[swift6] Add Identifiable conformance to supported models

x-sheep · x-sheep · commit 0578e138ef0e · 2024-11-23T17:50:57.000Z
diff --git a/bin/configs/swift6-objcCompatible.yaml b/bin/configs/swift6-objcCompatible.yaml
@@ -6,6 +6,7 @@ generateAliasAsModel: true
 additionalProperties:
   responseAs: ObjcBlock
   podAuthors: ""
+  identifiableModels: false
   podSummary: PetstoreClient
   objcCompatible: true
   projectName: PetstoreClient
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java
@@ -70,6 +70,7 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig
     public static final String USE_BACKTICK_ESCAPES = "useBacktickEscapes";
     public static final String GENERATE_MODEL_ADDITIONAL_PROPERTIES = "generateModelAdditionalProperties";
     public static final String HASHABLE_MODELS = "hashableModels";
+    public static final String IDENTIFIABLE_MODELS = "identifiableModels";
     public static final String USE_JSON_ENCODABLE = "useJsonEncodable";
     public static final String MAP_FILE_BINARY_TO_DATA = "mapFileBinaryToData";
     public static final String USE_CUSTOM_DATE_WITHOUT_TIME = "useCustomDateWithoutTime";
@@ -98,6 +99,7 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig
     @Setter protected boolean useBacktickEscapes = false;
     @Setter protected boolean generateModelAdditionalProperties = true;
     @Setter protected boolean hashableModels = true;
+    @Setter protected boolean identifiableModels = true;
     @Setter protected boolean useJsonEncodable = true;
     @Getter @Setter protected boolean mapFileBinaryToData = false;
     @Setter protected boolean useCustomDateWithoutTime = false;
@@ -307,6 +309,10 @@ public Swift6ClientCodegen() {
                 "Make hashable models (default: true)")
                 .defaultValue(Boolean.TRUE.toString()));
 
+        cliOptions.add(new CliOption(IDENTIFIABLE_MODELS,
+                "Make models conform to Identifiable when an id is present (default: true)")
+                .defaultValue(Boolean.TRUE.toString()));
+
         cliOptions.add(new CliOption(USE_JSON_ENCODABLE,
                 "Make models conform to JSONEncodable protocol (default: true)")
                 .defaultValue(Boolean.TRUE.toString()));
@@ -527,6 +533,11 @@ public void processOpts() {
         }
         additionalProperties.put(HASHABLE_MODELS, hashableModels);
 
+        if (additionalProperties.containsKey(IDENTIFIABLE_MODELS)) {
+            setIdentifiableModels(convertPropertyToBooleanAndWriteBack(IDENTIFIABLE_MODELS));
+        }
+        additionalProperties.put(IDENTIFIABLE_MODELS, identifiableModels);
+
         if (additionalProperties.containsKey(USE_JSON_ENCODABLE)) {
             setUseJsonEncodable(convertPropertyToBooleanAndWriteBack(USE_JSON_ENCODABLE));
         }
@@ -973,6 +984,15 @@ public CodegenModel fromModel(String name, Schema model) {
         if (hashableModels) {
             codegenModel.vendorExtensions.put("x-swift-hashable", true);
         }
+        if (identifiableModels && !codegenModel.vendorExtensions.containsKey("x-swift-identifiable")) {
+            for (CodegenProperty cp : codegenModel.getVars()) {
+                if (!cp.getBaseName().equals("id")) continue;
+                if (cp.isString || cp.isUuid || cp.isInteger || cp.isLong) {
+                    codegenModel.vendorExtensions.put("x-swift-identifiable", true);
+                    break;
+                }
+            }
+        }
         return codegenModel;
     }
 
diff --git a/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache
@@ -135,3 +135,7 @@
         {{#generateModelAdditionalProperties}}{{#additionalPropertiesType}}hasher.combine(additionalProperties.hashValue){{/additionalPropertiesType}}{{/generateModelAdditionalProperties}}
     }{{/vendorExtensions.x-swift-hashable}}{{/useClasses}}{{/objcCompatible}}
 }
+{{#vendorExtensions.x-swift-identifiable}}
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension {{{classname}}}: Identifiable {}
+{{/vendorExtensions.x-swift-identifiable}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift6ClientCodegenOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift6ClientCodegenOptionsProvider.java
@@ -48,6 +48,7 @@ public class Swift6ClientCodegenOptionsProvider implements OptionsProvider {
     public static final String USE_BACKTICKS_ESCAPES_VALUE = "false";
     public static final String GENERATE_MODEL_ADDITIONAL_PROPERTIES_VALUE = "true";
     public static final String HASHABLE_MODELS_VALUE = "true";
+    public static final String IDENTIFIABLE_MODELS_VALUE = "true";
     public static final String USE_JSON_ENCODABLE_VALUE = "true";
     public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false";
     public static final String PREPEND_FORM_OR_BODY_PARAMETERS_VALUE = "true";
@@ -98,15 +99,16 @@ public Map<String, String> createOptions() {
                 .put(Swift6ClientCodegen.GENERATE_MODEL_ADDITIONAL_PROPERTIES,
                         GENERATE_MODEL_ADDITIONAL_PROPERTIES_VALUE)
                 .put(Swift6ClientCodegen.HASHABLE_MODELS, HASHABLE_MODELS_VALUE)
+                .put(Swift6ClientCodegen.IDENTIFIABLE_MODELS, IDENTIFIABLE_MODELS_VALUE)
                 .put(Swift6ClientCodegen.USE_JSON_ENCODABLE, USE_JSON_ENCODABLE_VALUE)
                 .put(Swift6ClientCodegen.MAP_FILE_BINARY_TO_DATA, "false")
                 .put(Swift6ClientCodegen.USE_CUSTOM_DATE_WITHOUT_TIME, "false")
                 .put(Swift6ClientCodegen.VALIDATABLE, "true")
                 .put(Swift6ClientCodegen.ONE_OF_UNKNOWN_DEFAULT_CASE, "false")
                 .put(Swift6ClientCodegen.USE_CLASSES, "false")
-                .put(Swift6ClientCodegen.API_STATIC_METHOD, 
+                .put(Swift6ClientCodegen.API_STATIC_METHOD,
                         API_STATIC_METHOD_VALUE)
-                .put(Swift6ClientCodegen.COMBINE_DEFERRED, 
+                .put(Swift6ClientCodegen.COMBINE_DEFERRED,
                         COMBINE_DEFERRED_VALUE)
                 .put(CodegenConstants.ENUM_UNKNOWN_DEFAULT_CASE, ENUM_UNKNOWN_DEFAULT_CASE_VALUE)
                 .build();
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift6/Swift6ClientCodegenOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift6/Swift6ClientCodegenOptionsTest.java
@@ -53,6 +53,7 @@ protected void verifyOptions() {
         verify(clientCodegen).setGenerateModelAdditionalProperties(
                 Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.GENERATE_MODEL_ADDITIONAL_PROPERTIES_VALUE));
         verify(clientCodegen).setHashableModels(Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.HASHABLE_MODELS_VALUE));
+        verify(clientCodegen).setIdentifiableModels(Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.IDENTIFIABLE_MODELS_VALUE));
         verify(clientCodegen)
                 .setEnumUnknownDefaultCase(Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.ENUM_UNKNOWN_DEFAULT_CASE_VALUE));
         verify(clientCodegen).setApiStaticMethod(Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.API_STATIC_METHOD_VALUE));
diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift
@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift
@@ -52,4 +52,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(complete, forKey: .complete)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Order: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift
@@ -55,4 +55,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
         }
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Pet: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift
@@ -30,4 +30,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Tag: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift
@@ -55,4 +55,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(userStatus, forKey: .userStatus)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension User: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift
@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift
@@ -52,4 +52,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(complete, forKey: .complete)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Order: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift
@@ -55,4 +55,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
         }
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Pet: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift
@@ -30,4 +30,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Tag: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift
@@ -55,4 +55,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(userStatus, forKey: .userStatus)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension User: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift
@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift
@@ -52,4 +52,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(complete, forKey: .complete)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Order: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift
@@ -55,4 +55,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
         }
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Pet: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift
@@ -30,4 +30,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Tag: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift
@@ -55,4 +55,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(userStatus, forKey: .userStatus)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension User: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -52,4 +52,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(complete, forKey: .complete)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Order: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -55,4 +55,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
         }
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Pet: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -30,4 +30,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Tag: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -55,4 +55,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(userStatus, forKey: .userStatus)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension User: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift
@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift
@@ -52,4 +52,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(complete, forKey: .complete)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Order: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift
@@ -55,4 +55,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
         }
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Pet: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift
@@ -30,4 +30,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Tag: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift
@@ -55,4 +55,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(userStatus, forKey: .userStatus)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension User: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift
@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift
@@ -52,4 +52,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(complete, forKey: .complete)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Order: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift
@@ -53,4 +53,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(status, forKey: .status)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Pet: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift
@@ -30,4 +30,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Tag: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift
@@ -55,4 +55,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(userStatus, forKey: .userStatus)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension User: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -52,4 +52,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(complete, forKey: .complete)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Order: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -55,4 +55,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {
         }
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Pet: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -30,4 +30,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Tag: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -55,4 +55,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(userStatus, forKey: .userStatus)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension User: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -30,4 +30,6 @@ internal struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -53,4 +53,6 @@ internal struct Order: Sendable, Codable, JSONEncodable {
         try container.encodeIfPresent(complete, forKey: .complete)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Order: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -56,4 +56,6 @@ internal struct Pet: Sendable, Codable, JSONEncodable, Hashable {
         }
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Pet: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -30,4 +30,6 @@ internal struct Tag: Sendable, Codable, JSONEncodable, Hashable {
         try container.encodeIfPresent(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Tag: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -55,4 +55,6 @@ internal struct User: Sendable, Codable, JSONEncodable {
         try container.encodeIfPresent(userStatus, forKey: .userStatus)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension User: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {
         try container.encode(name, forKey: .name)
     }
 }
+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
+extension Category: Identifiable {}
 
diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift
diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift
diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift
diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift
diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift
diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Category.swift
diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Order.swift
diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Pet.swift
diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Tag.swift
diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/User.swift

Original file line number	Diff line number	Diff line change
`@@ -135,3 +135,7 @@`
`135`	`135`	`{{#generateModelAdditionalProperties}}{{#additionalPropertiesType}}hasher.combine(additionalProperties.hashValue){{/additionalPropertiesType}}{{/generateModelAdditionalProperties}}`
`136`	`136`	`}{{/vendorExtensions.x-swift-hashable}}{{/useClasses}}{{/objcCompatible}}`
`137`	`137`	`}`
	`138`	`+{{#vendorExtensions.x-swift-identifiable}}`
	`139`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`140`	`+extension {{{classname}}}: Identifiable {}`
	`141`	`+{{/vendorExtensions.x-swift-identifiable}}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable {`
`30`	`30`	`try container.encode(name, forKey: .name)`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`34`	`+extension Category: Identifiable {}`
`33`	`35`
Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable {`
`52`	`52`	`try container.encodeIfPresent(complete, forKey: .complete)`
`53`	`53`	`}`
`54`	`54`	`}`
	`55`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`56`	`+extension Order: Identifiable {}`
`55`	`57`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
	`58`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`59`	`+extension Pet: Identifiable {}`
`58`	`60`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable {`
`30`	`30`	`try container.encodeIfPresent(name, forKey: .name)`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`34`	`+extension Tag: Identifiable {}`
`33`	`35`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable {`
`55`	`55`	`try container.encodeIfPresent(userStatus, forKey: .userStatus)`
`56`	`56`	`}`
`57`	`57`	`}`
	`58`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`59`	`+extension User: Identifiable {}`
`58`	`60`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable {`
`53`	`53`	`try container.encodeIfPresent(status, forKey: .status)`
`54`	`54`	`}`
`55`	`55`	`}`
	`56`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`57`	`+extension Pet: Identifiable {}`
`56`	`58`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,6 @@ internal struct Category: Sendable, Codable, JSONEncodable, Hashable {`
`30`	`30`	`try container.encode(name, forKey: .name)`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`34`	`+extension Category: Identifiable {}`
`33`	`35`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,6 @@ internal struct Order: Sendable, Codable, JSONEncodable {`
`53`	`53`	`try container.encodeIfPresent(complete, forKey: .complete)`
`54`	`54`	`}`
`55`	`55`	`}`
	`56`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`57`	`+extension Order: Identifiable {}`
`56`	`58`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,6 @@ internal struct Pet: Sendable, Codable, JSONEncodable, Hashable {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
	`59`	`+@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)`
	`60`	`+extension Pet: Identifiable {}`
`59`	`61`