@putout/printer 1.19.0 → 1.21.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.04.04, v1.21.0
+
+feature:
+- d5716be @putout/printer: ForOfStatement: convert
+- 5bd0fe5 @putout/printer: improve newlines formatting
+
+2023.04.03, v1.20.0
+
+feature:
+- 069b266 @putout/printer: add support of TSPropertySignature
+
 2023.04.03, v1.19.0
 
 feature:

package/lib/tokenize/debug.js

@@ -52,8 +52,10 @@ module.exports.createLog = ({newline = '\n', store = createStore()} = {}) => ({t
 function createStore() {
     let chunks = [];
     
-    return (chunk) => {
-        if (chunk) {
+    return (...args) => {
+        const [chunk] = args;
+        
+        if (args.length) {
             chunks.push(chunk);
             return;
         }

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

@@ -1,17 +1,6 @@
 'use strict';
 
-const {
-    isMarkedParentBefore,
-    hasPrevNewline,
-} = require('../mark');
-
 const CallExpression = {
-    beforeIf(path) {
-        return isNewLineBefore(path) && !isMarkedParentBefore(path) && !hasPrevNewline(path.parentPath);
-    },
-    before(path, {print}) {
-        print.breakline();
-    },
     print(path, {indent, print, maybe}) {
         const isParentCall = toLong(path) && path.parentPath.isCallExpression();
         print('__callee');
@@ -57,27 +46,6 @@ const CallExpression = {
 module.exports.OptionalCallExpression = CallExpression;
 module.exports.CallExpression = CallExpression;
 
-function isNewLineBefore({parentPath}) {
-    if (!parentPath.isExpressionStatement())
-        return false;
-    
-    const prevPath = parentPath.getPrevSibling();
-    const prevPrevPath = prevPath.getPrevSibling();
-    
-    if (prevPath.isStatement() && !prevPath.isExpressionStatement() && !prevPath.isVariableDeclaration())
-        return true;
-    
-    const twoPrev = prevPath.node && prevPrevPath.node;
-    
-    if (!twoPrev)
-        return false;
-    
-    if (prevPath.isExpressionStatement() && prevPath.get('expression').isCallExpression())
-        return false;
-    
-    return true;
-}
-
 function toLong(path) {
     const args = path.get('arguments');
     

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

@@ -52,10 +52,17 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     indent.dec();
     maybe.indent(manyLines);
     print('}');
-    maybe.print.newline(path.parentPath.isLogicalExpression());
+    maybe.print.newline(shouldAddNewline(path));
     maybe.print(parens, ')');
 };
 
+function shouldAddNewline(path) {
+    if (!path.parentPath.isLogicalExpression())
+        return false;
+    
+    return path.parentPath.parentPath.isSpreadElement();
+}
+
 module.exports.ObjectProperty = (path, {print, maybe}) => {
     const {
         shorthand,

package/lib/tokenize/is.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const {isMarkedAfter} = require('./mark');
 const isParentProgram = (path) => path.parentPath?.isProgram();
 const isParentBlock = (path) => path.parentPath.isBlockStatement();
 
@@ -9,6 +10,9 @@ const isNext = (path) => {
     if (!next.node)
         return false;
     
+    if (isMarkedAfter(path.get('body')))
+        return false;
+    
     return !next.isEmptyStatement();
 };
 

package/lib/tokenize/mark.js

@@ -14,20 +14,11 @@ function markBefore(path) {
 function markAfter(path) {
     path[WATER_MARK_AFTER] = true;
 }
-module.exports.isMarkedBefore = isMarkedBefore;
 module.exports.isMarkedAfter = isMarkedAfter;
 
-function isMarkedBefore(path) {
-    return path[WATER_MARK_BEFORE];
-}
-
 function isMarkedAfter(path) {
     return path[WATER_MARK_AFTER];
 }
 module.exports.hasPrevNewline = (path) => {
     return isMarkedAfter(path.getPrevSibling());
 };
-
-module.exports.isMarkedParentBefore = (path) => {
-    return isMarkedBefore(path.parentPath);
-};

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

@@ -1,7 +1,6 @@
 'use strict';
 
 const {
-    isNext,
     isParentBlock,
     isNextParent,
 } = require('../is');
@@ -15,9 +14,12 @@ module.exports.BreakStatement = {
         print('break;');
     },
     afterIf(path) {
-        if (!isNext(path) && !isParentBlock(path) && !isNextParent(path))
-            return false;
+        if (isParentBlock(path))
+            return true;
         
-        return true;
+        if (isNextParent(path))
+            return true;
+        
+        return false;
     },
 };

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

@@ -72,7 +72,7 @@ function shouldAddNewLineAfter(path) {
     if (isNext(path))
         return true;
     
-    return false;
+    return path.findParent(isNext);
 }
 
 function isStrictMode(path) {
@@ -85,3 +85,4 @@ function isStrictMode(path) {
     
     return value === 'use strict';
 }
+

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

@@ -11,40 +11,45 @@ const {
     isNext,
 } = require('../is');
 
-module.exports.ForOfStatement = (path, {indent, print, maybe}) => {
-    if (!isFirst(path) && !hasPrevNewline(path)) {
+module.exports.ForOfStatement = {
+    beforeIf(path) {
+        return !isFirst(path) && !hasPrevNewline(path);
+    },
+    before(path, {print}) {
         print.indent();
         print.newline();
         markBefore(path);
-    }
-    
-    indent();
-    print('for (');
-    print('__left');
-    print(' of ');
-    print('__right');
-    print(')');
-    
-    const bodyPath = path.get('body');
-    
-    if (bodyPath.isExpressionStatement()) {
-        indent.inc();
-        print.newline();
-        print('__body');
-        indent.dec();
-        maybe.print.newline(isNext(path));
+    },
+    print(path, {indent, print, maybe}) {
+        indent();
+        print('for (');
+        print('__left');
+        print(' of ');
+        print('__right');
+        print(')');
+        
+        const bodyPath = path.get('body');
         
-        return;
-    }
-    
-    if (bodyPath.isBlockStatement()) {
-        print(' ');
-        print('__body');
-    }
-    
-    if (isNext(path)) {
+        if (bodyPath.isExpressionStatement()) {
+            indent.inc();
+            print.newline();
+            print('__body');
+            indent.dec();
+            maybe.print.newline(isNext(path));
+            
+            return;
+        }
+        
+        if (bodyPath.isBlockStatement()) {
+            print(' ');
+            print('__body');
+        }
+    },
+    afterIf: isNext,
+    after(path, {print}) {
         print.indent();
         print.newline();
         markAfter(path);
-    }
+    },
 };
+

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

@@ -37,12 +37,11 @@ module.exports.IfStatement = {
             write(' else ');
             traverse(alternate);
         } else if (alternate.isIfStatement()) {
-            print.space();
+            write.space();
             write('else');
-            print.space();
+            write.space();
             traverse(alternate);
         } else if (alternate.node) {
-            print.breakline();
             write('else');
             print.newline();
             indent.inc();
@@ -50,10 +49,8 @@ module.exports.IfStatement = {
             indent.dec();
         }
         
-        const next = path.getNextSibling();
-        
-        if (next.isExpressionStatement() && !next.get('expression').isCallExpression())
-            print.newline();
+        //if (shouldAddNewline(path))
+        //print.newline();
     },
     afterIf: (path) => {
         const next = path.getNextSibling();

package/lib/tokenize/statements/try-statements.js

@@ -14,9 +14,10 @@ module.exports.TryStatement = (path, {print, maybe}) => {
         print('finally');
         print(' ');
         print(finalizer);
-        print.newline();
     }
     
+    print.newline();
+    
     maybe.print.breakline(isNext(path));
 };
 

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

@@ -25,7 +25,7 @@ module.exports.VariableDeclaration = {
         const initPath = path.get('declarations.0.init');
         
         maybe.print(initPath.node, ' = ');
-        print(initPath);
+        print('__declarations.0.init');
         maybe.print(isParentBlock(path), ';');
         
         let wasNewline = false;
@@ -60,10 +60,14 @@ function shouldAddNewlineAfter(path) {
         return true;
     
     const next = path.getNextSibling();
+    const prev = path.getPrevSibling();
     
     if (isCoupleLines(next))
         return true;
     
+    if (prev.isVariableDeclaration() && !next.isVariableDeclaration())
+        return true;
+    
     return false;
 }
 const isLast = (path) => path.parentPath.isProgram() && !isNext(path);

package/lib/tokenize/tokenize.js

@@ -234,11 +234,13 @@ 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;
     
     return maybeLine;
 };
+

package/lib/tokenize/typescript/index.js

@@ -35,7 +35,7 @@ module.exports = {
         print('__typeAnnotation');
     },
     TSTypeAnnotation(path, {print}) {
-        if (!path.parentPath.isTSFunctionType()) {
+        if (path.parentPath.isIdentifier()) {
             print(':');
             print.space();
         }
@@ -55,4 +55,27 @@ module.exports = {
         print('__typeAnnotation');
         print(';');
     },
+    TSTypeLiteral(path, {indent, traverse, write}) {
+        write('{');
+        write.newline();
+        indent.inc();
+        for (const member of path.get('members')) {
+            indent();
+            traverse(member);
+            write(';');
+        }
+        
+        write.newline();
+        indent.dec();
+        write('}');
+    },
+    TSPropertySignature(path, {print, maybe}) {
+        const {optional} = path.node;
+        print('__key');
+        maybe.print(optional, '?');
+        print(':');
+        print.space();
+        print('__typeAnnotation');
+    },
 };
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.19.0",
+  "version": "1.21.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",
@@ -56,7 +56,7 @@
     "montag": "^1.0.0",
     "nodemon": "^2.0.1",
     "putout": "*",
-    "putout-plugin-apply-computed-print": "./rules/putout-plugin-apply-computed-print",
+    "putout-plugin-printer": "./rules",
     "supertape": "^8.0.0",
     "try-catch": "^3.0.0"
   },

package/rules/putout-plugin-apply-computed-print/index.js

@@ -1,21 +0,0 @@
-'use strict';
-
-const {assign} = Object;
-
-module.exports.report = () => `Use print('__path') instead of path.get(__path)`;
-
-module.exports.replace = () => ({
-    'print(path.get(__a))': ({__a}) => {
-        const {
-            raw,
-            value,
-        } = __a;
-        
-        assign(__a, {
-            value: `__${value}`,
-            raw: raw.replace(value, `__${value}`),
-        });
-        
-        return 'print(__a)';
-    },
-});