@putout/printer 8.11.0 → 8.12.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.04.11, v8.12.1
+
+feature:
+- cfb862d @putout/printer: tokenize: ArrayExpression: Identifier, Object: Tuple
+
+2024.04.11, v8.12.0
+
+feature:
+- 426fccf @putout/printer: ArrayExpression, ObjectExpression: improve support of printing Identifier, Object inside Arrray
+
 2024.04.09, v8.11.0
 
 feature:

package/README.md

@@ -183,7 +183,10 @@ When you want to improve support of existing visitor or extend **Printer** with
 When you need to override behavior of existing visitor use:
 
 ```js
-import {print, visitors as v} from '@putout/printer';
+import {
+    print,
+    visitors as v,
+} from '@putout/printer';
 
 print(ast, {
     visitors: {

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

@@ -6,6 +6,7 @@ const {
     isStringAndIdentifier,
     isIdentifierAndIdentifier,
     isStringAndArray,
+    isIdentifierAndObject,
 } = require('../../is');
 
 const {
@@ -24,6 +25,7 @@ const {
     isObjectExpression,
     isSpreadElement,
     isStringLiteral,
+    isIdentifier,
 } = types;
 
 const isNextString = (path) => isStringLiteral(path.getNextSibling());
@@ -32,6 +34,8 @@ 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 isObjectAfterSimple = (a) => isObjectAfterSpread(a) || isObjectAfterIdentifier(a);
 
 const isInsideOneElementArray = ({parentPath}) => parentPath.node.elements.length === 1;
 
@@ -88,7 +92,7 @@ module.exports.ArrayExpression = {
                 maybe.print(is, ',');
             
             maybe.print.newline(is && !isNextObject(element));
-            maybe.print.space(isObjectAfterSpread(element));
+            maybe.print.space(is && isObjectAfterSimple(element));
             
             if (!is && index < n) {
                 print(',');
@@ -112,6 +116,11 @@ module.exports.ArrayExpression = {
             maybe.indent(elements.length && isNewLine);
         }
         
+        if (isIdentifierAndObject(elements)) {
+            print(',');
+            print.breakline();
+        }
+        
         print(']');
     },
     afterIf(path) {

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

@@ -21,6 +21,7 @@ const {
     isCoupleLines,
     isStringAndArray,
     isIdentifierAndIdentifier,
+    isIdentifierAndObject,
 } = require('../../is');
 
 const {round} = Math;
@@ -60,6 +61,9 @@ module.exports.isMultiLine = (path, {elements, maxElementsInOneLine}) => {
     if (elements.length > 3 && !isObjectExpression(elements[0]))
         return MULTI_LINE;
     
+    if (isIdentifierAndObject(elements))
+        return MULTI_LINE;
+    
     if (isOneSimple(path))
         return ONE_LINE;
     

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

@@ -1,5 +1,8 @@
 'use strict';
 
+const {types} = require('@putout/babel');
+const {isIdentifier} = types;
+
 const {
     isCoupleLines,
     isForOf,
@@ -88,7 +91,9 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
     }
     
     indent.dec();
+    
     maybe.indent(manyLines);
+    
     print('}');
     maybe.print(parens, ')');
     

package/lib/tokenize/is.js

@@ -9,6 +9,7 @@ const {
     isVariableDeclaration,
     isMemberExpression,
     isArrayExpression,
+    isObjectExpression,
 } = require('@putout/babel').types;
 
 const isParentProgram = (path) => path.parentPath?.isProgram();
@@ -60,6 +61,16 @@ function isStringAndIdentifier([a, b]) {
     return isStringLiteral(a) && isIdentifier(b);
 }
 
+module.exports.isIdentifierAndObject = ([a, b]) => {
+    if (!isIdentifier(a))
+        return false;
+    
+    if (!isObjectExpression(b))
+        return false;
+    
+    return b.node.properties.length;
+};
+
 module.exports.isIdentifierAndIdentifier = ([a, b]) => {
     return isIdentifier(a) && isIdentifier(b);
 };

package/lib/tokenize/statements/variable-declaration/variable-declaration.js

@@ -83,7 +83,6 @@ module.exports.VariableDeclaration = {
             write.newline();
             wasNewline = true;
         } else if (isParentSwitchCase(path)) {
-            //write.breakline();
             write.newline();
         }
         

package/package.json

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