@putout/printer 8.27.0 → 8.29.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2024.05.02, v8.29.0
+
+feature:
+- 3286498 @putout/printer: ObjectExpression inside ArrayExpression tuple
+
+2024.05.02, v8.28.0
+
+fix:
+- b1fd34d @putout/printer: tsTypeAliasDeclaration: indent
+
+feature:
+- ac26e2e @putout/printer: ArrayExpression: inside nested array call
+
 2024.05.02, v8.27.0
 
 feature:

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 = () => void;
-type dec = () => void;
+    type inc = (condition: boolean) => void;
+    type dec = (condition: boolean) => void;
     
     export {
         inc,

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();
@@ -31,6 +32,25 @@ const isMemberExpressionCallee = ({parentPath}) => {
     return likeChain(callee);
 };
 
+const isInsideCall = ({parentPath}) => parentPath.isCallExpression();
+
+function isInsideNestedArrayCall({parentPath}) {
+    if (!parentPath.isArrayExpression())
+        return false;
+    
+    if (!parentPath.parentPath.isArrayExpression())
+        return false;
+    
+    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 {
@@ -39,7 +59,9 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
         indent,
     } = printer;
     
-    indent.inc();
+    const insideNestedArrayCall = isInsideNestedArrayCall(path);
+    
+    maybe.indent.inc(!insideNestedArrayCall);
     
     const properties = path.get('properties');
     const {length} = properties;
@@ -74,13 +96,10 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
         }
         
         maybe.indent(manyLines && noLeadingComment(property));
+        print(property);
         
-        if (property.isObjectMethod()) {
-            print(property);
+        if (property.isObjectMethod())
             continue;
-        }
-        
-        print(property);
         
         if (noTrailingComment(property) && !hasNextLeadingComment(property)) {
             maybe.print.newline(manyLines);
@@ -88,9 +107,14 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
         }
     }
     
-    indent.dec();
-    
-    maybe.indent(manyLines);
+    if (!insideNestedArrayCall) {
+        indent.dec();
+        maybe.indent(manyLines);
+    } else if (isInsideNestedTuple(path)) {
+        indent.dec();
+        indent();
+        indent.inc();
+    }
     
     print('}');
     maybe.print(parens, ')');
@@ -129,7 +153,7 @@ function isOneLine(path) {
     const {length} = path.get('properties');
     
     if (!length)
-        return true;
+        return ONE_LINE;
     
     if (notLastArgInsideCall(path))
         return ONE_LINE;

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

@@ -9,8 +9,13 @@ const {
 const {markAfter} = require('../../mark');
 const {maybeDeclare} = require('../../maybe/maybe-declare');
 const isNextType = (a) => a.getNextSibling().isTSTypeAliasDeclaration();
+const isNextExport = (a) => a.getNextSibling().isExportDeclaration();
 
 module.exports.TSTypeAliasDeclaration = {
+    beforeIf: (path) => !path.parentPath.isExportDeclaration(),
+    before: (path, {indent}) => {
+        indent();
+    },
     print: maybeDeclare((path, {print, maybe, store}) => {
         const typeAnnotation = path.get('typeAnnotation');
         const isConditional = typeAnnotation.isTSConditionalType();
@@ -40,7 +45,8 @@ module.exports.TSTypeAliasDeclaration = {
         
         return !isNextType(path);
     },
-    after(path, {print}) {
+    after(path, {print, maybe}) {
+        maybe.indent(isNextExport(path));
         print.newline();
         markAfter(path);
     },

package/package.json

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