@putout/printer 2.67.0 → 2.69.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.07.10, v2.69.0
+
+feature:
+- f057898 @putout/printer: TSDeclareFunction
+
+2023.07.10, v2.68.0
+
+feature:
+- e1fc3d9 @putout/printer: ObjectPattern: properties: AssignmentPattern: newline
+
 2023.07.10, v2.67.0
 
 feature:

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

@@ -3,6 +3,7 @@
 const {
     isIdentifier,
     isObjectPattern,
+    isAssignmentPattern,
 } = require('@babel/types');
 
 const {wrongShorthand} = require('./wrong-shortand');
@@ -22,6 +23,7 @@ const isOneParentProperty = ({parentPath}) => parentPath.parentPath.node.propert
 module.exports.ObjectPattern = {
     print(path, {indent, print, maybe}, semantics) {
         const {maxPropertiesInOneLine} = semantics;
+        
         indent.inc();
         print('{');
         
@@ -51,7 +53,6 @@ module.exports.ObjectPattern = {
             const isAssign = valuePath.isAssignmentPattern();
             
             const {shorthand, computed} = property.node;
-            
             const couple = isCoupleLines(valuePath) && !exists(property.getPrevSibling()) && !path.parentPath.isObjectProperty();
             
             maybe.indent(is);
@@ -117,6 +118,17 @@ function checkLength(properties) {
     return false;
 }
 
+function hasAssign(properties) {
+    for (const prop of properties) {
+        const {value} = prop.node;
+        
+        if (isAssignmentPattern(value))
+            return true;
+    }
+    
+    return false;
+}
+
 function hasObjectPattern(properties) {
     for (const property of properties) {
         if (isObjectPattern(property.node.value))
@@ -140,5 +152,8 @@ function shouldAddNewline(path, {maxPropertiesInOneLine}) {
     if (!isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties))
         return COUPLE_LINES;
     
+    if (hasAssign(properties))
+        return COUPLE_LINES;
+    
     return parentPath.isObjectProperty();
 }

package/lib/tokenize/typescript/ts-declare-function.js

@@ -3,7 +3,9 @@
 const {printParams} = require('../expressions/functions/params');
 const {isNext} = require('../is');
 
-const notInsideExport = (path) => !path.parentPath.isExportDeclaration();
+const isInsideExport = (path) => {
+    return path.parentPath.isExportDefaultDeclaration();
+};
 
 module.exports.TSDeclareFunction = (path, printer, semantics) => {
     const {print, maybe} = printer;
@@ -18,6 +20,9 @@ module.exports.TSDeclareFunction = (path, printer, semantics) => {
     print(':');
     print.space();
     print('__returnType');
-    maybe.print(notInsideExport(path), ';');
-    maybe.print.newline(isNext(path));
+    
+    if (!isInsideExport(path)) {
+        print(';');
+        maybe.print.newline(isNext(path) || isNext(path.parentPath));
+    }
 };

package/package.json

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