@putout/printer 1.52.1 → 1.52.3

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.04.17, v1.52.3
+
+fix:
+- f316738 @putout/printer: no newline after VariableDeclaration inside ExportDeclaration
+
+2023.04.17, v1.52.2
+
+feature:
+- ef0ef15 @putout/printer: maybe
+- beb210c @putout/printer: ExpressionStatement: apply satisfy
+
 2023.04.17, v1.52.1
 
 feature:

package/lib/tokenize/{maybe.js → maybe/index.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 const rendy = require('rendy');
-const maybeSatisfy = require('./maybe/satisfy');
+const maybeSatisfy = require('./satisfy');
 
 const {
     isProgram,

package/lib/tokenize/maybe/satisfy.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {satisfy} = require('../is');
+
 module.exports = (plugin) => {
     if (!plugin.afterSatisfy && !plugin.beforeSatisfy)
         return plugin;

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

@@ -6,8 +6,15 @@ const {
     isParentBlock,
     isParentLast,
     isNewlineBetweenStatements,
+    satisfy,
 } = require('../is');
 
+const shouldBreakline = satisfy([
+    isNewlineBetweenStatements,
+    isNotLastBody,
+    isStrictMode,
+]);
+
 module.exports.ExpressionStatement = {
     print(path, {indent, print, maybe, store}) {
         indent();
@@ -32,23 +39,14 @@ module.exports.ExpressionStatement = {
     },
 };
 
-function shouldBreakline(path) {
-    if (isNewlineBetweenStatements(path))
-        return true;
-    
-    if (isLast(path) || isParentLast(path))
-        return false;
-    
+function isNotLastBody(path) {
     if (!isNext(path) && isParentBlock(path))
         return false;
     
-    if (path.parentPath.get('body') === path)
-        return true;
-    
-    if (isStrictMode(path))
-        return true;
+    if (isLast(path) || isParentLast(path))
+        return false;
     
-    return false;
+    return path.parentPath.get('body') === path;
 }
 
 function isParentOrNotLastORParentLast(path) {

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

@@ -46,8 +46,19 @@ module.exports.VariableDeclaration = {
     },
 };
 
+function noNextParentBlock(path) {
+    return !isNext(path) && path.parentPath.isBlockStatement();
+}
+
+function notLastParentExport(path) {
+    if (isLast(path.parentPath))
+        return false;
+    
+    return path.parentPath.isExportDeclaration();
+}
+
 function shouldAddNewlineAfter(path) {
-    if (!isNext(path) && path.parentPath.isBlockStatement())
+    if (noNextParentBlock(path))
         return true;
     
     if (isLast(path))
@@ -71,9 +82,12 @@ function shouldAddNewlineAfter(path) {
     if (isNewlineBetweenStatements(path))
         return true;
     
+    if (notLastParentExport(path))
+        return true;
+    
     return false;
 }
-const isLast = (path) => path.parentPath.isProgram() && !isNext(path);
+const isLast = (path) => path.parentPath?.isProgram() && !isNext(path);
 
 function shouldAddNewlineBefore(path) {
     if (isFirst(path))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.52.1",
+  "version": "1.52.3",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",