@putout/printer 5.8.0 → 5.9.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2023.09.23, v5.9.0
+
+feature:
+- f163f9e @putout/printer: drop maybeMarkBefore
+- 06e2b19 @putout/printer: maybeDecorators
+
 2023.09.23, v5.8.0
 
 fix:

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

@@ -2,23 +2,9 @@
 
 const {exists} = require('../../is');
 const {maybePrintTypeAnnotation} = require('../../literals/maybe-type-annotation');
-const {maybePrintDecorators} = require('./maybe-print-decorators');
+const {maybeDecorators} = require('./maybe-decorators');
 
-module.exports.ClassProperty = processClassProperty;
-module.exports.ClassPrivateProperty = processClassProperty;
-
-module.exports.PrivateName = (path, {print}) => {
-    print('#');
-    print('__id');
-};
-
-module.exports.ClassAccessorProperty = (path, printer, semantics) => {
-    processClassProperty(path, printer, semantics, {
-        accessor: true,
-    });
-};
-
-function processClassProperty(path, printer, semantics, {accessor} = {}) {
+const processClassProperty = maybeDecorators((path, printer, semantics, {accessor} = {}) => {
     const {print, maybe} = printer;
     const {node} = path;
     const {
@@ -27,7 +13,6 @@ function processClassProperty(path, printer, semantics, {accessor} = {}) {
         optional,
     } = node;
     
-    maybePrintDecorators(path, printer);
     maybe.print(accessor, 'accessor ');
     
     const value = path.get('value');
@@ -50,4 +35,18 @@ function processClassProperty(path, printer, semantics, {accessor} = {}) {
     
     print(';');
     print.newline();
-}
+});
+
+module.exports.ClassProperty = processClassProperty;
+module.exports.ClassPrivateProperty = processClassProperty;
+
+module.exports.PrivateName = (path, {print}) => {
+    print('#');
+    print('__id');
+};
+
+module.exports.ClassAccessorProperty = (path, printer, semantics) => {
+    processClassProperty(path, printer, semantics, {
+        accessor: true,
+    });
+};

package/lib/tokenize/expressions/class/maybe-decorators.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const {isPrev} = require('../../is');
+
+module.exports.maybeDecorators = (visitor) => (path, printer, semantics, options) => {
+    const {
+        write,
+        traverse,
+        maybe,
+    } = printer;
+    const {decorators} = path.node;
+    
+    if (decorators) {
+        for (const decorator of path.get('decorators')) {
+            maybe.write.breakline(isPrev(path));
+            traverse(decorator);
+            write.breakline();
+        }
+    }
+    
+    visitor(path, printer, semantics, options);
+};

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

@@ -2,10 +2,10 @@
 
 const {isNext} = require('../../is');
 const {printParams} = require('./params');
-const {maybePrintDecorators} = require('../class/maybe-print-decorators');
+const {maybeDecorators} = require('../class/maybe-decorators');
 
 const ClassMethod = {
-    print(path, printer, semantics) {
+    print: maybeDecorators((path, printer, semantics) => {
         const {print, maybe} = printer;
         const {node} = path;
         const {
@@ -20,8 +20,6 @@ const ClassMethod = {
         const isMethod = kind === 'method';
         const isGetter = /get|set/.test(kind);
         
-        maybePrintDecorators(path, printer);
-        
         if (accessibility) {
             print(accessibility);
             print(' ');
@@ -62,7 +60,7 @@ const ClassMethod = {
         
         print.space();
         print('__body');
-    },
+    }),
     afterSatisfy: () => [isNext],
     after(path, {print}) {
         print.linebreak();

package/lib/tokenize/tokenize.js

@@ -19,10 +19,7 @@ const {
 
 const {createDebug, createLog} = require('./debug');
 
-const {
-    maybeMarkAfter,
-    maybeMarkBefore,
-} = require('./mark');
+const {maybeMarkAfter} = require('./mark');
 
 const {
     parseLeadingComments,
@@ -32,7 +29,7 @@ const {
 const {parseOverrides} = require('./overrides');
 
 const isString = (a) => typeof a === 'string';
-const {assign} = Object;
+const {assign, freeze} = Object;
 const callWith = (fn, a) => () => fn(a);
 
 const traversers = {
@@ -164,7 +161,6 @@ module.exports.tokenize = (ast, overrides) => {
     
     const maybe = {
         indent: maybeIndent,
-        markBefore: maybeMarkBefore,
         markAfter: maybeMarkAfter,
         write: maybeWrite,
         space: maybeSpace,
@@ -175,7 +171,7 @@ module.exports.tokenize = (ast, overrides) => {
         dec: maybeIndentDec,
     });
     
-    const printer = {
+    const mainPrinter = freeze({
         indent,
         write,
         debug,
@@ -183,7 +179,7 @@ module.exports.tokenize = (ast, overrides) => {
         maybe,
         quote,
         store: fullstore(),
-    };
+    });
     
     const currentTraversers = {
         ...traversers,
@@ -219,9 +215,10 @@ module.exports.tokenize = (ast, overrides) => {
             roundBraceClose,
         });
         
-        assign(printer, {
+        const printer = {
+            ...mainPrinter,
             print,
-        });
+        };
         
         const maybePrint = (a, b) => a && print(b);
         

package/package.json

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

package/lib/tokenize/expressions/class/maybe-print-decorators.js

@@ -1,16 +0,0 @@
-'use strict';
-
-const {isPrev} = require('../../is');
-
-module.exports.maybePrintDecorators = (path, printer) => {
-    const {print, maybe} = printer;
-    const {decorators} = path.node;
-    
-    if (decorators) {
-        for (const decorator of path.get('decorators')) {
-            maybe.print.breakline(isPrev(path));
-            print(decorator);
-            print.breakline();
-        }
-    }
-};