@putout/printer 1.91.0 → 1.92.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.10, v1.92.1
+
+feature:
+- d6c9e2a @putout/printer: add support of comments inside ObjectExpression
+
+2023.05.10, v1.92.0
+
+feature:
+- 2d623d5 @putout/printer: ExportNamespaceDeclaration: improve support
+
 2023.05.10, v1.91.0
 
 feature:

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

@@ -12,13 +12,14 @@ const {
 } = require('../is');
 
 const {isFunction} = require('@babel/types');
+const {parseComments} = require('../comments');
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
 const isValue = (path) => path.get('properties.0.value').node;
 const isParentExpression = (path) => path.parentPath.isExpressionStatement();
 
-module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
+module.exports.ObjectExpression = (path, {print, maybe, indent, write}) => {
     indent.inc();
     
     const properties = path.get('properties');
@@ -28,6 +29,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     
     maybe.print(parens, '(');
     print('{');
+    parseComments(path, {write});
     maybe.print.newline(manyLines);
     
     for (const property of properties) {
@@ -136,3 +138,4 @@ function isParens(path) {
     
     return false;
 }
+

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

@@ -9,9 +9,16 @@ const {
     markAfter,
     isMarkedAfter,
 } = require('../../mark');
+const {isExportNamespaceSpecifier} = require('@babel/types');
 
 const isDeclarationNewline = (path) => isMarkedAfter(path.get('declaration'));
 
+const options = {
+    exports: {
+        maxOneLineSpecifiers: 2,
+    },
+};
+
 module.exports.ExportSpecifier = (path, {print}) => {
     const {
         local,
@@ -27,38 +34,53 @@ module.exports.ExportSpecifier = (path, {print}) => {
 };
 
 module.exports.ExportNamespaceSpecifier = (path, {print}) => {
-    print(' * as ');
+    print('* as ');
     print('__exported');
 };
 
 module.exports.ExportNamedDeclaration = {
-    print(path, {print, traverse, write, indent}) {
+    print(path, {print, traverse, write, indent, maybe}) {
         const {exportKind} = path.node;
         const specifiers = path.get('specifiers');
+        const {maxOneLineSpecifiers} = options.exports;
+        const source = path.get('source');
         
         indent();
         write('export ');
         
         if (exportKind === 'type' && specifiers.length) {
-            print('type');
+            print('type ');
+            print(specifiers[0]);
+            print(' from ');
+            traverse(source);
+            print(';');
+            
+            return;
+        }
+        
+        if (isExportNamespaceSpecifier(specifiers[0])) {
             print(specifiers[0]);
             print(' from ');
             print('__source');
             print(';');
+            print.newline();
             
             return;
         }
         
+        const n = specifiers.length;
+        const isNewline = !exists(source) || n > maxOneLineSpecifiers;
+        
         if (specifiers.length) {
             write('{');
             indent.inc();
-            write.newline();
+            maybe.write.newline(isNewline);
             
             for (const spec of specifiers) {
-                indent();
+                maybe.indent(isNewline);
                 traverse(spec);
-                write(',');
-                write.newline();
+                maybe.write(isNewline, ',');
+                maybe.write.newline(isNewline);
             }
             
             indent.dec();
@@ -88,3 +110,4 @@ module.exports.ExportNamedDeclaration = {
         markAfter(path);
     },
 };
+

package/lib/tokenize/statements/index.js

@@ -73,4 +73,3 @@ module.exports = {
     },
     WhileStatement,
 };
-

package/package.json

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