@putout/printer 1.130.0 → 1.130.2

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.03, v1.130.2
+
+feature:
+- 7607ed8 @putout/printer: ExportDeclaration: newline
+
+2023.06.03, v1.130.1
+
+feature:
+- ed75f1a ImportDeclaration: assertions, attributes
+
 2023.06.03, v1.130.0
 
 feature:

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

@@ -4,6 +4,8 @@ const {
     isNewlineBetweenSiblings,
     exists,
     isNext,
+    isLast,
+
 } = require('../../is');
 
 const {
@@ -107,6 +109,9 @@ module.exports.ExportNamedDeclaration = {
         print('__declaration');
     },
     afterIf(path) {
+        if (isLast(path))
+            return false;
+        
         if (isDeclarationNewline(path))
             return false;
         

package/lib/tokenize/statements/import-declaration/import-attribute.js

@@ -1,48 +1,47 @@
 'use strict';
 
 module.exports.ImportAttribute = (path, {print}) => {
-    print('{');
-    print.space();
     print('__key');
     print(':');
     print.space();
     print('__value');
-    print.space();
-    print('}');
 };
 
-module.exports.printAttributes = (path, {write, traverse}) => {
+module.exports.maybePrintAttributes = (path, {write, traverse}) => {
     if (isAssertions(path))
-        printAssertions(path, {
+        return printAttributes(path, {
             write,
             traverse,
+            type: 'assertions',
+            keyword: 'assert',
         });
     
-    const attributes = path.get('attributes');
-    
-    if (!attributes.length)
-        return;
-    
-    write(' with');
-    write.space();
-    
-    for (const attr of attributes) {
-        traverse(attr);
-    }
+    printAttributes(path, {
+        write,
+        traverse,
+        type: 'attributes',
+        keyword: 'with',
+    });
 };
 
-const isAssertions = (path) => path.node.assertions;
+const isAssertions = (path) => path.node.assertions.length;
 
-function printAssertions(path, {write, traverse}) {
-    const attributes = path.get('assertions');
+function printAttributes(path, {write, traverse, type, keyword}) {
+    const attributes = path.get(type);
     
     if (!attributes.length)
         return;
     
-    write(' assert');
+    write(` ${keyword}`);
+    write.space();
+    
+    write('{');
     write.space();
     
     for (const attr of attributes) {
         traverse(attr);
     }
+    
+    write.space();
+    write('}');
 }

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

@@ -5,7 +5,7 @@ const {isLast} = require('../../is');
 const {parseSpecifiers} = require('./parse-specifiers');
 
 const {
-    printAttributes,
+    maybePrintAttributes,
     ImportAttribute,
 } = require('./import-attribute');
 
@@ -89,7 +89,7 @@ module.exports.ImportDeclaration = {
         print.space();
         
         print('__source');
-        printAttributes(path, {
+        maybePrintAttributes(path, {
             write,
             traverse,
         });

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

@@ -70,6 +70,10 @@ module.exports.VariableDeclaration = {
     ],
     after(path, {maybe, store}) {
         const wasNewline = store();
+        
+        if (isLast(path.parentPath))
+            return false;
+        
         maybe.print.linebreak(wasNewline);
         maybe.print.newline(!wasNewline);
         maybe.markAfter(wasNewline, path);

package/package.json

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