@kubb/plugin-react-query 5.0.0-alpha.31 → 5.0.0-alpha.33

package/dist/index.js

@@ -1,7 +1,8 @@
 import "./chunk--u3MIqq1.js";
-import { d as MutationKey, f as camelCase, p as pascalCase, u as QueryKey } from "./components-HG1bVVRU.js";
-import { a as infiniteQueryGenerator, i as mutationGenerator, n as suspenseInfiniteQueryGenerator, o as hookOptionsGenerator, r as queryGenerator, s as customHookOptionsFileGenerator, t as suspenseQueryGenerator } from "./generators-BZKMuZRH.js";
+import { d as MutationKey, f as camelCase, p as pascalCase, u as QueryKey } from "./components-DTiE-FKc.js";
+import { a as infiniteQueryGenerator, i as mutationGenerator, n as suspenseInfiniteQueryGenerator, o as hookOptionsGenerator, r as queryGenerator, s as customHookOptionsFileGenerator, t as suspenseQueryGenerator } from "./generators-DnnpkRmx.js";
 import path from "node:path";
+import { createFile, createSource, createText } from "@kubb/ast";
 import { createPlugin, getBarrelFiles } from "@kubb/core";
 import { pluginClientName } from "@kubb/plugin-client";
 import { source } from "@kubb/plugin-client/templates/clients/axios.source";
@@ -11,7 +12,7 @@ import { OperationGenerator, pluginOasName } from "@kubb/plugin-oas";
 import { pluginTsName } from "@kubb/plugin-ts";
 import { pluginZodName } from "@kubb/plugin-zod";
 //#region package.json
-var version = "5.0.0-alpha.31";
+var version = "5.0.0-alpha.33";
 //#endregion
 //#region src/plugin.ts
 const pluginReactQueryName = "plugin-react-query";
@@ -120,32 +121,27 @@ const pluginReactQuery = createPlugin((options) => {
 			const baseURL = await this.getBaseURL();
 			if (baseURL) this.plugin.options.client.baseURL = baseURL;
 			const hasClientPlugin = !!this.getPlugin(pluginClientName);
-			if (this.plugin.options.client.bundle && !hasClientPlugin && !this.plugin.options.client.importPath) await this.upsertFile({
+			if (this.plugin.options.client.bundle && !hasClientPlugin && !this.plugin.options.client.importPath) await this.upsertFile(createFile({
 				baseName: "fetch.ts",
 				path: path.resolve(root, ".kubb/fetch.ts"),
-				sources: [{
+				sources: [createSource({
 					name: "fetch",
-					value: this.plugin.options.client.client === "fetch" ? source$1 : source,
+					nodes: [createText(this.plugin.options.client.client === "fetch" ? source$1 : source)],
 					isExportable: true,
 					isIndexable: true
-				}],
-				imports: [],
-				exports: []
-			});
-			if (!hasClientPlugin) await this.upsertFile({
+				})]
+			}));
+			if (!hasClientPlugin) await this.upsertFile(createFile({
 				baseName: "config.ts",
 				path: path.resolve(root, ".kubb/config.ts"),
-				sources: [{
+				sources: [createSource({
 					name: "config",
-					value: source$2,
+					nodes: [createText(source$2)],
 					isExportable: false,
 					isIndexable: false
-				}],
-				imports: [],
-				exports: []
-			});
+				})]
+			}));
 			const files = await new OperationGenerator(this.plugin.options, {
-				fabric: this.fabric,
 				oas,
 				driver: this.driver,
 				events: this.events,
@@ -157,7 +153,7 @@ const pluginReactQuery = createPlugin((options) => {
 				mode
 			}).build(...generators);
 			await this.upsertFile(...files);
-			const barrelFiles = await getBarrelFiles(this.fabric.files, {
+			const barrelFiles = await getBarrelFiles(this.driver.fileManager.files, {
 				type: output.barrelType ?? "named",
 				root,
 				output,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["fetchClientSource","axiosClientSource","configSource"],"sources":["../package.json","../src/plugin.ts"],"sourcesContent":["","import path from 'node:path'\nimport { camelCase, pascalCase } from '@internals/utils'\nimport { createPlugin, getBarrelFiles, type UserGroup } from '@kubb/core'\nimport { pluginClientName } from '@kubb/plugin-client'\nimport { source as axiosClientSource } from '@kubb/plugin-client/templates/clients/axios.source'\nimport { source as fetchClientSource } from '@kubb/plugin-client/templates/clients/fetch.source'\nimport { source as configSource } from '@kubb/plugin-client/templates/config.source'\nimport { OperationGenerator, pluginOasName } from '@kubb/plugin-oas'\nimport { pluginTsName } from '@kubb/plugin-ts'\nimport { pluginZodName } from '@kubb/plugin-zod'\nimport { version } from '../package.json'\nimport { MutationKey } from './components'\nimport { QueryKey } from './components/QueryKey.tsx'\nimport {\n  customHookOptionsFileGenerator,\n  hookOptionsGenerator,\n  infiniteQueryGenerator,\n  mutationGenerator,\n  queryGenerator,\n  suspenseInfiniteQueryGenerator,\n  suspenseQueryGenerator,\n} from './generators'\nimport type { PluginReactQuery } from './types.ts'\n\nexport const pluginReactQueryName = 'plugin-react-query' satisfies PluginReactQuery['name']\n\nexport const pluginReactQuery = createPlugin<PluginReactQuery>((options) => {\n  const {\n    output = { path: 'hooks', barrelType: 'named' },\n    group,\n    exclude = [],\n    include,\n    override = [],\n    parser = 'client',\n    suspense = {},\n    infinite = false,\n    transformers = {},\n    paramsType = 'inline',\n    pathParamsType = paramsType === 'object' ? 'object' : options.pathParamsType || 'inline',\n    generators = [\n      queryGenerator,\n      suspenseQueryGenerator,\n      infiniteQueryGenerator,\n      suspenseInfiniteQueryGenerator,\n      mutationGenerator,\n      hookOptionsGenerator,\n      customHookOptionsFileGenerator,\n    ].filter(Boolean),\n    mutation = {},\n    query = {},\n    mutationKey = MutationKey.getTransformer,\n    queryKey = QueryKey.getTransformer,\n    customOptions,\n    paramsCasing,\n    contentType,\n    client,\n  } = options\n\n  const clientName = client?.client ?? 'axios'\n  const clientImportPath = client?.importPath ?? (!client?.bundle ? `@kubb/plugin-client/clients/${clientName}` : undefined)\n\n  return {\n    name: pluginReactQueryName,\n    version,\n    options: {\n      output,\n      client: {\n        bundle: client?.bundle,\n        baseURL: client?.baseURL,\n        client: clientName,\n        clientType: client?.clientType ?? 'function',\n        dataReturnType: client?.dataReturnType ?? 'data',\n        pathParamsType,\n        importPath: clientImportPath,\n        paramsCasing,\n      },\n      infinite: infinite\n        ? {\n            queryParam: 'id',\n            initialPageParam: 0,\n            cursorParam: undefined,\n            nextParam: undefined,\n            previousParam: undefined,\n            ...infinite,\n          }\n        : false,\n      suspense,\n      queryKey,\n      query:\n        query === false\n          ? false\n          : {\n              methods: ['get'],\n              importPath: '@tanstack/react-query',\n              ...query,\n            },\n      mutationKey,\n      mutation:\n        mutation === false\n          ? false\n          : {\n              methods: ['post', 'put', 'patch', 'delete'],\n              importPath: '@tanstack/react-query',\n              ...mutation,\n            },\n      customOptions: customOptions ? { name: 'useCustomHookOptions', ...customOptions } : undefined,\n      paramsType,\n      pathParamsType,\n      parser,\n      paramsCasing,\n      group,\n      exclude,\n      include,\n      override,\n    },\n    pre: [pluginOasName, pluginTsName, parser === 'zod' ? pluginZodName : undefined].filter(Boolean),\n    resolvePath(baseName, pathMode, options) {\n      const root = this.root\n      const mode = pathMode ?? this.getMode(output)\n\n      if (mode === 'single') {\n        /**\n         * when output is a file then we will always append to the same file(output file), see fileManager.addOrAppend\n         * Other plugins then need to call addOrAppend instead of just add from the fileManager class\n         */\n        return path.resolve(root, output.path)\n      }\n\n      if (group && (options?.group?.path || options?.group?.tag)) {\n        const groupName: UserGroup['name'] = group?.name\n          ? group.name\n          : (ctx) => {\n              if (group?.type === 'path') {\n                return `${ctx.group.split('/')[1]}`\n              }\n              return `${camelCase(ctx.group)}Controller`\n            }\n\n        return path.resolve(\n          root,\n          output.path,\n          groupName({\n            group: group.type === 'path' ? options.group.path! : options.group.tag!,\n          }),\n          baseName,\n        )\n      }\n\n      return path.resolve(root, output.path, baseName)\n    },\n    resolveName(name, type) {\n      let resolvedName = camelCase(name)\n\n      if (type === 'file' || type === 'function') {\n        resolvedName = camelCase(name, {\n          isFile: type === 'file',\n        })\n      }\n      if (type === 'type') {\n        resolvedName = pascalCase(name)\n      }\n\n      if (type) {\n        return transformers?.name?.(resolvedName, type) || resolvedName\n      }\n\n      return resolvedName\n    },\n    async buildStart() {\n      const root = this.root\n      const mode = this.getMode(output)\n      const oas = await this.getOas()\n      const baseURL = await this.getBaseURL()\n\n      if (baseURL) {\n        this.plugin.options.client.baseURL = baseURL\n      }\n\n      const hasClientPlugin = !!this.getPlugin(pluginClientName)\n\n      if (this.plugin.options.client.bundle && !hasClientPlugin && !this.plugin.options.client.importPath) {\n        // pre add bundled fetch\n        await this.upsertFile({\n          baseName: 'fetch.ts',\n          path: path.resolve(root, '.kubb/fetch.ts'),\n          sources: [\n            {\n              name: 'fetch',\n              value: this.plugin.options.client.client === 'fetch' ? fetchClientSource : axiosClientSource,\n              isExportable: true,\n              isIndexable: true,\n            },\n          ],\n          imports: [],\n          exports: [],\n        })\n      }\n\n      if (!hasClientPlugin) {\n        await this.upsertFile({\n          baseName: 'config.ts',\n          path: path.resolve(root, '.kubb/config.ts'),\n          sources: [\n            {\n              name: 'config',\n              value: configSource,\n              isExportable: false,\n              isIndexable: false,\n            },\n          ],\n          imports: [],\n          exports: [],\n        })\n      }\n\n      const operationGenerator = new OperationGenerator(this.plugin.options, {\n        fabric: this.fabric,\n        oas,\n        driver: this.driver,\n        events: this.events,\n        plugin: this.plugin,\n        contentType,\n        exclude,\n        include,\n        override,\n        mode,\n      })\n\n      const files = await operationGenerator.build(...generators)\n      await this.upsertFile(...files)\n\n      const barrelFiles = await getBarrelFiles(this.fabric.files, {\n        type: output.barrelType ?? 'named',\n        root,\n        output,\n        meta: {\n          pluginName: this.plugin.name,\n        },\n      })\n\n      await this.upsertFile(...barrelFiles)\n    },\n  }\n})\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":["fetchClientSource","axiosClientSource","configSource"],"sources":["../package.json","../src/plugin.ts"],"sourcesContent":["","import path from 'node:path'\nimport { camelCase, pascalCase } from '@internals/utils'\nimport { createFile, createSource, createText } from '@kubb/ast'\nimport type { FileNode } from '@kubb/ast/types'\nimport { createPlugin, getBarrelFiles, type UserGroup } from '@kubb/core'\nimport { pluginClientName } from '@kubb/plugin-client'\nimport { source as axiosClientSource } from '@kubb/plugin-client/templates/clients/axios.source'\nimport { source as fetchClientSource } from '@kubb/plugin-client/templates/clients/fetch.source'\nimport { source as configSource } from '@kubb/plugin-client/templates/config.source'\nimport { OperationGenerator, pluginOasName } from '@kubb/plugin-oas'\nimport { pluginTsName } from '@kubb/plugin-ts'\nimport { pluginZodName } from '@kubb/plugin-zod'\nimport { version } from '../package.json'\nimport { MutationKey } from './components'\nimport { QueryKey } from './components/QueryKey.tsx'\nimport {\n  customHookOptionsFileGenerator,\n  hookOptionsGenerator,\n  infiniteQueryGenerator,\n  mutationGenerator,\n  queryGenerator,\n  suspenseInfiniteQueryGenerator,\n  suspenseQueryGenerator,\n} from './generators'\nimport type { PluginReactQuery } from './types.ts'\n\nexport const pluginReactQueryName = 'plugin-react-query' satisfies PluginReactQuery['name']\n\nexport const pluginReactQuery = createPlugin<PluginReactQuery>((options) => {\n  const {\n    output = { path: 'hooks', barrelType: 'named' },\n    group,\n    exclude = [],\n    include,\n    override = [],\n    parser = 'client',\n    suspense = {},\n    infinite = false,\n    transformers = {},\n    paramsType = 'inline',\n    pathParamsType = paramsType === 'object' ? 'object' : options.pathParamsType || 'inline',\n    generators = [\n      queryGenerator,\n      suspenseQueryGenerator,\n      infiniteQueryGenerator,\n      suspenseInfiniteQueryGenerator,\n      mutationGenerator,\n      hookOptionsGenerator,\n      customHookOptionsFileGenerator,\n    ].filter(Boolean),\n    mutation = {},\n    query = {},\n    mutationKey = MutationKey.getTransformer,\n    queryKey = QueryKey.getTransformer,\n    customOptions,\n    paramsCasing,\n    contentType,\n    client,\n  } = options\n\n  const clientName = client?.client ?? 'axios'\n  const clientImportPath = client?.importPath ?? (!client?.bundle ? `@kubb/plugin-client/clients/${clientName}` : undefined)\n\n  return {\n    name: pluginReactQueryName,\n    version,\n    options: {\n      output,\n      client: {\n        bundle: client?.bundle,\n        baseURL: client?.baseURL,\n        client: clientName,\n        clientType: client?.clientType ?? 'function',\n        dataReturnType: client?.dataReturnType ?? 'data',\n        pathParamsType,\n        importPath: clientImportPath,\n        paramsCasing,\n      },\n      infinite: infinite\n        ? {\n            queryParam: 'id',\n            initialPageParam: 0,\n            cursorParam: undefined,\n            nextParam: undefined,\n            previousParam: undefined,\n            ...infinite,\n          }\n        : false,\n      suspense,\n      queryKey,\n      query:\n        query === false\n          ? false\n          : {\n              methods: ['get'],\n              importPath: '@tanstack/react-query',\n              ...query,\n            },\n      mutationKey,\n      mutation:\n        mutation === false\n          ? false\n          : {\n              methods: ['post', 'put', 'patch', 'delete'],\n              importPath: '@tanstack/react-query',\n              ...mutation,\n            },\n      customOptions: customOptions ? { name: 'useCustomHookOptions', ...customOptions } : undefined,\n      paramsType,\n      pathParamsType,\n      parser,\n      paramsCasing,\n      group,\n      exclude,\n      include,\n      override,\n    },\n    pre: [pluginOasName, pluginTsName, parser === 'zod' ? pluginZodName : undefined].filter(Boolean),\n    resolvePath(baseName, pathMode, options) {\n      const root = this.root\n      const mode = pathMode ?? this.getMode(output)\n\n      if (mode === 'single') {\n        /**\n         * when output is a file then we will always append to the same file(output file), see fileManager.addOrAppend\n         * Other plugins then need to call addOrAppend instead of just add from the fileManager class\n         */\n        return path.resolve(root, output.path)\n      }\n\n      if (group && (options?.group?.path || options?.group?.tag)) {\n        const groupName: UserGroup['name'] = group?.name\n          ? group.name\n          : (ctx) => {\n              if (group?.type === 'path') {\n                return `${ctx.group.split('/')[1]}`\n              }\n              return `${camelCase(ctx.group)}Controller`\n            }\n\n        return path.resolve(\n          root,\n          output.path,\n          groupName({\n            group: group.type === 'path' ? options.group.path! : options.group.tag!,\n          }),\n          baseName,\n        )\n      }\n\n      return path.resolve(root, output.path, baseName)\n    },\n    resolveName(name, type) {\n      let resolvedName = camelCase(name)\n\n      if (type === 'file' || type === 'function') {\n        resolvedName = camelCase(name, {\n          isFile: type === 'file',\n        })\n      }\n      if (type === 'type') {\n        resolvedName = pascalCase(name)\n      }\n\n      if (type) {\n        return transformers?.name?.(resolvedName, type) || resolvedName\n      }\n\n      return resolvedName\n    },\n    async buildStart() {\n      const root = this.root\n      const mode = this.getMode(output)\n      const oas = await this.getOas()\n      const baseURL = await this.getBaseURL()\n\n      if (baseURL) {\n        this.plugin.options.client.baseURL = baseURL\n      }\n\n      const hasClientPlugin = !!this.getPlugin(pluginClientName)\n\n      if (this.plugin.options.client.bundle && !hasClientPlugin && !this.plugin.options.client.importPath) {\n        // pre add bundled fetch\n        await this.upsertFile(\n          createFile({\n            baseName: 'fetch.ts',\n            path: path.resolve(root, '.kubb/fetch.ts'),\n            sources: [\n              createSource({\n                name: 'fetch',\n                nodes: [createText(this.plugin.options.client.client === 'fetch' ? fetchClientSource : axiosClientSource)],\n                isExportable: true,\n                isIndexable: true,\n              }),\n            ],\n          }),\n        )\n      }\n\n      if (!hasClientPlugin) {\n        await this.upsertFile(\n          createFile({\n            baseName: 'config.ts',\n            path: path.resolve(root, '.kubb/config.ts'),\n            sources: [\n              createSource({\n                name: 'config',\n                nodes: [createText(configSource)],\n                isExportable: false,\n                isIndexable: false,\n              }),\n            ],\n          }),\n        )\n      }\n\n      const operationGenerator = new OperationGenerator(this.plugin.options, {\n        oas,\n        driver: this.driver,\n        events: this.events,\n        plugin: this.plugin,\n        contentType,\n        exclude,\n        include,\n        override,\n        mode,\n      })\n\n      const files = await operationGenerator.build(...generators)\n      await this.upsertFile(...files)\n\n      const barrelFiles = await getBarrelFiles(this.driver.fileManager.files as unknown as FileNode[], {\n        type: output.barrelType ?? 'named',\n        root,\n        output,\n        meta: {\n          pluginName: this.plugin.name,\n        },\n      })\n\n      await this.upsertFile(...barrelFiles)\n    },\n  }\n})\n"],"mappings":";;;;;;;;;;;;;;;;;AC0BA,MAAa,uBAAuB;AAEpC,MAAa,mBAAmB,cAAgC,YAAY;CAC1E,MAAM,EACJ,SAAS;EAAE,MAAM;EAAS,YAAY;EAAS,EAC/C,OACA,UAAU,EAAE,EACZ,SACA,WAAW,EAAE,EACb,SAAS,UACT,WAAW,EAAE,EACb,WAAW,OACX,eAAe,EAAE,EACjB,aAAa,UACb,iBAAiB,eAAe,WAAW,WAAW,QAAQ,kBAAkB,UAChF,aAAa;EACX;EACA;EACA;EACA;EACA;EACA;EACA;EACD,CAAC,OAAO,QAAQ,EACjB,WAAW,EAAE,EACb,QAAQ,EAAE,EACV,cAAc,YAAY,gBAC1B,WAAW,SAAS,gBACpB,eACA,cACA,aACA,WACE;CAEJ,MAAM,aAAa,QAAQ,UAAU;CACrC,MAAM,mBAAmB,QAAQ,eAAe,CAAC,QAAQ,SAAS,+BAA+B,eAAe,KAAA;AAEhH,QAAO;EACL,MAAM;EACN;EACA,SAAS;GACP;GACA,QAAQ;IACN,QAAQ,QAAQ;IAChB,SAAS,QAAQ;IACjB,QAAQ;IACR,YAAY,QAAQ,cAAc;IAClC,gBAAgB,QAAQ,kBAAkB;IAC1C;IACA,YAAY;IACZ;IACD;GACD,UAAU,WACN;IACE,YAAY;IACZ,kBAAkB;IAClB,aAAa,KAAA;IACb,WAAW,KAAA;IACX,eAAe,KAAA;IACf,GAAG;IACJ,GACD;GACJ;GACA;GACA,OACE,UAAU,QACN,QACA;IACE,SAAS,CAAC,MAAM;IAChB,YAAY;IACZ,GAAG;IACJ;GACP;GACA,UACE,aAAa,QACT,QACA;IACE,SAAS;KAAC;KAAQ;KAAO;KAAS;KAAS;IAC3C,YAAY;IACZ,GAAG;IACJ;GACP,eAAe,gBAAgB;IAAE,MAAM;IAAwB,GAAG;IAAe,GAAG,KAAA;GACpF;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACD;EACD,KAAK;GAAC;GAAe;GAAc,WAAW,QAAQ,gBAAgB,KAAA;GAAU,CAAC,OAAO,QAAQ;EAChG,YAAY,UAAU,UAAU,SAAS;GACvC,MAAM,OAAO,KAAK;AAGlB,QAFa,YAAY,KAAK,QAAQ,OAAO,MAEhC;;;;;AAKX,UAAO,KAAK,QAAQ,MAAM,OAAO,KAAK;AAGxC,OAAI,UAAU,SAAS,OAAO,QAAQ,SAAS,OAAO,MAAM;IAC1D,MAAM,YAA+B,OAAO,OACxC,MAAM,QACL,QAAQ;AACP,SAAI,OAAO,SAAS,OAClB,QAAO,GAAG,IAAI,MAAM,MAAM,IAAI,CAAC;AAEjC,YAAO,GAAG,UAAU,IAAI,MAAM,CAAC;;AAGrC,WAAO,KAAK,QACV,MACA,OAAO,MACP,UAAU,EACR,OAAO,MAAM,SAAS,SAAS,QAAQ,MAAM,OAAQ,QAAQ,MAAM,KACpE,CAAC,EACF,SACD;;AAGH,UAAO,KAAK,QAAQ,MAAM,OAAO,MAAM,SAAS;;EAElD,YAAY,MAAM,MAAM;GACtB,IAAI,eAAe,UAAU,KAAK;AAElC,OAAI,SAAS,UAAU,SAAS,WAC9B,gBAAe,UAAU,MAAM,EAC7B,QAAQ,SAAS,QAClB,CAAC;AAEJ,OAAI,SAAS,OACX,gBAAe,WAAW,KAAK;AAGjC,OAAI,KACF,QAAO,cAAc,OAAO,cAAc,KAAK,IAAI;AAGrD,UAAO;;EAET,MAAM,aAAa;GACjB,MAAM,OAAO,KAAK;GAClB,MAAM,OAAO,KAAK,QAAQ,OAAO;GACjC,MAAM,MAAM,MAAM,KAAK,QAAQ;GAC/B,MAAM,UAAU,MAAM,KAAK,YAAY;AAEvC,OAAI,QACF,MAAK,OAAO,QAAQ,OAAO,UAAU;GAGvC,MAAM,kBAAkB,CAAC,CAAC,KAAK,UAAU,iBAAiB;AAE1D,OAAI,KAAK,OAAO,QAAQ,OAAO,UAAU,CAAC,mBAAmB,CAAC,KAAK,OAAO,QAAQ,OAAO,WAEvF,OAAM,KAAK,WACT,WAAW;IACT,UAAU;IACV,MAAM,KAAK,QAAQ,MAAM,iBAAiB;IAC1C,SAAS,CACP,aAAa;KACX,MAAM;KACN,OAAO,CAAC,WAAW,KAAK,OAAO,QAAQ,OAAO,WAAW,UAAUA,WAAoBC,OAAkB,CAAC;KAC1G,cAAc;KACd,aAAa;KACd,CAAC,CACH;IACF,CAAC,CACH;AAGH,OAAI,CAAC,gBACH,OAAM,KAAK,WACT,WAAW;IACT,UAAU;IACV,MAAM,KAAK,QAAQ,MAAM,kBAAkB;IAC3C,SAAS,CACP,aAAa;KACX,MAAM;KACN,OAAO,CAAC,WAAWC,SAAa,CAAC;KACjC,cAAc;KACd,aAAa;KACd,CAAC,CACH;IACF,CAAC,CACH;GAeH,MAAM,QAAQ,MAZa,IAAI,mBAAmB,KAAK,OAAO,SAAS;IACrE;IACA,QAAQ,KAAK;IACb,QAAQ,KAAK;IACb,QAAQ,KAAK;IACb;IACA;IACA;IACA;IACA;IACD,CAAC,CAEqC,MAAM,GAAG,WAAW;AAC3D,SAAM,KAAK,WAAW,GAAG,MAAM;GAE/B,MAAM,cAAc,MAAM,eAAe,KAAK,OAAO,YAAY,OAAgC;IAC/F,MAAM,OAAO,cAAc;IAC3B;IACA;IACA,MAAM,EACJ,YAAY,KAAK,OAAO,MACzB;IACF,CAAC;AAEF,SAAM,KAAK,WAAW,GAAG,YAAY;;EAExC;EACD"}

package/dist/{types-DMLrT2SW.d.ts → types-Crg16xc2.d.ts}

@@ -1,11 +1,10 @@
 import { t as __name } from "./chunk--u3MIqq1.js";
-import { Output, PluginFactoryOptions, ResolveNameParams, UserGroup } from "@kubb/core";
+import { FunctionParams, Output, PluginFactoryOptions, ResolveNameParams, UserGroup } from "@kubb/core";
 import { ClientImportPath, PluginClient } from "@kubb/plugin-client";
 import { Exclude, Include, OperationSchemas, Override, ResolvePathOptions } from "@kubb/plugin-oas";
 import { HttpMethod, Oas, Operation, contentType } from "@kubb/oas";
-import { FunctionParams } from "@kubb/react-fabric";
 import { Generator } from "@kubb/plugin-oas/generators";
-import { FabricReactNode } from "@kubb/react-fabric/types";
+import { KubbReactNode } from "@kubb/renderer-jsx/types";
 
 //#region ../../internals/tanstack-query/src/types.d.ts
 type ParamsCasing = 'camelcase' | undefined;
@@ -39,7 +38,7 @@ declare function MutationKey$1({
   operation,
   typeName,
   transformer
-}: Props$1): FabricReactNode;
+}: Props$1): KubbReactNode;
 declare namespace MutationKey$1 {
   var getParams: ({}: GetParamsProps$1) => FunctionParams;
   var getTransformer: Transformer;
@@ -68,7 +67,7 @@ declare function QueryKey$1({
   operation,
   typeName,
   transformer
-}: Props): FabricReactNode;
+}: Props): KubbReactNode;
 declare namespace QueryKey$1 {
   var getParams: ({
     pathParamsType,
@@ -277,4 +276,4 @@ declare global {
 }
 //#endregion
 export { MutationKey$1 as a, QueryKey$1 as i, Options as n, PluginReactQuery as r, Infinite as t };
-//# sourceMappingURL=types-DMLrT2SW.d.ts.map
+//# sourceMappingURL=types-Crg16xc2.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-react-query",
-  "version": "5.0.0-alpha.31",
+  "version": "5.0.0-alpha.33",
   "description": "React Query hooks generator plugin for Kubb, creating type-safe API client hooks from OpenAPI specifications for React applications.",
   "keywords": [
     "react-query",
@@ -71,19 +71,18 @@
     }
   ],
   "dependencies": {
-    "@kubb/fabric-core": "0.15.1",
-    "@kubb/react-fabric": "0.15.1",
     "remeda": "^2.33.7",
-    "@kubb/core": "5.0.0-alpha.31",
-    "@kubb/oas": "5.0.0-alpha.31",
-    "@kubb/plugin-client": "5.0.0-alpha.31",
-    "@kubb/plugin-oas": "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.33",
+    "@kubb/core": "5.0.0-alpha.33",
+    "@kubb/oas": "5.0.0-alpha.33",
+    "@kubb/plugin-client": "5.0.0-alpha.33",
+    "@kubb/plugin-oas": "5.0.0-alpha.33",
+    "@kubb/plugin-ts": "5.0.0-alpha.33",
+    "@kubb/plugin-zod": "5.0.0-alpha.33",
+    "@kubb/renderer-jsx": "5.0.0-alpha.33"
   },
   "peerDependencies": {
-    "@kubb/fabric-core": "0.15.1",
-    "@kubb/react-fabric": "0.15.1"
+    "@kubb/renderer-jsx": "5.0.0-alpha.33"
   },
   "engines": {
     "node": ">=22"

package/src/components/InfiniteQuery.tsx

@@ -1,8 +1,9 @@
+import { FunctionParams } from '@kubb/core'
 import { isAllOptional, isOptional, type Operation } from '@kubb/oas'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getComments, getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { Infinite, PluginReactQuery } from '../types.ts'
 import { QueryKey } from './QueryKey.tsx'
 import { QueryOptions } from './QueryOptions.tsx'
@@ -136,7 +137,7 @@ export function InfiniteQuery({
   initialPageParam,
   queryParam,
   customOptions,
-}: Props): FabricReactNode {
+}: Props): KubbReactNode {
   const responseType = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
   const errorType = `ResponseErrorConfig<${typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'}>`
   const isInitialPageParamDefined = initialPageParam !== undefined && initialPageParam !== null

package/src/components/InfiniteQueryOptions.tsx

@@ -1,10 +1,11 @@
 import { getNestedAccessor } from '@internals/utils'
+import { FunctionParams } from '@kubb/core'
 import { isAllOptional, isOptional } from '@kubb/oas'
 import { ClientLegacy as Client } from '@kubb/plugin-client'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { Infinite, PluginReactQuery } from '../types.ts'
 import { QueryKey } from './QueryKey.tsx'
 
@@ -127,7 +128,7 @@ export function InfiniteQueryOptions({
   pathParamsType,
   queryParam,
   queryKeyName,
-}: Props): FabricReactNode {
+}: Props): KubbReactNode {
   const queryFnDataType = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
   const errorType = `ResponseErrorConfig<${typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'}>`
   const isInitialPageParamDefined = initialPageParam !== undefined && initialPageParam !== null

package/src/components/Mutation.tsx

@@ -1,8 +1,9 @@
+import { FunctionParams } from '@kubb/core'
 import { isOptional, type Operation } from '@kubb/oas'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getComments, getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginReactQuery } from '../types.ts'
 import { MutationKey } from './MutationKey.tsx'
 import { MutationOptions } from './MutationOptions.tsx'
@@ -82,7 +83,7 @@ export function Mutation({
   operation,
   mutationKeyName,
   customOptions,
-}: Props): FabricReactNode {
+}: Props): KubbReactNode {
   const mutationKeyParams = MutationKey.getParams({
     pathParamsType,
     typeSchemas,

package/src/components/MutationOptions.tsx

@@ -1,9 +1,11 @@
+import type { Params } from '@kubb/core'
+import { FunctionParams } from '@kubb/core'
 import { isOptional } from '@kubb/oas'
 import { ClientLegacy as Client } from '@kubb/plugin-client'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode, Params } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginReactQuery } from '../types.ts'
 import { MutationKey } from './MutationKey.tsx'
 
@@ -42,7 +44,7 @@ export function MutationOptions({
   paramsType,
   pathParamsType,
   mutationKeyName,
-}: Props): FabricReactNode {
+}: Props): KubbReactNode {
   const params = getParams({ typeSchemas })
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
   const TError = typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'

package/src/components/Query.tsx

@@ -1,8 +1,9 @@
+import { FunctionParams } from '@kubb/core'
 import { isAllOptional, isOptional, type Operation } from '@kubb/oas'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getComments, getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginReactQuery } from '../types.ts'
 import { QueryKey } from './QueryKey.tsx'
 import { QueryOptions } from './QueryOptions.tsx'
@@ -132,7 +133,7 @@ export function Query({
   typeSchemas,
   operation,
   customOptions,
-}: Props): FabricReactNode {
+}: Props): KubbReactNode {
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
   const TError = `ResponseErrorConfig<${typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'}>`
   const returnType = `UseQueryResult<${['TData', TError].join(', ')}> & { queryKey: TQueryKey }`

package/src/components/QueryOptions.tsx

@@ -1,9 +1,10 @@
+import { FunctionParams } from '@kubb/core'
 import { isAllOptional, isOptional } from '@kubb/oas'
 import { ClientLegacy as Client } from '@kubb/plugin-client'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginReactQuery } from '../types.ts'
 import { QueryKey } from './QueryKey.tsx'
 
@@ -107,16 +108,7 @@ function getParams({ paramsType, paramsCasing, pathParamsType, typeSchemas }: Ge
   })
 }
 
-export function QueryOptions({
-  name,
-  clientName,
-  dataReturnType,
-  typeSchemas,
-  paramsCasing,
-  paramsType,
-  pathParamsType,
-  queryKeyName,
-}: Props): FabricReactNode {
+export function QueryOptions({ name, clientName, dataReturnType, typeSchemas, paramsCasing, paramsType, pathParamsType, queryKeyName }: Props): KubbReactNode {
   const params = getParams({
     paramsType,
     paramsCasing,

package/src/components/SuspenseInfiniteQuery.tsx

@@ -1,8 +1,9 @@
+import { FunctionParams } from '@kubb/core'
 import { isAllOptional, isOptional, type Operation } from '@kubb/oas'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getComments, getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { Infinite, PluginReactQuery } from '../types.ts'
 import { QueryKey } from './QueryKey.tsx'
 import { QueryOptions } from './QueryOptions.tsx'
@@ -136,7 +137,7 @@ export function SuspenseInfiniteQuery({
   customOptions,
   initialPageParam,
   queryParam,
-}: Props): FabricReactNode {
+}: Props): KubbReactNode {
   const responseType = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
   const errorType = `ResponseErrorConfig<${typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'}>`
   const isInitialPageParamDefined = initialPageParam !== undefined && initialPageParam !== null

package/src/components/SuspenseInfiniteQueryOptions.tsx

@@ -1,10 +1,11 @@
 import { getNestedAccessor } from '@internals/utils'
+import { FunctionParams } from '@kubb/core'
 import { isAllOptional, isOptional } from '@kubb/oas'
 import { ClientLegacy as Client } from '@kubb/plugin-client'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { Infinite, PluginReactQuery } from '../types.ts'
 import { QueryKey } from './QueryKey.tsx'
 
@@ -127,7 +128,7 @@ export function SuspenseInfiniteQueryOptions({
   pathParamsType,
   queryParam,
   queryKeyName,
-}: Props): FabricReactNode {
+}: Props): KubbReactNode {
   const queryFnDataType = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
   const errorType = `ResponseErrorConfig<${typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'}>`
   const isInitialPageParamDefined = initialPageParam !== undefined && initialPageParam !== null

package/src/components/SuspenseQuery.tsx

@@ -1,8 +1,9 @@
+import { FunctionParams } from '@kubb/core'
 import { isAllOptional, isOptional, type Operation } from '@kubb/oas'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getComments, getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, FunctionParams } from '@kubb/react-fabric'
-import type { FabricReactNode } from '@kubb/react-fabric/types'
+import { File, Function } from '@kubb/renderer-jsx'
+import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginReactQuery } from '../types.ts'
 import { QueryKey } from './QueryKey.tsx'
 import { QueryOptions } from './QueryOptions.tsx'
@@ -142,7 +143,7 @@ export function SuspenseQuery({
   typeSchemas,
   operation,
   customOptions,
-}: Props): FabricReactNode {
+}: Props): KubbReactNode {
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
   const TError = `ResponseErrorConfig<${typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'}>`
   const returnType = `UseSuspenseQueryResult<${['TData', TError].join(', ')}> & { queryKey: TQueryKey }`

package/src/generators/customHookOptionsFileGenerator.tsx

@@ -4,7 +4,7 @@ import { useDriver } from '@kubb/core/hooks'
 import type { Operation } from '@kubb/oas'
 import { createReactGenerator } from '@kubb/plugin-oas/generators'
 import { useOperationManager } from '@kubb/plugin-oas/hooks'
-import { File, Function } from '@kubb/react-fabric'
+import { File, Function } from '@kubb/renderer-jsx'
 import type { PluginReactQuery } from '../types'
 
 export const customHookOptionsFileGenerator = createReactGenerator<PluginReactQuery>({

package/src/generators/hookOptionsGenerator.tsx

@@ -3,7 +3,7 @@ import type { Operation } from '@kubb/oas'
 import { createReactGenerator } from '@kubb/plugin-oas/generators'
 import { useOas, useOperationManager } from '@kubb/plugin-oas/hooks'
 import { getBanner, getFooter } from '@kubb/plugin-oas/utils'
-import { File, Type } from '@kubb/react-fabric'
+import { File, Type } from '@kubb/renderer-jsx'
 import { difference } from 'remeda'
 import type { PluginReactQuery } from '../types'
 

package/src/generators/infiniteQueryGenerator.tsx

@@ -6,7 +6,7 @@ import { useOas, useOperationManager } from '@kubb/plugin-oas/hooks'
 import { getBanner, getFooter } from '@kubb/plugin-oas/utils'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
-import { File } from '@kubb/react-fabric'
+import { File } from '@kubb/renderer-jsx'
 import { difference } from 'remeda'
 import { InfiniteQuery, InfiniteQueryOptions, QueryKey } from '../components'
 import type { PluginReactQuery } from '../types'

package/src/generators/mutationGenerator.tsx

@@ -6,7 +6,7 @@ import { useOas, useOperationManager } from '@kubb/plugin-oas/hooks'
 import { getBanner, getFooter } from '@kubb/plugin-oas/utils'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
-import { File } from '@kubb/react-fabric'
+import { File } from '@kubb/renderer-jsx'
 import { difference } from 'remeda'
 import { Mutation, MutationKey } from '../components'
 import { MutationOptions } from '../components/MutationOptions.tsx'

package/src/generators/queryGenerator.tsx

@@ -6,7 +6,7 @@ import { useOas, useOperationManager } from '@kubb/plugin-oas/hooks'
 import { getBanner, getFooter } from '@kubb/plugin-oas/utils'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
-import { File } from '@kubb/react-fabric'
+import { File } from '@kubb/renderer-jsx'
 import { difference } from 'remeda'
 import { Query, QueryKey, QueryOptions } from '../components'
 import type { PluginReactQuery } from '../types'

package/src/generators/suspenseInfiniteQueryGenerator.tsx

@@ -6,7 +6,7 @@ import { useOas, useOperationManager } from '@kubb/plugin-oas/hooks'
 import { getBanner, getFooter } from '@kubb/plugin-oas/utils'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
-import { File } from '@kubb/react-fabric'
+import { File } from '@kubb/renderer-jsx'
 import { difference } from 'remeda'
 import { QueryKey, SuspenseInfiniteQuery, SuspenseInfiniteQueryOptions } from '../components'
 import type { PluginReactQuery } from '../types'

package/src/generators/suspenseQueryGenerator.tsx

@@ -6,7 +6,7 @@ import { useOas, useOperationManager } from '@kubb/plugin-oas/hooks'
 import { getBanner, getFooter } from '@kubb/plugin-oas/utils'
 import { pluginTsName } from '@kubb/plugin-ts'
 import { pluginZodName } from '@kubb/plugin-zod'
-import { File } from '@kubb/react-fabric'
+import { File } from '@kubb/renderer-jsx'
 import { difference } from 'remeda'
 import { QueryKey, QueryOptions, SuspenseQuery } from '../components'
 import type { PluginReactQuery } from '../types'

package/src/plugin.ts

@@ -1,5 +1,7 @@
 import path from 'node:path'
 import { camelCase, pascalCase } from '@internals/utils'
+import { createFile, createSource, createText } from '@kubb/ast'
+import type { FileNode } from '@kubb/ast/types'
 import { createPlugin, getBarrelFiles, type UserGroup } from '@kubb/core'
 import { pluginClientName } from '@kubb/plugin-client'
 import { source as axiosClientSource } from '@kubb/plugin-client/templates/clients/axios.source'
@@ -180,41 +182,40 @@ export const pluginReactQuery = createPlugin<PluginReactQuery>((options) => {
 
       if (this.plugin.options.client.bundle && !hasClientPlugin && !this.plugin.options.client.importPath) {
         // pre add bundled fetch
-        await this.upsertFile({
-          baseName: 'fetch.ts',
-          path: path.resolve(root, '.kubb/fetch.ts'),
-          sources: [
-            {
-              name: 'fetch',
-              value: this.plugin.options.client.client === 'fetch' ? fetchClientSource : axiosClientSource,
-              isExportable: true,
-              isIndexable: true,
-            },
-          ],
-          imports: [],
-          exports: [],
-        })
+        await this.upsertFile(
+          createFile({
+            baseName: 'fetch.ts',
+            path: path.resolve(root, '.kubb/fetch.ts'),
+            sources: [
+              createSource({
+                name: 'fetch',
+                nodes: [createText(this.plugin.options.client.client === 'fetch' ? fetchClientSource : axiosClientSource)],
+                isExportable: true,
+                isIndexable: true,
+              }),
+            ],
+          }),
+        )
       }
 
       if (!hasClientPlugin) {
-        await this.upsertFile({
-          baseName: 'config.ts',
-          path: path.resolve(root, '.kubb/config.ts'),
-          sources: [
-            {
-              name: 'config',
-              value: configSource,
-              isExportable: false,
-              isIndexable: false,
-            },
-          ],
-          imports: [],
-          exports: [],
-        })
+        await this.upsertFile(
+          createFile({
+            baseName: 'config.ts',
+            path: path.resolve(root, '.kubb/config.ts'),
+            sources: [
+              createSource({
+                name: 'config',
+                nodes: [createText(configSource)],
+                isExportable: false,
+                isIndexable: false,
+              }),
+            ],
+          }),
+        )
       }
 
       const operationGenerator = new OperationGenerator(this.plugin.options, {
-        fabric: this.fabric,
         oas,
         driver: this.driver,
         events: this.events,
@@ -229,7 +230,7 @@ export const pluginReactQuery = createPlugin<PluginReactQuery>((options) => {
       const files = await operationGenerator.build(...generators)
       await this.upsertFile(...files)
 
-      const barrelFiles = await getBarrelFiles(this.fabric.files, {
+      const barrelFiles = await getBarrelFiles(this.driver.fileManager.files as unknown as FileNode[], {
         type: output.barrelType ?? 'named',
         root,
         output,