@kubb/plugin-zod 3.0.0-alpha.3 → 3.0.0-alpha.30

package/src/generators/zodGenerator.tsx

@@ -0,0 +1,121 @@
+import { type OperationSchema as OperationSchemaType, SchemaGenerator, createReactGenerator, schemaKeywords } from '@kubb/plugin-oas'
+import { Oas } from '@kubb/plugin-oas/components'
+import { useOas, useOperationManager, useSchemaManager } from '@kubb/plugin-oas/hooks'
+import { pluginTsName } from '@kubb/plugin-ts'
+import { File, useApp } from '@kubb/react'
+import { Zod } from '../components'
+import type { PluginZod } from '../types'
+
+export const zodGenerator = createReactGenerator<PluginZod>({
+  name: 'zod',
+  Operation({ operation, options }) {
+    const { coercion, inferred, typed, mapper } = options
+
+    const { plugin, pluginManager, mode } = useApp<PluginZod>()
+    const oas = useOas()
+    const { getSchemas, getFile } = useOperationManager()
+    const schemaManager = useSchemaManager()
+
+    const file = getFile(operation)
+    const schemas = getSchemas(operation)
+    const schemaGenerator = new SchemaGenerator(options, {
+      oas,
+      plugin,
+      pluginManager,
+      mode,
+      override: options.override,
+    })
+
+    const operationSchemas = [schemas.pathParams, schemas.queryParams, schemas.headerParams, schemas.statusCodes, schemas.request, schemas.response]
+      .flat()
+      .filter(Boolean)
+
+    const mapOperationSchema = ({ name, schema, description, keysToOmit, ...options }: OperationSchemaType, i: number) => {
+      // hack so Params can be optional when needed
+      const required = Array.isArray(schema?.required) ? !!schema.required.length : !!schema?.required
+      const optional = !required && !!name.includes('Params')
+      const tree = [...schemaGenerator.parse({ schema, name }), optional ? { keyword: schemaKeywords.optional } : undefined].filter(Boolean)
+      const imports = schemaManager.getImports(tree)
+
+      const zod = {
+        name: schemaManager.getName(name, { type: 'function' }),
+        inferTypeName: schemaManager.getName(name, { type: 'type' }),
+        file: schemaManager.getFile(name),
+      }
+
+      const type = {
+        name: schemaManager.getName(name, { type: 'type', pluginKey: [pluginTsName] }),
+        file: schemaManager.getFile(options.operationName || name, { pluginKey: [pluginTsName], tag: options.operation?.getTags()[0]?.name }),
+      }
+
+      return (
+        <Oas.Schema key={i} name={name} value={schema} tree={tree}>
+          {typed && <File.Import isTypeOnly root={file.path} path={type.file.path} name={[type.name]} />}
+          {imports.map((imp, index) => (
+            <File.Import key={index} root={file.path} path={imp.path} name={imp.name} />
+          ))}
+          <Zod
+            name={zod.name}
+            typeName={typed ? type.name : undefined}
+            inferTypeName={inferred ? zod.inferTypeName : undefined}
+            description={description}
+            tree={tree}
+            mapper={mapper}
+            coercion={coercion}
+            keysToOmit={keysToOmit}
+          />
+        </Oas.Schema>
+      )
+    }
+
+    return (
+      <File baseName={file.baseName} path={file.path} meta={file.meta} banner={plugin.options.output?.banner} footer={plugin.options.output?.footer}>
+        <File.Import name={['z']} path={plugin.options.importPath} />
+        {operationSchemas.map(mapOperationSchema)}
+      </File>
+    )
+  },
+  Schema({ schema, options }) {
+    const { coercion, inferred, typed, mapper, importPath } = options
+
+    const { getName, getFile, getImports } = useSchemaManager()
+    const {
+      plugin: {
+        options: { output },
+      },
+    } = useApp<PluginZod>()
+
+    const imports = getImports(schema.tree)
+
+    const zod = {
+      name: getName(schema.name, { type: 'function' }),
+      inferTypeName: getName(schema.name, { type: 'type' }),
+      file: getFile(schema.name),
+    }
+
+    const type = {
+      name: getName(schema.name, { type: 'type', pluginKey: [pluginTsName] }),
+      file: getFile(schema.name, { pluginKey: [pluginTsName] }),
+    }
+
+    return (
+      <File baseName={zod.file.baseName} path={zod.file.path} meta={zod.file.meta} banner={output?.banner} footer={output?.footer}>
+        <File.Import name={['z']} path={importPath} />
+        {typed && <File.Import isTypeOnly root={zod.file.path} path={type.file.path} name={[type.name]} />}
+        {imports.map((imp, index) => (
+          <File.Import key={index} root={zod.file.path} path={imp.path} name={imp.name} />
+        ))}
+
+        <Zod
+          name={zod.name}
+          typeName={typed ? type.name : undefined}
+          inferTypeName={inferred ? zod.inferTypeName : undefined}
+          description={schema.value.description}
+          tree={schema.tree}
+          mapper={mapper}
+          coercion={coercion}
+        />
+      </File>
+    )
+  },
+})

package/src/parser/index.ts

@@ -3,7 +3,7 @@ import { type SchemaKeywordMapper, isKeyword, schemaKeywords } from '@kubb/plugi
 
 import type { Schema, SchemaKeywordBase, SchemaMapper } from '@kubb/plugin-oas'
 
-export const zodKeywordMapper = {
+const zodKeywordMapper = {
   any: () => 'z.any()',
   unknown: () => 'z.unknown()',
   number: (coercion?: boolean, min?: number, max?: number) => {
@@ -12,7 +12,11 @@ export const zodKeywordMapper = {
       .join('')
   },
   integer: (coercion?: boolean, min?: number, max?: number) => {
-    return [coercion ? 'z.coerce.number()' : 'z.number()', min !== undefined ? `.min(${min})` : undefined, max !== undefined ? `.max(${max})` : undefined]
+    return [
+      coercion ? 'z.coerce.number().int()' : 'z.number().int()',
+      min !== undefined ? `.min(${min})` : undefined,
+      max !== undefined ? `.max(${max})` : undefined,
+    ]
       .filter(Boolean)
       .join('')
   },
@@ -35,7 +39,7 @@ export const zodKeywordMapper = {
   tuple: (items: string[] = []) => `z.tuple([${items?.join(', ')}])`,
   enum: (items: string[] = []) => `z.enum([${items?.join(', ')}])`,
   union: (items: string[] = []) => `z.union([${items?.join(', ')}])`,
-  const: (value?: string | number) => `z.literal(${value ?? ''})`,
+  const: (value?: string | number | boolean) => `z.literal(${value ?? ''})`,
   /**
    * ISO 8601
    */
@@ -98,6 +102,7 @@ export const zodKeywordMapper = {
   password: undefined,
   phone: undefined,
   readOnly: undefined,
+  writeOnly: undefined,
   ref: (value?: string) => (value ? `z.lazy(() => ${value})` : undefined),
   blob: () => 'z.string()',
   deprecated: undefined,
@@ -201,6 +206,17 @@ export function parse(parent: Schema | undefined, current: Schema, options: Pars
 
   if (isKeyword(current, schemaKeywords.enum)) {
     if (current.args.asConst) {
+      if (current.args.items.length === 1) {
+        return parse(
+          current,
+          {
+            keyword: schemaKeywords.const,
+            args: current.args.items[0],
+          },
+          options,
+        )
+      }
+
       return zodKeywordMapper.union(
         current.args.items
           .map((schema) => {
@@ -219,6 +235,10 @@ export function parse(parent: Schema | undefined, current: Schema, options: Pars
 
     return zodKeywordMapper.enum(
       current.args.items.map((schema) => {
+        if (schema.format === 'boolean') {
+          return transformers.stringify(schema.value)
+        }
+
         if (schema.format === 'number') {
           return transformers.stringify(schema.value)
         }
@@ -259,7 +279,7 @@ export function parse(parent: Schema | undefined, current: Schema, options: Pars
       ? current.args.additionalProperties
           .map((schema) => parse(current, schema, options))
           .filter(Boolean)
-          .at(0)
+          .join('')
       : undefined
 
     const text = [
@@ -272,17 +292,17 @@ export function parse(parent: Schema | undefined, current: Schema, options: Pars
   }
 
   if (isKeyword(current, schemaKeywords.tuple)) {
-    return zodKeywordMapper.tuple(
-      sort(current.args.items)
-        .map((schema) => parse(current, schema, options))
-        .filter(Boolean),
-    )
+    return zodKeywordMapper.tuple(current.args.items.map((schema) => parse(current, schema, options)).filter(Boolean))
   }
 
   if (isKeyword(current, schemaKeywords.const)) {
     if (current.args.format === 'number' && current.args.value !== undefined) {
       return zodKeywordMapper.const(Number.parseInt(current.args.value?.toString()))
     }
+
+    if (current.args.format === 'boolean' && current.args.value !== undefined) {
+      return zodKeywordMapper.const(current.args.value)
+    }
     return zodKeywordMapper.const(transformers.stringify(current.args.value))
   }
 
@@ -308,10 +328,14 @@ export function parse(parent: Schema | undefined, current: Schema, options: Pars
     return zodKeywordMapper.string(options.coercion)
   }
 
-  if (isKeyword(current, schemaKeywords.number) || isKeyword(current, schemaKeywords.integer)) {
+  if (isKeyword(current, schemaKeywords.number)) {
     return zodKeywordMapper.number(options.coercion)
   }
 
+  if (isKeyword(current, schemaKeywords.integer)) {
+    return zodKeywordMapper.integer(options.coercion)
+  }
+
   if (isKeyword(current, schemaKeywords.min)) {
     return zodKeywordMapper.min(current.args)
   }

package/src/plugin.ts

@@ -3,21 +3,21 @@ import path from 'node:path'
 import { FileManager, PluginManager, createPlugin } from '@kubb/core'
 import { camelCase, pascalCase } from '@kubb/core/transformers'
 import { renderTemplate } from '@kubb/core/utils'
-import { OperationGenerator, pluginOasName, SchemaGenerator } from '@kubb/plugin-oas'
-import { getGroupedByTagFiles } from '@kubb/plugin-oas/utils'
+import { OperationGenerator, SchemaGenerator, pluginOasName } from '@kubb/plugin-oas'
+
 import { pluginTsName } from '@kubb/plugin-ts'
 
 import type { Plugin } from '@kubb/core'
 import type { PluginOas as SwaggerPluginOptions } from '@kubb/plugin-oas'
-import { Operations } from './components/Operations.tsx'
+import { operationsGenerator } from './generators'
+import { zodGenerator } from './generators/zodGenerator.tsx'
 import type { PluginZod } from './types.ts'
-import { zodParser } from './SchemaGenerator.tsx'
 
 export const pluginZodName = 'plugin-zod' satisfies PluginZod['name']
 
 export const pluginZod = createPlugin<PluginZod>((options) => {
   const {
-    output = { path: 'zod' },
+    output = { path: 'zod', barrelType: 'named' },
     group,
     exclude = [],
     include,
@@ -26,33 +26,31 @@ export const pluginZod = createPlugin<PluginZod>((options) => {
     dateType = 'string',
     unknownType = 'any',
     typed = false,
-    typedSchema = false,
     mapper = {},
-    templates,
+    operations = false,
     importPath = 'zod',
     coercion = false,
+    inferred = false,
+    generators = [zodGenerator, operations ? operationsGenerator : undefined].filter(Boolean),
   } = options
   const template = group?.output ? group.output : `${output.path}/{{tag}}Controller`
 
   return {
     name: pluginZodName,
     options: {
-      extName: output.extName,
+      output,
       transformers,
       include,
       exclude,
       override,
       typed,
-      typedSchema,
       dateType,
       unknownType,
       mapper,
       importPath,
       coercion,
-      templates: {
-        operations: Operations.templates,
-        ...templates,
-      },
+      operations,
+      inferred,
     },
     pre: [pluginOasName, typed ? pluginTsName : undefined].filter(Boolean),
     resolvePath(baseName, pathMode, options) {
@@ -109,7 +107,7 @@ export const pluginZod = createPlugin<PluginZod>((options) => {
         output: output.path,
       })
 
-      const schemaFiles = await schemaGenerator.build(zodParser)
+      const schemaFiles = await schemaGenerator.build(...generators)
       await this.addFile(...schemaFiles)
 
       const operationGenerator = new OperationGenerator(this.plugin.options, {
@@ -123,36 +121,21 @@ export const pluginZod = createPlugin<PluginZod>((options) => {
         mode,
       })
 
-      const operationFiles = await operationGenerator.build(zodParser)
+      const operationFiles = await operationGenerator.build(...generators)
       await this.addFile(...operationFiles)
-    },
-    async buildEnd() {
-      if (this.config.output.write === false) {
-        return
-      }
-
-      const root = path.resolve(this.config.root, this.config.output.path)
-
-      if (group?.type === 'tag') {
-        const rootFiles = await getGroupedByTagFiles({
-          logger: this.logger,
-          files: this.fileManager.files,
-          plugin: this.plugin,
-          template,
-          exportAs: group.exportAs || '{{tag}}Schemas',
-          root,
-          output,
-        })
-
-        await this.addFile(...rootFiles)
-      }
 
-      await this.fileManager.addIndexes({
+      const barrelFiles = await this.fileManager.getBarrelFiles({
+        type: output.barrelType ?? 'named',
         root,
         output,
-        meta: { pluginKey: this.plugin.key },
+        files: this.fileManager.files,
+        meta: {
+          pluginKey: this.plugin.key,
+        },
         logger: this.logger,
       })
+
+      await this.addFile(...barrelFiles)
     },
   }
 })

package/src/types.ts

@@ -1,35 +1,12 @@
-import type { Plugin, PluginFactoryOptions, ResolveNameParams } from '@kubb/core'
-import type * as KubbFile from '@kubb/fs/types'
+import type { Output, PluginFactoryOptions, ResolveNameParams } from '@kubb/core'
 import type { SchemaObject } from '@kubb/oas'
-import type { Exclude, Include, Override, ResolvePathOptions, Schema } from '@kubb/plugin-oas'
-import type { Operations } from './components/Operations'
-
-type Templates = {
-  operations?: typeof Operations.templates | false
-}
+import type { Exclude, Generator, Include, Override, ResolvePathOptions, Schema } from '@kubb/plugin-oas'
 
 export type Options = {
-  output?: {
-    /**
-     * Relative path to save the Zod schemas.
-     * When output is a file it will save all models inside that file else it will create a file per schema item.
-     * @default 'zod'
-     */
-    path: string
-    /**
-     * Name to be used for the `export * as {{exportAs}} from './'`
-     */
-    exportAs?: string
-    /**
-     * Add an extension to the generated imports and exports, default it will not use an extension
-     */
-    extName?: KubbFile.Extname
-    /**
-     * Define what needs to exported, here you can also disable the export of barrel files
-     * @default `'barrel'`
-     */
-    exportType?: 'barrel' | 'barrelNamed' | false
-  }
+  /**
+   * @default 'zod'
+   */
+  output?: Output
   /**
    * Group the Zod schemas based on the provided name.
    */
@@ -64,30 +41,15 @@ export type Options = {
    * Array containing override parameters to override `options` based on tags/operations/methods/paths.
    */
   override?: Array<Override<ResolvedOptions>>
-  transformers?: {
-    /**
-     * Customize the names based on the type that is provided by the plugin.
-     */
-    name?: (name: ResolveNameParams['name'], type?: ResolveNameParams['type']) => string
-    /**
-     * Receive schema and baseName(propertName) and return FakerMeta array
-     * TODO TODO add docs
-     * @beta
-     */
-    schema?: (
-      props: {
-        schema?: SchemaObject
-        name?: string
-        parentName?: string
-      },
-      defaultSchemas: Schema[],
-    ) => Schema[] | undefined
-  }
-  mapper?: Record<string, string>
   /**
-   * Make it possible to override one of the templates
+   * Path to Zod
+   * It will be used as `import { z } from '${importPath}'`.
+   * It allows both relative and absolute path.
+   * the path will be applied as is, so relative path should be based on the file being generated.
+   * @default 'zod'
    */
-  templates?: Partial<Templates>
+  importPath?: string
+
   /**
    * Choose to use `date` or `datetime` as JavaScript `Date` instead of `string`.
    * False will fallback on a simple z.string() format
@@ -106,40 +68,50 @@ export type Options = {
   /**
    * Return Zod generated schema as type with z.infer<TYPE>
    */
-  typedSchema?: boolean
+  inferred?: boolean
   /**
    * Use of z.coerce.string() instead of z.string()
    */
   coercion?: boolean
+  operations?: boolean
+  mapper?: Record<string, string>
+  transformers?: {
+    /**
+     * Customize the names based on the type that is provided by the plugin.
+     */
+    name?: (name: ResolveNameParams['name'], type?: ResolveNameParams['type']) => string
+    /**
+     * Receive schema and baseName(propertName) and return FakerMeta array
+     * TODO TODO add docs
+     * @beta
+     */
+    schema?: (
+      props: {
+        schema?: SchemaObject
+        name?: string
+        parentName?: string
+      },
+      defaultSchemas: Schema[],
+    ) => Schema[] | undefined
+  }
   /**
-   * Path to Zod
-   * It will be used as `import { z } from '${importPath}'`.
-   * It allows both relative and absolute path.
-   * the path will be applied as is, so relative path should be based on the file being generated.
-   * @default 'zod'
+   * Define some generators next to the zod generators
    */
-  importPath?: string
+  generators?: Array<Generator<PluginZod>>
 }
 
 type ResolvedOptions = {
-  extName: KubbFile.Extname | undefined
+  output: Output
+  override: NonNullable<Options['override']>
   transformers: NonNullable<Options['transformers']>
-  exclude: Options['exclude']
-  include: Options['include']
-  override: Options['override']
   dateType: NonNullable<Options['dateType']>
   unknownType: NonNullable<Options['unknownType']>
   typed: NonNullable<Options['typed']>
-  typedSchema: NonNullable<Options['typedSchema']>
-  templates: NonNullable<Templates>
+  inferred: NonNullable<Options['inferred']>
   mapper: NonNullable<Options['mapper']>
   importPath: NonNullable<Options['importPath']>
   coercion: NonNullable<Options['coercion']>
-}
-
-export type FileMeta = {
-  pluginKey?: Plugin['key']
-  tag?: string
+  operations: NonNullable<Options['coercion']>
 }
 
 export type PluginZod = PluginFactoryOptions<'plugin-zod', Options, ResolvedOptions, never, ResolvePathOptions>

package/dist/Operations-BlQtRP31.d.cts

@@ -1,47 +0,0 @@
-import { Operation } from '@kubb/oas';
-import { KubbNode } from '@kubb/react';
-import { ComponentType, ComponentProps } from 'react';
-
-type TemplateProps = {
-    /**
-     * Name of the function
-     */
-    operationsName: string;
-    /**
-     * Name of the function
-     */
-    pathsName: string;
-    operations: Operation[];
-};
-declare function Template({ operationsName, pathsName, operations }: TemplateProps): KubbNode;
-type RootTemplateProps = {
-    children?: React.ReactNode;
-};
-declare function RootTemplate({ children }: RootTemplateProps): JSX.Element;
-declare const defaultTemplates: {
-    readonly default: typeof Template;
-    readonly root: typeof RootTemplate;
-};
-type Templates = Partial<typeof defaultTemplates>;
-type Props = {
-    /**
-     * This will make it possible to override the default behaviour.
-     */
-    Template?: ComponentType<ComponentProps<typeof Template>>;
-};
-declare function Operations({ Template }: Props): KubbNode;
-declare namespace Operations {
-    var File: (props: FileProps) => KubbNode;
-    var templates: {
-        readonly default: typeof Template;
-        readonly root: typeof RootTemplate;
-    };
-}
-type FileProps = {
-    /**
-     * This will make it possible to override the default behaviour.
-     */
-    templates?: Templates;
-};
-
-export { Operations as O };

package/dist/Operations-BlQtRP31.d.ts

@@ -1,47 +0,0 @@
-import { Operation } from '@kubb/oas';
-import { KubbNode } from '@kubb/react';
-import { ComponentType, ComponentProps } from 'react';
-
-type TemplateProps = {
-    /**
-     * Name of the function
-     */
-    operationsName: string;
-    /**
-     * Name of the function
-     */
-    pathsName: string;
-    operations: Operation[];
-};
-declare function Template({ operationsName, pathsName, operations }: TemplateProps): KubbNode;
-type RootTemplateProps = {
-    children?: React.ReactNode;
-};
-declare function RootTemplate({ children }: RootTemplateProps): JSX.Element;
-declare const defaultTemplates: {
-    readonly default: typeof Template;
-    readonly root: typeof RootTemplate;
-};
-type Templates = Partial<typeof defaultTemplates>;
-type Props = {
-    /**
-     * This will make it possible to override the default behaviour.
-     */
-    Template?: ComponentType<ComponentProps<typeof Template>>;
-};
-declare function Operations({ Template }: Props): KubbNode;
-declare namespace Operations {
-    var File: (props: FileProps) => KubbNode;
-    var templates: {
-        readonly default: typeof Template;
-        readonly root: typeof RootTemplate;
-    };
-}
-type FileProps = {
-    /**
-     * This will make it possible to override the default behaviour.
-     */
-    templates?: Templates;
-};
-
-export { Operations as O };