@putout/printer 1.70.0 → 1.70.2

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.25, v1.70.2
+
+fix:
+- 42813b5 @putout/printer: ExportDeclaration: newline
+
+2023.04.25, v1.70.1
+
+feature:
+- 1cdcf93 @putout/printer: add support of ImportNamespaceSpecifier
+
 2023.04.25, v1.70.0
 
 feature:

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

@@ -1,5 +1,13 @@
 'use strict';
 
+const {isNewlineBetweenStatements} = require('../is');
+const {
+    markAfter,
+    isMarkedAfter,
+} = require('../mark');
+
+const isDeclarationNewline = (path) => isMarkedAfter(path.get('declaration'));
+
 module.exports.ExportSpecifier = (path, {print}) => {
     const {
         local,
@@ -19,37 +27,49 @@ module.exports.ExportNamespaceSpecifier = (path, {print}) => {
     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(';');
+module.exports.ExportNamedDeclaration = {
+    print(path, {print, traverse, write, indent}) {
+        const {exportKind} = path.node;
+        const specifiers = path.get('specifiers');
         
-        return;
-    }
-    
-    if (specifiers.length) {
-        write('{');
-        indent.inc();
-        write.newline();
+        write('export ');
         
-        for (const spec of specifiers) {
-            indent();
-            traverse(spec);
-            write(',');
+        if (exportKind === 'type' && specifiers.length) {
+            print('type');
+            print(specifiers[0]);
+            print(' from ');
+            print('__source');
+            print(';');
+            
+            return;
+        }
+        
+        if (specifiers.length) {
+            write('{');
+            indent.inc();
             write.newline();
+            
+            for (const spec of specifiers) {
+                indent();
+                traverse(spec);
+                write(',');
+                write.newline();
+            }
+            
+            indent.dec();
+            write('}');
         }
         
-        indent.dec();
-        write('}');
-    }
-    
-    print('__declaration');
+        print('__declaration');
+    },
+    afterIf(path) {
+        if (isDeclarationNewline(path))
+            return false;
+        
+        return isNewlineBetweenStatements(path);
+    },
+    after(path, {print}) {
+        print.newline();
+        markAfter(path);
+    },
 };

package/lib/tokenize/statements/{import-declarations.js → import-declaration.js}

@@ -17,6 +17,11 @@ module.exports.ImportDeclaration = {
                 continue;
             }
             
+            if (spec.isImportNamespaceSpecifier()) {
+                print('* as ');
+                print(spec.get('local'));
+            }
+            
             if (spec.isImportSpecifier()) {
                 maybe.print(index, ', ');
                 maybe.print(!wasSpecifier, '{');

package/lib/tokenize/statements/index.js

@@ -9,7 +9,7 @@ const {ReturnStatement} = require('./return-statement');
 const TryStatements = require('./try-statements');
 const {DebuggerStatement} = require('./debugger-statement');
 const {ForStatement} = require('./for-statement');
-const importDeclarations = require('./import-declarations');
+const importDeclarations = require('./import-declaration');
 const exportDeclarations = require('./export-declarations');
 const {WhileStatement} = require('./while-statement');
 const {SwitchStatement} = require('./switch-statement');

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

@@ -6,10 +6,7 @@ const {
     isNewlineBetweenStatements,
 } = require('../is');
 
-const {
-    hasPrevNewline,
-    markAfter,
-} = require('../mark');
+const {hasPrevNewline} = require('../mark');
 
 const {isExportDeclaration} = require('@babel/types');
 
@@ -52,7 +49,7 @@ module.exports.VariableDeclaration = {
         const wasNewline = store();
         maybe.print.linebreak(wasNewline);
         maybe.print.newline(!wasNewline);
-        markAfter(path);
+        maybe.markAfter(wasNewline, path);
     },
 };
 

package/package.json

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