@putout/printer 1.119.0 → 1.120.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2023.05.29, v1.120.0
+
+feature:
+- da33669 @putout/printer: ObjectProperty: improve support when one line inside LogicalExpression
+- db06c37 @putout/printer: ObjectPattern: improve RestElement support
+
 2023.05.29, v1.119.0
 
 feature:

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

@@ -91,7 +91,8 @@ module.exports.ObjectProperty = (path, {print, maybe}) => {
         shorthand,
         computed,
     } = path.node;
-    
+    const properties = path.parentPath.get('properties');
+    const isLast = path === properties.at(-1);
     const manyLines = !isOneLine(path.parentPath);
     
     maybe.print(computed, '[');
@@ -104,7 +105,10 @@ module.exports.ObjectProperty = (path, {print, maybe}) => {
         print('__value');
     }
     
-    maybe.print(manyLines, ',');
+    if (manyLines)
+        print(',');
+    else if (!isLast && properties.length)
+        print(', ');
 };
 
 const ONE_LINE = true;
@@ -137,3 +141,4 @@ function isParens(path) {
     
     return false;
 }
+

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

@@ -1,6 +1,9 @@
 'use strict';
 
-const {isIdentifier} = require('@babel/types');
+const {
+    isIdentifier,
+    isObjectPattern,
+} = require('@babel/types');
 
 const {
     isForOf,
@@ -22,14 +25,15 @@ module.exports.ObjectPattern = {
         const properties = path.get('properties');
         const n = properties.length - 1;
         const is = shouldAddNewline(path);
+        const hasObject = n && hasObjectPattern(properties);
         
         maybe.print(is, '\n');
         
         for (const [i, property] of properties.entries()) {
             if (property.isRestElement()) {
-                maybe.indent(n > 1);
+                maybe.indent(hasObject);
                 print(property);
-                maybe.print.newline(n > 1);
+                maybe.print.newline(hasObject);
                 continue;
             }
             
@@ -62,7 +66,7 @@ module.exports.ObjectPattern = {
                 maybe.print.newline(couple);
             }
             
-            if (is) {
+            if (is || hasObject) {
                 print(',');
                 print.newline();
                 
@@ -83,7 +87,10 @@ module.exports.ObjectPattern = {
         if (!path.parentPath.isObjectProperty())
             return false;
         
-        return isOneParentProperty(path);
+        if (isOneParentProperty(path))
+            return true;
+        
+        return false;
     },
     after(path, {print}) {
         print.newline();
@@ -104,6 +111,15 @@ function checkLength(properties) {
     return false;
 }
 
+function hasObjectPattern(properties) {
+    for (const property of properties) {
+        if (isObjectPattern(property.node.value))
+            return true;
+    }
+    
+    return false;
+}
+
 function shouldAddNewline(path) {
     const properties = path.get('properties');
     const n = properties.length - 1;
@@ -116,4 +132,3 @@ function shouldAddNewline(path) {
     
     return false;
 }
-

package/package.json

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