@putout/plugin-putout 18.2.0 → 18.4.0

package/README.md

@@ -29,6 +29,7 @@ npm i @putout/plugin-putout -D
         "putout/add-args": "on",
         "putout/add-push": "on",
         "putout/add-track-file": "on",
+        "putout/add-await-to-progress": "on",
         "putout/add-index-to-import": "on",
         "putout/check-match": "on",
         "putout/check-replace-code": "on",
@@ -588,7 +589,10 @@ module.exports.replace = () => ({
 
 ## convert-traverse-to-scan
 
-Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/afe988c8e53ae70e50bf26512672f3cd/a6677d53b996e85880a4af18250c00e849322bbe).
+Checkout in 🐊**Putout Editor**:
+
+- [`Traverser`](https://putout.cloudcmd.io/#/gist/afe988c8e53ae70e50bf26512672f3cd/a6677d53b996e85880a4af18250c00e849322bbe);
+- [`Replacer`](https://putout.cloudcmd.io/#/gist/2e89f498c88f3208beeb85dd01a9178e/ed975281c57f451fc1c3aaf187425a33499af71d);
 
 ### ❌ Example of incorrect code
 
@@ -765,6 +769,26 @@ module.exports.traverse = ({push}) => ({
 });
 ```
 
+## add-await-to-progress
+
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/978d70945edfa369390ea059654ff04d/89225c04039b9c0e9057aad34852c9428264f119).
+
+### ❌ Example of incorrect code
+
+```js
+test('', ({progress}) => {
+    progress();
+});
+```
+
+### ✅ Example of correct code
+
+```js
+test('', async ({progress}) => {
+    await progress();
+});
+```
+
 ## add-track-file
 
 Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/faaba1ce41e6fd274bc82a8875a52bfa/b34a22fdf9080e6b2f06703760f629d83d69ff3d).

package/lib/add-args/index.js

@@ -19,4 +19,9 @@ module.exports = addArgs({
         'test.skip("__a", async (__args) => __body)',
         'test.only("__a", async (__args) => __body)',
     ]],
+    progress: ['{progress}', [
+        'test("__a", async (__args) => __body)',
+        'test.skip("__a", async (__args) => __body)',
+        'test.only("__a", async (__args) => __body)',
+    ]],
 });

package/lib/add-await-to-progress/index.js

@@ -0,0 +1,48 @@
+'use strict';
+
+const {types, operator} = require('putout');
+const {
+    Identifier,
+    ObjectPattern,
+    ObjectProperty,
+} = types;
+
+const {remove, compare} = operator;
+
+const checkAwait = (vars, path) => !path.parentPath.isAwaitExpression();
+
+module.exports.report = () => `Add 'await' to operator 'progress()'`;
+
+module.exports.match = () => ({
+    'progress(__args)': checkAwait,
+    't.progress(__args)': checkAwait,
+});
+
+module.exports.replace = () => ({
+    'test(__a, async (t, {progress}) => __body)': 'test(__a, async ({progress}) => __body)',
+    'progress(__args)': addAwait,
+    't.progress(__args)': addAwait,
+});
+
+function addAwait(vars, path) {
+    const next = path.parentPath.getNextSibling();
+    
+    if (compare(next, 't.end()'))
+        remove(next);
+    
+    const {params} = path.scope.block;
+    const [first] = params;
+    
+    if (first.name === 't') {
+        const id = Identifier('progress');
+        
+        path.scope.block.params = [
+            ObjectPattern([
+                ObjectProperty(id, id, false, true),
+            ]),
+        ];
+    }
+    
+    path.scope.block.async = true;
+    return 'await progress(__args)';
+}

package/lib/{convert-progress-to-track → convert-progress-to-track-file}/index.js

@@ -27,7 +27,16 @@ module.exports.traverse = ({push}) => ({
         const statement = path.find(isForOfStatement);
         
         if (!statement)
-            return false;
+            return;
+        
+        const forOfCount = statement
+            .parentPath
+            .get('body')
+            .filter(isForOfStatement)
+            .length;
+        
+        if (forOfCount > 1)
+            return;
         
         push({
             path,

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

@@ -33,7 +33,12 @@ module.exports.fix = ({path, pathProperty}) => {
         replaceWith(path.parentPath, path.get('value.body'));
         path.parentPath.parentPath.node.params.unshift(Identifier('path'));
         
-        const {left} = path.parentPath.parentPath.parentPath.node;
+        const assignmentPath = path.parentPath.parentPath.parentPath;
+        
+        if (!assignmentPath.isAssignmentExpression())
+            return;
+        
+        const {left} = assignmentPath.node;
         
         left.property.name = 'scan';
         return;
@@ -84,7 +89,6 @@ module.exports.traverse = ({push}) => ({
             path,
         });
     },
-    '__.map(push)'() {},
     'push(__a)'(path) {
         const __aPath = path.get('arguments.0');
         

package/lib/index.js

@@ -45,7 +45,8 @@ const addIndexToImport = require('./add-index-to-import');
 const applyRename = require('./apply-rename');
 const applyShortProcessors = require('./apply-short-processors');
 const addTrackFile = require('./add-track-file');
-const convertProgressToTrack = require('./convert-progress-to-track');
+const convertProgressToTrackFile = require('./convert-progress-to-track-file');
+const addAwaitToProgress = require('./add-await-to-progress');
 
 module.exports.rules = {
     'apply-processors-destructuring': applyProcessorsDestructuring,
@@ -93,5 +94,6 @@ module.exports.rules = {
     'apply-short-processors': applyShortProcessors,
     'convert-traverse-to-scan': convertTraverseToScan,
     'add-track-file': addTrackFile,
-    'convert-progress-to-track': convertProgressToTrack,
+    'convert-progress-to-track-file': convertProgressToTrackFile,
+    'add-await-to-progress': addAwaitToProgress,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "18.2.0",
+  "version": "18.4.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin helps with plugins development",
@@ -37,6 +37,7 @@
     "putout"
   ],
   "devDependencies": {
+    "@putout/plugin-tape": "*",
     "@putout/test": "^8.0.0",
     "c8": "^8.0.0",
     "eslint": "^8.0.1",