@putout/printer 5.13.0 → 5.14.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2023.10.02, v5.14.0
+
+feature:
+- 0157a3c @putout/printer: ClassDeclaration: declare
+- 09310b8 @putout/printer: typescript: maybeDeclare
+
 2023.10.02, v5.13.0
 
 feature:

package/lib/tokenize/expressions/class/class.js

@@ -3,13 +3,14 @@
 const {isNext} = require('../../is');
 const {markAfter} = require('../../mark');
 const {maybeDecorators} = require('../../maybe-get');
+const {maybeDeclare} = require('../../typescript/namespace/maybeDeclare');
 
 const isInsideExport = ({parentPath}) => parentPath.isExportDeclaration();
 
 module.exports.ClassExpression = classVisitor;
 
 module.exports.ClassDeclaration = {
-    print(path, {print, indent, maybe, traverse}) {
+    print: maybeDeclare((path, {print, indent, maybe, traverse}) => {
         indent();
         
         classVisitor(path, {
@@ -18,7 +19,7 @@ module.exports.ClassDeclaration = {
             maybe,
             traverse,
         });
-    },
+    }),
     afterIf(path) {
         if (!isNext(path))
             return false;

package/lib/tokenize/statements/variable-declaration/variable-declaration.js

@@ -14,6 +14,7 @@ const {maybeSpaceAfterKeyword} = require('./maybe-space-after-keyword');
 
 const {isConcatenation} = require('../../expressions/binary-expression/concatanate');
 const {parseLeadingComments} = require('../../comment/comment');
+const {maybeDeclare} = require('../../typescript/namespace/maybeDeclare');
 
 const isParentTSModuleBlock = (path) => path.parentPath.isTSModuleBlock();
 const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parentPath.type);
@@ -26,15 +27,11 @@ module.exports.VariableDeclaration = {
     before(path, {print}) {
         print.breakline();
     },
-    print(path, {maybe, store, write, traverse, print, indent}, semantics) {
-        const {declare} = path.node;
+    print: maybeDeclare((path, {maybe, store, write, traverse, print, indent}, semantics) => {
         const {maxVariablesInOneLine} = semantics;
         
         maybe.indent(isInsideBlock(path));
         
-        if (declare)
-            write('declare ');
-        
         write(path.node.kind);
         maybeSpaceAfterKeyword(path, {
             write,
@@ -94,7 +91,7 @@ module.exports.VariableDeclaration = {
         }
         
         store(wasNewline);
-    },
+    }),
     afterSatisfy: () => [
         noNextParentBlock,
         notLastCoupleLines,

package/lib/tokenize/typescript/function/ts-declare-function.js

@@ -8,9 +8,14 @@ const isInsideExport = (path) => {
 };
 
 module.exports.TSDeclareFunction = (path, printer, semantics) => {
-    const {print, maybe} = printer;
+    const {
+        print,
+        maybe,
+        indent,
+    } = printer;
     const {declare} = path.node;
     
+    indent();
     maybe.print(declare, 'declare ');
     print('function ');
     print('__id');
@@ -26,3 +31,4 @@ module.exports.TSDeclareFunction = (path, printer, semantics) => {
         maybe.print.newline(isNext(path) || isNext(path.parentPath));
     }
 };
+

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

@@ -4,7 +4,11 @@ const {printParams} = require('../../expressions/function/params');
 
 module.exports.TSDeclareMethod = (path, printer, semantics) => {
     const {print} = printer;
-    const {accessibility, abstract} = path.node;
+    const {
+        accessibility,
+        abstract,
+        returnType,
+    } = path.node;
     
     if (accessibility) {
         print(accessibility);
@@ -20,9 +24,13 @@ module.exports.TSDeclareMethod = (path, printer, semantics) => {
     
     printParams(path, printer, semantics);
     
-    print(':');
-    print.space();
-    print('__returnType');
+    if (returnType) {
+        print(':');
+        print.space();
+        print('__returnType');
+    }
+    
     print(';');
     print.newline();
 };
+

package/lib/tokenize/typescript/index.js

@@ -12,7 +12,7 @@ const {TSDeclareMethod} = require('./function/ts-declare-method');
 const {
     TSModuleDeclaration,
     TSModuleBlock,
-} = require('./ts-module-declaration');
+} = require('./namespace/ts-module-declaration');
 
 const {TSInterfaceDeclaration} = require('./interface/ts-interface-declaration');
 const {TSAsExpression} = require('./ts-as-expression');

package/lib/tokenize/typescript/interface/ts-interface-declaration.js

@@ -1,23 +1,19 @@
 'use strict';
 
-const {isNext, isNextParent} = require('../../is');
 const {
     isTSTypeAliasDeclaration,
     isExportDeclaration,
 } = require('@putout/babel').types;
 
+const {isNext, isNextParent} = require('../../is');
+const {maybeDeclare} = require('../namespace/maybeDeclare');
+
 module.exports.TSInterfaceDeclaration = {
-    beforeIf(path) {
-        return path.node.declare;
-    },
-    before(path, {print}) {
-        print('declare ');
-    },
-    print(path, {print}) {
+    print: maybeDeclare((path, {print}) => {
         print('interface ');
         print('__id');
         print('__body');
-    },
+    }),
     afterSatisfy: () => [isNext, isNextParent],
     after(path, {print}) {
         const next = path.parentPath.getNextSibling();

package/lib/tokenize/typescript/namespace/maybeDeclare.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports.maybeDeclare = (visit) => (path, printer, semantics) => {
+    const {maybe} = printer;
+    const {declare} = path.node;
+    
+    maybe.print(declare, 'declare ');
+    visit(path, printer, semantics);
+};

package/lib/tokenize/typescript/{ts-module-declaration.js → namespace/ts-module-declaration.js}

@@ -1,17 +1,15 @@
 'use strict';
 
-const {isNext} = require('../is');
+const {isNext} = require('../../is');
+const {maybeDeclare} = require('./maybeDeclare');
 
 module.exports.TSModuleDeclaration = {
-    print(path, {print, maybe}) {
-        const {declare} = path.node;
-        maybe.print(declare, 'declare ');
-        
+    print: maybeDeclare((path, {print}) => {
         print('namespace ');
         print('__id');
         print.space();
         print('__body');
-    },
+    }),
     afterSatisfy: () => [isNext],
     after(path, {print}) {
         print.newline();

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

@@ -2,16 +2,11 @@
 
 const {isLast} = require('../../is');
 const {markAfter} = require('../../mark');
+const {maybeDeclare} = require('../namespace/maybeDeclare');
 const isNextType = (a) => a.getNextSibling().isTSTypeAliasDeclaration();
 
 module.exports.TSTypeAliasDeclaration = {
-    beforeIf(path) {
-        return path.node.declare;
-    },
-    before(path, {print}) {
-        print('declare ');
-    },
-    print(path, {print, maybe, store}) {
+    print: maybeDeclare((path, {print, maybe, store}) => {
         const typeAnnotation = path.get('typeAnnotation');
         const isConditional = typeAnnotation.isTSConditionalType();
         
@@ -28,7 +23,7 @@ module.exports.TSTypeAliasDeclaration = {
         
         const is = store(isLast(path) || isLast(path.parentPath));
         maybe.print.newline(!is);
-    },
+    }),
     afterIf(path, {store}) {
         const last = store();
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "5.13.0",
+  "version": "5.14.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",