@putout/plugin-putout 18.5.0 → 18.7.0

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

@@ -9,9 +9,9 @@ const {replaceWith} = operator;
 
 const {
     ArrayPattern,
-    ObjectPattern,
     BlockStatement,
     ObjectExpression,
+    ObjectPattern,
 } = types;
 
 module.exports = (rootPath, key) => {
@@ -54,17 +54,11 @@ module.exports = (rootPath, key) => {
                     }
                     
                     if (name === '__array') {
-                        if (path.parentPath.isVariableDeclarator())
-                            return replaceWith(path, ArrayPattern([]));
-                        
                         if (path.parentPath.isCallExpression())
                             return replaceWith(path, ArrayPattern([]));
                         
                         if (path.parentPath.isFunction())
                             return replaceWith(path, ArrayPattern([]));
-                        
-                        if (path.parentPath.isAssignmentExpression())
-                            return replaceWith(path, ArrayPattern([]));
                     }
                     
                     if (name === '__object')
@@ -98,12 +92,18 @@ function createVarStore(path) {
 
 function objectify(path) {
     const {parentPath} = path;
-    const isVar = parentPath.isVariableDeclarator();
     const isAssign = parentPath.isAssignmentExpression();
+    const isVar = parentPath.isVariableDeclarator();
     
-    if (isVar && parentPath.get('id') === path)
-        return replaceWith(path, ObjectPattern([]));
+    if (path.parentPath.isExportDeclaration())
+        return replaceWith(path, ObjectExpression([]));
+    
+    if (path.parentPath.isCallExpression())
+        return replaceWith(path, ObjectExpression([]));
     
     if (isAssign && parentPath.get('right') === path)
         return replaceWith(path, ObjectExpression([]));
+    
+    if (isVar && parentPath.get('id') === path)
+        return replaceWith(path, ObjectPattern([]));
 }

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

@@ -9,6 +9,7 @@ const {
     compare,
     extract,
     compute,
+    __json,
 } = operator;
 
 const name = '__putout_plugin_check_replace_code';
@@ -45,10 +46,11 @@ module.exports.traverse = ({push}) => ({
             return;
         
         for (const propertyPath of path.get('right.body.properties')) {
-            if (!propertyPath.get('value').isStringLiteral())
+            const template = extractValue(propertyPath);
+            
+            if (!template)
                 continue;
             
-            const {node} = propertyPath;
             const [parseError, key] = parseKey(propertyPath);
             
             if (parseError) {
@@ -61,7 +63,6 @@ module.exports.traverse = ({push}) => ({
                 return;
             }
             
-            const template = extract(node.value);
             const [generateError, keyCode] = generateCode(path, key);
             
             if (generateError) {
@@ -113,6 +114,10 @@ module.exports.traverse = ({push}) => ({
 
 function parseKey(propertyPath) {
     const keyPath = propertyPath.get('key');
+    
+    if (keyPath.isIdentifier({name: '__json'}))
+        return [null, __json];
+    
     const [isComputed, key] = compute(keyPath);
     
     if (!isComputed)
@@ -133,3 +138,15 @@ function hasMatch(path) {
     
     return false;
 }
+
+function extractValue(path) {
+    const valuePath = path.get('value');
+    
+    if (valuePath.isIdentifier({name: '__json'}))
+        return __json;
+    
+    if (valuePath.isStringLiteral())
+        return valuePath.node.value;
+    
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "18.5.0",
+  "version": "18.7.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin helps with plugins development",
@@ -39,8 +39,8 @@
   "devDependencies": {
     "@putout/plugin-tape": "*",
     "@putout/test": "^8.0.0",
-    "c8": "^8.0.0",
-    "eslint": "^8.0.1",
+    "c8": "^9.0.0",
+    "eslint": "^9.0.0-alpha.0",
     "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-putout": "^22.0.0",
     "lerna": "^6.0.1",