@putout/printer 1.2.0 → 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/index.js

@@ -13,6 +13,8 @@ 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,
@@ -27,6 +29,8 @@ module.exports = {
     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,7 +1,15 @@
 'use strict';
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
-const isForOf = (path) => path.parentPath?.parentPath?.isForOfStatement();
+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();
@@ -17,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

@@ -2,7 +2,6 @@
 
 const {entries} = Object;
 const isForOf = (path) => path.parentPath?.parentPath?.parentPath?.isForOfStatement();
-const isAssign = (path) => path.isAssignmentPattern();
 
 module.exports.ObjectPattern = (path, {traverse, maybeIndent, write, maybeWrite, incIndent, decIndent}) => {
     incIndent();
@@ -16,6 +15,11 @@ module.exports.ObjectPattern = (path, {traverse, maybeIndent, write, maybeWrite,
     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;
@@ -28,7 +32,7 @@ module.exports.ObjectPattern = (path, {traverse, maybeIndent, write, maybeWrite,
             traverse(valuePath);
         }
         
-        if (isAssign(valuePath))
+        if (valuePath.isAssignmentPattern())
             traverse(valuePath);
         
         if (is) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.2.0",
+  "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",