Skip to content

fix(typescript-fetch): import FromJSON for discriminator mapped models #24702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kdelay wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(typescript-fetch): import FromJSON for discriminator mapped models #24702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
{{/hasImports}}
{{#discriminator}}
{{#discriminator.mappedModels}}
import { type {{modelName}}, {{modelName}}FromJSONTyped, {{modelName}}ToJSON, {{modelName}}ToJSONTyped } from './{{modelName}}{{importFileExtension}}';
import { type {{modelName}}, {{modelName}}FromJSON, {{modelName}}FromJSONTyped, {{modelName}}ToJSON, {{modelName}}ToJSONTyped } from './{{modelName}}{{importFileExtension}}';

@cubic-dev-ai cubic-dev-ai Bot Aug 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: For discriminator parents whose mapped children are never referenced as property types (such as Animal.ts, where Cat/Dog only appear as subtypes), the newly added FromJSON import is unused. Consumers that compile generated code with noUnusedLocals enabled will now get a TS6133 error on the import, where previously FromJSON was not imported at all. This widens the pre-existing ToJSON unused-import situation to FromJSON across such models. Consider importing FromJSON only when the mapped model is also used as a property type, or documenting that consumers must not enable noUnusedLocals.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache, line 16:

<comment>For discriminator parents whose mapped children are never referenced as property types (such as Animal.ts, where Cat/Dog only appear as subtypes), the newly added `FromJSON` import is unused. Consumers that compile generated code with `noUnusedLocals` enabled will now get a TS6133 error on the import, where previously `FromJSON` was not imported at all. This widens the pre-existing `ToJSON` unused-import situation to `FromJSON` across such models. Consider importing `FromJSON` only when the mapped model is also used as a property type, or documenting that consumers must not enable `noUnusedLocals`.</comment>

<file context>
@@ -13,7 +13,7 @@ import {
 {{#discriminator}}
 {{#discriminator.mappedModels}}
-import { type {{modelName}}, {{modelName}}FromJSONTyped, {{modelName}}ToJSON, {{modelName}}ToJSONTyped } from './{{modelName}}{{importFileExtension}}';
+import { type {{modelName}}, {{modelName}}FromJSON, {{modelName}}FromJSONTyped, {{modelName}}ToJSON, {{modelName}}ToJSONTyped } from './{{modelName}}{{importFileExtension}}';
 {{/discriminator.mappedModels}}
 {{/discriminator}}
</file context>

{{/discriminator.mappedModels}}
{{/discriminator}}
{{>modelGenericInterfaces}}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/others/typescript-fetch/infinite-recursion-issue/models/TestBaseDto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
TestObjectTypeToJSONTyped,
} from './TestObjectType';

import { type ExtendDto, ExtendDtoFromJSONTyped, ExtendDtoToJSON, ExtendDtoToJSONTyped } from './ExtendDto';
import { type ExtendDto, ExtendDtoFromJSON, ExtendDtoFromJSONTyped, ExtendDtoToJSON, ExtendDtoToJSONTyped } from './ExtendDto';
/**
*
* @export
Expand Down
4 changes: 2 additions & 2 deletions samples/client/others/typescript-fetch/self-import-issue/models/AbstractUserDto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import {
BranchDtoToJSONTyped,
} from './BranchDto';

import { type InternalAuthenticatedUserDto, InternalAuthenticatedUserDtoFromJSONTyped, InternalAuthenticatedUserDtoToJSON, InternalAuthenticatedUserDtoToJSONTyped } from './InternalAuthenticatedUserDto';
import { type RemoteAuthenticatedUserDto, RemoteAuthenticatedUserDtoFromJSONTyped, RemoteAuthenticatedUserDtoToJSON, RemoteAuthenticatedUserDtoToJSONTyped } from './RemoteAuthenticatedUserDto';
import { type InternalAuthenticatedUserDto, InternalAuthenticatedUserDtoFromJSON, InternalAuthenticatedUserDtoFromJSONTyped, InternalAuthenticatedUserDtoToJSON, InternalAuthenticatedUserDtoToJSONTyped } from './InternalAuthenticatedUserDto';
import { type RemoteAuthenticatedUserDto, RemoteAuthenticatedUserDtoFromJSON, RemoteAuthenticatedUserDtoFromJSONTyped, RemoteAuthenticatedUserDtoToJSON, RemoteAuthenticatedUserDtoToJSONTyped } from './RemoteAuthenticatedUserDto';
/**
*
* @export
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Animal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*/

import { mapValues } from '../runtime';
import { type Cat, CatFromJSONTyped, CatToJSON, CatToJSONTyped } from './Cat';
import { type Dog, DogFromJSONTyped, DogToJSON, DogToJSONTyped } from './Dog';
import { type Cat, CatFromJSON, CatFromJSONTyped, CatToJSON, CatToJSONTyped } from './Cat';
import { type Dog, DogFromJSON, DogFromJSONTyped, DogToJSON, DogToJSONTyped } from './Dog';
/**
*
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/default-v3.0/models/ParentWithNullable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

import { mapValues } from '../runtime';
import { type ChildWithNullable, ChildWithNullableFromJSONTyped, ChildWithNullableToJSON, ChildWithNullableToJSONTyped } from './ChildWithNullable';
import { type ChildWithNullable, ChildWithNullableFromJSON, ChildWithNullableFromJSONTyped, ChildWithNullableToJSON, ChildWithNullableToJSONTyped } from './ChildWithNullable';
/**
*
* @export
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/kebab-case/models/animal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*/

import { mapValues } from '../runtime';
import { type Cat, CatFromJSONTyped, CatToJSON, CatToJSONTyped } from './Cat';
import { type Dog, DogFromJSONTyped, DogToJSON, DogToJSONTyped } from './Dog';
import { type Cat, CatFromJSON, CatFromJSONTyped, CatToJSON, CatToJSONTyped } from './Cat';
import { type Dog, DogFromJSON, DogFromJSONTyped, DogToJSON, DogToJSONTyped } from './Dog';
/**
*
* @export
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-fetch/builds/kebab-case/models/parent-with-nullable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

import { mapValues } from '../runtime';
import { type ChildWithNullable, ChildWithNullableFromJSONTyped, ChildWithNullableToJSON, ChildWithNullableToJSONTyped } from './ChildWithNullable';
import { type ChildWithNullable, ChildWithNullableFromJSON, ChildWithNullableFromJSONTyped, ChildWithNullableToJSON, ChildWithNullableToJSONTyped } from './ChildWithNullable';
/**
*
* @export
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Animal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*/

import { mapValues } from '../runtime';
import { type Cat, CatFromJSONTyped, CatToJSON, CatToJSONTyped } from './Cat';
import { type Dog, DogFromJSONTyped, DogToJSON, DogToJSONTyped } from './Dog';
import { type Cat, CatFromJSON, CatFromJSONTyped, CatToJSON, CatToJSONTyped } from './Cat';
import { type Dog, DogFromJSON, DogFromJSONTyped, DogToJSON, DogToJSONTyped } from './Dog';
/**
*
* @export
Expand Down
Loading