@putout/engine-runner 28.1.0 → 28.2.0

package/README.md

@@ -53,7 +53,7 @@ export const replace = () => ({
 });
 
 // optional
-export const filter = (path) => {
+export const filter = (path, {options}) => {
     return true;
 };
 
@@ -162,7 +162,7 @@ export const include = () => ['debugger'];
 export const exclude = () => {};
 
 // optional
-export const filter = (path) => {
+export const filter = (path, {options}) => {
     return true;
 };
 ```

package/lib/index.js

@@ -1,5 +1,6 @@
 import {traverse as defaultTraverse} from '@putout/babel';
 import once from 'once';
+import {clearWatermark} from '@putout/operator-watermark';
 import {createDebug} from './debug.js';
 import runFix from './run-fix.js';
 import mergeVisitors from './merge-visitors.js';
@@ -8,7 +9,7 @@ import template from './template/index.js';
 import {createProgress} from './progress.js';
 import {tryThrowWithReason} from './try-throw-with-reason.js';
 import {include} from './includer/index.js';
-import {replace, clearWatermark} from './replacer/index.js';
+import {replace} from './replacer/index.js';
 import {declare} from './declarator/index.js';
 import {scan} from './scanner/index.js';
 import {getPath, getPosition} from './get-position.js';
@@ -43,7 +44,9 @@ export const runPlugins = ({ast, fix, fixCount = 2, plugins, progress = createPr
         if (!fix || !places.length)
             return places;
         
-        clearWatermark(ast);
+        const {program} = ast;
+        
+        clearWatermark(program);
     }
     
     return places;

package/lib/merge-visitors.js

@@ -98,7 +98,7 @@ function getStore(plugin, {fix, rule, msg, options}) {
     const push = (path, pathOptions) => {
         const position = getPosition(path);
         const message = msg || plugin.report(path, {
-            ...options,
+            options,
             ...pathOptions,
         });
         

package/lib/replacer/index.js

@@ -1,6 +1,7 @@
 import {template, print} from '@putout/engine-parser';
 import {remove, replaceWith} from '@putout/operate';
 import {types} from '@putout/babel';
+import {watermark} from '@putout/operator-watermark';
 import {
     compare,
     findVarsWays,
@@ -8,10 +9,6 @@ import {
     setValues,
 } from '@putout/compare';
 import maybeArray from '../maybe-array.js';
-import {
-    REPLACE_WATERMARK,
-    watermark,
-} from './watermark.js';
 import {createDebug} from '../debug.js';
 
 const debug = createDebug('putout:runner:replace');
@@ -86,10 +83,6 @@ export const replace = ({rule, plugin, msg, options}) => {
     };
 };
 
-export const clearWatermark = (ast) => {
-    delete ast.program[REPLACE_WATERMARK];
-};
-
 const isFn = (a) => typeof a === 'function';
 
 const parseExpression = (nodeFrom, {node}) => {

package/lib/run-fix.js

@@ -7,21 +7,12 @@ const isFn = (a) => typeof a === 'function';
 const getPath = (path) => path.path || path;
 const debug = createDebug('putout:runner:fix');
 
-const chooseFixArgs = ({path, pathOptions, options}) => {
-    if (pathOptions)
-        return [
-            path,
-            pathOptions, {
-                options,
-            },
-        ];
-    
-    return [
-        path, {
-            options,
-        },
-    ];
-};
+const chooseFixArgs = ({path, pathOptions, options}) => [
+    path, {
+        options,
+        ...pathOptions,
+    },
+];
 
 const tryToFix = (fix, {path, pathOptions, position, options}) => {
     const [e] = tryCatch(fix, ...chooseFixArgs({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-runner",
-  "version": "28.1.0",
+  "version": "28.2.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Run 🐊Putout plugins",
@@ -36,6 +36,7 @@
     "@putout/operator-filesystem": "^11.0.0",
     "@putout/operator-json": "^3.0.0",
     "@putout/plugin-filesystem": "^13.0.0",
+    "@putout/operator-watermark": "^1.0.0",
     "fullstore": "^4.0.0",
     "obug": "^2.1.1",
     "once": "^1.4.0",
@@ -61,9 +62,6 @@
     "putout": "*",
     "supertape": "^12.0.0"
   },
-  "peerDependencies": {
-    "putout": "*"
-  },
   "license": "MIT",
   "engines": {
     "node": ">=22"

package/lib/replacer/find-path.js

@@ -1,38 +0,0 @@
-const {entries} = Object;
-const {isArray} = Array;
-
-export default (parentPath) => {
-    let current = {
-        parentPath,
-    };
-    
-    const path = [];
-    
-    while (current = current.parentPath) {
-        path.unshift(findKey(current, current.parent));
-    }
-    
-    return path.join('.');
-};
-
-function findKey(path, parent) {
-    const {node} = path;
-    let key;
-    let value;
-    
-    for ([key, value] of entries(parent)) {
-        if (isArray(value)) {
-            const index = value.indexOf(node);
-            
-            if (index >= 0)
-                return `${key}.${index}`;
-            
-            continue;
-        }
-        
-        if (value === node)
-            break;
-    }
-    
-    return key;
-}

package/lib/replacer/watermark.js

@@ -1,63 +0,0 @@
-import wraptile from 'wraptile';
-import {types} from '@putout/babel';
-import findPath from './find-path.js';
-
-const {isProgram} = types;
-const name = '__putout_runner_replace';
-const hasWatermark = (watermark) => (path) => path.node?.[name]?.has(watermark);
-
-export const watermark = (from, to, path) => {
-    const {watermark, highWatermark} = create(from, to, path);
-    const program = path.findParent(isProgram);
-    const options = {
-        watermark,
-        highWatermark,
-        program,
-        path,
-    };
-    
-    return {
-        init: wraptile(init, options),
-        has: wraptile(has, options),
-        add: wraptile(add, options),
-    };
-};
-
-export const REPLACE_WATERMARK = name;
-
-export function create(from, to, path) {
-    const watermark = `${from} -> ${to}`;
-    const highWatermark = `${findPath(path)}: ${watermark}`;
-    
-    return {
-        watermark,
-        highWatermark,
-    };
-}
-
-export function init({path, program}) {
-    if (path.node)
-        path.node[name] = path.node[name] || new Set();
-    
-    program.node[name] = program.node[name] || new Set();
-}
-
-export function add({path, program, watermark, highWatermark}) {
-    init({
-        path,
-        program,
-    });
-    
-    path?.node[name].add(watermark);
-    program.node[name].add(highWatermark);
-}
-
-export function has({path, program, watermark, highWatermark}) {
-    const {node} = path;
-    const {loc} = node;
-    
-    if (node?.[name].has(watermark) || path.findParent(hasWatermark(watermark)) && !loc)
-        return true;
-    
-    return program.node[name].has(highWatermark);
-}