@putout/printer 8.37.0 → 8.39.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2024.05.26, v8.39.0
+
+feature:
+- cb3474b @putout/printer: TSMethodDeclaration: getter/setter
+
+2024.05.24, v8.38.0
+
+feature:
+- f1f3d74 @putout/printer: check-dts v0.8.0
+- 2e9ff2d @putout/printer: AssignmentExpression: newline after FunctionDeclaration
+
 2024.05.21, v8.37.0
 
 feature:

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

@@ -3,6 +3,7 @@
 const {isObjectPattern} = require('@putout/babel').types;
 const {isParens} = require('../unary-expression/parens');
 const {isCoupleLines} = require('../../is');
+const {isMarkedAfter} = require('../../mark');
 
 module.exports.AssignmentExpression = {
     condition: (path) => {
@@ -34,18 +35,14 @@ module.exports.AssignmentExpression = {
     },
 };
 
-const isPrevCoupleLines = (path) => {
-    const {parentPath} = path;
+const isPrevCoupleLines = ({parentPath}) => {
     const prev = parentPath.getPrevSibling();
     
-    if (!prev.node)
+    if (isMarkedAfter(prev))
         return false;
     
-    const currentStart = path.node?.loc?.start.line;
-    const prevEnd = prev.node?.loc?.end.line;
-    
-    if (!isCoupleLines(prev))
+    if (!prev.node)
         return false;
     
-    return currentStart - prevEnd < 2;
+    return isCoupleLines(prev);
 };

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

@@ -3,22 +3,13 @@
 const {isNext} = require('../../is');
 const {printParams} = require('./params');
 const {maybeDecorators} = require('../../maybe/maybe-decorators');
+const {printKey} = require('./kind');
 
 const ClassMethod = {
     print: maybeDecorators((path, printer, semantics) => {
-        const {print, maybe} = printer;
+        const {print} = printer;
         const {node} = path;
-        const {
-            kind,
-            computed,
-            generator,
-            accessibility,
-            returnType,
-        } = node;
-        
-        const isConstructor = kind === 'constructor';
-        const isMethod = kind === 'method';
-        const isGetter = /get|set/.test(kind);
+        const {accessibility, returnType} = node;
         
         if (accessibility) {
             print(accessibility);
@@ -35,21 +26,7 @@ const ClassMethod = {
             print(' ');
         }
         
-        maybe.print(generator, '*');
-        maybe.print(isConstructor, kind);
-        
-        if (isMethod) {
-            maybe.print(computed, '[');
-            print('__key');
-            maybe.print(computed, ']');
-        }
-        
-        if (isGetter) {
-            print(kind);
-            print(' ');
-            print('__key');
-        }
-        
+        printKey(path, printer);
         printParams(path, printer, semantics);
         
         if (returnType) {

package/lib/tokenize/expressions/function/kind.js

@@ -0,0 +1,21 @@
+'use strict';
+
+module.exports.printKey = (path, {write, traverse, maybe}) => {
+    const key = path.get('key');
+    const {
+        kind,
+        computed,
+        generator,
+    } = path.node;
+    
+    const isGetter = kind === 'get' || kind === 'set';
+    
+    if (isGetter)
+        write(`${kind} `);
+    else if (generator)
+        write('*');
+    
+    maybe.write(computed, '[');
+    traverse(key);
+    maybe.write(computed, ']');
+};

package/lib/tokenize/expressions/function/object-method.js

@@ -2,6 +2,7 @@
 
 const {isNewlineBetweenSiblings} = require('../../is');
 const {printParams} = require('./params');
+const {printKey} = require('./kind');
 
 module.exports.ObjectMethod = {
     beforeIf(path) {
@@ -11,23 +12,9 @@ module.exports.ObjectMethod = {
         write('async ');
     },
     print(path, printer, semantics) {
-        const {print, maybe} = printer;
-        
-        const {
-            kind,
-            generator,
-            computed,
-        } = path.node;
-        
-        const notMethod = kind !== 'method';
-        
-        maybe.print(notMethod, `${kind} `);
-        maybe.print(generator, '*');
-        
-        maybe.print(computed, '[');
-        print('__key');
-        maybe.print(computed, ']');
+        const {print} = printer;
         
+        printKey(path, printer);
         printParams(path, printer, semantics);
         
         print.space();

package/lib/tokenize/typescript/function/ts-method-signature.js

@@ -1,16 +1,16 @@
 'use strict';
 
 const {printParams} = require('../../expressions/function/params');
-
+const {printKey} = require('../../expressions/function/kind');
 const {
     hasReturnType,
     printReturnType,
 } = require('./print-return-type');
 
 module.exports.TSMethodSignature = (path, printer, semantics) => {
-    const {traverse, write} = printer;
+    const {write} = printer;
     
-    traverse(path.get('key'));
+    printKey(path, printer);
     printParams(path, printer, semantics);
     
     if (hasReturnType(path)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "8.37.0",
+  "version": "8.39.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -53,7 +53,7 @@
     "@putout/plugin-react-hooks": "^6.0.0",
     "acorn": "^8.8.2",
     "c8": "^9.1.0",
-    "check-dts": "^0.7.2",
+    "check-dts": "^0.8.0",
     "escover": "^4.0.1",
     "eslint": "^9.0.0",
     "eslint-plugin-putout": "^22.0.0",