@putout/printer - npm Package Compare versions

Comparing version 8.3.0 to 8.4.0

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

 'use strict';
 
+const {types} = require('@putout/babel');
 const {
@@ -22,8 +23,9 @@ isCoupleLines,
 
-const {types} = require('@putout/babel');
 const {
     isObjectExpression,
     isSpreadElement,
+    isStringLiteral,
 } = types;
 
+const isNextString = (path) => isStringLiteral(path.getNextSibling());
 const isNextObject = (a) => a.getNextSibling().isObjectExpression();
@@ -102,5 +104,5 @@ const isPrevObject = (a) => a.getPrevSibling().isObjectExpression();
         if (isInsideArray(path) && isStringAndArray(parentElements)) {
-            indent.dec();
+            maybe.indent.dec(!isNextString(path));
             maybe.indent(elements.length && isNewLine);
-            indent.inc();
+            maybe.indent.inc(!isNextString(path));
         } else if (!isArrayInsideArray(path) && !isObjectExpression(elements.at(-1))) {
@@ -133,1 +135,2 @@ maybe.indent(elements.length && isNewLine);
 };
+

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

 'use strict';
 
 const {types} = require('@putout/babel');
-const {isStringLiteral} = types;
-
 const {isIndented} = require('../../is');
 
+const {
+    isStringLiteral,
+    isArrayExpression,
+} = types;
+
 const isInsideArray = (path) => path.parentPath.isArrayExpression();
@@ -29,3 +32,10 @@
     
-    return path.parentPath.node.elements.length <= 3;
+    const parentElements = path.parentPath.node.elements;
+    const parentHasArrays = parentElements.filter(isArrayExpression).length;
+    const lastIsArray = !isArrayExpression(parentElements.at(-1));
+    
+    if (parentHasArrays && lastIsArray)
+        return false;
+    
+    return parentElements.length <= 3;
 }
@@ -32,0 +42,0 @@

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

@@ -99,3 +99,3 @@ 'use strict';
     
-    if (isStringAndArray(elements))
+    if (isStringAndArray(elements) && elements.length < 3)
         return ONE_LINE;
@@ -102,0 +102,0 @@

lib/tokenize/is.js

@@ -68,8 +68,3 @@ 'use strict';
 module.exports.isIdentifierAndString = ([a, b]) => isIdentifier(a) && isStringLiteral(b);
-module.exports.isStringAndArray = (array) => {
-    if (array.length > 2)
-        return false;
-    
-    const [a, b] = array;
-    
+module.exports.isStringAndArray = ([a, b]) => {
     if (!isStringLiteral(a))
@@ -76,0 +71,0 @@ return false;

package.json

 {
   "name": "@putout/printer",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "type": "commonjs",
@@ -5,0 +5,0 @@ "author": "coderaiser <[e-mail]> (https://github.com/coderaiser)",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

206043

increased by0.22%

Lines of code

4609

increased by0.15%

No dependency changes