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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-ts",
-  "version": "3.0.0-alpha.9",
+  "version": "3.0.0-beta.2",
   "description": "Generator plugin-ts",
   "keywords": [
     "zod",
@@ -25,6 +25,11 @@
       "require": "./dist/index.cjs",
       "default": "./dist/index.cjs"
     },
+    "./generators": {
+      "import": "./dist/generators.js",
+      "require": "./dist/generators.cjs",
+      "default": "./dist/generators.cjs"
+    },
     "./components": {
       "import": "./dist/components.js",
       "require": "./dist/components.cjs",
@@ -40,6 +45,9 @@
     "*": {
       "components": [
         "./dist/components.d.ts"
+      ],
+      "generators": [
+        "./dist/generators.d.ts"
       ]
     }
   },
@@ -50,25 +58,23 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@kubb/core": "3.0.0-alpha.9",
-    "@kubb/fs": "3.0.0-alpha.9",
-    "@kubb/oas": "3.0.0-alpha.9",
-    "@kubb/parser-ts": "3.0.0-alpha.9",
-    "@kubb/plugin-oas": "3.0.0-alpha.9",
-    "@kubb/react": "3.0.0-alpha.9"
+    "@kubb/core": "3.0.0-beta.2",
+    "@kubb/fs": "3.0.0-beta.2",
+    "@kubb/oas": "3.0.0-beta.2",
+    "@kubb/parser-ts": "3.0.0-beta.2",
+    "@kubb/plugin-oas": "3.0.0-beta.2",
+    "@kubb/react": "3.0.0-beta.2"
   },
   "devDependencies": {
-    "@types/react": "^18.3.4",
-    "prettier": "^3.3.3",
+    "@types/react": "^18.3.11",
     "react": "^18.3.1",
-    "tsup": "^8.2.4",
-    "typescript": "^5.5.4",
-    "@kubb/config-biome": "3.0.0-alpha.9",
-    "@kubb/config-ts": "3.0.0-alpha.9",
-    "@kubb/config-tsup": "3.0.0-alpha.9"
+    "tsup": "^8.3.0",
+    "typescript": "^5.6.2",
+    "@kubb/config-ts": "3.0.0-beta.2",
+    "@kubb/config-tsup": "3.0.0-beta.2"
   },
   "peerDependencies": {
-    "@kubb/react": "3.0.0-alpha.9"
+    "@kubb/react": "3.0.0-beta.2"
   },
   "engines": {
     "node": ">=20"

package/src/components/OasType.tsx

@@ -1,11 +1,9 @@
-import { useOas } from '@kubb/plugin-oas/hooks'
-import { File, Type, useApp } from '@kubb/react'
+import { File, Type } from '@kubb/react'
 
 import type { OasTypes } from '@kubb/oas'
 import type { ReactNode } from 'react'
-import type { FileMeta, PluginTs } from '../types.ts'
 
-type TemplateProps = {
+type Props = {
   /**
    * Name of the function
    */
@@ -14,7 +12,7 @@ type TemplateProps = {
   api: OasTypes.OASDocument
 }
 
-function Template({ name, typeName, api }: TemplateProps): ReactNode {
+export function OasType({ name, typeName, api }: Props): ReactNode {
   return (
     <>
       <File.Source name={name} isExportable isIndexable>
@@ -29,48 +27,3 @@ function Template({ name, typeName, api }: TemplateProps): ReactNode {
     </>
   )
 }
-
-const defaultTemplates = { default: Template } as const
-
-type Props = {
-  name: string
-  typeName: string
-  /**
-   * This will make it possible to override the default behaviour.
-   */
-  Template?: React.ComponentType<React.ComponentProps<typeof Template>>
-}
-
-export function OasType({ name, typeName, Template = defaultTemplates.default }: Props): ReactNode {
-  const oas = useOas()
-
-  return <Template name={name} typeName={typeName} api={oas.api} />
-}
-
-type FileProps = {
-  name: string
-  typeName: string
-  /**
-   * This will make it possible to override the default behaviour.
-   */
-  templates?: typeof defaultTemplates
-}
-
-OasType.File = function ({ name, typeName, templates = defaultTemplates }: FileProps): ReactNode {
-  const {
-    pluginManager,
-    plugin: { key: pluginKey },
-  } = useApp<PluginTs>()
-  const file = pluginManager.getFile({ name, extName: '.ts', pluginKey })
-
-  const Template = templates.default
-
-  return (
-    <File<FileMeta> baseName={file.baseName} path={file.path} meta={file.meta}>
-      <File.Import name={['Infer']} path="@kubb/oas" isTypeOnly />
-      <OasType Template={Template} name={name} typeName={typeName} />
-    </File>
-  )
-}
-
-OasType.templates = defaultTemplates

package/src/components/{Schema.tsx → Type.tsx}

@@ -1,48 +1,26 @@
-import { Oas } from '@kubb/plugin-oas/components'
-import { File, useApp } from '@kubb/react'
+import { File } from '@kubb/react'
 
 import transformers from '@kubb/core/transformers'
-import { print, type ts } from '@kubb/parser-ts'
+import { print } from '@kubb/parser-ts'
 import * as factory from '@kubb/parser-ts/factory'
-import { SchemaGenerator, schemaKeywords } from '@kubb/plugin-oas'
-import { useSchema } from '@kubb/plugin-oas/hooks'
+import { type Schema, SchemaGenerator, schemaKeywords } from '@kubb/plugin-oas'
 import { Fragment, type ReactNode } from 'react'
+import type ts from 'typescript'
 import { parse, typeKeywordMapper } from '../parser/index.ts'
-import { pluginTsName } from '../plugin.ts'
 import type { PluginTs } from '../types.ts'
 
 type Props = {
+  name: string
+  typedName: string
+  tree: Array<Schema>
+  optionalType: PluginTs['resolvedOptions']['optionalType']
+  enumType: PluginTs['resolvedOptions']['enumType']
+  mapper: PluginTs['resolvedOptions']['mapper']
   description?: string
   keysToOmit?: string[]
 }
 
-export function Schema(props: Props): ReactNode {
-  const { keysToOmit, description } = props
-  const { tree, name } = useSchema()
-  const {
-    pluginManager,
-    plugin: {
-      options: { mapper, enumType, optionalType },
-    },
-  } = useApp<PluginTs>()
-
-  if (enumType === 'asPascalConst') {
-    pluginManager.logger.emit('warning', `enumType '${enumType}' is deprecated`)
-  }
-
-  // all checks are also inside this.schema(React)
-  const resolvedName = pluginManager.resolveName({
-    name,
-    pluginKey: [pluginTsName],
-    type: 'function',
-  })
-
-  const typeName = pluginManager.resolveName({
-    name,
-    pluginKey: [pluginTsName],
-    type: 'type',
-  })
-
+export function Type({ name, typedName, tree, keysToOmit, optionalType, enumType, mapper, description }: Props): ReactNode {
   const typeNodes: ts.Node[] = []
 
   if (!tree.length) {
@@ -57,8 +35,8 @@ export function Schema(props: Props): ReactNode {
     (tree
       .map((schema) =>
         parse(undefined, schema, {
-          name: resolvedName,
-          typeName,
+          name,
+          typeName: typedName,
           description,
           keysToOmit,
           optionalType,
@@ -89,7 +67,7 @@ export function Schema(props: Props): ReactNode {
 
   const node = factory.createTypeAliasDeclaration({
     modifiers: [factory.modifiers.export],
-    name: resolvedName,
+    name,
     type: keysToOmit?.length
       ? factory.createOmitDeclaration({
           keys: keysToOmit,
@@ -101,7 +79,7 @@ export function Schema(props: Props): ReactNode {
 
   const enumSchemas = SchemaGenerator.deepSearch(tree, schemaKeywords.enum)
 
-  const enums = enumSchemas.map((enumSchema) => {
+  const enums = [...new Set(enumSchemas)].map((enumSchema) => {
     const name = enumType === 'asPascalConst' ? transformers.pascalCase(enumSchema.args.name) : transformers.camelCase(enumSchema.args.name)
     const typeName = enumSchema.args.typeName
 
@@ -135,34 +113,21 @@ export function Schema(props: Props): ReactNode {
         <Fragment key={[name, nameNode].join('-')}>
           {nameNode && (
             <File.Source name={name} isExportable isIndexable>
-              {print(nameNode)}
+              {print([nameNode])}
             </File.Source>
           )}
           {
             <File.Source name={typeName} isIndexable isExportable={['enum', 'asConst', 'constEnum', 'literal', undefined].includes(enumType)} isTypeOnly>
-              {print(typeNode)}
+              {print([typeNode])}
             </File.Source>
           }
         </Fragment>
       ))}
-      {enums.every((item) => item.typeName !== resolvedName) && (
-        <File.Source name={typeName} isTypeOnly isExportable isIndexable>
+      {enums.every((item) => item.typeName !== name) && (
+        <File.Source name={typedName} isTypeOnly isExportable isIndexable>
           {print(typeNodes)}
         </File.Source>
       )}
     </Fragment>
   )
 }
-
-type FileProps = {}
-
-Schema.File = function ({}: FileProps): ReactNode {
-  const { pluginManager } = useApp<PluginTs>()
-  const { schema } = useSchema()
-
-  return (
-    <Oas.Schema.File isTypeOnly output={pluginManager.config.output.path}>
-      <Schema description={schema?.description} />
-    </Oas.Schema.File>
-  )
-}

package/src/components/index.ts

@@ -1,3 +1,2 @@
 export { OasType } from './OasType.tsx'
-export { OperationSchema } from './OperationSchema.tsx'
-export { Schema } from './Schema.tsx'
+export { Type } from './Type.tsx'

package/src/generators/__snapshots__/bodyUploadFileApiAssetsPost.ts

@@ -0,0 +1,6 @@
+export type bodyUploadFileApiAssetsPost = {
+    /**
+     * @type string, binary
+    */
+    file: Blob;
+};

package/src/generators/__snapshots__/catTypeAsConst.ts

@@ -0,0 +1,11 @@
+export type cat = {
+    /**
+     * @type string, uuid
+    */
+    id: string;
+    type: "Cat";
+    /**
+     * @type boolean | undefined
+    */
+    meow?: boolean;
+};

package/src/generators/__snapshots__/createPet.ts

@@ -0,0 +1,41 @@
+
+ /**
+ * @description Null response
+*/
+export type CreatePets201 = (error & {
+    /**
+     * @type object | undefined
+    */
+    name?: errorCode;
+});
+
+ /**
+ * @description unexpected error
+*/
+export type CreatePetsError = error;
+
+ export type CreatePetsMutationRequest = {
+    /**
+     * @type string
+    */
+    name: string;
+    /**
+     * @type string
+    */
+    tag: string;
+};
+
+ /**
+ * @description Null response
+*/
+export type CreatePetsMutationResponse = (error & {
+    /**
+     * @type object | undefined
+    */
+    name?: errorCode;
+});
+
+ export type createPetsMutation = {
+    Response: createPetsMutationResponse;
+    Request: createPetsMutationRequest;
+};

package/src/generators/__snapshots__/createPetWithUnknownTypeUnknown.ts

@@ -0,0 +1,41 @@
+
+ /**
+ * @description Null response
+*/
+export type CreatePets201 = (error & {
+    /**
+     * @type object | undefined
+    */
+    name?: errorCode;
+});
+
+ /**
+ * @description unexpected error
+*/
+export type CreatePetsError = error;
+
+ export type CreatePetsMutationRequest = {
+    /**
+     * @type string
+    */
+    name: string;
+    /**
+     * @type string
+    */
+    tag: string;
+};
+
+ /**
+ * @description Null response
+*/
+export type CreatePetsMutationResponse = (error & {
+    /**
+     * @type object | undefined
+    */
+    name?: errorCode;
+});
+
+ export type createPetsMutation = {
+    Response: createPetsMutationResponse;
+    Request: createPetsMutationRequest;
+};

package/src/generators/__snapshots__/deletePet.ts

@@ -0,0 +1,5 @@
+export type DeletePetsPetidMutationResponse = any;
+
+ export type deletePetsPetidMutation = {
+    Response: deletePetsPetidMutationResponse;
+};

package/src/generators/__snapshots__/dogTypeAsConst.ts

@@ -0,0 +1,11 @@
+export type dog = {
+    /**
+     * @type string, uuid
+    */
+    id: string;
+    /**
+     * @type number | undefined
+    */
+    bark?: number;
+    type: "Dog";
+};

package/src/generators/__snapshots__/enumAllOf.ts

@@ -0,0 +1,10 @@
+export const enumAllOfReasonEnum2 = {
+    "created_at": "created_at",
+    "description": "description"
+} as const;
+
+ export type EnumAllOfReasonEnum2 = (typeof enumAllOfReasonEnum2)[keyof typeof enumAllOfReasonEnum2];
+
+ export type enumAllOf = {
+    reason?: EnumAllOfReasonEnum2;
+};

package/src/generators/__snapshots__/enumArray.ts

@@ -0,0 +1,19 @@
+export const enumArrayIdentifierEnum2 = {
+    "NW": "NW",
+    "NE": "NE",
+    "SW": "SW",
+    "SE": "SE"
+} as const;
+
+ export type EnumArrayIdentifierEnum2 = (typeof enumArrayIdentifierEnum2)[keyof typeof enumArrayIdentifierEnum2];
+
+ export type enumArray = {
+    /**
+     * @type array | undefined
+    */
+    identifier?: [
+        number,
+        string,
+        EnumArrayIdentifierEnum2
+    ];
+};

package/src/generators/__snapshots__/enumInObject.ts

@@ -0,0 +1,13 @@
+export const enumInObjectReasonEnum2 = {
+    "created_at": "created_at",
+    "description": "description"
+} as const;
+
+ export type EnumInObjectReasonEnum2 = (typeof enumInObjectReasonEnum2)[keyof typeof enumInObjectReasonEnum2];
+
+ export type enumInObject = {
+    /**
+     * @type string | undefined
+    */
+    reason?: EnumInObjectReasonEnum2;
+};

package/src/generators/__snapshots__/enumItems.ts

@@ -0,0 +1,8 @@
+export const enumItemsEnum2 = {
+    "created_at": "created_at",
+    "description": "description"
+} as const;
+
+ export type EnumItemsEnum2 = (typeof enumItemsEnum2)[keyof typeof enumItemsEnum2];
+
+ export type enumItems = EnumItemsEnum2[];

package/src/generators/__snapshots__/enumNames.ts

@@ -0,0 +1,6 @@
+export enum EnumNamesTypeEnum2 {
+    "Pending" = 0,
+    "Received" = 1
+}
+
+ export type enumNamesType = EnumNamesTypeEnum2;

package/src/generators/__snapshots__/enumNamesConst.ts

@@ -0,0 +1,6 @@
+export const enum EnumNamesTypeEnum2 {
+    "Pending" = 0,
+    "Received" = 1
+}
+
+ export type enumNamesType = EnumNamesTypeEnum2;

package/src/generators/__snapshots__/enumNamesLiteral.ts

@@ -0,0 +1,3 @@
+export type EnumNamesTypeEnum2 = 0 | 1;
+
+ export type enumNamesType = EnumNamesTypeEnum2;

package/src/generators/__snapshots__/enumNamesPascalConst.ts

@@ -0,0 +1,8 @@
+export const EnumNamesTypeEnum2 = {
+    "Pending": 0,
+    "Received": 1
+} as const;
+
+ type EnumNamesTypeEnum2 = (typeof EnumNamesTypeEnum2)[keyof typeof EnumNamesTypeEnum2];
+
+ export type enumNamesType = EnumNamesTypeEnum2;

package/src/generators/__snapshots__/enumNamesType.ts

@@ -0,0 +1,8 @@
+export const enumNamesType = {
+    "Pending": 0,
+    "Received": 1
+} as const;
+
+ export type EnumNamesTypeEnum2 = (typeof enumNamesType)[keyof typeof enumNamesType];
+
+ export type enumNamesType = EnumNamesTypeEnum2;

package/src/generators/__snapshots__/enumNullableMember.ts

@@ -0,0 +1,8 @@
+export const enumNullableMemberEnum2 = {
+    "first": "first",
+    "second": "second"
+} as const;
+
+ export type EnumNullableMemberEnum2 = (typeof enumNullableMemberEnum2)[keyof typeof enumNullableMemberEnum2];
+
+ export type enumNullableMember = EnumNullableMemberEnum2 | null;

package/src/generators/__snapshots__/enumNullableType.ts

@@ -0,0 +1,8 @@
+export const enumNullableTypeEnum2 = {
+    "first": "first",
+    "second": "second"
+} as const;
+
+ export type EnumNullableTypeEnum2 = (typeof enumNullableTypeEnum2)[keyof typeof enumNullableTypeEnum2];
+
+ export type enumNullableType = EnumNullableTypeEnum2 | null;

package/src/generators/__snapshots__/enumString.ts

@@ -0,0 +1,10 @@
+export const enumStringEnum2 = {
+    "created_at": "created_at",
+    "description": "description",
+    "FILE.UPLOADED": "FILE.UPLOADED",
+    "FILE.DOWNLOADED": "FILE.DOWNLOADED"
+} as const;
+
+ export type EnumStringEnum2 = (typeof enumStringEnum2)[keyof typeof enumStringEnum2];
+
+ export type enumString = EnumStringEnum2;

package/src/generators/__snapshots__/enumVarNamesType.ts

@@ -0,0 +1,8 @@
+export const enumVarNamesTypeEnum2 = {
+    "Pending": 0,
+    "Received": 1
+} as const;
+
+ export type EnumVarNamesTypeEnum2 = (typeof enumVarNamesTypeEnum2)[keyof typeof enumVarNamesTypeEnum2];
+
+ export type enumVarNamesType = EnumVarNamesTypeEnum2;

package/src/generators/__snapshots__/getPets.ts

@@ -0,0 +1,27 @@
+export type ListPetsQueryParams = {
+    /**
+     * @description How many items to return at one time (max 100)
+     * @type string | undefined
+    */
+    limit?: string;
+};
+
+ /**
+ * @description A paged array of pets
+*/
+export type ListPets200 = pets;
+
+ /**
+ * @description unexpected error
+*/
+export type ListPetsError = error;
+
+ /**
+ * @description A paged array of pets
+*/
+export type ListPetsQueryResponse = pets;
+
+ export type listPetsQuery = {
+    Response: listPetsQueryResponse;
+    QueryParams: listPetsQueryParams;
+};

package/src/generators/__snapshots__/mixedValueTypeConst.ts

@@ -0,0 +1,9 @@
+/**
+ * @description This probably should fail miserably
+*/
+export type mixedValueTypeConst = {
+    /**
+     * @type number | undefined
+    */
+    foobar?: "foobar";
+};

package/src/generators/__snapshots__/nullConstNull.ts

@@ -0,0 +1,7 @@
+
+ /**
+ * @description The value of this keyword MAY be null.\nUse of this keyword is functionally equivalent to an \"enum\" (Section 6.1.2) with a single value.\nAn instance validates successfully against this keyword if its value is equal to the value of the keyword.\n
+*/
+export type nullConst = {
+    withoutValue?: null;
+};

package/src/generators/__snapshots__/numberValueConst.ts

@@ -0,0 +1,9 @@
+/**
+ * @description its value is equal to the value of the keyword
+*/
+export type numberValueConst = {
+    /**
+     * @type number | undefined
+    */
+    foobar?: 42;
+};

package/src/generators/__snapshots__/petMapper.ts

@@ -0,0 +1,15 @@
+export type pet = {
+    /**
+     * @type integer, int64
+    */
+    id: number;
+    /**
+     * @type string
+    */
+    name: string;
+    /**
+     * @type string | undefined
+    */
+    tag?: string;
+    category?: string;
+};

package/src/generators/__snapshots__/petQuestionToken.ts

@@ -0,0 +1,19 @@
+
+ export type pet = {
+    /**
+     * @type integer, int64
+    */
+    id: number;
+    /**
+     * @type string
+    */
+    name: string;
+    /**
+     * @type string | undefined
+    */
+    tag?: string;
+    /**
+     * @type object | undefined
+    */
+    category?: category;
+};

package/src/generators/__snapshots__/petQuestionTokenAndUndefined.ts

@@ -0,0 +1,19 @@
+
+ export type pet = {
+    /**
+     * @type integer, int64
+    */
+    id: number;
+    /**
+     * @type string
+    */
+    name: string;
+    /**
+     * @type string | undefined
+    */
+    tag?: string | undefined;
+    /**
+     * @type object | undefined
+    */
+    category?: category | undefined;
+};

package/src/generators/__snapshots__/petUndefined.ts

@@ -0,0 +1,19 @@
+
+ export type pet = {
+    /**
+     * @type integer, int64
+    */
+    id: number;
+    /**
+     * @type string
+    */
+    name: string;
+    /**
+     * @type string | undefined
+    */
+    tag: string | undefined;
+    /**
+     * @type object | undefined
+    */
+    category: category | undefined;
+};