fix: memoization when injecting magic (#4276)

* fix: memoization when injecting magic * extract get utlilties to a function * add return comment * fix tests * refactor * wip --------- Co-authored-by: Caleb Porzio <[email protected]>
alpinejs · Jul 1, 2024 · ac63592 · ac63592
1 parent 4c3478c
commit ac63592
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/packages/alpinejs/src/magics.js b/packages/alpinejs/src/magics.js
@@ -9,28 +9,26 @@ export function magic(name, callback) {
 }
 
 export function injectMagics(obj, el) {
-    Object.entries(magics).forEach(([name, callback]) => {
-        let memoizedUtilities = null;
-        function getUtilities() {
-            if (memoizedUtilities) {
-                return memoizedUtilities;
-            } else {
-                let [utilities, cleanup] = getElementBoundUtilities(el)
-
-                memoizedUtilities = {interceptor, ...utilities}
-
-                onElRemoved(el, cleanup)
-                return memoizedUtilities;
-            }
-        }
+    let memoizedUtilities = getUtilities(el)
 
+    Object.entries(magics).forEach(([name, callback]) => {
         Object.defineProperty(obj, `$${name}`, {
             get() {
-                return callback(el, getUtilities());
+                return callback(el, memoizedUtilities);
             },
             enumerable: false,
         })
     })
 
     return obj
 }
+
+export function getUtilities(el) {
+    let [utilities, cleanup] = getElementBoundUtilities(el)
+
+    let utils = { interceptor, ...utilities }
+
+    onElRemoved(el, cleanup)
+
+    return utils;
+}