mergeable props

Author: joetannenbaum

src/DeferProp.php

@@ -4,12 +4,16 @@
 
 use Illuminate\Support\Facades\App;
 
-class DeferProp implements IgnoreFirstLoad
+class DeferProp implements IgnoreFirstLoad, Mergeable
 {
+    use MergesProps;
+
     protected $callback;
 
     protected $group;
 
+    protected $merge = false;
+
     public function __construct(callable $callback, ?string $group = null)
     {
         $this->callback = $callback;

src/MergeProp.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Inertia;
+
+use Illuminate\Support\Facades\App;
+
+class MergeProp implements Mergeable
+{
+    use MergesProps;
+
+    /** @var mixed */
+    protected $value;
+
+    /**
+     * @param  mixed  $value
+     */
+    public function __construct($value)
+    {
+        $this->value = $value;
+        $this->merge = true;
+    }
+
+    public function __invoke()
+    {
+        return is_callable($this->value) ? App::call($this->value) : $this->value;
+    }
+}

src/Mergeable.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Inertia;
+
+interface Mergeable
+{
+    public function merge();
+
+    public function shouldMerge();
+}

src/MergesProps.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Inertia;
+
+
+trait MergesProps
+{
+    protected $merge = false;
+
+    public function merge()
+    {
+        $this->merge = true;
+
+        return $this;
+    }
+
+    public function shouldMerge()
+    {
+        return $this->merge;
+    }
+}

src/Response.php

@@ -115,9 +115,9 @@ public function resolveProperties(Request $request, array $props): array
     {
         $isPartial = $this->isPartial($request);
 
-        if (! $isPartial) {
+        if (!$isPartial) {
             $props = array_filter($this->props, static function ($prop) {
-                return ! ($prop instanceof IgnoreFirstLoad);
+                return !($prop instanceof IgnoreFirstLoad);
             });
         }
 
@@ -218,6 +218,7 @@ public function resolvePropertyInstances(array $props, Request $request): array
                 OptionalProp::class,
                 DeferProp::class,
                 AlwaysProp::class,
+                MergeProp::class,
                 WhenVisible::class,
             ])->first(fn ($class) => $value instanceof $class);
 
@@ -248,13 +249,34 @@ public function resolvePropertyInstances(array $props, Request $request): array
      */
     public function resolveMeta(Request $request): array
     {
-        $meta = [
+        return array_merge([
             'assetVersion' => $this->version,
             'clearHistory' => $this->clearHistory,
-        ];
+        ], $this->resolveMergeProps($request), $this->resolveDeferredProps($request));
+    }
+
+    public function resolveMergeProps(Request $request): array
+    {
+        $resetProps = collect(explode(',', $request->header(Header::RESET, '')));
+        $mergeProps = collect($this->props)
+            ->filter(function ($prop) {
+                return $prop instanceof Mergeable;
+            })
+            ->filter(function ($prop) {
+                return $prop->shouldMerge();
+            })
+            ->filter(function ($prop, $key) use ($resetProps) {
+                return !$resetProps->contains($key);
+            })
+            ->keys();
+
+        return $mergeProps->isNotEmpty() ? ['mergeProps' => $mergeProps->toArray()] : [];
+    }
 
+    public function resolveDeferredProps(Request $request): array
+    {
         if ($this->isPartial($request)) {
-            return $meta;
+            return [];
         }
 
         $deferredProps = collect($this->props)
@@ -271,11 +293,7 @@ public function resolveMeta(Request $request): array
             ->map
             ->pluck('key');
 
-        if ($deferredProps->isNotEmpty()) {
-            $meta['deferredProps'] = $deferredProps->toArray();
-        }
-
-        return $meta;
+        return $deferredProps->isNotEmpty() ? ['deferredProps' => $deferredProps->toArray()] : [];
     }
 
     /**

src/ResponseFactory.php

@@ -107,6 +107,14 @@ public function defer(callable $callback, string $group = 'default'): DeferProp
         return new DeferProp($callback, $group);
     }
 
+    /**
+     * @param  mixed  $value
+     */
+    public function merge($value): MergeProp
+    {
+        return new MergeProp($value);
+    }
+
     /**
      * @param  mixed  $value
      */

src/Support/Header.php

@@ -17,4 +17,6 @@ class Header
     public const PARTIAL_ONLY = 'X-Inertia-Partial-Data';
 
     public const PARTIAL_EXCEPT = 'X-Inertia-Partial-Except';
+
+    public const RESET = 'X-Inertia-Reset';
 }