@putout/printer 1.69.0 → 1.70.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.04.25, v1.70.0
+
+feature:
+- 054212f @putout/printer: improve handling of SpreadElement newline in ObjectExpression
+- b61a9e9 package: @putout/plugin-printer v1.0.0
+
+2023.04.24, v1.69.1
+
+fix:
+- be3dc7d @putout/printer: newline after ObjectProperty
+
 2023.04.23, v1.69.0
 
 feature:

package/README.md

@@ -5,7 +5,7 @@
 
 Prints [**Babel AST**](https://github.com/coderaiser/estree-to-babel) to readable **JavaScript**.
 
-- ☝️ Similar to **Recast**, but simpler and easier in maintenance, since it supports only **Babel**.
+- ☝️ 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).
@@ -22,6 +22,27 @@ Supports:
 npm i @putout/printer
 ```
 
+## 🐊 Support of Printer
+
+**Printer** has first class support from 🐊**Putout** with help of [`@putout/plugin-printer`](https://github.com/coderaiser/putout/tree/master/packages/plugin-printer#putoutplugin-printer-). So install:
+
+```sh
+npm i @putout/plugin-printer -aD
+```
+
+And update `.putout.json`:
+
+```json
+{
+    "printer": "putout",
+    "plugins": [
+        "printer"
+    ]
+}
+```
+
+To benefit from it.
+
 ## API
 
 ```js
@@ -158,6 +179,41 @@ print(ast, {
 
 This is the same as `print('__left')` but more low-level, and supports only objects.
 
+## Speed Comparison
+
+About speed, for file `speed.js`:
+
+```js
+const putout = require('putout');
+const {readFileSync} = require('fs');
+const parser = require('@babel/parser');
+
+const code = readFileSync('./lib/tokenize/tokenize.js', 'utf8');
+const ast = parser.parse(code);
+
+speed('recast');
+speed('putout');
+
+function speed(printer) {
+    console.time(printer);
+    
+    for (let i = 0; i < 1000; i++) {
+        putout(code, {
+            printer,
+            plugins: [
+                'remove-unused-variables',
+            ],
+        });
+    }
+    
+    console.timeEnd(printer);
+}
+```
+
+With contents of [`tokenize.js`](https://github.com/putoutjs/printer/blob/v1.69.1/lib/tokenize/tokenize.js), we have:
+
+![image](https://user-images.githubusercontent.com/1573141/234004942-8f890da3-a145-425f-9040-25924dcfba7b.png)
+
 ## License
 
 MIT

package/lib/tokenize/expressions/functions/function-expression.js

@@ -34,4 +34,3 @@ module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
     print(') ');
     print('__body');
 };
-

package/lib/tokenize/expressions/functions/functions.js

@@ -11,4 +11,3 @@ module.exports.FunctionExpression = FunctionExpression;
 module.exports.ArrowFunctionExpression = ArrowFunctionExpression;
 module.exports.ClassMethod = ClassMethod;
 module.exports.ObjectMethod = ObjectMethod;
-

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

@@ -28,10 +28,12 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     
     for (const property of properties) {
         if (property.isSpreadElement()) {
-            maybe.indent(length > 1 || isLogical(property));
+            const logical = isLogical(property);
+            
+            maybe.indent(length > 1 || logical || manyLines);
             print(property);
             
-            if (length > 1) {
+            if (!logical && (length > 1 || manyLines)) {
                 print(',');
                 print.newline();
             }

package/lib/tokenize/is.js

@@ -86,4 +86,4 @@ module.exports.satisfy = (conditions) => (path) => {
     return false;
 };
 
-module.exports.noTrailingComment = (path) => !path.node.trailingComments;
+module.exports.noTrailingComment = (path) => !path.node.trailingComments?.length;

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

@@ -6,9 +6,14 @@ const {
     isLast,
     exists,
 } = require('../is');
-const {isObjectMethod} = require('@babel/types');
+
+const {
+    isArrowFunctionExpression,
+    isObjectMethod,
+} = require('@babel/types');
 
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();
+const isMethodOrArrow = (path) => isArrowFunctionExpression(path) || isObjectMethod(path);
 
 module.exports.BlockStatement = {
     print(path, {indent, maybe, print}) {
@@ -49,7 +54,7 @@ function shouldAddNewlineAfter(path) {
     if (!isNext(path) && !isNext(path.parentPath) && isParentProgram(path.parentPath))
         return false;
     
-    if (path.find(isObjectMethod))
+    if (path.parentPath.isIfStatement() && path.find(isMethodOrArrow))
         return true;
     
     if (parentPath.isStatement() && !path.node.body.length && !isNext(parentPath))

package/lib/tokenize/statements/for-of-statement.js

@@ -17,8 +17,7 @@ module.exports.ForOfStatement = {
         return !isFirst(path) && !hasPrevNewline(path);
     },
     before(path, {print}) {
-        print.indent();
-        print.newline();
+        print.linebreak();
         markBefore(path);
     },
     print(path, {indent, print, maybe, traverse}) {
@@ -47,8 +46,7 @@ module.exports.ForOfStatement = {
     },
     afterIf: isNext,
     after(path, {print}) {
-        print.indent();
-        print.newline();
+        print.linebreak();
         markAfter(path);
     },
 };

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

@@ -13,8 +13,7 @@ module.exports.ReturnStatement = {
         return !hasPrevNewline(path) && isBodyLength(path) || isPrevBody(path);
     },
     before(path, {print}) {
-        print.indent();
-        print.newline();
+        print.linebreak();
     },
     print(path, {indent, traverse, print}) {
         indent();

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@putout/printer",
-  "version": "1.69.0",
+  "version": "1.70.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
-  "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",
+  "description": "Simplest possible opinionated Babel AST printer fro 🐊Putout",
   "homepage": "https://github.com/putoutjs/printer#readme",
   "main": "./lib/printer.js",
   "exports": {
@@ -45,6 +45,7 @@
     "generate"
   ],
   "devDependencies": {
+    "@putout/plugin-printer": "^1.0.0",
     "@putout/plugin-react-hooks": "^5.0.0",
     "@putout/test": "^6.0.1",
     "acorn": "^8.8.2",
@@ -58,8 +59,7 @@
     "mock-require": "^3.0.3",
     "montag": "^1.0.0",
     "nodemon": "^2.0.1",
-    "putout": "*",
-    "putout-plugin-printer": "./rules",
+    "putout": "29",
     "supertape": "^8.0.0",
     "try-catch": "^3.0.0"
   },