@putout/printer 1.51.0 → 1.52.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.17, v1.52.1
+
+feature:
+- cf83bcb @putout/printer: move out satisfy
+
+2023.04.17, v1.52.0
+
+feature:
+- bf2b9a3 @putout/printer: add support of afterSatisfy
+
 2023.04.17, v1.51.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/satisfy.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const {satisfy} = require('../is');
+module.exports = (plugin) => {
+    if (!plugin.afterSatisfy && !plugin.beforeSatisfy)
+        return plugin;
+    
+    return {
+        afterIf: createIf(plugin.afterSatisfy),
+        beforeIf: createIf(plugin.beforeSatisfy),
+        ...plugin,
+    };
+};
+
+const createIf = (getConditions) => {
+    const conditions = getConditions?.() || [];
+    return satisfy(conditions);
+};

package/lib/tokenize/maybe.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const rendy = require('rendy');
+const maybeSatisfy = require('./maybe/satisfy');
 
 const {
     isProgram,
@@ -22,9 +23,7 @@ module.exports.maybeThrow = (a, path, b) => {
     }));
 };
 
-const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
-    ExpressionStatement(ast),
-]);
+const maybeProgram = (ast) => isProgram(ast) ? ast : Program([ExpressionStatement(ast)]);
 
 module.exports.maybeFile = (ast) => isFile(ast) ? ast : File(maybeProgram(ast));
 
@@ -44,7 +43,7 @@ function objectPlugin(plugin, path, printer) {
         beforeIf = condition,
         after = split,
         afterIf = condition,
-    } = plugin;
+    } = maybeSatisfy(plugin);
     
     if (beforeIf?.(path, printer)) {
         before(path, printer);

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

@@ -2,7 +2,6 @@
 
 const {
     isNext,
-    isParentProgram,
     isLast,
     isParentBlock,
     isParentLast,
@@ -21,9 +20,12 @@ module.exports.ExpressionStatement = {
             store(true);
         }
     },
-    afterIf(path) {
-        return shouldAddNewLineAfter(path);
-    },
+    afterSatisfy: () => [
+        isParentOrNotLastORParentLast,
+        isParentBlock,
+        isNext,
+        isNextUp,
+    ],
     after(path, {print, maybe, store}) {
         print.newline();
         maybe.markAfter(store(), path);
@@ -49,16 +51,11 @@ function shouldBreakline(path) {
     return false;
 }
 
-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);
 }
 

package/package.json

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