@putout/engine-runner 23.4.1 → 23.6.0

package/lib/merge-visitors.js

@@ -84,10 +84,7 @@ module.exports = (pluginsToMerge, {fix, shebang, template}) => {
     
     const entries = Object.entries(pushed);
     
-    const visitor = {
-        //shouldSkip,
-        ...merge(mergeItems),
-    };
+    const visitor = merge(mergeItems);
     
     return {
         entries,

package/lib/replace/find-path.js

@@ -16,10 +16,13 @@ module.exports = (parentPath) => {
     
     return path.join('.');
 };
+
 function findKey(path, parent) {
     const {node} = path;
+    let key;
+    let value;
     
-    for (const [key, value] of entries(parent)) {
+    for ([key, value] of entries(parent)) {
         if (isArray(value)) {
             const index = value.indexOf(node);
             
@@ -30,6 +33,8 @@ function findKey(path, parent) {
         }
         
         if (value === node)
-            return key;
+            break;
     }
+    
+    return key;
 }

package/lib/replace/index.js

@@ -39,27 +39,31 @@ const log = (from, path) => {
 };
 
 const {keys, entries} = Object;
-
 const {stringify} = JSON;
 
 const stub = () => [];
 const stubMatch = () => ({});
 const packKeys = (a) => () => keys(a);
-const isObj = (a) => typeof a === 'object';
+const isObject = (a) => typeof a === 'object';
 
 module.exports = ({rule, plugin, msg, options}) => {
+    const maybeMatch = plugin.match || stubMatch;
+    const match = maybeMatch({
+        options,
+    });
+    
     const {
         report,
         exclude = stub,
         replace,
-        filter = getFilter(plugin.match, options),
+        filter = getFilter(match),
     } = plugin;
     
     const replaceItems = replace({
         options,
     });
     
-    const fix = getFix(replaceItems);
+    const fix = getFix(replaceItems, match);
     const include = packKeys(replaceItems);
     
     return {
@@ -96,9 +100,6 @@ const fix = (from, to, path) => {
     if (mark.has())
         return;
     
-    if (!compare(path, nodeFrom, {findUp: false}))
-        return;
-    
     const waysFrom = findVarsWays(nodeFrom);
     const {node} = path;
     
@@ -138,45 +139,55 @@ const fix = (from, to, path) => {
     log(from, newPath);
 };
 
-const getFix = (items) => (path) => {
-    for (const [from, to] of entries(items))
-        fix(from, to, path);
+const getFix = (items, match) => (path) => {
+    for (const [from, to] of entries(items)) {
+        const nodeFrom = template.ast(from);
+        
+        if (compare(path, nodeFrom, {findUp: false})) {
+            const matchFn = match[from];
+            
+            if (!matchFn || runMatch(path, nodeFrom, matchFn))
+                fix(from, to, path);
+        }
+    }
 };
 
-const getFilter = (match = stubMatch, options) => (path) => {
-    const all = entries(match({
-        options,
-    }));
+const getFilter = (match) => (path) => {
+    const all = entries(match);
     
     for (const [from, matchProperty] of all) {
         const nodeFrom = template.ast(from);
         
-        if (!compare(path.node, nodeFrom))
+        if (!compare(path.node, nodeFrom, {findUp: false}))
             continue;
         
-        const waysFrom = findVarsWays(nodeFrom);
-        const {node} = path;
-        
-        const values = getValues({
-            waysFrom,
-            node,
-        });
-        
-        validateMatchProperty(matchProperty);
-        
-        return matchProperty(values, path);
+        return runMatch(path, nodeFrom, matchProperty);
     }
     
     return true;
 };
 
+function runMatch(path, nodeFrom, matchProperty) {
+    const waysFrom = findVarsWays(nodeFrom);
+    const {node} = path;
+    
+    const values = getValues({
+        waysFrom,
+        node,
+    });
+    
+    validateMatchProperty(matchProperty);
+    
+    return matchProperty(values, path);
+}
+
 function parseTo(to, values, path) {
     const toStr = isFn(to) ? to(values, path) : to;
     
     if (!toStr)
         return null;
     
-    if (isObj(toStr) && toStr.type) {
+    if (isObject(toStr) && toStr.type) {
         toStr.__putout_replace_cooked = true;
         return toStr;
     }

package/lib/replace/watermark.js

@@ -11,7 +11,7 @@ const hasWatermark = (watermark) => (path) => path.node?.[name]?.has(watermark);
 
 module.exports = (from, to, path) => {
     const {watermark, highWatermark} = create(from, to, path);
-    const program = path.findParent(isProgram) || path;
+    const program = path.findParent(isProgram);
     const options = {
         watermark,
         highWatermark,

package/lib/run-fix.js

@@ -14,7 +14,8 @@ const chooseFixArgs = ({path, pathOptions, options}) => {
             path,
             pathOptions, {
                 options,
-            }];
+            },
+        ];
     
     return [
         path, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-runner",
-  "version": "23.4.1",
+  "version": "23.6.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Run 🐊Putout plugins",