@kubb/core 2.0.0-canary.20231027T203719 → 2.0.0-canary.20231029T125324

package/dist/index.d.cts

@@ -58,6 +58,10 @@ declare namespace KubbFile {
         isTypeOnly?: boolean;
         asAlias?: boolean;
     };
+    const dataTagSymbol: unique symbol;
+    type DataTag<Type, Value> = Type & {
+        [dataTagSymbol]: Value;
+    };
     type UUID = string;
     type Source = string;
     type Extname = '.ts' | '.js' | '.tsx' | '.json' | `.${string}`;
@@ -101,7 +105,7 @@ declare namespace KubbFile {
         env?: NodeJS.ProcessEnv;
         validate?: boolean;
     };
-    type ResolvedFile = KubbFile.File & {
+    type ResolvedFile<TMeta extends FileMetaBase = FileMetaBase, TBaseName extends BaseName = BaseName> = KubbFile.File<TMeta, TBaseName> & {
         /**
          * @default crypto.randomUUID()
          */
@@ -669,14 +673,21 @@ type KubbPluginFactory<T extends PluginFactoryOptions = PluginFactoryOptions> =
 declare function createPlugin<T extends PluginFactoryOptions = PluginFactoryOptions>(factory: KubbPluginFactory<T>): (options: T['options']) => ReturnType<KubbPluginFactory<T>>;
 declare const pluginName = "core";
 
-type PromiseFunc<T, T2 = never> = () => T2 extends never ? Promise<T> : Promise<T> | T2;
-type SeqOutput<TInput extends Array<PromiseFunc<TPromise, null>>, TPromise = unknown> = ReturnType<NonNullable<TInput[number]>>;
-type Options = {};
-type Strategy = 'seq';
-declare class PromiseManager {
+type PromiseFunc$1<T = unknown, T2 = never> = (state: T) => T2 extends never ? Promise<T> : Promise<T> | T2;
+type ValueOfPromiseFuncArray<TInput extends Array<unknown>> = TInput extends Array<PromiseFunc$1<infer X, infer Y>> ? X | Y : never;
+type SeqOutput<TInput extends Array<PromiseFunc$1<TValue, null>>, TValue> = Array<Awaited<ValueOfPromiseFuncArray<TInput>>>;
+type HookFirstOutput<TInput extends Array<PromiseFunc$1<TValue, null>>, TValue = unknown> = ValueOfPromiseFuncArray<TInput>;
+type Strategy = 'seq' | 'first';
+type StrategySwitch<TStrategy extends Strategy, TInput extends Array<PromiseFunc$1<TValue, null>>, TValue> = TStrategy extends 'first' ? HookFirstOutput<TInput, TValue> : TStrategy extends 'seq' ? SeqOutput<TInput, TValue> : never;
+
+type PromiseFunc<T = unknown, T2 = never> = () => T2 extends never ? Promise<T> : Promise<T> | T2;
+type Options<TState = any> = {
+    nullCheck?: (state: TState) => boolean;
+};
+declare class PromiseManager<TState = any> {
     #private;
-    constructor(options?: Options);
-    run<TInput extends Array<PromiseFunc<TPromise, null>>, TPromise = unknown, TOutput = SeqOutput<TInput, TPromise>>(strategy: Strategy, promises: TInput): TOutput;
+    constructor(options?: Options<TState>);
+    run<TInput extends Array<PromiseFunc<TValue, null>>, TValue, TStrategy extends Strategy, TOutput = StrategySwitch<TStrategy, TInput, TValue>>(strategy: TStrategy, promises: TInput): TOutput;
 }
 
 /**

package/dist/index.d.ts

@@ -58,6 +58,10 @@ declare namespace KubbFile {
         isTypeOnly?: boolean;
         asAlias?: boolean;
     };
+    const dataTagSymbol: unique symbol;
+    type DataTag<Type, Value> = Type & {
+        [dataTagSymbol]: Value;
+    };
     type UUID = string;
     type Source = string;
     type Extname = '.ts' | '.js' | '.tsx' | '.json' | `.${string}`;
@@ -101,7 +105,7 @@ declare namespace KubbFile {
         env?: NodeJS.ProcessEnv;
         validate?: boolean;
     };
-    type ResolvedFile = KubbFile.File & {
+    type ResolvedFile<TMeta extends FileMetaBase = FileMetaBase, TBaseName extends BaseName = BaseName> = KubbFile.File<TMeta, TBaseName> & {
         /**
          * @default crypto.randomUUID()
          */
@@ -669,14 +673,21 @@ type KubbPluginFactory<T extends PluginFactoryOptions = PluginFactoryOptions> =
 declare function createPlugin<T extends PluginFactoryOptions = PluginFactoryOptions>(factory: KubbPluginFactory<T>): (options: T['options']) => ReturnType<KubbPluginFactory<T>>;
 declare const pluginName = "core";
 
-type PromiseFunc<T, T2 = never> = () => T2 extends never ? Promise<T> : Promise<T> | T2;
-type SeqOutput<TInput extends Array<PromiseFunc<TPromise, null>>, TPromise = unknown> = ReturnType<NonNullable<TInput[number]>>;
-type Options = {};
-type Strategy = 'seq';
-declare class PromiseManager {
+type PromiseFunc$1<T = unknown, T2 = never> = (state: T) => T2 extends never ? Promise<T> : Promise<T> | T2;
+type ValueOfPromiseFuncArray<TInput extends Array<unknown>> = TInput extends Array<PromiseFunc$1<infer X, infer Y>> ? X | Y : never;
+type SeqOutput<TInput extends Array<PromiseFunc$1<TValue, null>>, TValue> = Array<Awaited<ValueOfPromiseFuncArray<TInput>>>;
+type HookFirstOutput<TInput extends Array<PromiseFunc$1<TValue, null>>, TValue = unknown> = ValueOfPromiseFuncArray<TInput>;
+type Strategy = 'seq' | 'first';
+type StrategySwitch<TStrategy extends Strategy, TInput extends Array<PromiseFunc$1<TValue, null>>, TValue> = TStrategy extends 'first' ? HookFirstOutput<TInput, TValue> : TStrategy extends 'seq' ? SeqOutput<TInput, TValue> : never;
+
+type PromiseFunc<T = unknown, T2 = never> = () => T2 extends never ? Promise<T> : Promise<T> | T2;
+type Options<TState = any> = {
+    nullCheck?: (state: TState) => boolean;
+};
+declare class PromiseManager<TState = any> {
     #private;
-    constructor(options?: Options);
-    run<TInput extends Array<PromiseFunc<TPromise, null>>, TPromise = unknown, TOutput = SeqOutput<TInput, TPromise>>(strategy: Strategy, promises: TInput): TOutput;
+    constructor(options?: Options<TState>);
+    run<TInput extends Array<PromiseFunc<TValue, null>>, TValue, TStrategy extends Strategy, TOutput = StrategySwitch<TStrategy, TInput, TValue>>(strategy: TStrategy, promises: TInput): TOutput;
 }
 
 /**

package/dist/index.js

@@ -671,6 +671,9 @@ var BarrelManager = class {
 _options = new WeakMap();
 
 // src/FileManager.ts
+var KubbFile;
+((KubbFile2) => {
+})(KubbFile || (KubbFile = {}));
 var _cache, _task, _isWriting, _timeout, _queue, _validate, validate_fn, _add, add_fn, _addOrAppend, addOrAppend_fn;
 var _FileManager = class _FileManager {
   constructor(options) {
@@ -1188,21 +1191,34 @@ var definePlugin = createPlugin((options) => {
 
 // src/utils/executeStrategies.ts
 function hookSeq(promises) {
-  return promises.reduce(
+  return promises.filter(Boolean).reduce(
     (promise, func) => {
-      if (!func || typeof func !== "function") {
+      if (typeof func !== "function") {
         throw new Error("HookSeq needs a function that returns a promise `() => Promise<unknown>`");
       }
-      return promise.then((result) => {
-        const calledFunc = func();
+      return promise.then((state) => {
+        const calledFunc = func(state);
         if (calledFunc) {
-          return calledFunc.then(Array.prototype.concat.bind(result));
+          return calledFunc.then(Array.prototype.concat.bind(state));
         }
       });
     },
     Promise.resolve([])
   );
 }
+function hookFirst(promises, nullCheck = (state) => state !== null) {
+  let promise = Promise.resolve(null);
+  for (const func of promises.filter(Boolean)) {
+    promise = promise.then((state) => {
+      if (nullCheck(state)) {
+        return state;
+      }
+      const calledFunc = func(state);
+      return calledFunc;
+    });
+  }
+  return promise;
+}
 
 // src/PromiseManager.ts
 var _options2;
@@ -1216,6 +1232,9 @@ var PromiseManager = class {
     if (strategy === "seq") {
       return hookSeq(promises);
     }
+    if (strategy === "first") {
+      return hookFirst(promises, __privateGet(this, _options2).nullCheck);
+    }
     throw new Error(`${strategy} not implemented`);
   }
 };
@@ -1302,7 +1321,7 @@ Names: ${JSON.stringify(names, void 0, 2)}`
     this.logger = options.logger;
     this.queue = new Queue(100, this.logger.logLevel === LogLevel.debug);
     this.fileManager = new FileManager({ task: options.task, queue: this.queue, timeout: options.writeTimeout });
-    __privateSet(this, _promiseManager, new PromiseManager());
+    __privateSet(this, _promiseManager, new PromiseManager({ nullCheck: (state) => !!state?.result }));
     const plugins = config.plugins || [];
     const core = definePlugin({
       config,
@@ -1359,20 +1378,15 @@ Names: ${JSON.stringify(names, void 0, 2)}`
   /**
    * Chains, first non-null result stops and returns
    */
-  hookFirst({
+  async hookFirst({
     hookName,
     parameters,
     skipped
   }) {
-    let promise = Promise.resolve(null);
-    for (const plugin of __privateMethod(this, _getSortedPlugins, getSortedPlugins_fn).call(this)) {
-      if (skipped && skipped.has(plugin)) {
-        continue;
-      }
-      promise = promise.then(async (parseResult) => {
-        if (parseResult?.result != null) {
-          return parseResult;
-        }
+    const promises = __privateMethod(this, _getSortedPlugins, getSortedPlugins_fn).call(this).filter((plugin) => {
+      return skipped ? skipped.has(plugin) : true;
+    }).map((plugin) => {
+      return async () => {
         const value = await __privateMethod(this, _execute, execute_fn).call(this, {
           strategy: "hookFirst",
           hookName,
@@ -1385,9 +1399,9 @@ Names: ${JSON.stringify(names, void 0, 2)}`
             result: value
           }
         );
-      });
-    }
-    return promise;
+      };
+    });
+    return __privateGet(this, _promiseManager).run("first", promises);
   }
   /**
    * Chains, first non-null result stops and returns
@@ -1469,7 +1483,7 @@ Names: ${JSON.stringify(names, void 0, 2)}`
   /**
    * Chains plugins
    */
-  hookSeq({ hookName, parameters }) {
+  async hookSeq({ hookName, parameters }) {
     const promises = __privateMethod(this, _getSortedPlugins, getSortedPlugins_fn).call(this).map((plugin) => {
       return () => __privateMethod(this, _execute, execute_fn).call(this, {
         strategy: "hookSeq",
@@ -1916,6 +1930,6 @@ var SchemaGenerator = class extends Generator {
 // src/index.ts
 var src_default = build;
 
-export { FileManager, Generator, 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, ParallelPluginError, PluginError, PluginManager, PromiseManager, SchemaGenerator, SummaryError, ValidationPluginError, Warning, build, combineExports, combineImports, createPlugin, src_default as default, defineConfig, isInputPath, pluginName as name, pluginName };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map