@putout/printer 2.15.0 → 2.17.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.15, v2.17.0
+
+feature:
+- 27c6292 @putout/printer: ImportDefault: newlines
+
+2023.06.14, v2.16.0
+
+feature:
+- 3540087 @putout/printer: ObjectExpression: newline
+
 2023.06.14, v2.15.0
 
 feature:

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

@@ -12,7 +12,6 @@ const {
 } = require('../../is');
 
 const {parseComments} = require('../../comments');
-const {isObjectExpression} = require('@babel/types');
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
@@ -84,12 +83,8 @@ const notLastArgInsideCall = (path) => {
     if (!parentPath.isCallExpression())
         return false;
     
-    const {properties} = path.node;
-    
-    for (const property of properties) {
-        if (isObjectExpression(property.value))
-            return false;
-    }
+    if (isCoupleLines(path))
+        return false;
     
     return path !== parentPath
         .get('arguments')

package/lib/tokenize/is.js

@@ -40,7 +40,7 @@ function isCoupleLines(path) {
     const start = path.node?.loc?.start?.line;
     const end = path.node?.loc?.end?.line;
     
-    return end > start;
+    return end !== start;
 }
 
 module.exports.exists = (a) => a.node;

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

@@ -1,7 +1,12 @@
 'use strict';
 
 const {markAfter} = require('../../mark');
-const {isLast, isNext} = require('../../is');
+
+const {
+    isLast,
+    isNext,
+} = require('../../is');
+
 const {parseImportSpecifiers} = require('parse-import-specifiers');
 
 const {
@@ -73,7 +78,12 @@ module.exports.ImportDeclaration = {
             
             if (importsCount > maxSpecifiersInOneLine) {
                 maybe.write(n, ',');
-                maybe.write.newline(index === n);
+                
+                const last = index === n;
+                const penult = index === n - 1;
+                
+                maybe.write.newline(penult && defaults.length);
+                maybe.write.newline(last);
             }
             
             indent.dec();

package/package.json

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