@putout/printer - npm Package Compare versions

Comparing version 1.54.2 to 1.54.3

lib/tokenize/expressions/array-expression.js

@@ -177,3 +177,18 @@ 'use strict';
 
+function isCallInsideArrow(path) {
+    const {parentPath} = path;
+    
+    if (!parentPath.isCallExpression())
+        return false;
+    
+    if (!parentPath.parentPath.isFunction())
+        return false;
+    
+    return path.node.elements.length < 4;
+}
+
 function isNewlineBetweenElements(path, {elements}) {
+    if (isCallInsideArrow(path))
+        return false;
+    
     if (isTwoElementReturn(path, {elements}))
@@ -180,0 +195,0 @@ return false;

lib/tokenize/expressions/functions/functions.js

 'use strict';
 
-const {hasPrevNewline} = require('../../mark');
-const isFirst = (path) => !path.getPrevSibling().node;
 const {ArrowFunctionExpression} = require('./arrow-function-expression');
+const {FunctionDeclaration} = require('./function-declaration');
 
 module.exports.ArrowFunctionExpression = ArrowFunctionExpression;
+module.exports.FunctionDeclaration = FunctionDeclaration;
 
@@ -67,27 +67,2 @@ module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
 
-module.exports.FunctionDeclaration = (path, {print, maybe}) => {
-    const {async} = path.node;
-    
-    if (!isFirst(path) && !hasPrevNewline(path) && !path.parentPath.isExportDeclaration())
-        print('\n');
-    
-    maybe.print(async, 'async ');
-    print('function ');
-    print('__id');
-    print('(');
-    
-    const params = path.get('params');
-    const n = params.length - 1;
-    
-    for (let i = 0; i <= n; i++) {
-        print(params[i]);
-        
-        if (i < n)
-            print(', ');
-    }
-    
-    print(') ');
-    print('__body');
-};
-
 module.exports.ClassMethod = (path, {print, maybe}) => {
@@ -94,0 +69,0 @@ const {kind} = path.node;

lib/tokenize/is.js

@@ -82,6 +82,3 @@ 'use strict';
     for (const condition of conditions)
-        if (condition(path))
-            return true;
-    
-    return false;
+        return false;
 };

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

 'use strict';
 
+const {isNewlineBetweenStatements} = require('../is');
+const {isMarkedAfter} = require('../mark');
+
 module.exports.ExportDefaultDeclaration = {
-    /*
     beforeIf(path) {
-        return path.getPrevSibling().isTSTypeAliasDeclaration();
+        const prev = path.getPrevSibling();
+        
+        if (isMarkedAfter(prev))
+            return false;
+        
+        return isNewlineBetweenStatements(prev);
     },
     before(path, {print}) {
-        print.breakline();
+        print.newline();
     },
-     */print(path, {print, traverse, maybe}) {
+    print(path, {print, traverse, maybe}) {
         const declaration = path.get('declaration');
@@ -13,0 +20,0 @@ print('export default ');

lib/tokenize/typescript/ts-type-alias-declaration.js

 'use strict';
 
 const {isLast} = require('../is');
+const {markAfter} = require('../mark');
 const isNextType = (a) => a.getNextSibling().isTSTypeAliasDeclaration();
@@ -34,3 +35,4 @@
         print.newline();
+        markAfter(path);
     },
 };

package.json

 {
   "name": "@putout/printer",
-  "version": "1.54.2",
+  "version": "1.54.3",
   "type": "commonjs",
@@ -5,0 +5,0 @@ "author": "coderaiser <[e-mail]> (https://github.com/coderaiser)",

No alert changes

Improved metrics

Total package byte prevSize

89271

increased by1.07%

Number of package files

63

increased by1.61%

Lines of code

2389

increased by0.97%

No dependency changes