@putout/printer 1.33.0 → 1.35.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.10, v1.35.0
+
+feature:
+- 855e575 @putout/printer: add support of TSInstantiationExpression
+
+2023.04.10, v1.34.0
+
+feature:
+- d783c21 @putout/printer: improve support of jsx assigned to variable
+
 2023.04.10, v1.33.0
 
 feature:

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/jsx/index.js

@@ -1,18 +1,29 @@
 'use strict';
 
 const {JSXElement} = require('./jsx-element');
+const {JSXAttribute} = require('./jsx-attribute');
+const {isCoupleLines} = require('../is');
 
 module.exports = {
     JSXElement,
-    JSXOpeningElement(path, {print}) {
+    JSXAttribute,
+    JSXOpeningElement(path, {print, maybe}) {
         print('<');
         print('__name');
         
+        const noCoupleLine = !isCoupleLines(path);
+        
         for (const attr of path.get('attributes')) {
-            print.space();
+            maybe.print.space(noCoupleLine);
             print(attr);
         }
         
+        if (isCoupleLines(path))
+            print.breakline();
+        
+        if (path.node.selfClosing)
+            print('/');
+        
         print('>');
     },
     JSXExpressionContainer(path, {print}) {
@@ -20,11 +31,6 @@ module.exports = {
         print('__expression');
         print('}');
     },
-    JSXAttribute(path, {print}) {
-        print('__name');
-        print('=');
-        print('__value');
-    },
     JSXIdentifier(path, {write}) {
         write(path.node.name);
     },

package/lib/tokenize/jsx/jsx-attribute.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const {isCoupleLines} = require('../is');
+
+module.exports.JSXAttribute = {
+    condition(path) {
+        return isCoupleLines(path.parentPath);
+    },
+    before(path, {print, indent}) {
+        indent.inc();
+        print.breakline();
+    },
+    print(path, {print}) {
+        print('__name');
+        print('=');
+        print('__value');
+    },
+    after(path, {indent}) {
+        indent.dec();
+    },
+};

package/lib/tokenize/jsx/jsx-element.js

@@ -4,9 +4,8 @@ module.exports.JSXElement = {
     condition,
     before(path, {write, indent}) {
         write('(');
-        write.breakline();
-        indent();
         indent.inc();
+        write.breakline();
     },
     print(path, {print, traverse}) {
         print('__openingElement');
@@ -21,5 +20,8 @@ module.exports.JSXElement = {
 };
 
 function condition(path) {
-    return path.parentPath.isReturnStatement();
+    if (path.parentPath.isReturnStatement())
+        return true;
+    
+    return path.parentPath.isVariableDeclarator();
 }

package/lib/tokenize/tokenize.js

@@ -114,7 +114,12 @@ module.exports.tokenize = (ast, overrides = {}) => {
     const breakline = () => {
         addToken({
             type: TYPES.NEWLINE,
-            value: `\n${printIndent(i, format.indent)}`,
+            value: '\n',
+        });
+        
+        addToken({
+            type: TYPES.SPACE,
+            value: printIndent(i, format.indent),
         });
     };
     

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.33.0",
+  "version": "1.35.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",