@putout/plugin-putout 10.1.0 → 11.0.1

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 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",
@@ -45,7 +47,7 @@ npm i @putout/plugin-putout -D
 
 ## apply-processors-destructuring
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('', async (t) => {
@@ -54,7 +56,7 @@ test('', async (t) => {
 
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 test('', async ({process}) => {
@@ -64,7 +66,7 @@ test('', async ({process}) => {
 
 ## apply-async-formatter
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('formatter: codeframea', (t) => {
@@ -73,7 +75,7 @@ test('formatter: codeframea', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('formatter: codeframea', async ({format}) => {
@@ -83,7 +85,7 @@ test('formatter: codeframea', async ({format}) => {
 
 ## apply-create-test
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('@putout/test')({
@@ -91,7 +93,7 @@ const test = require('@putout/test')({
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const {createTest} = require('@putout/test');
@@ -100,11 +102,11 @@ const test = createTest({
 });
 ```
 
-## convert-putout-test-to-create-test"
+## convert-putout-test-to-create-test
 
 Fixes results of [@putout/convert-commonjs-to-esm](https://github.com/coderaiser/putout/tree/master/packages/plugin-convert-commonjs-to-esm) work.
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 import putoutTest from '@putout/test';
@@ -114,7 +116,7 @@ const test = putoutTest(__dirname, {
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 import createTest from '@putout/test';
@@ -126,7 +128,7 @@ const test = createTest(__dirname, {
 
 ## convert-to-no-transform-code
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('plugin-apply-destructuring: transform: array: destructuring', (t) => {
@@ -137,7 +139,7 @@ test('plugin-apply-destructuring: transform: array: destructuring', (t) => {
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 test('plugin-apply-destructuring: transform: array: destructuring', (t) => {
@@ -150,7 +152,7 @@ test('plugin-apply-destructuring: transform: array: destructuring', (t) => {
 
 ## convert-replace-with
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.fix = (path) => {
@@ -158,7 +160,7 @@ module.exports.fix = (path) => {
 };
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const {replaceWith} = require('putout').operator;
@@ -170,7 +172,7 @@ module.exports.fix = (path) => {
 
 ## convert-replace-with-multiple
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.fix = (path) => {
@@ -178,7 +180,7 @@ module.exports.fix = (path) => {
 };
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const {replaceWithMultiple} = require('putout').operator;
@@ -188,9 +190,45 @@ module.exports.fix = (path) => {
 };
 ```
 
+## convert-replace-to-function
+
+### ❌ Example of incorrect code
+
+```js
+module.exports.replace = {
+    'let __a = __b': 'const __b = __a',
+};
+```
+
+### ✅ Example of correct code
+
+```js
+module.exports.replace = () => ({
+    'let __a = __b': 'const __b = __a',
+});
+```
+
+## convert-match-to-function
+
+### ❌ Example of incorrect code
+
+```js
+module.exports.match = {
+    'let __a = __b': () => false,
+};
+```
+
+### ✅ Example of correct code
+
+```js
+module.exports.match = () => ({
+    'let __a = __b': () => false,
+});
+```
+
 ## convert-babel-types
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const {
@@ -201,7 +239,7 @@ const {
 } = require('@babel/types');
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const {
@@ -214,7 +252,7 @@ const {
 
 ## convert-to-no-transform-code
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.replace = () => ({
@@ -225,7 +263,7 @@ module.exports.replace = () => ({
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 module.exports.replace = () => ({
@@ -238,13 +276,13 @@ module.exports.replace = () => ({
 
 ## convert-node-to-path-in-get-template-values
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const {__a, __b} = getTemplateValues(path.node, 'const __a = __b');
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const {__a, __b} = getTemplateValues(path, 'const __a = __b');
@@ -252,13 +290,13 @@ const {__a, __b} = getTemplateValues(path, 'const __a = __b');
 
 ## shorten-imports
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const parseOptions = require('putout/lib/parse-options');
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const parseOptions = require('putout/parse-options');
@@ -266,7 +304,7 @@ const parseOptions = require('putout/parse-options');
 
 ## convert-traverse-to-include
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.traverse = ({push}) => ({
@@ -276,7 +314,7 @@ module.exports.traverse = ({push}) => ({
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 module.exports.include = () => [
@@ -286,7 +324,7 @@ module.exports.include = () => [
 
 ## convert-traverse-to-replace
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.traverse = () => ({
@@ -294,7 +332,7 @@ module.exports.traverse = () => ({
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 module.exports.replace = () => ({
@@ -304,14 +342,14 @@ module.exports.replace = () => ({
 
 ## convert-process-to-find
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.preProcess = () => {};
 module.exports.postProcess = () => {};
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 module.exports.branch = (rawSource) => [];
@@ -323,7 +361,7 @@ module.exports.merge = (processedSource, list) => '';
 - property simpler to work with;
 - support of `convert-destructuring-to-identifier` which is `Replacer`, while `convert-method-to-property` is `Includer` (searches for `ObjectMethod` node);
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.match = () => ({
@@ -332,7 +370,7 @@ module.exports.match = () => ({
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 module.exports.match = () => ({
@@ -345,7 +383,7 @@ module.exports.match = () => ({
 
 Checks that [Replacer](https://github.com/coderaiser/putout/tree/master/packages/engine-runner#replacer) transform is possible.
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.replace = () => ({
@@ -361,14 +399,14 @@ This is additional tests, if you forget to test some case (from a big list of ru
 Depend on [@putout/convert-esm-to-commonjs](https://github.com/coderaiser/putout/tree/master/packages/plugin-convert-esm-to-commonjs) and
 [@putout/declare-undefined-variables](https://github.com/coderaiser/putout/tree/master/packages/plugin-declare-undefined-variables)
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 compare(a, 'const __a = __b');
 isIdentifier(a);
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const {operator, types} = require('putout');
@@ -381,7 +419,7 @@ isIdentifier(a);
 
 ## add-args
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('', () => {
@@ -389,7 +427,7 @@ test('', () => {
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 test('', ({comparePlaces}) => {
@@ -408,7 +446,7 @@ module.exports = addArgument({
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const {operator} = require('putout');
@@ -432,7 +470,7 @@ const test = createTest(__dirname, {
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 import {createTest} from '@putout/test';
@@ -454,7 +492,7 @@ const test = createTest(import.meta.url, {
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const {createTest} = require('@putout/test');
@@ -467,7 +505,7 @@ const test = createTest(import.meta.url, {
 
 ## move-require-on-top-level
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('@putout/test')(__dirname, {
@@ -482,7 +520,7 @@ test('remove debugger: report', (t) => {
 });
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 const removeDebugger = require('..');
@@ -500,7 +538,7 @@ test('remove debugger: report', (t) => {
 
 ## includer
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 module.exports.include = () => 'cons __a = __b';
@@ -513,7 +551,7 @@ module.exports.include = ['cons __a = __b'];
 module.exports.exclude = ['var __a = __b'];
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 module.exports.include = () => ['cons __a = __b'];

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/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/declare/operator.js

@@ -10,7 +10,7 @@ module.exports = {
     declare: `const {declare} = operator`,
     isSimpleRegExp: `const {isSimpleRegExp} = operator`,
     getTemplateValues: `const {getTemplateValues} = operator`,
-    addArgument: `const {addArgument} = operator`,
+    addArgs: `const {addArgs} = operator`,
     replaceWith: `const {replaceWith} = operator`,
     replaceWithMultiple: `const {replaceWithMultiple} = operator`,
     isESM: `const {isESM} = operator`,

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": "10.1.0",
+  "version": "11.0.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "putout plugin helps with plugins development",
@@ -36,22 +36,22 @@
     "putout"
   ],
   "devDependencies": {
-    "@putout/test": "^4.0.0",
+    "@putout/test": "^5.0.0",
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^13.0.0",
+    "eslint-plugin-putout": "^14.0.0",
     "lerna": "^4.0.0",
-    "madrun": "^8.0.1",
+    "madrun": "^9.0.0",
     "montag": "^1.2.1",
     "nodemon": "^2.0.1"
   },
   "peerDependencies": {
-    "putout": ">=24.2"
+    "putout": ">=25"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "publishConfig": {
     "access": "public"