@putout/printer 1.52.0 → 1.52.2

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.04.17, v1.52.2
+
+feature:
+- ef0ef15 @putout/printer: maybe
+- beb210c @putout/printer: ExpressionStatement: apply satisfy
+
+2023.04.17, v1.52.1
+
+feature:
+- cf83bcb @putout/printer: move out satisfy
+
 2023.04.17, v1.52.0
 
 feature:

package/lib/tokenize/is.js

@@ -76,3 +76,12 @@ module.exports.isNewlineBetweenStatements = (path) => {
     
     return startNext - endCurrent > 1;
 };
+
+module.exports.satisfy = (conditions) => (path) => {
+    for (const condition of conditions) {
+        if (condition(path))
+            return true;
+    }
+    
+    return false;
+};

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,5 +1,7 @@
 'use strict';
 
+const {satisfy} = require('../is');
+
 module.exports = (plugin) => {
     if (!plugin.afterSatisfy && !plugin.beforeSatisfy)
         return plugin;
@@ -11,13 +13,7 @@ module.exports = (plugin) => {
     };
 };
 
-const createIf = (getConditions) => (path) => {
+const createIf = (getConditions) => {
     const conditions = getConditions?.() || [];
-    
-    for (const condition of conditions) {
-        if (condition(path))
-            return true;
-    }
-    
-    return false;
+    return satisfy(conditions);
 };

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

@@ -6,8 +6,16 @@ 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 +40,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.52.0",
+  "version": "1.52.2",
   "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",