@putout/printer 1.6.8 → 1.6.10

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.03.22, v1.6.10
+
+feature:
+- 2c82f51 @putout/printer: add support of WhileStatement, NullLiteral
+
+2023.03.21, v1.6.9
+
+feature:
+- 39386c6 @putout/printer: add support of RegExpLiteral, OptionalCallExpression
+
 2023.03.21, v1.6.8
 
 feature:

package/lib/tokenize/comments.js

@@ -10,7 +10,7 @@ module.exports.parseComments = (path, {write}) => {
 function parseLeadingComments(path, {write}) {
     const {leadingComments} = path.node;
     
-    for (const {value}of leadingComments) {
+    for (const {value} of leadingComments) {
         write(`//${value}`);
         write.newline();
     }

package/lib/tokenize/debug.js

@@ -2,7 +2,6 @@
 
 const {TYPES} = require('../types');
 const toSnakeCase = require('just-snake-case');
-
 const {DEBUG} = process.env;
 
 module.exports.createDebug = (tokens) => (a) => {
@@ -14,4 +13,3 @@ module.exports.createDebug = (tokens) => (a) => {
         value: `/*__${toSnakeCase(a)}*/`,
     });
 };
-

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

@@ -5,9 +5,19 @@ const {
     isMarkedPrevAfter,
 } = require('../mark');
 
+module.exports.OptionalCallExpression = (path, {indent, print, maybe}) => {
+    return CallExpression(path, {
+        indent,
+        print,
+        maybe,
+    });
+};
+
 const {entries} = Object;
 
-module.exports.CallExpression = (path, {indent, print, maybe}) => {
+module.exports.CallExpression = CallExpression;
+
+function CallExpression(path, {indent, print, maybe}) {
     const isParentCall = toLong(path) && path.parentPath.isCallExpression();
     
     if (shouldAddNewLine(path) && !isMarkedParentBefore(path) && !isMarkedPrevAfter(path.parentPath))
@@ -44,7 +54,7 @@ module.exports.CallExpression = (path, {indent, print, maybe}) => {
     }
     
     print(')');
-};
+}
 
 function shouldAddNewLine({parentPath}) {
     if (!parentPath.isExpressionStatement())
@@ -77,4 +87,3 @@ function toLong(path) {
     
     return false;
 }
-

package/lib/tokenize/expressions/index.js

@@ -3,9 +3,12 @@
 const functions = require('./functions');
 const unaryExpressions = require('./unary-expressions');
 const memberExpressions = require('./member-expressions');
-
 const {ClassDeclaration} = require('./class-declaration');
-const {CallExpression} = require('./call-expression');
+const {
+    CallExpression,
+    OptionalCallExpression,
+} = require('./call-expression');
+
 const {NewExpression} = require('./new-expression');
 const {ObjectExpression} = require('./object-expression');
 const {ObjectPattern} = require('./object-pattern');
@@ -26,6 +29,7 @@ module.exports = {
     AssignmentExpression,
     AssignmentPattern,
     CallExpression,
+    OptionalCallExpression,
     ClassDeclaration,
     NewExpression,
     ObjectExpression,
@@ -44,4 +48,3 @@ module.exports = {
         traverse(path.get('right'));
     },
 };
-

package/lib/tokenize/is.js

@@ -3,9 +3,10 @@
 module.exports.isFirst = (path) => path.node === path.parentPath.node.body[0];
 module.exports.isPrevBody = (path) => path.getPrevSibling().isBlockStatement();
 module.exports.isNext = (path) => path.getNextSibling().node;
+
 module.exports.isCoupleLines = (path) => {
-    const start = path.node?.loc?.start.line;
-    const end = path.node?.loc?.end.line;
+    const start = path.node?.loc?.start?.line;
+    const end = path.node?.loc?.end?.line;
     
     return end > start;
 };

package/lib/tokenize/literals/index.js

@@ -26,5 +26,10 @@ module.exports = {
     Identifier(path, {write}) {
         write(path.node.name);
     },
+    RegExpLiteral(path, {print}) {
+        print(path.node.raw);
+    },
+    NullLiteral(path, {print}) {
+        print('null');
+    },
 };
-

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

@@ -19,7 +19,6 @@ module.exports.BlockStatement = (path, {indent, maybe, print}) => {
     }
     
     indent.dec();
-    
     maybe.indent(body.length);
     print('}');
     
@@ -53,4 +52,3 @@ function isTry({parentPath}) {
     
     return false;
 }
-

package/lib/tokenize/statements/index.js

@@ -11,6 +11,7 @@ const {DebuggerStatement} = require('./debugger-statement');
 const {ForStatement} = require('./for-statement');
 const importDeclarations = require('./import-declarations');
 const exportDeclarations = require('./export-declarations');
+const {WhileStatement} = require('./while-statement');
 
 module.exports = {
     ...importDeclarations,
@@ -37,5 +38,5 @@ module.exports = {
         print('continue;');
         print.newline();
     },
+    WhileStatement,
 };
-

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

@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports.WhileStatement = (path, {print, indent}) => {
+    print('while (');
+    print('__test');
+    print(')');
+    
+    if (path.node.body.body) {
+        print(' ');
+        print('__body');
+    } else {
+        indent.inc();
+        print.newline();
+        print('__body');
+        indent.dec();
+    }
+    
+    print.linebreak();
+};

package/lib/tokenize/tokenize.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const isObject = (a) => a && typeof a === 'object';
-
 const babelTraverse = require('@babel/traverse').default;
 const expressions = require('./expressions');
 const statements = require('./statements');
@@ -12,12 +11,10 @@ const {
     maybeMarkAfter,
     maybeMarkBefore,
 } = require('./mark');
-const {parseComments} = require('./comments');
 
+const {parseComments} = require('./comments');
 const isString = (a) => typeof a === 'string';
-
 const {assign} = Object;
-
 const traversers = {
     ...expressions,
     ...statements,
@@ -147,6 +144,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
             newline: maybeNewline,
             breakline: maybeBreakline,
         });
+        
         assign(printer.maybe, {
             print: maybePrint,
         });
@@ -172,13 +170,15 @@ function printIndent(i, indent) {
     
     return result;
 }
-
 const createPrint = (path, {traverse, write}) => (maybeLine) => {
     if (maybeLine === path)
         return null;
     
     if (isString(maybeLine) && maybeLine.startsWith(GET))
-        return traverse(get(path, maybeLine));
+        return traverse(get(
+            path,
+            maybeLine,
+        ));
     
     if (isObject(maybeLine))
         return traverse(maybeLine);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.6.8",
+  "version": "1.6.10",
   "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",