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

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

@@ -3,47 +3,36 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useContainer = exports.runWithContainer = exports.runHooks = exports.fromContainer = exports.createContext = exports.createContainer = void 0;
-
-var _hook = require("./hook");
+exports.createContext = void 0;
 
 /**
  * modified from https://github.com/farrow-js/farrow/tree/master/packages/farrow-pipeline
  * license at https://github.com/farrow-js/farrow/blob/master/LICENSE
  */
-const ContextSymbol = Symbol.for('MODERN_CONTEXT');
-
 const createContext = value => {
-  const id = Symbol('MODERN_CONTEXT_ID');
+  let currentValue;
 
   const create = value => {
-    const use = () => {
-      const container = useContainer();
-      return Object.seal({
-        get value() {
-          return container.read(Context);
-        },
+    currentValue = value;
 
-        set value(v) {
-          container.write(Context, v);
-        }
+    const use = () => ({
+      get value() {
+        return currentValue;
+      },
 
-      });
-    };
+      set value(v) {
+        currentValue = v;
+      }
 
-    const get = () => {
-      const container = useContainer();
-      return container.read(Context);
-    };
+    });
+
+    const get = () => currentValue;
 
     const set = v => {
-      const container = useContainer();
-      container.write(Context, v);
+      currentValue = v;
     };
 
     const Context = {
-      id,
-      [ContextSymbol]: value,
       create,
       use,
       get,
@@ -55,66 +44,4 @@ const createContext = value => {
   return create(value);
 };
 
-exports.createContext = createContext;
-
-const createContextMap = storage => {
-  const contextMap = new Map();
-  const contexts = Object.values(storage); // eslint-disable-next-line @typescript-eslint/prefer-for-of
-
-  for (let i = 0; i < contexts.length; i++) {
-    contextMap.set(contexts[i].id, contexts[i]);
-  }
-
-  return contextMap;
-};
-
-const createContainer = (ContextStorage = {}) => {
-  const contextMap = createContextMap(ContextStorage);
-
-  const read = context => {
-    const target = contextMap.get(context.id);
-
-    if (target) {
-      return target[ContextSymbol];
-    }
-
-    return context[ContextSymbol];
-  };
-
-  const write = (context, value) => {
-    contextMap.set(context.id, context.create(value));
-  };
-
-  return Object.freeze({
-    read,
-    write
-  });
-};
-
-exports.createContainer = createContainer;
-const {
-  run,
-  hooks
-} = (0, _hook.createHooks)({
-  useContainer: () => {
-    throw new Error(`Can't call useContainer out of scope, it should be placed on top of the function`);
-  }
-});
-const runHooks = run;
-exports.runHooks = runHooks;
-const {
-  useContainer
-} = hooks;
-exports.useContainer = useContainer;
-
-const fromContainer = container => ({
-  useContainer: () => {
-    return container;
-  }
-});
-
-exports.fromContainer = fromContainer;
-
-const runWithContainer = (f, container) => runHooks(f, fromContainer(container));
-
-exports.runWithContainer = runWithContainer;
+exports.createContext = createContext;

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

@@ -4,12 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createAsyncPipeline = void 0;
-Object.defineProperty(exports, "createContainer", {
-  enumerable: true,
-  get: function () {
-    return _context.createContainer;
-  }
-});
 Object.defineProperty(exports, "createContext", {
   enumerable: true,
   get: function () {
@@ -17,18 +11,6 @@ Object.defineProperty(exports, "createContext", {
   }
 });
 exports.isPipeline = exports.createPipeline = void 0;
-Object.defineProperty(exports, "runWithContainer", {
-  enumerable: true,
-  get: function () {
-    return _context.runWithContainer;
-  }
-});
-Object.defineProperty(exports, "useContainer", {
-  enumerable: true,
-  get: function () {
-    return _context.useContainer;
-  }
-});
 
 var _context = require("./context");
 
@@ -55,9 +37,7 @@ const getMiddleware = input => {
   throw new Error(`${input} is not a Middleware`);
 };
 
-const createPipeline = options => {
-  const config = _objectSpread({}, options);
-
+const createPipeline = () => {
   const middlewares = [];
 
   const use = (...inputs) => {
@@ -65,50 +45,35 @@ const createPipeline = options => {
     return pipeline;
   };
 
-  const createCurrentCounter = (hooks, onLast, onLastWithContext) => {
+  const createCurrentCounter = onLast => {
     return (0, _counter.createCounter)((index, input, next) => {
       if (index >= middlewares.length) {
         if (onLast) {
-          if (onLastWithContext) {
-            return (0, _context.runHooks)(() => onLast(input), hooks);
-          }
-
           return onLast(input);
         }
 
         throw new Error(`Expect returning a value, but all middlewares just calling next()`);
       }
 
-      return (0, _context.runHooks)(() => middlewares[index](input, next), hooks);
+      return middlewares[index](input, next);
     });
   };
 
-  const currentContainer = (0, _context.createContainer)(config.contexts);
-  const currentHooks = (0, _context.fromContainer)(currentContainer);
-  const currentCounter = createCurrentCounter(currentHooks);
+  const currentCounter = createCurrentCounter();
 
   const getCounter = options => {
     if (!options) {
       return currentCounter;
     }
 
-    if (options !== null && options !== void 0 && options.container) {
-      const hooks = (0, _context.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);
   };
 
   const run = (input, options) => getCounter(options).start(input);
 
-  const middleware = (input, next) => {
-    const container = (0, _context.useContainer)();
-    return run(input, {
-      container,
-      onLast: next
-    });
-  };
+  const middleware = (input, next) => run(input, {
+    onLast: next
+  });
 
   const pipeline = {
     [PipelineSymbol]: true,
@@ -121,8 +86,8 @@ const createPipeline = options => {
 
 exports.createPipeline = createPipeline;
 
-const createAsyncPipeline = options => {
-  const pipeline = createPipeline(options);
+const createAsyncPipeline = () => {
+  const pipeline = createPipeline();
   return _objectSpread({}, pipeline);
 };
 

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

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createAsyncManager = void 0;
 
-var _farrowPipeline = require("../farrow-pipeline");
-
 var _sync = require("./sync");
 
 var _runner = require("./runner");
 
+var _shared = require("./shared");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -28,7 +28,7 @@ const createAsyncManager = (hooks, api) => {
     currentHooks = _objectSpread(_objectSpread({}, extraHooks), currentHooks);
   };
 
-  const isPlugin = input => (0, _sync.isObject)(input) && (0, _sync.hasOwnProperty)(input, ASYNC_PLUGIN_SYMBOL) && input[ASYNC_PLUGIN_SYMBOL] === ASYNC_PLUGIN_SYMBOL;
+  const isPlugin = input => (0, _shared.isObject)(input) && (0, _shared.hasOwnProperty)(input, ASYNC_PLUGIN_SYMBOL) && input[ASYNC_PLUGIN_SYMBOL] === ASYNC_PLUGIN_SYMBOL;
 
   const pluginAPI = _objectSpread(_objectSpread({}, api), {}, {
     useHookRunners: _runner.useRunner
@@ -38,7 +38,7 @@ const createAsyncManager = (hooks, api) => {
     let plugins = [];
 
     const addPlugin = plugin => {
-      if (!includeAsyncPlugin(plugins, plugin)) {
+      if (!(0, _shared.includePlugin)(plugins, plugin)) {
         plugins.push(_objectSpread({}, plugin));
       }
     };
@@ -53,7 +53,7 @@ const createAsyncManager = (hooks, api) => {
           const options = plugin();
           addPlugin(createPlugin(options.setup, options));
         } // plain plugin object
-        else if ((0, _sync.isObject)(plugin)) {
+        else if ((0, _shared.isObject)(plugin)) {
           addPlugin(createPlugin(plugin.setup, plugin));
         } // unknown plugin
         else {
@@ -90,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 sortedPlugins = sortAsyncPlugins(plugins);
+    const init = async () => {
+      const sortedPlugins = (0, _shared.sortPlugins)(plugins);
 
       const mergedPluginAPI = _objectSpread(_objectSpread({}, pluginAPI), overrideAPI);
 
-      checkAsyncPlugins(sortedPlugins);
-      const hooksList = await Promise.all(sortedPlugins.map(plugin => (0, _farrowPipeline.runWithContainer)(() => plugin.setup(mergedPluginAPI), container)));
-      return (0, _sync.generateRunner)(hooksList, container, currentHooks);
+      (0, _shared.checkPlugins)(sortedPlugins);
+      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,
@@ -125,58 +119,4 @@ const createAsyncManager = (hooks, api) => {
   return clone();
 };
 
-exports.createAsyncManager = createAsyncManager;
-
-const includeAsyncPlugin = (plugins, input) => {
-  for (const plugin of plugins) {
-    if (plugin.name === input.name) {
-      return true;
-    }
-  }
-
-  return false;
-};
-
-const sortAsyncPlugins = input => {
-  let plugins = input.slice();
-
-  for (let i = 0; i < plugins.length; i++) {
-    const plugin = plugins[i];
-
-    for (const pre of plugin.pre) {
-      for (let j = i + 1; j < plugins.length; j++) {
-        if (plugins[j].name === pre) {
-          plugins = [...plugins.slice(0, i), plugins[j], ...plugins.slice(i, j), ...plugins.slice(j + 1, plugins.length)];
-        }
-      }
-    }
-
-    for (const post of plugin.post) {
-      for (let j = 0; j < i; j++) {
-        if (plugins[j].name === post) {
-          plugins = [...plugins.slice(0, j), ...plugins.slice(j + 1, i + 1), plugins[j], ...plugins.slice(i + 1, plugins.length)];
-        }
-      }
-    }
-  }
-
-  return plugins;
-};
-
-const checkAsyncPlugins = plugins => {
-  for (const origin of plugins) {
-    for (const rival of origin.rivals) {
-      for (const plugin of plugins) {
-        if (rival === plugin.name) {
-          throw new Error(`${origin.name} has rival ${plugin.name}`);
-        }
-      }
-    }
-
-    for (const required of origin.required) {
-      if (!plugins.some(plugin => plugin.name === required)) {
-        throw new Error(`The plugin: ${required} is required when plugin: ${origin.name} is exist.`);
-      }
-    }
-  }
-};
+exports.createAsyncManager = createAsyncManager;

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/shared.js

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isObject = exports.includePlugin = exports.hasOwnProperty = exports.checkPlugins = void 0;
+exports.sortPlugins = sortPlugins;
+
+const checkPlugins = plugins => {
+  plugins.forEach(origin => {
+    origin.rivals.forEach(rival => {
+      plugins.forEach(plugin => {
+        if (rival === plugin.name) {
+          throw new Error(`${origin.name} has rival ${plugin.name}`);
+        }
+      });
+    });
+    origin.required.forEach(required => {
+      if (!plugins.some(plugin => plugin.name === required)) {
+        throw new Error(`The plugin: ${required} is required when plugin: ${origin.name} is exist.`);
+      }
+    });
+  });
+};
+
+exports.checkPlugins = checkPlugins;
+
+function sortPlugins(input) {
+  let plugins = input.slice();
+
+  for (let i = 0; i < plugins.length; i++) {
+    const plugin = plugins[i];
+
+    for (const pre of plugin.pre) {
+      for (let j = i + 1; j < plugins.length; j++) {
+        if (plugins[j].name === pre) {
+          plugins = [...plugins.slice(0, i), plugins[j], ...plugins.slice(i, j), ...plugins.slice(j + 1, plugins.length)];
+        }
+      }
+    }
+
+    for (const post of plugin.post) {
+      for (let j = 0; j < i; j++) {
+        if (plugins[j].name === post) {
+          plugins = [...plugins.slice(0, j), ...plugins.slice(j + 1, i + 1), plugins[j], ...plugins.slice(i + 1, plugins.length)];
+        }
+      }
+    }
+  }
+
+  return plugins;
+}
+
+const includePlugin = (plugins, input) => plugins.some(plugin => plugin.name === input.name);
+
+exports.includePlugin = includePlugin;
+
+const isObject = obj => obj !== null && typeof obj === 'object';
+
+exports.isObject = isObject;
+
+const hasOwnProperty = (obj, prop) => obj.hasOwnProperty(prop);
+
+exports.hasOwnProperty = hasOwnProperty;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isObject = exports.hasOwnProperty = exports.generateRunner = exports.createManager = exports.closeHooksMap = exports.cloneHook = exports.DEFAULT_OPTIONS = void 0;
+exports.generateRunner = exports.createManager = exports.closeHooksMap = exports.cloneHook = exports.DEFAULT_OPTIONS = void 0;
 
 var _farrowPipeline = require("../farrow-pipeline");
 
@@ -13,6 +13,8 @@ var _workflow = require("../workflow");
 
 var _runner = require("./runner");
 
+var _shared = require("./shared");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -40,7 +42,7 @@ const createManager = (hooks, api) => {
     currentHooks = _objectSpread(_objectSpread({}, extraHooks), currentHooks);
   };
 
-  const isPlugin = input => isObject(input) && hasOwnProperty(input, SYNC_PLUGIN_SYMBOL) && input[SYNC_PLUGIN_SYMBOL] === SYNC_PLUGIN_SYMBOL;
+  const isPlugin = input => (0, _shared.isObject)(input) && (0, _shared.hasOwnProperty)(input, SYNC_PLUGIN_SYMBOL) && input[SYNC_PLUGIN_SYMBOL] === SYNC_PLUGIN_SYMBOL;
 
   const pluginAPI = _objectSpread(_objectSpread({}, api), {}, {
     useHookRunners: _runner.useRunner
@@ -50,13 +52,13 @@ const createManager = (hooks, api) => {
     let plugins = [];
 
     const addPlugin = plugin => {
-      if (!includePlugin(plugins, plugin)) {
+      if (!(0, _shared.includePlugin)(plugins, plugin)) {
         plugins.push(_objectSpread({}, plugin));
       }
     };
 
     const usePlugin = (...input) => {
-      for (const plugin of input) {
+      input.forEach(plugin => {
         // already created by createPlugin
         if (isPlugin(plugin)) {
           addPlugin(plugin);
@@ -65,14 +67,13 @@ const createManager = (hooks, api) => {
           const options = plugin();
           addPlugin(createPlugin(options.setup, options));
         } // plain plugin object
-        else if (isObject(plugin)) {
+        else if ((0, _shared.isObject)(plugin)) {
           addPlugin(createPlugin(plugin.setup, plugin));
         } // unknown plugin
         else {
           console.warn(`Unknown plugin: ${JSON.stringify(plugin)}`);
         }
-      }
-
+      });
       return manager;
     };
 
@@ -102,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 sortedPlugins = sortPlugins(plugins);
+    const init = () => {
+      const sortedPlugins = (0, _shared.sortPlugins)(plugins);
 
       const mergedPluginAPI = _objectSpread(_objectSpread({}, pluginAPI), overrideAPI);
 
-      checkPlugins(sortedPlugins);
-      const hooksList = sortedPlugins.map(plugin => (0, _farrowPipeline.runWithContainer)(() => plugin.setup(mergedPluginAPI), container));
-      return generateRunner(hooksList, container, currentHooks);
+      (0, _shared.checkPlugins)(sortedPlugins);
+      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,
@@ -139,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);
 
@@ -157,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;
 };
 
@@ -215,66 +209,4 @@ const closeHooksMap = record => {
   return result;
 };
 
-exports.closeHooksMap = closeHooksMap;
-
-const includePlugin = (plugins, input) => {
-  for (const plugin of plugins) {
-    if (plugin.name === input.name) {
-      return true;
-    }
-  }
-
-  return false;
-};
-
-const sortPlugins = input => {
-  let plugins = input.slice();
-
-  for (let i = 0; i < plugins.length; i++) {
-    const plugin = plugins[i];
-
-    for (const pre of plugin.pre) {
-      for (let j = i + 1; j < plugins.length; j++) {
-        if (plugins[j].name === pre) {
-          plugins = [...plugins.slice(0, i), plugins[j], ...plugins.slice(i, j), ...plugins.slice(j + 1, plugins.length)];
-        }
-      }
-    }
-
-    for (const post of plugin.post) {
-      for (let j = 0; j < i; j++) {
-        if (plugins[j].name === post) {
-          plugins = [...plugins.slice(0, j), ...plugins.slice(j + 1, i + 1), plugins[j], ...plugins.slice(i + 1, plugins.length)];
-        }
-      }
-    }
-  }
-
-  return plugins;
-};
-
-const checkPlugins = plugins => {
-  for (const origin of plugins) {
-    for (const rival of origin.rivals) {
-      for (const plugin of plugins) {
-        if (rival === plugin.name) {
-          throw new Error(`${origin.name} has rival ${plugin.name}`);
-        }
-      }
-    }
-
-    for (const required of origin.required) {
-      if (!plugins.some(plugin => plugin.name === required)) {
-        throw new Error(`The plugin: ${required} is required when plugin: ${origin.name} is exist.`);
-      }
-    }
-  }
-};
-
-const isObject = obj => obj !== null && typeof obj === 'object';
-
-exports.isObject = isObject;
-
-const hasOwnProperty = (obj, prop) => obj.hasOwnProperty(prop);
-
-exports.hasOwnProperty = hasOwnProperty;
+exports.closeHooksMap = closeHooksMap;

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,