@putout/printer 1.1.3 → 1.3.0

package/lib/tokenize/expressions/RestElement.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports.RestElement = (path, {write, traverse}) => {
+    write('...');
+    traverse(path.get('argument'));
+};

package/lib/tokenize/expressions/SpreadElement.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports.SpreadElement = (path, {write, traverse}) => {
+    write('...');
+    traverse(path.get('argument'));
+};

package/lib/tokenize/expressions/{arrays.js → array-expression.js}

@@ -1,34 +1,7 @@
 'use strict';
 
 const {entries} = Object;
-const isForOf = ({parentPath}) => parentPath.parentPath.parentPath.isForOfStatement();
-
-module.exports.ArrayPattern = (path, {write, indent, maybe, traverse}) => {
-    write('[');
-    
-    const elements = path.get('elements');
-    
-    indent.inc();
-    const isNewLine = !isForOf(path) && elements.length > 2;
-    const n = elements.length - 1;
-    
-    maybe.write(isNewLine && elements.length, '\n');
-    
-    for (const [index, element] of entries(elements)) {
-        maybe.indent(isNewLine);
-        
-        traverse(element);
-        
-        maybe.write(isNewLine, ',\n');
-        maybe.write(!isNewLine && index < n, ', ');
-    }
-    
-    indent.dec();
-    
-    maybe.indent(elements.length && isNewLine);
-    
-    write(']');
-};
+const isForOf = ({parentPath}) => parentPath.isForOfStatement();
 
 module.exports.ArrayExpression = (path, {write, indent, maybe, traverse}) => {
     write('[');
@@ -36,7 +9,8 @@ module.exports.ArrayExpression = (path, {write, indent, maybe, traverse}) => {
     const elements = path.get('elements');
     
     indent.inc();
-    const isNewLine = !isNumbers(elements);
+    
+    const isNewLine = !isNumbers(elements) && !isForOf(path);
     const n = elements.length - 1;
     
     maybe.write(isNewLine && elements.length, '\n');

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

@@ -0,0 +1,32 @@
+'use strict';
+
+const {entries} = Object;
+const isForOf = ({parentPath}) => parentPath.parentPath.parentPath.isForOfStatement();
+
+module.exports.ArrayPattern = (path, {write, indent, maybe, traverse}) => {
+    write('[');
+    
+    const elements = path.get('elements');
+    
+    indent.inc();
+    const isNewLine = !isForOf(path) && elements.length > 2;
+    const n = elements.length - 1;
+    
+    maybe.write(isNewLine && elements.length, '\n');
+    
+    for (const [index, element] of entries(elements)) {
+        maybe.indent(isNewLine);
+        
+        traverse(element);
+        
+        maybe.write(isNewLine, ',\n');
+        maybe.write(!isNewLine && index < n, ', ');
+    }
+    
+    indent.dec();
+    
+    maybe.indent(elements.length && isNewLine);
+    
+    write(']');
+};
+

package/lib/tokenize/expressions/assignment-pattern.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports.AssignmentPattern = (path, {write, traverse}) => {
+    write(' = ');
+    traverse(path.get('right'));
+};

package/lib/tokenize/expressions/index.js

@@ -1,27 +1,36 @@
 'use strict';
 
 const functions = require('./functions');
-const arrays = require('./arrays');
 const unaryExpressions = require('./unary-expressions');
 const memberExpressions = require('./member-expressions');
+
 const {ClassDeclaration} = require('./class-declaration');
 const {CallExpression} = require('./call-expression');
 const {NewExpression} = require('./new-expression');
 const {ObjectExpression} = require('./object-expression');
 const {ObjectPattern} = require('./object-pattern');
 const {AssignmentExpression} = require('./assignment-expression');
+const {ArrayExpression} = require('./array-expression');
+const {ArrayPattern} = require('./array-pattern');
+const {AssignmentPattern} = require('./assignment-pattern');
+const {RestElement} = require('./RestElement');
+const {SpreadElement} = require('./SpreadElement');
 
 module.exports = {
     ...functions,
     ...unaryExpressions,
-    ...arrays,
     ...memberExpressions,
+    ArrayPattern,
+    ArrayExpression,
     AssignmentExpression,
+    AssignmentPattern,
     CallExpression,
     ClassDeclaration,
     NewExpression,
     ObjectExpression,
     ObjectPattern,
+    RestElement,
+    SpreadElement,
     BinaryExpression(path, {traverse, write}) {
         traverse(path.get('left'));
         write(` ${path.node.operator} `);

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

@@ -1,6 +1,15 @@
 'use strict';
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
+const isForOf = (path) => {
+    if (path.parentPath.isForOfStatement())
+        return true;
+    
+    if (path.parentPath?.parentPath?.isForOfStatement())
+        return true;
+    
+    return false;
+};
 
 module.exports.ObjectExpression = (path, {traverse, write, maybeWrite, maybeIndent, incIndent, decIndent}) => {
     incIndent();
@@ -8,7 +17,7 @@ module.exports.ObjectExpression = (path, {traverse, write, maybeWrite, maybeInde
     const properties = path.get('properties');
     const parens = isBodyOfArrow(path);
     const isCall = path.parentPath.isCallExpression();
-    const isOneLine = isCall && properties.length < 2;
+    const isOneLine = isCall && properties.length < 2 || isForOf(path);
     
     maybeWrite(parens, '(');
     write('{');
@@ -16,6 +25,11 @@ module.exports.ObjectExpression = (path, {traverse, write, maybeWrite, maybeInde
     maybeWrite(!isOneLine, '\n');
     
     for (const property of properties) {
+        if (property.isSpreadElement()) {
+            traverse(property);
+            continue;
+        }
+        
         const {shorthand, computed} = property.node;
         
         maybeIndent(!isOneLine);

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

@@ -11,19 +11,30 @@ module.exports.ObjectPattern = (path, {traverse, maybeIndent, write, maybeWrite,
     const properties = path.get('properties');
     const n = properties.length - 1;
     
-    const is = !isForOf(path) && !path.parentPath.isFunction() && properties.length > 1 && checkLength(properties);
+    const is = !isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties);
     maybeWrite(is, '\n');
     
     for (const [i, property] of entries(properties)) {
+        if (property.isRestElement()) {
+            traverse(property);
+            continue;
+        }
+        
+        const valuePath = property.get('value');
+        const keyPath = property.get('key');
         const {shorthand} = property.node;
+        
         maybeIndent(is);
-        traverse(property.get('key'));
+        traverse(keyPath);
         
         if (!shorthand) {
             write(': ');
-            traverse(property.get('value'));
+            traverse(valuePath);
         }
         
+        if (valuePath.isAssignmentPattern())
+            traverse(valuePath);
+        
         if (is) {
             write(',\n');
             continue;

package/lib/tokenize/is.js

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

package/lib/tokenize/statements/variable-declaration.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const {isNext} = require('../is');
 const isNextAssign = (path) => {
     const nextPath = path.getNextSibling();
     
@@ -26,7 +27,7 @@ module.exports.VariableDeclaration = (path, {write, maybe, maybeIndent, traverse
     traverse(initPath);
     maybe.write(isParentBlock, ';\n');
     
-    const is = isCoupleLinesExpression(path) && !isNextAssign(path);
+    const is = isNext(path) && isCoupleLinesExpression(path) && !isNextAssign(path);
     
     maybe.indent(is);
     maybe.write(is, '\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.1.3",
+  "version": "1.3.0",
   "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",
@@ -17,6 +17,7 @@
     "url": "git://github.com/putoutjs/printer.git"
   },
   "scripts": {
+    "wisdom": "madrun wisdom",
     "test": "madrun test",
     "watch:test": "madrun watch:test",
     "lint": "madrun lint",