quicktype-core 23.0.46 → 23.0.48

package/dist/attributes/Description.js

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.descriptionAttributeProducer = exports.propertyDescriptionsTypeAttributeKind = exports.descriptionTypeAttributeKind = exports.addDescriptionToSchema = void 0;
 const collection_utils_1 = require("collection-utils");
+// There's a cyclic import here. Ignoring now because it requires a large refactor.
+// skipcq: JS-E1008
 const TypeAttributes_1 = require("./TypeAttributes");
+// FIXME: This is a circular import
 const JSONSchemaInput_1 = require("../input/JSONSchemaInput");
 function addDescriptionToSchema(schema, description) {
     if (description === undefined)

package/dist/input/JSONSchemaInput.d.ts

@@ -2,8 +2,8 @@ import URI from "urijs";
 import { TypeBuilder } from "../TypeBuilder";
 import { TypeAttributes } from "../attributes/TypeAttributes";
 import { JSONSchema, JSONSchemaStore } from "./JSONSchemaStore";
-import { RunContext } from "../Run";
-import { Input } from "./Inputs";
+import { type RunContext } from "../Run";
+import { type Input } from "./Inputs";
 export declare enum PathElementKind {
     Root = 0,
     KeyOrIndex = 1,

package/dist/input/JSONSchemaInput.js

@@ -23,6 +23,8 @@ const TypeAttributes_1 = require("../attributes/TypeAttributes");
 const JSONSchemaStore_1 = require("./JSONSchemaStore");
 const Messages_1 = require("../Messages");
 const StringTypes_1 = require("../attributes/StringTypes");
+// There's a cyclic import here. Ignoring now because it requires a large refactor.
+// skipcq: JS-E1008
 const Description_1 = require("../attributes/Description");
 const AccessorNames_1 = require("../attributes/AccessorNames");
 const EnumValues_1 = require("../attributes/EnumValues");

package/dist/language/CPlusPlus.d.ts

@@ -102,8 +102,8 @@ export type TypeContext = {
     inJsonNamespace: boolean;
 };
 declare class WrappingCode {
-    private readonly _start;
-    private readonly _end;
+    private readonly start;
+    private readonly end;
     constructor(start: Sourcelike[], end: Sourcelike[]);
     wrap(qualifier: Sourcelike, inner: Sourcelike): Sourcelike;
 }

package/dist/language/CPlusPlus.js

@@ -273,23 +273,23 @@ function addQualifier(qualifier, qualified) {
 }
 class WrappingCode {
     constructor(start, end) {
-        this._start = start;
-        this._end = end;
+        this.start = start;
+        this.end = end;
     }
     wrap(qualifier, inner) {
-        return [addQualifier(qualifier, this._start), inner, this._end];
+        return [addQualifier(qualifier, this.start), inner, this.end];
     }
 }
 class BaseString {
     constructor(stringType, constStringType, smatch, regex, stringLiteralPrefix, toString, encodingClass, encodingFunction) {
-        (this._stringType = stringType),
-            (this._constStringType = constStringType),
-            (this._smatch = smatch),
-            (this._regex = regex),
-            (this._stringLiteralPrefix = stringLiteralPrefix),
-            (this._toString = toString),
-            (this._encodingClass = encodingClass),
-            (this._encodingFunction = encodingFunction);
+        this._stringType = stringType;
+        this._constStringType = constStringType;
+        this._smatch = smatch;
+        this._regex = regex;
+        this._stringLiteralPrefix = stringLiteralPrefix;
+        this._toString = toString;
+        this._encodingClass = encodingClass;
+        this._encodingFunction = encodingFunction;
     }
     getType() {
         return this._stringType;
@@ -900,7 +900,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     type: t,
                     level: l,
                     variant: isVariant,
-                    forceInclude: forceInclude
+                    forceInclude
                 });
             }
             else if (t instanceof Type_1.MapType) {
@@ -937,7 +937,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                         type: t,
                         level: l,
                         variant: true,
-                        forceInclude: forceInclude
+                        forceInclude
                     });
                     /** intentional "fall-through", add all subtypes as well - but forced include */
                 }
@@ -953,7 +953,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return result;
     }
     constraintMember(jsonName) {
-        return this._memberNameStyle(jsonName + "Constraint");
+        return this._memberNameStyle(`${jsonName}Constraint`);
     }
     emitMember(cppType, name) {
         this.emitLine(cppType, " ", name, ";");
@@ -1180,7 +1180,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitBlock(["inline void from_json(", this.withConst("json"), " & j, ", ourQualifier, className, "& x)"], false, () => {
             this.forEachClassProperty(c, "none", (name, json, p) => {
                 const [, , setterName] = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
-                const t = p.type;
+                const propType = p.type;
                 let assignment;
                 if (this._options.codeFormat) {
                     assignment = new WrappingCode(["x.", setterName, "("], [")"]);
@@ -1188,7 +1188,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 else {
                     assignment = new WrappingCode(["x.", name, " = "], []);
                 }
-                if (t.kind === "null" || t.kind === "any") {
+                if (propType.kind === "null" || propType.kind === "any") {
                     this.emitLine(assignment.wrap([], [
                         ourQualifier,
                         "get_untyped(j, ",
@@ -1197,15 +1197,15 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     ]), ";");
                     return;
                 }
-                if (p.isOptional || t instanceof Type_1.UnionType) {
+                if (p.isOptional || propType instanceof Type_1.UnionType) {
                     const [nullOrOptional, typeSet] = (function () {
-                        if (t instanceof Type_1.UnionType) {
-                            const [maybeNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(t, true);
+                        if (propType instanceof Type_1.UnionType) {
+                            const [maybeNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(propType, true);
                             return [maybeNull !== null || p.isOptional, nonNulls];
                         }
                         else {
                             const set = new Set();
-                            set.add(t);
+                            set.add(propType);
                             return [true, set];
                         }
                     })();
@@ -1221,9 +1221,9 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                             inJsonNamespace: false
                         }, false, false);
                         this.emitLine(assignment.wrap([], [
-                            this._stringType.wrapEncodingChange([ourQualifier], [this.optionalType(t), "<", cppType, ">"], [this.optionalType(t), "<", toType, ">"], [
+                            this._stringType.wrapEncodingChange([ourQualifier], [this.optionalType(propType), "<", cppType, ">"], [this.optionalType(propType), "<", toType, ">"], [
                                 ourQualifier,
-                                `get_${this.optionalTypeLabel(t)}_optional<`,
+                                `get_${this.optionalTypeLabel(propType)}_optional<`,
                                 cppType,
                                 ">(j, ",
                                 this._stringType.wrapEncodingChange([ourQualifier], this._stringType.getType(), this.NarrowString.getType(), [this._stringType.createStringLiteral([(0, Strings_1.stringEscape)(json)])]),
@@ -1233,12 +1233,12 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                         return;
                     }
                 }
-                cppType = this.cppType(t, {
+                cppType = this.cppType(propType, {
                     needsForwardIndirection: true,
                     needsOptionalIndirection: true,
                     inJsonNamespace: false
                 }, false, true, p.isOptional);
-                toType = this.cppType(t, {
+                toType = this.cppType(propType, {
                     needsForwardIndirection: true,
                     needsOptionalIndirection: true,
                     inJsonNamespace: false
@@ -1256,13 +1256,13 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitBlock(["inline void to_json(json & j, ", this.withConst([ourQualifier, className]), " & x)"], false, () => {
             this.emitLine("j = json::object();");
             this.forEachClassProperty(c, "none", (name, json, p) => {
-                const t = p.type;
-                cppType = this.cppType(t, {
+                const propType = p.type;
+                cppType = this.cppType(propType, {
                     needsForwardIndirection: true,
                     needsOptionalIndirection: true,
                     inJsonNamespace: false
                 }, false, false, p.isOptional);
-                toType = this.cppType(t, {
+                toType = this.cppType(propType, {
                     needsForwardIndirection: true,
                     needsOptionalIndirection: true,
                     inJsonNamespace: false
@@ -1523,23 +1523,23 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
         }
         else if (decl.kind === "define") {
-            const t = decl.type;
-            const name = this.nameForNamedType(t);
-            if (t instanceof Type_1.ClassType) {
-                this.emitClass(t, name);
+            const type = decl.type;
+            const name = this.nameForNamedType(type);
+            if (type instanceof Type_1.ClassType) {
+                this.emitClass(type, name);
             }
-            else if (t instanceof Type_1.EnumType) {
-                this.emitEnum(t, name);
+            else if (type instanceof Type_1.EnumType) {
+                this.emitEnum(type, name);
             }
-            else if (t instanceof Type_1.UnionType) {
-                this.emitUnionTypedefs(t, name);
+            else if (type instanceof Type_1.UnionType) {
+                this.emitUnionTypedefs(type, name);
             }
             else {
-                return (0, Support_1.panic)(`Cannot declare type ${t.kind}`);
+                (0, Support_1.panic)(`Cannot declare type ${type.kind}`);
             }
         }
         else {
-            return (0, Support_1.assertNever)(decl.kind);
+            (0, Support_1.assertNever)(decl.kind);
         }
     }
     emitGetterSetter(t, getterName, setterName, memberName) {
@@ -1695,8 +1695,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
         untypedMacroName += "HELPER";
         optionalMacroName += "HELPER";
-        this.emitLine("#ifndef " + untypedMacroName);
-        this.emitLine("#define " + untypedMacroName);
+        this.emitLine(`#ifndef ${untypedMacroName}`);
+        this.emitLine(`#define ${untypedMacroName}`);
         this.emitBlock(["inline json get_untyped(", this.withConst("json"), " & j, ", this.withConst("char"), " * property)"], false, () => {
             this.emitBlock(["if (j.find(property) != j.end())"], false, () => {
                 this.emitLine("return j.at(property).get<json>();");
@@ -1711,8 +1711,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.ensureBlankLine();
         if (this.haveUnions || this.haveOptionalProperties) {
             this.ensureBlankLine();
-            this.emitLine("#ifndef " + optionalMacroName);
-            this.emitLine("#define " + optionalMacroName);
+            this.emitLine(`#ifndef ${optionalMacroName}`);
+            this.emitLine(`#define ${optionalMacroName}`);
             const emitGetOptional = (optionalType, label) => {
                 this.emitLine("template <typename T>");
                 this.emitBlock([
@@ -1752,28 +1752,28 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.ensureBlankLine();
         if (this._options.codeFormat) {
             if (this._options.boost) {
-                this.emitInclude(true, `boost/optional.hpp`);
+                this.emitInclude(true, "boost/optional.hpp");
             }
             else {
-                this.emitInclude(true, `optional`);
+                this.emitInclude(true, "optional");
             }
-            this.emitInclude(true, `stdexcept`);
-            this.emitInclude(true, `regex`);
+            this.emitInclude(true, "stdexcept");
+            this.emitInclude(true, "regex");
         }
         if (this._options.wstring) {
-            this.emitInclude(true, `codecvt`);
-            this.emitInclude(true, `locale`);
+            this.emitInclude(true, "codecvt");
+            this.emitInclude(true, "locale");
         }
         // Include unordered_map if contains large enums
         if (Array.from(this.enums).some(enumType => this.isLargeEnum(enumType))) {
-            this.emitInclude(true, `unordered_map`);
+            this.emitInclude(true, "unordered_map");
         }
         this.ensureBlankLine();
     }
     emitHelper() {
         this.startFile("helper.hpp", false);
         this.emitExtraIncludes();
-        this.emitInclude(true, `sstream`);
+        this.emitInclude(true, "sstream");
         this.ensureBlankLine();
         this.emitNamespaces(this._namespaceNames, () => {
             this.emitLine("using nlohmann::json;");
@@ -1833,13 +1833,13 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         else {
             const userNamespaceForwardDecls = this.gatherUserNamespaceForwardDecls();
             const nlohmannNamespaceForwardDecls = this.gatherNlohmannNamespaceForwardDecls();
-            if (userNamespaceForwardDecls.length == 0 && nlohmannNamespaceForwardDecls.length > 0) {
+            if (userNamespaceForwardDecls.length === 0 && nlohmannNamespaceForwardDecls.length > 0) {
                 this.emitNamespaces(["nlohmann"], () => {
                     this.emitGatheredSource(nlohmannNamespaceForwardDecls);
                     this.emitNlohmannNamespaceImpls();
                 });
             }
-            else if (userNamespaceForwardDecls.length > 0 && nlohmannNamespaceForwardDecls.length == 0) {
+            else if (userNamespaceForwardDecls.length > 0 && nlohmannNamespaceForwardDecls.length === 0) {
                 this.emitNamespaces(this._namespaceNames, () => {
                     this.emitGatheredSource(userNamespaceForwardDecls);
                     this.emitUserNamespaceImpls();
@@ -1996,7 +1996,7 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     emitDefinition(d, defName) {
-        const name = this.sourcelikeToString(defName) + ".hpp";
+        const name = `${this.sourcelikeToString(defName)}.hpp`;
         this.startFile(name, true);
         this._generatedFiles.add(name);
         this.emitIncludes(d, this.sourcelikeToString(defName));

package/dist/language/Golang.js

@@ -215,10 +215,16 @@ class GoRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitPackageDefinitons(false);
         this.emitDescription(this.descriptionForType(e));
         this.emitLine("type ", enumName, " string");
+        this.ensureBlankLine();
         this.emitLine("const (");
-        this.indent(() => this.forEachEnumCase(e, "none", (name, jsonName) => {
-            this.emitLine(name, " ", enumName, ' = "', (0, Strings_1.stringEscape)(jsonName), '"');
-        }));
+        let columns = [];
+        this.forEachEnumCase(e, "none", (name, jsonName) => {
+            columns.push([
+                [name, " "],
+                [enumName, ' = "', (0, Strings_1.stringEscape)(jsonName), '"']
+            ]);
+        });
+        this.indent(() => this.emitTable(columns));
         this.emitLine(")");
         this.endFile();
     }

package/package.json

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