quicktype 17.0.4 → 17.0.5

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JacksonRenderer = exports.JavaRenderer = exports.javaNameStyle = exports.stringEscape = exports.JavaTargetLanguage = exports.javaOptions = void 0;
 const Annotation_1 = require("../Annotation");
 const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
 const Naming_1 = require("../Naming");
@@ -22,7 +21,7 @@ exports.javaOptions = {
         ["java8", "java8"],
         ["legacy", "legacy"]
     ], "java8"),
-    acronymStyle: (0, Acronyms_1.acronymOption)(Acronyms_1.AcronymStyleOptions.Pascal),
+    acronymStyle: Acronyms_1.acronymOption(Acronyms_1.AcronymStyleOptions.Pascal),
     // FIXME: Do this via a configurable named eventually.
     packageName: new RendererOptions_1.StringOption("package", "Generated package name", "NAME", "io.quicktype"),
     lombok: new RendererOptions_1.BooleanOption("lombok", "Use lombok", false, "primary"),
@@ -47,7 +46,7 @@ class JavaTargetLanguage extends TargetLanguage_1.TargetLanguage {
         return true;
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        const options = (0, RendererOptions_1.getOptionValues)(exports.javaOptions, untypedOptionValues);
+        const options = RendererOptions_1.getOptionValues(exports.javaOptions, untypedOptionValues);
         if (options.justTypes) {
             return new JavaRenderer(this, renderContext, options);
         }
@@ -131,62 +130,63 @@ const javaKeywords = [
     "false",
     "true"
 ];
-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 javaNameStyle(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.javaNameStyle = javaNameStyle;
 class JavaDateTimeProvider {
-    _renderer;
-    _className;
     constructor(_renderer, _className) {
         this._renderer = _renderer;
         this._className = _className;
+        this.shouldEmitDateTimeConverter = true;
+        this.shouldEmitTimeConverter = true;
+        this.shouldEmitDateConverter = true;
     }
-    shouldEmitDateTimeConverter = true;
-    shouldEmitTimeConverter = true;
-    shouldEmitDateConverter = true;
 }
 class Java8DateTimeProvider extends JavaDateTimeProvider {
-    keywords = [
-        "LocalDate",
-        "OffsetDateTime",
-        "OffsetTime",
-        "ZoneOffset",
-        "ZonedDateTime",
-        "DateTimeFormatter",
-        "DateTimeFormatterBuilder",
-        "ChronoField"
-    ];
-    dateTimeImports = ["java.time.OffsetDateTime"];
-    dateImports = ["java.time.LocalDate"];
-    timeImports = ["java.time.OffsetTime"];
-    converterImports = [
-        "java.time.LocalDate",
-        "java.time.OffsetDateTime",
-        "java.time.OffsetTime",
-        "java.time.ZoneOffset",
-        "java.time.ZonedDateTime",
-        "java.time.format.DateTimeFormatter",
-        "java.time.format.DateTimeFormatterBuilder",
-        "java.time.temporal.ChronoField"
-    ];
-    dateTimeType = "OffsetDateTime";
-    dateType = "LocalDate";
-    timeType = "OffsetTime";
-    dateTimeJacksonAnnotations = [];
-    dateJacksonAnnotations = [];
-    timeJacksonAnnotations = [];
+    constructor() {
+        super(...arguments);
+        this.keywords = [
+            "LocalDate",
+            "OffsetDateTime",
+            "OffsetTime",
+            "ZoneOffset",
+            "ZonedDateTime",
+            "DateTimeFormatter",
+            "DateTimeFormatterBuilder",
+            "ChronoField"
+        ];
+        this.dateTimeImports = ["java.time.OffsetDateTime"];
+        this.dateImports = ["java.time.LocalDate"];
+        this.timeImports = ["java.time.OffsetTime"];
+        this.converterImports = [
+            "java.time.LocalDate",
+            "java.time.OffsetDateTime",
+            "java.time.OffsetTime",
+            "java.time.ZoneOffset",
+            "java.time.ZonedDateTime",
+            "java.time.format.DateTimeFormatter",
+            "java.time.format.DateTimeFormatterBuilder",
+            "java.time.temporal.ChronoField"
+        ];
+        this.dateTimeType = "OffsetDateTime";
+        this.dateType = "LocalDate";
+        this.timeType = "OffsetTime";
+        this.dateTimeJacksonAnnotations = [];
+        this.dateJacksonAnnotations = [];
+        this.timeJacksonAnnotations = [];
+    }
     emitDateTimeConverters() {
         this._renderer.ensureBlankLine();
         this._renderer.emitLine("private static final DateTimeFormatter DATE_TIME_FORMATTER = new DateTimeFormatterBuilder()");
@@ -240,17 +240,22 @@ class Java8DateTimeProvider extends JavaDateTimeProvider {
     }
 }
 class JavaLegacyDateTimeProvider extends JavaDateTimeProvider {
-    keywords = ["SimpleDateFormat", "Date"];
-    dateTimeImports = ["java.util.Date"];
-    dateImports = ["java.util.Date"];
-    timeImports = ["java.util.Date"];
-    converterImports = ["java.util.Date", "java.text.SimpleDateFormat"];
-    dateTimeType = "Date";
-    dateType = "Date";
-    timeType = "Date";
-    dateTimeJacksonAnnotations = ['@JsonFormat(pattern = "yyyy-MM-dd\'T\'HH:mm:ssX", timezone = "UTC")'];
-    dateJacksonAnnotations = ['@JsonFormat(pattern = "yyyy-MM-dd")'];
-    timeJacksonAnnotations = ['@JsonFormat(pattern = "HH:mm:ssX", timezone = "UTC")'];
+    constructor() {
+        super(...arguments);
+        this.keywords = ["SimpleDateFormat", "Date"];
+        this.dateTimeImports = ["java.util.Date"];
+        this.dateImports = ["java.util.Date"];
+        this.timeImports = ["java.util.Date"];
+        this.converterImports = ["java.util.Date", "java.text.SimpleDateFormat"];
+        this.dateTimeType = "Date";
+        this.dateType = "Date";
+        this.timeType = "Date";
+        this.dateTimeJacksonAnnotations = ['@JsonFormat(pattern = "yyyy-MM-dd\'T\'HH:mm:ssX", timezone = "UTC")'];
+        this.dateJacksonAnnotations = ['@JsonFormat(pattern = "yyyy-MM-dd")'];
+        this.timeJacksonAnnotations = ['@JsonFormat(pattern = "HH:mm:ssX", timezone = "UTC")'];
+        this.shouldEmitTimeConverter = false;
+        this.shouldEmitDateConverter = false;
+    }
     emitDateTimeConverters() {
         this._renderer.ensureBlankLine();
         this._renderer.emitLine("private static final String[] DATE_TIME_FORMATS = {");
@@ -292,8 +297,6 @@ class JavaLegacyDateTimeProvider extends JavaDateTimeProvider {
             this._renderer.emitLine('return new SimpleDateFormat("hh:mm:ssZ").format(datetime);');
         });
     }
-    shouldEmitTimeConverter = false;
-    shouldEmitDateConverter = false;
     convertStringToDateTime(variable) {
         return [this._className, ".parseAllDateTimeString(", variable, ")"];
     }
@@ -314,16 +317,13 @@ class JavaLegacyDateTimeProvider extends JavaDateTimeProvider {
     }
 }
 class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _options;
-    _currentFilename;
-    _gettersAndSettersForPropertyName = new Map();
-    _haveEmittedLeadingComments = false;
-    _dateTimeProvider;
-    _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 = [];
         switch (_options.dateTimeProvider) {
             default:
             case "java8":
@@ -359,13 +359,13 @@ class JavaRenderer 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) {
         // If the top-level type doesn't contain any classes or unions
         // we have to define a class just for the `FromJson` method, in
         // emitFromJsonForTopLevel.
-        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)}`);
@@ -379,9 +379,9 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     getNameStyling(convention) {
         const styling = {
-            typeNamingFunction: (0, Naming_1.funPrefixNamer)("types", n => javaNameStyle(true, false, n, (0, Acronyms_1.acronymStyle)(this._options.acronymStyle))),
-            propertyNamingFunction: (0, Naming_1.funPrefixNamer)("properties", n => javaNameStyle(false, false, n, (0, Acronyms_1.acronymStyle)(this._options.acronymStyle))),
-            enumCaseNamingFunction: (0, Naming_1.funPrefixNamer)("enum-cases", n => javaNameStyle(true, true, n, (0, Acronyms_1.acronymStyle)(this._options.acronymStyle)))
+            typeNamingFunction: Naming_1.funPrefixNamer("types", n => javaNameStyle(true, false, n, Acronyms_1.acronymStyle(this._options.acronymStyle))),
+            propertyNamingFunction: Naming_1.funPrefixNamer("properties", n => javaNameStyle(false, false, n, Acronyms_1.acronymStyle(this._options.acronymStyle))),
+            enumCaseNamingFunction: Naming_1.funPrefixNamer("enum-cases", n => javaNameStyle(true, true, n, Acronyms_1.acronymStyle(this._options.acronymStyle)))
         };
         return styling[convention];
     }
@@ -389,7 +389,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this.topLevels.size === 1) {
             return methodName;
         }
-        return [topLevelName, (0, Strings_1.capitalize)(methodName)];
+        return [topLevelName, Strings_1.capitalize(methodName)];
     }
     methodName(prefix, suffix, topLevelName) {
         if (this.topLevels.size === 1) {
@@ -410,7 +410,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return this.methodName("get", "ObjectWriter", topLevelName);
     }
     startFile(basename) {
-        (0, Support_1.assert)(this._currentFilename === undefined, "Previous file wasn't finished");
+        Support_1.assert(this._currentFilename === undefined, "Previous file wasn't finished");
         // FIXME: The filenames should actually be Sourcelikes, too
         this._currentFilename = `${this.sourcelikeToString(basename)}.java`;
         // FIXME: Why is this necessary?
@@ -422,7 +422,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     finishFile() {
-        super.finishFile((0, Support_1.defined)(this._currentFilename));
+        super.finishFile(Support_1.defined(this._currentFilename));
         this._currentFilename = undefined;
     }
     emitPackageAndImports(imports) {
@@ -456,7 +456,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitTryCatch(f, () => this.emitLine("// Ignored"));
     }
     javaType(reference, t, withIssues = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, "Object"), _nullType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, "Object"), _boolType => (reference ? "Boolean" : "boolean"), _integerType => (reference ? "Long" : "long"), _doubleType => (reference ? "Double" : "double"), _stringType => "String", arrayType => {
+        return TypeUtils_1.matchType(t, _anyType => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, "Object"), _nullType => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, "Object"), _boolType => (reference ? "Boolean" : "boolean"), _integerType => (reference ? "Long" : "long"), _doubleType => (reference ? "Double" : "double"), _stringType => "String", arrayType => {
             if (this._options.useList) {
                 return ["List<", this.javaType(true, arrayType.items, withIssues), ">"];
             }
@@ -464,7 +464,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 return [this.javaType(false, arrayType.items, withIssues), "[]"];
             }
         }, classType => this.nameForNamedType(classType), mapType => ["Map<String, ", this.javaType(true, mapType.values, withIssues), ">"], enumType => this.nameForNamedType(enumType), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null)
                 return this.javaType(true, nullable, withIssues);
             return this.nameForNamedType(unionType);
@@ -485,7 +485,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     javaImport(t) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => [], _nullType => [], _boolType => [], _integerType => [], _doubleType => [], _stringType => [], arrayType => {
+        return TypeUtils_1.matchType(t, _anyType => [], _nullType => [], _boolType => [], _integerType => [], _doubleType => [], _stringType => [], arrayType => {
             if (this._options.useList) {
                 return [...this.javaImport(arrayType.items), "java.util.List"];
             }
@@ -525,7 +525,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             return "Map";
         }
         else if (t instanceof Type_1.UnionType) {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(t);
+            const nullable = TypeUtils_1.nullableFromUnion(t);
             if (nullable !== null)
                 return this.javaTypeWithoutGenerics(true, nullable);
             return this.nameForNamedType(t);
@@ -552,7 +552,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (t instanceof Type_1.EnumType) {
             return ["java.io.IOException"];
         }
-        return (0, Support_1.assertNever)(t);
+        return Support_1.assertNever(t);
     }
     importsForClass(c) {
         const imports = [];
@@ -564,7 +564,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     importsForUnionMembers(u) {
         const imports = [];
-        const [, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u);
+        const [, nonNulls] = TypeUtils_1.removeNullFromUnion(u);
         this.forEachUnionMember(u, nonNulls, "none", null, (_fieldName, t) => {
             this.javaImport(t).forEach(imp => imports.push(imp));
         });
@@ -593,7 +593,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             if (!this._options.lombok) {
                 this.forEachClassProperty(c, "leading-and-interposing", (name, jsonName, p) => {
                     this.emitDescription(this.descriptionForClassProperty(c, jsonName));
-                    const [getterName, setterName] = (0, Support_1.defined)(this._gettersAndSettersForPropertyName.get(name));
+                    const [getterName, setterName] = Support_1.defined(this._gettersAndSettersForPropertyName.get(name));
                     const rendered = this.javaType(false, p.type);
                     this.annotationsForAccessor(c, className, name, jsonName, p, false).forEach(annotation => this.emitLine(annotation));
                     this.emitLine("public ", rendered, " ", getterName, "() { return ", name, "; }");
@@ -620,7 +620,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         const imports = [...this.importsForType(u), ...this.importsForUnionMembers(u)];
         this.emitFileHeader(unionName, imports);
         this.emitDescription(this.descriptionForType(u));
-        const [, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u);
+        const [, nonNulls] = TypeUtils_1.removeNullFromUnion(u);
         this.emitUnionAttributes(u, unionName);
         this.emitBlock(["public class ", unionName], () => {
             for (const t of nonNulls) {
@@ -655,7 +655,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine("switch (this) {");
                 this.indent(() => {
                     this.forEachEnumCase(e, "none", (name, jsonName) => {
-                        this.emitLine("case ", name, ': return "', (0, exports.stringEscape)(jsonName), '";');
+                        this.emitLine("case ", name, ': return "', exports.stringEscape(jsonName), '";');
                     });
                 });
                 this.emitLine("}");
@@ -665,7 +665,7 @@ class JavaRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitEnumDeserializationAttributes(e);
             this.emitBlock(["public static ", enumName, " forValue(String value) throws IOException"], () => {
                 this.forEachEnumCase(e, "none", (name, jsonName) => {
-                    this.emitLine('if (value.equals("', (0, exports.stringEscape)(jsonName), '")) return ', name, ";");
+                    this.emitLine('if (value.equals("', exports.stringEscape(jsonName), '")) return ', name, ";");
                 });
                 this.emitLine('throw new IOException("Cannot deserialize ', enumName, '");');
             });
@@ -680,18 +680,18 @@ exports.JavaRenderer = JavaRenderer;
 class JacksonRenderer extends JavaRenderer {
     constructor(targetLanguage, renderContext, options) {
         super(targetLanguage, renderContext, options);
+        this._converterKeywords = [
+            "JsonProperty",
+            "JsonDeserialize",
+            "JsonDeserializer",
+            "JsonSerialize",
+            "JsonSerializer",
+            "JsonParser",
+            "JsonProcessingException",
+            "DeserializationContext",
+            "SerializerProvider"
+        ];
     }
-    _converterKeywords = [
-        "JsonProperty",
-        "JsonDeserialize",
-        "JsonDeserializer",
-        "JsonSerialize",
-        "JsonSerializer",
-        "JsonParser",
-        "JsonProcessingException",
-        "DeserializationContext",
-        "SerializerProvider"
-    ];
     emitClassAttributes(c, _className) {
         if (c.getProperties().size === 0)
             this.emitLine("@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.NONE)");
@@ -699,7 +699,7 @@ class JacksonRenderer extends JavaRenderer {
     }
     annotationsForAccessor(_c, _className, _propertyName, jsonName, p, _isSetter) {
         const superAnnotations = super.annotationsForAccessor(_c, _className, _propertyName, jsonName, p, _isSetter);
-        const annotations = ['@JsonProperty("' + (0, exports.stringEscape)(jsonName) + '")'];
+        const annotations = ['@JsonProperty("' + exports.stringEscape(jsonName) + '")'];
         switch (p.type.kind) {
             case "date-time":
                 this._dateTimeProvider.dateTimeJacksonAnnotations.forEach(annotation => annotations.push(annotation));
@@ -734,7 +734,7 @@ class JacksonRenderer extends JavaRenderer {
             imports.push("com.fasterxml.jackson.annotation.*");
             return imports;
         }
-        return (0, Support_1.assertNever)(t);
+        return Support_1.assertNever(t);
     }
     emitUnionAttributes(_u, unionName) {
         this.emitLine("@JsonDeserialize(using = ", unionName, ".Deserializer.class)");
@@ -766,7 +766,7 @@ class JacksonRenderer extends JavaRenderer {
                     this.emitLine("value.", fieldName, " = UUID.fromString(", parseFrom, ");");
                     break;
                 default:
-                    return (0, Support_1.panic)("Requested type isnt an object!");
+                    return Support_1.panic("Requested type isnt an object!");
             }
         };
         const emitDeserializeType = (t, variableFieldName = "") => {
@@ -868,7 +868,7 @@ class JacksonRenderer extends JavaRenderer {
                 case "date-time":
                     return this._dateTimeProvider.convertDateTimeToString(fieldName);
                 default:
-                    return (0, Support_1.panic)("Requested type doesn't have custom serializer code!");
+                    return Support_1.panic("Requested type doesn't have custom serializer code!");
             }
         };
         const emitSerializeType = (t) => {
@@ -883,7 +883,7 @@ class JacksonRenderer extends JavaRenderer {
                 this.emitLine("return;");
             });
         };
-        const [maybeNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u);
+        const [maybeNull, nonNulls] = TypeUtils_1.removeNullFromUnion(u);
         this.ensureBlankLine();
         this.emitBlock(["static class Deserializer extends JsonDeserializer<", unionName, ">"], () => {
             this.emitLine("@Override");

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

@@ -15,7 +15,7 @@ export declare const javaScriptOptions: {
     converters: EnumOption<ConvertersOptions>;
     rawType: EnumOption<"any" | "json">;
 };
-export type JavaScriptTypeAnnotations = {
+export declare type JavaScriptTypeAnnotations = {
     any: string;
     anyArray: string;
     anyMap: string;
@@ -27,9 +27,9 @@ export type JavaScriptTypeAnnotations = {
 export declare class JavaScriptTargetLanguage extends TargetLanguage {
     constructor(displayName?: string, names?: string[], extension?: string);
     protected getOptions(): Option<any>[];
-    get stringTypeMapping(): StringTypeMapping;
-    get supportsOptionalClassProperties(): boolean;
-    get supportsFullObjectType(): boolean;
+    readonly stringTypeMapping: StringTypeMapping;
+    readonly supportsOptionalClassProperties: boolean;
+    readonly supportsFullObjectType: boolean;
     protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
     }): JavaScriptRenderer;
@@ -54,9 +54,9 @@ export declare class JavaScriptRenderer extends ConvenienceRenderer {
     protected deserializerFunctionLine(_t: Type, name: Name): Sourcelike;
     protected serializerFunctionName(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 emitConvertModuleBody(): void;
     protected emitConvertModuleHelpers(): void;
     protected emitConvertModule(): void;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JavaScriptRenderer = exports.legalizeName = exports.JavaScriptTargetLanguage = exports.javaScriptOptions = void 0;
 const collection_utils_1 = require("collection-utils");
 const TypeUtils_1 = require("../TypeUtils");
 const Acronyms_1 = require("../support/Acronyms");
@@ -14,10 +13,10 @@ const TargetLanguage_1 = require("../TargetLanguage");
 const RendererOptions_1 = require("../RendererOptions");
 const JavaScriptUnicodeMaps_1 = require("./JavaScriptUnicodeMaps");
 exports.javaScriptOptions = {
-    acronymStyle: (0, Acronyms_1.acronymOption)(Acronyms_1.AcronymStyleOptions.Pascal),
+    acronymStyle: Acronyms_1.acronymOption(Acronyms_1.AcronymStyleOptions.Pascal),
     runtimeTypecheck: new RendererOptions_1.BooleanOption("runtime-typecheck", "Verify JSON.parse results at runtime", true),
     runtimeTypecheckIgnoreUnknownProperties: new RendererOptions_1.BooleanOption("runtime-typecheck-ignore-unknown-properties", "Ignore unknown properties when verifying at runtime", false, "secondary"),
-    converters: (0, Converters_1.convertersOption)(),
+    converters: Converters_1.convertersOption(),
     rawType: new RendererOptions_1.EnumOption("raw-type", "Type of raw input (json by default)", [
         ["json", "json"],
         ["any", "any"]
@@ -50,25 +49,24 @@ class JavaScriptTargetLanguage extends TargetLanguage_1.TargetLanguage {
         return true;
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        return new JavaScriptRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.javaScriptOptions, untypedOptionValues));
+        return new JavaScriptRenderer(this, renderContext, RendererOptions_1.getOptionValues(exports.javaScriptOptions, untypedOptionValues));
     }
 }
 exports.JavaScriptTargetLanguage = JavaScriptTargetLanguage;
-exports.legalizeName = (0, Strings_1.utf16LegalizeCharacters)(JavaScriptUnicodeMaps_1.isES3IdentifierPart);
-const identityNamingFunction = (0, Naming_1.funPrefixNamer)("properties", s => s);
+exports.legalizeName = Strings_1.utf16LegalizeCharacters(JavaScriptUnicodeMaps_1.isES3IdentifierPart);
+const identityNamingFunction = Naming_1.funPrefixNamer("properties", s => s);
 class JavaScriptRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _jsOptions;
     constructor(targetLanguage, renderContext, _jsOptions) {
         super(targetLanguage, renderContext);
         this._jsOptions = _jsOptions;
     }
     nameStyle(original, upper) {
-        const acronyms = (0, Acronyms_1.acronymStyle)(this._jsOptions.acronymStyle);
-        const words = (0, Strings_1.splitIntoWords)(original);
-        return (0, Strings_1.combineWords)(words, exports.legalizeName, upper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, upper ? s => (0, Strings_1.capitalize)(acronyms(s)) : Strings_1.allLowerWordStyle, acronyms, "", JavaScriptUnicodeMaps_1.isES3IdentifierStart);
+        const acronyms = Acronyms_1.acronymStyle(this._jsOptions.acronymStyle);
+        const words = Strings_1.splitIntoWords(original);
+        return Strings_1.combineWords(words, exports.legalizeName, upper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, upper ? s => Strings_1.capitalize(acronyms(s)) : Strings_1.allLowerWordStyle, acronyms, "", JavaScriptUnicodeMaps_1.isES3IdentifierStart);
     }
     makeNamedTypeNamer() {
-        return (0, Naming_1.funPrefixNamer)("types", s => this.nameStyle(s, true));
+        return Naming_1.funPrefixNamer("types", s => this.nameStyle(s, true));
     }
     namerForObjectProperty() {
         return identityNamingFunction;
@@ -77,10 +75,10 @@ class JavaScriptRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return null;
     }
     makeEnumCaseNamer() {
-        return (0, Naming_1.funPrefixNamer)("enum-cases", s => this.nameStyle(s, true));
+        return Naming_1.funPrefixNamer("enum-cases", s => this.nameStyle(s, true));
     }
     namedTypeToNameForTopLevel(type) {
-        return (0, TypeUtils_1.directlyReachableSingleNamedType)(type);
+        return TypeUtils_1.directlyReachableSingleNamedType(type);
     }
     makeNameForProperty(c, className, p, jsonName, _assignedName) {
         // Ignore the assigned name
@@ -93,9 +91,9 @@ class JavaScriptRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (["class", "object", "enum"].indexOf(t.kind) >= 0) {
             return ['r("', this.nameForNamedType(t), '")'];
         }
-        return (0, TypeUtils_1.matchType)(t, _anyType => '"any"', _nullType => `null`, _boolType => `true`, _integerType => `0`, _doubleType => `3.14`, _stringType => `""`, arrayType => ["a(", this.typeMapTypeFor(arrayType.items), ")"], _classType => (0, Support_1.panic)("We handled this above"), mapType => ["m(", this.typeMapTypeFor(mapType.values), ")"], _enumType => (0, Support_1.panic)("We handled this above"), unionType => {
+        return TypeUtils_1.matchType(t, _anyType => '"any"', _nullType => `null`, _boolType => `true`, _integerType => `0`, _doubleType => `3.14`, _stringType => `""`, arrayType => ["a(", this.typeMapTypeFor(arrayType.items), ")"], _classType => Support_1.panic("We handled this above"), mapType => ["m(", this.typeMapTypeFor(mapType.values), ")"], _enumType => Support_1.panic("We handled this above"), unionType => {
             const children = Array.from(unionType.getChildren()).map((type) => this.typeMapTypeFor(type));
-            return ["u(", ...(0, collection_utils_1.arrayIntercalate)(", ", children), ")"];
+            return ["u(", ...collection_utils_1.arrayIntercalate(", ", children), ")"];
         }, transformedStringType => {
             if (transformedStringType.kind === "date-time") {
                 return "Date";
@@ -124,7 +122,7 @@ class JavaScriptRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine('"', name, '": o([');
                 this.indent(() => {
                     this.forEachClassProperty(t, "none", (propName, jsonName, property) => {
-                        this.emitLine('{ json: "', (0, Strings_1.utf16StringEscape)(jsonName), '", js: "', (0, Source_1.modifySource)(Strings_1.utf16StringEscape, propName), '", typ: ', this.typeMapTypeForProperty(property), " },");
+                        this.emitLine('{ json: "', Strings_1.utf16StringEscape(jsonName), '", js: "', Source_1.modifySource(Strings_1.utf16StringEscape, propName), '", typ: ', this.typeMapTypeForProperty(property), " },");
                     });
                 });
                 this.emitLine("], ", additional, "),");
@@ -133,7 +131,7 @@ class JavaScriptRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine('"', name, '": [');
                 this.indent(() => {
                     this.forEachEnumCase(e, "none", (_caseName, jsonName) => {
-                        this.emitLine(`"${(0, Strings_1.utf16StringEscape)(jsonName)}",`);
+                        this.emitLine(`"${Strings_1.utf16StringEscape(jsonName)}",`);
                     });
                 });
                 this.emitLine("],");
@@ -147,7 +145,7 @@ class JavaScriptRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return ["function ", this.deserializerFunctionName(name), "(json)"];
     }
     serializerFunctionName(name) {
-        const camelCaseName = (0, Source_1.modifySource)(Strings_1.camelCase, name);
+        const camelCaseName = Source_1.modifySource(Strings_1.camelCase, name);
         return [camelCaseName, "ToJson"];
     }
     serializerFunctionLine(_t, name) {
@@ -399,7 +397,7 @@ function r(name${stringAnnotation}) {
         this.emitUsageImportComment();
         this.emitLine("//");
         this.forEachTopLevel("none", (_t, name) => {
-            const camelCaseName = (0, Source_1.modifySource)(Strings_1.camelCase, name);
+            const camelCaseName = Source_1.modifySource(Strings_1.camelCase, name);
             this.emitLine("//   const ", camelCaseName, " = Convert.to", name, "(json);");
         });
         if (this._jsOptions.runtimeTypecheck) {

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JavaScriptPropTypesRenderer = exports.JavaScriptPropTypesTargetLanguage = exports.javaScriptPropTypesOptions = void 0;
 const TargetLanguage_1 = require("../TargetLanguage");
 const RendererOptions_1 = require("../RendererOptions");
 const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
@@ -15,8 +14,8 @@ const TypeUtils_1 = require("../TypeUtils");
 const collection_utils_1 = require("collection-utils");
 const Type_1 = require("../Type");
 exports.javaScriptPropTypesOptions = {
-    acronymStyle: (0, Acronyms_1.acronymOption)(Acronyms_1.AcronymStyleOptions.Pascal),
-    converters: (0, Converters_1.convertersOption)(),
+    acronymStyle: Acronyms_1.acronymOption(Acronyms_1.AcronymStyleOptions.Pascal),
+    converters: Converters_1.convertersOption(),
     moduleSystem: new RendererOptions_1.EnumOption("module-system", "Which module system to use", [
         ["common-js", false],
         ["es6", true]
@@ -30,24 +29,23 @@ class JavaScriptPropTypesTargetLanguage extends TargetLanguage_1.TargetLanguage
         super(displayName, names, extension);
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        return new JavaScriptPropTypesRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.javaScriptPropTypesOptions, untypedOptionValues));
+        return new JavaScriptPropTypesRenderer(this, renderContext, RendererOptions_1.getOptionValues(exports.javaScriptPropTypesOptions, untypedOptionValues));
     }
 }
 exports.JavaScriptPropTypesTargetLanguage = JavaScriptPropTypesTargetLanguage;
-const identityNamingFunction = (0, Naming_1.funPrefixNamer)("properties", s => s);
+const identityNamingFunction = Naming_1.funPrefixNamer("properties", s => s);
 class JavaScriptPropTypesRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _jsOptions;
     constructor(targetLanguage, renderContext, _jsOptions) {
         super(targetLanguage, renderContext);
         this._jsOptions = _jsOptions;
     }
     nameStyle(original, upper) {
-        const acronyms = (0, Acronyms_1.acronymStyle)(this._jsOptions.acronymStyle);
-        const words = (0, __1.splitIntoWords)(original);
-        return (0, __1.combineWords)(words, JavaScript_1.legalizeName, upper ? __1.firstUpperWordStyle : Strings_1.allLowerWordStyle, __1.firstUpperWordStyle, upper ? s => (0, __1.capitalize)(acronyms(s)) : Strings_1.allLowerWordStyle, acronyms, "", JavaScriptUnicodeMaps_1.isES3IdentifierStart);
+        const acronyms = Acronyms_1.acronymStyle(this._jsOptions.acronymStyle);
+        const words = __1.splitIntoWords(original);
+        return __1.combineWords(words, JavaScript_1.legalizeName, upper ? __1.firstUpperWordStyle : Strings_1.allLowerWordStyle, __1.firstUpperWordStyle, upper ? s => __1.capitalize(acronyms(s)) : Strings_1.allLowerWordStyle, acronyms, "", JavaScriptUnicodeMaps_1.isES3IdentifierStart);
     }
     makeNamedTypeNamer() {
-        return (0, Naming_1.funPrefixNamer)("types", s => this.nameStyle(s, true));
+        return Naming_1.funPrefixNamer("types", s => this.nameStyle(s, true));
     }
     namerForObjectProperty() {
         return identityNamingFunction;
@@ -56,10 +54,10 @@ class JavaScriptPropTypesRenderer extends ConvenienceRenderer_1.ConvenienceRende
         return null;
     }
     makeEnumCaseNamer() {
-        return (0, Naming_1.funPrefixNamer)("enum-cases", s => this.nameStyle(s, false));
+        return Naming_1.funPrefixNamer("enum-cases", s => this.nameStyle(s, false));
     }
     namedTypeToNameForTopLevel(type) {
-        return (0, TypeUtils_1.directlyReachableSingleNamedType)(type);
+        return TypeUtils_1.directlyReachableSingleNamedType(type);
     }
     makeNameForProperty(c, className, p, jsonName, _assignedName) {
         // Ignore the assigned name
@@ -69,9 +67,9 @@ class JavaScriptPropTypesRenderer extends ConvenienceRenderer_1.ConvenienceRende
         if (["class", "object", "enum"].indexOf(t.kind) >= 0) {
             return ["_", this.nameForNamedType(t)];
         }
-        const match = (0, __1.matchType)(t, _anyType => "PropTypes.any", _nullType => "PropTypes.any", _boolType => "PropTypes.bool", _integerType => "PropTypes.number", _doubleType => "PropTypes.number", _stringType => "PropTypes.string", arrayType => ["PropTypes.arrayOf(", this.typeMapTypeFor(arrayType.items, false), ")"], _classType => (0, __1.panic)("Should already be handled."), _mapType => "PropTypes.object", _enumType => (0, __1.panic)("Should already be handled."), unionType => {
+        const match = __1.matchType(t, _anyType => "PropTypes.any", _nullType => "PropTypes.any", _boolType => "PropTypes.bool", _integerType => "PropTypes.number", _doubleType => "PropTypes.number", _stringType => "PropTypes.string", arrayType => ["PropTypes.arrayOf(", this.typeMapTypeFor(arrayType.items, false), ")"], _classType => __1.panic("Should already be handled."), _mapType => "PropTypes.object", _enumType => __1.panic("Should already be handled."), unionType => {
             const children = Array.from(unionType.getChildren()).map((type) => this.typeMapTypeFor(type, false));
-            return ["PropTypes.oneOfType([", ...(0, collection_utils_1.arrayIntercalate)(", ", children), "])"];
+            return ["PropTypes.oneOfType([", ...collection_utils_1.arrayIntercalate(", ", children), "])"];
         }, _transformedStringType => {
             return "PropTypes.string";
         });
@@ -194,7 +192,7 @@ class JavaScriptPropTypesRenderer extends ConvenienceRenderer_1.ConvenienceRende
         this.emitLine("_", name, " = PropTypes.shape({");
         this.indent(() => {
             this.forEachClassProperty(t, "none", (_, jsonName, property) => {
-                this.emitLine(`"${(0, Strings_1.utf16StringEscape)(jsonName)}"`, ": ", this.typeMapTypeForProperty(property), ",");
+                this.emitLine(`"${Strings_1.utf16StringEscape(jsonName)}"`, ": ", this.typeMapTypeForProperty(property), ",");
             });
         });
         this.emitLine("});");