@putout/printer 1.117.0 → 1.119.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.29, v1.119.0
+
+feature:
+- 971dad5 @putout/printer: improve support of RestSpread inside ObjectPattern
+
+2023.05.25, v1.118.0
+
+feature:
+- 438921c @putout/printer: VariableDeclaration: space after keyword
+
 2023.05.25, v1.117.0
 
 feature:
@@ -1062,7 +1072,7 @@ feature:
 2023.03.23, v1.7.1
 
 feature:
-- f1db3bd @putout/printer: print: path.get(__a) => __a
+- f1db3bd @putout/printer: write: path.get(__a) => __a
 
 2023.03.23, v1.7.0
 
@@ -1122,7 +1132,7 @@ feature:
 2023.03.20, v1.6.3
 
 feature:
-- 052b966 @putout/printer: write -> print
+- 052b966 @putout/printer: write -> write
 
 2023.03.20, v1.6.2
 
@@ -1157,7 +1167,7 @@ feature:
 2023.03.18, v1.5.1
 
 feature:
-- a79e4f6 @putout/printer: print, indent, maybe
+- a79e4f6 @putout/printer: write, indent, maybe
 
 2023.03.18, v1.5.0
 

package/README.md

@@ -46,11 +46,11 @@ To benefit from it.
 ## API
 
 ```js
-const {print} = require('@putout/printer');
+const {write} = require('@putout/printer');
 const {parse} = require('@babel/parser');
 const ast = parse('const a = (b, c) => {const d = 5; return a;}');
 
-print(ast);
+write(ast);
 // returns
 `
 const a = (b, c) => {
@@ -65,9 +65,9 @@ const a = (b, c) => {
 When you need to extend syntax of `@putout/printer` just pass a function which receives:
 
 - `path`, Babel Path
-- `print`, a function to output result of printing into token array;
+- `write`, a function to output result of printing into token array;
 
-When `path` contains to dashes `__` and name, it is the same as: `print(path.get('right'))`, and this is
+When `path` contains to dashes `__` and name, it is the same as: `write(path.get('right'))`, and this is
 actually `traverse(path.get('right'))` shortened to simplify read and process.
 
 Here is how you can override `AssignmentPattern`:
@@ -75,7 +75,7 @@ Here is how you can override `AssignmentPattern`:
 ```js
 const ast = parse('const {a = 5} = b');
 
-print(ast, {
+write(ast, {
     format: {
         indent: '    ',
         newline: '\n',
@@ -84,9 +84,9 @@ print(ast, {
         splitter: '\n',
     },
     visitors: {
-        AssignmentPattern(path, {print}) {
-            print('/* [hello world] */= ');
-            print('__right');
+        AssignmentPattern(path, {write}) {
+            write('/* [hello world] */= ');
+            write('__right');
         },
     },
 });
@@ -148,21 +148,21 @@ else
     console.log('not ok');
 ```
 
-### `print`
+### `write`
 
-Used in previous example `print` can be used for a couple purposes:
+Used in previous example `write` can be used for a couple purposes:
 
-- to print `string`;
-- to print `node` when `object` passed;
-- to print `node` when `string` started with `__`;
+- to write `string`;
+- to write `node` when `object` passed;
+- to write `node` when `string` started with `__`;
 
 ```js
-print(ast, {
+write(ast, {
     visitors: {
-        AssignmentPattern(path, {print, maybe}) {
-            maybe.print.newline(path.parentPath.isCallExpression());
-            print('/* [hello world] */= ');
-            print('__right');
+        AssignmentPattern(path, {write, maybe}) {
+            maybe.write.newline(path.parentPath.isCallExpression());
+            write('/* [hello world] */= ');
+            write('__right');
         },
     },
 });
@@ -171,15 +171,15 @@ print(ast, {
 ### `maybe`
 
 When you need some condition use `maybe`. For example, to add newline only when parent node is `CallExpression` you
-can use `maybe.print.newline(condition)`:
+can use `maybe.write.newline(condition)`:
 
 ```js
-print(ast, {
+write(ast, {
     visitors: {
-        AssignmentPattern(path, {print, maybe}) {
-            maybe.print.newline(path.parentPath.isCallExpression());
-            print(' /* [hello world] */= ');
-            print('__right');
+        AssignmentPattern(path, {write, maybe}) {
+            maybe.write.newline(path.parentPath.isCallExpression());
+            write(' /* [hello world] */= ');
+            write('__right');
         },
     },
 });
@@ -190,7 +190,7 @@ print(ast, {
 When are you going to output string you can use low-level function `write`:
 
 ```js
-print(ast, {
+write(ast, {
     visitors: {
         BlockStatement(path, {write}) {
             write('hello');
@@ -205,7 +205,7 @@ When you need to add indentation use `indent`, for example when you output body,
 you need to increment indentation, and then decrement it back:
 
 ```js
-print(ast, {
+write(ast, {
     visitors: {
         BlockStatement(path, {write, indent}) {
             write('{');
@@ -224,7 +224,7 @@ print(ast, {
 When are you needing to traverse node, you can use `traverse`:
 
 ```js
-print(ast, {
+write(ast, {
     visitors: {
         AssignmentExpression(path, {traverse}) {
             traverse(path.get('left'));
@@ -233,7 +233,7 @@ print(ast, {
 });
 ```
 
-This is the same as `print('__left')` but more low-level, and supports only objects.
+This is the same as `write('__left')` but more low-level, and supports only objects.
 
 ## Speed Comparison
 

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

@@ -27,7 +27,9 @@ module.exports.ObjectPattern = {
         
         for (const [i, property] of properties.entries()) {
             if (property.isRestElement()) {
+                maybe.indent(n > 1);
                 print(property);
+                maybe.print.newline(n > 1);
                 continue;
             }
             
@@ -67,7 +69,10 @@ module.exports.ObjectPattern = {
                 continue;
             }
             
-            maybe.print(i < n, ', ');
+            if (i < n) {
+                print(',');
+                print.space();
+            }
         }
         
         indent.dec();
@@ -111,3 +116,4 @@ function shouldAddNewline(path) {
     
     return false;
 }
+

package/lib/tokenize/statements/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const {ExpressionStatement} = require('./expression-statement');
-const {VariableDeclaration} = require('./variable-declaration');
+const {VariableDeclaration} = require('./variable-declaration/variable-declaration');
 const {IfStatement} = require('./if-statement');
 const {ForOfStatement} = require('./for-of-statement');
 const {BlockStatement} = require('./block-statement');

package/lib/tokenize/statements/variable-declaration/maybe-space-after-keyword.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports.maybeSpaceAfterKeyword = (path, {write}) => {
+    const {id} = path.node.declarations[0];
+    
+    if (id.type === 'ArrayPattern' || id.type === 'ObjectPattern')
+        return write.space();
+    
+    write(' ');
+};

package/lib/tokenize/statements/{variable-declaration.js → variable-declaration/variable-declaration.js}

@@ -6,10 +6,11 @@ const {
     isNewlineBetweenSiblings,
     exists,
     noTrailingComment,
-} = require('../is');
+} = require('../../is');
 
-const {hasPrevNewline} = require('../mark');
+const {hasPrevNewline} = require('../../mark');
 const {isExportDeclaration} = require('@babel/types');
+const {maybeSpaceAfterKeyword} = require('./maybe-space-after-keyword');
 
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
 const isInsideBlock = (path) => /^(Program|BlockStatement)$/.test(path.parentPath.type);
@@ -21,7 +22,8 @@ module.exports.VariableDeclaration = {
     },
     print(path, {maybe, store, write, traverse}) {
         maybe.indent(isInsideBlock(path));
-        write(`${path.node.kind} `);
+        write(String(path.node.kind));
+        maybeSpaceAfterKeyword(path, {write});
         
         const declarations = path.get('declarations');
         const n = declarations.length - 1;
@@ -148,3 +150,4 @@ const isNextAssign = (path) => {
         .get('expression')
         .isAssignmentExpression();
 };
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.117.0",
+  "version": "1.119.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",