@putout/printer 8.26.0 → 8.28.0

package/ChangeLog

@@ -1,3 +1,16 @@
+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:
+- 20b3eac @putout/printer: ArrayExpression: nested array: space
+
 2024.05.01, v8.26.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/array-expression/array-expression.js

@@ -26,6 +26,7 @@ const {
     isSpreadElement,
     isStringLiteral,
     isIdentifier,
+    isArrayExpression,
 } = types;
 
 const isNextString = (path) => isStringLiteral(path.getNextSibling());
@@ -35,7 +36,20 @@ 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 isObjectAfterSimple = (a) => isObjectAfterSpread(a) || isObjectAfterIdentifier(a);
+
+const isObjectAfterArray = (a) => {
+    if (!isArrayExpression(a))
+        return false;
+    
+    return isNextObject(a);
+};
+
+const isObjectAfterSimple = (a) => {
+    if (isObjectAfterArray(a))
+        return true;
+    
+    return isObjectAfterSpread(a) || isObjectAfterIdentifier(a);
+};
 
 const isSpreadBeforeObject = (a) => {
     if (!a.isObjectExpression())

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

@@ -31,15 +31,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);
+}
+
 module.exports.ObjectExpression = (path, printer, semantics) => {
     const {trailingComma} = semantics;
-    const {
-        print,
-        maybe,
-        indent,
-    } = printer;
+    const {print, maybe} = printer;
+    
+    const insideNestedArrayCall = isInsideNestedArrayCall(path);
     
-    indent.inc();
+    maybe.indent.inc(!insideNestedArrayCall);
     
     const properties = path.get('properties');
     const {length} = properties;
@@ -74,13 +84,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 +95,8 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
         }
     }
     
-    indent.dec();
-    
-    maybe.indent(manyLines);
+    maybe.indent.dec(!insideNestedArrayCall);
+    maybe.indent(manyLines && !insideNestedArrayCall);
     
     print('}');
     maybe.print(parens, ')');
@@ -129,7 +135,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/is.js

@@ -64,7 +64,7 @@ function isStringAndIdentifier([a, b]) {
 }
 
 module.exports.isSimpleAndEmptyObject = ([a, b]) => {
-    if (!isIdentifier(a) && !isSpreadElement(a))
+    if (!isIdentifier(a) && !isSpreadElement(a) && !isArrayExpression(a))
         return false;
     
     if (!isObjectExpression(b))

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,8 +45,10 @@ 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.26.0",
+  "version": "8.28.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",