wip

Author: pascalbaljet

src/Mergeable.php

@@ -40,11 +40,11 @@ public function matchesOn();
     public function shouldAppend();
 
     /**
-     * Determine if the property should merge at the root level (vs at specific paths).
+     * Determine if the property has nested merge paths instead of just top-level merging.
      *
      * @return bool
      */
-    public function shouldMergeAtRootLevel();
+    public function hasNestedMergePaths();
 
     /**
      * Get the paths to append when merging.

src/MergesProps.php

@@ -145,9 +145,9 @@ public function prepend(string|bool $key = true, ?string $matchOn = null): self
     /**
      * Determine if the property should merge at the root level (vs at specific paths).
      */
-    public function shouldMergeAtRootLevel(): bool
+    public function hasNestedMergePaths(): bool
     {
-        return count($this->appendPaths) === 0 && count($this->prependPaths) === 0;
+        return count($this->appendPaths) > 0 || count($this->prependPaths) > 0;
     }
 
     /**

src/Response.php

@@ -484,12 +484,12 @@ public function resolveMergeProps(Request $request): array
      */
     protected function resolveAppendMergeProps(Collection $mergeProps): array
     {
-        [$rootMergeProps, $nestedMergeProps] = $mergeProps
+        [$nestedMergeProps, $rootMergeProps] = $mergeProps
             ->reject(fn (Mergeable $prop) => $prop->shouldDeepMerge())
-            ->partition(fn (Mergeable $prop) => $prop->shouldMergeAtRootLevel());
+            ->partition(fn (Mergeable $prop) => $prop->hasNestedMergePaths());
 
         return $nestedMergeProps
-            ->flatMap(fn (Mergeable $prop, string $key) => collect($prop->appendPaths())->map(fn ($path) => $path ? $key.'.'.$path : $key))
+            ->flatMap(fn (Mergeable $prop, string $key) => collect($prop->appendPaths())->map(fn ($path) => $key.'.'.$path))
             ->merge($rootMergeProps->filter(fn (Mergeable $prop) => $prop->shouldAppend())->keys())
             ->unique()
             ->values()
@@ -504,12 +504,12 @@ protected function resolveAppendMergeProps(Collection $mergeProps): array
      */
     protected function resolvePrependMergeProps(Collection $mergeProps): array
     {
-        [$rootMergeProps, $nestedMergeProps] = $mergeProps
+        [$nestedMergeProps, $rootMergeProps] = $mergeProps
             ->reject(fn (Mergeable $prop) => $prop->shouldDeepMerge())
-            ->partition(fn (Mergeable $prop) => $prop->shouldMergeAtRootLevel());
+            ->partition(fn (Mergeable $prop) => $prop->hasNestedMergePaths());
 
         return $nestedMergeProps
-            ->flatMap(fn (Mergeable $prop, string $key) => collect($prop->prependPaths())->map(fn ($path) => $path ? $key.'.'.$path : $key))
+            ->flatMap(fn (Mergeable $prop, string $key) => collect($prop->prependPaths())->map(fn ($path) => $key.'.'.$path))
             ->merge($rootMergeProps->filter(fn (Mergeable $prop) => ! $prop->shouldAppend())->keys())
             ->unique()
             ->values()