@putout/printer 3.8.0 → 4.0.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2023.09.03, v4.0.0
+
+feature:
+- d935f8f @putout/printer: semantics: trailingComma
+- 9aa52e4 @putout/printer: format: quote: add
+
 2023.09.01, v3.8.0
 
 feature:

package/README.md

@@ -8,7 +8,7 @@ Prints [**Babel AST**](https://github.com/coderaiser/estree-to-babel) to readabl
 - ☝️ Similar to **Recast**, but [twice faster](#speed-comparison), also simpler and easier in maintenance, since it supports only **Babel**.
 - ☝️ As opinionated as **Prettier**, but has more user-friendly output and works directly with **AST**.
 - ☝️ Like **ESLint** but works directly with **Babel AST**.
-- ☝️ Easily extandable with help of [Overrides](h#overrides).
+- ☝️ Easily extendable with help of [Overrides](h#overrides).
 
 Supports:
 
@@ -81,6 +81,7 @@ print(ast, {
         splitter: '\n',
         roundBraceOpen: '(',
         roundBraceClose: ')',
+        quote: `'`,
     },
     semantics: {
         comments: true,
@@ -88,6 +89,7 @@ print(ast, {
         maxElementsInOneLine: 3,
         maxVariablesInOneLine: 4,
         maxPropertiesInOneLine: 2,
+        trailingComma: true,
     },
     visitors: {
         AssignmentPattern(path, {print}) {

package/lib/is-json.js

@@ -0,0 +1,32 @@
+'use strict';
+
+const {
+    isCallExpression,
+    isIdentifier,
+} = require('@babel/types');
+const {isJSON} = require('@putout/processor-json/is-json');
+
+module.exports.isASTJSON = (ast) => {
+    const {program} = ast;
+    
+    if (!program)
+        return false;
+    
+    const {body} = ast.program;
+    
+    if (!body.length)
+        return false;
+    
+    const {expression} = ast.program.body[0];
+    
+    if (!isCallExpression(expression))
+        return false;
+    
+    const {callee} = expression;
+    
+    if (!isIdentifier(callee))
+        return false;
+    
+    return isJSON(callee.name);
+};
+

package/lib/printer.js

@@ -2,8 +2,19 @@
 
 const {tokenize} = require('./tokenize/tokenize');
 const {printTokens} = require('./print-tokens');
+const {isASTJSON} = require('./is-json');
+const {assign} = Object;
 
-module.exports.print = (ast, overrides) => {
+module.exports.print = (ast, overrides = {}) => {
+    if (isASTJSON(ast))
+        assign(overrides, {
+            format: {
+                quote: `"`,
+            },
+        });
+    
     const tokens = tokenize(ast, overrides);
+    
     return printTokens(tokens);
 };
+

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

@@ -53,7 +53,10 @@ module.exports.ArrayExpression = {
         print.breakline();
     },
     print(path, {print, maybe, indent}, semantics) {
-        const {maxElementsInOneLine} = semantics;
+        const {
+            maxElementsInOneLine,
+            trailingComma,
+        } = semantics;
         const elements = path.get('elements');
         const shouldIncreaseIndent = !isIncreaseIndent(path);
         
@@ -78,7 +81,10 @@ module.exports.ArrayExpression = {
             const is = isNewLine && isCurrentNewLine(element);
             maybe.indent(is);
             print(element);
-            maybe.print(is, ',');
+            
+            if (index < n || trailingComma)
+                maybe.print(is, ',');
+            
             maybe.print.newline(is && !isNextObject(element));
             maybe.print.space(element.isSpreadElement() && isNextObject(element));
             

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

@@ -19,6 +19,7 @@ const isValue = (path) => path.get('properties.0.value').node;
 const isParentExpression = (path) => path.parentPath.isExpressionStatement();
 
 module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantics) => {
+    const {trailingComma} = semantics;
     indent.inc();
     
     const properties = path.get('properties');
@@ -31,7 +32,9 @@ module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantic
     parseComments(path, {write}, semantics);
     maybe.print.newline(manyLines);
     
-    for (const property of properties) {
+    const n = properties.length - 1;
+    
+    for (const [index, property] of properties.entries()) {
         if (property.isSpreadElement()) {
             const logical = isLogical(property);
             
@@ -39,7 +42,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantic
             print(property);
             
             if (length > 1 || manyLines) {
-                print(',');
+                maybe.print(index !== n || trailingComma, ',');
                 print.newline();
             }
             

package/lib/tokenize/expressions/object-expression/object-property.js

@@ -3,7 +3,8 @@
 const {isConcatenation} = require('../binary-expression/concatanate');
 const {isOneLine} = require('./object-expression');
 
-module.exports.ObjectProperty = (path, {maybe, traverse, write}) => {
+module.exports.ObjectProperty = (path, {maybe, traverse, write}, semantics) => {
+    const {trailingComma} = semantics;
     const {shorthand, computed} = path.node;
     
     const key = path.get('key');
@@ -24,7 +25,7 @@ module.exports.ObjectProperty = (path, {maybe, traverse, write}) => {
     }
     
     if (manyLines)
-        write(',');
+        maybe.write(!isLast || trailingComma, ',');
     else if (!isLast && properties.length)
         write(', ');
 };

package/lib/tokenize/literals/index.js

@@ -39,7 +39,23 @@ module.exports = {
     StringLiteral(path, {write}) {
         const {raw, value} = path.node;
         
-        write(raw || `'${value}'`);
+        if (raw && path.parentPath.isJSXAttribute()) {
+            write(raw);
+            return;
+        }
+        
+        if (raw) {
+            const value = raw.slice(1, -1);
+            write.quote();
+            write(value);
+            write.quote();
+            
+            return;
+        }
+        
+        write.quote();
+        write(value);
+        write.quote();
     },
     RegExpLiteral(path, {print}) {
         print(path.node.raw);

package/lib/tokenize/overrides.js

@@ -22,6 +22,7 @@ function initFormat(format) {
         splitter: '\n',
         roundBraceOpen: '(',
         roundBraceClose: ')',
+        quote: `'`,
         ...format,
     };
 }
@@ -33,6 +34,7 @@ function initSemantics(semantics = {}) {
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 5,
         maxVariablesInOneLine: 4,
+        trailingComma: true,
         ...semantics,
     };
 }

package/lib/tokenize/tokenize.js

@@ -131,6 +131,13 @@ module.exports.tokenize = (ast, overrides) => {
         indent();
     };
     
+    const quote = () => {
+        addToken({
+            type: TYPES.QUOTE,
+            value: format.quote,
+        });
+    };
+    
     const newline = () => {
         addToken({
             type: TYPES.NEWLINE,
@@ -145,6 +152,7 @@ module.exports.tokenize = (ast, overrides) => {
         breakline,
         space,
         splitter,
+        quote,
     });
     
     assign(maybeWrite, {
@@ -173,6 +181,7 @@ module.exports.tokenize = (ast, overrides) => {
         debug,
         traverse,
         maybe,
+        quote,
         store: fullstore(),
     };
     

package/lib/types.js

@@ -8,6 +8,7 @@ module.exports.TYPES = {
     INDENT: 'Indent',
     DEBUG: 'Debug',
     SPACE: 'Space',
-    ROUND_BRACE_OPEN: '(',
-    ROUND_BRACE_CLOSE: ')',
+    ROUND_BRACE_OPEN: 'RoundBraceOpen',
+    ROUND_BRACE_CLOSE: 'RoundBraceClose',
+    QUOTE: 'Quote',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "3.8.0",
+  "version": "4.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -32,6 +32,7 @@
     "@babel/types": "^7.21.3",
     "@putout/compare": "^12.0.4",
     "@putout/operate": "^10.0.2",
+    "@putout/processor-json": "^7.0.0",
     "fullstore": "^3.0.0",
     "just-snake-case": "^3.2.0",
     "parse-import-specifiers": "^1.0.1",