@putout/printer 1.58.0 → 1.60.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.20, v1.60.0
+
+feature:
+- 4ed5ce4 @putout/printer: improve support of clases
+
+2023.04.20, v1.59.0
+
+feature:
+- 83d8323 @putout/printer: add support of Super
+
 2023.04.19, v1.58.0
 
 feature:

package/lib/tokenize/debug.js

@@ -8,6 +8,7 @@ const {
     LOG,
     LOG_ALL,
     LOG_TOKENS,
+    LOG_TERM,
     DEBUG,
 } = process.env;
 
@@ -54,6 +55,10 @@ module.exports.createLog = ({newline = '\n', store = createStore()} = {}) => ({t
         
         store(value);
     }
+    
+    if (LOG_TERM) {
+        process.stdout.write(value);
+    }
 };
 
 function createStore() {

package/lib/tokenize/expressions/functions/class-method.js

@@ -0,0 +1,42 @@
+'use strict';
+
+const {isNext} = require('../../is');
+
+module.exports.ClassMethod = {
+    print(path, {print, maybe}) {
+        const {kind} = path.node;
+        const isConstructor = kind === 'constructor';
+        const isMethod = kind === 'method';
+        const isGetter = /get|set/.test(kind);
+        
+        maybe.print(isConstructor, kind);
+        maybe.print(isMethod, '__key');
+        
+        if (isGetter) {
+            print(kind);
+            print(' ');
+            print('__key');
+        }
+        
+        print('(');
+        
+        const params = path.get('params');
+        const n = params.length;
+        
+        for (let i = 0; i < n; i++) {
+            print(params[i]);
+            
+            if (i < n - 1)
+                print(', ');
+        }
+        
+        print(') ');
+        print('__body');
+    },
+    afterSatisfy: () => [
+        isNext,
+    ],
+    after(path, {print}) {
+        print.linebreak();
+    },
+};

package/lib/tokenize/expressions/functions/functions.js

@@ -2,9 +2,11 @@
 
 const {ArrowFunctionExpression} = require('./arrow-function-expression');
 const {FunctionDeclaration} = require('./function-declaration');
+const {ClassMethod} = require('./class-method');
 
 module.exports.ArrowFunctionExpression = ArrowFunctionExpression;
 module.exports.FunctionDeclaration = FunctionDeclaration;
+module.exports.ClassMethod = ClassMethod;
 
 module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
     const {node} = path;
@@ -63,26 +65,3 @@ module.exports.ObjectMethod = (path, {print}) => {
     print(') ');
     print('__body');
 };
-
-module.exports.ClassMethod = (path, {print, maybe}) => {
-    const {kind} = path.node;
-    const notMethod = kind !== 'method';
-    const notConstructor = kind !== 'constructor';
-    
-    maybe.print(notMethod, `${kind} `);
-    maybe.print(notConstructor, '__key');
-    print('(');
-    
-    const params = path.get('params');
-    const n = params.length;
-    
-    for (let i = 0; i < n; i++) {
-        print(params[i]);
-        
-        if (i < n - 1)
-            print(', ');
-    }
-    
-    print(') ');
-    print('__body');
-};

package/lib/tokenize/jsx/index.js

@@ -20,7 +20,8 @@ module.exports = {
         write(path.node.name);
     },
     JSXText(path, {write}) {
-        write(path.node.value);
+        const {value} = path.node;
+        write(value);
     },
     JSXMemberExpression(path, {print}) {
         print('__object');

package/lib/tokenize/literals/index.js

@@ -42,4 +42,7 @@ module.exports = {
     Import(path, {write}) {
         write('import');
     },
+    Super(path, {write}) {
+        write('super');
+    },
 };

package/lib/tokenize/tokenize.js

@@ -100,10 +100,8 @@ module.exports.tokenize = (ast, overrides = {}) => {
     });
     
     const linebreak = () => {
-        addToken({
-            type: TYPES.NEWLINE,
-            value: `${printIndent(i, format.indent)}\n`,
-        });
+        indent();
+        newline();
     };
     
     const space = () => {
@@ -114,15 +112,8 @@ module.exports.tokenize = (ast, overrides = {}) => {
     };
     
     const breakline = () => {
-        addToken({
-            type: TYPES.NEWLINE,
-            value: '\n',
-        });
-        
-        addToken({
-            type: TYPES.SPACE,
-            value: printIndent(i, format.indent),
-        });
+        newline();
+        indent();
     };
     
     const newline = () => {
@@ -219,7 +210,10 @@ module.exports.tokenize = (ast, overrides = {}) => {
         
         const currentIndent = i;
         parseLeadingComments(path, printer);
+        
+        // this is main thing
         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/types.js

@@ -6,4 +6,5 @@ module.exports.TYPES = {
     LINEBREAK: 'Linebreak',
     INDENT: 'Indent',
     DEBUG: 'Debug',
+    SPACE: 'Space',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.58.0",
+  "version": "1.60.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",
@@ -45,6 +45,7 @@
     "generate"
   ],
   "devDependencies": {
+    "@putout/plugin-react-hooks": "^5.0.0",
     "@putout/test": "^6.0.1",
     "acorn": "^8.8.2",
     "c8": "^7.5.0",