@putout/printer 1.34.0 → 1.36.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.11, v1.36.0
+
+feature:
+- 03bd597 @putout/printer: improve support of nested ObjectPattern
+
+2023.04.10, v1.35.0
+
+feature:
+- 855e575 @putout/printer: add support of TSInstantiationExpression
+
 2023.04.10, v1.34.0
 
 feature:

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

@@ -9,7 +9,7 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
     
     const properties = path.get('properties');
     const n = properties.length - 1;
-    const is = !isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties);
+    const is = shouldAddNewline(path);
     
     maybe.print(is, '\n');
     
@@ -63,3 +63,16 @@ function checkLength(properties) {
     
     return false;
 }
+
+function shouldAddNewline(path) {
+    const properties = path.get('properties');
+    const n = properties.length - 1;
+    
+    if (!isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties))
+        return true;
+    
+    if (path.parentPath.isObjectProperty())
+        return true;
+    
+    return false;
+}

package/lib/tokenize/is.js

@@ -42,6 +42,7 @@ function isCoupleLines(path) {
     
     return end > start;
 }
+module.exports.exists = (a) => a.node;
 
 function isNextCoupleLines(path) {
     return isCoupleLines(path.getNextSibling());

package/lib/tokenize/typescript/index.js

@@ -1,6 +1,10 @@
 'use strict';
 
+const {exists} = require('../is');
+const {TSTypeLiteral} = require('./ts-type-literal');
+
 module.exports = {
+    TSTypeLiteral,
     TSTypeParameterDeclaration(path, {print}) {
         print('<');
         
@@ -28,6 +32,10 @@ module.exports = {
     TSNumberKeyword(path, {write}) {
         write('number');
     },
+    TSInstantiationExpression(path, {print}) {
+        print('__expression');
+        print('__typeParameters');
+    },
     TSAnyKeyword(path, {write}) {
         write('any');
     },
@@ -63,27 +71,17 @@ module.exports = {
         print('__typeAnnotation');
         print(';');
     },
-    TSTypeLiteral(path, {indent, traverse, write}) {
-        write('{');
-        write.newline();
-        indent.inc();
-        
-        for (const member of path.get('members')) {
-            indent();
-            traverse(member);
-            write(';');
-        }
-        
-        write.newline();
-        indent.dec();
-        write('}');
-    },
-    TSPropertySignature(path, {print, maybe}) {
+    TSPropertySignature(path, {print, maybe, traverse}) {
         const {optional} = path.node;
+        const typeAnnotation = path.get('typeAnnotation');
+        
         print('__key');
         maybe.print(optional, '?');
-        print(':');
-        print.space();
-        print('__typeAnnotation');
+        
+        if (exists(typeAnnotation)) {
+            print(':');
+            print.space();
+            traverse(typeAnnotation);
+        }
     },
 };

package/lib/tokenize/typescript/ts-type-literal.js

@@ -0,0 +1,35 @@
+'use strict';
+
+module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
+    const members = path.get('members');
+    write('{');
+    
+    const is = isNewline(path);
+    
+    if (is) {
+        write.newline();
+        indent.inc();
+    }
+    
+    for (const member of members) {
+        indent();
+        traverse(member);
+        maybe.write(is, ';');
+    }
+    
+    if (is) {
+        write.newline();
+        indent.inc();
+    }
+    
+    write('}');
+};
+
+function isNewline(path) {
+    const members = path.get('members');
+    
+    if (members.length && members[0].node.typeAnnotation)
+        return true;
+    
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.34.0",
+  "version": "1.36.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",