@kubb/core 1.1.5 → 1.1.6

package/dist/index.cjs

@@ -523,6 +523,13 @@ var FileManager = class {
     });
     return files;
   }
+  get cachedFiles() {
+    const files = [];
+    this.cache.forEach((item) => {
+      files.push(item);
+    });
+    return files;
+  }
   async add(file) {
     const cacheItem = { id: crypto__default.default.randomUUID(), file, status: "new" };
     this.cache.set(cacheItem.id, cacheItem);
@@ -691,9 +698,9 @@ var PluginManager = class {
     for (const plugin of this.getSortedPlugins(hookName)) {
       if (skipped && skipped.has(plugin))
         continue;
-      promise = promise.then(async (result) => {
-        if (result != null) {
-          return result;
+      promise = promise.then(async (parseResult) => {
+        if (parseResult?.result != null) {
+          return parseResult;
         }
         const value = await this.execute({
           strategy: "hookFirst",
@@ -718,45 +725,38 @@ var PluginManager = class {
     parameters,
     skipped
   }) {
-    let result = null;
+    let parseResult = null;
     for (const plugin of this.getSortedPlugins(hookName)) {
       if (skipped && skipped.has(plugin))
         continue;
-      result = {
+      parseResult = {
         result: this.executeSync({
           strategy: "hookFirst",
           hookName,
           parameters,
           plugin
-        })
+        }),
+        plugin
       };
-      if (result != null) {
+      if (parseResult?.result != null) {
         break;
       }
     }
-    return result;
+    return parseResult;
   }
-  // parallel
+  /**
+   *
+   * Parallel, runs all plugins
+   */
   async hookParallel({
     hookName,
     parameters
   }) {
     const parallelPromises = [];
     for (const plugin of this.getSortedPlugins(hookName)) {
-      if (plugin[hookName]?.sequential) {
-        await Promise.all(parallelPromises);
-        parallelPromises.length = 0;
-        await this.execute({
-          strategy: "hookParallel",
-          hookName,
-          parameters,
-          plugin
-        });
-      } else {
-        const promise = this.execute({ strategy: "hookParallel", hookName, parameters, plugin });
-        if (promise) {
-          parallelPromises.push(promise);
-        }
+      const promise = this.execute({ strategy: "hookParallel", hookName, parameters, plugin });
+      if (promise) {
+        parallelPromises.push(promise);
       }
     }
     const results = await Promise.allSettled(parallelPromises);
@@ -766,7 +766,10 @@ var PluginManager = class {
     }
     return results.filter((result) => result.status === "fulfilled").map((result) => result.value);
   }
-  // chains, reduces returned value, handling the reduced value as the first hook argument
+  /**
+   *
+   * Chains, reduces returned value, handling the reduced value as the first hook argument
+   */
   hookReduceArg0({
     hookName,
     parameters,
@@ -775,11 +778,11 @@ var PluginManager = class {
     const [argument0, ...rest] = parameters;
     let promise = Promise.resolve(argument0);
     for (const plugin of this.getSortedPlugins(hookName)) {
-      promise = promise.then((argument02) => {
+      promise = promise.then((arg0) => {
         const value = this.execute({
           strategy: "hookReduceArg0",
           hookName,
-          parameters: [argument02, ...rest],
+          parameters: [arg0, ...rest],
           plugin
         });
         return value;
@@ -787,7 +790,9 @@ var PluginManager = class {
     }
     return promise;
   }
-  // chains
+  /**
+   * Chains plugins
+   */
   hookSeq({ hookName, parameters }) {
     let promise = Promise.resolve();
     for (const plugin of this.getSortedPlugins(hookName)) {
@@ -1067,9 +1072,6 @@ ${source}`;
 
 // src/build.ts
 async function transformReducer(_previousCode, result, _plugin) {
-  if (result === null) {
-    return null;
-  }
   return result;
 }
 async function build(options) {

package/dist/index.d.ts

@@ -124,11 +124,12 @@ declare class FileManager {
     private queue?;
     constructor(options?: {
         queue: Queue;
-        task: QueueTask<unknown>;
+        task?: QueueTask<unknown>;
     });
     private getCache;
     getCacheByPath(path: string | undefined): CacheStore | undefined;
     get files(): File[];
+    get cachedFiles(): CacheStore[];
     add(file: File): Promise<File>;
     addOrAppend(file: File): Promise<File>;
     setStatus(id: UUID, status: Status): void;
@@ -210,21 +211,32 @@ declare class PluginManager {
         parameters: Parameters<PluginLifecycle[H]>;
         skipped?: ReadonlySet<KubbPlugin> | null;
     }): SafeParseResult<H>;
+    /**
+     *
+     * Parallel, runs all plugins
+     */
     hookParallel<H extends PluginLifecycleHooks, TOuput = void>({ hookName, parameters, }: {
         hookName: H;
         parameters?: Parameters<PluginLifecycle[H]> | undefined;
     }): Promise<Awaited<TOuput>[]>;
+    /**
+     *
+     * Chains, reduces returned value, handling the reduced value as the first hook argument
+     */
     hookReduceArg0<H extends PluginLifecycleHooks>({ hookName, parameters, reduce, }: {
         hookName: H;
         parameters: Parameters<PluginLifecycle[H]>;
         reduce: (reduction: Argument0<H>, result: ReturnType<ParseResult<H>>, plugin: KubbPlugin) => MaybePromise<Argument0<H> | null>;
     }): Promise<Argument0<H>>;
+    /**
+     * Chains plugins
+     */
     hookSeq<H extends PluginLifecycleHooks>({ hookName, parameters }: {
         hookName: H;
         parameters?: Parameters<PluginLifecycle[H]>;
     }): Promise<void>;
     private getSortedPlugins;
-    private getPlugin;
+    getPlugin(hookName: keyof PluginLifecycle, pluginName: string): KubbPlugin;
     private addExecuter;
     /**
      * Run an async plugin hook and return the result.

package/dist/index.js

@@ -513,6 +513,13 @@ var FileManager = class {
     });
     return files;
   }
+  get cachedFiles() {
+    const files = [];
+    this.cache.forEach((item) => {
+      files.push(item);
+    });
+    return files;
+  }
   async add(file) {
     const cacheItem = { id: crypto.randomUUID(), file, status: "new" };
     this.cache.set(cacheItem.id, cacheItem);
@@ -681,9 +688,9 @@ var PluginManager = class {
     for (const plugin of this.getSortedPlugins(hookName)) {
       if (skipped && skipped.has(plugin))
         continue;
-      promise = promise.then(async (result) => {
-        if (result != null) {
-          return result;
+      promise = promise.then(async (parseResult) => {
+        if (parseResult?.result != null) {
+          return parseResult;
         }
         const value = await this.execute({
           strategy: "hookFirst",
@@ -708,45 +715,38 @@ var PluginManager = class {
     parameters,
     skipped
   }) {
-    let result = null;
+    let parseResult = null;
     for (const plugin of this.getSortedPlugins(hookName)) {
       if (skipped && skipped.has(plugin))
         continue;
-      result = {
+      parseResult = {
         result: this.executeSync({
           strategy: "hookFirst",
           hookName,
           parameters,
           plugin
-        })
+        }),
+        plugin
       };
-      if (result != null) {
+      if (parseResult?.result != null) {
         break;
       }
     }
-    return result;
+    return parseResult;
   }
-  // parallel
+  /**
+   *
+   * Parallel, runs all plugins
+   */
   async hookParallel({
     hookName,
     parameters
   }) {
     const parallelPromises = [];
     for (const plugin of this.getSortedPlugins(hookName)) {
-      if (plugin[hookName]?.sequential) {
-        await Promise.all(parallelPromises);
-        parallelPromises.length = 0;
-        await this.execute({
-          strategy: "hookParallel",
-          hookName,
-          parameters,
-          plugin
-        });
-      } else {
-        const promise = this.execute({ strategy: "hookParallel", hookName, parameters, plugin });
-        if (promise) {
-          parallelPromises.push(promise);
-        }
+      const promise = this.execute({ strategy: "hookParallel", hookName, parameters, plugin });
+      if (promise) {
+        parallelPromises.push(promise);
       }
     }
     const results = await Promise.allSettled(parallelPromises);
@@ -756,7 +756,10 @@ var PluginManager = class {
     }
     return results.filter((result) => result.status === "fulfilled").map((result) => result.value);
   }
-  // chains, reduces returned value, handling the reduced value as the first hook argument
+  /**
+   *
+   * Chains, reduces returned value, handling the reduced value as the first hook argument
+   */
   hookReduceArg0({
     hookName,
     parameters,
@@ -765,11 +768,11 @@ var PluginManager = class {
     const [argument0, ...rest] = parameters;
     let promise = Promise.resolve(argument0);
     for (const plugin of this.getSortedPlugins(hookName)) {
-      promise = promise.then((argument02) => {
+      promise = promise.then((arg0) => {
         const value = this.execute({
           strategy: "hookReduceArg0",
           hookName,
-          parameters: [argument02, ...rest],
+          parameters: [arg0, ...rest],
           plugin
         });
         return value;
@@ -777,7 +780,9 @@ var PluginManager = class {
     }
     return promise;
   }
-  // chains
+  /**
+   * Chains plugins
+   */
   hookSeq({ hookName, parameters }) {
     let promise = Promise.resolve();
     for (const plugin of this.getSortedPlugins(hookName)) {
@@ -1057,9 +1062,6 @@ ${source}`;
 
 // src/build.ts
 async function transformReducer(_previousCode, result, _plugin) {
-  if (result === null) {
-    return null;
-  }
   return result;
 }
 async function build(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/core",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Generator core",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "change-case": "^4.1.2",
     "directory-tree": "^3.5.1",
     "rimraf": "^5.0.1",
-    "@kubb/ts-codegen": "1.1.5"
+    "@kubb/ts-codegen": "1.1.6"
   },
   "devDependencies": {
     "tsup": "^6.7.0",
@@ -55,7 +55,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "engines": {
-    "node": ">=16",
+    "node": ">=18",
     "pnpm": ">=8"
   },
   "scripts": {

package/src/build.ts

@@ -25,9 +25,6 @@ async function transformReducer(
   result: TransformResult | Promise<TransformResult>,
   _plugin: KubbPlugin
 ): Promise<string | null> {
-  if (result === null) {
-    return null
-  }
   return result
 }
 

package/src/managers/fileManager/FileManager.ts

@@ -12,7 +12,7 @@ export class FileManager {
 
   private queue?: Queue
 
-  constructor(options?: { queue: Queue; task: QueueTask<unknown> }) {
+  constructor(options?: { queue: Queue; task?: QueueTask<unknown> }) {
     if (options) {
       this.task = options.task
       this.queue = options.queue
@@ -43,6 +43,15 @@ export class FileManager {
     return files
   }
 
+  get cachedFiles() {
+    const files: CacheStore[] = []
+    this.cache.forEach((item) => {
+      files.push(item)
+    })
+
+    return files
+  }
+
   async add(file: File) {
     const cacheItem = { id: crypto.randomUUID(), file, status: 'new' as Status }
 

package/src/managers/pluginManager/PluginManager.ts

@@ -165,9 +165,9 @@ export class PluginManager {
 
     for (const plugin of this.getSortedPlugins(hookName)) {
       if (skipped && skipped.has(plugin)) continue
-      promise = promise.then(async (result) => {
-        if (result != null) {
-          return result
+      promise = promise.then(async (parseResult) => {
+        if (parseResult?.result != null) {
+          return parseResult
         }
         const value = await this.execute<H>({
           strategy: 'hookFirst',
@@ -179,7 +179,7 @@ export class PluginManager {
         return Promise.resolve({
           plugin,
           result: value,
-        } as typeof result)
+        } as typeof parseResult)
       })
     }
 
@@ -199,28 +199,32 @@ export class PluginManager {
     parameters: Parameters<PluginLifecycle[H]>
     skipped?: ReadonlySet<KubbPlugin> | null
   }): SafeParseResult<H> {
-    let result: SafeParseResult<H> = null as unknown as SafeParseResult<H>
+    let parseResult: SafeParseResult<H> = null as unknown as SafeParseResult<H>
 
     for (const plugin of this.getSortedPlugins(hookName)) {
       if (skipped && skipped.has(plugin)) continue
 
-      result = {
+      parseResult = {
         result: this.executeSync<H>({
           strategy: 'hookFirst',
           hookName,
           parameters,
           plugin,
         }),
+        plugin,
       } as SafeParseResult<H>
 
-      if (result != null) {
+      if (parseResult?.result != null) {
         break
       }
     }
-    return result as SafeParseResult<H>
+    return parseResult as SafeParseResult<H>
   }
 
-  // parallel
+  /**
+   *
+   * Parallel, runs all plugins
+   */
   async hookParallel<H extends PluginLifecycleHooks, TOuput = void>({
     hookName,
     parameters,
@@ -231,21 +235,21 @@ export class PluginManager {
     const parallelPromises: Promise<TOuput>[] = []
 
     for (const plugin of this.getSortedPlugins(hookName)) {
-      if ((plugin[hookName] as { sequential?: boolean })?.sequential) {
-        await Promise.all(parallelPromises)
-        parallelPromises.length = 0
-        await this.execute({
-          strategy: 'hookParallel',
-          hookName,
-          parameters,
-          plugin,
-        })
-      } else {
-        const promise: Promise<TOuput> | null = this.execute({ strategy: 'hookParallel', hookName, parameters, plugin })
-
-        if (promise) {
-          parallelPromises.push(promise)
-        }
+      // TODO implement sequential with `buildStart` as an object({ sequential: boolean; handler: PluginContext["buildStart"] })
+      // if ((plugin[hookName] as { sequential?: boolean })?.sequential) {
+      //   await Promise.all(parallelPromises)
+      //   parallelPromises.length = 0
+      //   await this.execute({
+      //     strategy: 'hookParallel',
+      //     hookName,
+      //     parameters,
+      //     plugin,
+      //   })
+      // }
+      const promise: Promise<TOuput> | null = this.execute({ strategy: 'hookParallel', hookName, parameters, plugin })
+
+      if (promise) {
+        parallelPromises.push(promise)
       }
     }
     const results = await Promise.allSettled(parallelPromises)
@@ -258,7 +262,10 @@ export class PluginManager {
     return results.filter((result) => result.status === 'fulfilled').map((result) => (result as PromiseFulfilledResult<Awaited<TOuput>>).value)
   }
 
-  // chains, reduces returned value, handling the reduced value as the first hook argument
+  /**
+   *
+   * Chains, reduces returned value, handling the reduced value as the first hook argument
+   */
   hookReduceArg0<H extends PluginLifecycleHooks>({
     hookName,
     parameters,
@@ -273,11 +280,11 @@ export class PluginManager {
     let promise: Promise<Argument0<H>> = Promise.resolve(argument0)
     for (const plugin of this.getSortedPlugins(hookName)) {
       promise = promise
-        .then((argument0) => {
+        .then((arg0) => {
           const value = this.execute({
             strategy: 'hookReduceArg0',
             hookName,
-            parameters: [argument0, ...rest] as Parameters<PluginLifecycle[H]>,
+            parameters: [arg0, ...rest] as Parameters<PluginLifecycle[H]>,
             plugin,
           })
           return value
@@ -287,8 +294,9 @@ export class PluginManager {
     return promise
   }
 
-  // chains
-
+  /**
+   * Chains plugins
+   */
   hookSeq<H extends PluginLifecycleHooks>({ hookName, parameters }: { hookName: H; parameters?: Parameters<PluginLifecycle[H]> }) {
     let promise: Promise<void | null> = Promise.resolve()
     for (const plugin of this.getSortedPlugins(hookName)) {
@@ -310,7 +318,7 @@ export class PluginManager {
     return plugins
   }
 
-  private getPlugin(hookName: keyof PluginLifecycle, pluginName: string): KubbPlugin {
+  public getPlugin(hookName: keyof PluginLifecycle, pluginName: string): KubbPlugin {
     const plugins = [...this.plugins]
 
     const pluginByPluginName = plugins.find((item) => item.name === pluginName && item[hookName])