@putout/printer 3.6.0 → 3.7.0

package/ChangeLog

@@ -1,3 +1,11 @@
+2023.08.31, v3.7.0
+
+feature:
+- 427e14f package: @putout/plugin-minify v4.0.0
+- f3a6959 package: @putout/plugin-promises v12.0.0
+- 52c04e4 package: @putout/plugin-printer v2.0.0
+- 1c7171d @putout/printer: VariableDeclaration inside TSModuleDeclaration
+
 2023.08.11, v3.6.0
 
 feature:

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

@@ -15,8 +15,9 @@ const {maybeSpaceAfterKeyword} = require('./maybe-space-after-keyword');
 const {isConcatenation} = require('../../expressions/binary-expression/concatanate');
 const {parseLeadingComments} = require('../../comment/comment');
 
+const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
-const isInsideBlock = (path) => /^(Program|BlockStatement)$/.test(path.parentPath.type);
+const isInsideBlock = (path) => /^(Program|BlockStatement|TSModuleBlock)$/.test(path.parentPath.type);
 const isParentSwitchCase = (path) => path.parentPath.isSwitchCase();
 const isFirstInSwitch = (path) => path.parentPath.get('consequent.0') === path;
 
@@ -47,7 +48,7 @@ module.exports.VariableDeclaration = {
         for (const [index, declaration] of declarations.entries()) {
             const id = declaration.get('id');
             const init = declaration.get('init');
-            const notLast = index < n;
+            const isLast = index === n;
             
             traverse(id);
             
@@ -58,7 +59,7 @@ module.exports.VariableDeclaration = {
                 traverse(init);
             }
             
-            if (notLast) {
+            if (!isLast) {
                 const next = declarations[index + 1];
                 
                 write(',');
@@ -74,7 +75,9 @@ module.exports.VariableDeclaration = {
         }
         
         maybe.indent.dec(n);
-        maybe.write(isParentBlock(path) || isParentSwitchCase(path), ';');
+        
+        if (isParentBlock(path) || isParentSwitchCase(path) || isParentTSModuleBlock(path))
+            write(';');
         
         let wasNewline = false;
         
@@ -100,11 +103,12 @@ module.exports.VariableDeclaration = {
         notLastPrevVarNotNextVar,
         isNewlineBetweenSiblings,
         notLastParentExport,
+        isParentTSModuleBlock,
     ],
     after(path, {maybe, store}) {
         const wasNewline = store();
         
-        if (isLast(path.parentPath) && !path.parentPath.isBlockStatement())
+        if (isLast(path.parentPath) && !path.parentPath.isBlockStatement() || !isParentBlock(path) && !isParentTSModuleBlock(path))
             return false;
         
         maybe.print.linebreak(wasNewline);

package/lib/tokenize/typescript/index.js

@@ -234,4 +234,3 @@ module.exports = {
         print('this');
     },
 };
-

package/lib/tokenize/typescript/ts-module-declaration.js

@@ -3,8 +3,11 @@
 const {isNext} = require('../is');
 
 module.exports.TSModuleDeclaration = {
-    print(path, {print}) {
-        print('declare namespace ');
+    print(path, {print, maybe}) {
+        const {declare} = path.node;
+        maybe.print(declare, 'declare ');
+        
+        print('namespace ');
         print('__id');
         print.space();
         print('__body');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -48,9 +48,9 @@
   ],
   "devDependencies": {
     "@babel/plugin-codemod-object-assign-to-object-spread": "^7.10.4",
-    "@putout/plugin-minify": "^2.4.0",
-    "@putout/plugin-printer": "^1.0.0",
-    "@putout/plugin-promises": "^11.0.0",
+    "@putout/plugin-minify": "^4.0.0",
+    "@putout/plugin-printer": "^2.0.0",
+    "@putout/plugin-promises": "^12.0.0",
     "@putout/plugin-react-hook-form": "^3.4.1",
     "@putout/plugin-react-hooks": "^5.0.0",
     "acorn": "^8.8.2",