Fix for #15736 [TYPESCRIPT-FETCH] Subclassing components using discri… (#19524)

* Fix for #15736 [TYPESCRIPT-FETCH] Subclassing components using discriminators fails to convert subclasses to JSON.
Added similar discriminator handling to ToJSON as was already in place for FromJSON.
The actual files changed are typescript-fetch/modelGeneric.mustache and typescript-fetch/apis.mustache.
Also, adjusted FromJSON a bit in an attempt to support multiple hierarchical levels of discriminators.
And fixed an issue with calling FromJSON from the map() function, which caused the index parameter getting inadvertently passed as the ignoreDiscriminator parameter.
Additionally, fixed failing "mvn integration-test -f samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml"
Moreover, added forceConsistentCasingInFileNames:false into tsconfig.json to make tests compile on OsX.

* Rolled back the changes related to the map() function calls in favor of using ToJSONTyped instead, as that is in line with how FromJSON is already implemented.

modules/openapi-generator/src/main/resources/typescript-fetch/modelEnum.mustache

@@ -22,3 +22,7 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
 export function {{classname}}ToJSON(value?: {{classname}} | null): any {
     return value as any;
 }
+
+export function {{classname}}ToJSONTyped(value: any, ignoreDiscriminator: boolean): {{classname}} {
+    return value as {{classname}};
+}

modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache

@@ -6,13 +6,14 @@ import {
     {{classname}}FromJSON,
     {{classname}}FromJSONTyped,
     {{classname}}ToJSON,
+    {{classname}}ToJSONTyped,
 } from './{{filename}}{{importFileExtension}}';
 {{/tsImports}}
 
 {{/hasImports}}
 {{#discriminator}}
 {{#discriminator.mappedModels}}
-import { {{modelName}}FromJSONTyped } from './{{modelName}}{{importFileExtension}}';
+import { {{modelName}}, {{modelName}}FromJSONTyped, {{modelName}}ToJSON, {{modelName}}ToJSONTyped } from './{{modelName}}{{importFileExtension}}';
 {{/discriminator.mappedModels}}
 {{/discriminator}}
 {{>modelGenericInterfaces}}
@@ -42,13 +43,13 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
     if (!ignoreDiscriminator) {
 {{#discriminator.mappedModels}}
         if (json['{{discriminator.propertyBaseName}}'] === '{{mappingName}}') {
-            return {{modelName}}FromJSONTyped(json, true);
+            return {{modelName}}FromJSONTyped(json, ignoreDiscriminator);
         }
 {{/discriminator.mappedModels}}
     }
 {{/discriminator}}
     return {
-        {{#parent}}...{{{.}}}FromJSONTyped(json, ignoreDiscriminator),{{/parent}}
+        {{#parent}}...{{{.}}}FromJSONTyped(json, true),{{/parent}}
         {{#additionalPropertiesType}}
             ...json,
         {{/additionalPropertiesType}}
@@ -97,13 +98,31 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
     {{/hasVars}}
 }
 
-export function {{classname}}ToJSON(value?: {{#hasReadOnly}}Omit<{{classname}}, {{#readOnlyVars}}'{{baseName}}'{{^-last}}|{{/-last}}{{/readOnlyVars}}>{{/hasReadOnly}}{{^hasReadOnly}}{{classname}}{{/hasReadOnly}} | null): any {
+  export function {{classname}}ToJSON(json: any): {{classname}} {
+      return {{classname}}ToJSONTyped(json, false);
+  }
+
+  export function {{classname}}ToJSONTyped(value?: {{#hasReadOnly}}Omit<{{classname}}, {{#readOnlyVars}}'{{baseName}}'{{^-last}}|{{/-last}}{{/readOnlyVars}}>{{/hasReadOnly}}{{^hasReadOnly}}{{classname}}{{/hasReadOnly}} | null, ignoreDiscriminator: boolean = false): any {
     {{#hasVars}}
     if (value == null) {
         return value;
     }
+    {{#discriminator}}
+
+    if (!ignoreDiscriminator) {
+        switch (value['{{discriminator.propertyName}}']) {
+        {{#discriminator.mappedModels}}
+            case '{{mappingName}}':
+                return {{modelName}}ToJSONTyped(value as {{modelName}}, ignoreDiscriminator);
+        {{/discriminator.mappedModels}}
+            default:
+                throw new Error(`No variant of {{classname}} exists with '{{discriminator.propertyName}}=${value['{{discriminator.propertyName}}']}'`);
+        }
+    }
+    {{/discriminator}}
+
     return {
-        {{#parent}}...{{{.}}}ToJSON(value),{{/parent}}
+        {{#parent}}...{{{.}}}ToJSONTyped(value, true),{{/parent}}
         {{#additionalPropertiesType}}
             ...value,
         {{/additionalPropertiesType}}

samples/client/others/typescript-fetch/self-import-issue/models/AbstractUserDto.ts

@@ -18,10 +18,11 @@ import {
     BranchDtoFromJSON,
     BranchDtoFromJSONTyped,
     BranchDtoToJSON,
+    BranchDtoToJSONTyped,
 } from './BranchDto';
 
-import { InternalAuthenticatedUserDtoFromJSONTyped } from './InternalAuthenticatedUserDto';
-import { RemoteAuthenticatedUserDtoFromJSONTyped } from './RemoteAuthenticatedUserDto';
+import { InternalAuthenticatedUserDto, InternalAuthenticatedUserDtoFromJSONTyped, InternalAuthenticatedUserDtoToJSON, InternalAuthenticatedUserDtoToJSONTyped } from './InternalAuthenticatedUserDto';
+import { RemoteAuthenticatedUserDto, RemoteAuthenticatedUserDtoFromJSONTyped, RemoteAuthenticatedUserDtoToJSON, RemoteAuthenticatedUserDtoToJSONTyped } from './RemoteAuthenticatedUserDto';
 /**
  * 
  * @export
@@ -65,10 +66,10 @@ export function AbstractUserDtoFromJSONTyped(json: any, ignoreDiscriminator: boo
     }
     if (!ignoreDiscriminator) {
         if (json['type'] === 'internal-authenticated') {
-            return InternalAuthenticatedUserDtoFromJSONTyped(json, true);
+            return InternalAuthenticatedUserDtoFromJSONTyped(json, ignoreDiscriminator);
         }
         if (json['type'] === 'remote-authenticated') {
-            return RemoteAuthenticatedUserDtoFromJSONTyped(json, true);
+            return RemoteAuthenticatedUserDtoFromJSONTyped(json, ignoreDiscriminator);
         }
     }
     return {
@@ -79,10 +80,26 @@ export function AbstractUserDtoFromJSONTyped(json: any, ignoreDiscriminator: boo
     };
 }
 
-export function AbstractUserDtoToJSON(value?: AbstractUserDto | null): any {
+  export function AbstractUserDtoToJSON(json: any): AbstractUserDto {
+      return AbstractUserDtoToJSONTyped(json, false);
+  }
+
+  export function AbstractUserDtoToJSONTyped(value?: AbstractUserDto | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
+    if (!ignoreDiscriminator) {
+        switch (value['type']) {
+            case 'internal-authenticated':
+                return InternalAuthenticatedUserDtoToJSONTyped(value as InternalAuthenticatedUserDto, ignoreDiscriminator);
+            case 'remote-authenticated':
+                return RemoteAuthenticatedUserDtoToJSONTyped(value as RemoteAuthenticatedUserDto, ignoreDiscriminator);
+            default:
+                throw new Error(`No variant of AbstractUserDto exists with 'type=${value['type']}'`);
+        }
+    }
+
     return {
         
         'username': value['username'],

samples/client/others/typescript-fetch/self-import-issue/models/BranchDto.ts

@@ -48,10 +48,15 @@ export function BranchDtoFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function BranchDtoToJSON(value?: BranchDto | null): any {
+  export function BranchDtoToJSON(json: any): BranchDto {
+      return BranchDtoToJSONTyped(json, false);
+  }
+
+  export function BranchDtoToJSONTyped(value?: BranchDto | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'name': value['name'],

samples/client/others/typescript-fetch/self-import-issue/models/InternalAuthenticatedUserDto.ts

@@ -18,12 +18,14 @@ import {
     BranchDtoFromJSON,
     BranchDtoFromJSONTyped,
     BranchDtoToJSON,
+    BranchDtoToJSONTyped,
 } from './BranchDto';
 import type { AbstractUserDto } from './AbstractUserDto';
 import {
     AbstractUserDtoFromJSON,
     AbstractUserDtoFromJSONTyped,
     AbstractUserDtoToJSON,
+    AbstractUserDtoToJSONTyped,
 } from './AbstractUserDto';
 
 /**
@@ -49,7 +51,11 @@ export function InternalAuthenticatedUserDtoFromJSONTyped(json: any, ignoreDiscr
     return json;
 }
 
-export function InternalAuthenticatedUserDtoToJSON(value?: InternalAuthenticatedUserDto | null): any {
+  export function InternalAuthenticatedUserDtoToJSON(json: any): InternalAuthenticatedUserDto {
+      return InternalAuthenticatedUserDtoToJSONTyped(json, false);
+  }
+
+  export function InternalAuthenticatedUserDtoToJSONTyped(value?: InternalAuthenticatedUserDto | null, ignoreDiscriminator: boolean = false): any {
     return value;
 }
 

samples/client/others/typescript-fetch/self-import-issue/models/RemoteAuthenticatedUserDto.ts

@@ -18,12 +18,14 @@ import {
     BranchDtoFromJSON,
     BranchDtoFromJSONTyped,
     BranchDtoToJSON,
+    BranchDtoToJSONTyped,
 } from './BranchDto';
 import type { AbstractUserDto } from './AbstractUserDto';
 import {
     AbstractUserDtoFromJSON,
     AbstractUserDtoFromJSONTyped,
     AbstractUserDtoToJSON,
+    AbstractUserDtoToJSONTyped,
 } from './AbstractUserDto';
 
 /**
@@ -49,7 +51,11 @@ export function RemoteAuthenticatedUserDtoFromJSONTyped(json: any, ignoreDiscrim
     return json;
 }
 
-export function RemoteAuthenticatedUserDtoToJSON(value?: RemoteAuthenticatedUserDto | null): any {
+  export function RemoteAuthenticatedUserDtoToJSON(json: any): RemoteAuthenticatedUserDto {
+      return RemoteAuthenticatedUserDtoToJSONTyped(json, false);
+  }
+
+  export function RemoteAuthenticatedUserDtoToJSONTyped(value?: RemoteAuthenticatedUserDto | null, ignoreDiscriminator: boolean = false): any {
     return value;
 }
 

samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Club.ts

@@ -18,6 +18,7 @@ import {
     OwnerFromJSON,
     OwnerFromJSONTyped,
     OwnerToJSON,
+    OwnerToJSONTyped,
 } from './Owner';
 
 /**
@@ -55,10 +56,15 @@ export function ClubFromJSONTyped(json: any, ignoreDiscriminator: boolean): Club
     };
 }
 
-export function ClubToJSON(value?: Club | null): any {
+  export function ClubToJSON(json: any): Club {
+      return ClubToJSONTyped(json, false);
+  }
+
+  export function ClubToJSONTyped(value?: Club | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'owner': OwnerToJSON(value['owner']),

samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Owner.ts

@@ -48,10 +48,15 @@ export function OwnerFromJSONTyped(json: any, ignoreDiscriminator: boolean): Own
     };
 }
 
-export function OwnerToJSON(value?: Owner | null): any {
+  export function OwnerToJSON(json: any): Owner {
+      return OwnerToJSONTyped(json, false);
+  }
+
+  export function OwnerToJSONTyped(value?: Owner | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'name': value['name'],

samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Club.ts

@@ -18,6 +18,7 @@ import {
     OwnerFromJSON,
     OwnerFromJSONTyped,
     OwnerToJSON,
+    OwnerToJSONTyped,
 } from './Owner';
 
 /**
@@ -55,10 +56,15 @@ export function ClubFromJSONTyped(json: any, ignoreDiscriminator: boolean): Club
     };
 }
 
-export function ClubToJSON(value?: Omit<Club, 'owner'> | null): any {
+  export function ClubToJSON(json: any): Club {
+      return ClubToJSONTyped(json, false);
+  }
+
+  export function ClubToJSONTyped(value?: Omit<Club, 'owner'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
     };

samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Owner.ts

@@ -48,10 +48,15 @@ export function OwnerFromJSONTyped(json: any, ignoreDiscriminator: boolean): Own
     };
 }
 
-export function OwnerToJSON(value?: Owner | null): any {
+  export function OwnerToJSON(json: any): Owner {
+      return OwnerToJSONTyped(json, false);
+  }
+
+  export function OwnerToJSONTyped(value?: Owner | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'name': value['name'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AdditionalPropertiesClass.ts

@@ -55,10 +55,15 @@ export function AdditionalPropertiesClassFromJSONTyped(json: any, ignoreDiscrimi
     };
 }
 
-export function AdditionalPropertiesClassToJSON(value?: AdditionalPropertiesClass | null): any {
+  export function AdditionalPropertiesClassToJSON(json: any): AdditionalPropertiesClass {
+      return AdditionalPropertiesClassToJSONTyped(json, false);
+  }
+
+  export function AdditionalPropertiesClassToJSONTyped(value?: AdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'map_property': value['mapProperty'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AllOfWithSingleRef.ts

@@ -18,6 +18,7 @@ import {
     SingleRefTypeFromJSON,
     SingleRefTypeFromJSONTyped,
     SingleRefTypeToJSON,
+    SingleRefTypeToJSONTyped,
 } from './SingleRefType';
 
 /**
@@ -64,10 +65,15 @@ export function AllOfWithSingleRefFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-export function AllOfWithSingleRefToJSON(value?: AllOfWithSingleRef | null): any {
+  export function AllOfWithSingleRefToJSON(json: any): AllOfWithSingleRef {
+      return AllOfWithSingleRefToJSONTyped(json, false);
+  }
+
+  export function AllOfWithSingleRefToJSONTyped(value?: AllOfWithSingleRef | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'username': value['username'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts

@@ -13,8 +13,8 @@
  */
 
 import { mapValues } from '../runtime';
-import { CatFromJSONTyped } from './Cat';
-import { DogFromJSONTyped } from './Dog';
+import { Cat, CatFromJSONTyped, CatToJSON, CatToJSONTyped } from './Cat';
+import { Dog, DogFromJSONTyped, DogToJSON, DogToJSONTyped } from './Dog';
 /**
  * 
  * @export
@@ -53,10 +53,10 @@ export function AnimalFromJSONTyped(json: any, ignoreDiscriminator: boolean): An
     }
     if (!ignoreDiscriminator) {
         if (json['className'] === 'CAT') {
-            return CatFromJSONTyped(json, true);
+            return CatFromJSONTyped(json, ignoreDiscriminator);
         }
         if (json['className'] === 'DOG') {
-            return DogFromJSONTyped(json, true);
+            return DogFromJSONTyped(json, ignoreDiscriminator);
         }
     }
     return {
@@ -66,10 +66,26 @@ export function AnimalFromJSONTyped(json: any, ignoreDiscriminator: boolean): An
     };
 }
 
-export function AnimalToJSON(value?: Animal | null): any {
+  export function AnimalToJSON(json: any): Animal {
+      return AnimalToJSONTyped(json, false);
+  }
+
+  export function AnimalToJSONTyped(value?: Animal | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
+    if (!ignoreDiscriminator) {
+        switch (value['className']) {
+            case 'CAT':
+                return CatToJSONTyped(value as Cat, ignoreDiscriminator);
+            case 'DOG':
+                return DogToJSONTyped(value as Dog, ignoreDiscriminator);
+            default:
+                throw new Error(`No variant of Animal exists with 'className=${value['className']}'`);
+        }
+    }
+
     return {
         
         'className': value['className'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfArrayOfNumberOnly.ts

@@ -48,10 +48,15 @@ export function ArrayOfArrayOfNumberOnlyFromJSONTyped(json: any, ignoreDiscrimin
     };
 }
 
-export function ArrayOfArrayOfNumberOnlyToJSON(value?: ArrayOfArrayOfNumberOnly | null): any {
+  export function ArrayOfArrayOfNumberOnlyToJSON(json: any): ArrayOfArrayOfNumberOnly {
+      return ArrayOfArrayOfNumberOnlyToJSONTyped(json, false);
+  }
+
+  export function ArrayOfArrayOfNumberOnlyToJSONTyped(value?: ArrayOfArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'ArrayArrayNumber': value['arrayArrayNumber'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfNumberOnly.ts

@@ -48,10 +48,15 @@ export function ArrayOfNumberOnlyFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-export function ArrayOfNumberOnlyToJSON(value?: ArrayOfNumberOnly | null): any {
+  export function ArrayOfNumberOnlyToJSON(json: any): ArrayOfNumberOnly {
+      return ArrayOfNumberOnlyToJSONTyped(json, false);
+  }
+
+  export function ArrayOfNumberOnlyToJSONTyped(value?: ArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'ArrayNumber': value['arrayNumber'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayTest.ts

@@ -18,6 +18,7 @@ import {
     ReadOnlyFirstFromJSON,
     ReadOnlyFirstFromJSONTyped,
     ReadOnlyFirstToJSON,
+    ReadOnlyFirstToJSONTyped,
 } from './ReadOnlyFirst';
 
 /**
@@ -69,10 +70,15 @@ export function ArrayTestFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function ArrayTestToJSON(value?: ArrayTest | null): any {
+  export function ArrayTestToJSON(json: any): ArrayTest {
+      return ArrayTestToJSONTyped(json, false);
+  }
+
+  export function ArrayTestToJSONTyped(value?: ArrayTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'array_of_string': value['arrayOfString'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Capitalization.ts

@@ -84,10 +84,15 @@ export function CapitalizationFromJSONTyped(json: any, ignoreDiscriminator: bool
     };
 }
 
-export function CapitalizationToJSON(value?: Capitalization | null): any {
+  export function CapitalizationToJSON(json: any): Capitalization {
+      return CapitalizationToJSONTyped(json, false);
+  }
+
+  export function CapitalizationToJSONTyped(value?: Capitalization | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'smallCamel': value['smallCamel'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Cat.ts

@@ -18,6 +18,7 @@ import {
     AnimalFromJSON,
     AnimalFromJSONTyped,
     AnimalToJSON,
+    AnimalToJSONTyped,
 } from './Animal';
 
 /**
@@ -50,17 +51,22 @@ export function CatFromJSONTyped(json: any, ignoreDiscriminator: boolean): Cat {
         return json;
     }
     return {
-        ...AnimalFromJSONTyped(json, ignoreDiscriminator),
+        ...AnimalFromJSONTyped(json, true),
         'declawed': json['declawed'] == null ? undefined : json['declawed'],
     };
 }
 
-export function CatToJSON(value?: Cat | null): any {
+  export function CatToJSON(json: any): Cat {
+      return CatToJSONTyped(json, false);
+  }
+
+  export function CatToJSONTyped(value?: Cat | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
-        ...AnimalToJSON(value),
+        ...AnimalToJSONTyped(value, true),
         'declawed': value['declawed'],
     };
 }

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Category.ts

@@ -56,10 +56,15 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function CategoryToJSON(value?: Category | null): any {
+  export function CategoryToJSON(json: any): Category {
+      return CategoryToJSONTyped(json, false);
+  }
+
+  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ChildWithNullable.ts

@@ -18,6 +18,7 @@ import {
     ParentWithNullableFromJSON,
     ParentWithNullableFromJSONTyped,
     ParentWithNullableToJSON,
+    ParentWithNullableToJSONTyped,
 } from './ParentWithNullable';
 
 /**
@@ -52,17 +53,22 @@ export function ChildWithNullableFromJSONTyped(json: any, ignoreDiscriminator: b
         return json;
     }
     return {
-        ...ParentWithNullableFromJSONTyped(json, ignoreDiscriminator),
+        ...ParentWithNullableFromJSONTyped(json, true),
         'otherProperty': json['otherProperty'] == null ? undefined : json['otherProperty'],
     };
 }
 
-export function ChildWithNullableToJSON(value?: ChildWithNullable | null): any {
+  export function ChildWithNullableToJSON(json: any): ChildWithNullable {
+      return ChildWithNullableToJSONTyped(json, false);
+  }
+
+  export function ChildWithNullableToJSONTyped(value?: ChildWithNullable | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
-        ...ParentWithNullableToJSON(value),
+        ...ParentWithNullableToJSONTyped(value, true),
         'otherProperty': value['otherProperty'],
     };
 }

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ClassModel.ts

@@ -48,10 +48,15 @@ export function ClassModelFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-export function ClassModelToJSON(value?: ClassModel | null): any {
+  export function ClassModelToJSON(json: any): ClassModel {
+      return ClassModelToJSONTyped(json, false);
+  }
+
+  export function ClassModelToJSONTyped(value?: ClassModel | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         '_class': value['_class'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Client.ts

@@ -48,10 +48,15 @@ export function ClientFromJSONTyped(json: any, ignoreDiscriminator: boolean): Cl
     };
 }
 
-export function ClientToJSON(value?: Client | null): any {
+  export function ClientToJSON(json: any): Client {
+      return ClientToJSONTyped(json, false);
+  }
+
+  export function ClientToJSONTyped(value?: Client | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'client': value['client'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/DeprecatedObject.ts

@@ -48,10 +48,15 @@ export function DeprecatedObjectFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-export function DeprecatedObjectToJSON(value?: DeprecatedObject | null): any {
+  export function DeprecatedObjectToJSON(json: any): DeprecatedObject {
+      return DeprecatedObjectToJSONTyped(json, false);
+  }
+
+  export function DeprecatedObjectToJSONTyped(value?: DeprecatedObject | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'name': value['name'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Dog.ts

@@ -18,6 +18,7 @@ import {
     AnimalFromJSON,
     AnimalFromJSONTyped,
     AnimalToJSON,
+    AnimalToJSONTyped,
 } from './Animal';
 
 /**
@@ -50,17 +51,22 @@ export function DogFromJSONTyped(json: any, ignoreDiscriminator: boolean): Dog {
         return json;
     }
     return {
-        ...AnimalFromJSONTyped(json, ignoreDiscriminator),
+        ...AnimalFromJSONTyped(json, true),
         'breed': json['breed'] == null ? undefined : json['breed'],
     };
 }
 
-export function DogToJSON(value?: Dog | null): any {
+  export function DogToJSON(json: any): Dog {
+      return DogToJSONTyped(json, false);
+  }
+
+  export function DogToJSONTyped(value?: Dog | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
-        ...AnimalToJSON(value),
+        ...AnimalToJSONTyped(value, true),
         'breed': value['breed'],
     };
 }

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts

@@ -75,10 +75,15 @@ export function EnumArraysFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-export function EnumArraysToJSON(value?: EnumArrays | null): any {
+  export function EnumArraysToJSON(json: any): EnumArrays {
+      return EnumArraysToJSONTyped(json, false);
+  }
+
+  export function EnumArraysToJSONTyped(value?: EnumArrays | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'just_symbol': value['justSymbol'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumClass.ts

@@ -48,3 +48,7 @@ export function EnumClassToJSON(value?: EnumClass | null): any {
     return value as any;
 }
 
+export function EnumClassToJSONTyped(value: any, ignoreDiscriminator: boolean): EnumClass {
+    return value as EnumClass;
+}
+

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts

@@ -18,24 +18,28 @@ import {
     OuterEnumFromJSON,
     OuterEnumFromJSONTyped,
     OuterEnumToJSON,
+    OuterEnumToJSONTyped,
 } from './OuterEnum';
 import type { OuterEnumIntegerDefaultValue } from './OuterEnumIntegerDefaultValue';
 import {
     OuterEnumIntegerDefaultValueFromJSON,
     OuterEnumIntegerDefaultValueFromJSONTyped,
     OuterEnumIntegerDefaultValueToJSON,
+    OuterEnumIntegerDefaultValueToJSONTyped,
 } from './OuterEnumIntegerDefaultValue';
 import type { OuterEnumInteger } from './OuterEnumInteger';
 import {
     OuterEnumIntegerFromJSON,
     OuterEnumIntegerFromJSONTyped,
     OuterEnumIntegerToJSON,
+    OuterEnumIntegerToJSONTyped,
 } from './OuterEnumInteger';
 import type { OuterEnumDefaultValue } from './OuterEnumDefaultValue';
 import {
     OuterEnumDefaultValueFromJSON,
     OuterEnumDefaultValueFromJSONTyped,
     OuterEnumDefaultValueToJSON,
+    OuterEnumDefaultValueToJSONTyped,
 } from './OuterEnumDefaultValue';
 
 /**
@@ -163,10 +167,15 @@ export function EnumTestFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function EnumTestToJSON(value?: EnumTest | null): any {
+  export function EnumTestToJSON(json: any): EnumTest {
+      return EnumTestToJSONTyped(json, false);
+  }
+
+  export function EnumTestToJSONTyped(value?: EnumTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'enum_string': value['enumString'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FakeBigDecimalMap200Response.ts

@@ -55,10 +55,15 @@ export function FakeBigDecimalMap200ResponseFromJSONTyped(json: any, ignoreDiscr
     };
 }
 
-export function FakeBigDecimalMap200ResponseToJSON(value?: FakeBigDecimalMap200Response | null): any {
+  export function FakeBigDecimalMap200ResponseToJSON(json: any): FakeBigDecimalMap200Response {
+      return FakeBigDecimalMap200ResponseToJSONTyped(json, false);
+  }
+
+  export function FakeBigDecimalMap200ResponseToJSONTyped(value?: FakeBigDecimalMap200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'someId': value['someId'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FileSchemaTestClass.ts

@@ -55,10 +55,15 @@ export function FileSchemaTestClassFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-export function FileSchemaTestClassToJSON(value?: FileSchemaTestClass | null): any {
+  export function FileSchemaTestClassToJSON(json: any): FileSchemaTestClass {
+      return FileSchemaTestClassToJSONTyped(json, false);
+  }
+
+  export function FileSchemaTestClassToJSONTyped(value?: FileSchemaTestClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'file': value['file'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Foo.ts

@@ -48,10 +48,15 @@ export function FooFromJSONTyped(json: any, ignoreDiscriminator: boolean): Foo {
     };
 }
 
-export function FooToJSON(value?: Foo | null): any {
+  export function FooToJSON(json: any): Foo {
+      return FooToJSONTyped(json, false);
+  }
+
+  export function FooToJSONTyped(value?: Foo | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'bar': value['bar'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FooGetDefaultResponse.ts

@@ -18,6 +18,7 @@ import {
     FooFromJSON,
     FooFromJSONTyped,
     FooToJSON,
+    FooToJSONTyped,
 } from './Foo';
 
 /**
@@ -55,10 +56,15 @@ export function FooGetDefaultResponseFromJSONTyped(json: any, ignoreDiscriminato
     };
 }
 
-export function FooGetDefaultResponseToJSON(value?: FooGetDefaultResponse | null): any {
+  export function FooGetDefaultResponseToJSON(json: any): FooGetDefaultResponse {
+      return FooGetDefaultResponseToJSONTyped(json, false);
+  }
+
+  export function FooGetDefaultResponseToJSONTyped(value?: FooGetDefaultResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'string': FooToJSON(value['string']),

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FormatTest.ts

@@ -18,6 +18,7 @@ import {
     DecimalFromJSON,
     DecimalFromJSONTyped,
     DecimalToJSON,
+    DecimalToJSONTyped,
 } from './Decimal';
 
 /**
@@ -164,10 +165,15 @@ export function FormatTestFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-export function FormatTestToJSON(value?: FormatTest | null): any {
+  export function FormatTestToJSON(json: any): FormatTest {
+      return FormatTestToJSONTyped(json, false);
+  }
+
+  export function FormatTestToJSONTyped(value?: FormatTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'integer': value['integer'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HasOnlyReadOnly.ts

@@ -55,10 +55,15 @@ export function HasOnlyReadOnlyFromJSONTyped(json: any, ignoreDiscriminator: boo
     };
 }
 
-export function HasOnlyReadOnlyToJSON(value?: Omit<HasOnlyReadOnly, 'bar'|'foo'> | null): any {
+  export function HasOnlyReadOnlyToJSON(json: any): HasOnlyReadOnly {
+      return HasOnlyReadOnlyToJSONTyped(json, false);
+  }
+
+  export function HasOnlyReadOnlyToJSONTyped(value?: Omit<HasOnlyReadOnly, 'bar'|'foo'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
     };

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HealthCheckResult.ts

@@ -48,10 +48,15 @@ export function HealthCheckResultFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-export function HealthCheckResultToJSON(value?: HealthCheckResult | null): any {
+  export function HealthCheckResultToJSON(json: any): HealthCheckResult {
+      return HealthCheckResultToJSONTyped(json, false);
+  }
+
+  export function HealthCheckResultToJSONTyped(value?: HealthCheckResult | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'NullableMessage': value['nullableMessage'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/List.ts

@@ -48,10 +48,15 @@ export function ListFromJSONTyped(json: any, ignoreDiscriminator: boolean): List
     };
 }
 
-export function ListToJSON(value?: List | null): any {
+  export function ListToJSON(json: any): List {
+      return ListToJSONTyped(json, false);
+  }
+
+  export function ListToJSONTyped(value?: List | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         '123-list': value['_123list'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts

@@ -80,10 +80,15 @@ export function MapTestFromJSONTyped(json: any, ignoreDiscriminator: boolean): M
     };
 }
 
-export function MapTestToJSON(value?: MapTest | null): any {
+  export function MapTestToJSON(json: any): MapTest {
+      return MapTestToJSONTyped(json, false);
+  }
+
+  export function MapTestToJSONTyped(value?: MapTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'map_map_of_string': value['mapMapOfString'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MixedPropertiesAndAdditionalPropertiesClass.ts

@@ -18,6 +18,7 @@ import {
     AnimalFromJSON,
     AnimalFromJSONTyped,
     AnimalToJSON,
+    AnimalToJSONTyped,
 } from './Animal';
 
 /**
@@ -69,10 +70,15 @@ export function MixedPropertiesAndAdditionalPropertiesClassFromJSONTyped(json: a
     };
 }
 
-export function MixedPropertiesAndAdditionalPropertiesClassToJSON(value?: MixedPropertiesAndAdditionalPropertiesClass | null): any {
+  export function MixedPropertiesAndAdditionalPropertiesClassToJSON(json: any): MixedPropertiesAndAdditionalPropertiesClass {
+      return MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(json, false);
+  }
+
+  export function MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(value?: MixedPropertiesAndAdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'uuid': value['uuid'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Model200Response.ts

@@ -55,10 +55,15 @@ export function Model200ResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-export function Model200ResponseToJSON(value?: Model200Response | null): any {
+  export function Model200ResponseToJSON(json: any): Model200Response {
+      return Model200ResponseToJSONTyped(json, false);
+  }
+
+  export function Model200ResponseToJSONTyped(value?: Model200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'name': value['name'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelApiResponse.ts

@@ -62,10 +62,15 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-export function ModelApiResponseToJSON(value?: ModelApiResponse | null): any {
+  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+      return ModelApiResponseToJSONTyped(json, false);
+  }
+
+  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'code': value['code'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelFile.ts

@@ -48,10 +48,15 @@ export function ModelFileFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function ModelFileToJSON(value?: ModelFile | null): any {
+  export function ModelFileToJSON(json: any): ModelFile {
+      return ModelFileToJSONTyped(json, false);
+  }
+
+  export function ModelFileToJSONTyped(value?: ModelFile | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'sourceURI': value['sourceURI'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Name.ts

@@ -70,10 +70,15 @@ export function NameFromJSONTyped(json: any, ignoreDiscriminator: boolean): Name
     };
 }
 
-export function NameToJSON(value?: Omit<Name, 'snake_case'|'123Number'> | null): any {
+  export function NameToJSON(json: any): Name {
+      return NameToJSONTyped(json, false);
+  }
+
+  export function NameToJSONTyped(value?: Omit<Name, 'snake_case'|'123Number'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'name': value['name'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NullableClass.ts

@@ -127,10 +127,15 @@ export function NullableClassFromJSONTyped(json: any, ignoreDiscriminator: boole
     };
 }
 
-export function NullableClassToJSON(value?: NullableClass | null): any {
+  export function NullableClassToJSON(json: any): NullableClass {
+      return NullableClassToJSONTyped(json, false);
+  }
+
+  export function NullableClassToJSONTyped(value?: NullableClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
             ...value,

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NumberOnly.ts

@@ -48,10 +48,15 @@ export function NumberOnlyFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-export function NumberOnlyToJSON(value?: NumberOnly | null): any {
+  export function NumberOnlyToJSON(json: any): NumberOnly {
+      return NumberOnlyToJSONTyped(json, false);
+  }
+
+  export function NumberOnlyToJSONTyped(value?: NumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'JustNumber': value['justNumber'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ObjectWithDeprecatedFields.ts

@@ -18,6 +18,7 @@ import {
     DeprecatedObjectFromJSON,
     DeprecatedObjectFromJSONTyped,
     DeprecatedObjectToJSON,
+    DeprecatedObjectToJSONTyped,
 } from './DeprecatedObject';
 
 /**
@@ -79,10 +80,15 @@ export function ObjectWithDeprecatedFieldsFromJSONTyped(json: any, ignoreDiscrim
     };
 }
 
-export function ObjectWithDeprecatedFieldsToJSON(value?: ObjectWithDeprecatedFields | null): any {
+  export function ObjectWithDeprecatedFieldsToJSON(json: any): ObjectWithDeprecatedFields {
+      return ObjectWithDeprecatedFieldsToJSONTyped(json, false);
+  }
+
+  export function ObjectWithDeprecatedFieldsToJSONTyped(value?: ObjectWithDeprecatedFields | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'uuid': value['uuid'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts

@@ -95,10 +95,15 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-export function OrderToJSON(value?: Order | null): any {
+  export function OrderToJSON(json: any): Order {
+      return OrderToJSONTyped(json, false);
+  }
+
+  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterComposite.ts

@@ -62,10 +62,15 @@ export function OuterCompositeFromJSONTyped(json: any, ignoreDiscriminator: bool
     };
 }
 
-export function OuterCompositeToJSON(value?: OuterComposite | null): any {
+  export function OuterCompositeToJSON(json: any): OuterComposite {
+      return OuterCompositeToJSONTyped(json, false);
+  }
+
+  export function OuterCompositeToJSONTyped(value?: OuterComposite | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'my_number': value['myNumber'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterEnum.ts

@@ -48,3 +48,7 @@ export function OuterEnumToJSON(value?: OuterEnum | null): any {
     return value as any;
 }
 
+export function OuterEnumToJSONTyped(value: any, ignoreDiscriminator: boolean): OuterEnum {
+    return value as OuterEnum;
+}
+

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterEnumDefaultValue.ts

@@ -48,3 +48,7 @@ export function OuterEnumDefaultValueToJSON(value?: OuterEnumDefaultValue | null
     return value as any;
 }
 
+export function OuterEnumDefaultValueToJSONTyped(value: any, ignoreDiscriminator: boolean): OuterEnumDefaultValue {
+    return value as OuterEnumDefaultValue;
+}
+

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterEnumInteger.ts

@@ -48,3 +48,7 @@ export function OuterEnumIntegerToJSON(value?: OuterEnumInteger | null): any {
     return value as any;
 }
 
+export function OuterEnumIntegerToJSONTyped(value: any, ignoreDiscriminator: boolean): OuterEnumInteger {
+    return value as OuterEnumInteger;
+}
+

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterEnumIntegerDefaultValue.ts

@@ -48,3 +48,7 @@ export function OuterEnumIntegerDefaultValueToJSON(value?: OuterEnumIntegerDefau
     return value as any;
 }
 
+export function OuterEnumIntegerDefaultValueToJSONTyped(value: any, ignoreDiscriminator: boolean): OuterEnumIntegerDefaultValue {
+    return value as OuterEnumIntegerDefaultValue;
+}
+

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterObjectWithEnumProperty.ts

@@ -18,6 +18,7 @@ import {
     OuterEnumIntegerFromJSON,
     OuterEnumIntegerFromJSONTyped,
     OuterEnumIntegerToJSON,
+    OuterEnumIntegerToJSONTyped,
 } from './OuterEnumInteger';
 
 /**
@@ -58,10 +59,15 @@ export function OuterObjectWithEnumPropertyFromJSONTyped(json: any, ignoreDiscri
     };
 }
 
-export function OuterObjectWithEnumPropertyToJSON(value?: OuterObjectWithEnumProperty | null): any {
+  export function OuterObjectWithEnumPropertyToJSON(json: any): OuterObjectWithEnumProperty {
+      return OuterObjectWithEnumPropertyToJSONTyped(json, false);
+  }
+
+  export function OuterObjectWithEnumPropertyToJSONTyped(value?: OuterObjectWithEnumProperty | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'value': OuterEnumIntegerToJSON(value['value']),

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ParentWithNullable.ts

@@ -13,7 +13,7 @@
  */
 
 import { mapValues } from '../runtime';
-import { ChildWithNullableFromJSONTyped } from './ChildWithNullable';
+import { ChildWithNullable, ChildWithNullableFromJSONTyped, ChildWithNullableToJSON, ChildWithNullableToJSONTyped } from './ChildWithNullable';
 /**
  * 
  * @export
@@ -61,7 +61,7 @@ export function ParentWithNullableFromJSONTyped(json: any, ignoreDiscriminator:
     }
     if (!ignoreDiscriminator) {
         if (json['type'] === 'ChildWithNullable') {
-            return ChildWithNullableFromJSONTyped(json, true);
+            return ChildWithNullableFromJSONTyped(json, ignoreDiscriminator);
         }
     }
     return {
@@ -71,10 +71,24 @@ export function ParentWithNullableFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-export function ParentWithNullableToJSON(value?: ParentWithNullable | null): any {
+  export function ParentWithNullableToJSON(json: any): ParentWithNullable {
+      return ParentWithNullableToJSONTyped(json, false);
+  }
+
+  export function ParentWithNullableToJSONTyped(value?: ParentWithNullable | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
+    if (!ignoreDiscriminator) {
+        switch (value['type']) {
+            case 'ChildWithNullable':
+                return ChildWithNullableToJSONTyped(value as ChildWithNullable, ignoreDiscriminator);
+            default:
+                throw new Error(`No variant of ParentWithNullable exists with 'type=${value['type']}'`);
+        }
+    }
+
     return {
         
         'type': value['type'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts

@@ -18,12 +18,14 @@ import {
     CategoryFromJSON,
     CategoryFromJSONTyped,
     CategoryToJSON,
+    CategoryToJSONTyped,
 } from './Category';
 import type { Tag } from './Tag';
 import {
     TagFromJSON,
     TagFromJSONTyped,
     TagToJSON,
+    TagToJSONTyped,
 } from './Tag';
 
 /**
@@ -110,10 +112,15 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-export function PetToJSON(value?: Pet | null): any {
+  export function PetToJSON(json: any): Pet {
+      return PetToJSONTyped(json, false);
+  }
+
+  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ReadOnlyFirst.ts

@@ -55,10 +55,15 @@ export function ReadOnlyFirstFromJSONTyped(json: any, ignoreDiscriminator: boole
     };
 }
 
-export function ReadOnlyFirstToJSON(value?: Omit<ReadOnlyFirst, 'bar'> | null): any {
+  export function ReadOnlyFirstToJSON(json: any): ReadOnlyFirst {
+      return ReadOnlyFirstToJSONTyped(json, false);
+  }
+
+  export function ReadOnlyFirstToJSONTyped(value?: Omit<ReadOnlyFirst, 'bar'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'baz': value['baz'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Return.ts

@@ -48,10 +48,15 @@ export function ReturnFromJSONTyped(json: any, ignoreDiscriminator: boolean): Re
     };
 }
 
-export function ReturnToJSON(value?: Return | null): any {
+  export function ReturnToJSON(json: any): Return {
+      return ReturnToJSONTyped(json, false);
+  }
+
+  export function ReturnToJSONTyped(value?: Return | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'return': value['_return'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/SingleRefType.ts

@@ -47,3 +47,7 @@ export function SingleRefTypeToJSON(value?: SingleRefType | null): any {
     return value as any;
 }
 
+export function SingleRefTypeToJSONTyped(value: any, ignoreDiscriminator: boolean): SingleRefType {
+    return value as SingleRefType;
+}
+

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/SpecialModelName.ts

@@ -48,10 +48,15 @@ export function SpecialModelNameFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-export function SpecialModelNameToJSON(value?: SpecialModelName | null): any {
+  export function SpecialModelNameToJSON(json: any): SpecialModelName {
+      return SpecialModelNameToJSONTyped(json, false);
+  }
+
+  export function SpecialModelNameToJSONTyped(value?: SpecialModelName | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         '$special[property.name]': value['$specialPropertyName'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Tag.ts

@@ -55,10 +55,15 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-export function TagToJSON(value?: Tag | null): any {
+  export function TagToJSON(json: any): Tag {
+      return TagToJSONTyped(json, false);
+  }
+
+  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/TestInlineFreeformAdditionalPropertiesRequest.ts

@@ -50,10 +50,15 @@ export function TestInlineFreeformAdditionalPropertiesRequestFromJSONTyped(json:
     };
 }
 
-export function TestInlineFreeformAdditionalPropertiesRequestToJSON(value?: TestInlineFreeformAdditionalPropertiesRequest | null): any {
+  export function TestInlineFreeformAdditionalPropertiesRequestToJSON(json: any): TestInlineFreeformAdditionalPropertiesRequest {
+      return TestInlineFreeformAdditionalPropertiesRequestToJSONTyped(json, false);
+  }
+
+  export function TestInlineFreeformAdditionalPropertiesRequestToJSONTyped(value?: TestInlineFreeformAdditionalPropertiesRequest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
             ...value,

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/User.ts

@@ -97,10 +97,15 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-export function UserToJSON(value?: User | null): any {
+  export function UserToJSON(json: any): User {
+      return UserToJSONTyped(json, false);
+  }
+
+  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default/models/Category.ts

@@ -55,10 +55,15 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function CategoryToJSON(value?: Category | null): any {
+  export function CategoryToJSON(json: any): Category {
+      return CategoryToJSONTyped(json, false);
+  }
+
+  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts

@@ -62,10 +62,15 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-export function ModelApiResponseToJSON(value?: ModelApiResponse | null): any {
+  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+      return ModelApiResponseToJSONTyped(json, false);
+  }
+
+  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'code': value['code'],

samples/client/petstore/typescript-fetch/builds/default/models/Order.ts

@@ -95,10 +95,15 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-export function OrderToJSON(value?: Order | null): any {
+  export function OrderToJSON(json: any): Order {
+      return OrderToJSONTyped(json, false);
+  }
+
+  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts

@@ -18,12 +18,14 @@ import {
     CategoryFromJSON,
     CategoryFromJSONTyped,
     CategoryToJSON,
+    CategoryToJSONTyped,
 } from './Category';
 import type { Tag } from './Tag';
 import {
     TagFromJSON,
     TagFromJSONTyped,
     TagToJSON,
+    TagToJSONTyped,
 } from './Tag';
 
 /**
@@ -110,10 +112,15 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-export function PetToJSON(value?: Pet | null): any {
+  export function PetToJSON(json: any): Pet {
+      return PetToJSONTyped(json, false);
+  }
+
+  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts

@@ -55,10 +55,15 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-export function TagToJSON(value?: Tag | null): any {
+  export function TagToJSON(json: any): Tag {
+      return TagToJSONTyped(json, false);
+  }
+
+  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/default/models/User.ts

@@ -97,10 +97,15 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-export function UserToJSON(value?: User | null): any {
+  export function UserToJSON(json: any): User {
+      return UserToJSONTyped(json, false);
+  }
+
+  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/enum/models/EnumPatternObject.ts

@@ -18,12 +18,14 @@ import {
     NumberEnumFromJSON,
     NumberEnumFromJSONTyped,
     NumberEnumToJSON,
+    NumberEnumToJSONTyped,
 } from './NumberEnum';
 import type { StringEnum } from './StringEnum';
 import {
     StringEnumFromJSON,
     StringEnumFromJSONTyped,
     StringEnumToJSON,
+    StringEnumToJSONTyped,
 } from './StringEnum';
 
 /**
@@ -84,10 +86,15 @@ export function EnumPatternObjectFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-export function EnumPatternObjectToJSON(value?: EnumPatternObject | null): any {
+  export function EnumPatternObjectToJSON(json: any): EnumPatternObject {
+      return EnumPatternObjectToJSONTyped(json, false);
+  }
+
+  export function EnumPatternObjectToJSONTyped(value?: EnumPatternObject | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'string-enum': StringEnumToJSON(value['stringEnum']),

samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestGetInline200Response.ts

@@ -111,10 +111,15 @@ export function FakeEnumRequestGetInline200ResponseFromJSONTyped(json: any, igno
     };
 }
 
-export function FakeEnumRequestGetInline200ResponseToJSON(value?: FakeEnumRequestGetInline200Response | null): any {
+  export function FakeEnumRequestGetInline200ResponseToJSON(json: any): FakeEnumRequestGetInline200Response {
+      return FakeEnumRequestGetInline200ResponseToJSONTyped(json, false);
+  }
+
+  export function FakeEnumRequestGetInline200ResponseToJSONTyped(value?: FakeEnumRequestGetInline200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'string-enum': value['stringEnum'],

samples/client/petstore/typescript-fetch/builds/enum/models/NumberEnum.ts

@@ -48,3 +48,7 @@ export function NumberEnumToJSON(value?: NumberEnum | null): any {
     return value as any;
 }
 
+export function NumberEnumToJSONTyped(value: any, ignoreDiscriminator: boolean): NumberEnum {
+    return value as NumberEnum;
+}
+

samples/client/petstore/typescript-fetch/builds/enum/models/StringEnum.ts

@@ -48,3 +48,7 @@ export function StringEnumToJSON(value?: StringEnum | null): any {
     return value as any;
 }
 
+export function StringEnumToJSONTyped(value: any, ignoreDiscriminator: boolean): StringEnum {
+    return value as StringEnum;
+}
+

samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts

@@ -55,10 +55,15 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function CategoryToJSON(value?: Category | null): any {
+  export function CategoryToJSON(json: any): Category {
+      return CategoryToJSONTyped(json, false);
+  }
+
+  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts

@@ -62,10 +62,15 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-export function ModelApiResponseToJSON(value?: ModelApiResponse | null): any {
+  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+      return ModelApiResponseToJSONTyped(json, false);
+  }
+
+  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'code': value['code'],

samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts

@@ -95,10 +95,15 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-export function OrderToJSON(value?: Order | null): any {
+  export function OrderToJSON(json: any): Order {
+      return OrderToJSONTyped(json, false);
+  }
+
+  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts

@@ -18,12 +18,14 @@ import {
     CategoryFromJSON,
     CategoryFromJSONTyped,
     CategoryToJSON,
+    CategoryToJSONTyped,
 } from './Category';
 import type { Tag } from './Tag';
 import {
     TagFromJSON,
     TagFromJSONTyped,
     TagToJSON,
+    TagToJSONTyped,
 } from './Tag';
 
 /**
@@ -110,10 +112,15 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-export function PetToJSON(value?: Pet | null): any {
+  export function PetToJSON(json: any): Pet {
+      return PetToJSONTyped(json, false);
+  }
+
+  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts

@@ -55,10 +55,15 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-export function TagToJSON(value?: Tag | null): any {
+  export function TagToJSON(json: any): Tag {
+      return TagToJSONTyped(json, false);
+  }
+
+  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts

@@ -97,10 +97,15 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-export function UserToJSON(value?: User | null): any {
+  export function UserToJSON(json: any): User {
+      return UserToJSONTyped(json, false);
+  }
+
+  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts

@@ -55,10 +55,15 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function CategoryToJSON(value?: Category | null): any {
+  export function CategoryToJSON(json: any): Category {
+      return CategoryToJSONTyped(json, false);
+  }
+
+  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts

@@ -62,10 +62,15 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-export function ModelApiResponseToJSON(value?: ModelApiResponse | null): any {
+  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+      return ModelApiResponseToJSONTyped(json, false);
+  }
+
+  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'code': value['code'],

samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts

@@ -95,10 +95,15 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-export function OrderToJSON(value?: Order | null): any {
+  export function OrderToJSON(json: any): Order {
+      return OrderToJSONTyped(json, false);
+  }
+
+  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts

@@ -18,12 +18,14 @@ import {
     CategoryFromJSON,
     CategoryFromJSONTyped,
     CategoryToJSON,
+    CategoryToJSONTyped,
 } from './Category';
 import type { Tag } from './Tag';
 import {
     TagFromJSON,
     TagFromJSONTyped,
     TagToJSON,
+    TagToJSONTyped,
 } from './Tag';
 
 /**
@@ -110,10 +112,15 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-export function PetToJSON(value?: Pet | null): any {
+  export function PetToJSON(json: any): Pet {
+      return PetToJSONTyped(json, false);
+  }
+
+  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts

@@ -55,10 +55,15 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-export function TagToJSON(value?: Tag | null): any {
+  export function TagToJSON(json: any): Tag {
+      return TagToJSONTyped(json, false);
+  }
+
+  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts

@@ -97,10 +97,15 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-export function UserToJSON(value?: User | null): any {
+  export function UserToJSON(json: any): User {
+      return UserToJSONTyped(json, false);
+  }
+
+  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/oneOf/models/TestA.ts

@@ -49,10 +49,15 @@ export function TestAFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tes
     };
 }
 
-export function TestAToJSON(value?: TestA | null): any {
+  export function TestAToJSON(json: any): TestA {
+      return TestAToJSONTyped(json, false);
+  }
+
+  export function TestAToJSONTyped(value?: TestA | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'foo': value['foo'],

samples/client/petstore/typescript-fetch/builds/oneOf/models/TestB.ts

@@ -49,10 +49,15 @@ export function TestBFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tes
     };
 }
 
-export function TestBToJSON(value?: TestB | null): any {
+  export function TestBToJSON(json: any): TestB {
+      return TestBToJSONTyped(json, false);
+  }
+
+  export function TestBToJSONTyped(value?: TestB | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'bar': value['bar'],

samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml

@@ -53,19 +53,6 @@
                             </arguments>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>npm-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>npm</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>

samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts

@@ -55,10 +55,15 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function CategoryToJSON(value?: Category | null): any {
+  export function CategoryToJSON(json: any): Category {
+      return CategoryToJSONTyped(json, false);
+  }
+
+  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts

@@ -62,10 +62,15 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-export function ModelApiResponseToJSON(value?: ModelApiResponse | null): any {
+  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+      return ModelApiResponseToJSONTyped(json, false);
+  }
+
+  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'code': value['code'],

samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts

@@ -95,10 +95,15 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-export function OrderToJSON(value?: Order | null): any {
+  export function OrderToJSON(json: any): Order {
+      return OrderToJSONTyped(json, false);
+  }
+
+  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts

@@ -18,12 +18,14 @@ import {
     CategoryFromJSON,
     CategoryFromJSONTyped,
     CategoryToJSON,
+    CategoryToJSONTyped,
 } from './Category';
 import type { Tag } from './Tag';
 import {
     TagFromJSON,
     TagFromJSONTyped,
     TagToJSON,
+    TagToJSONTyped,
 } from './Tag';
 
 /**
@@ -110,10 +112,15 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-export function PetToJSON(value?: Pet | null): any {
+  export function PetToJSON(json: any): Pet {
+      return PetToJSONTyped(json, false);
+  }
+
+  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts

@@ -55,10 +55,15 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-export function TagToJSON(value?: Tag | null): any {
+  export function TagToJSON(json: any): Tag {
+      return TagToJSONTyped(json, false);
+  }
+
+  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts

@@ -97,10 +97,15 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-export function UserToJSON(value?: User | null): any {
+  export function UserToJSON(json: any): User {
+      return UserToJSONTyped(json, false);
+  }
+
+  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/BehaviorType.ts

@@ -48,3 +48,7 @@ export function BehaviorTypeToJSON(value?: BehaviorType | null): any {
     return value as any;
 }
 
+export function BehaviorTypeToJSONTyped(value: any, ignoreDiscriminator: boolean): BehaviorType {
+    return value as BehaviorType;
+}
+

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Category.ts

@@ -55,10 +55,15 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-export function CategoryToJSON(value?: Category | null): any {
+  export function CategoryToJSON(json: any): Category {
+      return CategoryToJSONTyped(json, false);
+  }
+
+  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'id': value['id'],

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponse.ts

@@ -18,6 +18,7 @@ import {
     ResponseMetaFromJSON,
     ResponseMetaFromJSONTyped,
     ResponseMetaToJSON,
+    ResponseMetaToJSONTyped,
 } from './ResponseMeta';
 
 /**
@@ -56,10 +57,15 @@ export function DefaultMetaOnlyResponseFromJSONTyped(json: any, ignoreDiscrimina
     };
 }
 
-export function DefaultMetaOnlyResponseToJSON(value?: DefaultMetaOnlyResponse | null): any {
+  export function DefaultMetaOnlyResponseToJSON(json: any): DefaultMetaOnlyResponse {
+      return DefaultMetaOnlyResponseToJSONTyped(json, false);
+  }
+
+  export function DefaultMetaOnlyResponseToJSONTyped(value?: DefaultMetaOnlyResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'meta': ResponseMetaToJSON(value['meta']),

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DeploymentRequestStatus.ts

@@ -57,3 +57,7 @@ export function DeploymentRequestStatusToJSON(value?: DeploymentRequestStatus |
     return value as any;
 }
 
+export function DeploymentRequestStatusToJSONTyped(value: any, ignoreDiscriminator: boolean): DeploymentRequestStatus {
+    return value as DeploymentRequestStatus;
+}
+

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ErrorCode.ts

@@ -63,3 +63,7 @@ export function ErrorCodeToJSON(value?: ErrorCode | null): any {
     return value as any;
 }
 
+export function ErrorCodeToJSONTyped(value: any, ignoreDiscriminator: boolean): ErrorCode {
+    return value as ErrorCode;
+}
+

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponse.ts

@@ -18,12 +18,14 @@ import {
     ResponseMetaFromJSON,
     ResponseMetaFromJSONTyped,
     ResponseMetaToJSON,
+    ResponseMetaToJSONTyped,
 } from './ResponseMeta';
 import type { Pet } from './Pet';
 import {
     PetFromJSON,
     PetFromJSONTyped,
     PetToJSON,
+    PetToJSONTyped,
 } from './Pet';
 
 /**
@@ -69,10 +71,15 @@ export function FindPetsByStatusResponseFromJSONTyped(json: any, ignoreDiscrimin
     };
 }
 
-export function FindPetsByStatusResponseToJSON(value?: FindPetsByStatusResponse | null): any {
+  export function FindPetsByStatusResponseToJSON(json: any): FindPetsByStatusResponse {
+      return FindPetsByStatusResponseToJSONTyped(json, false);
+  }
+
+  export function FindPetsByStatusResponseToJSONTyped(value?: FindPetsByStatusResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'meta': ResponseMetaToJSON(value['meta']),

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponse.ts

@@ -18,12 +18,14 @@ import {
     UserFromJSON,
     UserFromJSONTyped,
     UserToJSON,
+    UserToJSONTyped,
 } from './User';
 import type { ResponseMeta } from './ResponseMeta';
 import {
     ResponseMetaFromJSON,
     ResponseMetaFromJSONTyped,
     ResponseMetaToJSON,
+    ResponseMetaToJSONTyped,
 } from './ResponseMeta';
 
 /**
@@ -69,10 +71,15 @@ export function FindPetsByUserResponseFromJSONTyped(json: any, ignoreDiscriminat
     };
 }
 
-export function FindPetsByUserResponseToJSON(value?: FindPetsByUserResponse | null): any {
+  export function FindPetsByUserResponseToJSON(json: any): FindPetsByUserResponse {
+      return FindPetsByUserResponseToJSONTyped(json, false);
+  }
+
+  export function FindPetsByUserResponseToJSONTyped(value?: FindPetsByUserResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'meta': ResponseMetaToJSON(value['meta']),

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponse.ts

@@ -18,6 +18,7 @@ import {
     ResponseMetaFromJSON,
     ResponseMetaFromJSONTyped,
     ResponseMetaToJSON,
+    ResponseMetaToJSONTyped,
 } from './ResponseMeta';
 
 /**
@@ -63,10 +64,15 @@ export function GetBehaviorPermissionsResponseFromJSONTyped(json: any, ignoreDis
     };
 }
 
-export function GetBehaviorPermissionsResponseToJSON(value?: GetBehaviorPermissionsResponse | null): any {
+  export function GetBehaviorPermissionsResponseToJSON(json: any): GetBehaviorPermissionsResponse {
+      return GetBehaviorPermissionsResponseToJSONTyped(json, false);
+  }
+
+  export function GetBehaviorPermissionsResponseToJSONTyped(value?: GetBehaviorPermissionsResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'meta': ResponseMetaToJSON(value['meta']),

samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponse.ts

@@ -18,12 +18,14 @@ import {
     BehaviorTypeFromJSON,
     BehaviorTypeFromJSONTyped,
     BehaviorTypeToJSON,
+    BehaviorTypeToJSONTyped,
 } from './BehaviorType';
 import type { ResponseMeta } from './ResponseMeta';
 import {
     ResponseMetaFromJSON,
     ResponseMetaFromJSONTyped,
     ResponseMetaToJSON,
+    ResponseMetaToJSONTyped,
 } from './ResponseMeta';
 
 /**
@@ -71,10 +73,15 @@ export function GetBehaviorTypeResponseFromJSONTyped(json: any, ignoreDiscrimina
     };
 }
 
-export function GetBehaviorTypeResponseToJSON(value?: GetBehaviorTypeResponse | null): any {
+  export function GetBehaviorTypeResponseToJSON(json: any): GetBehaviorTypeResponse {
+      return GetBehaviorTypeResponseToJSONTyped(json, false);
+  }
+
+  export function GetBehaviorTypeResponseToJSONTyped(value?: GetBehaviorTypeResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
+
     return {
         
         'meta': ResponseMetaToJSON(value['meta']),