@putout/printer 1.8.1 → 1.8.3

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.03.26, v1.8.3
+
+feature:
+- fec7aee @putout/printer: improve support of ObjectExpression inside LogicalExpression inside SpreadElement property of ObjectExpression
+
+2023.03.26, v1.8.2
+
+feature:
+- 5d25d59 @putout/printer: add support of ConditionalExpression
+
 2023.03.26, v1.8.1
 
 feature:

package/lib/print-tokens/cook.js

@@ -3,24 +3,7 @@
 module.exports.cook = (tokens) => {
     const cookedTokens = [];
     
-    for (const [i, {
-        value,
-    }] of tokens.entries()) {
-        /*
-        if (type !== TYPES.TOKEN)
-            console.log(type);
-        
-        if (type === TYPES.NEWLINE && next?.type === TYPES.LINEBREAK) {
-            console.log('[skipped]');
-            continue;
-        }
-        
-        if (type === TYPES.LINEBREAK && next?.type === TYPES.LINEBREAK) {
-            console.log('[skipped]');
-            continue;
-        }
-         */
-        
+    for (const [i, {value}] of tokens.entries()) {
         cookedTokens.push(value);
     }
     

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

@@ -25,6 +25,10 @@ function CallExpression(path, {indent, print, maybe}) {
     }
     
     print('__callee');
+    
+    if (path.node.optional)
+        print('?.');
+    
     print('(');
     
     const args = path.get('arguments');

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

@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports.ConditionalExpression = (path, {print}) => {
+    print('__test');
+    print.space();
+    print('?');
+    print.space();
+    print('__consequent');
+    print.space();
+    print(':');
+    print.space();
+    print('__alternate');
+};
+

package/lib/tokenize/expressions/index.js

@@ -24,6 +24,7 @@ const {
     BinaryExpression,
     LogicalExpression,
 } = require('./binary-expression');
+const {ConditionalExpression} = require('./conditional-expression');
 
 module.exports = {
     ...functions,
@@ -36,6 +37,7 @@ module.exports = {
     BinaryExpression,
     CallExpression,
     ClassDeclaration,
+    ConditionalExpression,
     NewExpression,
     LogicalExpression,
     OptionalCallExpression,

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

@@ -2,6 +2,7 @@
 
 const {isCoupleLines} = require('../is');
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
+const isLogical = (path) => path.get('argument').isLogicalExpression();
 const isForOf = (path) => {
     if (path.parentPath.isForOfStatement())
         return true;
@@ -24,7 +25,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     
     for (const property of properties) {
         if (property.isSpreadElement()) {
-            maybe.indent(length > 1);
+            maybe.indent(length > 1 || isLogical(property));
             print(property);
             
             if (length > 1) {
@@ -60,6 +61,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     
     maybe.indent(manyLines);
     print('}');
+    maybe.print.newline(path.parentPath.isLogicalExpression());
     maybe.print(parens, ')');
 };
 function isOneLine(path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",