@putout/plugin-putout 8.2.0 → 8.5.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`](https://github.com/coderaiser/putout) plugins development.
+🐊[`Putout`](https://github.com/coderaiser/putout) plugin helps with 🐊`Putout` plugins development.
 
 ## Install
 
@@ -33,7 +33,8 @@ npm i @putout/plugin-putout -D
         "putout/convert-add-argument-to-add-args": "on",
         "putout/shorten-imports": "on",
         "putout/check-replace-code": "on",
-        "putout/declare": "on"
+        "putout/declare": "on",
+        "putout/move-require-on-top-level": "on"
     }
 }
 ```
@@ -75,18 +76,29 @@ test('formatter: codeframea', async ({format}) => {
     await format(codeframe, 1);
 });
 ```
+
 ## 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
 
 ```js
 import putoutTest from '@putout/test';
+
+const test = putoutTest(__dirname, {
+    'remove-unused-variables': rmVars,
+});
 ```
 
 ### ✅ Correct code Example
 
 ```js
 import createTest from '@putout/test';
+
+const test = createTest(__dirname, {
+    'remove-unused-variables': rmVars,
+});
 ```
 
 ## convert-to-no-transform-code
@@ -318,7 +330,8 @@ module.exports.replace = () => ({
 });
 ```
 
-There is no `fix` for this rule, it used internally to be more confident about `test coverage`, because of declaration form, transforms cannon be checked by `nyc` and `c8`, and uncovered lines can find unfixable false possitives when running on code. This additional tests, if you forget to test some case (from a big list of rules that is supported) it will be checked with this `rule` and make code more stable and transform bugs.
+There is no `fix` for this rule, it used internally to be more confident about `test coverage`, because of declaration form, transforms cannon be checked by `nyc` and `c8`, and uncovered lines can find unfixable false possitives when running on code.
+This is additional tests, if you forget to test some case (from a big list of rules that is supported) it will be checked with this `rule` and make transforms more stable.
 
 ## declare
 
@@ -383,6 +396,39 @@ module.exports = addArgs({
 });
 ```
 
+## move-require-on-top-level
+
+### ❌ Incorrect code example
+
+```js
+const test = require('@putout/test')(__dirname, {
+    'remove-debugger': require('..'),
+});
+
+test('remove debugger: report', (t) => {
+    t.transform('debugger', {
+        'remove-debugger': require('..'),
+    });
+    t.end();
+});
+```
+
+### ✅ Correct code Example
+
+```js
+const removeDebugger = require('..');
+const test = require('@putout/test')(__dirname, {
+    'remove-debugger': removeDebugger,
+});
+
+test('remove debugger: report', (t) => {
+    const test = require('@putout/test')(__dirname, {
+        'remove-debugger': removeDebugger,
+    });
+    t.end();
+});
+```
+
 ## License
 
 MIT

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

@@ -10,6 +10,7 @@ const {operator} = putout;
 const {
     compare,
     extract,
+    compute,
 } = operator;
 
 const name = '__putout_plugin_check_replace_code';
@@ -28,7 +29,7 @@ module.exports.report = ({path, code, error}) => {
     if (error)
         return error.message;
     
-    const key = extract(path.node.key);
+    const [, key] = parseKey(path);
     const value = extract(path.node.value);
     
     return `transform mismatch: "${key}" -> "${value}" !== "${code}"`;
@@ -48,7 +49,17 @@ module.exports.traverse = ({push}) => ({
                 continue;
             
             const {node} = propertyPath;
-            const key = extract(node.key);
+            const [parseError, key] = parseKey(propertyPath);
+            
+            if (parseError) {
+                push({
+                    error: parseError,
+                    mainPath: path,
+                    path: propertyPath,
+                });
+                return;
+            }
+            
             const template = extract(node.value);
             const [generateError, keyCode] = generateCode(path, key);
             
@@ -96,3 +107,18 @@ module.exports.traverse = ({push}) => ({
     },
 });
 
+function parseKey(propertyPath) {
+    const {node} = propertyPath;
+    
+    if (!node.computed)
+        return [null, extract(node.key)];
+    
+    const keyPath = propertyPath.get('key');
+    const [isComputed, key] = compute(keyPath);
+    
+    if (!isComputed)
+        return [Error(`Replace key cannot be computed: '${keyPath.toString()}'`)];
+    
+    return [null, key];
+}
+

package/lib/convert-putout-test-to-create-test/index.js

@@ -2,10 +2,13 @@
 
 module.exports.report = () => `Use 'createTest' instead of 'putoutTest'`;
 
-module.exports.replace = () => ({
-    'import putoutTest from "@putout/test"': (vars, path) => {
-        path.scope.rename('putoutTest', 'createTest');
-        return path;
-    },
-});
+module.exports.filter = ({scope}) => !scope.bindings.createTest;
+
+module.exports.include = () => [
+    'import putoutTest from "@putout/test"',
+];
+
+module.exports.fix = (path) => {
+    path.scope.rename('putoutTest', 'createTest');
+};
 

package/lib/index.js

@@ -26,5 +26,6 @@ module.exports.rules = {
     ...getRule('check-replace-code'),
     ...getRule('declare'),
     ...getRule('add-args'),
+    ...getRule('move-require-on-top-level'),
 };
 

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

@@ -0,0 +1,76 @@
+'use strict';
+
+const justCamelCase = require('just-camel-case');
+const {
+    types,
+    template,
+} = require('putout');
+
+const TEST = `
+    const test = require('@putout/test')(__dirname, {
+        __a: __b
+    });
+`;
+
+const TRANSFORM = `
+    t.transform(__c, {
+        __a: __b
+    });
+`;
+
+const {
+    Identifier,
+    isIdentifier,
+} = types;
+
+module.exports.report = () => 'Move require on top level';
+
+module.exports.match = () => ({
+    [TEST]: ({__b}) => !isIdentifier(__b),
+    [TRANSFORM]: ({__b}) => !isIdentifier(__b),
+});
+
+module.exports.replace = () => ({
+    [TEST]: (vars, path) => {
+        const name = declareRequire(vars, path);
+        const {__a} = vars;
+        const value = __a.value || __a.name;
+        
+        return `
+            const test = require('@putout/test')(__dirname, {
+                '${value}': ${name},
+            });
+        `;
+    },
+    [TRANSFORM]: (vars, path) => {
+        const name = declareRequire(vars, path);
+        const {__a} = vars;
+        const value = __a.value || __a.name;
+        
+        return `
+            t.transform(__c, {
+                '${value}': ${name},
+            });
+    `;
+    },
+});
+
+const buildRequire = template(`const NAME = REQUIRE`);
+
+function declareRequire({__a, __b}, path) {
+    const shortName = (__a.value || __a.name).split('/').pop();
+    const name = justCamelCase(shortName);
+    const requireNode = buildRequire({
+        NAME: Identifier(name),
+        REQUIRE: __b,
+    });
+    
+    if (path.scope.hasBinding(name))
+        return name;
+    
+    const programPath = path.scope.getProgramParent().path;
+    programPath.node.body.unshift(requireNode);
+    
+    return name;
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "8.2.0",
+  "version": "8.5.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "putout plugin helps with plugins development",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-putout",
@@ -13,6 +13,7 @@
     "url": "git://github.com/coderaiser/putout.git"
   },
   "scripts": {
+    "wisdom": "madrun wisdom",
     "test": "madrun test",
     "watch:test": "madrun watch:test",
     "lint": "madrun lint",
@@ -24,6 +25,7 @@
   },
   "dependencies": {
     "fullstore": "^3.0.0",
+    "just-camel-case": "^6.0.1",
     "try-catch": "^3.0.0"
   },
   "keywords": [