@putout/plugin-putout 19.6.0 → 20.0.0

package/README.md

@@ -13,12 +13,10 @@ npm i @putout/plugin-putout -D
 
 ## Rules
 
-- ✅ [add-args](#add-args);
+- ✅ [add-test-args](#add-test-args);
 - ✅ [add-await-to-progress](#add-await-to-progress);
 - ✅ [add-index-to-import](#add-index-to-import);
-- ✅ [add-push](#add-push);
-- ✅ [add-store](#add-store);
-- ✅ [add-path-store](#add-path-store);
+- ✅ [add-traverse-args](#add-traverse-args);
 - ✅ [add-track-file](#add-track-file);
 - ✅ [apply-async-formatter](#apply-async-formatter);
 - ✅ [apply-create-test](#apply-create-test);
@@ -33,7 +31,7 @@ npm i @putout/plugin-putout -D
 - ✅ [apply-short-processors](#apply-short-processors);
 - ✅ [check-match](#check-match);
 - ✅ [check-replace-code](#check-replace-code);
-- ✅ [convert-add-argument-to-add-args](#convert-add-argument-to-add-args);
+- ✅ [convert-add-argument-to-add-args](#convert-add-argument-to-add-test-args);
 - ✅ [convert-babel-types](#convert-babel-types);
 - ✅ [convert-destructuring-to-identifier](#convert-destructuring-to-identifier);
 - ✅ [convert-dirname-to-url](#convert-dirname-to-url);
@@ -81,10 +79,8 @@ npm i @putout/plugin-putout -D
         "putout/apply-short-processors": "on",
         "putout/apply-namespace-specifier": "on",
         "putout/apply-for-of-to-track-file": "on",
-        "putout/add-args": "on",
-        "putout/add-push": "on",
-        "putout/add-store": "on",
-        "putout/add-path-store": "on",
+        "putout/add-test-args": "on",
+        "putout/add-traverse-args": "on",
         "putout/add-track-file": "on",
         "putout/add-await-to-progress": "on",
         "putout/add-index-to-import": "on",
@@ -797,7 +793,7 @@ compare(a, 'const __a = __b');
 isIdentifier(a);
 ```
 
-## add-args
+## add-test-args
 
 ### ❌ Example of incorrect code
 
@@ -815,7 +811,12 @@ test('', ({comparePlaces}) => {
 });
 ```
 
-## add-push
+## add-traverse-args
+
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/b453bd78b8e9380da8b2f33dfb38b4e2/53b14f89eb88aa10c8e00ba1f0251976592e14ee).
+Supported args:
+
+- `push`:
 
 ### ❌ Example of incorrect code
 
@@ -837,9 +838,7 @@ module.exports.traverse = ({push}) => ({
 });
 ```
 
-## add-store
-
-Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/b453bd78b8e9380da8b2f33dfb38b4e2/53b14f89eb88aa10c8e00ba1f0251976592e14ee).
+- `store`
 
 ### ❌ Example of incorrect code
 
@@ -867,7 +866,7 @@ module.exports.traverse = ({store}) => ({
 });
 ```
 
-## add-path-store
+- `pathStore`:
 
 ### ❌ Example of incorrect code
 

package/lib/{add-arg.js → add-traverse-args/index.js}

@@ -9,21 +9,19 @@ const {
     Identifier,
 } = types;
 
-module.exports = function addArg(name) {
-    return {
-        report: createReport(name),
-        fix: createFix(name),
-        traverse: createTraverse(name),
-    };
-};
+const defaultNames = [
+    'push',
+    'store',
+    'pathStore',
+];
 
-const createReport = (name) => () => `Add '${name}' argument to 'traverse'`;
+module.exports.report = ({name}) => `Add '${name}' argument to 'traverse'`;
 
-const createFix = (mainName) => ({fn}) => {
+module.exports.fix = ({name, fn}) => {
     const computed = false;
     const shorthand = true;
-    const name = Identifier(mainName);
-    const property = ObjectProperty(name, name, computed, shorthand);
+    const id = Identifier(name);
+    const property = ObjectProperty(id, id, computed, shorthand);
     
     if (!fn.params.length) {
         fn.params.push(ObjectPattern([property]));
@@ -33,8 +31,11 @@ const createFix = (mainName) => ({fn}) => {
     fn.params[0].properties.push(property);
 };
 
-const createTraverse = (name) => ({push}) => {
-    const check = checkArgs(name, push);
+module.exports.traverse = ({push, options}) => {
+    const {
+        names = defaultNames,
+    } = options;
+    const check = checkArgs(names, push);
     
     return {
         'export const traverse = (__args) => __': check,
@@ -54,34 +55,44 @@ const isArgExists = (mainName, fn) => {
     return false;
 };
 
-const checkArgs = (mainName, push) => (path) => {
+const checkArgs = (names, push) => (path) => {
     const fn = parseFn(path);
     
-    if (isArgExists(mainName, fn))
-        return false;
-    
     traverse(path, {
         ReferencedIdentifier(path) {
-            if (path.node.name !== mainName)
+            const {name} = path.node;
+            
+            if (!names.includes(name))
                 return;
             
-            if (isCallee(mainName, path))
+            if (isCallee(name, path))
+                return;
+            
+            if (isArgExists(name, fn))
                 return;
             
             push({
                 path,
                 fn,
+                name,
             });
         },
-        [`${mainName}(__args)`]: (currentPath) => {
+        [`__a(__args)`]: (currentPath) => {
+            const {callee} = currentPath.node;
+            const {name} = callee;
+            
+            if (!names.includes(name))
+                return;
+            
             const bindings = currentPath.scope.getAllBindings();
             
-            if (bindings[mainName])
+            if (bindings[name])
                 return;
             
             push({
                 path,
                 fn,
+                name,
             });
         },
     });

package/lib/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const addStore = require('./add-store');
-const addPathStore = require('./add-path-store');
 const applyProcessorsDestructuring = require('./apply-processors-destructuring');
 const applyAsyncFormatter = require('./apply-async-formatter');
 const applyCreateTest = require('./apply-create-test');
@@ -36,8 +34,8 @@ const renameOperateToOperator = require('./rename-operate-to-operator');
 const replaceOperateWithOperator = require('./replace-operate-with-operator');
 const shortenImports = require('./shorten-imports');
 const declare = require('./declare');
-const addArgs = require('./add-args');
-const addPush = require('./add-push');
+const addTestArgs = require('./add-test-args');
+const addTraverseArgs = require('./add-traverse-args');
 const moveRequireOnTopLevel = require('./move-require-on-top-level');
 const includer = require('./includer');
 const createTest = require('./create-test');
@@ -53,8 +51,6 @@ const applyForOfToTrackFile = require('./apply-for-of-to-track-file');
 const removeUnusedGetPropertiesArgument = require('./remove-unused-get-properties-argument');
 
 module.exports.rules = {
-    'add-store': addStore,
-    'add-path-store': addPathStore,
     'apply-processors-destructuring': applyProcessorsDestructuring,
     'apply-async-formatter': applyAsyncFormatter,
     'apply-create-test': applyCreateTest,
@@ -88,8 +84,8 @@ module.exports.rules = {
     'replace-operate-with-operator': replaceOperateWithOperator,
     'shorten-imports': shortenImports,
     declare,
-    'add-args': addArgs,
-    'add-push': addPush,
+    'add-test-args': addTestArgs,
+    'add-traverse-args': addTraverseArgs,
     'move-require-on-top-level': moveRequireOnTopLevel,
     includer,
     'create-test': createTest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "19.6.0",
+  "version": "20.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin helps with plugins development",

package/lib/add-path-store/index.js

@@ -1,5 +0,0 @@
-'use strict';
-
-const addArg = require('../add-arg');
-
-module.exports = addArg('pathStore');

package/lib/add-push/index.js

@@ -1,5 +0,0 @@
-'use strict';
-
-const addArg = require('../add-arg.js');
-
-module.exports = addArg('push');

package/lib/add-store/index.js

@@ -1,5 +0,0 @@
-'use strict';
-
-const addArg = require('../add-arg');
-
-module.exports = addArg('store');