@putout/printer 2.45.0 → 2.47.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.07.05, v2.47.0
+
+feature:
+- dc0ba73 @putout/printer: Program: improve support of inner comments
+
+2023.07.04, v2.46.0
+
+feature:
+- c131fac @putout/printer: Directives
+- 70baffb @putout/printer: add support of directives
+
 2023.07.04, v2.45.0
 
 feature:

package/lib/tokenize/{comments.js → comments/comments.js}

@@ -3,9 +3,9 @@
 const {
     hasTrailingComment,
     isLast,
-} = require('./is');
+} = require('../is');
 
-const {markBefore} = require('./mark');
+const {markBefore} = require('../mark');
 const {isVariableDeclarator} = require('@babel/types');
 
 module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics) => {
@@ -99,6 +99,13 @@ module.exports.parseComments = (path, {write}, semantics) => {
             write('//');
             write(value);
             write.newline();
+            continue;
+        }
+        
+        if (type === 'CommentBlock') {
+            write('/*');
+            write(value);
+            write('*/');
         }
     }
 };

package/lib/tokenize/expressions/functions/function-declaration.js

@@ -24,6 +24,7 @@ module.exports.FunctionDeclaration = {
         });
         
         print.space();
+        
         print('__body');
     },
     afterSatisfy: () => [isNext, isNextParent],

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

@@ -11,7 +11,7 @@ const {
     exists,
 } = require('../../is');
 
-const {parseComments} = require('../../comments');
+const {parseComments} = require('../../comments/comments');
 const {isSpreadElement} = require('@babel/types');
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;

package/lib/tokenize/literals/index.js

@@ -21,6 +21,15 @@ module.exports = {
         
         write(raw || extra?.raw || value);
     },
+    Directive(path, {print}) {
+        print('__value');
+    },
+    DirectiveLiteral(path, {write}) {
+        write.indent();
+        write(path.node.raw);
+        write(';');
+        write.newline();
+    },
     BooleanLiteral(path, {write}) {
         write(path.node.value);
     },

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

@@ -13,44 +13,54 @@ const {
 } = require('@babel/types');
 
 const {markAfter} = require('../../mark');
-const {parseComments} = require('../../comments');
+const {parseComments} = require('../../comments/comments');
 const {insideIfWithNoBody} = require('./inside-if-with-no-body');
 
-const isFirstStatement = (path) => path.get('body.0')?.isStatement();
+const isFirstStatement = (path) => path.node.body[0];
+const isFirstDirective = (path) => path.node.directives?.[0];
 const isMethodOrArrow = (path) => isArrowFunctionExpression(path) || isObjectMethod(path);
 
+const getDirectives = (path) => !path.node.directives ? [] : path.get('directives');
+
+module.exports._getDirectives = getDirectives;
+
 module.exports.BlockStatement = {
-    print(path, {indent, maybe, print, write}, semantics) {
+    print(path, {indent, maybe, write, traverse}, semantics) {
         const body = path.get('body');
+        const directives = getDirectives(path);
         
         if (path.parentPath.isBlockStatement())
             indent();
         
         indent.inc();
-        print('{');
+        write('{');
         
-        if (isFirstStatement(path))
-            print.newline();
+        if (isFirstStatement(path) || isFirstDirective(path))
+            write.newline();
+        
+        for (const directive of directives) {
+            traverse(directive);
+        }
         
         for (const element of body) {
-            print(element);
+            traverse(element);
         }
         
         parseComments(path, {write}, semantics);
         
         indent.dec();
         maybe.indent(body.length);
-        print('}');
+        write('}');
         
         if (path.parentPath.isObjectMethod()) {
-            print(',');
+            write(',');
         }
     },
     afterIf(path) {
         return shouldAddNewlineAfter(path);
     },
-    after(path, {print}) {
-        print.newline();
+    after(path, {write}) {
+        write.newline();
         markAfter(path.parentPath);
     },
 };

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

@@ -38,6 +38,7 @@ const shouldBreakline = satisfy([
 module.exports.ExpressionStatement = {
     print(path, {indent, print, maybe, store}) {
         indent();
+        
         print('__expression');
         print(';');
         

package/lib/tokenize/statements/index.js

@@ -19,6 +19,7 @@ const {ForInStatement} = require('./for-in-statement');
 const {ExportDefaultDeclaration} = require('./export-declaration/export-default-declaration');
 const {BreakStatement} = require('./break-statement');
 const {DoWhileStatement} = require('./do-while-statement');
+const {Program} = require('./program');
 
 const {
     ExportNamespaceSpecifier,
@@ -48,15 +49,7 @@ module.exports = {
         print.space();
         print('__body');
     },
-    Program(path, {print}) {
-        print('__interpreter');
-        
-        path
-            .get('body')
-            .forEach(print);
-        
-        print.newline();
-    },
+    Program,
     EmptyStatement(path, {write}) {
         write(';');
     },

package/lib/tokenize/statements/program.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const {parseComments} = require('../comments/comments');
+module.exports.Program = (path, {print, write}, semantics) => {
+    print('__interpreter');
+    parseComments(path, {write}, semantics);
+    
+    path
+        .get('body')
+        .forEach(print);
+    
+    print.newline();
+};
+

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

@@ -13,7 +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 {parseLeadingComments} = require('../../comments/comments');
 
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
 const isInsideBlock = (path) => /^(Program|BlockStatement)$/.test(path.parentPath.type);

package/lib/tokenize/tokenize.js

@@ -27,7 +27,7 @@ const {
 const {
     parseLeadingComments,
     parseTrailingComments,
-} = require('./comments');
+} = require('./comments/comments');
 
 const {parseOverrides} = require('./overrides');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "2.45.0",
+  "version": "2.47.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -50,6 +50,7 @@
     "@babel/plugin-codemod-object-assign-to-object-spread": "^7.10.4",
     "@putout/plugin-minify": "^1.8.0",
     "@putout/plugin-printer": "^1.0.0",
+    "@putout/plugin-promises": "^10.0.0",
     "@putout/plugin-react-hook-form": "^3.4.1",
     "@putout/plugin-react-hooks": "^5.0.0",
     "@putout/test": "^6.0.1",