@openapi-qraft/tanstack-query-react-plugin 2.0.0-next.1 → 2.0.0-next.10

package/dist/ts-factory/tsdoc/createUseSuspenseInfiniteQueryOperationTSDocExample.d.ts

@@ -0,0 +1,3 @@
+import { ServiceOperation } from '@openapi-qraft/plugin/lib/open-api/getServices';
+export declare const createUseSuspenseInfiniteQueryOperationTSDocExample: (operation: ServiceOperation, serviceVariableName: string) => string[];
+//# sourceMappingURL=createUseSuspenseInfiniteQueryOperationTSDocExample.d.ts.map

package/dist/ts-factory/tsdoc/createUseSuspenseInfiniteQueryOperationTSDocExample.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createUseSuspenseInfiniteQueryOperationTSDocExample.d.ts","sourceRoot":"","sources":["../../../src/ts-factory/tsdoc/createUseSuspenseInfiniteQueryOperationTSDocExample.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAOlF,eAAO,MAAM,mDAAmD,cACnD,gBAAgB,uBACN,MAAM,KAC1B,MAAM,EAoDR,CAAC"}

package/dist/ts-factory/tsdoc/createUseSuspenseInfiniteQueryOperationTSDocExample.js

@@ -0,0 +1,39 @@
+import ts from 'typescript';
+import { astToString } from '../astToString.js';
+import { createInfiniteQueryOptionsArgumentExamplePropertyAssignmentNodes } from './createUseInfiniteQueryOperationTSDocExample.js';
+import { createOperationMethodCallExpressionExampleNode } from './lib/createOperationMethodCallExpressionExampleNode.js';
+import { createOperationMethodParametersExampleNodes } from './lib/createOperationMethodParametersExampleNodes.js';
+export const createUseSuspenseInfiniteQueryOperationTSDocExample = (operation, serviceVariableName) => {
+    const factory = ts.factory;
+    const commonTSDoc = [
+        'Performs asynchronous data fetching with support for infinite scrolling scenarios.',
+        'Manages paginated data and provides utilities for fetching additional pages.',
+        'It functions similarly to `useInfiniteQuery`, but with added support for React Suspense.',
+        '',
+        '@see {@link https://openapi-qraft.github.io/openapi-qraft/docs/hooks/useSuspenseInfiniteQuery|`useSuspenseInfiniteQuery(...)` documentation}',
+        '',
+    ];
+    return [
+        ...commonTSDoc,
+        '@example Suspense Infinite Query',
+        '```ts',
+        ...('const { data, isLoading, fetchNextPage } = ' +
+            astToString(createOperationMethodCallExpressionExampleNode(operation, {
+                serviceVariableName,
+                operationMethodName: 'useSuspenseInfiniteQuery',
+            }, [
+                factory.createObjectLiteralExpression(createOperationMethodParametersExampleNodes({
+                    ...operation,
+                    parameters: operation.parameters?.filter((parameter) => parameter.in === 'query' ? parameter.required : true),
+                }), true),
+                factory.createObjectLiteralExpression(createInfiniteQueryOptionsArgumentExamplePropertyAssignmentNodes(operation), true),
+            ])))
+            .trim()
+            .split('\n'),
+        '',
+        'console.log(data);',
+        'fetchNextPage(); // Fetch the next page',
+        '```',
+    ];
+};
+//# sourceMappingURL=createUseSuspenseInfiniteQueryOperationTSDocExample.js.map

package/dist/ts-factory/tsdoc/createUseSuspenseInfiniteQueryOperationTSDocExample.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createUseSuspenseInfiniteQueryOperationTSDocExample.js","sourceRoot":"","sources":["../../../src/ts-factory/tsdoc/createUseSuspenseInfiniteQueryOperationTSDocExample.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,gEAAgE,EAAE,MAAM,kDAAkD,CAAC;AACpI,OAAO,EAAE,8CAA8C,EAAE,MAAM,yDAAyD,CAAC;AACzH,OAAO,EAAE,2CAA2C,EAAE,MAAM,sDAAsD,CAAC;AAEnH,MAAM,CAAC,MAAM,mDAAmD,GAAG,CACjE,SAA2B,EAC3B,mBAA2B,EACjB,EAAE;IACZ,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;IAE3B,MAAM,WAAW,GAAG;QAClB,oFAAoF;QACpF,8EAA8E;QAC9E,0FAA0F;QAC1F,EAAE;QACF,8IAA8I;QAC9I,EAAE;KACH,CAAC;IAEF,OAAO;QACL,GAAG,WAAW;QACd,kCAAkC;QAClC,OAAO;QACP,GAAG,CACD,6CAA6C;YAC7C,WAAW,CACT,8CAA8C,CAC5C,SAAS,EACT;gBACE,mBAAmB;gBACnB,mBAAmB,EAAE,0BAA0B;aAChD,EACD;gBACE,OAAO,CAAC,6BAA6B,CACnC,2CAA2C,CAAC;oBAC1C,GAAG,SAAS;oBACZ,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CACrD,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CACrD;iBACF,CAAC,EACF,IAAI,CACL;gBACD,OAAO,CAAC,6BAA6B,CACnC,gEAAgE,CAC9D,SAAS,CACV,EACD,IAAI,CACL;aACF,CACF,CACF,CACF;aACE,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;QACd,EAAE;QACF,oBAAoB;QACpB,yCAAyC;QACzC,KAAK;KACN,CAAC;AACJ,CAAC,CAAC"}

package/dist/ts-factory/tsdoc/lib/createOperationMethodCallExpressionExampleNode.d.ts

@@ -0,0 +1,7 @@
+import { ServiceOperation } from '@openapi-qraft/plugin/lib/open-api/getServices';
+import ts from 'typescript';
+export declare const createOperationMethodCallExpressionExampleNode: (operation: ServiceOperation, { serviceVariableName, operationMethodName, }: {
+    serviceVariableName: string;
+    operationMethodName: string;
+}, nodes: ts.Expression[] | undefined) => ts.CallExpression;
+//# sourceMappingURL=createOperationMethodCallExpressionExampleNode.d.ts.map

package/dist/ts-factory/tsdoc/lib/createOperationMethodCallExpressionExampleNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createOperationMethodCallExpressionExampleNode.d.ts","sourceRoot":"","sources":["../../../../src/ts-factory/tsdoc/lib/createOperationMethodCallExpressionExampleNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,eAAO,MAAM,8CAA8C,cAC9C,gBAAgB,iDAIxB;IAAE,mBAAmB,EAAE,MAAM,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAAE,SACxD,EAAE,CAAC,UAAU,EAAE,GAAG,SAAS,sBAkBnC,CAAC"}

package/dist/ts-factory/tsdoc/lib/createOperationMethodCallExpressionExampleNode.js

@@ -0,0 +1,6 @@
+import ts from 'typescript';
+export const createOperationMethodCallExpressionExampleNode = (operation, { serviceVariableName, operationMethodName, }, nodes) => {
+    const factory = ts.factory;
+    return factory.createCallExpression(factory.createPropertyAccessExpression(factory.createPropertyAccessExpression(factory.createPropertyAccessExpression(factory.createIdentifier('qraft'), factory.createIdentifier(serviceVariableName)), factory.createIdentifier(operation.name)), factory.createIdentifier(operationMethodName)), undefined, nodes);
+};
+//# sourceMappingURL=createOperationMethodCallExpressionExampleNode.js.map

package/dist/ts-factory/tsdoc/lib/createOperationMethodCallExpressionExampleNode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createOperationMethodCallExpressionExampleNode.js","sourceRoot":"","sources":["../../../../src/ts-factory/tsdoc/lib/createOperationMethodCallExpressionExampleNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,CAAC,MAAM,8CAA8C,GAAG,CAC5D,SAA2B,EAC3B,EACE,mBAAmB,EACnB,mBAAmB,GAC0C,EAC/D,KAAkC,EAClC,EAAE;IACF,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;IAE3B,OAAO,OAAO,CAAC,oBAAoB,CACjC,OAAO,CAAC,8BAA8B,CACpC,OAAO,CAAC,8BAA8B,CACpC,OAAO,CAAC,8BAA8B,CACpC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACjC,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAC9C,EACD,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CACzC,EACD,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAC9C,EACD,SAAS,EACT,KAAK,CACN,CAAC;AACJ,CAAC,CAAC"}

package/dist/ts-factory/tsdoc/lib/createOperationMethodParametersExampleNodes.d.ts

@@ -0,0 +1,4 @@
+import { ServiceOperation } from '@openapi-qraft/plugin/lib/open-api/getServices';
+import ts from 'typescript';
+export declare const createOperationMethodParametersExampleNodes: (operation: ServiceOperation, transformOperationParameterIdentifier?: (operationParameter: NonNullable<ServiceOperation["parameters"]>[number]) => string) => ts.PropertyAssignment[];
+//# sourceMappingURL=createOperationMethodParametersExampleNodes.d.ts.map

package/dist/ts-factory/tsdoc/lib/createOperationMethodParametersExampleNodes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createOperationMethodParametersExampleNodes.d.ts","sourceRoot":"","sources":["../../../../src/ts-factory/tsdoc/lib/createOperationMethodParametersExampleNodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAElF,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,eAAO,MAAM,2CAA2C,cAC3C,gBAAgB,0CACa,CACtC,kBAAkB,EAAE,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,KACpE,MAAM,KACV,EAAE,CAAC,kBAAkB,EA0DvB,CAAC"}

package/dist/ts-factory/tsdoc/lib/createOperationMethodParametersExampleNodes.js

@@ -0,0 +1,47 @@
+import camelcase from 'camelcase';
+import ts from 'typescript';
+export const createOperationMethodParametersExampleNodes = (operation, transformOperationParameterIdentifier) => {
+    if (!operation.parameters)
+        return [];
+    const parametersTypeList = operation.parameters
+        .map((parameter) => parameter.in)
+        .filter((parameterKind, index, array) => array.indexOf(parameterKind) === index);
+    const operationRequiredParameters = operation.parameters.filter((parameter) => parameter.required);
+    return parametersTypeList.reduce((acc, parameterKind) => {
+        let operationParameters = operationRequiredParameters.filter((parameter) => parameter.in === parameterKind);
+        if (!operationParameters.length) {
+            const operationParameter = operation.parameters?.find((parameter) => parameter.in === parameterKind);
+            if (operationParameter) {
+                operationParameters = [operationParameter];
+            }
+        }
+        if (!operationParameters.length)
+            return acc;
+        const factory = ts.factory;
+        return [
+            ...acc,
+            factory.createPropertyAssignment(factory.createIdentifier(parameterKind), factory.createObjectLiteralExpression(operationParameters.map((parameter) => factory.createPropertyAssignment(isIdentifierCompatibleVariableName(parameter.name)
+                ? factory.createIdentifier(parameter.name)
+                : factory.createStringLiteral(parameter.name), parameter.example // todo:: add example type inferring
+                ? factory.createStringLiteral(parameter.example)
+                : factory.createIdentifier(transformOperationParameterIdentifier
+                    ? transformOperationParameterIdentifier(parameter)
+                    : camelcase(parameter.name)))), true)),
+        ];
+    }, []);
+};
+/**
+ * Checks if the given name is a valid identifier name.
+ *
+ * @example
+ * ```ts
+ * isIdentifierCompatibleVariableName('foo'); // true
+ * isIdentifierCompatibleVariableName('foo-bar'); // false
+ * isIdentifierCompatibleVariableName('foo_bar'); // true
+ * isIdentifierCompatibleVariableName('foo.bar'); // false
+ * ```
+ */
+function isIdentifierCompatibleVariableName(name) {
+    return !/[^a-zA-Z0-9_$]/.test(name);
+}
+//# sourceMappingURL=createOperationMethodParametersExampleNodes.js.map

package/dist/ts-factory/tsdoc/lib/createOperationMethodParametersExampleNodes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createOperationMethodParametersExampleNodes.js","sourceRoot":"","sources":["../../../../src/ts-factory/tsdoc/lib/createOperationMethodParametersExampleNodes.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,CAAC,MAAM,2CAA2C,GAAG,CACzD,SAA2B,EAC3B,qCAEW,EACc,EAAE;IAC3B,IAAI,CAAC,SAAS,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,kBAAkB,GAAG,SAAS,CAAC,UAAU;SAC5C,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;SAChC,MAAM,CACL,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,KAAK,CACxE,CAAC;IAEJ,MAAM,2BAA2B,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,CAC7D,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAClC,CAAC;IAEF,OAAO,kBAAkB,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE;QACrB,IAAI,mBAAmB,GAAG,2BAA2B,CAAC,MAAM,CAC1D,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,aAAa,CAC9C,CAAC;QAEF,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,kBAAkB,GAAG,SAAS,CAAC,UAAU,EAAE,IAAI,CACnD,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,aAAa,CAC9C,CAAC;YACF,IAAI,kBAAkB,EAAE,CAAC;gBACvB,mBAAmB,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,mBAAmB,CAAC,MAAM;YAAE,OAAO,GAAG,CAAC;QAE5C,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;QAE3B,OAAO;YACL,GAAG,GAAG;YACN,OAAO,CAAC,wBAAwB,CAC9B,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,EACvC,OAAO,CAAC,6BAA6B,CACnC,mBAAmB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACpC,OAAO,CAAC,wBAAwB,CAC9B,kCAAkC,CAAC,SAAS,CAAC,IAAI,CAAC;gBAChD,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1C,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,EAC/C,SAAS,CAAC,OAAO,CAAC,oCAAoC;gBACpD,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,OAAO,CAAC;gBAChD,CAAC,CAAC,OAAO,CAAC,gBAAgB,CACtB,qCAAqC;oBACnC,CAAC,CAAC,qCAAqC,CAAC,SAAS,CAAC;oBAClD,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAC9B,CACN,CACF,EACD,IAAI,CACL,CACF;SACF,CAAC;IACJ,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,SAAS,kCAAkC,CAAC,IAAY;IACtD,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC"}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@openapi-qraft/tanstack-query-react-plugin",
-  "version": "2.0.0-next.1",
+  "version": "2.0.0-next.10",
   "type": "module",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
+    "codegen": "yarn exec ./generate-ts-factory.mjs",
     "dev": "yarn build --watch --noEmitOnError false",
     "test": "vitest run",
     "typecheck": "tsc --noEmit",
@@ -26,16 +27,18 @@
     }
   },
   "dependencies": {
-    "@openapi-qraft/plugin": "^2.0.0-next.1",
-    "typescript": "^5.5.4"
+    "@openapi-qraft/plugin": "^2.0.0-next.10",
+    "typescript": "^5.6.2"
   },
   "devDependencies": {
     "@openapi-qraft/eslint-config": "1.0.0",
     "@openapi-qraft/test-fixtures": "1.0.0",
-    "eslint": "^9.0.0",
-    "memfs": "^4.9.2",
+    "@openapi-qraft/ts-factory-code-generator": "1.0.0",
+    "camelcase": "^8.0.0",
+    "eslint": "^9.10.0",
+    "memfs": "^4.11.1",
     "rimraf": "^5.0.10",
-    "vitest": "^1.4.0"
+    "vitest": "^1.6.0"
   },
   "files": [
     "dist",

package/src/lib/createOperationCommonTSDoc.ts

@@ -0,0 +1,11 @@
+import { ServiceOperation } from '@openapi-qraft/plugin/lib/open-api/getServices';
+
+export const createOperationCommonTSDoc = (operation: ServiceOperation) => {
+  return [
+    operation.deprecated ? '@deprecated' : null,
+    operation.summary ? `@summary ${operation.summary}` : null,
+    operation.description ? `@description ${operation.description}` : null,
+  ].filter((comment): comment is NonNullable<typeof comment> =>
+    Boolean(comment)
+  );
+};

package/src/plugin.ts

@@ -26,17 +26,11 @@ export const plugin: QraftCommandPlugin = {
           return arg?.toLowerCase() !== 'false';
         }
       )
-      .option(
-        '--operation-generics-import-path <path>',
-        'Path to operation generics file',
-        '@openapi-qraft/react'
-      )
       .action(async ({ spinner, output, args, services, schema }, resolve) => {
         return void (await generateCode({
           spinner,
           services,
           serviceImports: {
-            operationGenericsImportPath: args.operationGenericsImportPath,
             openapiTypesImportPath: args.openapiTypesImportPath,
           },
           output: {

package/src/ts-factory/getClientFactory.ts

@@ -32,6 +32,9 @@ const getClientImportsFactory = ({
           ),
           ...[
             'APIBasicClientServices',
+            'APIBasicQueryClientServices',
+            'APIUtilityClientServices',
+            'CreateAPIBasicQueryClientOptions',
             'CreateAPIBasicClientOptions',
             'CreateAPIClientOptions',
             'CreateAPIQueryClientOptions',
@@ -111,6 +114,39 @@ const getCreateClientFunctionFactory = () => {
       ),
       undefined
     ),
+    factory.createFunctionDeclaration(
+      [factory.createToken(ts.SyntaxKind.ExportKeyword)],
+      undefined,
+      factory.createIdentifier('createAPIClient'),
+      undefined,
+      [
+        factory.createParameterDeclaration(
+          undefined,
+          undefined,
+          factory.createIdentifier('options'),
+          undefined,
+          factory.createTypeReferenceNode(
+            factory.createIdentifier('CreateAPIBasicQueryClientOptions'),
+            undefined
+          ),
+          undefined
+        ),
+      ],
+      factory.createTypeReferenceNode(
+        factory.createIdentifier('APIBasicQueryClientServices'),
+        [
+          factory.createTypeReferenceNode(
+            factory.createIdentifier('Services'),
+            undefined
+          ),
+          factory.createTypeReferenceNode(
+            factory.createIdentifier('ServiceMethods'),
+            undefined
+          ),
+        ]
+      ),
+      undefined
+    ),
     factory.createFunctionDeclaration(
       [factory.createToken(ts.SyntaxKind.ExportKeyword)],
       undefined,
@@ -144,6 +180,27 @@ const getCreateClientFunctionFactory = () => {
       ),
       undefined
     ),
+    factory.createFunctionDeclaration(
+      [factory.createToken(ts.SyntaxKind.ExportKeyword)],
+      undefined,
+      factory.createIdentifier('createAPIClient'),
+      undefined,
+      [],
+      factory.createTypeReferenceNode(
+        factory.createIdentifier('APIUtilityClientServices'),
+        [
+          factory.createTypeReferenceNode(
+            factory.createIdentifier('Services'),
+            undefined
+          ),
+          factory.createTypeReferenceNode(
+            factory.createIdentifier('ServiceMethods'),
+            undefined
+          ),
+        ]
+      ),
+      undefined
+    ),
     factory.createFunctionDeclaration(
       [factory.createToken(ts.SyntaxKind.ExportKeyword)],
       undefined,
@@ -154,7 +211,7 @@ const getCreateClientFunctionFactory = () => {
           undefined,
           undefined,
           factory.createIdentifier('options'),
-          undefined,
+          factory.createToken(ts.SyntaxKind.QuestionToken),
           factory.createTypeReferenceNode(
             factory.createIdentifier('CreateAPIClientOptions'),
             undefined
@@ -180,9 +237,76 @@ const getCreateClientFunctionFactory = () => {
             ),
           ]
         ),
+        factory.createTypeReferenceNode(
+          factory.createIdentifier('APIUtilityClientServices'),
+          [
+            factory.createTypeReferenceNode(
+              factory.createIdentifier('Services'),
+              undefined
+            ),
+            factory.createTypeReferenceNode(
+              factory.createIdentifier('ServiceMethods'),
+              undefined
+            ),
+          ]
+        ),
       ]),
       factory.createBlock(
         [
+          factory.createIfStatement(
+            factory.createPrefixUnaryExpression(
+              ts.SyntaxKind.ExclamationToken,
+              factory.createIdentifier('options')
+            ),
+            factory.createReturnStatement(
+              factory.createCallExpression(
+                factory.createIdentifier('qraftAPIClient'),
+                [
+                  factory.createTypeReferenceNode(
+                    factory.createIdentifier('Services'),
+                    undefined
+                  ),
+                  factory.createTypeReferenceNode(
+                    factory.createIdentifier('ServiceMethods'),
+                    undefined
+                  ),
+                ],
+                [
+                  factory.createIdentifier('services'),
+                  factory.createIdentifier('callbacks'),
+                ]
+              )
+            ),
+            undefined
+          ),
+          factory.createIfStatement(
+            factory.createBinaryExpression(
+              factory.createStringLiteral('requestFn'),
+              factory.createToken(ts.SyntaxKind.InKeyword),
+              factory.createIdentifier('options')
+            ),
+            factory.createReturnStatement(
+              factory.createCallExpression(
+                factory.createIdentifier('qraftAPIClient'),
+                [
+                  factory.createTypeReferenceNode(
+                    factory.createIdentifier('Services'),
+                    undefined
+                  ),
+                  factory.createTypeReferenceNode(
+                    factory.createIdentifier('ServiceMethods'),
+                    undefined
+                  ),
+                ],
+                [
+                  factory.createIdentifier('services'),
+                  factory.createIdentifier('callbacks'),
+                  factory.createIdentifier('options'),
+                ]
+              )
+            ),
+            undefined
+          ),
           factory.createReturnStatement(
             factory.createCallExpression(
               factory.createIdentifier('qraftAPIClient'),

package/src/ts-factory/getCreatePredefinedParametersRequestFnFactory.ts

@@ -59,7 +59,7 @@ const getCreatePredefinedParametersRequestFnImportsFactory = ({
             factory.createIdentifier('qraftPredefinedParametersRequestFn')
           ),
           factory.createImportSpecifier(
-            false,
+            true,
             undefined,
             factory.createIdentifier('QraftPredefinedParameterValue')
           ),
@@ -73,7 +73,7 @@ const getCreatePredefinedParametersRequestFnImportsFactory = ({
     factory.createImportDeclaration(
       undefined,
       factory.createImportClause(
-        false,
+        true,
         undefined,
         factory.createNamedImports([
           factory.createImportSpecifier(