@putout/printer 11.6.0 → 11.8.0

package/ChangeLog

@@ -1,3 +1,15 @@
+2024.12.17, v11.8.0
+
+feature:
+- 0ed288d @putout/printer: LabeledStatement: nexted
+
+2024.12.17, v11.7.0
+
+feature:
+- 8fd4fd6 @putout/printer: FunctionDeclaration inside TSModuleDeclarationExportnamed
+- ab8c280 @putout/printer: @putout/plugin-promises v16.0.0
+- ba04427 @putout/printer: LabeledStatement: indent
+
 2024.12.16, v11.6.0
 
 feature:

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

@@ -1,16 +1,20 @@
 'use strict';
 
+const {
+    isTSModuleBlock,
+    isBlockStatement,
+    isExportNamedDeclaration,
+} = require('@putout/babel').types;
+
 const {markAfter} = require('../../mark');
 const {isNext, isNextParent} = require('../../is');
 const {printParams} = require('./params');
 
+const isInsideNamedExport = ({parentPath}) => isExportNamedDeclaration(parentPath);
+
 module.exports.FunctionDeclaration = {
     print(path, printer, semantics) {
-        const {
-            print,
-            maybe,
-            indent,
-        } = printer;
+        const {print, maybe} = printer;
         
         const {
             async,
@@ -18,7 +22,7 @@ module.exports.FunctionDeclaration = {
             returnType,
         } = path.node;
         
-        indent();
+        maybe.indent(!isInsideNamedExport(path));
         maybe.print(async, 'async ');
         
         print('function');
@@ -49,7 +53,12 @@ module.exports.FunctionDeclaration = {
 };
 
 function isInsideBlockStatement(path) {
-    if (!path.parentPath.isBlockStatement())
+    const {parentPath} = path;
+    
+    if (isTSModuleBlock(parentPath.parentPath))
+        return true;
+    
+    if (!isBlockStatement(parentPath))
         return false;
     
     return !path.node.body.body.length;

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

@@ -51,4 +51,3 @@ function printUnary(path, name, {print}) {
     print(`${name} `);
     print('__argument');
 }
-

package/lib/tokenize/is.js

@@ -12,6 +12,7 @@ const {
     isMemberExpression,
     isArrayExpression,
     isObjectExpression,
+    isLabeledStatement,
 } = types;
 
 const isParentProgram = (path) => path.parentPath?.isProgram();
@@ -124,6 +125,8 @@ module.exports.isNewlineBetweenSiblings = (path) => {
     return startNext - endCurrent > 1;
 };
 
+module.exports.isInsideLabel = ({parentPath}) => isLabeledStatement(parentPath);
+
 module.exports.satisfy = (conditions) => (path) => {
     for (const condition of conditions)
         if (condition(path))

package/lib/tokenize/maybe/maybe-parens.js

@@ -26,4 +26,3 @@ const maybeParensCondition = ({print, condition}) => ({
     ...maybeParensPrint(print),
     condition: (path) => condition?.(path) || isParens(path),
 });
-

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

@@ -10,6 +10,7 @@ const {
     noTrailingComment,
     hasTrailingComment,
     isCoupleLines,
+    isInsideLabel,
 } = require('../is');
 
 const isBeforeElse = (path) => {
@@ -36,8 +37,8 @@ const shouldBreakline = satisfy([
 ]);
 
 module.exports.ExpressionStatement = {
-    print(path, {indent, print, maybe, store}) {
-        indent();
+    print(path, {print, maybe, store}) {
+        maybe.indent(!isInsideLabel(path));
         
         print('__expression');
         print(';');

package/lib/tokenize/statements/index.js

@@ -21,6 +21,7 @@ const {BreakStatement} = require('./break-statement');
 const {DoWhileStatement} = require('./do-while-statement');
 const {Program} = require('./program/program');
 const {ContinueStatement} = require('./continue-statement');
+const {LabeledStatement} = require('./labeled-statement/labeled-satement');
 
 const {
     ExportNamespaceSpecifier,
@@ -44,12 +45,7 @@ module.exports = {
     ForOfStatement,
     ReturnStatement,
     DebuggerStatement,
-    LabeledStatement(path, {print}) {
-        print('__label');
-        print(':');
-        print.space();
-        print('__body');
-    },
+    LabeledStatement,
     Program,
     EmptyStatement(path, {write}) {
         write(';');

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

@@ -0,0 +1,11 @@
+'use strict';
+
+const {isInsideLabel} = require('../../is');
+
+module.exports.LabeledStatement = (path, {print, maybe}) => {
+    maybe.indent(!isInsideLabel(path));
+    print('__label');
+    print(':');
+    print.space();
+    print('__body');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "11.6.0",
+  "version": "11.8.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -54,7 +54,7 @@
     "@putout/eslint": "^3.5.0",
     "@putout/plugin-minify": "^9.0.0",
     "@putout/plugin-printer": "^3.0.0",
-    "@putout/plugin-promises": "^15.0.0",
+    "@putout/plugin-promises": "^16.0.0",
     "@putout/plugin-react-hook-form": "^4.0.0",
     "@putout/plugin-react-hooks": "^6.0.0",
     "acorn": "^8.8.2",