@putout/printer 12.31.0 → 12.32.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.02.15, v12.32.1
+
+fix:
+- 1ae65ad @putout/printer: DEBUG -> LOG_DEBUG
+
+2025.02.14, v12.32.0
+
+feature:
+- bc351a1 @putout/printer: ArrayExpression: ObjectExpression between Identifier and CallExpression
+
 2025.02.09, v12.31.0
 
 feature:

package/lib/tokenize/debug.js

@@ -11,11 +11,11 @@ const {
     LOG_ALL,
     LOG_TOKENS,
     LOG_TERM,
-    DEBUG,
+    LOG_DEBUG,
 } = process.env;
 
 module.exports.createDebug = (tokens) => (a) => {
-    if (!DEBUG)
+    if (!LOG_DEBUG)
         return;
     
     tokens.push({

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

@@ -22,7 +22,10 @@ const {
     isArrayIndented,
 } = require('./indent');
 
-const {isObjectAfterSimple} = require('./is-object-after-simple');
+const {
+    isObjectAfterSimple,
+    isNextSimple,
+} = require('./is-object-after-simple');
 
 const {
     isObjectExpression,
@@ -30,6 +33,7 @@ const {
     isStringLiteral,
     isIdentifier,
     isFunction,
+    isCallExpression,
 } = types;
 
 const isNextString = (path) => isStringLiteral(path.getNextSibling());
@@ -60,18 +64,9 @@ const isSpreadBeforeObject = (a) => {
     return prev.get('argument').isCallExpression();
 };
 
-const isNextSimple = (a) => {
-    const next = a.getNextSibling();
-    
-    if (next.isSpreadElement())
-        return true;
-    
-    return next.isIdentifier();
-};
-
 const isNextSimpleBetweenObjects = (a) => {
     const next = a.getNextSibling();
-    const is = next.isSpreadElement() || next.isIdentifier();
+    const is = next.isSpreadElement() || next.isIdentifier() || next.isCallExpression();
     
     if (!is)
         return true;
@@ -115,8 +110,7 @@ module.exports.ArrayExpression = {
         
         const indented = isArrayIndented(path);
         
-        if (indented)
-            maybe.indent.inc(shouldIncreaseIndent);
+        maybe.indent.inc(indented && shouldIncreaseIndent);
         
         const isNewLine = isMultiLine(path, {
             elements,
@@ -150,8 +144,7 @@ module.exports.ArrayExpression = {
             }
         }
         
-        if (indented)
-            maybe.indent.dec(shouldIncreaseIndent);
+        maybe.indent.dec(indented && shouldIncreaseIndent);
         
         const parentElements = path.parentPath.get('elements');
         
@@ -166,7 +159,7 @@ module.exports.ArrayExpression = {
             maybe.indent(elements.length && isNewLine);
         }
         
-        if (isSimpleAndNotEmptyObject(elements) && !isSpreadElement(elements.at(-1))) {
+        if (isSimpleAndNotEmptyObject(elements) && !isSpreadElement(elements.at(-1)) && !isCallExpression(elements.at(-1))) {
             print(',');
             print.breakline();
         }
@@ -196,7 +189,7 @@ module.exports.ArrayExpression = {
 };
 
 function isSimpleAfterObject(path) {
-    if (!isSpreadElement(path) && !isIdentifier(path))
+    if (!isSpreadElement(path) && !isIdentifier(path) && !isCallExpression(path))
         return;
     
     const prev = path.getPrevSibling();

package/lib/tokenize/expressions/array-expression/is-object-after-simple.js

@@ -19,3 +19,9 @@ module.exports.isObjectAfterSimple = (a) => {
     
     return SIMPLE_TYPES.includes(type);
 };
+
+module.exports.isNextSimple = (a) => {
+    const {type} = a.getNextSibling();
+    
+    return SIMPLE_TYPES.includes(type);
+};

package/lib/tokenize/is.js

@@ -77,7 +77,8 @@ function isStringAndIdentifier([a, b]) {
     return isStringLiteral(a) && isIdentifier(b);
 }
 
-module.exports.isSimpleAndNotEmptyObject = ([a, b]) => {
+module.exports.isSimpleAndNotEmptyObject = (elements) => {
+    const [a, b] = elements;
     const simpleTypes = [
         'Identifier',
         'SpreadElement',

package/lib/tokenize/statements/expression-statement/expression-statement.js

@@ -124,7 +124,7 @@ function isNotLastBody(path) {
 }
 
 function isNotLastOrParentLast(path) {
-    return !(isLast(path) || isParentLast(path));
+    return !isLast(path) && !isParentLast(path);
 }
 
 function isNextUp(path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "12.31.0",
+  "version": "12.32.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -66,6 +66,7 @@
   },
   "devDependencies": {
     "@putout/eslint": "^3.5.0",
+    "@putout/eslint-flat": "^2.0.0",
     "@putout/plugin-minify": "^9.0.0",
     "@putout/plugin-printer": "^4.0.0",
     "@putout/plugin-promises": "^16.0.0",

package/tsconfig.json

@@ -0,0 +1,6 @@
+{
+    "compilerOptions": {
+        "target": "es2015",
+        "skipLibCheck": true
+    }
+}