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

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @modern-js/plugin
 
+## 1.4.0-alpha.0
+
+### Minor Changes
+
+- f29e9bacf: feat(plugin): simplify context usage, no longer depend on containers
+
+## 1.3.8
+
+### Patch Changes
+
+- b7302f781: Export some required types
+- e0e708f83: perf(app-tools): speed up modern start command
+
+## 1.3.7
+
+### Patch Changes
+
+- 1ac68424f: chore(plugin): extract same utils to shared
+
 ## 1.3.6
 
 ### Patch Changes

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

@@ -2,39 +2,30 @@
  * 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";
-const ContextSymbol = Symbol.for('MODERN_CONTEXT');
 export 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,
@@ -44,56 +35,4 @@ export const createContext = value => {
   };
 
   return create(value);
-};
-
-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;
-};
-
-export 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
-  });
-};
-const {
-  run,
-  hooks
-} = createHooks({
-  useContainer: () => {
-    throw new Error(`Can't call useContainer out of scope, it should be placed on top of the function`);
-  }
-});
-export const runHooks = run;
-export const {
-  useContainer
-} = hooks;
-export const fromContainer = container => ({
-  useContainer: () => {
-    return container;
-  }
-});
-export const runWithContainer = (f, container) => runHooks(f, fromContainer(container));
+};

package/dist/js/modern/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/modern/farrow-pipeline/pipeline.js

@@ -8,9 +8,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 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 const isPipeline = input => Boolean(input === null || input === void 0 ? void 0 : input[PipelineSymbol]);
 const PipelineSymbol = Symbol.for('MODERN_PIPELINE');
 
@@ -24,9 +24,7 @@ const getMiddleware = input => {
   throw new Error(`${input} is not a Middleware`);
 };
 
-export const createPipeline = options => {
-  const config = _objectSpread({}, options);
-
+export const createPipeline = () => {
   const middlewares = [];
 
   const use = (...inputs) => {
@@ -34,50 +32,35 @@ export const createPipeline = options => {
     return pipeline;
   };
 
-  const createCurrentCounter = (hooks, onLast, onLastWithContext) => {
+  const createCurrentCounter = onLast => {
     return createCounter((index, input, next) => {
       if (index >= middlewares.length) {
         if (onLast) {
-          if (onLastWithContext) {
-            return runHooks(() => onLast(input), hooks);
-          }
-
           return onLast(input);
         }
 
         throw new Error(`Expect returning a value, but all middlewares just calling next()`);
       }
 
-      return runHooks(() => middlewares[index](input, next), hooks);
+      return middlewares[index](input, next);
     });
   };
 
-  const currentContainer = createContainer(config.contexts);
-  const currentHooks = 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 = 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 = useContainer();
-    return run(input, {
-      container,
-      onLast: next
-    });
-  };
+  const middleware = (input, next) => run(input, {
+    onLast: next
+  });
 
   const pipeline = {
     [PipelineSymbol]: true,
@@ -87,7 +70,7 @@ export const createPipeline = options => {
   };
   return pipeline;
 };
-export const createAsyncPipeline = options => {
-  const pipeline = createPipeline(options);
+export const createAsyncPipeline = () => {
+  const pipeline = createPipeline();
   return _objectSpread({}, pipeline);
 };

package/dist/js/modern/manager/async.js

@@ -4,9 +4,9 @@ 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 "../farrow-pipeline";
-import { isObject, generateRunner, hasOwnProperty, DEFAULT_OPTIONS } from "./sync";
+import { generateRunner, DEFAULT_OPTIONS } from "./sync";
 import { useRunner } from "./runner";
+import { checkPlugins, isObject, hasOwnProperty, sortPlugins, includePlugin } from "./shared";
 const ASYNC_PLUGIN_SYMBOL = 'ASYNC_PLUGIN_SYMBOL';
 export const createAsyncManager = (hooks, api) => {
   let index = 0;
@@ -27,7 +27,7 @@ export const createAsyncManager = (hooks, api) => {
     let plugins = [];
 
     const addPlugin = plugin => {
-      if (!includeAsyncPlugin(plugins, plugin)) {
+      if (!includePlugin(plugins, plugin)) {
         plugins.push(_objectSpread({}, plugin));
       }
     };
@@ -79,23 +79,17 @@ export const createAsyncManager = (hooks, api) => {
       plugins = [];
     };
 
-    const currentContainer = 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 = sortPlugins(plugins);
 
       const mergedPluginAPI = _objectSpread(_objectSpread({}, pluginAPI), overrideAPI);
 
-      checkAsyncPlugins(sortedPlugins);
-      const hooksList = await Promise.all(sortedPlugins.map(plugin => runWithContainer(() => plugin.setup(mergedPluginAPI), container)));
-      return generateRunner(hooksList, container, currentHooks);
+      checkPlugins(sortedPlugins);
+      const hooksList = await Promise.all(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 runWithContainer(cb, container);
-    };
+    const run = cb => cb();
 
     const manager = {
       createPlugin,
@@ -112,58 +106,4 @@ export const createAsyncManager = (hooks, api) => {
   };
 
   return clone();
-};
-
-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.`);
-      }
-    }
-  }
 };

package/dist/js/modern/manager/runner.js

@@ -1,11 +1,3 @@
 import { createContext } from "../farrow-pipeline";
 export const RunnerContext = createContext(null);
-export 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;
-};
+export const useRunner = () => RunnerContext.get();

package/dist/js/modern/manager/shared.js

@@ -0,0 +1,44 @@
+export 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.`);
+      }
+    });
+  });
+};
+export 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;
+}
+export const includePlugin = (plugins, input) => plugins.some(plugin => plugin.name === input.name);
+export const isObject = obj => obj !== null && typeof obj === 'object';
+export const hasOwnProperty = (obj, prop) => obj.hasOwnProperty(prop);

package/dist/js/modern/manager/sync.js

@@ -4,10 +4,11 @@ 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 { 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";
+import { checkPlugins, hasOwnProperty, includePlugin, isObject, sortPlugins } from "./shared";
 const SYNC_PLUGIN_SYMBOL = 'SYNC_PLUGIN_SYMBOL';
 export const DEFAULT_OPTIONS = {
   name: 'untitled',
@@ -43,7 +44,7 @@ export const createManager = (hooks, api) => {
     };
 
     const usePlugin = (...input) => {
-      for (const plugin of input) {
+      input.forEach(plugin => {
         // already created by createPlugin
         if (isPlugin(plugin)) {
           addPlugin(plugin);
@@ -58,8 +59,7 @@ export const createManager = (hooks, api) => {
         else {
           console.warn(`Unknown plugin: ${JSON.stringify(plugin)}`);
         }
-      }
-
+      });
       return manager;
     };
 
@@ -89,23 +89,17 @@ export const createManager = (hooks, api) => {
       plugins = [];
     };
 
-    const currentContainer = createContainer();
-
-    const init = options => {
-      const container = (options === null || options === void 0 ? void 0 : options.container) || currentContainer;
+    const init = () => {
       const sortedPlugins = sortPlugins(plugins);
 
       const mergedPluginAPI = _objectSpread(_objectSpread({}, pluginAPI), overrideAPI);
 
       checkPlugins(sortedPlugins);
-      const hooksList = sortedPlugins.map(plugin => 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 runWithContainer(cb, container);
-    };
+    const run = cb => cb();
 
     const manager = {
       createPlugin,
@@ -123,7 +117,7 @@ export const createManager = (hooks, api) => {
 
   return clone();
 };
-export const generateRunner = (hooksList, container, hooksMap) => {
+export const generateRunner = (hooksList, hooksMap) => {
   const runner = {};
   const cloneShape = closeHooksMap(hooksMap);
 
@@ -141,13 +135,11 @@ export 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(RunnerContext, runner);
+  RunnerContext.set(runner);
   return runner;
 };
 export const cloneHook = hook => {
@@ -191,61 +183,4 @@ export const closeHooksMap = record => {
   }
 
   return result;
-};
-
-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.`);
-      }
-    }
-  }
-};
-
-export const isObject = obj => obj !== null && typeof obj === 'object';
-export const hasOwnProperty = (obj, prop) => obj.hasOwnProperty(prop);
+};

package/dist/js/modern/waterfall/async.js

@@ -4,7 +4,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 { createAsyncPipeline, useContainer } from "../farrow-pipeline";
+import { createAsyncPipeline } from "../farrow-pipeline";
 const ASYNC_WATERFALL_SYMBOL = Symbol.for('MODERN_ASYNC_WATERFALL');
 export const getAsyncBrook = input => {
   if (typeof input === 'function') {
@@ -28,9 +28,7 @@ export const createAsyncWaterfall = () => {
   }));
 
   const middleware = input => {
-    const container = useContainer();
     return pipeline.run(input, {
-      container,
       onLast: input => input
     });
   };

package/dist/js/modern/waterfall/sync.js

@@ -4,7 +4,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 { useContainer, createPipeline } from "../farrow-pipeline";
+import { createPipeline } from "../farrow-pipeline";
 const WATERFALL_SYMBOL = Symbol.for('MODERN_WATERFALL');
 export const getBrook = input => {
   if (typeof input === 'function') {
@@ -28,9 +28,7 @@ export const createWaterfall = () => {
   }));
 
   const middleware = input => {
-    const container = useContainer();
     return pipeline.run(input, {
-      container,
       onLast: input => input
     });
   };

package/dist/js/modern/workflow/async.js

@@ -15,10 +15,10 @@ export 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/modern/workflow/parallel.js

@@ -15,9 +15,9 @@ export 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/modern/workflow/sync.js

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