@modern-js/plugin 1.0.0 → 1.1.2

package/dist/js/node/waterfall/async.js

@@ -5,17 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isAsyncWaterfall = exports.getAsyncBrook = exports.createAsyncWaterfall = void 0;
 
-var _counter = require("../counter");
+var _farrowPipeline = require("farrow-pipeline");
 
-var _context = require("../context");
+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; }
 
 const ASYNC_WATERFALL_SYMBOL = Symbol('ASYNC_WATERFALL_SYMBOL');
 
 const getAsyncBrook = input => {
   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
 
 
@@ -26,48 +30,35 @@ exports.getAsyncBrook = getAsyncBrook;
 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 const createAsyncWaterfall = () => {
-  const middlewares = [];
-
-  const createCurrentRunner = hooks => (0, _counter.createAsyncCounter)(async (index, input, next) => {
-    if (index >= middlewares.length) {
-      return input;
-    }
-
-    return (0, _context.runHooks)(async () => next((await middlewares[index](input)) || input), hooks);
-  });
-
-  const currentContainer = (0, _context.createContainer)();
-  const currentHooks = (0, _context.fromContainer)(currentContainer);
-  const currentRunner = createCurrentRunner(currentHooks);
+  const pipeline = (0, _farrowPipeline.createAsyncPipeline)();
 
   const use = (...input) => {
-    middlewares.push(...input.map(getAsyncBrook));
+    pipeline.use(...input.map(getAsyncBrook).map(mapAsyncBrookToAsyncMiddleware));
     return waterfall;
   };
 
-  const run = async (input, options) => {
-    var _options$container;
+  const run = (input, options) => // eslint-disable-next-line @typescript-eslint/no-shadow
+  pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+    onLast: input => input
+  }));
 
-    const container = (_options$container = options === null || options === void 0 ? void 0 : options.container) !== null && _options$container !== void 0 ? _options$container : currentContainer;
-    const hooks = container === currentContainer ? currentHooks : (0, _context.fromContainer)(container);
-    const runner = container === currentContainer ? currentRunner : createCurrentRunner(hooks);
-    return runner.start(input);
-  };
-
-  const brook = input => {
+  const middlware = input => {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    const container = (0, _context.useContainer)();
-    return run(input, {
-      container
+    const container = (0, _farrowPipeline.useContainer)(); // eslint-disable-next-line @typescript-eslint/no-shadow
+
+    return pipeline.run(input, {
+      container,
+      onLast: input => input
     });
   };
 
-  const waterfall = {
+  const waterfall = _objectSpread(_objectSpread({}, pipeline), {}, {
     use,
     run,
-    brook,
+    middlware,
     [ASYNC_WATERFALL_SYMBOL]: true
-  };
+  });
+
   return waterfall;
 };
 
@@ -75,4 +66,6 @@ exports.createAsyncWaterfall = createAsyncWaterfall;
 
 const isAsyncWaterfall = input => Boolean(input === null || input === void 0 ? void 0 : input[ASYNC_WATERFALL_SYMBOL]);
 
-exports.isAsyncWaterfall = isAsyncWaterfall;
+exports.isAsyncWaterfall = isAsyncWaterfall;
+
+const mapAsyncBrookToAsyncMiddleware = brook => async (input, next) => next(await brook(input));

package/dist/js/node/waterfall/sync.js

@@ -5,17 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isWaterfall = exports.getBrook = exports.createWaterfall = void 0;
 
-var _counter = require("../counter");
+var _farrowPipeline = require("farrow-pipeline");
 
-var _context = require("../context");
+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; }
 
-const WATERFALL_SYMBOL = Symbol('WATERFALL_SYMBOL'); // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+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; }
+
+const WATERFALL_SYMBOL = Symbol('WATERFALL_SYMBOL');
 
 const getBrook = input => {
   if (typeof input === 'function') {
     return input;
-  } else if (input && typeof input.brook === 'function') {
-    return input.brook;
+  } else if (input && typeof input.middleware === 'function') {
+    return input.middleware;
   } // eslint-disable-next-line @typescript-eslint/no-base-to-string,@typescript-eslint/restrict-template-expressions
 
 
@@ -26,48 +30,35 @@ exports.getBrook = getBrook;
 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 const createWaterfall = () => {
-  const middlewares = [];
+  const pipeline = (0, _farrowPipeline.createPipeline)();
 
-  const createCurrentRunner = hooks => (0, _counter.createCounter)((index, input, next) => {
-    if (index >= middlewares.length) {
-      return input;
-    }
-
-    return (0, _context.runHooks)(() => next(middlewares[index](input) || input), hooks);
-  });
-
-  const currentContainer = (0, _context.createContainer)();
-  const currentHooks = (0, _context.fromContainer)(currentContainer);
-  const currentRunner = createCurrentRunner(currentHooks);
-
-  const use = (...input) => {
-    middlewares.push(...input.map(getBrook));
+  const use = (...brooks) => {
+    pipeline.use(...brooks.map(getBrook).map(mapBrookToMiddleware));
     return waterfall;
   };
 
-  const run = (input, options) => {
-    var _options$container;
+  const run = (input, options) => // eslint-disable-next-line @typescript-eslint/no-shadow
+  pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+    onLast: input => input
+  }));
 
-    const container = (_options$container = options === null || options === void 0 ? void 0 : options.container) !== null && _options$container !== void 0 ? _options$container : currentContainer;
-    const hooks = container === currentContainer ? currentHooks : (0, _context.fromContainer)(container);
-    const runner = container === currentContainer ? currentRunner : createCurrentRunner(hooks);
-    return runner.start(input);
-  };
-
-  const brook = input => {
+  const middleware = input => {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    const container = (0, _context.useContainer)();
-    return run(input, {
-      container
+    const container = (0, _farrowPipeline.useContainer)(); // eslint-disable-next-line @typescript-eslint/no-shadow
+
+    return pipeline.run(input, {
+      container,
+      onLast: input => input
     });
   };
 
-  const waterfall = {
+  const waterfall = _objectSpread(_objectSpread({}, pipeline), {}, {
     use,
     run,
-    brook,
+    middleware,
     [WATERFALL_SYMBOL]: true
-  };
+  });
+
   return waterfall;
 };
 
@@ -75,4 +66,6 @@ exports.createWaterfall = createWaterfall;
 
 const isWaterfall = input => Boolean(input === null || input === void 0 ? void 0 : input[WATERFALL_SYMBOL]);
 
-exports.isWaterfall = isWaterfall;
+exports.isWaterfall = isWaterfall;
+
+const mapBrookToMiddleware = brook => (input, next) => next(brook(input));

package/dist/js/node/workflow/async.js

@@ -5,9 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isAsyncWorkflow = exports.createAsyncWorkflow = void 0;
 
-var _counter = require("../counter");
+var _farrowPipeline = require("farrow-pipeline");
 
-var _context = require("../context");
+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; }
 
 const ASYNC_WORKFLOW_SYMBOL = Symbol('ASYNC_WORKFLOW_SYMBOL');
 
@@ -17,45 +21,41 @@ const isAsyncWorkflow = input => Boolean(input === null || input === void 0 ? vo
 exports.isAsyncWorkflow = isAsyncWorkflow;
 
 const createAsyncWorkflow = () => {
-  const middlewares = [];
-
-  const createCurrentRunner = hooks => (0, _counter.createAsyncCounter)(async (index, input, next) => {
-    if (index >= middlewares.length) {
-      return [];
-    }
-
-    const middleware = middlewares[index];
-    return (0, _context.runHooks)(async () => {
-      const result = await middleware(input);
-      const rest = await next(input);
-      return [result, ...rest];
-    }, hooks);
-  });
-
-  const currentContainer = (0, _context.createContainer)();
-  const currentHooks = (0, _context.fromContainer)(currentContainer);
-  const currentRunner = createCurrentRunner(currentHooks);
+  const pipeline = (0, _farrowPipeline.createAsyncPipeline)();
 
   const use = (...input) => {
-    middlewares.push(...input);
+    pipeline.use(...input.map(mapAsyncWorkerToAsyncMiddleware));
     return workflow;
   };
 
   const run = async (input, options) => {
-    var _options$container;
-
-    const container = (_options$container = options === null || options === void 0 ? void 0 : options.container) !== null && _options$container !== void 0 ? _options$container : currentContainer;
-    const hooks = container === currentContainer ? currentHooks : (0, _context.fromContainer)(container);
-    const runner = container === currentContainer ? currentRunner : createCurrentRunner(hooks);
-    return runner.start(input);
+    const result = pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+      onLast: () => []
+    }));
+
+    if (isPromise(result)) {
+      // eslint-disable-next-line @typescript-eslint/no-shadow,promise/prefer-await-to-then
+      return result.then(result => result.filter(Boolean));
+    } else {
+      return result.filter(Boolean);
+    }
   };
 
-  const workflow = {
+  const workflow = _objectSpread(_objectSpread({}, pipeline), {}, {
     use,
     run,
     [ASYNC_WORKFLOW_SYMBOL]: true
-  };
+  });
+
   return workflow;
 };
 
-exports.createAsyncWorkflow = createAsyncWorkflow;
+exports.createAsyncWorkflow = createAsyncWorkflow;
+
+const mapAsyncWorkerToAsyncMiddleware = worker => async (input, next) => [await worker(input), ...(await next(input))];
+
+function isPromise(obj) {
+  /* eslint-disable promise/prefer-await-to-then */
+  return Boolean(obj) && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
+  /* eslint-enable promise/prefer-await-to-then */
+}

package/dist/js/node/workflow/parallel.js

@@ -5,9 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isParallelWorkflow = exports.createParallelWorkflow = void 0;
 
-var _counter = require("../counter");
+var _farrowPipeline = require("farrow-pipeline");
 
-var _context = require("../context");
+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; }
 
 const PARALLEL_WORKFLOW_SYMBOL = Symbol('PARALLEL_WORKFLOW_SYMBOL');
 
@@ -16,41 +20,27 @@ const isParallelWorkflow = input => Boolean(input === null || input === void 0 ?
 exports.isParallelWorkflow = isParallelWorkflow;
 
 const createParallelWorkflow = () => {
-  const middlewares = [];
-
-  const createCurrentRunner = hooks => (0, _counter.createAsyncCounter)((index, input, next) => {
-    if (index >= middlewares.length) {
-      return Promise.resolve([]);
-    }
-
-    const middleware = middlewares[index];
-    return (0, _context.runHooks)(async () => Promise.all([middleware(input), ...(await next(input))]), hooks);
-  });
-
-  const currentContainer = (0, _context.createContainer)();
-  const currentHooks = (0, _context.fromContainer)(currentContainer);
-  const currentRunner = createCurrentRunner(currentHooks);
+  const pipeline = (0, _farrowPipeline.createPipeline)();
 
   const use = (...input) => {
-    middlewares.push(...input);
+    pipeline.use(...input.map(mapParallelWorkerToAsyncMiddleware));
     return workflow;
   };
 
-  const run = async (input, options) => {
-    var _options$container;
-
-    const container = (_options$container = options === null || options === void 0 ? void 0 : options.container) !== null && _options$container !== void 0 ? _options$container : currentContainer;
-    const hooks = container === currentContainer ? currentHooks : (0, _context.fromContainer)(container);
-    const runner = container === currentContainer ? currentRunner : createCurrentRunner(hooks);
-    return runner.start(input);
-  };
+  const run = async (input, options) => // eslint-disable-next-line promise/prefer-await-to-then
+  Promise.all(pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+    onLast: () => []
+  }))).then(result => result.filter(Boolean));
 
-  const workflow = {
-    use,
+  const workflow = _objectSpread(_objectSpread({}, pipeline), {}, {
     run,
+    use,
     [PARALLEL_WORKFLOW_SYMBOL]: true
-  };
+  });
+
   return workflow;
 };
 
-exports.createParallelWorkflow = createParallelWorkflow;
+exports.createParallelWorkflow = createParallelWorkflow;
+
+const mapParallelWorkerToAsyncMiddleware = worker => (input, next) => [worker(input), ...next(input)];

package/dist/js/node/workflow/sync.js

@@ -5,48 +5,38 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isWorkflow = exports.createWorkflow = void 0;
 
-var _counter = require("../counter");
+var _farrowPipeline = require("farrow-pipeline");
 
-var _context = require("../context");
+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; }
 
 const WORKFLOW_SYMBOL = Symbol('WORKFLOW_SYMBOL');
 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 const createWorkflow = () => {
-  const middlewares = [];
-
-  const createCurrentRunner = hooks => (0, _counter.createCounter)((index, input, next) => {
-    if (index >= middlewares.length) {
-      return [];
-    }
-
-    const middleware = middlewares[index];
-    return (0, _context.runHooks)(() => [middleware(input), ...next(input)], hooks);
-  });
-
-  const currentContainer = (0, _context.createContainer)();
-  const currentHooks = (0, _context.fromContainer)(currentContainer);
-  const currentRunner = createCurrentRunner(currentHooks);
+  const pipeline = (0, _farrowPipeline.createPipeline)();
 
   const use = (...input) => {
-    middlewares.push(...input);
+    pipeline.use(...input.map(mapWorkerToMiddleware));
     return workflow;
   };
 
-  const run = (input, options) => {
-    var _options$container;
-
-    const container = (_options$container = options === null || options === void 0 ? void 0 : options.container) !== null && _options$container !== void 0 ? _options$container : currentContainer;
-    const hooks = container === currentContainer ? currentHooks : (0, _context.fromContainer)(container);
-    const runner = container === currentContainer ? currentRunner : createCurrentRunner(hooks);
-    return runner.start(input);
+  const run = async (input, options) => {
+    const result = pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+      onLast: () => []
+    }));
+    return result.filter(Boolean);
   };
 
-  const workflow = {
+  const workflow = _objectSpread(_objectSpread({}, pipeline), {}, {
     use,
     run,
     [WORKFLOW_SYMBOL]: true
-  };
+  });
+
   return workflow;
 };
 
@@ -54,4 +44,6 @@ exports.createWorkflow = createWorkflow;
 
 const isWorkflow = input => Boolean(input === null || input === void 0 ? void 0 : input[WORKFLOW_SYMBOL]);
 
-exports.isWorkflow = isWorkflow;
+exports.isWorkflow = isWorkflow;
+
+const mapWorkerToMiddleware = worker => (input, next) => [worker(input), ...next(input)];

package/dist/js/treeshaking/index.js

@@ -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/js/treeshaking/manager/async.js

@@ -24,7 +24,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 { runWithContainer, createContainer } from "../context";
+import { runWithContainer, createContainer } from 'farrow-pipeline';
 import { generateRunner, hasOwnProperty, DEFAULT_OPTIONS } from "./sync";
 import { useRunner } from "./runner"; // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 

package/dist/js/treeshaking/manager/runner.js

@@ -1,4 +1,4 @@
-import { createContext } from "../context";
+import { createContext } from 'farrow-pipeline';
 export var RunnerContext = createContext(null);
 export var useRunner = function useRunner() {
   var runner = RunnerContext.use().value;

package/dist/js/treeshaking/manager/sync.js

@@ -21,10 +21,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // eslint-disable-next-line eslint-comments/disable-enable-pair
 
 /* eslint-disable max-lines */
-import { runWithContainer, createContainer } from "../context";
+import { isPipeline, createPipeline, runWithContainer, createContainer } from 'farrow-pipeline';
 import { isWaterfall, createWaterfall, isAsyncWaterfall, createAsyncWaterfall } from "../waterfall";
 import { isWorkflow, createWorkflow, isAsyncWorkflow, createAsyncWorkflow, isParallelWorkflow, createParallelWorkflow } from "../workflow";
-import { isPipeline, createPipeline, isAsyncPipeline, createAsyncPipeline } from "../pipeline";
 import { RunnerContext, useRunner } from "./runner"; // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 
 var SYNC_PLUGIN_SYMBOL = 'SYNC_PLUGIN_SYMBOL';
@@ -201,10 +200,6 @@ export var cloneProgress = function cloneProgress(progress) {
 
   if (isPipeline(progress)) {
     return createPipeline();
-  }
-
-  if (isAsyncPipeline(progress)) {
-    return createAsyncPipeline();
   } // eslint-disable-next-line @typescript-eslint/restrict-template-expressions