@kubb/swagger-ts 1.15.0-canary.20231025T223956 → 1.15.0-canary.20231026T165055

package/dist/index.cjs

@@ -2,56 +2,49 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var path = require('path');
+var pathParser = require('path');
 var core = require('@kubb/core');
-var utils = require('@kubb/core/utils');
 var swagger = require('@kubb/swagger');
 var changeCase = require('change-case');
 var parser = require('@kubb/parser');
-var factory = require('@kubb/parser/factory');
+var ts = require('typescript');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var path__default = /*#__PURE__*/_interopDefault(path);
-var factory__namespace = /*#__PURE__*/_interopNamespace(factory);
+var pathParser__default = /*#__PURE__*/_interopDefault(pathParser);
+var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 // src/plugin.ts
-var TypeGenerator = class extends core.SchemaGenerator {
+var { factory } = ts__default.default;
+var keywordTypeNodes = {
+  any: factory.createKeywordTypeNode(ts__default.default.SyntaxKind.AnyKeyword),
+  number: factory.createKeywordTypeNode(ts__default.default.SyntaxKind.NumberKeyword),
+  integer: factory.createKeywordTypeNode(ts__default.default.SyntaxKind.NumberKeyword),
+  object: factory.createKeywordTypeNode(ts__default.default.SyntaxKind.ObjectKeyword),
+  string: factory.createKeywordTypeNode(ts__default.default.SyntaxKind.StringKeyword),
+  boolean: factory.createKeywordTypeNode(ts__default.default.SyntaxKind.BooleanKeyword),
+  undefined: factory.createKeywordTypeNode(ts__default.default.SyntaxKind.UndefinedKeyword),
+  null: factory.createLiteralTypeNode(factory.createToken(ts__default.default.SyntaxKind.NullKeyword))
+};
+function resolve(props) {
+  return swagger.resolve({ ...props, pluginName });
+}
+
+// src/generators/TypeGenerator.ts
+var { factory: factory2 } = ts__default.default;
+var TypeGenerator = class _TypeGenerator extends core.SchemaGenerator {
+  // Collect the types of all referenced schemas so we can export them later
+  static usedEnumNames = {};
   refs = {};
   extraNodes = [];
   aliases = [];
   // Keep track of already used type aliases
-  #usedAliasNames = {};
-  #caseOptions = {
+  usedAliasNames = {};
+  caseOptions = {
     delimiter: "",
     stripRegexp: /[^A-Z0-9$]/gi
   };
-  constructor(options = {
-    usedEnumNames: {},
-    withJSDocs: true,
-    resolveName: ({ name }) => name,
-    enumType: "asConst",
-    dateType: "string",
-    optionalType: "questionToken"
-  }) {
+  constructor(options = { withJSDocs: true, resolveName: ({ name }) => name, enumType: "asConst", dateType: "string", optionalType: "questionToken" }) {
     super(options);
     return this;
   }
@@ -66,14 +59,14 @@ var TypeGenerator = class extends core.SchemaGenerator {
     if (!type) {
       return this.extraNodes;
     }
-    const node = factory__namespace.createTypeAliasDeclaration({
-      modifiers: [factory__namespace.modifiers.export],
-      name: this.options.resolveName({ name: baseName }) || baseName,
-      type: keysToOmit?.length ? factory__namespace.createOmitDeclaration({ keys: keysToOmit, type, nonNullable: true }) : type
+    const node = parser.createTypeAliasDeclaration({
+      modifiers: [parser.modifiers.export],
+      name: this.options.resolveName({ name: baseName, pluginName }) || baseName,
+      type: keysToOmit?.length ? parser.createOmitDeclaration({ keys: keysToOmit, type, nonNullable: true }) : type
     });
     if (description) {
       nodes.push(
-        factory__namespace.appendJSDocToNode({
+        parser.appendJSDocToNode({
           node,
           comments: [`@description ${description}`]
         })
@@ -101,7 +94,7 @@ var TypeGenerator = class extends core.SchemaGenerator {
     if (schema && !schema.nullable) {
       return type;
     }
-    return factory__namespace.createUnionDeclaration({ nodes: [type, factory__namespace.keywordTypeNodes.null] });
+    return parser.createUnionDeclaration({ nodes: [type, keywordTypeNodes.null] });
   }
   /**
    * Recursively creates a type literal with the given props.
@@ -114,21 +107,21 @@ var TypeGenerator = class extends core.SchemaGenerator {
     const members = Object.keys(properties).map((name) => {
       const schema = properties[name];
       const isRequired = required && required.includes(name);
-      let type = this.#getTypeFromSchema(schema, this.options.resolveName({ name: `${baseName || ""} ${name}` }));
+      let type = this.#getTypeFromSchema(schema, this.options.resolveName({ name: `${baseName || ""} ${name}`, pluginName }));
       if (!type) {
         return null;
       }
       if (!isRequired && ["undefined", "questionTokenAndUndefined"].includes(optionalType)) {
-        type = factory__namespace.createUnionDeclaration({ nodes: [type, factory__namespace.keywordTypeNodes.undefined] });
+        type = parser.createUnionDeclaration({ nodes: [type, keywordTypeNodes.undefined] });
       }
-      const propertySignature = factory__namespace.createPropertySignature({
+      const propertySignature = parser.createPropertySignature({
         questionToken: ["questionToken", "questionTokenAndUndefined"].includes(optionalType) && !isRequired,
         name,
         type,
         readOnly: schema.readOnly
       });
       if (this.options.withJSDocs) {
-        return factory__namespace.appendJSDocToNode({
+        return parser.appendJSDocToNode({
           node: propertySignature,
           comments: [
             schema.description ? `@description ${schema.description}` : void 0,
@@ -143,29 +136,29 @@ var TypeGenerator = class extends core.SchemaGenerator {
       return propertySignature;
     });
     if (additionalProperties) {
-      const type = additionalProperties === true ? factory__namespace.keywordTypeNodes.any : this.#getTypeFromSchema(additionalProperties);
+      const type = additionalProperties === true ? keywordTypeNodes.any : this.#getTypeFromSchema(additionalProperties);
       if (type) {
-        members.push(factory__namespace.createIndexSignature(type));
+        members.push(parser.createIndexSignature(type));
       }
     }
-    return factory__namespace.createTypeLiteralNode(members.filter(Boolean));
+    return factory2.createTypeLiteralNode(members.filter(Boolean));
   }
   /**
    * Create a type alias for the schema referenced by the given ReferenceObject
    */
-  #getRefAlias(obj, _baseName) {
+  #getRefAlias(obj, baseName) {
     const { $ref } = obj;
     let ref = this.refs[$ref];
     if (ref) {
-      return factory__namespace.createTypeReferenceNode(ref.propertyName, void 0);
+      return factory2.createTypeReferenceNode(ref.propertyName, void 0);
     }
-    const originalName = utils.getUniqueName($ref.replace(/.+\//, ""), this.#usedAliasNames);
-    const propertyName = this.options.resolveName({ name: originalName }) || originalName;
+    const originalName = core.getUniqueName($ref.replace(/.+\//, ""), this.usedAliasNames);
+    const propertyName = this.options.resolveName({ name: originalName, pluginName }) || originalName;
     ref = this.refs[$ref] = {
       propertyName,
       originalName
     };
-    return factory__namespace.createTypeReferenceNode(ref.propertyName, void 0);
+    return factory2.createTypeReferenceNode(ref.propertyName, void 0);
   }
   /**
    * This is the very core of the OpenAPI to TS conversion - it takes a
@@ -173,23 +166,23 @@ var TypeGenerator = class extends core.SchemaGenerator {
    */
   #getBaseTypeFromSchema(schema, baseName) {
     if (!schema) {
-      return factory__namespace.keywordTypeNodes.any;
+      return keywordTypeNodes.any;
     }
     if (swagger.isReference(schema)) {
       return this.#getRefAlias(schema, baseName);
     }
     if (schema.oneOf) {
       const schemaWithoutOneOf = { ...schema, oneOf: void 0 };
-      const union = factory__namespace.createUnionDeclaration({
+      const union = parser.createUnionDeclaration({
         withParentheses: true,
         nodes: schema.oneOf.map((item) => {
           return this.#getBaseTypeFromSchema(item);
         }).filter((item) => {
-          return item && item !== factory__namespace.keywordTypeNodes.any;
+          return item && item !== keywordTypeNodes.any;
         })
       });
       if (schemaWithoutOneOf.properties) {
-        return factory__namespace.createIntersectionDeclaration({
+        return parser.createIntersectionDeclaration({
           nodes: [this.#getBaseTypeFromSchema(schemaWithoutOneOf, baseName), union].filter(Boolean)
         });
       }
@@ -197,16 +190,16 @@ var TypeGenerator = class extends core.SchemaGenerator {
     }
     if (schema.anyOf) {
       const schemaWithoutAnyOf = { ...schema, anyOf: void 0 };
-      const union = factory__namespace.createUnionDeclaration({
+      const union = parser.createUnionDeclaration({
         withParentheses: true,
         nodes: schema.anyOf.map((item) => {
           return this.#getBaseTypeFromSchema(item);
         }).filter((item) => {
-          return item && item !== factory__namespace.keywordTypeNodes.any;
+          return item && item !== keywordTypeNodes.any;
         })
       });
       if (schemaWithoutAnyOf.properties) {
-        return factory__namespace.createIntersectionDeclaration({
+        return parser.createIntersectionDeclaration({
           nodes: [this.#getBaseTypeFromSchema(schemaWithoutAnyOf, baseName), union].filter(Boolean)
         });
       }
@@ -214,23 +207,23 @@ var TypeGenerator = class extends core.SchemaGenerator {
     }
     if (schema.allOf) {
       const schemaWithoutAllOf = { ...schema, allOf: void 0 };
-      const and = factory__namespace.createIntersectionDeclaration({
+      const and = parser.createIntersectionDeclaration({
         withParentheses: true,
         nodes: schema.allOf.map((item) => {
           return this.#getBaseTypeFromSchema(item);
         }).filter((item) => {
-          return item && item !== factory__namespace.keywordTypeNodes.any;
+          return item && item !== keywordTypeNodes.any;
         })
       });
       if (schemaWithoutAllOf.properties) {
-        return factory__namespace.createIntersectionDeclaration({
+        return parser.createIntersectionDeclaration({
           nodes: [this.#getBaseTypeFromSchema(schemaWithoutAllOf, baseName), and].filter(Boolean)
         });
       }
       return and;
     }
     if (schema.enum && baseName) {
-      const enumName = utils.getUniqueName(baseName, this.options.usedEnumNames);
+      const enumName = core.getUniqueName(baseName, _TypeGenerator.usedEnumNames);
       let enums = [...new Set(schema.enum)].map((key) => [key, key]);
       if ("x-enumNames" in schema) {
         enums = [...new Set(schema["x-enumNames"])].map((key, index) => {
@@ -238,31 +231,31 @@ var TypeGenerator = class extends core.SchemaGenerator {
         });
       }
       this.extraNodes.push(
-        ...factory__namespace.createEnumDeclaration({
-          name: changeCase.camelCase(enumName, this.#caseOptions),
-          typeName: this.options.resolveName({ name: enumName }),
+        ...parser.createEnumDeclaration({
+          name: changeCase.camelCase(enumName, this.caseOptions),
+          typeName: this.options.resolveName({ name: enumName, pluginName }),
           enums,
           type: this.options.enumType
         })
       );
-      return factory__namespace.createTypeReferenceNode(this.options.resolveName({ name: enumName }), void 0);
+      return factory2.createTypeReferenceNode(this.options.resolveName({ name: enumName, pluginName }), void 0);
     }
     if (schema.enum) {
-      return factory__namespace.createUnionDeclaration({
+      return parser.createUnionDeclaration({
         nodes: schema.enum.map((name) => {
-          return factory__namespace.createLiteralTypeNode(typeof name === "number" ? factory__namespace.createNumericLiteral(name) : factory__namespace.createStringLiteral(`${name}`));
+          return factory2.createLiteralTypeNode(typeof name === "number" ? factory2.createNumericLiteral(name) : factory2.createStringLiteral(`${name}`));
         })
       });
     }
     if ("items" in schema) {
       const node = this.#getTypeFromSchema(schema.items, baseName);
       if (node) {
-        return factory__namespace.createArrayTypeNode(node);
+        return factory2.createArrayTypeNode(node);
       }
     }
     if ("prefixItems" in schema) {
       const prefixItems = schema.prefixItems;
-      return factory__namespace.createTupleDeclaration({
+      return parser.createTupleDeclaration({
         nodes: prefixItems.map((item) => {
           return this.#getBaseTypeFromSchema(item, void 0);
         })
@@ -274,7 +267,7 @@ var TypeGenerator = class extends core.SchemaGenerator {
     if (schema.type) {
       if (Array.isArray(schema.type)) {
         const [type, nullable] = schema.type;
-        return factory__namespace.createUnionDeclaration({
+        return parser.createUnionDeclaration({
           nodes: [
             this.#getBaseTypeFromSchema(
               {
@@ -283,25 +276,37 @@ var TypeGenerator = class extends core.SchemaGenerator {
               },
               baseName
             ),
-            nullable ? factory__namespace.createLiteralTypeNode(factory__namespace.createNull()) : void 0
+            nullable ? factory2.createLiteralTypeNode(factory2.createNull()) : void 0
           ].filter(Boolean)
         });
       }
       if (this.options.dateType === "date" && ["date", "date-time"].some((item) => item === schema.format)) {
-        return factory__namespace.createTypeReferenceNode(factory__namespace.createIdentifier("Date"));
+        return factory2.createTypeReferenceNode(factory2.createIdentifier("Date"));
       }
-      if (schema.type in factory__namespace.keywordTypeNodes) {
-        return factory__namespace.keywordTypeNodes[schema.type];
+      if (schema.type in keywordTypeNodes) {
+        return keywordTypeNodes[schema.type];
       }
     }
     if (schema.format === "binary") {
-      return factory__namespace.createTypeReferenceNode("Blob", []);
+      return factory2.createTypeReferenceNode("Blob", []);
+    }
+    if ("const" in schema && schema["const"] !== void 0 && typeof schema["const"] === "string") {
+      return factory2.createLiteralTypeNode(factory2.createStringLiteral(schema["const"]));
     }
-    return factory__namespace.keywordTypeNodes.any;
+    return keywordTypeNodes.any;
   }
 };
 
 // src/builders/TypeBuilder.ts
+function refsSorter(a, b) {
+  if (Object.keys(a.import.refs)?.length < Object.keys(b.import.refs)?.length) {
+    return -1;
+  }
+  if (Object.keys(a.import.refs)?.length > Object.keys(b.import.refs)?.length) {
+    return 1;
+  }
+  return 0;
+}
 var TypeBuilder = class extends swagger.OasBuilder {
   configure(options) {
     if (options) {
@@ -314,9 +319,8 @@ var TypeBuilder = class extends swagger.OasBuilder {
   }
   print(name) {
     const codes = [];
-    const generated = this.items.filter((operationSchema) => name ? operationSchema.name === name : true).sort(utils.transformers.nameSorter).map((operationSchema) => {
+    const generated = this.items.filter((operationSchema) => name ? operationSchema.name === name : true).sort(core.nameSorter).map((operationSchema) => {
       const generator = new TypeGenerator({
-        usedEnumNames: this.options.usedEnumNames,
         withJSDocs: this.options.withJSDocs,
         resolveName: this.options.resolveName,
         enumType: this.options.enumType,
@@ -336,7 +340,7 @@ var TypeBuilder = class extends swagger.OasBuilder {
         },
         sources
       };
-    }).sort(swagger.refsSorter);
+    }).sort(refsSorter);
     generated.forEach((item) => {
       codes.push(parser.print(item.sources));
     });
@@ -345,7 +349,7 @@ var TypeBuilder = class extends swagger.OasBuilder {
       const importMeta = importsGenerator.build(generated.map((item) => item.import));
       if (importMeta) {
         const nodes = importMeta.map((item) => {
-          return factory__namespace.createImportDeclaration({
+          return parser.createImportDeclaration({
             name: [{ propertyName: item.ref.propertyName }],
             path: item.path,
             isTypeOnly: true
@@ -354,39 +358,38 @@ var TypeBuilder = class extends swagger.OasBuilder {
         codes.unshift(parser.print(nodes));
       }
     }
-    return utils.transformers.combineCodes(codes);
+    return core.combineCodes(codes);
   }
 };
 var OperationGenerator = class extends swagger.OperationGenerator {
   resolve(operation) {
-    const { pluginManager, plugin } = this.context;
+    const { pluginManager } = this.context;
     return swagger.resolve({
       operation,
       resolveName: pluginManager.resolveName,
       resolvePath: pluginManager.resolvePath,
-      pluginKey: plugin?.key
+      pluginName
     });
   }
   async all() {
     return null;
   }
   async get(operation, schemas, options) {
-    const { mode, enumType, dateType, optionalType, usedEnumNames } = options;
-    const { pluginManager, plugin } = this.context;
+    const { mode, enumType, dateType, optionalType } = options;
+    const { pluginManager } = this.context;
     const type = this.resolve(operation);
     const fileResolver = (name) => {
-      const root = pluginManager.resolvePath({ baseName: type.baseName, pluginKey: plugin?.key, options: { tag: operation.getTags()[0]?.name } });
+      const root = pluginManager.resolvePath({ baseName: type.baseName, pluginName, options: { tag: operation.getTags()[0]?.name } });
       const resolvedTypeId = pluginManager.resolvePath({
         baseName: `${name}.ts`,
-        pluginKey: plugin?.key
+        pluginName
       });
-      return utils.getRelativePath(root, resolvedTypeId);
+      return core.getRelativePath(root, resolvedTypeId);
     };
     const source = new TypeBuilder({
-      usedEnumNames,
       fileResolver: mode === "file" ? void 0 : fileResolver,
       withJSDocs: true,
-      resolveName: (params) => pluginManager.resolveName({ ...params, pluginKey: plugin?.key }),
+      resolveName: pluginManager.resolveName,
       enumType,
       optionalType,
       dateType
@@ -396,28 +399,27 @@ var OperationGenerator = class extends swagger.OperationGenerator {
       baseName: type.baseName,
       source,
       meta: {
-        pluginKey: plugin.key,
+        pluginName,
         tag: operation.getTags()[0]?.name
       }
     };
   }
   async post(operation, schemas, options) {
-    const { mode, enumType, dateType, optionalType, usedEnumNames } = options;
-    const { pluginManager, plugin } = this.context;
+    const { mode, enumType, dateType, optionalType } = options;
+    const { pluginManager } = this.context;
     const type = this.resolve(operation);
     const fileResolver = (name) => {
-      const root = pluginManager.resolvePath({ baseName: type.baseName, pluginKey: plugin?.key, options: { tag: operation.getTags()[0]?.name } });
+      const root = pluginManager.resolvePath({ baseName: type.baseName, pluginName, options: { tag: operation.getTags()[0]?.name } });
       const resolvedTypeId = pluginManager.resolvePath({
         baseName: `${name}.ts`,
-        pluginKey: plugin?.key
+        pluginName
       });
-      return utils.getRelativePath(root, resolvedTypeId);
+      return core.getRelativePath(root, resolvedTypeId);
     };
     const source = new TypeBuilder({
-      usedEnumNames,
       fileResolver: mode === "file" ? void 0 : fileResolver,
       withJSDocs: true,
-      resolveName: (params) => pluginManager.resolveName({ ...params, pluginKey: plugin?.key }),
+      resolveName: pluginManager.resolveName,
       enumType,
       optionalType,
       dateType
@@ -427,7 +429,7 @@ var OperationGenerator = class extends swagger.OperationGenerator {
       baseName: type.baseName,
       source,
       meta: {
-        pluginKey: plugin.key,
+        pluginName,
         tag: operation.getTags()[0]?.name
       }
     };
@@ -445,7 +447,6 @@ var OperationGenerator = class extends swagger.OperationGenerator {
 
 // src/plugin.ts
 var pluginName = "swagger-ts";
-var pluginKey = ["schema", pluginName];
 var definePlugin = core.createPlugin((options) => {
   const {
     output = "types",
@@ -455,8 +456,7 @@ var definePlugin = core.createPlugin((options) => {
     enumType = "asConst",
     dateType = "string",
     optionalType = "questionToken",
-    transformers: transformers2 = {},
-    exportAs
+    transformers = {}
   } = options;
   const template = groupBy?.output ? groupBy.output : `${output}/{{tag}}Controller`;
   let pluginsOptions;
@@ -465,49 +465,47 @@ var definePlugin = core.createPlugin((options) => {
     options,
     kind: "schema",
     validate(plugins) {
-      pluginsOptions = core.PluginManager.getDependedPlugins(plugins, [swagger.pluginName]);
+      pluginsOptions = core.getDependedPlugins(plugins, [swagger.pluginName]);
       return true;
     },
     resolvePath(baseName, directory, options2) {
-      const root = path__default.default.resolve(this.config.root, this.config.output.path);
-      const mode = core.FileManager.getMode(path__default.default.resolve(root, output));
+      const root = pathParser__default.default.resolve(this.config.root, this.config.output.path);
+      const mode = core.getPathMode(pathParser__default.default.resolve(root, output));
       if (mode === "file") {
-        return path__default.default.resolve(root, output);
+        return pathParser__default.default.resolve(root, output);
       }
       if (options2?.tag && groupBy?.type === "tag") {
         const tag = changeCase.camelCase(options2.tag, { delimiter: "", transform: changeCase.camelCaseTransformMerge });
-        return path__default.default.resolve(root, utils.renderTemplate(template, { tag }), baseName);
+        return pathParser__default.default.resolve(root, core.renderTemplate(template, { tag }), baseName);
       }
-      return path__default.default.resolve(root, output, baseName);
+      return pathParser__default.default.resolve(root, output, baseName);
     },
     resolveName(name) {
       const resolvedName = changeCase.pascalCase(name, { delimiter: "", stripRegexp: /[^A-Z0-9$]/gi, transform: changeCase.pascalCaseTransformMerge });
-      return transformers2?.name?.(resolvedName) || resolvedName;
+      return transformers?.name?.(resolvedName) || resolvedName;
     },
-    async writeFile(source, writePath) {
-      if (!writePath.endsWith(".ts") || !source) {
+    async writeFile(source, path) {
+      if (!path.endsWith(".ts") || !source) {
         return;
       }
-      return this.fileManager.write(source, writePath);
+      await this.fileManager.write(source, path);
     },
     async buildStart() {
       const [swaggerPlugin] = pluginsOptions;
       const oas = await swaggerPlugin.api.getOas();
       const schemas = await swaggerPlugin.api.getSchemas();
-      const root = path__default.default.resolve(this.config.root, this.config.output.path);
-      const mode = core.FileManager.getMode(path__default.default.resolve(root, output));
-      const usedEnumNames = {};
+      const root = pathParser__default.default.resolve(this.config.root, this.config.output.path);
+      const mode = core.getPathMode(pathParser__default.default.resolve(root, output));
       if (mode === "directory") {
         const builder = await new TypeBuilder({
-          usedEnumNames,
-          resolveName: (params) => this.resolveName({ pluginKey: this.plugin.key, ...params }),
+          resolveName: (params) => this.resolveName({ pluginName, ...params }),
           fileResolver: (name) => {
             const resolvedTypeId = this.resolvePath({
               baseName: `${name}.ts`,
-              pluginKey: this.plugin.key
+              pluginName
             });
-            const root2 = this.resolvePath({ baseName: ``, pluginKey: this.plugin.key });
-            return utils.getRelativePath(root2, resolvedTypeId);
+            const root2 = this.resolvePath({ baseName: ``, pluginName });
+            return core.getRelativePath(root2, resolvedTypeId);
           },
           withJSDocs: true,
           enumType,
@@ -521,16 +519,16 @@ var definePlugin = core.createPlugin((options) => {
           });
         });
         const mapFolderSchema = async ([name]) => {
-          const resolvedPath = this.resolvePath({ baseName: `${this.resolveName({ name, pluginKey: this.plugin.key })}.ts`, pluginKey: this.plugin.key });
-          if (!resolvedPath) {
+          const path = this.resolvePath({ baseName: `${this.resolveName({ name, pluginName })}.ts`, pluginName });
+          if (!path) {
             return null;
           }
           return this.addFile({
-            path: resolvedPath,
-            baseName: `${this.resolveName({ name, pluginKey: this.plugin.key })}.ts`,
+            path,
+            baseName: `${this.resolveName({ name, pluginName })}.ts`,
             source: builder.print(name),
             meta: {
-              pluginKey: this.plugin.key
+              pluginName
             }
           });
         };
@@ -539,8 +537,7 @@ var definePlugin = core.createPlugin((options) => {
       }
       if (mode === "file") {
         const builder = new TypeBuilder({
-          usedEnumNames,
-          resolveName: (params) => this.resolveName({ pluginKey: this.plugin.key, ...params }),
+          resolveName: (params) => this.resolveName({ pluginName, ...params }),
           withJSDocs: true,
           enumType,
           dateType,
@@ -552,18 +549,17 @@ var definePlugin = core.createPlugin((options) => {
             name
           });
         });
-        const resolvedPath = this.resolvePath({ baseName: "", pluginKey: this.plugin.key });
-        if (!resolvedPath) {
+        const path = this.resolvePath({ baseName: "", pluginName });
+        if (!path) {
           return;
         }
         await this.addFile({
-          path: resolvedPath,
-          baseName: output,
+          path,
+          baseName: `${this.resolveName({ name: output, pluginName })}.ts`,
           source: builder.print(),
           meta: {
-            pluginKey: this.plugin.key
-          },
-          validate: false
+            pluginName
+          }
         });
       }
       const operationGenerator = new OperationGenerator(
@@ -571,13 +567,11 @@ var definePlugin = core.createPlugin((options) => {
           mode,
           enumType,
           dateType,
-          optionalType,
-          usedEnumNames
+          optionalType
         },
         {
           oas,
           pluginManager: this.pluginManager,
-          plugin: this.plugin,
           contentType: swaggerPlugin.api.contentType,
           skipBy,
           overrideBy
@@ -590,39 +584,16 @@ var definePlugin = core.createPlugin((options) => {
       if (this.config.output.write === false) {
         return;
       }
-      const root = path__default.default.resolve(this.config.root, this.config.output.path);
-      await this.fileManager.addIndexes({
-        root,
-        extName: ".ts",
-        meta: { pluginKey: this.plugin.key },
-        options: {
-          map: (file) => {
-            return {
-              ...file,
-              exports: file.exports?.map((item) => {
-                if (exportAs) {
-                  return {
-                    ...item,
-                    name: exportAs,
-                    asAlias: !!exportAs
-                  };
-                }
-                return item;
-              })
-            };
-          },
-          output,
-          isTypeOnly: true
-        }
-      });
+      while (this.fileManager.isExecuting) {
+        await core.timeout(100);
+      }
+      const root = pathParser__default.default.resolve(this.config.root, this.config.output.path);
+      await this.fileManager.addIndexes(root, ".ts");
     }
   };
 });
 function useResolve(props = {}) {
-  return swagger.useResolve({ pluginKey, ...props });
-}
-function resolve2(props) {
-  return swagger.resolve({ pluginKey, ...props });
+  return swagger.useResolve({ pluginName, ...props });
 }
 
 // src/index.ts
@@ -633,9 +604,9 @@ exports.TypeBuilder = TypeBuilder;
 exports.TypeGenerator = TypeGenerator;
 exports.default = src_default;
 exports.definePlugin = definePlugin;
-exports.pluginKey = pluginKey;
+exports.keywordTypeNodes = keywordTypeNodes;
 exports.pluginName = pluginName;
-exports.resolve = resolve2;
+exports.resolve = resolve;
 exports.useResolve = useResolve;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.cjs.map