quicktype 17.0.0 → 17.0.1

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

@@ -17,11 +17,11 @@ export declare const phpOptions: {
 export declare class PhpTargetLanguage extends TargetLanguage {
     constructor();
     protected getOptions(): Option<any>[];
-    get supportsUnionsWithBothNumberTypes(): boolean;
+    readonly supportsUnionsWithBothNumberTypes: boolean;
     protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
     }): PhpRenderer;
-    get stringTypeMapping(): StringTypeMapping;
+    readonly stringTypeMapping: StringTypeMapping;
 }
 export declare const stringEscape: (s: string) => string;
 export declare function phpNameStyle(startWithUpper: boolean, upperUnderscore: boolean, original: string, acronymsStyle?: (s: string) => string): string;

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

@@ -1,29 +1,5 @@
 "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.PhpRenderer = exports.phpNameStyle = exports.stringEscape = exports.PhpTargetLanguage = exports.phpOptions = void 0;
 const Annotation_1 = require("../Annotation");
 const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
 const Naming_1 = require("../Naming");
@@ -34,13 +10,13 @@ const Strings_1 = require("../support/Strings");
 const Support_1 = require("../support/Support");
 const TargetLanguage_1 = require("../TargetLanguage");
 const TypeUtils_1 = require("../TypeUtils");
-const _ = __importStar(require("lodash"));
+const _ = require("lodash");
 exports.phpOptions = {
     withGet: new RendererOptions_1.BooleanOption("with-get", "Create Getter", true),
     fastGet: new RendererOptions_1.BooleanOption("fast-get", "getter without validation", false),
     withSet: new RendererOptions_1.BooleanOption("with-set", "Create Setter", false),
     withClosing: new RendererOptions_1.BooleanOption("with-closing", "PHP Closing Tag", false),
-    acronymStyle: (0, Acronyms_1.acronymOption)(Acronyms_1.AcronymStyleOptions.Pascal)
+    acronymStyle: Acronyms_1.acronymOption(Acronyms_1.AcronymStyleOptions.Pascal)
 };
 class PhpTargetLanguage extends TargetLanguage_1.TargetLanguage {
     constructor() {
@@ -53,7 +29,7 @@ class PhpTargetLanguage extends TargetLanguage_1.TargetLanguage {
         return true;
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        const options = (0, RendererOptions_1.getOptionValues)(exports.phpOptions, untypedOptionValues);
+        const options = RendererOptions_1.getOptionValues(exports.phpOptions, untypedOptionValues);
         return new PhpRenderer(this, renderContext, options);
     }
     get stringTypeMapping() {
@@ -66,30 +42,29 @@ class PhpTargetLanguage extends TargetLanguage_1.TargetLanguage {
     }
 }
 exports.PhpTargetLanguage = PhpTargetLanguage;
-exports.stringEscape = (0, Strings_1.utf16ConcatMap)((0, Strings_1.escapeNonPrintableMapper)(Strings_1.isAscii, Strings_1.standardUnicodeHexEscape));
+exports.stringEscape = Strings_1.utf16ConcatMap(Strings_1.escapeNonPrintableMapper(Strings_1.isAscii, Strings_1.standardUnicodeHexEscape));
 function isStartCharacter(codePoint) {
     if (codePoint === 0x5f)
         return true; // underscore
-    return (0, Strings_1.isAscii)(codePoint) && (0, Strings_1.isLetter)(codePoint);
+    return Strings_1.isAscii(codePoint) && Strings_1.isLetter(codePoint);
 }
 function isPartCharacter(codePoint) {
-    return isStartCharacter(codePoint) || ((0, Strings_1.isAscii)(codePoint) && (0, Strings_1.isDigit)(codePoint));
+    return isStartCharacter(codePoint) || (Strings_1.isAscii(codePoint) && Strings_1.isDigit(codePoint));
 }
-const legalizeName = (0, Strings_1.utf16LegalizeCharacters)(isPartCharacter);
+const legalizeName = Strings_1.utf16LegalizeCharacters(isPartCharacter);
 function phpNameStyle(startWithUpper, upperUnderscore, original, acronymsStyle = Strings_1.allUpperWordStyle) {
-    const words = (0, Strings_1.splitIntoWords)(original);
-    return (0, Strings_1.combineWords)(words, legalizeName, upperUnderscore ? Strings_1.allUpperWordStyle : startWithUpper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, upperUnderscore ? Strings_1.allUpperWordStyle : Strings_1.firstUpperWordStyle, upperUnderscore || startWithUpper ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle, acronymsStyle, upperUnderscore ? "_" : "", isStartCharacter);
+    const words = Strings_1.splitIntoWords(original);
+    return Strings_1.combineWords(words, legalizeName, upperUnderscore ? Strings_1.allUpperWordStyle : startWithUpper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, upperUnderscore ? Strings_1.allUpperWordStyle : Strings_1.firstUpperWordStyle, upperUnderscore || startWithUpper ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle, acronymsStyle, upperUnderscore ? "_" : "", isStartCharacter);
 }
 exports.phpNameStyle = phpNameStyle;
 class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _options;
-    _gettersAndSettersForPropertyName = new Map();
-    _haveEmittedLeadingComments = false;
-    _converterClassname = "Converter";
-    _converterKeywords = [];
     constructor(targetLanguage, renderContext, _options) {
         super(targetLanguage, renderContext);
         this._options = _options;
+        this._gettersAndSettersForPropertyName = new Map();
+        this._haveEmittedLeadingComments = false;
+        this._converterClassname = "Converter";
+        this._converterKeywords = [];
     }
     forbiddenForObjectProperties(_c, _className) {
         return { names: [], includeGlobalForbidden: true };
@@ -107,10 +82,10 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return this.getNameStyling("enumCaseNamingFunction");
     }
     unionNeedsName(u) {
-        return (0, TypeUtils_1.nullableFromUnion)(u) === null;
+        return TypeUtils_1.nullableFromUnion(u) === null;
     }
     namedTypeToNameForTopLevel(type) {
-        return (0, TypeUtils_1.directlyReachableSingleNamedType)(type);
+        return TypeUtils_1.directlyReachableSingleNamedType(type);
     }
     makeNamesForPropertyGetterAndSetter(_c, _className, _p, _jsonName, name) {
         const getterName = new Naming_1.DependencyName(this.getNameStyling("propertyNamingFunction"), name.order, lookup => `get_${lookup(name)}`);
@@ -142,9 +117,9 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     getNameStyling(convention) {
         const styling = {
-            typeNamingFunction: (0, Naming_1.funPrefixNamer)("types", n => phpNameStyle(true, false, n, (0, Acronyms_1.acronymStyle)(this._options.acronymStyle))),
-            propertyNamingFunction: (0, Naming_1.funPrefixNamer)("properties", n => phpNameStyle(false, false, n, (0, Acronyms_1.acronymStyle)(this._options.acronymStyle))),
-            enumCaseNamingFunction: (0, Naming_1.funPrefixNamer)("enum-cases", n => phpNameStyle(true, true, n, (0, Acronyms_1.acronymStyle)(this._options.acronymStyle)))
+            typeNamingFunction: Naming_1.funPrefixNamer("types", n => phpNameStyle(true, false, n, Acronyms_1.acronymStyle(this._options.acronymStyle))),
+            propertyNamingFunction: Naming_1.funPrefixNamer("properties", n => phpNameStyle(false, false, n, Acronyms_1.acronymStyle(this._options.acronymStyle))),
+            enumCaseNamingFunction: Naming_1.funPrefixNamer("enum-cases", n => phpNameStyle(true, true, n, Acronyms_1.acronymStyle(this._options.acronymStyle)))
         };
         return styling[convention];
     }
@@ -176,8 +151,8 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         function optionalize(s) {
             return [isOptional ? prefix : "", s, isOptional ? suffix : ""];
         }
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.maybeAnnotated)(isOptional, Annotation_1.anyTypeIssueAnnotation, "Object"), _nullType => (0, Source_1.maybeAnnotated)(isOptional, Annotation_1.nullTypeIssueAnnotation, "Object"), _boolType => optionalize("bool"), _integerType => optionalize("int"), _doubleType => optionalize("float"), _stringType => optionalize("string"), _arrayType => optionalize("array"), classType => optionalize(this.nameForNamedType(classType)), _mapType => optionalize("stdClass"), enumType => optionalize(this.nameForNamedType(enumType)), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => Source_1.maybeAnnotated(isOptional, Annotation_1.anyTypeIssueAnnotation, "Object"), _nullType => Source_1.maybeAnnotated(isOptional, Annotation_1.nullTypeIssueAnnotation, "Object"), _boolType => optionalize("bool"), _integerType => optionalize("int"), _doubleType => optionalize("float"), _stringType => optionalize("string"), _arrayType => optionalize("array"), classType => optionalize(this.nameForNamedType(classType)), _mapType => optionalize("stdClass"), enumType => optionalize(this.nameForNamedType(enumType)), unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null)
                 return this.phpType(true, nullable, true, prefix, suffix);
             return this.nameForNamedType(unionType);
@@ -198,8 +173,8 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     phpDocConvertType(className, t) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => "any", _nullType => "null", _boolType => "bool", _integerType => "int", _doubleType => "float", _stringType => "string", arrayType => [this.phpDocConvertType(className, arrayType.items), "[]"], _classType => _classType.getCombinedName(), _mapType => "stdClass", enumType => this.nameForNamedType(enumType), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => "any", _nullType => "null", _boolType => "bool", _integerType => "int", _doubleType => "float", _stringType => "string", arrayType => [this.phpDocConvertType(className, arrayType.items), "[]"], _classType => _classType.getCombinedName(), _mapType => "stdClass", enumType => this.nameForNamedType(enumType), unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 return [this.phpDocConvertType(className, nullable), "|null"];
             }
@@ -212,10 +187,10 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     phpConvertType(className, t) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => "any", _nullType => "null", _boolType => "bool", _integerType => "int", _doubleType => "float", _stringType => "string", _arrayType => "array", _classType => "stdClass", _mapType => "stdClass", _enumType => "string", // TODO number this.nameForNamedType(enumType),
+        return TypeUtils_1.matchType(t, _anyType => "any", _nullType => "null", _boolType => "bool", _integerType => "int", _doubleType => "float", _stringType => "string", _arrayType => "array", _classType => "stdClass", _mapType => "stdClass", _enumType => "string", // TODO number this.nameForNamedType(enumType),
         // TODO number this.nameForNamedType(enumType),
         unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 return ["?", this.phpConvertType(className, nullable)];
             }
@@ -228,7 +203,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     phpToObjConvert(className, t, lhs, args) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => this.emitLine(...lhs, ...args, "; /*any*/"), _nullType => this.emitLine(...lhs, ...args, "; /*null*/"), _boolType => this.emitLine(...lhs, ...args, "; /*bool*/"), _integerType => this.emitLine(...lhs, ...args, "; /*int*/"), _doubleType => this.emitLine(...lhs, ...args, "; /*float*/"), _stringType => this.emitLine(...lhs, ...args, "; /*string*/"), arrayType => {
+        return TypeUtils_1.matchType(t, _anyType => this.emitLine(...lhs, ...args, "; /*any*/"), _nullType => this.emitLine(...lhs, ...args, "; /*null*/"), _boolType => this.emitLine(...lhs, ...args, "; /*bool*/"), _integerType => this.emitLine(...lhs, ...args, "; /*int*/"), _doubleType => this.emitLine(...lhs, ...args, "; /*float*/"), _stringType => this.emitLine(...lhs, ...args, "; /*string*/"), arrayType => {
             this.emitLine(...lhs, "array_map(function ($value) {");
             this.indent(() => {
                 this.phpToObjConvert(className, arrayType.items, ["return "], ["$value"]);
@@ -245,7 +220,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
             this.emitLine("return to(", ...args, ");");
         }, enumType => this.emitLine(...lhs, this.nameForNamedType(enumType), "::to(", ...args, "); ", "/*enum*/"), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 this.emitLine("if (!is_null(", ...args, ")) {");
                 this.indent(() => this.phpToObjConvert(className, nullable, lhs, args));
@@ -270,7 +245,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         // }
     }
     phpFromObjConvert(className, t, lhs, args) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => this.emitLine(...lhs, ...args, "; /*any*/"), _nullType => this.emitLine(...lhs, ...args, "; /*null*/"), _boolType => this.emitLine(...lhs, ...args, "; /*bool*/"), _integerType => this.emitLine(...lhs, ...args, "; /*int*/"), _doubleType => this.emitLine(...lhs, ...args, "; /*float*/"), _stringType => this.emitLine(...lhs, ...args, "; /*string*/"), arrayType => {
+        return TypeUtils_1.matchType(t, _anyType => this.emitLine(...lhs, ...args, "; /*any*/"), _nullType => this.emitLine(...lhs, ...args, "; /*null*/"), _boolType => this.emitLine(...lhs, ...args, "; /*bool*/"), _integerType => this.emitLine(...lhs, ...args, "; /*int*/"), _doubleType => this.emitLine(...lhs, ...args, "; /*float*/"), _stringType => this.emitLine(...lhs, ...args, "; /*string*/"), arrayType => {
             this.emitLine(...lhs, " array_map(function ($value) {");
             this.indent(() => {
                 this.phpFromObjConvert(className, arrayType.items, ["return "], ["$value"]);
@@ -287,7 +262,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
             this.emitLine("return from(", ...args, ");");
         }, enumType => this.emitLine(...lhs, this.nameForNamedType(enumType), "::from(", ...args, "); ", "/*enum*/"), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 this.emitLine("if (!is_null(", ...args, ")) {");
                 this.indent(() => this.phpFromObjConvert(className, nullable, lhs, args));
@@ -308,7 +283,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     phpSampleConvert(className, t, lhs, args, idx, suffix) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => this.emitLine(...lhs, "'AnyType::", className, "::", args, "::" + idx, "'", suffix, "/*", "" + idx, ":", args, "*/"), _nullType => this.emitLine(...lhs, "null", suffix, " /*", "" + idx, ":", args, "*/"), _boolType => this.emitLine(...lhs, "true", suffix, " /*", "" + idx, ":", args, "*/"), _integerType => this.emitLine(...lhs, "" + idx, suffix, " /*", "" + idx, ":", args, "*/"), _doubleType => this.emitLine(...lhs, "" + (idx + idx / 1000), suffix, " /*", "" + idx, ":", args, "*/"), _stringType => this.emitLine(...lhs, "'", className, "::", args, "::" + idx, "'", suffix, " /*", "" + idx, ":", args, "*/"), arrayType => {
+        return TypeUtils_1.matchType(t, _anyType => this.emitLine(...lhs, "'AnyType::", className, "::", args, "::" + idx, "'", suffix, "/*", "" + idx, ":", args, "*/"), _nullType => this.emitLine(...lhs, "null", suffix, " /*", "" + idx, ":", args, "*/"), _boolType => this.emitLine(...lhs, "true", suffix, " /*", "" + idx, ":", args, "*/"), _integerType => this.emitLine(...lhs, "" + idx, suffix, " /*", "" + idx, ":", args, "*/"), _doubleType => this.emitLine(...lhs, "" + (idx + idx / 1000), suffix, " /*", "" + idx, ":", args, "*/"), _stringType => this.emitLine(...lhs, "'", className, "::", args, "::" + idx, "'", suffix, " /*", "" + idx, ":", args, "*/"), arrayType => {
             this.emitLine(...lhs, " array(");
             this.indent(() => {
                 this.phpSampleConvert(className, arrayType.items, [], [], idx, "");
@@ -322,7 +297,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
             this.emitLine("return sample();");
         }, enumType => this.emitLine(...lhs, this.nameForNamedType(enumType), "::sample()", suffix, " /*enum*/"), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 this.phpSampleConvert(className, nullable, lhs, args, idx, suffix);
                 return;
@@ -342,7 +317,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         const is = (isfn, myT = className) => {
             this.emitBlock(["if (!", isfn, "(", scopeAttrName, "))"], () => this.emitLine('throw new Exception("Attribute Error:', myT, "::", attrName, '");'));
         };
-        return (0, TypeUtils_1.matchType)(t, _anyType => is("defined"), _nullType => is("is_null"), _boolType => is("is_bool"), _integerType => is("is_integer"), _doubleType => is("is_float"), _stringType => is("is_string"), arrayType => {
+        return TypeUtils_1.matchType(t, _anyType => is("defined"), _nullType => is("is_null"), _boolType => is("is_bool"), _integerType => is("is_integer"), _doubleType => is("is_float"), _stringType => is("is_string"), arrayType => {
             is("is_array");
             this.emitLine("array_walk(", scopeAttrName, ", function(", scopeAttrName, "_v) {");
             this.indent(() => {
@@ -360,7 +335,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }, enumType => {
             this.emitLine(this.phpType(false, enumType), "::to(", scopeAttrName, ");");
         }, unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 this.emitBlock(["if (!is_null(", scopeAttrName, "))"], () => {
                     this.phpValidate(className, nullable, attrName, scopeAttrName);
@@ -511,7 +486,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             let idx = 31;
             this.forEachClassProperty(c, "leading-and-interposing", (name, jsonName, p) => {
                 const desc = this.descriptionForClassProperty(c, jsonName);
-                const names = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
+                const names = Support_1.defined(this._gettersAndSettersForPropertyName.get(name));
                 this.ensureBlankLine();
                 this.emitFromMethod(names, p, className, name, desc);
                 this.ensureBlankLine();
@@ -530,7 +505,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 let lines = [];
                 let p = "return ";
                 this.forEachClassProperty(c, "none", (name, _jsonName, _p) => {
-                    const names = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
+                    const names = Support_1.defined(this._gettersAndSettersForPropertyName.get(name));
                     lines.push([p, className, "::", names.validate, "($this->", name, ")"]);
                     p = "|| ";
                 });
@@ -548,7 +523,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             ], () => {
                 this.emitLine("$out = new stdClass();");
                 this.forEachClassProperty(c, "none", (name, jsonName) => {
-                    const names = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
+                    const names = Support_1.defined(this._gettersAndSettersForPropertyName.get(name));
                     this.emitLine("$out->{'", jsonName, "'} = $this->", names.to, "();");
                 });
                 this.emitLine("return $out;");
@@ -567,14 +542,14 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             ], () => {
                 if (this._options.fastGet) {
                     this.forEachClassProperty(c, "none", name => {
-                        const names = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
+                        const names = Support_1.defined(this._gettersAndSettersForPropertyName.get(name));
                         this.emitLine(className, "::", names.validate, "($this->", name, ", true);");
                     });
                 }
                 this.emitLine("return new ", className, "(");
                 let comma = " ";
                 this.forEachClassProperty(c, "none", (name, jsonName) => {
-                    const names = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
+                    const names = Support_1.defined(this._gettersAndSettersForPropertyName.get(name));
                     this.emitLine(comma, className, "::", names.from, "($obj->{'", jsonName, "'})");
                     comma = ",";
                 });
@@ -585,7 +560,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine("return new ", className, "(");
                 let comma = " ";
                 this.forEachClassProperty(c, "none", name => {
-                    const names = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
+                    const names = Support_1.defined(this._gettersAndSettersForPropertyName.get(name));
                     this.emitLine(comma, className, "::", names.sample, "()");
                     comma = ",";
                 });
@@ -649,7 +624,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.indent(() => {
                     this.forEachEnumCase(e, "none", (name, jsonName) => {
                         // Todo String or Number
-                        this.emitLine("case ", enumName, "::$", name, "->enum: return '", (0, exports.stringEscape)(jsonName), "';");
+                        this.emitLine("case ", enumName, "::$", name, "->enum: return '", exports.stringEscape(jsonName), "';");
                     });
                 });
                 this.emitLine("}");
@@ -672,7 +647,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.indent(() => {
                     this.forEachEnumCase(e, "none", (name, jsonName) => {
                         // Todo String or Enum
-                        this.emitLine("case '", (0, exports.stringEscape)(jsonName), "': return ", enumName, "::$", name, ";");
+                        this.emitLine("case '", exports.stringEscape(jsonName), "': return ", enumName, "::$", name, ";");
                     });
                 });
                 this.emitLine("}");
@@ -696,7 +671,7 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this._options.withClosing) {
             this.emitLine("?>");
         }
-        super.finishFile((0, Support_1.defined)(givenFilename));
+        super.finishFile(Support_1.defined(givenFilename));
     }
 }
 exports.PhpRenderer = PhpRenderer;

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

@@ -13,7 +13,7 @@ export declare class PikeTargetLanguage extends TargetLanguage {
 }
 export declare class PikeRenderer extends ConvenienceRenderer {
     protected emitSourceStructure(): void;
-    protected get enumCasesInGlobalNamespace(): boolean;
+    protected readonly enumCasesInGlobalNamespace: boolean;
     protected makeEnumCaseNamer(): Namer;
     protected makeNamedTypeNamer(): Namer;
     protected makeUnionMemberNamer(): Namer;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PikeRenderer = exports.PikeTargetLanguage = exports.pikeOptions = void 0;
 const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
 const Naming_1 = require("../Naming");
 const Source_1 = require("../Source");
@@ -63,10 +62,10 @@ const keywords = [
     "typeof",
     "global"
 ];
-const legalizeName = (0, Strings_1.legalizeCharacters)(Strings_1.isLetterOrUnderscoreOrDigit);
-const enumNamingFunction = (0, Naming_1.funPrefixNamer)("enumNamer", (0, Strings_1.makeNameStyle)("upper-underscore", legalizeName));
-const namingFunction = (0, Naming_1.funPrefixNamer)("genericNamer", (0, Strings_1.makeNameStyle)("underscore", legalizeName));
-const namedTypeNamingFunction = (0, Naming_1.funPrefixNamer)("typeNamer", (0, Strings_1.makeNameStyle)("pascal", legalizeName));
+const legalizeName = Strings_1.legalizeCharacters(Strings_1.isLetterOrUnderscoreOrDigit);
+const enumNamingFunction = Naming_1.funPrefixNamer("enumNamer", Strings_1.makeNameStyle("upper-underscore", legalizeName));
+const namingFunction = Naming_1.funPrefixNamer("genericNamer", Strings_1.makeNameStyle("underscore", legalizeName));
+const namedTypeNamingFunction = Naming_1.funPrefixNamer("typeNamer", Strings_1.makeNameStyle("pascal", legalizeName));
 class PikeTargetLanguage extends TargetLanguage_1.TargetLanguage {
     constructor() {
         super("Pike", ["pike", "pikelang"], "pmod");
@@ -121,20 +120,20 @@ class PikeRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     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)("mixed"), _nullType => (0, Source_1.singleWord)("mixed"), _boolType => (0, Source_1.singleWord)("bool"), _integerType => (0, Source_1.singleWord)("int"), _doubleType => (0, Source_1.singleWord)("float"), _stringType => (0, Source_1.singleWord)("string"), arrayType => (0, Source_1.singleWord)(["array(", this.sourceFor(arrayType.items).source, ")"]), _classType => (0, Source_1.singleWord)(this.nameForNamedType(_classType)), mapType => {
+        return TypeUtils_1.matchType(t, _anyType => Source_1.singleWord("mixed"), _nullType => Source_1.singleWord("mixed"), _boolType => Source_1.singleWord("bool"), _integerType => Source_1.singleWord("int"), _doubleType => Source_1.singleWord("float"), _stringType => Source_1.singleWord("string"), arrayType => Source_1.singleWord(["array(", this.sourceFor(arrayType.items).source, ")"]), _classType => Source_1.singleWord(this.nameForNamedType(_classType)), mapType => {
             let valueSource;
             const v = mapType.values;
             valueSource = this.sourceFor(v).source;
-            return (0, Source_1.singleWord)(["mapping(string:", valueSource, ")"]);
-        }, _enumType => (0, Source_1.singleWord)("enum"), unionType => {
-            if ((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);
+            return Source_1.singleWord(["mapping(string:", valueSource, ")"]);
+        }, _enumType => Source_1.singleWord("enum"), unionType => {
+            if (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));
             }
         });
     }
@@ -153,7 +152,7 @@ class PikeRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             let table = [];
             this.forEachEnumCase(e, "none", (name, jsonName) => {
                 table.push([
-                    [name, ' = "', (0, Strings_1.stringEscape)(jsonName), '", '],
+                    [name, ' = "', Strings_1.stringEscape(jsonName), '", '],
                     ['// json: "', jsonName, '"']
                 ]);
             });
@@ -161,12 +160,12 @@ class PikeRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     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));
-        const [, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u);
+        const [, nonNulls] = TypeUtils_1.removeNullFromUnion(u);
         let types = [];
         this.forEachUnionMember(u, nonNulls, "none", null, (_name, t) => {
             const pikeType = this.sourceFor(t).source;
@@ -254,7 +253,7 @@ class PikeRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitBlock(["string encode_json()"], () => {
             this.emitMappingBlock(["mapping(string:mixed) json = "], () => {
                 this.forEachClassProperty(c, "none", (name, jsonName) => {
-                    this.emitLine(['"', (0, Strings_1.stringEscape)(jsonName), '" : ', name, ","]);
+                    this.emitLine(['"', Strings_1.stringEscape(jsonName), '" : ', name, ","]);
                 });
             });
             this.ensureBlankLine();
@@ -266,7 +265,7 @@ class PikeRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine([className, " retval = ", className, "();"]);
             this.ensureBlankLine();
             this.forEachClassProperty(c, "none", (name, jsonName) => {
-                this.emitLine(["retval.", name, ' = json["', (0, Strings_1.stringEscape)(jsonName), '"];']);
+                this.emitLine(["retval.", name, ' = json["', Strings_1.stringEscape(jsonName), '"];']);
             });
             this.ensureBlankLine();
             this.emitLine(["return retval;"]);

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

@@ -7,7 +7,7 @@ import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer"
 import { Namer, Name, DependencyName } from "../Naming";
 import { Sourcelike, MultiWord } from "../Source";
 import { Transformer } from "../Transformers";
-export type PythonFeatures = {
+export declare type PythonFeatures = {
     typeHints: boolean;
     dataClasses: boolean;
 };
@@ -18,9 +18,9 @@ export declare const pythonOptions: {
 };
 export declare class PythonTargetLanguage extends TargetLanguage {
     protected getOptions(): Option<any>[];
-    get stringTypeMapping(): StringTypeMapping;
-    get supportsUnionsWithBothNumberTypes(): boolean;
-    get supportsOptionalClassProperties(): boolean;
+    readonly stringTypeMapping: StringTypeMapping;
+    readonly supportsUnionsWithBothNumberTypes: boolean;
+    readonly supportsOptionalClassProperties: boolean;
     needsTransformerForType(t: Type): boolean;
     protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
@@ -37,9 +37,9 @@ export declare class PythonRenderer extends ConvenienceRenderer {
     protected namerForObjectProperty(): Namer;
     protected makeUnionMemberNamer(): null;
     protected makeEnumCaseNamer(): Namer;
-    protected get commentLineStart(): string;
+    protected readonly commentLineStart: string;
     protected emitDescriptionBlock(lines: Sourcelike[]): void;
-    protected get needsTypeDeclarationBeforeUse(): boolean;
+    protected readonly needsTypeDeclarationBeforeUse: boolean;
     protected canBeForwardDeclared(t: Type): boolean;
     protected emitBlock(line: Sourcelike, f: () => void): void;
     protected string(s: string): Sourcelike;
@@ -61,8 +61,8 @@ export declare class PythonRenderer extends ConvenienceRenderer {
     protected emitClosingCode(): void;
     protected emitSourceStructure(_givenOutputFilename: string): void;
 }
-export type ConverterFunction = "none" | "bool" | "int" | "from-float" | "to-float" | "str" | "to-enum" | "list" | "to-class" | "dict" | "union" | "from-datetime" | "from-stringified-bool" | "is-type";
-export type ValueOrLambda = {
+export declare type ConverterFunction = "none" | "bool" | "int" | "from-float" | "to-float" | "str" | "to-enum" | "list" | "to-class" | "dict" | "union" | "from-datetime" | "from-stringified-bool" | "is-type";
+export declare type ValueOrLambda = {
     value: Sourcelike | undefined;
     lambda?: MultiWord;
 };