quicktype-core 23.0.2 → 23.0.4

package/dist/language/CPlusPlus.js

@@ -1280,7 +1280,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 });
                 onFirst = false;
             }
-            this.emitLine('else throw "Could not deserialize";');
+            // this.emitLine('else throw "Could not deserialize";');
+            this.emitLine('else throw std::runtime_error("Could not deserialise!");');
         });
         this.ensureBlankLine();
         this.emitBlock(["inline void adl_serializer<", variantType, ">::to_json(json & j, ", this.withConst(variantType), " & x)"], false, () => {
@@ -1308,7 +1309,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     });
                     i++;
                 }
-                this.emitLine('default: throw "Input JSON does not conform to schema";');
+                // this.emitLine('default: throw "Input JSON does not conform to schema";');
+                this.emitLine('default: throw std::runtime_error("Input JSON does not conform to schema!");');
             });
         });
     }
@@ -1350,7 +1352,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     this.emitLine(maybeElse, "if (j == ", this._stringType.wrapEncodingChange([ourQualifier], this._stringType.getType(), this.NarrowString.getType(), [this._stringType.createStringLiteral([(0, Strings_1.stringEscape)(jsonName)])]), ") x = ", ourQualifier, enumName, "::", name, ";");
                     onFirst = false;
                 });
-                this.emitLine('else throw "Input JSON does not conform to schema";');
+                // this.emitLine('else throw "Input JSON does not conform to schema";');
+                this.emitLine('else { throw std::runtime_error("Input JSON does not conform to schema!"); }');
             }
         });
         this.ensureBlankLine();
@@ -1359,7 +1362,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.forEachEnumCase(e, "none", (name, jsonName) => {
                     this.emitLine("case ", ourQualifier, enumName, "::", name, ": j = ", this._stringType.wrapEncodingChange([ourQualifier], this._stringType.getType(), this.NarrowString.getType(), [this._stringType.createStringLiteral([(0, Strings_1.stringEscape)(jsonName)])]), "; break;");
                 });
-                this.emitLine('default: throw "This should not happen";');
+                // this.emitLine('default: throw "This should not happen";');
+                this.emitLine('default: throw std::runtime_error("This should not happen");');
             });
         });
     }

package/dist/language/Python.d.ts

@@ -46,7 +46,7 @@ export declare class PythonRenderer extends ConvenienceRenderer {
     protected withImport(module: string, name: string): Sourcelike;
     protected withTyping(name: string): Sourcelike;
     protected namedType(t: Type): Sourcelike;
-    protected pythonType(t: Type): Sourcelike;
+    protected pythonType(t: Type, _isRootTypeDef?: boolean): Sourcelike;
     protected declarationLine(t: Type): Sourcelike;
     protected declareType<T extends Type>(t: T, emitter: () => void): void;
     protected emitClassMembers(t: ClassType): void;

package/dist/language/Python.js

@@ -240,15 +240,19 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             return name;
         return ["'", name, "'"];
     }
-    pythonType(t) {
+    pythonType(t, _isRootTypeDef = false) {
         const actualType = (0, Transformers_1.followTargetType)(t);
         return (0, TypeUtils_1.matchType)(actualType, _anyType => this.withTyping("Any"), _nullType => "None", _boolType => "bool", _integerType => "int", _doubletype => "float", _stringType => "str", arrayType => [this.withTyping("List"), "[", this.pythonType(arrayType.items), "]"], classType => this.namedType(classType), mapType => [this.withTyping("Dict"), "[str, ", this.pythonType(mapType.values), "]"], enumType => this.namedType(enumType), unionType => {
             const [hasNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(unionType);
             const memberTypes = Array.from(nonNulls).map(m => this.pythonType(m));
             if (hasNull !== null) {
                 let rest = [];
-                if (!this.getAlphabetizeProperties() && this.pyOptions.features.dataClasses)
+                if (!this.getAlphabetizeProperties() && this.pyOptions.features.dataClasses && _isRootTypeDef) {
+                    // Only push "= None" if this is a root level type def
+                    //   otherwise we may get type defs like List[Optional[int] = None]
+                    //   which are invalid
                     rest.push(" = None");
+                }
                 if (nonNulls.size > 1) {
                     this.withImport("typing", "Union");
                     return [
@@ -344,7 +348,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 else {
                     this.forEachClassProperty(t, "none", (name, jsonName, cp) => {
                         this.emitDescription(this.descriptionForClassProperty(t, jsonName));
-                        this.emitLine(name, this.typeHint(": ", this.pythonType(cp.type)));
+                        this.emitLine(name, this.typeHint(": ", this.pythonType(cp.type, true)));
                     });
                 }
                 this.ensureBlankLine();

package/package.json

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