[pull] master from glideapps:master

.github/workflows/test-pr.yaml

@@ -53,6 +53,7 @@ jobs:
                     - ruby
                     - php,schema-php
                     - scala3,schema-scala3
+                    - scala3-upickle,schema-scala3-upickle
                     - elixir,schema-elixir,graphql-elixir
                     - comment-injection-treesitter,comment-injection-typescript,comment-injection-typescript-zod,comment-injection-typescript-effect-schema
 
@@ -124,7 +125,7 @@ jobs:
               if: ${{ contains(matrix.fixture, 'csharp') }}
               uses: actions/setup-dotnet@v3
               with:
-                  dotnet-version: 6
+                  dotnet-version: 8
 
             - name: Install Rust
               if: ${{ contains(matrix.fixture, 'rust') }}
@@ -145,16 +146,16 @@ jobs:
                   if ! command -v stack > /dev/null 2>&1; then
                     curl -sL "https://get.haskellstack.org/" | sh
                   fi
-            - name: Install Python 3.7
+            - name: Install Python 3.12
               if: ${{ contains(matrix.fixture, 'python') }}
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.7
+                  python-version: "3.12"
 
             - name: Install Python Dependencies
               if: ${{ contains(matrix.fixture, 'python') }}
               run: |
-                  pip3.7 install mypy python-dateutil types-python-dateutil
+                  pip3.12 install mypy python-dateutil types-python-dateutil
             - name: Install flow
               if: ${{ contains(matrix.fixture, 'flow') }}
               run: |

package.json

@@ -62,9 +62,10 @@
         "@types/semver": "^7.5.0",
         "@types/shelljs": "^0.10.0",
         "@types/stream-json": "^1.7.3",
-        "@types/urijs": "^1.19.25",
+        "@types/urijs": "^1.19.26",
         "@types/wordwrap": "^1.0.3",
-        "ajv": "^5.5.2",
+        "ajv": "^8.20.0",
+        "ajv-formats": "^3.0.1",
         "deep-equal": "^2.2.3",
         "esbuild": "^0.28.1",
         "promise-timeout": "^1.3.0",

packages/quicktype-core/package.json

@@ -32,7 +32,7 @@
     "dependencies": {
         "@glideapps/ts-necessities": "2.2.3",
         "@types/readable-stream": "4.0.10",
-        "@types/urijs": "^1.19.25",
+        "@types/urijs": "^1.19.26",
         "browser-or-node": "^3.0.0",
         "collection-utils": "^1.0.1",
         "is-url": "^1.2.4",
@@ -49,7 +49,7 @@
         "@types/is-url": "^1.2.32",
         "@types/node": "~20.19.0",
         "@types/pluralize": "0.0.30",
-        "@types/unicode-properties": "^1.3.0",
+        "@types/unicode-properties": "^1.3.2",
         "@types/wordwrap": "^1.0.3",
         "typescript": "~7.0.2"
     },

packages/quicktype-core/src/language/CSharp/CSharpRenderer.ts

@@ -188,7 +188,7 @@ export class CSharpRenderer extends ConvenienceRenderer {
     ): Sourcelike {
         t = followTargetType(t);
         const csType = this.csType(t, follow, withIssues);
-        if (isValueType(t)) {
+        if (isValueType(t) || this._csOptions.version >= 8) {
             return [csType, "?"];
         } else {
             return csType;

packages/quicktype-core/src/language/CSharp/NewtonSoftCSharpRenderer.ts

@@ -192,6 +192,15 @@ export class NewtonsoftCSharpRenderer extends CSharpRenderer {
         return this._options.baseclass;
     }
 
+    protected emitDefaultFollowingComments(): void {
+        if (!this._needHelpers || this._options.version < 8) return;
+
+        this.emitLine("#pragma warning restore CS8618");
+        this.emitLine("#pragma warning restore CS8601");
+        this.emitLine("#pragma warning restore CS8603");
+        this.emitLine("#pragma warning restore CS8765");
+    }
+
     protected emitDefaultLeadingComments(): void {
         if (!this._needHelpers) return;
 
@@ -225,6 +234,14 @@ export class NewtonsoftCSharpRenderer extends CSharpRenderer {
                 ";",
             );
         });
+
+        if (this._options.version >= 8) {
+            this.emitLine("#nullable enable");
+            this.emitLine("#pragma warning disable CS8618");
+            this.emitLine("#pragma warning disable CS8601");
+            this.emitLine("#pragma warning disable CS8603");
+            this.emitLine("#pragma warning disable CS8765");
+        }
     }
 
     private converterForType(t: Type): Name | undefined {

packages/quicktype-core/src/language/CSharp/SystemTextJsonCSharpRenderer.ts

@@ -275,6 +275,13 @@ export class SystemTextJsonCSharpRenderer extends CSharpRenderer {
         const isNullable = followTargetType(property.type).isNullable;
         const isOptional = property.isOptional;
 
+        // [JsonRequired] makes deserialization fail if the property is
+        // missing from the JSON.  It requires System.Text.Json 7.0 or
+        // later (.NET 7+).
+        if (this._options.checkRequired && !isOptional) {
+            attributes.push(["[JsonRequired]"]);
+        }
+
         if (isOptional && !isNullable) {
             attributes.push([
                 "[",

packages/quicktype-core/src/language/CSharp/language.ts

@@ -69,6 +69,7 @@ export const cSharpOptions = {
         {
             "5": 5,
             "6": 6,
+            "8": 8,
         } as const,
         "6",
         "secondary",

packages/quicktype-core/src/language/JavaScript/JavaScriptRenderer.ts

@@ -239,6 +239,16 @@ export class JavaScriptRenderer extends ConvenienceRenderer {
         };
     }
 
+    /** The expression a deserializer returns when runtime typechecks
+     * are disabled.  Subclasses can wrap it in a cast to the target
+     * type if `parsedJson`'s type isn't assignable to it. */
+    protected uncheckedParsedJson(
+        _t: Type,
+        parsedJson: Sourcelike,
+    ): Sourcelike {
+        return parsedJson;
+    }
+
     protected emitConvertModuleBody(): void {
         const converter = (t: Type, name: Name): void => {
             const typeMap = this.typeMapTypeFor(t);
@@ -251,7 +261,11 @@ export class JavaScriptRenderer extends ConvenienceRenderer {
                             ? "JSON.parse(json)"
                             : "json";
                     if (!this._jsOptions.runtimeTypecheck) {
-                        this.emitLine("return ", parsedJson, ";");
+                        this.emitLine(
+                            "return ",
+                            this.uncheckedParsedJson(t, parsedJson),
+                            ";",
+                        );
                     } else {
                         this.emitLine(
                             "return cast(",