Merge main

2026-08-22 13:13:05 +00:00 · 2026-07-22 10:48:14 +01:00 · 2026-07-22 10:48:14 +01:00 · 5ab95df4c0
commit 5ab95df4c0
parent 0d4bbf6f38 8435d219e4
787 changed files with 33462 additions and 25302 deletions
--- a/open-api/bin/generate-dart-sdk.sh
+++ b/open-api/bin/generate-dart-sdk.sh
@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-OPENAPI_GENERATOR_VERSION=v7.22.0
+OPENAPI_GENERATOR_VERSION=v7.24.0

 set -euo pipefail

@ -23,7 +23,6 @@ patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./patch/
 patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api.dart <./patch/api.dart.patch
 patch --no-backup-if-mismatch -u ../mobile/openapi/pubspec.yaml <./patch/pubspec_immich_mobile.yaml.patch
 patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/asset_edit_action_item_dto.dart <./patch/asset_edit_action_item_dto.dart.patch
-patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/time_bucket_asset_response_dto.dart <./patch/time_bucket_asset_response_dto.dart.patch
 # Don't include analysis_options.yaml for the generated openapi files
 # so that language servers can properly exclude the mobile/openapi directory
 rm ../mobile/openapi/analysis_options.yaml
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@ -2702,6 +2702,7 @@
            "name": "id",
            "required": true,
            "in": "path",
+            "description": "Album ID",
            "schema": {
              "format": "uuid",
              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
@ -2712,6 +2713,14 @@
            "name": "userId",
            "required": true,
            "in": "path",
+            "description": "Album user ID, or \"me\" to reference the current user.",
+            "x-immich-history": [
+              {
+                "version": "v3",
+                "state": "Updated",
+                "description": "\"me\" as a value is deprecated"
+              }
+            ],
            "schema": {
              "type": "string"
            }
@ -2762,6 +2771,7 @@
            "name": "id",
            "required": true,
            "in": "path",
+            "description": "Album ID",
            "schema": {
              "format": "uuid",
              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
@ -2772,6 +2782,14 @@
            "name": "userId",
            "required": true,
            "in": "path",
+            "description": "Album user ID, or \"me\" to reference the current user.",
+            "x-immich-history": [
+              {
+                "version": "v3",
+                "state": "Updated",
+                "description": "\"me\" as a value is deprecated"
+              }
+            ],
            "schema": {
              "type": "string"
            }
@ -7139,9 +7157,9 @@
            "in": "query",
            "description": "Filter by date",
            "schema": {
-              "format": "date-time",
-              "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z|([+-](?:[01]\\d|2[0-3]):[0-5]\\d)))$",
-              "example": "2024-01-01T00:00:00.000Z",
+              "format": "date",
+              "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))$",
+              "example": "2024-01-01",
              "type": "string"
            }
          },
@ -7308,9 +7326,9 @@
            "in": "query",
            "description": "Filter by date",
            "schema": {
-              "format": "date-time",
-              "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z|([+-](?:[01]\\d|2[0-3]):[0-5]\\d)))$",
-              "example": "2024-01-01T00:00:00.000Z",
+              "format": "date",
+              "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))$",
+              "example": "2024-01-01",
              "type": "string"
            }
          },
@ -10552,7 +10570,24 @@
      "post": {
        "description": "Search for assets based on various metadata criteria.",
        "operationId": "searchAssets",
-        "parameters": [],
+        "parameters": [
+          {
+            "name": "key",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "slug",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
        "requestBody": {
          "content": {
            "application/json": {
@ -17270,7 +17305,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "3.0.0-rc.2",
+    "version": "3.0.3",
    "contact": {}
  },
  "tags": [
@ -20404,6 +20439,17 @@
        },
        "type": "object"
      },
+      "HlsVideoResolution": {
+        "description": "HLS video resolution",
+        "enum": [
+          480,
+          720,
+          1080,
+          1440,
+          2160
+        ],
+        "type": "integer"
+      },
      "ImageFormat": {
        "description": "Image format",
        "enum": [
@ -23547,6 +23593,27 @@
        ],
        "type": "string"
      },
+      "RecentlyAddedResponse": {
+        "properties": {
+          "sidebarWeb": {
+            "description": "Whether the recently added page appears in the web sidebar",
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "sidebarWeb"
+        ],
+        "type": "object"
+      },
+      "RecentlyAddedUpdate": {
+        "properties": {
+          "sidebarWeb": {
+            "description": "Whether the recently added page appears in the web sidebar",
+            "type": "boolean"
+          }
+        },
+        "type": "object"
+      },
      "ReleaseChannel": {
        "description": "Release channel",
        "enum": [
@ -27868,10 +27935,26 @@
          "enabled": {
            "description": "Enable real-time HLS transcoding (alpha)",
            "type": "boolean"
+          },
+          "resolutions": {
+            "description": "Resolutions to use for real-time HLS transcoding",
+            "items": {
+              "$ref": "#/components/schemas/HlsVideoResolution"
+            },
+            "type": "array"
+          },
+          "videoCodecs": {
+            "description": "Video codecs to use for real-time HLS transcoding",
+            "items": {
+              "$ref": "#/components/schemas/VideoCodec"
+            },
+            "type": "array"
          }
        },
        "required": [
-          "enabled"
+          "enabled",
+          "resolutions",
+          "videoCodecs"
        ],
        "type": "object"
      },
@ -28004,9 +28087,10 @@
          },
          "percentageLimit": {
            "description": "Percentage limit of the integrity checksum job",
-            "maximum": 9007199254740991,
+            "format": "double",
+            "maximum": 1,
            "minimum": 0,
-            "type": "integer"
+            "type": "number"
          },
          "timeLimit": {
            "description": "How long the integrity checksum job may run for",
@ -29684,6 +29768,9 @@
          "ratings": {
            "$ref": "#/components/schemas/RatingsResponse"
          },
+          "recentlyAdded": {
+            "$ref": "#/components/schemas/RecentlyAddedResponse"
+          },
          "sharedLinks": {
            "$ref": "#/components/schemas/SharedLinksResponse"
          },
@ -29701,6 +29788,7 @@
          "people",
          "purchase",
          "ratings",
+          "recentlyAdded",
          "sharedLinks",
          "tags"
        ],
@ -29738,6 +29826,9 @@
          "ratings": {
            "$ref": "#/components/schemas/RatingsUpdate"
          },
+          "recentlyAdded": {
+            "$ref": "#/components/schemas/RecentlyAddedUpdate"
+          },
          "sharedLinks": {
            "$ref": "#/components/schemas/SharedLinksUpdate"
          },
--- a/open-api/openapitools.json
+++ b/open-api/openapitools.json
@ -2,6 +2,6 @@
  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
  "spaces": 2,
  "generator-cli": {
-    "version": "7.22.0"
+    "version": "7.24.0"
  }
 }
--- a/open-api/patch/api_client.dart.patch
+++ b/open-api/patch/api_client.dart.patch
@ -1,96 +1,30 @@
@@ -13,7 +13,7 @@
 class ApiClient {
   ApiClient({this.basePath = '/api', this.authentication,});
- 
+
 -  final String basePath;
 +  String basePath;
   final Authentication? authentication;
- 
+
   var _client = Client();
-@@ -44,8 +44,9 @@
-     Object? body,
-     Map<String, String> headerParams,
-     Map<String, String> formParams,
-    String? contentType,
-  ) async {
-+    String? contentType, {
-+    Future<void>? abortTrigger,
-+  }) async {
-     await authentication?.applyToParams(queryParams, headerParams);
- 
-     headerParams.addAll(_defaultHeaderMap);
-@@ -63,7 +64,7 @@
-         body is MultipartFile && (contentType == null ||
-         !contentType.toLowerCase().startsWith('multipart/form-data'))
-       ) {
-        final request = StreamedRequest(method, uri);
-+        final request = AbortableStreamedRequest(method, uri, abortTrigger: abortTrigger);
-         request.headers.addAll(headerParams);
-         request.contentLength = body.length;
-         body.finalize().listen(
-@@ -78,7 +79,7 @@
-       }
- 
-       if (body is MultipartRequest) {
-        final request = MultipartRequest(method, uri);
-+        final request = AbortableMultipartRequest(method, uri, abortTrigger: abortTrigger);
-         request.fields.addAll(body.fields);
-         request.files.addAll(body.files);
-         request.headers.addAll(body.headers);
-@@ -92,14 +93,19 @@
-         : await serializeAsync(body);
-       final nullableHeaderParams = headerParams.isEmpty ? null : headerParams;
- 
-      switch(method) {
-        case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,);
-        case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,);
-        case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams, body: msgBody,);
-        case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,);
-        case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,);
-        case 'GET': return await _client.get(uri, headers: nullableHeaderParams,);
-+      final request = AbortableRequest(method, uri, abortTrigger: abortTrigger);
-+      if (nullableHeaderParams != null) {
-+        request.headers.addAll(nullableHeaderParams);
-       }
-+      if (msgBody is String) {
-+        request.body = msgBody;
-+      } else if (msgBody is List<int>) {
-+        request.bodyBytes = msgBody;
-+      } else if (msgBody is Map<String, String>) {
-+        request.bodyFields = msgBody;
-+      }
-+      final response = await _client.send(request);
-+      return Response.fromStream(response);
-     } on SocketException catch (error, trace) {
-       throw ApiException.withInner(
-         HttpStatus.badRequest,
-@@ -136,26 +146,21 @@
-         trace,
-       );
-     }
-
-    throw ApiException(
-      HttpStatus.badRequest,
-      'Invalid HTTP operation: $method $path',
-    );
+@@ -143,19 +143,19 @@
+     );
   }
- 
+
 -  Future<dynamic> deserializeAsync(String value, String targetType, {bool growable = false,}) async =>
 +  Future<dynamic> deserializeAsync(String value, String targetType, {bool growable = false,}) =>
     // ignore: deprecated_member_use_from_same_package
     deserialize(value, targetType, growable: growable);
- 
+
   @Deprecated('Scheduled for removal in OpenAPI Generator 6.x. Use deserializeAsync() instead.')
 -  dynamic deserialize(String value, String targetType, {bool growable = false,}) {
 +  Future<dynamic> deserialize(String value, String targetType, {bool growable = false,}) async {
     // Remove all spaces. Necessary for regular expressions as well.
     targetType = targetType.replaceAll(' ', ''); // ignore: parameter_assignments
- 
+
     // If the expected target type is String, nothing to do...
     return targetType == 'String'
       ? value
 -      : fromJson(json.decode(value), targetType, growable: growable);
 +      : fromJson(await compute((String j) => json.decode(j), value), targetType, growable: growable);
   }
- 
-   // ignore: deprecated_member_use_from_same_package
--- a/open-api/patch/time_bucket_asset_response_dto.dart.patch
+++ b/open-api/patch/time_bucket_asset_response_dto.dart.patch
@ -1,9 +0,0 @@
-@@ -83,7 +83,7 @@
-   List<num> ratio;
- 
-   /// Array of stack information as [stackId, assetCount] tuples (null for non-stacked assets)
-  Optional<List<List<String>>?> stack;
-+  Optional<List<List<String>?>?> stack;
- 
-   /// Array of BlurHash strings for generating asset previews (base64 encoded)
-   List<String> thumbhash;
--- a/open-api/templates/mobile/api.mustache.patch
+++ b/open-api/templates/mobile/api.mustache.patch
@ -1,11 +1,8 @@
 --- api.mustache
 +++ api.mustache.modified
-@@ -49,9 +49,9 @@
-   ///
-     {{/-last}}
+@@ -51,7 +51,7 @@
   {{/allParams}}
-  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
-+  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}}, {{/required}}{{/allParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}}, {{/required}}{{/allParams}}Future<void>? abortTrigger, }) async {
+   Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
     // ignore: prefer_const_declarations
 -    final path = r'{{{path}}}'{{#pathParams}}
 +    final apiPath = r'{{{path}}}'{{#pathParams}}
@ -21,7 +18,7 @@
     {{#formParams}}
     {{^isFile}}
     if ({{{paramName}}} != null) {
-@@ -121,13 +121,14 @@
+@@ -121,7 +121,7 @@
     {{/isMultipart}}
 
     return apiClient.invokeAPI(
@ -30,21 +27,3 @@
       '{{{httpMethod}}}',
       queryParams,
       postBody,
-       headerParams,
-       formParams,
-       contentTypes.isEmpty ? null : contentTypes.first,
-+      abortTrigger: abortTrigger,
-     );
-   }
- 
-@@ -161,8 +162,8 @@
-   ///
-     {{/-last}}
-   {{/allParams}}
-  Future<{{#returnType}}{{{.}}}?{{/returnType}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
-    final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}} {{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} {{/hasOptionalParams}});
-+  Future<{{#returnType}}{{{.}}}?{{/returnType}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}}, {{/required}}{{/allParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}}, {{/required}}{{/allParams}}Future<void>? abortTrigger, }) async {
-+    final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}}, {{/required}}{{/allParams}}{{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}}, {{/required}}{{/allParams}}abortTrigger: abortTrigger,);
-     if (response.statusCode >= HttpStatus.badRequest) {
-       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-     }
--- a/open-api/templates/mobile/serialization/native/native_class.mustache
+++ b/open-api/templates/mobile/serialization/native/native_class.mustache
@ -34,14 +34,14 @@ class {{{classname}}} {
    {{/isNullable}}
  {{/isEnum}}
  {{#required}}
-  {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{{name}}};
+  {{#useFinalProperties}}final {{/useFinalProperties}}{{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{{name}}};
  {{/required}}
  {{^required}}
    {{#vendorExtensions.x-is-optional}}
-  {{{datatypeWithEnum}}} {{{name}}};
+  {{#useFinalProperties}}final {{/useFinalProperties}}{{{datatypeWithEnum}}} {{{name}}};
    {{/vendorExtensions.x-is-optional}}
    {{^vendorExtensions.x-is-optional}}
-  {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}?{{/defaultValue}}{{/isNullable}} {{{name}}};
+  {{#useFinalProperties}}final {{/useFinalProperties}}{{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}?{{/defaultValue}}{{/isNullable}} {{{name}}};
    {{/vendorExtensions.x-is-optional}}
  {{/required}}

@ -150,6 +150,21 @@ class {{{classname}}} {
    return json;
  }

+{{#useFinalProperties}}
+  /// Clones this instance of [{{{classname}}}] and returns a new one where some of the
+  /// properties have changed.
+  {{{classname}}} copyWith({
+  {{#vars}}
+    {{{datatypeWithEnum}}}? {{{name}}},{{#isNullable}}
+    bool {{{name}}}SetToNull = false,{{/isNullable}}
+  {{/vars}}
+  }) => {{{classname}}}(
+  {{#vars}}
+    {{{name}}}: {{#isNullable}}{{{name}}}SetToNull ? null : {{/isNullable}}{{{name}}} ?? this.{{{name}}},
+  {{/vars}}
+  );
+
+{{/useFinalProperties}}
  /// Returns a new [{{{classname}}}] instance and imports its values from
  /// [value] if it's a [Map], null otherwise.
  // ignore: prefer_constructors_over_static_methods
--- a/open-api/templates/mobile/serialization/native/native_class.mustache.patch
+++ b/open-api/templates/mobile/serialization/native/native_class.mustache.patch
@ -26,155 +26,3 @@
       return {{{classname}}}(
   {{#vars}}
     {{#isDateTime}}
-@@ -195,48 +181,98 @@
-         {{#complexType}}
-           {{#isArray}}
-             {{#items.isArray}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is List
-+          ? (json[r'{{{baseName}}}'] as List).map((e) =>
-+              {{#items.complexType}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
-+              {{/items.complexType}}
-+              {{^items.complexType}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
-+              {{/items.complexType}}
-+            ).toList()
-+          :  {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] is List
-           ? (json[r'{{{baseName}}}'] as List).map((e) =>
-               {{#items.complexType}}
-              {{items.complexType}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
-               {{/items.complexType}}
-               {{^items.complexType}}
-              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const  <{{items.items.dataType}}>[]{{/items.isNullable}} : (e as List).cast<{{items.items.dataType}}>()
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
-               {{/items.complexType}}
-             ).toList()
-           :  {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/items.isArray}}
-             {{^items.isArray}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/items.isArray}}
-           {{/isArray}}
-           {{^isArray}}
-             {{#isMap}}
-               {{#items.isArray}}
-+                {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null
-+                  {{#items.complexType}}
-+            : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                  {{/items.complexType}}
-+                  {{^items.complexType}}
-+            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)))) : const Optional.absent(),
-+                  {{/items.complexType}}
-+                {{/vendorExtensions.x-is-optional}}
-+                {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] == null
-           ? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
-                {{#items.complexType}}
-+                  {{#items.complexType}}
-             : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}']),
-                {{/items.complexType}}
-                {{^items.complexType}}
-            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}>[]{{/items.isNullable}} : (v as List).cast<{{items.items.dataType}}>())),
-                {{/items.complexType}}
-+                  {{/items.complexType}}
-+                  {{^items.complexType}}
-+            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false))),
-+                  {{/items.complexType}}
-+                {{/vendorExtensions.x-is-optional}}
-               {{/items.isArray}}
-               {{^items.isArray}}
-                 {{#items.isMap}}
-                   {{#items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{items.complexType}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{items.complexType}}.mapFromJson(json[r'{{{baseName}}}']),
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                   {{^items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, dynamic>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, dynamic>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                 {{/items.isMap}}
-                 {{^items.isMap}}
-                   {{#items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}']),
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                   {{^items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                 {{/items.isMap}}
-               {{/items.isArray}}
-@@ -259,23 +295,45 @@
-         {{^complexType}}
-           {{#isArray}}
-             {{#isEnum}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isEnum}}
-             {{^isEnum}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is Iterable
-+            ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
-+            : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] is Iterable
-             ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
-             : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isEnum}}
-           {{/isArray}}
-           {{^isArray}}
-             {{#isMap}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isMap}}
-             {{^isMap}}
-               {{#isNumber}}
-+                {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null : num.parse('${json[r'{{{baseName}}}']}')) : const Optional.absent(),
-+                {{/vendorExtensions.x-is-optional}}
-+                {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{#isNullable}}json[r'{{{baseName}}}'] == null
-             ? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
-             : {{/isNullable}}{{{datatypeWithEnum}}}.parse('${json[r'{{{baseName}}}']}'),
-+                {{/vendorExtensions.x-is-optional}}
-               {{/isNumber}}
-               {{^isNumber}}
-                 {{#vendorExtensions.x-original-is-integer}}