quicktype 17.0.4 → 17.0.6

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CrystalRenderer = exports.CrystalTargetLanguage = void 0;
 const TargetLanguage_1 = require("../TargetLanguage");
 const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
 const Strings_1 = require("../support/Strings");
@@ -162,35 +161,35 @@ const keywords = [
     "yield"
 ];
 function 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);
 }
 function 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 crystalStyle(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) => crystalStyle(original, true));
-const camelNamingFunction = (0, Naming_1.funPrefixNamer)("camel", (original) => crystalStyle(original, false));
+const snakeNamingFunction = Naming_1.funPrefixNamer("default", (original) => crystalStyle(original, true));
+const camelNamingFunction = Naming_1.funPrefixNamer("camel", (original) => crystalStyle(original, false));
 function standardUnicodeCrystalEscape(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 crystalStringEscape = (0, Strings_1.utf32ConcatMap)((0, Strings_1.escapeNonPrintableMapper)(Strings_1.isPrintable, standardUnicodeCrystalEscape));
+const crystalStringEscape = Strings_1.utf32ConcatMap(Strings_1.escapeNonPrintableMapper(Strings_1.isPrintable, standardUnicodeCrystalEscape));
 class CrystalRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     constructor(targetLanguage, renderContext) {
         super(targetLanguage, renderContext);
@@ -230,11 +229,11 @@ class CrystalRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return kind === "array" || kind === "map";
     }
     crystalType(t, withIssues = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, "JSON::Any?"), _nullType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, "Nil"), _boolType => "Bool", _integerType => "Int32", _doubleType => "Float64", _stringType => "String", arrayType => ["Array(", this.crystalType(arrayType.items, withIssues), ")"], classType => this.nameForNamedType(classType), mapType => ["Hash(String, ", this.crystalType(mapType.values, withIssues), ")"], _enumType => "String", unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, "JSON::Any?"), _nullType => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, "Nil"), _boolType => "Bool", _integerType => "Int32", _doubleType => "Float64", _stringType => "String", arrayType => ["Array(", this.crystalType(arrayType.items, withIssues), ")"], classType => this.nameForNamedType(classType), mapType => ["Hash(String, ", this.crystalType(mapType.values, withIssues), ")"], _enumType => "String", unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null)
                 return this.nullableCrystalType(nullable, withIssues);
-            const [hasNull] = (0, TypeUtils_1.removeNullFromUnion)(unionType);
+            const [hasNull] = TypeUtils_1.removeNullFromUnion(unionType);
             const name = this.nameForNamedType(unionType);
             return hasNull !== null ? [name, "?"] : name;
         });
@@ -274,12 +273,12 @@ class CrystalRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("end");
     }
     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 crystalType = this.breakCycle(t, true);

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

@@ -21,8 +21,8 @@ export declare const dartOptions: {
 export declare class DartTargetLanguage extends TargetLanguage {
     constructor();
     protected getOptions(): Option<any>[];
-    get supportsUnionsWithBothNumberTypes(): boolean;
-    get stringTypeMapping(): StringTypeMapping;
+    readonly supportsUnionsWithBothNumberTypes: boolean;
+    readonly stringTypeMapping: StringTypeMapping;
     protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
     }): DartRenderer;
@@ -44,8 +44,8 @@ export declare class DartRenderer extends ConvenienceRenderer {
     protected makeEnumCaseNamer(): Namer;
     protected unionNeedsName(u: UnionType): boolean;
     protected namedTypeToNameForTopLevel(type: Type): Type | undefined;
-    protected get toJson(): string;
-    protected get fromJson(): string;
+    protected readonly toJson: string;
+    protected readonly fromJson: string;
     protected makeTopLevelDependencyNames(_t: Type, name: Name): DependencyName[];
     protected makeNamesForPropertyGetterAndSetter(_c: ClassType, _className: Name, _p: ClassProperty, _jsonName: string, name: Name): [Name, Name];
     protected makePropertyDependencyNames(c: ClassType, className: Name, p: ClassProperty, jsonName: string, name: Name): Name[];

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DartRenderer = exports.DartTargetLanguage = exports.dartOptions = void 0;
 const Type_1 = require("../Type");
 const TypeUtils_1 = require("../TypeUtils");
 const Source_1 = require("../Source");
@@ -53,7 +52,7 @@ class DartTargetLanguage extends TargetLanguage_1.TargetLanguage {
         return mapping;
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        const options = (0, RendererOptions_1.getOptionValues)(exports.dartOptions, untypedOptionValues);
+        const options = RendererOptions_1.getOptionValues(exports.dartOptions, untypedOptionValues);
         return new DartRenderer(this, renderContext, options);
     }
 }
@@ -129,45 +128,44 @@ const keywords = [
     "fromMap",
     "toMap"
 ];
-const typeNamingFunction = (0, Naming_1.funPrefixNamer)("types", n => dartNameStyle(true, false, n));
-const propertyNamingFunction = (0, Naming_1.funPrefixNamer)("properties", n => dartNameStyle(false, false, n));
-const enumCaseNamingFunction = (0, Naming_1.funPrefixNamer)("enum-cases", n => dartNameStyle(true, true, n));
+const typeNamingFunction = Naming_1.funPrefixNamer("types", n => dartNameStyle(true, false, n));
+const propertyNamingFunction = Naming_1.funPrefixNamer("properties", n => dartNameStyle(false, false, n));
+const enumCaseNamingFunction = Naming_1.funPrefixNamer("enum-cases", n => dartNameStyle(true, true, n));
 // Escape the dollar sign, which is used in string interpolation
-const stringEscape = (0, Strings_1.utf16ConcatMap)((0, Strings_1.escapeNonPrintableMapper)(cp => (0, Strings_1.isPrintable)(cp) && cp !== 0x24, Strings_1.standardUnicodeHexEscape));
+const stringEscape = Strings_1.utf16ConcatMap(Strings_1.escapeNonPrintableMapper(cp => Strings_1.isPrintable(cp) && cp !== 0x24, Strings_1.standardUnicodeHexEscape));
 function isStartCharacter(codePoint) {
     if (codePoint === 0x5f)
         return false; // 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);
 // FIXME: Handle acronyms consistently.  In particular, that means that
 // we have to use namers to produce the getter and setter names - we can't
 // just capitalize and concatenate.
 // https://stackoverflow.com/questions/8277355/naming-convention-for-upper-case-abbreviations
 function dartNameStyle(startWithUpper, upperUnderscore, original) {
-    const words = (0, Strings_1.splitIntoWords)(original);
+    const words = Strings_1.splitIntoWords(original);
     const firstWordStyle = upperUnderscore
         ? Strings_1.allUpperWordStyle
         : startWithUpper
             ? Strings_1.firstUpperWordStyle
             : Strings_1.allLowerWordStyle;
     const restWordStyle = upperUnderscore ? Strings_1.allUpperWordStyle : Strings_1.firstUpperWordStyle;
-    return (0, Strings_1.combineWords)(words, legalizeName, firstWordStyle, restWordStyle, firstWordStyle, restWordStyle, upperUnderscore ? "_" : "", isStartCharacter);
+    return Strings_1.combineWords(words, legalizeName, firstWordStyle, restWordStyle, firstWordStyle, restWordStyle, upperUnderscore ? "_" : "", isStartCharacter);
 }
 class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _options;
-    _gettersAndSettersForPropertyName = new Map();
-    _needEnumValues = false;
-    classCounter = 0;
-    classPropertyCounter = 0;
-    _topLevelDependents = new Map();
-    _enumValues = new Map();
     constructor(targetLanguage, renderContext, _options) {
         super(targetLanguage, renderContext);
         this._options = _options;
+        this._gettersAndSettersForPropertyName = new Map();
+        this._needEnumValues = false;
+        this.classCounter = 0;
+        this.classPropertyCounter = 0;
+        this._topLevelDependents = new Map();
+        this._enumValues = new Map();
     }
     forbiddenNamesForGlobalNamespace() {
         return keywords;
@@ -188,13 +186,13 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return 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);
     }
     get toJson() {
         return `to${this._options.methodNamesWithMap ? "Map" : "Json"}`;
@@ -234,8 +232,8 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("// To parse this JSON data, do");
         this.emitLine("//");
         this.forEachTopLevel("none", (_t, name) => {
-            const { decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
-            this.emitLine("//     final ", (0, Source_1.modifySource)(Strings_1.decapitalize, name), " = ", decoder, "(jsonString);");
+            const { decoder } = Support_1.defined(this._topLevelDependents.get(name));
+            this.emitLine("//     final ", Source_1.modifySource(Strings_1.decapitalize, name), " = ", decoder, "(jsonString);");
         });
         this.ensureBlankLine();
         if (this._options.requiredProperties) {
@@ -252,7 +250,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.ensureBlankLine();
             const optionNameIsEmpty = this._options.partName.length === 0;
             // FIXME: This should use a `Name`, not `modifySource`
-            const name = (0, Source_1.modifySource)(Strings_1.snakeCase, optionNameIsEmpty ? [...this.topLevels.keys()][0] : this._options.partName);
+            const name = Source_1.modifySource(Strings_1.snakeCase, optionNameIsEmpty ? [...this.topLevels.keys()][0] : this._options.partName);
             if (this._options.useFreezed) {
                 this.emitLine("part '", name, ".freezed.dart';");
             }
@@ -270,7 +268,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("}");
     }
     dartType(t, withIssues = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, "dynamic"), _nullType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, "dynamic"), _boolType => {
+        return TypeUtils_1.matchType(t, _anyType => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, "dynamic"), _nullType => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, "dynamic"), _boolType => {
             if (this._options.nullSafety) {
                 return ["bool", "?"];
             }
@@ -311,7 +309,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
             return this.nameForNamedType(enumType);
         }, unionType => {
-            const maybeNullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const maybeNullable = TypeUtils_1.nullableFromUnion(unionType);
             if (maybeNullable === null) {
                 return "dynamic";
             }
@@ -339,15 +337,15 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return ["Map.from(", map, ").map((k, v) => MapEntry<String, ", valueType, ">(k, ", valueMapper, "))"];
     }
     fromDynamicExpression(t, ...dynamic) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => dynamic, _nullType => dynamic, // FIXME: check null
+        return TypeUtils_1.matchType(t, _anyType => dynamic, _nullType => dynamic, // FIXME: check null
         // FIXME: check null
         _boolType => dynamic, _integerType => dynamic, _doubleType => [dynamic, ".toDouble()"], _stringType => dynamic, arrayType => this.mapList(this.dartType(arrayType.items), dynamic, this.fromDynamicExpression(arrayType.items, "x")), classType => [this.nameForNamedType(classType), ".", this.fromJson, "(", dynamic, ")"], mapType => this.mapMap(this.dartType(mapType.values), dynamic, this.fromDynamicExpression(mapType.values, "v")), enumType => {
             if (this._options.nullSafety) {
-                return [(0, Support_1.defined)(this._enumValues.get(enumType)), "!.map[", dynamic, "]"];
+                return [Support_1.defined(this._enumValues.get(enumType)), "!.map[", dynamic, "]"];
             }
-            return [(0, Support_1.defined)(this._enumValues.get(enumType)), ".map[", dynamic, "]"];
+            return [Support_1.defined(this._enumValues.get(enumType)), ".map[", dynamic, "]"];
         }, unionType => {
-            const maybeNullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const maybeNullable = TypeUtils_1.nullableFromUnion(unionType);
             if (maybeNullable === null) {
                 return dynamic;
             }
@@ -366,18 +364,18 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     toDynamicExpression(t, ...dynamic) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => dynamic, _nullType => dynamic, _boolType => dynamic, _integerType => dynamic, _doubleType => dynamic, _stringType => dynamic, arrayType => this.mapList("dynamic", dynamic, this.toDynamicExpression(arrayType.items, "x")), _classType => {
+        return TypeUtils_1.matchType(t, _anyType => dynamic, _nullType => dynamic, _boolType => dynamic, _integerType => dynamic, _doubleType => dynamic, _stringType => dynamic, arrayType => this.mapList("dynamic", dynamic, this.toDynamicExpression(arrayType.items, "x")), _classType => {
             if (this._options.nullSafety) {
                 return [dynamic, "!.", this.toJson, "()"];
             }
             return [dynamic, ".", this.toJson, "()"];
         }, mapType => this.mapMap("dynamic", dynamic, this.toDynamicExpression(mapType.values, "v")), enumType => {
             if (this._options.nullSafety) {
-                return [(0, Support_1.defined)(this._enumValues.get(enumType)), ".reverse![", dynamic, "]"];
+                return [Support_1.defined(this._enumValues.get(enumType)), ".reverse![", dynamic, "]"];
             }
-            return [(0, Support_1.defined)(this._enumValues.get(enumType)), ".reverse[", dynamic, "]"];
+            return [Support_1.defined(this._enumValues.get(enumType)), ".reverse[", dynamic, "]"];
         }, unionType => {
-            const maybeNullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const maybeNullable = TypeUtils_1.nullableFromUnion(unionType);
             if (maybeNullable === null) {
                 return dynamic;
             }
@@ -524,11 +522,11 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     emitEnumDefinition(e, enumName) {
         const caseNames = Array.from(e.cases).map(c => this.nameForEnumCase(e, c));
         this.emitDescription(this.descriptionForType(e));
-        this.emitLine("enum ", enumName, " { ", (0, collection_utils_1.arrayIntercalate)(", ", caseNames), " }");
+        this.emitLine("enum ", enumName, " { ", collection_utils_1.arrayIntercalate(", ", caseNames), " }");
         if (this._options.justTypes)
             return;
         this.ensureBlankLine();
-        this.emitLine("final ", (0, Support_1.defined)(this._enumValues.get(e)), " = EnumValues({");
+        this.emitLine("final ", Support_1.defined(this._enumValues.get(e)), " = EnumValues({");
         this.indent(() => {
             this.forEachEnumCase(e, "none", (name, jsonName, pos) => {
                 const comma = pos === "first" || pos === "middle" ? "," : [];
@@ -556,7 +554,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitFileHeader();
         if (!this._options.justTypes && !this._options.codersInClass) {
             this.forEachTopLevel("leading-and-interposing", (t, name) => {
-                const { encoder, decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
+                const { encoder, decoder } = Support_1.defined(this._topLevelDependents.get(name));
                 this.emitLine(this.dartType(t), " ", decoder, "(String str) => ", this.fromDynamicExpression(t, "json.decode(str)"), ";");
                 this.ensureBlankLine();
                 this.emitLine("String ", encoder, "(", this.dartType(t), " data) => json.encode(", this.toDynamicExpression(t, "data"), ");");

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

@@ -13,8 +13,8 @@ export declare const elmOptions: {
 export declare class ElmTargetLanguage extends TargetLanguage {
     constructor();
     protected getOptions(): Option<any>[];
-    get supportsOptionalClassProperties(): boolean;
-    get supportsUnionsWithBothNumberTypes(): boolean;
+    readonly supportsOptionalClassProperties: boolean;
+    readonly supportsUnionsWithBothNumberTypes: boolean;
     protected makeRenderer(renderContext: RenderContext, untypedOptionValues: {
         [name: string]: any;
     }): ElmRenderer;
@@ -31,13 +31,13 @@ export declare class ElmRenderer extends ConvenienceRenderer {
     protected namerForObjectProperty(): Namer;
     protected forbiddenForObjectProperties(_c: ClassType, _className: Name): ForbiddenWordsInfo;
     protected makeUnionMemberNamer(): Namer;
-    protected get unionMembersInGlobalNamespace(): boolean;
+    protected readonly unionMembersInGlobalNamespace: boolean;
     protected makeEnumCaseNamer(): Namer;
-    protected get enumCasesInGlobalNamespace(): boolean;
+    protected readonly enumCasesInGlobalNamespace: boolean;
     protected proposeUnionMemberName(u: UnionType, unionName: Name, fieldType: Type, lookup: (n: Name) => string): string;
-    protected get commentLineStart(): string;
+    protected readonly commentLineStart: string;
     protected emitDescriptionBlock(lines: Sourcelike[]): void;
-    private get arrayType();
+    private readonly arrayType;
     private elmType;
     private elmProperty;
     private decoderNameForNamedType;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElmRenderer = exports.ElmTargetLanguage = exports.elmOptions = void 0;
 const collection_utils_1 = require("collection-utils");
 const TargetLanguage_1 = require("../TargetLanguage");
 const RendererOptions_1 = require("../RendererOptions");
@@ -35,7 +34,7 @@ class ElmTargetLanguage extends TargetLanguage_1.TargetLanguage {
         return true;
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        return new ElmRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.elmOptions, untypedOptionValues));
+        return new ElmRenderer(this, renderContext, RendererOptions_1.getOptionValues(exports.elmOptions, untypedOptionValues));
     }
 }
 exports.ElmTargetLanguage = ElmTargetLanguage;
@@ -79,19 +78,19 @@ const forbiddenNames = [
     "String",
     "Float"
 ];
-const legalizeName = (0, Strings_1.legalizeCharacters)(cp => (0, Strings_1.isAscii)(cp) && (0, Strings_1.isLetterOrUnderscoreOrDigit)(cp));
+const legalizeName = Strings_1.legalizeCharacters(cp => Strings_1.isAscii(cp) && Strings_1.isLetterOrUnderscoreOrDigit(cp));
 function elmNameStyle(original, upper) {
-    const words = (0, Strings_1.splitIntoWords)(original);
-    return (0, Strings_1.combineWords)(words, legalizeName, upper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, upper ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.allUpperWordStyle, "", Strings_1.isLetterOrUnderscore);
+    const words = Strings_1.splitIntoWords(original);
+    return Strings_1.combineWords(words, legalizeName, upper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, upper ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.allUpperWordStyle, "", Strings_1.isLetterOrUnderscore);
 }
-const upperNamingFunction = (0, Naming_1.funPrefixNamer)("upper", n => elmNameStyle(n, true));
-const lowerNamingFunction = (0, Naming_1.funPrefixNamer)("lower", n => elmNameStyle(n, false));
+const upperNamingFunction = Naming_1.funPrefixNamer("upper", n => elmNameStyle(n, true));
+const lowerNamingFunction = Naming_1.funPrefixNamer("lower", n => elmNameStyle(n, false));
 function requiredOrOptional(p) {
     function optional(fallback) {
         return { reqOrOpt: "Jpipe.optional", fallback };
     }
     const t = p.type;
-    if (p.isOptional || (t instanceof Type_1.UnionType && (0, TypeUtils_1.nullableFromUnion)(t) !== null)) {
+    if (p.isOptional || (t instanceof Type_1.UnionType && TypeUtils_1.nullableFromUnion(t) !== null)) {
         return optional(" Nothing");
     }
     if (t.kind === "null") {
@@ -100,12 +99,11 @@ function requiredOrOptional(p) {
     return { reqOrOpt: "Jpipe.required", fallback: "" };
 }
 class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _options;
-    _topLevelDependents = new Map();
-    _namedTypeDependents = new Map();
     constructor(targetLanguage, renderContext, _options) {
         super(targetLanguage, renderContext);
         this._options = _options;
+        this._topLevelDependents = new Map();
+        this._namedTypeDependents = new Map();
     }
     forbiddenNamesForGlobalNamespace() {
         return forbiddenNames;
@@ -168,20 +166,20 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return this._options.useList ? "List" : "Array";
     }
     elmType(t, noOptional = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.singleWord)((0, Source_1.annotated)(Annotation_1.anyTypeIssueAnnotation, "Jdec.Value")), _nullType => (0, Source_1.singleWord)((0, Source_1.annotated)(Annotation_1.nullTypeIssueAnnotation, "()")), _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.multiWord)(" ", this.arrayType, (0, Source_1.parenIfNeeded)(this.elmType(arrayType.items))), classType => (0, Source_1.singleWord)(this.nameForNamedType(classType)), mapType => (0, Source_1.multiWord)(" ", "Dict String", (0, Source_1.parenIfNeeded)(this.elmType(mapType.values))), enumType => (0, Source_1.singleWord)(this.nameForNamedType(enumType)), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => Source_1.singleWord(Source_1.annotated(Annotation_1.anyTypeIssueAnnotation, "Jdec.Value")), _nullType => Source_1.singleWord(Source_1.annotated(Annotation_1.nullTypeIssueAnnotation, "()")), _boolType => Source_1.singleWord("Bool"), _integerType => Source_1.singleWord("Int"), _doubleType => Source_1.singleWord("Float"), _stringType => Source_1.singleWord("String"), arrayType => Source_1.multiWord(" ", this.arrayType, Source_1.parenIfNeeded(this.elmType(arrayType.items))), classType => Source_1.singleWord(this.nameForNamedType(classType)), mapType => Source_1.multiWord(" ", "Dict String", Source_1.parenIfNeeded(this.elmType(mapType.values))), enumType => Source_1.singleWord(this.nameForNamedType(enumType)), unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 const nullableType = this.elmType(nullable);
                 if (noOptional)
                     return nullableType;
-                return (0, Source_1.multiWord)(" ", "Maybe", (0, Source_1.parenIfNeeded)(nullableType));
+                return Source_1.multiWord(" ", "Maybe", Source_1.parenIfNeeded(nullableType));
             }
-            return (0, Source_1.singleWord)(this.nameForNamedType(unionType));
+            return Source_1.singleWord(this.nameForNamedType(unionType));
         });
     }
     elmProperty(p) {
         if (p.isOptional) {
-            return (0, Source_1.multiWord)(" ", "Maybe", (0, Source_1.parenIfNeeded)(this.elmType(p.type, true))).source;
+            return Source_1.multiWord(" ", "Maybe", Source_1.parenIfNeeded(this.elmType(p.type, true))).source;
         }
         else {
             return this.elmType(p.type).source;
@@ -189,23 +187,23 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     decoderNameForNamedType(t) {
         const name = this.nameForNamedType(t);
-        return (0, Support_1.defined)(this._namedTypeDependents.get(name)).decoder;
+        return Support_1.defined(this._namedTypeDependents.get(name)).decoder;
     }
     decoderNameForType(t, noOptional = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.singleWord)("Jdec.value"), _nullType => (0, Source_1.multiWord)(" ", "Jdec.null", "()"), _boolType => (0, Source_1.singleWord)("Jdec.bool"), _integerType => (0, Source_1.singleWord)("Jdec.int"), _doubleType => (0, Source_1.singleWord)("Jdec.float"), _stringType => (0, Source_1.singleWord)("Jdec.string"), arrayType => (0, Source_1.multiWord)(" ", ["Jdec.", (0, Strings_1.decapitalize)(this.arrayType)], (0, Source_1.parenIfNeeded)(this.decoderNameForType(arrayType.items))), classType => (0, Source_1.singleWord)(this.decoderNameForNamedType(classType)), mapType => (0, Source_1.multiWord)(" ", "Jdec.dict", (0, Source_1.parenIfNeeded)(this.decoderNameForType(mapType.values))), enumType => (0, Source_1.singleWord)(this.decoderNameForNamedType(enumType)), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => Source_1.singleWord("Jdec.value"), _nullType => Source_1.multiWord(" ", "Jdec.null", "()"), _boolType => Source_1.singleWord("Jdec.bool"), _integerType => Source_1.singleWord("Jdec.int"), _doubleType => Source_1.singleWord("Jdec.float"), _stringType => Source_1.singleWord("Jdec.string"), arrayType => Source_1.multiWord(" ", ["Jdec.", Strings_1.decapitalize(this.arrayType)], Source_1.parenIfNeeded(this.decoderNameForType(arrayType.items))), classType => Source_1.singleWord(this.decoderNameForNamedType(classType)), mapType => Source_1.multiWord(" ", "Jdec.dict", Source_1.parenIfNeeded(this.decoderNameForType(mapType.values))), enumType => Source_1.singleWord(this.decoderNameForNamedType(enumType)), unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 const nullableDecoder = this.decoderNameForType(nullable);
                 if (noOptional)
                     return nullableDecoder;
-                return (0, Source_1.multiWord)(" ", "Jdec.nullable", (0, Source_1.parenIfNeeded)(nullableDecoder));
+                return Source_1.multiWord(" ", "Jdec.nullable", Source_1.parenIfNeeded(nullableDecoder));
             }
-            return (0, Source_1.singleWord)(this.decoderNameForNamedType(unionType));
+            return Source_1.singleWord(this.decoderNameForNamedType(unionType));
         });
     }
     decoderNameForProperty(p) {
         if (p.isOptional) {
-            return (0, Source_1.multiWord)(" ", "Jdec.nullable", (0, Source_1.parenIfNeeded)(this.decoderNameForType(p.type, true)));
+            return Source_1.multiWord(" ", "Jdec.nullable", Source_1.parenIfNeeded(this.decoderNameForType(p.type, true)));
         }
         else {
             return this.decoderNameForType(p.type);
@@ -213,23 +211,23 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     encoderNameForNamedType(t) {
         const name = this.nameForNamedType(t);
-        return (0, Support_1.defined)(this._namedTypeDependents.get(name)).encoder;
+        return Support_1.defined(this._namedTypeDependents.get(name)).encoder;
     }
     encoderNameForType(t, noOptional = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.singleWord)("identity"), _nullType => (0, Source_1.multiWord)(" ", "always", "Jenc.null"), _boolType => (0, Source_1.singleWord)("Jenc.bool"), _integerType => (0, Source_1.singleWord)("Jenc.int"), _doubleType => (0, Source_1.singleWord)("Jenc.float"), _stringType => (0, Source_1.singleWord)("Jenc.string"), arrayType => (0, Source_1.multiWord)(" ", ["make", this.arrayType, "Encoder"], (0, Source_1.parenIfNeeded)(this.encoderNameForType(arrayType.items))), classType => (0, Source_1.singleWord)(this.encoderNameForNamedType(classType)), mapType => (0, Source_1.multiWord)(" ", "makeDictEncoder", (0, Source_1.parenIfNeeded)(this.encoderNameForType(mapType.values))), enumType => (0, Source_1.singleWord)(this.encoderNameForNamedType(enumType)), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => Source_1.singleWord("identity"), _nullType => Source_1.multiWord(" ", "always", "Jenc.null"), _boolType => Source_1.singleWord("Jenc.bool"), _integerType => Source_1.singleWord("Jenc.int"), _doubleType => Source_1.singleWord("Jenc.float"), _stringType => Source_1.singleWord("Jenc.string"), arrayType => Source_1.multiWord(" ", ["make", this.arrayType, "Encoder"], Source_1.parenIfNeeded(this.encoderNameForType(arrayType.items))), classType => Source_1.singleWord(this.encoderNameForNamedType(classType)), mapType => Source_1.multiWord(" ", "makeDictEncoder", Source_1.parenIfNeeded(this.encoderNameForType(mapType.values))), enumType => Source_1.singleWord(this.encoderNameForNamedType(enumType)), unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 const nullableEncoder = this.encoderNameForType(nullable);
                 if (noOptional)
                     return nullableEncoder;
-                return (0, Source_1.multiWord)(" ", "makeNullableEncoder", (0, Source_1.parenIfNeeded)(nullableEncoder));
+                return Source_1.multiWord(" ", "makeNullableEncoder", Source_1.parenIfNeeded(nullableEncoder));
             }
-            return (0, Source_1.singleWord)(this.encoderNameForNamedType(unionType));
+            return Source_1.singleWord(this.encoderNameForNamedType(unionType));
         });
     }
     encoderNameForProperty(p) {
         if (p.isOptional) {
-            return (0, Source_1.multiWord)(" ", "makeNullableEncoder", (0, Source_1.parenIfNeeded)(this.encoderNameForType(p.type, true)));
+            return Source_1.multiWord(" ", "makeNullableEncoder", Source_1.parenIfNeeded(this.encoderNameForType(p.type, true)));
         }
         else {
             return this.encoderNameForType(p.type);
@@ -290,17 +288,17 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     this.emitLine(equalsOrPipe, " ", constructor);
                 }
                 else {
-                    this.emitLine(equalsOrPipe, " ", constructor, " ", (0, Source_1.parenIfNeeded)(this.elmType(t)));
+                    this.emitLine(equalsOrPipe, " ", constructor, " ", Source_1.parenIfNeeded(this.elmType(t)));
                 }
                 onFirst = false;
             });
         });
     }
     emitTopLevelFunctions(t, topLevelName) {
-        const { encoder, decoder } = (0, Support_1.defined)(this._topLevelDependents.get(topLevelName));
+        const { encoder, decoder } = Support_1.defined(this._topLevelDependents.get(topLevelName));
         if (this.namedTypeToNameForTopLevel(t) === undefined) {
-            this.emitLine((0, Support_1.defined)(decoder), " : Jdec.Decoder ", topLevelName);
-            this.emitLine((0, Support_1.defined)(decoder), " = ", this.decoderNameForType(t).source);
+            this.emitLine(Support_1.defined(decoder), " : Jdec.Decoder ", topLevelName);
+            this.emitLine(Support_1.defined(decoder), " = ", this.decoderNameForType(t).source);
             this.ensureBlankLine();
         }
         this.emitLine(encoder, " : ", topLevelName, " -> String");
@@ -314,9 +312,9 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine("Jpipe.decode ", className);
             this.indent(() => {
                 this.forEachClassProperty(c, "none", (_, jsonName, p) => {
-                    const propDecoder = (0, Source_1.parenIfNeeded)(this.decoderNameForProperty(p));
+                    const propDecoder = Source_1.parenIfNeeded(this.decoderNameForProperty(p));
                     const { reqOrOpt, fallback } = requiredOrOptional(p);
-                    this.emitLine("|> ", reqOrOpt, ' "', (0, Strings_1.stringEscape)(jsonName), '" ', propDecoder, fallback);
+                    this.emitLine("|> ", reqOrOpt, ' "', Strings_1.stringEscape(jsonName), '" ', propDecoder, fallback);
                 });
             });
         });
@@ -331,7 +329,7 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.forEachClassProperty(c, "none", (name, jsonName, p) => {
                     const bracketOrComma = onFirst ? "[" : ",";
                     const propEncoder = this.encoderNameForProperty(p).source;
-                    this.emitLine(bracketOrComma, ' ("', (0, Strings_1.stringEscape)(jsonName), '", ', propEncoder, " x.", name, ")");
+                    this.emitLine(bracketOrComma, ' ("', Strings_1.stringEscape(jsonName), '", ', propEncoder, " x.", name, ")");
                     onFirst = false;
                 });
                 if (onFirst) {
@@ -353,7 +351,7 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     this.emitLine("case str of");
                     this.indent(() => {
                         this.forEachEnumCase(e, "none", (name, jsonName) => {
-                            this.emitLine('"', (0, Strings_1.stringEscape)(jsonName), '" -> Jdec.succeed ', name);
+                            this.emitLine('"', Strings_1.stringEscape(jsonName), '" -> Jdec.succeed ', name);
                         });
                         this.emitLine('somethingElse -> Jdec.fail <| "Invalid ', enumName, ': " ++ somethingElse');
                     });
@@ -367,7 +365,7 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine(encoderName, " x = case x of");
         this.indent(() => {
             this.forEachEnumCase(e, "none", (name, jsonName) => {
-                this.emitLine(name, ' -> Jenc.string "', (0, Strings_1.stringEscape)(jsonName), '"');
+                this.emitLine(name, ' -> Jenc.string "', Strings_1.stringEscape(jsonName), '"');
             });
         });
     }
@@ -398,7 +396,7 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                         this.emitLine(bracketOrComma, " Jdec.null ", constructor);
                     }
                     else {
-                        const decoder = (0, Source_1.parenIfNeeded)(this.decoderNameForType(t));
+                        const decoder = Source_1.parenIfNeeded(this.decoderNameForType(t));
                         this.emitLine(bracketOrComma, " Jdec.map ", constructor, " ", decoder);
                     }
                     onFirst = false;
@@ -426,23 +424,23 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         const exports = [];
         const topLevelDecoders = [];
         this.forEachTopLevel("none", (_, name) => {
-            let { encoder, decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
+            let { encoder, decoder } = Support_1.defined(this._topLevelDependents.get(name));
             if (decoder === undefined) {
-                decoder = (0, Support_1.defined)(this._namedTypeDependents.get(name)).decoder;
+                decoder = Support_1.defined(this._namedTypeDependents.get(name)).decoder;
             }
             topLevelDecoders.push(decoder);
             exports.push(name, encoder, decoder);
         });
         this.forEachObject("none", (t, name) => {
-            if (!(0, collection_utils_1.mapContains)(this.topLevels, t))
+            if (!collection_utils_1.mapContains(this.topLevels, t))
                 exports.push(name);
         });
         this.forEachEnum("none", (t, name) => {
-            if (!(0, collection_utils_1.mapContains)(this.topLevels, t))
+            if (!collection_utils_1.mapContains(this.topLevels, t))
                 exports.push([name, "(..)"]);
         });
         this.forEachUnion("none", (t, name) => {
-            if (!(0, collection_utils_1.mapContains)(this.topLevels, t))
+            if (!collection_utils_1.mapContains(this.topLevels, t))
                 exports.push([name, "(..)"]);
         });
         if (this.leadingComments !== undefined) {
@@ -458,14 +456,14 @@ class ElmRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 "",
                 "    import Json.Decode exposing (decodeString)`);"
             ]);
-            this.emitLine("--     import ", this._options.moduleName, " exposing (", (0, collection_utils_1.arrayIntercalate)(", ", topLevelDecoders), ")");
+            this.emitLine("--     import ", this._options.moduleName, " exposing (", collection_utils_1.arrayIntercalate(", ", topLevelDecoders), ")");
             this.emitMultiline(`--
 -- and you're off to the races with
 --`);
             this.forEachTopLevel("none", (_, name) => {
-                let { decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
+                let { decoder } = Support_1.defined(this._topLevelDependents.get(name));
                 if (decoder === undefined) {
-                    decoder = (0, Support_1.defined)(this._namedTypeDependents.get(name)).decoder;
+                    decoder = Support_1.defined(this._namedTypeDependents.get(name)).decoder;
                 }
                 this.emitLine("--     decodeString ", decoder, " myJsonString");
             });
@@ -505,7 +503,7 @@ import Dict exposing (Dict, map, toList)`);
         this.emitLine("make", this.arrayType, "Encoder : (a -> Jenc.Value) -> ", this.arrayType, " a -> Jenc.Value");
         this.emitLine("make", this.arrayType, "Encoder f arr =");
         this.indent(() => {
-            this.emitLine("Jenc.", (0, Strings_1.decapitalize)(this.arrayType), " (", this.arrayType, ".map f arr)");
+            this.emitLine("Jenc.", Strings_1.decapitalize(this.arrayType), " (", this.arrayType, ".map f arr)");
         });
         this.ensureBlankLine();
         this.emitMultiline(`makeDictEncoder : (a -> Jenc.Value) -> Dict String a -> Jenc.Value