@kubb/swagger-ts 2.7.2 → 2.8.0

package/dist/components.cjs

@@ -2,10 +2,10 @@
 
 
 
-var _chunk4NJMZQ76cjs = require('./chunk-4NJMZQ76.cjs');
+var _chunkFPS6MH3Rcjs = require('./chunk-FPS6MH3R.cjs');
 
 
 
 
-exports.Mutation = _chunk4NJMZQ76cjs.Mutation; exports.Oas = _chunk4NJMZQ76cjs.Oas; exports.Query = _chunk4NJMZQ76cjs.Query;
+exports.Mutation = _chunkFPS6MH3Rcjs.Mutation; exports.OasType = _chunkFPS6MH3Rcjs.OasType; exports.Query = _chunkFPS6MH3Rcjs.Query;
 //# sourceMappingURL=components.cjs.map

package/dist/components.d.cts

@@ -1,6 +1,6 @@
 import { OasBuilder } from '@kubb/swagger';
 import { KubbFile } from '@kubb/core';
-import { P as PluginOptions } from './types-WZh-GEfj.cjs';
+import { P as PluginOptions } from './types-DHrYEdS6.cjs';
 import { ReactNode } from 'react';
 import { OasTypes } from '@kubb/swagger/oas';
 
@@ -39,8 +39,8 @@ type Props$1 = {
      */
     Template?: React.ComponentType<React.ComponentProps<typeof Template>>;
 };
-declare function Oas({ name, typeName, Template, }: Props$1): ReactNode;
-declare namespace Oas {
+declare function OasType({ name, typeName, Template, }: Props$1): ReactNode;
+declare namespace OasType {
     var File: ({ name, typeName, templates }: FileProps$1) => ReactNode;
     var templates: {
         readonly default: typeof Template;
@@ -66,4 +66,4 @@ type FileProps = {
     mode: KubbFile.Mode;
 };
 
-export { Mutation, Oas, Query };
+export { Mutation, OasType, Query };

package/dist/components.d.ts

@@ -1,6 +1,6 @@
 import { OasBuilder } from '@kubb/swagger';
 import { KubbFile } from '@kubb/core';
-import { P as PluginOptions } from './types-WZh-GEfj.js';
+import { P as PluginOptions } from './types-DHrYEdS6.js';
 import { ReactNode } from 'react';
 import { OasTypes } from '@kubb/swagger/oas';
 
@@ -39,8 +39,8 @@ type Props$1 = {
      */
     Template?: React.ComponentType<React.ComponentProps<typeof Template>>;
 };
-declare function Oas({ name, typeName, Template, }: Props$1): ReactNode;
-declare namespace Oas {
+declare function OasType({ name, typeName, Template, }: Props$1): ReactNode;
+declare namespace OasType {
     var File: ({ name, typeName, templates }: FileProps$1) => ReactNode;
     var templates: {
         readonly default: typeof Template;
@@ -66,4 +66,4 @@ type FileProps = {
     mode: KubbFile.Mode;
 };
 
-export { Mutation, Oas, Query };
+export { Mutation, OasType, Query };

package/dist/components.js

@@ -1,11 +1,11 @@
 import {
   Mutation,
-  Oas,
+  OasType,
   Query
-} from "./chunk-FWZBVC3N.js";
+} from "./chunk-XTEOVKJ6.js";
 export {
   Mutation,
-  Oas,
+  OasType,
   Query
 };
 //# sourceMappingURL=components.js.map

package/dist/index.cjs

@@ -2,15 +2,15 @@
 
 
 
-var _chunk4NJMZQ76cjs = require('./chunk-4NJMZQ76.cjs');
+var _chunkFPS6MH3Rcjs = require('./chunk-FPS6MH3R.cjs');
 
 // src/index.ts
-var definePluginDefault = _chunk4NJMZQ76cjs.definePlugin;
+var definePluginDefault = _chunkFPS6MH3Rcjs.definePlugin;
 var src_default = definePluginDefault;
 
 
 
 
 
-exports.default = src_default; exports.definePlugin = _chunk4NJMZQ76cjs.definePlugin; exports.pluginKey = _chunk4NJMZQ76cjs.pluginKey; exports.pluginName = _chunk4NJMZQ76cjs.pluginName;
+exports.default = src_default; exports.definePlugin = _chunkFPS6MH3Rcjs.definePlugin; exports.pluginKey = _chunkFPS6MH3Rcjs.pluginKey; exports.pluginName = _chunkFPS6MH3Rcjs.pluginName;
 //# sourceMappingURL=index.cjs.map

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import * as _kubb_core from '@kubb/core';
-import { P as PluginOptions, O as Options } from './types-WZh-GEfj.cjs';
-export { F as FileMeta } from './types-WZh-GEfj.cjs';
+import { P as PluginOptions, O as Options } from './types-DHrYEdS6.cjs';
+export { F as FileMeta } from './types-DHrYEdS6.cjs';
 export { i as Oas } from './index-BKDH3fXc.cjs';
 import '@kubb/swagger';
 import 'hotscript';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _kubb_core from '@kubb/core';
-import { P as PluginOptions, O as Options } from './types-WZh-GEfj.js';
-export { F as FileMeta } from './types-WZh-GEfj.js';
+import { P as PluginOptions, O as Options } from './types-DHrYEdS6.js';
+export { F as FileMeta } from './types-DHrYEdS6.js';
 export { i as Oas } from './index-BKDH3fXc.js';
 import '@kubb/swagger';
 import 'hotscript';

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   definePlugin,
   pluginKey,
   pluginName
-} from "./chunk-FWZBVC3N.js";
+} from "./chunk-XTEOVKJ6.js";
 
 // src/index.ts
 var definePluginDefault = definePlugin;

package/dist/{types-WZh-GEfj.d.cts → types-DHrYEdS6.d.cts}

@@ -1,5 +1,5 @@
 import { KubbFile, ResolveNameParams, Plugin, PluginFactoryOptions } from '@kubb/core';
-import { Exclude, Include, Override, ResolvePathOptions, AppMeta as AppMeta$1 } from '@kubb/swagger';
+import { Exclude, Include, Override, ResolvePathOptions } from '@kubb/swagger';
 
 type Options = {
     output?: {
@@ -57,6 +57,12 @@ type Options = {
      * @default 'asConst'
      */
     enumType?: 'enum' | 'asConst' | 'asPascalConst' | 'constEnum' | 'literal';
+    /**
+     * Set a suffix for the generated enums.
+     * @default ''
+     * Default will be `'enum'` in version 3 of Kubb
+     */
+    enumSuffix?: string;
     /**
      * Choose to use `date` or `datetime` as JavaScript `Date` instead of `string`.
      * @default 'string'
@@ -88,6 +94,7 @@ type Options = {
 };
 type ResolvedOptions = {
     enumType: NonNullable<Options['enumType']>;
+    enumSuffix: NonNullable<Options['enumSuffix']>;
     dateType: NonNullable<Options['dateType']>;
     unknownType: NonNullable<Options['unknownType']>;
     optionalType: NonNullable<Options['optionalType']>;
@@ -100,8 +107,7 @@ type FileMeta = {
     name?: string;
     tag?: string;
 };
-type AppMeta = AppMeta$1;
-type PluginOptions = PluginFactoryOptions<'swagger-ts', Options, ResolvedOptions, never, ResolvePathOptions, AppMeta>;
+type PluginOptions = PluginFactoryOptions<'swagger-ts', Options, ResolvedOptions, never, ResolvePathOptions>;
 declare module '@kubb/core' {
     interface _Register {
         ['@kubb/swagger-ts']: PluginOptions;

package/dist/{types-WZh-GEfj.d.ts → types-DHrYEdS6.d.ts}

@@ -1,5 +1,5 @@
 import { KubbFile, ResolveNameParams, Plugin, PluginFactoryOptions } from '@kubb/core';
-import { Exclude, Include, Override, ResolvePathOptions, AppMeta as AppMeta$1 } from '@kubb/swagger';
+import { Exclude, Include, Override, ResolvePathOptions } from '@kubb/swagger';
 
 type Options = {
     output?: {
@@ -57,6 +57,12 @@ type Options = {
      * @default 'asConst'
      */
     enumType?: 'enum' | 'asConst' | 'asPascalConst' | 'constEnum' | 'literal';
+    /**
+     * Set a suffix for the generated enums.
+     * @default ''
+     * Default will be `'enum'` in version 3 of Kubb
+     */
+    enumSuffix?: string;
     /**
      * Choose to use `date` or `datetime` as JavaScript `Date` instead of `string`.
      * @default 'string'
@@ -88,6 +94,7 @@ type Options = {
 };
 type ResolvedOptions = {
     enumType: NonNullable<Options['enumType']>;
+    enumSuffix: NonNullable<Options['enumSuffix']>;
     dateType: NonNullable<Options['dateType']>;
     unknownType: NonNullable<Options['unknownType']>;
     optionalType: NonNullable<Options['optionalType']>;
@@ -100,8 +107,7 @@ type FileMeta = {
     name?: string;
     tag?: string;
 };
-type AppMeta = AppMeta$1;
-type PluginOptions = PluginFactoryOptions<'swagger-ts', Options, ResolvedOptions, never, ResolvePathOptions, AppMeta>;
+type PluginOptions = PluginFactoryOptions<'swagger-ts', Options, ResolvedOptions, never, ResolvePathOptions>;
 declare module '@kubb/core' {
     interface _Register {
         ['@kubb/swagger-ts']: PluginOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/swagger-ts",
-  "version": "2.7.2",
+  "version": "2.8.0",
   "description": "Generator swagger-ts",
   "keywords": [
     "typescript",
@@ -59,14 +59,14 @@
     "hotscript": "^1.0.13",
     "json-schema-to-ts": "^3.0.0",
     "ts-toolbelt": "^9.6.0",
-    "@kubb/core": "2.7.2",
-    "@kubb/parser": "2.7.2",
-    "@kubb/react": "2.7.2",
-    "@kubb/swagger": "2.7.2",
-    "@kubb/types": "2.7.2"
+    "@kubb/core": "2.8.0",
+    "@kubb/parser": "2.8.0",
+    "@kubb/react": "2.8.0",
+    "@kubb/swagger": "2.8.0",
+    "@kubb/types": "2.8.0"
   },
   "devDependencies": {
-    "@types/react": "^18.2.63",
+    "@types/react": "^18.2.64",
     "eslint": "^8.57.0",
     "expect-type": "^0.17.3",
     "react": "^18.2.0",
@@ -76,7 +76,7 @@
     "@kubb/tsup-config": "1.1.8"
   },
   "peerDependencies": {
-    "@kubb/react": "2.7.2"
+    "@kubb/react": "2.8.0"
   },
   "packageManager": "pnpm@8.3.0",
   "engines": {

package/src/OperationGenerator.tsx

@@ -1,63 +1,71 @@
 import { createRoot } from '@kubb/react'
 import { OperationGenerator as Generator } from '@kubb/swagger'
+import { Oas } from '@kubb/swagger/components'
 
 import { Mutation } from './components/Mutation.tsx'
-import { Oas } from './components/Oas.tsx'
+import { OasType } from './components/OasType.tsx'
 import { Query } from './components/Query.tsx'
 
 import type { AppContextProps } from '@kubb/react'
-import type { OperationMethodResult, OperationSchemas } from '@kubb/swagger'
+import type { OperationMethodResult } from '@kubb/swagger'
 import type { Operation } from '@kubb/swagger/oas'
 import type { FileMeta, PluginOptions } from './types.ts'
 
 export class OperationGenerator extends Generator<PluginOptions['resolvedOptions'], PluginOptions> {
-  async all(): OperationMethodResult<FileMeta> {
+  async all(operations: Operation[]): OperationMethodResult<FileMeta> {
     const { oas, pluginManager, plugin } = this.context
 
-    if (!plugin.options.oasType) {
-      return null
-    }
+    const root = createRoot<AppContextProps<PluginOptions['appMeta']>>({ logger: pluginManager.logger })
 
-    const root = createRoot<AppContextProps>({ logger: pluginManager.logger })
     root.render(
-      <Oas.File name="oas" typeName="Oas" />,
-      { meta: { oas, pluginManager, plugin } },
+      <Oas oas={oas} operations={operations} getSchemas={(...props) => this.getSchemas(...props)}>
+        {plugin.options.oasType && <OasType.File name="oas" typeName="Oas" />}
+      </Oas>,
+      { meta: { pluginManager, plugin } },
     )
 
     return root.files
   }
 
-  async get(operation: Operation, schemas: OperationSchemas, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
+  async get(operation: Operation, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
     const { oas, pluginManager, plugin, mode = 'directory' } = this.context
 
     const root = createRoot<AppContextProps<PluginOptions['appMeta']>>({ logger: pluginManager.logger })
     root.render(
-      <Query.File mode={mode} />,
-      { meta: { oas, pluginManager, plugin: { ...plugin, options }, schemas, operation } },
+      <Oas oas={oas} operations={[operation]} getSchemas={(...props) => this.getSchemas(...props)}>
+        <Oas.Operation operation={operation}>
+          <Query.File mode={mode} />
+        </Oas.Operation>
+      </Oas>,
+      { meta: { pluginManager, plugin: { ...plugin, options } } },
     )
 
     return root.files
   }
 
-  async post(operation: Operation, schemas: OperationSchemas, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
+  async post(operation: Operation, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
     const { oas, pluginManager, plugin, mode = 'directory' } = this.context
 
     const root = createRoot<AppContextProps<PluginOptions['appMeta']>>({ logger: pluginManager.logger })
     root.render(
-      <Mutation.File mode={mode} />,
-      { meta: { oas, pluginManager, plugin: { ...plugin, options }, schemas, operation } },
+      <Oas oas={oas} operations={[operation]} getSchemas={(...props) => this.getSchemas(...props)}>
+        <Oas.Operation operation={operation}>
+          <Mutation.File mode={mode} />
+        </Oas.Operation>
+      </Oas>,
+      { meta: { pluginManager, plugin: { ...plugin, options } } },
     )
 
     return root.files
   }
 
-  async put(operation: Operation, schemas: OperationSchemas, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
-    return this.post(operation, schemas, options)
+  async put(operation: Operation, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
+    return this.post(operation, options)
   }
-  async patch(operation: Operation, schemas: OperationSchemas, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
-    return this.post(operation, schemas, options)
+  async patch(operation: Operation, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
+    return this.post(operation, options)
   }
-  async delete(operation: Operation, schemas: OperationSchemas, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
-    return this.post(operation, schemas, options)
+  async delete(operation: Operation, options: PluginOptions['resolvedOptions']): OperationMethodResult<FileMeta> {
+    return this.post(operation, options)
   }
 }

package/src/TypeGenerator.ts

@@ -1,5 +1,5 @@
 import { Generator } from '@kubb/core'
-import transformers from '@kubb/core/transformers'
+import transformers, { pascalCase } from '@kubb/core/transformers'
 import { getUniqueName } from '@kubb/core/utils'
 import * as factory from '@kubb/parser/factory'
 import { keywordTypeNodes } from '@kubb/parser/factory'
@@ -10,7 +10,7 @@ import { pluginKey } from './plugin.ts'
 import type { PluginManager } from '@kubb/core'
 import type { ts } from '@kubb/parser'
 import type { ImportMeta, Refs } from '@kubb/swagger'
-import type { Oas, OasTypes, OpenAPIV3, OpenAPIV3_1 } from '@kubb/swagger/oas'
+import type { Oas, OpenAPIV3, OpenAPIV3_1, SchemaObject } from '@kubb/swagger/oas'
 import type { PluginOptions } from './types.ts'
 
 // based on https://github.com/cellular/oazapfts/blob/7ba226ebb15374e8483cc53e7532f1663179a22c/src/codegen/generate.ts#L398
@@ -38,7 +38,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
     description,
     keysToOmit,
   }: {
-    schema: OasTypes.SchemaObject
+    schema: SchemaObject
     baseName: string
     description?: string
     optional?: boolean
@@ -88,7 +88,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
    * Delegates to getBaseTypeFromSchema internally and
    * optionally adds a union with null.
    */
-  getTypeFromSchema(schema?: OasTypes.SchemaObject & { 'x-nullable': boolean }, name?: string): ts.TypeNode | null {
+  getTypeFromSchema(schema?: SchemaObject, name?: string): ts.TypeNode | null {
     const type = this.#getBaseTypeFromSchema(schema, name)
 
     if (!type) {
@@ -107,14 +107,14 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
   /**
    * Recursively creates a type literal with the given props.
    */
-  #getTypeFromProperties(baseSchema?: OasTypes.SchemaObject, baseName?: string): ts.TypeNode | null {
+  #getTypeFromProperties(baseSchema?: SchemaObject, baseName?: string): ts.TypeNode | null {
     const { optionalType } = this.options
     const properties = baseSchema?.properties || {}
     const required = baseSchema?.required
     const additionalProperties = baseSchema?.additionalProperties
 
     const members: Array<ts.TypeElement | null> = Object.keys(properties).map((name) => {
-      const schema = properties[name] as OasTypes.SchemaObject
+      const schema = properties[name] as SchemaObject
 
       const isRequired = Array.isArray(required) ? required.includes(name) : !!required
       let type = this.getTypeFromSchema(schema, this.context.pluginManager.resolveName({ name: `${baseName || ''} ${name}`, pluginKey, type: 'type' }))
@@ -146,7 +146,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
       })
     })
     if (additionalProperties) {
-      const type = additionalProperties === true ? this.#unknownReturn : this.getTypeFromSchema(additionalProperties as OasTypes.SchemaObject)
+      const type = additionalProperties === true ? this.#unknownReturn : this.getTypeFromSchema(additionalProperties as SchemaObject)
 
       if (type) {
         members.push(factory.createIndexSignature(type))
@@ -186,7 +186,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
     return factory.createTypeReferenceNode(ref.propertyName, undefined)
   }
 
-  #getParsedSchema(schema?: OasTypes.SchemaObject) {
+  #getParsedSchema(schema?: SchemaObject) {
     const parsedSchema = getSchemaFactory(this.context.oas)(schema)
     return parsedSchema
   }
@@ -196,7 +196,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
    * schema and returns the appropriate type.
    */
   #getBaseTypeFromSchema(
-    _schema: OasTypes.SchemaObject | undefined,
+    _schema: SchemaObject | undefined,
     baseName?: string,
   ): ts.TypeNode | null {
     const { schema, version } = this.#getParsedSchema(_schema)
@@ -211,13 +211,13 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
 
     if (schema.oneOf) {
       // union
-      const schemaWithoutOneOf = { ...schema, oneOf: undefined } as OasTypes.SchemaObject
+      const schemaWithoutOneOf = { ...schema, oneOf: undefined } as SchemaObject
 
       const union = factory.createUnionDeclaration({
         withParentheses: true,
         nodes: schema.oneOf
           .map((item) => {
-            return item && this.getTypeFromSchema(item as OasTypes.SchemaObject)
+            return item && this.getTypeFromSchema(item as SchemaObject)
           })
           .filter((item) => {
             return item && item !== this.#unknownReturn
@@ -234,13 +234,13 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
     }
 
     if (schema.anyOf) {
-      const schemaWithoutAnyOf = { ...schema, anyOf: undefined } as OasTypes.SchemaObject
+      const schemaWithoutAnyOf = { ...schema, anyOf: undefined } as SchemaObject
 
       const union = factory.createUnionDeclaration({
         withParentheses: true,
         nodes: schema.anyOf
           .map((item) => {
-            return item && this.getTypeFromSchema(item as OasTypes.SchemaObject)
+            return item && this.getTypeFromSchema(item as SchemaObject)
           })
           .filter((item) => {
             return item && item !== this.#unknownReturn
@@ -257,13 +257,13 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
     }
     if (schema.allOf) {
       // intersection/add
-      const schemaWithoutAllOf = { ...schema, allOf: undefined } as OasTypes.SchemaObject
+      const schemaWithoutAllOf = { ...schema, allOf: undefined } as SchemaObject
 
       const and = factory.createIntersectionDeclaration({
         withParentheses: true,
         nodes: schema.allOf
           .map((item) => {
-            return item && this.getTypeFromSchema(item as OasTypes.SchemaObject)
+            return item && this.getTypeFromSchema(item as SchemaObject)
           })
           .filter((item) => {
             return item && item !== this.#unknownReturn
@@ -283,7 +283,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
      * Enum will be defined outside the baseType(hints the baseName check)
      */
     if (schema.enum && baseName) {
-      const enumName = getUniqueName(baseName, this.options.usedEnumNames)
+      const enumName = getUniqueName(pascalCase([baseName, this.options.enumSuffix].join(' ')), this.options.usedEnumNames)
 
       let enums: [key: string, value: string | number][] = [...new Set(schema.enum)].map((key) => [key, key])
 
@@ -318,7 +318,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
 
     if ('items' in schema) {
       // items -> array
-      const node = this.getTypeFromSchema(schema.items as OasTypes.SchemaObject, baseName)
+      const node = this.getTypeFromSchema(schema.items as SchemaObject, baseName)
       if (node) {
         return factory.createArrayTypeNode(node)
       }
@@ -330,7 +330,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
      */
 
     if ('prefixItems' in schema) {
-      const prefixItems = schema.prefixItems as OasTypes.SchemaObject[]
+      const prefixItems = schema.prefixItems as SchemaObject[]
 
       return factory.createTupleDeclaration({
         nodes: prefixItems.map((item) => {
@@ -342,7 +342,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
 
     if (schema.properties || schema.additionalProperties) {
       // properties -> literal type
-      return this.#getTypeFromProperties(schema, baseName)
+      return this.#getTypeFromProperties(schema as SchemaObject, baseName)
     }
 
     /**
@@ -380,7 +380,7 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
               {
                 ...schema,
                 type,
-              },
+              } as SchemaObject,
               baseName,
             ),
             nullable ? factory.createLiteralTypeNode(factory.createNull()) : undefined,

package/src/components/Mutation.tsx

@@ -107,7 +107,7 @@ Mutation.File = function({ mode }: FileProps): ReactNode {
 
   const schemas = useSchemas()
   const pluginManager = usePluginManager()
-  const oas = useOas()
+  const { oas } = useOas()
   const file = useOperationFile()
   const factoryName = useOperationName({ type: 'type' })
   const operation = useOperation()

package/src/components/{Oas.tsx → OasType.tsx}

@@ -42,12 +42,12 @@ type Props = {
   Template?: React.ComponentType<React.ComponentProps<typeof Template>>
 }
 
-export function Oas({
+export function OasType({
   name,
   typeName,
   Template = defaultTemplates.default,
 }: Props): ReactNode {
-  const oas = useOas()
+  const { oas } = useOas()
 
   return <Template name={name} typeName={typeName} api={oas.api} />
 }
@@ -61,7 +61,7 @@ type FileProps = {
   templates?: typeof defaultTemplates
 }
 
-Oas.File = function({ name, typeName, templates = defaultTemplates }: FileProps): ReactNode {
+OasType.File = function({ name, typeName, templates = defaultTemplates }: FileProps): ReactNode {
   const { key: pluginKey } = usePlugin<PluginOptions>()
   const file = useFile({ name, extName: '.ts', pluginKey })
 
@@ -76,11 +76,11 @@ Oas.File = function({ name, typeName, templates = defaultTemplates }: FileProps)
       >
         <File.Import name={['Infer']} path="@kubb/swagger-ts/oas" isTypeOnly />
         <File.Source>
-          <Oas Template={Template} name={name} typeName={typeName} />
+          <OasType Template={Template} name={name} typeName={typeName} />
         </File.Source>
       </File>
     </Editor>
   )
 }
 
-Oas.templates = defaultTemplates
+OasType.templates = defaultTemplates

package/src/components/Query.tsx

@@ -108,7 +108,7 @@ Query.File = function({ mode }: FileProps): ReactNode {
 
   const schemas = useSchemas()
   const pluginManager = usePluginManager()
-  const oas = useOas()
+  const { oas } = useOas()
   const file = useOperationFile()
   const factoryName = useOperationName({ type: 'type' })
   const operation = useOperation()

package/src/components/index.ts

@@ -1,3 +1,3 @@
 export { Mutation } from './Mutation.tsx'
-export { Oas } from './Oas.tsx'
+export { OasType } from './OasType.tsx'
 export { Query } from './Query.tsx'

package/src/plugin.ts

@@ -23,6 +23,7 @@ export const definePlugin = createPlugin<PluginOptions>((options) => {
     include,
     override = [],
     enumType = 'asConst',
+    enumSuffix = '',
     dateType = 'string',
     unknownType = 'any',
     optionalType = 'questionToken',
@@ -37,6 +38,7 @@ export const definePlugin = createPlugin<PluginOptions>((options) => {
       transformers,
       dateType,
       enumType,
+      enumSuffix,
       optionalType,
       oasType,
       // keep the used enumnames between TypeBuilder and OperationGenerator per plugin(pluginKey)
@@ -44,9 +46,9 @@ export const definePlugin = createPlugin<PluginOptions>((options) => {
       unknownType,
     },
     pre: [swaggerPluginName],
-    resolvePath(baseName, directory, options) {
+    resolvePath(baseName, pathMode, options) {
       const root = path.resolve(this.config.root, this.config.output.path)
-      const mode = FileManager.getMode(path.resolve(root, output.path))
+      const mode = pathMode ?? FileManager.getMode(path.resolve(root, output.path))
 
       if (mode === 'file') {
         /**

package/src/types.ts

@@ -1,5 +1,5 @@
 import type { KubbFile, Plugin, PluginFactoryOptions, ResolveNameParams } from '@kubb/core'
-import type { AppMeta as SwaggerAppMeta, Exclude, Include, Override, ResolvePathOptions } from '@kubb/swagger'
+import type { Exclude, Include, Override, ResolvePathOptions } from '@kubb/swagger'
 
 export type Options = {
   output?: {
@@ -57,6 +57,13 @@ export type Options = {
    * @default 'asConst'
    */
   enumType?: 'enum' | 'asConst' | 'asPascalConst' | 'constEnum' | 'literal'
+  /**
+   * Set a suffix for the generated enums.
+   * @default ''
+   * Default will be `'enum'` in version 3 of Kubb
+   */
+  enumSuffix?: string
+
   /**
    * Choose to use `date` or `datetime` as JavaScript `Date` instead of `string`.
    * @default 'string'
@@ -89,6 +96,7 @@ export type Options = {
 
 type ResolvedOptions = {
   enumType: NonNullable<Options['enumType']>
+  enumSuffix: NonNullable<Options['enumSuffix']>
   dateType: NonNullable<Options['dateType']>
   unknownType: NonNullable<Options['unknownType']>
   optionalType: NonNullable<Options['optionalType']>
@@ -103,9 +111,7 @@ export type FileMeta = {
   tag?: string
 }
 
-type AppMeta = SwaggerAppMeta
-
-export type PluginOptions = PluginFactoryOptions<'swagger-ts', Options, ResolvedOptions, never, ResolvePathOptions, AppMeta>
+export type PluginOptions = PluginFactoryOptions<'swagger-ts', Options, ResolvedOptions, never, ResolvePathOptions>
 
 declare module '@kubb/core' {
   export interface _Register {