@kubb/core 2.0.0-alpha.3 → 2.0.0-alpha.4

package/dist/index.d.cts

@@ -148,42 +148,6 @@ declare class FileManager {
 declare function combineExports(exports: Array<KubbFile.Export>): Array<KubbFile.Export>;
 declare function combineImports(imports: Array<KubbFile.Import>, exports: Array<KubbFile.Export>, source?: string): Array<KubbFile.Import>;
 
-declare class PluginError extends Error {
-    pluginManager: PluginManager;
-    cause: Error;
-    constructor(message: string, options: {
-        cause: Error;
-        pluginManager: PluginManager;
-    });
-}
-declare class ParallelPluginError extends Error {
-    errors: PluginError[];
-    pluginManager: PluginManager;
-    constructor(message: string, options: {
-        cause?: Error;
-        errors: PluginError[];
-        pluginManager: PluginManager;
-    });
-    findError<T extends Error = Error>(searchError: T | undefined): T | undefined;
-}
-declare class SummaryError extends Error {
-    summary: string[];
-    constructor(message: string, options: {
-        cause: Error;
-        summary?: string[];
-    });
-}
-/**
- * Behaves as an Error to log a warning in the console(still stops the execution)
- */
-declare class Warning extends Error {
-    constructor(message?: string, options?: {
-        cause: Error;
-    });
-}
-declare class ValidationPluginError extends Error {
-}
-
 declare const LogLevel: {
     readonly silent: "silent";
     readonly info: "info";
@@ -237,7 +201,7 @@ type Options$1 = {
 type Events = {
     execute: [executer: Executer];
     executed: [executer: Executer];
-    error: [pluginError: PluginError];
+    error: [error: Error];
 };
 declare class PluginManager {
     #private;
@@ -422,6 +386,10 @@ type CLIOptions = {
 type BuildOutput = {
     files: FileManager['files'];
     pluginManager: PluginManager;
+    /**
+     * Only for safeBuild
+     */
+    error?: Error;
 };
 type KubbPluginKind = 'schema' | 'controller';
 type KubbUnionPlugins = PluginUnion;
@@ -622,6 +590,7 @@ type BuildOptions = {
     logger?: Logger;
 };
 declare function build(options: BuildOptions): Promise<BuildOutput>;
+declare function safeBuild(options: BuildOptions): Promise<BuildOutput>;
 
 /**
  * Type helper to make it easier to use kubb.config.js
@@ -633,6 +602,17 @@ declare function defineConfig(options: PossiblePromise<KubbUserConfig | Array<Ku
 cliOptions: CLIOptions) => PossiblePromise<KubbUserConfig | Array<KubbUserConfig>>)): typeof options;
 declare function isInputPath(result: KubbConfig | undefined): result is KubbConfig<InputPath>;
 
+/**
+ * Behaves as an Error to log a warning in the console(still stops the execution)
+ */
+declare class Warning extends Error {
+    constructor(message?: string, options?: {
+        cause: Error;
+    });
+}
+declare class ValidationPluginError extends Error {
+}
+
 /**
  * Abstract class that contains the building blocks for plugins to create their own Generator
  * @link idea based on https://github.com/colinhacks/zod/blob/master/src/types.ts#L137
@@ -707,4 +687,4 @@ type OptionsOfPlugin<K extends keyof Plugins> = Plugins[K]['options'];
 type PluginUnion = TupleToUnion<ObjValueTuple<OptionsPlugins>>;
 type Plugin = keyof Plugins;
 
-export { AppMeta, BuildOutput, CLIOptions, FileManager, Generator, GetPluginFactoryOptions, GreaterThan, InputData, InputPath, KubbConfig, KubbFile, KubbObjectPlugin, KubbPlugin, KubbPluginKind, KubbUnionPlugins, KubbUserConfig, KubbUserPlugin, ObjValueTuple, OptionsOfPlugin, OptionsPlugins, PackageManager, ParallelPluginError, Plugin, PluginCache, PluginContext, PluginError, PluginFactoryOptions, PluginLifecycle, PluginLifecycleHooks, PluginManager, PluginParameter, PluginUnion, Plugins, PossiblePromise, Prettify, PromiseManager, ResolveNameParams, ResolvePathParams, SchemaGenerator, SummaryError, TransformResult, TupleToUnion, ValidationPluginError, Warning, _Register, build, combineExports, combineImports, createPlugin, build as default, defineConfig, isInputPath, pluginName as name, pluginName };
+export { AppMeta, BuildOutput, CLIOptions, FileManager, Generator, GetPluginFactoryOptions, GreaterThan, InputData, InputPath, KubbConfig, KubbFile, KubbObjectPlugin, KubbPlugin, KubbPluginKind, KubbUnionPlugins, KubbUserConfig, KubbUserPlugin, ObjValueTuple, OptionsOfPlugin, OptionsPlugins, PackageManager, Plugin, PluginCache, PluginContext, PluginFactoryOptions, PluginLifecycle, PluginLifecycleHooks, PluginManager, PluginParameter, PluginUnion, Plugins, PossiblePromise, Prettify, PromiseManager, ResolveNameParams, ResolvePathParams, SchemaGenerator, TransformResult, TupleToUnion, ValidationPluginError, Warning, _Register, build, combineExports, combineImports, createPlugin, build as default, defineConfig, isInputPath, pluginName as name, pluginName, safeBuild };

package/dist/index.d.ts

@@ -148,42 +148,6 @@ declare class FileManager {
 declare function combineExports(exports: Array<KubbFile.Export>): Array<KubbFile.Export>;
 declare function combineImports(imports: Array<KubbFile.Import>, exports: Array<KubbFile.Export>, source?: string): Array<KubbFile.Import>;
 
-declare class PluginError extends Error {
-    pluginManager: PluginManager;
-    cause: Error;
-    constructor(message: string, options: {
-        cause: Error;
-        pluginManager: PluginManager;
-    });
-}
-declare class ParallelPluginError extends Error {
-    errors: PluginError[];
-    pluginManager: PluginManager;
-    constructor(message: string, options: {
-        cause?: Error;
-        errors: PluginError[];
-        pluginManager: PluginManager;
-    });
-    findError<T extends Error = Error>(searchError: T | undefined): T | undefined;
-}
-declare class SummaryError extends Error {
-    summary: string[];
-    constructor(message: string, options: {
-        cause: Error;
-        summary?: string[];
-    });
-}
-/**
- * Behaves as an Error to log a warning in the console(still stops the execution)
- */
-declare class Warning extends Error {
-    constructor(message?: string, options?: {
-        cause: Error;
-    });
-}
-declare class ValidationPluginError extends Error {
-}
-
 declare const LogLevel: {
     readonly silent: "silent";
     readonly info: "info";
@@ -237,7 +201,7 @@ type Options$1 = {
 type Events = {
     execute: [executer: Executer];
     executed: [executer: Executer];
-    error: [pluginError: PluginError];
+    error: [error: Error];
 };
 declare class PluginManager {
     #private;
@@ -422,6 +386,10 @@ type CLIOptions = {
 type BuildOutput = {
     files: FileManager['files'];
     pluginManager: PluginManager;
+    /**
+     * Only for safeBuild
+     */
+    error?: Error;
 };
 type KubbPluginKind = 'schema' | 'controller';
 type KubbUnionPlugins = PluginUnion;
@@ -622,6 +590,7 @@ type BuildOptions = {
     logger?: Logger;
 };
 declare function build(options: BuildOptions): Promise<BuildOutput>;
+declare function safeBuild(options: BuildOptions): Promise<BuildOutput>;
 
 /**
  * Type helper to make it easier to use kubb.config.js
@@ -633,6 +602,17 @@ declare function defineConfig(options: PossiblePromise<KubbUserConfig | Array<Ku
 cliOptions: CLIOptions) => PossiblePromise<KubbUserConfig | Array<KubbUserConfig>>)): typeof options;
 declare function isInputPath(result: KubbConfig | undefined): result is KubbConfig<InputPath>;
 
+/**
+ * Behaves as an Error to log a warning in the console(still stops the execution)
+ */
+declare class Warning extends Error {
+    constructor(message?: string, options?: {
+        cause: Error;
+    });
+}
+declare class ValidationPluginError extends Error {
+}
+
 /**
  * Abstract class that contains the building blocks for plugins to create their own Generator
  * @link idea based on https://github.com/colinhacks/zod/blob/master/src/types.ts#L137
@@ -707,4 +687,4 @@ type OptionsOfPlugin<K extends keyof Plugins> = Plugins[K]['options'];
 type PluginUnion = TupleToUnion<ObjValueTuple<OptionsPlugins>>;
 type Plugin = keyof Plugins;
 
-export { AppMeta, BuildOutput, CLIOptions, FileManager, Generator, GetPluginFactoryOptions, GreaterThan, InputData, InputPath, KubbConfig, KubbFile, KubbObjectPlugin, KubbPlugin, KubbPluginKind, KubbUnionPlugins, KubbUserConfig, KubbUserPlugin, ObjValueTuple, OptionsOfPlugin, OptionsPlugins, PackageManager, ParallelPluginError, Plugin, PluginCache, PluginContext, PluginError, PluginFactoryOptions, PluginLifecycle, PluginLifecycleHooks, PluginManager, PluginParameter, PluginUnion, Plugins, PossiblePromise, Prettify, PromiseManager, ResolveNameParams, ResolvePathParams, SchemaGenerator, SummaryError, TransformResult, TupleToUnion, ValidationPluginError, Warning, _Register, build, combineExports, combineImports, createPlugin, build as default, defineConfig, isInputPath, pluginName as name, pluginName };
+export { AppMeta, BuildOutput, CLIOptions, FileManager, Generator, GetPluginFactoryOptions, GreaterThan, InputData, InputPath, KubbConfig, KubbFile, KubbObjectPlugin, KubbPlugin, KubbPluginKind, KubbUnionPlugins, KubbUserConfig, KubbUserPlugin, ObjValueTuple, OptionsOfPlugin, OptionsPlugins, PackageManager, Plugin, PluginCache, PluginContext, PluginFactoryOptions, PluginLifecycle, PluginLifecycleHooks, PluginManager, PluginParameter, PluginUnion, Plugins, PossiblePromise, Prettify, PromiseManager, ResolveNameParams, ResolvePathParams, SchemaGenerator, TransformResult, TupleToUnion, ValidationPluginError, Warning, _Register, build, combineExports, combineImports, createPlugin, build as default, defineConfig, isInputPath, pluginName as name, pluginName, safeBuild };

package/dist/index.js

@@ -270,14 +270,19 @@ function combineCodes(codes) {
 }
 
 // src/utils/transformers/createJSDocBlockText.ts
-function createJSDocBlockText({ comments }) {
+function createJSDocBlockText({ comments, newLine }) {
   const filteredComments = comments.filter(Boolean);
   if (!filteredComments.length) {
     return "";
   }
-  return `/**
+  const source = `/**
  * ${filteredComments.join("\n * ")}
  */`;
+  if (newLine) {
+    return `${source}
+`;
+  }
+  return source;
 }
 
 // src/utils/transformers/escape.ts
@@ -621,12 +626,12 @@ var BarrelManager = class {
       if (currentTree.children?.length > 1) {
         const indexPath = path.resolve(currentTree.data.path, "index.ts");
         const exports = currentTree.children.filter(Boolean).map((file) => {
-          const importPath = file.data.type === "directory" ? `./${file.data.name}` : `./${file.data.name.replace(/\.[^.]*$/, "")}`;
-          if (importPath.includes("index") && indexPath.includes("index")) {
+          const importPath = file.data.type === "directory" ? `./${file.data.name}/index` : `./${file.data.name.replace(/\.[^.]*$/, "")}`;
+          if (importPath.includes("index") && file.data.type === "file") {
             return void 0;
           }
           return {
-            path: includeExt ? file.data.type === "directory" ? `${importPath}/index${extName}` : `${importPath}${extName}` : importPath,
+            path: includeExt ? `${importPath}${extName}` : importPath,
             isTypeOnly
           };
         }).filter(Boolean);
@@ -641,10 +646,10 @@ var BarrelManager = class {
       } else {
         currentTree.children?.forEach((child) => {
           const indexPath = path.resolve(currentTree.data.path, "index.ts");
-          const importPath = child.data.type === "directory" ? `./${child.data.name}` : `./${child.data.name.replace(/\.[^.]*$/, "")}`;
+          const importPath = child.data.type === "directory" ? `./${child.data.name}/index` : `./${child.data.name.replace(/\.[^.]*$/, "")}`;
           const exports = [
             {
-              path: includeExt ? child.data.type === "directory" ? `${importPath}/index${extName}` : `${importPath}${extName}` : importPath,
+              path: includeExt ? `${importPath}${extName}` : importPath,
               isTypeOnly
             }
           ];
@@ -1064,44 +1069,6 @@ function setUniqueName(originalName, data) {
 }
 
 // src/errors.ts
-var PluginError = class extends Error {
-  constructor(message, options) {
-    super(message, { cause: options.cause });
-    this.name = "PluginError";
-    this.cause = options.cause;
-    this.pluginManager = options.pluginManager;
-  }
-};
-var ParallelPluginError = class extends Error {
-  constructor(message, options) {
-    super(message, { cause: options.cause });
-    this.errors = [];
-    this.name = "ParallelPluginError";
-    this.errors = options.errors;
-    this.pluginManager = options.pluginManager;
-  }
-  findError(searchError) {
-    if (!searchError) {
-      return void 0;
-    }
-    return this.errors.find((error) => {
-      if (error.cause) {
-        if (error.cause.name == searchError.name) {
-          return true;
-        }
-        return !!this.findError(error.cause);
-      }
-      return error.name === searchError.name;
-    })?.cause;
-  }
-};
-var SummaryError = class extends Error {
-  constructor(message, options) {
-    super(message, { cause: options.cause });
-    this.name = "SummaryError";
-    this.summary = options.summary || [];
-  }
-};
 var Warning = class extends Error {
   constructor(message, options) {
     super(message, { cause: options?.cause });
@@ -1446,15 +1413,12 @@ Names: ${JSON.stringify(names, void 0, 2)}`
       }
     }
     const results = await Promise.allSettled(parallelPromises);
-    const errors = results.map((result) => {
-      if (isPromiseRejectedResult(result) && result.reason instanceof PluginError) {
-        return result.reason;
+    results.forEach((result, index) => {
+      if (isPromiseRejectedResult(result)) {
+        const plugin = __privateMethod(this, _getSortedPlugins, getSortedPlugins_fn).call(this)[index];
+        __privateMethod(this, _catcher, catcher_fn).call(this, result.reason, plugin, hookName);
       }
-      return void 0;
-    }).filter(Boolean);
-    if (errors.length) {
-      throw new ParallelPluginError("Error", { errors, pluginManager: this });
-    }
+    });
     return results.filter((result) => result.status === "fulfilled").map((result) => result.value);
   }
   /**
@@ -1588,11 +1552,6 @@ execute_fn = function({
     return hook;
   }).then((result) => {
     output = result;
-    return result;
-  }).catch((e) => {
-    __privateMethod(this, _catcher, catcher_fn).call(this, e, plugin, hookName);
-    return null;
-  }).finally(() => {
     __privateMethod(this, _addExecutedToCallStack, addExecutedToCallStack_fn).call(this, {
       parameters,
       output,
@@ -1600,6 +1559,10 @@ execute_fn = function({
       hookName,
       plugin
     });
+    return result;
+  }).catch((e) => {
+    __privateMethod(this, _catcher, catcher_fn).call(this, e, plugin, hookName);
+    return null;
   });
   return task;
 };
@@ -1623,11 +1586,6 @@ executeSync_fn = function({
       return fn;
     }
     output = hook;
-    return hook;
-  } catch (e) {
-    __privateMethod(this, _catcher, catcher_fn).call(this, e, plugin, hookName);
-    return null;
-  } finally {
     __privateMethod(this, _addExecutedToCallStack, addExecutedToCallStack_fn).call(this, {
       parameters,
       output,
@@ -1635,15 +1593,18 @@ executeSync_fn = function({
       hookName,
       plugin
     });
+    return hook;
+  } catch (e) {
+    __privateMethod(this, _catcher, catcher_fn).call(this, e, plugin, hookName);
+    return null;
   }
 };
 _catcher = new WeakSet();
 catcher_fn = function(e, plugin, hookName) {
-  const text = `${e.message} (plugin: ${plugin.name}, hook: ${hookName})
+  const text = `${e.message} (plugin: ${plugin?.name || "unknown"}, hook: ${hookName || "unknown"})
 `;
-  const pluginError = new PluginError(text, { cause: e, pluginManager: this });
-  this.eventEmitter.emit("error", pluginError);
-  throw pluginError;
+  this.logger.error(text);
+  this.eventEmitter.emit("error", e);
 };
 _parse = new WeakSet();
 parse_fn = function(plugin, pluginManager, context) {
@@ -1676,7 +1637,7 @@ parse_fn = function(plugin, pluginManager, context) {
 async function transformReducer(_previousCode, result, _plugin) {
   return result;
 }
-async function build(options) {
+async function setup(options) {
   const { config, logger = createLogger({ logLevel: LogLevel.silent }) } = options;
   try {
     if (isInputPath(config) && !new URLPath(config.input.path).isURL) {
@@ -1730,7 +1691,6 @@ async function build(options) {
     }
   };
   const pluginManager = new PluginManager(config, { logger, task: queueTask, writeTimeout: 0 });
-  const { plugins, fileManager } = pluginManager;
   pluginManager.on("execute", (executer) => {
     const { hookName, parameters, plugin } = executer;
     if (hookName === "writeFile" && logger.spinner) {
@@ -1768,13 +1728,18 @@ ${code}`);
       console.log(logs.join("\n"));
     }
   });
+  return pluginManager;
+}
+async function build(options) {
+  const pluginManager = await setup(options);
+  const { fileManager, logger } = pluginManager;
   await pluginManager.hookParallel({
     hookName: "validate",
-    parameters: [plugins]
+    parameters: [pluginManager.plugins]
   });
   await pluginManager.hookParallel({
     hookName: "buildStart",
-    parameters: [config]
+    parameters: [options.config]
   });
   await pluginManager.hookParallel({ hookName: "buildEnd" });
   if (!fileManager.isExecuting && logger.spinner) {
@@ -1783,6 +1748,28 @@ ${code}`);
   }
   return { files: fileManager.files.map((file) => ({ ...file, source: FileManager.getSource(file) })), pluginManager };
 }
+async function safeBuild(options) {
+  const pluginManager = await setup(options);
+  const { fileManager, logger } = pluginManager;
+  try {
+    await pluginManager.hookParallel({
+      hookName: "validate",
+      parameters: [pluginManager.plugins]
+    });
+    await pluginManager.hookParallel({
+      hookName: "buildStart",
+      parameters: [options.config]
+    });
+    await pluginManager.hookParallel({ hookName: "buildEnd" });
+    if (!fileManager.isExecuting && logger.spinner) {
+      logger.spinner.suffixText = "";
+      logger.spinner.succeed(`\u{1F4BE} Writing completed`);
+    }
+  } catch (e) {
+    return { files: fileManager.files.map((file) => ({ ...file, source: FileManager.getSource(file) })), pluginManager, error: e };
+  }
+  return { files: fileManager.files.map((file) => ({ ...file, source: FileManager.getSource(file) })), pluginManager };
+}
 
 // src/Generator.ts
 var _options3, _context;
@@ -1899,6 +1886,9 @@ var _PackageManager = class _PackageManager {
     if (!packageVersion) {
       return false;
     }
+    if (packageVersion === version) {
+      return true;
+    }
     const semVer = coerce(packageVersion);
     if (!semVer) {
       throw new Error(`${packageVersion} is not valid`);
@@ -1930,6 +1920,6 @@ var SchemaGenerator = class extends Generator {
 // src/index.ts
 var src_default = build;
 
-export { FileManager, Generator, KubbFile, PackageManager, ParallelPluginError, PluginError, PluginManager, PromiseManager, SchemaGenerator, SummaryError, ValidationPluginError, Warning, build, combineExports, combineImports, createPlugin, src_default as default, defineConfig, isInputPath, pluginName as name, pluginName };
+export { FileManager, Generator, KubbFile, PackageManager, PluginManager, PromiseManager, SchemaGenerator, ValidationPluginError, Warning, build, combineExports, combineImports, createPlugin, src_default as default, defineConfig, isInputPath, pluginName as name, pluginName, safeBuild };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map