@putout/engine-loader 9.1.0 → 9.2.1

package/README.md

@@ -15,14 +15,14 @@ npm i @putout/engine-loader
 
 Loader supports two kinds of plugins:
 
-- ☝️ [**Onerule Plugin**](#simple-plugin)
-- ☝️ [**Multirule Plugin**](#multirule-plugin)
+- ☝️ [**Simple**](#simple-plugin)
+- ☝️ [**Nested**](#nested-plugin)
 
-### Onerule Plugin
+### Simple Plugin
 
 Simplest type of plugin support by [`@putout/engine-runner`](https://github.com/coderaiser/putout/tree/master/packages/engine-runner#supported-plugin-types), contains one rule.
 
-### Multirule Plugin
+### Nested Plugin
 
 Nested contains one or more rules:
 
@@ -82,6 +82,19 @@ const plugins = loadPlugins({
 });
 ```
 
+When you need to use imported babel plugin use `babelPlugin`:
+
+```js
+import {babelPlugin} from '@putout/engine-loader';
+import transformBlockScoping from '@babel/plugin-transform-block-scoping';
+
+const plugins = loadPlugins({
+    pluginNames: [
+        ['babel/transform-inline-consecutive-adds', babelPlugin(transformBlockScoping, 'Optional message')],
+    ],
+});
+```
+
 ### loadProcessorsAsync
 
 ```js
@@ -104,13 +117,12 @@ Gives ability to create loader for `processor` or `formatter`.
 const {createAsyncLoader} = require('@putout/engine-loader');
 const {loadProcessor} = createAsyncLoader('processor');
 
+// load @putout/processor-markdown
 await loadProcessors('markdown');
-// loads @putout/processor-markdown
-
+// load @putout/processor-json using custom loader
 await loadProcess('json', () => {
     return Promise.resolve(`will be called instead of 'import'`);
 });
-// loads @putout/processor-json using custom loader
 ```
 
 ## License

package/lib/async-loader.js

@@ -47,4 +47,3 @@ async function cleverLoad(names, load = simpleImport) {
     
     return [e];
 }
-

package/lib/build-paths.js

@@ -3,8 +3,13 @@
 const addNodeModules = (a) => `${a}/node_modules`;
 
 module.exports = (path) => {
-    const names = path.split('/').slice(1);
-    const result = [''];
+    const names = path
+        .split('/')
+        .slice(1);
+    
+    const result = [
+        '',
+    ];
     
     let current = '';
     
@@ -13,7 +18,5 @@ module.exports = (path) => {
         result.push(current);
     }
     
-    return result
-        .map(addNodeModules);
+    return result.map(addNodeModules);
 };
-

package/lib/get-positions-by-diff.js

@@ -66,4 +66,3 @@ function diffLineMode(text1, text2) {
     
     return diffs;
 }
-

package/lib/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const memo = require('nano-memoize');
+const {nanomemoize} = require('nano-memoize');
 
 const isEnabled = require('./is-enabled');
 const {loadPlugin} = require('./load');
@@ -10,10 +10,12 @@ const parseProcessorNames = require('./parse-processor-names');
 const parseRules = require('./parse-rules');
 const validateRules = require('./validate-rules');
 const validatePlugin = require('./validate-plugin');
+const {babelPlugin} = require('./wrap-plugin');
 
 const isString = (a) => typeof a === 'string';
 
 const defaultOptions = () => Object.create(null);
+
 const mergeRules = ([rule, plugin], rules) => {
     for (const currentRule of rules) {
         if (currentRule.rule !== rule)
@@ -40,12 +42,10 @@ const mergeRules = ([rule, plugin], rules) => {
     };
 };
 
-module.exports.loadProcessorsAsync = memo(async (options, load) => {
+module.exports.loadProcessorsAsync = nanomemoize(async (options, load) => {
     check(options);
     
-    const {
-        processors = [],
-    } = options;
+    const {processors = []} = options;
     
     const parsedProcessors = parseProcessorNames(processors);
     const loadProcessor = createAsyncLoader('processor');
@@ -66,18 +66,18 @@ module.exports.loadProcessorsAsync = memo(async (options, load) => {
 
 module.exports.createAsyncLoader = createAsyncLoader;
 
+module.exports.babelPlugin = babelPlugin;
+
 module.exports.loadPlugins = (options) => {
     check(options);
     
-    const {
-        pluginNames = [],
-        rules = {},
-    } = options;
+    const {pluginNames = [], rules = {}} = options;
     
     const cookedRules = parseRules(rules);
     const loadedRules = getLoadedRules(cookedRules);
     
     const items = parsePluginNames(pluginNames);
+    
     const plugins = loadPlugins({
         items,
         loadedRules,
@@ -99,7 +99,10 @@ module.exports.loadPlugins = (options) => {
         if (!isEnabled(name, cookedRules))
             continue;
         
-        result.push(mergeRules([name, plugin], cookedRules));
+        result.push(mergeRules(
+            [name, plugin],
+            cookedRules,
+        ));
     }
     
     return result;
@@ -151,7 +154,10 @@ function loadPlugins({items, loadedRules}) {
             namespace,
         });
         
-        validatePlugin({plugin, rule});
+        validatePlugin({
+            plugin,
+            rule,
+        });
         
         const {rules} = plugin;
         
@@ -160,10 +166,7 @@ function loadPlugins({items, loadedRules}) {
             continue;
         }
         
-        plugins.push([
-            rule,
-            plugin,
-        ]);
+        plugins.push([rule, plugin]);
     }
     
     return plugins;
@@ -192,4 +195,3 @@ function checkRule(rule) {
     if (!isString(rule))
         throw Error(`☝️ Looks like plugin name type is not 'string', but: '${typeof rule}'`);
 }
-

package/lib/is-enabled.js

@@ -13,4 +13,3 @@ module.exports = (name, rules) => {
     
     return true;
 };
-

package/lib/load.js

@@ -63,4 +63,3 @@ function getModulePath(name) {
     
     return [path, customRequire];
 }
-

package/lib/parse-plugin-names.js

@@ -24,4 +24,3 @@ module.exports = (plugins) => {
     
     return result;
 };
-

package/lib/parse-processor-names.js

@@ -34,4 +34,3 @@ module.exports = (plugins) => {
     
     return result;
 };
-

package/lib/parse-rules.js

@@ -67,7 +67,11 @@ function parseArray(rule, args) {
     const state = parseState(rule, rawState);
     
     if (args.length === 3) {
-        const [, msg, options] = args;
+        const [
+            ,
+            msg,
+            options,
+        ] = args;
         
         return {
             rule,
@@ -144,4 +148,3 @@ function parseSubrules(rules) {
     
     return newRules;
 }
-

package/lib/simple-import.js

@@ -5,4 +5,3 @@ module.exports.simpleImport = async (url) => {
     const result = await import(url);
     return result.default || result;
 };
-

package/lib/transforms/babel.js

@@ -5,15 +5,18 @@ const {
     transformFromAstSync,
 } = require('@babel/core');
 
+const isString = (a) => typeof a === 'string';
+
 module.exports = (ast, code, name) => {
+    const plugin = !isString(name) ? name : require(name);
+    
     transformFromAstSync(ast, code, {
         cloneInputAst: false,
         plugins: [
             // globally installed modules support
-            createConfigItem(require(name)),
+            createConfigItem(plugin),
         ],
     });
     
     return ast;
 };
-

package/lib/validate-plugin.js

@@ -20,4 +20,3 @@ module.exports = ({plugin, rule}) => {
     
     throw Error(`☝️ Cannot determine type of plugin '${rule}'. Here is list of supported plugins: https://git.io/JqcMn`);
 };
-

package/lib/validate-rules.js

@@ -5,7 +5,9 @@ const parse = (rule) => {
         return rule;
     
     if (rule.includes('/'))
-        return rule.split('/').shift();
+        return rule
+            .split('/')
+            .shift();
     
     return rule;
 };
@@ -32,4 +34,3 @@ module.exports = ({items, rules}) => {
             throw Error(`No plugin found for a rule: "${rule}"`);
     }
 };
-

package/lib/wrap-plugin.js

@@ -7,9 +7,9 @@ const getPositions = require('./get-positions-by-diff');
 
 const babelTransform = require('./transforms/babel');
 
-const getMessage = (a) => a
-    .replace(/@babel\/plugin-|babel-plugin-/, '')
-    .replaceAll('-', ' ');
+const BABEL_REG = /@babel\/plugin-|babel-plugin-/;
+
+const getMessage = (a) => a.replace(BABEL_REG, '').replaceAll('-', ' ');
 
 const getModulePath = (name) => {
     const [, path] = tryCatch(require.resolve, name);
@@ -59,6 +59,14 @@ const getPlugin = ({name, transform, message}) => ({
     },
 });
 
+module.exports.babelPlugin = (plugin, message) => {
+    return getPlugin({
+        name: plugin,
+        transform: babelTransform,
+        message,
+    });
+};
+
 function getBabelPluginName(name) {
     const namespaced = getModulePath(`@babel/plugin-${name}`);
     
@@ -67,4 +75,3 @@ function getBabelPluginName(name) {
     
     return `babel-plugin-${name}`;
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-loader",
-  "version": "9.1.0",
+  "version": "9.2.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "load plugins and prepare them to run",
@@ -27,7 +27,7 @@
     "@babel/core": "^7.12.3",
     "@putout/engine-parser": "^6.1.0",
     "diff-match-patch": "^1.0.4",
-    "nano-memoize": "^2.0.0",
+    "nano-memoize": "^3.0.11",
     "once": "^1.4.0",
     "try-catch": "^3.0.0",
     "try-to-catch": "^3.0.1"
@@ -48,9 +48,10 @@
     "@putout/processor-javascript": "*",
     "@putout/processor-markdown": "*",
     "babel-plugin-angularjs-annotate": "https://github.com/putoutjs/babel-plugin-angularjs-annotate",
+    "babel-plugin-transform-inline-consecutive-adds": "^0.4.3",
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
-    "eslint-plugin-n": "^15.2.4",
+    "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-putout": "^17.0.0",
     "estrace": "*",
     "just-camel-case": "^4.0.2",