quicktype 17.0.4 → 17.0.5

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSONPythonRenderer = exports.PythonRenderer = exports.PythonTargetLanguage = exports.pythonOptions = void 0;
 const TargetLanguage_1 = require("../TargetLanguage");
 const Type_1 = require("../Type");
 const RendererOptions_1 = require("../RendererOptions");
@@ -103,12 +102,12 @@ class PythonTargetLanguage extends TargetLanguage_1.TargetLanguage {
     }
     needsTransformerForType(t) {
         if (t instanceof Type_1.UnionType) {
-            return (0, collection_utils_1.iterableSome)(t.members, m => this.needsTransformerForType(m));
+            return collection_utils_1.iterableSome(t.members, m => this.needsTransformerForType(m));
         }
         return t.kind === "integer-string" || t.kind === "bool-string";
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        const options = (0, RendererOptions_1.getOptionValues)(exports.pythonOptions, untypedOptionValues);
+        const options = RendererOptions_1.getOptionValues(exports.pythonOptions, untypedOptionValues);
         if (options.justTypes) {
             return new PythonRenderer(this, renderContext, options);
         }
@@ -150,10 +149,10 @@ function isPartCharacter3(utf16Unit) {
     }
     return true;
 }
-const legalizeName3 = (0, Strings_1.utf16LegalizeCharacters)(isPartCharacter3);
+const legalizeName3 = Strings_1.utf16LegalizeCharacters(isPartCharacter3);
 function classNameStyle(original) {
-    const words = (0, Strings_1.splitIntoWords)(original);
-    return (0, Strings_1.combineWords)(words, legalizeName3, Strings_1.firstUpperWordStyle, Strings_1.firstUpperWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter3);
+    const words = Strings_1.splitIntoWords(original);
+    return Strings_1.combineWords(words, legalizeName3, Strings_1.firstUpperWordStyle, Strings_1.firstUpperWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter3);
 }
 function getWordStyle(uppercase, forceSnakeNameStyle) {
     if (!forceSnakeNameStyle) {
@@ -164,16 +163,15 @@ function getWordStyle(uppercase, forceSnakeNameStyle) {
 function snakeNameStyle(original, uppercase, forceSnakeNameStyle) {
     const wordStyle = getWordStyle(uppercase, forceSnakeNameStyle);
     const separator = forceSnakeNameStyle ? "_" : "";
-    const words = (0, Strings_1.splitIntoWords)(original);
-    return (0, Strings_1.combineWords)(words, legalizeName3, wordStyle, wordStyle, wordStyle, wordStyle, separator, isStartCharacter3);
+    const words = Strings_1.splitIntoWords(original);
+    return Strings_1.combineWords(words, legalizeName3, wordStyle, wordStyle, wordStyle, wordStyle, separator, isStartCharacter3);
 }
 class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    pyOptions;
-    imports = new Map();
-    declaredTypes = new Set();
     constructor(targetLanguage, renderContext, pyOptions) {
         super(targetLanguage, renderContext);
         this.pyOptions = pyOptions;
+        this.imports = new Map();
+        this.declaredTypes = new Set();
     }
     forbiddenNamesForGlobalNamespace() {
         return forbiddenTypeNames;
@@ -182,16 +180,16 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return { names: forbiddenPropertyNames, includeGlobalForbidden: false };
     }
     makeNamedTypeNamer() {
-        return (0, Naming_1.funPrefixNamer)("type", classNameStyle);
+        return Naming_1.funPrefixNamer("type", classNameStyle);
     }
     namerForObjectProperty() {
-        return (0, Naming_1.funPrefixNamer)("property", s => snakeNameStyle(s, false, this.pyOptions.nicePropertyNames));
+        return Naming_1.funPrefixNamer("property", s => snakeNameStyle(s, false, this.pyOptions.nicePropertyNames));
     }
     makeUnionMemberNamer() {
         return null;
     }
     makeEnumCaseNamer() {
-        return (0, Naming_1.funPrefixNamer)("enum-case", s => snakeNameStyle(s, true, this.pyOptions.nicePropertyNames));
+        return Naming_1.funPrefixNamer("enum-case", s => snakeNameStyle(s, true, this.pyOptions.nicePropertyNames));
     }
     get commentLineStart() {
         return "# ";
@@ -217,7 +215,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     string(s) {
         const openQuote = '"';
-        return [openQuote, (0, Strings_1.stringEscape)(s), '"'];
+        return [openQuote, Strings_1.stringEscape(s), '"'];
     }
     withImport(module, name) {
         if (this.pyOptions.features.typeHints || module !== "typing") {
@@ -225,7 +223,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             // place, but right now we just make the type source and then throw it away.  It's
             // not a performance issue, so it's fine, I just bemoan this special case, and
             // potential others down the road.
-            (0, collection_utils_1.mapUpdateInto)(this.imports, module, s => (s ? (0, collection_utils_1.setUnionInto)(s, [name]) : new Set([name])));
+            collection_utils_1.mapUpdateInto(this.imports, module, s => (s ? collection_utils_1.setUnionInto(s, [name]) : new Set([name])));
         }
         return name;
     }
@@ -239,9 +237,9 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return ["'", name, "'"];
     }
     pythonType(t) {
-        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 actualType = Transformers_1.followTargetType(t);
+        return 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] = TypeUtils_1.removeNullFromUnion(unionType);
             const memberTypes = Array.from(nonNulls).map(m => this.pythonType(m));
             if (hasNull !== null) {
                 let rest = [];
@@ -252,17 +250,17 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     return [
                         this.withTyping("Optional"),
                         "[Union[",
-                        (0, collection_utils_1.arrayIntercalate)(", ", memberTypes),
+                        collection_utils_1.arrayIntercalate(", ", memberTypes),
                         "]]",
                         ...rest
                     ];
                 }
                 else {
-                    return [this.withTyping("Optional"), "[", (0, Support_1.defined)((0, collection_utils_1.iterableFirst)(memberTypes)), "]", ...rest];
+                    return [this.withTyping("Optional"), "[", Support_1.defined(collection_utils_1.iterableFirst(memberTypes)), "]", ...rest];
                 }
             }
             else {
-                return [this.withTyping("Union"), "[", (0, collection_utils_1.arrayIntercalate)(", ", memberTypes), "]"];
+                return [this.withTyping("Union"), "[", collection_utils_1.arrayIntercalate(", ", memberTypes), "]"];
             }
         }, transformedStringType => {
             if (transformedStringType.kind === "date-time") {
@@ -271,7 +269,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             if (transformedStringType.kind === "uuid") {
                 return this.withImport("uuid", "UUID");
             }
-            return (0, Support_1.panic)(`Transformed type ${transformedStringType.kind} not supported`);
+            return Support_1.panic(`Transformed type ${transformedStringType.kind} not supported`);
         });
     }
     declarationLine(t) {
@@ -281,7 +279,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (t instanceof Type_1.EnumType) {
             return ["class ", this.nameForNamedType(t), "(", this.withImport("enum", "Enum"), "):"];
         }
-        return (0, Support_1.panic)(`Can't declare type ${t.kind}`);
+        return Support_1.panic(`Can't declare type ${t.kind}`);
     }
     declareType(t, emitter) {
         this.emitBlock(this.declarationLine(t), () => {
@@ -297,7 +295,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.forEachClassProperty(t, "none", (name, _, cp) => {
             args.push([name, this.typeHint(": ", this.pythonType(cp.type))]);
         });
-        this.emitBlock(["def __init__(self, ", (0, collection_utils_1.arrayIntercalate)(", ", args), ")", this.typeHint(" -> None"), ":"], () => {
+        this.emitBlock(["def __init__(self, ", collection_utils_1.arrayIntercalate(", ", args), ")", this.typeHint(" -> None"), ":"], () => {
             if (args.length === 0) {
                 this.emitLine("pass");
             }
@@ -322,8 +320,8 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     sortClassProperties(properties, propertyNames) {
         if (this.pyOptions.features.dataClasses) {
-            return (0, collection_utils_1.mapSortBy)(properties, (p) => {
-                return p.type instanceof Type_1.UnionType && (0, TypeUtils_1.nullableFromUnion)(p.type) != null ? 1 : 0;
+            return collection_utils_1.mapSortBy(properties, (p) => {
+                return p.type instanceof Type_1.UnionType && TypeUtils_1.nullableFromUnion(p.type) != null ? 1 : 0;
             });
         }
         else {
@@ -398,13 +396,13 @@ function compose(input, f) {
         }
         if (input.lambda !== undefined) {
             // `input` is a lambda, so build `lambda x: f(input(x))`.
-            return { lambda: (0, Source_1.multiWord)(" ", "lambda x:", f([(0, Source_1.parenIfNeeded)(input.lambda), "(x)"])), value: undefined };
+            return { lambda: Source_1.multiWord(" ", "lambda x:", f([Source_1.parenIfNeeded(input.lambda), "(x)"])), value: undefined };
         }
         // `input` is the identify function, so the composition is `lambda x: f(x)`.
-        return { lambda: (0, Source_1.multiWord)(" ", "lambda x:", f("x")), value: undefined };
+        return { lambda: Source_1.multiWord(" ", "lambda x:", f("x")), value: undefined };
     }
     if (f.value !== undefined) {
-        return (0, Support_1.panic)("Cannot compose into a value");
+        return Support_1.panic("Cannot compose into a value");
     }
     if (f.lambda === undefined) {
         // `f` is the identity function, so the result is just `input`.
@@ -418,7 +416,7 @@ function compose(input, f) {
         }
         // `input` is a lambda, so the result is `lambda x: f(input(x))`.
         return {
-            lambda: (0, Source_1.multiWord)("", "lambda x: ", (0, Source_1.parenIfNeeded)(f.lambda), "(", (0, Source_1.parenIfNeeded)(input.lambda), "(x))"),
+            lambda: Source_1.multiWord("", "lambda x: ", Source_1.parenIfNeeded(f.lambda), "(", Source_1.parenIfNeeded(input.lambda), "(x))"),
             value: undefined
         };
     }
@@ -433,31 +431,34 @@ function makeLambda(vol) {
         if (vol.value === undefined) {
             return vol.lambda;
         }
-        return (0, Source_1.multiWord)("", "lambda x: ", (0, Source_1.parenIfNeeded)(vol.lambda), "(", vol.value, ")");
+        return Source_1.multiWord("", "lambda x: ", Source_1.parenIfNeeded(vol.lambda), "(", vol.value, ")");
     }
     else if (vol.value !== undefined) {
-        return (0, Source_1.multiWord)(" ", "lambda x:", vol.value);
+        return Source_1.multiWord(" ", "lambda x:", vol.value);
     }
-    return (0, Source_1.multiWord)(" ", "lambda x:", "x");
+    return Source_1.multiWord(" ", "lambda x:", "x");
 }
 // If `vol` is a value, return the value in its source form.
 // Calling this with `vol` being a lambda is not allowed.
 function makeValue(vol) {
     if (vol.value === undefined) {
-        return (0, Support_1.panic)("Cannot make value from lambda without value");
+        return Support_1.panic("Cannot make value from lambda without value");
     }
     if (vol.lambda !== undefined) {
-        return [(0, Source_1.parenIfNeeded)(vol.lambda), "(", vol.value, ")"];
+        return [Source_1.parenIfNeeded(vol.lambda), "(", vol.value, ")"];
     }
     return vol.value;
 }
 class JSONPythonRenderer extends PythonRenderer {
-    _deserializerFunctions = new Set();
-    _converterNamer = (0, Naming_1.funPrefixNamer)("converter", s => snakeNameStyle(s, false, this.pyOptions.nicePropertyNames));
-    _topLevelConverterNames = new Map();
-    _haveTypeVar = false;
-    _haveEnumTypeVar = false;
-    _haveDateutil = false;
+    constructor() {
+        super(...arguments);
+        this._deserializerFunctions = new Set();
+        this._converterNamer = Naming_1.funPrefixNamer("converter", s => snakeNameStyle(s, false, this.pyOptions.nicePropertyNames));
+        this._topLevelConverterNames = new Map();
+        this._haveTypeVar = false;
+        this._haveEnumTypeVar = false;
+        this._haveDateutil = false;
+    }
     emitTypeVar(tvar, constraints) {
         if (!this.pyOptions.features.typeHints) {
             return;
@@ -663,7 +664,7 @@ class JSONPythonRenderer extends PythonRenderer {
             case "is-type":
                 return this.emitIsTypeConverter();
             default:
-                return (0, Support_1.assertNever)(cf);
+                return Support_1.assertNever(cf);
         }
     }
     // Return the name of the Python converter function `cf`.
@@ -676,10 +677,10 @@ class JSONPythonRenderer extends PythonRenderer {
     }
     // Applies the converter function to `arg`
     convFn(cf, arg) {
-        return compose(arg, { lambda: (0, Source_1.singleWord)(this.conv(cf)), value: undefined });
+        return compose(arg, { lambda: Source_1.singleWord(this.conv(cf)), value: undefined });
     }
     typeObject(t) {
-        const s = (0, TypeUtils_1.matchType)(t, _anyType => undefined, _nullType => "type(None)", _boolType => "bool", _integerType => "int", _doubleType => "float", _stringType => "str", _arrayType => "List", classType => this.nameForNamedType(classType), _mapType => "dict", enumType => this.nameForNamedType(enumType), _unionType => undefined, transformedStringType => {
+        const s = TypeUtils_1.matchType(t, _anyType => undefined, _nullType => "type(None)", _boolType => "bool", _integerType => "int", _doubleType => "float", _stringType => "str", _arrayType => "List", classType => this.nameForNamedType(classType), _mapType => "dict", enumType => this.nameForNamedType(enumType), _unionType => undefined, transformedStringType => {
             if (transformedStringType.kind === "date-time") {
                 return this.withImport("datetime", "datetime");
             }
@@ -689,7 +690,7 @@ class JSONPythonRenderer extends PythonRenderer {
             return undefined;
         });
         if (s === undefined) {
-            return (0, Support_1.panic)(`No type object for ${t.kind}`);
+            return Support_1.panic(`No type object for ${t.kind}`);
         }
         return s;
     }
@@ -708,7 +709,7 @@ class JSONPythonRenderer extends PythonRenderer {
             return compose(inputTransformer, v => [
                 this.conv("union"),
                 "([",
-                (0, collection_utils_1.arrayIntercalate)(", ", lambdas),
+                collection_utils_1.arrayIntercalate(", ", lambdas),
                 "], ",
                 v,
                 ")"
@@ -751,7 +752,7 @@ class JSONPythonRenderer extends PythonRenderer {
                     vol = compose(inputTransformer, v => [this.withImport("uuid", "UUID"), "(", v, ")"]);
                     break;
                 default:
-                    return (0, Support_1.panic)(`Parsing of ${immediateTargetType.kind} in a transformer is not supported`);
+                    return Support_1.panic(`Parsing of ${immediateTargetType.kind} in a transformer is not supported`);
             }
             return consume(consumer, vol);
         }
@@ -775,23 +776,23 @@ class JSONPythonRenderer extends PythonRenderer {
                     vol = compose(inputTransformer, v => ["str(", v, ")"]);
                     break;
                 default:
-                    return (0, Support_1.panic)(`Parsing of ${xfer.sourceType.kind} in a transformer is not supported`);
+                    return Support_1.panic(`Parsing of ${xfer.sourceType.kind} in a transformer is not supported`);
             }
             return consume(consumer, vol);
         }
         else {
-            return (0, Support_1.panic)(`Transformer ${xfer.kind} is not supported`);
+            return Support_1.panic(`Transformer ${xfer.kind} is not supported`);
         }
     }
     // Returns the code to deserialize `value` as type `t`.  If `t` has
     // an associated transformer, the code for that transformer is
     // returned.
     deserializer(value, t) {
-        const xf = (0, Transformers_1.transformationForType)(t);
+        const xf = Transformers_1.transformationForType(t);
         if (xf !== undefined) {
             return this.transformer(value, xf.transformer, xf.targetType);
         }
-        return (0, TypeUtils_1.matchType)(t, _anyType => value, _nullType => this.convFn("none", value), _boolType => this.convFn("bool", value), _integerType => this.convFn("int", value), _doubleType => this.convFn("from-float", value), _stringType => this.convFn("str", value), arrayType => compose(value, v => [
+        return TypeUtils_1.matchType(t, _anyType => value, _nullType => this.convFn("none", value), _boolType => this.convFn("bool", value), _integerType => this.convFn("int", value), _doubleType => this.convFn("from-float", value), _stringType => this.convFn("str", value), arrayType => compose(value, v => [
             this.conv("list"),
             "(",
             makeLambda(this.deserializer(identity, arrayType.items)).source,
@@ -799,7 +800,7 @@ class JSONPythonRenderer extends PythonRenderer {
             v,
             ")"
         ]), classType => compose(value, {
-            lambda: (0, Source_1.singleWord)(this.nameForNamedType(classType), ".from_dict"),
+            lambda: Source_1.singleWord(this.nameForNamedType(classType), ".from_dict"),
             value: undefined
         }), mapType => compose(value, v => [
             this.conv("dict"),
@@ -808,13 +809,13 @@ class JSONPythonRenderer extends PythonRenderer {
             ", ",
             v,
             ")"
-        ]), enumType => compose(value, { lambda: (0, Source_1.singleWord)(this.nameForNamedType(enumType)), value: undefined }), unionType => {
+        ]), enumType => compose(value, { lambda: Source_1.singleWord(this.nameForNamedType(enumType)), value: undefined }), unionType => {
             // FIXME: handle via transformers
             const deserializers = Array.from(unionType.members).map(m => makeLambda(this.deserializer(identity, m)).source);
             return compose(value, v => [
                 this.conv("union"),
                 "([",
-                (0, collection_utils_1.arrayIntercalate)(", ", deserializers),
+                collection_utils_1.arrayIntercalate(", ", deserializers),
                 "], ",
                 v,
                 ")"
@@ -827,16 +828,16 @@ class JSONPythonRenderer extends PythonRenderer {
             if (transformedStringType.kind === "uuid") {
                 return compose(value, v => [this.withImport("uuid", "UUID"), "(", v, ")"]);
             }
-            return (0, Support_1.panic)(`Transformed type ${transformedStringType.kind} not supported`);
+            return Support_1.panic(`Transformed type ${transformedStringType.kind} not supported`);
         });
     }
     serializer(value, t) {
-        const xf = (0, Transformers_1.transformationForType)(t);
+        const xf = Transformers_1.transformationForType(t);
         if (xf !== undefined) {
             const reverse = xf.reverse;
             return this.transformer(value, reverse.transformer, reverse.targetType);
         }
-        return (0, TypeUtils_1.matchType)(t, _anyType => value, _nullType => this.convFn("none", value), _boolType => this.convFn("bool", value), _integerType => this.convFn("int", value), _doubleType => this.convFn("to-float", value), _stringType => this.convFn("str", value), arrayType => compose(value, v => [
+        return TypeUtils_1.matchType(t, _anyType => value, _nullType => this.convFn("none", value), _boolType => this.convFn("bool", value), _integerType => this.convFn("int", value), _doubleType => this.convFn("to-float", value), _stringType => this.convFn("str", value), arrayType => compose(value, v => [
             this.conv("list"),
             "(",
             makeLambda(this.serializer(identity, arrayType.items)).source,
@@ -855,7 +856,7 @@ class JSONPythonRenderer extends PythonRenderer {
             return compose(value, v => [
                 this.conv("union"),
                 "([",
-                (0, collection_utils_1.arrayIntercalate)(", ", serializers),
+                collection_utils_1.arrayIntercalate(", ", serializers),
                 "], ",
                 v,
                 ")"
@@ -867,7 +868,7 @@ class JSONPythonRenderer extends PythonRenderer {
             if (transformedStringType.kind === "uuid") {
                 return compose(value, v => ["str(", v, ")"]);
             }
-            return (0, Support_1.panic)(`Transformed type ${transformedStringType.kind} not supported`);
+            return Support_1.panic(`Transformed type ${transformedStringType.kind} not supported`);
         });
     }
     emitClassMembers(t) {
@@ -883,7 +884,7 @@ class JSONPythonRenderer extends PythonRenderer {
                 this.emitLine(name, " = ", makeValue(this.deserializer(property, cp.type)));
                 args.push(name);
             });
-            this.emitLine("return ", className, "(", (0, collection_utils_1.arrayIntercalate)(", ", args), ")");
+            this.emitLine("return ", className, "(", collection_utils_1.arrayIntercalate(", ", args), ")");
         });
         this.ensureBlankLine();
         this.emitBlock(["def to_dict(self)", this.typeHint(" -> dict"), ":"], () => {
@@ -948,13 +949,13 @@ class JSONPythonRenderer extends PythonRenderer {
             ""
         ]);
         this.forEachTopLevel("none", (_, name) => {
-            const { fromDict } = (0, Support_1.defined)(this._topLevelConverterNames.get(name));
+            const { fromDict } = Support_1.defined(this._topLevelConverterNames.get(name));
             this.emitLine(this.commentLineStart, "    result = ", fromDict, "(json.loads(json_string))");
         });
     }
     emitClosingCode() {
         this.forEachTopLevel(["interposing", 2], (t, name) => {
-            const { fromDict, toDict } = (0, Support_1.defined)(this._topLevelConverterNames.get(name));
+            const { fromDict, toDict } = Support_1.defined(this._topLevelConverterNames.get(name));
             const pythonType = this.pythonType(t);
             this.emitBlock(["def ", fromDict, "(", this.typingDecl("s", "Any"), ")", this.typeHint(" -> ", pythonType), ":"], () => {
                 this.emitLine("return ", makeValue(this.deserializer({ value: "s" }, t)));

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

@@ -39,13 +39,13 @@ export declare class RustRenderer extends ConvenienceRenderer {
     protected forbiddenForObjectProperties(_c: ClassType, _className: Name): ForbiddenWordsInfo;
     protected forbiddenForUnionMembers(_u: UnionType, _unionName: Name): ForbiddenWordsInfo;
     protected forbiddenForEnumCases(_e: EnumType, _enumName: Name): ForbiddenWordsInfo;
-    protected get commentLineStart(): string;
+    protected readonly commentLineStart: string;
     private nullableRustType;
     protected isImplicitCycleBreaker(t: Type): boolean;
     private rustType;
     private breakCycle;
     private emitRenameAttribute;
-    private get visibility();
+    private readonly visibility;
     protected emitStructDefinition(c: ClassType, className: Name): void;
     protected emitBlock(line: Sourcelike, f: () => void): void;
     protected emitUnion(u: UnionType, unionName: Name): void;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RustRenderer = exports.RustTargetLanguage = exports.rustOptions = exports.Visibility = exports.Density = void 0;
 const collection_utils_1 = require("collection-utils");
 const TargetLanguage_1 = require("../TargetLanguage");
 const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
@@ -38,7 +37,7 @@ exports.rustOptions = {
 };
 class RustTargetLanguage extends TargetLanguage_1.TargetLanguage {
     makeRenderer(renderContext, untypedOptionValues) {
-        return new RustRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.rustOptions, untypedOptionValues));
+        return new RustRenderer(this, renderContext, RendererOptions_1.getOptionValues(exports.rustOptions, untypedOptionValues));
     }
     constructor() {
         super("Rust", ["rust", "rs", "rustlang"], "rs");
@@ -121,37 +120,36 @@ const keywords = [
     "union"
 ];
 const isAsciiLetterOrUnderscoreOrDigit = (codePoint) => {
-    if (!(0, Strings_1.isAscii)(codePoint)) {
+    if (!Strings_1.isAscii(codePoint)) {
         return false;
     }
-    return (0, Strings_1.isLetterOrUnderscoreOrDigit)(codePoint);
+    return Strings_1.isLetterOrUnderscoreOrDigit(codePoint);
 };
 const isAsciiLetterOrUnderscore = (codePoint) => {
-    if (!(0, Strings_1.isAscii)(codePoint)) {
+    if (!Strings_1.isAscii(codePoint)) {
         return false;
     }
-    return (0, Strings_1.isLetterOrUnderscore)(codePoint);
+    return Strings_1.isLetterOrUnderscore(codePoint);
 };
-const legalizeName = (0, Strings_1.legalizeCharacters)(isAsciiLetterOrUnderscoreOrDigit);
+const legalizeName = Strings_1.legalizeCharacters(isAsciiLetterOrUnderscoreOrDigit);
 function rustStyle(original, isSnakeCase) {
-    const words = (0, Strings_1.splitIntoWords)(original);
+    const words = Strings_1.splitIntoWords(original);
     const wordStyle = isSnakeCase ? Strings_1.allLowerWordStyle : Strings_1.firstUpperWordStyle;
-    const combined = (0, Strings_1.combineWords)(words, legalizeName, wordStyle, wordStyle, wordStyle, wordStyle, isSnakeCase ? "_" : "", isAsciiLetterOrUnderscore);
+    const combined = Strings_1.combineWords(words, legalizeName, wordStyle, wordStyle, wordStyle, wordStyle, isSnakeCase ? "_" : "", isAsciiLetterOrUnderscore);
     return combined === "_" ? "_underscore" : combined;
 }
-const snakeNamingFunction = (0, Naming_1.funPrefixNamer)("default", (original) => rustStyle(original, true));
-const camelNamingFunction = (0, Naming_1.funPrefixNamer)("camel", (original) => rustStyle(original, false));
+const snakeNamingFunction = Naming_1.funPrefixNamer("default", (original) => rustStyle(original, true));
+const camelNamingFunction = Naming_1.funPrefixNamer("camel", (original) => rustStyle(original, false));
 const standardUnicodeRustEscape = (codePoint) => {
     if (codePoint <= 0xffff) {
-        return "\\u{" + (0, Strings_1.intToHex)(codePoint, 4) + "}";
+        return "\\u{" + Strings_1.intToHex(codePoint, 4) + "}";
     }
     else {
-        return "\\u{" + (0, Strings_1.intToHex)(codePoint, 6) + "}";
+        return "\\u{" + Strings_1.intToHex(codePoint, 6) + "}";
     }
 };
-const rustStringEscape = (0, Strings_1.utf32ConcatMap)((0, Strings_1.escapeNonPrintableMapper)(Strings_1.isPrintable, standardUnicodeRustEscape));
+const rustStringEscape = Strings_1.utf32ConcatMap(Strings_1.escapeNonPrintableMapper(Strings_1.isPrintable, standardUnicodeRustEscape));
 class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _options;
     constructor(targetLanguage, renderContext, _options) {
         super(targetLanguage, renderContext);
         this._options = _options;
@@ -191,11 +189,11 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return kind === "array" || kind === "map";
     }
     rustType(t, withIssues = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, "Option<serde_json::Value>"), _nullType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, "Option<serde_json::Value>"), _boolType => "bool", _integerType => "i64", _doubleType => "f64", _stringType => "String", arrayType => ["Vec<", this.rustType(arrayType.items, withIssues), ">"], classType => this.nameForNamedType(classType), mapType => ["HashMap<String, ", this.rustType(mapType.values, withIssues), ">"], enumType => this.nameForNamedType(enumType), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, "Option<serde_json::Value>"), _nullType => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, "Option<serde_json::Value>"), _boolType => "bool", _integerType => "i64", _doubleType => "f64", _stringType => "String", arrayType => ["Vec<", this.rustType(arrayType.items, withIssues), ">"], classType => this.nameForNamedType(classType), mapType => ["HashMap<String, ", this.rustType(mapType.values, withIssues), ">"], enumType => this.nameForNamedType(enumType), unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null)
                 return this.nullableRustType(nullable, withIssues);
-            const [hasNull] = (0, TypeUtils_1.removeNullFromUnion)(unionType);
+            const [hasNull] = TypeUtils_1.removeNullFromUnion(unionType);
             const isCycleBreaker = this.isCycleBreakerType(unionType);
             const name = isCycleBreaker
                 ? ["Box<", this.nameForNamedType(unionType), ">"]
@@ -241,14 +239,14 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("}");
     }
     emitUnion(u, unionName) {
-        const isMaybeWithSingleType = (0, TypeUtils_1.nullableFromUnion)(u);
+        const isMaybeWithSingleType = TypeUtils_1.nullableFromUnion(u);
         if (isMaybeWithSingleType !== null) {
             return;
         }
         this.emitDescription(this.descriptionForType(u));
         this.emitLine("#[derive(", this._options.deriveDebug ? "Debug, " : "", "Serialize, Deserialize)]");
         this.emitLine("#[serde(untagged)]");
-        const [, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u);
+        const [, nonNulls] = TypeUtils_1.removeNullFromUnion(u);
         const blankLines = this._options.density === Density.Dense ? "none" : "interposing";
         this.emitBlock(["pub enum ", unionName], () => this.forEachUnionMember(u, nonNulls, blankLines, null, (fieldName, t) => {
             const rustType = this.breakCycle(t, true);
@@ -272,7 +270,7 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitCommentLines(this.leadingComments);
             return;
         }
-        const topLevelName = (0, Support_1.defined)((0, collection_utils_1.mapFirst)(this.topLevels)).getCombinedName();
+        const topLevelName = Support_1.defined(collection_utils_1.mapFirst(this.topLevels)).getCombinedName();
         this.emitMultiline(`// Example code that deserializes and serializes the model.
 // extern crate serde;
 // #[macro_use]

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

@@ -38,13 +38,13 @@ export interface SwiftProperty {
 export declare class SwiftTargetLanguage extends TargetLanguage {
     constructor();
     protected getOptions(): Option<any>[];
-    get stringTypeMapping(): StringTypeMapping;
-    get supportsOptionalClassProperties(): boolean;
-    get supportsUnionsWithBothNumberTypes(): boolean;
+    readonly stringTypeMapping: StringTypeMapping;
+    readonly supportsOptionalClassProperties: boolean;
+    readonly supportsUnionsWithBothNumberTypes: boolean;
     protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
     }): SwiftRenderer;
-    get dateTimeRecognizer(): DateTimeRecognizer;
+    readonly dateTimeRecognizer: DateTimeRecognizer;
 }
 export declare class SwiftRenderer extends ConvenienceRenderer {
     private readonly _options;
@@ -65,7 +65,7 @@ export declare class SwiftRenderer extends ConvenienceRenderer {
     private emitBlock;
     private emitBlockWithAccess;
     private justTypesCase;
-    private get lowerNamingFunction();
+    private readonly lowerNamingFunction;
     protected swiftPropertyType(p: ClassProperty): Sourcelike;
     protected swiftType(t: Type, withIssues?: boolean, noOptional?: boolean): Sourcelike;
     protected proposedUnionMemberNameForTypeKind(kind: TypeKind): string | null;
@@ -75,8 +75,8 @@ export declare class SwiftRenderer extends ConvenienceRenderer {
     protected getProtocolsArray(_t: Type, isClass: boolean): string[];
     private getProtocolString;
     private getEnumPropertyGroups;
-    private get accessLevel();
-    private get objcMembersDeclaration();
+    private readonly accessLevel;
+    private readonly objcMembersDeclaration;
     protected startFile(basename: Sourcelike): void;
     protected endFile(): void;
     protected propertyLinesDefinition(name: Name, parameter: ClassProperty): Sourcelike;