quicktype-core 23.0.4 → 23.0.5

package/dist/language/CPlusPlus.js

@@ -765,7 +765,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         const [maybeNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u, true);
         (0, Support_2.assert)(nonNulls.size >= 2, "Variant not needed for less than two types.");
         const indirection = maybeNull !== null;
-        const variant = this.cppTypeInOptional(nonNulls, { needsForwardIndirection: !indirection, needsOptionalIndirection: !indirection, inJsonNamespace }, true, false);
+        const variant = this.cppTypeInOptional(nonNulls, {
+            needsForwardIndirection: !indirection,
+            needsOptionalIndirection: !indirection,
+            inJsonNamespace
+        }, true, false);
         if (!indirection) {
             return variant;
         }
@@ -814,7 +818,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
         }, arrayType => [
             "std::vector<",
-            this.cppType(arrayType.items, { needsForwardIndirection: false, needsOptionalIndirection: true, inJsonNamespace }, withIssues, forceNarrowString, false),
+            this.cppType(arrayType.items, {
+                needsForwardIndirection: false,
+                needsOptionalIndirection: true,
+                inJsonNamespace
+            }, withIssues, forceNarrowString, false),
             ">"
         ], classType => this.variantIndirection(classType, ctx.needsForwardIndirection && this.isForwardDeclaredType(classType) && !isOptional, [this.ourQualifier(inJsonNamespace), this.nameForNamedType(classType)]), mapType => {
             let keyType = this._stringType.getType();
@@ -825,14 +833,22 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 "std::map<",
                 keyType,
                 ", ",
-                this.cppType(mapType.values, { needsForwardIndirection: false, needsOptionalIndirection: true, inJsonNamespace }, withIssues, forceNarrowString, false),
+                this.cppType(mapType.values, {
+                    needsForwardIndirection: false,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace
+                }, withIssues, forceNarrowString, false),
                 ">"
             ];
         }, enumType => [this.ourQualifier(inJsonNamespace), this.nameForNamedType(enumType)], unionType => {
             const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (nullable !== null) {
                 isOptional = true;
-                return this.cppType(nullable, { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace }, withIssues, forceNarrowString, false);
+                return this.cppType(nullable, {
+                    needsForwardIndirection: false,
+                    needsOptionalIndirection: false,
+                    inJsonNamespace
+                }, withIssues, forceNarrowString, false);
             }
             else {
                 return [this.ourQualifier(inJsonNamespace), this.nameForNamedType(unionType)];
@@ -920,7 +936,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this._options.codeFormat) {
             this.emitLine("private:");
             this.forEachClassProperty(c, "none", (name, jsonName, property) => {
-                this.emitMember(this.cppType(property.type, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, true, false, property.isOptional), name);
+                this.emitMember(this.cppType(property.type, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, true, false, property.isOptional), name);
                 if (constraints !== undefined && constraints.has(jsonName)) {
                     /** FIXME!!! NameStyle will/can collide with other Names */
                     const cnst = this.lookupGlobalName(GlobalNames.ClassMemberConstraints);
@@ -933,11 +953,19 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.forEachClassProperty(c, "none", (name, jsonName, property) => {
             this.emitDescription(this.descriptionForClassProperty(c, jsonName));
             if (!this._options.codeFormat) {
-                this.emitMember(this.cppType(property.type, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, true, false, property.isOptional), name);
+                this.emitMember(this.cppType(property.type, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, true, false, property.isOptional), name);
             }
             else {
                 const [getterName, mutableGetterName, setterName] = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
-                const rendered = this.cppType(property.type, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, true, false, property.isOptional);
+                const rendered = this.cppType(property.type, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, true, false, property.isOptional);
                 /**
                  * fix for optional type -> e.g. unique_ptrs can't be copied
                  * One might as why the "this->xxx = value". Simple if we have
@@ -1067,8 +1095,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 className,
                 "& x)"
             ], false, () => {
-                cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
-                toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
+                cppType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: true
+                }, false, true, false);
+                toType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: true
+                }, false, false, false);
                 this.emitLine([
                     "x = ",
                     this._stringType.wrapEncodingChange([ourQualifier], cppType, toType, [
@@ -1087,8 +1123,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.withConst([ourQualifier, className]),
                 " & x)"
             ], false, () => {
-                cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
-                toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
+                cppType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: true
+                }, false, false, false);
+                toType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: true
+                }, false, true, false);
                 this.emitLine([
                     "j = ",
                     this._stringType.wrapEncodingChange([ourQualifier], cppType, toType, "x"),
@@ -1157,8 +1201,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                         return;
                     }
                 }
-                cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, false, true, p.isOptional);
-                toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, false, false, p.isOptional);
+                cppType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, false, true, p.isOptional);
+                toType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, false, false, p.isOptional);
                 this.emitLine(assignment.wrap([], this._stringType.wrapEncodingChange([ourQualifier], cppType, toType, [
                     "j.at(",
                     this._stringType.wrapEncodingChange([ourQualifier], this._stringType.getType(), this.NarrowString.getType(), this._stringType.createStringLiteral([(0, Strings_1.stringEscape)(json)])),
@@ -1173,8 +1225,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine("j = json::object();");
             this.forEachClassProperty(c, "none", (name, json, p) => {
                 const t = p.type;
-                cppType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, false, false, p.isOptional);
-                toType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, false, true, p.isOptional);
+                cppType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, false, false, p.isOptional);
+                toType = this.cppType(t, {
+                    needsForwardIndirection: true,
+                    needsOptionalIndirection: true,
+                    inJsonNamespace: false
+                }, false, true, p.isOptional);
                 const [getterName, ,] = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
                 let getter;
                 if (this._options.codeFormat) {
@@ -1232,7 +1292,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         // but it's nontrivial to detect that (consider variant<string, variant<map<string, string>, int>> which
         // does need an adl_serializer specialization) so we'll just specialize every time.
         const nonNulls = (0, TypeUtils_1.removeNullFromUnion)(u, true)[1];
-        const variantType = this.cppTypeInOptional(nonNulls, { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false);
+        const variantType = this.cppTypeInOptional(nonNulls, {
+            needsForwardIndirection: false,
+            needsOptionalIndirection: false,
+            inJsonNamespace: true
+        }, false, false);
         this.emitLine("template <>");
         this.emitBlock(["struct adl_serializer<", variantType, ">"], true, () => {
             this.emitLine("static void from_json(", this.withConst("json"), " & j, ", variantType, " & x);");
@@ -1253,7 +1317,11 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             ["enum", "is_string"]
         ];
         const nonNulls = (0, TypeUtils_1.removeNullFromUnion)(u, true)[1];
-        const variantType = this.cppTypeInOptional(nonNulls, { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false);
+        const variantType = this.cppTypeInOptional(nonNulls, {
+            needsForwardIndirection: false,
+            needsOptionalIndirection: false,
+            inJsonNamespace: true
+        }, false, false);
         this.emitBlock([
             "inline void adl_serializer<",
             variantType,
@@ -1270,8 +1338,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     continue;
                 this.emitLine(onFirst ? "if" : "else if", " (j.", func, "())");
                 this.indent(() => {
-                    const cppType = this.cppType(typeForKind, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
-                    let toType = this.cppType(typeForKind, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
+                    const cppType = this.cppType(typeForKind, {
+                        needsForwardIndirection: true,
+                        needsOptionalIndirection: true,
+                        inJsonNamespace: true
+                    }, false, true, false);
+                    let toType = this.cppType(typeForKind, {
+                        needsForwardIndirection: true,
+                        needsOptionalIndirection: true,
+                        inJsonNamespace: true
+                    }, false, false, false);
                     this.emitLine("x = ", this._stringType.wrapEncodingChange([ourQualifier], cppType, toType, [
                         "j.get<",
                         cppType,
@@ -1280,7 +1356,6 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 });
                 onFirst = false;
             }
-            // this.emitLine('else throw "Could not deserialize";');
             this.emitLine('else throw std::runtime_error("Could not deserialise!");');
         });
         this.ensureBlankLine();
@@ -1309,7 +1384,6 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     });
                     i++;
                 }
-                // 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!");');
             });
         });
@@ -1352,7 +1426,6 @@ 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 std::runtime_error("Input JSON does not conform to schema!"); }');
             }
         });
@@ -1362,19 +1435,30 @@ 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 std::runtime_error("This should not happen");');
             });
         });
     }
     emitTopLevelTypedef(t, name) {
-        this.emitLine("using ", name, " = ", this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: false }, true, false, false), ";");
+        this.emitLine("using ", name, " = ", this.cppType(t, {
+            needsForwardIndirection: true,
+            needsOptionalIndirection: true,
+            inJsonNamespace: false
+        }, true, false, false), ";");
     }
     emitAllUnionFunctions() {
-        this.forEachUniqueUnion("leading-and-interposing", u => this.sourcelikeToString(this.cppTypeInOptional((0, TypeUtils_1.removeNullFromUnion)(u, true)[1], { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false)), (u) => this.emitUnionFunctions(u));
+        this.forEachUniqueUnion("leading-and-interposing", u => this.sourcelikeToString(this.cppTypeInOptional((0, TypeUtils_1.removeNullFromUnion)(u, true)[1], {
+            needsForwardIndirection: false,
+            needsOptionalIndirection: false,
+            inJsonNamespace: true
+        }, false, false)), (u) => this.emitUnionFunctions(u));
     }
     emitAllUnionHeaders() {
-        this.forEachUniqueUnion("interposing", u => this.sourcelikeToString(this.cppTypeInOptional((0, TypeUtils_1.removeNullFromUnion)(u, true)[1], { needsForwardIndirection: false, needsOptionalIndirection: false, inJsonNamespace: true }, false, false)), (u) => this.emitUnionHeaders(u));
+        this.forEachUniqueUnion("interposing", u => this.sourcelikeToString(this.cppTypeInOptional((0, TypeUtils_1.removeNullFromUnion)(u, true)[1], {
+            needsForwardIndirection: false,
+            needsOptionalIndirection: false,
+            inJsonNamespace: true
+        }, false, false)), (u) => this.emitUnionHeaders(u));
     }
     emitOptionalHelpers() {
         this.emitLine("#ifndef NLOHMANN_OPT_HELPER");
@@ -1956,8 +2040,16 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     isConversionRequired(t) {
-        let originalType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, false, false);
-        let newType = this.cppType(t, { needsForwardIndirection: true, needsOptionalIndirection: true, inJsonNamespace: true }, false, true, false);
+        let originalType = this.cppType(t, {
+            needsForwardIndirection: true,
+            needsOptionalIndirection: true,
+            inJsonNamespace: true
+        }, false, false, false);
+        let newType = this.cppType(t, {
+            needsForwardIndirection: true,
+            needsOptionalIndirection: true,
+            inJsonNamespace: true
+        }, false, true, false);
         return originalType !== newType;
     }
 }

package/package.json

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