@putout/printer 14.3.6 → 14.4.0

package/ChangeLog

@@ -1,3 +1,23 @@
+2025.04.15, v14.4.0
+
+feature:
+- c15e8d1 @putout/printer: json: string-literal
+- fb50b99 @putout/printer: supertape v11.1.0
+- 7e46e0a @putout/printer: samadhi v3.0.3
+- d4222cf @putout/printer: putout v40.0.1
+- f24d29d @putout/printer: goldstein v6.0.1
+- 72a05df @putout/printer: estree-to-babel v11.0.2
+- 36aefdf @putout/printer: check-dts v0.9.0
+- bcb7a53 @putout/printer: @putout/plugin-react-hooks v8.0.1
+- 809bfe2 @putout/printer: @putout/plugin-react-hook-form v6.0.0
+- b5c91ec @putout/printer: @putout/plugin-promises v17.0.0
+- 6c24426 @putout/printer: @putout/compare v17.0.0
+
+2025.03.29, v14.3.7
+
+fix:
+- a73ce65 @putout/printer: ExpressionStatement: comments
+
 2025.03.28, v14.3.6
 
 fix:

package/lib/json.js

@@ -19,8 +19,8 @@ module.exports.maybeJSON = (ast, overrides) => {
             semantics: {
                 ...overrides?.semantics,
                 trailingComma: false,
-                encodeSingleQuote: false,
-                encodeDoubleQuote: true,
+                escapeSingleQuote: false,
+                escapeDoubleQuote: true,
             },
         };
     

package/lib/tokenize/comment/parse-trailing-comments.js

@@ -14,6 +14,7 @@ const {
     isDecorator,
     isMemberExpression,
     isExpressionStatement,
+    isCallExpression,
 } = types;
 
 const hasBody = (path) => {
@@ -150,5 +151,10 @@ function isPrevCall(path) {
     if (isExpressionStatement(prev))
         return false;
     
-    return path.get('expression').isCallExpression();
+    const {expression} = path.node;
+    
+    if (!isCallExpression(expression))
+        return false;
+    
+    return !isCallExpression(expression.arguments[0]);
 }

package/lib/tokenize/literals/string-literal.js

@@ -1,24 +1,16 @@
 'use strict';
 
 module.exports.StringLiteral = (path, {write}, semantics) => {
-    const {raw, value} = path.node;
+    const {value, raw = `'${value}'`} = path.node;
     
-    if (raw && path.parentPath.isJSXAttribute()) {
+    if (path.parentPath.isJSXAttribute()) {
         write(raw);
         return;
     }
     
-    if (raw) {
-        const value = raw.slice(1, -1);
-        write.quote();
-        write(maybeEscape(value, semantics));
-        write.quote();
-        
-        return;
-    }
-    
+    const newValue = raw.slice(1, -1);
     write.quote();
-    write(value);
+    write(maybeEscape(newValue, semantics));
     write.quote();
 };
 

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

@@ -15,6 +15,7 @@ const {
 } = require('../../is');
 
 const {isInsideAssignNextAssignFunction} = require('./is-inside-assign-next-assign-function');
+const isCommentBlock = (a) => a?.type === 'CommentBlock';
 
 const {
     isCallExpression,
@@ -76,7 +77,11 @@ module.exports.ExpressionStatement = {
         
         if (!insideReturn && shouldBreakline(path)) {
             print.newline();
-            const condition = isNext(path) && noTrailingComment(path) || isNextToAssignmentCall(path);
+            
+            const condition = isNext(path)
+                && noTrailingComment(path)
+                || isNextToAssignmentCall(path)
+                || isNextStatementWithBlockComment(path);
             
             if (condition)
                 indent();
@@ -166,3 +171,22 @@ function isNextToAssignmentCall(path) {
     
     return isCallExpression(expression);
 }
+
+function isNextStatementWithBlockComment(path) {
+    const {expression} = path.node;
+    
+    if (!isCallExpression(expression))
+        return false;
+    
+    if (!isCallExpression(expression.arguments[0]))
+        return false;
+    
+    return hasTrailingBlock(path);
+}
+
+function hasTrailingBlock(path) {
+    const {trailingComments} = path.node;
+    const [first] = trailingComments;
+    
+    return isCommentBlock(first);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "14.3.6",
+  "version": "14.4.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@putout/babel": "^3.0.0",
-    "@putout/compare": "^16.0.1",
+    "@putout/compare": "^17.0.0",
     "@putout/operate": "^13.0.0",
     "@putout/operator-json": "^2.0.0",
     "fullstore": "^3.0.0",
@@ -71,26 +71,26 @@
     "@putout/eslint": "^4.1.0",
     "@putout/plugin-minify": "^10.0.0",
     "@putout/plugin-printer": "^5.0.0",
-    "@putout/plugin-promises": "^16.0.0",
-    "@putout/plugin-react-hook-form": "^5.0.0",
-    "@putout/plugin-react-hooks": "^7.0.0",
+    "@putout/plugin-promises": "^17.0.0",
+    "@putout/plugin-react-hook-form": "^6.0.0",
+    "@putout/plugin-react-hooks": "^8.0.1",
     "acorn": "^8.8.2",
     "c8": "^10.1.2",
-    "check-dts": "^0.8.0",
+    "check-dts": "^0.9.0",
     "escover": "^4.0.1",
     "eslint": "^9.0.0",
     "eslint-plugin-putout": "^26.0.2",
-    "estree-to-babel": "^10.0.0",
-    "goldstein": "^5.14.0",
+    "estree-to-babel": "^11.0.2",
+    "goldstein": "^6.0.1",
     "just-kebab-case": "^4.2.0",
     "madrun": "^11.0.0",
     "mock-require": "^3.0.3",
     "montag": "^1.0.0",
     "nodemon": "^3.0.1",
-    "putout": "^39.0.2",
+    "putout": "^40.0.1",
     "redlint": "^4.0.0",
-    "samadhi": "^2.8.0",
-    "supertape": "^10.0.0",
+    "samadhi": "^3.0.3",
+    "supertape": "^11.1.0",
     "try-catch": "^3.0.0",
     "typescript": "^5.3.3"
   },

package/tsconfig.json

@@ -2,5 +2,6 @@
     "compilerOptions": {
         "target": "es2015",
         "skipLibCheck": true
-    }
+    },
+    "include": ["lib/printer.d.ts", "test/*.ts"]
 }