@putout/printer 13.3.0 → 13.4.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.03.13, v13.4.1
+
+feature:
+- 982f309 @putout/printer: is: simplify
+
+2025.03.13, v13.4.0
+
+feature:
+- abbfbce @putout/printer: improve support of ObjectExpressions inside ArrayExpressions
+
 2025.03.11, v13.3.0
 
 feature:

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

@@ -135,7 +135,7 @@ module.exports.ArrayExpression = {
                 maybe.print(is, ',');
             
             if (!(isObjectExpression(element) && isObjectProperty(path.parentPath)))
-                maybe.print.newline((is || isSpreadBeforeObject(element)) && !isNextObject(element));
+                maybe.print.newline((is || isSpreadBeforeObject(element)) && !isNextObject(element) && !isObjectExpression(element));
             
             maybe.print.space(is && isObjectAfterSimple(element));
             

package/lib/tokenize/expressions/object-expression/is-third-object-inside-array.js

@@ -4,18 +4,14 @@ const {types} = require('@putout/babel');
 const {
     isArrayExpression,
     isCallExpression,
+    isIdentifier,
 } = types;
 
-module.exports.isThirdObjectInsideArray = (path) => {
-    const {parentPath} = path;
-    
+module.exports.isThirdObjectInsideArray = ({parentPath}) => {
     if (!isArrayExpression(parentPath))
         return false;
     
-    const [, second, third] = parentPath.node.elements;
-    
-    if (!isCallExpression(second))
-        return false;
+    const [, second] = parentPath.node.elements;
     
-    return third === path.node;
+    return isCallExpression(second) && !!isIdentifier(second);
 };

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

@@ -53,10 +53,6 @@ function isInsideNestedArrayCall({parentPath}) {
 
 function isInsideNestedTuple({parentPath}) {
     const {elements} = parentPath.parentPath.node;
-    
-    if (!elements)
-        return false;
-    
     const [first] = elements;
     
     return isStringLiteral(first);

package/lib/tokenize/is.js

@@ -78,8 +78,21 @@ function isStringAndIdentifier([a, b]) {
     return isStringLiteral(a) && isIdentifier(b);
 }
 
+const checkObject = (elements) => {
+    let a = elements.at(-1);
+    
+    if (!isObjectExpression(a))
+        a = elements.at(-2);
+    
+    if (!isObjectExpression(a))
+        return false;
+    
+    return a.node.properties.length;
+};
+
 module.exports.isSimpleAndNotEmptyObject = (elements) => {
-    const [a, b] = elements;
+    const [a] = elements;
+    
     const simpleTypes = [
         'Identifier',
         'SpreadElement',
@@ -91,10 +104,7 @@ module.exports.isSimpleAndNotEmptyObject = (elements) => {
     if (a && !simpleTypes.includes(a.type))
         return false;
     
-    if (!isObjectExpression(b))
-        return false;
-    
-    return b.node.properties.length;
+    return checkObject(elements);
 };
 
 module.exports.isIdentifierAndIdentifier = ([a, b]) => {
@@ -168,3 +178,4 @@ module.exports.hasLeadingComment = (path) => path.node?.leadingComments?.length;
 
 module.exports.noTrailingComment = (path) => !path.node.trailingComments?.length;
 module.exports.noLeadingComment = (path) => !path.node.leadingComments?.length;
+

package/package.json

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