@modern-js/plugin 1.3.8 → 1.4.0-alpha.0

package/dist/js/node/manager/async.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createAsyncManager = void 0;
 
-var _farrowPipeline = require("../farrow-pipeline");
-
 var _sync = require("./sync");
 
 var _runner = require("./runner");
@@ -92,23 +90,17 @@ const createAsyncManager = (hooks, api) => {
       plugins = [];
     };
 
-    const currentContainer = (0, _farrowPipeline.createContainer)();
-
-    const init = async options => {
-      const container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
+    const init = async () => {
       const sortedPlugins = (0, _shared.sortPlugins)(plugins);
 
       const mergedPluginAPI = _objectSpread(_objectSpread({}, pluginAPI), overrideAPI);
 
       (0, _shared.checkPlugins)(sortedPlugins);
-      const hooksList = await Promise.all(sortedPlugins.map(plugin => (0, _farrowPipeline.runWithContainer)(() => plugin.setup(mergedPluginAPI), container)));
-      return (0, _sync.generateRunner)(hooksList, container, currentHooks);
+      const hooksList = await Promise.all(sortedPlugins.map(plugin => plugin.setup(mergedPluginAPI)));
+      return (0, _sync.generateRunner)(hooksList, currentHooks);
     };
 
-    const run = (cb, options) => {
-      const container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
-      return (0, _farrowPipeline.runWithContainer)(cb, container);
-    };
+    const run = cb => cb();
 
     const manager = {
       createPlugin,

package/dist/js/node/manager/runner.js

@@ -10,14 +10,6 @@ var _farrowPipeline = require("../farrow-pipeline");
 const RunnerContext = (0, _farrowPipeline.createContext)(null);
 exports.RunnerContext = RunnerContext;
 
-const useRunner = () => {
-  const runner = RunnerContext.use().value;
-
-  if (!runner) {
-    throw new Error(`Can't call useRunner out of scope, it should be placed in hooks of plugin`);
-  }
-
-  return runner;
-};
+const useRunner = () => RunnerContext.get();
 
 exports.useRunner = useRunner;

package/dist/js/node/manager/sync.js

@@ -103,23 +103,17 @@ const createManager = (hooks, api) => {
       plugins = [];
     };
 
-    const currentContainer = (0, _farrowPipeline.createContainer)();
-
-    const init = options => {
-      const container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
+    const init = () => {
       const sortedPlugins = (0, _shared.sortPlugins)(plugins);
 
       const mergedPluginAPI = _objectSpread(_objectSpread({}, pluginAPI), overrideAPI);
 
       (0, _shared.checkPlugins)(sortedPlugins);
-      const hooksList = sortedPlugins.map(plugin => (0, _farrowPipeline.runWithContainer)(() => plugin.setup(mergedPluginAPI), container));
-      return generateRunner(hooksList, container, currentHooks);
+      const hooksList = sortedPlugins.map(plugin => plugin.setup(mergedPluginAPI));
+      return generateRunner(hooksList, currentHooks);
     };
 
-    const run = (cb, options) => {
-      const container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
-      return (0, _farrowPipeline.runWithContainer)(cb, container);
-    };
+    const run = cb => cb();
 
     const manager = {
       createPlugin,
@@ -140,7 +134,7 @@ const createManager = (hooks, api) => {
 
 exports.createManager = createManager;
 
-const generateRunner = (hooksList, container, hooksMap) => {
+const generateRunner = (hooksList, hooksMap) => {
   const runner = {};
   const cloneShape = closeHooksMap(hooksMap);
 
@@ -158,13 +152,12 @@ const generateRunner = (hooksList, container, hooksMap) => {
       // @ts-expect-error
 
 
-      runner[key] = (input, options) => cloneShape[key].run(input, _objectSpread({
-        container
-      }, options));
+      runner[key] = (input, options) => cloneShape[key].run(input, _objectSpread({}, options));
     }
   }
 
-  container.write(_runner.RunnerContext, runner);
+  _runner.RunnerContext.set(runner);
+
   return runner;
 };
 

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

@@ -40,9 +40,7 @@ const createAsyncWaterfall = () => {
   }));
 
   const middleware = input => {
-    const container = (0, _farrowPipeline.useContainer)();
     return pipeline.run(input, {
-      container,
       onLast: input => input
     });
   };

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

@@ -40,9 +40,7 @@ const createWaterfall = () => {
   }));
 
   const middleware = input => {
-    const container = (0, _farrowPipeline.useContainer)();
     return pipeline.run(input, {
-      container,
       onLast: input => input
     });
   };

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

@@ -27,10 +27,10 @@ const createAsyncWorkflow = () => {
     return workflow;
   };
 
-  const run = async (input, options) => {
-    const result = pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+  const run = async input => {
+    const result = pipeline.run(input, {
       onLast: () => []
-    }));
+    });
 
     if (isPromise(result)) {
       return result.then(result => result.filter(Boolean));

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

@@ -27,9 +27,9 @@ const createParallelWorkflow = () => {
     return workflow;
   };
 
-  const run = async (input, options) => Promise.all(pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+  const run = async input => Promise.all(pipeline.run(input, {
     onLast: () => []
-  }))).then(result => result.filter(Boolean));
+  })).then(result => result.filter(Boolean));
 
   const workflow = _objectSpread(_objectSpread({}, pipeline), {}, {
     run,

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

@@ -23,10 +23,10 @@ const createWorkflow = () => {
     return workflow;
   };
 
-  const run = (input, options) => {
-    const result = pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+  const run = input => {
+    const result = pipeline.run(input, {
       onLast: () => []
-    }));
+    });
     return result.filter(Boolean);
   };
 

package/dist/js/treeshaking/farrow-pipeline/context.js

@@ -1,103 +1,42 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 /**
  * modified from https://github.com/farrow-js/farrow/tree/master/packages/farrow-pipeline
  * license at https://github.com/farrow-js/farrow/blob/master/LICENSE
  */
-import { createHooks } from "./hook";
-var ContextSymbol = Symbol["for"]('MODERN_CONTEXT');
 export var createContext = function createContext(value) {
-  var id = Symbol('MODERN_CONTEXT_ID');
+  var currentValue;
 
   var create = function create(value) {
-    var _Context;
+    currentValue = value;
 
     var use = function use() {
-      var container = useContainer();
-      return Object.seal({
+      return {
         get value() {
-          return container.read(Context);
+          return currentValue;
         },
 
         set value(v) {
-          container.write(Context, v);
+          currentValue = v;
         }
 
-      });
+      };
     };
 
     var get = function get() {
-      var container = useContainer();
-      return container.read(Context);
+      return currentValue;
     };
 
     var set = function set(v) {
-      var container = useContainer();
-      container.write(Context, v);
+      currentValue = v;
     };
 
-    var Context = (_Context = {
-      id: id
-    }, _defineProperty(_Context, ContextSymbol, value), _defineProperty(_Context, "create", create), _defineProperty(_Context, "use", use), _defineProperty(_Context, "get", get), _defineProperty(_Context, "set", set), _Context);
+    var Context = {
+      create: create,
+      use: use,
+      get: get,
+      set: set
+    };
     return Context;
   };
 
   return create(value);
-};
-
-var createContextMap = function createContextMap(storage) {
-  var contextMap = new Map();
-  var contexts = Object.values(storage); // eslint-disable-next-line @typescript-eslint/prefer-for-of
-
-  for (var i = 0; i < contexts.length; i++) {
-    contextMap.set(contexts[i].id, contexts[i]);
-  }
-
-  return contextMap;
-};
-
-export var createContainer = function createContainer() {
-  var ContextStorage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var contextMap = createContextMap(ContextStorage);
-
-  var read = function read(context) {
-    var target = contextMap.get(context.id);
-
-    if (target) {
-      return target[ContextSymbol];
-    }
-
-    return context[ContextSymbol];
-  };
-
-  var write = function write(context, value) {
-    contextMap.set(context.id, context.create(value));
-  };
-
-  return Object.freeze({
-    read: read,
-    write: write
-  });
-};
-
-var _createHooks = createHooks({
-  useContainer: function useContainer() {
-    throw new Error("Can't call useContainer out of scope, it should be placed on top of the function");
-  }
-}),
-    run = _createHooks.run,
-    hooks = _createHooks.hooks;
-
-export var runHooks = run;
-var useContainer = hooks.useContainer;
-export { useContainer };
-export var fromContainer = function fromContainer(container) {
-  return {
-    useContainer: function useContainer() {
-      return container;
-    }
-  };
-};
-export var runWithContainer = function runWithContainer(f, container) {
-  return runHooks(f, fromContainer(container));
 };

package/dist/js/treeshaking/farrow-pipeline/index.js

@@ -1,19 +1,5 @@
 /**
  * modified from https://github.com/farrow-js/farrow/tree/master/packages/farrow-pipeline
  * license at https://github.com/farrow-js/farrow/blob/master/LICENSE
- *
- * removed:
- *  - dependencies:
- *    - tslib
- *  - files
- *    - compose.ts
- *  - methods:
- *    - usePipeline
- *    - assertContainer
- *    - assertContext
- *    - isContext
- *    - isContainer
- *    - pipeline.useLazy
- *    - context.assert
  */
 export * from "./pipeline";

package/dist/js/treeshaking/farrow-pipeline/pipeline.js

@@ -1,14 +1,14 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 
 /**
  * modified from https://github.com/farrow-js/farrow/tree/master/packages/farrow-pipeline
  * license at https://github.com/farrow-js/farrow/blob/master/LICENSE
  */
-import { createContext, createContainer, fromContainer, runHooks, useContainer, runWithContainer } from "./context";
+import { createContext } from "./context";
 import { createCounter } from "./counter";
-export { createContext, createContainer, useContainer, runWithContainer };
+export { createContext };
 export var isPipeline = function isPipeline(input) {
   return Boolean(input === null || input === void 0 ? void 0 : input[PipelineSymbol]);
 };
@@ -24,11 +24,9 @@ var getMiddleware = function getMiddleware(input) {
   throw new Error("".concat(input, " is not a Middleware"));
 };
 
-export var createPipeline = function createPipeline(options) {
+export var createPipeline = function createPipeline() {
   var _pipeline;
 
-  var config = _objectSpread({}, options);
-
   var middlewares = [];
 
   var use = function use() {
@@ -40,43 +38,28 @@ export var createPipeline = function createPipeline(options) {
     return pipeline;
   };
 
-  var createCurrentCounter = function createCurrentCounter(hooks, onLast, onLastWithContext) {
+  var createCurrentCounter = function createCurrentCounter(onLast) {
     return createCounter(function (index, input, next) {
       if (index >= middlewares.length) {
         if (onLast) {
-          if (onLastWithContext) {
-            return runHooks(function () {
-              return onLast(input);
-            }, hooks);
-          }
-
           return onLast(input);
         }
 
         throw new Error("Expect returning a value, but all middlewares just calling next()");
       }
 
-      return runHooks(function () {
-        return middlewares[index](input, next);
-      }, hooks);
+      return middlewares[index](input, next);
     });
   };
 
-  var currentContainer = createContainer(config.contexts);
-  var currentHooks = fromContainer(currentContainer);
-  var currentCounter = createCurrentCounter(currentHooks);
+  var currentCounter = createCurrentCounter();
 
   var getCounter = function getCounter(options) {
     if (!options) {
       return currentCounter;
     }
 
-    if (options !== null && options !== void 0 && options.container) {
-      var hooks = fromContainer(options === null || options === void 0 ? void 0 : options.container);
-      return options !== null && options !== void 0 && options.onLast ? createCurrentCounter(hooks, options.onLast, typeof options.onLastWithContext === 'boolean' ? options.onLastWithContext : true) : createCurrentCounter(hooks);
-    }
-
-    return options !== null && options !== void 0 && options.onLast ? createCurrentCounter(currentHooks, options.onLast, typeof options.onLastWithContext === 'boolean' ? options.onLastWithContext : true) : createCurrentCounter(currentHooks);
+    return createCurrentCounter(options === null || options === void 0 ? void 0 : options.onLast);
   };
 
   var run = function run(input, options) {
@@ -84,9 +67,7 @@ export var createPipeline = function createPipeline(options) {
   };
 
   var middleware = function middleware(input, next) {
-    var container = useContainer();
     return run(input, {
-      container: container,
       onLast: next
     });
   };
@@ -94,7 +75,7 @@ export var createPipeline = function createPipeline(options) {
   var pipeline = (_pipeline = {}, _defineProperty(_pipeline, PipelineSymbol, true), _defineProperty(_pipeline, "use", use), _defineProperty(_pipeline, "run", run), _defineProperty(_pipeline, "middleware", middleware), _pipeline);
   return pipeline;
 };
-export var createAsyncPipeline = function createAsyncPipeline(options) {
-  var pipeline = createPipeline(options);
+export var createAsyncPipeline = function createAsyncPipeline() {
+  var pipeline = createPipeline();
   return _objectSpread({}, pipeline);
 };

package/dist/js/treeshaking/manager/async.js

@@ -1,7 +1,6 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { runWithContainer, createContainer } from "../farrow-pipeline";
 import { generateRunner, DEFAULT_OPTIONS } from "./sync";
 import { useRunner } from "./runner";
 import { checkPlugins, isObject, hasOwnProperty, sortPlugins, includePlugin } from "./shared";
@@ -88,31 +87,26 @@ export var createAsyncManager = function createAsyncManager(hooks, api) {
       plugins = [];
     };
 
-    var currentContainer = createContainer();
-
     var init = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-        var container, sortedPlugins, mergedPluginAPI, hooksList;
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var sortedPlugins, mergedPluginAPI, hooksList;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
                 sortedPlugins = sortPlugins(plugins);
                 mergedPluginAPI = _objectSpread(_objectSpread({}, pluginAPI), overrideAPI);
                 checkPlugins(sortedPlugins);
-                _context.next = 6;
+                _context.next = 5;
                 return Promise.all(sortedPlugins.map(function (plugin) {
-                  return runWithContainer(function () {
-                    return plugin.setup(mergedPluginAPI);
-                  }, container);
+                  return plugin.setup(mergedPluginAPI);
                 }));
 
-              case 6:
+              case 5:
                 hooksList = _context.sent;
-                return _context.abrupt("return", generateRunner(hooksList, container, currentHooks));
+                return _context.abrupt("return", generateRunner(hooksList, currentHooks));
 
-              case 8:
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -120,14 +114,13 @@ export var createAsyncManager = function createAsyncManager(hooks, api) {
         }, _callee);
       }));
 
-      return function init(_x) {
+      return function init() {
         return _ref.apply(this, arguments);
       };
     }();
 
-    var run = function run(cb, options) {
-      var container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
-      return runWithContainer(cb, container);
+    var run = function run(cb) {
+      return cb();
     };
 
     var manager = {

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

@@ -1,11 +1,5 @@
 import { createContext } from "../farrow-pipeline";
 export var RunnerContext = createContext(null);
 export var useRunner = function useRunner() {
-  var runner = RunnerContext.use().value;
-
-  if (!runner) {
-    throw new Error("Can't call useRunner out of scope, it should be placed in hooks of plugin");
-  }
-
-  return runner;
+  return RunnerContext.get();
 };

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

@@ -1,6 +1,6 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { isPipeline, createPipeline, runWithContainer, createContainer } from "../farrow-pipeline";
+import { isPipeline, createPipeline } from "../farrow-pipeline";
 import { isWaterfall, createWaterfall, isAsyncWaterfall, createAsyncWaterfall } from "../waterfall";
 import { isWorkflow, createWorkflow, isAsyncWorkflow, createAsyncWorkflow, isParallelWorkflow, createParallelWorkflow } from "../workflow";
 import { RunnerContext, useRunner } from "./runner";
@@ -94,26 +94,20 @@ export var createManager = function createManager(hooks, api) {
       plugins = [];
     };
 
-    var currentContainer = createContainer();
-
-    var init = function init(options) {
-      var container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
+    var init = function init() {
       var sortedPlugins = sortPlugins(plugins);
 
       var mergedPluginAPI = _objectSpread(_objectSpread({}, pluginAPI), overrideAPI);
 
       checkPlugins(sortedPlugins);
       var hooksList = sortedPlugins.map(function (plugin) {
-        return runWithContainer(function () {
-          return plugin.setup(mergedPluginAPI);
-        }, container);
+        return plugin.setup(mergedPluginAPI);
       });
-      return generateRunner(hooksList, container, currentHooks);
+      return generateRunner(hooksList, currentHooks);
     };
 
-    var run = function run(cb, options) {
-      var container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
-      return runWithContainer(cb, container);
+    var run = function run(cb) {
+      return cb();
     };
 
     var manager = {
@@ -132,7 +126,7 @@ export var createManager = function createManager(hooks, api) {
 
   return clone();
 };
-export var generateRunner = function generateRunner(hooksList, container, hooksMap) {
+export var generateRunner = function generateRunner(hooksList, hooksMap) {
   var runner = {};
   var cloneShape = closeHooksMap(hooksMap);
 
@@ -162,9 +156,7 @@ export var generateRunner = function generateRunner(hooksList, container, hooksM
       }
 
       runner[key] = function (input, options) {
-        return cloneShape[key].run(input, _objectSpread({
-          container: container
-        }, options));
+        return cloneShape[key].run(input, _objectSpread({}, options));
       };
     };
 
@@ -173,7 +165,7 @@ export var generateRunner = function generateRunner(hooksList, container, hooksM
     }
   }
 
-  container.write(RunnerContext, runner);
+  RunnerContext.set(runner);
   return runner;
 };
 export var cloneHook = function cloneHook(hook) {

package/dist/js/treeshaking/waterfall/async.js

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { createAsyncPipeline, useContainer } from "../farrow-pipeline";
+import { createAsyncPipeline } from "../farrow-pipeline";
 var ASYNC_WATERFALL_SYMBOL = Symbol["for"]('MODERN_ASYNC_WATERFALL');
 export var getAsyncBrook = function getAsyncBrook(input) {
   if (typeof input === 'function') {
@@ -35,9 +35,7 @@ export var createAsyncWaterfall = function createAsyncWaterfall() {
   };
 
   var middleware = function middleware(input) {
-    var container = useContainer();
     return pipeline.run(input, {
-      container: container,
       onLast: function onLast(input) {
         return input;
       }

package/dist/js/treeshaking/waterfall/sync.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { useContainer, createPipeline } from "../farrow-pipeline";
+import { createPipeline } from "../farrow-pipeline";
 var WATERFALL_SYMBOL = Symbol["for"]('MODERN_WATERFALL');
 export var getBrook = function getBrook(input) {
   if (typeof input === 'function') {
@@ -33,9 +33,7 @@ export var createWaterfall = function createWaterfall() {
   };
 
   var middleware = function middleware(input) {
-    var container = useContainer();
     return pipeline.run(input, {
-      container: container,
       onLast: function onLast(input) {
         return input;
       }

package/dist/js/treeshaking/workflow/async.js

@@ -1,7 +1,7 @@
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { createAsyncPipeline } from "../farrow-pipeline";
@@ -22,17 +22,17 @@ export var createAsyncWorkflow = function createAsyncWorkflow() {
   };
 
   var run = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(input, options) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(input) {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              result = pipeline.run(input, _objectSpread(_objectSpread({}, options), {}, {
+              result = pipeline.run(input, {
                 onLast: function onLast() {
                   return [];
                 }
-              }));
+              });
 
               if (!isPromise(result)) {
                 _context.next = 5;
@@ -54,7 +54,7 @@ export var createAsyncWorkflow = function createAsyncWorkflow() {
       }, _callee);
     }));
 
-    return function run(_x, _x2) {
+    return function run(_x) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -97,7 +97,7 @@ var mapAsyncWorkerToAsyncMiddleware = function mapAsyncWorkerToAsyncMiddleware(w
       }, _callee2);
     }));
 
-    return function (_x3, _x4) {
+    return function (_x2, _x3) {
       return _ref2.apply(this, arguments);
     };
   }();