@openapi-qraft/tanstack-query-react-plugin 2.6.4 → 2.7.1

package/dist/ts-factory/service-operation.generated/ServiceOperationUseSuspenseQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceOperationUseSuspenseQuery.js","sourceRoot":"","sources":["../../../src/ts-factory/service-operation.generated/ServiceOperationUseSuspenseQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServiceOperationUseSuspenseQuery.js","sourceRoot":"","sources":["../../../src/ts-factory/service-operation.generated/ServiceOperationUseSuspenseQuery.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/tanstack-query-react-plugin",
-  "version": "2.6.4",
+  "version": "2.7.1",
   "type": "module",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -35,12 +35,12 @@
     }
   },
   "dependencies": {
-    "@openapi-qraft/plugin": "^2.6.4",
+    "@openapi-qraft/plugin": "^2.7.1",
     "typescript": "^5.6.2"
   },
   "devDependencies": {
     "@openapi-qraft/eslint-config": "1.0.1",
-    "@openapi-qraft/tanstack-query-react-types": "2.6.4",
+    "@openapi-qraft/tanstack-query-react-types": "2.7.1",
     "@openapi-qraft/test-fixtures": "1.1.0",
     "@openapi-qraft/ts-factory-code-generator": "1.0.2",
     "camelcase": "^8.0.0",

package/src/generateCode.ts

@@ -1,3 +1,4 @@
+import type { OverrideImportType } from './ts-factory/OverrideImportType.js';
 import { URL } from 'node:url';
 import { formatFileHeader } from '@openapi-qraft/plugin/lib/formatFileHeader';
 import { GeneratorFile } from '@openapi-qraft/plugin/lib/GeneratorFile';
@@ -33,26 +34,35 @@ interface OutputOptions extends OutputOptionsBase {
 export const generateCode = async ({
   spinner,
   services,
-  serviceImports,
+  serviceOptions,
   output,
+  overrideImportType,
 }: {
   spinner: Ora;
   services: OpenAPIService[];
-  serviceImports: ServiceFactoryOptions;
+  serviceOptions: ServiceFactoryOptions;
   output: OutputOptions;
+  overrideImportType: OverrideImportType | undefined;
 }) => {
   return [
-    ...(await generateServices(spinner, services, serviceImports, output)),
+    ...(await generateServices(
+      spinner,
+      services,
+      serviceOptions,
+      output,
+      overrideImportType
+    )),
     ...(await generateServiceIndex(spinner, services, output)),
-    ...(await generateOperationClient(spinner, output)),
+    ...(await generateOperationClient(spinner, output, overrideImportType)),
     ...(output.operationPredefinedParameters
       ? await generateCreatePredefinedParametersRequestFn(
           spinner,
-          serviceImports,
-          output
+          serviceOptions,
+          output,
+          overrideImportType
         )
       : []),
-    ...(await generateIndex(spinner, serviceImports, output)),
+    ...(await generateIndex(spinner, serviceOptions, output)),
   ];
 };
 
@@ -66,7 +76,8 @@ const generateServices = async (
   spinner: Ora,
   services: OpenAPIService[],
   serviceImports: ServiceFactoryOptions,
-  output: OutputOptions
+  output: OutputOptions,
+  overrideImportType: OverrideImportType | undefined
 ) => {
   const servicesDir = composeServicesDirPath(output);
 
@@ -92,7 +103,8 @@ const generateServices = async (
             variableName,
           },
           operations,
-          serviceImports
+          serviceImports,
+          overrideImportType?.[output.servicesDirName]
         )
       );
 
@@ -150,13 +162,19 @@ const generateServiceIndex = async (
   return serviceIndexFiles;
 };
 
-const generateOperationClient = async (spinner: Ora, output: OutputOptions) => {
+const generateOperationClient = async (
+  spinner: Ora,
+  output: OutputOptions,
+  overrideImportType: OverrideImportType | undefined
+) => {
   spinner.start('Generating operation client');
 
   const operationClientFiles: GeneratorFile[] = [];
 
   try {
     output.createApiClientFn.map(([functionName, value]) => {
+      const fileName = value.filename?.[0] ?? functionName;
+
       const code = astToString(
         getCreateAPIClientFactory({
           defaultClientCallbacks: value.callbacks,
@@ -164,11 +182,12 @@ const generateOperationClient = async (spinner: Ora, output: OutputOptions) => {
           createAPIClientFnName: functionName,
           servicesDirName: output.servicesDirName,
           explicitImportExtensions: output.explicitImportExtensions,
+          createAPIClientFnImportTypeOverrides: overrideImportType?.[fileName],
         })
       );
 
       operationClientFiles.push({
-        file: new URL(`${value.filename?.[0] ?? functionName}.ts`, output.dir),
+        file: new URL(`${fileName}.ts`, output.dir),
         code: formatFileHeader(output.fileHeader) + code,
       });
     });
@@ -188,23 +207,27 @@ const generateOperationClient = async (spinner: Ora, output: OutputOptions) => {
 const generateCreatePredefinedParametersRequestFn = async (
   spinner: Ora,
   serviceImports: ServiceFactoryOptions,
-  output: OutputOptions
+  output: OutputOptions,
+  overrideImportType: OverrideImportType | undefined
 ) => {
   spinner.start('Generating "createPredefinedParametersRequestFn"');
 
   const clientFiles: GeneratorFile[] = [];
 
   try {
+    const filename = 'create-predefined-parameters-request-fn';
+
     const code = astToString(
       getCreatePredefinedParametersRequestFnFactory({
         servicesDirName: output.servicesDirName,
         operationPredefinedParameters: output.operationPredefinedParameters,
         openapiTypesImportPath: serviceImports.openapiTypesImportPath,
+        importTypeOverrides: overrideImportType?.[filename],
       })
     );
 
     clientFiles.push({
-      file: new URL('create-predefined-parameters-request-fn.ts', output.dir),
+      file: new URL(`${filename}.ts`, output.dir),
       code: formatFileHeader(output.fileHeader) + code,
     });
   } catch (error) {

package/src/plugin.ts

@@ -1,3 +1,4 @@
+import type { OverrideImportType } from './ts-factory/OverrideImportType.js';
 import { fileHeader } from '@openapi-qraft/plugin/lib/fileHeader';
 import {
   createPredefinedParametersGlobs,
@@ -31,7 +32,7 @@ export const plugin: QraftCommandPlugin = {
       )
       .option(
         '--export-openapi-types [bool]',
-        "Add an export statement of the generated OpenAPI document types from the `./index.ts' file. Useful for sharing types within your project.",
+        "Add an export statement of the generated OpenAPI document types from the `./index.ts' file. Useful for sharing types within your project. Default: true when --plugin openapi-typescript is used.",
         parseBooleanOption
       )
       .option(
@@ -39,22 +40,37 @@ export const plugin: QraftCommandPlugin = {
         'Enable generation of query hooks (useQuery, useSuspenseQuery, etc.) for writable HTTP methods like POST, PUT, PATCH. By default, only mutation hooks are generated for writable operations.',
         parseBooleanOption
       )
+      .addOption(
+        (() => {
+          const option = new Option(
+            '--create-api-client-fn <functionName> [options...]',
+            'Configure API client creation function. Allows specifying the function name, included services, and callbacks. Can be specified multiple times to generate several different API client functions from a single OpenAPI document.'
+          )
+            .argParser(parseCreateApiClientFn)
+            .default(createApiClientFnDefault);
+
+          option.defaultValueDescription = 'null';
+
+          return option;
+        })()
+      )
       .addOption(
         new Option(
-          '--create-api-client-fn [name...]',
-          'Name, default callbacks and services of the generated `createAPIClient` function'
-        )
-          .argParser(parseCreateApiClientFn)
-          .default(createApiClientFnDefault)
+          '--override-import-type <pathname overrides...>',
+          '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'
+        ).argParser(parseOverrideImportType)
       )
       .action(async ({ spinner, output, args, services, schema }, resolve) => {
         return void (await generateCode({
           spinner,
           services,
-          serviceImports: {
+          serviceOptions: {
             openapiTypesImportPath: args.openapiTypesImportPath,
             queryableWriteOperations: args.queryableWriteOperations,
           },
+          overrideImportType: Array.isArray(args.overrideImportType)
+            ? args.overrideImportType[0]
+            : undefined,
           output: {
             ...output,
             fileHeader: args.fileHeader ?? fileHeader,
@@ -185,6 +201,66 @@ function parseCreateApiClientFn(
   return nextValue;
 }
 
+type ParsedOverrideImportTypeOption = [
+  overrides: OverrideImportType,
+  filepath?: string,
+];
+
+function parseOverrideImportType(
+  value: string,
+  previousValue: unknown
+): ParsedOverrideImportTypeOption {
+  const previous = (
+    Array.isArray(previousValue) ? previousValue : [{}]
+  ) as ParsedOverrideImportTypeOption;
+
+  if (!value.includes(':')) {
+    previous.push(value);
+
+    return previous;
+  }
+
+  const importOverrides = value.split(':');
+
+  if (importOverrides.length === 3) {
+    const originalModule = importOverrides[0];
+    const typeName = importOverrides[1];
+    const overrideModule = importOverrides[2];
+
+    if (!originalModule || !typeName || !overrideModule) {
+      throw new CommanderError(
+        1,
+        'ERR_INVALID_IMPORT_TYPE_OVERRIDE',
+        `Invalid import type override: ${value}. Expected format: originalModule:importTypeName:customImportPath`
+      );
+    }
+
+    const filePath = previous[previous.length - 1];
+
+    if (!filePath || typeof filePath !== 'string') {
+      throw new CommanderError(
+        1,
+        'ERR_INVALID_IMPORT_TYPE_OVERRIDE',
+        `Invalid import type override: ${value}. Expected format: filepath originalModule:importTypeName:customImportPath`
+      );
+    }
+
+    const [overrides] = previous;
+    overrides[filePath] = overrides[filePath] ?? {};
+    overrides[filePath][originalModule] =
+      overrides[filePath][originalModule] ?? {};
+    overrides[filePath][originalModule][typeName] = overrideModule;
+
+    return previous;
+  } else {
+    throw new CommanderError(
+      1,
+      'ERR_INVALID_IMPORT_TYPE_OVERRIDE',
+      `Invalid import type override: ${value}. Expected format: filepath namespace:importTypeName:importPath`
+    );
+  }
+}
+
 type CreateAPIClientFnArg = [
   functionName: string,
   value: Partial<CreateAPIClientFnOptions>,

package/src/ts-factory/OverrideImportType.ts

@@ -0,0 +1,27 @@
+/**
+ * Allows you to override standard type imports by specifying custom paths for them.
+ *
+ * @example
+ * ```ts
+ * {
+ *   services: {
+ *     '@openapi-qraft/tanstack-query-react-types': {
+ *       OperationError: '../custom/types/ErrorType.js',
+ *       RequestFn: '../custom/types/ApiClient.js',
+ *     },
+ *     '@openapi-qraft/react': {
+ *       Result: '../custom/types/ApiResult.js',
+ *     },
+ *   },
+ *   'create-api-client': {
+ *     '@openapi-qraft/react': {
+ *       CreateAPIQueryClientOptions:
+ *         '../custom/types/CreateAPIQueryClientOptions',
+ *     },
+ *   },
+ * }
+ **/
+export type OverrideImportType = Record<
+  string,
+  Record<string, Record<string, string>>
+>;

package/src/ts-factory/getCreateAPIClientFactory.ts

@@ -1,4 +1,6 @@
+import type { OverrideImportType } from './OverrideImportType.js';
 import ts from 'typescript';
+import { getOverriddenImportDeclarationsFactory } from './getOverriddenImportDeclarationsFactory.js';
 
 type Options = {
   servicesDirName: string;
@@ -6,6 +8,9 @@ type Options = {
   defaultClientCallbacks: string[] | ['all'] | ['none'] | undefined;
   defaultClientServices: string[] | ['all'] | ['none'] | undefined;
   createAPIClientFnName: string;
+  createAPIClientFnImportTypeOverrides:
+    | OverrideImportType[keyof OverrideImportType]
+    | undefined;
 };
 
 export const getCreateAPIClientFactory = (options: Options) => {
@@ -20,6 +25,7 @@ const getOperationClientImportsFactory = ({
   explicitImportExtensions,
   defaultClientCallbacks,
   defaultClientServices,
+  createAPIClientFnImportTypeOverrides,
 }: Options) => {
   const factory = ts.factory;
 
@@ -35,75 +41,59 @@ const getOperationClientImportsFactory = ({
       (name) => name !== 'all' && name !== 'none'
     ) || [];
 
-  const imports: ts.Statement[] = [
-    factory.createImportDeclaration(
-      undefined,
-      factory.createImportClause(
-        true,
+  const qraftImportTypeOverrides =
+    createAPIClientFnImportTypeOverrides?.['@openapi-qraft/react'];
+
+  const availableQraftImportedTypes = [
+    'APIBasicClientServices',
+    'APIBasicQueryClientServices',
+    'APIDefaultQueryClientServices',
+    !shouldImportAllCallbacks && 'APIQueryClientServices',
+    'APIUtilityClientServices',
+    'CreateAPIBasicClientOptions',
+    'CreateAPIBasicQueryClientOptions',
+    'CreateAPIClientOptions',
+    'CreateAPIQueryClientOptions',
+    !shouldImportAllServices && 'UnionServiceOperationsDeclaration',
+  ].filter((typeName) => typeof typeName === 'string');
+
+  const imports: ts.Statement[] = [];
+
+  const qraftTypesToImport = availableQraftImportedTypes.filter(
+    (typeName) => !qraftImportTypeOverrides?.[typeName]
+  );
+
+  if (qraftTypesToImport.length) {
+    imports.push(
+      factory.createImportDeclaration(
         undefined,
-        factory.createNamedImports(
-          [
-            factory.createImportSpecifier(
-              false,
-              undefined,
-              factory.createIdentifier('APIBasicClientServices')
-            ),
-            factory.createImportSpecifier(
-              false,
-              undefined,
-              factory.createIdentifier('APIBasicQueryClientServices')
-            ),
-            factory.createImportSpecifier(
-              false,
-              undefined,
-              factory.createIdentifier('APIDefaultQueryClientServices')
-            ),
-            shouldImportAllCallbacks
-              ? null
-              : factory.createImportSpecifier(
-                  false,
-                  undefined,
-                  factory.createIdentifier('APIQueryClientServices')
-                ),
-            factory.createImportSpecifier(
-              false,
-              undefined,
-              factory.createIdentifier('APIUtilityClientServices')
-            ),
-            factory.createImportSpecifier(
-              false,
-              undefined,
-              factory.createIdentifier('CreateAPIBasicClientOptions')
-            ),
-            factory.createImportSpecifier(
-              false,
-              undefined,
-              factory.createIdentifier('CreateAPIBasicQueryClientOptions')
-            ),
-            factory.createImportSpecifier(
-              false,
-              undefined,
-              factory.createIdentifier('CreateAPIClientOptions')
-            ),
-            factory.createImportSpecifier(
-              false,
-              undefined,
-              factory.createIdentifier('CreateAPIQueryClientOptions')
-            ),
-            shouldImportAllServices
-              ? null
-              : factory.createImportSpecifier(
-                  false,
-                  undefined,
-                  factory.createIdentifier('UnionServiceOperationsDeclaration')
-                ),
-          ].filter(nonNullable)
-        )
-      ),
-      factory.createStringLiteral('@openapi-qraft/react'),
-      undefined
-    ),
-  ];
+        factory.createImportClause(
+          true,
+          undefined,
+          factory.createNamedImports(
+            qraftTypesToImport.map((name) =>
+              factory.createImportSpecifier(
+                false,
+                undefined,
+                factory.createIdentifier(name)
+              )
+            )
+          )
+        ),
+        factory.createStringLiteral('@openapi-qraft/react'),
+        undefined
+      )
+    );
+  }
+
+  if (qraftImportTypeOverrides) {
+    imports.push(
+      ...getOverriddenImportDeclarationsFactory(
+        { '@openapi-qraft/react': availableQraftImportedTypes },
+        createAPIClientFnImportTypeOverrides
+      )
+    );
+  }
 
   imports.push(
     factory.createImportDeclaration(

package/src/ts-factory/getCreatePredefinedParametersRequestFnFactory.ts

@@ -1,11 +1,14 @@
+import type { OverrideImportType } from './OverrideImportType.js';
 import { PredefinedParametersGlob } from '@openapi-qraft/plugin/lib/predefineSchemaParameters';
 import ts from 'typescript';
 import { maybeResolveImport } from '../lib/maybeResolveImport.js';
+import { getOverriddenImportDeclarationsFactory } from './getOverriddenImportDeclarationsFactory.js';
 
 type Options = {
   servicesDirName: string;
   operationPredefinedParameters: Array<PredefinedParametersGlob> | undefined;
   openapiTypesImportPath: string | undefined;
+  importTypeOverrides: OverrideImportType[keyof OverrideImportType] | undefined;
 };
 
 export const getCreatePredefinedParametersRequestFnFactory = (
@@ -25,28 +28,53 @@ export const getCreatePredefinedParametersRequestFnFactory = (
 const getCreatePredefinedParametersRequestFnImportsFactory = ({
   servicesDirName,
   openapiTypesImportPath,
+  importTypeOverrides,
 }: Options) => {
   if (!openapiTypesImportPath) return [];
 
   const factory = ts.factory;
 
-  return [
-    factory.createImportDeclaration(
-      undefined,
-      factory.createImportClause(
-        true,
-        undefined,
-        factory.createNamedImports([
+  const qraftImports = {
+    '@openapi-qraft/react': ['RequestFn'],
+    '@openapi-qraft/react/qraftPredefinedParametersRequestFn': [
+      'QraftPredefinedParameterValue',
+    ],
+  };
+
+  const internalImports = Object.entries(qraftImports)
+    .map(([importPath, typeNames]) => {
+      const importSpecifiers = typeNames
+        .filter((typeName) => !importTypeOverrides?.[importPath]?.[typeName])
+        .map((typeName) =>
           factory.createImportSpecifier(
             false,
             undefined,
-            factory.createIdentifier('RequestFn')
-          ),
-        ])
-      ),
-      factory.createStringLiteral('@openapi-qraft/react'),
-      undefined
-    ),
+            factory.createIdentifier(typeName)
+          )
+        );
+
+      if (!importSpecifiers.length) return null;
+
+      return factory.createImportDeclaration(
+        undefined,
+        factory.createImportClause(
+          true,
+          undefined,
+          factory.createNamedImports(importSpecifiers)
+        ),
+        factory.createStringLiteral(importPath),
+        undefined
+      );
+    })
+    .filter((importDeclaration) => !!importDeclaration);
+
+  const overrideImports = importTypeOverrides
+    ? getOverriddenImportDeclarationsFactory(qraftImports, importTypeOverrides)
+    : [];
+
+  return [
+    ...internalImports,
+    ...overrideImports,
     factory.createImportDeclaration(
       undefined,
       factory.createImportClause(
@@ -58,11 +86,6 @@ const getCreatePredefinedParametersRequestFnImportsFactory = ({
             undefined,
             factory.createIdentifier('qraftPredefinedParametersRequestFn')
           ),
-          factory.createImportSpecifier(
-            true,
-            undefined,
-            factory.createIdentifier('QraftPredefinedParameterValue')
-          ),
         ])
       ),
       factory.createStringLiteral(

package/src/ts-factory/getOverriddenImportDeclarationsFactory.ts

@@ -0,0 +1,53 @@
+import type { ImportDeclaration } from 'typescript';
+import type { OverrideImportType } from './OverrideImportType.js';
+import { factory } from 'typescript';
+
+export function getOverriddenImportDeclarationsFactory(
+  moduleImports: Record<string, string[]>,
+  serviceImportTypeOverrides: OverrideImportType[keyof OverrideImportType]
+) {
+  const customImportDeclarations: ImportDeclaration[] = [];
+
+  if (serviceImportTypeOverrides) {
+    Object.entries(moduleImports).forEach(([moduleName, importSpecifiers]) => {
+      if (serviceImportTypeOverrides[moduleName]) {
+        const importsByPath: Record<string, string[]> = {};
+
+        importSpecifiers.forEach((specifier) => {
+          if (serviceImportTypeOverrides[moduleName][specifier]) {
+            const customPath =
+              serviceImportTypeOverrides[moduleName][specifier];
+            if (!importsByPath[customPath]) {
+              importsByPath[customPath] = [];
+            }
+            importsByPath[customPath].push(specifier);
+          }
+        });
+
+        Object.entries(importsByPath).forEach(([customPath, specifiers]) => {
+          customImportDeclarations.push(
+            factory.createImportDeclaration(
+              undefined,
+              factory.createImportClause(
+                true,
+                undefined,
+                factory.createNamedImports(
+                  specifiers.map((specifier) =>
+                    factory.createImportSpecifier(
+                      false,
+                      undefined,
+                      factory.createIdentifier(specifier)
+                    )
+                  )
+                )
+              ),
+              factory.createStringLiteral(customPath)
+            )
+          );
+        });
+      }
+    });
+  }
+
+  return customImportDeclarations;
+}