@putout/plugin-putout 9.0.1 → 10.2.0

package/README.md

@@ -3,7 +3,7 @@
 [NPMIMGURL]: https://img.shields.io/npm/v/@putout/plugin-putout.svg?style=flat&longCache=true
 [NPMURL]: https://npmjs.org/package/@putout/plugin-putout"npm"
 
-🐊[`Putout`](https://github.com/coderaiser/putout) plugin helps with 🐊`Putout` plugins development.
+🐊[`Putout`](https://github.com/coderaiser/putout) plugin helps with plugins development.
 
 ## Install
 
@@ -24,6 +24,8 @@ npm i @putout/plugin-putout -D
         "putout/convert-to-no-transform-code": "on",
         "putout/convert-replace-with": "on",
         "putout/convert-replace-with-multiple": "on",
+        "putout/convert-replace-to-function": "on",
+        "putout/convert-match-to-function": "on",
         "putout/convert-babel-types": "on",
         "putout/convert-destructuring-to-identifier": "on",
         "putout/convert-node-to-path-in-get-template-values": "on",
@@ -188,6 +190,42 @@ module.exports.fix = (path) => {
 };
 ```
 
+## convert-replace-to-function
+
+### ❌ Incorrect code example
+
+```js
+module.exports.replace = {
+    'let __a = __b': 'const __b = __a',
+};
+```
+
+### ✅ Correct code Example
+
+```js
+module.exports.replace = () => ({
+    'let __a = __b': 'const __b = __a',
+});
+```
+
+## convert-match-to-function
+
+### ❌ Incorrect code example
+
+```js
+module.exports.match = {
+    'let __a = __b': () => false,
+};
+```
+
+### ✅ Correct code Example
+
+```js
+module.exports.match = () => ({
+    'let __a = __b': () => false,
+});
+```
+
 ## convert-babel-types
 
 ### ❌ Incorrect code example

package/lib/check-replace-code/generate-code.js

@@ -9,6 +9,7 @@ const {
     ArrayPattern,
     ObjectPattern,
     BlockStatement,
+    ObjectExpression,
 } = types;
 
 module.exports = (rootPath, key) => {
@@ -56,10 +57,7 @@ module.exports = (rootPath, key) => {
                     }
                     
                     if (name === '__object') {
-                        if (path.parentPath.isVariableDeclarator())
-                            replaceWith(path, ObjectPattern([]));
-                        
-                        return;
+                        return objectify(path);
                     }
                     
                     if (name === '__body') {
@@ -86,3 +84,15 @@ function createVarStore(path) {
     };
 }
 
+function objectify(path) {
+    const {parentPath} = path;
+    const isVar = parentPath.isVariableDeclarator();
+    const isAssign = parentPath.isAssignmentExpression();
+    
+    if (isVar && parentPath.get('id') === path)
+        return replaceWith(path, ObjectPattern([]));
+    
+    if (isAssign && parentPath.get('right') === path)
+        return replaceWith(path, ObjectExpression([]));
+}
+

package/lib/check-replace-code/index.js

@@ -44,6 +44,9 @@ module.exports.traverse = ({push}) => ({
         if (get(path))
             return;
         
+        if (hasMatch(path))
+            return;
+        
         for (const propertyPath of path.get('right.body.properties')) {
             if (!propertyPath.get('value').isStringLiteral())
                 continue;
@@ -117,3 +120,14 @@ function parseKey(propertyPath) {
     return [null, key];
 }
 
+function hasMatch(path) {
+    const {body} = path.scope.getProgramParent().path.node;
+    
+    for (const current of body) {
+        if (compare(current, 'module.exports.match = __a'))
+            return true;
+    }
+    
+    return false;
+}
+

package/lib/convert-add-argument-to-add-args/index.js

@@ -5,8 +5,6 @@ module.exports.report = () => 'Use addArgs instead of addArgument';
 module.exports.replace = () => ({
     'addArgument(__args)': (vars, path) => {
         path.scope.rename('addArgument', 'addArgs');
-        path.scope.crawl();
-        
         return path;
     },
 });

package/lib/convert-match-to-function/index.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.report = () => `'match' should be a function`;
+
+module.exports.replace = () => ({
+    'module.exports.match= __object': 'module.exports.match = () => __object',
+});
+

package/lib/convert-replace-to-function/index.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.report = () => `'replace' should be a function`;
+
+module.exports.replace = () => ({
+    'module.exports.replace = __object': 'module.exports.replace = () => __object',
+});
+

package/lib/convert-replace-with/index.js

@@ -44,7 +44,6 @@ module.exports.fix = ({path, calleePath, property, object, program, isInserted})
         isInserted(true);
         insertAfter(pathToInsertAfter, replaceWithAST);
         
-        path.scope.getProgramParent().crawl();
         return;
     }
     

package/lib/convert-replace-with-multiple/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const fullstore = require('fullstore');
-
 const {
     operator,
     template,
@@ -26,7 +24,7 @@ const replaceWithAST = template.ast(`
     const {replaceWithMultiple} = require('putout').operate;
 `);
 
-module.exports.fix = ({path, calleePath, property, object, program, isInserted}) => {
+module.exports.fix = ({path, calleePath, property, object, program}) => {
     const strictModePath = program.get('body.0');
     const {bindings} = strictModePath.scope;
     
@@ -36,11 +34,6 @@ module.exports.fix = ({path, calleePath, property, object, program, isInserted})
     if (bindings.replaceWithMultiple)
         return;
     
-    if (isInserted())
-        return;
-    
-    isInserted(true);
-    
     if (!bindings.replaceWith && !bindings.insertAfter)
         return insertAfter(strictModePath, replaceWithAST);
     
@@ -63,32 +56,27 @@ function getVarPath(bindings) {
     return insertAfter.path;
 }
 
-module.exports.traverse = ({push}) => {
-    const isInserted = fullstore();
-    
-    return {
-        CallExpression(path) {
-            const calleePath = path.get('callee');
-            
-            if (!calleePath.isMemberExpression())
-                return;
-            
-            const {object, property} = calleePath.node;
-            
-            if (property.name !== 'replaceWithMultiple')
-                return;
-            
-            const program = path.findParent((path) => path.isProgram());
-            
-            push({
-                isInserted,
-                path,
-                object,
-                program,
-                calleePath,
-                property,
-            });
-        },
-    };
-};
+module.exports.traverse = ({push}) => ({
+    CallExpression(path) {
+        const calleePath = path.get('callee');
+        
+        if (!calleePath.isMemberExpression())
+            return;
+        
+        const {object, property} = calleePath.node;
+        
+        if (property.name !== 'replaceWithMultiple')
+            return;
+        
+        const program = path.findParent((path) => path.isProgram());
+        
+        push({
+            path,
+            object,
+            program,
+            calleePath,
+            property,
+        });
+    },
+});
 

package/lib/index.js

@@ -11,9 +11,11 @@ module.exports.rules = {
     ...getRule('convert-putout-test-to-create-test'),
     ...getRule('convert-to-no-transform-code'),
     ...getRule('convert-find-to-traverse'),
-    ...getRule('convert-replace-with'),
     ...getRule('convert-destructuring-to-identifier'),
+    ...getRule('convert-replace-with'),
     ...getRule('convert-replace-with-multiple'),
+    ...getRule('convert-replace-to-function'),
+    ...getRule('convert-match-to-function'),
     ...getRule('convert-babel-types'),
     ...getRule('convert-node-to-path-in-get-template-values'),
     ...getRule('convert-traverse-to-include'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "9.0.1",
+  "version": "10.2.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "putout plugin helps with plugins development",
@@ -47,7 +47,7 @@
     "nodemon": "^2.0.1"
   },
   "peerDependencies": {
-    "putout": ">=24"
+    "putout": ">=24.2"
   },
   "license": "MIT",
   "engines": {