@putout/printer - npm Package Compare versions

Comparing version 1.51.0 to 1.52.0

lib/tokenize/maybe.js

 'use strict';
 
 const rendy = require('rendy');
+const maybeSatisfy = require('./maybe/satisfy');
 
@@ -25,5 +26,3 @@ const {
 
-const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
-    ExpressionStatement(ast),
-]);
+const maybeProgram = (ast) => isProgram(ast) ? ast : Program([ExpressionStatement(ast)]);
 
@@ -48,3 +47,3 @@ module.exports.maybeFile = (ast) => isFile(ast) ? ast : File(maybeProgram(ast));
         afterIf = condition,
-    } = plugin;
+    } = maybeSatisfy(plugin);
     
@@ -51,0 +50,0 @@ if (beforeIf?.(path, printer)) {

lib/tokenize/statements/expression-statement.js

@@ -5,3 +5,2 @@ 'use strict';
     isNext,
-    isParentProgram,
     isLast,
@@ -25,5 +24,8 @@ isParentBlock,
     },
-    afterIf(path) {
-        return shouldAddNewLineAfter(path);
-    },
+    afterSatisfy: () => [
+        isParentOrNotLastORParentLast,
+        isParentBlock,
+        isNext,
+        isNextUp,
+    ],
     after(path, {print, maybe, store}) {
@@ -54,12 +56,7 @@ print.newline();
 
-function shouldAddNewLineAfter(path) {
-    if (!isParentBlock(path) && (isLast(path) || isParentLast(path)))
-        return false;
-    
-    if (isParentBlock(path) && !isParentProgram(path))
-        return true;
-    
-    if (isNext(path))
-        return true;
-    
+function isParentOrNotLastORParentLast(path) {
+    return isParentBlock(path) || !(isLast(path) || isParentLast(path));
+}
+
+function isNextUp(path) {
     return path.findParent(isNext);
@@ -66,0 +63,0 @@ }

package.json

 {
   "name": "@putout/printer",
-  "version": "1.51.0",
+  "version": "1.52.0",
   "type": "commonjs",
@@ -5,0 +5,0 @@ "author": "coderaiser <[e-mail]> (https://github.com/coderaiser)",

No alert changes

Improved metrics

Total package byte prevSize

85805

0.66%

Number of package files

61

1.67%

Lines of code

2315

0.7%

No dependency changes