@putout/printer 1.70.1 → 1.70.3

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.25, v1.70.3
+
+feature:
+- 0752294 @putout/printer: keep newlines between ObjectProperties
+
+2023.04.25, v1.70.2
+
+fix:
+- 42813b5 @putout/printer: ExportDeclaration: newline
+
 2023.04.25, v1.70.1
 
 feature:

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

@@ -5,6 +5,8 @@ const {
     isForOf,
     isIf,
     noTrailingComment,
+    isNewlineBetweenSiblings,
+
 } = require('../is');
 
 const {isFunction} = require('@babel/types');
@@ -50,6 +52,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
         
         print(property);
         maybe.print.newline(manyLines && noTrailingComment(property));
+        maybe.print.linebreak(isNewlineBetweenSiblings(property));
     }
     
     indent.dec();

package/lib/tokenize/is.js

@@ -68,7 +68,7 @@ module.exports.isForOf = (path) => {
     return false;
 };
 
-module.exports.isNewlineBetweenStatements = (path) => {
+module.exports.isNewlineBetweenSiblings = (path) => {
     const endCurrent = path.node?.loc?.end?.line;
     const startNext = path.getNextSibling().node?.loc?.start?.line;
     

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

@@ -1,5 +1,13 @@
 'use strict';
 
+const {isNewlineBetweenSiblings} = require('../is');
+const {
+    markAfter,
+    isMarkedAfter,
+} = require('../mark');
+
+const isDeclarationNewline = (path) => isMarkedAfter(path.get('declaration'));
+
 module.exports.ExportSpecifier = (path, {print}) => {
     const {
         local,
@@ -19,37 +27,49 @@ module.exports.ExportNamespaceSpecifier = (path, {print}) => {
     print('__exported');
 };
 
-module.exports.ExportNamedDeclaration = (path, {print, traverse, write, indent}) => {
-    const {exportKind} = path.node;
-    const specifiers = path.get('specifiers');
-    
-    write('export ');
-    
-    if (exportKind === 'type' && specifiers.length) {
-        print('type');
-        print(specifiers[0]);
-        print(' from ');
-        print('__source');
-        print(';');
+module.exports.ExportNamedDeclaration = {
+    print(path, {print, traverse, write, indent}) {
+        const {exportKind} = path.node;
+        const specifiers = path.get('specifiers');
         
-        return;
-    }
-    
-    if (specifiers.length) {
-        write('{');
-        indent.inc();
-        write.newline();
+        write('export ');
         
-        for (const spec of specifiers) {
-            indent();
-            traverse(spec);
-            write(',');
+        if (exportKind === 'type' && specifiers.length) {
+            print('type');
+            print(specifiers[0]);
+            print(' from ');
+            print('__source');
+            print(';');
+            
+            return;
+        }
+        
+        if (specifiers.length) {
+            write('{');
+            indent.inc();
             write.newline();
+            
+            for (const spec of specifiers) {
+                indent();
+                traverse(spec);
+                write(',');
+                write.newline();
+            }
+            
+            indent.dec();
+            write('}');
         }
         
-        indent.dec();
-        write('}');
-    }
-    
-    print('__declaration');
+        print('__declaration');
+    },
+    afterIf(path) {
+        if (isDeclarationNewline(path))
+            return false;
+        
+        return isNewlineBetweenSiblings(path);
+    },
+    after(path, {print}) {
+        print.newline();
+        markAfter(path);
+    },
 };

package/lib/tokenize/statements/expression-statement.js

@@ -5,12 +5,12 @@ const {
     isLast,
     isParentBlock,
     isParentLast,
-    isNewlineBetweenStatements,
+    isNewlineBetweenSiblings,
     satisfy,
 } = require('../is');
 
 const shouldBreakline = satisfy([
-    isNewlineBetweenStatements,
+    isNewlineBetweenSiblings,
     isNotLastBody,
     isStrictMode,
 ]);

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

@@ -3,13 +3,10 @@
 const {
     isNext,
     isCoupleLines,
-    isNewlineBetweenStatements,
+    isNewlineBetweenSiblings,
 } = require('../is');
 
-const {
-    hasPrevNewline,
-    markAfter,
-} = require('../mark');
+const {hasPrevNewline} = require('../mark');
 
 const {isExportDeclaration} = require('@babel/types');
 
@@ -45,14 +42,14 @@ module.exports.VariableDeclaration = {
         isNextAssign,
         isNextCoupleLines,
         notLastPrevVarNotNextVar,
-        isNewlineBetweenStatements,
+        isNewlineBetweenSiblings,
         notLastParentExport,
     ],
     after(path, {maybe, store}) {
         const wasNewline = store();
         maybe.print.linebreak(wasNewline);
         maybe.print.newline(!wasNewline);
-        markAfter(path);
+        maybe.markAfter(wasNewline, path);
     },
 };
 

package/package.json

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