@kubb/plugin-client 3.0.0-alpha.9 → 3.0.0-beta.2

package/src/components/Client.tsx

@@ -3,8 +3,8 @@ import { URLPath } from '@kubb/core/utils'
 import { type Operation, isOptional } from '@kubb/oas'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getComments, getPathParams } from '@kubb/plugin-oas/utils'
-import { File, Function, createParams } from '@kubb/react'
-import type { KubbNode, Params } from '@kubb/react/types'
+import { File, Function, FunctionParams } from '@kubb/react'
+import type { KubbNode } from '@kubb/react/types'
 import type { PluginClient } from '../types.ts'
 
 type Props = {
@@ -12,87 +12,107 @@ type Props = {
    * Name of the function
    */
   name: string
-  options: PluginClient['resolvedOptions']
-  typedSchemas: OperationSchemas
+  isExportable?: boolean
+  isIndexable?: boolean
+
+  baseURL: string | undefined
+  dataReturnType: PluginClient['resolvedOptions']['dataReturnType']
+  pathParamsType: PluginClient['resolvedOptions']['pathParamsType']
+  parser: PluginClient['resolvedOptions']['parser'] | undefined
+  typeSchemas: OperationSchemas
+  zodSchemas: OperationSchemas | undefined
   operation: Operation
 }
 
-export function Client({ name, options, typedSchemas, operation }: Props): KubbNode {
-  const contentType = operation.getContentType()
-  const baseURL = options.client.importPath === '@kubb/plugin-client/client' ? options.baseURL : undefined
-  const path = new URLPath(operation.path)
-  const isFormData = contentType === 'multipart/form-data'
-  const headers = [
-    contentType !== 'application/json' ? `'Content-Type': '${contentType}'` : undefined,
-    typedSchemas.headerParams?.name ? '...headers' : undefined,
-  ].filter(Boolean)
+type GetParamsProps = {
+  pathParamsType: PluginClient['resolvedOptions']['pathParamsType']
+  typeSchemas: OperationSchemas
+}
 
-  const params = createParams({
+function getParams({ pathParamsType, typeSchemas }: GetParamsProps) {
+  return FunctionParams.factory({
     pathParams: {
-      mode: options.pathParamsType === 'object' ? 'object' : 'inlineSpread',
-      children: getPathParams(typedSchemas.pathParams, { typed: true }),
+      mode: pathParamsType === 'object' ? 'object' : 'inlineSpread',
+      children: getPathParams(typeSchemas.pathParams, { typed: true }),
     },
-    data: typedSchemas.request?.name
+    data: typeSchemas.request?.name
       ? {
-          type: typedSchemas.request?.name,
-          optional: isOptional(typedSchemas.request?.schema),
+          type: typeSchemas.request?.name,
+          optional: isOptional(typeSchemas.request?.schema),
         }
       : undefined,
-    params: typedSchemas.queryParams?.name
+    params: typeSchemas.queryParams?.name
       ? {
-          type: typedSchemas.queryParams?.name,
-          optional: isOptional(typedSchemas.queryParams?.schema),
+          type: typeSchemas.queryParams?.name,
+          optional: isOptional(typeSchemas.queryParams?.schema),
         }
       : undefined,
-    headers: typedSchemas.headerParams?.name
+    headers: typeSchemas.headerParams?.name
       ? {
-          type: typedSchemas.headerParams?.name,
-          optional: isOptional(typedSchemas.headerParams?.schema),
+          type: typeSchemas.headerParams?.name,
+          optional: isOptional(typeSchemas.headerParams?.schema),
         }
       : undefined,
-    options: {
-      type: 'Partial<Parameters<typeof client>[0]>',
+    config: {
+      type: typeSchemas.request?.name ? `Partial<RequestConfig<${typeSchemas.request?.name}>>` : 'Partial<RequestConfig>',
       default: '{}',
     },
   })
+}
+
+export function Client({
+  name,
+  isExportable = true,
+  isIndexable = true,
+  typeSchemas,
+  baseURL,
+  dataReturnType,
+  parser,
+  zodSchemas,
+  pathParamsType,
+  operation,
+}: Props): KubbNode {
+  const path = new URLPath(operation.path)
+  const contentType = operation.getContentType()
+  const isFormData = contentType === 'multipart/form-data'
+  const headers = [
+    contentType !== 'application/json' ? `'Content-Type': '${contentType}'` : undefined,
+    typeSchemas.headerParams?.name ? '...headers' : undefined,
+  ].filter(Boolean)
 
-  const clientParams = createParams({
-    data: {
+  const generics = [
+    typeSchemas.response.name,
+    typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error',
+    typeSchemas.request?.name || 'unknown',
+  ].filter(Boolean)
+  const params = getParams({ pathParamsType, typeSchemas })
+  const clientParams = FunctionParams.factory({
+    config: {
       mode: 'object',
       children: {
         method: {
-          type: 'string',
-          value: JSON.stringify(operation.method),
+          value: JSON.stringify(operation.method.toUpperCase()),
         },
         url: {
-          type: 'string',
           value: path.template,
         },
         baseURL: baseURL
           ? {
-              type: 'string',
               value: JSON.stringify(baseURL),
             }
           : undefined,
-        params: typedSchemas.queryParams?.name
+        params: typeSchemas.queryParams?.name ? {} : undefined,
+        data: typeSchemas.request?.name
           ? {
-              type: 'any',
-            }
-          : undefined,
-        data: typedSchemas.request?.name
-          ? {
-              type: 'any',
               value: isFormData ? 'formData' : undefined,
             }
           : undefined,
         headers: headers.length
           ? {
-              type: 'any',
-              value: headers.length ? `{ ${headers.join(', ')}, ...options.headers }` : undefined,
+              value: headers.length ? `{ ${headers.join(', ')}, ...config.headers }` : undefined,
             }
           : undefined,
-        options: {
-          type: 'any',
+        config: {
           mode: 'inlineSpread',
         },
       },
@@ -104,36 +124,36 @@ export function Client({ name, options, typedSchemas, operation }: Props): KubbN
    const formData = new FormData()
    if(data) {
     Object.keys(data).forEach((key) => {
-      const value = data[key];
+      const value = data[key as keyof typeof data];
       if (typeof key === "string" && (typeof value === "string" || value instanceof Blob)) {
         formData.append(key, value);
       }
     })
    }
   `
-    : undefined
+    : ''
 
   return (
-    <File.Source name={name} isExportable isIndexable>
+    <File.Source name={name} isExportable={isExportable} isIndexable={isIndexable}>
       <Function
         name={name}
         async
-        export
-        returnType={
-          options.dataReturnType === 'data' ? `ResponseConfig<${typedSchemas.response.name}>["data"]` : `ResponseConfig<${typedSchemas.response.name}>`
-        }
-        params={params}
+        export={isExportable}
+        params={params.toConstructor()}
         JSDoc={{
           comments: getComments(operation),
         }}
       >
-        {formData || ''}
-        <Function.Call
-          name="res"
-          to={<Function name="client" async generics={[typedSchemas.response.name, typedSchemas.request?.name].filter(Boolean)} params={clientParams} />}
-        />
-        <Function.Return>{options.dataReturnType === 'data' ? 'res.data' : 'res'}</Function.Return>
+        {formData}
+        {`const res = await client<${generics.join(', ')}>(${clientParams.toCall()})`}
+        <br />
+        {dataReturnType === 'full' && parser === 'zod' && zodSchemas && `return {...res, data: ${zodSchemas.response.name}.parse(res.data)}`}
+        {dataReturnType === 'data' && parser === 'zod' && zodSchemas && `return ${zodSchemas.response.name}.parse(res.data)`}
+        {dataReturnType === 'full' && parser === 'client' && 'return res'}
+        {dataReturnType === 'data' && parser === 'client' && 'return res.data'}
       </Function>
     </File.Source>
   )
 }
+
+Client.getParams = getParams

package/src/generators/__snapshots__/deletePet.ts

@@ -0,0 +1,13 @@
+/* eslint-disable no-alert, no-console */
+import client from "@kubb/plugin-client/client";
+import type { RequestConfig } from "@kubb/plugin-client/client";
+
+ /**
+ * @description delete a pet
+ * @summary Deletes a pet
+ * @link /pet/:petId
+ */
+export async function deletePet(petId: DeletePetPathParams["petId"], headers?: DeletePetHeaderParams, config: Partial<RequestConfig> = {}) {
+    const res = await client<DeletePetMutationResponse, DeletePet400, unknown>({ method: "DELETE", url: `/pet/${petId}`, headers: { ...headers, ...config.headers }, ...config });
+    return res.data;
+}

package/src/generators/__snapshots__/deletePetObject.ts

@@ -0,0 +1,15 @@
+/* eslint-disable no-alert, no-console */
+import client from "@kubb/plugin-client/client";
+import type { RequestConfig } from "@kubb/plugin-client/client";
+
+ /**
+ * @description delete a pet
+ * @summary Deletes a pet
+ * @link /pet/:petId
+ */
+export async function deletePet({ petId }: {
+    petId: DeletePetPathParams["petId"];
+}, headers?: DeletePetHeaderParams, config: Partial<RequestConfig> = {}) {
+    const res = await client<DeletePetMutationResponse, DeletePet400, unknown>({ method: "DELETE", url: `/pet/${petId}`, headers: { ...headers, ...config.headers }, ...config });
+    return res.data;
+}

package/src/generators/__snapshots__/findByTags.ts

@@ -0,0 +1,13 @@
+/* eslint-disable no-alert, no-console */
+import client from "@kubb/plugin-client/client";
+import type { RequestConfig } from "@kubb/plugin-client/client";
+
+ /**
+ * @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 async function findPetsByTags(params?: FindPetsByTagsQueryParams, config: Partial<RequestConfig> = {}) {
+    const res = await client<FindPetsByTagsQueryResponse, FindPetsByTags400, unknown>({ method: "GET", url: `/pet/findByTags`, params, ...config });
+    return res.data;
+}

package/src/generators/__snapshots__/findByTagsFull.ts

@@ -0,0 +1,13 @@
+/* eslint-disable no-alert, no-console */
+import client from "@kubb/plugin-client/client";
+import type { RequestConfig } from "@kubb/plugin-client/client";
+
+ /**
+ * @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 async function findPetsByTags(params?: FindPetsByTagsQueryParams, config: Partial<RequestConfig> = {}) {
+    const res = await client<FindPetsByTagsQueryResponse, FindPetsByTags400, unknown>({ method: "GET", url: `/pet/findByTags`, params, ...config });
+    return res;
+}

package/src/generators/__snapshots__/findByTagsWithZod.ts

@@ -0,0 +1,13 @@
+/* eslint-disable no-alert, no-console */
+import client from "@kubb/plugin-client/client";
+import type { RequestConfig } from "@kubb/plugin-client/client";
+
+ /**
+ * @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 async function findPetsByTags(params?: FindPetsByTagsQueryParams, config: Partial<RequestConfig> = {}) {
+    const res = await client<FindPetsByTagsQueryResponse, FindPetsByTags400, unknown>({ method: "GET", url: `/pet/findByTags`, params, ...config });
+    return findPetsByTagsQueryResponse.parse(res.data);
+}

package/src/generators/__snapshots__/findByTagsWithZodFull.ts

@@ -0,0 +1,13 @@
+/* eslint-disable no-alert, no-console */
+import client from "@kubb/plugin-client/client";
+import type { RequestConfig } from "@kubb/plugin-client/client";
+
+ /**
+ * @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 async function findPetsByTags(params?: FindPetsByTagsQueryParams, config: Partial<RequestConfig> = {}) {
+    const res = await client<FindPetsByTagsQueryResponse, FindPetsByTags400, unknown>({ method: "GET", url: `/pet/findByTags`, params, ...config });
+    return { ...res, data: findPetsByTagsQueryResponse.parse(res.data) };
+}

package/src/generators/__snapshots__/importPath.ts

@@ -0,0 +1,13 @@
+/* eslint-disable no-alert, no-console */
+import client from "axios";
+import type { RequestConfig } from "axios";
+
+ /**
+ * @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 async function findPetsByTags(params?: FindPetsByTagsQueryParams, config: Partial<RequestConfig> = {}) {
+    const res = await client<FindPetsByTagsQueryResponse, FindPetsByTags400, unknown>({ method: "GET", url: `/pet/findByTags`, params, ...config });
+    return res.data;
+}

package/src/generators/__snapshots__/operations.ts

@@ -0,0 +1,82 @@
+export const operations = {
+    "updatePet": {
+        "path": "/pet",
+        "method": "put"
+    },
+    "addPet": {
+        "path": "/pet",
+        "method": "post"
+    },
+    "findPetsByStatus": {
+        "path": "/pet/findByStatus",
+        "method": "get"
+    },
+    "findPetsByTags": {
+        "path": "/pet/findByTags",
+        "method": "get"
+    },
+    "getPetById": {
+        "path": "/pet/:petId",
+        "method": "get"
+    },
+    "updatePetWithForm": {
+        "path": "/pet/:petId",
+        "method": "post"
+    },
+    "deletePet": {
+        "path": "/pet/:petId",
+        "method": "delete"
+    },
+    "uploadFile": {
+        "path": "/pet/:petId/uploadImage",
+        "method": "post"
+    },
+    "getInventory": {
+        "path": "/store/inventory",
+        "method": "get"
+    },
+    "placeOrder": {
+        "path": "/store/order",
+        "method": "post"
+    },
+    "placeOrderPatch": {
+        "path": "/store/order",
+        "method": "patch"
+    },
+    "getOrderById": {
+        "path": "/store/order/:orderId",
+        "method": "get"
+    },
+    "deleteOrder": {
+        "path": "/store/order/:orderId",
+        "method": "delete"
+    },
+    "createUser": {
+        "path": "/user",
+        "method": "post"
+    },
+    "createUsersWithListInput": {
+        "path": "/user/createWithList",
+        "method": "post"
+    },
+    "loginUser": {
+        "path": "/user/login",
+        "method": "get"
+    },
+    "logoutUser": {
+        "path": "/user/logout",
+        "method": "get"
+    },
+    "getUserByName": {
+        "path": "/user/:username",
+        "method": "get"
+    },
+    "updateUser": {
+        "path": "/user/:username",
+        "method": "put"
+    },
+    "deleteUser": {
+        "path": "/user/:username",
+        "method": "delete"
+    }
+} as const;

package/src/generators/__snapshots__/updatePetById.ts

@@ -0,0 +1,12 @@
+/* eslint-disable no-alert, no-console */
+import client from "@kubb/plugin-client/client";
+import type { RequestConfig } from "@kubb/plugin-client/client";
+
+ /**
+ * @summary Updates a pet in the store with form data
+ * @link /pet/:petId
+ */
+export async function updatePetWithForm(petId: UpdatePetWithFormPathParams["petId"], params?: UpdatePetWithFormQueryParams, config: Partial<RequestConfig> = {}) {
+    const res = await client<UpdatePetWithFormMutationResponse, UpdatePetWithForm405, unknown>({ method: "POST", url: `/pet/${petId}`, params, ...config });
+    return res.data;
+}

package/src/generators/clientGenerator.tsx

@@ -0,0 +1,66 @@
+import { createReactGenerator } from '@kubb/plugin-oas'
+import { useOperationManager } from '@kubb/plugin-oas/hooks'
+import { pluginTsName } from '@kubb/plugin-ts'
+import { pluginZodName } from '@kubb/plugin-zod'
+import { File, useApp } from '@kubb/react'
+import { Client } from '../components/Client'
+import type { PluginClient } from '../types'
+
+export const clientGenerator = createReactGenerator<PluginClient>({
+  name: 'client',
+  Operation({ options, operation }) {
+    const {
+      plugin: {
+        options: { output },
+      },
+    } = useApp<PluginClient>()
+    const { getSchemas, getName, getFile } = useOperationManager()
+
+    const client = {
+      name: getName(operation, { type: 'function' }),
+      file: getFile(operation),
+    }
+
+    const type = {
+      file: getFile(operation, { pluginKey: [pluginTsName] }),
+      schemas: getSchemas(operation, { pluginKey: [pluginTsName], type: 'type' }),
+    }
+
+    const zod = {
+      file: getFile(operation, { pluginKey: [pluginZodName] }),
+      schemas: getSchemas(operation, { pluginKey: [pluginZodName], type: 'function' }),
+    }
+
+    return (
+      <File baseName={client.file.baseName} path={client.file.path} meta={client.file.meta} banner={output?.banner} footer={output?.footer}>
+        <File.Import name={'client'} path={options.importPath} />
+        <File.Import name={['RequestConfig']} path={options.importPath} isTypeOnly />
+        {options.parser === 'zod' && <File.Import name={[zod.schemas.response.name]} root={client.file.path} path={zod.file.path} />}
+        <File.Import
+          name={[
+            type.schemas.request?.name,
+            type.schemas.response.name,
+            type.schemas.pathParams?.name,
+            type.schemas.queryParams?.name,
+            type.schemas.headerParams?.name,
+            ...(type.schemas.statusCodes?.map((item) => item.name) || []),
+          ].filter(Boolean)}
+          root={client.file.path}
+          path={type.file.path}
+          isTypeOnly
+        />
+
+        <Client
+          name={client.name}
+          baseURL={options.baseURL}
+          dataReturnType={options.dataReturnType}
+          pathParamsType={options.pathParamsType}
+          typeSchemas={type.schemas}
+          operation={operation}
+          parser={options.parser}
+          zodSchemas={zod.schemas}
+        />
+      </File>
+    )
+  },
+})

package/src/generators/groupedClientGenerator.tsx

@@ -0,0 +1,70 @@
+import { camelCase } from '@kubb/core/transformers'
+import type * as KubbFile from '@kubb/fs/types'
+import { pluginClientName } from '@kubb/plugin-client'
+import { createReactGenerator } from '@kubb/plugin-oas'
+import { useOperationManager } from '@kubb/plugin-oas/hooks'
+import { File, Function, useApp } from '@kubb/react'
+import type { PluginClient } from '../types'
+
+export const groupedClientGenerator = createReactGenerator<PluginClient>({
+  name: 'groupedClient',
+  Operations({ operations }) {
+    const {
+      pluginManager,
+      plugin: { options },
+    } = useApp<PluginClient>()
+    const { getName, getFile } = useOperationManager()
+
+    const controllers = operations.reduce(
+      (acc, operation) => {
+        if (options.group?.type === 'tag') {
+          const tag = operation.getTags().at(0)?.name
+          const name = tag ? options.group?.name?.({ group: camelCase(tag) }) : undefined
+
+          if (!tag || !name) {
+            return acc
+          }
+
+          const file = pluginManager.getFile({
+            name,
+            extname: '.ts',
+            pluginKey: [pluginClientName],
+            options: { tag },
+          })
+
+          const client = {
+            name: getName(operation, { type: 'function' }),
+            file: getFile(operation),
+          }
+
+          const previousFile = acc.find((item) => item.file.path === file.path)
+
+          if (previousFile) {
+            previousFile.clients.push(client)
+          } else {
+            acc.push({ name, file, clients: [client] })
+          }
+        }
+
+        return acc
+      },
+      [] as Array<{ name: string; file: KubbFile.File; clients: Array<{ name: string; file: KubbFile.File }> }>,
+    )
+
+    return controllers.map(({ name, file, clients }) => {
+      return (
+        <File key={file.path} baseName={file.baseName} path={file.path} meta={file.meta} banner={options.output?.banner} footer={options.output?.footer}>
+          {clients.map((client) => (
+            <File.Import key={client.name} name={[client.name]} root={file.path} path={client.file.path} />
+          ))}
+
+          <File.Source name={name} isExportable isIndexable>
+            <Function export name={name}>
+              {`return { ${clients.map((client) => client.name).join(', ')} }`}
+            </Function>
+          </File.Source>
+        </File>
+      )
+    })
+  },
+})

package/src/generators/index.ts

@@ -1 +1,3 @@
-export { axiosGenerator } from './axiosGenerator.tsx'
+export { clientGenerator } from './clientGenerator.tsx'
+export { operationsGenerator } from './operationsGenerator.tsx'
+export { groupedClientGenerator } from './groupedClientGenerator.tsx'

package/src/generators/operationsGenerator.tsx

@@ -0,0 +1,26 @@
+import { pluginClientName } from '@kubb/plugin-client'
+import { createReactGenerator } from '@kubb/plugin-oas'
+import { File, useApp } from '@kubb/react'
+import { Operations } from '../components/Operations'
+import type { PluginClient } from '../types'
+
+export const operationsGenerator = createReactGenerator<PluginClient>({
+  name: 'client',
+  Operations({ operations }) {
+    const {
+      pluginManager,
+      plugin: {
+        options: { output },
+      },
+    } = useApp<PluginClient>()
+
+    const name = 'operations'
+    const file = pluginManager.getFile({ name, extname: '.ts', pluginKey: [pluginClientName] })
+
+    return (
+      <File baseName={file.baseName} path={file.path} meta={file.meta} banner={output?.banner} footer={output?.footer}>
+        <Operations name={name} operations={operations} />
+      </File>
+    )
+  },
+})