@putout/plugin-putout 8.4.0 → 8.5.0

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

@@ -5,16 +5,12 @@ const tryCatch = require('try-catch');
 
 const generateCode = require('./generate-code');
 
-const {operator, types} = putout;
-const {
-    isMemberExpression,
-    isObjectExpression,
-} = types;
+const {operator} = putout;
 
 const {
     compare,
     extract,
-    getBindingPath,
+    compute,
 } = operator;
 
 const name = '__putout_plugin_check_replace_code';
@@ -33,7 +29,7 @@ module.exports.report = ({path, code, error}) => {
     if (error)
         return error.message;
     
-    const key = extract(path.node.key);
+    const [, key] = parseKey(path);
     const value = extract(path.node.value);
     
     return `transform mismatch: "${key}" -> "${value}" !== "${code}"`;
@@ -53,13 +49,18 @@ module.exports.traverse = ({push}) => ({
                 continue;
             
             const {node} = propertyPath;
-            const key = compute(propertyPath);
+            const [parseError, key] = parseKey(propertyPath);
             
-            if (!key)
-                continue;
+            if (parseError) {
+                push({
+                    error: parseError,
+                    mainPath: path,
+                    path: propertyPath,
+                });
+                return;
+            }
             
             const template = extract(node.value);
-            
             const [generateError, keyCode] = generateCode(path, key);
             
             if (generateError) {
@@ -106,34 +107,18 @@ module.exports.traverse = ({push}) => ({
     },
 });
 
-function compute(path) {
-    const {key, computed} = path.node;
-    
-    if (!computed)
-        return extract(key);
-    
-    if (!isMemberExpression(key))
-        return '';
-    
-    const bindingPath = getBindingPath(path, extract(key.object));
+function parseKey(propertyPath) {
+    const {node} = propertyPath;
     
-    if (!bindingPath)
-        return '';
+    if (!node.computed)
+        return [null, extract(node.key)];
     
-    const bindingNode = bindingPath.node;
+    const keyPath = propertyPath.get('key');
+    const [isComputed, key] = compute(keyPath);
     
-    if (!isObjectExpression(bindingNode.init))
-        return '';
-    
-    const keyPropertyValue = extract(key.property);
-    
-    for (const property of bindingNode.init.properties) {
-        const keyValue = extract(property.key);
-        
-        if (keyValue === keyPropertyValue)
-            return extract(property.value);
-    }
+    if (!isComputed)
+        return [Error(`Replace key cannot be computed: '${keyPath.toString()}'`)];
     
-    return `'not found'`;
+    return [null, key];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "putout plugin helps with plugins development",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-putout",