@putout/printer 14.8.0 → 15.1.0

package/ChangeLog

@@ -1,3 +1,21 @@
+2025.06.12, v15.1.0
+
+fix:
+- 7274b61 @putout/printer: ObjectPattern: AssignmentPattern: ObjectExpression: comma
+
+feature:
+- c41eda6 @putout/printer: Decorator: printLeadingCommentLine
+- 88d8cd4 @putout/printer: @putout/plugin-react-hooks v9.0.0
+- 57495a1 @putout/printer: @putout/operate v14.0.1
+
+2025.06.01, v15.0.0
+
+feature:
+- abb07ed @putout/printer: get rid of Record and Tuple (https://github.com/tc39/proposal-record-tuple/issues/394)
+- 6a5ff0c @putout/printer: @putout/compare v18.0.0
+- 9c147b2 @putout/printer: @putout/plugin-promises v18.0.0
+- 0300161 @putout/printer: @putout/babel v4.0.1
+
 2025.05.26, v14.8.0
 
 feature:

package/lib/tokenize/comment/parse-leading-comments.js

@@ -48,12 +48,7 @@ const isInsideVar = (path) => {
     return isVariableDeclarator(parentPath.parentPath);
 };
 
-const hasDecoratorsWithComments = (path) => {
-    if (isDecorator(path))
-        return false;
-    
-    return path?.parentPath.node?.decorators;
-};
+const hasDecoratorsWithComments = (path) => path?.parentPath.node?.decorators;
 
 function isCommentOfPrevious(path) {
     const [comment] = path.node.leadingComments;

package/lib/tokenize/expressions/decorator/decorator.js

@@ -13,3 +13,9 @@ module.exports.Decorator = (path, {print, maybe}) => {
     print('__expression');
     maybe.print(isMember, ')');
 };
+
+module.exports.Decorator.printLeadingCommentLine = (path, printer, semantics, {printComment}) => {
+    const {print} = printer;
+    printComment();
+    print.breakline();
+};

package/lib/tokenize/expressions/function/print-function-params.js

@@ -36,7 +36,7 @@ module.exports.printFunctionParams = (path, printer, semantics) => {
         printer,
     });
     
-    const printAfterOpen = createPrintAfterOpen(path, {
+    const printAfterOpen = createPrintAfterOpen({
         type: 'inc',
         printer,
         isNewline,
@@ -57,7 +57,7 @@ module.exports.printFunctionParams = (path, printer, semantics) => {
     });
 };
 
-const createPrintAfterOpen = (path, {isNewline, isAllHasComments, printer, type}) => () => {
+const createPrintAfterOpen = ({isNewline, isAllHasComments, printer, type}) => () => {
     if (!isNewline)
         return;
     
@@ -67,11 +67,6 @@ const createPrintAfterOpen = (path, {isNewline, isAllHasComments, printer, type}
         indent[type]();
     
     print.breakline();
-    
-    const [first] = path.get('params');
-    
-    if (!first.node.decorators)
-        indent();
 };
 
 const createPrintBeforeClose = ({isNewline, printer, isAllHasComments, type}) => () => {

package/lib/tokenize/expressions/index.js

@@ -39,8 +39,6 @@ const {BinaryExpression} = require('./binary-expression/binary-expression');
 const {LogicalExpression} = require('./logical-expression/logical-expression');
 const {ConditionalExpression} = require('./conditional-expression');
 const {StaticBlock} = require('./class/static-block');
-const {RecordExpression} = require('./object-expression/record-expression');
-const {TupleExpression} = require('./array-expression/tuple-expression');
 const {ImportExpression} = require('./import-expression');
 const {ParenthesizedExpression} = require('./parenthesized-expression/parenthesized-expression');
 
@@ -77,6 +75,4 @@ module.exports = {
     ThisExpression(path, {write}) {
         write('this');
     },
-    RecordExpression,
-    TupleExpression,
 };

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

@@ -181,4 +181,3 @@ function isParens(path) {
     
     return isParentExpression(path);
 }
-

package/lib/tokenize/expressions/object-expression/object-property.js

@@ -1,8 +1,11 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {isConcatenation} = require('../binary-expression/concatenate');
 const {isOneLine} = require('./object-expression');
 const {printKey} = require('./print-key');
+const {isTSImportType} = types;
+const isInsideTSImportType = ({parentPath}) => isTSImportType(parentPath.parentPath);
 
 module.exports.ObjectProperty = (path, printer, semantics) => {
     const {trailingComma} = semantics;
@@ -14,7 +17,6 @@ module.exports.ObjectProperty = (path, printer, semantics) => {
     } = printer;
     
     const value = path.get('value');
-    
     const properties = path.parentPath.get('properties');
     const isLast = path === properties.at(-1);
     const manyLines = !isOneLine(path.parentPath);
@@ -27,7 +29,7 @@ module.exports.ObjectProperty = (path, printer, semantics) => {
         traverse(value);
     }
     
-    if (manyLines)
+    if (manyLines && !isInsideTSImportType(path))
         maybe.write(!isLast || trailingComma, ',');
     else if (!isLast && properties.length)
         write(', ');

package/lib/tokenize/expressions/object-pattern/object-pattern.js

@@ -115,7 +115,7 @@ module.exports.ObjectPattern = {
                 continue;
             }
             
-            if (i < n) {
+            if (i < n && !(isAssign && couple)) {
                 print(',');
                 print.space();
             }

package/lib/tokenize/maybe/index.js

@@ -8,10 +8,10 @@ const maybeSatisfy = require('./satisfy');
 const {
     isProgram,
     isFile,
-    File,
-    ExpressionStatement,
-    Program,
     isStatement,
+    expressionStatement,
+    program,
+    file,
 } = types;
 
 const isFn = (a) => typeof a === 'function';
@@ -26,13 +26,13 @@ module.exports.maybeThrow = (a, path, b) => {
     }));
 };
 
-const maybeStatement = (ast) => isStatement(ast) ? ast : ExpressionStatement(ast);
+const maybeStatement = (ast) => isStatement(ast) ? ast : expressionStatement(ast);
 
-const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
+const maybeProgram = (ast) => isProgram(ast) ? ast : program([
     maybeStatement(ast),
 ]);
 
-module.exports.maybeFile = (ast) => isFile(ast) ? ast : File(maybeProgram(ast));
+module.exports.maybeFile = (ast) => isFile(ast) ? ast : file(maybeProgram(ast));
 
 module.exports.maybeVisitor = (plugin, path, printer, options) => {
     if (isFn(plugin))

package/lib/tokenize/statements/block-statement/block-statement.js

@@ -196,4 +196,3 @@ function isTry({parentPath}) {
     
     return parentPath.parentPath?.isTryStatement();
 }
-

package/lib/tokenize/typescript/ts-parameter-property/ts-parameter-property.js

@@ -10,7 +10,6 @@ module.exports.TSParameterProperty = (path, {print, maybe, indent}) => {
     } = path.node;
     
     const decoratorsLength = decorators?.length > 1;
-    const isNewline = decoratorsLength || hasLeadingComment(path);
     
     maybe.print.breakline(decoratorsLength);
     
@@ -22,11 +21,10 @@ module.exports.TSParameterProperty = (path, {print, maybe, indent}) => {
         
         maybe.print.breakline(decoratorsLength);
         
-        if (isNewline)
-            indent();
-        
         if (!hasLeadingComment(path))
-            print.space();
+            indent();
+        else
+            print(' ');
     }
     
     if (accessibility) {
@@ -48,12 +46,21 @@ module.exports.TSParameterProperty = (path, {print, maybe, indent}) => {
 module.exports.TSParameterProperty.printLeadingCommentLine = (path, printer, semantics, {printComment}) => {
     const {indent, print} = printer;
     
-    if (path.parentPath.isClassMethod() && !path.node.decorators) {
+    if (path.node.decorators) {
+        printComment();
+        print.breakline();
+        
+        return;
+    }
+    
+    if (path.parentPath.isClassMethod()) {
         indent.inc();
         print.breakline();
         
         printComment();
         print.breakline();
         indent.dec();
+        
+        return;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "14.8.0",
+  "version": "15.1.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -33,9 +33,9 @@
     "report": "madrun report"
   },
   "dependencies": {
-    "@putout/babel": "^3.0.0",
-    "@putout/compare": "^17.0.0",
-    "@putout/operate": "^13.0.0",
+    "@putout/babel": "^4.0.1",
+    "@putout/compare": "^18.0.0",
+    "@putout/operate": "^14.0.1",
     "@putout/operator-json": "^2.0.0",
     "fullstore": "^3.0.0",
     "just-snake-case": "^3.2.0",
@@ -72,9 +72,9 @@
     "@putout/eslint": "^4.1.0",
     "@putout/plugin-minify": "^10.0.0",
     "@putout/plugin-printer": "^5.0.0",
-    "@putout/plugin-promises": "^17.0.0",
+    "@putout/plugin-promises": "^18.0.0",
     "@putout/plugin-react-hook-form": "^6.0.0",
-    "@putout/plugin-react-hooks": "^8.0.1",
+    "@putout/plugin-react-hooks": "^9.0.0",
     "acorn": "^8.8.2",
     "c8": "^10.1.2",
     "check-dts": "^0.9.0",

package/lib/tokenize/expressions/array-expression/tuple-expression.js

@@ -1,10 +0,0 @@
-'use strict';
-
-const {ArrayExpression} = require('./array-expression');
-const {maybeVisitor} = require('../../maybe');
-
-module.exports.TupleExpression = (path, operations, semantics) => {
-    const {write} = operations;
-    write('#');
-    maybeVisitor(ArrayExpression, path, operations, semantics);
-};

package/lib/tokenize/expressions/object-expression/record-expression.js

@@ -1,9 +0,0 @@
-'use strict';
-
-const {ObjectExpression} = require('./object-expression');
-
-module.exports.RecordExpression = (path, operations, semantics) => {
-    const {write} = operations;
-    write('#');
-    ObjectExpression(path, operations, semantics);
-};