quicktype 17.0.4 → 17.0.6

package/dist/quicktype-core/language/TypeScriptFlow.d.ts

@@ -19,7 +19,7 @@ export declare const tsFlowOptions: {
 };
 export declare abstract class TypeScriptFlowBaseTargetLanguage extends JavaScriptTargetLanguage {
     protected getOptions(): Option<any>[];
-    get supportsOptionalClassProperties(): boolean;
+    readonly supportsOptionalClassProperties: boolean;
     protected abstract makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
     }): JavaScriptRenderer;
@@ -44,9 +44,9 @@ export declare abstract class TypeScriptFlowBaseRenderer extends JavaScriptRende
     protected emitUsageComments(): void;
     protected deserializerFunctionLine(t: Type, name: Name): Sourcelike;
     protected serializerFunctionLine(t: Type, name: Name): Sourcelike;
-    protected get moduleLine(): string | undefined;
-    protected get castFunctionLines(): [string, string];
-    protected get typeAnnotations(): JavaScriptTypeAnnotations;
+    protected readonly moduleLine: string | undefined;
+    protected readonly castFunctionLines: [string, string];
+    protected readonly typeAnnotations: JavaScriptTypeAnnotations;
     protected emitConvertModule(): void;
     protected emitConvertModuleHelpers(): void;
     protected emitModuleExports(): void;
@@ -55,8 +55,8 @@ export declare class TypeScriptRenderer extends TypeScriptFlowBaseRenderer {
     protected forbiddenNamesForGlobalNamespace(): string[];
     protected deserializerFunctionLine(t: Type, name: Name): Sourcelike;
     protected serializerFunctionLine(t: Type, name: Name): Sourcelike;
-    protected get moduleLine(): string | undefined;
-    protected get typeAnnotations(): JavaScriptTypeAnnotations;
+    protected readonly moduleLine: string | undefined;
+    protected readonly typeAnnotations: JavaScriptTypeAnnotations;
     protected emitModuleExports(): void;
     protected emitUsageImportComment(): void;
     protected emitEnum(e: EnumType, enumName: Name): void;
@@ -70,7 +70,7 @@ export declare class FlowTargetLanguage extends TypeScriptFlowBaseTargetLanguage
 }
 export declare class FlowRenderer extends TypeScriptFlowBaseRenderer {
     protected forbiddenNamesForGlobalNamespace(): string[];
-    protected get typeAnnotations(): JavaScriptTypeAnnotations;
+    protected readonly typeAnnotations: JavaScriptTypeAnnotations;
     protected emitEnum(e: EnumType, enumName: Name): void;
     protected emitClassBlock(c: ClassType, className: Name): void;
     protected emitSourceStructure(): void;

package/dist/quicktype-core/language/TypeScriptFlow.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FlowRenderer = exports.FlowTargetLanguage = exports.TypeScriptRenderer = exports.TypeScriptFlowBaseRenderer = exports.TypeScriptTargetLanguage = exports.TypeScriptFlowBaseTargetLanguage = exports.tsFlowOptions = void 0;
 const Type_1 = require("../Type");
 const TypeUtils_1 = require("../TypeUtils");
 const Strings_1 = require("../support/Strings");
@@ -48,23 +47,23 @@ class TypeScriptTargetLanguage extends TypeScriptFlowBaseTargetLanguage {
         super("TypeScript", ["typescript", "ts", "tsx"], "ts");
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        return new TypeScriptRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.tsFlowOptions, untypedOptionValues));
+        return new TypeScriptRenderer(this, renderContext, RendererOptions_1.getOptionValues(exports.tsFlowOptions, untypedOptionValues));
     }
 }
 exports.TypeScriptTargetLanguage = TypeScriptTargetLanguage;
 function quotePropertyName(original) {
-    const escaped = (0, Strings_1.utf16StringEscape)(original);
+    const escaped = Strings_1.utf16StringEscape(original);
     const quoted = `"${escaped}"`;
     if (original.length === 0) {
         return quoted;
     }
-    else if (!(0, JavaScriptUnicodeMaps_1.isES3IdentifierStart)(original.codePointAt(0))) {
+    else if (!JavaScriptUnicodeMaps_1.isES3IdentifierStart(original.codePointAt(0))) {
         return quoted;
     }
     else if (escaped !== original) {
         return quoted;
     }
-    else if ((0, JavaScript_1.legalizeName)(original) !== original) {
+    else if (JavaScript_1.legalizeName(original) !== original) {
         return quoted;
     }
     else {
@@ -72,14 +71,13 @@ function quotePropertyName(original) {
     }
 }
 class TypeScriptFlowBaseRenderer extends JavaScript_1.JavaScriptRenderer {
-    _tsFlowOptions;
     constructor(targetLanguage, renderContext, _tsFlowOptions) {
         super(targetLanguage, renderContext, _tsFlowOptions);
         this._tsFlowOptions = _tsFlowOptions;
     }
     namerForObjectProperty() {
         if (this._tsFlowOptions.nicePropertyNames) {
-            return (0, Naming_1.funPrefixNamer)("properties", s => this.nameStyle(s, false));
+            return Naming_1.funPrefixNamer("properties", s => this.nameStyle(s, false));
         }
         else {
             return super.namerForObjectProperty();
@@ -87,37 +85,37 @@ class TypeScriptFlowBaseRenderer extends JavaScript_1.JavaScriptRenderer {
     }
     sourceFor(t) {
         if (["class", "object", "enum"].indexOf(t.kind) >= 0) {
-            return (0, Source_1.singleWord)(this.nameForNamedType(t));
+            return Source_1.singleWord(this.nameForNamedType(t));
         }
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.singleWord)("any"), _nullType => (0, Source_1.singleWord)("null"), _boolType => (0, Source_1.singleWord)("boolean"), _integerType => (0, Source_1.singleWord)("number"), _doubleType => (0, Source_1.singleWord)("number"), _stringType => (0, Source_1.singleWord)("string"), arrayType => {
+        return TypeUtils_1.matchType(t, _anyType => Source_1.singleWord("any"), _nullType => Source_1.singleWord("null"), _boolType => Source_1.singleWord("boolean"), _integerType => Source_1.singleWord("number"), _doubleType => Source_1.singleWord("number"), _stringType => Source_1.singleWord("string"), arrayType => {
             const itemType = this.sourceFor(arrayType.items);
             if ((arrayType.items instanceof Type_1.UnionType && !this._tsFlowOptions.declareUnions) ||
                 arrayType.items instanceof Type_1.ArrayType) {
-                return (0, Source_1.singleWord)(["Array<", itemType.source, ">"]);
+                return Source_1.singleWord(["Array<", itemType.source, ">"]);
             }
             else {
-                return (0, Source_1.singleWord)([(0, Source_1.parenIfNeeded)(itemType), "[]"]);
+                return Source_1.singleWord([Source_1.parenIfNeeded(itemType), "[]"]);
             }
-        }, _classType => (0, Support_1.panic)("We handled this above"), mapType => (0, Source_1.singleWord)(["{ [key: string]: ", this.sourceFor(mapType.values).source, " }"]), _enumType => (0, Support_1.panic)("We handled this above"), unionType => {
-            if (!this._tsFlowOptions.declareUnions || (0, TypeUtils_1.nullableFromUnion)(unionType) !== null) {
-                const children = Array.from(unionType.getChildren()).map(c => (0, Source_1.parenIfNeeded)(this.sourceFor(c)));
-                return (0, Source_1.multiWord)(" | ", ...children);
+        }, _classType => Support_1.panic("We handled this above"), mapType => Source_1.singleWord(["{ [key: string]: ", this.sourceFor(mapType.values).source, " }"]), _enumType => Support_1.panic("We handled this above"), unionType => {
+            if (!this._tsFlowOptions.declareUnions || TypeUtils_1.nullableFromUnion(unionType) !== null) {
+                const children = Array.from(unionType.getChildren()).map(c => Source_1.parenIfNeeded(this.sourceFor(c)));
+                return Source_1.multiWord(" | ", ...children);
             }
             else {
-                return (0, Source_1.singleWord)(this.nameForNamedType(unionType));
+                return Source_1.singleWord(this.nameForNamedType(unionType));
             }
         }, transformedStringType => {
             if (transformedStringType.kind === "date-time") {
-                return (0, Source_1.singleWord)("Date");
+                return Source_1.singleWord("Date");
             }
-            return (0, Source_1.singleWord)("string");
+            return Source_1.singleWord("string");
         });
     }
     emitClassBlockBody(c) {
         this.emitPropertyTable(c, (name, _jsonName, p) => {
             const t = p.type;
             return [
-                [(0, Source_1.modifySource)(quotePropertyName, name), p.isOptional ? "?" : "", ": "],
+                [Source_1.modifySource(quotePropertyName, name), p.isOptional ? "?" : "", ": "],
                 [this.sourceFor(t).source, ";"]
             ];
         });
@@ -135,7 +133,7 @@ class TypeScriptFlowBaseRenderer extends JavaScript_1.JavaScriptRenderer {
             return;
         }
         this.emitDescription(this.descriptionForType(u));
-        const children = (0, Source_1.multiWord)(" | ", ...Array.from(u.getChildren()).map(c => (0, Source_1.parenIfNeeded)(this.sourceFor(c))));
+        const children = Source_1.multiWord(" | ", ...Array.from(u.getChildren()).map(c => Source_1.parenIfNeeded(this.sourceFor(c))));
         this.emitLine("export type ", unionName, " = ", children.source, ";");
     }
     emitTypes() {
@@ -151,7 +149,7 @@ class TypeScriptFlowBaseRenderer extends JavaScript_1.JavaScriptRenderer {
         return ["function to", name, "(json: ", jsonType, "): ", this.sourceFor(t).source];
     }
     serializerFunctionLine(t, name) {
-        const camelCaseName = (0, Source_1.modifySource)(Strings_1.camelCase, name);
+        const camelCaseName = Source_1.modifySource(Strings_1.camelCase, name);
         const returnType = this._tsFlowOptions.rawType === "json" ? "string" : "any";
         return ["function ", camelCaseName, "ToJson(value: ", this.sourceFor(t).source, "): ", returnType];
     }
@@ -193,7 +191,7 @@ class TypeScriptRenderer extends TypeScriptFlowBaseRenderer {
         return ["public static to", name, "(json: ", jsonType, "): ", this.sourceFor(t).source];
     }
     serializerFunctionLine(t, name) {
-        const camelCaseName = (0, Source_1.modifySource)(Strings_1.camelCase, name);
+        const camelCaseName = Source_1.modifySource(Strings_1.camelCase, name);
         const returnType = this._tsFlowOptions.rawType === "json" ? "string" : "any";
         return ["public static ", camelCaseName, "ToJson(value: ", this.sourceFor(t).source, "): ", returnType];
     }
@@ -219,17 +217,17 @@ class TypeScriptRenderer extends TypeScriptFlowBaseRenderer {
             let items = "";
             e.cases.forEach(item => {
                 if (items === "") {
-                    items += `"${(0, Strings_1.utf16StringEscape)(item)}"`;
+                    items += `"${Strings_1.utf16StringEscape(item)}"`;
                     return;
                 }
-                items += ` | "${(0, Strings_1.utf16StringEscape)(item)}"`;
+                items += ` | "${Strings_1.utf16StringEscape(item)}"`;
             });
             this.emitLine("export type ", enumName, " = ", items, ";");
         }
         else {
             this.emitBlock(["export enum ", enumName, " "], "", () => {
                 this.forEachEnumCase(e, "none", (name, jsonName) => {
-                    this.emitLine(name, ` = "${(0, Strings_1.utf16StringEscape)(jsonName)}",`);
+                    this.emitLine(name, ` = "${Strings_1.utf16StringEscape(jsonName)}",`);
                 });
             });
         }
@@ -246,7 +244,7 @@ class FlowTargetLanguage extends TypeScriptFlowBaseTargetLanguage {
         super("Flow", ["flow"], "js");
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        return new FlowRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.tsFlowOptions, untypedOptionValues));
+        return new FlowRenderer(this, renderContext, RendererOptions_1.getOptionValues(exports.tsFlowOptions, untypedOptionValues));
     }
 }
 exports.FlowTargetLanguage = FlowTargetLanguage;
@@ -262,9 +260,9 @@ class FlowRenderer extends TypeScriptFlowBaseRenderer {
         const lines = [];
         this.forEachEnumCase(e, "none", (_, jsonName) => {
             const maybeOr = lines.length === 0 ? "  " : "| ";
-            lines.push([maybeOr, '"', (0, Strings_1.utf16StringEscape)(jsonName), '"']);
+            lines.push([maybeOr, '"', Strings_1.utf16StringEscape(jsonName), '"']);
         });
-        (0, Support_1.defined)(lines[lines.length - 1]).push(";");
+        Support_1.defined(lines[lines.length - 1]).push(";");
         this.emitLine("export type ", enumName, " =");
         this.indent(() => {
             for (const line of lines) {

package/dist/quicktype-core/language/ruby/index.d.ts

@@ -17,8 +17,8 @@ export declare const rubyOptions: {
 export declare class RubyTargetLanguage extends TargetLanguage {
     constructor();
     protected getOptions(): Option<any>[];
-    get supportsOptionalClassProperties(): boolean;
-    protected get defaultIndentation(): string;
+    readonly supportsOptionalClassProperties: boolean;
+    protected readonly defaultIndentation: string;
     protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
     }): RubyRenderer;
@@ -26,8 +26,8 @@ export declare class RubyTargetLanguage extends TargetLanguage {
 export declare class RubyRenderer extends ConvenienceRenderer {
     private readonly _options;
     constructor(targetLanguage: TargetLanguage, renderContext: RenderContext, _options: OptionValues<typeof rubyOptions>);
-    protected get commentLineStart(): string;
-    protected get needsTypeDeclarationBeforeUse(): boolean;
+    protected readonly commentLineStart: string;
+    protected readonly needsTypeDeclarationBeforeUse: boolean;
     protected canBeForwardDeclared(t: Type): boolean;
     protected forbiddenNamesForGlobalNamespace(): string[];
     protected forbiddenForObjectProperties(_c: ClassType, _classNamed: Name): ForbiddenWordsInfo;

package/dist/quicktype-core/language/ruby/index.js

@@ -1,44 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RubyRenderer = exports.RubyTargetLanguage = exports.rubyOptions = exports.Strictness = void 0;
 const unicode = require("unicode-properties");
 const Source_1 = require("../../Source");
 const Naming_1 = require("../../Naming");
 const ConvenienceRenderer_1 = require("../../ConvenienceRenderer");
 const TargetLanguage_1 = require("../../TargetLanguage");
 const RendererOptions_1 = require("../../RendererOptions");
-const keywords = __importStar(require("./keywords"));
+const keywords = require("./keywords");
 const forbiddenForObjectProperties = Array.from(new Set([...keywords.keywords, ...keywords.reservedProperties]));
 const Type_1 = require("../../Type");
 const TypeUtils_1 = require("../../TypeUtils");
 const Strings_1 = require("../../support/Strings");
 function unicodeEscape(codePoint) {
-    return "\\u{" + (0, Strings_1.intToHex)(codePoint, 0) + "}";
+    return "\\u{" + Strings_1.intToHex(codePoint, 0) + "}";
 }
-const stringEscape = (0, Strings_1.utf32ConcatMap)((0, Strings_1.escapeNonPrintableMapper)(Strings_1.isPrintable, unicodeEscape));
+const stringEscape = Strings_1.utf32ConcatMap(Strings_1.escapeNonPrintableMapper(Strings_1.isPrintable, unicodeEscape));
 var Strictness;
 (function (Strictness) {
     Strictness["Strict"] = "Strict::";
@@ -68,7 +44,7 @@ class RubyTargetLanguage extends TargetLanguage_1.TargetLanguage {
         return "  ";
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        return new RubyRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.rubyOptions, untypedOptionValues));
+        return new RubyRenderer(this, renderContext, RendererOptions_1.getOptionValues(exports.rubyOptions, untypedOptionValues));
     }
 }
 exports.RubyTargetLanguage = RubyTargetLanguage;
@@ -77,20 +53,19 @@ function isPartCharacter(utf16Unit) {
     const category = unicode.getCategory(utf16Unit);
     return ["Nd", "Pc", "Mn", "Mc"].indexOf(category) >= 0 || isStartCharacter(utf16Unit);
 }
-const legalizeName = (0, Strings_1.legalizeCharacters)(isPartCharacter);
+const legalizeName = Strings_1.legalizeCharacters(isPartCharacter);
 function simpleNameStyle(original, uppercase) {
     if (/^[0-9]+$/.test(original)) {
         original = original + "N";
     }
-    const words = (0, Strings_1.splitIntoWords)(original);
-    return (0, Strings_1.combineWords)(words, legalizeName, uppercase ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, uppercase ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter);
+    const words = Strings_1.splitIntoWords(original);
+    return Strings_1.combineWords(words, legalizeName, uppercase ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, uppercase ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter);
 }
 function memberNameStyle(original) {
-    const words = (0, Strings_1.splitIntoWords)(original);
-    return (0, Strings_1.combineWords)(words, legalizeName, Strings_1.allLowerWordStyle, Strings_1.allLowerWordStyle, Strings_1.allLowerWordStyle, Strings_1.allLowerWordStyle, "_", isStartCharacter);
+    const words = Strings_1.splitIntoWords(original);
+    return Strings_1.combineWords(words, legalizeName, Strings_1.allLowerWordStyle, Strings_1.allLowerWordStyle, Strings_1.allLowerWordStyle, Strings_1.allLowerWordStyle, "_", isStartCharacter);
 }
 class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _options;
     constructor(targetLanguage, renderContext, _options) {
         super(targetLanguage, renderContext);
         this._options = _options;
@@ -124,8 +99,8 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     dryType(t, isOptional = false) {
         const optional = isOptional ? ".optional" : "";
-        return (0, TypeUtils_1.matchType)(t, _anyType => ["Types::Any", optional], _nullType => ["Types::Nil", optional], _boolType => ["Types::Bool", optional], _integerType => ["Types::Integer", optional], _doubleType => ["Types::Double", optional], _stringType => ["Types::String", optional], arrayType => ["Types.Array(", this.dryType(arrayType.items), ")", optional], classType => [this.nameForNamedType(classType), optional], mapType => ["Types::Hash.meta(of: ", this.dryType(mapType.values), ")", optional], enumType => ["Types::", this.nameForNamedType(enumType), optional], unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => ["Types::Any", optional], _nullType => ["Types::Nil", optional], _boolType => ["Types::Bool", optional], _integerType => ["Types::Integer", optional], _doubleType => ["Types::Double", optional], _stringType => ["Types::String", optional], arrayType => ["Types.Array(", this.dryType(arrayType.items), ")", optional], classType => [this.nameForNamedType(classType), optional], mapType => ["Types::Hash.meta(of: ", this.dryType(mapType.values), ")", optional], enumType => ["Types::", this.nameForNamedType(enumType), optional], unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 return [this.dryType(nullable), ".optional"];
             }
@@ -137,7 +112,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             return exp;
         }
         const safeNav = optional ? "&" : "";
-        return (0, TypeUtils_1.matchType)(t, _anyType => exp, _nullType => [exp, ".nil?"], _boolType => exp, _integerType => [exp, ".even?"], _doubleType => exp, _stringType => exp, arrayType => this.exampleUse(arrayType.items, [exp, safeNav, ".first"], depth), classType => {
+        return TypeUtils_1.matchType(t, _anyType => exp, _nullType => [exp, ".nil?"], _boolType => exp, _integerType => [exp, ".even?"], _doubleType => exp, _stringType => exp, arrayType => this.exampleUse(arrayType.items, [exp, safeNav, ".first"], depth), classType => {
             let info;
             this.forEachClassProperty(classType, "none", (name, _json, prop) => {
                 if (["class", "map", "array"].indexOf(prop.type.kind) >= 0) {
@@ -164,7 +139,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
             return exp;
         }, unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 if (["class", "map", "array"].indexOf(nullable.kind) >= 0) {
                     return this.exampleUse(nullable, exp, depth, true);
@@ -195,7 +170,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         const primitiveCast = [this.dryType(t, optional), "[", e, "]"];
         const primitive = castPrimitives ? primitiveCast : e;
         const safeAccess = optional ? "&" : "";
-        return (0, TypeUtils_1.matchType)(t, _anyType => primitive, _nullType => primitive, _boolType => primitive, _integerType => primitive, _doubleType => primitive, _stringType => primitive, arrayType => [e, safeAccess, ".map { |x| ", this.fromDynamic(arrayType.items, "x", false, true), " }"], classType => {
+        return TypeUtils_1.matchType(t, _anyType => primitive, _nullType => primitive, _boolType => primitive, _integerType => primitive, _doubleType => primitive, _stringType => primitive, arrayType => [e, safeAccess, ".map { |x| ", this.fromDynamic(arrayType.items, "x", false, true), " }"], classType => {
             const expression = [this.nameForNamedType(classType), ".from_dynamic!(", e, ")"];
             return optional ? [e, " ? ", expression, " : nil"] : expression;
         }, mapType => [
@@ -210,7 +185,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             const expression = ["Types::", this.nameForNamedType(enumType), "[", e, "]"];
             return optional ? [e, ".nil? ? nil : ", expression] : expression;
         }, unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 return this.fromDynamic(nullable, e, true);
             }
@@ -222,8 +197,8 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this.marshalsImplicitlyToDynamic(t)) {
             return e;
         }
-        return (0, TypeUtils_1.matchType)(t, _anyType => e, _nullType => e, _boolType => e, _integerType => e, _doubleType => e, _stringType => e, arrayType => [e, optional ? "&" : "", ".map { |x| ", this.toDynamic(arrayType.items, "x"), " }"], _classType => [e, optional ? "&" : "", ".to_dynamic"], mapType => [e, optional ? "&" : "", ".map { |k, v| [k, ", this.toDynamic(mapType.values, "v"), "] }.to_h"], _enumType => e, unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => e, _nullType => e, _boolType => e, _integerType => e, _doubleType => e, _stringType => e, arrayType => [e, optional ? "&" : "", ".map { |x| ", this.toDynamic(arrayType.items, "x"), " }"], _classType => [e, optional ? "&" : "", ".to_dynamic"], mapType => [e, optional ? "&" : "", ".map { |k, v| [k, ", this.toDynamic(mapType.values, "v"), "] }.to_h"], _enumType => e, unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 return this.toDynamic(nullable, e, true);
             }
@@ -234,8 +209,8 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     marshalsImplicitlyToDynamic(t) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => true, _nullType => true, _boolType => true, _integerType => true, _doubleType => true, _stringType => true, arrayType => this.marshalsImplicitlyToDynamic(arrayType.items), _classType => false, mapType => this.marshalsImplicitlyToDynamic(mapType.values), _enumType => true, unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => true, _nullType => true, _boolType => true, _integerType => true, _doubleType => true, _stringType => true, arrayType => this.marshalsImplicitlyToDynamic(arrayType.items), _classType => false, mapType => this.marshalsImplicitlyToDynamic(mapType.values), _enumType => true, unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 return this.marshalsImplicitlyToDynamic(nullable);
             }
@@ -246,10 +221,10 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     // marshal implicitly. They are allowed to do this because they will
     // be checked in Dry::Struct.new
     propertyTypeMarshalsImplicitlyFromDynamic(t) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => true, _nullType => true, _boolType => true, _integerType => true, _doubleType => true, _stringType => true, arrayType => this.propertyTypeMarshalsImplicitlyFromDynamic(arrayType.items), _classType => false, 
+        return TypeUtils_1.matchType(t, _anyType => true, _nullType => true, _boolType => true, _integerType => true, _doubleType => true, _stringType => true, arrayType => this.propertyTypeMarshalsImplicitlyFromDynamic(arrayType.items), _classType => false, 
         // Map properties must be checked because Dry:Types doesn't have a generic Map
         _mapType => false, _enumType => true, unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 return this.propertyTypeMarshalsImplicitlyFromDynamic(nullable);
             }
@@ -389,7 +364,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 return;
             }
             this.ensureBlankLine();
-            const [maybeNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u, false);
+            const [maybeNull, nonNulls] = TypeUtils_1.removeNullFromUnion(u, false);
             this.emitBlock("def self.from_dynamic!(d)", () => {
                 const memberNames = Array.from(u.getChildren()).map(member => this.nameForUnionMember(u, member));
                 this.forEachUnionMember(u, u.getChildren(), "none", null, (name, t) => {
@@ -501,7 +476,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine("# To parse this JSON, add 'dry-struct' and 'dry-types' gems, then do:");
             this.emitLine("#");
             this.forEachTopLevel("none", (topLevel, name) => {
-                const variable = (0, Source_1.modifySource)(Strings_1.snakeCase, name);
+                const variable = Source_1.modifySource(Strings_1.snakeCase, name);
                 this.emitLine("#   ", variable, " = ", name, ".from_json! ", this.jsonSample(topLevel));
                 this.emitLine("#   puts ", this.exampleUse(topLevel, variable));
                 this.emitLine("#");
@@ -526,7 +501,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.forEachNamedType("leading-and-interposing", (c, n) => this.emitClass(c, n), (e, n) => this.emitEnum(e, n), (u, n) => this.emitUnion(u, n));
             if (!this._options.justTypes) {
                 this.forEachTopLevel("leading-and-interposing", (topLevel, name) => {
-                    const self = (0, Source_1.modifySource)(Strings_1.snakeCase, name);
+                    const self = Source_1.modifySource(Strings_1.snakeCase, name);
                     // The json gem defines to_json on maps and primitives, so we only need to supply
                     // it for arrays.
                     const needsToJsonDefined = "array" === topLevel.kind;

package/dist/quicktype-core/language/ruby/keywords.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reservedProperties = exports.globals = exports.keywords = void 0;
 exports.keywords = [
     "__ENCODING__",
     "__FILE__",

package/dist/quicktype-core/rewrites/CombineClasses.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.combineClasses = void 0;
 const Type_1 = require("../Type");
 const TypeUtils_1 = require("../TypeUtils");
 const Support_1 = require("../support/Support");
@@ -10,7 +9,7 @@ const REQUIRED_OVERLAP = 3 / 4;
 // enums with strings, integers with doubles, maps with objects of
 // the correct type.
 function typeSetsCanBeCombined(s1, s2) {
-    return (0, Type_1.setOperationCasesEqual)(s1, s2, true, (a, b) => a.structurallyCompatible(b, true));
+    return Type_1.setOperationCasesEqual(s1, s2, true, (a, b) => a.structurallyCompatible(b, true));
 }
 function canBeCombined(c1, c2, onlyWithSameProperties) {
     const p1 = c1.getProperties();
@@ -43,7 +42,7 @@ function canBeCombined(c1, c2, onlyWithSameProperties) {
         const minOverlap = Math.ceil(larger.size * REQUIRED_OVERLAP);
         maxFaults = smaller.size - minOverlap;
     }
-    (0, Support_1.assert)(maxFaults >= 0, "Max faults negative");
+    Support_1.assert(maxFaults >= 0, "Max faults negative");
     const commonProperties = [];
     let faults = 0;
     for (const [name] of smaller) {
@@ -62,10 +61,10 @@ function canBeCombined(c1, c2, onlyWithSameProperties) {
         let ts = smaller.get(name);
         let tl = larger.get(name);
         if (ts === undefined || tl === undefined) {
-            return (0, Support_1.panic)(`Both classes should have property ${name}`);
+            return Support_1.panic(`Both classes should have property ${name}`);
         }
-        const tsCases = (0, TypeUtils_1.nonNullTypeCases)(ts.type);
-        const tlCases = (0, TypeUtils_1.nonNullTypeCases)(tl.type);
+        const tsCases = TypeUtils_1.nonNullTypeCases(ts.type);
+        const tlCases = TypeUtils_1.nonNullTypeCases(tl.type);
         if (tsCases.size > 0 && tlCases.size > 0 && !typeSetsCanBeCombined(tsCases, tlCases)) {
             return false;
         }
@@ -116,9 +115,9 @@ function findSimilarityCliques(graph, onlyWithSameProperties, includeFixedClasse
 function combineClasses(ctx, graph, alphabetizeProperties, conflateNumbers, onlyWithSameProperties, debugPrintReconstitution) {
     const cliques = ctx.time("  find similarity cliques", () => findSimilarityCliques(graph, onlyWithSameProperties, false));
     function makeCliqueClass(clique, builder, forwardingRef) {
-        (0, Support_1.assert)(clique.size > 0, "Clique can't be empty");
-        const attributes = (0, TypeUtils_1.combineTypeAttributesOfTypes)("union", clique);
-        return (0, UnifyClasses_1.unifyTypes)(clique, attributes, builder, (0, UnifyClasses_1.unionBuilderForUnification)(builder, false, false, conflateNumbers), conflateNumbers, forwardingRef);
+        Support_1.assert(clique.size > 0, "Clique can't be empty");
+        const attributes = TypeUtils_1.combineTypeAttributesOfTypes("union", clique);
+        return UnifyClasses_1.unifyTypes(clique, attributes, builder, UnifyClasses_1.unionBuilderForUnification(builder, false, false, conflateNumbers), conflateNumbers, forwardingRef);
     }
     return graph.rewrite("combine classes", ctx.stringTypeMapping, alphabetizeProperties, cliques, debugPrintReconstitution, makeCliqueClass);
 }

package/dist/quicktype-core/rewrites/ExpandStrings.d.ts

@@ -1,4 +1,4 @@
 import { TypeGraph } from "../TypeGraph";
 import { RunContext } from "../Run";
-export type EnumInference = "none" | "all" | "infer";
+export declare type EnumInference = "none" | "all" | "infer";
 export declare function expandStrings(ctx: RunContext, graph: TypeGraph, inference: EnumInference): TypeGraph;

package/dist/quicktype-core/rewrites/ExpandStrings.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expandStrings = void 0;
 const collection_utils_1 = require("collection-utils");
 const TypeUtils_1 = require("../TypeUtils");
 const Support_1 = require("../support/Support");
@@ -14,7 +13,7 @@ function isOwnEnum({ numValues, cases }) {
 }
 function enumCasesOverlap(newCases, existingCases, newAreSubordinate) {
     const smaller = newAreSubordinate ? newCases.size : Math.min(newCases.size, existingCases.size);
-    const overlap = (0, collection_utils_1.setIntersect)(newCases, existingCases).size;
+    const overlap = collection_utils_1.setIntersect(newCases, existingCases).size;
     return overlap >= smaller * REQUIRED_OVERLAP;
 }
 function isAlwaysEmptyString(cases) {
@@ -22,21 +21,21 @@ function isAlwaysEmptyString(cases) {
 }
 function expandStrings(ctx, graph, inference) {
     const stringTypeMapping = ctx.stringTypeMapping;
-    const allStrings = Array.from(graph.allTypesUnordered()).filter(t => t.kind === "string" && (0, TypeUtils_1.stringTypesForType)(t).isRestricted);
+    const allStrings = Array.from(graph.allTypesUnordered()).filter(t => t.kind === "string" && TypeUtils_1.stringTypesForType(t).isRestricted);
     function makeEnumInfo(t) {
-        const stringTypes = (0, TypeUtils_1.stringTypesForType)(t);
+        const stringTypes = TypeUtils_1.stringTypesForType(t);
         const mappedStringTypes = stringTypes.applyStringTypeMapping(stringTypeMapping);
         if (!mappedStringTypes.isRestricted)
             return undefined;
-        const cases = (0, Support_1.defined)(mappedStringTypes.cases);
+        const cases = Support_1.defined(mappedStringTypes.cases);
         if (cases.size === 0)
             return undefined;
-        const numValues = (0, collection_utils_1.iterableReduce)(cases.values(), 0, (a, b) => a + b);
+        const numValues = collection_utils_1.iterableReduce(cases.values(), 0, (a, b) => a + b);
         if (inference !== "all") {
             const keys = Array.from(cases.keys());
             if (isAlwaysEmptyString(keys))
                 return undefined;
-            const someCaseIsNotNumber = (0, collection_utils_1.iterableSome)(keys, key => /^(\-|\+)?[0-9]+(\.[0-9]+)?$/.test(key) === false);
+            const someCaseIsNotNumber = collection_utils_1.iterableSome(keys, key => /^(\-|\+)?[0-9]+(\.[0-9]+)?$/.test(key) === false);
             if (!someCaseIsNotNumber)
                 return undefined;
         }
@@ -57,7 +56,7 @@ function expandStrings(ctx, graph, inference) {
         // First, make case sets for all the enums that stand on their own.  If
         // we find some overlap (searching eagerly), make unions.
         for (const t of Array.from(enumInfos.keys())) {
-            const enumInfo = (0, Support_1.defined)(enumInfos.get(t));
+            const enumInfo = Support_1.defined(enumInfos.get(t));
             const cases = enumInfo.cases;
             if (inference === "all") {
                 enumSets.push(cases);
@@ -72,7 +71,7 @@ function expandStrings(ctx, graph, inference) {
                     //         Array.from(enumSets[index])
                     //     )}`
                     // );
-                    enumSets[index] = (0, collection_utils_1.setUnion)(enumSets[index], cases);
+                    enumSets[index] = collection_utils_1.setUnion(enumSets[index], cases);
                 }
                 else {
                     // console.log(`adding new ${JSON.stringify(Array.from(cases))}`);
@@ -83,7 +82,7 @@ function expandStrings(ctx, graph, inference) {
             enumInfos.delete(t);
         }
         if (inference === "all") {
-            (0, Support_1.assert)(enumInfos.size === 0);
+            Support_1.assert(enumInfos.size === 0);
         }
         // Now see if we can unify the rest with some a set we found in the
         // previous step.
@@ -97,22 +96,22 @@ function expandStrings(ctx, graph, inference) {
                 //         Array.from(enumSets[index])
                 //     )}`
                 // );
-                enumSets[index] = (0, collection_utils_1.setUnion)(enumSets[index], enumInfo.cases);
+                enumSets[index] = collection_utils_1.setUnion(enumSets[index], enumInfo.cases);
             }
         }
     }
     function replaceString(group, builder, forwardingRef) {
-        (0, Support_1.assert)(group.size === 1);
-        const t = (0, Support_1.defined)((0, collection_utils_1.iterableFirst)(group));
-        const stringTypes = (0, TypeUtils_1.stringTypesForType)(t);
-        const attributes = (0, collection_utils_1.mapFilter)(t.getAttributes(), a => a !== stringTypes);
+        Support_1.assert(group.size === 1);
+        const t = Support_1.defined(collection_utils_1.iterableFirst(group));
+        const stringTypes = TypeUtils_1.stringTypesForType(t);
+        const attributes = collection_utils_1.mapFilter(t.getAttributes(), a => a !== stringTypes);
         const mappedStringTypes = stringTypes.applyStringTypeMapping(stringTypeMapping);
         if (!mappedStringTypes.isRestricted) {
             return builder.getStringType(attributes, StringTypes_1.StringTypes.unrestricted, forwardingRef);
         }
         const setMatches = inference === "all" ? collection_utils_1.areEqual : collection_utils_1.setIsSuperset;
         const types = [];
-        const cases = (0, Support_1.defined)(mappedStringTypes.cases);
+        const cases = Support_1.defined(mappedStringTypes.cases);
         if (cases.size > 0) {
             const keys = new Set(cases.keys());
             const fullCases = enumSets.find(s => setMatches(s, keys));
@@ -131,11 +130,11 @@ function expandStrings(ctx, graph, inference) {
         // both are rewritten via `getPrimitiveType` below without any attributes, they end up
         // being the same string type.
         if (types.length === 0 && transformations.size === 1) {
-            const kind = (0, Support_1.defined)((0, collection_utils_1.iterableFirst)(transformations));
+            const kind = Support_1.defined(collection_utils_1.iterableFirst(transformations));
             return builder.getPrimitiveType(kind, attributes, forwardingRef);
         }
         types.push(...Array.from(transformations).map(k => builder.getPrimitiveType(k)));
-        (0, Support_1.assert)(types.length > 0, "We got an empty string type");
+        Support_1.assert(types.length > 0, "We got an empty string type");
         return builder.getUnionType(attributes, new Set(types), forwardingRef);
     }
     return graph.rewrite("expand strings", stringTypeMapping, false, allStrings.map(t => [t]), ctx.debugPrintReconstitution, replaceString);