quicktype-core 6.1.7 → 6.1.8

package/dist/language/Swift.d.ts

@@ -20,6 +20,7 @@ export declare const swiftOptions: {
     dense: EnumOption<boolean>;
     linux: BooleanOption;
     objcSupport: BooleanOption;
+    optionalEnums: BooleanOption;
     swift5Support: BooleanOption;
     multiFileOutput: BooleanOption;
     accessLevel: EnumOption<string>;

package/dist/language/Swift.js

@@ -33,6 +33,7 @@ exports.swiftOptions = {
     ], "dense", "secondary"),
     linux: new RendererOptions_1.BooleanOption("support-linux", "Support Linux", false, "secondary"),
     objcSupport: new RendererOptions_1.BooleanOption("objective-c-support", "Objects inherit from NSObject and @objcMembers is added to classes", false),
+    optionalEnums: new RendererOptions_1.BooleanOption("optional-enums", "If no matching case is found enum value is set to null", false),
     swift5Support: new RendererOptions_1.BooleanOption("swift-5-support", "Renders output in a Swift 5 compatible mode", false),
     multiFileOutput: new RendererOptions_1.BooleanOption("multi-file-output", "Renders each top-level object in its own Swift file", false),
     accessLevel: new RendererOptions_1.EnumOption("access-level", "Access level", [
@@ -79,6 +80,7 @@ class SwiftTargetLanguage extends TargetLanguage_1.TargetLanguage {
             exports.swiftOptions.protocol,
             exports.swiftOptions.acronymStyle,
             exports.swiftOptions.objcSupport,
+            exports.swiftOptions.optionalEnums,
             exports.swiftOptions.swift5Support,
             exports.swiftOptions.multiFileOutput,
             exports.swiftOptions.mutableProperties
@@ -574,7 +576,7 @@ class SwiftRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return Naming_1.funPrefixNamer("lower", s => swiftNameStyle("", false, s, Acronyms_1.acronymStyle(this._options.acronymStyle)));
     }
     swiftPropertyType(p) {
-        if (p.isOptional) {
+        if (p.isOptional || (this._options.optionalEnums && p.type.kind === "enum")) {
             return [this.swiftType(p.type, true, true), "?"];
         }
         else {
@@ -771,7 +773,17 @@ class SwiftRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     if (lastProperty === undefined)
                         return;
                     const useMutableProperties = this._options.mutableProperties;
-                    let sources = [[this.accessLevel, useMutableProperties ? "var " : "let "]];
+                    let sources = [
+                        [
+                            this._options.optionalEnums && lastProperty.type.kind === "enum"
+                                ? `@NilOnFail${this._options.namedTypePrefix} `
+                                : "",
+                            this.accessLevel,
+                            useMutableProperties || (this._options.optionalEnums && lastProperty.type.kind === "enum")
+                                ? "var "
+                                : "let "
+                        ]
+                    ];
                     lastNames.forEach((n, i) => {
                         if (i > 0)
                             sources.push(", ");
@@ -1145,6 +1157,18 @@ encoder.dateEncodingStrategy = .formatted(formatter)`);
         if (!this._options.justTypes) {
             this.emitSupportFunctions4();
         }
+        if (this._options.optionalEnums) {
+            this.emitBlockWithAccess(`@propertyWrapper public struct NilOnFail${this._options.namedTypePrefix}<T: Codable>: Codable`, () => {
+                this.emitMultiline(`
+public let wrappedValue: T?
+public init(from decoder: Decoder) throws {
+    wrappedValue = try? T(from: decoder)
+}
+public init(_ wrappedValue: T?) {
+    self.wrappedValue = wrappedValue
+}`);
+            });
+        }
     }
     emitAlamofireExtension() {
         this.ensureBlankLine();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "6.1.7",
+    "version": "6.1.8",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -45,6 +45,6 @@
         "fs": false
     },
     "config": {
-        "commit": "99e0554e3a23b5e56dd56676b89a7e96fcfc2013"
+        "commit": "4523ba79ed0103e4d456538e6651451422c30977"
     }
 }