quicktype-core 23.3.11 → 23.3.13

package/dist/input/JSONSchemaInput.js

@@ -780,8 +780,10 @@ function addTypesInSchema(resolver, typeBuilder, references, attributeProducers)
                 const includeArray = enumArray === undefined &&
                     !isConst &&
                     (typeSet === undefined || typeSet.has("array"));
+                const enumArrayHasString = (enumArray === null || enumArray === void 0 ? void 0 : enumArray.find((x) => typeof x === "string")) !== undefined;
+                const constIsString = isConst && typeof schema.const === "string";
                 const needStringEnum = includedTypes.has("string") &&
-                    (enumArray === null || enumArray === void 0 ? void 0 : enumArray.find((x) => typeof x === "string")) !== undefined;
+                    (enumArrayHasString || constIsString);
                 const needUnion = typeSet !== undefined ||
                     schema.properties !== undefined ||
                     schema.additionalProperties !== undefined ||
@@ -807,8 +809,13 @@ function addTypesInSchema(resolver, typeBuilder, references, attributeProducers)
                         unionTypes.push(typeBuilder.getPrimitiveType(kind, attributes));
                     }
                     const stringAttributes = (0, TypeAttributes_1.combineTypeAttributes)("union", inferredAttributes, combineProducedAttributes(({ forString }) => forString));
-                    if (needStringEnum || isConst) {
-                        const cases = isConst
+                    // FIXME: A non-string const never takes this path, so it
+                    // degrades to its plain primitive type and the literal value is
+                    // dropped, because enum case name generation only works with
+                    // strings. To fix this, the cases below have to support all
+                    // types.
+                    if (needStringEnum) {
+                        const cases = constIsString
                             ? [schema.const]
                             : ((_a = enumArray === null || enumArray === void 0 ? void 0 : enumArray.filter((x) => typeof x === "string")) !== null && _a !== void 0 ? _a : []);
                         unionTypes.push(typeBuilder.getStringType(stringAttributes, StringTypes_1.StringTypes.fromCases(cases)));

package/dist/language/CPlusPlus/CPlusPlusRenderer.js

@@ -1258,7 +1258,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     onFirst = false;
                 });
             }
-            this.emitLine('else { throw std::runtime_error("Input JSON does not conform to schema!"); }');
+            this.emitLine('else { throw std::runtime_error("Cannot deserialize to enumeration \\"', enumName, '\\""); }');
         });
         this.ensureBlankLine();
         this.emitBlock([

package/dist/language/Dart/DartRenderer.js

@@ -251,7 +251,10 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 (0, Support_1.defined)(this._enumValues.get(enumType)),
                 ".map[",
                 dynamic,
-                this._options.nullSafety ? "]!" : "]",
+                this._options.nullSafety &&
+                    (!isNullable || this._options.requiredProperties)
+                    ? "]!"
+                    : "]",
             ];
         }, (unionType) => {
             const maybeNullable = (0, TypeUtils_1.nullableFromUnion)(unionType);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "23.3.11",
+    "version": "23.3.13",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",