feature: @putout/printer: ObjectPattern: comma: simplify

Author: coderaiser

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

@@ -0,0 +1,28 @@
+import {types} from '@putout/babel';
+import {createTypeChecker} from '#type-checker';
+
+const {
+    isForOfStatement,
+    isAssignmentPattern,
+} = types;
+
+const isCoupleOption = (a, {couple}) => couple;
+
+export function isInsideForOf({parentPath}) {
+    return isForOfStatement(parentPath.parentPath.parentPath);
+}
+
+export function isPrevAssign(path) {
+    const prev = path.getPrevSibling();
+    
+    return isAssignmentPattern(prev.node.value);
+}
+
+export const isCommaAfterProperty = createTypeChecker([
+    ['+', isCoupleOption],
+    ['-: key -> -'],
+    ['-', isPrevAssign],
+    ['-: parentPath', isInsideForOf],
+    ['+: node.value.right -> ObjectExpression'],
+]);
+

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

@@ -5,7 +5,6 @@ import {hasAssign} from './has.js';
 const {
     isObjectExpression,
     isAssignmentPattern,
-    isForOfStatement,
     isFunction,
     isVariableDeclarator,
     isObjectProperty,
@@ -38,16 +37,6 @@ export const isCoupleProperties = ({path, valuePath, property}) => {
     return !isObjectProperty(parentPath);
 };
 
-export function isInsideForOf({parentPath}) {
-    return isForOfStatement(parentPath.parentPath.parentPath);
-}
-
-export function isPrevAssign(path) {
-    const prev = path.getPrevSibling();
-    
-    return isAssignmentPattern(prev.node.value);
-}
-
 export function isPrevAssignObject(path) {
     const prev = path.getPrevSibling();
 

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

@@ -1,4 +1,3 @@
-import {types} from '@putout/babel';
 import {wrongShorthand} from './wrong-shorthand.js';
 import {maybeTypeAnnotation} from '../../maybe/maybe-type-annotation.js';
 import {printKey} from '../object-expression/print-key.js';
@@ -12,18 +11,15 @@ import {
     hasAssignObject,
     hasObjectPattern,
 } from './has.js';
+import {isCommaAfterProperty} from './comma.js';
 import {
     isCoupleProperties,
     isIndent,
     isInsideFn,
-    isInsideForOf,
     isNextAssignObject,
-    isPrevAssign,
     isPrevAssignObject,
 } from './is.js';
 
-const {isObjectExpression} = types;
-
 export const ObjectPattern = {
     print: maybeTypeAnnotation((path, printer, semantics) => {
         const shouldIndent = isIndent(path);
@@ -97,12 +93,7 @@ export const ObjectPattern = {
             } else if (isAssign) {
                 print(valuePath);
 
-                maybe.print(couple, ',');
-                maybe.print.newline(couple);
-                
-                const {right} = valuePath.node;
-                
-                if (i && !isPrevAssign(property) && !isInsideForOf(path) && isObjectExpression(right)) {
+                if (isCommaAfterProperty(property, {couple})) {
                     print(',');
                     print.newline();
                     continue;
@@ -137,3 +128,4 @@ export const ObjectPattern = {
         print('}');
     }),
 };
+