@modern-js/plugin 1.0.0 → 1.1.2

package/dist/js/treeshaking/workflow/parallel.js

@@ -1,6 +1,14 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -14,93 +22,61 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-import { createAsyncCounter } from "../counter";
-import { runHooks, fromContainer, createContainer } from "../context";
+import { createPipeline } from 'farrow-pipeline';
 var PARALLEL_WORKFLOW_SYMBOL = Symbol('PARALLEL_WORKFLOW_SYMBOL');
 export var isParallelWorkflow = function isParallelWorkflow(input) {
   return Boolean(input === null || input === void 0 ? void 0 : input[PARALLEL_WORKFLOW_SYMBOL]);
 };
 export var createParallelWorkflow = function createParallelWorkflow() {
-  var middlewares = [];
-
-  var createCurrentRunner = function createCurrentRunner(hooks) {
-    return createAsyncCounter(function (index, input, next) {
-      if (index >= middlewares.length) {
-        return Promise.resolve([]);
-      }
-
-      var middleware = middlewares[index];
-      return runHooks( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.t0 = Promise;
-                _context.t1 = [middleware(input)];
-                _context.t2 = _toConsumableArray;
-                _context.next = 5;
-                return next(input);
-
-              case 5:
-                _context.t3 = _context.sent;
-                _context.t4 = (0, _context.t2)(_context.t3);
-                _context.t5 = _context.t1.concat.call(_context.t1, _context.t4);
-                return _context.abrupt("return", _context.t0.all.call(_context.t0, _context.t5));
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      })), hooks);
-    });
-  };
-
-  var currentContainer = createContainer();
-  var currentHooks = fromContainer(currentContainer);
-  var currentRunner = createCurrentRunner(currentHooks);
+  var pipeline = createPipeline();
 
   var use = function use() {
-    middlewares.push.apply(middlewares, arguments);
+    for (var _len = arguments.length, input = new Array(_len), _key = 0; _key < _len; _key++) {
+      input[_key] = arguments[_key];
+    }
+
+    pipeline.use.apply(pipeline, _toConsumableArray(input.map(mapParallelWorkerToAsyncMiddleware)));
     return workflow;
   };
 
   var run = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(input, options) {
-      var _options$container;
-
-      var container, hooks, runner;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(input, options) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context.prev = _context.next) {
             case 0:
-              container = (_options$container = options === null || options === void 0 ? void 0 : options.container) !== null && _options$container !== void 0 ? _options$container : currentContainer;
-              hooks = container === currentContainer ? currentHooks : fromContainer(container);
-              runner = container === currentContainer ? currentRunner : createCurrentRunner(hooks);
-              return _context2.abrupt("return", runner.start(input));
-
-            case 4:
+              return _context.abrupt("return", // eslint-disable-next-line promise/prefer-await-to-then
+              Promise.all(pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+                onLast: function onLast() {
+                  return [];
+                }
+              }))).then(function (result) {
+                return result.filter(Boolean);
+              }));
+
+            case 1:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
         }
-      }, _callee2);
+      }, _callee);
     }));
 
     return function run(_x, _x2) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
-  var workflow = _defineProperty({
-    use: use,
-    run: run
-  }, PARALLEL_WORKFLOW_SYMBOL, true);
+  var workflow = _objectSpread(_objectSpread({}, pipeline), {}, _defineProperty({
+    run: run,
+    use: use
+  }, PARALLEL_WORKFLOW_SYMBOL, true));
 
   return workflow;
+};
+
+var mapParallelWorkerToAsyncMiddleware = function mapParallelWorkerToAsyncMiddleware(worker) {
+  return function (input, next) {
+    return [worker(input)].concat(_toConsumableArray(next(input)));
+  };
 };

package/dist/js/treeshaking/workflow/sync.js

@@ -1,5 +1,15 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -12,51 +22,61 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-import { createCounter } from "../counter";
-import { runHooks, fromContainer, createContainer } from "../context";
+import { createPipeline } from 'farrow-pipeline';
 var WORKFLOW_SYMBOL = Symbol('WORKFLOW_SYMBOL');
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 export var createWorkflow = function createWorkflow() {
-  var middlewares = [];
-
-  var createCurrentRunner = function createCurrentRunner(hooks) {
-    return createCounter(function (index, input, next) {
-      if (index >= middlewares.length) {
-        return [];
-      }
-
-      var middleware = middlewares[index];
-      return runHooks(function () {
-        return [middleware(input)].concat(_toConsumableArray(next(input)));
-      }, hooks);
-    });
-  };
-
-  var currentContainer = createContainer();
-  var currentHooks = fromContainer(currentContainer);
-  var currentRunner = createCurrentRunner(currentHooks);
+  var pipeline = createPipeline();
 
   var use = function use() {
-    middlewares.push.apply(middlewares, arguments);
+    for (var _len = arguments.length, input = new Array(_len), _key = 0; _key < _len; _key++) {
+      input[_key] = arguments[_key];
+    }
+
+    pipeline.use.apply(pipeline, _toConsumableArray(input.map(mapWorkerToMiddleware)));
     return workflow;
   };
 
-  var run = function run(input, options) {
-    var _options$container;
+  var run = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(input, options) {
+      var result;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              result = pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+                onLast: function onLast() {
+                  return [];
+                }
+              }));
+              return _context.abrupt("return", result.filter(Boolean));
 
-    var container = (_options$container = options === null || options === void 0 ? void 0 : options.container) !== null && _options$container !== void 0 ? _options$container : currentContainer;
-    var hooks = container === currentContainer ? currentHooks : fromContainer(container);
-    var runner = container === currentContainer ? currentRunner : createCurrentRunner(hooks);
-    return runner.start(input);
-  };
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function run(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
-  var workflow = _defineProperty({
+  var workflow = _objectSpread(_objectSpread({}, pipeline), {}, _defineProperty({
     use: use,
     run: run
-  }, WORKFLOW_SYMBOL, true);
+  }, WORKFLOW_SYMBOL, true));
 
   return workflow;
 };
 export var isWorkflow = function isWorkflow(input) {
   return Boolean(input === null || input === void 0 ? void 0 : input[WORKFLOW_SYMBOL]);
+};
+
+var mapWorkerToMiddleware = function mapWorkerToMiddleware(worker) {
+  return function (input, next) {
+    return [worker(input)].concat(_toConsumableArray(next(input)));
+  };
 };

package/dist/types/index.d.ts

@@ -1,5 +1,4 @@
+export * from 'farrow-pipeline';
 export * from './waterfall';
 export * from './workflow';
-export * from './pipeline';
-export * from './manager';
-export * from './context';
+export * from './manager';

package/dist/types/manager/runner.d.ts

@@ -1,2 +1,2 @@
-export declare const RunnerContext: import("../context").Context<any>;
+export declare const RunnerContext: import("farrow-pipeline").Context<any>;
 export declare const useRunner: () => any;

package/dist/types/manager/sync.d.ts

@@ -1,7 +1,6 @@
-import { Container } from '../context';
+import { Middleware, Pipeline, AsyncPipeline, MaybeAsync, Container } from 'farrow-pipeline';
 import { Waterfall, Brook, AsyncWaterfall, AsyncBrook } from '../waterfall';
 import { Worker, Workflow, AsyncWorker, AsyncWorkflow, ParallelWorkflow } from '../workflow';
-import { Middleware, Pipeline, AsyncMiddleware, AsyncPipeline } from '../pipeline';
 export declare type Initializer<O> = () => O | void;
 declare const SYNC_PLUGIN_SYMBOL = "SYNC_PLUGIN_SYMBOL";
 export declare type Plugin<O> = {
@@ -21,7 +20,7 @@ export declare type PluginOptions = {
   required?: string[];
 };
 export declare type Progress = Waterfall<any> | AsyncWaterfall<any> | Workflow<any, any> | AsyncWorkflow<any, any> | ParallelWorkflow<any> | Pipeline<any, any> | AsyncPipeline<any, any>;
-export declare type Progress2Thread<P extends Progress> = P extends Workflow<infer I, infer O> ? Worker<I, O> : P extends AsyncWorkflow<infer I, infer O> ? AsyncWorker<I, O> : P extends ParallelWorkflow<infer I, infer O> ? AsyncWorker<I, O> : P extends Waterfall<infer I> ? Brook<I> : P extends AsyncWaterfall<infer I> ? AsyncBrook<I> : P extends Pipeline<infer I, infer O> ? Middleware<I, O> : P extends AsyncPipeline<infer I, infer O> ? AsyncMiddleware<I, O> : never;
+export declare type Progress2Thread<P extends Progress> = P extends Workflow<infer I, infer O> ? Worker<I, O> : P extends AsyncWorkflow<infer I, infer O> ? AsyncWorker<I, O> : P extends ParallelWorkflow<infer I, infer O> ? AsyncWorker<I, O> : P extends Waterfall<infer I> ? Brook<I> : P extends AsyncWaterfall<infer I> ? AsyncBrook<I> : P extends Pipeline<infer I, infer O> ? Middleware<I, O> : P extends AsyncPipeline<infer I, infer O> ? Middleware<I, MaybeAsync<O>> : never;
 export declare type ProgressRecord = Record<string, Progress>;
 export declare type Progresses2Threads<PS extends ProgressRecord | void> = { [K in keyof PS]: PS[K] extends Progress ? Progress2Thread<PS[K]> : PS[K] extends void ? void : never };
 export declare type RunnerFromProgress<P extends Progress> = P extends Waterfall<infer I> ? Waterfall<I>['run'] : P extends AsyncWaterfall<infer I> ? AsyncWaterfall<I>['run'] : P extends Workflow<infer I, infer O> ? Workflow<I, O>['run'] : P extends AsyncWorkflow<infer I, infer O> ? AsyncWorkflow<I, O>['run'] : P extends ParallelWorkflow<infer I, infer O> ? ParallelWorkflow<I, O>['run'] : P extends Pipeline<infer I, infer O> ? Pipeline<I, O>['run'] : P extends AsyncPipeline<infer I, infer O> ? AsyncPipeline<I, O>['run'] : never;

package/dist/types/waterfall/async.d.ts

@@ -1,16 +1,20 @@
-import type { RunWaterfallOptions } from './sync';
+import { MaybeAsync, Container } from 'farrow-pipeline';
 declare const ASYNC_WATERFALL_SYMBOL: unique symbol;
-export declare type AsyncBrook<I = unknown> = (I: I) => I | Promise<I> | void | Promise<void>;
+export declare type AsyncBrook<I = unknown> = (I: I) => MaybeAsync<I>;
 export declare type AsyncBrookInput<I = unknown> = AsyncBrook<I> | {
-  brook: AsyncBrook<I>;
+  middlware: AsyncBrook<I>;
 };
 export declare type AsyncBrooks<I = unknown> = AsyncBrook<I>[];
 export declare type AsyncBrookInputs<I = unknown> = AsyncBrookInput<I>[];
 export declare const getAsyncBrook: <I>(input: AsyncBrookInput<I>) => AsyncBrook<I>;
+export declare type RunAsyncWaterfallOptions<I = unknown> = {
+  container?: Container;
+  onLast?: AsyncBrook<I>;
+};
 export declare type AsyncWaterfall<I> = {
-  run: (input: I, options?: RunWaterfallOptions<I>) => Promise<I>;
+  run: (input: I, options?: RunAsyncWaterfallOptions<I>) => MaybeAsync<I>;
   use: (...I: AsyncBrookInputs<I>) => AsyncWaterfall<I>;
-  brook: AsyncBrook<I>;
+  middlware: AsyncBrook<I>;
   [ASYNC_WATERFALL_SYMBOL]: true;
 };
 export declare type AsyncWaterfall2AsyncBrook<P extends AsyncWaterfall<any>> = P extends AsyncWaterfall<infer I> ? AsyncBrook<I> : never;

package/dist/types/waterfall/sync.d.ts

@@ -1,8 +1,8 @@
-import { Container } from '../context';
+import { Container } from 'farrow-pipeline';
 declare const WATERFALL_SYMBOL: unique symbol;
-export declare type Brook<I = unknown> = (I: I) => I | void;
+export declare type Brook<I = unknown> = (I: I) => I;
 export declare type BrookInput<I = unknown> = Brook<I> | {
-  brook: Brook<I>;
+  middleware: Brook<I>;
 };
 export declare type Brooks<I = unknown> = Brook<I>[];
 export declare type BrookInputs<I = unknown> = BrookInput<I>[];
@@ -14,7 +14,7 @@ export declare type RunWaterfallOptions<I = unknown> = {
 export declare type Waterfall<I = void> = {
   run: (input: I, options?: RunWaterfallOptions<I>) => I;
   use: (...I: BrookInputs<I>) => Waterfall<I>;
-  brook: Brook<I>;
+  middleware: Brook<I>;
   [WATERFALL_SYMBOL]: true;
 };
 export declare type Waterfall2Brook<P extends Waterfall<any>> = P extends Waterfall<infer I> ? Brook<I> : never;

package/dist/types/workflow/async.d.ts

@@ -1,9 +1,10 @@
+import { MaybeAsync } from 'farrow-pipeline';
 import type { RunWorkflowOptions } from './sync';
 declare const ASYNC_WORKFLOW_SYMBOL: unique symbol;
-export declare type AsyncWorker<I, O> = (I: I) => O | Promise<O>;
+export declare type AsyncWorker<I, O> = (I: I) => MaybeAsync<O>;
 export declare type AsyncWorkers<I, O> = AsyncWorker<I, O>[];
 export declare type AsyncWorkflow<I, O> = {
-  run: (input: I, options?: RunWorkflowOptions) => Promise<O[]>;
+  run: (input: I, options?: RunWorkflowOptions) => MaybeAsync<O[]>;
   use: (...I: AsyncWorkers<I, O>) => AsyncWorkflow<I, O>;
   [ASYNC_WORKFLOW_SYMBOL]: true;
 };

package/dist/types/workflow/parallel.d.ts

@@ -1,4 +1,4 @@
-import { AsyncWorker, AsyncWorkers } from './async';
+import type { AsyncWorker, AsyncWorkers } from './async';
 import type { RunWorkflowOptions } from './sync';
 declare const PARALLEL_WORKFLOW_SYMBOL: unique symbol;
 export declare type ParallelWorkflow<I, O = any> = {

package/dist/types/workflow/sync.d.ts

@@ -1,4 +1,4 @@
-import { Container } from '../context';
+import { Container } from 'farrow-pipeline';
 declare const WORKFLOW_SYMBOL: unique symbol;
 export declare type Worker<I, O> = (I: I) => O;
 export declare type Workers<I, O> = Worker<I, O>[];

package/node.d.ts

@@ -1 +1 @@
-export * from './dist/types/asyncHooksImpl';
+export * from 'farrow-pipeline/asyncHooks.node';

package/node.js

@@ -1 +1 @@
-module.exports = require('./dist/js/node/asyncHooksImpl');
+module.exports = require('farrow-pipeline/asyncHooks.node');

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.0",
+  "version": "1.1.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,14 +30,15 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7"
+    "@babel/runtime": "^7",
+    "farrow-pipeline": "^1.10.6"
   },
   "devDependencies": {
     "@types/jest": "^26",
     "@types/node": "^14",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.0.0",
-    "@modern-js/module-tools": "^1.0.0"
+    "@modern-js/plugin-testing": "^1.1.0",
+    "@modern-js/module-tools": "^1.1.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -1,5 +1,5 @@
+export * from 'farrow-pipeline';
+
 export * from './waterfall';
 export * from './workflow';
-export * from './pipeline';
 export * from './manager';
-export * from './context';

package/src/manager/async.ts

@@ -1,4 +1,4 @@
-import { runWithContainer, createContainer } from '../context';
+import { runWithContainer, createContainer } from 'farrow-pipeline';
 import {
   ProgressRecord,
   Progresses2Threads,

package/src/manager/runner.ts

@@ -1,4 +1,4 @@
-import { createContext } from '../context';
+import { createContext } from 'farrow-pipeline';
 
 export const RunnerContext = createContext<any>(null);
 

package/src/manager/sync.ts

@@ -1,6 +1,16 @@
 // eslint-disable-next-line eslint-comments/disable-enable-pair
 /* eslint-disable max-lines */
-import { runWithContainer, createContainer, Container } from '../context';
+import {
+  Middleware,
+  Pipeline,
+  isPipeline,
+  createPipeline,
+  AsyncPipeline,
+  MaybeAsync,
+  runWithContainer,
+  createContainer,
+  Container,
+} from 'farrow-pipeline';
 import {
   Waterfall,
   Brook,
@@ -24,16 +34,6 @@ import {
   isParallelWorkflow,
   createParallelWorkflow,
 } from '../workflow';
-import {
-  Middleware,
-  Pipeline,
-  isPipeline,
-  createPipeline,
-  AsyncMiddleware,
-  AsyncPipeline,
-  isAsyncPipeline,
-  createAsyncPipeline,
-} from '../pipeline';
 import { RunnerContext, useRunner } from './runner';
 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
@@ -86,7 +86,7 @@ export type Progress2Thread<P extends Progress> = P extends Workflow<
   : P extends Pipeline<infer I, infer O>
   ? Middleware<I, O>
   : P extends AsyncPipeline<infer I, infer O>
-  ? AsyncMiddleware<I, O>
+  ? Middleware<I, MaybeAsync<O>>
   : never;
 
 export type ProgressRecord = Record<string, Progress>;
@@ -360,10 +360,6 @@ export const cloneProgress = (progress: Progress): Progress => {
     return createPipeline();
   }
 
-  if (isAsyncPipeline(progress)) {
-    return createAsyncPipeline();
-  }
-
   // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
   throw new Error(`Unknown progress: ${progress}`);
 };

package/src/waterfall/async.ts

@@ -1,39 +1,39 @@
-import { createAsyncCounter } from '../counter';
 import {
-  Hooks,
-  runHooks,
-  fromContainer,
-  createContainer,
+  createAsyncPipeline,
+  Middleware,
+  MaybeAsync,
+  Container,
   useContainer,
-} from '../context';
-import type { RunWaterfallOptions } from './sync';
+} from 'farrow-pipeline';
 
 const ASYNC_WATERFALL_SYMBOL = Symbol('ASYNC_WATERFALL_SYMBOL');
 
-export type AsyncBrook<I = unknown> = (
-  I: I,
-  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-) => I | Promise<I> | void | Promise<void>;
+export type AsyncBrook<I = unknown> = (I: I) => MaybeAsync<I>;
 export type AsyncBrookInput<I = unknown> =
   | AsyncBrook<I>
-  | { brook: AsyncBrook<I> };
+  | { middlware: AsyncBrook<I> };
 export type AsyncBrooks<I = unknown> = AsyncBrook<I>[];
 export type AsyncBrookInputs<I = unknown> = AsyncBrookInput<I>[];
 
 export const getAsyncBrook = <I>(input: AsyncBrookInput<I>) => {
   if (typeof input === 'function') {
     return input;
-  } else if (input && typeof input.brook === 'function') {
-    return input.brook;
+  } else if (input && typeof input.middlware === 'function') {
+    return input.middlware;
   }
   // eslint-disable-next-line @typescript-eslint/no-base-to-string,@typescript-eslint/restrict-template-expressions
   throw new Error(`${input} is not a AsyncBrook or { brook: AsyncBrook }`);
 };
 
+export type RunAsyncWaterfallOptions<I = unknown> = {
+  container?: Container;
+  onLast?: AsyncBrook<I>;
+};
+
 export type AsyncWaterfall<I> = {
-  run: (input: I, options?: RunWaterfallOptions<I>) => Promise<I>;
+  run: (input: I, options?: RunAsyncWaterfallOptions<I>) => MaybeAsync<I>;
   use: (...I: AsyncBrookInputs<I>) => AsyncWaterfall<I>;
-  brook: AsyncBrook<I>;
+  middlware: AsyncBrook<I>;
   [ASYNC_WATERFALL_SYMBOL]: true;
 };
 
@@ -69,51 +69,31 @@ export type AsyncWaterfalls2Runners<PS extends AsyncWaterfallRecord | void> = {
 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 export const createAsyncWaterfall = <I = void>(): AsyncWaterfall<I> => {
-  const middlewares: AsyncBrooks<I> = [];
-
-  const createCurrentRunner = (hooks: Hooks) =>
-    createAsyncCounter<I, I>(async (index, input, next) => {
-      if (index >= middlewares.length) {
-        return input;
-      }
-
-      return runHooks(
-        async () => next((await middlewares[index](input)) || input),
-        hooks,
-      );
-    });
-
-  const currentContainer = createContainer();
-  const currentHooks = fromContainer(currentContainer);
-  const currentRunner = createCurrentRunner(currentHooks);
+  const pipeline = createAsyncPipeline<I, I>();
 
   const use: AsyncWaterfall<I>['use'] = (...input) => {
-    middlewares.push(...input.map(getAsyncBrook));
+    pipeline.use(
+      ...input.map(getAsyncBrook).map(mapAsyncBrookToAsyncMiddleware),
+    );
     return waterfall;
   };
 
-  const run: AsyncWaterfall<I>['run'] = async (input, options) => {
-    const container = options?.container ?? currentContainer;
-    const hooks =
-      container === currentContainer ? currentHooks : fromContainer(container);
-    const runner =
-      container === currentContainer
-        ? currentRunner
-        : createCurrentRunner(hooks);
-
-    return runner.start(input);
-  };
+  const run: AsyncWaterfall<I>['run'] = (input, options) =>
+    // eslint-disable-next-line @typescript-eslint/no-shadow
+    pipeline.run(input, { ...options, onLast: input => input });
 
-  const brook: AsyncWaterfall<I>['brook'] = input => {
+  const middlware: AsyncWaterfall<I>['middlware'] = input => {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const container = useContainer();
-    return run(input, { container });
+    // eslint-disable-next-line @typescript-eslint/no-shadow
+    return pipeline.run(input, { container, onLast: input => input });
   };
 
-  const waterfall = {
+  const waterfall: AsyncWaterfall<I> = {
+    ...pipeline,
     use,
     run,
-    brook,
+    middlware,
     [ASYNC_WATERFALL_SYMBOL]: true as const,
   };
 
@@ -122,3 +102,8 @@ export const createAsyncWaterfall = <I = void>(): AsyncWaterfall<I> => {
 
 export const isAsyncWaterfall = (input: any): input is AsyncWaterfall<any> =>
   Boolean(input?.[ASYNC_WATERFALL_SYMBOL]);
+
+const mapAsyncBrookToAsyncMiddleware =
+  <I>(brook: AsyncBrook<I>): Middleware<I, MaybeAsync<I>> =>
+  async (input, next) =>
+    next(await brook(input));