@putout/plugin-return 1.0.0 → 1.1.0

package/README.md

@@ -123,7 +123,7 @@ Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/a321ee4d76
 function x() {
     if (a)
         break;
-
+    
     return false;
 }
 ```
@@ -151,10 +151,10 @@ function x() {
     {
         hello: 'world';
     }
-
+    
     return;
     5;
-
+    
     return;
     a ? 2 : 3;
 }
@@ -208,7 +208,7 @@ Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/304035b95
 function isA(a, b) {
     if (a.length === b.length)
         return true;
-
+    
     return false;
 }
 ```

package/lib/convert-from-break/index.js

@@ -1,50 +1,5 @@
 'use strict';
 
-const {types, operator} = require('putout');
-const {replaceWith} = operator;
-const {
-    isLabeledStatement,
-    ReturnStatement,
-} = types;
+const {convertFrom} = require('../convert-from');
 
-module.exports.report = () => `Use 'return' instead of 'break'`;
-
-module.exports.fix = (path) => {
-    replaceWith(path, ReturnStatement());
-};
-
-module.exports.traverse = ({push}) => ({
-    BreakStatement(path) {
-        if (path.node.label) {
-            const {name} = path.node.label;
-            
-            const labeledPath = path.find(isLabeledStatement);
-            
-            if (labeledPath && name === labeledPath.node.label.name)
-                return;
-        }
-        
-        const upperPath = path.find(isUpperScope);
-        
-        if (upperPath.isLoop())
-            return;
-        
-        if (upperPath.isSwitchStatement())
-            return;
-        
-        push(path);
-    },
-});
-
-const isUpperScope = (path) => {
-    if (path.isLoop())
-        return true;
-    
-    if (path.isProgram())
-        return true;
-    
-    if (path.isSwitchStatement())
-        return true;
-    
-    return path.isFunction();
-};
+module.exports = convertFrom('break');

package/lib/convert-from-continue/index.js

@@ -1,44 +1,5 @@
 'use strict';
 
-const {types, operator} = require('putout');
-const {
-    isLabeledStatement,
-    ReturnStatement,
-} = types;
+const {convertFrom} = require('../convert-from');
 
-const {replaceWith} = operator;
-
-module.exports.report = () => `Use 'return' instead of 'continue'`;
-
-module.exports.fix = (path) => {
-    replaceWith(path, ReturnStatement());
-};
-
-module.exports.traverse = ({push}) => ({
-    ContinueStatement(path) {
-        if (path.node.label) {
-            const {name} = path.node.label;
-            const labeledPath = path.find(isLabeledStatement);
-            
-            if (labeledPath && name === labeledPath.node.label.name)
-                return;
-        }
-        
-        const upperPath = path.find(isUpperScope);
-        
-        if (upperPath.isLoop())
-            return;
-        
-        push(path);
-    },
-});
-
-const isUpperScope = (path) => {
-    if (path.isProgram())
-        return true;
-    
-    if (path.isLoop())
-        return true;
-    
-    return path.isFunction();
-};
+module.exports = convertFrom('continue');

package/lib/convert-from.js

@@ -0,0 +1,60 @@
+'use strict';
+
+const {types, operator} = require('putout');
+const {replaceWith} = operator;
+const {
+    isLabeledStatement,
+    ReturnStatement,
+} = types;
+
+const createReport = (name) => () => `Use 'return' instead of '${name}'`;
+
+const fix = (path) => {
+    replaceWith(path, ReturnStatement());
+};
+
+module.exports.convertFrom = (name) => {
+    const visitor = name[0].toUpperCase() + name.slice(1) + `Statement`;
+    
+    return {
+        fix,
+        report: createReport(name),
+        traverse: createTraverse(visitor),
+    };
+};
+
+const createTraverse = (visitor) => ({push}) => ({
+    [visitor](path) {
+        if (path.node.label) {
+            const {name} = path.node.label;
+            
+            const labeledPath = path.find(isLabeledStatement);
+            
+            if (labeledPath && name === labeledPath.node.label.name)
+                return;
+        }
+        
+        const upperPath = path.find(isUpperScope);
+        
+        if (upperPath.isLoop())
+            return;
+        
+        if (upperPath.isSwitchStatement())
+            return;
+        
+        push(path);
+    },
+});
+
+const isUpperScope = (path) => {
+    if (path.isLoop())
+        return true;
+    
+    if (path.isProgram())
+        return true;
+    
+    if (path.isSwitchStatement())
+        return true;
+    
+    return path.isFunction();
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-return",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability to transform code related to return",