@putout/printer - npm Package Compare versions

Comparing version 1.3.0 to 1.3.1

lib/tokenize/expressions/call-expression.js

 'use strict';
 
-const {hasPrevNewline} = require('../mark');
+const {hasPrevNewline, isMarkedParent} = require('../mark');
 
@@ -10,3 +10,3 @@ const {entries} = Object;
     
-    if (shouldAddNewLine(path) && !hasPrevNewline(path.parentPath)) {
+    if (shouldAddNewLine(path) && !hasPrevNewline(path.parentPath) && !isMarkedParent(path)) {
         write.newline();
@@ -13,0 +13,0 @@ write.indent();

lib/tokenize/expressions/object-expression.js

@@ -14,4 +14,4 @@ 'use strict';
 
-module.exports.ObjectExpression = (path, {traverse, write, maybeWrite, maybeIndent, incIndent, decIndent}) => {
-    incIndent();
+module.exports.ObjectExpression = (path, {traverse, write, maybe, indent}) => {
+    indent.inc();
     
@@ -21,12 +21,20 @@ const properties = path.get('properties');
     const isCall = path.parentPath.isCallExpression();
-    const isOneLine = isCall && properties.length < 2 || isForOf(path);
+    const {length} = properties;
+    const isOneLine = !length || (isCall && length < 2 || isForOf(path));
     
-    maybeWrite(parens, '(');
+    maybe.write(parens, '(');
     write('{');
     
-    maybeWrite(!isOneLine, '\n');
+    maybe.write(!isOneLine, '\n');
     
     for (const property of properties) {
         if (property.isSpreadElement()) {
+            maybe.indent(properties.length > 1);
             traverse(property);
+            
+            if (properties.length > 1) {
+                write(',');
+                write.newline();
+            }
+            
             continue;
@@ -37,3 +45,3 @@ }
         
-        maybeIndent(!isOneLine);
+        maybe.indent(!isOneLine);
         
@@ -45,5 +53,5 @@ if (property.isObjectMethod()) {
         
-        maybeWrite(computed, '[');
+        maybe.write(computed, '[');
         traverse(property.get('key'));
-        maybeWrite(computed, ']');
+        maybe.write(computed, ']');
         
@@ -55,9 +63,9 @@ if (!shorthand) {
         
-        maybeWrite(!isOneLine, ',\n');
+        maybe.write(!isOneLine, ',\n');
     }
     
-    decIndent();
-    maybeIndent(!isOneLine);
+    indent.dec();
+    maybe.indent(!isOneLine);
     write('}');
-    maybeWrite(parens, ')');
+    maybe.write(parens, ')');
 };

lib/tokenize/is.js

@@ -5,2 +5,1 @@ 'use strict';
 module.exports.isNext = (path) => path.getNextSibling().node;
-

lib/tokenize/mark.js

@@ -22,1 +22,5 @@ 'use strict';
 module.exports.maybeMark = (a, path) => a && mark(path);
+
+module.exports.isMarkedParent = (path) => {
+    return isMarked(path.parentPath);
+};

lib/tokenize/statements/expression-statement.js

 'use strict';
 
+const {mark} = require('../mark');
 module.exports.ExpressionStatement = (path, {write, indent, traverse}) => {
     if (isCoupleLinesExpression(path) && !isFirst(path) && shouldAddNewLine(path)) {
         write.linebreak();
+        mark(path);
     }
@@ -7,0 +9,0 @@

lib/tokenize/statements/for-of-statement.js

 'use strict';
 
+const {isMarked} = require('../mark');
 const isPrevNewLine = (path) => {
@@ -9,3 +10,3 @@ const prev = path.getPrevSibling();
     
-    return prev.__putout_newline;
+    return isMarked(prev);
 };
@@ -40,7 +41,2 @@
     }
-    
-    if (path.getNextSibling().node) {
-        //write.newline();
-        //path.__putout_newline = true;
-    }
 };

package.json

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

No alert changes

Improved metrics

Total package byte prevSize

28476

increased by1.07%

Lines of code

810

increased by1%

No dependency changes