@putout/printer 1.150.0 → 2.0.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.12, v2.0.0
+
+feature:
+- b12c1a3 @putout/printer: move comments to semantics
+
+2023.06.12, v1.150.1
+
+feature:
+- 51ee3e9 @putout/printer: ArrayExpression: newline
+
 2023.06.09, v1.150.0
 
 feature:

package/README.md

@@ -80,12 +80,12 @@ write(ast, {
         indent: '    ',
         newline: '\n',
         space: ' ',
-        comments: true,
         splitter: '\n',
         roundBraceOpen: '(',
         roundBraceClose: ')',
     },
     semantics: {
+        comments: true,
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 3,
     },

package/lib/tokenize/comments.js

@@ -6,8 +6,9 @@ const {
 } = require('./is');
 
 const {markBefore} = require('./mark');
+const {isVariableDeclarator} = require('@babel/types');
 
-module.exports.parseLeadingComments = (path, {print, maybe, indent}, format) => {
+module.exports.parseLeadingComments = (path, {print, maybe, indent}, format = {}) => {
     if (!format.comments)
         return;
     
@@ -20,7 +21,7 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, format) =>
         return;
     
     const insideFn = path.parentPath.isFunction();
-    const isProperty = path.isObjectProperty();
+    const isProperty = path.isObjectProperty() || isVariableDeclarator(path);
     const isIndent = !path.isClassMethod() && !insideFn && !isProperty;
     
     for (const {type, value} of leadingComments) {

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

@@ -22,6 +22,7 @@ const {
     isIdentifierAndString,
     isStringAndMember,
 } = require('../../is');
+
 const MAX_ARRAY_ELEMENTS_WHEN_USED_AS_ARGUMENT = 4;
 
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
@@ -39,8 +40,13 @@ const isStringAndArray = ([a, b]) => {
 };
 
 const isStringAndString = ([a, b]) => isStringLiteral(a) && isStringLiteral(b);
+
 const isShortTwoSimplesInsideCall = (path, short) => {
-    const {node, parentPath} = path;
+    const {
+        node,
+        parentPath,
+    } = path;
+    
     const {elements} = node;
     const {length} = elements;
     const [a, b] = elements;
@@ -48,11 +54,12 @@ const isShortTwoSimplesInsideCall = (path, short) => {
     if (!parentPath.isCallExpression())
         return false;
     
-    if (!isSimple(a) || !isSimple(b))
+    if (!isStringLiteral(a) || !isStringLiteral(b))
         return false;
     
     return length < short;
 };
+
 const isIdentifierAndIdentifier = ([a, b]) => isIdentifier(a) && isIdentifier(b);
 const isInsideArray = (path) => path.parentPath.isArrayExpression();
 
@@ -66,6 +73,7 @@ const isSimpleAndCall = ([a, b]) => {
 const isBooleanAndSimple = ([a, b]) => isBooleanLiteral(a) && isSimple(b);
 const isNullAndSimple = ([a, b]) => isNullLiteral(a) && isSimple(b);
 const isSimpleAndObject = ([a, b]) => isSimple(a) && isObjectExpression(b);
+
 const isStringAndObject = (elements) => {
     const first = elements.at(0);
     const last = elements.at(-1);
@@ -350,4 +358,3 @@ const isOneElementCall = (path, {elements}) => {
     
     return !isCallExpression(elements[0]);
 };
-

package/lib/tokenize/overrides.js

@@ -19,7 +19,6 @@ function initFormat(format) {
         indent: '    ',
         newline: '\n',
         space: ' ',
-        comments: true,
         splitter: '\n',
         roundBraceOpen: '(',
         roundBraceClose: ')',
@@ -29,6 +28,7 @@ function initFormat(format) {
 
 function initSemantics(semantics = {}) {
     return {
+        comments: true,
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 5,
         ...semantics,

package/lib/tokenize/statements/variable-declaration/maybe-space-after-keyword.js

@@ -1,7 +1,11 @@
 'use strict';
 
 module.exports.maybeSpaceAfterKeyword = (path, {write}) => {
-    const {id} = path.node.declarations[0];
+    const {declarations} = path.node;
+    const {id} = declarations[0];
+    
+    if (declarations.length > 1)
+        return;
     
     if (id.type === 'ArrayPattern' || id.type === 'ObjectPattern')
         return write.space();

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

@@ -13,6 +13,7 @@ const {isExportDeclaration} = require('@babel/types');
 const {maybeSpaceAfterKeyword} = require('./maybe-space-after-keyword');
 
 const {isConcatenation} = require('../../expressions/binary-expression/concatanate');
+const {parseLeadingComments} = require('../../comments');
 
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
 const isInsideBlock = (path) => /^(Program|BlockStatement)$/.test(path.parentPath.type);
@@ -22,9 +23,9 @@ module.exports.VariableDeclaration = {
     before(path, {print}) {
         print.breakline();
     },
-    print(path, {maybe, store, write, traverse}) {
+    print(path, {maybe, store, write, traverse, print, indent}, semantics) {
         maybe.indent(isInsideBlock(path));
-        write(String(path.node.kind));
+        write(path.node.kind);
         maybeSpaceAfterKeyword(path, {
             write,
         });
@@ -32,6 +33,9 @@ module.exports.VariableDeclaration = {
         const declarations = path.get('declarations');
         const n = declarations.length - 1;
         
+        maybe.indent.inc(n);
+        maybe.print.breakline(n);
+        
         for (const [index, declaration] of declarations.entries()) {
             const id = declaration.get('id');
             const init = declaration.get('init');
@@ -46,10 +50,20 @@ module.exports.VariableDeclaration = {
                 traverse(init);
             }
             
-            maybe.write(notLast, ',');
-            maybe.write.space(notLast);
+            if (notLast) {
+                const next = declarations[index + 1];
+                
+                write(',');
+                parseLeadingComments(next, {
+                    print,
+                    maybe,
+                    indent,
+                }, semantics);
+                maybe.write.breakline(!next.node.leadingComments);
+            }
         }
         
+        maybe.indent.dec(n);
         maybe.write(isParentBlock(path), ';');
         
         let wasNewline = false;

package/lib/tokenize/tokenize.js

@@ -233,10 +233,10 @@ module.exports.tokenize = (ast, overrides) => {
         maybeThrow(!currentTraverse, path, `Node type '{{ type }}' is not supported yet: '{{ path }}'`);
         
         const currentIndent = i;
-        parseLeadingComments(path, printer, format);
+        parseLeadingComments(path, printer, semantics);
         // this is main thing
         maybePlugin(currentTraverse, path, printer, semantics);
-        parseTrailingComments(path, printer, format);
+        parseTrailingComments(path, printer, semantics);
         maybeThrow(i !== currentIndent, path, `☝️Looks like indent level changed after token visitor: '{{ type }}', for code: '{{ path }}'`);
         
         debug(path.type);

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

@@ -19,7 +19,7 @@ module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
         maybe.write(is, ';');
         
         if (is && isNext(member))
-            write.newline(is);
+            write.newline();
     }
     
     if (is) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.150.0",
+  "version": "2.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",