@kubb/swagger-ts 1.1.7 → 1.1.8

package/README.md

@@ -6,37 +6,45 @@
   <p>
    Swagger integration for TypeScript to generate all the different types based on an OpenAPI specification.
   </p>
+  
+  <img src="https://raw.githubusercontent.com/kubb-project/kubb/main/assets/banner.png" alt="logo"  height="auto" />
 
-<!-- Badges -->
-<p>
-  <a href="https://www.npmjs.com/package/@kubb/swagger-ts">
+  <!-- Badges -->
+  <p>
+  <a href="https://www.npmjs.com/package/@kubb/swagger-ts" target="_blank">
     <img alt="npm version" src="https://img.shields.io/npm/v/@kubb/swagger-ts?style=for-the-badge"/>
   </a>
-  <a href="https://www.npmjs.com/package/@kubb/swagger-ts">
-    <img alt="npm downloads" src="https://img.shields.io/bundlephobia/min/@kubb/swagger-ts?style=for-the-badge"/>
-  </a>
-  <a href="https://www.npmjs.com/package/@kubb/swagger-ts">
+
+  <a href="https://www.npmjs.com/package/@kubb/swagger-ts" target="_blank">
     <img alt="npm downloads" src="https://img.shields.io/npm/dm/@kubb/swagger-ts?style=for-the-badge"/>
   </a>
-</p>
+  </p>
+    
+  <p> 
+  <a href="https://www.npmjs.com/package/@kubb/swagger-ts" target="_blank">
+    <img alt="Minified size" src="https://img.shields.io/bundlephobia/min/@kubb/swagger-ts?style=for-the-badge"/>
+  </a>
+    
+  <a href="https://www.npmjs.com/package/@kubb/swagger-ts" target="_blank">
+    <img alt="Coverage" src="https://img.shields.io/codecov/c/github/kubb-project/kubb?style=for-the-badge"/>
+  </a>
+    
+  <a href="https://www.npmjs.com/package/@kubb/swagger-ts" target="_blank">
+    <img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/kubb-project/kubb/ci.yaml?style=for-the-badge"/>
+  </a>
+  
+  
+  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+  <!-- ALL-CONTRIBUTORS-BADGE:END -->
+  </p>
    
-<h4>
-    <a href="https://codesandbox.io/s/github/kubb-project/kubb/tree/main/examples/simple">View Demo</a>
-  <span> · </span>
-    <a href="https://kubb.dev/" target="_blank">Documentation</a>
-  <span> · </span>
-    <a href="https://github.com/kubb-project/kubb/issues/">Report Bug</a>
-  <span> · </span>
-    <a href="https://github.com/kubb-project/kubb/issues/">Request Feature</a>
+  <h4>
+    <a href="https://codesandbox.io/s/github/kubb-project/kubb/tree/main/examples/simple" target="_blank">View Demo</a>
+    <span> · </span>
+      <a href="https://kubb.dev/" target="_blank">Documentation</a>
+    <span> · </span>
+      <a href="https://github.com/kubb-project/kubb/issues/" target="_blank">Report Bug</a>
+    <span> · </span>
+      <a href="https://github.com/kubb-project/kubb/issues/" target="_blank">Request Feature</a>
   </h4>
 </div>
-
-<br />
-
-<!-- About the Project 
-## :star2: About the Project
-
-<div align="center"> 
-  <img src="assets/screenshot.jpg" alt="screenshot" />
-</div>
--->

package/dist/index.cjs

@@ -8,13 +8,11 @@ var core = require('@kubb/core');
 var swagger = require('@kubb/swagger');
 var changeCase = require('change-case');
 var tsCodegen = require('@kubb/ts-codegen');
-var uniqueId = require('lodash.uniqueid');
 var ts = require('typescript');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var pathParser__default = /*#__PURE__*/_interopDefault(pathParser);
-var uniqueId__default = /*#__PURE__*/_interopDefault(uniqueId);
 var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('out.js', document.baseURI).href)));
@@ -56,7 +54,7 @@ var _TypeGenerator = class extends core.SchemaGenerator {
       return this.extraNodes;
     }
     const node = tsCodegen.createTypeAliasDeclaration({
-      modifiers: [tsCodegen.modifier.export],
+      modifiers: [tsCodegen.modifiers.export],
       name: this.options.resolveName({ name: baseName, pluginName }) || baseName,
       type
     });
@@ -152,7 +150,7 @@ var _TypeGenerator = class extends core.SchemaGenerator {
       ref = this.refs[$ref] = {
         propertyName,
         originalName,
-        name: uniqueId__default.default(propertyName)
+        name: core.uniqueId(propertyName)
       };
       return factory2.createTypeReferenceNode(ref.name, void 0);
     }
@@ -187,9 +185,7 @@ var _TypeGenerator = class extends core.SchemaGenerator {
           nodes: [this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName), union].filter(Boolean)
         });
       }
-      return tsCodegen.createIntersectionDeclaration({
-        nodes: [union]
-      });
+      return union;
     }
     if (schema.anyOf) ;
     if (schema.allOf) {
@@ -206,9 +202,7 @@ var _TypeGenerator = class extends core.SchemaGenerator {
           nodes: [this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName), and].filter(Boolean)
         });
       }
-      return tsCodegen.createIntersectionDeclaration({
-        nodes: [and]
-      });
+      return and;
     }
     if (schema.enum && baseName) {
       const enumName = core.getUniqueName(baseName, _TypeGenerator.usedEnumNames);
@@ -300,7 +294,7 @@ var TypeBuilder = class extends swagger.OasBuilder {
     }
     return this;
   }
-  async print(name) {
+  print(name) {
     const codes = [];
     const generated = this.items.filter((operationSchema) => name ? operationSchema.name === name : true).sort(core.nameSorter).map((operationSchema) => {
       const generator = new TypeGenerator(this.oas, {
@@ -322,7 +316,7 @@ var TypeBuilder = class extends swagger.OasBuilder {
     });
     if (this.config.withImports) {
       const importsGenerator = new swagger.ImportsGenerator({ fileResolver: this.config.fileResolver });
-      const importMeta = await importsGenerator.build(generated.map((item) => item.import));
+      const importMeta = importsGenerator.build(generated.map((item) => item.import));
       if (importMeta) {
         const nodes = importMeta.map((item) => {
           return tsCodegen.createImportDeclaration({
@@ -366,7 +360,7 @@ var OperationGenerator = class extends swagger.OperationGenerator {
       });
       return core.getRelativePath(root, resolvedTypeId);
     };
-    const source = await new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
+    const source = new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
     return {
       path: type.filePath,
       fileName: type.fileName,
@@ -384,7 +378,7 @@ var OperationGenerator = class extends swagger.OperationGenerator {
       });
       return core.getRelativePath(root, resolvedTypeId);
     };
-    const source = await new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.request).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
+    const source = new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.request).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
     return {
       path: type.filePath,
       fileName: type.fileName,
@@ -402,7 +396,7 @@ var OperationGenerator = class extends swagger.OperationGenerator {
       });
       return core.getRelativePath(root, resolvedTypeId);
     };
-    const source = await new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.request).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
+    const source = new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.request).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
     return {
       path: type.filePath,
       fileName: type.fileName,
@@ -420,7 +414,7 @@ var OperationGenerator = class extends swagger.OperationGenerator {
       });
       return core.getRelativePath(root, resolvedTypeId);
     };
-    const source = await new TypeBuilder(oas).add(schemas.pathParams).add(schemas.request).add(schemas.queryParams).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
+    const source = new TypeBuilder(oas).add(schemas.pathParams).add(schemas.request).add(schemas.queryParams).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
     return {
       path: type.filePath,
       fileName: type.fileName,
@@ -499,7 +493,7 @@ var definePlugin = core.createPlugin((options) => {
           return this.addFile({
             path,
             fileName: `${this.resolveName({ name, pluginName })}.ts`,
-            source: await builder.print(name)
+            source: builder.print(name)
           });
         };
         const promises = Object.entries(schemas).map(mapFolderSchema);
@@ -524,7 +518,7 @@ var definePlugin = core.createPlugin((options) => {
         await this.addFile({
           path,
           fileName: `${this.resolveName({ name: output, pluginName })}.ts`,
-          source: await builder.print()
+          source: builder.print()
         });
       }
       const operationGenerator = new OperationGenerator({

package/dist/index.d.ts

@@ -110,7 +110,7 @@ type Config = {
 };
 declare class TypeBuilder extends OasBuilder<Config> {
     configure(config: Config): this;
-    print(name?: string): Promise<string>;
+    print(name?: string): string;
 }
 
 declare const keywordTypeNodes: {

package/dist/index.js

@@ -1,10 +1,9 @@
 import { createRequire } from 'module';
 import pathParser from 'node:path';
-import { createPlugin, validatePlugins, getPathMode, renderTemplate, getRelativePath, writeIndexes, nameSorter, SchemaGenerator, getUniqueName } from '@kubb/core';
+import { createPlugin, validatePlugins, getPathMode, renderTemplate, getRelativePath, writeIndexes, nameSorter, SchemaGenerator, getUniqueName, uniqueId } from '@kubb/core';
 import { pluginName as pluginName$1, OasBuilder, ImportsGenerator, OperationGenerator as OperationGenerator$1, isReference } from '@kubb/swagger';
 import { pascalCase, pascalCaseTransformMerge, camelCase } from 'change-case';
-import { print, createImportDeclaration, createTypeAliasDeclaration, modifier, appendJSDocToNode, createUnionDeclaration, createPropertySignature, createIndexSignature, createIntersectionDeclaration, createEnumDeclaration, createTupleDeclaration } from '@kubb/ts-codegen';
-import uniqueId from 'lodash.uniqueid';
+import { print, createImportDeclaration, createTypeAliasDeclaration, modifiers, appendJSDocToNode, createUnionDeclaration, createPropertySignature, createIndexSignature, createIntersectionDeclaration, createEnumDeclaration, createTupleDeclaration } from '@kubb/ts-codegen';
 import ts from 'typescript';
 
 createRequire(import.meta.url);
@@ -46,7 +45,7 @@ var _TypeGenerator = class extends SchemaGenerator {
       return this.extraNodes;
     }
     const node = createTypeAliasDeclaration({
-      modifiers: [modifier.export],
+      modifiers: [modifiers.export],
       name: this.options.resolveName({ name: baseName, pluginName }) || baseName,
       type
     });
@@ -177,9 +176,7 @@ var _TypeGenerator = class extends SchemaGenerator {
           nodes: [this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName), union].filter(Boolean)
         });
       }
-      return createIntersectionDeclaration({
-        nodes: [union]
-      });
+      return union;
     }
     if (schema.anyOf) ;
     if (schema.allOf) {
@@ -196,9 +193,7 @@ var _TypeGenerator = class extends SchemaGenerator {
           nodes: [this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName), and].filter(Boolean)
         });
       }
-      return createIntersectionDeclaration({
-        nodes: [and]
-      });
+      return and;
     }
     if (schema.enum && baseName) {
       const enumName = getUniqueName(baseName, _TypeGenerator.usedEnumNames);
@@ -290,7 +285,7 @@ var TypeBuilder = class extends OasBuilder {
     }
     return this;
   }
-  async print(name) {
+  print(name) {
     const codes = [];
     const generated = this.items.filter((operationSchema) => name ? operationSchema.name === name : true).sort(nameSorter).map((operationSchema) => {
       const generator = new TypeGenerator(this.oas, {
@@ -312,7 +307,7 @@ var TypeBuilder = class extends OasBuilder {
     });
     if (this.config.withImports) {
       const importsGenerator = new ImportsGenerator({ fileResolver: this.config.fileResolver });
-      const importMeta = await importsGenerator.build(generated.map((item) => item.import));
+      const importMeta = importsGenerator.build(generated.map((item) => item.import));
       if (importMeta) {
         const nodes = importMeta.map((item) => {
           return createImportDeclaration({
@@ -356,7 +351,7 @@ var OperationGenerator = class extends OperationGenerator$1 {
       });
       return getRelativePath(root, resolvedTypeId);
     };
-    const source = await new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
+    const source = new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
     return {
       path: type.filePath,
       fileName: type.fileName,
@@ -374,7 +369,7 @@ var OperationGenerator = class extends OperationGenerator$1 {
       });
       return getRelativePath(root, resolvedTypeId);
     };
-    const source = await new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.request).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
+    const source = new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.request).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
     return {
       path: type.filePath,
       fileName: type.fileName,
@@ -392,7 +387,7 @@ var OperationGenerator = class extends OperationGenerator$1 {
       });
       return getRelativePath(root, resolvedTypeId);
     };
-    const source = await new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.request).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
+    const source = new TypeBuilder(oas).add(schemas.pathParams).add(schemas.queryParams).add(schemas.request).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
     return {
       path: type.filePath,
       fileName: type.fileName,
@@ -410,7 +405,7 @@ var OperationGenerator = class extends OperationGenerator$1 {
       });
       return getRelativePath(root, resolvedTypeId);
     };
-    const source = await new TypeBuilder(oas).add(schemas.pathParams).add(schemas.request).add(schemas.queryParams).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
+    const source = new TypeBuilder(oas).add(schemas.pathParams).add(schemas.request).add(schemas.queryParams).add(schemas.response).add(schemas.errors).configure({ fileResolver: mode === "file" ? void 0 : fileResolver, withJSDocs: true, resolveName, enumType }).print();
     return {
       path: type.filePath,
       fileName: type.fileName,
@@ -489,7 +484,7 @@ var definePlugin = createPlugin((options) => {
           return this.addFile({
             path,
             fileName: `${this.resolveName({ name, pluginName })}.ts`,
-            source: await builder.print(name)
+            source: builder.print(name)
           });
         };
         const promises = Object.entries(schemas).map(mapFolderSchema);
@@ -514,7 +509,7 @@ var definePlugin = createPlugin((options) => {
         await this.addFile({
           path,
           fileName: `${this.resolveName({ name: output, pluginName })}.ts`,
-          source: await builder.print()
+          source: builder.print()
         });
       }
       const operationGenerator = new OperationGenerator({

package/package.json

@@ -1,14 +1,7 @@
 {
   "name": "@kubb/swagger-ts",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Generator swagger-ts",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/kubb-project/kubb.git",
-    "directory": "packages/swagger-ts"
-  },
-  "license": "MIT",
-  "author": "Stijn Van Hulle <stijn@stijnvanhulle.be",
   "keywords": [
     "typescript",
     "plugins",
@@ -17,11 +10,15 @@
     "swagger",
     "openapi"
   ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/kubb-project/kubb.git",
+    "directory": "packages/swagger-ts"
+  },
+  "license": "MIT",
+  "author": "Stijn Van Hulle <stijn@stijnvanhulle.be",
   "sideEffects": false,
   "type": "module",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -31,6 +28,9 @@
     },
     "./package.json": "./package.json"
   },
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "src",
@@ -39,35 +39,36 @@
   ],
   "dependencies": {
     "change-case": "^4.1.2",
-    "lodash.uniqueid": "^4.0.1",
     "typescript": "^5.1.3",
-    "@kubb/core": "1.1.7",
-    "@kubb/swagger": "1.1.7",
-    "@kubb/ts-codegen": "1.1.7"
+    "@kubb/core": "1.1.8",
+    "@kubb/swagger": "1.1.8",
+    "@kubb/ts-codegen": "1.1.8"
   },
   "devDependencies": {
     "eslint": "^8.42.0",
     "tsup": "^6.7.0",
-    "@types/lodash.uniqueid": "^4.0.7",
+    "@kubb/eslint-config": "0.1.0",
     "@kubb/tsup-config": "0.1.0",
-    "@kubb/eslint-config": "0.1.0"
+    "@kubb/typescript-config": "0.1.0"
+  },
+  "packageManager": "pnpm@8.3.0",
+  "engines": {
+    "node": ">=18",
+    "pnpm": ">=8.3.0"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "engines": {
-    "node": ">=18",
-    "pnpm": ">=8"
-  },
   "scripts": {
     "build": "tsup",
-    "start": "tsup --watch",
-    "release": "pnpm publish --no-git-check",
+    "clean": "rimraf ./dist",
     "lint": "eslint \"**/*.{ts,tsx}\"",
     "lint-fix": "eslint \"**/*.{ts,tsx}\" --quiet --fix",
+    "release": "pnpm publish --no-git-check",
+    "start": "tsup --watch",
     "test": "vitest --passWithNoTests",
-    "upgrade": "pnpm update",
-    "typecheck": "tsc -p ./tsconfig.json --noEmit --emitDeclarationOnly false"
+    "typecheck": "tsc -p ./tsconfig.json --noEmit --emitDeclarationOnly false",
+    "upgrade": "pnpm update"
   }
 }

package/src/builders/TypeBuilder.ts

@@ -39,7 +39,7 @@ export class TypeBuilder extends OasBuilder<Config> {
     return this
   }
 
-  async print(name?: string) {
+  print(name?: string): string {
     const codes: string[] = []
 
     const generated = this.items
@@ -69,7 +69,7 @@ export class TypeBuilder extends OasBuilder<Config> {
 
     if (this.config.withImports) {
       const importsGenerator = new ImportsGenerator({ fileResolver: this.config.fileResolver })
-      const importMeta = await importsGenerator.build(generated.map((item) => item.import))
+      const importMeta = importsGenerator.build(generated.map((item) => item.import))
 
       if (importMeta) {
         const nodes = importMeta.map((item) => {

package/src/generators/OperationGenerator.ts

@@ -55,7 +55,7 @@ export class OperationGenerator extends Generator<Options> {
       return getRelativePath(root, resolvedTypeId)
     }
 
-    const source = await new TypeBuilder(oas)
+    const source = new TypeBuilder(oas)
       .add(schemas.pathParams)
       .add(schemas.queryParams)
       .add(schemas.response)
@@ -87,7 +87,7 @@ export class OperationGenerator extends Generator<Options> {
       return getRelativePath(root, resolvedTypeId)
     }
 
-    const source = await new TypeBuilder(oas)
+    const source = new TypeBuilder(oas)
       .add(schemas.pathParams)
       .add(schemas.queryParams)
       .add(schemas.request)
@@ -120,7 +120,7 @@ export class OperationGenerator extends Generator<Options> {
       return getRelativePath(root, resolvedTypeId)
     }
 
-    const source = await new TypeBuilder(oas)
+    const source = new TypeBuilder(oas)
       .add(schemas.pathParams)
       .add(schemas.queryParams)
       .add(schemas.request)
@@ -153,7 +153,7 @@ export class OperationGenerator extends Generator<Options> {
       return getRelativePath(root, resolvedTypeId)
     }
 
-    const source = await new TypeBuilder(oas)
+    const source = new TypeBuilder(oas)
       .add(schemas.pathParams)
       .add(schemas.request)
       .add(schemas.queryParams)

package/src/generators/TypeGenerator.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { getUniqueName, SchemaGenerator } from '@kubb/core'
+import { getUniqueName, SchemaGenerator, uniqueId } from '@kubb/core'
 import { isReference } from '@kubb/swagger'
 import {
   appendJSDocToNode,
@@ -10,11 +10,10 @@ import {
   createTupleDeclaration,
   createTypeAliasDeclaration,
   createUnionDeclaration,
-  modifier,
+  modifiers,
 } from '@kubb/ts-codegen'
 
 import { camelCase, pascalCase } from 'change-case'
-import uniqueId from 'lodash.uniqueid'
 import ts from 'typescript'
 
 import { pluginName } from '../plugin.ts'
@@ -22,6 +21,7 @@ import { keywordTypeNodes } from '../utils/index.ts'
 
 import type { PluginContext } from '@kubb/core'
 import type { Oas, OpenAPIV3, Refs } from '@kubb/swagger'
+import type { ArrayTwoOrMore } from '@kubb/ts-codegen'
 
 const { factory } = ts
 
@@ -60,7 +60,7 @@ export class TypeGenerator extends SchemaGenerator<Options, OpenAPIV3.SchemaObje
     }
 
     const node = createTypeAliasDeclaration({
-      modifiers: [modifier.export],
+      modifiers: [modifiers.export],
       name: this.options.resolveName({ name: baseName, pluginName }) || baseName,
       type,
     })
@@ -212,22 +212,20 @@ export class TypeGenerator extends SchemaGenerator<Options, OpenAPIV3.SchemaObje
       const union = factory.createParenthesizedType(
         createUnionDeclaration({
           nodes: schema.oneOf
-            .map((item) => {
-              return this.getBaseTypeFromSchema(item)
+            .map((item: any) => {
+              return this.getBaseTypeFromSchema(item as OpenAPIV3.SchemaObject)
             })
-            .filter(Boolean) as ts.TypeNode[],
+            .filter(Boolean) as ArrayTwoOrMore<ts.TypeNode>,
         })
       )
 
       if (schemaWithoutOneOf.properties) {
         return createIntersectionDeclaration({
-          nodes: [this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName), union].filter(Boolean) as ts.TypeNode[],
+          nodes: [this.getBaseTypeFromSchema(schemaWithoutOneOf, baseName), union].filter(Boolean) as ArrayTwoOrMore<ts.TypeNode>,
         })
       }
 
-      return createIntersectionDeclaration({
-        nodes: [union],
-      })
+      return union
     }
 
     if (schema.anyOf) {
@@ -240,22 +238,20 @@ export class TypeGenerator extends SchemaGenerator<Options, OpenAPIV3.SchemaObje
       const and = factory.createParenthesizedType(
         factory.createIntersectionTypeNode(
           schema.allOf
-            .map((item) => {
-              return this.getBaseTypeFromSchema(item)
+            .map((item: any) => {
+              return this.getBaseTypeFromSchema(item as OpenAPIV3.SchemaObject)
             })
-            .filter(Boolean) as ts.TypeNode[]
+            .filter(Boolean) as ArrayTwoOrMore<ts.TypeNode>
         )
       )
 
       if (schemaWithoutAllOf.properties) {
         return createIntersectionDeclaration({
-          nodes: [this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName), and].filter(Boolean) as ts.TypeNode[],
+          nodes: [this.getBaseTypeFromSchema(schemaWithoutAllOf, baseName), and].filter(Boolean) as ArrayTwoOrMore<ts.TypeNode>,
         })
       }
 
-      return createIntersectionDeclaration({
-        nodes: [and],
-      })
+      return and
     }
 
     /**
@@ -285,9 +281,9 @@ export class TypeGenerator extends SchemaGenerator<Options, OpenAPIV3.SchemaObje
 
     if (schema.enum) {
       return createUnionDeclaration({
-        nodes: schema.enum.map((name) => {
+        nodes: schema.enum.map((name: any) => {
           return factory.createLiteralTypeNode(typeof name === 'number' ? factory.createNumericLiteral(name) : factory.createStringLiteral(`${name}`))
-        }),
+        }) as unknown as ArrayTwoOrMore<ts.TypeNode>,
       })
     }
 
@@ -309,7 +305,7 @@ export class TypeGenerator extends SchemaGenerator<Options, OpenAPIV3.SchemaObje
         nodes: prefixItems.map((item) => {
           // no baseType so we can fall back on an union when using enum
           return this.getBaseTypeFromSchema(item, undefined)!
-        }),
+        }) as ArrayTwoOrMore<ts.TypeNode>,
       })
     }
 
@@ -333,7 +329,7 @@ export class TypeGenerator extends SchemaGenerator<Options, OpenAPIV3.SchemaObje
               baseName
             )!,
             nullable ? factory.createLiteralTypeNode(factory.createNull()) : undefined,
-          ].filter(Boolean) as ts.TypeNode[],
+          ].filter(Boolean) as ArrayTwoOrMore<ts.TypeNode>,
         })
       }
       // string, boolean, null, number

package/src/plugin.ts

@@ -111,7 +111,7 @@ export const definePlugin = createPlugin<PluginOptions>((options) => {
           return this.addFile({
             path,
             fileName: `${this.resolveName({ name, pluginName })}.ts`,
-            source: await builder.print(name),
+            source: builder.print(name),
           })
         }
 
@@ -143,7 +143,7 @@ export const definePlugin = createPlugin<PluginOptions>((options) => {
         await this.addFile({
           path,
           fileName: `${this.resolveName({ name: output, pluginName })}.ts`,
-          source: await builder.print(),
+          source: builder.print(),
         })
       }