@putout/printer 6.2.0 → 6.4.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.11.15, v6.4.0
+
+feature:
+- a5a01f0 @putout/printer: use @putout/operator-json instead of processors
+
+2023.11.12, v6.3.0
+
+feature:
+- d4795dc @putout/printer: putout v33.1.1
+- 68439dd @putout/printer: StringLiteral: encode single quote (coderaiser/putout#192)
+
 2023.11.09, v6.2.0
 
 feature:

package/README.md

@@ -98,6 +98,7 @@ print(ast, {
         maxVariablesInOneLine: 4,
         maxPropertiesInOneLine: 2,
         trailingComma: true,
+        encodeSingleQuote: true,
     },
     visitors: {
         AssignmentPattern(path, {print}) {

package/lib/json.js

@@ -5,11 +5,10 @@ const {
     isIdentifier,
 } = require('@putout/babel').types;
 
-const {isJSON} = require('@putout/processor-json/is-json');
-const {isFilesystem} = require('@putout/processor-filesystem/is-filesystem');
+const {isJSON} = require('@putout/operator-json');
 
 module.exports.maybeJSON = (ast, overrides) => {
-    if (isASTJSON(ast)) {
+    if (isASTJSON(ast))
         return {
             ...overrides,
             format: {
@@ -19,9 +18,9 @@ module.exports.maybeJSON = (ast, overrides) => {
             semantics: {
                 ...overrides?.semantics,
                 trailingComma: false,
+                encodeSingleQuote: false,
             },
         };
-    }
     
     return overrides;
 };
@@ -47,11 +46,5 @@ function isASTJSON(ast) {
     if (!isIdentifier(callee))
         return false;
     
-    const {name} = callee;
-    
-    if (isJSON(name))
-        return true;
-    
-    if (isFilesystem(name))
-        return true;
+    return isJSON(callee.name);
 }

package/lib/tokenize/debug.js

@@ -56,9 +56,8 @@ module.exports.createLog = ({newline = '\n', store = createStore()} = {}) => ({t
         store(value);
     }
     
-    if (LOG_TERM) {
+    if (LOG_TERM)
         process.stdout.write(value);
-    }
 };
 
 function createStore() {

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

@@ -65,9 +65,8 @@ module.exports.ArrayExpression = {
         
         const indented = !isTwoLongStrings(elements) || !isInsideArray(path) && isIndented(elements[0]);
         
-        if (indented) {
+        if (indented)
             maybe.indent.inc(shouldIncreaseIndent);
-        }
         
         const isNewLine = isNewlineBetweenElements(path, {
             elements,

package/lib/tokenize/expressions/binary-expression/concatanate.js

@@ -47,7 +47,6 @@ module.exports.concatanate = (path, {print, indent}) => {
     print.breakline();
     print('__right');
     
-    if (!path.parentPath.isBinaryExpression()) {
+    if (!path.parentPath.isBinaryExpression())
         indent.dec();
-    }
 };

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

@@ -36,9 +36,8 @@ function CallExpression(path, {indent, print, maybe, traverse}) {
     for (const [i, arg] of args.entries()) {
         const isObject = arg.isObjectExpression();
         
-        if (isParentCall && !isObject && n) {
+        if (isParentCall && !isObject && n)
             print.breakline();
-        }
         
         print(arg);
         

package/lib/tokenize/expressions/class/class.js

@@ -53,9 +53,8 @@ const classVisitor = maybeDecorators((path, printer, semantics) => {
         traverse(item);
     }
     
-    if (!body.length) {
+    if (!body.length)
         parseComments(classBody, printer, semantics);
-    }
     
     indent.dec();
     maybe.indent(body.length);

package/lib/tokenize/expressions/member-expression/chain.js

@@ -64,12 +64,11 @@ function build(path) {
         type: path.type,
     };
     
-    if (path.isCallExpression()) {
+    if (path.isCallExpression())
         assign(prop, {
             args: path.node.arguments.length,
             name: path.node.callee.property?.name || '',
         });
-    }
     
     return prop;
 }

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

@@ -33,9 +33,8 @@ module.exports.MemberExpression = (path, {print, maybe, traverse}) => {
     
     maybe.indent.inc(isChain);
     
-    if (isChain) {
+    if (isChain)
         print.breakline();
-    }
     
     print('.');
     print('__property');

package/lib/tokenize/literals/index.js

@@ -1,9 +1,15 @@
 'use strict';
 
 const {TemplateLiteral} = require('./template-literal');
-
 const {Identifier} = require('./identifier');
 
+const maybeEncode = (value, {encodeSingleQuote}) => {
+    if (encodeSingleQuote && !value.includes('\\'))
+        return value.replaceAll(`'`, `\\'`);
+    
+    return value;
+};
+
 module.exports = {
     Identifier,
     TemplateLiteral,
@@ -36,7 +42,7 @@ module.exports = {
     BooleanLiteral(path, {write}) {
         write(path.node.value);
     },
-    StringLiteral(path, {write}) {
+    StringLiteral(path, {write}, semantics) {
         const {raw, value} = path.node;
         
         if (raw && path.parentPath.isJSXAttribute()) {
@@ -47,7 +53,7 @@ module.exports = {
         if (raw) {
             const value = raw.slice(1, -1);
             write.quote();
-            write(value);
+            write(maybeEncode(value, semantics));
             write.quote();
             
             return;

package/lib/tokenize/maybe/index.js

@@ -50,13 +50,11 @@ function objectPlugin(plugin, path, printer, options) {
         afterIf = condition,
     } = maybeSatisfy(plugin);
     
-    if (beforeIf?.(path, printer)) {
+    if (beforeIf?.(path, printer))
         before(path, printer);
-    }
     
     print(path, printer, options);
     
-    if (afterIf?.(path, printer)) {
+    if (afterIf?.(path, printer))
         after(path, printer);
-    }
 }

package/lib/tokenize/maybe/maybe-decorators.js

@@ -18,13 +18,12 @@ module.exports.maybeDecorators = (visitor) => (path, printer, semantics, options
     
     const {decorators} = path.node;
     
-    if (decorators) {
+    if (decorators)
         for (const decorator of path.get('decorators')) {
             maybe.write.breakline(isPrevClassProperty(path));
             traverse(decorator);
             write.breakline();
         }
-    }
     
     visitor(path, printer, semantics, options);
 };

package/lib/tokenize/overrides.js

@@ -36,6 +36,7 @@ function initSemantics(semantics = {}) {
         maxElementsInOneLine: 5,
         maxVariablesInOneLine: 4,
         trailingComma: true,
+        encodeSingleQuote: true,
         ...semantics,
     };
 }

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

@@ -65,9 +65,8 @@ module.exports.BlockStatement = {
         maybe.indent(body.length);
         write('}');
         
-        if (path.parentPath.isObjectMethod()) {
+        if (path.parentPath.isObjectMethod())
             write(',');
-        }
     },
     afterIf(path) {
         return shouldAddNewlineAfter(path);

package/lib/tokenize/statements/export-declaration/export-declaration.js

@@ -75,9 +75,8 @@ module.exports.ExportNamedDeclaration = {
                 maybe.write(isType, 'type ');
                 traverse(spec);
                 
-                if (i < lastIndex && !isNewline) {
+                if (i < lastIndex && !isNewline)
                     write(', ');
-                }
                 
                 maybe.write(isNewline, ',');
                 maybe.write.newline(isNewline);

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

@@ -61,13 +61,11 @@ module.exports.ExpressionStatement = {
         return isBeforeElse(path);
     },
     after(path, {print, maybe, store}) {
-        if (hasTrailingComment(path) && isLast(path) && isCoupleLines(path)) {
+        if (hasTrailingComment(path) && isLast(path) && isCoupleLines(path))
             print.breakline();
-        }
         
-        if (hasTrailingComment(path) && !isCoupleLines(path)) {
+        if (hasTrailingComment(path) && !isCoupleLines(path))
             return;
-        }
         
         print.newline();
         maybe.markAfter(store(), path);

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

@@ -38,9 +38,8 @@ module.exports.IfStatement = {
             print.space();
             print(consequent);
             
-            if (isInsideIf(path) || isInsideNestedBody(path)) {
+            if (isInsideIf(path) || isInsideNestedBody(path))
                 maybe.print.newline(isEmptyBody(consequent));
-            }
         } else {
             const is = !isEmptyConsequent(path);
             maybe.print.newline(is);

package/lib/tokenize/tokenize.js

@@ -268,9 +268,8 @@ const createPrint = (path, {traverse, write}) => (maybeLine) => {
 };
 
 const computePath = (path, maybeLine) => {
-    if (isString(maybeLine) && maybeLine.startsWith(GET)) {
+    if (isString(maybeLine) && maybeLine.startsWith(GET))
         return get(path, maybeLine);
-    }
     
     if (isObject(maybeLine))
         return maybeLine;

package/lib/tokenize/typescript/type/ts-type-parameter.js

@@ -17,11 +17,10 @@ module.exports.TSTypeParameter = (path, {write, traverse}) => {
     if (!exists(constraint))
         return;
     
-    if (constraint.isTSTypeOperator() || path.parentPath.isTSMappedType()) {
+    if (constraint.isTSTypeOperator() || path.parentPath.isTSMappedType())
         write(' in ');
-    } else {
+    else
         write(' extends ');
-    }
     
     traverse(constraint);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "6.2.0",
+  "version": "6.4.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -30,8 +30,7 @@
     "@putout/babel": "^1.1.1",
     "@putout/compare": "^13.0.0",
     "@putout/operate": "^11.0.0",
-    "@putout/processor-filesystem": "^1.1.0",
-    "@putout/processor-json": "^7.0.0",
+    "@putout/operator-json": "^1.2.0",
     "fullstore": "^3.0.0",
     "just-snake-case": "^3.2.0",
     "parse-import-specifiers": "^1.0.1",
@@ -66,7 +65,7 @@
     "mock-require": "^3.0.3",
     "montag": "^1.0.0",
     "nodemon": "^3.0.1",
-    "putout": "^32.0.4",
+    "putout": "^33.1.1",
     "supertape": "^8.0.0",
     "try-catch": "^3.0.0"
   },