@kubb/plugin-ts 3.3.3 → 3.3.5

package/dist/index.js

@@ -1,4 +1,4 @@
-export { pluginTs, pluginTsName } from './chunk-XQHAKH5D.js';
-import './chunk-7TGSNOHU.js';
+export { pluginTs, pluginTsName } from './chunk-AYNI7BPH.js';
+import './chunk-EAOG7QZN.js';
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-ts",
-  "version": "3.3.3",
+  "version": "3.3.5",
   "description": "Generator plugin-ts",
   "keywords": [
     "zod",
@@ -58,20 +58,20 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@kubb/core": "3.3.3",
-    "@kubb/fs": "3.3.3",
-    "@kubb/oas": "3.3.3",
-    "@kubb/parser-ts": "3.3.3",
-    "@kubb/plugin-oas": "3.3.3",
-    "@kubb/react": "3.3.3"
+    "@kubb/core": "3.3.5",
+    "@kubb/fs": "3.3.5",
+    "@kubb/oas": "3.3.5",
+    "@kubb/parser-ts": "3.3.5",
+    "@kubb/plugin-oas": "3.3.5",
+    "@kubb/react": "3.3.5"
   },
   "devDependencies": {
-    "@types/react": "^18.3.16",
+    "@types/react": "^18.3.18",
     "react": "^18.3.1",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
-    "@kubb/config-ts": "3.3.3",
-    "@kubb/config-tsup": "3.3.3"
+    "@kubb/config-ts": "3.3.5",
+    "@kubb/config-tsup": "3.3.5"
   },
   "peerDependencies": {
     "@kubb/react": "^3.0.0"

package/src/components/Type.tsx

@@ -1,6 +1,7 @@
 import { File } from '@kubb/react'
 
 import transformers from '@kubb/core/transformers'
+import type { SchemaObject } from '@kubb/oas'
 import { print } from '@kubb/parser-ts'
 import * as factory from '@kubb/parser-ts/factory'
 import { createTypeDeclaration } from '@kubb/parser-ts/factory'
@@ -13,6 +14,7 @@ import type { PluginTs } from '../types.ts'
 type Props = {
   name: string
   typedName: string
+  schema: SchemaObject
   tree: Array<Schema>
   optionalType: PluginTs['resolvedOptions']['optionalType']
   enumType: PluginTs['resolvedOptions']['enumType']
@@ -22,20 +24,20 @@ type Props = {
   keysToOmit?: string[]
 }
 
-export function Type({ name, typedName, tree, keysToOmit, optionalType, syntaxType, enumType, mapper, description }: Props): ReactNode {
+export function Type({ name, typedName, tree, keysToOmit, schema, optionalType, syntaxType, enumType, mapper, description }: Props): ReactNode {
   const typeNodes: ts.Node[] = []
 
   if (!tree.length) {
     return ''
   }
 
-  const schema = tree.find((item) => item.keyword === schemaKeywords.schema)
+  const schemaFromTree = tree.find((item) => item.keyword === schemaKeywords.schema)
 
   let type =
     (tree
-      .map((schema, _index, siblings) =>
+      .map((current, _index, siblings) =>
         parse(
-          { parent: undefined, current: schema, siblings },
+          { parent: undefined, current, siblings },
           {
             name,
             typedName,
@@ -51,7 +53,7 @@ export function Type({ name, typedName, tree, keysToOmit, optionalType, syntaxTy
       .filter(Boolean)
       .at(0) as ts.TypeNode) || typeKeywordMapper.undefined()
 
-  if (schema && isKeyword(schema, schemaKeywords.schema) && schema.args.type !== 'object') {
+  if (schemaFromTree && isKeyword(schemaFromTree, schemaKeywords.schema) && schemaFromTree.args.type !== 'object') {
     const isNullish = tree.some((item) => item.keyword === schemaKeywords.nullish)
     const isNullable = tree.some((item) => item.keyword === schemaKeywords.nullable)
     const isOptional = tree.some((item) => item.keyword === schemaKeywords.optional)
@@ -89,7 +91,15 @@ export function Type({ name, typedName, tree, keysToOmit, optionalType, syntaxTy
           })
         : type,
       syntax: useTypeGeneration ? 'type' : 'interface',
-      description: description ? transformers.jsStringEscape(description) : undefined,
+      comments: [
+        description ? `@description ${transformers.jsStringEscape(description)}` : undefined,
+        schema.deprecated ? '@deprecated' : undefined,
+        schema.minLength ? `@minLength ${schema.minLength}` : undefined,
+        schema.maxLength ? `@maxLength ${schema.maxLength}` : undefined,
+        schema.pattern ? `@pattern ${schema.pattern}` : undefined,
+        schema.default ? `@default ${schema.default}` : undefined,
+        schema.example ? `@example ${schema.example}` : undefined,
+      ],
     }),
   )
 

package/src/generators/typeGenerator.tsx

@@ -146,6 +146,7 @@ export const typeGenerator = createReactGenerator<PluginTs>({
             typedName={type.typedName}
             description={description}
             tree={tree}
+            schema={schema}
             mapper={mapper}
             enumType={enumType}
             optionalType={optionalType}
@@ -196,6 +197,7 @@ export const typeGenerator = createReactGenerator<PluginTs>({
           typedName={type.typedName}
           description={schema.value.description}
           tree={schema.tree}
+          schema={schema.value}
           mapper={mapper}
           enumType={enumType}
           optionalType={optionalType}

package/src/parser.ts

@@ -206,6 +206,9 @@ export function parse({ parent, current, siblings }: SchemaTree, options: Parser
         const defaultSchema = schemas.find((schema) => schema.keyword === schemaKeywords.default) as SchemaKeywordMapper['default'] | undefined
         const exampleSchema = schemas.find((schema) => schema.keyword === schemaKeywords.example) as SchemaKeywordMapper['example'] | undefined
         const schemaSchema = schemas.find((schema) => schema.keyword === schemaKeywords.schema) as SchemaKeywordMapper['schema'] | undefined
+        const minSchema = schemas.find((schema) => schema.keyword === schemaKeywords.min) as SchemaKeywordMapper['min'] | undefined
+        const maxSchema = schemas.find((schema) => schema.keyword === schemaKeywords.max) as SchemaKeywordMapper['max'] | undefined
+        const matchesSchema = schemas.find((schema) => schema.keyword === schemaKeywords.matches) as SchemaKeywordMapper['matches'] | undefined
 
         let type = schemas.map((schema) => parse({ parent: current, current: schema, siblings }, options)).filter(Boolean)[0] as ts.TypeNode
 
@@ -239,6 +242,9 @@ export function parse({ parent, current, siblings }: SchemaTree, options: Parser
           comments: [
             describeSchema ? `@description ${transformers.jsStringEscape(describeSchema.args)}` : undefined,
             deprecatedSchema ? '@deprecated' : undefined,
+            minSchema ? `@minLength ${minSchema.args}` : undefined,
+            maxSchema ? `@maxLength ${maxSchema.args}` : undefined,
+            matchesSchema ? `@pattern ${matchesSchema.args}` : undefined,
             defaultSchema ? `@default ${defaultSchema.args}` : undefined,
             exampleSchema ? `@example ${exampleSchema.args}` : undefined,
             schemaSchema?.args?.type || schemaSchema?.args?.format