@putout/printer 15.0.0 → 15.1.1

package/ChangeLog

@@ -1,3 +1,18 @@
+2025.06.12, v15.1.1
+
+feature:
+- e67a827 @putout/printer: ObjectPattern: Assign: improve
+
+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:

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/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

@@ -1,7 +1,6 @@
 'use strict';
 
 const {types} = require('@putout/babel');
-
 const {wrongShorthand} = require('./wrong-shortand');
 
 const {
@@ -15,13 +14,20 @@ const {moreThenMaxPropertiesInOneLine} = require('./more-then-max-properties-in-
 const {maybeTypeAnnotation} = require('../../maybe/maybe-type-annotation');
 const {moreThenMaxPropertiesLengthInOneLine} = require('./more-then-max-properties-length-in-one-line');
 const {printKey} = require('../object-expression/print-key');
-const isInsideFn = (path) => path.parentPath.isFunction();
+
+const isInsideFn = (path) => {
+    if (isFunction(path.parentPath))
+        return true;
+    
+    return isFunction(path.parentPath.parentPath);
+};
 
 const {
     isIdentifier,
     isObjectPattern,
     isAssignmentPattern,
     isVariableDeclarator,
+    isFunction,
 } = types;
 
 function isIndent(path) {
@@ -67,8 +73,8 @@ module.exports.ObjectPattern = {
         });
         
         const hasObject = n && hasObjectPattern(properties);
-        
         const notInsideFn = !isInsideFn(path);
+        
         maybe.print.newline(is && notInsideFn);
         
         for (const [i, property] of properties.entries()) {
@@ -81,6 +87,9 @@ module.exports.ObjectPattern = {
                 continue;
             }
             
+            const prev = property.getPrevSibling();
+            const prevAssign = i && isAssignmentPattern(prev.node.value);
+            
             const valuePath = property.get('value');
             const keyPath = property.get('key');
             const isAssign = valuePath.isAssignmentPattern();
@@ -92,7 +101,7 @@ module.exports.ObjectPattern = {
                 valuePath,
             });
             
-            maybe.indent(is && notInsideFn);
+            maybe.indent((prevAssign || is) && notInsideFn);
             maybe.print.breakline(couple);
             
             printKey(property, printer);
@@ -108,14 +117,14 @@ module.exports.ObjectPattern = {
                 maybe.print.newline(couple);
             }
             
-            if (is || hasObject) {
+            if (is || hasObject || prevAssign && notInsideFn) {
                 print(',');
                 print.newline();
                 
                 continue;
             }
             
-            if (i < n) {
+            if (i < n && !(isAssign && couple)) {
                 print(',');
                 print.space();
             }
@@ -209,3 +218,4 @@ function isFunctionParam({parentPath}) {
     
     return parentPath.parentPath.isFunction();
 }
+

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": "15.0.0",
+  "version": "15.1.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@putout/babel": "^4.0.1",
     "@putout/compare": "^18.0.0",
-    "@putout/operate": "^13.0.0",
+    "@putout/operate": "^14.0.1",
     "@putout/operator-json": "^2.0.0",
     "fullstore": "^3.0.0",
     "just-snake-case": "^3.2.0",
@@ -74,7 +74,7 @@
     "@putout/plugin-printer": "^5.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",