@kubb/plugin-solid-query 3.0.0-beta.8 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-solid-query",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0",
   "description": "Generator solid-query hooks",
   "keywords": [
     "faker",
@@ -62,24 +62,24 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@kubb/core": "3.0.0-beta.8",
-    "@kubb/fs": "3.0.0-beta.8",
-    "@kubb/oas": "3.0.0-beta.8",
-    "@kubb/plugin-oas": "3.0.0-beta.8",
-    "@kubb/plugin-ts": "3.0.0-beta.8",
-    "@kubb/plugin-zod": "3.0.0-beta.8",
-    "@kubb/react": "3.0.0-beta.8"
+    "@kubb/core": "3.0.0",
+    "@kubb/fs": "3.0.0",
+    "@kubb/oas": "3.0.0",
+    "@kubb/plugin-oas": "3.0.0",
+    "@kubb/plugin-ts": "3.0.0",
+    "@kubb/plugin-zod": "3.0.0",
+    "@kubb/react": "3.0.0"
   },
   "devDependencies": {
-    "@types/react": "^18.3.11",
+    "@types/react": "^18.3.12",
     "react": "^18.3.1",
-    "tsup": "^8.3.0",
+    "tsup": "^8.3.5",
     "typescript": "^5.6.3",
-    "@kubb/config-ts": "3.0.0-beta.8",
-    "@kubb/config-tsup": "3.0.0-beta.8"
+    "@kubb/config-ts": "3.0.0",
+    "@kubb/config-tsup": "3.0.0"
   },
   "peerDependencies": {
-    "@kubb/react": "3.0.0-beta.8"
+    "@kubb/react": "3.0.0"
   },
   "engines": {
     "node": ">=20"

package/src/components/Query.tsx

@@ -18,24 +18,68 @@ type Props = {
   queryKeyTypeName: string
   typeSchemas: OperationSchemas
   operation: Operation
+  paramsType: PluginSolidQuery['resolvedOptions']['paramsType']
   pathParamsType: PluginSolidQuery['resolvedOptions']['pathParamsType']
   dataReturnType: PluginSolidQuery['resolvedOptions']['client']['dataReturnType']
 }
 
 type GetParamsProps = {
+  paramsType: PluginSolidQuery['resolvedOptions']['paramsType']
   pathParamsType: PluginSolidQuery['resolvedOptions']['pathParamsType']
   dataReturnType: PluginSolidQuery['resolvedOptions']['client']['dataReturnType']
   typeSchemas: OperationSchemas
 }
 
-function getParams({ pathParamsType, dataReturnType, typeSchemas }: GetParamsProps) {
+function getParams({ paramsType, pathParamsType, dataReturnType, typeSchemas }: GetParamsProps) {
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
 
+  if (paramsType === 'object') {
+    return FunctionParams.factory({
+      data: {
+        mode: 'object',
+        children: {
+          ...getPathParams(typeSchemas.pathParams, { typed: true }),
+          data: typeSchemas.request?.name
+            ? {
+                type: typeSchemas.request?.name,
+                optional: isOptional(typeSchemas.request?.schema),
+              }
+            : undefined,
+          params: typeSchemas.queryParams?.name
+            ? {
+                type: typeSchemas.queryParams?.name,
+                optional: isOptional(typeSchemas.queryParams?.schema),
+              }
+            : undefined,
+          headers: typeSchemas.headerParams?.name
+            ? {
+                type: typeSchemas.headerParams?.name,
+                optional: isOptional(typeSchemas.headerParams?.schema),
+              }
+            : undefined,
+        },
+      },
+      options: {
+        type: `
+{
+  query?: Partial<CreateBaseQueryOptions<${[TData, typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error', 'TData', 'TQueryData', 'TQueryKey'].join(', ')}>>,
+  client?: ${typeSchemas.request?.name ? `Partial<RequestConfig<${typeSchemas.request?.name}>>` : 'Partial<RequestConfig>'}
+}
+`,
+        default: '{}',
+      },
+    })
+  }
+
   return FunctionParams.factory({
-    pathParams: {
-      mode: pathParamsType === 'object' ? 'object' : 'inlineSpread',
-      children: getPathParams(typeSchemas.pathParams, { typed: true }),
-    },
+    pathParams: typeSchemas.pathParams?.name
+      ? {
+          mode: pathParamsType === 'object' ? 'object' : 'inlineSpread',
+          children: getPathParams(typeSchemas.pathParams, { typed: true }),
+          type: typeSchemas.pathParams?.name,
+          optional: isOptional(typeSchemas.pathParams?.schema),
+        }
+      : undefined,
     data: typeSchemas.request?.name
       ? {
           type: typeSchemas.request?.name,
@@ -66,7 +110,17 @@ function getParams({ pathParamsType, dataReturnType, typeSchemas }: GetParamsPro
   })
 }
 
-export function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, pathParamsType, dataReturnType, typeSchemas, operation }: Props): ReactNode {
+export function Query({
+  name,
+  queryKeyTypeName,
+  queryOptionsName,
+  queryKeyName,
+  paramsType,
+  pathParamsType,
+  dataReturnType,
+  typeSchemas,
+  operation,
+}: Props): ReactNode {
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
   const returnType = `CreateQueryResult<${['TData', typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'].join(', ')}> & { queryKey: TQueryKey }`
   const generics = [`TData = ${TData}`, `TQueryData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`]
@@ -76,10 +130,12 @@ export function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
     typeSchemas,
   })
   const queryOptionsParams = QueryOptions.getParams({
+    paramsType,
     pathParamsType,
     typeSchemas,
   })
   const params = getParams({
+    paramsType,
     pathParamsType,
     dataReturnType,
     typeSchemas,

package/src/components/QueryKey.tsx

@@ -5,7 +5,7 @@ import { File, Function, FunctionParams, Type } from '@kubb/react'
 import { type Operation, isOptional } from '@kubb/oas'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import type { ReactNode } from 'react'
-import type { PluginSolidQuery } from '../types'
+import type { PluginSolidQuery, Transformer } from '../types'
 
 type Props = {
   name: string
@@ -13,7 +13,7 @@ type Props = {
   typeSchemas: OperationSchemas
   operation: Operation
   pathParamsType: PluginSolidQuery['resolvedOptions']['pathParamsType']
-  keysFn: ((keys: unknown[]) => unknown[]) | undefined
+  transformer: Transformer | undefined
 }
 
 type GetParamsProps = {
@@ -42,23 +42,32 @@ function getParams({ pathParamsType, typeSchemas }: GetParamsProps) {
   })
 }
 
-export function QueryKey({ name, typeSchemas, pathParamsType, operation, typeName, keysFn = (name) => name }: Props): ReactNode {
+const getTransformer: Transformer = ({ operation, schemas }) => {
   const path = new URLPath(operation.path)
-  const params = getParams({ pathParamsType, typeSchemas })
   const keys = [
     path.toObject({
       type: 'path',
       stringify: true,
     }),
-    typeSchemas.queryParams?.name ? '...(params ? [params] : [])' : undefined,
-    typeSchemas.request?.name ? '...(data ? [data] : [])' : undefined,
+    schemas.queryParams?.name ? '...(params ? [params] : [])' : undefined,
+    schemas.request?.name ? '...(data ? [data] : [])' : undefined,
   ].filter(Boolean)
 
+  return keys
+}
+
+export function QueryKey({ name, typeSchemas, pathParamsType, operation, typeName, transformer = getTransformer }: Props): ReactNode {
+  const params = getParams({ pathParamsType, typeSchemas })
+  const keys = transformer({
+    operation,
+    schemas: typeSchemas,
+  })
+
   return (
     <>
       <File.Source name={name} isExportable isIndexable>
         <Function.Arrow name={name} export params={params.toConstructor()} singleLine>
-          {`[${keysFn(keys).join(', ')}] as const`}
+          {`[${keys.join(', ')}] as const`}
         </Function.Arrow>
       </File.Source>
       <File.Source name={typeName} isExportable isIndexable isTypeOnly>
@@ -71,3 +80,4 @@ export function QueryKey({ name, typeSchemas, pathParamsType, operation, typeNam
 }
 
 QueryKey.getParams = getParams
+QueryKey.getTransformer = getTransformer

package/src/components/QueryOptions.tsx

@@ -14,20 +14,59 @@ type Props = {
   clientName: string
   queryKeyName: string
   typeSchemas: OperationSchemas
+  paramsType: PluginSolidQuery['resolvedOptions']['paramsType']
   pathParamsType: PluginSolidQuery['resolvedOptions']['pathParamsType']
 }
 
 type GetParamsProps = {
+  paramsType: PluginSolidQuery['resolvedOptions']['paramsType']
   pathParamsType: PluginSolidQuery['resolvedOptions']['pathParamsType']
   typeSchemas: OperationSchemas
 }
 
-function getParams({ pathParamsType, typeSchemas }: GetParamsProps) {
+function getParams({ paramsType, pathParamsType, typeSchemas }: GetParamsProps) {
+  if (paramsType === 'object') {
+    return FunctionParams.factory({
+      data: {
+        mode: 'object',
+        children: {
+          ...getPathParams(typeSchemas.pathParams, { typed: true }),
+          data: typeSchemas.request?.name
+            ? {
+                type: typeSchemas.request?.name,
+                optional: isOptional(typeSchemas.request?.schema),
+              }
+            : undefined,
+          params: typeSchemas.queryParams?.name
+            ? {
+                type: typeSchemas.queryParams?.name,
+                optional: isOptional(typeSchemas.queryParams?.schema),
+              }
+            : undefined,
+          headers: typeSchemas.headerParams?.name
+            ? {
+                type: typeSchemas.headerParams?.name,
+                optional: isOptional(typeSchemas.headerParams?.schema),
+              }
+            : undefined,
+        },
+      },
+      config: {
+        type: typeSchemas.request?.name ? `Partial<RequestConfig<${typeSchemas.request?.name}>>` : 'Partial<RequestConfig>',
+        default: '{}',
+      },
+    })
+  }
+
   return FunctionParams.factory({
-    pathParams: {
-      mode: pathParamsType === 'object' ? 'object' : 'inlineSpread',
-      children: getPathParams(typeSchemas.pathParams, { typed: true }),
-    },
+    pathParams: typeSchemas.pathParams?.name
+      ? {
+          mode: pathParamsType === 'object' ? 'object' : 'inlineSpread',
+          children: getPathParams(typeSchemas.pathParams, { typed: true }),
+          type: typeSchemas.pathParams?.name,
+          optional: isOptional(typeSchemas.pathParams?.schema),
+        }
+      : undefined,
     data: typeSchemas.request?.name
       ? {
           type: typeSchemas.request?.name,
@@ -53,10 +92,11 @@ function getParams({ pathParamsType, typeSchemas }: GetParamsProps) {
   })
 }
 
-export function QueryOptions({ name, clientName, typeSchemas, pathParamsType, queryKeyName }: Props): ReactNode {
-  const params = getParams({ pathParamsType, typeSchemas })
+export function QueryOptions({ name, clientName, typeSchemas, paramsType, pathParamsType, queryKeyName }: Props): ReactNode {
+  const params = getParams({ paramsType, pathParamsType, typeSchemas })
   const clientParams = Client.getParams({
     typeSchemas,
+    paramsType,
     pathParamsType,
   })
   const queryKeyParams = QueryKey.getParams({

package/src/generators/__snapshots__/clientDataReturnTypeFull.ts

@@ -1,7 +1,7 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig, ResponseConfig } from "@kubb/plugin-client/client";
 import type { QueryKey, CreateBaseQueryOptions, CreateQueryResult } from "@tanstack/svelte-query";
-import { createQuery, queryOptions } from "@tanstack/svelte-query";
+import { queryOptions, createQuery } from "@tanstack/svelte-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
 

package/src/generators/__snapshots__/clientGetImportPath.ts

@@ -1,7 +1,7 @@
 import client from "axios";
 import type { QueryKey, CreateBaseQueryOptions, CreateQueryResult } from "@tanstack/svelte-query";
 import type { RequestConfig } from "axios";
-import { createQuery, queryOptions } from "@tanstack/svelte-query";
+import { queryOptions, createQuery } from "@tanstack/svelte-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
 

package/src/generators/__snapshots__/findByTags.ts

@@ -1,7 +1,7 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
 import type { QueryKey, CreateBaseQueryOptions, CreateQueryResult } from "@tanstack/svelte-query";
-import { createQuery, queryOptions } from "@tanstack/svelte-query";
+import { queryOptions, createQuery } from "@tanstack/svelte-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
 

package/src/generators/__snapshots__/findByTagsObject.ts

@@ -0,0 +1,61 @@
+import client from "@kubb/plugin-client/client";
+import type { RequestConfig } from "@kubb/plugin-client/client";
+import type { QueryKey, CreateBaseQueryOptions, CreateQueryResult } from "@tanstack/svelte-query";
+import { queryOptions, createQuery } from "@tanstack/svelte-query";
+
+ export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
+
+ export type FindPetsByTagsQueryKey = ReturnType<typeof findPetsByTagsQueryKey>;
+
+ /**
+ * @description Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+ * @summary Finds Pets by tags
+ * @link /pet/findByTags
+ */
+async function findPetsByTags({ headers, params }: {
+    headers: FindPetsByTagsHeaderParams;
+    params?: FindPetsByTagsQueryParams;
+}, config: Partial<RequestConfig> = {}) {
+    const res = await client<FindPetsByTagsQueryResponse, FindPetsByTags400, unknown>({ method: "GET", url: `/pet/findByTags`, params, headers: { ...headers, ...config.headers }, ...config });
+    return findPetsByTagsQueryResponse.parse(res.data);
+}
+
+ export function findPetsByTagsQueryOptions({ headers, params }: {
+    headers: FindPetsByTagsHeaderParams;
+    params?: FindPetsByTagsQueryParams;
+}, config: Partial<RequestConfig> = {}) {
+    const queryKey = findPetsByTagsQueryKey(params);
+    return queryOptions({
+        queryKey,
+        queryFn: async ({ signal }) => {
+            config.signal = signal;
+            return findPetsByTags({ headers, params }, config);
+        },
+    });
+}
+
+ /**
+ * @description Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+ * @summary Finds Pets by tags
+ * @link /pet/findByTags
+ */
+export function createFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryData = FindPetsByTagsQueryResponse, TQueryKey extends QueryKey = FindPetsByTagsQueryKey>({ headers, params }: {
+    headers: FindPetsByTagsHeaderParams;
+    params?: FindPetsByTagsQueryParams;
+}, options: {
+    query?: Partial<CreateBaseQueryOptions<FindPetsByTagsQueryResponse, FindPetsByTags400, TData, TQueryData, TQueryKey>>;
+    client?: Partial<RequestConfig>;
+} = {}) {
+    const { query: queryOptions, client: config = {} } = options ?? {};
+    const queryKey = queryOptions?.queryKey ?? findPetsByTagsQueryKey(params);
+    const query = createQuery(() => ({
+        ...findPetsByTagsQueryOptions({ headers, params }, config) as unknown as CreateBaseQueryOptions,
+        queryKey,
+        initialData: null,
+        ...queryOptions as unknown as Omit<CreateBaseQueryOptions, "queryKey">
+    })) as CreateQueryResult<TData, FindPetsByTags400> & {
+        queryKey: TQueryKey;
+    };
+    query.queryKey = queryKey as TQueryKey;
+    return query;
+}

package/src/generators/__snapshots__/findByTagsPathParamsObject.ts

@@ -1,7 +1,7 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
 import type { QueryKey, CreateBaseQueryOptions, CreateQueryResult } from "@tanstack/svelte-query";
-import { createQuery, queryOptions } from "@tanstack/svelte-query";
+import { queryOptions, createQuery } from "@tanstack/svelte-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
 

package/src/generators/__snapshots__/findByTagsWithCustomQueryKey.ts

@@ -1,9 +1,9 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
 import type { QueryKey, CreateBaseQueryOptions, CreateQueryResult } from "@tanstack/react-query";
-import { createQuery, queryOptions } from "@tanstack/react-query";
+import { queryOptions, createQuery } from "@tanstack/react-query";
 
- export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [test, { url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
+ export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => ["test", { url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
 
  export type FindPetsByTagsQueryKey = ReturnType<typeof findPetsByTagsQueryKey>;
 

package/src/generators/__snapshots__/findByTagsWithZod.ts

@@ -1,7 +1,7 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
 import type { QueryKey, CreateBaseQueryOptions, CreateQueryResult } from "@tanstack/svelte-query";
-import { createQuery, queryOptions } from "@tanstack/svelte-query";
+import { queryOptions, createQuery } from "@tanstack/svelte-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
 

package/src/generators/__snapshots__/postAsQuery.ts

@@ -1,7 +1,7 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
 import type { QueryKey, CreateBaseQueryOptions, CreateQueryResult } from "custom-query";
-import { createQuery, queryOptions } from "custom-query";
+import { queryOptions, createQuery } from "custom-query";
 
  export const updatePetWithFormQueryKey = (petId: UpdatePetWithFormPathParams["petId"], data?: UpdatePetWithFormMutationRequest, params?: UpdatePetWithFormQueryParams) => [{ url: "/pet/:petId", params: { petId: petId } }, ...(params ? [params] : []), ...(data ? [data] : [])] as const;
 

package/src/generators/queryGenerator.tsx

@@ -1,4 +1,3 @@
-import transformers from '@kubb/core/transformers'
 import { pluginClientName } from '@kubb/plugin-client'
 import { Client } from '@kubb/plugin-client/components'
 import { createReactGenerator } from '@kubb/plugin-oas'
@@ -20,6 +19,7 @@ export const queryGenerator = createReactGenerator<PluginSolidQuery>({
     const { getSchemas, getName, getFile } = useOperationManager()
 
     const isQuery = typeof options.query === 'boolean' ? true : options.query?.methods.some((method) => operation.method === method)
+    const importPath = options.query ? options.query.importPath : '@tanstack/solid-query'
 
     const query = {
       name: getName(operation, { type: 'function', prefix: 'create' }),
@@ -51,15 +51,13 @@ export const queryGenerator = createReactGenerator<PluginSolidQuery>({
       schemas: getSchemas(operation, { pluginKey: [pluginZodName], type: 'function' }),
     }
 
-    if (!isQuery || typeof options.query === 'boolean') {
+    if (!isQuery) {
       return null
     }
 
     return (
       <File baseName={query.file.baseName} path={query.file.path} meta={query.file.meta} banner={output?.banner} footer={output?.footer}>
         {options.parser === 'zod' && <File.Import name={[zod.schemas.response.name]} root={query.file.path} path={zod.file.path} />}
-        <File.Import name={['createQuery', 'queryOptions']} path={options.query.importPath} />
-        <File.Import name={['QueryKey', 'WithRequired', 'CreateBaseQueryOptions', 'CreateQueryResult']} path={options.query.importPath} isTypeOnly />
         <File.Import name={'client'} path={options.client.importPath} />
         <File.Import name={['RequestConfig']} path={options.client.importPath} isTypeOnly />
         {options.client.dataReturnType === 'full' && <File.Import name={['ResponseConfig']} path={options.client.importPath} isTypeOnly />}
@@ -76,44 +74,53 @@ export const queryGenerator = createReactGenerator<PluginSolidQuery>({
           path={type.file.path}
           isTypeOnly
         />
-
         <QueryKey
           name={queryKey.name}
           typeName={queryKey.typeName}
           operation={operation}
           pathParamsType={options.pathParamsType}
           typeSchemas={type.schemas}
-          keysFn={options.query.key}
+          transformer={options.queryKey}
         />
         <Client
           name={client.name}
           isExportable={false}
           isIndexable={false}
-          baseURL={options.baseURL}
+          baseURL={options.client.baseURL}
           operation={operation}
           typeSchemas={type.schemas}
           zodSchemas={zod.schemas}
           dataReturnType={options.client.dataReturnType}
+          paramsType={options.paramsType}
           pathParamsType={options.pathParamsType}
           parser={options.parser}
         />
+        <File.Import name={['queryOptions']} path={importPath} />
         <QueryOptions
           name={queryOptions.name}
           clientName={client.name}
           queryKeyName={queryKey.name}
           typeSchemas={type.schemas}
+          paramsType={options.paramsType}
           pathParamsType={options.pathParamsType}
         />
-        <Query
-          name={query.name}
-          queryOptionsName={queryOptions.name}
-          typeSchemas={type.schemas}
-          pathParamsType={options.pathParamsType}
-          operation={operation}
-          dataReturnType={options.client.dataReturnType}
-          queryKeyName={queryKey.name}
-          queryKeyTypeName={queryKey.typeName}
-        />
+        {options.query && (
+          <>
+            <File.Import name={['createQuery']} path={importPath} />
+            <File.Import name={['QueryKey', 'CreateBaseQueryOptions', 'CreateQueryResult']} path={importPath} isTypeOnly />
+            <Query
+              name={query.name}
+              queryOptionsName={queryOptions.name}
+              typeSchemas={type.schemas}
+              paramsType={options.paramsType}
+              pathParamsType={options.pathParamsType}
+              operation={operation}
+              dataReturnType={options.client.dataReturnType}
+              queryKeyName={queryKey.name}
+              queryKeyTypeName={queryKey.typeName}
+            />
+          </>
+        )}
       </File>
     )
   },

package/src/plugin.ts

@@ -2,7 +2,6 @@ import path from 'node:path'
 
 import { FileManager, type Group, PluginManager, createPlugin } from '@kubb/core'
 import { camelCase, pascalCase } from '@kubb/core/transformers'
-import { renderTemplate } from '@kubb/core/utils'
 import { OperationGenerator, pluginOasName } from '@kubb/plugin-oas'
 
 import { pluginTsName } from '@kubb/plugin-ts'
@@ -10,6 +9,7 @@ import { pluginZodName } from '@kubb/plugin-zod'
 
 import type { Plugin } from '@kubb/core'
 import type { PluginOas } from '@kubb/plugin-oas'
+import { QueryKey } from './components'
 import { queryGenerator } from './generators'
 import type { PluginSolidQuery } from './types.ts'
 
@@ -24,7 +24,9 @@ export const pluginSolidQuery = createPlugin<PluginSolidQuery>((options) => {
     override = [],
     parser = 'client',
     transformers = {},
+    paramsType = 'inline',
     pathParamsType = 'inline',
+    queryKey = QueryKey.getTransformer,
     generators = [queryGenerator].filter(Boolean),
     query = {},
   } = options
@@ -33,20 +35,20 @@ export const pluginSolidQuery = createPlugin<PluginSolidQuery>((options) => {
     name: pluginSolidQueryName,
     options: {
       output,
-      baseURL: undefined,
       client: {
         importPath: '@kubb/plugin-client/client',
         dataReturnType: 'data',
         pathParamsType: 'inline',
         ...options.client,
       },
+      queryKey,
       query: {
-        key: (key: unknown[]) => key,
         methods: ['get'],
         importPath: '@tanstack/solid-query',
         ...query,
       },
-      pathParamsType,
+      paramsType,
+      pathParamsType: paramsType === 'object' ? 'object' : pathParamsType,
       parser,
     },
     pre: [pluginOasName, pluginTsName, parser === 'zod' ? pluginZodName : undefined].filter(Boolean),
@@ -96,22 +98,20 @@ export const pluginSolidQuery = createPlugin<PluginSolidQuery>((options) => {
       const mode = FileManager.getMode(path.resolve(root, output.path))
       const baseURL = await swaggerPlugin.context.getBaseURL()
 
-      const operationGenerator = new OperationGenerator(
-        {
-          ...this.plugin.options,
-          baseURL,
-        },
-        {
-          oas,
-          pluginManager: this.pluginManager,
-          plugin: this.plugin,
-          contentType: swaggerPlugin.context.contentType,
-          exclude,
-          include,
-          override,
-          mode,
-        },
-      )
+      if (baseURL) {
+        this.plugin.options.client.baseURL = baseURL
+      }
+
+      const operationGenerator = new OperationGenerator(this.plugin.options, {
+        oas,
+        pluginManager: this.pluginManager,
+        plugin: this.plugin,
+        contentType: swaggerPlugin.context.contentType,
+        exclude,
+        include,
+        override,
+        mode,
+      })
 
       const files = await operationGenerator.build(...generators)
       await this.addFile(...files)