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

package/dist/optimizer.mjs

@@ -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
@@ -1260,7 +1260,7 @@ function createPath(opts = {}) {
 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() {
@@ -2997,7 +2997,7 @@ function assertNumber(value1, text, ...parts) {
 
 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];
@@ -3232,7 +3232,7 @@ function setLocale(locale) {
 }
 
 var versions3 = {
-  qwik: "2.0.0-alpha.4-dev+374e0d6",
+  qwik: "2.0.0-alpha.5-dev+cb53bbd",
   qwikDom: globalThis.QWIK_DOM_VERSION
 };
 
@@ -3501,7 +3501,6 @@ var StoreHandler = class {
     return value;
   }
   set(target, prop, value) {
-    target = unwrapDeserializerProxy(target);
     if ("symbol" === typeof prop) {
       target[prop] = value;
       return true;
@@ -3561,6 +3560,7 @@ function addEffect(target, prop, store, effectSubscriber) {
   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(), "  "));
 }
 
@@ -3597,28 +3597,36 @@ function clearVNodeEffectDependencies(container, value) {
   }
   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--) {
@@ -3629,15 +3637,62 @@ function clearEffects(subscriber, value) {
       }
     }
   }
-  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",
@@ -3663,7 +3718,7 @@ var runResource = (task, container, host) => {
   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) => {
@@ -4067,6 +4122,17 @@ function escapeHTML(html) {
   return 0 === lastIdx ? html : escapedHTML + html.substring(lastIdx);
 }
 
+function getFileLocationFromJsx(jsxDev) {
+  if (!jsxDev) {
+    return null;
+  }
+  const sanitizedFileName = jsxDev.fileName?.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 = [];
@@ -4348,7 +4414,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       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;
@@ -4372,6 +4438,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
             value(element);
             continue;
           }
+          throw qError(32, [ currentFile ]);
         }
         if (isSignal(value)) {
           const signalData = new EffectPropData({
@@ -4386,13 +4453,13 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           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);
@@ -4421,20 +4488,27 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     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) => {
@@ -4452,7 +4526,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       });
     }
   }
-  function setBulkProps(vnode, srcAttrs) {
+  function setBulkProps(vnode, srcAttrs, currentFile) {
     vnode_ensureElementInflated(vnode);
     const dstAttrs = vnode;
     let srcIdx = 0;
@@ -4477,9 +4551,16 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           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) => {
@@ -4515,6 +4596,8 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         }
         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++];
@@ -4581,7 +4664,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     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;
       }
     }
@@ -4742,7 +4825,7 @@ function cleanup(container, vNode) {
             const obj = seq[i];
             if (isTask(obj)) {
               const task = obj;
-              clearSubscriberEffectDependencies(task);
+              clearSubscriberEffectDependencies(container, task);
               1 & task.$flags$ ? container.$scheduler$(48, task) : cleanupTask(task);
             }
           }
@@ -4851,15 +4934,15 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
     };
     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$;
     }
@@ -4868,7 +4951,7 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
     }
     while (choreQueue.length) {
       const nextChore = choreQueue.shift();
-      const order = choreComparator(nextChore, runUptoChore, false);
+      const order = choreComparator(nextChore, runUptoChore, rootVNode, false);
       if (null === order) {
         continue;
       }
@@ -4882,7 +4965,7 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
       }
       const returnValue = executeChore(nextChore);
       if (isPromise(returnValue)) {
-        const promise = returnValue.then((() => drainUpTo(runUptoChore)));
+        const promise = returnValue.then((() => drainUpTo(runUptoChore, rootVNode)));
         return promise;
       }
     }
@@ -4996,7 +5079,7 @@ 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;
@@ -5014,7 +5097,7 @@ function choreComparator(a, b, shouldThrowOnHostMismatch) {
         return null;
       }
       {
-        const hostDiff = vnode_documentPosition(aHost, bHost);
+        const hostDiff = vnode_documentPosition(aHost, bHost, rootVNode);
         if (0 !== hostDiff) {
           return hostDiff;
         }
@@ -5035,13 +5118,13 @@ function choreComparator(a, b, shouldThrowOnHostMismatch) {
   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 {
@@ -5054,8 +5137,8 @@ function sortedFindIndex(sortedArray, value) {
   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;
@@ -5100,7 +5183,7 @@ var runTask = (task, container, host) => {
   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, ":" ];
@@ -5444,7 +5527,7 @@ var WrappedSignal = class extends Signal {
   }
 };
 
-var version = "2.0.0-alpha.4-dev+374e0d6";
+var version = "2.0.0-alpha.5-dev+cb53bbd";
 
 var _SharedContainer = class {
   constructor(scheduleDrain, journalFlush, serverData, locale) {
@@ -6659,7 +6742,7 @@ var vnode_getNode = vnode => {
   return vnode[4];
 };
 
-function vnode_toString(depth = 10, offset = "", materialize2 = false, siblings = false) {
+function vnode_toString(depth = 20, offset = "", materialize2 = false, siblings = false) {
   let vnode = this;
   if (0 === depth) {
     return "...";
@@ -6850,17 +6933,19 @@ 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];
@@ -6880,6 +6965,9 @@ var vnode_documentPosition = (a, b) => {
           return -1;
         }
       } while (cursor);
+      if (rootVNode && vnode_getProp(b, QSlotParent, (id => vnode_locate(rootVNode, id)))) {
+        return -1;
+      }
       return 1;
     }
     aDepth--;
@@ -6892,8 +6980,7 @@ var vnode_getProjectionParentComponent = (vHost, rootVNode) => {
   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);
@@ -7378,13 +7465,10 @@ var DomContainer = class extends _SharedContainer {
         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;
   }
@@ -7476,11 +7560,6 @@ var DomContainer = class extends _SharedContainer {
 
 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");
@@ -7521,11 +7600,11 @@ var DeserializationHandler = class {
       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) {
@@ -7562,7 +7641,7 @@ var resolvers = new WeakMap;
 
 var inflate = (container, target, typeId, data) => {
   if (void 0 === typeId) {
-    return;
+    return target;
   }
   13 !== typeId && Array.isArray(data) && (data = _eagerDeserializeArray(container, data));
   switch (typeId) {
@@ -7629,12 +7708,11 @@ var inflate = (container, target, typeId, data) => {
    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;
     }
 
@@ -7770,6 +7848,7 @@ var inflate = (container, target, typeId, data) => {
    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 ];
@@ -7834,10 +7913,8 @@ var allocate = (container, typeId, value) => {
     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);
@@ -8404,13 +8481,13 @@ function qrlToString(serializationContext, value) {
   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) {

package/dist/prefetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/prefetch",
-  "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,