@putout/printer 1.70.3 → 1.71.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.25, v1.71.0
+
+feature:
+- b56cdb1 @putout/printer: ImportDeclaration: improve support of ImportSpecifier
+
+2023.04.25, v1.70.4
+
+feature:
+- b59320e @putout/printer: improve printing of comments after ObjectProperty
+
 2023.04.25, v1.70.3
 
 feature:

package/lib/tokenize/comments.js

@@ -4,28 +4,30 @@ const {isNext} = require('./is');
 
 const {markBefore} = require('./mark');
 
-module.exports.parseLeadingComments = (path, {print, maybe}) => {
+module.exports.parseLeadingComments = (path, {print, maybe, indent}) => {
     const {leadingComments} = path.node;
     
     if (!leadingComments || !leadingComments.length)
         return;
     
     const insideFn = path.parentPath.isFunction();
-    const isIndent = !path.isClassMethod() && !insideFn;
+    const isProperty = path.isObjectProperty();
+    const isIndent = !path.isClassMethod() && !insideFn && !isProperty;
     
     for (const {type, value} of leadingComments) {
         maybe.indent(isIndent);
         
         if (type === 'CommentLine') {
-            maybe.indent.inc(insideFn);
-            maybe.indent.inc(insideFn);
-            maybe.print.breakline(insideFn);
-            maybe.indent.dec(insideFn);
-            maybe.indent.dec(insideFn);
+            maybeInsideFn(insideFn, {
+                print,
+                indent,
+            });
             
+            maybe.print.space(isProperty);
             print(`//${value}`);
-            print.newline();
             
+            maybe.print.breakline(isProperty);
+            maybe.print.newline(!isProperty);
             continue;
         }
         
@@ -67,3 +69,14 @@ module.exports.parseTrailingComments = (path, {write, maybe}) => {
 function isSameLine(path, loc) {
     return path.node.loc.start.line === loc.start.line;
 }
+
+function maybeInsideFn(insideFn, {print, indent}) {
+    if (!insideFn)
+        return;
+    
+    indent.inc();
+    indent.inc();
+    print.breakline();
+    indent.dec();
+    indent.dec();
+}

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

@@ -6,7 +6,8 @@ const {
     isIf,
     noTrailingComment,
     isNewlineBetweenSiblings,
-
+    noLeadingComment,
+    noComment,
 } = require('../is');
 
 const {isFunction} = require('@babel/types');
@@ -43,7 +44,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
             continue;
         }
         
-        maybe.indent(manyLines);
+        maybe.indent(manyLines && noLeadingComment(property));
         
         if (property.isObjectMethod()) {
             print(property);
@@ -51,7 +52,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
         }
         
         print(property);
-        maybe.print.newline(manyLines && noTrailingComment(property));
+        maybe.print.newline(manyLines && noTrailingComment(property) && noComment(property));
         maybe.print.linebreak(isNewlineBetweenSiblings(property));
     }
     

package/lib/tokenize/is.js

@@ -87,3 +87,5 @@ module.exports.satisfy = (conditions) => (path) => {
 };
 
 module.exports.noTrailingComment = (path) => !path.node.trailingComments?.length;
+module.exports.noComment = (path) => !path.node.comments?.length;
+module.exports.noLeadingComment = (path) => !path.node.leadingComments?.length;

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

@@ -1,6 +1,7 @@
 'use strict';
 
 const {isNewlineBetweenSiblings} = require('../is');
+
 const {
     markAfter,
     isMarkedAfter,

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

@@ -23,12 +23,18 @@ module.exports.ImportDeclaration = {
             }
             
             if (spec.isImportSpecifier()) {
+                const {imported, local} = spec.node;
                 maybe.print(index, ', ');
                 maybe.print(!wasSpecifier, '{');
                 
                 wasSpecifier = true;
+                print(imported.name);
+                
+                if (imported.name !== local.name) {
+                    print(' as ');
+                    print(spec.node.local.name);
+                }
                 
-                print(spec.get('imported'));
                 maybe.print(index === n, '}');
                 
                 continue;

package/package.json

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