@putout/printer 12.2.0 → 12.4.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2025.01.15, v12.4.0
+
+feature:
+- 96a5778 ObjectExpression: inside tuple
+
+2025.01.14, v12.3.0
+
+feature:
+- a8074a5 @putout/printer: ExpressionStatement: inside ReturnStatement
+- ecf7d0e @putout/printer: move out ExpressionStatement
+
 2025.01.13, v12.2.0
 
 feature:

package/lib/tokenize/expressions/object-expression/is-inside-tuple.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const {types} = require('@putout/babel');
+const {
+    isNumericLiteral,
+    isNullLiteral,
+    isArrayExpression,
+} = types;
+
+module.exports.isInsideTuple = (path) => {
+    const {parentPath} = path;
+    
+    if (!isArrayExpression(parentPath))
+        return false;
+    
+    const [first, second] = parentPath.node.elements;
+    
+    if (second !== path.node)
+        return false;
+    
+    return isNullLiteral(first) || isNumericLiteral(first);
+};

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

@@ -14,8 +14,12 @@ const {
 
 const {parseComments} = require('../../comment/comment');
 const {likeChain} = require('../member-expression/member-expressions');
+const {isInsideTuple} = require('./is-inside-tuple');
 
-const {isStringLiteral} = types;
+const {
+    isStringLiteral,
+    isArrayExpression,
+} = types;
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
@@ -37,16 +41,19 @@ const isMemberExpressionCallee = ({parentPath}) => {
 const isInsideCall = ({parentPath}) => parentPath.isCallExpression();
 
 function isInsideNestedArrayCall({parentPath}) {
-    if (!parentPath.isArrayExpression())
+    if (!isArrayExpression(parentPath))
         return false;
     
-    if (!parentPath.parentPath.isArrayExpression())
+    if (!isArrayExpression(parentPath.parentPath))
         return false;
     
     return isInsideCall(parentPath.parentPath);
 }
 
 function isInsideNestedTuple({parentPath}) {
+    if (!isArrayExpression(parentPath.parentPath))
+        return false;
+    
     const {elements} = parentPath.parentPath.node;
     const [first] = elements;
     
@@ -61,7 +68,7 @@ module.exports.ObjectExpression = (path, printer, semantics) => {
         indent,
     } = printer;
     
-    const insideNestedArrayCall = isInsideNestedArrayCall(path);
+    const insideNestedArrayCall = isInsideTuple(path) || isInsideNestedArrayCall(path);
     
     maybe.indent.inc(!insideNestedArrayCall);
     

package/lib/tokenize/statements/{expression-statement.js → expression-statement/expression-statement.js}

@@ -11,8 +11,9 @@ const {
     hasTrailingComment,
     isCoupleLines,
     isInsideLabel,
-} = require('../is');
+} = require('../../is');
 
+const not = (fn) => (...a) => !fn(...a);
 const isBeforeElse = (path) => {
     if (!path.parentPath.isIfStatement())
         return false;
@@ -23,6 +24,9 @@ const isBeforeElse = (path) => {
     return Boolean(path.parentPath.node.alternate);
 };
 
+const isInsideReturn = ({parentPath}) => parentPath.isReturnStatement();
+const notInsideReturn = not(isInsideReturn);
+
 const satisfyAfter = satisfy([
     isNotLastOrParentLast,
     isParentBlock,
@@ -37,16 +41,25 @@ const shouldBreakline = satisfy([
 ]);
 
 module.exports.ExpressionStatement = {
+    beforeIf(path) {
+        if (isInsideReturn(path))
+            return false;
+        
+        return !isInsideLabel(path);
+    },
+    before(path, {indent}) {
+        indent();
+    },
     print(path, {print, maybe, store}) {
-        maybe.indent(!isInsideLabel(path));
+        const insideReturn = isInsideReturn(path);
         
         print('__expression');
-        print(';');
+        maybe.print(!insideReturn, ';');
         
         if (!isNext(path))
             return;
         
-        if (shouldBreakline(path)) {
+        if (!insideReturn && shouldBreakline(path)) {
             print.newline();
             maybe.indent(isNext(path) && noTrailingComment(path));
             store(true);
@@ -71,8 +84,10 @@ module.exports.ExpressionStatement = {
         if (isTopParentLast(path))
             return;
         
-        print.newline();
-        maybe.markAfter(store(), path);
+        if (notInsideReturn(path)) {
+            print.newline();
+            maybe.markAfter(store(), path);
+        }
     },
 };
 

package/lib/tokenize/statements/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {ExpressionStatement} = require('./expression-statement');
+const {ExpressionStatement} = require('./expression-statement/expression-statement');
 const {VariableDeclaration} = require('./variable-declaration/variable-declaration');
 const {IfStatement} = require('./if-statement/if-statement');
 const {ForOfStatement} = require('./for-of-statement/for-of-statement');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "12.2.0",
+  "version": "12.4.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -50,6 +50,14 @@
     "traverse",
     "generate"
   ],
+  "imports": {
+    "#test/printer": {
+      "default": "./test/printer.js"
+    },
+    "#test/fixture": {
+      "default": "./test/fixture.js"
+    }
+  },
   "devDependencies": {
     "@putout/eslint": "^3.5.0",
     "@putout/plugin-minify": "^9.0.0",