@kubb/plugin-axios 5.0.0-beta.99 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-axios",
-  "version": "5.0.0-beta.99",
+  "version": "5.0.1",
   "description": "Generate a slim, type-safe HTTP client with Kubb based on axios.",
   "keywords": [
     "api-client",
@@ -13,6 +13,7 @@
     "swagger",
     "typescript"
   ],
+  "homepage": "https://kubb.dev/plugins/plugin-axios",
   "license": "MIT",
   "author": "stijnvanhulle",
   "repository": {
@@ -20,6 +21,16 @@
     "url": "git+https://github.com/kubb-labs/plugins.git",
     "directory": "packages/plugin-axios"
   },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/stijnvanhulle"
+    },
+    {
+      "type": "opencollective",
+      "url": "https://opencollective.com/kubb"
+    }
+  ],
   "files": [
     "src",
     "dist",
@@ -49,19 +60,19 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@kubb/plugin-ts": "5.0.0-beta.99",
-    "@kubb/plugin-zod": "5.0.0-beta.99"
+    "@kubb/plugin-ts": "^5.0.0",
+    "@kubb/plugin-zod": "^5.0.0"
   },
   "devDependencies": {
-    "axios": "^1.18.1",
-    "kubb": "5.0.0-beta.97",
+    "axios": "^1.19.0",
+    "kubb": "^5.0.0",
     "typescript": "^6.0.3",
     "@internals/client": "0.0.0",
     "@internals/shared": "0.0.0"
   },
   "peerDependencies": {
-    "axios": "^1.7.2",
-    "kubb": "5.0.0-beta.97"
+    "axios": "^1.19.0",
+    "kubb": "^5.0.0"
   },
   "peerDependenciesMeta": {
     "axios": {
@@ -76,9 +87,6 @@
     "clean": "node -e \"require('node:fs').rmSync('./dist', {recursive:true,force:true})\"",
     "lint": "oxlint .",
     "lint:fix": "oxlint --fix .",
-    "release": "pnpm publish --no-git-check",
-    "release:canary": "bash ../../.github/canary.sh && node ../../scripts/build.js canary && pnpm publish --no-git-check",
-    "release:stage": "pnpm stage publish --no-git-check",
     "start": "tsdown --watch",
     "test": "vitest --passWithNoTests",
     "typecheck": "tsc -p ./tsconfig.json --noEmit --emitDeclarationOnly false"

package/src/generators/clientGenerator.tsx

@@ -1,106 +1,9 @@
-import path from 'node:path'
-import {
-  buildZodErrorParse,
-  getOperationSecurity,
-  Operation,
-  resolveRequestValidator,
-  resolveResponseValidator,
-  type SecurityDocument,
-} from '@internals/client'
-import { isEventStream, operationFileEntry } from '@internals/shared'
-import { ast, defineGenerator } from 'kubb/kit'
-import { pluginTsName } from '@kubb/plugin-ts'
-import { pluginZodName } from '@kubb/plugin-zod'
-import { File, jsxRenderer } from 'kubb/jsx'
+import { createClientGenerator } from '@internals/client'
 import type { PluginAxios } from '../types.ts'
 
 /**
  * Built-in operation generator for `@kubb/plugin-axios`. Emits one async function per OpenAPI
- * operation using the shared `Operation` component: a grouped `<Name>Request` type and a function that
- * forwards a single `options` object to the bundled `client` and returns the `RequestResult`.
+ * operation using the shared `Operation` component: a grouped `<Name>Request` type and a function
+ * that forwards a single `options` object to the bundled `client` and returns the `RequestResult`.
  */
-export const clientGenerator = defineGenerator<PluginAxios>({
-  name: 'axios',
-  renderer: jsxRenderer,
-  operation(node, ctx) {
-    if (!ast.isHttpOperationNode(node)) return null
-
-    const { config, driver, resolver, root } = ctx
-    const { output, validator, group } = ctx.options
-
-    const pluginTs = driver.getPlugin(pluginTsName)
-    if (!pluginTs) return null
-
-    const tsResolver = driver.getResolver(pluginTsName)
-
-    const validatorEnabled = resolveResponseValidator(validator) === 'zod' || resolveRequestValidator(validator) === 'zod'
-    const pluginZod = validatorEnabled ? driver.getPlugin(pluginZodName) : null
-    const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null
-
-    const hasRequestBody = Boolean(node.requestBody?.content?.[0]?.schema)
-    const importedTypeNames = [tsResolver.response.options(node), tsResolver.response.responses(node)]
-
-    const importedZodNames = zodResolver
-      ? [
-          resolveResponseValidator(validator) === 'zod' ? zodResolver.response.response?.(node) : null,
-          resolveResponseValidator(validator) === 'zod' ? (buildZodErrorParse(node, zodResolver)?.expression ?? null) : null,
-          resolveRequestValidator(validator) === 'zod' && hasRequestBody ? zodResolver.response.body?.(node) : null,
-        ].filter((name): name is string => Boolean(name))
-      : []
-
-    const meta = {
-      name: resolver.name(node.operationId),
-      file: resolver.file({ ...operationFileEntry(node, node.operationId), root, output, group: group ?? undefined }),
-      fileTs: tsResolver.file({
-        ...operationFileEntry(node, node.operationId),
-        root,
-        output: pluginTs.options?.output ?? output,
-        group: pluginTs.options?.group ?? undefined,
-      }),
-      fileZod:
-        zodResolver && pluginZod?.options
-          ? zodResolver.file({
-              ...operationFileEntry(node, node.operationId),
-              root,
-              output: pluginZod.options.output ?? output,
-              group: pluginZod.options?.group ?? undefined,
-            })
-          : null,
-    } as const
-
-    const security = getOperationSecurity({
-      document: ctx.adapter.document as SecurityDocument | null | undefined,
-      method: node.method,
-      path: node.path,
-    })
-
-    const clientPath = path.resolve(root, '.kubb/client.ts')
-    const eventStream = isEventStream(node)
-
-    return (
-      <File
-        baseName={meta.file.baseName}
-        path={meta.file.path}
-        meta={meta.file.meta}
-        banner={resolver.default.banner(ctx.meta, { output, config, file: { path: meta.file.path, baseName: meta.file.baseName } })}
-        footer={resolver.default.footer(ctx.meta, { output, config, file: { path: meta.file.path, baseName: meta.file.baseName } })}
-      >
-        <File.Import name={eventStream ? ['client', 'toEventStream'] : ['client']} root={meta.file.path} path={clientPath} />
-        <File.Import
-          name={eventStream ? ['Options', 'EventStreamResult', 'SuccessOf'] : ['Options', 'RequestResult']}
-          root={meta.file.path}
-          path={clientPath}
-          isTypeOnly
-        />
-
-        {meta.fileTs && importedTypeNames.length > 0 && (
-          <File.Import name={Array.from(new Set(importedTypeNames))} root={meta.file.path} path={meta.fileTs.path} isTypeOnly />
-        )}
-
-        {meta.fileZod && importedZodNames.length > 0 && <File.Import name={importedZodNames} root={meta.file.path} path={meta.fileZod.path} />}
-
-        <Operation name={meta.name} node={node} tsResolver={tsResolver} zodResolver={zodResolver} validator={validator} security={security} />
-      </File>
-    )
-  },
-})
+export const clientGenerator = createClientGenerator<PluginAxios>('axios')

package/templates/axios.ts

@@ -2,7 +2,7 @@ import axios from 'axios'
 import type { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
 import { applyHeaderStyles, defaultBodySerializer, defaultPathSerializer, defaultQuerySerializer, isDefaultJsonBody, serializeCookies } from './serializers'
 import type { HeadersInit, PathParamStyle, PathSerializer, Serializers, Styles } from './serializers'
-import { type StandardSchemaValidator, validateStandardSchema } from './standardSchema.ts'
+import { type StandardSchemaValidator, validateStandardSchema } from './standardSchema'
 
 /**
  * HTTP status codes treated as a success, everything else is an error.
@@ -483,7 +483,8 @@ async function resolveRequest<TBody, TRequest, TResponse>({
   )
 
   const throwOnError = requestConfig.throwOnError ?? config.throwOnError ?? true
-  const validateStatus = requestConfig.validateStatus ?? config.validateStatus ?? (throwOnError ? undefined : () => true)
+  const validateStatus =
+    requestConfig.validateStatus ?? config.validateStatus ?? (throwOnError ? (status: number) => status >= 200 && status < 300 : () => true)
 
   const options = config.options || requestConfig.options ? { ...config.options, ...requestConfig.options } : undefined
 

package/templates/standardSchema.ts

@@ -50,5 +50,5 @@ export async function validateStandardSchema<TOutput>(schema: StandardSchemaVali
   if (result.issues) {
     throw new ParseError({ issues: result.issues })
   }
-  return result.value as TOutput
+  return (result as { value: TOutput }).value
 }