[typescript-fetch][Fix] oneOf models are generated without `...ToJS…

…ONTyped` functions but models referencing still try to import (#20046) * Fix #19858 * re-generate the samples
OpenAPITools · Nov 7, 2024 · 2c38d0d · 2c38d0d
1 parent 28e02fc
commit 2c38d0d
Show file tree

Hide file tree

Showing 163 changed files with 654 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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/...s/client/others/typescript-fetch/self-import-issue/models/InternalAuthenticatedUserDto.ts b/...s/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/...les/client/others/typescript-fetch/self-import-issue/models/RemoteAuthenticatedUserDto.ts b/...les/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
@@ -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
@@ -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
@@ -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
@@ -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/.../client/petstore/typescript-fetch/builds/default-v3.0/models/AdditionalPropertiesClass.ts b/.../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
@@ -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
@@ -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/...s/client/petstore/typescript-fetch/builds/default-v3.0/models/ArrayOfArrayOfNumberOnly.ts b/...s/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
     }