quicktype 17.0.4 → 17.0.5

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

@@ -1,7 +1,6 @@
 "use strict";
 // Taken from https://github.com/Microsoft/TypeScript
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isES3IdentifierPart = exports.isES3IdentifierStart = void 0;
 function lookupInUnicodeMap(code, map) {
     // Bail out quickly if it couldn't possibly be in the map.
     if (code < map[0]) {
@@ -28,20 +27,20 @@ function lookupInUnicodeMap(code, map) {
     return false;
 }
 function isES3IdentifierStart(ch) {
-    return ((ch >= 65 /* CharacterCodes.A */ && ch <= 90 /* CharacterCodes.Z */) ||
-        (ch >= 97 /* CharacterCodes.a */ && ch <= 122 /* CharacterCodes.z */) ||
-        ch === 36 /* CharacterCodes.$ */ ||
-        ch === 95 /* CharacterCodes._ */ ||
-        (ch > 127 /* CharacterCodes.maxAsciiCharacter */ && lookupInUnicodeMap(ch, unicodeES3IdentifierStart)));
+    return ((ch >= 65 /* A */ && ch <= 90 /* Z */) ||
+        (ch >= 97 /* a */ && ch <= 122 /* z */) ||
+        ch === 36 /* $ */ ||
+        ch === 95 /* _ */ ||
+        (ch > 127 /* maxAsciiCharacter */ && lookupInUnicodeMap(ch, unicodeES3IdentifierStart)));
 }
 exports.isES3IdentifierStart = isES3IdentifierStart;
 function isES3IdentifierPart(ch) {
-    return ((ch >= 65 /* CharacterCodes.A */ && ch <= 90 /* CharacterCodes.Z */) ||
-        (ch >= 97 /* CharacterCodes.a */ && ch <= 122 /* CharacterCodes.z */) ||
-        (ch >= 48 /* CharacterCodes._0 */ && ch <= 57 /* CharacterCodes._9 */) ||
-        ch === 36 /* CharacterCodes.$ */ ||
-        ch === 95 /* CharacterCodes._ */ ||
-        (ch > 127 /* CharacterCodes.maxAsciiCharacter */ && lookupInUnicodeMap(ch, unicodeES3IdentifierPart)));
+    return ((ch >= 65 /* A */ && ch <= 90 /* Z */) ||
+        (ch >= 97 /* a */ && ch <= 122 /* z */) ||
+        (ch >= 48 /* _0 */ && ch <= 57 /* _9 */) ||
+        ch === 36 /* $ */ ||
+        ch === 95 /* _ */ ||
+        (ch > 127 /* maxAsciiCharacter */ && lookupInUnicodeMap(ch, unicodeES3IdentifierPart)));
 }
 exports.isES3IdentifierPart = isES3IdentifierPart;
 /*

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

@@ -20,8 +20,8 @@ export declare const kotlinOptions: {
 export declare class KotlinTargetLanguage 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;
     }): ConvenienceRenderer;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KotlinXRenderer = exports.KotlinJacksonRenderer = exports.KotlinKlaxonRenderer = exports.KotlinRenderer = exports.KotlinTargetLanguage = exports.kotlinOptions = exports.Framework = void 0;
 const collection_utils_1 = require("collection-utils");
 const Annotation_1 = require("../Annotation");
 const ConvenienceRenderer_1 = require("../ConvenienceRenderer");
@@ -27,7 +26,7 @@ exports.kotlinOptions = {
         ["klaxon", Framework.Klaxon],
         ["kotlinx", Framework.KotlinX]
     ], "klaxon"),
-    acronymStyle: (0, Acronyms_1.acronymOption)(Acronyms_1.AcronymStyleOptions.Pascal),
+    acronymStyle: Acronyms_1.acronymOption(Acronyms_1.AcronymStyleOptions.Pascal),
     packageName: new RendererOptions_1.StringOption("package", "Package", "PACKAGE", "quicktype")
 };
 class KotlinTargetLanguage extends TargetLanguage_1.TargetLanguage {
@@ -44,7 +43,7 @@ class KotlinTargetLanguage extends TargetLanguage_1.TargetLanguage {
         return true;
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        const options = (0, RendererOptions_1.getOptionValues)(exports.kotlinOptions, untypedOptionValues);
+        const options = RendererOptions_1.getOptionValues(exports.kotlinOptions, untypedOptionValues);
         switch (options.framework) {
             case Framework.None:
                 return new KotlinRenderer(this, renderContext, options);
@@ -55,7 +54,7 @@ class KotlinTargetLanguage extends TargetLanguage_1.TargetLanguage {
             case Framework.KotlinX:
                 return new KotlinXRenderer(this, renderContext, options);
             default:
-                return (0, Support_1.assertNever)(options.framework);
+                return Support_1.assertNever(options.framework);
         }
     }
 }
@@ -112,26 +111,25 @@ const keywords = [
     "Klaxon"
 ];
 function isPartCharacter(codePoint) {
-    return (0, Strings_1.isLetterOrUnderscore)(codePoint) || (0, Strings_1.isNumeric)(codePoint);
+    return Strings_1.isLetterOrUnderscore(codePoint) || Strings_1.isNumeric(codePoint);
 }
 function isStartCharacter(codePoint) {
-    return isPartCharacter(codePoint) && !(0, Strings_1.isDigit)(codePoint);
+    return isPartCharacter(codePoint) && !Strings_1.isDigit(codePoint);
 }
-const legalizeName = (0, Strings_1.legalizeCharacters)(isPartCharacter);
+const legalizeName = Strings_1.legalizeCharacters(isPartCharacter);
 function kotlinNameStyle(isUpper, original, acronymsStyle = Strings_1.allUpperWordStyle) {
-    const words = (0, Strings_1.splitIntoWords)(original);
-    return (0, Strings_1.combineWords)(words, legalizeName, isUpper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, isUpper ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle, acronymsStyle, "", isStartCharacter);
+    const words = Strings_1.splitIntoWords(original);
+    return Strings_1.combineWords(words, legalizeName, isUpper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, isUpper ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle, acronymsStyle, "", isStartCharacter);
 }
 function unicodeEscape(codePoint) {
-    return "\\u" + (0, Strings_1.intToHex)(codePoint, 4);
+    return "\\u" + Strings_1.intToHex(codePoint, 4);
 }
-const _stringEscape = (0, Strings_1.utf32ConcatMap)((0, Strings_1.escapeNonPrintableMapper)(Strings_1.isPrintable, unicodeEscape));
+const _stringEscape = Strings_1.utf32ConcatMap(Strings_1.escapeNonPrintableMapper(Strings_1.isPrintable, unicodeEscape));
 function stringEscape(s) {
     // "$this" is a template string in Kotlin so we have to escape $
     return _stringEscape(s).replace(/\$/g, "\\$");
 }
 class KotlinRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _kotlinOptions;
     constructor(targetLanguage, renderContext, _kotlinOptions) {
         super(targetLanguage, renderContext);
         this._kotlinOptions = _kotlinOptions;
@@ -152,16 +150,16 @@ class KotlinRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return kotlinNameStyle(true, rawName);
     }
     makeNamedTypeNamer() {
-        return (0, Naming_1.funPrefixNamer)("upper", s => kotlinNameStyle(true, s, (0, Acronyms_1.acronymStyle)(this._kotlinOptions.acronymStyle)));
+        return Naming_1.funPrefixNamer("upper", s => kotlinNameStyle(true, s, Acronyms_1.acronymStyle(this._kotlinOptions.acronymStyle)));
     }
     namerForObjectProperty() {
-        return (0, Naming_1.funPrefixNamer)("lower", s => kotlinNameStyle(false, s, (0, Acronyms_1.acronymStyle)(this._kotlinOptions.acronymStyle)));
+        return Naming_1.funPrefixNamer("lower", s => kotlinNameStyle(false, s, Acronyms_1.acronymStyle(this._kotlinOptions.acronymStyle)));
     }
     makeUnionMemberNamer() {
-        return (0, Naming_1.funPrefixNamer)("upper", s => kotlinNameStyle(true, s) + "Value");
+        return Naming_1.funPrefixNamer("upper", s => kotlinNameStyle(true, s) + "Value");
     }
     makeEnumCaseNamer() {
-        return (0, Naming_1.funPrefixNamer)("upper", s => kotlinNameStyle(true, s, (0, Acronyms_1.acronymStyle)(this._kotlinOptions.acronymStyle)));
+        return Naming_1.funPrefixNamer("upper", s => kotlinNameStyle(true, s, Acronyms_1.acronymStyle(this._kotlinOptions.acronymStyle)));
     }
     emitDescriptionBlock(lines) {
         this.emitCommentLines(lines, " * ", "/**", " */");
@@ -185,12 +183,12 @@ class KotlinRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     kotlinType(t, withIssues = false, noOptional = false) {
         const optional = noOptional ? "" : "?";
-        return (0, TypeUtils_1.matchType)(t, _anyType => {
-            return (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, this.anySourceType(optional));
+        return TypeUtils_1.matchType(t, _anyType => {
+            return Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, this.anySourceType(optional));
         }, _nullType => {
-            return (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, this.anySourceType(optional));
+            return Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, this.anySourceType(optional));
         }, _boolType => "Boolean", _integerType => "Long", _doubleType => "Double", _stringType => "String", arrayType => this.arrayType(arrayType, withIssues), classType => this.nameForNamedType(classType), mapType => this.mapType(mapType, withIssues), enumType => this.nameForNamedType(enumType), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null)
                 return [this.kotlinType(nullable, withIssues), optional];
             return this.nameForNamedType(unionType);
@@ -243,7 +241,7 @@ class KotlinRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             let count = c.getProperties().size;
             let first = true;
             this.forEachClassProperty(c, "none", (name, jsonName, p) => {
-                const nullable = p.type.kind === "union" && (0, TypeUtils_1.nullableFromUnion)(p.type) !== null;
+                const nullable = p.type.kind === "union" && TypeUtils_1.nullableFromUnion(p.type) !== null;
                 const nullableOrOptional = p.isOptional || p.type.kind === "null" || nullable;
                 const last = --count === 0;
                 let meta = [];
@@ -293,7 +291,7 @@ class KotlinRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             return "_" + kind;
         }
         this.emitDescription(this.descriptionForType(u));
-        const [maybeNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u, sortBy);
+        const [maybeNull, nonNulls] = TypeUtils_1.removeNullFromUnion(u, sortBy);
         this.emitClassAnnotations(u, unionName);
         this.emitBlock(["sealed class ", unionName], () => {
             {
@@ -338,29 +336,29 @@ class KotlinKlaxonRenderer extends KotlinRenderer {
         super(targetLanguage, renderContext, _kotlinOptions);
     }
     unionMemberFromJsonValue(t, e) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => [e, ".inside"], _nullType => "null", _boolType => [e, ".boolean"], _integerType => ["(", e, ".int?.toLong() ?: ", e, ".longValue)"], _doubleType => [e, ".double"], _stringType => [e, ".string"], arrayType => [e, ".array?.let { klaxon.parseFromJsonArray<", this.kotlinType(arrayType.items), ">(it) }"], _classType => [e, ".obj?.let { klaxon.parseFromJsonObject<", this.kotlinType(t), ">(it) }"], _mapType => [e, ".obj?.let { klaxon.parseFromJsonObject<", this.kotlinType(t), ">(it) }"], enumType => [e, ".string?.let { ", this.kotlinType(enumType), ".fromValue(it) }"], _unionType => (0, Support_1.mustNotHappen)());
+        return TypeUtils_1.matchType(t, _anyType => [e, ".inside"], _nullType => "null", _boolType => [e, ".boolean"], _integerType => ["(", e, ".int?.toLong() ?: ", e, ".longValue)"], _doubleType => [e, ".double"], _stringType => [e, ".string"], arrayType => [e, ".array?.let { klaxon.parseFromJsonArray<", this.kotlinType(arrayType.items), ">(it) }"], _classType => [e, ".obj?.let { klaxon.parseFromJsonObject<", this.kotlinType(t), ">(it) }"], _mapType => [e, ".obj?.let { klaxon.parseFromJsonObject<", this.kotlinType(t), ">(it) }"], enumType => [e, ".string?.let { ", this.kotlinType(enumType), ".fromValue(it) }"], _unionType => Support_1.mustNotHappen());
     }
     unionMemberJsonValueGuard(t, _e) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => "is Any", _nullType => "null", _boolType => "is Boolean", _integerType => "is Int, is Long", _doubleType => "is Double", _stringType => "is String", _arrayType => "is JsonArray<*>", 
+        return TypeUtils_1.matchType(t, _anyType => "is Any", _nullType => "null", _boolType => "is Boolean", _integerType => "is Int, is Long", _doubleType => "is Double", _stringType => "is String", _arrayType => "is JsonArray<*>", 
         // These could be stricter, but for now we don't allow maps
         // and objects in the same union
         _classType => "is JsonObject", _mapType => "is JsonObject", 
         // This could be stricter, but for now we don't allow strings
         // and enums in the same union
-        _enumType => "is String", _unionType => (0, Support_1.mustNotHappen)());
+        _enumType => "is String", _unionType => Support_1.mustNotHappen());
     }
     emitUsageHeader() {
         this.emitLine("// To parse the JSON, install Klaxon and do:");
         this.emitLine("//");
         this.forEachTopLevel("none", (_, name) => {
-            this.emitLine("//   val ", (0, Source_1.modifySource)(Strings_1.camelCase, name), " = ", name, ".fromJson(jsonString)");
+            this.emitLine("//   val ", Source_1.modifySource(Strings_1.camelCase, name), " = ", name, ".fromJson(jsonString)");
         });
     }
     emitHeader() {
         super.emitHeader();
         this.emitLine("import com.beust.klaxon.*");
-        const hasUnions = (0, collection_utils_1.iterableSome)(this.typeGraph.allNamedTypes(), t => t instanceof Type_1.UnionType && (0, TypeUtils_1.nullableFromUnion)(t) === null);
-        const hasEmptyObjects = (0, collection_utils_1.iterableSome)(this.typeGraph.allNamedTypes(), c => c instanceof Type_1.ClassType && c.getProperties().size === 0);
+        const hasUnions = collection_utils_1.iterableSome(this.typeGraph.allNamedTypes(), t => t instanceof Type_1.UnionType && TypeUtils_1.nullableFromUnion(t) === null);
+        const hasEmptyObjects = collection_utils_1.iterableSome(this.typeGraph.allNamedTypes(), c => c instanceof Type_1.ClassType && c.getProperties().size === 0);
         if (hasUnions || this.haveEnums || hasEmptyObjects) {
             this.emitGenericConverter();
         }
@@ -428,14 +426,14 @@ class KotlinKlaxonRenderer extends KotlinRenderer {
         if (ignore) {
             properties.push("ignored = true");
         }
-        return properties.length === 0 ? undefined : ["@Json(", (0, collection_utils_1.arrayIntercalate)(", ", properties), ")"];
+        return properties.length === 0 ? undefined : ["@Json(", collection_utils_1.arrayIntercalate(", ", properties), ")"];
     }
     emitEmptyClassDefinition(c, className) {
         this.emitDescription(this.descriptionForType(c));
         this.emitLine("typealias ", className, " = JsonObject");
     }
     emitClassDefinitionMethods(c, className) {
-        const isTopLevel = (0, collection_utils_1.iterableSome)(this.topLevels, ([_, top]) => top === c);
+        const isTopLevel = collection_utils_1.iterableSome(this.topLevels, ([_, top]) => top === c);
         if (isTopLevel) {
             this.emitBlock(")", () => {
                 this.emitLine("public fun toJson() = klaxon.toJsonString(this)");
@@ -537,19 +535,19 @@ class KotlinJacksonRenderer extends KotlinRenderer {
         super(targetLanguage, renderContext, _kotlinOptions);
     }
     unionMemberJsonValueGuard(t, _e) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => "is Any", _nullType => "null", _boolType => "is BooleanNode", _integerType => "is IntNode, is LongNode", _doubleType => "is DoubleNode", _stringType => "is TextNode", _arrayType => "is ArrayNode", 
+        return TypeUtils_1.matchType(t, _anyType => "is Any", _nullType => "null", _boolType => "is BooleanNode", _integerType => "is IntNode, is LongNode", _doubleType => "is DoubleNode", _stringType => "is TextNode", _arrayType => "is ArrayNode", 
         // These could be stricter, but for now we don't allow maps
         // and objects in the same union
         _classType => "is ObjectNode", _mapType => "is ObjectNode", 
         // This could be stricter, but for now we don't allow strings
         // and enums in the same union
-        _enumType => "is TextNode", _unionType => (0, Support_1.mustNotHappen)());
+        _enumType => "is TextNode", _unionType => Support_1.mustNotHappen());
     }
     emitUsageHeader() {
         this.emitLine("// To parse the JSON, install jackson-module-kotlin and do:");
         this.emitLine("//");
         this.forEachTopLevel("none", (_, name) => {
-            this.emitLine("//   val ", (0, Source_1.modifySource)(Strings_1.camelCase, name), " = ", name, ".fromJson(jsonString)");
+            this.emitLine("//   val ", Source_1.modifySource(Strings_1.camelCase, name), " = ", name, ".fromJson(jsonString)");
         });
     }
     emitHeader() {
@@ -562,8 +560,8 @@ import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.databind.node.*
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import com.fasterxml.jackson.module.kotlin.*`);
-        const hasUnions = (0, collection_utils_1.iterableSome)(this.typeGraph.allNamedTypes(), t => t instanceof Type_1.UnionType && (0, TypeUtils_1.nullableFromUnion)(t) === null);
-        const hasEmptyObjects = (0, collection_utils_1.iterableSome)(this.typeGraph.allNamedTypes(), c => c instanceof Type_1.ClassType && c.getProperties().size === 0);
+        const hasUnions = collection_utils_1.iterableSome(this.typeGraph.allNamedTypes(), t => t instanceof Type_1.UnionType && TypeUtils_1.nullableFromUnion(t) === null);
+        const hasEmptyObjects = collection_utils_1.iterableSome(this.typeGraph.allNamedTypes(), c => c instanceof Type_1.ClassType && c.getProperties().size === 0);
         if (hasUnions || this.haveEnums || hasEmptyObjects) {
             this.emitGenericConverter();
         }
@@ -637,8 +635,8 @@ import com.fasterxml.jackson.module.kotlin.*`);
             propertyOpts.push("required=true");
         }
         if (propertyOpts.length > 0) {
-            properties.push(["@get:JsonProperty(", (0, collection_utils_1.arrayIntercalate)(", ", propertyOpts), ")"]);
-            properties.push(["@field:JsonProperty(", (0, collection_utils_1.arrayIntercalate)(", ", propertyOpts), ")"]);
+            properties.push(["@get:JsonProperty(", collection_utils_1.arrayIntercalate(", ", propertyOpts), ")"]);
+            properties.push(["@field:JsonProperty(", collection_utils_1.arrayIntercalate(", ", propertyOpts), ")"]);
         }
         if (ignore) {
             properties.push("@get:JsonIgnore");
@@ -651,7 +649,7 @@ import com.fasterxml.jackson.module.kotlin.*`);
         this.emitLine("typealias ", className, " = JsonNode");
     }
     emitClassDefinitionMethods(c, className) {
-        const isTopLevel = (0, collection_utils_1.iterableSome)(this.topLevels, ([_, top]) => top === c);
+        const isTopLevel = collection_utils_1.iterableSome(this.topLevels, ([_, top]) => top === c);
         if (isTopLevel) {
             this.emitBlock(")", () => {
                 this.emitLine("fun toJson() = mapper.writeValueAsString(this)");
@@ -787,7 +785,7 @@ class KotlinXRenderer extends KotlinRenderer {
         this.forEachTopLevel("none", (_, name) => {
             table.push([
                 "// val ",
-                (0, Source_1.modifySource)(Strings_1.camelCase, name),
+                Source_1.modifySource(Strings_1.camelCase, name),
                 ` = json.parse(${this.sourcelikeToString(name)}.serializer(), jsonString)`
             ]);
         });

package/dist/quicktype-core/language/Objective-C.d.ts

@@ -5,8 +5,8 @@ import { Sourcelike } from "../Source";
 import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer";
 import { StringOption, BooleanOption, EnumOption, Option, OptionValues } from "../RendererOptions";
 import { RenderContext } from "../Renderer";
-export type MemoryAttribute = "assign" | "strong" | "copy";
-export type OutputFeatures = {
+export declare type MemoryAttribute = "assign" | "strong" | "copy";
+export declare type OutputFeatures = {
     interface: boolean;
     implementation: boolean;
 };
@@ -74,6 +74,6 @@ export declare class ObjectiveCRenderer extends ConvenienceRenderer {
     private emitPseudoEnumInterface;
     private emitPseudoEnumImplementation;
     protected emitSourceStructure(proposedFilename: string): void;
-    private get needsMap();
+    private readonly needsMap;
     protected emitMapFunction(): void;
 }

package/dist/quicktype-core/language/Objective-C.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectiveCRenderer = exports.ObjectiveCTargetLanguage = exports.objcOptions = void 0;
 const collection_utils_1 = require("collection-utils");
 const TargetLanguage_1 = require("../TargetLanguage");
 const Type_1 = require("../Type");
@@ -39,14 +38,14 @@ class ObjectiveCTargetLanguage extends TargetLanguage_1.TargetLanguage {
         ];
     }
     makeRenderer(renderContext, untypedOptionValues) {
-        return new ObjectiveCRenderer(this, renderContext, (0, RendererOptions_1.getOptionValues)(exports.objcOptions, untypedOptionValues));
+        return new ObjectiveCRenderer(this, renderContext, RendererOptions_1.getOptionValues(exports.objcOptions, untypedOptionValues));
     }
 }
 exports.ObjectiveCTargetLanguage = ObjectiveCTargetLanguage;
 function typeNameStyle(prefix, original) {
-    const words = (0, Strings_1.splitIntoWords)(original);
-    const result = (0, Strings_1.combineWords)(words, legalizeName, Strings_1.firstUpperWordStyle, Strings_1.firstUpperWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter);
-    return (0, Strings_1.addPrefixIfNecessary)(prefix, result);
+    const words = Strings_1.splitIntoWords(original);
+    const result = Strings_1.combineWords(words, legalizeName, Strings_1.firstUpperWordStyle, Strings_1.firstUpperWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter);
+    return Strings_1.addPrefixIfNecessary(prefix, result);
 }
 function propertyNameStyle(original, isBool = false) {
     // Objective-C developers are uncomfortable with property "id"
@@ -54,7 +53,7 @@ function propertyNameStyle(original, isBool = false) {
     if (original === "id") {
         original = "identifier";
     }
-    let words = (0, Strings_1.splitIntoWords)(original);
+    let words = Strings_1.splitIntoWords(original);
     if (isBool) {
         if (words.length === 0) {
             words = [{ word: "flag", isAcronym: false }];
@@ -68,7 +67,7 @@ function propertyNameStyle(original, isBool = false) {
     if (words.length > 0 && forbiddenPropertyNames.indexOf(words[0].word) >= 0) {
         words = [{ word: "the", isAcronym: false }, ...words];
     }
-    return (0, Strings_1.combineWords)(words, legalizeName, Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, Strings_1.allLowerWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter);
+    return Strings_1.combineWords(words, legalizeName, Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, Strings_1.allLowerWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter);
 }
 const keywords = [
     /*
@@ -157,7 +156,7 @@ function isPartCharacter(utf16Unit) {
     const category = unicode.getCategory(utf16Unit);
     return ["Nd", "Pc", "Mn", "Mc"].indexOf(category) >= 0 || isStartCharacter(utf16Unit);
 }
-const legalizeName = (0, Strings_1.utf16LegalizeCharacters)(isPartCharacter);
+const legalizeName = Strings_1.utf16LegalizeCharacters(isPartCharacter);
 const staticEnumValuesIdentifier = "values";
 const forbiddenForEnumCases = ["new", staticEnumValuesIdentifier];
 function splitExtension(filename) {
@@ -167,15 +166,12 @@ function splitExtension(filename) {
     return [filename, extension === undefined ? "m" : extension];
 }
 class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
-    _options;
-    _currentFilename;
-    _classPrefix;
     constructor(targetLanguage, renderContext, _options) {
         super(targetLanguage, renderContext);
         this._options = _options;
         // Infer the class prefix from a top-level name if it's not given
         if (_options.classPrefix === DEFAULT_CLASS_PREFIX) {
-            const aTopLevel = (0, Support_1.defined)((0, collection_utils_1.iterableFirst)(this.topLevels.keys()));
+            const aTopLevel = Support_1.defined(collection_utils_1.iterableFirst(this.topLevels.keys()));
             this._classPrefix = this.inferClassPrefix(aTopLevel);
         }
         else {
@@ -185,7 +181,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     inferClassPrefix(name) {
         const l = name.length;
         let firstNonUpper = 0;
-        while (firstNonUpper < l && (0, Strings_1.fastIsUpperCase)(name.charCodeAt(firstNonUpper))) {
+        while (firstNonUpper < l && Strings_1.fastIsUpperCase(name.charCodeAt(firstNonUpper))) {
             firstNonUpper += 1;
         }
         if (firstNonUpper < 2)
@@ -202,7 +198,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return { names: forbiddenForEnumCases, includeGlobalForbidden: true };
     }
     makeNamedTypeNamer() {
-        return (0, Naming_1.funPrefixNamer)("types", rawName => typeNameStyle(this._classPrefix, rawName));
+        return Naming_1.funPrefixNamer("types", rawName => typeNameStyle(this._classPrefix, rawName));
     }
     namerForObjectProperty(_, p) {
         // TODO why is underscore being removed?
@@ -245,52 +241,52 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     startFile(basename, extension) {
-        (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)}.${extension}`;
     }
     finishFile() {
-        super.finishFile((0, Support_1.defined)(this._currentFilename));
+        super.finishFile(Support_1.defined(this._currentFilename));
         this._currentFilename = undefined;
     }
     memoryAttribute(t, isNullable) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => "copy", _nullType => "copy", _boolType => (isNullable ? "strong" : "assign"), _integerType => (isNullable ? "strong" : "assign"), _doubleType => (isNullable ? "strong" : "assign"), _stringType => "copy", _arrayType => "copy", _classType => "strong", _mapType => "copy", _enumType => "assign", unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => "copy", _nullType => "copy", _boolType => (isNullable ? "strong" : "assign"), _integerType => (isNullable ? "strong" : "assign"), _doubleType => (isNullable ? "strong" : "assign"), _stringType => "copy", _arrayType => "copy", _classType => "strong", _mapType => "copy", _enumType => "assign", unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             return nullable !== null ? this.memoryAttribute(nullable, true) : "copy";
         });
     }
     objcType(t, nullableOrBoxed = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => ["id", ""], 
+        return TypeUtils_1.matchType(t, _anyType => ["id", ""], 
         // For now, we're treating nulls just like any
         _nullType => ["id", ""], _boolType => (nullableOrBoxed ? ["NSNumber", " *"] : ["BOOL", ""]), _integerType => (nullableOrBoxed ? ["NSNumber", " *"] : ["NSInteger", ""]), _doubleType => (nullableOrBoxed ? ["NSNumber", " *"] : ["double", ""]), _stringType => ["NSString", " *"], arrayType => {
             const itemType = arrayType.items;
             const itemTypeName = this.objcType(itemType, true);
             // NSArray<id>* === NSArray*
-            if ((0, TypeUtils_1.isAnyOrNull)(itemType)) {
+            if (TypeUtils_1.isAnyOrNull(itemType)) {
                 return ["NSArray", " *"];
             }
             return [["NSArray<", itemTypeName, ">"], " *"];
         }, classType => [this.nameForNamedType(classType), " *"], mapType => [["NSDictionary<NSString *, ", this.objcType(mapType.values, true), ">"], " *"], enumType => [this.nameForNamedType(enumType), " *"], unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             return nullable !== null ? this.objcType(nullable, true) : ["id", ""];
         });
     }
     jsonType(t) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => ["id", ""], 
+        return TypeUtils_1.matchType(t, _anyType => ["id", ""], 
         // For now, we're treating nulls just like any
         _nullType => ["id", ""], _boolType => ["NSNumber", " *"], _integerType => ["NSNumber", " *"], _doubleType => ["NSNumber", " *"], _stringType => ["NSString", " *"], _arrayType => ["NSArray", " *"], _classType => ["NSDictionary<NSString *, id>", " *"], mapType => [["NSDictionary<NSString *, ", this.jsonType(mapType.values), ">"], " *"], _enumType => ["NSString", " *"], unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             return nullable !== null ? this.jsonType(nullable) : ["id", ""];
         });
     }
     fromDynamicExpression(t, ...dynamic) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => dynamic, _nullType => dynamic, _boolType => dynamic, _integerType => dynamic, _doubleType => dynamic, _stringType => dynamic, arrayType => ["map(", dynamic, ", λ(id x, ", this.fromDynamicExpression(arrayType.items, "x"), "))"], classType => ["[", this.nameForNamedType(classType), " fromJSONDictionary:", dynamic, "]"], mapType => ["map(", dynamic, ", λ(id x, ", this.fromDynamicExpression(mapType.values, "x"), "))"], enumType => ["[", this.nameForNamedType(enumType), " withValue:", dynamic, "]"], unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+        return TypeUtils_1.matchType(t, _anyType => dynamic, _nullType => dynamic, _boolType => dynamic, _integerType => dynamic, _doubleType => dynamic, _stringType => dynamic, arrayType => ["map(", dynamic, ", λ(id x, ", this.fromDynamicExpression(arrayType.items, "x"), "))"], classType => ["[", this.nameForNamedType(classType), " fromJSONDictionary:", dynamic, "]"], mapType => ["map(", dynamic, ", λ(id x, ", this.fromDynamicExpression(mapType.values, "x"), "))"], enumType => ["[", this.nameForNamedType(enumType), " withValue:", dynamic, "]"], unionType => {
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             return nullable !== null ? this.fromDynamicExpression(nullable, dynamic) : dynamic;
         });
     }
     toDynamicExpression(t, typed) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => ["NSNullify(", typed, ")"], _nullType => ["NSNullify(", typed, ")"], 
+        return TypeUtils_1.matchType(t, _anyType => ["NSNullify(", typed, ")"], _nullType => ["NSNullify(", typed, ")"], 
         // Sadly, KVC
         _boolType => [typed, ` ? @YES : @NO`], _integerType => typed, _doubleType => typed, _stringType => typed, arrayType => {
             if (this.implicitlyConvertsFromJSON(arrayType)) {
@@ -305,7 +301,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
             return ["map(", typed, ", λ(id x, ", this.toDynamicExpression(mapType.values, "x"), "))"];
         }, _enumType => ["[", typed, " value]"], unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 if (this.implicitlyConvertsFromJSON(nullable)) {
                     return ["NSNullify(", typed, ")"];
@@ -337,7 +333,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             return true;
         }
         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.implicitlyConvertsFromJSON(nullable);
             }
@@ -355,11 +351,11 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     emitPropertyAssignment(propertyName, jsonName, propertyType) {
         const name = ["_", propertyName];
-        (0, TypeUtils_1.matchType)(propertyType, anyType => this.emitLine(name, " = ", this.fromDynamicExpression(anyType, name), ";"), nullType => this.emitLine(name, " = ", this.fromDynamicExpression(nullType, name), ";"), boolType => this.emitLine(name, " = ", this.fromDynamicExpression(boolType, name), ";"), integerType => this.emitLine(name, " = ", this.fromDynamicExpression(integerType, name), ";"), doubleType => this.emitLine(name, " = ", this.fromDynamicExpression(doubleType, name), ";"), stringType => this.emitLine(name, " = ", this.fromDynamicExpression(stringType, name), ";"), arrayType => this.emitLine(name, " = ", this.fromDynamicExpression(arrayType, name), ";"), classType => this.emitLine(name, " = ", this.fromDynamicExpression(classType, ["(id)", name]), ";"), mapType => {
+        TypeUtils_1.matchType(propertyType, anyType => this.emitLine(name, " = ", this.fromDynamicExpression(anyType, name), ";"), nullType => this.emitLine(name, " = ", this.fromDynamicExpression(nullType, name), ";"), boolType => this.emitLine(name, " = ", this.fromDynamicExpression(boolType, name), ";"), integerType => this.emitLine(name, " = ", this.fromDynamicExpression(integerType, name), ";"), doubleType => this.emitLine(name, " = ", this.fromDynamicExpression(doubleType, name), ";"), stringType => this.emitLine(name, " = ", this.fromDynamicExpression(stringType, name), ";"), arrayType => this.emitLine(name, " = ", this.fromDynamicExpression(arrayType, name), ";"), classType => this.emitLine(name, " = ", this.fromDynamicExpression(classType, ["(id)", name]), ";"), mapType => {
             const itemType = mapType.values;
             this.emitLine(name, " = map(", name, ", ", ["λ(id x, ", this.fromDynamicExpression(itemType, "x"), ")"], ");");
         }, enumType => this.emitLine(name, " = ", this.fromDynamicExpression(enumType, ["(id)", name]), ";"), unionType => {
-            const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
+            const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 this.emitPropertyAssignment(propertyName, jsonName, nullable);
             }
@@ -392,12 +388,12 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     topLevelToDataPrototype(name, pad = false) {
         const parameter = this.variableNameForTopLevel(name);
-        const padding = pad ? (0, Strings_1.repeatString)(" ", this.sourcelikeToString(name).length - "NSData".length) : "";
+        const padding = pad ? Strings_1.repeatString(" ", this.sourcelikeToString(name).length - "NSData".length) : "";
         return ["NSData", padding, " *_Nullable ", name, "ToData(", name, " *", parameter, ", NSError **error)"];
     }
     topLevelToJSONPrototype(name, pad = false) {
         const parameter = this.variableNameForTopLevel(name);
-        const padding = pad ? (0, Strings_1.repeatString)(" ", this.sourcelikeToString(name).length - "NSString".length) : "";
+        const padding = pad ? Strings_1.repeatString(" ", this.sourcelikeToString(name).length - "NSString".length) : "";
         return [
             "NSString",
             padding,
@@ -454,7 +450,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     emitClassInterface(t, className) {
-        const isTopLevel = (0, collection_utils_1.mapContains)(this.topLevels, t);
+        const isTopLevel = collection_utils_1.mapContains(this.topLevels, t);
         this.emitDescription(this.descriptionForType(t));
         this.emitLine("@interface ", className, " : NSObject");
         if (DEBUG)
@@ -485,7 +481,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     hasIrregularProperties(t) {
         let irregular = false;
         this.forEachClassProperty(t, "none", (name, jsonName) => {
-            irregular = irregular || (0, Strings_1.stringEscape)(jsonName) !== this.sourcelikeToString(name);
+            irregular = irregular || Strings_1.stringEscape(jsonName) !== this.sourcelikeToString(name);
         });
         return irregular;
     }
@@ -498,7 +494,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     // TODO Implement NSCopying
     emitClassImplementation(t, className) {
-        const isTopLevel = (0, collection_utils_1.mapContains)(this.topLevels, t);
+        const isTopLevel = collection_utils_1.mapContains(this.topLevels, t);
         const hasIrregularProperties = this.hasIrregularProperties(t);
         const hasUnsafeProperties = this.hasUnsafeProperties(t);
         this.emitLine("@implementation ", className);
@@ -507,7 +503,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine("static NSDictionary<NSString *, NSString *> *properties;");
                 this.emitLine("return properties = properties ? properties : @{");
                 this.indent(() => {
-                    this.forEachClassProperty(t, "none", (name, jsonName) => this.emitLine(`@"${(0, Strings_1.stringEscape)(jsonName)}": @"`, name, `",`));
+                    this.forEachClassProperty(t, "none", (name, jsonName) => this.emitLine(`@"${Strings_1.stringEscape(jsonName)}": @"`, name, `",`));
                 });
                 this.emitLine("};");
             });
@@ -577,7 +573,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     this.indent(() => {
                         this.forEachClassProperty(t, "none", (propertyName, jsonKey, property) => {
                             if (!this.implicitlyConvertsToJSON(property.type)) {
-                                const key = (0, Strings_1.stringEscape)(jsonKey);
+                                const key = Strings_1.stringEscape(jsonKey);
                                 const name = ["_", propertyName];
                                 this.emitLine('@"', key, '": ', this.toDynamicExpression(property.type, name), ",");
                             }
@@ -607,11 +603,11 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.ensureBlankLine();
     }
     variableNameForTopLevel(name) {
-        const camelCaseName = (0, Source_1.modifySource)(serialized => {
+        const camelCaseName = Source_1.modifySource(serialized => {
             // 1. remove class prefix
             serialized = serialized.slice(this._classPrefix.length);
             // 2. camel case
-            return (0, Strings_1.camelCase)(serialized);
+            return Strings_1.camelCase(serialized);
         }, name);
         return camelCaseName;
     }
@@ -633,7 +629,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine("return ", staticEnumValuesIdentifier, " = ", staticEnumValuesIdentifier, " ? ", staticEnumValuesIdentifier, " : @{");
             this.indent(() => {
                 this.forEachEnumCase(enumType, "none", (_, jsonValue) => {
-                    const value = ['@"', (0, Strings_1.stringEscape)(jsonValue), '"'];
+                    const value = ['@"', Strings_1.stringEscape(jsonValue), '"'];
                     this.emitLine(value, ": [[", enumName, " alloc] initWithValue:", value, "],");
                 });
             });
@@ -641,7 +637,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
         this.ensureBlankLine();
         this.forEachEnumCase(enumType, "none", (name, jsonValue) => {
-            this.emitLine("+ (", enumName, " *)", name, " { return ", instances, '[@"', (0, Strings_1.stringEscape)(jsonValue), '"]; }');
+            this.emitLine("+ (", enumName, " *)", name, " { return ", instances, '[@"', Strings_1.stringEscape(jsonValue), '"]; }');
         });
         this.ensureBlankLine();
         this.emitMethod("+ (instancetype _Nullable)withValue:(NSString *)value", () => this.emitLine("return ", instances, "[value];"));
@@ -658,7 +654,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         const fileMode = proposedFilename !== "stdout";
         if (!fileMode) {
             // We don't have a filename, so we use a top-level name
-            const firstTopLevel = (0, Support_1.defined)((0, collection_utils_1.mapFirst)(this.topLevels));
+            const firstTopLevel = Support_1.defined(collection_utils_1.mapFirst(this.topLevels));
             proposedFilename = this.sourcelikeToString(this.nameForNamedType(firstTopLevel)) + ".m";
         }
         const [filename, extension] = splitExtension(proposedFilename);
@@ -692,7 +688,7 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
             // Emit interfaces for top-level array+maps and classes
             this.forEachTopLevel("leading-and-interposing", (t, n) => this.emitNonClassTopLevelTypedef(t, n), t => !(t instanceof Type_1.ClassType));
-            const hasTopLevelNonClassTypes = (0, collection_utils_1.iterableSome)(this.topLevels, ([_, t]) => !(t instanceof Type_1.ClassType));
+            const hasTopLevelNonClassTypes = collection_utils_1.iterableSome(this.topLevels, ([_, t]) => !(t instanceof Type_1.ClassType));
             if (!this._options.justTypes && (hasTopLevelNonClassTypes || this._options.marshallingFunctions)) {
                 this.ensureBlankLine();
                 this.emitMark("Top-level marshaling functions");
@@ -754,9 +750,9 @@ class ObjectiveCRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         function needsMap(t) {
             return (t instanceof Type_1.MapType ||
                 t instanceof Type_1.ArrayType ||
-                (t instanceof Type_1.ClassType && (0, collection_utils_1.mapSome)(t.getProperties(), p => needsMap(p.type))));
+                (t instanceof Type_1.ClassType && collection_utils_1.mapSome(t.getProperties(), p => needsMap(p.type))));
         }
-        return (0, collection_utils_1.iterableSome)(this.typeGraph.allTypesUnordered(), needsMap);
+        return collection_utils_1.iterableSome(this.typeGraph.allTypesUnordered(), needsMap);
     }
     emitMapFunction() {
         if (this.needsMap) {