quicktype 16.0.26 → 16.0.28

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

@@ -78,33 +78,30 @@ function csTypeForTransformedStringType(t) {
     }
 }
 exports.cSharpOptions = {
-    framework: new RendererOptions_1.EnumOption("framework", "Serialization framework", [
-        ["NewtonSoft", Framework.Newtonsoft],
-        ["SystemTextJson", Framework.SystemTextJson]
-    ], "NewtonSoft"),
+    framework: new RendererOptions_1.EnumOption("framework", "Serialization framework", [["NewtonSoft", Framework.Newtonsoft], ["SystemTextJson", Framework.SystemTextJson]], "NewtonSoft"),
     useList: new RendererOptions_1.EnumOption("array-type", "Use T[] or List<T>", [
         ["array", false],
-        ["list", true]
+        ["list", true],
     ]),
     dense: new RendererOptions_1.EnumOption("density", "Property density", [
         ["normal", false],
-        ["dense", true]
+        ["dense", true],
     ], "normal", "secondary"),
     // FIXME: Do this via a configurable named eventually.
     namespace: new RendererOptions_1.StringOption("namespace", "Generated namespace", "NAME", "QuickType"),
     version: new RendererOptions_1.EnumOption("csharp-version", "C# version", [
         ["5", 5],
-        ["6", 6]
+        ["6", 6],
     ], "6", "secondary"),
     virtual: new RendererOptions_1.BooleanOption("virtual", "Generate virtual properties", false),
     typeForAny: new RendererOptions_1.EnumOption("any-type", 'Type to use for "any"', [
         ["object", "object"],
-        ["dynamic", "dynamic"]
+        ["dynamic", "dynamic"],
     ], "object", "secondary"),
     useDecimal: new RendererOptions_1.EnumOption("number-type", "Type to use for numbers", [
         ["double", false],
-        ["decimal", true]
-    ], "double", "secondary")
+        ["decimal", true],
+    ], "double", "secondary"),
 };
 class CSharpTargetLanguage extends TargetLanguage_1.TargetLanguage {
     constructor() {
@@ -119,7 +116,7 @@ class CSharpTargetLanguage extends TargetLanguage_1.TargetLanguage {
             exports.cSharpOptions.useList,
             exports.cSharpOptions.useDecimal,
             exports.cSharpOptions.typeForAny,
-            exports.cSharpOptions.virtual
+            exports.cSharpOptions.virtual,
         ];
     }
     get stringTypeMapping() {
@@ -203,9 +200,9 @@ class CSharpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 "Equals",
                 "GetType",
                 "MemberwiseClone",
-                "ReferenceEquals"
+                "ReferenceEquals",
             ],
-            includeGlobalForbidden: false
+            includeGlobalForbidden: false,
         };
     }
     forbiddenForUnionMembers(_, unionNamed) {
@@ -242,7 +239,7 @@ class CSharpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     csType(t, follow = Transformers_1.followTargetType, withIssues = false) {
         const actualType = follow(t);
-        return TypeUtils_1.matchType(actualType, _anyType => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, this._csOptions.typeForAny), _nullType => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, this._csOptions.typeForAny), _boolType => "bool", _integerType => "long", _doubleType => this.doubleType, _stringType => "string", arrayType => {
+        return TypeUtils_1.matchType(actualType, (_anyType) => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, this._csOptions.typeForAny), (_nullType) => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, this._csOptions.typeForAny), (_boolType) => "bool", (_integerType) => "long", (_doubleType) => this.doubleType, (_stringType) => "string", (arrayType) => {
             const itemsType = this.csType(arrayType.items, follow, withIssues);
             if (this._csOptions.useList) {
                 return ["System.Collections.Generic.List<", itemsType, ">"];
@@ -250,16 +247,12 @@ class CSharpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             else {
                 return [itemsType, "[]"];
             }
-        }, classType => this.nameForNamedType(classType), mapType => [
-            "System.Collections.Generic.Dictionary<string, ",
-            this.csType(mapType.values, follow, withIssues),
-            ">"
-        ], enumType => this.nameForNamedType(enumType), unionType => {
+        }, (classType) => this.nameForNamedType(classType), (mapType) => ["System.Collections.Generic.Dictionary<string, ", this.csType(mapType.values, follow, withIssues), ">"], (enumType) => this.nameForNamedType(enumType), (unionType) => {
             const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null)
                 return this.nullableCSType(nullable, noFollow);
             return this.nameForNamedType(unionType);
-        }, transformedStringType => csTypeForTransformedStringType(transformedStringType));
+        }, (transformedStringType) => csTypeForTransformedStringType(transformedStringType));
     }
     nullableCSType(t, follow = Transformers_1.followTargetType, withIssues = false) {
         t = Transformers_1.followTargetType(t);
@@ -369,9 +362,9 @@ class CSharpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.emitLine("public ", csType, " ", fieldName, ";");
             });
             this.ensureBlankLine();
-            const nullTests = Array.from(nonNulls).map(t => [
+            const nullTests = Array.from(nonNulls).map((t) => [
                 this.nameForUnionMember(u, t),
-                " == null"
+                " == null",
             ]);
             this.ensureBlankLine();
             this.forEachUnionMember(u, nonNulls, "none", null, (fieldName, t) => {
@@ -385,7 +378,7 @@ class CSharpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     emitEnumDefinition(e, enumName) {
         const caseNames = [];
-        this.forEachEnumCase(e, "none", name => {
+        this.forEachEnumCase(e, "none", (name) => {
             if (caseNames.length > 0)
                 caseNames.push(", ");
             caseNames.push(name);
@@ -482,13 +475,13 @@ exports.newtonsoftCSharpOptions = Object.assign({}, exports.cSharpOptions, {
         ["complete", { namespaces: true, helpers: true, attributes: true }],
         ["attributes-only", { namespaces: true, helpers: false, attributes: true }],
         ["just-types-and-namespace", { namespaces: true, helpers: false, attributes: false }],
-        ["just-types", { namespaces: true, helpers: false, attributes: false }]
+        ["just-types", { namespaces: true, helpers: false, attributes: false }],
     ]),
     baseclass: new RendererOptions_1.EnumOption("base-class", "Base class", [
         ["EntityData", "EntityData"],
-        ["Object", undefined]
+        ["Object", undefined],
     ], "Object", "secondary"),
-    checkRequired: new RendererOptions_1.BooleanOption("check-required", "Fail if required properties are missing", false)
+    checkRequired: new RendererOptions_1.BooleanOption("check-required", "Fail if required properties are missing", false),
 });
 class NewtonsoftCSharpRenderer extends CSharpRenderer {
     constructor(targetLanguage, renderContext, _options) {
@@ -511,7 +504,7 @@ class NewtonsoftCSharpRenderer extends CSharpRenderer {
             "MetadataPropertyHandling",
             "DateParseHandling",
             "FromJson",
-            "Required"
+            "Required",
         ];
         if (this._options.dense) {
             forbidden.push("J", "R", "N");
@@ -534,12 +527,12 @@ class NewtonsoftCSharpRenderer extends CSharpRenderer {
             }
             return new Naming_1.SimpleName([`${xfer.kind}_converter`], namingFunction, ConvenienceRenderer_1.inferredNameOrder + 30);
         }
-        return new Naming_1.DependencyName(namingFunction, typeName.order + 30, lookup => `${lookup(typeName)}_converter`);
+        return new Naming_1.DependencyName(namingFunction, typeName.order + 30, (lookup) => `${lookup(typeName)}_converter`);
     }
     makeNamedTypeDependencyNames(t, name) {
         if (!(t instanceof Type_1.EnumType))
             return [];
-        const extensionsName = new Naming_1.DependencyName(namingFunction, name.order + 30, lookup => `${lookup(name)}_extensions`);
+        const extensionsName = new Naming_1.DependencyName(namingFunction, name.order + 30, (lookup) => `${lookup(name)}_extensions`);
         this._enumExtensionsNames.set(name, extensionsName);
         return [extensionsName];
     }
@@ -679,7 +672,7 @@ class NewtonsoftCSharpRenderer extends CSharpRenderer {
             // Sometimes multiple top-levels will resolve to the same type, so we have to take care
             // not to emit more than one extension method for the same type.
             const seenTypes = new Set();
-            this.forEachTopLevel("none", t => {
+            this.forEachTopLevel("none", (t) => {
                 // FIXME: Make ToJson a Named
                 if (!seenTypes.has(t)) {
                     seenTypes.add(t);
@@ -772,7 +765,7 @@ class NewtonsoftCSharpRenderer extends CSharpRenderer {
             this.emitLine("var ", variableName, " = new List<", this.csType(targetType.items), ">();");
             this.emitLine("while (reader.TokenType != JsonToken.EndArray)");
             this.emitBlock(() => {
-                this.emitDecodeTransformer(xfer.itemTransformer, xfer.itemTargetType, v => this.emitLine(variableName, ".Add(", v, ");"), "arrayItem");
+                this.emitDecodeTransformer(xfer.itemTransformer, xfer.itemTargetType, (v) => this.emitLine(variableName, ".Add(", v, ");"), "arrayItem");
                 // FIXME: handle EOF
                 this.emitLine("reader.Read();");
             });
@@ -826,7 +819,7 @@ class NewtonsoftCSharpRenderer extends CSharpRenderer {
         }
         if (xfer instanceof Transformers_1.ChoiceTransformer) {
             const caseXfers = xfer.transformers;
-            if (caseXfers.length > 1 && caseXfers.every(caseXfer => caseXfer instanceof Transformers_1.StringMatchTransformer)) {
+            if (caseXfers.length > 1 && caseXfers.every((caseXfer) => caseXfer instanceof Transformers_1.StringMatchTransformer)) {
                 this.emitLine("switch (", variable, ")");
                 this.emitBlock(() => {
                     for (const caseXfer of caseXfers) {
@@ -1044,7 +1037,7 @@ class NewtonsoftCSharpRenderer extends CSharpRenderer {
                 if (haveNullable && !(targetType instanceof Type_1.UnionType)) {
                     this.emitLine("if (reader.TokenType == JsonToken.Null) return null;");
                 }
-                const allHandled = this.emitDecodeTransformer(xfer, targetType, v => this.emitLine("return ", v, ";"));
+                const allHandled = this.emitDecodeTransformer(xfer, targetType, (v) => this.emitLine("return ", v, ";"));
                 if (!allHandled) {
                     this.emitThrow(['"Cannot unmarshal type ', csType, '"']);
                 }
@@ -1091,13 +1084,13 @@ exports.systemTextJsonCSharpOptions = Object.assign({}, exports.cSharpOptions, {
         ["complete", { namespaces: true, helpers: true, attributes: true }],
         ["attributes-only", { namespaces: true, helpers: false, attributes: true }],
         ["just-types-and-namespace", { namespaces: true, helpers: false, attributes: false }],
-        ["just-types", { namespaces: true, helpers: false, attributes: false }]
+        ["just-types", { namespaces: true, helpers: false, attributes: false }],
     ]),
     baseclass: new RendererOptions_1.EnumOption("base-class", "Base class", [
         ["EntityData", "EntityData"],
-        ["Object", undefined]
+        ["Object", undefined],
     ], "Object", "secondary"),
-    checkRequired: new RendererOptions_1.BooleanOption("check-required", "Fail if required properties are missing", false)
+    checkRequired: new RendererOptions_1.BooleanOption("check-required", "Fail if required properties are missing", false),
 });
 class SystemTextJsonCSharpRenderer extends CSharpRenderer {
     constructor(targetLanguage, renderContext, _options) {
@@ -1574,7 +1567,7 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer {
                     this.emitBlock(() => {
                         // this.emitLine("var uri = new Uri(", variable, ");");
                         // The default value about:blank should never happen, but this way we avoid a null reference warning.
-                        this.emitLine('var uri = new Uri("about:blank");');
+                        this.emitLine("var uri = new Uri(\"about:blank\");");
                         this.emitLine("if (!string.IsNullOrEmpty(stringValue))");
                         this.emitBlock(() => {
                             this.emitLine("uri = new Uri(", variable, ");");

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

@@ -13,10 +13,7 @@ const Source_1 = require("../Source");
 const Annotation_1 = require("../Annotation");
 exports.elmOptions = {
     justTypes: new RendererOptions_1.BooleanOption("just-types", "Plain types only", false),
-    useList: new RendererOptions_1.EnumOption("array-type", "Use Array or List", [
-        ["array", false],
-        ["list", true]
-    ]),
+    useList: new RendererOptions_1.EnumOption("array-type", "Use Array or List", [["array", false], ["list", true]]),
     // FIXME: Do this via a configurable named eventually.
     moduleName: new RendererOptions_1.StringOption("module", "Generated module name", "NAME", "QuickType")
 };

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

@@ -14,7 +14,7 @@ exports.goOptions = {
     justTypes: new RendererOptions_1.BooleanOption("just-types", "Plain types only", false),
     justTypesAndPackage: new RendererOptions_1.BooleanOption("just-types-and-package", "Plain types with package only", false),
     packageName: new RendererOptions_1.StringOption("package", "Generated package name", "NAME", "main"),
-    multiFileOutput: new RendererOptions_1.BooleanOption("multi-file-output", "Renders each top-level object in its own Go file", false)
+    multiFileOutput: new RendererOptions_1.BooleanOption("multi-file-output", "Renders each top-level object in its own Go file", false),
 };
 class GoTargetLanguage extends TargetLanguage_1.TargetLanguage {
     constructor() {
@@ -82,7 +82,7 @@ class GoRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return true;
     }
     makeTopLevelDependencyNames(_, topLevelName) {
-        const unmarshalName = new Naming_1.DependencyName(namingFunction, topLevelName.order, lookup => `unmarshal_${lookup(topLevelName)}`);
+        const unmarshalName = new Naming_1.DependencyName(namingFunction, topLevelName.order, (lookup) => `unmarshal_${lookup(topLevelName)}`);
         this._topLevelUnmarshalNames.set(topLevelName, unmarshalName);
         return [unmarshalName];
     }
@@ -135,7 +135,7 @@ class GoRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return this.goType(t, true);
     }
     goType(t, withIssues = false) {
-        return TypeUtils_1.matchType(t, _anyType => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, "interface{}"), _nullType => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, "interface{}"), _boolType => "bool", _integerType => "int64", _doubleType => "float64", _stringType => "string", arrayType => ["[]", this.goType(arrayType.items, withIssues)], classType => this.nameForNamedType(classType), mapType => {
+        return TypeUtils_1.matchType(t, (_anyType) => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, "interface{}"), (_nullType) => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, "interface{}"), (_boolType) => "bool", (_integerType) => "int64", (_doubleType) => "float64", (_stringType) => "string", (arrayType) => ["[]", this.goType(arrayType.items, withIssues)], (classType) => this.nameForNamedType(classType), (mapType) => {
             let valueSource;
             const v = mapType.values;
             if (v instanceof Type_1.UnionType && TypeUtils_1.nullableFromUnion(v) === null) {
@@ -145,7 +145,7 @@ class GoRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 valueSource = this.goType(v, withIssues);
             }
             return ["map[string]", valueSource];
-        }, enumType => this.nameForNamedType(enumType), unionType => {
+        }, (enumType) => this.nameForNamedType(enumType), (unionType) => {
             const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null)
                 return this.nullableGoType(nullable, withIssues);
@@ -254,7 +254,7 @@ class GoRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             ifMember("class", undefined, (_1, _2, goType) => {
                 this.emitLine("var c ", goType);
             });
-            const args = makeArgs(fn => ["&x.", fn], (isClass, fn) => {
+            const args = makeArgs((fn) => ["&x.", fn], (isClass, fn) => {
                 if (isClass) {
                     return "true, &c";
                 }
@@ -275,7 +275,7 @@ class GoRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
         this.ensureBlankLine();
         this.emitFunc(["(x *", unionName, ") MarshalJSON() ([]byte, error)"], () => {
-            const args = makeArgs(fn => ["x.", fn], (_, fn) => ["x.", fn, " != nil, x.", fn]);
+            const args = makeArgs((fn) => ["x.", fn], (_, fn) => ["x.", fn, " != nil, x.", fn]);
             this.emitLine("return marshalUnion(", args, ")");
         });
         this.endFile();
@@ -442,7 +442,7 @@ func marshalUnion(pi *int64, pf *float64, pb *bool, ps *string, haveArray bool,
             this.leadingComments === undefined) {
             this.emitSingleFileHeaderComments();
         }
-        this.forEachTopLevel("leading-and-interposing", (t, name) => this.emitTopLevel(t, name), t => !(this._options.justTypes || this._options.justTypesAndPackage) ||
+        this.forEachTopLevel("leading-and-interposing", (t, name) => this.emitTopLevel(t, name), (t) => !(this._options.justTypes || this._options.justTypesAndPackage) ||
             this.namedTypeToNameForTopLevel(t) === undefined);
         this.forEachObject("leading-and-interposing", (c, className) => this.emitClass(c, className));
         this.forEachEnum("leading-and-interposing", (u, enumName) => this.emitEnum(u, enumName));

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

@@ -12,9 +12,9 @@ exports.haskellOptions = {
     justTypes: new RendererOptions_1.BooleanOption("just-types", "Plain types only", false),
     useList: new RendererOptions_1.EnumOption("array-type", "Use Array or List", [
         ["array", false],
-        ["list", true]
+        ["list", true],
     ]),
-    moduleName: new RendererOptions_1.StringOption("module", "Generated module name", "NAME", "QuickType")
+    moduleName: new RendererOptions_1.StringOption("module", "Generated module name", "NAME", "QuickType"),
 };
 class HaskellTargetLanguage extends TargetLanguage_1.TargetLanguage {
     constructor() {
@@ -86,15 +86,15 @@ const forbiddenNames = [
     "Object",
     "Result",
     "Series",
-    "Error"
+    "Error",
 ];
-const legalizeName = Strings_1.legalizeCharacters(cp => Strings_1.isAscii(cp) && Strings_1.isLetterOrUnderscoreOrDigit(cp));
+const legalizeName = Strings_1.legalizeCharacters((cp) => Strings_1.isAscii(cp) && Strings_1.isLetterOrUnderscoreOrDigit(cp));
 function haskellNameStyle(original, upper) {
     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 = Naming_1.funPrefixNamer("upper", n => haskellNameStyle(n, true));
-const lowerNamingFunction = Naming_1.funPrefixNamer("lower", n => haskellNameStyle(n, false));
+const upperNamingFunction = Naming_1.funPrefixNamer("upper", (n) => haskellNameStyle(n, true));
+const lowerNamingFunction = Naming_1.funPrefixNamer("lower", (n) => haskellNameStyle(n, false));
 class HaskellRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     constructor(targetLanguage, renderContext, _options) {
         super(targetLanguage, renderContext);
@@ -140,12 +140,12 @@ class HaskellRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     haskellType(t, noOptional = false) {
-        return TypeUtils_1.matchType(t, _anyType => Source_1.multiWord(" ", "Maybe", "Text"), _nullType => Source_1.multiWord(" ", "Maybe", "Text"), _boolType => Source_1.singleWord("Bool"), _integerType => Source_1.singleWord("Int"), _doubleType => Source_1.singleWord("Float"), _stringType => Source_1.singleWord("Text"), arrayType => {
+        return TypeUtils_1.matchType(t, (_anyType) => Source_1.multiWord(" ", "Maybe", "Text"), (_nullType) => Source_1.multiWord(" ", "Maybe", "Text"), (_boolType) => Source_1.singleWord("Bool"), (_integerType) => Source_1.singleWord("Int"), (_doubleType) => Source_1.singleWord("Float"), (_stringType) => Source_1.singleWord("Text"), (arrayType) => {
             if (this._options.useList) {
                 return Source_1.multiWord("", "[", Source_1.parenIfNeeded(this.haskellType(arrayType.items)), "]");
             }
             return Source_1.multiWord(" ", "Vector", Source_1.parenIfNeeded(this.haskellType(arrayType.items)));
-        }, classType => Source_1.singleWord(this.nameForNamedType(classType)), mapType => Source_1.multiWord(" ", "HashMap Text", Source_1.parenIfNeeded(this.haskellType(mapType.values))), enumType => Source_1.singleWord(this.nameForNamedType(enumType)), unionType => {
+        }, (classType) => Source_1.singleWord(this.nameForNamedType(classType)), (mapType) => Source_1.multiWord(" ", "HashMap Text", Source_1.parenIfNeeded(this.haskellType(mapType.values))), (enumType) => Source_1.singleWord(this.nameForNamedType(enumType)), (unionType) => {
             const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 const nullableType = this.haskellType(nullable);
@@ -204,7 +204,7 @@ class HaskellRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("data ", enumName);
         this.indent(() => {
             let onFirst = true;
-            this.forEachEnumCase(e, "none", name => {
+            this.forEachEnumCase(e, "none", (name) => {
                 const equalsOrPipe = onFirst ? "=" : "|";
                 this.emitLine(equalsOrPipe, " ", name, enumName);
                 onFirst = false;
@@ -243,7 +243,7 @@ class HaskellRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     emitClassEncoderInstance(c, className) {
         let classProperties = [];
-        this.forEachClassProperty(c, "none", name => {
+        this.forEachClassProperty(c, "none", (name) => {
             classProperties.push(" ");
             classProperties.push(name);
             classProperties.push(className);
@@ -259,7 +259,7 @@ class HaskellRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     this.emitLine("object");
                     let onFirst = true;
                     this.forEachClassProperty(c, "none", (name, jsonName) => {
-                        this.emitLine(onFirst ? "[ " : ", ", '"', Strings_1.stringEscape(jsonName), '" .= ', name, className);
+                        this.emitLine(onFirst ? "[ " : ", ", "\"", Strings_1.stringEscape(jsonName), "\" .= ", name, className);
                         onFirst = false;
                     });
                     if (onFirst) {
@@ -282,7 +282,7 @@ class HaskellRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     let onFirst = true;
                     this.forEachClassProperty(c, "none", (_, jsonName, p) => {
                         const operator = p.isOptional ? ".:?" : ".:";
-                        this.emitLine(onFirst ? "<$> " : "<*> ", "v ", operator, ' "', Strings_1.stringEscape(jsonName), '"');
+                        this.emitLine(onFirst ? "<$> " : "<*> ", "v ", operator, " \"", Strings_1.stringEscape(jsonName), "\"");
                         onFirst = false;
                     });
                 });
@@ -298,19 +298,19 @@ class HaskellRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("instance ToJSON ", enumName, " where");
         this.indent(() => {
             this.forEachEnumCase(e, "none", (name, jsonName) => {
-                this.emitLine("toJSON ", name, enumName, ' = "', Strings_1.stringEscape(jsonName), '"');
+                this.emitLine("toJSON ", name, enumName, " = \"", Strings_1.stringEscape(jsonName), "\"");
             });
         });
     }
     emitEnumDecoderInstance(e, enumName) {
         this.emitLine("instance FromJSON ", enumName, " where");
         this.indent(() => {
-            this.emitLine('parseJSON = withText "', enumName, '" parseText');
+            this.emitLine("parseJSON = withText \"", enumName, "\" parseText");
             this.indent(() => {
                 this.emitLine("where");
                 this.indent(() => {
                     this.forEachEnumCase(e, "none", (name, jsonName) => {
-                        this.emitLine('parseText "', Strings_1.stringEscape(jsonName), '" = return ', name, enumName);
+                        this.emitLine("parseText \"", Strings_1.stringEscape(jsonName), "\" = return ", name, enumName);
                     });
                 });
             });