@kubb/plugin-client 5.0.0-alpha.31 → 5.0.0-alpha.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-client",
-  "version": "5.0.0-alpha.31",
+  "version": "5.0.0-alpha.32",
   "description": "API client generator plugin for Kubb, creating type-safe HTTP clients (Axios, Fetch) from OpenAPI specifications for making API requests.",
   "keywords": [
     "api-client",
@@ -94,19 +94,17 @@
     }
   ],
   "dependencies": {
-    "@kubb/fabric-core": "0.15.1",
     "@kubb/react-fabric": "0.15.1",
-    "@kubb/ast": "5.0.0-alpha.31",
-    "@kubb/core": "5.0.0-alpha.31",
-    "@kubb/plugin-ts": "5.0.0-alpha.31",
-    "@kubb/plugin-zod": "5.0.0-alpha.31"
+    "@kubb/ast": "5.0.0-alpha.32",
+    "@kubb/core": "5.0.0-alpha.32",
+    "@kubb/plugin-ts": "5.0.0-alpha.32",
+    "@kubb/plugin-zod": "5.0.0-alpha.32"
   },
   "devDependencies": {
     "axios": "^1.14.0",
     "@internals/utils": "0.0.0"
   },
   "peerDependencies": {
-    "@kubb/fabric-core": "0.15.1",
     "@kubb/react-fabric": "0.15.1",
     "axios": "^1.7.2"
   },

package/src/components/Client.tsx

@@ -1,5 +1,5 @@
 import { isValidVarName, URLPath } from '@internals/utils'
-import { caseParams, createFunctionParameter, createOperationParams, createTypeNode } from '@kubb/ast'
+import { caseParams, createFunctionParameter, createOperationParams, createParamsType } from '@kubb/ast'
 import type { FunctionParametersNode, OperationNode } from '@kubb/ast/types'
 import type { PluginTs } from '@kubb/plugin-ts'
 import { functionPrinter } from '@kubb/plugin-ts'
@@ -53,7 +53,7 @@ function getParams({ paramsType, paramsCasing, pathParamsType, node, tsResolver,
       ? [
           createFunctionParameter({
             name: 'config',
-            type: createTypeNode({
+            type: createParamsType({
               variant: 'reference',
               name: requestName ? `Partial<RequestConfig<${requestName}>> & { client?: Client }` : 'Partial<RequestConfig> & { client?: Client }',
             }),

package/src/generators/classClientGenerator.tsx

@@ -1,7 +1,6 @@
 import path from 'node:path'
 import { camelCase, pascalCase } from '@internals/utils'
-import type { OperationNode } from '@kubb/ast/types'
-import type { KubbFile } from '@kubb/core'
+import type { FileNode, OperationNode } from '@kubb/ast/types'
 import { defineGenerator } from '@kubb/core'
 import type { PluginTs } from '@kubb/plugin-ts'
 import { pluginTsName } from '@kubb/plugin-ts'
@@ -17,13 +16,13 @@ type OperationData = {
   name: string
   tsResolver: PluginTs['resolver']
   zodResolver: PluginZod['resolver'] | undefined
-  typeFile: KubbFile.File
-  zodFile: KubbFile.File | undefined
+  typeFile: FileNode
+  zodFile: FileNode | undefined
 }
 
 type Controller = {
   name: string
-  file: KubbFile.File
+  file: FileNode
   operations: Array<OperationData>
 }
 
@@ -49,7 +48,7 @@ export const classClientGenerator = defineGenerator<PluginClient>({
   operations(nodes, options) {
     const { adapter, config, driver, resolver, root } = this
     const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, wrapper } = options
-    const baseURL = options.baseURL ?? adapter.rootNode?.meta?.baseURL
+    const baseURL = options.baseURL ?? adapter.inputNode?.meta?.baseURL
 
     const pluginTs = driver.getPlugin(pluginTsName)
     if (!pluginTs?.resolver) return null
@@ -118,7 +117,7 @@ export const classClientGenerator = defineGenerator<PluginClient>({
 
     function collectTypeImports(ops: Array<OperationData>) {
       const typeImportsByFile = new Map<string, Set<string>>()
-      const typeFilesByPath = new Map<string, KubbFile.File>()
+      const typeFilesByPath = new Map<string, FileNode>()
 
       ops.forEach((op) => {
         const names = resolveTypeImportNames(op.node, tsResolver)
@@ -137,7 +136,7 @@ export const classClientGenerator = defineGenerator<PluginClient>({
 
     function collectZodImports(ops: Array<OperationData>) {
       const zodImportsByFile = new Map<string, Set<string>>()
-      const zodFilesByPath = new Map<string, KubbFile.File>()
+      const zodFilesByPath = new Map<string, FileNode>()
 
       ops.forEach((op) => {
         if (!op.zodFile || !zodResolver) return
@@ -158,7 +157,7 @@ export const classClientGenerator = defineGenerator<PluginClient>({
     const files = controllers.map(({ name, file, operations: ops }) => {
       const { typeImportsByFile, typeFilesByPath } = collectTypeImports(ops)
       const { zodImportsByFile, zodFilesByPath } =
-        parser === 'zod' ? collectZodImports(ops) : { zodImportsByFile: new Map<string, Set<string>>(), zodFilesByPath: new Map<string, KubbFile.File>() }
+        parser === 'zod' ? collectZodImports(ops) : { zodImportsByFile: new Map<string, Set<string>>(), zodFilesByPath: new Map<string, FileNode>() }
       const hasFormData = ops.some((op) => op.node.requestBody?.contentType === 'multipart/form-data')
 
       return (
@@ -167,8 +166,8 @@ export const classClientGenerator = defineGenerator<PluginClient>({
           baseName={file.baseName}
           path={file.path}
           meta={file.meta}
-          banner={resolver.resolveBanner(adapter.rootNode, { output, config })}
-          footer={resolver.resolveFooter(adapter.rootNode, { output, config })}
+          banner={resolver.resolveBanner(adapter.inputNode, { output, config })}
+          footer={resolver.resolveFooter(adapter.inputNode, { output, config })}
         >
           {importPath ? (
             <>
@@ -226,8 +225,8 @@ export const classClientGenerator = defineGenerator<PluginClient>({
           baseName={wrapperFile.baseName}
           path={wrapperFile.path}
           meta={wrapperFile.meta}
-          banner={resolver.resolveBanner(adapter.rootNode, { output, config })}
-          footer={resolver.resolveFooter(adapter.rootNode, { output, config })}
+          banner={resolver.resolveBanner(adapter.inputNode, { output, config })}
+          footer={resolver.resolveFooter(adapter.inputNode, { output, config })}
         >
           {importPath ? (
             <File.Import name={['Client', 'RequestConfig']} path={importPath} isTypeOnly />

package/src/generators/clientGenerator.tsx

@@ -13,7 +13,7 @@ export const clientGenerator = defineGenerator<PluginClient>({
   operation(node, options) {
     const { adapter, config, driver, resolver, root } = this
     const { output, urlType, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, group } = options
-    const baseURL = options.baseURL ?? adapter.rootNode?.meta?.baseURL
+    const baseURL = options.baseURL ?? adapter.inputNode?.meta?.baseURL
 
     const pluginTs = driver.getPlugin(pluginTsName)
 
@@ -77,8 +77,8 @@ export const clientGenerator = defineGenerator<PluginClient>({
         baseName={meta.file.baseName}
         path={meta.file.path}
         meta={meta.file.meta}
-        banner={resolver.resolveBanner(adapter.rootNode, { output, config })}
-        footer={resolver.resolveFooter(adapter.rootNode, { output, config })}
+        banner={resolver.resolveBanner(adapter.inputNode, { output, config })}
+        footer={resolver.resolveFooter(adapter.inputNode, { output, config })}
       >
         {importPath ? (
           <>

package/src/generators/groupedClientGenerator.tsx

@@ -1,5 +1,5 @@
 import { camelCase } from '@internals/utils'
-import type { KubbFile } from '@kubb/core'
+import type { FileNode } from '@kubb/ast/types'
 import { defineGenerator } from '@kubb/core'
 import { File, Function } from '@kubb/react-fabric'
 import type { PluginClient } from '../types'
@@ -42,7 +42,7 @@ export const groupedClientGenerator = defineGenerator<PluginClient>({
 
         return acc
       },
-      [] as Array<{ name: string; file: KubbFile.File; clients: Array<{ name: string; file: KubbFile.File }> }>,
+      [] as Array<{ name: string; file: FileNode; clients: Array<{ name: string; file: FileNode }> }>,
     )
 
     return (
@@ -54,8 +54,8 @@ export const groupedClientGenerator = defineGenerator<PluginClient>({
               baseName={file.baseName}
               path={file.path}
               meta={file.meta}
-              banner={resolver.resolveBanner(adapter.rootNode, { output, config })}
-              footer={resolver.resolveFooter(adapter.rootNode, { output, config })}
+              banner={resolver.resolveBanner(adapter.inputNode, { output, config })}
+              footer={resolver.resolveFooter(adapter.inputNode, { output, config })}
             >
               {clients.map((client) => (
                 <File.Import key={client.name} name={[client.name]} root={file.path} path={client.file.path} />

package/src/generators/operationsGenerator.tsx

@@ -17,8 +17,8 @@ export const operationsGenerator = defineGenerator<PluginClient>({
         baseName={file.baseName}
         path={file.path}
         meta={file.meta}
-        banner={resolver.resolveBanner(adapter.rootNode, { output, config })}
-        footer={resolver.resolveFooter(adapter.rootNode, { output, config })}
+        banner={resolver.resolveBanner(adapter.inputNode, { output, config })}
+        footer={resolver.resolveFooter(adapter.inputNode, { output, config })}
       >
         <Operations name={name} nodes={nodes} />
       </File>

package/src/generators/staticClassClientGenerator.tsx

@@ -1,7 +1,6 @@
 import path from 'node:path'
 import { camelCase, pascalCase } from '@internals/utils'
-import type { OperationNode } from '@kubb/ast/types'
-import type { KubbFile } from '@kubb/core'
+import type { FileNode, OperationNode } from '@kubb/ast/types'
 import { defineGenerator } from '@kubb/core'
 import type { PluginTs } from '@kubb/plugin-ts'
 import { pluginTsName } from '@kubb/plugin-ts'
@@ -16,13 +15,13 @@ type OperationData = {
   name: string
   tsResolver: PluginTs['resolver']
   zodResolver: PluginZod['resolver'] | undefined
-  typeFile: KubbFile.File
-  zodFile: KubbFile.File | undefined
+  typeFile: FileNode
+  zodFile: FileNode | undefined
 }
 
 type Controller = {
   name: string
-  file: KubbFile.File
+  file: FileNode
   operations: Array<OperationData>
 }
 
@@ -48,7 +47,7 @@ export const staticClassClientGenerator = defineGenerator<PluginClient>({
   operations(nodes, options) {
     const { adapter, config, driver, resolver, root } = this
     const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath } = options
-    const baseURL = options.baseURL ?? adapter.rootNode?.meta?.baseURL
+    const baseURL = options.baseURL ?? adapter.inputNode?.meta?.baseURL
 
     const pluginTs = driver.getPlugin(pluginTsName)
     if (!pluginTs?.resolver) return null
@@ -117,7 +116,7 @@ export const staticClassClientGenerator = defineGenerator<PluginClient>({
 
     function collectTypeImports(ops: Array<OperationData>) {
       const typeImportsByFile = new Map<string, Set<string>>()
-      const typeFilesByPath = new Map<string, KubbFile.File>()
+      const typeFilesByPath = new Map<string, FileNode>()
 
       ops.forEach((op) => {
         const names = resolveTypeImportNames(op.node, tsResolver)
@@ -136,7 +135,7 @@ export const staticClassClientGenerator = defineGenerator<PluginClient>({
 
     function collectZodImports(ops: Array<OperationData>) {
       const zodImportsByFile = new Map<string, Set<string>>()
-      const zodFilesByPath = new Map<string, KubbFile.File>()
+      const zodFilesByPath = new Map<string, FileNode>()
 
       ops.forEach((op) => {
         if (!op.zodFile || !zodResolver) return
@@ -159,7 +158,7 @@ export const staticClassClientGenerator = defineGenerator<PluginClient>({
         {controllers.map(({ name, file, operations: ops }) => {
           const { typeImportsByFile, typeFilesByPath } = collectTypeImports(ops)
           const { zodImportsByFile, zodFilesByPath } =
-            parser === 'zod' ? collectZodImports(ops) : { zodImportsByFile: new Map<string, Set<string>>(), zodFilesByPath: new Map<string, KubbFile.File>() }
+            parser === 'zod' ? collectZodImports(ops) : { zodImportsByFile: new Map<string, Set<string>>(), zodFilesByPath: new Map<string, FileNode>() }
           const hasFormData = ops.some((op) => op.node.requestBody?.contentType === 'multipart/form-data')
 
           return (
@@ -168,8 +167,8 @@ export const staticClassClientGenerator = defineGenerator<PluginClient>({
               baseName={file.baseName}
               path={file.path}
               meta={file.meta}
-              banner={resolver.resolveBanner(adapter.rootNode, { output, config })}
-              footer={resolver.resolveFooter(adapter.rootNode, { output, config })}
+              banner={resolver.resolveBanner(adapter.inputNode, { output, config })}
+              footer={resolver.resolveFooter(adapter.inputNode, { output, config })}
             >
               {importPath ? (
                 <>

package/src/plugin.ts

@@ -1,5 +1,6 @@
 import path from 'node:path'
 import { camelCase } from '@internals/utils'
+import { createFile, createSource } from '@kubb/ast'
 import { createPlugin, type Group, getPreset, mergeGenerators } from '@kubb/core'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
@@ -161,36 +162,36 @@ export const pluginClient = createPlugin<PluginClient>((options) => {
 
       // pre add bundled fetch
       if (bundle && !plugin.options.importPath) {
-        await this.addFile({
-          baseName: 'fetch.ts',
-          path: path.resolve(root, '.kubb/fetch.ts'),
-          sources: [
-            {
-              name: 'fetch',
-              value: plugin.options.client === 'fetch' ? fetchClientSource : axiosClientSource,
-              isExportable: true,
-              isIndexable: true,
-            },
-          ],
-          imports: [],
-          exports: [],
-        })
+        await this.addFile(
+          createFile({
+            baseName: 'fetch.ts',
+            path: path.resolve(root, '.kubb/fetch.ts'),
+            sources: [
+              createSource({
+                name: 'fetch',
+                value: plugin.options.client === 'fetch' ? fetchClientSource : axiosClientSource,
+                isExportable: true,
+                isIndexable: true,
+              }),
+            ],
+          }),
+        )
       }
 
-      await this.addFile({
-        baseName: 'config.ts',
-        path: path.resolve(root, '.kubb/config.ts'),
-        sources: [
-          {
-            name: 'config',
-            value: configSource,
-            isExportable: false,
-            isIndexable: false,
-          },
-        ],
-        imports: [],
-        exports: [],
-      })
+      await this.addFile(
+        createFile({
+          baseName: 'config.ts',
+          path: path.resolve(root, '.kubb/config.ts'),
+          sources: [
+            createSource({
+              name: 'config',
+              value: configSource,
+              isExportable: false,
+              isIndexable: false,
+            }),
+          ],
+        }),
+      )
     },
   }
 })