@kubb/core 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/index.cjs

@@ -170,6 +170,24 @@ function randomPicoColour(text, colors = defaultColours) {
   }
   return formatter(text);
 }
+function slash(path5, platform = "linux") {
+  const isWindowsPath = /^\\\\\?\\/.test(path5);
+  if (["linux", "mac"].includes(platform) && !isWindowsPath) {
+    return path5.replaceAll(/\\/g, "/").replace("../", "").trimEnd();
+  }
+  return path5.replaceAll(/\\/g, "/").replace("../", "").trimEnd();
+}
+function getRelativePath(rootDir, filePath, platform = "linux") {
+  if (!rootDir || !filePath) {
+    throw new Error(`Root and file should be filled in when retrieving the relativePath, ${rootDir || ""} ${filePath || ""}`);
+  }
+  const relativePath = path4.relative(rootDir, filePath);
+  const slashedPath = slash(relativePath, platform);
+  if (slashedPath.startsWith("../")) {
+    return slashedPath.replace(path4.basename(slashedPath), path4.basename(slashedPath, path4.extname(filePath)));
+  }
+  return `./${slashedPath.replace(path4.basename(slashedPath), path4.basename(slashedPath, path4.extname(filePath)))}`;
+}
 var reader = jsRuntime.switcher(
   {
     node: async (path5) => {
@@ -196,141 +214,30 @@ jsRuntime.switcher(
 async function read(path5) {
   return reader(path5);
 }
-var URLPath = class {
-  constructor(path5) {
-    this.path = path5;
-    return this;
-  }
-  /**
-   * Convert Swagger path to URLPath(syntax of Express)
-   * @example /pet/{petId} => /pet/:petId
-   */
-  get URL() {
-    return this.toURLPath();
-  }
-  get isURL() {
-    try {
-      const url = new URL(this.path);
-      if (url?.href) {
-        return true;
-      }
-    } catch (error) {
-      return false;
-    }
-    return false;
-  }
-  /**
-   * Convert Swagger path to template literals/ template strings(camelcase)
-   * @example /pet/{petId} => `/pet/${petId}`
-   * @example /account/monetary-accountID => `/account/${monetaryAccountId}`
-   * @example /account/userID => `/account/${userId}`
-   */
-  get template() {
-    return this.toTemplateString();
-  }
-  get object() {
-    return this.toObject();
-  }
-  get params() {
-    return this.getParams();
-  }
-  toObject({ type = "path", replacer, stringify } = {}) {
-    const object = {
-      url: type === "path" ? this.toURLPath() : this.toTemplateString(replacer),
-      params: this.getParams()
-    };
-    if (stringify) {
-      if (type === "template") {
-        return JSON.stringify(object).replaceAll("'", "").replaceAll(`"`, "");
-      }
-      if (object.params) {
-        return `{ url: '${object.url}', params: ${JSON.stringify(object.params).replaceAll("'", "").replaceAll(`"`, "")} }`;
-      }
-      return `{ url: '${object.url}' }`;
-    }
-    return object;
-  }
-  /**
-   * Convert Swagger path to template literals/ template strings(camelcase)
-   * @example /pet/{petId} => `/pet/${petId}`
-   * @example /account/monetary-accountID => `/account/${monetaryAccountId}`
-   * @example /account/userID => `/account/${userId}`
-   */
-  toTemplateString(replacer) {
-    const regex = /{(\w|-)*}/g;
-    const found = this.path.match(regex);
-    let newPath = this.path.replaceAll("{", "${");
-    if (found) {
-      newPath = found.reduce((prev, curr) => {
-        const pathParam = replacer ? replacer(changeCase.camelCase(curr, { delimiter: "", transform: changeCase.camelCaseTransformMerge })) : changeCase.camelCase(curr, { delimiter: "", transform: changeCase.camelCaseTransformMerge });
-        const replacement = `\${${pathParam}}`;
-        return prev.replace(curr, replacement);
-      }, this.path);
-    }
-    return `\`${newPath}\``;
-  }
-  getParams(replacer) {
-    const regex = /{(\w|-)*}/g;
-    const found = this.path.match(regex);
-    if (!found) {
-      return void 0;
-    }
-    const params = {};
-    found.forEach((item) => {
-      item = item.replaceAll("{", "").replaceAll("}", "");
-      const pathParam = replacer ? replacer(changeCase.camelCase(item, { delimiter: "", transform: changeCase.camelCaseTransformMerge })) : changeCase.camelCase(item, { delimiter: "", transform: changeCase.camelCaseTransformMerge });
-      params[pathParam] = pathParam;
-    }, this.path);
-    return params;
-  }
-  /**
-   * Convert Swagger path to URLPath(syntax of Express)
-   * @example /pet/{petId} => /pet/:petId
-   */
-  toURLPath() {
-    return this.path.replaceAll("{", ":").replaceAll("}", "");
-  }
-};
-
-// src/config.ts
-function defineConfig(options) {
-  return options;
+function camelCase(text) {
+  return changeCase.camelCase(text, { delimiter: "", stripRegexp: /[^A-Z0-9$]/gi, transform: changeCase.camelCaseTransformMerge });
 }
-function isInputPath(result) {
-  return !!result && "path" in result;
+function pascalCase(text) {
+  return changeCase.pascalCase(text, { delimiter: "", stripRegexp: /[^A-Z0-9$]/gi, transform: changeCase.pascalCaseTransformMerge });
 }
 
-// src/utils/timeout.ts
-async function timeout(ms) {
-  return new Promise((resolve2) => {
-    setTimeout(() => {
-      resolve2(true);
-    }, ms);
-  });
-}
-
-// src/utils/transformers/combineCodes.ts
+// src/transformers/combineCodes.ts
 function combineCodes(codes) {
   return codes.join("\n");
 }
 
-// src/utils/transformers/createJSDocBlockText.ts
-function createJSDocBlockText({ comments, newLine }) {
+// src/transformers/createJSDocBlockText.ts
+function createJSDocBlockText({ comments }) {
   const filteredComments = comments.filter(Boolean);
   if (!filteredComments.length) {
     return "";
   }
-  const source = `/**
+  return `/**
  * ${filteredComments.join("\n * ")}
  */`;
-  if (newLine) {
-    return `${source}
-`;
-  }
-  return source;
 }
 
-// src/utils/transformers/escape.ts
+// src/transformers/escape.ts
 function escape(text) {
   return text ? text.replaceAll("`", "\\`") : "";
 }
@@ -355,12 +262,12 @@ function jsStringEscape(input) {
   });
 }
 
-// src/utils/transformers/indent.ts
+// src/transformers/indent.ts
 function createIndent(size) {
   return Array.from({ length: size + 1 }).join(" ");
 }
 
-// src/utils/transformers/nameSorter.ts
+// src/transformers/nameSorter.ts
 function nameSorter(a, b) {
   if (a.name < b.name) {
     return -1;
@@ -371,7 +278,7 @@ function nameSorter(a, b) {
   return 0;
 }
 
-// src/utils/transformers/searchAndReplace.ts
+// src/transformers/searchAndReplace.ts
 function searchAndReplace(options) {
   const { text, replaceBy, prefix = "", key } = options;
   const searchValues = options.searchValues?.(prefix, key) || [
@@ -388,7 +295,7 @@ function searchAndReplace(options) {
   }, text);
 }
 
-// src/utils/transformers/transformReservedWord.ts
+// src/transformers/transformReservedWord.ts
 var reservedWords = [
   "abstract",
   "arguments",
@@ -481,13 +388,16 @@ function transformReservedWord(word) {
   return word;
 }
 
-// src/utils/transformers/trim.ts
+// src/transformers/trim.ts
 function trim(text) {
   return text.replaceAll(/\n/g, "").trim();
 }
+function trimExtName(text) {
+  return text.replace(/\.[^/.]+$/, "");
+}
 
-// src/utils/transformers/index.ts
-var transformers = {
+// src/transformers/index.ts
+var transformers_default = {
   combineCodes,
   escape,
   jsStringEscape,
@@ -496,10 +406,127 @@ var transformers = {
   nameSorter,
   searchAndReplace,
   trim,
+  trimExtName,
   JSDoc: {
     createJSDocBlockText
+  },
+  camelCase,
+  pascalCase
+};
+
+// src/utils/URLPath.ts
+var URLPath = class {
+  constructor(path5) {
+    this.path = path5;
+    return this;
+  }
+  /**
+   * Convert Swagger path to URLPath(syntax of Express)
+   * @example /pet/{petId} => /pet/:petId
+   */
+  get URL() {
+    return this.toURLPath();
+  }
+  get isURL() {
+    try {
+      const url = new URL(this.path);
+      if (url?.href) {
+        return true;
+      }
+    } catch (error) {
+      return false;
+    }
+    return false;
+  }
+  /**
+   * Convert Swagger path to template literals/ template strings(camelcase)
+   * @example /pet/{petId} => `/pet/${petId}`
+   * @example /account/monetary-accountID => `/account/${monetaryAccountId}`
+   * @example /account/userID => `/account/${userId}`
+   */
+  get template() {
+    return this.toTemplateString();
+  }
+  get object() {
+    return this.toObject();
+  }
+  get params() {
+    return this.getParams();
+  }
+  toObject({ type = "path", replacer, stringify } = {}) {
+    const object = {
+      url: type === "path" ? this.toURLPath() : this.toTemplateString(replacer),
+      params: this.getParams()
+    };
+    if (stringify) {
+      if (type === "template") {
+        return JSON.stringify(object).replaceAll("'", "").replaceAll(`"`, "");
+      }
+      if (object.params) {
+        return `{ url: '${object.url}', params: ${JSON.stringify(object.params).replaceAll("'", "").replaceAll(`"`, "")} }`;
+      }
+      return `{ url: '${object.url}' }`;
+    }
+    return object;
+  }
+  /**
+   * Convert Swagger path to template literals/ template strings(camelcase)
+   * @example /pet/{petId} => `/pet/${petId}`
+   * @example /account/monetary-accountID => `/account/${monetaryAccountId}`
+   * @example /account/userID => `/account/${userId}`
+   */
+  toTemplateString(replacer) {
+    const regex = /{(\w|-)*}/g;
+    const found = this.path.match(regex);
+    let newPath = this.path.replaceAll("{", "${");
+    if (found) {
+      newPath = found.reduce((prev, curr) => {
+        const pathParam = replacer ? replacer(transformers_default.camelCase(curr)) : transformers_default.camelCase(curr);
+        const replacement = `\${${pathParam}}`;
+        return prev.replace(curr, replacement);
+      }, this.path);
+    }
+    return `\`${newPath}\``;
+  }
+  getParams(replacer) {
+    const regex = /{(\w|-)*}/g;
+    const found = this.path.match(regex);
+    if (!found) {
+      return void 0;
+    }
+    const params = {};
+    found.forEach((item) => {
+      item = item.replaceAll("{", "").replaceAll("}", "");
+      const pathParam = replacer ? replacer(transformers_default.camelCase(item)) : transformers_default.camelCase(item);
+      params[pathParam] = pathParam;
+    }, this.path);
+    return params;
+  }
+  /**
+   * Convert Swagger path to URLPath(syntax of Express)
+   * @example /pet/{petId} => /pet/:petId
+   */
+  toURLPath() {
+    return this.path.replaceAll("{", ":").replaceAll("}", "");
   }
 };
+
+// src/config.ts
+function defineConfig(options) {
+  return options;
+}
+function isInputPath(result) {
+  return !!result && "path" in result;
+}
+
+// src/utils/timeout.ts
+async function timeout(ms) {
+  return new Promise((resolve2) => {
+    setTimeout(() => {
+      resolve2(true);
+    }, ms);
+  });
+}
 async function saveCreateDirectory(path5) {
   const passedPath = path4.dirname(path4.resolve(path5));
   await fs2__default.default.mkdir(passedPath, { recursive: true });
@@ -730,7 +757,7 @@ _options = new WeakMap();
 exports.KubbFile = void 0;
 ((KubbFile2) => {
 })(exports.KubbFile || (exports.KubbFile = {}));
-var _cache, _task, _isWriting, _timeout, _queue, _validate, validate_fn, _add, add_fn, _addOrAppend, addOrAppend_fn;
+var _cache, _task, _isWriting, _timeout, _queue, _validate, _add, add_fn, _addOrAppend, addOrAppend_fn;
 var _FileManager = class _FileManager {
   constructor(options) {
     __privateAdd(this, _validate);
@@ -763,7 +790,6 @@ var _FileManager = class _FileManager {
   }
   async add(...files) {
     const promises = files.map((file) => {
-      __privateMethod(this, _validate, validate_fn).call(this, file);
       if (file.override) {
         return __privateMethod(this, _add, add_fn).call(this, file);
       }
@@ -827,9 +853,22 @@ var _FileManager = class _FileManager {
     }
     const exports = file.exports ? combineExports(file.exports) : [];
     const imports = file.imports ? combineImports(file.imports, exports, file.source) : [];
-    const importNodes = imports.map((item) => factory__namespace.createImportDeclaration({ name: item.name, path: item.path, isTypeOnly: item.isTypeOnly }));
+    const importNodes = imports.filter((item) => {
+      return item.path !== transformers_default.trimExtName(file.path);
+    }).map((item) => {
+      return factory__namespace.createImportDeclaration({
+        name: item.name,
+        path: item.root ? getRelativePath(item.root, item.path) : item.path,
+        isTypeOnly: item.isTypeOnly
+      });
+    });
     const exportNodes = exports.map(
-      (item) => factory__namespace.createExportDeclaration({ name: item.name, path: item.path, isTypeOnly: item.isTypeOnly, asAlias: item.asAlias })
+      (item) => factory__namespace.createExportDeclaration({
+        name: item.name,
+        path: item.path,
+        isTypeOnly: item.isTypeOnly,
+        asAlias: item.asAlias
+      })
     );
     return [parser.print([...importNodes, ...exportNodes]), getEnvSource(file.source, file.env)].join("\n");
   }
@@ -880,14 +919,6 @@ _isWriting = new WeakMap();
 _timeout = new WeakMap();
 _queue = new WeakMap();
 _validate = new WeakSet();
-validate_fn = function(file) {
-  if (!file.validate) {
-    return;
-  }
-  if (!file.path.toLowerCase().endsWith(file.baseName.toLowerCase())) {
-    throw new Error(`${file.path} should end with the baseName ${file.baseName}`);
-  }
-};
 _add = new WeakSet();
 add_fn = async function(file) {
   const controller = new AbortController();
@@ -964,7 +995,7 @@ function combineImports(imports, exports, source) {
       return checker(importName) || exports.some(({ name: name2 }) => Array.isArray(name2) ? name2.some(checker) : checker(name2));
     };
     if (Array.isArray(name)) {
-      name = name.filter((item) => hasImportInSource(item));
+      name = name.filter((item) => typeof item === "string" ? hasImportInSource(item) : hasImportInSource(item.propertyName));
     }
     const prevByPath = prev.findLast((imp) => imp.path === curr.path && imp.isTypeOnly === curr.isTypeOnly);
     const uniquePrev = prev.findLast((imp) => imp.path === curr.path && isEqual__default.default(imp.name, name) && imp.isTypeOnly === curr.isTypeOnly);
@@ -1010,8 +1041,8 @@ function getEnvSource(source, env) {
       throw new TypeError(`Environment should be in upperCase for ${key}`);
     }
     if (typeof replaceBy === "string") {
-      prev = transformers.searchAndReplace({ text: prev.replaceAll(`process.env.${key}`, replaceBy), replaceBy, prefix: "process.env", key });
-      prev = transformers.searchAndReplace({ text: prev.replaceAll(new RegExp(`(declare const).*
+      prev = transformers_default.searchAndReplace({ text: prev.replaceAll(`process.env.${key}`, replaceBy), replaceBy, prefix: "process.env", key });
+      prev = transformers_default.searchAndReplace({ text: prev.replaceAll(new RegExp(`(declare const).*
 `, "ig"), ""), replaceBy, key });
     }
     return prev;
@@ -1305,11 +1336,14 @@ var PluginManager = class {
           hookName: "resolvePath",
           parameters: [params.baseName, params.directory, params.options]
         });
-        if (paths && paths?.length > 1) {
-          throw new Error(
+        if (paths && paths?.length > 1 && this.logger.logLevel === LogLevel.debug) {
+          this.logger.warn(
             `Cannot return a path where the 'pluginKey' ${params.pluginKey ? JSON.stringify(params.pluginKey) : '"'} is not unique enough
 
-Paths: ${JSON.stringify(paths, void 0, 2)}`
+Paths: ${JSON.stringify(paths, void 0, 2)}
+
+Falling back on the first item.
+`
           );
         }
         return paths?.at(0);
@@ -1326,11 +1360,14 @@ Paths: ${JSON.stringify(paths, void 0, 2)}`
           hookName: "resolveName",
           parameters: [params.name, params.type]
         });
-        if (names && names?.length > 1) {
-          throw new Error(
+        if (names && names?.length > 1 && this.logger.logLevel === LogLevel.debug) {
+          this.logger.warn(
             `Cannot return a name where the 'pluginKey' ${params.pluginKey ? JSON.stringify(params.pluginKey) : '"'} is not unique enough
 
-Names: ${JSON.stringify(names, void 0, 2)}`
+Names: ${JSON.stringify(names, void 0, 2)}
+
+Falling back on the first item.
+`
           );
         }
         return transformReservedWord(names?.at(0) || params.name);
@@ -1525,7 +1562,7 @@ Names: ${JSON.stringify(names, void 0, 2)}`
     });
     if (!pluginByPluginName?.length) {
       const corePlugin = plugins.find((plugin) => plugin.name === "core" && plugin[hookName]);
-      if (this.logger.logLevel === "info") {
+      if (this.logger.logLevel === LogLevel.debug) {
         if (corePlugin) {
           this.logger.warn(`No hook '${hookName}' for pluginKey '${JSON.stringify(pluginKey)}' found, falling back on the '@kubb/core' plugin`);
         } else {
@@ -1563,7 +1600,7 @@ _getSortedPlugins = new WeakSet();
 getSortedPlugins_fn = function(hookName) {
   const plugins = [...this.plugins].filter((plugin) => plugin.name !== "core");
   if (hookName) {
-    if (this.logger.logLevel === "info") {
+    if (this.logger.logLevel === LogLevel.info) {
       const containsHookName = plugins.some((item) => item[hookName]);
       if (!containsHookName) {
         this.logger.warn(`No hook ${hookName} found`);
@@ -1766,7 +1803,7 @@ async function setup(options) {
       if (logger.logLevel === LogLevel.info) {
         logger.spinner.start(`\u{1F4BE} Writing`);
       }
-      if (logger.logLevel === "debug") {
+      if (logger.logLevel === LogLevel.debug) {
         logger.info(`PluginKey ${pc3__default.default.dim(JSON.stringify(plugin.key))} 
 with source
 
@@ -2257,10 +2294,6 @@ match_fn = function(packageJSON, dependency) {
 __privateAdd(_PackageManager, _cache2, {});
 var PackageManager = _PackageManager;
 
-// src/SchemaGenerator.ts
-var SchemaGenerator = class extends Generator {
-};
-
 // src/index.ts
 var src_default = build;
 
@@ -2269,7 +2302,6 @@ exports.Generator = Generator;
 exports.PackageManager = PackageManager;
 exports.PluginManager = PluginManager;
 exports.PromiseManager = PromiseManager;
-exports.SchemaGenerator = SchemaGenerator;
 exports.ValidationPluginError = ValidationPluginError;
 exports.Warning = Warning;
 exports.build = build;