@putout/printer 1.38.0 → 1.40.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.13, v1.40.0
+
+feature:
+- 4cd3b37 @putout/printer: add support of TSStringKeyword
+
+2023.04.12, v1.39.0
+
+feature:
+- b14f85d @putout/printer: add support of TSQualifiedName
+
 2023.04.12, v1.38.0
 
 feature:

package/lib/tokenize/expressions/functions.js

@@ -106,13 +106,13 @@ module.exports.FunctionDeclaration = (path, {print, maybe}) => {
     print('__body');
 };
 
-module.exports.ClassMethod = (path, {print}) => {
+module.exports.ClassMethod = (path, {print, maybe}) => {
     const {kind} = path.node;
+    const notMethod = kind !== 'method';
+    const notConstructor = kind !== 'constructor';
     
-    if (kind !== 'method')
-        print(`${kind} `);
-    
-    print('__key');
+    maybe.print(notMethod, `${kind} `);
+    maybe.print(notConstructor, '__key');
     print('(');
     
     const params = path.get('params');

package/lib/tokenize/maybe.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const isFn = (a) => typeof a === 'function';
+const rendy = require('rendy');
 
 const {
     isProgram,
@@ -10,6 +10,18 @@ const {
     Program,
 } = require('@babel/types');
 
+const isFn = (a) => typeof a === 'function';
+
+module.exports.maybeThrow = (a, path, b) => {
+    if (!a)
+        return;
+    
+    throw Error(rendy(b, {
+        path,
+        type: path.type,
+    }));
+};
+
 const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
     ExpressionStatement(ast),
 ]);

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

@@ -1,7 +1,17 @@
 'use strict';
 
-module.exports.ExportDefaultDeclaration = (path, {print}) => {
-    print('export default ');
-    print('__declaration');
-    print(';');
+module.exports.ExportDefaultDeclaration = {
+    /*
+    beforeIf(path) {
+        return path.getPrevSibling().isTSTypeAliasDeclaration();
+    },
+    before(path, {print}) {
+        print.breakline();
+    },
+     */print(path, {print, traverse, maybe}) {
+        const declaration = path.get('declaration');
+        print('export default ');
+        traverse(declaration);
+        maybe.print(!declaration.isClassDeclaration(), ';');
+    },
 };

package/lib/tokenize/tokenize.js

@@ -14,6 +14,7 @@ const {TYPES} = require('../types');
 const {
     maybeFile,
     maybePlugin,
+    maybeThrow,
 } = require('./maybe');
 
 const {
@@ -138,6 +139,13 @@ module.exports.tokenize = (ast, overrides = {}) => {
         space,
     });
     
+    assign(maybeWrite, {
+        newline: maybeNewline,
+        breakline: maybeBreakline,
+        linebreak: maybeLinebreak,
+        space: maybeSpace,
+    });
+    
     const maybe = {
         indent: maybeIndent,
         markBefore: maybeMarkBefore,
@@ -206,12 +214,13 @@ module.exports.tokenize = (ast, overrides = {}) => {
             print: maybePrint,
         });
         
-        if (!currentTraverse)
-            throw Error(`Node type '${type}' is not supported yet: '${path}'`);
+        maybeThrow(!currentTraverse, path, `Node type '{{ type }}' is not supported yet: '{{ path }}'`);
         
+        const currentIndent = i;
         parseLeadingComments(path, printer);
         maybePlugin(currentTraverse, path, printer);
         parseTrailingComments(path, printer);
+        maybeThrow(i !== currentIndent, path, `☝️Looks like indent level changed after token visitor: '{{ type }}', for code: '{{ path }}'`);
         debug(path.type);
     }
     

package/lib/tokenize/typescript/index.js

@@ -2,9 +2,11 @@
 
 const {exists} = require('../is');
 const {TSTypeLiteral} = require('./ts-type-literal');
+const {TSTypeAliasDeclaration} = require('./ts-type-alias-declaration');
 
 module.exports = {
     TSTypeLiteral,
+    TSTypeAliasDeclaration,
     TSTypeParameterDeclaration(path, {print}) {
         print('<');
         
@@ -32,6 +34,9 @@ module.exports = {
     TSNumberKeyword(path, {write}) {
         write('number');
     },
+    TSStringKeyword(path, {write}) {
+        write('string');
+    },
     TSInstantiationExpression(path, {print}) {
         print('__expression');
         print('__typeParameters');
@@ -50,6 +55,16 @@ module.exports = {
         print.space();
         print('__typeAnnotation');
     },
+    TSQualifiedName(path, {print}) {
+        print('__left');
+        print('.');
+        print('__right');
+    },
+    TSParameterProperty(path, {write, print}) {
+        write(path.node.accessibility);
+        write.space();
+        print('__parameter');
+    },
     TSTypeAnnotation(path, {print}) {
         if (path.parentPath.isIdentifier()) {
             print(':');
@@ -62,15 +77,6 @@ module.exports = {
         print('__expression');
         print('__typeParameters');
     },
-    TSTypeAliasDeclaration(path, {print}) {
-        print('type ');
-        print('__id');
-        print.space();
-        print('=');
-        print.space();
-        print('__typeAnnotation');
-        print(';');
-    },
     TSPropertySignature(path, {print, maybe, traverse}) {
         const {optional} = path.node;
         const typeAnnotation = path.get('typeAnnotation');

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

@@ -0,0 +1,33 @@
+'use strict';
+
+const {isLast} = require('../is');
+const isNextType = (a) => a.getNextSibling().isTSTypeAliasDeclaration();
+
+module.exports.TSTypeAliasDeclaration = {
+    print(path, {print, maybe, store}) {
+        print('type ');
+        print('__id');
+        print.space();
+        print('=');
+        print.space();
+        print('__typeAnnotation');
+        print(';');
+        
+        const is = store(isLast(path));
+        maybe.print.newline(!is);
+    },
+    afterIf(path, {store}) {
+        const last = store();
+        
+        if (last)
+            return false;
+        
+        if (isNextType(path))
+            return false;
+        
+        return true;
+    },
+    after(path, {print}) {
+        print.newline();
+    },
+};

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

@@ -1,5 +1,7 @@
 'use strict';
 
+const {isNext} = require('../is');
+
 module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
     const members = path.get('members');
     write('{');
@@ -15,11 +17,14 @@ module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
         indent();
         traverse(member);
         maybe.write(is, ';');
+        
+        if (is && isNext(member))
+            write.newline(is);
     }
     
     if (is) {
         write.newline();
-        indent.inc();
+        indent.dec();
     }
     
     write('}');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.38.0",
+  "version": "1.40.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",
@@ -32,7 +32,8 @@
     "@babel/types": "^7.21.3",
     "@putout/compare": "^9.13.0",
     "fullstore": "^3.0.0",
-    "just-snake-case": "^3.2.0"
+    "just-snake-case": "^3.2.0",
+    "rendy": "^3.1.1"
   },
   "keywords": [
     "putout",