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

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(