@putout/printer 9.1.0 → 9.3.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.06.10, v9.3.0
+
+feature:
+- 960565f @putout/printer: roundBraces: add ability to split to: arrow, sequence and assign
+
+2024.06.09, v9.2.0
+
+feature:
+- 6fae5d0 @putout/printer: SequenceExpressions: braces: add support of ConditinalExpressions (@putoutjs/minify#15)
+
 2024.06.09, v9.1.0
 
 feature:

package/README.md

@@ -102,7 +102,11 @@ print(ast, {
         trailingComma: true,
         encodeSingleQuote: true,
         encodeDoubleQuote: false,
-        roundBraces: true,
+        roundBraces: {
+            arrow: true,
+            sequence: true,
+            assign: false,
+        },
     },
     visitors: {
         AssignmentPattern(path, {print}) {
@@ -175,9 +179,9 @@ Options used to configure logic of output, similar to ESLint rules:
 - ✅ `maxPropertiesInOneLine` - count of `ObjectProperties` in one line.
 - ✅ `maxPropertiesLengthInOneLine` - maximum length of `Object Property`, when violated splits event if `maxPropertiesInOneLine` satisfies;
 - ✅ `roundBraces` to output braces or not
-  - In a  single argument arrow function expressions `(a) => {}` or not `a => {}`;
-  - In sequence expressions: `for(let e of l) (a(), b())` or not `for(let e of l) a(), b()`;
-  - In assignment expressions: `(e.o=w(e.o)` or not `e.o=w(e.o)`;
+  - `arrow`: In a  single argument arrow function expressions enabled: `(a) => {}`, disabled: `a => {}`;
+  - `sequence`: In sequence expressions: enabled: `for(let e of l) (a(), b())`, disabled: `for(let e of l) a(), b()`;
+  - `assign`: In assignment expressions: enabled: `(e.o=w(e.o)`, disabled: `e.o=w(e.o)`;
 
 ## Visitors API
 

package/lib/tokenize/expressions/assignment-expression/maybe-write-brace.js

@@ -30,7 +30,7 @@ function maybeWriteBrace(path, printer, semantics, {brace}) {
         return;
     }
     
-    if (!roundBraces)
+    if (!roundBraces.assign)
         return;
     
     if (!isParens(path))

package/lib/tokenize/expressions/function/params.js

@@ -52,14 +52,14 @@ module.exports.printParams = (path, printer, semantics, customization = {}) => {
 };
 
 function printBraceOpen(path, {print, braceOpen}, semantics) {
-    if (isOneArgArrow(path) && !semantics.roundBraces)
+    if (isOneArgArrow(path) && !semantics.roundBraces.arrow)
         return;
     
     return print(braceOpen);
 }
 
 function printBraceClose(path, {print, braceClose}, semantics) {
-    if (isOneArgArrow(path) && !semantics.roundBraces)
+    if (isOneArgArrow(path) && !semantics.roundBraces.arrow)
         return;
     
     print(braceClose);

package/lib/tokenize/expressions/sequence-expression/maybe-write-brace.js

@@ -23,12 +23,17 @@ function maybeWriteBrace(path, printer, semantics, {brace}) {
         return;
     }
     
+    if (type === 'ConditionalExpression' && path !== parentPath.get('test')) {
+        write(brace);
+        return;
+    }
+    
     if (type === 'LogicalExpression') {
         write(brace);
         return;
     }
     
-    if (!roundBraces)
+    if (!roundBraces.sequence)
         return;
     
     write(brace);

package/lib/tokenize/{overrides.js → overrides/overrides.js}

@@ -1,5 +1,7 @@
 'use strict';
 
+const {parseRoundBraces} = require('./parse-round-braces');
+
 module.exports.parseOverrides = (overrides = {}) => {
     const {
         format,
@@ -37,7 +39,7 @@ function initSemantics(semantics = {}) {
         trailingComma: true,
         encodeSingleQuote: true,
         encodeDoubleQuote: false,
-        roundBraces: true,
         ...semantics,
+        roundBraces: parseRoundBraces(semantics),
     };
 }

package/lib/tokenize/overrides/parse-round-braces.js

@@ -0,0 +1,42 @@
+'use strict';
+
+const isObject = (a) => a && typeof a === 'object';
+const isBool = (a) => typeof a === 'boolean';
+
+const ROUND_BRACES_DEFAULTS = {
+    arrow: true,
+    sequence: true,
+    assign: false,
+};
+
+const ROUND_BRACES_ENABLED = {
+    arrow: true,
+    sequence: true,
+    assign: true,
+};
+
+const ROUND_BRACES_DISABLED = {
+    arrow: false,
+    sequence: false,
+    assign: false,
+};
+
+module.exports.parseRoundBraces = ({roundBraces}) => {
+    if (isObject(roundBraces))
+        return {
+            ...ROUND_BRACES_DEFAULTS,
+            ...roundBraces,
+        };
+    
+    if (isBool(roundBraces) && roundBraces)
+        return ROUND_BRACES_ENABLED;
+    
+    if (isBool(roundBraces) && !roundBraces)
+        return ROUND_BRACES_DISABLED;
+    
+    return ROUND_BRACES_DEFAULTS;
+};
+
+module.exports.ROUND_BRACES_DISABLED = ROUND_BRACES_DISABLED;
+module.exports.ROUND_BRACES_ENABLED = ROUND_BRACES_ENABLED;
+module.exports.ROUND_BRACES_DEFAULTS = ROUND_BRACES_DEFAULTS;

package/lib/tokenize/statements/return-statement/maybe-space-after-keyword.js

@@ -9,7 +9,7 @@ module.exports.maybeSpaceAfterKeyword = (path, {print}, semantics) => {
     
     const {type} = argument;
     
-    if (type === 'SequenceExpression' && roundBraces)
+    if (type === 'SequenceExpression' && roundBraces.sequence)
         return print.space();
     
     if (type === 'StringLiteral' || type === 'TemplateLiteral')
@@ -21,7 +21,7 @@ module.exports.maybeSpaceAfterKeyword = (path, {print}, semantics) => {
     if (type === 'UnaryExpression' && argument.operator === '!')
         return print.space();
     
-    if (type === 'ArrowFunctionExpression' && roundBraces)
+    if (type === 'ArrowFunctionExpression' && roundBraces.arrow)
         return print.space();
     
     print(' ');

package/lib/tokenize/tokenize.js

@@ -21,7 +21,7 @@ const {
     parseTrailingComments,
 } = require('./comment/comment');
 
-const {parseOverrides} = require('./overrides');
+const {parseOverrides} = require('./overrides/overrides');
 
 const isString = (a) => typeof a === 'string';
 const {assign, freeze} = Object;

package/package.json

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