quicktype-core 23.0.39 → 23.0.41

package/dist/language/Swift.d.ts

@@ -22,6 +22,7 @@ export declare const swiftOptions: {
     objcSupport: BooleanOption;
     optionalEnums: BooleanOption;
     swift5Support: BooleanOption;
+    sendable: BooleanOption;
     multiFileOutput: BooleanOption;
     accessLevel: EnumOption<string>;
     protocol: EnumOption<{
@@ -72,7 +73,7 @@ export declare class SwiftRenderer extends ConvenienceRenderer {
     private renderSingleFileHeaderComments;
     private renderHeader;
     private renderTopLevelAlias;
-    protected getProtocolsArray(_t: Type, isClass: boolean): string[];
+    protected getProtocolsArray(kind: "struct" | "class" | "enum"): string[];
     private getProtocolString;
     private getEnumPropertyGroups;
     private get accessLevel();

package/dist/language/Swift.js

@@ -36,6 +36,7 @@ exports.swiftOptions = {
     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),
+    sendable: new RendererOptions_1.BooleanOption("sendable", "Mark generated models as Sendable", 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", [
         ["internal", "internal"],
@@ -82,6 +83,7 @@ class SwiftTargetLanguage extends TargetLanguage_1.TargetLanguage {
             exports.swiftOptions.acronymStyle,
             exports.swiftOptions.objcSupport,
             exports.swiftOptions.optionalEnums,
+            exports.swiftOptions.sendable,
             exports.swiftOptions.swift5Support,
             exports.swiftOptions.multiFileOutput,
             exports.swiftOptions.mutableProperties
@@ -666,14 +668,18 @@ class SwiftRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (!this._options.justTypes && this._options.alamofire) {
             this.emitLineOnce("import Alamofire");
         }
+        if (this._options.optionalEnums) {
+            this.emitLineOnce("import OptionallyDecodable // https://github.com/idrougge/OptionallyDecodable");
+        }
         this.ensureBlankLine();
     }
     renderTopLevelAlias(t, name) {
         this.emitLine(this.accessLevel, "typealias ", name, " = ", this.swiftType(t, true));
     }
-    getProtocolsArray(_t, isClass) {
+    getProtocolsArray(kind) {
         const protocols = [];
         // [Michael Fey (@MrRooni), 2019-4-24] Technically NSObject isn't a "protocol" in this instance, but this felt like the best place to slot in this superclass declaration.
+        const isClass = kind === "class";
         if (isClass && this._options.objcSupport) {
             protocols.push("NSObject");
         }
@@ -686,10 +692,16 @@ class SwiftRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this._options.protocol.equatable) {
             protocols.push("Equatable");
         }
+        if (this._options.sendable && !this._options.mutableProperties && !this._options.objcSupport) {
+            protocols.push("Sendable");
+        }
         return protocols;
     }
-    getProtocolString(_t, isClass) {
-        const protocols = this.getProtocolsArray(_t, isClass);
+    getProtocolString(kind, baseClass = undefined) {
+        let protocols = this.getProtocolsArray(kind);
+        if (baseClass) {
+            protocols.unshift(baseClass);
+        }
         return protocols.length > 0 ? ": " + protocols.join(", ") : "";
     }
     getEnumPropertyGroups(c) {
@@ -765,7 +777,7 @@ class SwiftRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             // [Michael Fey (@MrRooni), 2019-4-24] Swift 5 or greater, must come before the access declaration for the class.
             this.emitItem(this.objcMembersDeclaration);
         }
-        this.emitBlockWithAccess([structOrClass, " ", className, this.getProtocolString(c, isClass)], () => {
+        this.emitBlockWithAccess([structOrClass, " ", className, this.getProtocolString(structOrClass)], () => {
             if (this._options.dense) {
                 let lastProperty = undefined;
                 let lastNames = [];
@@ -776,7 +788,7 @@ class SwiftRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     let sources = [
                         [
                             this._options.optionalEnums && lastProperty.type.kind === "enum"
-                                ? `@NilOnFail${this._options.namedTypePrefix} `
+                                ? `@OptionallyDecodable `
                                 : "",
                             this.accessLevel,
                             useMutableProperties || (this._options.optionalEnums && lastProperty.type.kind === "enum")
@@ -995,18 +1007,7 @@ encoder.dateEncodingStrategy = .formatted(formatter)`);
         this.emitLineOnce("import Foundation");
         this.ensureBlankLine();
         this.emitDescription(this.descriptionForType(e));
-        const protocols = [];
-        if (!this._options.justTypes) {
-            protocols.push("String"); // Not a protocol
-            protocols.push("Codable");
-        }
-        if (this._options.protocol.hashable) {
-            protocols.push("Hashable");
-        }
-        if (this._options.protocol.equatable) {
-            protocols.push("Equatable");
-        }
-        const protocolString = protocols.length > 0 ? ": " + protocols.join(", ") : "";
+        const protocolString = this.getProtocolString("enum", "String");
         if (this._options.justTypes) {
             this.emitBlockWithAccess(["enum ", enumName, protocolString], () => {
                 this.forEachEnumCase(e, "none", name => {
@@ -1042,7 +1043,7 @@ encoder.dateEncodingStrategy = .formatted(formatter)`);
         this.emitDescription(this.descriptionForType(u));
         const indirect = this.isCycleBreakerType(u) ? "indirect " : "";
         const [maybeNull, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u, sortBy);
-        this.emitBlockWithAccess([indirect, "enum ", unionName, this.getProtocolString(u, false)], () => {
+        this.emitBlockWithAccess([indirect, "enum ", unionName, this.getProtocolString("enum")], () => {
             this.forEachUnionMember(u, nonNulls, "none", null, (name, t) => {
                 this.emitLine("case ", name, "(", this.swiftType(t), ")");
             });
@@ -1157,18 +1158,6 @@ 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": "23.0.39",
+    "version": "23.0.41",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",