@putout/printer 8.12.0 → 8.13.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.04.11, v8.13.0
+
+feature:
+- 454c659 @putout/printer: ArrayExpression: SpreadElement, ObjectExpression
+
+2024.04.11, v8.12.1
+
+feature:
+- cfb862d @putout/printer: tokenize: ArrayExpression: Identifier, Object: Tuple
+
 2024.04.11, v8.12.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,
+    isSimpleAndEmptyObject,
 } = require('../../is');
 
 const {
@@ -115,6 +116,11 @@ module.exports.ArrayExpression = {
             maybe.indent(elements.length && isNewLine);
         }
         
+        if (isSimpleAndEmptyObject(elements)) {
+            print(',');
+            print.breakline();
+        }
+        
         print(']');
     },
     afterIf(path) {

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

@@ -12,7 +12,6 @@ const {
     isNullLiteral,
     isStringLiteral,
     isSpreadElement,
-    isIdentifier,
 } = require('@putout/babel').types;
 
 const {
@@ -22,7 +21,7 @@ const {
     isCoupleLines,
     isStringAndArray,
     isIdentifierAndIdentifier,
-    isIdentifierAndObject,
+    isSimpleAndEmptyObject,
 } = require('../../is');
 
 const {round} = Math;
@@ -62,7 +61,7 @@ module.exports.isMultiLine = (path, {elements, maxElementsInOneLine}) => {
     if (elements.length > 3 && !isObjectExpression(elements[0]))
         return MULTI_LINE;
     
-    if (isIdentifierAndObject(elements))
+    if (isSimpleAndEmptyObject(elements))
         return MULTI_LINE;
     
     if (isOneSimple(path))

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

@@ -9,7 +9,6 @@ const {
     noLeadingComment,
     hasLeadingComment,
     exists,
-    isIdentifierAndObject,
 } = require('../../is');
 
 const {parseComments} = require('../../comment/comment');
@@ -89,24 +88,10 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
     }
     
     indent.dec();
-    const isInsideArrayWithIdentifierFirst = ({parentPath}) => {
-        if (!parentPath.isArrayExpression())
-            return false;
-        
-        return isIdentifierAndObject(parentPath.get('elements'));
-    };
     
     maybe.indent(manyLines);
     
-    if (isInsideArrayWithIdentifierFirst(path)) {
-        print('},');
-        indent.dec();
-        print.breakline();
-        indent.inc();
-    } else {
-        print('}');
-    }
-    
+    print('}');
     maybe.print(parens, ')');
     
     maybe.indent.dec(isMemberExpressionCallee(path));
@@ -166,4 +151,3 @@ function isParens(path) {
     
     return isParentExpression(path);
 }
-

package/lib/tokenize/is.js

@@ -1,7 +1,9 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isStringLiteral,
+    isSpreadElement,
     isIdentifier,
     isIfStatement,
     isStatement,
@@ -10,7 +12,7 @@ const {
     isMemberExpression,
     isArrayExpression,
     isObjectExpression,
-} = require('@putout/babel').types;
+} = types;
 
 const isParentProgram = (path) => path.parentPath?.isProgram();
 const isParentBlock = (path) => path.parentPath.isBlockStatement();
@@ -61,8 +63,8 @@ function isStringAndIdentifier([a, b]) {
     return isStringLiteral(a) && isIdentifier(b);
 }
 
-module.exports.isIdentifierAndObject = ([a, b]) => {
-    if (!isIdentifier(a))
+module.exports.isSimpleAndEmptyObject = ([a, b]) => {
+    if (!isIdentifier(a) && !isSpreadElement(a))
         return false;
     
     if (!isObjectExpression(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.12.0",
+  "version": "8.13.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",