Make chain breaking as similar to original prettier (js) as much as p…

…ossible (#2320) * Removed chain break with more than 3 expressions * Added maxChainCallExpressionCountPHP option to control max calls in a chain * Added option to readme Updated description in options file * Added advance check for chain breaks * Reduced chain items count to 2 for complexity test Fixed array handling in complexity test * Func. name change * Removed comment * Style fix --------- Co-authored-by: Kristijan Novaković <[email protected]>
prettier · Feb 3, 2024 · 410e292 · 410e292
1 parent c8aadcf
commit 410e292
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 146 deletions.
diff --git a/src/printer.mjs b/src/printer.mjs
@@ -36,6 +36,7 @@ import {
   getAncestorNode,
   isReferenceLikeNode,
   normalizeMagicMethodName,
+  isSimpleCallArgument,
 } from "./util.mjs";
 
 const {
@@ -508,9 +509,9 @@ function printMemberChain(path, options, print) {
     printIndentedGroup(groups.slice(shouldMerge ? 2 : 1)),
   ];
 
-  const callExpressionCount = printedNodes.filter(
-    (tuple) => tuple.node.kind === "call"
-  ).length;
+  const callExpressions = printedNodes.filter((tuple) =>
+    ["call", "new"].includes(tuple.node.kind)
+  );
 
   // We don't want to print in one line if there's:
   //  * A comment.
@@ -519,7 +520,10 @@ function printMemberChain(path, options, print) {
   // If the last group is a function it's okay to inline if it fits.
   if (
     hasComment ||
-    callExpressionCount >= 3 ||
+    (callExpressions.length > 2 &&
+      callExpressions.some(
+        (exp) => !exp.node.arguments.every((arg) => isSimpleCallArgument(arg))
+      )) ||
     printedGroups.slice(0, -1).some(willBreak)
   ) {
     return group(expanded);

diff --git a/src/util.mjs b/src/util.mjs
@@ -612,6 +612,79 @@ function normalizeMagicMethodName(name) {
   return name;
 }
 
+/**
+ * @param {string[]} kindsArray
+ * @returns {(node: Node | Comment) => Boolean}
+ */
+function createTypeCheckFunction(kindsArray) {
+  const kinds = new Set(kindsArray);
+  return (node) => kinds.has(node?.kind);
+}
+
+const isSingleWordType = createTypeCheckFunction([
+  "variable",
+  "parameter",
+  "variadic",
+  "clone",
+  "cast",
+  "boolean",
+  "number",
+  "string",
+  "literal",
+  "nullkeyword",
+  "namedargument",
+  "variadicplaceholder",
+]);
+
+const isArrayExpression = createTypeCheckFunction(["array"]);
+const isCallOrNewExpression = createTypeCheckFunction(["call", "new"]);
+const isArrowFuncExpression = createTypeCheckFunction(["arrowfunc"]);
+
+function getChainParts(node, prev = []) {
+  const parts = prev;
+  if (isCallOrNewExpression(node)) {
+    parts.push(node);
+  }
+
+  if (!node.what) {
+    return parts;
+  }
+
+  return getChainParts(node.what, parts);
+}
+
+function isSimpleCallArgument(node, depth = 2) {
+  if (depth <= 0) {
+    return false;
+  }
+
+  const isChildSimple = (child) => isSimpleCallArgument(child, depth - 1);
+
+  if (isSingleWordType(node)) {
+    return true;
+  }
+
+  if (isArrayExpression(node)) {
+    return node.items.every((x) => x === null || isChildSimple(x));
+  }
+
+  if (isCallOrNewExpression(node)) {
+    const parts = getChainParts(node);
+    return (
+      parts.filter((node) => node.kind === "call").length <= depth &&
+      parts.every((node) => node.arguments.every(isChildSimple))
+    );
+  }
+
+  if (isArrowFuncExpression(node)) {
+    return (
+      node.arguments.length <= depth && node.arguments.every(isChildSimple)
+    );
+  }
+
+  return false;
+}
+
 export {
   printNumber,
   getPrecedence,
@@ -641,4 +714,5 @@ export {
   isDocNode,
   getAncestorNode,
   normalizeMagicMethodName,
+  isSimpleCallArgument,
 };
diff --git a/tests/call/__snapshots__/jsfmt.spec.mjs.snap b/tests/call/__snapshots__/jsfmt.spec.mjs.snap
@@ -705,18 +705,8 @@ $var = $this->foo()();
 $var = ($this->foo->bar)();
 $var = $this->foo->bar()();
 $var = ($this->foo->bar->baz->foo->bar->baz)();
-$var = $this->foo()
-    ->bar()
-    ->baz()
-    ->foo()
-    ->bar()
-    ->baz()();
-$var = ($this->foo()
-    ->bar()
-    ->baz()
-    ->foo()
-    ->bar()
-    ->baz)();
+$var = $this->foo()->bar()->baz()->foo()->bar()->baz()();
+$var = ($this->foo()->bar()->baz()->foo()->bar()->baz)();
 $var = $this["foo"]();
 $var = $this["foo"]["bar"]();
 $var = ($this::$foo)();
@@ -733,10 +723,7 @@ $var = ((["Foo", "bar"])->bar)();
 $var = ($var->foo)()();
 $var = ($var->foo)()();
 $var = (($var->foo)()->bar)();
-$var = ((($var
-    ->foo)()
-    ->bar)()
-    ->baz)();
+$var = ((($var->foo)()->bar)()->baz)();
 
 $obj = call('return new class($value)
 {

diff --git a/tests/member_chain/__snapshots__/jsfmt.spec.mjs.snap b/tests/member_chain/__snapshots__/jsfmt.spec.mjs.snap
@@ -110,22 +110,47 @@ printWidth: 80
 
 $object->foo()->bar()->baz();
 
+$object->foo()->bar()->baz()->foo()->bar()->baz();
+
+$object->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz();
+
+$object->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz();
+
 foo()->bar()->baz();
 
 foo()->bar->baz();
 
 =====================================output=====================================
 <?php
 
+$object->foo()->bar()->baz();
+
+$object->foo()->bar()->baz()->foo()->bar()->baz();
+
+$object->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz();
+
 $object
     ->foo()
     ->bar()
-    ->baz();
-
-foo()
+    ->baz()
+    ->foo()
+    ->bar()
+    ->baz()
+    ->foo()
+    ->bar()
+    ->baz()
+    ->foo()
+    ->bar()
+    ->baz()
+    ->foo()
+    ->bar()
+    ->baz()
+    ->foo()
     ->bar()
     ->baz();
 
+foo()->bar()->baz();
+
 foo()->bar->baz();
 
 ================================================================================
@@ -191,10 +216,7 @@ $object[$valid
 
 ($a ? $b : $c)->d()->e();
 
-($a ? $b : $c)
-    ->d()
-    ->e()
-    ->f();
+($a ? $b : $c)->d()->e()->f();
 
 ($valid
     ? $helper->responseBody($this->currentUser)
@@ -436,12 +458,8 @@ $var = Foo::keys($items)->filter(function ($x) { return $x > 2; })->map(function
 <?php
 
 one()->two();
-one()
-    ->two()
-    ->three();
-one()
-    ->two->three()
-    ->four->five();
+one()->two()->three();
+one()->two->three()->four->five();
 
 Route::prefix("api")
     ->middleware("api")
@@ -476,9 +494,7 @@ $a->a()->b();
 $a->a()->b();
 $a->a()->b;
 $a->b->a();
-$a->b()
-    ->c()
-    ->d();
+$a->b()->c()->d();
 $a->b->c->d;
 
 // should inline
@@ -545,67 +561,19 @@ $foo->bar(
     "veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLong"
 )()()()()();
 
-$brian->hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-$brian::$hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-$brian["hotel"]
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-Foo::$hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-(new Foo())->hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-(clone $a)->hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-
-$var = $brian->hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-$var = $brian::$hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-$var = $brian["hotel"]
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-$var = Foo::$hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-$var = (new Foo())->hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
-$var = (clone $a)->hotel
-    ->orders()
-    ->ordered()
-    ->with("smith")
-    ->get();
+$brian->hotel->orders()->ordered()->with("smith")->get();
+$brian::$hotel->orders()->ordered()->with("smith")->get();
+$brian["hotel"]->orders()->ordered()->with("smith")->get();
+Foo::$hotel->orders()->ordered()->with("smith")->get();
+(new Foo())->hotel->orders()->ordered()->with("smith")->get();
+(clone $a)->hotel->orders()->ordered()->with("smith")->get();
+
+$var = $brian->hotel->orders()->ordered()->with("smith")->get();
+$var = $brian::$hotel->orders()->ordered()->with("smith")->get();
+$var = $brian["hotel"]->orders()->ordered()->with("smith")->get();
+$var = Foo::$hotel->orders()->ordered()->with("smith")->get();
+$var = (new Foo())->hotel->orders()->ordered()->with("smith")->get();
+$var = (clone $a)->hotel->orders()->ordered()->with("smith")->get();
 
 $var = Foo::keys($items)
     ->filter(function ($x) {
@@ -615,9 +583,11 @@ $var = Foo::keys($items)
         return $x * 2;
     });
 
-(new static(func_get_args()))->push($this)->each(function ($item) {
-    VarDumper::dump($item);
-});
+(new static(func_get_args()))
+    ->push($this)
+    ->each(function ($item) {
+        VarDumper::dump($item);
+    });
 (new static(func_get_args()))
     ->offset(10)
     ->push($this)

diff --git a/tests/member_chain/break-multiple.php b/tests/member_chain/break-multiple.php
@@ -2,6 +2,12 @@
 
 $object->foo()->bar()->baz();
 
+$object->foo()->bar()->baz()->foo()->bar()->baz();
+
+$object->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz();
+
+$object->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz()->foo()->bar()->baz();
+
 foo()->bar()->baz();
 
 foo()->bar->baz();
diff --git a/tests/parens/__snapshots__/jsfmt.spec.mjs.snap b/tests/parens/__snapshots__/jsfmt.spec.mjs.snap
@@ -1568,10 +1568,7 @@ $var = (clone foo())->bar()->foo();
 $var = (clone foo())->bar()->foo();
 $var = (clone foo())->bar()->foo()[0];
 $var = (clone foo())->bar()->foo()[0][1];
-$var = (clone foo())
-    ->bar()
-    ->foo()
-    ->baz();
+$var = (clone foo())->bar()->foo()->baz();
 $var = (clone $foo())->bar;
 $var = (clone $bar->y)->x;
 $var = (clone $foo)[0];
@@ -2562,10 +2559,7 @@ $var = (new foo())->bar()->foo();
 $var = (new foo())->bar()->foo();
 $var = (new foo())->bar()->foo()[0];
 $var = (new foo())->bar()->foo()[0][1];
-$var = (new foo())
-    ->bar()
-    ->foo()
-    ->baz();
+$var = (new foo())->bar()->foo()->baz();
 $var = (new $foo())->bar;
 $var = (new $bar->y())->x;
 $var = (new foo())[0];
@@ -2935,10 +2929,7 @@ $var = ((int) $var) + 1 === 2 ? "1" : "2";
 ($var ? $var : $var)[1];
 ($var ? $var : $var)->d();
 ($var ? $var : $var)->d()->e();
-($var ? $var : $var)
-    ->d()
-    ->e()
-    ->f();
+($var ? $var : $var)->d()->e()->f();
 ($var
     ? $var->responseBody($var->currentUser)
     : $var->responseBody($var->defaultUser)

diff --git a/tests/print/__snapshots__/jsfmt.spec.mjs.snap b/tests/print/__snapshots__/jsfmt.spec.mjs.snap
@@ -299,10 +299,7 @@ print $var->veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongProperty
     ->veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongProperty
     ->veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongProperty;
 
-print $var
-    ->call()
-    ->call()
-    ->call();
+print $var->call()->call()->call();
 print $var
     ->veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongCall()
     ->veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongCall()