@putout/printer 2.79.0 → 2.81.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.07.21, v2.81.0
+
+feature:
+- dddf2b5 @putout/printer: TSExternalModuleReference
+
+2023.07.20, v2.80.0
+
+feature:
+- 25cdb60 @putout/printer: SwitchStatement: format
+
 2023.07.20, v2.79.0
 
 feature:

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

@@ -36,8 +36,9 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
             maybe.print.space(isProperty);
             print(`//${value}`);
             
-            maybe.print.breakline(isProperty);
-            maybe.print.newline(!isProperty);
+            const isParentSwitch = path.parentPath.isSwitchCase();
+            maybe.print.breakline(isProperty || isParentSwitch);
+            maybe.print.newline(!isProperty && !isParentSwitch);
             continue;
         }
         

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

@@ -8,6 +8,7 @@ const {
 
 const {hasPrevNewline} = require('../../mark');
 const {maybeSpaceAfterKeyword} = require('./maybe-space-after-keyword');
+
 const isBodyLength = ({parentPath}) => parentPath.node?.body?.length > 2;
 
 module.exports.ReturnStatement = {
@@ -24,7 +25,6 @@ module.exports.ReturnStatement = {
             print,
         });
         print('__argument');
-        
         print(';');
     },
     afterIf: (path) => {

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

@@ -74,6 +74,6 @@ module.exports.SwitchStatement = {
     afterSatisfy: () => [isNext],
     after(path, {print}) {
         print.breakline();
-        print.breakline();
+        print.newline();
     },
 };

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

@@ -17,6 +17,8 @@ const {parseLeadingComments} = require('../../comment/comment');
 
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
 const isInsideBlock = (path) => /^(Program|BlockStatement)$/.test(path.parentPath.type);
+const isParentSwitchCase = (path) => path.parentPath.isSwitchCase();
+const isFirstInSwitch = (path) => path.parentPath.get('consequent.0') === path;
 
 module.exports.VariableDeclaration = {
     beforeIf: shouldAddNewlineBefore,
@@ -72,10 +74,17 @@ module.exports.VariableDeclaration = {
         }
         
         maybe.indent.dec(n);
-        maybe.write(isParentBlock(path), ';');
+        maybe.write(isParentBlock(path) || isParentSwitchCase(path), ';');
         
         let wasNewline = false;
         
+        if (isParentSwitchCase(path) && !isFirstInSwitch(path)) {
+            write.newline();
+            wasNewline = true;
+        } else if (isParentSwitchCase(path)) {
+            write.breakline();
+        }
+        
         if (isParentBlock(path) && isNext(path) && (noTrailingComment(path) || isNewlineBetweenSiblings(path))) {
             write.newline();
             wasNewline = true;

package/lib/tokenize/typescript/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {exists} = require('../is');
+const {exists, isNext} = require('../is');
 const {TSTypeLiteral} = require('./ts-type-literal');
 const {TSTypeAliasDeclaration} = require('./ts-type-alias-declaration');
 const {TSMappedType} = require('./ts-mapped-type');
@@ -243,7 +243,7 @@ module.exports = {
     },
     TSEnumDeclaration,
     TSEnumMember,
-    TSImportEqualsDeclaration(path, {print}) {
+    TSImportEqualsDeclaration(path, {print, maybe}) {
         print('import ');
         print('__id');
         print.space();
@@ -251,6 +251,12 @@ module.exports = {
         print.space();
         print('__moduleReference');
         print(';');
-        print.newline();
+        maybe.print.newline(isNext(path));
+    },
+    TSExternalModuleReference(path, {print}) {
+        print('require(');
+        print('__expression');
+        print(')');
     },
 };
+

package/package.json

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