@putout/printer 1.81.0 → 1.81.2

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.04, v1.81.2
+
+feature:
+- 4033f37 @putout/printer: plugin: add satisfy
+
+2023.05.04, v1.81.1
+
+feature:
+- 12f7943 @putout/printer: improve comments support
+
 2023.05.04, v1.81.0
 
 feature:

package/lib/tokenize/comments.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isNext} = require('./is');
+const {hasTrailingComment} = require('./is');
 
 const {markBefore} = require('./mark');
 
@@ -10,7 +10,10 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, format) =>
     
     const {leadingComments} = path.node;
     
-    if (!leadingComments || !leadingComments.length)
+    if (!leadingComments?.length)
+        return;
+    
+    if (hasTrailingComment(path.getPrevSibling()))
         return;
     
     const insideFn = path.parentPath.isFunction();
@@ -54,10 +57,7 @@ module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
     
     const {trailingComments} = path.node;
     
-    if (!trailingComments || !trailingComments.length)
-        return;
-    
-    if (isNext(path))
+    if (!trailingComments?.length)
         return;
     
     for (const {type, value, loc} of trailingComments) {
@@ -69,6 +69,12 @@ module.exports.parseTrailingComments = (path, {write, maybe}, format) => {
             
             write(`//${value}`);
             write.newline();
+            continue;
+        }
+        
+        if (type === 'CommentBlock') {
+            write(`/*${value}*/`);
+            write.newline();
         }
     }
 };

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

@@ -1,15 +1,15 @@
 'use strict';
 
+const insideArrow = ({parentPath}) => parentPath.isArrowFunctionExpression();
+const insideExport = ({parentPath}) => parentPath.isExportDeclaration();
+const insideConst = ({parentPath}) => parentPath.isVariableDeclarator();
+
 module.exports.SequenceExpression = {
-    condition({parentPath}) {
-        if (parentPath.isArrowFunctionExpression())
-            return true;
-        
-        if (parentPath.isExportDeclaration())
-            return true;
-        
-        return false;
-    },
+    satisfy: () => [
+        insideArrow,
+        insideExport,
+        insideConst,
+    ],
     before(path, {write}) {
         write('(');
     },

package/lib/tokenize/expressions/unary-expressions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isLast} = require('../is');
+const {isLast, isNext} = require('../is');
 
 module.exports.UnaryExpression = unaryExpression;
 module.exports.UpdateExpression = unaryExpression;
@@ -26,6 +26,7 @@ module.exports.ThrowStatement = (path, {print, indent, maybe}) => {
     
     print(';');
     maybe.print.newline(!isLast(path));
+    maybe.print.breakline(isNext(path));
 };
 
 function printUnary(path, name, {print}) {

package/lib/tokenize/maybe/satisfy.js

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

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

@@ -5,6 +5,7 @@ const {
     isCoupleLines,
     isNewlineBetweenSiblings,
     exists,
+    noTrailingComment,
 } = require('../is');
 
 const {hasPrevNewline} = require('../mark');
@@ -36,7 +37,7 @@ module.exports.VariableDeclaration = {
         
         let wasNewline = false;
         
-        if (isParentBlock(path) && isNext(path)) {
+        if (isParentBlock(path) && isNext(path) && (noTrailingComment(path) || isNewlineBetweenSiblings(path))) {
             print.newline();
             wasNewline = true;
         }
@@ -136,4 +137,3 @@ const isNextAssign = (path) => {
         .get('expression')
         .isAssignmentExpression();
 };
-

package/package.json

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