Apply modifiers in LiveComponentMetadata

Author: squrious

src/LiveComponent/src/EventListener/QueryStringInitializeSubscriber.php

@@ -55,7 +55,7 @@ public function onPreMount(PreMountEvent $event): void
 
         $metadata = $this->metadataFactory->getMetadata($event->getMetadata()->getName());
 
-        if (!$metadata->hasQueryStringBindings()) {
+        if (!$metadata->hasQueryStringBindings($event->getComponent())) {
             return;
         }
 

src/LiveComponent/src/LiveComponentHydrator.php

@@ -65,8 +65,7 @@ public function dehydrate(object $component, ComponentAttributes $attributes, Li
         $takenFrontendPropertyNames = [];
 
         $dehydratedProps = new DehydratedProps();
-        foreach ($componentMetadata->getAllLivePropsMetadata() as $propMetadata) {
-            $propMetadata = $propMetadata->withModifier($component);
+        foreach ($componentMetadata->getAllLivePropsMetadata($component) as $propMetadata) {
             $propertyName = $propMetadata->getName();
             $frontendName = $propMetadata->calculateFieldName($component, $propertyName);
 
@@ -146,21 +145,9 @@ public function hydrate(object $component, array $props, array $updatedProps, Li
         $attributes = new ComponentAttributes($dehydratedOriginalProps->getPropValue(self::ATTRIBUTES_KEY, []));
         $dehydratedOriginalProps->removePropValue(self::ATTRIBUTES_KEY);
 
-        $allMetadata = $componentMetadata->getAllLivePropsMetadata();
-        uasort($allMetadata, static function (LivePropMetadata $a, LivePropMetadata $b) {
-            if ($a->hasModifier() && !$b->hasModifier()) {
-                return 1;
-            } elseif (!$a->hasModifier() && $b->hasModifier()) {
-                return -1;
-            } else {
-                return 0;
-            }
-        });
-
-        foreach ($allMetadata as $propMetadata) {
-            $propMetadata = $propMetadata->withModifier($component);
-            //        foreach ($componentMetadata->getAllLivePropsMetadata($component) as $propMetadata) {
+        foreach ($componentMetadata->getAllLivePropsMetadata($component) as $propMetadata) {
             $frontendName = $propMetadata->calculateFieldName($component, $propMetadata->getName());
+
             if (!$dehydratedOriginalProps->hasPropValue($frontendName)) {
                 // this property was not sent, so skip
                 // even if this has writable paths, if no identity is sent,

src/LiveComponent/src/Metadata/LiveComponentMetadata.php

@@ -27,6 +27,10 @@ public function __construct(
         /** @var LivePropMetadata[] */
         private array $livePropsMetadata,
     ) {
+        uasort(
+            $this->livePropsMetadata,
+            static fn (LivePropMetadata $a, LivePropMetadata $b) => $a->hasModifier() <=> $b->hasModifier()
+        );
     }
 
     public function getComponentMetadata(): ComponentMetadata
@@ -37,9 +41,11 @@ public function getComponentMetadata(): ComponentMetadata
     /**
      * @return LivePropMetadata[]
      */
-    public function getAllLivePropsMetadata(): array
+    public function getAllLivePropsMetadata(object $component): iterable
     {
-        return $this->livePropsMetadata;
+        foreach ($this->livePropsMetadata as $livePropMetadata) {
+            yield $livePropMetadata->withModifier($component);
+        }
     }
 
     /**
@@ -62,9 +68,9 @@ public function getOnlyPropsThatAcceptUpdatesFromParent(array $inputProps): arra
         return array_intersect_key($inputProps, array_flip($propNames));
     }
 
-    public function hasQueryStringBindings(): bool
+    public function hasQueryStringBindings($component): bool
     {
-        foreach ($this->getAllLivePropsMetadata() as $livePropMetadata) {
+        foreach ($this->getAllLivePropsMetadata($component) as $livePropMetadata) {
             if ($livePropMetadata->queryStringMapping()) {
                 return true;
             }

src/LiveComponent/src/Util/LiveControllerAttributesCreator.php

@@ -105,12 +105,11 @@ public function attributesForRendering(MountedComponent $mounted, ComponentMetad
             $attributesCollection->setRequestMethod($requestMethod);
         }
 
-        if ($liveMetadata->hasQueryStringBindings()) {
+        if ($liveMetadata->hasQueryStringBindings($mounted->getComponent())) {
             $queryMapping = [];
-            foreach ($liveMetadata->getAllLivePropsMetadata() as $livePropMetadata) {
-                $livePropMetadata = $livePropMetadata->withModifier($mounted->getComponent());
+            foreach ($liveMetadata->getAllLivePropsMetadata($mounted->getComponent()) as $livePropMetadata) {
                 if ($livePropMetadata->queryStringMapping()) {
-                    $frontendName = $livePropMetadata->calculateFieldName($mounted, $livePropMetadata->getName());
+                    $frontendName = $livePropMetadata->calculateFieldName($mounted->getComponent(), $livePropMetadata->getName());
                     $queryMapping[$frontendName] = ['name' => $frontendName];
                 }
             }

src/LiveComponent/src/Util/QueryStringPropsExtractor.php

@@ -42,8 +42,7 @@ public function extract(Request $request, LiveComponentMetadata $metadata, objec
         }
         $data = [];
 
-        foreach ($metadata->getAllLivePropsMetadata() as $livePropMetadata) {
-            $livePropMetadata = $livePropMetadata->withModifier($component);
+        foreach ($metadata->getAllLivePropsMetadata($component) as $livePropMetadata) {
             if ($livePropMetadata->queryStringMapping()) {
                 $frontendName = $livePropMetadata->calculateFieldName($component, $livePropMetadata->getName());
                 if (null !== ($value = $query[$frontendName] ?? null)) {