@putout/printer 1.18.2 → 1.20.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.03, v1.20.0
+
+feature:
+- 069b266 @putout/printer: add support of TSPropertySignature
+
+2023.04.03, v1.19.0
+
+feature:
+- c439209 @putout/printer: add support of TSTypeAliasDeclaration
+
 2023.04.02, v1.18.2
 
 feature:

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

@@ -21,13 +21,10 @@ function BinaryExpression(path, {write, traverse, maybe}) {
     maybe.write(isLeft, '(');
     traverse(left);
     maybe.write(isLeft, ')');
-    
     write.space();
     write(path.node.operator);
     write.space();
-    
     maybe.write(isRight, '(');
     traverse(right);
     maybe.write(isRight, ')');
 }
-

package/lib/tokenize/expressions/class.js

@@ -5,7 +5,10 @@ module.exports.ClassDeclaration = classVisitor;
 
 module.exports.ClassDeclaration = (path, {print, indent}) => {
     indent();
-    classVisitor(path, {print, indent});
+    classVisitor(path, {
+        print,
+        indent,
+    });
 };
 
 function classVisitor(path, {print, indent}) {

package/lib/tokenize/expressions/member-expressions.js

@@ -17,7 +17,17 @@ module.exports.MemberExpression = (path, {print}) => {
 };
 
 module.exports.OptionalMemberExpression = (path, {print}) => {
+    const {computed} = path.node;
     print('__object');
     print('?.');
+    
+    if (computed) {
+        print('[');
+        print('__property');
+        print(']');
+        
+        return;
+    }
+    
     print('__property');
 };

package/lib/tokenize/expressions/unary-expressions.js

@@ -43,7 +43,6 @@ function unaryExpression(path, {maybe, traverse}) {
     
     maybe.print(prefix, operator);
     maybe.print(isWord(operator), ' ');
-    
     maybe.print(round, '(');
     traverse(argPath);
     maybe.print(round, ')');

package/lib/tokenize/statements/for-statement.js

@@ -25,7 +25,6 @@ module.exports.ForStatement = {
             print('__body');
         } else {
             const is = !path.get('body').isEmptyStatement();
-            
             maybe.print.newline(is);
             maybe.indent.inc(is);
             print('__body');

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

@@ -20,7 +20,9 @@ module.exports.ImportDeclaration = {
             if (spec.isImportSpecifier()) {
                 maybe.print(index, ', ');
                 maybe.print(!wasSpecifier, '{');
+                
                 wasSpecifier = true;
+                
                 print(spec.get('imported'));
                 maybe.print(index === n, '}');
                 

package/lib/tokenize/tokenize.js

@@ -234,11 +234,13 @@ const createPrint = (path, {traverse, write}) => (maybeLine) => {
 };
 
 const computePath = (path, maybeLine) => {
-    if (isString(maybeLine) && maybeLine.startsWith(GET))
+    if (isString(maybeLine) && maybeLine.startsWith(GET)) {
         return get(path, maybeLine);
+    }
     
     if (isObject(maybeLine))
         return maybeLine;
     
     return maybeLine;
 };
+

package/lib/tokenize/typescript/index.js

@@ -23,13 +23,59 @@ module.exports = {
     TSAnyKeyword(path, {write}) {
         write('any');
     },
-    TSTypeAnnotation(path, {print}) {
-        print(':');
+    TSVoidKeyword(path, {write}) {
+        write('void');
+    },
+    TSFunctionType(path, {print}) {
+        print('(');
+        print(')');
+        print.space();
+        print('=>');
         print.space();
         print('__typeAnnotation');
     },
+    TSTypeAnnotation(path, {print}) {
+        if (path.parentPath.isIdentifier()) {
+            print(':');
+            print.space();
+        }
+        
+        print('__typeAnnotation');
+    },
     TSExpressionWithTypeArguments(path, {print}) {
         print('__expression');
         print('__typeParameters');
     },
+    TSTypeAliasDeclaration(path, {print}) {
+        print('type ');
+        print('__id');
+        print.space();
+        print('=');
+        print.space();
+        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}) {
+        const {optional} = path.node;
+        print('__key');
+        maybe.print(optional, '?');
+        print(':');
+        print.space();
+        print('__typeAnnotation');
+    },
 };
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.18.2",
+  "version": "1.20.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",
@@ -56,7 +56,7 @@
     "montag": "^1.0.0",
     "nodemon": "^2.0.1",
     "putout": "*",
-    "putout-plugin-apply-computed-print": "./rules/putout-plugin-apply-computed-print",
+    "putout-plugin-printer": "./rules",
     "supertape": "^8.0.0",
     "try-catch": "^3.0.0"
   },

package/rules/putout-plugin-apply-computed-print/index.js

@@ -1,21 +0,0 @@
-'use strict';
-
-const {assign} = Object;
-
-module.exports.report = () => `Use print('__path') instead of path.get(__path)`;
-
-module.exports.replace = () => ({
-    'print(path.get(__a))': ({__a}) => {
-        const {
-            raw,
-            value,
-        } = __a;
-        
-        assign(__a, {
-            value: `__${value}`,
-            raw: raw.replace(value, `__${value}`),
-        });
-        
-        return 'print(__a)';
-    },
-});