@putout/printer 1.92.4 → 1.93.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.05.11, v1.93.0
+
+feature:
+- 9822d55 @putout/printer: improve support computed property of ObjectPattern
+
 2023.05.11, v1.92.4
 
 feature:

package/lib/tokenize/expressions/object-pattern.js

@@ -8,55 +8,71 @@ const {
     exists,
 } = require('../is');
 
-module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
-    indent.inc();
-    print('{');
-    
-    const properties = path.get('properties');
-    const n = properties.length - 1;
-    const is = shouldAddNewline(path);
-    
-    maybe.print(is, '\n');
-    
-    for (const [i, property] of properties.entries()) {
-        if (property.isRestElement()) {
-            print(property);
-            continue;
-        }
+const isOneParentProperty = ({parentPath}) => parentPath.parentPath.node.properties.length === 1;
+
+module.exports.ObjectPattern = {
+    print(path, {indent, print, maybe}) {
+        indent.inc();
+        print('{');
         
-        const valuePath = property.get('value');
-        const keyPath = property.get('key');
-        const isAssign = valuePath.isAssignmentPattern();
-        const {shorthand} = property.node;
-        const couple = isCoupleLines(valuePath) && !exists(property.getPrevSibling());
+        const properties = path.get('properties');
+        const n = properties.length - 1;
+        const is = shouldAddNewline(path);
         
-        maybe.indent(is);
-        maybe.print.breakline(couple);
-        print(keyPath);
+        maybe.print(is, '\n');
         
-        if (!shorthand) {
-            print(': ');
-            print(valuePath);
-        } else if (isAssign) {
-            print(valuePath);
+        for (const [i, property] of properties.entries()) {
+            if (property.isRestElement()) {
+                print(property);
+                continue;
+            }
             
-            maybe.print(couple, ',');
-            maybe.print.newline(couple);
-        }
-        
-        if (is) {
-            print(',');
-            print.newline();
+            const valuePath = property.get('value');
+            const keyPath = property.get('key');
+            const isAssign = valuePath.isAssignmentPattern();
+            const {shorthand, computed} = property.node;
+            const couple = isCoupleLines(valuePath) && !exists(property.getPrevSibling());
             
-            continue;
+            maybe.indent(is);
+            maybe.print.breakline(couple);
+            
+            maybe.print(computed, '[');
+            print(keyPath);
+            maybe.print(computed, ']');
+            
+            if (!shorthand) {
+                print(': ');
+                print(valuePath);
+            } else if (isAssign) {
+                print(valuePath);
+                
+                maybe.print(couple, ',');
+                maybe.print.newline(couple);
+            }
+            
+            if (is) {
+                print(',');
+                print.newline();
+                
+                continue;
+            }
+            
+            maybe.print(i < n, ', ');
         }
         
-        maybe.print(i < n, ', ');
-    }
-    
-    indent.dec();
-    maybe.indent(is);
-    print('}');
+        indent.dec();
+        maybe.indent(is);
+        print('}');
+    },
+    afterIf(path) {
+        if (!path.parentPath.isObjectProperty())
+            return false;
+        
+        return isOneParentProperty(path);
+    },
+    after(path, {print}) {
+        print.newline();
+    },
 };
 
 function checkLength(properties) {
@@ -85,3 +101,4 @@ function shouldAddNewline(path) {
     
     return false;
 }
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.92.4",
+  "version": "1.93.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",