@qwik.dev/core 2.0.0-alpha.4 → 2.0.0-alpha.5

package/dist/insights/index.qwik.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const core = require("@qwik.dev/core");
 /**
  * @license
- * @qwik.dev/core 2.0.0-alpha.4-dev+374e0d6
+ * @qwik.dev/core 2.0.0-alpha.5-dev+cb53bbd
  * Copyright QwikDev. All Rights Reserved.
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://github.com/QwikDev/qwik/blob/main/LICENSE

package/dist/insights/index.qwik.mjs

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 import { sync$, component$ } from "@qwik.dev/core";
 /**
  * @license
- * @qwik.dev/core 2.0.0-alpha.4-dev+374e0d6
+ * @qwik.dev/core 2.0.0-alpha.5-dev+cb53bbd
  * Copyright QwikDev. All Rights Reserved.
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://github.com/QwikDev/qwik/blob/main/LICENSE

package/dist/loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/loader",
-  "version": "2.0.0-alpha.4-dev+374e0d6",
+  "version": "2.0.0-alpha.5-dev+cb53bbd",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

package/dist/optimizer.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/optimizer 2.0.0-alpha.4-dev+374e0d6
+ * @qwik.dev/core/optimizer 2.0.0-alpha.5-dev+cb53bbd
  * Copyright QwikDev. All Rights Reserved.
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://github.com/QwikDev/qwik/blob/main/LICENSE
@@ -1226,7 +1226,7 @@ globalThis.qwikOptimizer = function(module) {
   }
   var QWIK_BINDING_MAP = {};
   var versions = {
-    qwik: "2.0.0-alpha.4-dev+374e0d6"
+    qwik: "2.0.0-alpha.5-dev+cb53bbd"
   };
   async function getSystem() {
     const sysEnv = getEnv();
@@ -2872,7 +2872,7 @@ globalThis.qwikOptimizer = function(module) {
   }
   var codeToText = (code, ...parts) => {
     if (qDev) {
-      const MAP = [ "Error while serializing class or style attributes", "", "", "Only primitive and object literals can be serialized. {{0}}", "", "You can render over a existing q:container. Skipping render().", "", "", "", "", "QRL is not a function", "Dynamic import not found", "Unknown type argument", "Actual value for useContext({{0}}) can not be found, make sure some ancestor component has set a value using useContextProvider(). In the browser make sure that the context was used during SSR so its state was serialized.", "Invoking 'use*()' method outside of invocation context.", "", "", "", "", "", "Calling a 'use*()' method outside 'component$(() => { HERE })' is not allowed. 'use*()' methods provide hooks to the 'component$' state and lifecycle, ie 'use' hooks can only be called synchronously within the 'component$' function or another 'use' method.\nSee https://qwik.dev/docs/components/tasks/#use-method-rules", "", "", "", "", "", "", "", 'The provided Context reference "{{0}}" is not a valid context created by createContextId()', "SsrError(tag): {{0}}", "QRLs can not be resolved because it does not have an attached container. This means that the QRL does not know where it belongs inside the DOM, so it cant dynamically import() from a relative path.", "QRLs can not be dynamically resolved, because it does not have a chunk path", "The JSX ref attribute must be a Signal", "Serialization Error: Deserialization of data type {{0}} is not implemented", "Serialization Error: Expected vnode for ref prop, but got {{0}}", "Serialization Error: Cannot allocate data type {{0}}", "Serialization Error: Missing root id for {{0}}", "Serialization Error: Serialization of data type {{0}} is not implemented", "Serialization Error: Unvisited {{0}}", "Serialization Error: Missing QRL chunk for {{0}}", "The value of the textarea must be a string", "Unable to find q:container", "Element must have 'q:container' attribute.", "Unknown vnode type {{0}}.", "Materialize error: missing element: {{0}} {{1}} {{2}}", "SsrError: {{0}}", "Cannot coerce a Signal, use `.value` instead", "useComputedSignal$ QRL {{0}} {{1}} returned a Promise", "ComputedSignal is read-only", "WrappedSignal is read-only", "SsrError: Promises not expected here.", "Attribute value is unsafe for SSR" ];
+      const MAP = [ "Error while serializing class or style attributes", "", "", "Only primitive and object literals can be serialized. {{0}}", "", "You can render over a existing q:container. Skipping render().", "", "", "", "", "QRL is not a function", "Dynamic import not found", "Unknown type argument", "Actual value for useContext({{0}}) can not be found, make sure some ancestor component has set a value using useContextProvider(). In the browser make sure that the context was used during SSR so its state was serialized.", "Invoking 'use*()' method outside of invocation context.", "", "", "", "", "", "Calling a 'use*()' method outside 'component$(() => { HERE })' is not allowed. 'use*()' methods provide hooks to the 'component$' state and lifecycle, ie 'use' hooks can only be called synchronously within the 'component$' function or another 'use' method.\nSee https://qwik.dev/docs/components/tasks/#use-method-rules", "", "", "", "", "", "", "", 'The provided Context reference "{{0}}" is not a valid context created by createContextId()', "SsrError(tag): {{0}}", "QRLs can not be resolved because it does not have an attached container. This means that the QRL does not know where it belongs inside the DOM, so it cant dynamically import() from a relative path.", "QRLs can not be dynamically resolved, because it does not have a chunk path", "{{0}}\nThe JSX ref attribute must be a Signal", "Serialization Error: Deserialization of data type {{0}} is not implemented", "Serialization Error: Expected vnode for ref prop, but got {{0}}", "Serialization Error: Cannot allocate data type {{0}}", "Serialization Error: Missing root id for {{0}}", "Serialization Error: Serialization of data type {{0}} is not implemented", "Serialization Error: Unvisited {{0}}", "Serialization Error: Missing QRL chunk for {{0}}", "{{0}}\nThe value of the textarea must be a string found {{1}}", "Unable to find q:container", "Element must have 'q:container' attribute.", "Unknown vnode type {{0}}.", "Materialize error: missing element: {{0}} {{1}} {{2}}", "SsrError: {{0}}", "Cannot coerce a Signal, use `.value` instead", "useComputedSignal$ QRL {{0}} {{1}} returned a Promise", "ComputedSignal is read-only", "WrappedSignal is read-only", "SsrError: Promises not expected here.", "Attribute value is unsafe for SSR" ];
       let text = MAP[code] ?? "";
       parts.length && (text = text.replaceAll(/{{(\d+)}}/g, ((_, index) => {
         let v = parts[index];
@@ -3254,7 +3254,6 @@ globalThis.qwikOptimizer = function(module) {
       return value;
     }
     set(target, prop, value) {
-      target = unwrapDeserializerProxy(target);
       if ("symbol" === typeof prop) {
         target[prop] = value;
         return true;
@@ -3313,6 +3312,7 @@ globalThis.qwikOptimizer = function(module) {
     const effects = Object.prototype.hasOwnProperty.call(effectsMap, prop) && effectsMap[prop] || (effectsMap[prop] = []);
     ensureContainsEffect(effects, effectSubscriber);
     ensureContains(effectSubscriber, target);
+    ensureEffectContainsSubscriber(effectSubscriber[0], target, store.$container$);
     DEBUG && log("sub", pad("\n" + store.$effects$.toString(), "  "));
   }
   function setNewValueAndTriggerEffects(prop, value, target, currentStore) {
@@ -3342,26 +3342,33 @@ globalThis.qwikOptimizer = function(module) {
     }
     for (let i = effects.length - 1; i >= 0; i--) {
       const subscriber = effects[i];
-      const subscriptionRemoved = clearEffects(subscriber, value);
-      subscriptionRemoved && effects.splice(i, 1);
+      clearEffects(subscriber, value, effects, i, container);
     }
+    0 === effects.length && vnode_setProp(value, QSubscribers, null);
   }
-  function clearSubscriberEffectDependencies(value) {
+  function clearSubscriberEffectDependencies(container, value) {
     if (value.$effectDependencies$) {
       for (let i = value.$effectDependencies$.length - 1; i >= 0; i--) {
         const subscriber = value.$effectDependencies$[i];
-        const subscriptionRemoved = clearEffects(subscriber, value);
-        subscriptionRemoved && value.$effectDependencies$.splice(i, 1);
+        clearEffects(subscriber, value, value.$effectDependencies$, i, container);
       }
+      0 === value.$effectDependencies$.length && (value.$effectDependencies$ = null);
     }
   }
-  function clearEffects(subscriber, value) {
-    if (!isSignal(subscriber)) {
-      return false;
-    }
+  function clearEffects(subscriber, value, effectArray, indexToRemove, container) {
+    let subscriptionRemoved = false;
+    const seenSet = new Set;
+    if (subscriber instanceof WrappedSignal) {
+      subscriptionRemoved = clearSignalEffects(subscriber, value, seenSet);
+    } else if (container.$storeProxyMap$.has(subscriber)) {
+      const store = container.$storeProxyMap$.get(subscriber);
+      const handler = getStoreHandler(store);
+      subscriptionRemoved = clearStoreEffects(handler, value);
+    }
+    subscriptionRemoved && effectArray.splice(indexToRemove, 1);
+  }
+  function clearSignalEffects(subscriber, value, seenSet) {
     const effectSubscriptions = subscriber.$effects$;
-    const hostElement = subscriber.$hostElement$;
-    hostElement && hostElement === value && (subscriber.$hostElement$ = null);
     let subscriptionRemoved = false;
     if (effectSubscriptions) {
       for (let i = effectSubscriptions.length - 1; i >= 0; i--) {
@@ -3372,14 +3379,58 @@ globalThis.qwikOptimizer = function(module) {
         }
       }
     }
-    const args = subscriber.$args$;
-    if (args) {
-      for (let i = args.length - 1; i >= 0; i--) {
-        clearEffects(args[i], subscriber);
+    if (subscriber instanceof WrappedSignal) {
+      const hostElement = subscriber.$hostElement$;
+      hostElement && hostElement === value && (subscriber.$hostElement$ = null);
+      const args = subscriber.$args$;
+      args && clearArgsEffects(args, subscriber, seenSet);
+    }
+    return subscriptionRemoved;
+  }
+  function clearStoreEffects(storeHandler, value) {
+    const effectSubscriptions = storeHandler.$effects$;
+    if (!effectSubscriptions) {
+      return false;
+    }
+    let subscriptionRemoved = false;
+    for (const key in effectSubscriptions) {
+      const effects = effectSubscriptions[key];
+      for (let i = effects.length - 1; i >= 0; i--) {
+        const effect = effects[i];
+        if (effect[0] === value) {
+          effects.splice(i, 1);
+          subscriptionRemoved = true;
+        }
       }
+      0 === effects.length && delete effectSubscriptions[key];
     }
     return subscriptionRemoved;
   }
+  function clearArgsEffects(args, subscriber, seenSet) {
+    for (let i = args.length - 1; i >= 0; i--) {
+      const arg = args[i];
+      clearArgEffect(arg, subscriber, seenSet);
+    }
+  }
+  function clearArgEffect(arg, subscriber, seenSet) {
+    if (seenSet.has(arg)) {
+      return;
+    }
+    seenSet.add(arg);
+    if (isSignal(arg)) {
+      clearSignalEffects(arg, subscriber, seenSet);
+    } else if ("object" === typeof arg && null !== arg) {
+      if (isStore(arg)) {
+        clearStoreEffects(getStoreHandler(arg), subscriber);
+      } else {
+        for (const key in arg) {
+          clearArgEffect(arg[key], subscriber, seenSet);
+        }
+      }
+    } else {
+      Array.isArray(arg) && clearArgsEffects(arg, subscriber, seenSet);
+    }
+  }
   var _createResourceReturn = opts => {
     const resource = {
       __brand: "resource",
@@ -3403,7 +3454,7 @@ globalThis.qwikOptimizer = function(module) {
     cleanupTask(task);
     const iCtx = newInvokeContext(container.$locale$, host, void 0, ResourceEvent);
     iCtx.$container$ = container;
-    const taskFn = task.$qrl$.getFn(iCtx, (() => clearSubscriberEffectDependencies(task)));
+    const taskFn = task.$qrl$.getFn(iCtx, (() => clearSubscriberEffectDependencies(container, task)));
     const resource = task.$state$;
     assertDefined(resource, 'useResource: when running a resource, "task.resource" must be a defined.', task);
     const track = (obj, prop) => {
@@ -3786,6 +3837,17 @@ globalThis.qwikOptimizer = function(module) {
     }
     return 0 === lastIdx ? html : escapedHTML + html.substring(lastIdx);
   }
+  function getFileLocationFromJsx(jsxDev) {
+    var _a;
+    if (!jsxDev) {
+      return null;
+    }
+    const sanitizedFileName = null == (_a = jsxDev.fileName) ? void 0 : _a.replace(/\\/g, "/");
+    if (sanitizedFileName) {
+      return `${sanitizedFileName}:${jsxDev.lineNumber}:${jsxDev.columnNumber}`;
+    }
+    return null;
+  }
   var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     let journal = container.$journal$;
     const stack2 = [];
@@ -4067,7 +4129,7 @@ globalThis.qwikOptimizer = function(module) {
         vnode_remove(journal, vParent, toRemove, true);
       }
     }
-    function createNewElement(jsx2, elementName) {
+    function createNewElement(jsx2, elementName, currentFile) {
       const element = createElementWithNamespace(elementName);
       const {constProps: constProps} = jsx2;
       let needsQDispatchEventPatch = false;
@@ -4091,6 +4153,7 @@ globalThis.qwikOptimizer = function(module) {
               value(element);
               continue;
             }
+            throw qError(32, [ currentFile ]);
           }
           if (isSignal(value)) {
             const signalData = new EffectPropData({
@@ -4105,13 +4168,13 @@ globalThis.qwikOptimizer = function(module) {
             continue;
           }
           if ("textarea" === elementName && "value" === key2) {
-            if ("string" !== typeof value) {
+            if (value && "string" !== typeof value) {
               if (isDev) {
-                throw qError(40);
+                throw qError(40, [ currentFile, value ]);
               }
               continue;
             }
-            element.value = escapeHTML(value);
+            element.value = escapeHTML(value || "");
             continue;
           }
           value = serializeAttribute(key2, value, scopedStyleIdPrefix);
@@ -4140,20 +4203,27 @@ globalThis.qwikOptimizer = function(module) {
       const isSameElementName = vCurrent && vnode_isElementVNode(vCurrent) && elementName === vnode_getElementName(vCurrent);
       const jsxKey = jsx2.key;
       let needsQDispatchEventPatch = false;
+      const currentFile = getFileLocationFromJsx(jsx2.dev);
       if (!isSameElementName || jsxKey !== getKey(vCurrent)) {
         vNewNode = retrieveChildWithKey(elementName, jsxKey);
-        null === vNewNode ? needsQDispatchEventPatch = createNewElement(jsx2, elementName) : vnode_insertBefore(journal, vParent, vNewNode, vCurrent);
+        if (null === vNewNode) {
+          needsQDispatchEventPatch = createNewElement(jsx2, elementName);
+        } else {
+          vnode_insertBefore(journal, vParent, vNewNode, vCurrent);
+          vCurrent = vNewNode;
+          vNewNode = null;
+          null !== vSiblings && (vSiblingsIdx -= 3);
+        }
       }
       const jsxAttrs = [];
       const props = jsx2.varProps;
       for (const key in props) {
-        let value = props[key];
-        value = serializeAttribute(key, value, scopedStyleIdPrefix);
+        const value = props[key];
         null != value && mapArray_set(jsxAttrs, key, value, 0);
       }
       null !== jsxKey && mapArray_set(jsxAttrs, ELEMENT_KEY, jsxKey, 0);
       const vNode = vNewNode || vCurrent;
-      needsQDispatchEventPatch = setBulkProps(vNode, jsxAttrs) || needsQDispatchEventPatch;
+      needsQDispatchEventPatch = setBulkProps(vNode, jsxAttrs, currentFile) || needsQDispatchEventPatch;
       if (needsQDispatchEventPatch) {
         const element = vnode_getNode(vNode);
         element.qDispatchEvent || (element.qDispatchEvent = (event, scope) => {
@@ -4171,7 +4241,7 @@ globalThis.qwikOptimizer = function(module) {
         });
       }
     }
-    function setBulkProps(vnode, srcAttrs) {
+    function setBulkProps(vnode, srcAttrs, currentFile) {
       vnode_ensureElementInflated(vnode);
       const dstAttrs = vnode;
       let srcIdx = 0;
@@ -4196,9 +4266,16 @@ globalThis.qwikOptimizer = function(module) {
             value(element);
             return;
           }
+          throw qError(32, [ currentFile ]);
+        }
+        if (isSignal(value)) {
+          const signalData = new EffectPropData({
+            $scopedStyleIdPrefix$: scopedStyleIdPrefix,
+            $isConst$: false
+          });
+          value = trackSignalAndAssignHost(value, vnode, key, container, signalData);
         }
-        isSignal(value) && (value = untrack((() => value.value)));
-        vnode_setAttr(journal, vnode, key, value);
+        vnode_setAttr(journal, vnode, key, serializeAttribute(key, value, scopedStyleIdPrefix));
         null === value && (dstLength = dstAttrs.length);
       };
       const recordJsxEvent = (key, value) => {
@@ -4234,6 +4311,8 @@ globalThis.qwikOptimizer = function(module) {
           }
           srcIdx++;
           srcKey = srcIdx < srcLength ? srcAttrs[srcIdx++] : null;
+          dstIdx++;
+          dstKey = dstIdx < dstLength ? dstAttrs[dstIdx++] : null;
         } else if (srcKey == dstKey) {
           const srcValue = srcAttrs[srcIdx++];
           const dstValue = dstAttrs[dstIdx++];
@@ -4300,7 +4379,7 @@ globalThis.qwikOptimizer = function(module) {
       if (null !== jsxKey) {
         vNewNode = retrieveChildWithKey(null, jsxKey);
         if (null != vNewNode) {
-          vnode_insertBefore(journal, vParent, vNewNode = vnode_newVirtual(), vCurrent && getInsertBefore());
+          vnode_insertBefore(journal, vParent, vNewNode, vCurrent && getInsertBefore());
           return;
         }
       }
@@ -4455,7 +4534,7 @@ globalThis.qwikOptimizer = function(module) {
               const obj = seq[i];
               if (isTask(obj)) {
                 const task = obj;
-                clearSubscriberEffectDependencies(task);
+                clearSubscriberEffectDependencies(container, task);
                 1 & task.$flags$ ? container.$scheduler$(48, task) : cleanupTask(task);
               }
             }
@@ -4558,15 +4637,15 @@ globalThis.qwikOptimizer = function(module) {
       };
       chore.$promise$ = new Promise((resolve => chore.$resolve$ = resolve));
       DEBUG2 && debugTrace("schedule", chore, currentChore, choreQueue);
-      chore = sortedInsert(choreQueue, chore);
+      chore = sortedInsert(choreQueue, chore, container.rootVNode || null);
       if (!journalFlushScheduled && runLater) {
         journalFlushScheduled = true;
         schedule(16);
         scheduleDrain();
       }
-      return runLater ? chore.$promise$ : drainUpTo(chore);
+      return runLater ? chore.$promise$ : drainUpTo(chore, container.rootVNode || null);
     }
-    function drainUpTo(runUptoChore) {
+    function drainUpTo(runUptoChore, rootVNode) {
       if (runUptoChore.$executed$) {
         return runUptoChore.$returnValue$;
       }
@@ -4575,7 +4654,7 @@ globalThis.qwikOptimizer = function(module) {
       }
       while (choreQueue.length) {
         const nextChore = choreQueue.shift();
-        const order = choreComparator(nextChore, runUptoChore, false);
+        const order = choreComparator(nextChore, runUptoChore, rootVNode, false);
         if (null === order) {
           continue;
         }
@@ -4589,7 +4668,7 @@ globalThis.qwikOptimizer = function(module) {
         }
         const returnValue = executeChore(nextChore);
         if (isPromise(returnValue)) {
-          const promise = returnValue.then((() => drainUpTo(runUptoChore)));
+          const promise = returnValue.then((() => drainUpTo(runUptoChore, rootVNode)));
           return promise;
         }
       }
@@ -4701,7 +4780,7 @@ globalThis.qwikOptimizer = function(module) {
   function vNodeAlreadyDeleted(chore) {
     return !!(chore.$host$ && vnode_isVNode(chore.$host$) && 32 & chore.$host$[0]);
   }
-  function choreComparator(a, b, shouldThrowOnHostMismatch) {
+  function choreComparator(a, b, rootVNode, shouldThrowOnHostMismatch) {
     const macroTypeDiff = (240 & a.$type$) - (240 & b.$type$);
     if (0 !== macroTypeDiff) {
       return macroTypeDiff;
@@ -4719,7 +4798,7 @@ globalThis.qwikOptimizer = function(module) {
           return null;
         }
         {
-          const hostDiff = vnode_documentPosition(aHost, bHost);
+          const hostDiff = vnode_documentPosition(aHost, bHost, rootVNode);
           if (0 !== hostDiff) {
             return hostDiff;
           }
@@ -4739,13 +4818,13 @@ globalThis.qwikOptimizer = function(module) {
     }
     return 0;
   }
-  function sortedFindIndex(sortedArray, value) {
+  function sortedFindIndex(sortedArray, value, rootVNode) {
     let bottom = 0;
     let top = sortedArray.length;
     while (bottom < top) {
       const middle = bottom + (top - bottom >> 1);
       const midChore = sortedArray[middle];
-      const comp = choreComparator(value, midChore, true);
+      const comp = choreComparator(value, midChore, rootVNode, true);
       if (comp < 0) {
         top = middle;
       } else {
@@ -4757,8 +4836,8 @@ globalThis.qwikOptimizer = function(module) {
     }
     return ~bottom;
   }
-  function sortedInsert(sortedArray, value) {
-    const idx = sortedFindIndex(sortedArray, value);
+  function sortedInsert(sortedArray, value, rootVNode) {
+    const idx = sortedFindIndex(sortedArray, value, rootVNode);
     if (idx < 0) {
       sortedArray.splice(~idx, 0, value);
       return value;
@@ -4801,7 +4880,7 @@ globalThis.qwikOptimizer = function(module) {
     cleanupTask(task);
     const iCtx = newInvokeContext(container.$locale$, host, void 0, TaskEvent);
     iCtx.$container$ = container;
-    const taskFn = task.$qrl$.getFn(iCtx, (() => clearSubscriberEffectDependencies(task)));
+    const taskFn = task.$qrl$.getFn(iCtx, (() => clearSubscriberEffectDependencies(container, task)));
     const track = (obj, prop) => {
       const ctx = newInvokeContext();
       ctx.$effectSubscriber$ = [ task, ":" ];
@@ -5129,7 +5208,7 @@ globalThis.qwikOptimizer = function(module) {
       throw qError(49);
     }
   };
-  var version = "2.0.0-alpha.4-dev+374e0d6";
+  var version = "2.0.0-alpha.5-dev+cb53bbd";
   var _SharedContainer = class {
     $version$;
     $scheduler$;
@@ -6248,7 +6327,7 @@ globalThis.qwikOptimizer = function(module) {
     assertTrue(vnode_isTextVNode(vnode), "Expecting Text Node.");
     return vnode[4];
   };
-  function vnode_toString(depth = 10, offset = "", materialize2 = false, siblings = false) {
+  function vnode_toString(depth = 20, offset = "", materialize2 = false, siblings = false) {
     var _a;
     let vnode = this;
     if (0 === depth) {
@@ -6431,17 +6510,19 @@ globalThis.qwikOptimizer = function(module) {
   var isElement = node => node && "object" == typeof node && 1 === fastNodeType(node);
   var aPath = [];
   var bPath = [];
-  var vnode_documentPosition = (a, b) => {
+  var vnode_documentPosition = (a, b, rootVNode) => {
     if (a === b) {
       return 0;
     }
     let aDepth = -1;
     let bDepth = -1;
     while (a) {
-      a = (aPath[++aDepth] = a)[1];
+      const vNode = aPath[++aDepth] = a;
+      a = vNode[1] || rootVNode && vnode_getProp(a, QSlotParent, (id => vnode_locate(rootVNode, id)));
     }
     while (b) {
-      b = (bPath[++bDepth] = b)[1];
+      const vNode = bPath[++bDepth] = b;
+      b = vNode[1] || rootVNode && vnode_getProp(b, QSlotParent, (id => vnode_locate(rootVNode, id)));
     }
     while (aDepth >= 0 && bDepth >= 0) {
       a = aPath[aDepth];
@@ -6461,6 +6542,9 @@ globalThis.qwikOptimizer = function(module) {
             return -1;
           }
         } while (cursor);
+        if (rootVNode && vnode_getProp(b, QSlotParent, (id => vnode_locate(rootVNode, id)))) {
+          return -1;
+        }
         return 1;
       }
       aDepth--;
@@ -6472,8 +6556,7 @@ globalThis.qwikOptimizer = function(module) {
     let projectionDepth = 1;
     while (projectionDepth--) {
       while (vHost && (!vnode_isVirtualVNode(vHost) || null === vnode_getProp(vHost, OnRenderProp, null))) {
-        const qSlotParentProp = vnode_getProp(vHost, QSlotParent, null);
-        const qSlotParent = qSlotParentProp && ("string" === typeof qSlotParentProp ? vnode_locate(rootVNode, qSlotParentProp) : qSlotParentProp);
+        const qSlotParent = vnode_getProp(vHost, QSlotParent, (id => vnode_locate(rootVNode, id)));
         const vProjectionParent = vnode_isVirtualVNode(vHost) && qSlotParent;
         vProjectionParent && projectionDepth++;
         vHost = vProjectionParent || vnode_getParent(vHost);
@@ -6934,13 +7017,10 @@ globalThis.qwikOptimizer = function(module) {
           if (null !== vnode_getProp(vNode, OnRenderProp, null)) {
             return vNode;
           }
-          const parent = vnode_getProp(vNode, QSlotParent, this.$vnodeLocate$);
-          if (parent) {
-            vNode = parent;
-            continue;
-          }
+          vNode = vnode_getParent(vNode) || vnode_getProp(vNode, QSlotParent, this.$vnodeLocate$);
+        } else {
+          vNode = vnode_getParent(vNode);
         }
-        vNode = vnode_getParent(vNode);
       }
       return null;
     }
@@ -7035,10 +7115,6 @@ globalThis.qwikOptimizer = function(module) {
     }
   };
   var deserializedProxyMap = new WeakMap;
-  var unwrapDeserializerProxy = value => {
-    const unwrapped = "object" === typeof value && null !== value && value[SERIALIZER_PROXY_UNWRAP];
-    return unwrapped || value;
-  };
   var isDeserializerProxy = value => "object" === typeof value && null !== value && SERIALIZER_PROXY_UNWRAP in value;
   var SERIALIZER_PROXY_UNWRAP = Symbol("UNWRAP");
   var wrapDeserializerProxy = (container, data) => {
@@ -7076,11 +7152,11 @@ globalThis.qwikOptimizer = function(module) {
         return value;
       }
       const container = this.$container$;
-      const propValue = allocate(container, typeId, value);
+      let propValue = allocate(container, typeId, value);
+      typeId >= 12 && (propValue = inflate(container, propValue, typeId, value));
       Reflect.set(target, property, propValue);
       this.$data$[idx] = void 0;
       this.$data$[idx + 1] = propValue;
-      typeId >= 12 && inflate(container, propValue, typeId, value);
       return propValue;
     }
     has(target, property) {
@@ -7115,7 +7191,7 @@ globalThis.qwikOptimizer = function(module) {
   var inflate = (container, target, typeId, data) => {
     var _a;
     if (void 0 === typeId) {
-      return;
+      return target;
     }
     13 !== typeId && Array.isArray(data) && (data = _eagerDeserializeArray(container, data));
     switch (typeId) {
@@ -7182,12 +7258,11 @@ globalThis.qwikOptimizer = function(module) {
      case 26:
       {
         const [value, flags, effects2, storeEffect] = data;
-        const handler = getStoreHandler(target);
-        handler.$flags$ = flags;
-        Object.assign(getStoreTarget(target), value);
+        const store = getOrCreateStore(value, flags, container);
+        const storeHandler = getStoreHandler(store);
         storeEffect && (effects2[STORE_ARRAY_PROP] = storeEffect);
-        handler.$effects$ = effects2;
-        container.$storeProxyMap$.set(value, target);
+        storeHandler.$effects$ = effects2;
+        target = store;
         break;
       }
 
@@ -7323,6 +7398,7 @@ globalThis.qwikOptimizer = function(module) {
      default:
       throw qError(33, [ typeId ]);
     }
+    return target;
   };
   var _constants = [ void 0, null, true, false, "", EMPTY_ARRAY, EMPTY_OBJ, NEEDS_COMPUTATION, Slot, Fragment, NaN, 1 / 0, -1 / 0, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER - 1, Number.MIN_SAFE_INTEGER ];
   var allocate = (container, typeId, value) => {
@@ -7385,10 +7461,8 @@ globalThis.qwikOptimizer = function(module) {
       return new ComputedSignal(container, null);
 
      case 25:
-      return createStore(container, {}, 0);
-
      case 26:
-      return createStore(container, [], 0);
+      return null;
 
      case 11:
       return new URLSearchParams(value);
@@ -7946,13 +8020,13 @@ globalThis.qwikOptimizer = function(module) {
     }
     return qrlStringInline;
   }
-  function deserializeData(container, typeId, propValue) {
+  function deserializeData(container, typeId, value) {
     if (void 0 === typeId) {
-      return propValue;
+      return value;
     }
-    const value = allocate(container, typeId, propValue);
-    typeId >= 12 && inflate(container, value, typeId, propValue);
-    return value;
+    let propValue = allocate(container, typeId, value);
+    typeId >= 12 && (propValue = inflate(container, propValue, typeId, value));
+    return propValue;
   }
   function shouldTrackObj(obj) {
     return "object" === typeof obj && null !== obj || "string" === typeof obj && obj.length > 1;