@putout/printer 2.56.0 → 2.57.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.07.08, v2.57.0
+
+feature:
+- 0e980f4 @putout/printer: ObjectProperty: improve support of multiline comments
+
 2023.07.08, v2.56.0
 
 feature:

package/lib/tokenize/comments/comments.js

@@ -1,129 +1,10 @@
 'use strict';
 
-const {
-    hasTrailingComment,
-    isLast,
-} = require('../is');
+const {parseLeadingComments} = require('./parse-leading-comments');
+const {parseTrailingComments} = require('./parse-trailing-comments');
+const {parseComments} = require('./parse-comments');
 
-const {markBefore} = require('../mark');
-const {isVariableDeclarator} = require('@babel/types');
+module.exports.parseLeadingComments = parseLeadingComments;
+module.exports.parseTrailingComments = parseTrailingComments;
+module.exports.parseComments = parseComments;
 
-module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics) => {
-    if (!semantics.comments)
-        return;
-    
-    const {leadingComments} = path.node;
-    
-    if (!leadingComments?.length)
-        return;
-    
-    if (hasTrailingComment(path.getPrevSibling()))
-        return;
-    
-    const insideFn = path.parentPath.isFunction();
-    const isProperty = path.isObjectProperty() || isVariableDeclarator(path);
-    const isIndent = !path.isClassMethod() && !insideFn && !isProperty;
-    
-    for (const {type, value} of leadingComments) {
-        maybe.indent(isIndent);
-        
-        if (type === 'CommentLine') {
-            maybeInsideFn(insideFn, {
-                print,
-                indent,
-            });
-            
-            maybe.print.space(isProperty);
-            print(`//${value}`);
-            
-            maybe.print.breakline(isProperty);
-            maybe.print.newline(!isProperty);
-            continue;
-        }
-        
-        if (type === 'CommentBlock') {
-            print(`/*${value}*/`);
-            
-            if (path.isStatement() || path.isClassMethod() || path.isDirective()) {
-                print.newline();
-                markBefore(path);
-                maybe.indent(path.isClassMethod());
-            }
-            
-            continue;
-        }
-    }
-};
-
-module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
-    if (!semantics.comments)
-        return;
-    
-    const {trailingComments} = path.node;
-    
-    if (!trailingComments?.length)
-        return;
-    
-    if (path.isDirective())
-        return;
-    
-    for (const {type, value, loc} of trailingComments) {
-        const sameLine = isSameLine(path, loc);
-        
-        if (type === 'CommentLine') {
-            maybe.write.space(sameLine);
-            maybe.indent(!sameLine);
-            
-            write(`//${value}`);
-            maybe.write.newline(!isLast(path));
-            continue;
-        }
-        
-        if (type === 'CommentBlock') {
-            maybe.write.space(sameLine);
-            write(`/*${value}*/`);
-            maybe.write.newline(!sameLine);
-        }
-    }
-};
-
-module.exports.parseComments = (path, {write}, semantics) => {
-    if (!semantics.comments)
-        return;
-    
-    const comments = path.node.comments || path.node.innerComments;
-    
-    if (!comments)
-        return;
-    
-    for (const {type, value} of comments) {
-        if (type === 'CommentLine') {
-            write.breakline();
-            write('//');
-            write(value);
-            write.newline();
-            continue;
-        }
-        
-        if (type === 'CommentBlock') {
-            write('/*');
-            write(value);
-            write('*/');
-        }
-    }
-};
-
-function isSameLine(path, loc) {
-    return path.node.loc?.start.line === loc.start.line || path.node.loc?.end.line === loc.end.line;
-}
-
-function maybeInsideFn(insideFn, {print, indent}) {
-    if (!insideFn)
-        return;
-    
-    indent.inc();
-    indent.inc();
-    print.breakline();
-    indent.dec();
-    indent.dec();
-}

package/lib/tokenize/comments/maybe-inside-fn.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports.maybeInsideFn = (insideFn, {print, indent}) => {
+    if (!insideFn)
+        return;
+    
+    indent.inc();
+    indent.inc();
+    print.breakline();
+    indent.dec();
+    indent.dec();
+};
+

package/lib/tokenize/comments/parse-comments.js

@@ -0,0 +1,28 @@
+'use strict';
+
+module.exports.parseComments = (path, {write}, semantics) => {
+    if (!semantics.comments)
+        return;
+    
+    const comments = path.node.comments || path.node.innerComments;
+    
+    if (!comments)
+        return;
+    
+    for (const {type, value} of comments) {
+        if (type === 'CommentLine') {
+            write.breakline();
+            write('//');
+            write(value);
+            write.newline();
+            continue;
+        }
+        
+        if (type === 'CommentBlock') {
+            write('/*');
+            write(value);
+            write('*/');
+        }
+    }
+};
+

package/lib/tokenize/comments/parse-leading-comments.js

@@ -0,0 +1,61 @@
+'use strict';
+
+const {hasTrailingComment} = require('../is');
+const {isVariableDeclarator} = require('@babel/types');
+const {markBefore} = require('../mark');
+const {maybeInsideFn} = require('./maybe-inside-fn');
+
+module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics) => {
+    if (!semantics.comments)
+        return;
+    
+    const {leadingComments} = path.node;
+    
+    if (!leadingComments?.length)
+        return;
+    
+    if (hasTrailingComment(path.getPrevSibling()))
+        return;
+    
+    const insideFn = path.parentPath.isFunction();
+    const isProperty = path.isObjectProperty() || isVariableDeclarator(path);
+    const isIndent = !path.isClassMethod() && !insideFn && !isProperty;
+    
+    for (const {type, value} of leadingComments) {
+        maybe.indent(isIndent);
+        
+        if (type === 'CommentLine') {
+            maybeInsideFn(insideFn, {
+                print,
+                indent,
+            });
+            
+            maybe.print.space(isProperty);
+            print(`//${value}`);
+            
+            maybe.print.breakline(isProperty);
+            maybe.print.newline(!isProperty);
+            continue;
+        }
+        
+        if (type === 'CommentBlock') {
+            const looksLikeMethod = path.isClassMethod();
+            const looksLikeDirective = path.isDirective();
+            const looksLikeProp = path.isObjectProperty();
+            
+            if (looksLikeProp)
+                print.breakline();
+            
+            print(`/*${value}*/`);
+            
+            if (path.isStatement() || looksLikeDirective || looksLikeMethod || looksLikeProp) {
+                print.newline();
+                markBefore(path);
+                maybe.indent(looksLikeMethod || looksLikeProp);
+            }
+            
+            continue;
+        }
+    }
+};
+

package/lib/tokenize/comments/parse-trailing-comments.js

@@ -0,0 +1,40 @@
+'use strict';
+
+const {isLast} = require('../is');
+
+function isSameLine(path, loc) {
+    return path.node.loc?.start.line === loc.start.line || path.node.loc?.end.line === loc.end.line;
+}
+
+module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
+    if (!semantics.comments)
+        return;
+    
+    const {trailingComments} = path.node;
+    
+    if (!trailingComments?.length)
+        return;
+    
+    if (path.isDirective())
+        return;
+    
+    for (const {type, value, loc} of trailingComments) {
+        const sameLine = isSameLine(path, loc);
+        
+        if (type === 'CommentLine') {
+            maybe.write.space(sameLine);
+            maybe.indent(!sameLine);
+            
+            write(`//${value}`);
+            maybe.write.newline(!isLast(path));
+            continue;
+        }
+        
+        if (type === 'CommentBlock') {
+            maybe.write.space(sameLine);
+            write(`/*${value}*/`);
+            maybe.write.newline(!sameLine);
+        }
+    }
+};
+

package/lib/tokenize/literals/index.js

@@ -72,4 +72,3 @@ module.exports = {
         write('super');
     },
 };
-

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

@@ -1,4 +1,3 @@
 'use strict';
 
 module.exports.getDirectives = (path) => !path.node.directives ? [] : path.get('directives');
-

package/lib/tokenize/statements/program/program.js

@@ -24,4 +24,3 @@ module.exports.Program = (path, {print, write, traverse, maybe}, semantics) => {
     
     print.newline();
 };
-

package/package.json

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