@putout/printer 8.31.0 → 8.33.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2024.05.03, v8.33.0
+
+feature:
+- c8b9948 @putout/printer: ObjectPattern: improve support of maxPropertiesLengthInOneLine
+- 039c54d @putout/printer: ObjectPattern: indent: simplify
+
+2024.05.03, v8.32.0
+
+feature:
+- 4c10986 @putout/printer: ObjectPattern: used as Function param
+
 2024.05.03, v8.31.0
 
 feature:

package/lib/tokenize/expressions/array-expression/is-object-after-simple.js

@@ -18,4 +18,3 @@ module.exports.isObjectAfterSimple = (a) => {
     
     return SIMPLE_TYPES.includes(type);
 };
-

package/lib/tokenize/expressions/object-pattern/more-then-max-properties-length-in-one-line.js

@@ -1,11 +1,26 @@
 'use strict';
 
-const {isIdentifier} = require('@putout/babel').types;
+const {
+    isAssignmentPattern,
+    isIdentifier,
+} = require('@putout/babel').types;
 
 module.exports.moreThenMaxPropertiesLengthInOneLine = (path, {maxPropertiesLengthInOneLine}) => {
     const {properties} = path.node;
     
-    for (const {key} of properties) {
+    for (const {key, value} of properties) {
+        if (isAssignmentPattern(value)) {
+            const {left, right} = value;
+            
+            if (!isIdentifier(left) || !isIdentifier(right))
+                continue;
+            
+            const length = left.name.length + right.name.length;
+            
+            if (length >= maxPropertiesLengthInOneLine)
+                return true;
+        }
+        
         if (!isIdentifier(key))
             continue;
         
@@ -17,3 +32,4 @@ module.exports.moreThenMaxPropertiesLengthInOneLine = (path, {maxPropertiesLengt
     
     return false;
 };
+

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

@@ -26,8 +26,18 @@ function isIndent(path) {
     return !path.parentPath.isArrayPattern();
 }
 
+const isCoupleProperties = ({path, valuePath, property}) => {
+    if (!isCoupleLines(valuePath))
+        return false;
+    
+    if (exists(property.getPrevSibling()))
+        return false;
+    
+    return !path.parentPath.isObjectProperty();
+};
+
 module.exports.ObjectPattern = {
-    print: maybeTypeAnnotation((path, {print, maybe}, semantics) => {
+    print: maybeTypeAnnotation((path, {print, maybe, indent}, semantics) => {
         const shouldIndent = isIndent(path);
         const {
             maxPropertiesInOneLine,
@@ -64,7 +74,11 @@ module.exports.ObjectPattern = {
             const isAssign = valuePath.isAssignmentPattern();
             
             const {shorthand, computed} = property.node;
-            const couple = isCoupleLines(valuePath) && !exists(property.getPrevSibling()) && !path.parentPath.isObjectProperty();
+            const couple = isCoupleProperties({
+                path,
+                property,
+                valuePath,
+            });
             
             maybe.indent(is);
             maybe.print.breakline(couple);
@@ -84,7 +98,7 @@ module.exports.ObjectPattern = {
                 maybe.print.newline(couple);
             }
             
-            if (is || hasObject) {
+            if (is || hasObject && !isAssign) {
                 print(',');
                 print.newline();
                 
@@ -97,9 +111,7 @@ module.exports.ObjectPattern = {
             }
         }
         
-        maybe.indent.dec(shouldIndent);
-        
-        maybe.indent.dec(!shouldIndent);
+        indent.dec();
         maybe.indent(is);
         maybe.indent.inc(!shouldIndent);
         print('}');
@@ -173,14 +185,27 @@ function shouldAddNewline(path, semantics) {
         maxPropertiesInOneLine,
     });
     
+    const fnParam = isFunctionParam(path);
+    
     if (moreCount && !moreLength)
         return ONE_LINE;
     
-    if (!isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties))
+    if (!fnParam && n && !isForOf(path) && checkLength(properties))
         return COUPLE_LINES;
     
-    if (hasAssign(properties))
+    if (!fnParam && hasAssign(properties))
         return COUPLE_LINES;
     
     return parentPath.isObjectProperty();
 }
+
+function isFunctionParam({parentPath}) {
+    if (parentPath.isFunction())
+        return true;
+    
+    if (!parentPath.isAssignmentPattern())
+        return false;
+    
+    return parentPath.parentPath.isFunction();
+}
+

package/package.json

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