feature: @putout/plugin-extract-keywords-from-variables: add support of import, let, var

Author: coderaiser

packages/plugin-extract-keywords-from-variables/.putout.json

@@ -1,5 +1,5 @@
 {
     "rules": {
-        "extract-keywords-from-variables": "on"
+        "extract-keywords-from-variables": "off"
     }
 }

packages/plugin-extract-keywords-from-variables/README.md

@@ -7,7 +7,7 @@
 >
 > (c) [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Unexpected_token)
 
-🐊[**Putout**](https://github.com/coderaiser/putout) plugin adds ability to extract `keywords` from variables. Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/fcaedaa9daf7f3a771274aca0da9ab1b).
+🐊[**Putout**](https://github.com/coderaiser/putout) plugin adds ability to extract `keywords` from variables. Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/fcaedaa9daf7f3a771274aca0da9ab1b/4496811b3f092b8124703fd69c84c51be86cf90a).
 
 ## Install
 

packages/plugin-extract-keywords-from-variables/lib/extract-keywords-from-variables.js

@@ -1,33 +1,51 @@
 'use strict';
 
 const {types, operator} = require('putout');
-const {remove, replaceWith} = operator;
+const buildDeclaration = (type) => (path) => {
+    const {left, right} = path.node.expression;
+    replaceWith(path, VariableDeclaration(type, [VariableDeclarator(left, right)]));
+};
+
 const {
+    ImportDefaultSpecifier,
+    ImportDeclaration,
+    ExportNamedDeclaration,
     VariableDeclarator,
     VariableDeclaration,
-    ExportNamedDeclaration,
 } = types;
 
+const {remove, replaceWith} = operator;
+
 const keywords = [
     'export',
     'const',
+    'var',
+    'let',
+    'import',
 ];
 
+const builders = {
+    const: buildDeclaration('const'),
+    var: buildDeclaration('var'),
+    let: buildDeclaration('let'),
+    import: buildImport,
+    export: buildExport,
+};
+
 module.exports.report = () => `Extract 'export' from variable`;
 
 module.exports.fix = ({path, nextPath}) => {
-    if (path.node.id.name === 'export')
-        replaceWith(nextPath, ExportNamedDeclaration(nextPath.node));
-    
-    if (path.node.id.name === 'const')
-        replaceWith(nextPath, VariableDeclaration('const', [VariableDeclarator(nextPath.node.expression.left, nextPath.node.expression.right)]));
+    const {name} = path.node.id;
 
+    builders[name](nextPath);
     remove(path);
 };
 
 module.exports.traverse = ({push}) => ({
     VariableDeclarator(path) {
-        if (!keywords.includes(path.node.id.name))
+        const {name} = path.node.id;
+        
+        if (!keywords.includes(name))
             return;
 
         const topPath = getTopPath(path);
@@ -39,7 +57,7 @@ module.exports.traverse = ({push}) => ({
                 nextPath,
             });
 
-        if (nextPath.isExpressionStatement() && nextPath.get('expression').isAssignmentExpression())
+        if (nextPath.isExpressionStatement())
             return push({
                 path,
                 nextPath,
@@ -53,3 +71,18 @@ function getTopPath(path) {
 
     return path.parentPath;
 }
+
+function buildExport(path) {
+    replaceWith(path, ExportNamedDeclaration(path.node));
+}
+
+function buildImport(path) {
+    const fromPath = path.getNextSibling();
+    const sourcePath = fromPath.getNextSibling();
+    const source = sourcePath.node.expression;
+    const local = path.node.expression;
+    
+    replaceWith(path, ImportDeclaration([ImportDefaultSpecifier(local, local)], source));
+    remove(sourcePath);
+    remove(fromPath);
+}

packages/plugin-extract-keywords-from-variables/test/fixture/extract-keywords-from-variables-fix.js

@@ -1,9 +1,17 @@
 export const isTemplateMiddle = (a) => a?.type === 'TemplateMiddle';
 export const isTemplateTail = (a) => a?.type === 'TemplateTail';
 
-export const a = 1;
+export const a = (a) => a?.type === 'TemplateMiddle';
 const b = 5;
 
-const a1 = 1;
+const a1 = 2;
 
-const b2 = 5;
+import x from 'b';
+
+const z1 = 1;
+
+var z2 = 2;
+
+const a4 = 1;
+
+let b4 = 2;

packages/plugin-extract-keywords-from-variables/test/fixture/extract-keywords-from-variables.js

@@ -1,8 +1,16 @@
 export const isTemplateMiddle = (a) => a?.type === 'TemplateMiddle',
 export const isTemplateTail = (a) => a?.type === 'TemplateTail';
 
-export const a = 1;
+export const a = (a) => a?.type === 'TemplateMiddle',
 const b = 5;
 
-const a1 = 1,
-const b2 = 5;
+const a1 = 2,
+import x from 'b';
+
+
+const z1 = 1,
+var z2 = 2;
+
+const a4 = 1,
+let b4 = 2;
+