@putout/printer 1.66.0 → 1.68.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.23, v1.68.0
+
+feature:
+- 4975e30 @putout/printer: comment in ReturnStatement
+
+2023.04.21, v1.67.0
+
+feature:
+- fd645f6 @putout/printer add support of "for export type *"
+
 2023.04.21, v1.66.0
 
 feature:

package/lib/tokenize/comments.js

@@ -55,10 +55,11 @@ module.exports.parseTrailingComments = (path, {write, maybe}) => {
     for (const {type, value, loc} of trailingComments) {
         if (type === 'CommentLine') {
             const sameLine = isSameLine(path, loc);
+            
             maybe.write.space(sameLine);
             maybe.indent(!sameLine);
             write(`//${value}`);
-            maybe.write.newline(!sameLine);
+            write.newline();
         }
     }
 };

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

@@ -4,6 +4,8 @@ const {
     isCoupleLines,
     isForOf,
     isIf,
+    noTrailingComment,
+
 } = require('../is');
 
 const {isFunction} = require('@babel/types');
@@ -46,7 +48,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
         }
         
         print(property);
-        maybe.print.newline(manyLines);
+        maybe.print.newline(manyLines && noTrailingComment(property));
     }
     
     indent.dec();

package/lib/tokenize/is.js

@@ -85,3 +85,5 @@ module.exports.satisfy = (conditions) => (path) => {
     
     return false;
 };
+
+module.exports.noTrailingComment = (path) => !path.node.trailingComments;

package/lib/tokenize/maybe/index.js

@@ -23,7 +23,9 @@ module.exports.maybeThrow = (a, path, b) => {
     }));
 };
 
-const maybeProgram = (ast) => isProgram(ast) ? ast : Program([ExpressionStatement(ast)]);
+const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
+    ExpressionStatement(ast),
+]);
 
 module.exports.maybeFile = (ast) => isFile(ast) ? ast : File(maybeProgram(ast));
 

package/lib/tokenize/statements/export-declarations.js

@@ -14,10 +14,27 @@ module.exports.ExportSpecifier = (path, {print}) => {
     }
 };
 
+module.exports.ExportNamespaceSpecifier = (path, {print}) => {
+    print(' * as ');
+    print('__exported');
+};
+
 module.exports.ExportNamedDeclaration = (path, {print, traverse, write, indent}) => {
+    const {exportKind} = path.node;
     const specifiers = path.get('specifiers');
+    
     write('export ');
     
+    if (exportKind === 'type' && specifiers.length) {
+        print('type');
+        print(specifiers[0]);
+        print(' from ');
+        print('__source');
+        print(';');
+        
+        return;
+    }
+    
     if (specifiers.length) {
         write('{');
         indent.inc();

package/lib/tokenize/statements/index.js

@@ -16,7 +16,11 @@ const {SwitchStatement} = require('./switch-statement');
 const {ForInStatement} = require('./for-in-statement');
 const {ExportDefaultDeclaration} = require('./export-default-declaration');
 const {BreakStatement} = require('./break-statement');
-const {ExportSpecifier} = exportDeclarations;
+
+const {
+    ExportNamespaceSpecifier,
+    ExportSpecifier,
+} = exportDeclarations;
 
 module.exports = {
     ...importDeclarations,
@@ -24,6 +28,7 @@ module.exports = {
     BlockStatement,
     ExpressionStatement,
     ExportSpecifier,
+    ExportNamespaceSpecifier,
     ExportDefaultDeclaration,
     VariableDeclaration,
     IfStatement,

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

@@ -1,25 +1,38 @@
 'use strict';
 
-const {isPrevBody} = require('../is');
+const {
+    isPrevBody,
+    noTrailingComment,
+} = require('../is');
+
 const {hasPrevNewline} = require('../mark');
 const isBodyLength = ({parentPath}) => parentPath.node?.body?.length > 2;
 
-module.exports.ReturnStatement = (path, {indent, traverse, print}) => {
-    if (!hasPrevNewline(path) && isBodyLength(path) || isPrevBody(path)) {
+module.exports.ReturnStatement = {
+    beforeIf(path) {
+        return !hasPrevNewline(path) && isBodyLength(path) || isPrevBody(path);
+    },
+    before(path, {print}) {
         print.indent();
         print.newline();
-    }
-    
-    indent();
-    print('return');
-    
-    const argPath = path.get('argument');
-    
-    if (argPath.node) {
-        print(' ');
-        traverse(argPath);
-    }
-    
-    print(';');
-    print.newline();
+    },
+    print(path, {indent, traverse, print}) {
+        indent();
+        print('return');
+        
+        const argPath = path.get('argument');
+        
+        if (argPath.node) {
+            print(' ');
+            traverse(argPath);
+        }
+        
+        print(';');
+    },
+    afterSatisfy: () => [
+        noTrailingComment,
+    ],
+    after(path, {print}) {
+        print.newline();
+    },
 };

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

@@ -25,4 +25,3 @@ module.exports.TSTypeParameter = (path, {write, traverse}) => {
     
     traverse(constraint);
 };
-

package/package.json

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