@putout/plugin-putout 12.8.0 → 13.1.0

package/README.md

@@ -19,8 +19,9 @@ npm i @putout/plugin-putout -D
         "putout/apply-create-test": "on",
         "putout/apply-processors-destructuring": "on",
         "putout/apply-async-formatter": "on",
-        "putout/apply-remove": "on",
         "putout/apply-declare": "on",
+        "putout/apply-remove": "on",
+        "putout/apply-insert-after": "on",
         "putout/add-args": "on",
         "putout/add-push": "on",
         "putout/check-match": "on",
@@ -96,6 +97,31 @@ export const fix = (path) => {
 };
 ```
 
+## apply-insert-after
+
+Better to use [`insertAfter(a, b)`](https://github.com/coderaiser/putout/tree/master/packages/operate#insert-after) method of `operator`.
+It helps to avoid duplication of comments.
+
+### ❌ Example of incorrect code
+
+```js
+export const fix = (path) => {
+    path.insertAfter(path.get('init'));
+};
+```
+
+### ✅ Example of correct code
+
+```js
+import {operator} from 'putout';
+
+const {insertAfter} = operator;
+
+export const fix = (path) => {
+    insertAfter(path, path.get('init'));
+};
+```
+
 ## apply-declare
 
 Better to use [`Declareator`](https://github.com/coderaiser/putout/tree/master/packages/engine-runner#declarator) instead of `operator.declare()`.
@@ -218,7 +244,7 @@ isNumericLiteral(node);
 
 ## 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.
+Fixes results of [@putout/convert-commonjs-to-esm](https://github.com/coderaiser/putout/tree/master/packages/plugin-convert-commonjs-to-esm#readme) work.
 
 ### ❌ Example of incorrect code
 
@@ -541,10 +567,7 @@ isIdentifier(a);
 ### ✅ Example of correct code
 
 ```js
-const {
-    operator,
-    types,
-} = require('putout');
+const {operator, types} = require('putout');
 
 const {compare} = operator;
 const {isIdentifier} = types;

package/lib/add-push/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    types,
-    operator,
-} = require('putout');
+const {types, operator} = require('putout');
 
 const {traverse} = operator;
 

package/lib/apply-async-formatter/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    operator,
-    types,
-} = require('putout');
+const {operator, types} = require('putout');
 
 const computed = true;
 const shorthand = true;

package/lib/apply-insert-after/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports.report = () => `Use 'insertAfter(a, b)' instead of 'a.insertAfter(b)'`;
+
+module.exports.replace = () => ({
+    '__a.insertAfter(__b)': 'insertAfter(__a, __b)',
+});

package/lib/apply-remove/index.js

@@ -3,5 +3,5 @@
 module.exports.report = () => `Use 'remove(path)' instead of 'path.remove()'`;
 
 module.exports.replace = () => ({
-    'path.remove()': 'remove(path)',
+    '__a.remove()': 'remove(__a)',
 });

package/lib/check-match/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    operator,
-    types,
-} = require('putout');
+const {operator, types} = require('putout');
 
 const {
     getTemplateValues,

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

@@ -4,11 +4,7 @@ const putout = require('putout');
 const tryCatch = require('try-catch');
 const noop = () => {};
 
-const {
-    types,
-    operator,
-} = putout;
-
+const {types, operator} = putout;
 const {replaceWith} = operator;
 
 const {
@@ -22,6 +18,7 @@ module.exports = (rootPath, key) => {
     const getVar = createVarStore(rootPath);
     
     const [transformError, result] = tryCatch(putout, key, {
+        printer: 'putout',
         fix: true,
         isTS: true,
         plugins: [
@@ -34,10 +31,7 @@ module.exports = (rootPath, key) => {
                 fix: (path) => {
                     const {node} = path;
                     
-                    const {
-                        value,
-                        name,
-                    } = node;
+                    const {value, name} = node;
                     
                     if (path.isStringLiteral() && /^__[a-z]$/.test(value)) {
                         path.node.value = getVar(name);

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

@@ -75,6 +75,7 @@ module.exports.traverse = ({push}) => ({
             }
             
             const [transformError, result] = tryCatch(putout, keyCode, {
+                printer: 'putout',
                 fix: true,
                 isTS: true,
                 plugins: [
@@ -97,7 +98,7 @@ module.exports.traverse = ({push}) => ({
                 return;
             }
             
-            const {code} = result;
+            const code = result.code.slice(0, -1);
             const [error, is] = tryCatch(compare, rmSemi(code), template);
             
             if (error || !is)

package/lib/convert-babel-types/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    operator,
-    template,
-} = require('putout');
+const {operator, template} = require('putout');
 
 const {replaceWith} = operator;
 

package/lib/convert-find-to-traverse/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    types,
-    operator,
-} = require('putout');
+const {types, operator} = require('putout');
 
 const {replaceWith} = operator;
 

package/lib/convert-method-to-property/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    types,
-    operator,
-} = require('putout');
+const {types, operator} = require('putout');
 
 const {replaceWith} = operator;
 const {ObjectProperty} = types;

package/lib/convert-node-to-path-in-get-template-values/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    types,
-    operator,
-} = require('putout');
+const {types, operator} = require('putout');
 
 const {
     compare,

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

@@ -8,15 +8,12 @@ const {
 
 const fullstore = require('fullstore');
 
-const {
-    Identifier,
-    ObjectProperty,
-} = types;
+const {Identifier, ObjectProperty} = types;
+const {replaceWith, insertAfter} = operator;
 
-const {
-    replaceWith,
-    insertAfter,
-} = operator;
+const isRecast = (program) => program.get('body.0.expression').isStringLiteral({
+    value: 'use strict',
+});
 
 module.exports.report = () => {
     return `"operator.replaceWith" should be called instead of "path.replaceWith"`;
@@ -24,9 +21,7 @@ module.exports.report = () => {
 
 module.exports.fix = ({path, calleePath, property, object, program, isInserted}) => {
     replaceWith(calleePath, property);
-    
-    const strictModePath = program.get('body.0');
-    const {bindings} = strictModePath.scope;
+    const {bindings} = program.scope;
     
     path.node.arguments.unshift(object);
     
@@ -39,10 +34,17 @@ module.exports.fix = ({path, calleePath, property, object, program, isInserted})
         `);
         
         const {types} = bindings;
-        const pathToInsertAfter = types ? types.path.parentPath : strictModePath;
+        const first = program.get('body.0');
+        const pathToInsert = types ? types.path.parentPath : first;
+        
+        if (isRecast(program))
+            insertAfter(pathToInsert, replaceWithAST);
+        else if (types)
+            insertAfter(pathToInsert, replaceWithAST);
+        else
+            pathToInsert.insertBefore(replaceWithAST);
         
         isInserted(true);
-        insertAfter(pathToInsertAfter, replaceWithAST);
         
         return;
     }
@@ -75,15 +77,12 @@ module.exports.traverse = ({push}) => {
             if (!calleePath.isMemberExpression())
                 return;
             
-            const {
-                object,
-                property,
-            } = calleePath.node;
+            const {object, property} = calleePath.node;
             
             if (property.name !== 'replaceWith')
                 return;
             
-            const program = path.findParent((path) => path.isProgram());
+            const program = path.scope.getProgramParent().path;
             
             push({
                 isInserted,

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

@@ -6,15 +6,13 @@ const {
     types,
 } = require('putout');
 
-const {
-    insertAfter,
-    replaceWith,
-} = operator;
+const {insertAfter, replaceWith} = operator;
+const {Identifier, ObjectProperty} = types;
 
-const {
-    Identifier,
-    ObjectProperty,
-} = types;
+const isRecast = (program) => program.get('body.0').get('expression')
+    .isStringLiteral({
+        value: 'use strict',
+    });
 
 module.exports.report = () => {
     return `"operate.replaceWithMultiple" should be called instead of "path.replaceWithMultiple"`;
@@ -25,8 +23,8 @@ const replaceWithAST = template.ast(`
 `);
 
 module.exports.fix = ({path, calleePath, property, object, program}) => {
-    const strictModePath = program.get('body.0');
-    const {bindings} = strictModePath.scope;
+    const first = program.get('body.0');
+    const {bindings} = program.scope;
     
     replaceWith(calleePath, property);
     path.node.arguments.unshift(object);
@@ -34,8 +32,12 @@ module.exports.fix = ({path, calleePath, property, object, program}) => {
     if (bindings.replaceWithMultiple)
         return;
     
-    if (!bindings.replaceWith && !bindings.insertAfter)
-        return insertAfter(strictModePath, replaceWithAST);
+    if (!bindings.replaceWith && !bindings.insertAfter) {
+        if (isRecast(program))
+            return insertAfter(first, replaceWithAST);
+        
+        return first.insertBefore(replaceWithAST);
+    }
     
     const id = Identifier('replaceWithMultiple');
     const varPath = getVarPath(bindings);
@@ -44,10 +46,7 @@ module.exports.fix = ({path, calleePath, property, object, program}) => {
 };
 
 function getVarPath(bindings) {
-    const {
-        replaceWith,
-        insertAfter,
-    } = bindings;
+    const {replaceWith, insertAfter} = bindings;
     
     if (replaceWith)
         return replaceWith.path;
@@ -62,15 +61,12 @@ module.exports.traverse = ({push}) => ({
         if (!calleePath.isMemberExpression())
             return;
         
-        const {
-            object,
-            property,
-        } = calleePath.node;
+        const {object, property} = calleePath.node;
         
         if (property.name !== 'replaceWithMultiple')
             return;
         
-        const program = path.findParent((path) => path.isProgram());
+        const program = path.scope.getProgramParent().path;
         
         push({
             path,

package/lib/convert-to-no-transform-code/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    isIdentifier,
-    Identifier,
-} = require('putout').types;
+const {isIdentifier, Identifier} = require('putout').types;
 
 module.exports.report = () => {
     return `"noTransformCode" should be called instead of using same arguments twice in "transformCode"`;
@@ -16,10 +13,7 @@ module.exports.traverse = ({push}) => ({
         if (!calleePath.isMemberExpression())
             return;
         
-        const {
-            object,
-            property,
-        } = calleePath.node;
+        const {object, property} = calleePath.node;
         
         if (object.name !== 't' || property.name !== 'transformCode')
             return;

package/lib/convert-traverse-to-include/index.js

@@ -7,7 +7,7 @@ const {
 } = require('putout');
 
 const {StringLiteral} = types;
-const {compare} = operator;
+const {compare, remove} = operator;
 
 const isPush = (path) => path.get('value').isIdentifier({
     name: 'push',
@@ -42,7 +42,7 @@ module.exports.replace = () => ({
             
             if (isPush(propertyPath) || isBlock(propertyPath)) {
                 node.right.body.elements.push(StringLiteral(name));
-                propertyPath.remove();
+                remove(propertyPath);
             }
         }
         

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

@@ -1,10 +1,7 @@
 'use strict';
 
 const {operator} = require('putout');
-const {
-    contains,
-    traverse,
-} = operator;
+const {contains, traverse} = operator;
 
 module.exports.report = () => 'Replacer should be used instead of Traverser (https://git.io/JqcMn)';
 

package/lib/create-test/index.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    operator,
-    types,
-} = require('putout');
+const {operator, types} = require('putout');
 
 const {
     StringLiteral,
@@ -14,10 +11,7 @@ const {
     isIdentifier,
 } = types;
 
-const {
-    replaceWith,
-    getProperty,
-} = operator;
+const {replaceWith, getProperty} = operator;
 
 module.exports.report = () => `Apply modifications to 'createTest()' options`;
 
@@ -63,10 +57,7 @@ const maybeLiteral = (a) => {
 };
 
 function convert(objectPath) {
-    const {
-        key,
-        value,
-    } = objectPath.node.properties[0];
+    const {key, value} = objectPath.node.properties[0];
     
     replaceWith(objectPath, ObjectExpression([
         ObjectProperty(Identifier('plugins'), ArrayExpression([

package/lib/declare/operator.js

@@ -16,6 +16,7 @@ module.exports = {
     isSimpleRegExp: `const {isSimpleRegExp} = operator`,
     getTemplateValues: `const {getTemplateValues} = operator`,
     addArgs: `const {addArgs} = operator`,
+    insertAfter: 'const {insertAfter} = operator',
     replaceWith: `const {replaceWith} = operator`,
     replaceWithMultiple: `const {replaceWithMultiple} = operator`,
     remove: 'const {remove} = operator',

package/lib/index.js

@@ -9,6 +9,7 @@ module.exports.rules = {
     ...getRule('apply-async-formatter'),
     ...getRule('apply-create-test'),
     ...getRule('apply-remove'),
+    ...getRule('apply-insert-after'),
     ...getRule('apply-declare'),
     ...getRule('check-replace-code'),
     ...getRule('check-match'),

package/lib/move-require-on-top-level/index.js

@@ -2,10 +2,7 @@
 
 const justCamelCase = require('just-camel-case');
 
-const {
-    types,
-    template,
-} = require('putout');
+const {types, template} = require('putout');
 
 const TEST = `
     const test = require('@putout/test')(__dirname, {

package/lib/rename-operate-to-operator/index.js

@@ -5,9 +5,7 @@ const {rename} = operator;
 
 module.exports.report = () => '"operator" should be used instead of "operate"';
 
-module.exports.include = () => [
-    'Program',
-];
+module.exports.include = () => ['Program'];
 
 module.exports.filter = (path) => {
     const noOperator = !path.scope.bindings.operator;

package/lib/replace-test-message/index.js

@@ -59,16 +59,12 @@ function isCorrect({path, incorrect}) {
     const calleePath = path.findParent(isCallExpression);
     
     if (!calleePath)
-        return [
-            CORRECT,
-        ];
+        return [CORRECT];
     
     const messagePath = calleePath.get('arguments.0');
     
     if (!messagePath.isStringLiteral())
-        return [
-            CORRECT,
-        ];
+        return [CORRECT];
     
     const {value} = messagePath.node;
     const is = !incorrect.test(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "12.8.0",
+  "version": "13.1.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin helps with plugins development",
@@ -36,18 +36,18 @@
     "putout"
   ],
   "devDependencies": {
-    "@putout/test": "^6.0.0",
-    "c8": "^7.5.0",
+    "@putout/test": "^7.0.0",
+    "c8": "^8.0.0",
     "eslint": "^8.0.1",
     "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-putout": "^17.0.0",
+    "eslint-plugin-putout": "^18.0.0",
     "lerna": "^6.0.1",
     "madrun": "^9.0.0",
     "montag": "^1.2.1",
-    "nodemon": "^2.0.1"
+    "nodemon": "^3.0.1"
   },
   "peerDependencies": {
-    "putout": ">=29"
+    "putout": ">=30"
   },
   "license": "MIT",
   "engines": {