@kubb/plugin-zod 3.0.0-alpha.1 → 3.0.0-alpha.11

package/dist/components.cjs

@@ -1,11 +1,21 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+'use strict';
 
+var chunkWDPKVCXH_cjs = require('./chunk-WDPKVCXH.cjs');
 
+// src/components/index.ts
+chunkWDPKVCXH_cjs.init_cjs_shims();
 
-var _chunk64Z35OF4cjs = require('./chunk-64Z35OF4.cjs');
-
-
-
-
-exports.OperationSchema = _chunk64Z35OF4cjs.OperationSchema; exports.Operations = _chunk64Z35OF4cjs.Operations; exports.Schema = _chunk64Z35OF4cjs.Schema;
+Object.defineProperty(exports, "OperationSchema", {
+  enumerable: true,
+  get: function () { return chunkWDPKVCXH_cjs.OperationSchema; }
+});
+Object.defineProperty(exports, "Operations", {
+  enumerable: true,
+  get: function () { return chunkWDPKVCXH_cjs.Operations; }
+});
+Object.defineProperty(exports, "Schema", {
+  enumerable: true,
+  get: function () { return chunkWDPKVCXH_cjs.Schema; }
+});
+//# sourceMappingURL=components.cjs.map
 //# sourceMappingURL=components.cjs.map

package/dist/components.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/home/runner/work/kubb/kubb/packages/plugin-zod/dist/components.cjs"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACF,wDAA6B;AAC7B;AACE;AACA;AACA;AACF,0JAAC","file":"/home/runner/work/kubb/kubb/packages/plugin-zod/dist/components.cjs"}
+{"version":3,"sources":["../src/components/index.ts"],"names":["init_cjs_shims"],"mappings":";;;;;AAAAA,gCAAA,EAAA","file":"components.cjs","sourcesContent":["export { OperationSchema } from './OperationSchema.tsx'\nexport { Operations } from './Operations.tsx'\nexport { Schema } from './Schema.tsx'\n"]}

package/dist/components.d.cts

@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
-export { O as Operations } from './Operations-BlQtRP31.cjs';
+export { O as Operations } from './Operations-BG26e_MW.cjs';
 import '@kubb/oas';
-import '@kubb/react';
+import '@kubb/react/types';
 
 type Props$1 = {
     description?: string;

package/dist/components.d.ts

@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
-export { O as Operations } from './Operations-BlQtRP31.js';
+export { O as Operations } from './Operations-BG26e_MW.js';
 import '@kubb/oas';
-import '@kubb/react';
+import '@kubb/react/types';
 
 type Props$1 = {
     description?: string;

package/dist/components.js

@@ -1,11 +1,7 @@
-import {
-  OperationSchema,
-  Operations,
-  Schema
-} from "./chunk-V6DUT3EA.js";
-export {
-  OperationSchema,
-  Operations,
-  Schema
-};
+import { init_esm_shims } from './chunk-Z5LNW4XC.js';
+export { OperationSchema, Operations, Schema } from './chunk-Z5LNW4XC.js';
+
+// src/components/index.ts
+init_esm_shims();
+//# sourceMappingURL=components.js.map
 //# sourceMappingURL=components.js.map

package/dist/components.js.map

@@ -1 +1 @@
-{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}
+{"version":3,"sources":["../src/components/index.ts"],"names":[],"mappings":";;;;AAAA,cAAA,EAAA","file":"components.js","sourcesContent":["export { OperationSchema } from './OperationSchema.tsx'\nexport { Operations } from './Operations.tsx'\nexport { Schema } from './Schema.tsx'\n"]}

package/dist/index.cjs

@@ -1,9 +1,17 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+'use strict';
 
+var chunkWDPKVCXH_cjs = require('./chunk-WDPKVCXH.cjs');
 
-var _chunk64Z35OF4cjs = require('./chunk-64Z35OF4.cjs');
+// src/index.ts
+chunkWDPKVCXH_cjs.init_cjs_shims();
 
-
-
-exports.pluginZod = _chunk64Z35OF4cjs.pluginZod; exports.pluginZodName = _chunk64Z35OF4cjs.pluginZodName;
+Object.defineProperty(exports, "pluginZod", {
+  enumerable: true,
+  get: function () { return chunkWDPKVCXH_cjs.pluginZod; }
+});
+Object.defineProperty(exports, "pluginZodName", {
+  enumerable: true,
+  get: function () { return chunkWDPKVCXH_cjs.pluginZodName; }
+});
+//# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/home/runner/work/kubb/kubb/packages/plugin-zod/dist/index.cjs"],"names":[],"mappings":"AAAA;AACE;AACA;AACF,wDAA6B;AAC7B;AACE;AACA;AACF,yGAAC","file":"/home/runner/work/kubb/kubb/packages/plugin-zod/dist/index.cjs"}
+{"version":3,"sources":["../src/index.ts"],"names":["init_cjs_shims"],"mappings":";;;;;AAAAA,gCAAA,EAAA","file":"index.cjs","sourcesContent":["export { pluginZod, pluginZodName } from './plugin.ts'\nexport type { PluginZod } from './types.ts'\n"]}

package/dist/index.d.cts

@@ -3,8 +3,8 @@ import { PluginFactoryOptions, ResolveNameParams } from '@kubb/core';
 import * as KubbFile from '@kubb/fs/types';
 import { SchemaObject } from '@kubb/oas';
 import { ResolvePathOptions, Exclude, Include, Override, Schema } from '@kubb/plugin-oas';
-import { O as Operations } from './Operations-BlQtRP31.cjs';
-import '@kubb/react';
+import { O as Operations } from './Operations-BG26e_MW.cjs';
+import '@kubb/react/types';
 import 'react';
 
 type Templates = {

package/dist/index.d.ts

@@ -3,8 +3,8 @@ import { PluginFactoryOptions, ResolveNameParams } from '@kubb/core';
 import * as KubbFile from '@kubb/fs/types';
 import { SchemaObject } from '@kubb/oas';
 import { ResolvePathOptions, Exclude, Include, Override, Schema } from '@kubb/plugin-oas';
-import { O as Operations } from './Operations-BlQtRP31.js';
-import '@kubb/react';
+import { O as Operations } from './Operations-BG26e_MW.js';
+import '@kubb/react/types';
 import 'react';
 
 type Templates = {

package/dist/index.js

@@ -1,9 +1,7 @@
-import {
-  pluginZod,
-  pluginZodName
-} from "./chunk-V6DUT3EA.js";
-export {
-  pluginZod,
-  pluginZodName
-};
+import { init_esm_shims } from './chunk-Z5LNW4XC.js';
+export { pluginZod, pluginZodName } from './chunk-Z5LNW4XC.js';
+
+// src/index.ts
+init_esm_shims();
+//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,cAAA,EAAA","file":"index.js","sourcesContent":["export { pluginZod, pluginZodName } from './plugin.ts'\nexport type { PluginZod } from './types.ts'\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-zod",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.11",
   "description": "Generator plugin-zod",
   "keywords": [
     "typescript",
@@ -56,25 +56,25 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@kubb/core": "3.0.0-alpha.1",
-    "@kubb/fs": "3.0.0-alpha.1",
-    "@kubb/oas": "3.0.0-alpha.1",
-    "@kubb/parser-ts": "3.0.0-alpha.1",
-    "@kubb/plugin-oas": "3.0.0-alpha.1",
-    "@kubb/react": "3.0.0-alpha.1",
-    "@kubb/types": "3.0.0-alpha.1"
+    "@kubb/core": "3.0.0-alpha.11",
+    "@kubb/fs": "3.0.0-alpha.11",
+    "@kubb/oas": "3.0.0-alpha.11",
+    "@kubb/parser-ts": "3.0.0-alpha.11",
+    "@kubb/plugin-oas": "3.0.0-alpha.11",
+    "@kubb/react": "3.0.0-alpha.11",
+    "@kubb/types": "3.0.0-alpha.11"
   },
   "devDependencies": {
-    "@types/react": "^18.3.4",
+    "@types/react": "^18.3.5",
     "prettier": "^3.3.3",
     "react": "^18.3.1",
     "tsup": "^8.2.4",
-    "@kubb/config-biome": "3.0.0-alpha.1",
-    "@kubb/config-ts": "3.0.0-alpha.1",
-    "@kubb/config-tsup": "3.0.0-alpha.1"
+    "@kubb/config-biome": "3.0.0-alpha.11",
+    "@kubb/config-ts": "3.0.0-alpha.11",
+    "@kubb/config-tsup": "3.0.0-alpha.11"
   },
   "peerDependencies": {
-    "@kubb/react": "3.0.0-alpha.1"
+    "@kubb/react": "3.0.0-alpha.11"
   },
   "engines": {
     "node": ">=20"

package/src/SchemaGenerator.tsx

@@ -1,31 +1,22 @@
-import type { SchemaObject } from '@kubb/oas'
-import { SchemaGenerator as Generator } from '@kubb/plugin-oas'
-import type { SchemaMethodResult } from '@kubb/plugin-oas'
-import { Oas } from '@kubb/plugin-oas/components'
-import { App, createRoot } from '@kubb/react'
+import { createReactGenerator } from '@kubb/plugin-oas'
+import { OperationSchema } from './components/OperationSchema.tsx'
+import { Operations } from './components/Operations.tsx'
 import { Schema } from './components/Schema.tsx'
-import type { FileMeta, PluginZod } from './types.ts'
+import type { PluginZod } from './types.ts'
 
-export class SchemaGenerator extends Generator<PluginZod['resolvedOptions'], PluginZod> {
-  async schema(name: string, schema: SchemaObject, options: PluginZod['resolvedOptions']): SchemaMethodResult<FileMeta> {
-    const { oas, pluginManager, plugin, mode, output } = this.context
+export const zodParser = createReactGenerator<PluginZod>({
+  name: 'plugin-zod',
+  Operations({ options }) {
+    if (!options.templates.operations) {
+      return null
+    }
 
-    const root = createRoot({
-      logger: pluginManager.logger,
-    })
-
-    const tree = this.parse({ schema, name })
-
-    root.render(
-      <App pluginManager={pluginManager} plugin={{ ...plugin, options }} mode={mode}>
-        <Oas oas={oas}>
-          <Oas.Schema name={name} value={schema} tree={tree}>
-            <Schema.File />
-          </Oas.Schema>
-        </Oas>
-      </App>,
-    )
-
-    return root.files
-  }
-}
+    return <Operations.File templates={options.templates.operations} />
+  },
+  Operation() {
+    return <OperationSchema.File />
+  },
+  Schema({ schema, name }) {
+    return <Schema.File />
+  },
+})

package/src/components/OperationSchema.tsx

@@ -1,9 +1,7 @@
-import { schemaKeywords } from '@kubb/plugin-oas'
+import { SchemaGenerator, schemaKeywords } from '@kubb/plugin-oas'
 import { Oas } from '@kubb/plugin-oas/components'
 import { useOas, useOperation, useOperationManager } from '@kubb/plugin-oas/hooks'
-import { File, Parser, useApp } from '@kubb/react'
-
-import { SchemaGenerator } from '../SchemaGenerator.tsx'
+import { File, useApp } from '@kubb/react'
 
 import type { OperationSchema as OperationSchemaType } from '@kubb/plugin-oas'
 import type { ReactNode } from 'react'
@@ -47,20 +45,16 @@ OperationSchema.File = function ({}: FileProps): ReactNode {
 
     return (
       <Oas.Schema key={i} name={name} value={schema} tree={[...tree, optional ? { keyword: schemaKeywords.optional } : undefined].filter(Boolean)}>
-        {mode === 'split' && <Oas.Schema.Imports extName={plugin.options.extName} />}
-        <File.Source>
-          <OperationSchema description={description} keysToOmit={keysToOmit} />
-        </File.Source>
+        {mode === 'split' && <Oas.Schema.Imports isTypeOnly={false} />}
+        <OperationSchema description={description} keysToOmit={keysToOmit} />
       </Oas.Schema>
     )
   }
 
   return (
-    <Parser language="typescript">
-      <File<FileMeta> baseName={file.baseName} path={file.path} meta={file.meta}>
-        <File.Import name={['z']} path={plugin.options.importPath} />
-        {items.map(mapItem)}
-      </File>
-    </Parser>
+    <File<FileMeta> baseName={file.baseName} path={file.path} meta={file.meta}>
+      <File.Import name={['z']} path={plugin.options.importPath} />
+      {items.map(mapItem)}
+    </File>
   )
 }

package/src/components/Operations.tsx

@@ -1,9 +1,9 @@
 import { useOperationManager, useOperations } from '@kubb/plugin-oas/hooks'
-import { Const, File, Parser, useApp } from '@kubb/react'
+import { Const, File, useApp } from '@kubb/react'
 
 import transformers from '@kubb/core/transformers'
 import type { HttpMethod, Operation } from '@kubb/oas'
-import type { KubbNode } from '@kubb/react'
+import type { KubbNode } from '@kubb/react/types'
 import type { ComponentProps, ComponentType } from 'react'
 import type { FileMeta, PluginZod } from '../types.ts'
 
@@ -46,12 +46,16 @@ function Template({ operationsName, pathsName, operations }: TemplateProps): Kub
 
   return (
     <>
-      <Const export name={operationsName} asConst>
-        {`{${transformers.stringifyObject(operationsJSON)}}`}
-      </Const>
-      <Const export name={pathsName} asConst>
-        {`{${transformers.stringifyObject(pathsJSON)}}`}
-      </Const>
+      <File.Source name={operationsName} isExportable isIndexable>
+        <Const export name={operationsName} asConst>
+          {`{${transformers.stringifyObject(operationsJSON)}}`}
+        </Const>
+      </File.Source>
+      <File.Source name={pathsName} isExportable isIndexable>
+        <Const export name={pathsName} asConst>
+          {`{${transformers.stringifyObject(pathsJSON)}}`}
+        </Const>
+      </File.Source>
     </>
   )
 }
@@ -76,20 +80,18 @@ function RootTemplate({ children }: RootTemplateProps) {
 
   const file = pluginManager.getFile({ name: 'operations', extName: '.ts', pluginKey })
   const imports = Object.entries(transformedOperations)
-    .map(([_key, { data, operation }], index) => {
+    .map(([key, { data, operation }]) => {
       const names = [data.request, ...Object.values(data.responses), ...Object.values(data.parameters)].filter(Boolean)
 
-      return <File.Import key={index} extName={extName} name={names} root={file.path} path={getFile(operation).path} />
+      return <File.Import key={key} name={names} root={file.path} path={getFile(operation).path} />
     })
     .filter(Boolean)
 
   return (
-    <Parser language="typescript">
-      <File<FileMeta> baseName={file.baseName} path={file.path} meta={file.meta} exportable={false}>
-        {mode === 'split' && imports}
-        <File.Source>{children}</File.Source>
-      </File>
-    </Parser>
+    <File<FileMeta> baseName={file.baseName} path={file.path} meta={file.meta}>
+      {mode === 'split' && imports}
+      {children}
+    </File>
   )
 }
 

package/src/components/Schema.tsx

@@ -46,15 +46,17 @@ export function Schema(props: Props): ReactNode {
 
   if (!tree.length) {
     return (
-      <Const
-        name={resolvedName}
-        export
-        JSDoc={{
-          comments: [description ? `@description ${transformers.jsStringEscape(description)}` : undefined].filter(Boolean),
-        }}
-      >
-        undefined
-      </Const>
+      <File.Source name={resolvedName} isExportable isIndexable>
+        <Const
+          name={resolvedName}
+          export
+          JSDoc={{
+            comments: [description ? `@description ${transformers.jsStringEscape(description)}` : undefined].filter(Boolean),
+          }}
+        >
+          undefined
+        </Const>
+      </File.Source>
     )
   }
 
@@ -77,25 +79,29 @@ export function Schema(props: Props): ReactNode {
 
   return (
     <>
-      <Const
-        export
-        name={resolvedName}
-        JSDoc={{
-          comments: [description ? `@description ${transformers.jsStringEscape(description)}` : undefined].filter(Boolean),
-        }}
-      >
-        {[
-          output,
-          keysToOmit?.length ? `${suffix}(z.object({ ${keysToOmit.map((key) => `${key}: z.never()`).join(',')} }))` : undefined,
-          withTypeAnnotation && typeName ? ` as z.ZodType<${typeName}>` : '',
-        ]
-          .filter(Boolean)
-          .join('') || ''}
-      </Const>
+      <File.Source name={resolvedName} isExportable isIndexable>
+        <Const
+          export
+          name={resolvedName}
+          JSDoc={{
+            comments: [description ? `@description ${transformers.jsStringEscape(description)}` : undefined].filter(Boolean),
+          }}
+        >
+          {[
+            output,
+            keysToOmit?.length ? `${suffix}(z.object({ ${keysToOmit.map((key) => `${key}: z.never()`).join(',')} }))` : undefined,
+            withTypeAnnotation && typeName ? ` as z.ZodType<${typeName}>` : '',
+          ]
+            .filter(Boolean)
+            .join('') || ''}
+        </Const>
+      </File.Source>
       {typedSchema && (
-        <Type export name={resolvedTypeName}>
-          {`z.infer<typeof ${resolvedName}>`}
-        </Type>
+        <File.Source name={resolvedTypeName} isExportable isIndexable isTypeOnly>
+          <Type export name={resolvedTypeName}>
+            {`z.infer<typeof ${resolvedName}>`}
+          </Type>
+        </File.Source>
       )}
     </>
   )
@@ -110,25 +116,14 @@ Schema.File = function ({}: FileProps): ReactNode {
       options: { typed },
     },
   } = useApp<PluginZod>()
-  const { tree, schema } = useSchema()
-
-  const withData = tree.some(
-    (schema) =>
-      schema.keyword === schemaKeywords.array ||
-      schema.keyword === schemaKeywords.and ||
-      schema.keyword === schemaKeywords.object ||
-      schema.keyword === schemaKeywords.union ||
-      schema.keyword === schemaKeywords.tuple,
-  )
+  const { schema } = useSchema()
 
   const withTypeAnnotation = !!typed
 
   return (
     <Oas.Schema.File output={pluginManager.config.output.path}>
       <Schema.Imports />
-      <File.Source>
-        <Schema withTypeAnnotation={withTypeAnnotation} description={schema?.description} />
-      </File.Source>
+      <Schema withTypeAnnotation={withTypeAnnotation} description={schema?.description} />
     </Oas.Schema.File>
   )
 }

package/src/components/__snapshots__/operations.ts

@@ -1,50 +1,53 @@
-export const operations = {
-  'get_pets-pet-id': {
-    request: undefined,
+export const operations = {"get_pets-pet-id": {
+            request: undefined,
     parameters: {
-      path: undefined,
-      query: undefined,
-      header: undefined,
-    },
+            path: undefined,
+    query: undefined,
+    header: undefined
+          },
     responses: {
-      200: GetPetsPetIdQueryResponse,
-      default: GetPetsPetIdQueryResponse,
-    },
-    errors: {},
-  },
-  listPets: {
-    request: undefined,
+            200: getPetsPetIdQueryResponse,
+    default: getPetsPetIdQueryResponse
+          },
+    errors: {
+            
+          }
+          },
+    "listPets": {
+            request: undefined,
     parameters: {
-      path: undefined,
-      query: ListPetsQueryParams,
-      header: undefined,
-    },
+            path: undefined,
+    query: listPetsQueryParams,
+    header: undefined
+          },
     responses: {
-      200: ListPetsQueryResponse,
-      default: ListPetsQueryResponse,
-    },
-    errors: {},
-  },
-  createPets: {
-    request: CreatePetsMutationRequest,
+            200: listPetsQueryResponse,
+    default: listPetsQueryResponse
+          },
+    errors: {
+            
+          }
+          },
+    "createPets": {
+            request: createPetsMutationRequest,
     parameters: {
-      path: undefined,
-      query: undefined,
-      header: undefined,
-    },
+            path: undefined,
+    query: undefined,
+    header: undefined
+          },
     responses: {
-      201: CreatePetsMutationResponse,
-      default: CreatePetsMutationResponse,
-    },
-    errors: {},
-  },
-} as const
-export const paths = {
-  '/pets/{pet_id}': {
-    get: operations['get_pets-pet-id'],
-  },
-  '/pets': {
-    get: operations['listPets'],
-    post: operations['createPets'],
-  },
-} as const
+            201: createPetsMutationResponse,
+    default: createPetsMutationResponse
+          },
+    errors: {
+            
+          }
+          }} as const
+
+export const paths = {"/pets/{pet_id}": {
+            get: operations["get_pets-pet-id"]
+          },
+    "/pets": {
+            get: operations["listPets"],
+    post: operations["createPets"]
+          }} as const

package/src/parser/index.ts

@@ -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('')
   },
@@ -308,10 +312,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)
   }