feature: @putout/plugin-extract-keywords-from-variables: export

Author: coderaiser

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

@@ -2,32 +2,50 @@
 
 const {types, operator} = require('putout');
 const {
+    isArrowFunctionExpression,
+    isLiteral,
     IfStatement,
     ImportDefaultSpecifier,
     ImportDeclaration,
     ExportNamedDeclaration,
-    isLiteral,
     VariableDeclarator,
     VariableDeclaration,
     isAssignmentExpression,
+    isExportNamedDeclaration,
 } = types;
 
 const {
     remove,
     replaceWith,
     isDeclarationKeyword,
     isConditionKeyword,
+    isModuleDeclarationKeyword,
 } = operator;
 
 const buildDeclaration = (type) => (nextPath, path) => {
     const {expression} = nextPath.node;
+    let left;
+    let right;
 
     if (isAssignmentExpression(expression)) {
-        const {left, right} = expression;
-        replaceWith(nextPath, VariableDeclaration(type, [VariableDeclarator(left, right)]));
+        ({
+            left,
+            right,
+        } = expression);
     } else {
-        replaceWith(nextPath, VariableDeclaration(type, [VariableDeclarator(path.node.id, nextPath.node.expression)]));
+        left = path.node.id;
+        right = nextPath.node.expression;
     }
+    
+    replaceWith(nextPath, VariableDeclaration(type, [VariableDeclarator(left, right)]));
+    
+    const {name} = path.node.id;
+    
+    if (isDeclarationKeyword(name))
+        return;
+    
+    if (isExportNamedDeclaration(path.parentPath.parentPath))
+        replaceWith(nextPath, ExportNamedDeclaration(nextPath.node));
 };
 
 const builders = {
@@ -50,7 +68,7 @@ module.exports.traverse = ({push}) => ({
     VariableDeclarator(path) {
         const {name} = path.node.id;
 
-        if (isDeclarationKeyword(name) || isConditionKeyword(name)) {
+        if (isDeclarationKeyword(name) || isConditionKeyword(name) || isModuleDeclarationKeyword(name)) {
             const topPath = getTopPath(path);
             const nextPath = topPath.getNextSibling();
 
@@ -73,13 +91,18 @@ module.exports.traverse = ({push}) => ({
 
         const {kind} = path.parentPath.node;
 
-        if (kind === 'const' && !path.node.init) {
+        if (!path.node.init) {
             const topPath = getTopPath(path);
             const nextPath = topPath.getNextSibling();
 
-            if (nextPath.isExpressionStatement() && isLiteral(nextPath.node.expression))
-                return push({
-                    name: 'const',
+            if (!nextPath.isExpressionStatement())
+                return;
+            
+            const {expression} = nextPath.node;
+            
+            if (isLiteral(expression) || isArrowFunctionExpression(expression))
+                push({
+                    name: kind,
                     path,
                     nextPath,
                 });

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

@@ -29,6 +29,26 @@ test('putout: extract-keywords-from-variables: transform: if', (t) => {
     t.end();
 });
 
+test('putout: extract-keywords-from-variables: transform: export', (t) => {
+    t.transform('export');
+    t.end();
+});
+
+test('putout: extract-keywords-from-variables: transform: export-let', (t) => {
+    t.transform('export-let');
+    t.end();
+});
+
+test('putout: extract-keywords-from-variables: transform: export-var', (t) => {
+    t.transform('export-var');
+    t.end();
+});
+
+test('putout: extract-keywords-from-variables: transform: let-no-init', (t) => {
+    t.transform('let-no-init');
+    t.end();
+});
+
 test('putout: extract-keywords-from-variables: report: const', (t) => {
     t.report('const', `Extract 'const' from variable`);
     t.end();

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

@@ -0,0 +1,3 @@
+export const report = () => '';
+export const fix = () => {};
+export const include = () => ['JSXElement'];

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

@@ -0,0 +1,3 @@
+export const report = () => '';
+export const fix = () => {};
+export let include = () => ['JSXElement'];

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

@@ -0,0 +1,3 @@
+export const report = () => '',
+export const fix = () => {};
+export let include () => ['JSXElement'];

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

@@ -0,0 +1,3 @@
+export const report = () => '';
+export const fix = () => {};
+export var include = () => ['JSXElement'];

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

@@ -0,0 +1,3 @@
+export const report = () => '',
+export const fix = () => {};
+export var include () => ['JSXElement'];

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

@@ -0,0 +1,3 @@
+export const report = () => '',
+export const fix = () => {};
+export const include () => ['JSXElement'];

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

@@ -0,0 +1,3 @@
+export const report = () => '';
+export const fix = () => {};
+export let include;

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

@@ -0,0 +1,3 @@
+export const report = () => '',
+export const fix = () => {};
+export let include;