@putout/printer 8.28.0 → 8.30.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.05.02, v8.30.0
+
+feature:
+- 9a3ea75 @putout/printer: ArrayExpression: tuple: call
+
+2024.05.02, v8.29.0
+
+feature:
+- 3286498 @putout/printer: ObjectExpression inside ArrayExpression tuple
+
 2024.05.02, v8.28.0
 
 fix:

package/lib/printer.d.ts

@@ -24,8 +24,8 @@ type Traverse = (input: types.Node) => void;
 
 declare function MaybeIndent(condition: boolean): void;
 declare namespace MaybeIndent {
-type inc = (condition: boolean) => void;
-type dec = (condition: boolean) => void;
+    type inc = (condition: boolean) => void;
+    type dec = (condition: boolean) => void;
     
     export {
         inc,

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

@@ -27,6 +27,7 @@ const {
     isStringLiteral,
     isIdentifier,
     isArrayExpression,
+    isCallExpression,
 } = types;
 
 const isNextString = (path) => isStringLiteral(path.getNextSibling());
@@ -44,10 +45,20 @@ const isObjectAfterArray = (a) => {
     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);
 };
 

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

@@ -13,6 +13,7 @@ const {
 
 const {parseComments} = require('../../comment/comment');
 const {likeChain} = require('../member-expression/member-expressions');
+const {isStringLiteral} = require('@putout/babel').types;
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
@@ -43,9 +44,20 @@ function isInsideNestedArrayCall({parentPath}) {
     return isInsideCall(parentPath.parentPath);
 }
 
+function isInsideNestedTuple({parentPath}) {
+    const {elements} = parentPath.parentPath.node;
+    const [first] = elements;
+    
+    return isStringLiteral(first);
+}
+
 module.exports.ObjectExpression = (path, printer, semantics) => {
     const {trailingComma} = semantics;
-    const {print, maybe} = printer;
+    const {
+        print,
+        maybe,
+        indent,
+    } = printer;
     
     const insideNestedArrayCall = isInsideNestedArrayCall(path);
     
@@ -95,8 +107,14 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
         }
     }
     
-    maybe.indent.dec(!insideNestedArrayCall);
-    maybe.indent(manyLines && !insideNestedArrayCall);
+    if (!insideNestedArrayCall) {
+        indent.dec();
+        maybe.indent(manyLines);
+    } else if (isInsideNestedTuple(path)) {
+        indent.dec();
+        indent();
+        indent.inc();
+    }
     
     print('}');
     maybe.print(parens, ')');

package/lib/tokenize/typescript/type/ts-type-alias-declaration.js

@@ -51,4 +51,3 @@ module.exports.TSTypeAliasDeclaration = {
         markAfter(path);
     },
 };
-

package/package.json

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