@putout/printer 12.32.0 → 13.0.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2025.02.17, v13.0.0
+
+fix:
+- 64bec90 @putout/printer:  "\\n'" will be escaped to '\\n\'' instead of '\\n''
+
+feature:
+- 8fd3042 @putout/printer: add ability to set escapeSingleQuotes/escapeDoubleQuotes according to format (coderaiser/putout#230)
+
+2025.02.15, v12.32.1
+
+fix:
+- 1ae65ad @putout/printer: DEBUG -> LOG_DEBUG
+
 2025.02.14, v12.32.0
 
 feature:

package/README.md

@@ -102,8 +102,8 @@ print(ast, {
         maxPropertiesInOneLine: 2,
         maxPropertiesLengthInOneLine: 15,
         trailingComma: true,
-        encodeSingleQuote: true,
-        encodeDoubleQuote: false,
+        escapeSingleQuote: true,
+        escapeDoubleQuote: false,
         roundBraces: {
             arrow: true,
             sequence: true,

package/lib/tokenize/debug.js

@@ -11,11 +11,11 @@ const {
     LOG_ALL,
     LOG_TOKENS,
     LOG_TERM,
-    DEBUG,
+    LOG_DEBUG,
 } = process.env;
 
 module.exports.createDebug = (tokens) => (a) => {
-    if (!DEBUG)
+    if (!LOG_DEBUG)
         return;
     
     tokens.push({

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

@@ -200,4 +200,3 @@ function isSimpleAfterObject(path) {
     
     return prev.isObjectExpression();
 }
-

package/lib/tokenize/expressions/array-expression/is-object-after-simple.js

@@ -25,4 +25,3 @@ module.exports.isNextSimple = (a) => {
     
     return SIMPLE_TYPES.includes(type);
 };
-

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

@@ -1,15 +1,5 @@
 'use strict';
 
-const maybeEncode = (value, {encodeDoubleQuote, encodeSingleQuote}) => {
-    if (encodeSingleQuote && !value.includes('\\'))
-        return value.replaceAll(`'`, `\\'`);
-    
-    if (encodeDoubleQuote && !value.includes('\\"'))
-        return value.replaceAll(`"`, '\\"');
-    
-    return value;
-};
-
 module.exports.StringLiteral = (path, {write}, semantics) => {
     const {raw, value} = path.node;
     
@@ -21,7 +11,7 @@ module.exports.StringLiteral = (path, {write}, semantics) => {
     if (raw) {
         const value = raw.slice(1, -1);
         write.quote();
-        write(maybeEncode(value, semantics));
+        write(maybeEscape(value, semantics));
         write.quote();
         
         return;
@@ -31,3 +21,40 @@ module.exports.StringLiteral = (path, {write}, semantics) => {
     write(value);
     write.quote();
 };
+
+const maybeEscape = (value, {escapeDoubleQuote, escapeSingleQuote}) => {
+    const list = value.split('');
+    const slash = '\\';
+    
+    if (escapeSingleQuote)
+        return escape(list, {
+            slash,
+            quote: `'`,
+        });
+    
+    if (escapeDoubleQuote)
+        return escape(list, {
+            slash,
+            quote: `"`,
+        });
+    
+    return value;
+};
+
+const escape = (list, {slash, quote}) => {
+    const res = [];
+    
+    for (const [index, char] of list.entries()) {
+        const prev = list[index - 1];
+        
+        if (char === quote && prev !== slash) {
+            res.push(`${slash}${char}`);
+            continue;
+        }
+        
+        res.push(char);
+    }
+    
+    return res.join('');
+};
+

package/lib/tokenize/overrides/overrides.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {parseRoundBraces} = require('./parse-round-braces');
+const {parseQuotes} = require('./parse-quotes');
 
 module.exports.parseOverrides = (overrides = {}) => {
     const {
@@ -9,9 +10,11 @@ module.exports.parseOverrides = (overrides = {}) => {
         visitors,
     } = overrides;
     
+    const initiatedFormat = initFormat(format);
+    
     return {
-        format: initFormat(format),
-        semantics: initSemantics(semantics),
+        format: initiatedFormat,
+        semantics: initSemantics(initiatedFormat, semantics),
         visitors,
     };
 };
@@ -26,7 +29,7 @@ const initFormat = (format) => ({
     ...format,
 });
 
-const initSemantics = (semantics = {}) => ({
+const initSemantics = (format, semantics = {}) => ({
     comments: true,
     maxPropertiesInOneLine: 2,
     maxPropertiesLengthInOneLine: 15,
@@ -36,8 +39,7 @@ const initSemantics = (semantics = {}) => ({
     maxVariablesInOneLine: 4,
     maxTypesInOneLine: 3,
     trailingComma: true,
-    encodeSingleQuote: true,
-    encodeDoubleQuote: false,
+    ...parseQuotes(format),
     ...semantics,
     roundBraces: parseRoundBraces(semantics),
 });

package/lib/tokenize/overrides/parse-quotes.js

@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports.parseQuotes = ({quote}) => {
+    if (quote === '"')
+        return {
+            escapeSingleQuote: false,
+            escapeDoubleQuote: true,
+        };
+    
+    return {
+        escapeSingleQuote: true,
+        escapeDoubleQuote: false,
+    };
+};

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

@@ -124,7 +124,7 @@ function isNotLastBody(path) {
 }
 
 function isNotLastOrParentLast(path) {
-    return !(isLast(path) || isParentLast(path));
+    return !isLast(path) && !isParentLast(path);
 }
 
 function isNextUp(path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "12.32.0",
+  "version": "13.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -66,6 +66,7 @@
   },
   "devDependencies": {
     "@putout/eslint": "^3.5.0",
+    "@putout/eslint-flat": "^2.0.0",
     "@putout/plugin-minify": "^9.0.0",
     "@putout/plugin-printer": "^4.0.0",
     "@putout/plugin-promises": "^16.0.0",

package/tsconfig.json

@@ -0,0 +1,6 @@
+{
+    "compilerOptions": {
+        "target": "es2015",
+        "skipLibCheck": true
+    }
+}