@putout/engine-loader 12.1.0 → 12.3.0

package/lib/index.js

@@ -17,8 +17,8 @@ const {
 } = require('./rules');
 
 const {filterEnabledPlugins} = require('./plugins/filter-enabled-plugins');
-
 const {check, checkRule} = require('./check');
+const {isArray} = Array;
 
 module.exports.loadPluginsAsync = loadPluginsAsync;
 module.exports.loadProcessorsAsync = nanomemoize(async (options, load) => {
@@ -74,6 +74,14 @@ function splitRule(rule) {
     return [rule, 'putout'];
 }
 
+function parseRule(rule) {
+    return rule
+        .replace('import:@putout/plugin-', '')
+        .replace('@putout/plugin-', '');
+}
+
+const maybeFromTuple = (a) => isArray(a) ? a[1] : a;
+
 function loadPlugins({items, loadedRules}) {
     const plugins = [];
     
@@ -82,9 +90,10 @@ function loadPlugins({items, loadedRules}) {
             continue;
         
         checkRule(rule);
+        const parsedRule = parseRule(rule);
         
         const [name, namespace] = splitRule(rule);
-        const plugin = itemPlugin || loadPlugin({
+        const plugin = maybeFromTuple(itemPlugin) || loadPlugin({
             name,
             namespace,
         });
@@ -97,11 +106,11 @@ function loadPlugins({items, loadedRules}) {
         const {rules} = plugin;
         
         if (rules) {
-            plugins.push(...extendRules(rule, rules));
+            plugins.push(...extendRules(parsedRule, rules));
             continue;
         }
         
-        plugins.push([rule, plugin]);
+        plugins.push([parsedRule, plugin]);
     }
     
     return plugins;

package/lib/load/load.js

@@ -52,13 +52,7 @@ const {PUTOUT_YARN_PNP = 'putout'} = process.env;
 const createCustomRequire = once(() => createRequire(require.resolve(PUTOUT_YARN_PNP)));
 const createPutoutRequire = once(() => createRequire(require.resolve('putout')));
 
-// That's all for Yarn P'n'P
-//
-// We need to create a couple version of require for plugins, formatters and processors:
-// - declared in 🐊Putout package.json;
-// - declared in module that want to extend 🐊Putout;
-//
-// https://yarnpkg.com/advanced/rulebook#modules-shouldnt-hardcode-node_modules-paths-to-access-other-modules
+// That's all for Yarn P'n'P//// We need to create a couple version of require for plugins, formatters and processors:// - declared in 🐊Putout package.json;// - declared in module that want to extend 🐊Putout;//// https://yarnpkg.com/advanced/rulebook#modules-shouldnt-hardcode-node_modules-paths-to-access-other-modules
 function getModulePath(name) {
     let path;
     

package/lib/plugins/filter-enabled-plugins.js

@@ -2,6 +2,9 @@
 
 const {isEnabled, mergeRules} = require('../rules');
 
+const {isArray} = Array;
+const maybeTuple = (a) => isArray(a) ? a : ['on', a];
+
 // Would be great to have ability to filter
 // disabled plugins and prevent them from loading
 // but we can't because of a way multi-rule plugins
@@ -14,11 +17,28 @@ module.exports.filterEnabledPlugins = ({plugins, cookedRules}) => {
         if (!isEnabled(name, cookedRules))
             continue;
         
+        const [status, currentPlugin] = maybeTuple(plugin);
+        
+        if (!isExectRuleEnabled(name, status, cookedRules))
+            continue;
+        
         result.push(mergeRules(
-            [name, plugin],
+            [name, currentPlugin],
             cookedRules,
         ));
     }
     
     return result;
 };
+
+function isExectRuleEnabled(name, status, rules) {
+    if (status === 'on')
+        return true;
+    
+    for (const {rule, state} of rules) {
+        if (rule.includes('/') && RegExp(`^${rule}`).test(name))
+            return state;
+    }
+    
+    return false;
+}

package/lib/rules/is-enabled.js

@@ -1,6 +1,11 @@
 'use strict';
 
 module.exports.isEnabled = (name, rules) => {
+    for (const {rule, state} of rules) {
+        if (rule.includes('/') && RegExp(`^${rule}`).test(name))
+            return state;
+    }
+    
     for (const {rule, state} of rules) {
         if (rule === name)
             return state;

package/lib/rules/validate-rules.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const parse = (rule) => {
+const parseSlashes = (rule) => {
     if (rule.includes('/'))
         return rule
             .split('/')
@@ -9,6 +9,12 @@ const parse = (rule) => {
     return rule;
 };
 
+const parsePluginName = (a) => {
+    return a
+        .replace('import:@putout/plugin-', '')
+        .replace('@putout/plugin-', '');
+};
+
 module.exports.validateRules = ({items, rules}) => {
     const ruleItems = Object.keys(rules);
     
@@ -17,8 +23,10 @@ module.exports.validateRules = ({items, rules}) => {
         let isWithSlash = false;
         
         for (const [pluginName, plugin = {}] of items) {
-            isName = pluginName === rule;
-            isWithSlash = pluginName === parse(rule);
+            const parsedPluginName = parsePluginName(pluginName);
+            
+            isName = parsedPluginName === rule;
+            isWithSlash = parsedPluginName === parseSlashes(rule);
             
             if (isName && plugin.rules)
                 throw Error(`Rule "${rule}" cannot be applied to nested plugin "${pluginName}"`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-loader",
-  "version": "12.1.0",
+  "version": "12.3.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "load plugins and prepare them to run",
@@ -43,13 +43,14 @@
     "@putout/formatter-progress": "*",
     "@putout/plugin-apply-nullish-coalescing": "*",
     "@putout/plugin-convert-commonjs-to-esm": "*",
+    "@putout/plugin-nodejs": "*",
     "@putout/plugin-remove-unused-variables": "*",
     "@putout/processor-javascript": "*",
     "@putout/processor-markdown": "*",
     "c8": "^8.0.0",
     "eslint": "^8.0.1",
     "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-putout": "^20.0.0",
+    "eslint-plugin-putout": "^21.0.0",
     "estrace": "*",
     "just-camel-case": "^4.0.2",
     "lerna": "^6.0.1",