@putout/printer 12.32.1 → 13.0.1

package/ChangeLog

@@ -1,3 +1,18 @@
+2025.02.22, v13.0.1
+
+feature:
+- ee27918 @putout/printer: @putout/eslint v4.1.0
+- 7384b14 @putout/printer: eslint-plugin-putout v25.0.1
+- fc42fa2 @putout/printer: ObjectExpression inside ArrayExpression
+
+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:

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/expressions/array-expression/array-expression.js

@@ -34,6 +34,7 @@ const {
     isIdentifier,
     isFunction,
     isCallExpression,
+    isObjectProperty,
 } = types;
 
 const isNextString = (path) => isStringLiteral(path.getNextSibling());
@@ -133,7 +134,9 @@ module.exports.ArrayExpression = {
             if (index < n || trailingComma)
                 maybe.print(is, ',');
             
-            maybe.print.newline((is || isSpreadBeforeObject(element)) && !isNextObject(element));
+            if (!(isObjectExpression(element) && isObjectProperty(path.parentPath)))
+                maybe.print.newline((is || isSpreadBeforeObject(element)) && !isNextObject(element));
+            
             maybe.print.space(is && isObjectAfterSimple(element));
             
             if (!is && index < n) {

package/lib/tokenize/is.js

@@ -37,6 +37,7 @@ const isLast = (path) => isParentProgram(path) && !isNext(path);
 module.exports.isNextObject = (a) => a
     .getNextSibling()
     .isObjectExpression();
+
 module.exports.isPrevObject = (a) => a
     .getPrevSibling()
     .isObjectExpression();

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,39 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "12.32.1",
+  "version": "13.0.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -65,7 +65,7 @@
     }
   },
   "devDependencies": {
-    "@putout/eslint": "^3.5.0",
+    "@putout/eslint": "^4.1.0",
     "@putout/eslint-flat": "^2.0.0",
     "@putout/plugin-minify": "^9.0.0",
     "@putout/plugin-printer": "^4.0.0",
@@ -77,7 +77,7 @@
     "check-dts": "^0.8.0",
     "escover": "^4.0.1",
     "eslint": "^9.0.0",
-    "eslint-plugin-putout": "^24.0.0",
+    "eslint-plugin-putout": "^25.0.1",
     "estree-to-babel": "^10.0.0",
     "goldstein": "^5.14.0",
     "just-kebab-case": "^4.2.0",