@putout/printer 8.30.0 → 8.32.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2024.05.03, v8.32.0
+
+feature:
+- 4c10986 @putout/printer: ObjectPattern: used as Function param
+
+2024.05.03, v8.31.0
+
+feature:
+- 5fd0053 @putout/printer: ArrayExpression: is-object-after-simple: simplify
+- 22dae11 @putout/printer: ArrayExpression: is-object-after-simple
+
 2024.05.02, v8.30.0
 
 feature:

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

@@ -7,6 +7,7 @@ const {
     isIdentifierAndIdentifier,
     isStringAndArray,
     isSimpleAndEmptyObject,
+    isNextObject,
 } = require('../../is');
 
 const {
@@ -21,46 +22,18 @@ const {
     isArrayIndented,
 } = require('./indent');
 
+const {isObjectAfterSimple} = require('./is-object-after-simple');
+
 const {
     isObjectExpression,
     isSpreadElement,
     isStringLiteral,
     isIdentifier,
-    isArrayExpression,
-    isCallExpression,
 } = types;
 
 const isNextString = (path) => isStringLiteral(path.getNextSibling());
 const isPrevString = (path) => isStringLiteral(path.getPrevSibling());
 const isAroundStrings = (path) => isNextString(path) || isPrevString(path);
-const isNextObject = (a) => a.getNextSibling().isObjectExpression();
-const isPrevObject = (a) => a.getPrevSibling().isObjectExpression();
-const isObjectAfterSpread = (a) => isSpreadElement(a) && isNextObject(a) && !isPrevObject(a);
-const isObjectAfterIdentifier = (a) => isIdentifier(a) && isNextObject(a) && !isPrevObject(a);
-
-const isObjectAfterArray = (a) => {
-    if (!isArrayExpression(a))
-        return false;
-    
-    return isNextObject(a);
-};
-
-const isObjectAfterCall = (a) => {
-    if (!isCallExpression(a))
-        return false;
-    
-    return isNextObject(a);
-};
-
-const isObjectAfterSimple = (a) => {
-    if (isObjectAfterArray(a))
-        return true;
-    
-    if (isObjectAfterCall(a))
-        return true;
-    
-    return isObjectAfterSpread(a) || isObjectAfterIdentifier(a);
-};
 
 const isSpreadBeforeObject = (a) => {
     if (!a.isObjectExpression())

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

@@ -0,0 +1,20 @@
+'use strict';
+
+const {isNextObject, isPrevObject} = require('../../is');
+
+const SIMPLE_TYPES = [
+    'ArrayExpression',
+    'ObjectExpression',
+    'SpreadElement',
+    'CallExpression',
+    'Identifier',
+];
+
+module.exports.isObjectAfterSimple = (a) => {
+    const {type} = a;
+    
+    if (!isNextObject(a) || isPrevObject(a))
+        return false;
+    
+    return SIMPLE_TYPES.includes(type);
+};

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

@@ -173,14 +173,28 @@ 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(path) {
+    const {parentPath} = path;
+    
+    if (parentPath.isFunction())
+        return true;
+    
+    if (!parentPath.isAssignmentPattern())
+        return false;
+    
+    return parentPath.parentPath.isFunction();
+}

package/lib/tokenize/is.js

@@ -34,6 +34,9 @@ const isPrev = (path) => {
 const isNextParent = (path) => isNext(path.parentPath);
 const isLast = (path) => isParentProgram(path) && !isNext(path);
 
+module.exports.isNextObject = (a) => a.getNextSibling().isObjectExpression();
+module.exports.isPrevObject = (a) => a.getPrevSibling().isObjectExpression();
+
 module.exports.isFirst = (path) => path.node === path.parentPath.node.body?.[0];
 module.exports.isPrevBody = (path) => path.getPrevSibling().isBlockStatement();
 module.exports.isNext = isNext;

package/package.json

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