@putout/printer 1.76.1 → 1.78.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.01, v1.78.0
+
+feature:
+- ebd6259 @putout/printer: improve support of AssignmentPattern
+
+2023.05.01, v1.77.0
+
+feature:
+- 3e016f5 @putout/printer: improve support of ImportDeclaration
+
 2023.05.01, v1.76.1
 
 feature:

package/README.md

@@ -81,13 +81,13 @@ print(ast, {
     },
     visitors: {
         AssignmentPattern(path, {print}) {
-            print(' /* [hello world] */= ');
+            print('/* [hello world] */= ');
             print('__right');
         },
     },
 });
 // returns
-'const {a /* [hello world] */= 5} = b;\n';
+'const {/* [hello world] */= 5} = b;\n';
 ```
 
 ### `print`
@@ -103,7 +103,7 @@ print(ast, {
     visitors: {
         AssignmentPattern(path, {print, maybe}) {
             maybe.print.newline(path.parentPath.isCallExpression());
-            print(' /* [hello world] */= ');
+            print('/* [hello world] */= ');
             print('__right');
         },
     },

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

@@ -2,21 +2,21 @@
 
 const isArg = (path) => path.parentPath.isFunction();
 
-module.exports.AssignmentPattern = (path, {print, maybe}) => {
-    maybe.print(shouldPrint(path), '__left');
-    print(' = ');
-    print('__right');
+module.exports.AssignmentPattern = {
+    print(path, {print, maybe}) {
+        maybe.print(shouldPrint(path), '__left');
+        print(' = ');
+        print('__right');
+    },
 };
 
 function shouldPrint(path) {
-    if (path.parentPath.isObjectProperty() && !path.parentPath.node.shorthand)
+    if (path.parentPath.isObjectProperty())
         return true;
     
     if (isArg(path))
         return true;
     
-    if (path.parentPath.isArrayPattern())
-        return true;
-    
-    return false;
+    return path.parentPath.isArrayPattern();
 }
+

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

@@ -1,7 +1,7 @@
 'use strict';
 
 const {isIdentifier} = require('@babel/types');
-const {isForOf} = require('../is');
+const {isForOf, isCoupleLines} = require('../is');
 
 module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
     indent.inc();
@@ -25,13 +25,19 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
         const {shorthand} = property.node;
         
         maybe.indent(is);
-        print(keyPath);
+        maybe.print(!isAssign || !shorthand, keyPath);
         
         if (!shorthand) {
             print(': ');
             print(valuePath);
-        } else if (isAssign)
+        } else if (isAssign) {
+            const couple = isCoupleLines(valuePath);
+            maybe.print.breakline(couple);
             print(valuePath);
+            
+            maybe.print(couple, ',');
+            maybe.print.newline(couple);
+        }
         
         if (is) {
             print(',');

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

@@ -4,7 +4,7 @@ const {markAfter} = require('../mark');
 const {isLast} = require('../is');
 
 module.exports.ImportDeclaration = {
-    print(path, {print, maybe}) {
+    print(path, {print, maybe, write, traverse, indent}) {
         const isType = path.node.importKind === 'type';
         const specifiers = path.get('specifiers');
         
@@ -16,7 +16,9 @@ module.exports.ImportDeclaration = {
         
         for (const [index, spec] of specifiers.entries()) {
             if (spec.isImportDefaultSpecifier()) {
-                print(spec.get('local'));
+                traverse(spec.get('local'));
+                maybe.write(n, ',');
+                maybe.write.space(n);
                 continue;
             }
             
@@ -31,18 +33,23 @@ module.exports.ImportDeclaration = {
                     local,
                 } = spec.node;
                 
-                maybe.print(index, ', ');
-                maybe.print(!wasSpecifier, '{');
+                indent.inc();
+                
+                maybe.write(!wasSpecifier, '{');
+                maybe.write.breakline(n);
                 
                 wasSpecifier = true;
-                print(imported.name);
+                write(imported.name);
                 
                 if (imported.name !== local.name) {
-                    print(' as ');
-                    print(spec.node.local.name);
+                    write(' as ');
+                    write(spec.node.local.name);
                 }
                 
-                maybe.print(index === n, '}');
+                maybe.write(n, ',');
+                indent.dec();
+                maybe.write.newline(n && index === n);
+                maybe.write(index === n, '}');
                 
                 continue;
             }
@@ -76,3 +83,4 @@ module.exports.ImportDeclaration = {
         markAfter(path);
     },
 };
+

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

@@ -4,6 +4,8 @@ const {
     isNext,
     isCoupleLines,
     isNewlineBetweenSiblings,
+    exists,
+
 } = require('../is');
 
 const {hasPrevNewline} = require('../mark');
@@ -23,7 +25,7 @@ module.exports.VariableDeclaration = {
         print('__declarations.0.id');
         
         const initPath = path.get('declarations.0.init');
-        maybe.print(initPath.node, ' = ');
+        maybe.print(exists(initPath), ' = ');
         print('__declarations.0.init');
         maybe.print(isParentBlock(path), ';');
         

package/package.json

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