@putout/engine-loader 12.0.0 → 12.2.0

package/lib/index.js

@@ -17,7 +17,6 @@ const {
 } = require('./rules');
 
 const {filterEnabledPlugins} = require('./plugins/filter-enabled-plugins');
-
 const {check, checkRule} = require('./check');
 
 module.exports.loadPluginsAsync = loadPluginsAsync;
@@ -74,6 +73,12 @@ function splitRule(rule) {
     return [rule, 'putout'];
 }
 
+function parseRule(rule) {
+    return rule
+        .replace('import:@putout/plugin-', '')
+        .replace('@putout/plugin-', '');
+}
+
 function loadPlugins({items, loadedRules}) {
     const plugins = [];
     
@@ -82,6 +87,7 @@ function loadPlugins({items, loadedRules}) {
             continue;
         
         checkRule(rule);
+        const parsedRule = parseRule(rule);
         
         const [name, namespace] = splitRule(rule);
         const plugin = itemPlugin || loadPlugin({
@@ -97,11 +103,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/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/parse-rules.js

@@ -11,7 +11,18 @@ const notSupportedError = (a) => Error(`☝️ Rule format not supported ${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';
+
+const parseState = (rule, value) => {
+    validateState(rule, value);
+    
+    if (value === 'on')
+        return true;
+    
+    if (value === 'off')
+        return false;
+    
+    return value;
+};
 
 module.exports.parseRules = (rules) => {
     rules = parseSubrules(rules);

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.0.0",
+  "version": "12.2.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "load plugins and prepare them to run",
@@ -49,7 +49,7 @@
     "c8": "^8.0.0",
     "eslint": "^8.0.1",
     "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-putout": "^19.0.0",
+    "eslint-plugin-putout": "^21.0.0",
     "estrace": "*",
     "just-camel-case": "^4.0.2",
     "lerna": "^6.0.1",