feature: @putout/printer: ObjectPattern: Assign: improve

Author: coderaiser

lib/tokenize/expressions/object-pattern/fixture/object-pattern-assign-object.js

@@ -2,4 +2,5 @@ const {
     loc = {
         line: 0,
     },
-id} = error;
+    id,
+} = error;

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,7 +117,7 @@ module.exports.ObjectPattern = {
                 maybe.print.newline(couple);
             }
 
-            if (is || hasObject) {
+            if (is || hasObject || prevAssign && notInsideFn) {
                 print(',');
                 print.newline();
 
@@ -209,3 +218,4 @@ function isFunctionParam({parentPath}) {
 
     return parentPath.parentPath.isFunction();
 }
+