@putout/printer 1.15.4 → 1.16.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.01, v1.16.1
+
+feature:
+- 4f2f38a @putout/printer: improve support of ImportSpecifier in ImportDeclaration
+
+2023.03.31, v1.16.0
+
+feature:
+- c19ded9 @putout/printer: add support of ClassExpression
+
 2023.03.31, v1.15.4
 
 feature:

package/lib/tokenize/comments.js

@@ -4,12 +4,13 @@ const {
     isFirst,
     isNext,
 } = require('./is');
+
 const {
     markBefore,
     hasPrevNewline,
 } = require('./mark');
 
-module.exports.parseLeadingComments = (path, {print, indent}) => {
+module.exports.parseLeadingComments = (path, {print, maybe}) => {
     const {leadingComments} = path.node;
     
     if (!leadingComments || !leadingComments.length)
@@ -18,8 +19,10 @@ module.exports.parseLeadingComments = (path, {print, indent}) => {
     if (shouldAddNewlineBefore(path))
         print.linebreak();
     
+    const isClass = !path.isClassMethod();
+    
     for (const {type, value} of leadingComments) {
-        indent();
+        maybe.indent(isClass);
         
         if (type === 'CommentLine') {
             print(`//${value}`);
@@ -31,9 +34,10 @@ module.exports.parseLeadingComments = (path, {print, indent}) => {
         if (type === 'CommentBlock') {
             print(`/*${value}*/`);
             
-            if (path.isStatement()) {
+            if (path.isStatement() || path.isClassMethod()) {
                 print.newline();
                 markBefore(path);
+                maybe.indent(path.isClassMethod());
             }
             
             continue;

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

@@ -3,7 +3,17 @@
 const isArg = (path) => path.parentPath.isFunction();
 
 module.exports.AssignmentPattern = (path, {print, maybe}) => {
-    maybe.print(isArg(path), '__left');
+    maybe.print(shouldPrint(path), '__left');
     print(' = ');
     print('__right');
 };
+
+function shouldPrint(path) {
+    if (isArg(path))
+        return true;
+    
+    if (path.parentPath.isArrayPattern())
+        return true;
+    
+    return false;
+}

package/lib/tokenize/expressions/{class-declaration.js → class.js}

@@ -1,6 +1,9 @@
 'use strict';
 
-module.exports.ClassDeclaration = (path, {print, indent}) => {
+module.exports.ClassExpression = classVisitor;
+module.exports.ClassDeclaration = classVisitor;
+
+function classVisitor(path, {print, indent}) {
     indent();
     print('class ');
     print('__id');
@@ -25,4 +28,4 @@ module.exports.ClassDeclaration = (path, {print, indent}) => {
     
     indent.dec();
     print('}');
-};
+}

package/lib/tokenize/expressions/index.js

@@ -3,7 +3,11 @@
 const functions = require('./functions');
 const unaryExpressions = require('./unary-expressions');
 const memberExpressions = require('./member-expressions');
-const {ClassDeclaration} = require('./class-declaration');
+
+const {
+    ClassExpression,
+    ClassDeclaration,
+} = require('./class');
 
 const {
     CallExpression,
@@ -44,6 +48,7 @@ module.exports = {
     AssignmentPattern,
     BinaryExpression,
     CallExpression,
+    ClassExpression,
     ClassDeclaration,
     ConditionalExpression,
     NewExpression,

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

@@ -20,6 +20,7 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
         
         const valuePath = property.get('value');
         const keyPath = property.get('key');
+        const isAssign = valuePath.isAssignmentPattern();
         const {shorthand} = property.node;
         
         maybe.indent(is);
@@ -30,7 +31,7 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
             print(valuePath);
         }
         
-        if (valuePath.isAssignmentPattern())
+        if (isAssign)
             print(valuePath);
         
         if (is) {

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

@@ -2,42 +2,47 @@
 
 const {markAfter} = require('../mark');
 
-module.exports.ImportDeclaration = (path, {print, maybe}) => {
-    const specifiers = path.get('specifiers');
-    print('import ');
-    
-    for (const [index, spec] of specifiers.entries()) {
-        if (spec.isImportDefaultSpecifier()) {
-            print(spec.get('local'));
-            continue;
-        }
+module.exports.ImportDeclaration = {
+    print(path, {print, maybe}) {
+        const specifiers = path.get('specifiers');
+        print('import ');
+        
+        let wasSpecifier = false;
+        const n = specifiers.length - 1;
         
-        if (spec.isImportSpecifier()) {
-            maybe.print(index, ', ');
-            print('{');
-            print(spec.get('imported'));
-            print('}');
+        for (const [index, spec] of specifiers.entries()) {
+            if (spec.isImportDefaultSpecifier()) {
+                print(spec.get('local'));
+                continue;
+            }
             
-            continue;
+            if (spec.isImportSpecifier()) {
+                maybe.print(index, ', ');
+                maybe.print(!wasSpecifier, '{');
+                wasSpecifier = true;
+                print(spec.get('imported'));
+                maybe.print(index === n, '}');
+                
+                continue;
+            }
         }
-    }
-    
-    if (specifiers.length) {
-        print.space();
-        print('from');
-        print.space();
-    }
-    
-    print('__source');
-    print(';');
-    print.newline();
-    
-    if (shouldAddNewlineAfter(path)) {
+        
+        if (specifiers.length) {
+            print.space();
+            print('from');
+            print.space();
+        }
+        
+        print('__source');
+        print(';');
+        print.newline();
+    },
+    afterIf: shouldAddNewlineAfter,
+    after(path, {print}) {
         print.newline();
         markAfter(path);
-    }
+    },
 };
-
 function shouldAddNewlineAfter(path) {
     if (path.getNextSibling().isImportDeclaration())
         return false;

package/lib/tokenize/tokenize.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const {round} = Math;
-
 const fullstore = require('fullstore');
 const isObject = (a) => a && typeof a === 'object';
 const babelTraverse = require('@babel/traverse').default;
@@ -230,16 +229,13 @@ const createPrint = (path, {traverse, write}) => (maybeLine) => {
     
     return write(computed);
 };
+
 const computePath = (path, maybeLine) => {
     if (isString(maybeLine) && maybeLine.startsWith(GET))
-        return get(
-            path,
-            maybeLine,
-        );
+        return get(path, maybeLine);
     
     if (isObject(maybeLine))
         return maybeLine;
     
     return maybeLine;
 };
-

package/package.json

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