@putout/printer 1.80.4 → 1.81.1

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.05.04, v1.81.1
+
+feature:
+- 12f7943 @putout/printer: improve comments support
+
+2023.05.04, v1.81.0
+
+feature:
+- 8b4ea75 @putout/printer: add ability to minify whitespaces
+- ee6c8f1 @putout/printer: ImportDeclaration: add potential ability to overide imports.maxOneLineSpecifiers
+
 2023.05.03, v1.80.4
 
 fix:

package/README.md

@@ -78,6 +78,9 @@ const ast = parse('const {a = 5} = b');
 print(ast, {
     format: {
         indent: '    ',
+        newline: '\n',
+        space: ' ',
+        comments: true,
     },
     visitors: {
         AssignmentPattern(path, {print}) {

package/lib/tokenize/comments.js

@@ -1,13 +1,19 @@
 'use strict';
 
-const {isNext} = require('./is');
+const {hasTrailingComment} = require('./is');
 
 const {markBefore} = require('./mark');
 
-module.exports.parseLeadingComments = (path, {print, maybe, indent}) => {
+module.exports.parseLeadingComments = (path, {print, maybe, indent}, format) => {
+    if (!format.comments)
+        return;
+    
     const {leadingComments} = path.node;
     
-    if (!leadingComments || !leadingComments.length)
+    if (!leadingComments?.length)
+        return;
+    
+    if (hasTrailingComment(path.getPrevSibling()))
         return;
     
     const insideFn = path.parentPath.isFunction();
@@ -45,13 +51,13 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}) => {
     }
 };
 
-module.exports.parseTrailingComments = (path, {write, maybe}) => {
-    const {trailingComments} = path.node;
-    
-    if (!trailingComments || !trailingComments.length)
+module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
+    if (!format.comments)
         return;
     
-    if (isNext(path))
+    const {trailingComments} = path.node;
+    
+    if (!trailingComments?.length)
         return;
     
     for (const {type, value, loc} of trailingComments) {
@@ -63,6 +69,12 @@ module.exports.parseTrailingComments = (path, {write, maybe}) => {
             
             write(`//${value}`);
             write.newline();
+            continue;
+        }
+        
+        if (type === 'CommentBlock') {
+            write(`/*${value}*/`);
+            write.newline();
         }
     }
 };

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

@@ -4,10 +4,17 @@ const {markAfter} = require('../../mark');
 const {isLast} = require('../../is');
 const {parseSpecifiers} = require('./parse-specifiers');
 
+const options = {
+    imports: {
+        maxOneLineSpecifiers: 2,
+    },
+};
+
 module.exports.ImportDeclaration = {
     print(path, {print, maybe, write, traverse, indent}) {
         const isType = path.node.importKind === 'type';
         const specifiers = path.get('specifiers');
+        const {maxOneLineSpecifiers} = options.imports;
         
         print('import ');
         maybe.print(isType, 'type ');
@@ -56,12 +63,12 @@ module.exports.ImportDeclaration = {
                 write(spec.node.local.name);
             }
             
-            if (importsCount <= 2 && notLast) {
+            if (importsCount <= maxOneLineSpecifiers && notLast) {
                 maybe.write(n, ',');
                 maybe.write.space(n);
             }
             
-            if (importsCount > 2) {
+            if (importsCount > maxOneLineSpecifiers) {
                 maybe.write(n, ',');
                 maybe.write.newline(index === n);
             }

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

@@ -5,6 +5,7 @@ const {
     isCoupleLines,
     isNewlineBetweenSiblings,
     exists,
+    noTrailingComment,
 } = require('../is');
 
 const {hasPrevNewline} = require('../mark');
@@ -18,19 +19,25 @@ module.exports.VariableDeclaration = {
     before(path, {print}) {
         print.breakline();
     },
-    print(path, {maybe, print, store}) {
+    print(path, {maybe, print, store, write}) {
         maybe.indent(isParentBlock(path));
         print(`${path.node.kind} `);
         print('__declarations.0.id');
         
         const initPath = path.get('declarations.0.init');
-        maybe.print(exists(initPath), ' = ');
+        
+        if (exists(initPath)) {
+            write.space();
+            write('=');
+            write.space();
+        }
+        
         print('__declarations.0.init');
         maybe.print(isParentBlock(path), ';');
         
         let wasNewline = false;
         
-        if (isParentBlock(path) && isNext(path)) {
+        if (isParentBlock(path) && isNext(path) && (noTrailingComment(path) || isNewlineBetweenSiblings(path))) {
             print.newline();
             wasNewline = true;
         }

package/lib/tokenize/tokenize.js

@@ -48,8 +48,11 @@ const get = (path, command) => path.get(command.replace(GET, ''));
 
 function initFormat(format) {
     return {
-        ...format,
         indent: '    ',
+        newline: '\n',
+        space: ' ',
+        comments: true,
+        ...format,
     };
 }
 
@@ -107,7 +110,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
     const space = () => {
         addToken({
             type: TYPES.SPACE,
-            value: ' ',
+            value: format.space,
         });
     };
     
@@ -119,7 +122,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
     const newline = () => {
         addToken({
             type: TYPES.NEWLINE,
-            value: '\n',
+            value: format.newline,
         });
     };
     
@@ -209,12 +212,12 @@ module.exports.tokenize = (ast, overrides = {}) => {
         maybeThrow(!currentTraverse, path, `Node type '{{ type }}' is not supported yet: '{{ path }}'`);
         
         const currentIndent = i;
-        parseLeadingComments(path, printer);
+        parseLeadingComments(path, printer, format);
         
         // this is main thing
         maybePlugin(currentTraverse, path, printer);
         
-        parseTrailingComments(path, printer);
+        parseTrailingComments(path, printer, format);
         maybeThrow(i !== currentIndent, path, `☝️Looks like indent level changed after token visitor: '{{ type }}', for code: '{{ path }}'`);
         debug(path.type);
     }

package/package.json

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