Skip to content
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.

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

fix: import react deps when tags have mutator #1614

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions packages/core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,7 @@ export type ClientDependenciesBuilder = (
hasParamsSerializerOptions: boolean,
packageJson?: PackageJson,
httpClient?: OutputHttpClient,
hasTagsMutator?: boolean,
) => GeneratorDependency[];

export type ClientMockGeneratorImplementation = {
Expand Down Expand Up @@ -1051,6 +1052,7 @@ export type GeneratorClientImports = (data: {
hasSchemaDir: boolean;
isAllowSyntheticDefaultImports: boolean;
hasGlobalMutator: boolean;
hasTagsMutator: boolean;
hasParamsSerializerOptions: boolean;
packageJson?: PackageJson;
output: NormalizedOutputOptions;
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/writers/single-mode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ export const writeSingleMode = async ({
hasSchemaDir: !!output.schemas,
isAllowSyntheticDefaultImports,
hasGlobalMutator: !!output.override.mutator,
hasTagsMutator: Object.values(output.override.tags).some(
(tag) => !!tag.mutator,
),
hasParamsSerializerOptions: !!output.override.paramsSerializerOptions,
packageJson: output.packageJson,
output,
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/writers/split-mode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ export const writeSplitMode = async ({
hasSchemaDir: !!output.schemas,
isAllowSyntheticDefaultImports,
hasGlobalMutator: !!output.override.mutator,
hasTagsMutator: Object.values(output.override.tags).some(
(tag) => !!tag.mutator,
),
hasParamsSerializerOptions: !!output.override.paramsSerializerOptions,
packageJson: output.packageJson,
output,
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/writers/split-tags-mode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ export const writeSplitTagsMode = async ({
hasSchemaDir: !!output.schemas,
isAllowSyntheticDefaultImports,
hasGlobalMutator: !!output.override.mutator,
hasTagsMutator: Object.values(output.override.tags).some(
(tag) => !!tag.mutator,
),
hasParamsSerializerOptions: !!output.override.paramsSerializerOptions,
packageJson: output.packageJson,
output,
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/writers/tags-mode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ export const writeTagsMode = async ({
hasSchemaDir: !!output.schemas,
isAllowSyntheticDefaultImports,
hasGlobalMutator: !!output.override.mutator,
hasTagsMutator: Object.values(output.override.tags).some(
(tag) => !!tag.mutator,
),
hasParamsSerializerOptions: !!output.override.paramsSerializerOptions,
packageJson: output.packageJson,
output,
Expand Down
2 changes: 2 additions & 0 deletions packages/orval/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export const generateClientImports: GeneratorClientImports = ({
hasSchemaDir,
isAllowSyntheticDefaultImports,
hasGlobalMutator,
hasTagsMutator,
hasParamsSerializerOptions,
packageJson,
output,
Expand All @@ -79,6 +80,7 @@ export const generateClientImports: GeneratorClientImports = ({
hasParamsSerializerOptions,
packageJson,
output.httpClient,
hasTagsMutator,
),
...imports,
]
Expand Down
3 changes: 2 additions & 1 deletion packages/query/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ export const getReactQueryDependencies: ClientDependenciesBuilder = (
hasParamsSerializerOptions,
packageJson,
httpClient,
hasTagsMutator,
) => {
const hasReactQuery =
packageJson?.dependencies?.['react-query'] ??
Expand All @@ -220,7 +221,7 @@ export const getReactQueryDependencies: ClientDependenciesBuilder = (
packageJson?.peerDependencies?.['@tanstack/react-query'];

return [
...(hasGlobalMutator ? REACT_DEPENDENCIES : []),
...(hasGlobalMutator || hasTagsMutator ? REACT_DEPENDENCIES : []),
...(!hasGlobalMutator && httpClient === OutputHttpClient.AXIOS
? AXIOS_DEPENDENCIES
: []),
Expand Down
58 changes: 29 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1165,23 +1165,23 @@ __metadata:
languageName: node
linkType: hard

"@orval/angular@npm:7.0.1, @orval/angular@workspace:packages/angular":
"@orval/angular@npm:7.1.0, @orval/angular@workspace:packages/angular":
version: 0.0.0-use.local
resolution: "@orval/angular@workspace:packages/angular"
dependencies:
"@orval/core": "npm:7.0.1"
"@orval/core": "npm:7.1.0"
languageName: unknown
linkType: soft

"@orval/axios@npm:7.0.1, @orval/axios@workspace:packages/axios":
"@orval/axios@npm:7.1.0, @orval/axios@workspace:packages/axios":
version: 0.0.0-use.local
resolution: "@orval/axios@workspace:packages/axios"
dependencies:
"@orval/core": "npm:7.0.1"
"@orval/core": "npm:7.1.0"
languageName: unknown
linkType: soft

"@orval/core@npm:7.0.1, @orval/core@workspace:packages/core":
"@orval/core@npm:7.1.0, @orval/core@workspace:packages/core":
version: 0.0.0-use.local
resolution: "@orval/core@workspace:packages/core"
dependencies:
Expand Down Expand Up @@ -1219,62 +1219,62 @@ __metadata:
languageName: unknown
linkType: soft

"@orval/fetch@npm:7.0.1, @orval/fetch@workspace:packages/fetch":
"@orval/fetch@npm:7.1.0, @orval/fetch@workspace:packages/fetch":
version: 0.0.0-use.local
resolution: "@orval/fetch@workspace:packages/fetch"
dependencies:
"@orval/core": "npm:7.0.1"
"@orval/core": "npm:7.1.0"
languageName: unknown
linkType: soft

"@orval/hono@npm:7.0.1, @orval/hono@workspace:packages/hono":
"@orval/hono@npm:7.1.0, @orval/hono@workspace:packages/hono":
version: 0.0.0-use.local
resolution: "@orval/hono@workspace:packages/hono"
dependencies:
"@orval/core": "npm:7.0.1"
"@orval/zod": "npm:7.0.1"
"@orval/core": "npm:7.1.0"
"@orval/zod": "npm:7.1.0"
"@types/lodash.uniq": "npm:^4.5.7"
lodash.uniq: "npm:^4.5.0"
languageName: unknown
linkType: soft

"@orval/mock@npm:7.0.1, @orval/mock@workspace:packages/mock":
"@orval/mock@npm:7.1.0, @orval/mock@workspace:packages/mock":
version: 0.0.0-use.local
resolution: "@orval/mock@workspace:packages/mock"
dependencies:
"@orval/core": "npm:7.0.1"
"@orval/core": "npm:7.1.0"
lodash.get: "npm:^4.4.2"
lodash.omit: "npm:^4.5.0"
openapi3-ts: "npm:^4.2.2"
languageName: unknown
linkType: soft

"@orval/query@npm:7.0.1, @orval/query@workspace:packages/query":
"@orval/query@npm:7.1.0, @orval/query@workspace:packages/query":
version: 0.0.0-use.local
resolution: "@orval/query@workspace:packages/query"
dependencies:
"@orval/core": "npm:7.0.1"
"@orval/fetch": "npm:7.0.1"
"@orval/core": "npm:7.1.0"
"@orval/fetch": "npm:7.1.0"
"@types/lodash.omitby": "npm:^4.6.7"
lodash.omitby: "npm:^4.6.0"
vitest: "npm:^0.34.6"
languageName: unknown
linkType: soft

"@orval/swr@npm:7.0.1, @orval/swr@workspace:packages/swr":
"@orval/swr@npm:7.1.0, @orval/swr@workspace:packages/swr":
version: 0.0.0-use.local
resolution: "@orval/swr@workspace:packages/swr"
dependencies:
"@orval/core": "npm:7.0.1"
"@orval/fetch": "npm:7.0.1"
"@orval/core": "npm:7.1.0"
"@orval/fetch": "npm:7.1.0"
languageName: unknown
linkType: soft

"@orval/zod@npm:7.0.1, @orval/zod@workspace:packages/zod":
"@orval/zod@npm:7.1.0, @orval/zod@workspace:packages/zod":
version: 0.0.0-use.local
resolution: "@orval/zod@workspace:packages/zod"
dependencies:
"@orval/core": "npm:7.0.1"
"@orval/core": "npm:7.1.0"
"@types/lodash.uniq": "npm:^4.5.7"
lodash.uniq: "npm:^4.5.0"
languageName: unknown
Expand Down Expand Up @@ -7177,15 +7177,15 @@ __metadata:
resolution: "orval@workspace:packages/orval"
dependencies:
"@apidevtools/swagger-parser": "npm:^10.1.0"
"@orval/angular": "npm:7.0.1"
"@orval/axios": "npm:7.0.1"
"@orval/core": "npm:7.0.1"
"@orval/fetch": "npm:7.0.1"
"@orval/hono": "npm:7.0.1"
"@orval/mock": "npm:7.0.1"
"@orval/query": "npm:7.0.1"
"@orval/swr": "npm:7.0.1"
"@orval/zod": "npm:7.0.1"
"@orval/angular": "npm:7.1.0"
"@orval/axios": "npm:7.1.0"
"@orval/core": "npm:7.1.0"
"@orval/fetch": "npm:7.1.0"
"@orval/hono": "npm:7.1.0"
"@orval/mock": "npm:7.1.0"
"@orval/query": "npm:7.1.0"
"@orval/swr": "npm:7.1.0"
"@orval/zod": "npm:7.1.0"
"@types/inquirer": "npm:^9.0.6"
"@types/js-yaml": "npm:^4.0.8"
"@types/lodash.uniq": "npm:^4.5.8"
Expand Down