@kubb/plugin-solid-query 4.4.1 → 4.5.0

package/dist/{types-DGoK3Yh1.d.cts → types-CMt50Wv3.d.cts}

@@ -556,170 +556,6 @@ type FileMetaBase = {
   pluginKey?: Plugin['key'];
 };
 //#endregion
-//#region ../plugin-oas/src/generators/createReactGenerator.d.ts
-type ReactGenerator<TOptions extends PluginFactoryOptions> = {
-  name: string;
-  type: 'react';
-  Operations: (props: OperationsProps<TOptions>) => KubbNode;
-  Operation: (props: OperationProps<TOptions>) => KubbNode;
-  Schema: (props: SchemaProps$1<TOptions>) => KubbNode;
-};
-//#endregion
-//#region ../plugin-oas/src/generators/types.d.ts
-type OperationsProps<TOptions extends PluginFactoryOptions> = {
-  /**
-   * @deprecated
-   */
-  instance: Omit<OperationGenerator<TOptions>, 'build'>;
-  options: TOptions['resolvedOptions'];
-  operations: Array<Operation$1>;
-};
-type OperationProps<TOptions extends PluginFactoryOptions> = {
-  /**
-   * @deprecated
-   */
-  instance: Omit<OperationGenerator<TOptions>, 'build'>;
-  options: TOptions['resolvedOptions'];
-  operation: Operation$1;
-};
-type SchemaProps$1<TOptions extends PluginFactoryOptions> = {
-  instance: Omit<SchemaGenerator<SchemaGeneratorOptions, TOptions>, 'build'>;
-  options: TOptions['resolvedOptions'];
-  schema: {
-    name: string;
-    tree: Array<Schema>;
-    value: SchemaObject$1;
-  };
-};
-type Generator<TOptions extends PluginFactoryOptions> = CoreGenerator<TOptions> | ReactGenerator<TOptions>;
-//#endregion
-//#region ../plugin-oas/src/generators/createGenerator.d.ts
-type CoreGenerator<TOptions extends PluginFactoryOptions> = {
-  name: string;
-  type: 'core';
-  operations: (props: OperationsProps<TOptions>) => Promise<KubbFile.File[]>;
-  operation: (props: OperationProps<TOptions>) => Promise<KubbFile.File[]>;
-  schema: (props: SchemaProps$1<TOptions>) => Promise<KubbFile.File[]>;
-};
-//#endregion
-//#region ../plugin-oas/src/types.d.ts
-type ResolvePathOptions = {
-  pluginKey?: Plugin['key'];
-  group?: {
-    tag?: string;
-    path?: string;
-  };
-  type?: ResolveNameParams['type'];
-};
-/**
- * `propertyName` is the ref name + resolved with the nameResolver
- *  @example import { Pet } from './Pet'
- *
- * `originalName` is the original name used(in PascalCase), only used to remove duplicates
- *
- * `pluginKey` can be used to override the current plugin being used, handy when you want to import a type/schema out of another plugin
- * @example import a type(plugin-ts) for a mock file(swagger-faker)
- */
-type Ref = {
-  propertyName: string;
-  originalName: string;
-  path: KubbFile.OptionalPath;
-  pluginKey?: Plugin['key'];
-};
-type Refs = Record<string, Ref>;
-type OperationSchema = {
-  /**
-   * Converted name, contains already `PathParams`, `QueryParams`, ...
-   */
-  name: string;
-  schema: SchemaObject$1;
-  operation?: Operation$1;
-  /**
-   * OperationName in PascalCase, only being used in OperationGenerator
-   */
-  operationName: string;
-  description?: string;
-  statusCode?: number;
-  keys?: string[];
-  keysToOmit?: string[];
-  withData?: boolean;
-};
-type OperationSchemas = {
-  pathParams?: OperationSchema & {
-    keysToOmit?: never;
-  };
-  queryParams?: OperationSchema & {
-    keysToOmit?: never;
-  };
-  headerParams?: OperationSchema & {
-    keysToOmit?: never;
-  };
-  request?: OperationSchema;
-  response: OperationSchema;
-  responses: Array<OperationSchema>;
-  statusCodes?: Array<OperationSchema>;
-  errors?: Array<OperationSchema>;
-};
-type ByTag = {
-  type: 'tag';
-  pattern: string | RegExp;
-};
-type ByOperationId = {
-  type: 'operationId';
-  pattern: string | RegExp;
-};
-type ByPath = {
-  type: 'path';
-  pattern: string | RegExp;
-};
-type ByMethod = {
-  type: 'method';
-  pattern: HttpMethod | RegExp;
-};
-type BySchemaName = {
-  type: 'schemaName';
-  pattern: string | RegExp;
-};
-type ByContentType = {
-  type: 'contentType';
-  pattern: string | RegExp;
-};
-type Exclude$1 = ByTag | ByOperationId | ByPath | ByMethod | ByContentType;
-type Include = ByTag | ByOperationId | ByPath | ByMethod | ByContentType;
-type Override<TOptions> = (ByTag | ByOperationId | ByPath | ByMethod | BySchemaName | ByContentType) & {
-  options: Partial<TOptions>;
-};
-//#endregion
-//#region ../plugin-oas/src/OperationGenerator.d.ts
-type Context$1<TOptions, TPluginOptions extends PluginFactoryOptions> = {
-  fabric: Fabric;
-  oas: Oas;
-  exclude: Array<Exclude$1> | undefined;
-  include: Array<Include> | undefined;
-  override: Array<Override<TOptions>> | undefined;
-  contentType: contentType | undefined;
-  pluginManager: PluginManager;
-  /**
-   * Current plugin
-   */
-  plugin: Plugin<TPluginOptions>;
-  mode: KubbFile.Mode;
-};
-declare class OperationGenerator<TPluginOptions extends PluginFactoryOptions = PluginFactoryOptions, TFileMeta extends FileMetaBase = FileMetaBase> extends BaseGenerator<TPluginOptions['resolvedOptions'], Context$1<TPluginOptions['resolvedOptions'], TPluginOptions>> {
-  #private;
-  getSchemas(operation: Operation$1, {
-    resolveName
-  }?: {
-    resolveName?: (name: string) => string;
-  }): OperationSchemas;
-  getOperations(): Promise<Array<{
-    path: string;
-    method: HttpMethod;
-    operation: Operation$1;
-  }>>;
-  build(...generators: Array<Generator<TPluginOptions>>): Promise<Array<KubbFile.File<TFileMeta>>>;
-}
-//#endregion
 //#region ../plugin-oas/src/SchemaMapper.d.ts
 type SchemaKeywordMapper = {
   object: {
@@ -937,8 +773,96 @@ type Schema = {
   keyword: string;
 } | SchemaKeywordMapper[keyof SchemaKeywordMapper];
 //#endregion
+//#region ../plugin-oas/src/types.d.ts
+type ResolvePathOptions = {
+  pluginKey?: Plugin['key'];
+  group?: {
+    tag?: string;
+    path?: string;
+  };
+  type?: ResolveNameParams['type'];
+};
+/**
+ * `propertyName` is the ref name + resolved with the nameResolver
+ *  @example import { Pet } from './Pet'
+ *
+ * `originalName` is the original name used(in PascalCase), only used to remove duplicates
+ *
+ * `pluginKey` can be used to override the current plugin being used, handy when you want to import a type/schema out of another plugin
+ * @example import a type(plugin-ts) for a mock file(swagger-faker)
+ */
+type Ref = {
+  propertyName: string;
+  originalName: string;
+  path: KubbFile.OptionalPath;
+  pluginKey?: Plugin['key'];
+};
+type Refs = Record<string, Ref>;
+type OperationSchema = {
+  /**
+   * Converted name, contains already `PathParams`, `QueryParams`, ...
+   */
+  name: string;
+  schema: SchemaObject$1;
+  operation?: Operation$1;
+  /**
+   * OperationName in PascalCase, only being used in OperationGenerator
+   */
+  operationName: string;
+  description?: string;
+  statusCode?: number;
+  keys?: string[];
+  keysToOmit?: string[];
+  withData?: boolean;
+};
+type OperationSchemas = {
+  pathParams?: OperationSchema & {
+    keysToOmit?: never;
+  };
+  queryParams?: OperationSchema & {
+    keysToOmit?: never;
+  };
+  headerParams?: OperationSchema & {
+    keysToOmit?: never;
+  };
+  request?: OperationSchema;
+  response: OperationSchema;
+  responses: Array<OperationSchema>;
+  statusCodes?: Array<OperationSchema>;
+  errors?: Array<OperationSchema>;
+};
+type ByTag = {
+  type: 'tag';
+  pattern: string | RegExp;
+};
+type ByOperationId = {
+  type: 'operationId';
+  pattern: string | RegExp;
+};
+type ByPath = {
+  type: 'path';
+  pattern: string | RegExp;
+};
+type ByMethod = {
+  type: 'method';
+  pattern: HttpMethod | RegExp;
+};
+type BySchemaName = {
+  type: 'schemaName';
+  pattern: string | RegExp;
+};
+type ByContentType = {
+  type: 'contentType';
+  pattern: string | RegExp;
+};
+type Exclude$1 = ByTag | ByOperationId | ByPath | ByMethod | ByContentType;
+type Include = ByTag | ByOperationId | ByPath | ByMethod | ByContentType;
+type Override<TOptions> = (ByTag | ByOperationId | ByPath | ByMethod | BySchemaName | ByContentType) & {
+  options: Partial<TOptions>;
+};
+//#endregion
 //#region ../plugin-oas/src/SchemaGenerator.d.ts
-type Context<TOptions, TPluginOptions extends PluginFactoryOptions> = {
+type Context$1<TOptions, TPluginOptions extends PluginFactoryOptions> = {
   fabric: Fabric;
   oas: Oas;
   pluginManager: PluginManager;
@@ -971,15 +895,15 @@ type SchemaGeneratorOptions = {
      * TODO TODO add docs
      * @beta
      */
-    schema?: (schemaProps: SchemaProps, defaultSchemas: Schema[]) => Schema[] | undefined;
+    schema?: (schemaProps: SchemaProps$1, defaultSchemas: Schema[]) => Schema[] | undefined;
   };
 };
-type SchemaProps = {
+type SchemaProps$1 = {
   schemaObject?: SchemaObject$1;
   name?: string;
   parentName?: string;
 };
-declare class SchemaGenerator<TOptions extends SchemaGeneratorOptions = SchemaGeneratorOptions, TPluginOptions extends PluginFactoryOptions = PluginFactoryOptions, TFileMeta extends FileMetaBase = FileMetaBase> extends BaseGenerator<TOptions, Context<TOptions, TPluginOptions>> {
+declare class SchemaGenerator<TOptions extends SchemaGeneratorOptions = SchemaGeneratorOptions, TPluginOptions extends PluginFactoryOptions = PluginFactoryOptions, TFileMeta extends FileMetaBase = FileMetaBase> extends BaseGenerator<TOptions, Context$1<TOptions, TPluginOptions>> {
   #private;
   refs: Refs;
   /**
@@ -987,16 +911,86 @@ declare class SchemaGenerator<TOptions extends SchemaGeneratorOptions = SchemaGe
    * Delegates to getBaseTypeFromSchema internally and
    * optionally adds a union with null.
    */
-  parse(props: SchemaProps): Schema[];
-  deepSearch<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): Array<SchemaKeywordMapper[T]>;
-  find<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
+  parse(props: SchemaProps$1): Schema[];
   static deepSearch<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): Array<SchemaKeywordMapper[T]>;
-  static findInObject<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
   static find<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
   static combineObjects(tree: Schema[] | undefined): Schema[];
   build(...generators: Array<Generator<TPluginOptions>>): Promise<Array<KubbFile.File<TFileMeta>>>;
 }
 //#endregion
+//#region ../plugin-oas/src/generators/createGenerator.d.ts
+type CoreGenerator<TOptions extends PluginFactoryOptions> = {
+  name: string;
+  type: 'core';
+  operations: (props: OperationsProps<TOptions>) => Promise<KubbFile.File[]>;
+  operation: (props: OperationProps<TOptions>) => Promise<KubbFile.File[]>;
+  schema: (props: SchemaProps<TOptions>) => Promise<KubbFile.File[]>;
+};
+//#endregion
+//#region ../plugin-oas/src/generators/createReactGenerator.d.ts
+type ReactGenerator<TOptions extends PluginFactoryOptions> = {
+  name: string;
+  type: 'react';
+  Operations: (props: OperationsProps<TOptions>) => KubbNode;
+  Operation: (props: OperationProps<TOptions>) => KubbNode;
+  Schema: (props: SchemaProps<TOptions>) => KubbNode;
+};
+//#endregion
+//#region ../plugin-oas/src/generators/types.d.ts
+type OperationsProps<TOptions extends PluginFactoryOptions> = {
+  config: Config;
+  generator: Omit<OperationGenerator<TOptions>, 'build'>;
+  plugin: Plugin<TOptions>;
+  operations: Array<Operation$1>;
+};
+type OperationProps<TOptions extends PluginFactoryOptions> = {
+  config: Config;
+  generator: Omit<OperationGenerator<TOptions>, 'build'>;
+  plugin: Plugin<TOptions>;
+  operation: Operation$1;
+};
+type SchemaProps<TOptions extends PluginFactoryOptions> = {
+  config: Config;
+  generator: Omit<SchemaGenerator<SchemaGeneratorOptions, TOptions>, 'build'>;
+  plugin: Plugin<TOptions>;
+  schema: {
+    name: string;
+    tree: Array<Schema>;
+    value: SchemaObject$1;
+  };
+};
+type Generator<TOptions extends PluginFactoryOptions> = CoreGenerator<TOptions> | ReactGenerator<TOptions>;
+//#endregion
+//#region ../plugin-oas/src/OperationGenerator.d.ts
+type Context<TOptions, TPluginOptions extends PluginFactoryOptions> = {
+  fabric: Fabric;
+  oas: Oas;
+  exclude: Array<Exclude$1> | undefined;
+  include: Array<Include> | undefined;
+  override: Array<Override<TOptions>> | undefined;
+  contentType: contentType | undefined;
+  pluginManager: PluginManager;
+  /**
+   * Current plugin
+   */
+  plugin: Plugin<TPluginOptions>;
+  mode: KubbFile.Mode;
+};
+declare class OperationGenerator<TPluginOptions extends PluginFactoryOptions = PluginFactoryOptions, TFileMeta extends FileMetaBase = FileMetaBase> extends BaseGenerator<TPluginOptions['resolvedOptions'], Context<TPluginOptions['resolvedOptions'], TPluginOptions>> {
+  #private;
+  getSchemas(operation: Operation$1, {
+    resolveName
+  }?: {
+    resolveName?: (name: string) => string;
+  }): OperationSchemas;
+  getOperations(): Promise<Array<{
+    path: string;
+    method: HttpMethod;
+    operation: Operation$1;
+  }>>;
+  build(...generators: Array<Generator<TPluginOptions>>): Promise<Array<KubbFile.File<TFileMeta>>>;
+}
+//#endregion
 //#region ../plugin-client/src/types.d.ts
 type Options$2 = {
   /**
@@ -1041,7 +1035,6 @@ type Options$2 = {
    * Path to the client import path that will be used to do the API calls.
    * It will be used as `import client from '${client.importPath}'`.
    * It allows both relative and absolute path but be aware that we will not change the path.
-   * @default '@kubb/plugin-client/clients/axios'
    */
   importPath?: string;
   /**
@@ -1082,8 +1075,8 @@ type Options$2 = {
   parser?: 'client' | 'zod';
   /**
    * Which client should be used to do the HTTP calls
-   * - 'axios' will use `@kubb/plugin-client/clients/axios` to fetch data.
-   * - 'fetch' will use `@kubb/plugin-client/clients/fetch` to fetch data.
+   * - 'axios' will use `@kubb/plugin-client/templates/axios` to fetch data.
+   * - 'fetch' will use `@kubb/plugin-client/templates/fetch` to fetch data.
    * @default 'axios'
    */
   client?: 'axios' | 'fetch';
@@ -1102,9 +1095,10 @@ type ResolvedOptions$1 = {
   output: Output<Oas>;
   group?: Options$2['group'];
   baseURL: string | undefined;
+  client: Options$2['client'];
   parser: NonNullable<Options$2['parser']>;
   urlType: NonNullable<Options$2['urlType']>;
-  importPath: NonNullable<Options$2['importPath']>;
+  importPath: Options$2['importPath'];
   dataReturnType: NonNullable<Options$2['dataReturnType']>;
   pathParamsType: NonNullable<Options$2['pathParamsType']>;
   paramsType: NonNullable<Options$2['paramsType']>;
@@ -1172,7 +1166,7 @@ type Options$1 = {
    * Group the @tanstack/query hooks based on the provided name.
    */
   group?: Group;
-  client?: Pick<PluginClient['options'], 'dataReturnType' | 'importPath' | 'baseURL'>;
+  client?: Pick<PluginClient['options'], 'client' | 'dataReturnType' | 'importPath' | 'baseURL'>;
   /**
    * Array containing exclude parameters to exclude/skip tags/operations/methods/paths.
    */
@@ -1233,9 +1227,7 @@ type Options$1 = {
 type ResolvedOptions = {
   output: Output<Oas>;
   group: Options$1['group'];
-  client: Required<Omit<NonNullable<PluginSolidQuery['options']['client']>, 'baseURL'>> & {
-    baseURL?: string;
-  };
+  client: NonNullable<PluginSolidQuery['options']['client']>;
   parser: Required<NonNullable<Options$1['parser']>>;
   paramsCasing: Options$1['paramsCasing'];
   paramsType: NonNullable<Options$1['paramsType']>;
@@ -1247,5 +1239,5 @@ type ResolvedOptions = {
 };
 type PluginSolidQuery = PluginFactoryOptions<'plugin-solid-query', Options$1, ResolvedOptions, never, ResolvePathOptions>;
 //#endregion
-export { ReactGenerator as a, OperationSchemas as i, PluginSolidQuery as n, UserPluginWithLifeCycle as o, Transformer as r, Operation$1 as s, Options$1 as t };
-//# sourceMappingURL=types-DGoK3Yh1.d.cts.map
+export { OperationSchemas as a, ReactGenerator as i, PluginSolidQuery as n, UserPluginWithLifeCycle as o, Transformer as r, Operation$1 as s, Options$1 as t };
+//# sourceMappingURL=types-CMt50Wv3.d.cts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-solid-query",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "description": "Solid Query hooks generator plugin for Kubb, creating type-safe API client hooks from OpenAPI specifications for Solid.js applications.",
   "keywords": [
     "solid-query",
@@ -68,18 +68,18 @@
     }
   ],
   "dependencies": {
-    "@kubb/react-fabric": "0.2.10",
+    "@kubb/react-fabric": "0.2.14",
     "remeda": "^2.32.0",
-    "@kubb/core": "4.4.1",
-    "@kubb/oas": "4.4.1",
-    "@kubb/plugin-client": "4.4.1",
-    "@kubb/plugin-oas": "4.4.1",
-    "@kubb/plugin-ts": "4.4.1",
-    "@kubb/plugin-zod": "4.4.1"
+    "@kubb/core": "4.5.0",
+    "@kubb/oas": "4.5.0",
+    "@kubb/plugin-client": "4.5.0",
+    "@kubb/plugin-oas": "4.5.0",
+    "@kubb/plugin-ts": "4.5.0",
+    "@kubb/plugin-zod": "4.5.0"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@kubb/react-fabric": "0.2.10"
+    "@kubb/react-fabric": "0.2.14"
   },
   "engines": {
     "node": ">=20"

package/src/generators/mutationGenerator.tsx

@@ -1,7 +1,8 @@
-import { usePlugin, usePluginManager } from '@kubb/core/hooks'
+import path from 'node:path'
+import { usePluginManager } from '@kubb/core/hooks'
 import { pluginClientName } from '@kubb/plugin-client'
 import { Client } from '@kubb/plugin-client/components'
-import { createReactGenerator } from '@kubb/plugin-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 { pluginTsName } from '@kubb/plugin-ts'
@@ -13,14 +14,15 @@ import type { PluginSolidQuery } from '../types'
 
 export const mutationGenerator = createReactGenerator<PluginSolidQuery>({
   name: 'solid-query',
-  Operation({ options, operation }) {
+  Operation({ config, operation, generator, plugin }) {
     const {
+      options,
       options: { output },
-    } = usePlugin<PluginSolidQuery>()
+    } = plugin
     const pluginManager = usePluginManager()
 
     const oas = useOas()
-    const { getSchemas, getName, getFile } = useOperationManager()
+    const { getSchemas, getName, getFile } = useOperationManager(generator)
 
     const isQuery = !!options.query && options.query?.methods.some((method) => operation.method === method)
     const isMutation =
@@ -79,9 +81,32 @@ export const mutationGenerator = createReactGenerator<PluginSolidQuery>({
         {options.parser === 'zod' && (
           <File.Import name={[zod.schemas.response.name, zod.schemas.request?.name].filter(Boolean)} root={mutation.file.path} path={zod.file.path} />
         )}
-        <File.Import name={'fetch'} path={options.client.importPath} />
+        {options.client.importPath ? (
+          <>
+            <File.Import name={'fetch'} path={options.client.importPath} />
+            <File.Import name={['RequestConfig', 'ResponseErrorConfig']} path={options.client.importPath} isTypeOnly />
+            {options.client.dataReturnType === 'full' && <File.Import name={['ResponseConfig']} path={options.client.importPath} isTypeOnly />}
+          </>
+        ) : (
+          <>
+            <File.Import name={'fetch'} root={mutation.file.path} path={path.resolve(config.root, config.output.path, '.kubb/fetcher.ts')} />
+            <File.Import
+              name={['RequestConfig', 'ResponseErrorConfig']}
+              root={mutation.file.path}
+              path={path.resolve(config.root, config.output.path, '.kubb/fetcher.ts')}
+              isTypeOnly
+            />
+            {options.client.dataReturnType === 'full' && (
+              <File.Import
+                name={['ResponseConfig']}
+                root={mutation.file.path}
+                path={path.resolve(config.root, config.output.path, '.kubb/fetcher.ts')}
+                isTypeOnly
+              />
+            )}
+          </>
+        )}
         {!!hasClientPlugin && <File.Import name={[client.name]} root={mutation.file.path} path={client.file.path} />}
-        <File.Import name={['RequestConfig', 'ResponseConfig', 'ResponseErrorConfig']} path={options.client.importPath} isTypeOnly />
         <File.Import
           name={[
             type.schemas.request?.name,
@@ -113,7 +138,7 @@ export const mutationGenerator = createReactGenerator<PluginSolidQuery>({
             operation={operation}
             typeSchemas={type.schemas}
             zodSchemas={zod.schemas}
-            dataReturnType={options.client.dataReturnType}
+            dataReturnType={options.client.dataReturnType || 'data'}
             paramsCasing={options.paramsCasing}
             paramsType={options.paramsType}
             pathParamsType={options.pathParamsType}
@@ -130,7 +155,7 @@ export const mutationGenerator = createReactGenerator<PluginSolidQuery>({
               typeName={mutation.typeName}
               typeSchemas={type.schemas}
               operation={operation}
-              dataReturnType={options.client.dataReturnType}
+              dataReturnType={options.client.dataReturnType || 'data'}
               paramsCasing={options.paramsCasing}
               paramsType={options.paramsType}
               pathParamsType={options.pathParamsType}

package/src/generators/queryGenerator.tsx

@@ -1,7 +1,8 @@
-import { usePlugin, usePluginManager } from '@kubb/core/hooks'
+import path from 'node:path'
+import { usePluginManager } from '@kubb/core/hooks'
 import { pluginClientName } from '@kubb/plugin-client'
 import { Client } from '@kubb/plugin-client/components'
-import { createReactGenerator } from '@kubb/plugin-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 { pluginTsName } from '@kubb/plugin-ts'
@@ -12,15 +13,16 @@ import { Query, QueryKey, QueryOptions } from '../components'
 import type { PluginSolidQuery } from '../types'
 
 export const queryGenerator = createReactGenerator<PluginSolidQuery>({
-  name: 'svelte-query',
-  Operation({ options, operation }) {
+  name: 'solid-query',
+  Operation({ config, operation, generator, plugin }) {
     const {
+      options,
       options: { output },
-    } = usePlugin<PluginSolidQuery>()
+    } = plugin
     const pluginManager = usePluginManager()
 
     const oas = useOas()
-    const { getSchemas, getName, getFile } = useOperationManager()
+    const { getSchemas, getName, getFile } = useOperationManager(generator)
 
     const isQuery = typeof options.query === 'boolean' ? true : options.query?.methods.some((method) => operation.method === method)
     const isMutation = difference(['post', 'put', 'delete', 'patch'], options.query ? options.query.methods : []).some((method) => operation.method === method)
@@ -80,10 +82,32 @@ export const queryGenerator = createReactGenerator<PluginSolidQuery>({
         {options.parser === 'zod' && (
           <File.Import name={[zod.schemas.response.name, zod.schemas.request?.name].filter(Boolean)} root={query.file.path} path={zod.file.path} />
         )}
-        <File.Import name={'fetch'} path={options.client.importPath} />
+        {options.client.importPath ? (
+          <>
+            <File.Import name={'fetch'} path={options.client.importPath} />
+            <File.Import name={['RequestConfig', 'ResponseErrorConfig']} path={options.client.importPath} isTypeOnly />
+            {options.client.dataReturnType === 'full' && <File.Import name={['ResponseConfig']} path={options.client.importPath} isTypeOnly />}
+          </>
+        ) : (
+          <>
+            <File.Import name={'fetch'} root={query.file.path} path={path.resolve(config.root, config.output.path, '.kubb/fetcher.ts')} />
+            <File.Import
+              name={['RequestConfig', 'ResponseErrorConfig']}
+              root={query.file.path}
+              path={path.resolve(config.root, config.output.path, '.kubb/fetcher.ts')}
+              isTypeOnly
+            />
+            {options.client.dataReturnType === 'full' && (
+              <File.Import
+                name={['ResponseConfig']}
+                root={query.file.path}
+                path={path.resolve(config.root, config.output.path, '.kubb/fetcher.ts')}
+                isTypeOnly
+              />
+            )}
+          </>
+        )}
         {!!hasClientPlugin && <File.Import name={[client.name]} root={query.file.path} path={client.file.path} />}
-        <File.Import name={['RequestConfig', 'ResponseErrorConfig']} path={options.client.importPath} isTypeOnly />
-        {options.client.dataReturnType === 'full' && <File.Import name={['ResponseConfig']} path={options.client.importPath} isTypeOnly />}
         <File.Import
           name={[
             type.schemas.request?.name,
@@ -113,7 +137,7 @@ export const queryGenerator = createReactGenerator<PluginSolidQuery>({
             operation={operation}
             typeSchemas={type.schemas}
             zodSchemas={zod.schemas}
-            dataReturnType={options.client.dataReturnType}
+            dataReturnType={options.client.dataReturnType || 'data'}
             paramsCasing={options.paramsCasing}
             paramsType={options.paramsType}
             pathParamsType={options.pathParamsType}
@@ -129,7 +153,7 @@ export const queryGenerator = createReactGenerator<PluginSolidQuery>({
           paramsCasing={options.paramsCasing}
           paramsType={options.paramsType}
           pathParamsType={options.pathParamsType}
-          dataReturnType={options.client.dataReturnType}
+          dataReturnType={options.client.dataReturnType || 'data'}
         />
         {options.query && (
           <>
@@ -143,7 +167,7 @@ export const queryGenerator = createReactGenerator<PluginSolidQuery>({
               pathParamsType={options.pathParamsType}
               operation={operation}
               paramsCasing={options.paramsCasing}
-              dataReturnType={options.client.dataReturnType}
+              dataReturnType={options.client.dataReturnType || 'data'}
               queryKeyName={queryKey.name}
               queryKeyTypeName={queryKey.typeName}
             />