@putout/engine-loader 4.5.0 → 4.9.0

package/README.md

@@ -1,9 +1,7 @@
-# @putout/engine-loader [![NPM version][NPMIMGURL]][NPMURL] [![Dependency Status][DependencyStatusIMGURL]][DependencyStatusURL]
+# @putout/engine-loader [![NPM version][NPMIMGURL]][NPMURL]
 
 [NPMIMGURL]: https://img.shields.io/npm/v/@putout/engine-loader.svg?style=flat&longCache=true
 [NPMURL]: https://npmjs.org/package/@putout/engine-loader"npm"
-[DependencyStatusURL]: https://david-dm.org/coderaiser/putout?path=packages/engine-loader
-[DependencyStatusIMGURL]: https://david-dm.org/coderaiser/putout.svg?path=packages/engine-loader
 
 Load putout `plugins`, `processors`.
 

package/lib/load.js

@@ -11,6 +11,9 @@ function getPath(namespace, type, name) {
     if (!path)
         path = getModulePath(`${namespace}-${type}-${name}`);
     
+    if (!path)
+        path = getModulePath(name);
+    
     return path;
 }
 

package/lib/parse-rules.js

@@ -7,8 +7,9 @@ const isObj = (a) => typeof a === 'object';
 const {entries} = Object;
 const {stringify} = JSON;
 
-const notSupportedError = (a) => Error(`Rule format not supported ${a}: ${typeof a}`);
-const rulesUsedInsteadOfMatchError = (a) => Error(`Looks like you need to change "rules" to "match" for ${stringify(a)}`);
+const notSupportedError = (a) => Error(`☝️ Rule format not supported ${a}: ${typeof a}`);
+const rulesUsedInsteadOfMatchError = (a) => Error(`☝️ Looks like you need to change "rules" to "match" for ${stringify(a)}`);
+const stateOptionError = ({rule, value}) => Error(`☝️ ${rule}: state option can be "on" or "off" only, when used as string, received: "${value}"`);
 const defaultOptions = () => Object.create(null);
 const parseState = (rule, value) => validateState(rule, value) && value === 'on' || value !== 'off';
 
@@ -122,7 +123,10 @@ function validateState(rule, value) {
     if (isObj(value))
         return true;
     
-    throw Error(`${rule}: state option can be "on" or "off" only, when used as string, received: "${value}"`);
+    throw stateOptionError({
+        rule,
+        value,
+    });
 }
 
 const cut = (a) => a.split('/')[0];

package/lib/validate-plugin.js

@@ -17,6 +17,6 @@ module.exports = ({plugin, rule}) => {
             return;
     }
     
-    throw Error(`Plugin "${rule}" type cannot be determined. Supported plugin types: https://git.io/JqcMn`);
+    throw Error(`☝️ Plugin "${rule}" type cannot be determined. Supported plugin types: https://git.io/JqcMn`);
 };
 

package/lib/validate-rules.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const shift = ([a]) => a;
 const parse = (rule) => {
     if (/^(babel|jscodeshift)\//.test(rule))
         return rule;
@@ -13,14 +12,24 @@ const parse = (rule) => {
 
 module.exports = ({items, rules}) => {
     const ruleItems = Object.keys(rules);
-    const plugins = items.map(shift);
     
     for (const rule of ruleItems) {
-        const isWithSlash = plugins.includes(parse(rule));
-        const isName = plugins.includes(rule);
+        let isName = false;
+        let isWithSlash = false;
+        
+        for (const [pluginName, plugin = {}] of items) {
+            isName = pluginName === rule;
+            isWithSlash = pluginName === parse(rule);
+            
+            if (isName && plugin.rules)
+                throw Error(`Rule "${rule}" cannot be applied to nested plugin "${pluginName}"`);
+            
+            if (isName || isWithSlash)
+                break;
+        }
         
         if (!isName && !isWithSlash)
-            throw Error(`no plugin found for a rule: "${rule}"`);
+            throw Error(`No plugin found for a rule: "${rule}"`);
     }
 };
 

package/lib/wrap-plugin.js

@@ -31,35 +31,34 @@ module.exports = (name, namespace) => {
     return null;
 };
 
-const getPlugin = ({name, transform, message}) => {
-    return {
-        report: () => message,
-        fix: () => {},
-        find(ast, {push}) {
-            const oldCode = print(ast);
-            transform(ast, oldCode, name);
-            const newCode = print(ast);
+const getPlugin = ({name, transform, message}) => ({
+    report: () => message,
+    fix: () => {},
+    
+    find(ast, {push}) {
+        const oldCode = print(ast);
+        transform(ast, oldCode, name);
+        const newCode = print(ast);
+        
+        if (newCode === oldCode)
+            return;
+        
+        const positions = getPositions(oldCode, newCode);
+        for (const start of positions) {
+            const node = {
+                loc: {
+                    start,
+                },
+            };
             
-            if (newCode === oldCode)
-                return;
+            const path = {
+                node,
+            };
             
-            const positions = getPositions(oldCode, newCode);
-            for (const start of positions) {
-                const node = {
-                    loc: {
-                        start,
-                    },
-                };
-                
-                const path = {
-                    node,
-                };
-                
-                push(path);
-            }
-        },
-    };
-};
+            push(path);
+        }
+    },
+});
 
 function getBabelPluginName(name) {
     const namespaced = getModulePath(`@babel/plugin-${name}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-loader",
-  "version": "4.5.0",
+  "version": "4.9.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "load plugins and prepare them to run",
   "homepage": "http://github.com/coderaiser/putout",
@@ -43,10 +43,10 @@
     "@putout/plugin-remove-unused-variables": "*",
     "@putout/processor-markdown": "*",
     "c8": "^7.5.0",
-    "eslint": "^7.0.0",
+    "eslint": "^8.0.1",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^8.0.0",
-    "estrace": "^2.1.0",
+    "eslint-plugin-putout": "^11.0.0",
+    "estrace": "^3.0.2",
     "js-codemod": "^7.0.0",
     "just-camel-case": "^4.0.2",
     "lerna": "^4.0.0",
@@ -55,7 +55,7 @@
     "montag": "^1.0.0",
     "nodemon": "^2.0.1",
     "putout": "*",
-    "supertape": "^5.0.0"
+    "supertape": "^6.0.0"
   },
   "license": "MIT",
   "engines": {