chore: fix ts

Author: stijnvanhulle

examples/advanced/src/gen/clients/axios/index.ts

@@ -1,4 +1,4 @@
 export * from './operations'
-export * as petsService from './petsService/index'
 export * as petService from './petService/index'
+export * as petsService from './petsService/index'
 export * as userService from './userService/index'

examples/advanced/src/gen/clients/hooks/index.ts

@@ -1,3 +1,3 @@
-export * as petsHooks from './petsController/index'
 export * as petHooks from './petController/index'
+export * as petsHooks from './petsController/index'
 export * as userHooks from './userController/index'

examples/advanced/src/gen/index.ts

@@ -1,7 +1,7 @@
-export * from './models/ts/index.js'
+export * as clients from './clients/axios/index'
 export * as hooks from './clients/hooks/index'
 export * as swrHooks from './clients/swr/index'
-export * as clients from './clients/axios/index'
-export * as zod from './zod/index'
 export * as faker from './mocks/index'
+export * from './models/ts/index.js'
 export * as msw from './msw/index'
+export * as zod from './zod/index'

examples/advanced/src/gen/models/ts/index.ts

@@ -5,11 +5,11 @@ export * from './Category.js'
 export * from './Customer.js'
 export * from './Order.js'
 export * from './Pet.js'
-export * from './PetNotFound.js'
-export * from './User.js'
-export * from './UserArray.js'
 export * from './petController/index.js'
+export * from './PetNotFound.js'
 export * from './petsController/index.js'
 export * from './storeController/index.js'
 export * from './tag/index.js'
+export * from './User.js'
+export * from './UserArray.js'
 export * from './userController/index.js'

examples/advanced/src/gen/msw/index.ts

@@ -1,4 +1,4 @@
 export * from './handlers'
-export * as petsHandlers from './petsController/index'
 export * as petHandlers from './petController/index'
+export * as petsHandlers from './petsController/index'
 export * as userHandlers from './userController/index'

examples/advanced/src/gen/zod/index.ts

@@ -4,11 +4,11 @@ export * from './apiResponseSchema'
 export * from './categorySchema'
 export * from './customerSchema'
 export * from './orderSchema'
+export * as petSchemas from './petController/index'
 export * from './petNotFoundSchema'
 export * from './petSchema'
+export * as petsSchemas from './petsController/index'
 export * from './tag/index'
 export * from './userArraySchema'
-export * from './userSchema'
-export * as petsSchemas from './petsController/index'
-export * as petSchemas from './petController/index'
 export * as userSchemas from './userController/index'
+export * from './userSchema'

examples/faker/src/gen/customMocks/createUser.ts

@@ -12,7 +12,7 @@ export function createUser(override: NonNullable<Partial<User>> = {}): NonNullab
       'password': faker.internet.password(),
       'phone': faker.phone.number(),
       'userStatus': faker.number.float({}),
-      'nationalityCode': faker.helpers.fromRegExp(/^[A-Z]{2}$/),
+      'nationalityCode': faker.helpers.fromRegExp(/\/^[A-Z]{2}$\//),
     },
     ...override,
   }

examples/faker/src/gen/index.ts

@@ -1,2 +1,2 @@
-export * from './models/index'
 export * from './customMocks/index'
+export * from './models/index'

packages/swagger-ts/src/OperationGenerator.test.tsx

@@ -18,6 +18,7 @@ describe('OperationGenerator', async () => {
   test('[GET] /pets with optionalType `questionToken`', async () => {
     const options: GetOperationGeneratorOptions<OperationGenerator> = {
       enumType: 'asConst',
+      enumSuffix: '',
       dateType: 'string',
       optionalType: 'questionToken',
       usedEnumNames: {},
@@ -56,6 +57,7 @@ describe('OperationGenerator', async () => {
   test('[POST] /pets 201', async () => {
     const options: GetOperationGeneratorOptions<OperationGenerator> = {
       enumType: 'asConst',
+      enumSuffix: '',
       dateType: 'string',
       optionalType: 'questionToken',
       usedEnumNames: {},
@@ -87,6 +89,7 @@ describe('OperationGenerator', async () => {
   test('[DELETE] /pet/{petId} with unknownType `any`', async () => {
     const options: GetOperationGeneratorOptions<OperationGenerator> = {
       enumType: 'asConst',
+      enumSuffix: '',
       dateType: 'string',
       optionalType: 'questionToken',
       usedEnumNames: {},
@@ -117,6 +120,7 @@ describe('OperationGenerator', async () => {
   test('[DELETE] /pet/{petId} with unknownType `unknown`', async () => {
     const options: GetOperationGeneratorOptions<OperationGenerator> = {
       enumType: 'asConst',
+      enumSuffix: '',
       dateType: 'string',
       optionalType: 'questionToken',
       usedEnumNames: {},

packages/swagger-ts/src/TypeGenerator.ts

@@ -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
@@ -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) => {

packages/swagger/src/oas/index.ts

@@ -1,6 +1,10 @@
+import type * as OasTypes from 'oas/types'
+
 // external packages
 export type { default as Oas } from 'oas'
 export type { Operation } from 'oas/operation'
 export type { HttpMethods as HttpMethod } from 'oas/types'
 export type * as OasTypes from 'oas/types'
 export type { OpenAPIV3, OpenAPIV3_1 } from 'openapi-types'
+
+export type SchemaObject = OasTypes.SchemaObject & { 'x-nullable'?: boolean }