@putout/plugin-putout 8.4.0 → 8.7.0

package/README.md

@@ -16,6 +16,7 @@ npm i @putout/plugin-putout -D
 ```json
 {
     "rules": {
+        "putout/apply-create-test": "on",
         "putout/apply-processors-destructuring": "on",
         "putout/apply-async-formatter": "on",
         "putout/add-args": "on",
@@ -31,6 +32,8 @@ npm i @putout/plugin-putout -D
         "putout/convert-process-to-find": "on",
         "putout/convert-method-to-property": "on",
         "putout/convert-add-argument-to-add-args": "on",
+        "putout/convert-dirname-to-url": "on",
+        "putout/convert-url-to-dirname": "on",
         "putout/shorten-imports": "on",
         "putout/check-replace-code": "on",
         "putout/declare": "on",
@@ -77,6 +80,25 @@ test('formatter: codeframea', async ({format}) => {
 });
 ```
 
+## apply-create-test
+
+### ❌ Incorrect code example
+
+```js
+const test = require('@putout/test')({
+    'remove-debugger': plugin,
+});
+```
+
+### ✅ Correct code example
+
+```js
+const {createTest} = require('@putout/test');
+const test = createTest({
+    'remove-debugger': plugin,
+});
+```
+
 ## 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.
@@ -396,6 +418,52 @@ module.exports = addArgs({
 });
 ```
 
+## convert-dirname-to-url
+
+```js
+import {createTest} from '@putout/test';
+import plugin from '@putout/plugin-debugger';
+import {createSimport} from 'simport';
+const {__dirname} = createSimport(import.meta.url);
+
+const test = createTest(__dirname, {
+    'remove-debugger': plugin,
+});
+```
+
+### ✅ Correct code Example
+
+```js
+import {createTest} from '@putout/test';
+import plugin from '@putout/plugin-debugger';
+
+const test = createTest(import.meta.url, {
+    'remove-debugger': plugin,
+});
+```
+
+## convert-url-to-dirname-
+
+```js
+const {createTest} = require('@putout/test');
+const plugin = require('@putout/plugin-debugger');
+
+const test = createTest(import.meta.url, {
+    'remove-debugger': plugin,
+});
+```
+
+### ✅ Correct code Example
+
+```js
+const {createTest} = require('@putout/test');
+const plugin = require('@putout/plugin-debugger');
+
+const test = createTest(import.meta.url, {
+    'remove-debugger': plugin,
+});
+```
+
 ## move-require-on-top-level
 
 ### ❌ Incorrect code example

package/lib/apply-create-test/index.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.report = () => `Apply 'createTest'`;
+
+module.exports.replace = () => ({
+    'require("@putout/test")(__dirname, __a)': `createTest(__dirname, __a)`,
+});
+

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

@@ -5,16 +5,12 @@ const tryCatch = require('try-catch');
 
 const generateCode = require('./generate-code');
 
-const {operator, types} = putout;
-const {
-    isMemberExpression,
-    isObjectExpression,
-} = types;
+const {operator} = putout;
 
 const {
     compare,
     extract,
-    getBindingPath,
+    compute,
 } = operator;
 
 const name = '__putout_plugin_check_replace_code';
@@ -33,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}"`;
@@ -53,13 +49,18 @@ module.exports.traverse = ({push}) => ({
                 continue;
             
             const {node} = propertyPath;
-            const key = compute(propertyPath);
+            const [parseError, key] = parseKey(propertyPath);
             
-            if (!key)
-                continue;
+            if (parseError) {
+                push({
+                    error: parseError,
+                    mainPath: path,
+                    path: propertyPath,
+                });
+                return;
+            }
             
             const template = extract(node.value);
-            
             const [generateError, keyCode] = generateCode(path, key);
             
             if (generateError) {
@@ -106,34 +107,13 @@ module.exports.traverse = ({push}) => ({
     },
 });
 
-function compute(path) {
-    const {key, computed} = path.node;
+function parseKey(propertyPath) {
+    const keyPath = propertyPath.get('key');
+    const [isComputed, key] = compute(keyPath);
     
-    if (!computed)
-        return extract(key);
-    
-    if (!isMemberExpression(key))
-        return '';
-    
-    const bindingPath = getBindingPath(path, extract(key.object));
-    
-    if (!bindingPath)
-        return '';
-    
-    const bindingNode = bindingPath.node;
-    
-    if (!isObjectExpression(bindingNode.init))
-        return '';
-    
-    const keyPropertyValue = extract(key.property);
-    
-    for (const property of bindingNode.init.properties) {
-        const keyValue = extract(property.key);
-        
-        if (keyValue === keyPropertyValue)
-            return extract(property.value);
-    }
+    if (!isComputed)
+        return [Error(`Replace key cannot be computed: '${keyPath.toString()}'`)];
     
-    return `'not found'`;
+    return [null, key];
 }
 

package/lib/convert-dirname-to-url/index.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const {operator} = require('putout');
+const {isESM} = operator;
+
+module.exports.report = () => `Use 'createTest(import.meta.url)' instead of 'createTest(__dirname)'`;
+
+module.exports.match = () => ({
+    'createTest(__dirname, __a)': (vars, path) => {
+        return isESM(path);
+    },
+});
+
+module.exports.replace = () => ({
+    'createTest(__dirname, __a)': 'createTest(import.meta.url, __a)',
+});
+

package/lib/convert-url-to-dirname/index.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const {operator} = require('putout');
+const {isESM} = operator;
+
+module.exports.report = () => `Use 'createTest(__dirname)' instead of 'createTest(import.meta.url)' in CommonJS'`;
+
+module.exports.match = () => ({
+    'createTest(import.meta.url, __a)': (vars, path) => !isESM(path),
+});
+
+module.exports.replace = () => ({
+    'createTest(import.meta.url, __a)': 'createTest(__dirname, __a)',
+});
+

package/lib/declare/declarations.js

@@ -4,7 +4,8 @@ const types = require('./types');
 const operator = require('./operator');
 
 module.exports = {
-    template: `const {template} = require('putout')`,
+    template: `import {template} from 'putout'`,
+    createTest: `import {createTest} from '@putout/test'`,
     ...operator,
     ...types,
 };

package/lib/index.js

@@ -7,6 +7,7 @@ const getRule = (a) => ({
 module.exports.rules = {
     ...getRule('apply-processors-destructuring'),
     ...getRule('apply-async-formatter'),
+    ...getRule('apply-create-test'),
     ...getRule('convert-putout-test-to-create-test'),
     ...getRule('convert-to-no-transform-code'),
     ...getRule('convert-find-to-traverse'),
@@ -20,6 +21,8 @@ module.exports.rules = {
     ...getRule('convert-process-to-find'),
     ...getRule('convert-method-to-property'),
     ...getRule('convert-add-argument-to-add-args'),
+    ...getRule('convert-dirname-to-url'),
+    ...getRule('convert-url-to-dirname'),
     ...getRule('rename-operate-to-operator'),
     ...getRule('replace-operate-with-operator'),
     ...getRule('shorten-imports'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "8.4.0",
+  "version": "8.7.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",