@putout/printer 8.12.1 → 8.14.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.04.15, v8.14.0
+
+feature:
+- 214d6c7 @putout/printer: ObjectPattern: improve support of ArrayPattern tuple
+
+2024.04.11, v8.13.0
+
+feature:
+- 454c659 @putout/printer: ArrayExpression: SpreadElement, ObjectExpression
+
 2024.04.11, v8.12.1
 
 feature:

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

@@ -6,7 +6,7 @@ const {
     isStringAndIdentifier,
     isIdentifierAndIdentifier,
     isStringAndArray,
-    isIdentifierAndObject,
+    isSimpleAndEmptyObject,
 } = require('../../is');
 
 const {
@@ -116,7 +116,7 @@ module.exports.ArrayExpression = {
             maybe.indent(elements.length && isNewLine);
         }
         
-        if (isIdentifierAndObject(elements)) {
+        if (isSimpleAndEmptyObject(elements)) {
             print(',');
             print.breakline();
         }

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

@@ -21,7 +21,7 @@ const {
     isCoupleLines,
     isStringAndArray,
     isIdentifierAndIdentifier,
-    isIdentifierAndObject,
+    isSimpleAndEmptyObject,
 } = require('../../is');
 
 const {round} = Math;
@@ -61,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/{array-pattern.js → array-pattern/array-pattern.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const {maybeTypeAnnotation} = require('../maybe/maybe-type-annotation');
+const {maybeTypeAnnotation} = require('../../maybe/maybe-type-annotation');
 const isForOf = ({parentPath}) => parentPath.parentPath.parentPath?.isForOfStatement();
 
 module.exports.ArrayPattern = maybeTypeAnnotation((path, {indent, maybe, print}, options) => {

package/lib/tokenize/expressions/index.js

@@ -29,7 +29,7 @@ const {
 
 const {AssignmentExpression} = require('./assignment-expression');
 const {ArrayExpression} = require('./array-expression/array-expression');
-const {ArrayPattern} = require('./array-pattern');
+const {ArrayPattern} = require('./array-pattern/array-pattern');
 const {AssignmentPattern} = require('./assignment-pattern');
 const {RestElement} = require('./rest-element');
 const {SpreadElement} = require('./spread-element');

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

@@ -1,8 +1,5 @@
 'use strict';
 
-const {types} = require('@putout/babel');
-const {isIdentifier} = types;
-
 const {
     isCoupleLines,
     isForOf,

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

@@ -21,11 +21,16 @@ const isTwoLevelsDeep = ({parentPath}) => parentPath.parentPath.parentPath.isObj
 
 const isOneParentProperty = ({parentPath}) => parentPath.parentPath.node.properties?.length === 1;
 
+function isIndent(path) {
+    return !path.parentPath.isArrayPattern();
+}
+
 module.exports.ObjectPattern = {
     print: maybeTypeAnnotation((path, {indent, print, maybe}, semantics) => {
         const {maxPropertiesInOneLine} = semantics;
         
-        indent.inc();
+        const shouldIndent = isIndent(path);
+        maybe.indent.inc(shouldIndent);
         print('{');
         
         const properties = path.get('properties');
@@ -87,8 +92,8 @@ module.exports.ObjectPattern = {
             }
         }
         
-        indent.dec();
-        maybe.indent(is);
+        maybe.indent.dec(shouldIndent);
+        maybe.indent(is && shouldIndent);
         print('}');
     }),
     afterIf(path) {
@@ -158,3 +163,4 @@ function shouldAddNewline(path, {maxPropertiesInOneLine}) {
     
     return parentPath.isObjectProperty();
 }
+

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/package.json

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