@putout/printer 10.4.0 → 10.5.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.11.28, v10.5.0
+
+feature:
+- 9e2a3c5 @putout/printer: ObjectPattern: nested
+
+2024.11.27, v10.4.1
+
+fix:
+- 2b128c2 @putout/printer: comments
+
 2024.11.27, v10.4.0
 
 feature:

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

@@ -76,8 +76,10 @@ function isCommentOnNextLine(path) {
     if (!loc)
         return true;
     
-    const isNextLine = line === loc.start.line + 1;
-    const isNextLineAfterNewline = line === loc.start.line + 2;
+    const startLine = loc.start.line;
+    const endLine = loc.end.line;
+    const isNextLine = line === startLine + 1 && line === endLine + 1;
+    const isNextLineAfterNewline = line === startLine + 2 && line === endLine + 2;
     
     return isNextLine || isNextLineAfterNewline;
 }

package/lib/tokenize/expressions/object-pattern/more-then-max-properties-length-in-one-line.js

@@ -1,9 +1,10 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isAssignmentPattern,
     isIdentifier,
-} = require('@putout/babel').types;
+} = types;
 
 module.exports.moreThenMaxPropertiesLengthInOneLine = (path, {maxPropertiesLengthInOneLine}) => {
     const {properties} = path.node;

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

@@ -4,6 +4,7 @@ const {
     isIdentifier,
     isObjectPattern,
     isAssignmentPattern,
+    isVariableDeclarator,
 } = require('@putout/babel').types;
 
 const {wrongShorthand} = require('./wrong-shortand');
@@ -20,9 +21,6 @@ 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 isTwoLevelsDeep = ({parentPath}) => parentPath.parentPath.parentPath.isObjectProperty();
-const isOneParentProperty = ({parentPath}) => parentPath.parentPath.node.properties?.length === 1;
-
 function isIndent(path) {
     return !path.parentPath.isArrayPattern();
 }
@@ -34,6 +32,9 @@ const isCoupleProperties = ({path, valuePath, property}) => {
     if (exists(property.getPrevSibling()))
         return false;
     
+    if (path.parentPath.isVariableDeclarator() && !hasAssign(path.get('properties')))
+        return false;
+    
     return !path.parentPath.isObjectProperty();
 };
 
@@ -103,7 +104,7 @@ module.exports.ObjectPattern = {
                 maybe.print.newline(couple);
             }
             
-            if (is || hasObject && !isAssign) {
+            if (is || hasObject) {
                 print(',');
                 print.newline();
                 
@@ -121,18 +122,6 @@ module.exports.ObjectPattern = {
         maybe.indent.inc(!shouldIndent);
         print('}');
     }),
-    afterIf(path) {
-        if (!path.parentPath.isObjectProperty())
-            return false;
-        
-        if (isTwoLevelsDeep(path))
-            return false;
-        
-        return isOneParentProperty(path);
-    },
-    after(path, {print}) {
-        print.newline();
-    },
 };
 
 function checkLength(properties) {
@@ -192,7 +181,10 @@ function shouldAddNewline(path, semantics) {
     
     const fnParam = isFunctionParam(path);
     
-    if (moreCount && !moreLength)
+    if (hasObjectPattern(properties))
+        return COUPLE_LINES;
+    
+    if (moreCount && !moreLength && isVariableDeclarator(path.parentPath))
         return ONE_LINE;
     
     if (!fnParam && n && !isForOf(path) && checkLength(properties))

package/package.json

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