From 2c38d0de35dbad9b0b7ea743601aa272c8deaf5a Mon Sep 17 00:00:00 2001
From: Jules Ivanic <jules.ivanic@gmail.com>
Date: Fri, 8 Nov 2024 00:33:33 +1100
Subject: [PATCH] [typescript-fetch][Fix] `oneOf` models are generated without
 `...ToJSONTyped` functions but models referencing still try to import
 (#20046)

* Fix #19858

* re-generate the samples
---
 .../main/resources/typescript-fetch/modelGeneric.mustache | 8 ++++----
 .../main/resources/typescript-fetch/modelOneOf.mustache   | 6 +++++-
 .../self-import-issue/models/AbstractUserDto.ts           | 8 ++++----
 .../self-import-issue/models/BranchDto.ts                 | 8 ++++----
 .../models/InternalAuthenticatedUserDto.ts                | 8 ++++----
 .../models/RemoteAuthenticatedUserDto.ts                  | 8 ++++----
 .../typescript-fetch/builds/allOf-nullable/models/Club.ts | 8 ++++----
 .../builds/allOf-nullable/models/Owner.ts                 | 8 ++++----
 .../typescript-fetch/builds/allOf-readonly/models/Club.ts | 8 ++++----
 .../builds/allOf-readonly/models/Owner.ts                 | 8 ++++----
 .../default-v3.0/models/AdditionalPropertiesClass.ts      | 8 ++++----
 .../builds/default-v3.0/models/AllOfWithSingleRef.ts      | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Animal.ts | 8 ++++----
 .../default-v3.0/models/ArrayOfArrayOfNumberOnly.ts       | 8 ++++----
 .../builds/default-v3.0/models/ArrayOfNumberOnly.ts       | 8 ++++----
 .../builds/default-v3.0/models/ArrayTest.ts               | 8 ++++----
 .../builds/default-v3.0/models/Capitalization.ts          | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Cat.ts    | 8 ++++----
 .../builds/default-v3.0/models/Category.ts                | 8 ++++----
 .../builds/default-v3.0/models/ChildWithNullable.ts       | 8 ++++----
 .../builds/default-v3.0/models/ClassModel.ts              | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Client.ts | 8 ++++----
 .../builds/default-v3.0/models/DeprecatedObject.ts        | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Dog.ts    | 8 ++++----
 .../builds/default-v3.0/models/EnumArrays.ts              | 8 ++++----
 .../builds/default-v3.0/models/EnumTest.ts                | 8 ++++----
 .../default-v3.0/models/FakeBigDecimalMap200Response.ts   | 8 ++++----
 .../builds/default-v3.0/models/FileSchemaTestClass.ts     | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Foo.ts    | 8 ++++----
 .../builds/default-v3.0/models/FooGetDefaultResponse.ts   | 8 ++++----
 .../builds/default-v3.0/models/FormatTest.ts              | 8 ++++----
 .../builds/default-v3.0/models/HasOnlyReadOnly.ts         | 8 ++++----
 .../builds/default-v3.0/models/HealthCheckResult.ts       | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/List.ts   | 8 ++++----
 .../builds/default-v3.0/models/MapTest.ts                 | 8 ++++----
 .../models/MixedPropertiesAndAdditionalPropertiesClass.ts | 8 ++++----
 .../builds/default-v3.0/models/Model200Response.ts        | 8 ++++----
 .../builds/default-v3.0/models/ModelApiResponse.ts        | 8 ++++----
 .../builds/default-v3.0/models/ModelFile.ts               | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Name.ts   | 8 ++++----
 .../builds/default-v3.0/models/NullableClass.ts           | 8 ++++----
 .../builds/default-v3.0/models/NumberOnly.ts              | 8 ++++----
 .../default-v3.0/models/ObjectWithDeprecatedFields.ts     | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Order.ts  | 8 ++++----
 .../builds/default-v3.0/models/OuterComposite.ts          | 8 ++++----
 .../default-v3.0/models/OuterObjectWithEnumProperty.ts    | 8 ++++----
 .../builds/default-v3.0/models/ParentWithNullable.ts      | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Pet.ts    | 8 ++++----
 .../builds/default-v3.0/models/ReadOnlyFirst.ts           | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Return.ts | 8 ++++----
 .../builds/default-v3.0/models/SpecialModelName.ts        | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/Tag.ts    | 8 ++++----
 .../TestInlineFreeformAdditionalPropertiesRequest.ts      | 8 ++++----
 .../typescript-fetch/builds/default-v3.0/models/User.ts   | 8 ++++----
 .../typescript-fetch/builds/default/models/Category.ts    | 8 ++++----
 .../builds/default/models/ModelApiResponse.ts             | 8 ++++----
 .../typescript-fetch/builds/default/models/Order.ts       | 8 ++++----
 .../typescript-fetch/builds/default/models/Pet.ts         | 8 ++++----
 .../typescript-fetch/builds/default/models/Tag.ts         | 8 ++++----
 .../typescript-fetch/builds/default/models/User.ts        | 8 ++++----
 .../builds/enum/models/EnumPatternObject.ts               | 8 ++++----
 .../enum/models/FakeEnumRequestGetInline200Response.ts    | 8 ++++----
 .../builds/es6-target/src/models/Category.ts              | 8 ++++----
 .../builds/es6-target/src/models/ModelApiResponse.ts      | 8 ++++----
 .../builds/es6-target/src/models/Order.ts                 | 8 ++++----
 .../typescript-fetch/builds/es6-target/src/models/Pet.ts  | 8 ++++----
 .../typescript-fetch/builds/es6-target/src/models/Tag.ts  | 8 ++++----
 .../typescript-fetch/builds/es6-target/src/models/User.ts | 8 ++++----
 .../builds/multiple-parameters/models/Category.ts         | 8 ++++----
 .../builds/multiple-parameters/models/ModelApiResponse.ts | 8 ++++----
 .../builds/multiple-parameters/models/Order.ts            | 8 ++++----
 .../builds/multiple-parameters/models/Pet.ts              | 8 ++++----
 .../builds/multiple-parameters/models/Tag.ts              | 8 ++++----
 .../builds/multiple-parameters/models/User.ts             | 8 ++++----
 .../typescript-fetch/builds/oneOf/models/TestA.ts         | 8 ++++----
 .../typescript-fetch/builds/oneOf/models/TestB.ts         | 8 ++++----
 .../typescript-fetch/builds/oneOf/models/TestResponse.ts  | 6 +++++-
 .../prefix-parameter-interfaces/src/models/Category.ts    | 8 ++++----
 .../src/models/ModelApiResponse.ts                        | 8 ++++----
 .../prefix-parameter-interfaces/src/models/Order.ts       | 8 ++++----
 .../builds/prefix-parameter-interfaces/src/models/Pet.ts  | 8 ++++----
 .../builds/prefix-parameter-interfaces/src/models/Tag.ts  | 8 ++++----
 .../builds/prefix-parameter-interfaces/src/models/User.ts | 8 ++++----
 .../builds/sagas-and-records/src/models/Category.ts       | 8 ++++----
 .../src/models/DefaultMetaOnlyResponse.ts                 | 8 ++++----
 .../src/models/FindPetsByStatusResponse.ts                | 8 ++++----
 .../src/models/FindPetsByUserResponse.ts                  | 8 ++++----
 .../src/models/GetBehaviorPermissionsResponse.ts          | 8 ++++----
 .../src/models/GetBehaviorTypeResponse.ts                 | 8 ++++----
 .../src/models/GetMatchingPartsResponse.ts                | 8 ++++----
 .../src/models/GetPetPartTypeResponse.ts                  | 8 ++++----
 .../builds/sagas-and-records/src/models/ItemId.ts         | 8 ++++----
 .../builds/sagas-and-records/src/models/MatchingParts.ts  | 8 ++++----
 .../sagas-and-records/src/models/ModelApiResponse.ts      | 8 ++++----
 .../builds/sagas-and-records/src/models/ModelError.ts     | 8 ++++----
 .../builds/sagas-and-records/src/models/Order.ts          | 8 ++++----
 .../builds/sagas-and-records/src/models/Part.ts           | 8 ++++----
 .../builds/sagas-and-records/src/models/Pet.ts            | 8 ++++----
 .../sagas-and-records/src/models/PetRegionsResponse.ts    | 8 ++++----
 .../builds/sagas-and-records/src/models/ResponseMeta.ts   | 8 ++++----
 .../builds/sagas-and-records/src/models/Tag.ts            | 8 ++++----
 .../builds/sagas-and-records/src/models/User.ts           | 8 ++++----
 .../models/AdditionalPropertiesClass.ts                   | 8 ++++----
 .../snakecase-discriminator/models/AllOfWithSingleRef.ts  | 8 ++++----
 .../builds/snakecase-discriminator/models/Animal.ts       | 8 ++++----
 .../models/ArrayOfArrayOfNumberOnly.ts                    | 8 ++++----
 .../snakecase-discriminator/models/ArrayOfNumberOnly.ts   | 8 ++++----
 .../builds/snakecase-discriminator/models/ArrayTest.ts    | 8 ++++----
 .../snakecase-discriminator/models/Capitalization.ts      | 8 ++++----
 .../builds/snakecase-discriminator/models/Cat.ts          | 8 ++++----
 .../builds/snakecase-discriminator/models/Category.ts     | 8 ++++----
 .../builds/snakecase-discriminator/models/ClassModel.ts   | 8 ++++----
 .../builds/snakecase-discriminator/models/Client.ts       | 8 ++++----
 .../snakecase-discriminator/models/DeprecatedObject.ts    | 8 ++++----
 .../builds/snakecase-discriminator/models/Dog.ts          | 8 ++++----
 .../builds/snakecase-discriminator/models/EnumArrays.ts   | 8 ++++----
 .../builds/snakecase-discriminator/models/EnumTest.ts     | 8 ++++----
 .../models/FakeBigDecimalMap200Response.ts                | 8 ++++----
 .../snakecase-discriminator/models/FileSchemaTestClass.ts | 8 ++++----
 .../builds/snakecase-discriminator/models/Foo.ts          | 8 ++++----
 .../models/FooGetDefaultResponse.ts                       | 8 ++++----
 .../builds/snakecase-discriminator/models/FormatTest.ts   | 8 ++++----
 .../snakecase-discriminator/models/HasOnlyReadOnly.ts     | 8 ++++----
 .../snakecase-discriminator/models/HealthCheckResult.ts   | 8 ++++----
 .../builds/snakecase-discriminator/models/List.ts         | 8 ++++----
 .../builds/snakecase-discriminator/models/MapTest.ts      | 8 ++++----
 .../models/MixedPropertiesAndAdditionalPropertiesClass.ts | 8 ++++----
 .../snakecase-discriminator/models/Model200Response.ts    | 8 ++++----
 .../snakecase-discriminator/models/ModelApiResponse.ts    | 8 ++++----
 .../builds/snakecase-discriminator/models/ModelFile.ts    | 8 ++++----
 .../builds/snakecase-discriminator/models/Name.ts         | 8 ++++----
 .../snakecase-discriminator/models/NullableClass.ts       | 8 ++++----
 .../builds/snakecase-discriminator/models/NumberOnly.ts   | 8 ++++----
 .../models/ObjectWithDeprecatedFields.ts                  | 8 ++++----
 .../builds/snakecase-discriminator/models/Order.ts        | 8 ++++----
 .../snakecase-discriminator/models/OuterComposite.ts      | 8 ++++----
 .../models/OuterObjectWithEnumProperty.ts                 | 8 ++++----
 .../builds/snakecase-discriminator/models/Pet.ts          | 8 ++++----
 .../snakecase-discriminator/models/ReadOnlyFirst.ts       | 8 ++++----
 .../builds/snakecase-discriminator/models/Return.ts       | 8 ++++----
 .../snakecase-discriminator/models/SpecialModelName.ts    | 8 ++++----
 .../builds/snakecase-discriminator/models/Tag.ts          | 8 ++++----
 .../builds/snakecase-discriminator/models/User.ts         | 8 ++++----
 .../builds/validation-attributes/models/Category.ts       | 8 ++++----
 .../validation-attributes/models/ModelApiResponse.ts      | 8 ++++----
 .../builds/validation-attributes/models/Order.ts          | 8 ++++----
 .../builds/validation-attributes/models/Pet.ts            | 8 ++++----
 .../builds/validation-attributes/models/Tag.ts            | 8 ++++----
 .../builds/validation-attributes/models/User.ts           | 8 ++++----
 .../builds/with-interfaces/models/Category.ts             | 8 ++++----
 .../builds/with-interfaces/models/ModelApiResponse.ts     | 8 ++++----
 .../builds/with-interfaces/models/Order.ts                | 8 ++++----
 .../typescript-fetch/builds/with-interfaces/models/Pet.ts | 8 ++++----
 .../typescript-fetch/builds/with-interfaces/models/Tag.ts | 8 ++++----
 .../builds/with-interfaces/models/User.ts                 | 8 ++++----
 .../builds/with-npm-version/src/models/Category.ts        | 8 ++++----
 .../with-npm-version/src/models/ModelApiResponse.ts       | 8 ++++----
 .../builds/with-npm-version/src/models/Order.ts           | 8 ++++----
 .../builds/with-npm-version/src/models/Pet.ts             | 8 ++++----
 .../builds/with-npm-version/src/models/Tag.ts             | 8 ++++----
 .../builds/with-npm-version/src/models/User.ts            | 8 ++++----
 .../builds/with-string-enums/models/EnumPatternObject.ts  | 8 ++++----
 .../models/FakeEnumRequestGetInline200Response.ts         | 8 ++++----
 163 files changed, 654 insertions(+), 646 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
index bf91a7f3db67..9ad18a9ccc76 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
@@ -108,11 +108,11 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
     {{/hasVars}}
 }
 
-  export function {{classname}}ToJSON(json: any): {{classname}} {
-      return {{classname}}ToJSONTyped(json, false);
-  }
+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 {
+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;
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache
index 0decac17419f..c02a0df9da73 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache
@@ -41,7 +41,11 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
 {{/discriminator}}
 }
 
-export function {{classname}}ToJSON(value?: {{classname}} | null): any {
+export function {{classname}}ToJSON(json: any): any {
+    return {{classname}}ToJSONTyped(json, false);
+}
+
+export function {{classname}}ToJSONTyped(value?: {{classname}} | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/others/typescript-fetch/self-import-issue/models/AbstractUserDto.ts b/samples/client/others/typescript-fetch/self-import-issue/models/AbstractUserDto.ts
index 53bf52f50bb9..29e0d20f36f3 100644
--- a/samples/client/others/typescript-fetch/self-import-issue/models/AbstractUserDto.ts
+++ b/samples/client/others/typescript-fetch/self-import-issue/models/AbstractUserDto.ts
@@ -80,11 +80,11 @@ export function AbstractUserDtoFromJSONTyped(json: any, ignoreDiscriminator: boo
     };
 }
 
-  export function AbstractUserDtoToJSON(json: any): AbstractUserDto {
-      return AbstractUserDtoToJSONTyped(json, false);
-  }
+export function AbstractUserDtoToJSON(json: any): AbstractUserDto {
+    return AbstractUserDtoToJSONTyped(json, false);
+}
 
-  export function AbstractUserDtoToJSONTyped(value?: AbstractUserDto | null, ignoreDiscriminator: boolean = false): any {
+export function AbstractUserDtoToJSONTyped(value?: AbstractUserDto | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/others/typescript-fetch/self-import-issue/models/BranchDto.ts b/samples/client/others/typescript-fetch/self-import-issue/models/BranchDto.ts
index 5de31fa073f8..2eeefff17c66 100644
--- a/samples/client/others/typescript-fetch/self-import-issue/models/BranchDto.ts
+++ b/samples/client/others/typescript-fetch/self-import-issue/models/BranchDto.ts
@@ -48,11 +48,11 @@ export function BranchDtoFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function BranchDtoToJSON(json: any): BranchDto {
-      return BranchDtoToJSONTyped(json, false);
-  }
+export function BranchDtoToJSON(json: any): BranchDto {
+    return BranchDtoToJSONTyped(json, false);
+}
 
-  export function BranchDtoToJSONTyped(value?: BranchDto | null, ignoreDiscriminator: boolean = false): any {
+export function BranchDtoToJSONTyped(value?: BranchDto | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/others/typescript-fetch/self-import-issue/models/InternalAuthenticatedUserDto.ts b/samples/client/others/typescript-fetch/self-import-issue/models/InternalAuthenticatedUserDto.ts
index 14a4f768ac4f..7a8e69f01231 100644
--- a/samples/client/others/typescript-fetch/self-import-issue/models/InternalAuthenticatedUserDto.ts
+++ b/samples/client/others/typescript-fetch/self-import-issue/models/InternalAuthenticatedUserDto.ts
@@ -51,11 +51,11 @@ export function InternalAuthenticatedUserDtoFromJSONTyped(json: any, ignoreDiscr
     return json;
 }
 
-  export function InternalAuthenticatedUserDtoToJSON(json: any): InternalAuthenticatedUserDto {
-      return InternalAuthenticatedUserDtoToJSONTyped(json, false);
-  }
+export function InternalAuthenticatedUserDtoToJSON(json: any): InternalAuthenticatedUserDto {
+    return InternalAuthenticatedUserDtoToJSONTyped(json, false);
+}
 
-  export function InternalAuthenticatedUserDtoToJSONTyped(value?: InternalAuthenticatedUserDto | null, ignoreDiscriminator: boolean = false): any {
+export function InternalAuthenticatedUserDtoToJSONTyped(value?: InternalAuthenticatedUserDto | null, ignoreDiscriminator: boolean = false): any {
     return value;
 }
 
diff --git a/samples/client/others/typescript-fetch/self-import-issue/models/RemoteAuthenticatedUserDto.ts b/samples/client/others/typescript-fetch/self-import-issue/models/RemoteAuthenticatedUserDto.ts
index 6791e2e1216f..4fb8c1916e9d 100644
--- a/samples/client/others/typescript-fetch/self-import-issue/models/RemoteAuthenticatedUserDto.ts
+++ b/samples/client/others/typescript-fetch/self-import-issue/models/RemoteAuthenticatedUserDto.ts
@@ -51,11 +51,11 @@ export function RemoteAuthenticatedUserDtoFromJSONTyped(json: any, ignoreDiscrim
     return json;
 }
 
-  export function RemoteAuthenticatedUserDtoToJSON(json: any): RemoteAuthenticatedUserDto {
-      return RemoteAuthenticatedUserDtoToJSONTyped(json, false);
-  }
+export function RemoteAuthenticatedUserDtoToJSON(json: any): RemoteAuthenticatedUserDto {
+    return RemoteAuthenticatedUserDtoToJSONTyped(json, false);
+}
 
-  export function RemoteAuthenticatedUserDtoToJSONTyped(value?: RemoteAuthenticatedUserDto | null, ignoreDiscriminator: boolean = false): any {
+export function RemoteAuthenticatedUserDtoToJSONTyped(value?: RemoteAuthenticatedUserDto | null, ignoreDiscriminator: boolean = false): any {
     return value;
 }
 
diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Club.ts b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Club.ts
index cce6b72e169a..840229f07010 100644
--- a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Club.ts
+++ b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Club.ts
@@ -56,11 +56,11 @@ export function ClubFromJSONTyped(json: any, ignoreDiscriminator: boolean): Club
     };
 }
 
-  export function ClubToJSON(json: any): Club {
-      return ClubToJSONTyped(json, false);
-  }
+export function ClubToJSON(json: any): Club {
+    return ClubToJSONTyped(json, false);
+}
 
-  export function ClubToJSONTyped(value?: Club | null, ignoreDiscriminator: boolean = false): any {
+export function ClubToJSONTyped(value?: Club | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Owner.ts b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Owner.ts
index 0ed8fde3a930..a0dcefdc827e 100644
--- a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Owner.ts
+++ b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/models/Owner.ts
@@ -48,11 +48,11 @@ export function OwnerFromJSONTyped(json: any, ignoreDiscriminator: boolean): Own
     };
 }
 
-  export function OwnerToJSON(json: any): Owner {
-      return OwnerToJSONTyped(json, false);
-  }
+export function OwnerToJSON(json: any): Owner {
+    return OwnerToJSONTyped(json, false);
+}
 
-  export function OwnerToJSONTyped(value?: Owner | null, ignoreDiscriminator: boolean = false): any {
+export function OwnerToJSONTyped(value?: Owner | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Club.ts b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Club.ts
index b815ab07d2c6..b6659c9de23b 100644
--- a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Club.ts
+++ b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Club.ts
@@ -56,11 +56,11 @@ export function ClubFromJSONTyped(json: any, ignoreDiscriminator: boolean): Club
     };
 }
 
-  export function ClubToJSON(json: any): Club {
-      return ClubToJSONTyped(json, false);
-  }
+export function ClubToJSON(json: any): Club {
+    return ClubToJSONTyped(json, false);
+}
 
-  export function ClubToJSONTyped(value?: Omit<Club, 'owner'> | null, ignoreDiscriminator: boolean = false): any {
+export function ClubToJSONTyped(value?: Omit<Club, 'owner'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Owner.ts b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Owner.ts
index 0ed8fde3a930..a0dcefdc827e 100644
--- a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Owner.ts
+++ b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/models/Owner.ts
@@ -48,11 +48,11 @@ export function OwnerFromJSONTyped(json: any, ignoreDiscriminator: boolean): Own
     };
 }
 
-  export function OwnerToJSON(json: any): Owner {
-      return OwnerToJSONTyped(json, false);
-  }
+export function OwnerToJSON(json: any): Owner {
+    return OwnerToJSONTyped(json, false);
+}
 
-  export function OwnerToJSONTyped(value?: Owner | null, ignoreDiscriminator: boolean = false): any {
+export function OwnerToJSONTyped(value?: Owner | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AdditionalPropertiesClass.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AdditionalPropertiesClass.ts
index c15b937e8a1c..d470576ef7d3 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AdditionalPropertiesClass.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AdditionalPropertiesClass.ts
@@ -55,11 +55,11 @@ export function AdditionalPropertiesClassFromJSONTyped(json: any, ignoreDiscrimi
     };
 }
 
-  export function AdditionalPropertiesClassToJSON(json: any): AdditionalPropertiesClass {
-      return AdditionalPropertiesClassToJSONTyped(json, false);
-  }
+export function AdditionalPropertiesClassToJSON(json: any): AdditionalPropertiesClass {
+    return AdditionalPropertiesClassToJSONTyped(json, false);
+}
 
-  export function AdditionalPropertiesClassToJSONTyped(value?: AdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
+export function AdditionalPropertiesClassToJSONTyped(value?: AdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AllOfWithSingleRef.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AllOfWithSingleRef.ts
index 826ea603e2db..cbd15b990c6c 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AllOfWithSingleRef.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/AllOfWithSingleRef.ts
@@ -65,11 +65,11 @@ export function AllOfWithSingleRefFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-  export function AllOfWithSingleRefToJSON(json: any): AllOfWithSingleRef {
-      return AllOfWithSingleRefToJSONTyped(json, false);
-  }
+export function AllOfWithSingleRefToJSON(json: any): AllOfWithSingleRef {
+    return AllOfWithSingleRefToJSONTyped(json, false);
+}
 
-  export function AllOfWithSingleRefToJSONTyped(value?: AllOfWithSingleRef | null, ignoreDiscriminator: boolean = false): any {
+export function AllOfWithSingleRefToJSONTyped(value?: AllOfWithSingleRef | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts
index 0f87e6dd367e..f1289f027f15 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts
@@ -66,11 +66,11 @@ export function AnimalFromJSONTyped(json: any, ignoreDiscriminator: boolean): An
     };
 }
 
-  export function AnimalToJSON(json: any): Animal {
-      return AnimalToJSONTyped(json, false);
-  }
+export function AnimalToJSON(json: any): Animal {
+    return AnimalToJSONTyped(json, false);
+}
 
-  export function AnimalToJSONTyped(value?: Animal | null, ignoreDiscriminator: boolean = false): any {
+export function AnimalToJSONTyped(value?: Animal | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfArrayOfNumberOnly.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfArrayOfNumberOnly.ts
index 18264d15d7cb..3792b9134b4a 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfArrayOfNumberOnly.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfArrayOfNumberOnly.ts
@@ -48,11 +48,11 @@ export function ArrayOfArrayOfNumberOnlyFromJSONTyped(json: any, ignoreDiscrimin
     };
 }
 
-  export function ArrayOfArrayOfNumberOnlyToJSON(json: any): ArrayOfArrayOfNumberOnly {
-      return ArrayOfArrayOfNumberOnlyToJSONTyped(json, false);
-  }
+export function ArrayOfArrayOfNumberOnlyToJSON(json: any): ArrayOfArrayOfNumberOnly {
+    return ArrayOfArrayOfNumberOnlyToJSONTyped(json, false);
+}
 
-  export function ArrayOfArrayOfNumberOnlyToJSONTyped(value?: ArrayOfArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
+export function ArrayOfArrayOfNumberOnlyToJSONTyped(value?: ArrayOfArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfNumberOnly.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfNumberOnly.ts
index fa5c6dc5edd1..40fbb3c6326d 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfNumberOnly.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfNumberOnly.ts
@@ -48,11 +48,11 @@ export function ArrayOfNumberOnlyFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-  export function ArrayOfNumberOnlyToJSON(json: any): ArrayOfNumberOnly {
-      return ArrayOfNumberOnlyToJSONTyped(json, false);
-  }
+export function ArrayOfNumberOnlyToJSON(json: any): ArrayOfNumberOnly {
+    return ArrayOfNumberOnlyToJSONTyped(json, false);
+}
 
-  export function ArrayOfNumberOnlyToJSONTyped(value?: ArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
+export function ArrayOfNumberOnlyToJSONTyped(value?: ArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayTest.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayTest.ts
index b31c80207b2f..9f3c53288826 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayTest.ts
@@ -70,11 +70,11 @@ export function ArrayTestFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function ArrayTestToJSON(json: any): ArrayTest {
-      return ArrayTestToJSONTyped(json, false);
-  }
+export function ArrayTestToJSON(json: any): ArrayTest {
+    return ArrayTestToJSONTyped(json, false);
+}
 
-  export function ArrayTestToJSONTyped(value?: ArrayTest | null, ignoreDiscriminator: boolean = false): any {
+export function ArrayTestToJSONTyped(value?: ArrayTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Capitalization.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Capitalization.ts
index ace2ede88477..9c6a2be5afb6 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Capitalization.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Capitalization.ts
@@ -84,11 +84,11 @@ export function CapitalizationFromJSONTyped(json: any, ignoreDiscriminator: bool
     };
 }
 
-  export function CapitalizationToJSON(json: any): Capitalization {
-      return CapitalizationToJSONTyped(json, false);
-  }
+export function CapitalizationToJSON(json: any): Capitalization {
+    return CapitalizationToJSONTyped(json, false);
+}
 
-  export function CapitalizationToJSONTyped(value?: Capitalization | null, ignoreDiscriminator: boolean = false): any {
+export function CapitalizationToJSONTyped(value?: Capitalization | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Cat.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Cat.ts
index a1b44d02d26d..ba0e19539237 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Cat.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Cat.ts
@@ -56,11 +56,11 @@ export function CatFromJSONTyped(json: any, ignoreDiscriminator: boolean): Cat {
     };
 }
 
-  export function CatToJSON(json: any): Cat {
-      return CatToJSONTyped(json, false);
-  }
+export function CatToJSON(json: any): Cat {
+    return CatToJSONTyped(json, false);
+}
 
-  export function CatToJSONTyped(value?: Cat | null, ignoreDiscriminator: boolean = false): any {
+export function CatToJSONTyped(value?: Cat | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Category.ts
index 7c8caddd4969..e4047d919b2b 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Category.ts
@@ -56,11 +56,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ChildWithNullable.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ChildWithNullable.ts
index 0a5dd717f208..87e1106a1dd8 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ChildWithNullable.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ChildWithNullable.ts
@@ -58,11 +58,11 @@ export function ChildWithNullableFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-  export function ChildWithNullableToJSON(json: any): ChildWithNullable {
-      return ChildWithNullableToJSONTyped(json, false);
-  }
+export function ChildWithNullableToJSON(json: any): ChildWithNullable {
+    return ChildWithNullableToJSONTyped(json, false);
+}
 
-  export function ChildWithNullableToJSONTyped(value?: ChildWithNullable | null, ignoreDiscriminator: boolean = false): any {
+export function ChildWithNullableToJSONTyped(value?: ChildWithNullable | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ClassModel.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ClassModel.ts
index 813177eb3d50..cba5bbc353cf 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ClassModel.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ClassModel.ts
@@ -48,11 +48,11 @@ export function ClassModelFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function ClassModelToJSON(json: any): ClassModel {
-      return ClassModelToJSONTyped(json, false);
-  }
+export function ClassModelToJSON(json: any): ClassModel {
+    return ClassModelToJSONTyped(json, false);
+}
 
-  export function ClassModelToJSONTyped(value?: ClassModel | null, ignoreDiscriminator: boolean = false): any {
+export function ClassModelToJSONTyped(value?: ClassModel | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Client.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Client.ts
index c6aa7163b0b3..b9509a4421f9 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Client.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Client.ts
@@ -48,11 +48,11 @@ export function ClientFromJSONTyped(json: any, ignoreDiscriminator: boolean): Cl
     };
 }
 
-  export function ClientToJSON(json: any): Client {
-      return ClientToJSONTyped(json, false);
-  }
+export function ClientToJSON(json: any): Client {
+    return ClientToJSONTyped(json, false);
+}
 
-  export function ClientToJSONTyped(value?: Client | null, ignoreDiscriminator: boolean = false): any {
+export function ClientToJSONTyped(value?: Client | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/DeprecatedObject.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/DeprecatedObject.ts
index d2acf418fded..2b22f28ddfe7 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/DeprecatedObject.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/DeprecatedObject.ts
@@ -48,11 +48,11 @@ export function DeprecatedObjectFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function DeprecatedObjectToJSON(json: any): DeprecatedObject {
-      return DeprecatedObjectToJSONTyped(json, false);
-  }
+export function DeprecatedObjectToJSON(json: any): DeprecatedObject {
+    return DeprecatedObjectToJSONTyped(json, false);
+}
 
-  export function DeprecatedObjectToJSONTyped(value?: DeprecatedObject | null, ignoreDiscriminator: boolean = false): any {
+export function DeprecatedObjectToJSONTyped(value?: DeprecatedObject | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Dog.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Dog.ts
index 1d66d5c04bf8..6662a88d3bee 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Dog.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Dog.ts
@@ -56,11 +56,11 @@ export function DogFromJSONTyped(json: any, ignoreDiscriminator: boolean): Dog {
     };
 }
 
-  export function DogToJSON(json: any): Dog {
-      return DogToJSONTyped(json, false);
-  }
+export function DogToJSON(json: any): Dog {
+    return DogToJSONTyped(json, false);
+}
 
-  export function DogToJSONTyped(value?: Dog | null, ignoreDiscriminator: boolean = false): any {
+export function DogToJSONTyped(value?: Dog | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts
index 27f42e0a652b..b30860b8e8bb 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts
@@ -75,11 +75,11 @@ export function EnumArraysFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function EnumArraysToJSON(json: any): EnumArrays {
-      return EnumArraysToJSONTyped(json, false);
-  }
+export function EnumArraysToJSON(json: any): EnumArrays {
+    return EnumArraysToJSONTyped(json, false);
+}
 
-  export function EnumArraysToJSONTyped(value?: EnumArrays | null, ignoreDiscriminator: boolean = false): any {
+export function EnumArraysToJSONTyped(value?: EnumArrays | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts
index de99ab4dc662..0097912a9561 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts
@@ -167,11 +167,11 @@ export function EnumTestFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function EnumTestToJSON(json: any): EnumTest {
-      return EnumTestToJSONTyped(json, false);
-  }
+export function EnumTestToJSON(json: any): EnumTest {
+    return EnumTestToJSONTyped(json, false);
+}
 
-  export function EnumTestToJSONTyped(value?: EnumTest | null, ignoreDiscriminator: boolean = false): any {
+export function EnumTestToJSONTyped(value?: EnumTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FakeBigDecimalMap200Response.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FakeBigDecimalMap200Response.ts
index 5c97b9928efa..54458419a514 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FakeBigDecimalMap200Response.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FakeBigDecimalMap200Response.ts
@@ -55,11 +55,11 @@ export function FakeBigDecimalMap200ResponseFromJSONTyped(json: any, ignoreDiscr
     };
 }
 
-  export function FakeBigDecimalMap200ResponseToJSON(json: any): FakeBigDecimalMap200Response {
-      return FakeBigDecimalMap200ResponseToJSONTyped(json, false);
-  }
+export function FakeBigDecimalMap200ResponseToJSON(json: any): FakeBigDecimalMap200Response {
+    return FakeBigDecimalMap200ResponseToJSONTyped(json, false);
+}
 
-  export function FakeBigDecimalMap200ResponseToJSONTyped(value?: FakeBigDecimalMap200Response | null, ignoreDiscriminator: boolean = false): any {
+export function FakeBigDecimalMap200ResponseToJSONTyped(value?: FakeBigDecimalMap200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FileSchemaTestClass.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FileSchemaTestClass.ts
index 557abed7403e..87a77f497fbc 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FileSchemaTestClass.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FileSchemaTestClass.ts
@@ -55,11 +55,11 @@ export function FileSchemaTestClassFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-  export function FileSchemaTestClassToJSON(json: any): FileSchemaTestClass {
-      return FileSchemaTestClassToJSONTyped(json, false);
-  }
+export function FileSchemaTestClassToJSON(json: any): FileSchemaTestClass {
+    return FileSchemaTestClassToJSONTyped(json, false);
+}
 
-  export function FileSchemaTestClassToJSONTyped(value?: FileSchemaTestClass | null, ignoreDiscriminator: boolean = false): any {
+export function FileSchemaTestClassToJSONTyped(value?: FileSchemaTestClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Foo.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Foo.ts
index 118b6190f280..ca208c88e2f8 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Foo.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Foo.ts
@@ -48,11 +48,11 @@ export function FooFromJSONTyped(json: any, ignoreDiscriminator: boolean): Foo {
     };
 }
 
-  export function FooToJSON(json: any): Foo {
-      return FooToJSONTyped(json, false);
-  }
+export function FooToJSON(json: any): Foo {
+    return FooToJSONTyped(json, false);
+}
 
-  export function FooToJSONTyped(value?: Foo | null, ignoreDiscriminator: boolean = false): any {
+export function FooToJSONTyped(value?: Foo | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FooGetDefaultResponse.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FooGetDefaultResponse.ts
index 721b08a2242d..1199e6b3793a 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FooGetDefaultResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FooGetDefaultResponse.ts
@@ -56,11 +56,11 @@ export function FooGetDefaultResponseFromJSONTyped(json: any, ignoreDiscriminato
     };
 }
 
-  export function FooGetDefaultResponseToJSON(json: any): FooGetDefaultResponse {
-      return FooGetDefaultResponseToJSONTyped(json, false);
-  }
+export function FooGetDefaultResponseToJSON(json: any): FooGetDefaultResponse {
+    return FooGetDefaultResponseToJSONTyped(json, false);
+}
 
-  export function FooGetDefaultResponseToJSONTyped(value?: FooGetDefaultResponse | null, ignoreDiscriminator: boolean = false): any {
+export function FooGetDefaultResponseToJSONTyped(value?: FooGetDefaultResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FormatTest.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FormatTest.ts
index df41354802ae..33aed92595aa 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FormatTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/FormatTest.ts
@@ -157,11 +157,11 @@ export function FormatTestFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function FormatTestToJSON(json: any): FormatTest {
-      return FormatTestToJSONTyped(json, false);
-  }
+export function FormatTestToJSON(json: any): FormatTest {
+    return FormatTestToJSONTyped(json, false);
+}
 
-  export function FormatTestToJSONTyped(value?: FormatTest | null, ignoreDiscriminator: boolean = false): any {
+export function FormatTestToJSONTyped(value?: FormatTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HasOnlyReadOnly.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HasOnlyReadOnly.ts
index 0eb9accdc1f5..59019adf1993 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HasOnlyReadOnly.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HasOnlyReadOnly.ts
@@ -55,11 +55,11 @@ export function HasOnlyReadOnlyFromJSONTyped(json: any, ignoreDiscriminator: boo
     };
 }
 
-  export function HasOnlyReadOnlyToJSON(json: any): HasOnlyReadOnly {
-      return HasOnlyReadOnlyToJSONTyped(json, false);
-  }
+export function HasOnlyReadOnlyToJSON(json: any): HasOnlyReadOnly {
+    return HasOnlyReadOnlyToJSONTyped(json, false);
+}
 
-  export function HasOnlyReadOnlyToJSONTyped(value?: Omit<HasOnlyReadOnly, 'bar'|'foo'> | null, ignoreDiscriminator: boolean = false): any {
+export function HasOnlyReadOnlyToJSONTyped(value?: Omit<HasOnlyReadOnly, 'bar'|'foo'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HealthCheckResult.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HealthCheckResult.ts
index c62de4d9fb83..e8683a11f338 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HealthCheckResult.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/HealthCheckResult.ts
@@ -48,11 +48,11 @@ export function HealthCheckResultFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-  export function HealthCheckResultToJSON(json: any): HealthCheckResult {
-      return HealthCheckResultToJSONTyped(json, false);
-  }
+export function HealthCheckResultToJSON(json: any): HealthCheckResult {
+    return HealthCheckResultToJSONTyped(json, false);
+}
 
-  export function HealthCheckResultToJSONTyped(value?: HealthCheckResult | null, ignoreDiscriminator: boolean = false): any {
+export function HealthCheckResultToJSONTyped(value?: HealthCheckResult | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/List.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/List.ts
index fb9a30ea0e5b..21dd83e2c200 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/List.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/List.ts
@@ -48,11 +48,11 @@ export function ListFromJSONTyped(json: any, ignoreDiscriminator: boolean): List
     };
 }
 
-  export function ListToJSON(json: any): List {
-      return ListToJSONTyped(json, false);
-  }
+export function ListToJSON(json: any): List {
+    return ListToJSONTyped(json, false);
+}
 
-  export function ListToJSONTyped(value?: List | null, ignoreDiscriminator: boolean = false): any {
+export function ListToJSONTyped(value?: List | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts
index a88b84fd1027..753c30a6cf93 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts
@@ -80,11 +80,11 @@ export function MapTestFromJSONTyped(json: any, ignoreDiscriminator: boolean): M
     };
 }
 
-  export function MapTestToJSON(json: any): MapTest {
-      return MapTestToJSONTyped(json, false);
-  }
+export function MapTestToJSON(json: any): MapTest {
+    return MapTestToJSONTyped(json, false);
+}
 
-  export function MapTestToJSONTyped(value?: MapTest | null, ignoreDiscriminator: boolean = false): any {
+export function MapTestToJSONTyped(value?: MapTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MixedPropertiesAndAdditionalPropertiesClass.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MixedPropertiesAndAdditionalPropertiesClass.ts
index 1f69153ef85c..5466bc5177e2 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MixedPropertiesAndAdditionalPropertiesClass.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MixedPropertiesAndAdditionalPropertiesClass.ts
@@ -70,11 +70,11 @@ export function MixedPropertiesAndAdditionalPropertiesClassFromJSONTyped(json: a
     };
 }
 
-  export function MixedPropertiesAndAdditionalPropertiesClassToJSON(json: any): MixedPropertiesAndAdditionalPropertiesClass {
-      return MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(json, false);
-  }
+export function MixedPropertiesAndAdditionalPropertiesClassToJSON(json: any): MixedPropertiesAndAdditionalPropertiesClass {
+    return MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(json, false);
+}
 
-  export function MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(value?: MixedPropertiesAndAdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
+export function MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(value?: MixedPropertiesAndAdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Model200Response.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Model200Response.ts
index af0066b276eb..b0a30640133e 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Model200Response.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Model200Response.ts
@@ -55,11 +55,11 @@ export function Model200ResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function Model200ResponseToJSON(json: any): Model200Response {
-      return Model200ResponseToJSONTyped(json, false);
-  }
+export function Model200ResponseToJSON(json: any): Model200Response {
+    return Model200ResponseToJSONTyped(json, false);
+}
 
-  export function Model200ResponseToJSONTyped(value?: Model200Response | null, ignoreDiscriminator: boolean = false): any {
+export function Model200ResponseToJSONTyped(value?: Model200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelApiResponse.ts
index a505854c2d71..355b5f76e428 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelFile.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelFile.ts
index ef6eee2c53c7..4b63fcfe25f2 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelFile.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ModelFile.ts
@@ -48,11 +48,11 @@ export function ModelFileFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function ModelFileToJSON(json: any): ModelFile {
-      return ModelFileToJSONTyped(json, false);
-  }
+export function ModelFileToJSON(json: any): ModelFile {
+    return ModelFileToJSONTyped(json, false);
+}
 
-  export function ModelFileToJSONTyped(value?: ModelFile | null, ignoreDiscriminator: boolean = false): any {
+export function ModelFileToJSONTyped(value?: ModelFile | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Name.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Name.ts
index 1c957bff4d65..b999bdccb1d0 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Name.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Name.ts
@@ -70,11 +70,11 @@ export function NameFromJSONTyped(json: any, ignoreDiscriminator: boolean): Name
     };
 }
 
-  export function NameToJSON(json: any): Name {
-      return NameToJSONTyped(json, false);
-  }
+export function NameToJSON(json: any): Name {
+    return NameToJSONTyped(json, false);
+}
 
-  export function NameToJSONTyped(value?: Omit<Name, 'snake_case'|'123Number'> | null, ignoreDiscriminator: boolean = false): any {
+export function NameToJSONTyped(value?: Omit<Name, 'snake_case'|'123Number'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NullableClass.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NullableClass.ts
index 4f32da1c0ced..3c2a165a7bd9 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NullableClass.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NullableClass.ts
@@ -127,11 +127,11 @@ export function NullableClassFromJSONTyped(json: any, ignoreDiscriminator: boole
     };
 }
 
-  export function NullableClassToJSON(json: any): NullableClass {
-      return NullableClassToJSONTyped(json, false);
-  }
+export function NullableClassToJSON(json: any): NullableClass {
+    return NullableClassToJSONTyped(json, false);
+}
 
-  export function NullableClassToJSONTyped(value?: NullableClass | null, ignoreDiscriminator: boolean = false): any {
+export function NullableClassToJSONTyped(value?: NullableClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NumberOnly.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NumberOnly.ts
index d9e19a6d9d86..01ffc388797b 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NumberOnly.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NumberOnly.ts
@@ -48,11 +48,11 @@ export function NumberOnlyFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function NumberOnlyToJSON(json: any): NumberOnly {
-      return NumberOnlyToJSONTyped(json, false);
-  }
+export function NumberOnlyToJSON(json: any): NumberOnly {
+    return NumberOnlyToJSONTyped(json, false);
+}
 
-  export function NumberOnlyToJSONTyped(value?: NumberOnly | null, ignoreDiscriminator: boolean = false): any {
+export function NumberOnlyToJSONTyped(value?: NumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ObjectWithDeprecatedFields.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ObjectWithDeprecatedFields.ts
index 88b028733508..8dd72d9dfde3 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ObjectWithDeprecatedFields.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ObjectWithDeprecatedFields.ts
@@ -80,11 +80,11 @@ export function ObjectWithDeprecatedFieldsFromJSONTyped(json: any, ignoreDiscrim
     };
 }
 
-  export function ObjectWithDeprecatedFieldsToJSON(json: any): ObjectWithDeprecatedFields {
-      return ObjectWithDeprecatedFieldsToJSONTyped(json, false);
-  }
+export function ObjectWithDeprecatedFieldsToJSON(json: any): ObjectWithDeprecatedFields {
+    return ObjectWithDeprecatedFieldsToJSONTyped(json, false);
+}
 
-  export function ObjectWithDeprecatedFieldsToJSONTyped(value?: ObjectWithDeprecatedFields | null, ignoreDiscriminator: boolean = false): any {
+export function ObjectWithDeprecatedFieldsToJSONTyped(value?: ObjectWithDeprecatedFields | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
index ef82efcce508..2e9a77af0484 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterComposite.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterComposite.ts
index ab4303f03c3a..ffb9d35f81ae 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterComposite.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterComposite.ts
@@ -62,11 +62,11 @@ export function OuterCompositeFromJSONTyped(json: any, ignoreDiscriminator: bool
     };
 }
 
-  export function OuterCompositeToJSON(json: any): OuterComposite {
-      return OuterCompositeToJSONTyped(json, false);
-  }
+export function OuterCompositeToJSON(json: any): OuterComposite {
+    return OuterCompositeToJSONTyped(json, false);
+}
 
-  export function OuterCompositeToJSONTyped(value?: OuterComposite | null, ignoreDiscriminator: boolean = false): any {
+export function OuterCompositeToJSONTyped(value?: OuterComposite | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterObjectWithEnumProperty.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterObjectWithEnumProperty.ts
index a533ca482d8b..cc02ae41cfec 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterObjectWithEnumProperty.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterObjectWithEnumProperty.ts
@@ -59,11 +59,11 @@ export function OuterObjectWithEnumPropertyFromJSONTyped(json: any, ignoreDiscri
     };
 }
 
-  export function OuterObjectWithEnumPropertyToJSON(json: any): OuterObjectWithEnumProperty {
-      return OuterObjectWithEnumPropertyToJSONTyped(json, false);
-  }
+export function OuterObjectWithEnumPropertyToJSON(json: any): OuterObjectWithEnumProperty {
+    return OuterObjectWithEnumPropertyToJSONTyped(json, false);
+}
 
-  export function OuterObjectWithEnumPropertyToJSONTyped(value?: OuterObjectWithEnumProperty | null, ignoreDiscriminator: boolean = false): any {
+export function OuterObjectWithEnumPropertyToJSONTyped(value?: OuterObjectWithEnumProperty | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ParentWithNullable.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ParentWithNullable.ts
index a7a8016b7adc..8b64d83d50f9 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ParentWithNullable.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ParentWithNullable.ts
@@ -71,11 +71,11 @@ export function ParentWithNullableFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-  export function ParentWithNullableToJSON(json: any): ParentWithNullable {
-      return ParentWithNullableToJSONTyped(json, false);
-  }
+export function ParentWithNullableToJSON(json: any): ParentWithNullable {
+    return ParentWithNullableToJSONTyped(json, false);
+}
 
-  export function ParentWithNullableToJSONTyped(value?: ParentWithNullable | null, ignoreDiscriminator: boolean = false): any {
+export function ParentWithNullableToJSONTyped(value?: ParentWithNullable | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts
index 4dc3777b0123..d45f8d2b64bc 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts
@@ -112,11 +112,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ReadOnlyFirst.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ReadOnlyFirst.ts
index 561b3037f5c0..38dbd2fbf41a 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ReadOnlyFirst.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ReadOnlyFirst.ts
@@ -55,11 +55,11 @@ export function ReadOnlyFirstFromJSONTyped(json: any, ignoreDiscriminator: boole
     };
 }
 
-  export function ReadOnlyFirstToJSON(json: any): ReadOnlyFirst {
-      return ReadOnlyFirstToJSONTyped(json, false);
-  }
+export function ReadOnlyFirstToJSON(json: any): ReadOnlyFirst {
+    return ReadOnlyFirstToJSONTyped(json, false);
+}
 
-  export function ReadOnlyFirstToJSONTyped(value?: Omit<ReadOnlyFirst, 'bar'> | null, ignoreDiscriminator: boolean = false): any {
+export function ReadOnlyFirstToJSONTyped(value?: Omit<ReadOnlyFirst, 'bar'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Return.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Return.ts
index dc1fd7c1712c..557bb0d67195 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Return.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Return.ts
@@ -48,11 +48,11 @@ export function ReturnFromJSONTyped(json: any, ignoreDiscriminator: boolean): Re
     };
 }
 
-  export function ReturnToJSON(json: any): Return {
-      return ReturnToJSONTyped(json, false);
-  }
+export function ReturnToJSON(json: any): Return {
+    return ReturnToJSONTyped(json, false);
+}
 
-  export function ReturnToJSONTyped(value?: Return | null, ignoreDiscriminator: boolean = false): any {
+export function ReturnToJSONTyped(value?: Return | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/SpecialModelName.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/SpecialModelName.ts
index 3fec48ea4438..5ad3c16ca096 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/SpecialModelName.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/SpecialModelName.ts
@@ -48,11 +48,11 @@ export function SpecialModelNameFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function SpecialModelNameToJSON(json: any): SpecialModelName {
-      return SpecialModelNameToJSONTyped(json, false);
-  }
+export function SpecialModelNameToJSON(json: any): SpecialModelName {
+    return SpecialModelNameToJSONTyped(json, false);
+}
 
-  export function SpecialModelNameToJSONTyped(value?: SpecialModelName | null, ignoreDiscriminator: boolean = false): any {
+export function SpecialModelNameToJSONTyped(value?: SpecialModelName | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Tag.ts
index 11266e1fb90a..c8711cf09f01 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/TestInlineFreeformAdditionalPropertiesRequest.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/TestInlineFreeformAdditionalPropertiesRequest.ts
index 5bfdc0cfa545..025e2205b096 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/TestInlineFreeformAdditionalPropertiesRequest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/TestInlineFreeformAdditionalPropertiesRequest.ts
@@ -50,11 +50,11 @@ export function TestInlineFreeformAdditionalPropertiesRequestFromJSONTyped(json:
     };
 }
 
-  export function TestInlineFreeformAdditionalPropertiesRequestToJSON(json: any): TestInlineFreeformAdditionalPropertiesRequest {
-      return TestInlineFreeformAdditionalPropertiesRequestToJSONTyped(json, false);
-  }
+export function TestInlineFreeformAdditionalPropertiesRequestToJSON(json: any): TestInlineFreeformAdditionalPropertiesRequest {
+    return TestInlineFreeformAdditionalPropertiesRequestToJSONTyped(json, false);
+}
 
-  export function TestInlineFreeformAdditionalPropertiesRequestToJSONTyped(value?: TestInlineFreeformAdditionalPropertiesRequest | null, ignoreDiscriminator: boolean = false): any {
+export function TestInlineFreeformAdditionalPropertiesRequestToJSONTyped(value?: TestInlineFreeformAdditionalPropertiesRequest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/User.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/User.ts
index 97523c16bb4d..854f2dae12f5 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts
index b1f80cca9cd2..5e56849000d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts
@@ -55,11 +55,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts
index baea7c98fece..756cdf624098 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts
index 5f0ffc2452de..46977acb9c08 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts
index 90ba76c7c496..981d00a85076 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts
@@ -112,11 +112,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts
index 9b7b41d11e87..f2c835eb0462 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/User.ts b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts
index 54d3a2b2d69b..4d57bd098a66 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/models/EnumPatternObject.ts b/samples/client/petstore/typescript-fetch/builds/enum/models/EnumPatternObject.ts
index 1c4279574261..70b017dc859d 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/models/EnumPatternObject.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/models/EnumPatternObject.ts
@@ -86,11 +86,11 @@ export function EnumPatternObjectFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-  export function EnumPatternObjectToJSON(json: any): EnumPatternObject {
-      return EnumPatternObjectToJSONTyped(json, false);
-  }
+export function EnumPatternObjectToJSON(json: any): EnumPatternObject {
+    return EnumPatternObjectToJSONTyped(json, false);
+}
 
-  export function EnumPatternObjectToJSONTyped(value?: EnumPatternObject | null, ignoreDiscriminator: boolean = false): any {
+export function EnumPatternObjectToJSONTyped(value?: EnumPatternObject | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestGetInline200Response.ts b/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestGetInline200Response.ts
index f45e1771ea3e..23aca822ea66 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestGetInline200Response.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestGetInline200Response.ts
@@ -111,11 +111,11 @@ export function FakeEnumRequestGetInline200ResponseFromJSONTyped(json: any, igno
     };
 }
 
-  export function FakeEnumRequestGetInline200ResponseToJSON(json: any): FakeEnumRequestGetInline200Response {
-      return FakeEnumRequestGetInline200ResponseToJSONTyped(json, false);
-  }
+export function FakeEnumRequestGetInline200ResponseToJSON(json: any): FakeEnumRequestGetInline200Response {
+    return FakeEnumRequestGetInline200ResponseToJSONTyped(json, false);
+}
 
-  export function FakeEnumRequestGetInline200ResponseToJSONTyped(value?: FakeEnumRequestGetInline200Response | null, ignoreDiscriminator: boolean = false): any {
+export function FakeEnumRequestGetInline200ResponseToJSONTyped(value?: FakeEnumRequestGetInline200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts
index b1f80cca9cd2..5e56849000d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts
@@ -55,11 +55,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts
index baea7c98fece..756cdf624098 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts
index 5f0ffc2452de..46977acb9c08 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts
index 90ba76c7c496..981d00a85076 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts
@@ -112,11 +112,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts
index 9b7b41d11e87..f2c835eb0462 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts
index 54d3a2b2d69b..4d57bd098a66 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts
index b1f80cca9cd2..5e56849000d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts
@@ -55,11 +55,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts
index baea7c98fece..756cdf624098 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts
index 5f0ffc2452de..46977acb9c08 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts
index 90ba76c7c496..981d00a85076 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts
@@ -112,11 +112,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts
index 9b7b41d11e87..f2c835eb0462 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts
index 54d3a2b2d69b..4d57bd098a66 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestA.ts b/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestA.ts
index 8fffa09116a6..198768099c18 100644
--- a/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestA.ts
+++ b/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestA.ts
@@ -49,11 +49,11 @@ export function TestAFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tes
     };
 }
 
-  export function TestAToJSON(json: any): TestA {
-      return TestAToJSONTyped(json, false);
-  }
+export function TestAToJSON(json: any): TestA {
+    return TestAToJSONTyped(json, false);
+}
 
-  export function TestAToJSONTyped(value?: TestA | null, ignoreDiscriminator: boolean = false): any {
+export function TestAToJSONTyped(value?: TestA | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestB.ts b/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestB.ts
index d8477b8db52e..f33eae68ab37 100644
--- a/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestB.ts
+++ b/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestB.ts
@@ -49,11 +49,11 @@ export function TestBFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tes
     };
 }
 
-  export function TestBToJSON(json: any): TestB {
-      return TestBToJSONTyped(json, false);
-  }
+export function TestBToJSON(json: any): TestB {
+    return TestBToJSONTyped(json, false);
+}
 
-  export function TestBToJSONTyped(value?: TestB | null, ignoreDiscriminator: boolean = false): any {
+export function TestBToJSONTyped(value?: TestB | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestResponse.ts b/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestResponse.ts
index d37db87e324a..e228a3e9f73d 100644
--- a/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/oneOf/models/TestResponse.ts
@@ -52,7 +52,11 @@ export function TestResponseFromJSONTyped(json: any, ignoreDiscriminator: boolea
     return {} as any;
 }
 
-export function TestResponseToJSON(value?: TestResponse | null): any {
+export function TestResponseToJSON(json: any): any {
+    return TestResponseToJSONTyped(json, false);
+}
+
+export function TestResponseToJSONTyped(value?: TestResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts
index b1f80cca9cd2..5e56849000d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts
@@ -55,11 +55,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts
index baea7c98fece..756cdf624098 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts
index 5f0ffc2452de..46977acb9c08 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts
index 90ba76c7c496..981d00a85076 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts
@@ -112,11 +112,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts
index 9b7b41d11e87..f2c835eb0462 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts
index 54d3a2b2d69b..4d57bd098a66 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Category.ts
index b1f80cca9cd2..5e56849000d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Category.ts
@@ -55,11 +55,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponse.ts
index 35356dee4a9b..8cd876962635 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponse.ts
@@ -57,11 +57,11 @@ export function DefaultMetaOnlyResponseFromJSONTyped(json: any, ignoreDiscrimina
     };
 }
 
-  export function DefaultMetaOnlyResponseToJSON(json: any): DefaultMetaOnlyResponse {
-      return DefaultMetaOnlyResponseToJSONTyped(json, false);
-  }
+export function DefaultMetaOnlyResponseToJSON(json: any): DefaultMetaOnlyResponse {
+    return DefaultMetaOnlyResponseToJSONTyped(json, false);
+}
 
-  export function DefaultMetaOnlyResponseToJSONTyped(value?: DefaultMetaOnlyResponse | null, ignoreDiscriminator: boolean = false): any {
+export function DefaultMetaOnlyResponseToJSONTyped(value?: DefaultMetaOnlyResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponse.ts
index 6fd8b71f6f9d..1fcc22f40073 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponse.ts
@@ -71,11 +71,11 @@ export function FindPetsByStatusResponseFromJSONTyped(json: any, ignoreDiscrimin
     };
 }
 
-  export function FindPetsByStatusResponseToJSON(json: any): FindPetsByStatusResponse {
-      return FindPetsByStatusResponseToJSONTyped(json, false);
-  }
+export function FindPetsByStatusResponseToJSON(json: any): FindPetsByStatusResponse {
+    return FindPetsByStatusResponseToJSONTyped(json, false);
+}
 
-  export function FindPetsByStatusResponseToJSONTyped(value?: FindPetsByStatusResponse | null, ignoreDiscriminator: boolean = false): any {
+export function FindPetsByStatusResponseToJSONTyped(value?: FindPetsByStatusResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponse.ts
index 66256507d9b3..5519b6ab9e45 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponse.ts
@@ -71,11 +71,11 @@ export function FindPetsByUserResponseFromJSONTyped(json: any, ignoreDiscriminat
     };
 }
 
-  export function FindPetsByUserResponseToJSON(json: any): FindPetsByUserResponse {
-      return FindPetsByUserResponseToJSONTyped(json, false);
-  }
+export function FindPetsByUserResponseToJSON(json: any): FindPetsByUserResponse {
+    return FindPetsByUserResponseToJSONTyped(json, false);
+}
 
-  export function FindPetsByUserResponseToJSONTyped(value?: FindPetsByUserResponse | null, ignoreDiscriminator: boolean = false): any {
+export function FindPetsByUserResponseToJSONTyped(value?: FindPetsByUserResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponse.ts
index 3f4000b9413c..c8c229330602 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponse.ts
@@ -64,11 +64,11 @@ export function GetBehaviorPermissionsResponseFromJSONTyped(json: any, ignoreDis
     };
 }
 
-  export function GetBehaviorPermissionsResponseToJSON(json: any): GetBehaviorPermissionsResponse {
-      return GetBehaviorPermissionsResponseToJSONTyped(json, false);
-  }
+export function GetBehaviorPermissionsResponseToJSON(json: any): GetBehaviorPermissionsResponse {
+    return GetBehaviorPermissionsResponseToJSONTyped(json, false);
+}
 
-  export function GetBehaviorPermissionsResponseToJSONTyped(value?: GetBehaviorPermissionsResponse | null, ignoreDiscriminator: boolean = false): any {
+export function GetBehaviorPermissionsResponseToJSONTyped(value?: GetBehaviorPermissionsResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponse.ts
index a282384d2207..5c90defb5d56 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponse.ts
@@ -73,11 +73,11 @@ export function GetBehaviorTypeResponseFromJSONTyped(json: any, ignoreDiscrimina
     };
 }
 
-  export function GetBehaviorTypeResponseToJSON(json: any): GetBehaviorTypeResponse {
-      return GetBehaviorTypeResponseToJSONTyped(json, false);
-  }
+export function GetBehaviorTypeResponseToJSON(json: any): GetBehaviorTypeResponse {
+    return GetBehaviorTypeResponseToJSONTyped(json, false);
+}
 
-  export function GetBehaviorTypeResponseToJSONTyped(value?: GetBehaviorTypeResponse | null, ignoreDiscriminator: boolean = false): any {
+export function GetBehaviorTypeResponseToJSONTyped(value?: GetBehaviorTypeResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetMatchingPartsResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetMatchingPartsResponse.ts
index 255ca5f80112..356c421fe83c 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetMatchingPartsResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetMatchingPartsResponse.ts
@@ -71,11 +71,11 @@ export function GetMatchingPartsResponseFromJSONTyped(json: any, ignoreDiscrimin
     };
 }
 
-  export function GetMatchingPartsResponseToJSON(json: any): GetMatchingPartsResponse {
-      return GetMatchingPartsResponseToJSONTyped(json, false);
-  }
+export function GetMatchingPartsResponseToJSON(json: any): GetMatchingPartsResponse {
+    return GetMatchingPartsResponseToJSONTyped(json, false);
+}
 
-  export function GetMatchingPartsResponseToJSONTyped(value?: GetMatchingPartsResponse | null, ignoreDiscriminator: boolean = false): any {
+export function GetMatchingPartsResponseToJSONTyped(value?: GetMatchingPartsResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetPetPartTypeResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetPetPartTypeResponse.ts
index e9b0c8a6c937..09b562b02433 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetPetPartTypeResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetPetPartTypeResponse.ts
@@ -73,11 +73,11 @@ export function GetPetPartTypeResponseFromJSONTyped(json: any, ignoreDiscriminat
     };
 }
 
-  export function GetPetPartTypeResponseToJSON(json: any): GetPetPartTypeResponse {
-      return GetPetPartTypeResponseToJSONTyped(json, false);
-  }
+export function GetPetPartTypeResponseToJSON(json: any): GetPetPartTypeResponse {
+    return GetPetPartTypeResponseToJSONTyped(json, false);
+}
 
-  export function GetPetPartTypeResponseToJSONTyped(value?: GetPetPartTypeResponse | null, ignoreDiscriminator: boolean = false): any {
+export function GetPetPartTypeResponseToJSONTyped(value?: GetPetPartTypeResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ItemId.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ItemId.ts
index 93b39cd0e786..e59902c72aa2 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ItemId.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ItemId.ts
@@ -57,11 +57,11 @@ export function ItemIdFromJSONTyped(json: any, ignoreDiscriminator: boolean): It
     };
 }
 
-  export function ItemIdToJSON(json: any): ItemId {
-      return ItemIdToJSONTyped(json, false);
-  }
+export function ItemIdToJSON(json: any): ItemId {
+    return ItemIdToJSONTyped(json, false);
+}
 
-  export function ItemIdToJSONTyped(value?: ItemId | null, ignoreDiscriminator: boolean = false): any {
+export function ItemIdToJSONTyped(value?: ItemId | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/MatchingParts.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/MatchingParts.ts
index 955aefde7190..abbf1567a3c2 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/MatchingParts.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/MatchingParts.ts
@@ -65,11 +65,11 @@ export function MatchingPartsFromJSONTyped(json: any, ignoreDiscriminator: boole
     };
 }
 
-  export function MatchingPartsToJSON(json: any): MatchingParts {
-      return MatchingPartsToJSONTyped(json, false);
-  }
+export function MatchingPartsToJSON(json: any): MatchingParts {
+    return MatchingPartsToJSONTyped(json, false);
+}
 
-  export function MatchingPartsToJSONTyped(value?: MatchingParts | null, ignoreDiscriminator: boolean = false): any {
+export function MatchingPartsToJSONTyped(value?: MatchingParts | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelApiResponse.ts
index baea7c98fece..756cdf624098 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelError.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelError.ts
index 5033802329ef..1d06be7f975e 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelError.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelError.ts
@@ -78,11 +78,11 @@ export function ModelErrorFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function ModelErrorToJSON(json: any): ModelError {
-      return ModelErrorToJSONTyped(json, false);
-  }
+export function ModelErrorToJSON(json: any): ModelError {
+    return ModelErrorToJSONTyped(json, false);
+}
 
-  export function ModelErrorToJSONTyped(value?: ModelError | null, ignoreDiscriminator: boolean = false): any {
+export function ModelErrorToJSONTyped(value?: ModelError | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Order.ts
index 5f0ffc2452de..46977acb9c08 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Part.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Part.ts
index a9723f00da65..18c27a946b9b 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Part.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Part.ts
@@ -57,11 +57,11 @@ export function PartFromJSONTyped(json: any, ignoreDiscriminator: boolean): Part
     };
 }
 
-  export function PartToJSON(json: any): Part {
-      return PartToJSONTyped(json, false);
-  }
+export function PartToJSON(json: any): Part {
+    return PartToJSONTyped(json, false);
+}
 
-  export function PartToJSONTyped(value?: Part | null, ignoreDiscriminator: boolean = false): any {
+export function PartToJSONTyped(value?: Part | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Pet.ts
index c02125e029ac..bdc19f7dd1df 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Pet.ts
@@ -243,11 +243,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRegionsResponse.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRegionsResponse.ts
index d48d53c5b557..f221a6178768 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRegionsResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRegionsResponse.ts
@@ -64,11 +64,11 @@ export function PetRegionsResponseFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-  export function PetRegionsResponseToJSON(json: any): PetRegionsResponse {
-      return PetRegionsResponseToJSONTyped(json, false);
-  }
+export function PetRegionsResponseToJSON(json: any): PetRegionsResponse {
+    return PetRegionsResponseToJSONTyped(json, false);
+}
 
-  export function PetRegionsResponseToJSONTyped(value?: PetRegionsResponse | null, ignoreDiscriminator: boolean = false): any {
+export function PetRegionsResponseToJSONTyped(value?: PetRegionsResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ResponseMeta.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ResponseMeta.ts
index a00d3cf10be8..97b93cb70d1e 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ResponseMeta.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ResponseMeta.ts
@@ -124,11 +124,11 @@ export function ResponseMetaFromJSONTyped(json: any, ignoreDiscriminator: boolea
     };
 }
 
-  export function ResponseMetaToJSON(json: any): ResponseMeta {
-      return ResponseMetaToJSONTyped(json, false);
-  }
+export function ResponseMetaToJSON(json: any): ResponseMeta {
+    return ResponseMetaToJSONTyped(json, false);
+}
 
-  export function ResponseMetaToJSONTyped(value?: ResponseMeta | null, ignoreDiscriminator: boolean = false): any {
+export function ResponseMetaToJSONTyped(value?: ResponseMeta | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Tag.ts
index 9b7b41d11e87..f2c835eb0462 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/User.ts
index 32c20200e0cb..262d40196d4a 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/User.ts
@@ -113,11 +113,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/AdditionalPropertiesClass.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/AdditionalPropertiesClass.ts
index c15b937e8a1c..d470576ef7d3 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/AdditionalPropertiesClass.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/AdditionalPropertiesClass.ts
@@ -55,11 +55,11 @@ export function AdditionalPropertiesClassFromJSONTyped(json: any, ignoreDiscrimi
     };
 }
 
-  export function AdditionalPropertiesClassToJSON(json: any): AdditionalPropertiesClass {
-      return AdditionalPropertiesClassToJSONTyped(json, false);
-  }
+export function AdditionalPropertiesClassToJSON(json: any): AdditionalPropertiesClass {
+    return AdditionalPropertiesClassToJSONTyped(json, false);
+}
 
-  export function AdditionalPropertiesClassToJSONTyped(value?: AdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
+export function AdditionalPropertiesClassToJSONTyped(value?: AdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/AllOfWithSingleRef.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/AllOfWithSingleRef.ts
index 826ea603e2db..cbd15b990c6c 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/AllOfWithSingleRef.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/AllOfWithSingleRef.ts
@@ -65,11 +65,11 @@ export function AllOfWithSingleRefFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-  export function AllOfWithSingleRefToJSON(json: any): AllOfWithSingleRef {
-      return AllOfWithSingleRefToJSONTyped(json, false);
-  }
+export function AllOfWithSingleRefToJSON(json: any): AllOfWithSingleRef {
+    return AllOfWithSingleRefToJSONTyped(json, false);
+}
 
-  export function AllOfWithSingleRefToJSONTyped(value?: AllOfWithSingleRef | null, ignoreDiscriminator: boolean = false): any {
+export function AllOfWithSingleRefToJSONTyped(value?: AllOfWithSingleRef | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Animal.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Animal.ts
index 33ad57bbe791..fb532ffbeff1 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Animal.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Animal.ts
@@ -66,11 +66,11 @@ export function AnimalFromJSONTyped(json: any, ignoreDiscriminator: boolean): An
     };
 }
 
-  export function AnimalToJSON(json: any): Animal {
-      return AnimalToJSONTyped(json, false);
-  }
+export function AnimalToJSON(json: any): Animal {
+    return AnimalToJSONTyped(json, false);
+}
 
-  export function AnimalToJSONTyped(value?: Animal | null, ignoreDiscriminator: boolean = false): any {
+export function AnimalToJSONTyped(value?: Animal | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayOfArrayOfNumberOnly.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayOfArrayOfNumberOnly.ts
index 18264d15d7cb..3792b9134b4a 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayOfArrayOfNumberOnly.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayOfArrayOfNumberOnly.ts
@@ -48,11 +48,11 @@ export function ArrayOfArrayOfNumberOnlyFromJSONTyped(json: any, ignoreDiscrimin
     };
 }
 
-  export function ArrayOfArrayOfNumberOnlyToJSON(json: any): ArrayOfArrayOfNumberOnly {
-      return ArrayOfArrayOfNumberOnlyToJSONTyped(json, false);
-  }
+export function ArrayOfArrayOfNumberOnlyToJSON(json: any): ArrayOfArrayOfNumberOnly {
+    return ArrayOfArrayOfNumberOnlyToJSONTyped(json, false);
+}
 
-  export function ArrayOfArrayOfNumberOnlyToJSONTyped(value?: ArrayOfArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
+export function ArrayOfArrayOfNumberOnlyToJSONTyped(value?: ArrayOfArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayOfNumberOnly.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayOfNumberOnly.ts
index fa5c6dc5edd1..40fbb3c6326d 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayOfNumberOnly.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayOfNumberOnly.ts
@@ -48,11 +48,11 @@ export function ArrayOfNumberOnlyFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-  export function ArrayOfNumberOnlyToJSON(json: any): ArrayOfNumberOnly {
-      return ArrayOfNumberOnlyToJSONTyped(json, false);
-  }
+export function ArrayOfNumberOnlyToJSON(json: any): ArrayOfNumberOnly {
+    return ArrayOfNumberOnlyToJSONTyped(json, false);
+}
 
-  export function ArrayOfNumberOnlyToJSONTyped(value?: ArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
+export function ArrayOfNumberOnlyToJSONTyped(value?: ArrayOfNumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayTest.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayTest.ts
index b31c80207b2f..9f3c53288826 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ArrayTest.ts
@@ -70,11 +70,11 @@ export function ArrayTestFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function ArrayTestToJSON(json: any): ArrayTest {
-      return ArrayTestToJSONTyped(json, false);
-  }
+export function ArrayTestToJSON(json: any): ArrayTest {
+    return ArrayTestToJSONTyped(json, false);
+}
 
-  export function ArrayTestToJSONTyped(value?: ArrayTest | null, ignoreDiscriminator: boolean = false): any {
+export function ArrayTestToJSONTyped(value?: ArrayTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Capitalization.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Capitalization.ts
index ace2ede88477..9c6a2be5afb6 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Capitalization.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Capitalization.ts
@@ -84,11 +84,11 @@ export function CapitalizationFromJSONTyped(json: any, ignoreDiscriminator: bool
     };
 }
 
-  export function CapitalizationToJSON(json: any): Capitalization {
-      return CapitalizationToJSONTyped(json, false);
-  }
+export function CapitalizationToJSON(json: any): Capitalization {
+    return CapitalizationToJSONTyped(json, false);
+}
 
-  export function CapitalizationToJSONTyped(value?: Capitalization | null, ignoreDiscriminator: boolean = false): any {
+export function CapitalizationToJSONTyped(value?: Capitalization | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Cat.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Cat.ts
index a1b44d02d26d..ba0e19539237 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Cat.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Cat.ts
@@ -56,11 +56,11 @@ export function CatFromJSONTyped(json: any, ignoreDiscriminator: boolean): Cat {
     };
 }
 
-  export function CatToJSON(json: any): Cat {
-      return CatToJSONTyped(json, false);
-  }
+export function CatToJSON(json: any): Cat {
+    return CatToJSONTyped(json, false);
+}
 
-  export function CatToJSONTyped(value?: Cat | null, ignoreDiscriminator: boolean = false): any {
+export function CatToJSONTyped(value?: Cat | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Category.ts
index 7c8caddd4969..e4047d919b2b 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Category.ts
@@ -56,11 +56,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ClassModel.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ClassModel.ts
index 813177eb3d50..cba5bbc353cf 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ClassModel.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ClassModel.ts
@@ -48,11 +48,11 @@ export function ClassModelFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function ClassModelToJSON(json: any): ClassModel {
-      return ClassModelToJSONTyped(json, false);
-  }
+export function ClassModelToJSON(json: any): ClassModel {
+    return ClassModelToJSONTyped(json, false);
+}
 
-  export function ClassModelToJSONTyped(value?: ClassModel | null, ignoreDiscriminator: boolean = false): any {
+export function ClassModelToJSONTyped(value?: ClassModel | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Client.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Client.ts
index c6aa7163b0b3..b9509a4421f9 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Client.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Client.ts
@@ -48,11 +48,11 @@ export function ClientFromJSONTyped(json: any, ignoreDiscriminator: boolean): Cl
     };
 }
 
-  export function ClientToJSON(json: any): Client {
-      return ClientToJSONTyped(json, false);
-  }
+export function ClientToJSON(json: any): Client {
+    return ClientToJSONTyped(json, false);
+}
 
-  export function ClientToJSONTyped(value?: Client | null, ignoreDiscriminator: boolean = false): any {
+export function ClientToJSONTyped(value?: Client | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/DeprecatedObject.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/DeprecatedObject.ts
index d2acf418fded..2b22f28ddfe7 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/DeprecatedObject.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/DeprecatedObject.ts
@@ -48,11 +48,11 @@ export function DeprecatedObjectFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function DeprecatedObjectToJSON(json: any): DeprecatedObject {
-      return DeprecatedObjectToJSONTyped(json, false);
-  }
+export function DeprecatedObjectToJSON(json: any): DeprecatedObject {
+    return DeprecatedObjectToJSONTyped(json, false);
+}
 
-  export function DeprecatedObjectToJSONTyped(value?: DeprecatedObject | null, ignoreDiscriminator: boolean = false): any {
+export function DeprecatedObjectToJSONTyped(value?: DeprecatedObject | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Dog.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Dog.ts
index 1d66d5c04bf8..6662a88d3bee 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Dog.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Dog.ts
@@ -56,11 +56,11 @@ export function DogFromJSONTyped(json: any, ignoreDiscriminator: boolean): Dog {
     };
 }
 
-  export function DogToJSON(json: any): Dog {
-      return DogToJSONTyped(json, false);
-  }
+export function DogToJSON(json: any): Dog {
+    return DogToJSONTyped(json, false);
+}
 
-  export function DogToJSONTyped(value?: Dog | null, ignoreDiscriminator: boolean = false): any {
+export function DogToJSONTyped(value?: Dog | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/EnumArrays.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/EnumArrays.ts
index 27f42e0a652b..b30860b8e8bb 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/EnumArrays.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/EnumArrays.ts
@@ -75,11 +75,11 @@ export function EnumArraysFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function EnumArraysToJSON(json: any): EnumArrays {
-      return EnumArraysToJSONTyped(json, false);
-  }
+export function EnumArraysToJSON(json: any): EnumArrays {
+    return EnumArraysToJSONTyped(json, false);
+}
 
-  export function EnumArraysToJSONTyped(value?: EnumArrays | null, ignoreDiscriminator: boolean = false): any {
+export function EnumArraysToJSONTyped(value?: EnumArrays | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/EnumTest.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/EnumTest.ts
index de99ab4dc662..0097912a9561 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/EnumTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/EnumTest.ts
@@ -167,11 +167,11 @@ export function EnumTestFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function EnumTestToJSON(json: any): EnumTest {
-      return EnumTestToJSONTyped(json, false);
-  }
+export function EnumTestToJSON(json: any): EnumTest {
+    return EnumTestToJSONTyped(json, false);
+}
 
-  export function EnumTestToJSONTyped(value?: EnumTest | null, ignoreDiscriminator: boolean = false): any {
+export function EnumTestToJSONTyped(value?: EnumTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FakeBigDecimalMap200Response.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FakeBigDecimalMap200Response.ts
index 5c97b9928efa..54458419a514 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FakeBigDecimalMap200Response.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FakeBigDecimalMap200Response.ts
@@ -55,11 +55,11 @@ export function FakeBigDecimalMap200ResponseFromJSONTyped(json: any, ignoreDiscr
     };
 }
 
-  export function FakeBigDecimalMap200ResponseToJSON(json: any): FakeBigDecimalMap200Response {
-      return FakeBigDecimalMap200ResponseToJSONTyped(json, false);
-  }
+export function FakeBigDecimalMap200ResponseToJSON(json: any): FakeBigDecimalMap200Response {
+    return FakeBigDecimalMap200ResponseToJSONTyped(json, false);
+}
 
-  export function FakeBigDecimalMap200ResponseToJSONTyped(value?: FakeBigDecimalMap200Response | null, ignoreDiscriminator: boolean = false): any {
+export function FakeBigDecimalMap200ResponseToJSONTyped(value?: FakeBigDecimalMap200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FileSchemaTestClass.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FileSchemaTestClass.ts
index 557abed7403e..87a77f497fbc 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FileSchemaTestClass.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FileSchemaTestClass.ts
@@ -55,11 +55,11 @@ export function FileSchemaTestClassFromJSONTyped(json: any, ignoreDiscriminator:
     };
 }
 
-  export function FileSchemaTestClassToJSON(json: any): FileSchemaTestClass {
-      return FileSchemaTestClassToJSONTyped(json, false);
-  }
+export function FileSchemaTestClassToJSON(json: any): FileSchemaTestClass {
+    return FileSchemaTestClassToJSONTyped(json, false);
+}
 
-  export function FileSchemaTestClassToJSONTyped(value?: FileSchemaTestClass | null, ignoreDiscriminator: boolean = false): any {
+export function FileSchemaTestClassToJSONTyped(value?: FileSchemaTestClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Foo.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Foo.ts
index 118b6190f280..ca208c88e2f8 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Foo.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Foo.ts
@@ -48,11 +48,11 @@ export function FooFromJSONTyped(json: any, ignoreDiscriminator: boolean): Foo {
     };
 }
 
-  export function FooToJSON(json: any): Foo {
-      return FooToJSONTyped(json, false);
-  }
+export function FooToJSON(json: any): Foo {
+    return FooToJSONTyped(json, false);
+}
 
-  export function FooToJSONTyped(value?: Foo | null, ignoreDiscriminator: boolean = false): any {
+export function FooToJSONTyped(value?: Foo | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FooGetDefaultResponse.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FooGetDefaultResponse.ts
index 721b08a2242d..1199e6b3793a 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FooGetDefaultResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FooGetDefaultResponse.ts
@@ -56,11 +56,11 @@ export function FooGetDefaultResponseFromJSONTyped(json: any, ignoreDiscriminato
     };
 }
 
-  export function FooGetDefaultResponseToJSON(json: any): FooGetDefaultResponse {
-      return FooGetDefaultResponseToJSONTyped(json, false);
-  }
+export function FooGetDefaultResponseToJSON(json: any): FooGetDefaultResponse {
+    return FooGetDefaultResponseToJSONTyped(json, false);
+}
 
-  export function FooGetDefaultResponseToJSONTyped(value?: FooGetDefaultResponse | null, ignoreDiscriminator: boolean = false): any {
+export function FooGetDefaultResponseToJSONTyped(value?: FooGetDefaultResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FormatTest.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FormatTest.ts
index df41354802ae..33aed92595aa 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FormatTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/FormatTest.ts
@@ -157,11 +157,11 @@ export function FormatTestFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function FormatTestToJSON(json: any): FormatTest {
-      return FormatTestToJSONTyped(json, false);
-  }
+export function FormatTestToJSON(json: any): FormatTest {
+    return FormatTestToJSONTyped(json, false);
+}
 
-  export function FormatTestToJSONTyped(value?: FormatTest | null, ignoreDiscriminator: boolean = false): any {
+export function FormatTestToJSONTyped(value?: FormatTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/HasOnlyReadOnly.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/HasOnlyReadOnly.ts
index 0eb9accdc1f5..59019adf1993 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/HasOnlyReadOnly.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/HasOnlyReadOnly.ts
@@ -55,11 +55,11 @@ export function HasOnlyReadOnlyFromJSONTyped(json: any, ignoreDiscriminator: boo
     };
 }
 
-  export function HasOnlyReadOnlyToJSON(json: any): HasOnlyReadOnly {
-      return HasOnlyReadOnlyToJSONTyped(json, false);
-  }
+export function HasOnlyReadOnlyToJSON(json: any): HasOnlyReadOnly {
+    return HasOnlyReadOnlyToJSONTyped(json, false);
+}
 
-  export function HasOnlyReadOnlyToJSONTyped(value?: Omit<HasOnlyReadOnly, 'bar'|'foo'> | null, ignoreDiscriminator: boolean = false): any {
+export function HasOnlyReadOnlyToJSONTyped(value?: Omit<HasOnlyReadOnly, 'bar'|'foo'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/HealthCheckResult.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/HealthCheckResult.ts
index c62de4d9fb83..e8683a11f338 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/HealthCheckResult.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/HealthCheckResult.ts
@@ -48,11 +48,11 @@ export function HealthCheckResultFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-  export function HealthCheckResultToJSON(json: any): HealthCheckResult {
-      return HealthCheckResultToJSONTyped(json, false);
-  }
+export function HealthCheckResultToJSON(json: any): HealthCheckResult {
+    return HealthCheckResultToJSONTyped(json, false);
+}
 
-  export function HealthCheckResultToJSONTyped(value?: HealthCheckResult | null, ignoreDiscriminator: boolean = false): any {
+export function HealthCheckResultToJSONTyped(value?: HealthCheckResult | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/List.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/List.ts
index fb9a30ea0e5b..21dd83e2c200 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/List.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/List.ts
@@ -48,11 +48,11 @@ export function ListFromJSONTyped(json: any, ignoreDiscriminator: boolean): List
     };
 }
 
-  export function ListToJSON(json: any): List {
-      return ListToJSONTyped(json, false);
-  }
+export function ListToJSON(json: any): List {
+    return ListToJSONTyped(json, false);
+}
 
-  export function ListToJSONTyped(value?: List | null, ignoreDiscriminator: boolean = false): any {
+export function ListToJSONTyped(value?: List | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/MapTest.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/MapTest.ts
index a88b84fd1027..753c30a6cf93 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/MapTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/MapTest.ts
@@ -80,11 +80,11 @@ export function MapTestFromJSONTyped(json: any, ignoreDiscriminator: boolean): M
     };
 }
 
-  export function MapTestToJSON(json: any): MapTest {
-      return MapTestToJSONTyped(json, false);
-  }
+export function MapTestToJSON(json: any): MapTest {
+    return MapTestToJSONTyped(json, false);
+}
 
-  export function MapTestToJSONTyped(value?: MapTest | null, ignoreDiscriminator: boolean = false): any {
+export function MapTestToJSONTyped(value?: MapTest | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/MixedPropertiesAndAdditionalPropertiesClass.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/MixedPropertiesAndAdditionalPropertiesClass.ts
index 1f69153ef85c..5466bc5177e2 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/MixedPropertiesAndAdditionalPropertiesClass.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/MixedPropertiesAndAdditionalPropertiesClass.ts
@@ -70,11 +70,11 @@ export function MixedPropertiesAndAdditionalPropertiesClassFromJSONTyped(json: a
     };
 }
 
-  export function MixedPropertiesAndAdditionalPropertiesClassToJSON(json: any): MixedPropertiesAndAdditionalPropertiesClass {
-      return MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(json, false);
-  }
+export function MixedPropertiesAndAdditionalPropertiesClassToJSON(json: any): MixedPropertiesAndAdditionalPropertiesClass {
+    return MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(json, false);
+}
 
-  export function MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(value?: MixedPropertiesAndAdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
+export function MixedPropertiesAndAdditionalPropertiesClassToJSONTyped(value?: MixedPropertiesAndAdditionalPropertiesClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Model200Response.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Model200Response.ts
index af0066b276eb..b0a30640133e 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Model200Response.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Model200Response.ts
@@ -55,11 +55,11 @@ export function Model200ResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function Model200ResponseToJSON(json: any): Model200Response {
-      return Model200ResponseToJSONTyped(json, false);
-  }
+export function Model200ResponseToJSON(json: any): Model200Response {
+    return Model200ResponseToJSONTyped(json, false);
+}
 
-  export function Model200ResponseToJSONTyped(value?: Model200Response | null, ignoreDiscriminator: boolean = false): any {
+export function Model200ResponseToJSONTyped(value?: Model200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ModelApiResponse.ts
index a505854c2d71..355b5f76e428 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ModelFile.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ModelFile.ts
index ef6eee2c53c7..4b63fcfe25f2 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ModelFile.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ModelFile.ts
@@ -48,11 +48,11 @@ export function ModelFileFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function ModelFileToJSON(json: any): ModelFile {
-      return ModelFileToJSONTyped(json, false);
-  }
+export function ModelFileToJSON(json: any): ModelFile {
+    return ModelFileToJSONTyped(json, false);
+}
 
-  export function ModelFileToJSONTyped(value?: ModelFile | null, ignoreDiscriminator: boolean = false): any {
+export function ModelFileToJSONTyped(value?: ModelFile | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Name.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Name.ts
index 1c957bff4d65..b999bdccb1d0 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Name.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Name.ts
@@ -70,11 +70,11 @@ export function NameFromJSONTyped(json: any, ignoreDiscriminator: boolean): Name
     };
 }
 
-  export function NameToJSON(json: any): Name {
-      return NameToJSONTyped(json, false);
-  }
+export function NameToJSON(json: any): Name {
+    return NameToJSONTyped(json, false);
+}
 
-  export function NameToJSONTyped(value?: Omit<Name, 'snake_case'|'123Number'> | null, ignoreDiscriminator: boolean = false): any {
+export function NameToJSONTyped(value?: Omit<Name, 'snake_case'|'123Number'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NullableClass.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NullableClass.ts
index 4f32da1c0ced..3c2a165a7bd9 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NullableClass.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NullableClass.ts
@@ -127,11 +127,11 @@ export function NullableClassFromJSONTyped(json: any, ignoreDiscriminator: boole
     };
 }
 
-  export function NullableClassToJSON(json: any): NullableClass {
-      return NullableClassToJSONTyped(json, false);
-  }
+export function NullableClassToJSON(json: any): NullableClass {
+    return NullableClassToJSONTyped(json, false);
+}
 
-  export function NullableClassToJSONTyped(value?: NullableClass | null, ignoreDiscriminator: boolean = false): any {
+export function NullableClassToJSONTyped(value?: NullableClass | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NumberOnly.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NumberOnly.ts
index d9e19a6d9d86..01ffc388797b 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NumberOnly.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NumberOnly.ts
@@ -48,11 +48,11 @@ export function NumberOnlyFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     };
 }
 
-  export function NumberOnlyToJSON(json: any): NumberOnly {
-      return NumberOnlyToJSONTyped(json, false);
-  }
+export function NumberOnlyToJSON(json: any): NumberOnly {
+    return NumberOnlyToJSONTyped(json, false);
+}
 
-  export function NumberOnlyToJSONTyped(value?: NumberOnly | null, ignoreDiscriminator: boolean = false): any {
+export function NumberOnlyToJSONTyped(value?: NumberOnly | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ObjectWithDeprecatedFields.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ObjectWithDeprecatedFields.ts
index 88b028733508..8dd72d9dfde3 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ObjectWithDeprecatedFields.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ObjectWithDeprecatedFields.ts
@@ -80,11 +80,11 @@ export function ObjectWithDeprecatedFieldsFromJSONTyped(json: any, ignoreDiscrim
     };
 }
 
-  export function ObjectWithDeprecatedFieldsToJSON(json: any): ObjectWithDeprecatedFields {
-      return ObjectWithDeprecatedFieldsToJSONTyped(json, false);
-  }
+export function ObjectWithDeprecatedFieldsToJSON(json: any): ObjectWithDeprecatedFields {
+    return ObjectWithDeprecatedFieldsToJSONTyped(json, false);
+}
 
-  export function ObjectWithDeprecatedFieldsToJSONTyped(value?: ObjectWithDeprecatedFields | null, ignoreDiscriminator: boolean = false): any {
+export function ObjectWithDeprecatedFieldsToJSONTyped(value?: ObjectWithDeprecatedFields | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Order.ts
index ef82efcce508..2e9a77af0484 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/OuterComposite.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/OuterComposite.ts
index ab4303f03c3a..ffb9d35f81ae 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/OuterComposite.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/OuterComposite.ts
@@ -62,11 +62,11 @@ export function OuterCompositeFromJSONTyped(json: any, ignoreDiscriminator: bool
     };
 }
 
-  export function OuterCompositeToJSON(json: any): OuterComposite {
-      return OuterCompositeToJSONTyped(json, false);
-  }
+export function OuterCompositeToJSON(json: any): OuterComposite {
+    return OuterCompositeToJSONTyped(json, false);
+}
 
-  export function OuterCompositeToJSONTyped(value?: OuterComposite | null, ignoreDiscriminator: boolean = false): any {
+export function OuterCompositeToJSONTyped(value?: OuterComposite | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/OuterObjectWithEnumProperty.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/OuterObjectWithEnumProperty.ts
index a533ca482d8b..cc02ae41cfec 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/OuterObjectWithEnumProperty.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/OuterObjectWithEnumProperty.ts
@@ -59,11 +59,11 @@ export function OuterObjectWithEnumPropertyFromJSONTyped(json: any, ignoreDiscri
     };
 }
 
-  export function OuterObjectWithEnumPropertyToJSON(json: any): OuterObjectWithEnumProperty {
-      return OuterObjectWithEnumPropertyToJSONTyped(json, false);
-  }
+export function OuterObjectWithEnumPropertyToJSON(json: any): OuterObjectWithEnumProperty {
+    return OuterObjectWithEnumPropertyToJSONTyped(json, false);
+}
 
-  export function OuterObjectWithEnumPropertyToJSONTyped(value?: OuterObjectWithEnumProperty | null, ignoreDiscriminator: boolean = false): any {
+export function OuterObjectWithEnumPropertyToJSONTyped(value?: OuterObjectWithEnumProperty | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Pet.ts
index 4dc3777b0123..d45f8d2b64bc 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Pet.ts
@@ -112,11 +112,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ReadOnlyFirst.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ReadOnlyFirst.ts
index 561b3037f5c0..38dbd2fbf41a 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ReadOnlyFirst.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/ReadOnlyFirst.ts
@@ -55,11 +55,11 @@ export function ReadOnlyFirstFromJSONTyped(json: any, ignoreDiscriminator: boole
     };
 }
 
-  export function ReadOnlyFirstToJSON(json: any): ReadOnlyFirst {
-      return ReadOnlyFirstToJSONTyped(json, false);
-  }
+export function ReadOnlyFirstToJSON(json: any): ReadOnlyFirst {
+    return ReadOnlyFirstToJSONTyped(json, false);
+}
 
-  export function ReadOnlyFirstToJSONTyped(value?: Omit<ReadOnlyFirst, 'bar'> | null, ignoreDiscriminator: boolean = false): any {
+export function ReadOnlyFirstToJSONTyped(value?: Omit<ReadOnlyFirst, 'bar'> | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Return.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Return.ts
index dc1fd7c1712c..557bb0d67195 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Return.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Return.ts
@@ -48,11 +48,11 @@ export function ReturnFromJSONTyped(json: any, ignoreDiscriminator: boolean): Re
     };
 }
 
-  export function ReturnToJSON(json: any): Return {
-      return ReturnToJSONTyped(json, false);
-  }
+export function ReturnToJSON(json: any): Return {
+    return ReturnToJSONTyped(json, false);
+}
 
-  export function ReturnToJSONTyped(value?: Return | null, ignoreDiscriminator: boolean = false): any {
+export function ReturnToJSONTyped(value?: Return | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/SpecialModelName.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/SpecialModelName.ts
index 3fec48ea4438..5ad3c16ca096 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/SpecialModelName.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/SpecialModelName.ts
@@ -48,11 +48,11 @@ export function SpecialModelNameFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function SpecialModelNameToJSON(json: any): SpecialModelName {
-      return SpecialModelNameToJSONTyped(json, false);
-  }
+export function SpecialModelNameToJSON(json: any): SpecialModelName {
+    return SpecialModelNameToJSONTyped(json, false);
+}
 
-  export function SpecialModelNameToJSONTyped(value?: SpecialModelName | null, ignoreDiscriminator: boolean = false): any {
+export function SpecialModelNameToJSONTyped(value?: SpecialModelName | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Tag.ts
index 11266e1fb90a..c8711cf09f01 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/User.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/User.ts
index 97523c16bb4d..854f2dae12f5 100644
--- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Category.ts
index 93ddb7d8f62c..32df5bbb27c5 100644
--- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Category.ts
@@ -55,11 +55,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/ModelApiResponse.ts
index 51e5f5a91a4d..7059aa7225ef 100644
--- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Order.ts
index fb3d41daab6a..072d3bf5ac9e 100644
--- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Order.ts
@@ -97,11 +97,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Pet.ts
index 2290adbd00d6..0af0ffab39d1 100644
--- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Pet.ts
@@ -113,11 +113,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Tag.ts
index eefbfb792ff8..a942cc99f5d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/User.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/User.ts
index f12cee29181e..39a70be42fae 100644
--- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts
index b1f80cca9cd2..5e56849000d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts
@@ -55,11 +55,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts
index baea7c98fece..756cdf624098 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts
index 5f0ffc2452de..46977acb9c08 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts
index 90ba76c7c496..981d00a85076 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts
@@ -112,11 +112,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts
index 9b7b41d11e87..f2c835eb0462 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts
index 54d3a2b2d69b..4d57bd098a66 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Category.ts
index b1f80cca9cd2..5e56849000d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Category.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Category.ts
@@ -55,11 +55,11 @@ export function CategoryFromJSONTyped(json: any, ignoreDiscriminator: boolean):
     };
 }
 
-  export function CategoryToJSON(json: any): Category {
-      return CategoryToJSONTyped(json, false);
-  }
+export function CategoryToJSON(json: any): Category {
+    return CategoryToJSONTyped(json, false);
+}
 
-  export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
+export function CategoryToJSONTyped(value?: Category | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/ModelApiResponse.ts
index baea7c98fece..756cdf624098 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/ModelApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/ModelApiResponse.ts
@@ -62,11 +62,11 @@ export function ModelApiResponseFromJSONTyped(json: any, ignoreDiscriminator: bo
     };
 }
 
-  export function ModelApiResponseToJSON(json: any): ModelApiResponse {
-      return ModelApiResponseToJSONTyped(json, false);
-  }
+export function ModelApiResponseToJSON(json: any): ModelApiResponse {
+    return ModelApiResponseToJSONTyped(json, false);
+}
 
-  export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
+export function ModelApiResponseToJSONTyped(value?: ModelApiResponse | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts
index 5f0ffc2452de..46977acb9c08 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts
@@ -95,11 +95,11 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     };
 }
 
-  export function OrderToJSON(json: any): Order {
-      return OrderToJSONTyped(json, false);
-  }
+export function OrderToJSON(json: any): Order {
+    return OrderToJSONTyped(json, false);
+}
 
-  export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
+export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts
index 90ba76c7c496..981d00a85076 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts
@@ -112,11 +112,11 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
     };
 }
 
-  export function PetToJSON(json: any): Pet {
-      return PetToJSONTyped(json, false);
-  }
+export function PetToJSON(json: any): Pet {
+    return PetToJSONTyped(json, false);
+}
 
-  export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
+export function PetToJSONTyped(value?: Pet | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Tag.ts
index 9b7b41d11e87..f2c835eb0462 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Tag.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Tag.ts
@@ -55,11 +55,11 @@ export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
     };
 }
 
-  export function TagToJSON(json: any): Tag {
-      return TagToJSONTyped(json, false);
-  }
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
 
-  export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
+export function TagToJSONTyped(value?: Tag | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/User.ts
index 54d3a2b2d69b..4d57bd098a66 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/User.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/User.ts
@@ -97,11 +97,11 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
     };
 }
 
-  export function UserToJSON(json: any): User {
-      return UserToJSONTyped(json, false);
-  }
+export function UserToJSON(json: any): User {
+    return UserToJSONTyped(json, false);
+}
 
-  export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
+export function UserToJSONTyped(value?: User | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/EnumPatternObject.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/EnumPatternObject.ts
index 1c4279574261..70b017dc859d 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/EnumPatternObject.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/EnumPatternObject.ts
@@ -86,11 +86,11 @@ export function EnumPatternObjectFromJSONTyped(json: any, ignoreDiscriminator: b
     };
 }
 
-  export function EnumPatternObjectToJSON(json: any): EnumPatternObject {
-      return EnumPatternObjectToJSONTyped(json, false);
-  }
+export function EnumPatternObjectToJSON(json: any): EnumPatternObject {
+    return EnumPatternObjectToJSONTyped(json, false);
+}
 
-  export function EnumPatternObjectToJSONTyped(value?: EnumPatternObject | null, ignoreDiscriminator: boolean = false): any {
+export function EnumPatternObjectToJSONTyped(value?: EnumPatternObject | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestGetInline200Response.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestGetInline200Response.ts
index 5822a99aa444..aef815c9e004 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestGetInline200Response.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestGetInline200Response.ts
@@ -107,11 +107,11 @@ export function FakeEnumRequestGetInline200ResponseFromJSONTyped(json: any, igno
     };
 }
 
-  export function FakeEnumRequestGetInline200ResponseToJSON(json: any): FakeEnumRequestGetInline200Response {
-      return FakeEnumRequestGetInline200ResponseToJSONTyped(json, false);
-  }
+export function FakeEnumRequestGetInline200ResponseToJSON(json: any): FakeEnumRequestGetInline200Response {
+    return FakeEnumRequestGetInline200ResponseToJSONTyped(json, false);
+}
 
-  export function FakeEnumRequestGetInline200ResponseToJSONTyped(value?: FakeEnumRequestGetInline200Response | null, ignoreDiscriminator: boolean = false): any {
+export function FakeEnumRequestGetInline200ResponseToJSONTyped(value?: FakeEnumRequestGetInline200Response | null, ignoreDiscriminator: boolean = false): any {
     if (value == null) {
         return value;
     }