@putout/printer 1.81.3 → 1.81.5

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.05, v1.81.5
+
+feature:
+- b8367bc @putout/printer: improve support of newline in FunctionDeclaration inside of ExportDeclaration
+
+2023.05.04, v1.81.4
+
+feature:
+- a6bd038 @putout/printer: improve support of comments inside ObjectProperty
+
 2023.05.04, v1.81.3
 
 feature:

package/README.md

@@ -90,7 +90,7 @@ print(ast, {
     },
 });
 // returns
-'const {/* [hello world] */= 5} = b;\n';
+'const {a/* [hello world] */= 5} = b;\n';
 ```
 
 ### `print`

package/lib/tokenize/comments.js

@@ -61,9 +61,9 @@ module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
         return;
     
     for (const {type, value, loc} of trailingComments) {
+        const sameLine = isSameLine(path, loc);
+        
         if (type === 'CommentLine') {
-            const sameLine = isSameLine(path, loc);
-            
             maybe.write.space(sameLine);
             maybe.indent(!sameLine);
             
@@ -73,8 +73,9 @@ module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
         }
         
         if (type === 'CommentBlock') {
+            maybe.write.space(sameLine);
             write(`/*${value}*/`);
-            write.newline();
+            maybe.write.newline(!sameLine);
         }
     }
 };

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

@@ -11,7 +11,7 @@ module.exports.AssignmentPattern = {
 };
 
 function shouldPrint(path) {
-    if (path.parentPath.isObjectProperty())
+    if (path.parentPath.isObjectProperty() && !path.parentPath.node.shorthand)
         return true;
     
     if (isArg(path))

package/lib/tokenize/expressions/functions/function-declaration.js

@@ -1,7 +1,10 @@
 'use strict';
 
 const {markAfter} = require('../../mark');
-const {isNext} = require('../../is');
+const {
+    isNext,
+    isNextParent,
+} = require('../../is');
 
 module.exports.FunctionDeclaration = {
     print(path, {print, maybe}) {
@@ -27,9 +30,7 @@ module.exports.FunctionDeclaration = {
         print(') ');
         print('__body');
     },
-    afterSatisfy: () => [
-        isNext,
-    ],
+    afterSatisfy: () => [isNext, isNextParent],
     after(path, {write}) {
         write.newline();
         markAfter(path);

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

@@ -28,7 +28,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     
     maybe.print(parens, '(');
     print('{');
-    maybe.print(manyLines, '\n');
+    maybe.print.newline(manyLines);
     
     for (const property of properties) {
         if (property.isSpreadElement()) {

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

@@ -5,6 +5,7 @@ const {isIdentifier} = require('@babel/types');
 const {
     isForOf,
     isCoupleLines,
+    exists,
 } = require('../is');
 
 module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
@@ -27,16 +28,16 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
         const keyPath = property.get('key');
         const isAssign = valuePath.isAssignmentPattern();
         const {shorthand} = property.node;
+        const couple = isCoupleLines(valuePath) && !exists(property.getPrevSibling());
         
         maybe.indent(is);
-        maybe.print(!isAssign || !shorthand, keyPath);
+        maybe.print.breakline(couple);
+        print(keyPath);
         
         if (!shorthand) {
             print(': ');
             print(valuePath);
         } else if (isAssign) {
-            const couple = isCoupleLines(valuePath);
-            maybe.print.breakline(couple);
             print(valuePath);
             
             maybe.print(couple, ',');

package/package.json

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