Skip to content

Commit 59d096f

Browse files
committed
Revert "chore(tanstack-query-react-plugin): add --tanstack-query-version support"
This reverts commit ca79337.
1 parent 0393274 commit 59d096f

6 files changed

Lines changed: 3 additions & 198 deletions

File tree

packages/plugin/src/lib/QraftCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { writeGeneratorFiles } from './writeGeneratorFiles.js';
3232
export class QraftCommand extends Command {
3333
static spinner = ora();
3434

35-
public readonly cwd: URL;
35+
protected readonly cwd: URL;
3636
protected registeredPluginActions: QraftCommandActionCallback[] = [];
3737

3838
/**

packages/react-client/redocly.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ apis:
1616
enum-values: true
1717
explicit-import-extensions: true
1818
openapi-types-file-name: openapi.ts
19-
tanstack-query-version: 5.79.2
2019
filter-services:
2120
- '/approval_policies/**'
2221
- '/entities/**'

packages/tanstack-query-react-plugin/src/lib/isSemverLessThan.spec.ts

Lines changed: 0 additions & 116 deletions
This file was deleted.

packages/tanstack-query-react-plugin/src/lib/isSemverLessThan.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

packages/tanstack-query-react-plugin/src/plugin.ts

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import type { OverrideImportType } from './ts-factory/OverrideImportType.js';
2-
import { readFileSync } from 'node:fs';
3-
import { URL } from 'node:url';
42
import { fileHeader } from '@openapi-qraft/plugin/lib/fileHeader';
53
import {
64
createPredefinedParametersGlobs,
@@ -62,22 +60,13 @@ export const plugin: QraftCommandPlugin = {
6260
'Override import paths for specific types in generated files. This allows using custom type implementations instead of the default ones. Expected format: filepath originalModule:importTypeName:customImportPath'
6361
).argParser(parseOverrideImportType)
6462
)
65-
.addOption(
66-
new Option(
67-
'--tanstack-query-version [semver]',
68-
'TanStack Query version to use (automatically detected if not specified)'
69-
)
70-
.default(getTanStackQueryVersion(command.cwd))
71-
.makeOptionMandatory()
72-
)
7363
.action(async ({ spinner, output, args, services, schema }, resolve) => {
7464
return void (await generateCode({
7565
spinner,
7666
services,
7767
serviceOptions: {
7868
openapiTypesImportPath: args.openapiTypesImportPath,
7969
queryableWriteOperations: args.queryableWriteOperations,
80-
tanstackQueryVersion: args.tanstackQueryVersion,
8170
},
8271
overrideImportType: Array.isArray(args.overrideImportType)
8372
? args.overrideImportType[0]
@@ -287,22 +276,3 @@ const createApiClientFnDefault = [
287276
},
288277
],
289278
] as const;
290-
291-
function getTanStackQueryVersion(cwd: URL): string | void {
292-
const packagesToCheck = ['@tanstack/react-query', '@tanstack/query-core'];
293-
294-
for (const packageName of packagesToCheck) {
295-
try {
296-
const packageJsonUrl = import.meta.resolve(
297-
`${packageName}/package.json`,
298-
cwd.href
299-
);
300-
const packageJsonPath = new URL(packageJsonUrl);
301-
const packageJsonContent = readFileSync(packageJsonPath, 'utf-8');
302-
const packageJson = JSON.parse(packageJsonContent);
303-
return packageJson.version;
304-
} catch {
305-
continue;
306-
}
307-
}
308-
}

packages/tanstack-query-react-plugin/src/ts-factory/getServiceFactory.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { ServiceOperation } from '@openapi-qraft/plugin/lib/open-api/OpenAPIServ
44
import camelCase from 'camelcase';
55
import ts from 'typescript';
66
import { createOperationCommonTSDoc } from '../lib/createOperationCommonTSDoc.js';
7-
import { isSemverLessThan } from '../lib/isSemverLessThan.js';
87
import { filterUnusedTypes } from './filterUnusedTypes.js';
98
import { getOverriddenImportDeclarationsFactory } from './getOverriddenImportDeclarationsFactory.js';
109
import {
@@ -18,7 +17,6 @@ const factory = ts.factory;
1817
export type ServiceFactoryOptions = {
1918
openapiTypesImportPath: string;
2019
queryableWriteOperations: boolean;
21-
tanstackQueryVersion: string;
2220
};
2321

2422
type Service = { typeName: string; variableName: string };
@@ -57,8 +55,7 @@ export const getServiceFactory = (
5755
getOpenAPISchemaImportsFactory(options.openapiTypesImportPath),
5856
...getServiceOperationImportsFactory(
5957
moduleTypeImports,
60-
serviceImportTypeOverrides,
61-
options.tanstackQueryVersion
58+
serviceImportTypeOverrides
6259
),
6360
];
6461

@@ -89,20 +86,9 @@ const getServiceOperationImportsFactory = (
8986
moduleImports: Record<string, string[]>,
9087
serviceImportTypeOverrides:
9188
| OverrideImportType[keyof OverrideImportType]
92-
| undefined,
93-
tanstackQueryVersion: string
89+
| undefined
9490
) => {
9591
const factory = ts.factory;
96-
if (isSemverLessThan(tanstackQueryVersion, '5.80.0')) {
97-
serviceImportTypeOverrides = {
98-
...serviceImportTypeOverrides,
99-
'@tanstack/react-query': {
100-
UseSuspenseInfiniteQueryOptions:
101-
'@openapi-qraft/tanstack-query-react-types/legacy/Lt_5_80_0_UseSuspenseInfiniteQueryOptions',
102-
...serviceImportTypeOverrides?.['@tanstack/react-query'],
103-
},
104-
};
105-
}
10692

10793
const standardImports = Object.entries(moduleImports)
10894
.map(([moduleName, importSpecifierNames]) => {

0 commit comments

Comments
 (0)