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

package/dist/server.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/server 2.0.0-alpha.4-dev+374e0d6
+ * @qwik.dev/core/server 2.0.0-alpha.6-dev+d848ba5
  * 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
@@ -243,7 +243,7 @@ See https://qwik.dev/docs/components/tasks/#use-method-rules`,
       // 30
       "QRLs can not be dynamically resolved, because it does not have a chunk path",
       // 31
-      "The JSX ref attribute must be a Signal",
+      "{{0}}\nThe JSX ref attribute must be a Signal",
       // 32
       "Serialization Error: Deserialization of data type {{0}} is not implemented",
       // 33
@@ -259,7 +259,7 @@ See https://qwik.dev/docs/components/tasks/#use-method-rules`,
       // 38
       "Serialization Error: Missing QRL chunk for {{0}}",
       // 39
-      "The value of the textarea must be a string",
+      "{{0}}\nThe value of the textarea must be a string found {{1}}",
       // 40
       "Unable to find q:container",
       // 41
@@ -269,8 +269,6 @@ See https://qwik.dev/docs/components/tasks/#use-method-rules`,
       // 43
       "Materialize error: missing element: {{0}} {{1}} {{2}}",
       // 44
-      "SsrError: {{0}}",
-      // 45
       "Cannot coerce a Signal, use `.value` instead",
       // 46
       "useComputedSignal$ QRL {{0}} {{1}} returned a Promise",
@@ -527,6 +525,106 @@ function assertNumber(value1, text, ...parts) {
 
 // packages/qwik/src/core/shared/platform/platform.ts
 var import_build = require("@qwik.dev/core/build");
+
+// packages/qwik/src/core/shared/types.ts
+var DEBUG_TYPE = "q:type";
+var START = "\x1B[34m";
+var END = "\x1B[0m";
+var VirtualTypeName = {
+  ["V" /* Virtual */]: (
+    /* ********* */
+    START + "Virtual" + END
+  ),
+  //
+  ["F" /* Fragment */]: (
+    /* ******** */
+    START + "Fragment" + END
+  ),
+  //
+  ["S" /* WrappedSignal */]: (
+    /* *** */
+    START + "Signal" + END
+  ),
+  //
+  ["A" /* Awaited */]: (
+    /* ********* */
+    START + "Awaited" + END
+  ),
+  //
+  ["C" /* Component */]: (
+    /* ******* */
+    START + "Component" + END
+  ),
+  //
+  ["I" /* InlineComponent */]: (
+    /* * */
+    START + "InlineComponent" + END
+  ),
+  //
+  ["P" /* Projection */]: (
+    /* ****** */
+    START + "Projection" + END
+  )
+  //
+};
+
+// packages/qwik/src/core/shared/utils/markers.ts
+var OnRenderProp = "q:renderFn";
+var ComponentStylesPrefixContent = "\u2B50\uFE0F";
+var QSlot = "q:slot";
+var QSlotParent = ":";
+var QSlotRef = "q:sref";
+var QSlotS = "q:s";
+var QStyle = "q:style";
+var QStyleSelector = "style[q\\:style]";
+var QStyleSSelector = "style[q\\:sstyle]";
+var QStylesAllSelector = QStyleSelector + "," + QStyleSSelector;
+var QScopedStyle = "q:sstyle";
+var QCtxAttr = "q:ctx";
+var QSubscribers = "q:subs";
+var QFuncsPrefix = "qFuncs_";
+var getQFuncs = (document2, hash2) => {
+  return document2[QFuncsPrefix + hash2] || [];
+};
+var QRenderAttr = "q:render";
+var QRuntimeAttr = "q:runtime";
+var QVersionAttr = "q:version";
+var QBaseAttr = "q:base";
+var QLocaleAttr = "q:locale";
+var QManifestHashAttr = "q:manifest-hash";
+var QInstanceAttr = "q:instance";
+var QContainerIsland = "q:container-island";
+var QContainerIslandEnd = "/" + QContainerIsland;
+var QIgnore = "q:ignore";
+var QIgnoreEnd = "/" + QIgnore;
+var QContainerAttr = "q:container";
+var QContainerAttrEnd = "/" + QContainerAttr;
+var QTemplate = "q:template";
+var QContainerSelector = "[q\\:container]:not([q\\:container=" + "html" /* HTML */ + "]):not([q\\:container=" + "text" /* TEXT */ + "])";
+var HTML_NS = "http://www.w3.org/1999/xhtml";
+var SVG_NS = "http://www.w3.org/2000/svg";
+var MATH_NS = "http://www.w3.org/1998/Math/MathML";
+var ResourceEvent = "qResource";
+var RenderEvent = "qRender";
+var TaskEvent = "qTask";
+var QDefaultSlot = "";
+var ELEMENT_ID = "q:id";
+var ELEMENT_KEY = "q:key";
+var ELEMENT_PROPS = "q:props";
+var ELEMENT_SEQ = "q:seq";
+var ELEMENT_SEQ_IDX = "q:seqIdx";
+var Q_PREFIX = "q:";
+var NON_SERIALIZABLE_MARKER_PREFIX = ":";
+var USE_ON_LOCAL = NON_SERIALIZABLE_MARKER_PREFIX + "on";
+var USE_ON_LOCAL_SEQ_IDX = NON_SERIALIZABLE_MARKER_PREFIX + "onIdx";
+var USE_ON_LOCAL_FLAGS = NON_SERIALIZABLE_MARKER_PREFIX + "onFlags";
+var FLUSH_COMMENT = "qkssr-f";
+var STREAM_BLOCK_START_COMMENT = "qkssr-pu";
+var STREAM_BLOCK_END_COMMENT = "qkssr-po";
+var Q_PROPS_SEPARATOR = ":";
+var dangerouslySetInnerHTML = "dangerouslySetInnerHTML";
+
+// packages/qwik/src/core/shared/platform/platform.ts
 var createPlatform2 = () => {
   return {
     isServer: import_build.isServer,
@@ -577,7 +675,7 @@ var createPlatform2 = () => {
 };
 var toUrl = (doc, containerEl, url) => {
   const baseURI = doc.baseURI;
-  const base = new URL(containerEl.getAttribute("q:base") ?? baseURI, baseURI);
+  const base = new URL(containerEl.getAttribute(QBaseAttr) ?? baseURI, baseURI);
   return new URL(url, base);
 };
 var _platform = /* @__PURE__ */ createPlatform2();
@@ -628,117 +726,26 @@ var delay = (timeout) => {
   });
 };
 function retryOnPromise(fn, retryCount = 0) {
-  try {
-    return fn();
-  } catch (e) {
+  const retryOrThrow = (e) => {
     if (isPromise(e) && retryCount < MAX_RETRY_ON_PROMISE_COUNT) {
       return e.then(retryOnPromise.bind(null, fn, retryCount++));
     }
     throw e;
+  };
+  try {
+    const result = fn();
+    if (isPromise(result)) {
+      return result.catch((e) => retryOrThrow(e));
+    }
+    return result;
+  } catch (e) {
+    return retryOrThrow(e);
   }
 }
 
 // packages/qwik/src/build/index.dev.ts
 var isDev = true;
 
-// packages/qwik/src/core/shared/types.ts
-var DEBUG_TYPE = "q:type";
-var START = "\x1B[34m";
-var END = "\x1B[0m";
-var VirtualTypeName = {
-  ["V" /* Virtual */]: (
-    /* ********* */
-    START + "Virtual" + END
-  ),
-  //
-  ["F" /* Fragment */]: (
-    /* ******** */
-    START + "Fragment" + END
-  ),
-  //
-  ["S" /* WrappedSignal */]: (
-    /* *** */
-    START + "Signal" + END
-  ),
-  //
-  ["A" /* Awaited */]: (
-    /* ********* */
-    START + "Awaited" + END
-  ),
-  //
-  ["C" /* Component */]: (
-    /* ******* */
-    START + "Component" + END
-  ),
-  //
-  ["I" /* InlineComponent */]: (
-    /* * */
-    START + "InlineComponent" + END
-  ),
-  //
-  ["P" /* Projection */]: (
-    /* ****** */
-    START + "Projection" + END
-  )
-  //
-};
-
-// packages/qwik/src/core/shared/utils/markers.ts
-var OnRenderProp = "q:renderFn";
-var ComponentStylesPrefixContent = "\u2B50\uFE0F";
-var QSlot = "q:slot";
-var QSlotParent = ":";
-var QSlotRef = "q:sref";
-var QSlotS = "q:s";
-var QStyle = "q:style";
-var QStyleSelector = "style[q\\:style]";
-var QStyleSSelector = "style[q\\:sstyle]";
-var QStylesAllSelector = QStyleSelector + "," + QStyleSSelector;
-var QScopedStyle = "q:sstyle";
-var QCtxAttr = "q:ctx";
-var QSubscribers = "q:subs";
-var QFuncsPrefix = "qFuncs_";
-var getQFuncs = (document2, hash2) => {
-  return document2[QFuncsPrefix + hash2] || [];
-};
-var QRenderAttr = "q:render";
-var QRuntimeAttr = "q:runtime";
-var QVersionAttr = "q:version";
-var QBaseAttr = "q:base";
-var QLocaleAttr = "q:locale";
-var QManifestHashAttr = "q:manifest-hash";
-var QInstanceAttr = "q:instance";
-var QContainerIsland = "q:container-island";
-var QContainerIslandEnd = "/" + QContainerIsland;
-var QIgnore = "q:ignore";
-var QIgnoreEnd = "/" + QIgnore;
-var QContainerAttr = "q:container";
-var QContainerAttrEnd = "/" + QContainerAttr;
-var QTemplate = "q:template";
-var QContainerSelector = "[q\\:container]:not([q\\:container=" + "html" /* HTML */ + "]):not([q\\:container=" + "text" /* TEXT */ + "])";
-var HTML_NS = "http://www.w3.org/1999/xhtml";
-var SVG_NS = "http://www.w3.org/2000/svg";
-var MATH_NS = "http://www.w3.org/1998/Math/MathML";
-var ResourceEvent = "qResource";
-var RenderEvent = "qRender";
-var TaskEvent = "qTask";
-var QDefaultSlot = "";
-var ELEMENT_ID = "q:id";
-var ELEMENT_KEY = "q:key";
-var ELEMENT_PROPS = "q:props";
-var ELEMENT_SEQ = "q:seq";
-var ELEMENT_SEQ_IDX = "q:seqIdx";
-var Q_PREFIX = "q:";
-var NON_SERIALIZABLE_MARKER_PREFIX = ":";
-var USE_ON_LOCAL = NON_SERIALIZABLE_MARKER_PREFIX + "on";
-var USE_ON_LOCAL_SEQ_IDX = NON_SERIALIZABLE_MARKER_PREFIX + "onIdx";
-var USE_ON_LOCAL_FLAGS = NON_SERIALIZABLE_MARKER_PREFIX + "onFlags";
-var FLUSH_COMMENT = "qkssr-f";
-var STREAM_BLOCK_START_COMMENT = "qkssr-pu";
-var STREAM_BLOCK_END_COMMENT = "qkssr-po";
-var Q_PROPS_SEPARATOR = ":";
-var dangerouslySetInnerHTML = "dangerouslySetInnerHTML";
-
 // packages/qwik/src/core/use/use-locale.ts
 var _locale = void 0;
 function setLocale(locale) {
@@ -775,7 +782,7 @@ function getBuildBase(opts) {
   return `${import_meta.env.BASE_URL}build/`;
 }
 var versions = {
-  qwik: "2.0.0-alpha.4-dev+374e0d6",
+  qwik: "2.0.0-alpha.6-dev+d848ba5",
   qwikDom: "2.1.19"
 };
 
@@ -941,7 +948,6 @@ var StoreHandler = class {
   }
   /** In the case of oldValue and value are the same, the effects are not triggered. */
   set(target, prop, value) {
-    target = unwrapDeserializerProxy(target);
     if (typeof prop === "symbol") {
       target[prop] = value;
       return true;
@@ -1009,6 +1015,11 @@ 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 /* EFFECT */],
+    target,
+    store.$container$
+  );
   DEBUG && log("sub", pad("\n" + store.$effects$.toString(), "  "));
 }
 function setNewValueAndTriggerEffects(prop, value, target, currentStore) {
@@ -1046,32 +1057,39 @@ function clearVNodeEffectDependencies(container, value) {
   }
   for (let i = effects.length - 1; i >= 0; i--) {
     const subscriber = effects[i];
-    const subscriptionRemoved = clearEffects(subscriber, value);
-    if (subscriptionRemoved) {
-      effects.splice(i, 1);
-    }
+    clearEffects(subscriber, value, effects, i, container);
+  }
+  if (effects.length === 0) {
+    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);
-      if (subscriptionRemoved) {
-        value.$effectDependencies$.splice(i, 1);
-      }
+      clearEffects(subscriber, value, value.$effectDependencies$, i, container);
+    }
+    if (value.$effectDependencies$.length === 0) {
+      value.$effectDependencies$ = null;
     }
   }
 }
-function clearEffects(subscriber, value) {
-  if (!isSignal(subscriber)) {
-    return false;
+function clearEffects(subscriber, value, effectArray, indexToRemove, container) {
+  let subscriptionRemoved = false;
+  const seenSet = /* @__PURE__ */ 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);
   }
-  const effectSubscriptions = subscriber.$effects$;
-  const hostElement = subscriber.$hostElement$;
-  if (hostElement && hostElement === value) {
-    subscriber.$hostElement$ = null;
+  if (subscriptionRemoved) {
+    effectArray.splice(indexToRemove, 1);
   }
+}
+function clearSignalEffects(subscriber, value, seenSet) {
+  const effectSubscriptions = subscriber.$effects$;
   let subscriptionRemoved = false;
   if (effectSubscriptions) {
     for (let i = effectSubscriptions.length - 1; i >= 0; i--) {
@@ -1082,14 +1100,76 @@ 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$;
+    if (hostElement && hostElement === value) {
+      subscriber.$hostElement$ = null;
+    }
+    const args = subscriber.$args$;
+    if (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 /* EFFECT */] === value) {
+        effects.splice(i, 1);
+        subscriptionRemoved = true;
+      }
+    }
+    if (effects.length === 0) {
+      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 (typeof arg === "object" && arg !== null) {
+    if (isStore(arg)) {
+      clearStoreEffects(getStoreHandler(arg), subscriber);
+    } else if (isPropsProxy(arg)) {
+      const constProps = arg[_CONST_PROPS];
+      const varProps = arg[_VAR_PROPS];
+      if (constProps) {
+        for (const key in constProps) {
+          clearArgEffect(constProps[key], subscriber, seenSet);
+        }
+      }
+      for (const key in varProps) {
+        clearArgEffect(varProps[key], subscriber, seenSet);
+      }
+    } else {
+      for (const key in arg) {
+        clearArgEffect(arg[key], subscriber, seenSet);
+      }
+    }
+  } else if (Array.isArray(arg)) {
+    clearArgsEffects(arg, subscriber, seenSet);
+  } else {
+  }
+}
 
 // packages/qwik/src/core/use/use-resource.ts
 var _createResourceReturn = (opts) => {
@@ -1115,7 +1195,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,
@@ -1603,6 +1683,19 @@ function escapeHTML(html) {
   }
 }
 
+// packages/qwik/src/core/shared/utils/jsx-filename.ts
+function getFileLocationFromJsx(jsxDev) {
+  var _a;
+  if (!jsxDev) {
+    return null;
+  }
+  const sanitizedFileName = (_a = jsxDev.fileName) == null ? void 0 : _a.replace(/\\/g, "/");
+  if (sanitizedFileName) {
+    return `${sanitizedFileName}:${jsxDev.lineNumber}:${jsxDev.columnNumber}`;
+  }
+  return null;
+}
+
 // packages/qwik/src/core/client/vnode-diff.ts
 var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
   let journal = container.$journal$;
@@ -1943,7 +2036,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 } = jsx2;
     let needsQDispatchEventPatch = false;
@@ -1971,6 +2064,8 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           } else if (typeof value === "function") {
             value(element);
             continue;
+          } else {
+            throw qError(32 /* invalidRefValue */, [currentFile]);
           }
         }
         if (isSignal(value)) {
@@ -1992,13 +2087,13 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           continue;
         }
         if (elementName === "textarea" && key2 === "value") {
-          if (typeof value !== "string") {
+          if (value && typeof value !== "string") {
             if (import_build4.isDev) {
-              throw qError(40 /* wrongTextareaValue */);
+              throw qError(40 /* wrongTextareaValue */, [currentFile, value]);
             }
             continue;
           }
-          element.value = escapeHTML(value);
+          element.value = escapeHTML(value || "");
           continue;
         }
         value = serializeAttribute(key2, value, scopedStyleIdPrefix);
@@ -2034,19 +2129,24 @@ 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);
       if (vNewNode === null) {
         needsQDispatchEventPatch = createNewElement(jsx2, elementName);
       } else {
         vnode_insertBefore(journal, vParent, vNewNode, vCurrent);
+        vCurrent = vNewNode;
+        vNewNode = null;
+        if (vSiblings !== null) {
+          vSiblingsIdx -= 3 /* Size */;
+        }
       }
     }
     const jsxAttrs = [];
     const props = jsx2.varProps;
     for (const key in props) {
-      let value = props[key];
-      value = serializeAttribute(key, value, scopedStyleIdPrefix);
+      const value = props[key];
       if (value != null) {
         mapArray_set(jsxAttrs, key, value, 0);
       }
@@ -2055,7 +2155,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       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);
       if (!element.qDispatchEvent) {
@@ -2078,7 +2178,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;
@@ -2101,12 +2201,18 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         } else if (typeof value === "function") {
           value(element);
           return;
+        } else {
+          throw qError(32 /* invalidRefValue */, [currentFile]);
         }
       }
       if (isSignal(value)) {
-        value = untrack(() => value.value);
+        const signalData = new EffectPropData({
+          $scopedStyleIdPrefix$: scopedStyleIdPrefix,
+          $isConst$: false
+        });
+        value = trackSignalAndAssignHost(value, vnode, key, container, signalData);
       }
-      vnode_setAttr(journal, vnode, key, value);
+      vnode_setAttr(journal, vnode, key, serializeAttribute(key, value, scopedStyleIdPrefix));
       if (value === null) {
         dstLength = dstAttrs.length;
       }
@@ -2148,6 +2254,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++];
@@ -2224,7 +2332,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         vnode_insertBefore(
           journal,
           vParent,
-          vNewNode = vnode_newVirtual(),
+          vNewNode,
           vCurrent && getInsertBefore()
         );
         return;
@@ -2422,7 +2530,7 @@ function cleanup(container, vNode) {
             const obj = seq[i];
             if (isTask(obj)) {
               const task = obj;
-              clearSubscriberEffectDependencies(task);
+              clearSubscriberEffectDependencies(container, task);
               if (task.$flags$ & 1 /* VISIBLE_TASK */) {
                 container.$scheduler$(48 /* CLEANUP_VISIBLE */, task);
               } else {
@@ -2507,6 +2615,81 @@ function markVNodeAsDeleted(vCursor) {
 var HANDLER_PREFIX = ":";
 var count = 0;
 
+// packages/qwik/src/core/shared/scheduler-document-position.ts
+var aVNodePath = [];
+var bVNodePath = [];
+var vnode_documentPosition = (a, b, rootVNode) => {
+  if (a === b) {
+    return 0;
+  }
+  let aDepth = -1;
+  let bDepth = -1;
+  while (a) {
+    const vNode = aVNodePath[++aDepth] = a;
+    a = vNode[1 /* parent */] || rootVNode && vnode_getProp(a, QSlotParent, (id) => vnode_locate(rootVNode, id));
+  }
+  while (b) {
+    const vNode = bVNodePath[++bDepth] = b;
+    b = vNode[1 /* parent */] || rootVNode && vnode_getProp(b, QSlotParent, (id) => vnode_locate(rootVNode, id));
+  }
+  while (aDepth >= 0 && bDepth >= 0) {
+    a = aVNodePath[aDepth];
+    b = bVNodePath[bDepth];
+    if (a === b) {
+      aDepth--;
+      bDepth--;
+    } else {
+      let cursor = b;
+      do {
+        cursor = vnode_getNextSibling(cursor);
+        if (cursor === a) {
+          return 1;
+        }
+      } while (cursor);
+      cursor = b;
+      do {
+        cursor = vnode_getPreviousSibling(cursor);
+        if (cursor === a) {
+          return -1;
+        }
+      } while (cursor);
+      if (rootVNode && vnode_getProp(b, QSlotParent, (id) => vnode_locate(rootVNode, id))) {
+        return -1;
+      }
+      return 1;
+    }
+  }
+  return aDepth < bDepth ? -1 : 1;
+};
+var aSsrNodePath = [];
+var bSsrNodePath = [];
+var ssrNodeDocumentPosition = (a, b) => {
+  if (a === b) {
+    return 0;
+  }
+  let aDepth = -1;
+  let bDepth = -1;
+  while (a) {
+    const ssrNode = aSsrNodePath[++aDepth] = a;
+    a = ssrNode.currentComponentNode;
+  }
+  while (b) {
+    const ssrNode = bSsrNodePath[++bDepth] = b;
+    b = ssrNode.currentComponentNode;
+  }
+  while (aDepth >= 0 && bDepth >= 0) {
+    a = aSsrNodePath[aDepth];
+    b = bSsrNodePath[bDepth];
+    if (a === b) {
+      aDepth--;
+      bDepth--;
+    } else {
+      return 1;
+    }
+  }
+  return aDepth < bDepth ? -1 : 1;
+};
+
 // packages/qwik/src/core/shared/scheduler.ts
 var DEBUG2 = false;
 var createScheduler = (container, scheduleDrain, journalFlush) => {
@@ -2533,7 +2716,7 @@ 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 /* JOURNAL_FLUSH */);
@@ -2542,10 +2725,10 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
     if (runLater) {
       return chore.$promise$;
     } else {
-      return drainUpTo(chore);
+      return drainUpTo(chore, container.rootVNode || null);
     }
   }
-  function drainUpTo(runUptoChore) {
+  function drainUpTo(runUptoChore, rootVNode) {
     if (runUptoChore.$executed$) {
       return runUptoChore.$returnValue$;
     }
@@ -2554,7 +2737,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);
       if (order === null) {
         continue;
       }
@@ -2569,7 +2752,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;
       }
     }
@@ -2600,11 +2783,13 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
           (jsx3) => {
             if (chore.$type$ === 7 /* COMPONENT */) {
               const styleScopedId = container.getHostProp(host, QScopedStyle);
-              return vnode_diff(
-                container,
-                jsx3,
-                host,
-                addComponentStylePrefix(styleScopedId)
+              return retryOnPromise(
+                () => vnode_diff(
+                  container,
+                  jsx3,
+                  host,
+                  addComponentStylePrefix(styleScopedId)
+                )
               );
             } else {
               return jsx3;
@@ -2633,7 +2818,9 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
         if (isSignal(jsx2)) {
           jsx2 = jsx2.value;
         }
-        returnValue = vnode_diff(container, jsx2, parentVirtualNode, null);
+        returnValue = retryOnPromise(
+          () => vnode_diff(container, jsx2, parentVirtualNode, null)
+        );
         break;
       case 5 /* NODE_PROP */:
         const virtualNode = chore.$host$;
@@ -2696,7 +2883,7 @@ var choreUpdate = (existing, newChore) => {
 function vNodeAlreadyDeleted(chore) {
   return !!(chore.$host$ && vnode_isVNode(chore.$host$) && chore.$host$[0 /* flags */] & 32 /* Deleted */);
 }
-function choreComparator(a, b, shouldThrowOnHostMismatch) {
+function choreComparator(a, b, rootVNode) {
   const macroTypeDiff = (a.$type$ & 240 /* MACRO */) - (b.$type$ & 240 /* MACRO */);
   if (macroTypeDiff !== 0) {
     return macroTypeDiff;
@@ -2706,7 +2893,7 @@ function choreComparator(a, b, shouldThrowOnHostMismatch) {
     const bHost = b.$host$;
     if (aHost !== bHost && aHost !== null && bHost !== null) {
       if (vnode_isVNode(aHost) && vnode_isVNode(bHost)) {
-        const hostDiff = vnode_documentPosition(aHost, bHost);
+        const hostDiff = vnode_documentPosition(aHost, bHost, rootVNode);
         if (hostDiff !== 0) {
           return hostDiff;
         }
@@ -2715,11 +2902,11 @@ function choreComparator(a, b, shouldThrowOnHostMismatch) {
           You are attempting to change a state that has already been streamed to the client.
           This can lead to inconsistencies between Server-Side Rendering (SSR) and Client-Side Rendering (CSR).
           Problematic Node: ${aHost.toString()}`;
-        if (shouldThrowOnHostMismatch) {
-          throw qError(45 /* serverHostMismatch */, [errorMessage]);
-        }
         logWarn(errorMessage);
-        return null;
+        const hostDiff = ssrNodeDocumentPosition(aHost, bHost);
+        if (hostDiff !== 0) {
+          return hostDiff;
+        }
       }
     }
     const microTypeDiff = (a.$type$ & 15 /* MICRO */) - (b.$type$ & 15 /* MICRO */);
@@ -2736,13 +2923,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);
     if (comp < 0) {
       top = middle;
     } else if (comp > 0) {
@@ -2753,8 +2940,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;
@@ -2807,7 +2994,10 @@ 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, ":" /* COMPONENT */];
@@ -2964,7 +3154,7 @@ var Signal = class {
   // prevent accidental use as value
   valueOf() {
     if (qDev) {
-      throw qError(46 /* cannotCoerceSignal */);
+      throw qError(45 /* cannotCoerceSignal */);
     }
   }
   toString() {
@@ -3131,7 +3321,7 @@ var ComputedSignal = class extends Signal {
     try {
       const untrackedValue = computeQrl.getFn(ctx)();
       if (isPromise(untrackedValue)) {
-        throw qError(47 /* computedNotSync */, [
+        throw qError(46 /* computedNotSync */, [
           computeQrl.dev ? computeQrl.dev.file : "",
           computeQrl.$hash$
         ]);
@@ -3154,7 +3344,7 @@ var ComputedSignal = class extends Signal {
     return super.value;
   }
   set value(_) {
-    throw qError(48 /* computedReadOnly */);
+    throw qError(47 /* computedReadOnly */);
   }
 };
 var WrappedSignal = class extends Signal {
@@ -3221,12 +3411,12 @@ var WrappedSignal = class extends Signal {
     return super.value;
   }
   set value(_) {
-    throw qError(49 /* wrappedReadOnly */);
+    throw qError(48 /* wrappedReadOnly */);
   }
 };
 
 // packages/qwik/src/core/version.ts
-var version = "2.0.0-alpha.4-dev+374e0d6";
+var version = "2.0.0-alpha.6-dev+d848ba5";
 
 // packages/qwik/src/core/shared/shared-container.ts
 var _SharedContainer = class {
@@ -4873,7 +5063,7 @@ var vnode_getNode = (vnode) => {
   assertTrue(vnode_isTextVNode(vnode), "Expecting Text Node.");
   return vnode[4 /* node */];
 };
-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 (depth === 0) {
@@ -5070,52 +5260,15 @@ var vnode_getType = (vnode) => {
 };
 var isElement = (node) => node && typeof node == "object" && fastNodeType(node) === /** Node.ELEMENT_NODE* */
 1;
-var aPath = [];
-var bPath = [];
-var vnode_documentPosition = (a, b) => {
-  if (a === b) {
-    return 0;
-  }
-  let aDepth = -1;
-  let bDepth = -1;
-  while (a) {
-    a = (aPath[++aDepth] = a)[1 /* parent */];
-  }
-  while (b) {
-    b = (bPath[++bDepth] = b)[1 /* parent */];
-  }
-  while (aDepth >= 0 && bDepth >= 0) {
-    a = aPath[aDepth];
-    b = bPath[bDepth];
-    if (a === b) {
-      aDepth--;
-      bDepth--;
-    } else {
-      let cursor = b;
-      do {
-        cursor = vnode_getNextSibling(cursor);
-        if (cursor === a) {
-          return 1;
-        }
-      } while (cursor);
-      cursor = b;
-      do {
-        cursor = vnode_getPreviousSibling(cursor);
-        if (cursor === a) {
-          return -1;
-        }
-      } while (cursor);
-      return 1;
-    }
-  }
-  return aDepth < bDepth ? -1 : 1;
-};
 var vnode_getProjectionParentComponent = (vHost, rootVNode) => {
   let projectionDepth = 1;
   while (projectionDepth--) {
     while (vHost && (vnode_isVirtualVNode(vHost) ? vnode_getProp(vHost, OnRenderProp, null) === null : true)) {
-      const qSlotParentProp = vnode_getProp(vHost, QSlotParent, null);
-      const qSlotParent = qSlotParentProp && (typeof qSlotParentProp === "string" ? vnode_locate(rootVNode, qSlotParentProp) : qSlotParentProp);
+      const qSlotParent = vnode_getProp(
+        vHost,
+        QSlotParent,
+        (id) => vnode_locate(rootVNode, id)
+      );
       const vProjectionParent = vnode_isVirtualVNode(vHost) && qSlotParent;
       if (vProjectionParent) {
         projectionDepth++;
@@ -5665,13 +5818,11 @@ var DomContainer = class extends _SharedContainer {
         if (vnode_getProp(vNode, OnRenderProp, null) !== null) {
           return vNode;
         }
-        const parent = vnode_getProp(vNode, QSlotParent, this.$vnodeLocate$);
-        if (parent) {
-          vNode = parent;
-          continue;
-        }
+        vNode = vnode_getParent(vNode) || // If virtual node, than it could be a slot so we need to read its parent.
+        vnode_getProp(vNode, QSlotParent, this.$vnodeLocate$);
+      } else {
+        vNode = vnode_getParent(vNode);
       }
-      vNode = vnode_getParent(vNode);
     }
     return null;
   }
@@ -5774,10 +5925,6 @@ var DomContainer = class extends _SharedContainer {
 
 // packages/qwik/src/core/shared/shared-serialization.ts
 var deserializedProxyMap = /* @__PURE__ */ new WeakMap();
-var unwrapDeserializerProxy = (value) => {
-  const unwrapped = typeof value === "object" && value !== null && value[SERIALIZER_PROXY_UNWRAP];
-  return unwrapped ? unwrapped : value;
-};
 var isDeserializerProxy = (value) => {
   return typeof value === "object" && value !== null && SERIALIZER_PROXY_UNWRAP in value;
 };
@@ -5819,13 +5966,13 @@ var DeserializationHandler = class {
       return value;
     }
     const container = this.$container$;
-    const propValue = allocate(container, typeId, value);
+    let propValue = allocate(container, typeId, value);
+    if (typeId >= 12 /* Error */) {
+      propValue = inflate(container, propValue, typeId, value);
+    }
     Reflect.set(target, property, propValue);
     this.$data$[idx] = void 0;
     this.$data$[idx + 1] = propValue;
-    if (typeId >= 12 /* Error */) {
-      inflate(container, propValue, typeId, value);
-    }
     return propValue;
   }
   has(target, property) {
@@ -5860,7 +6007,7 @@ var resolvers = /* @__PURE__ */ new WeakMap();
 var inflate = (container, target, typeId, data) => {
   var _a;
   if (typeId === void 0) {
-    return;
+    return target;
   }
   if (typeId !== 13 /* Object */ && Array.isArray(data)) {
     data = _eagerDeserializeArray(container, data);
@@ -5931,14 +6078,13 @@ var inflate = (container, target, typeId, data) => {
     case 25 /* Store */:
     case 26 /* StoreArray */: {
       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);
       if (storeEffect) {
         effects2[STORE_ARRAY_PROP] = storeEffect;
       }
-      handler.$effects$ = effects2;
-      container.$storeProxyMap$.set(value, target);
+      storeHandler.$effects$ = effects2;
+      target = store;
       break;
     }
     case 22 /* Signal */: {
@@ -6060,6 +6206,7 @@ var inflate = (container, target, typeId, data) => {
     default:
       throw qError(33 /* serializeErrorNotImplemented */, [typeId]);
   }
+  return target;
 };
 var _constants = [
   void 0,
@@ -6127,9 +6274,8 @@ var allocate = (container, typeId, value) => {
     case 24 /* ComputedSignal */:
       return new ComputedSignal(container, null);
     case 25 /* Store */:
-      return createStore(container, {}, 0);
     case 26 /* StoreArray */:
-      return createStore(container, [], 0);
+      return null;
     case 11 /* URLSearchParams */:
       return new URLSearchParams(value);
     case 27 /* FormData */:
@@ -6781,15 +6927,15 @@ function qrlToString(serializationContext, value) {
   }
   return qrlStringInline;
 }
-function deserializeData(container, typeId, propValue) {
+function deserializeData(container, typeId, value) {
   if (typeId === void 0) {
-    return propValue;
+    return value;
   }
-  const value = allocate(container, typeId, propValue);
+  let propValue = allocate(container, typeId, value);
   if (typeId >= 12 /* Error */) {
-    inflate(container, value, typeId, propValue);
+    propValue = inflate(container, propValue, typeId, value);
   }
-  return value;
+  return propValue;
 }
 function shouldTrackObj(obj) {
   return (
@@ -7533,7 +7679,7 @@ var SsrComponentFrame = class {
     if ((0, import_core2._isJSXNode)(children)) {
       const slotName = this.getSlotName(children);
       mapArray_set(this.slots, slotName, children, 0);
-    } else if (Array.isArray(children)) {
+    } else if (Array.isArray(children) && children.length > 0) {
       const defaultSlot = [];
       for (let i = 0; i < children.length; i++) {
         const child = children[i];
@@ -7548,7 +7694,7 @@ var SsrComponentFrame = class {
           defaultSlot.push(child);
         }
       }
-      defaultSlot.length && mapArray_set(this.slots, QDefaultSlot, defaultSlot, 0);
+      defaultSlot.length > 0 && mapArray_set(this.slots, QDefaultSlot, defaultSlot, 0);
     } else {
       mapArray_set(this.slots, QDefaultSlot, children, 0);
     }
@@ -8165,12 +8311,12 @@ var SSRContainer = class extends import_core4._SharedContainer {
     this.write("<");
     this.write(elementName);
     if (varAttrs) {
-      innerHTML = this.writeAttrs(elementName, varAttrs, false);
+      innerHTML = this.writeAttrs(elementName, varAttrs, false, currentFile);
     }
     this.write(" " + Q_PROPS_SEPARATOR);
     import_build10.isDev && this.write('=""');
     if (constAttrs && constAttrs.length) {
-      innerHTML = this.writeAttrs(elementName, constAttrs, true) || innerHTML;
+      innerHTML = this.writeAttrs(elementName, constAttrs, true, currentFile) || innerHTML;
     }
     this.write(">");
     this.lastNode = null;
@@ -8245,14 +8391,10 @@ var SSRContainer = class extends import_core4._SharedContainer {
     }
   }
   openProjection(attrs) {
-    var _a;
     this.openFragment(attrs);
-    const vNode = (_a = this.currentElementFrame) == null ? void 0 : _a.vNodeData;
-    if (vNode) {
-      vNode[0] |= 16 /* SERIALIZE */;
-    }
     const componentFrame = this.getComponentFrame();
     if (componentFrame) {
+      this.serializationCtx.$addRoot$(componentFrame.componentNode);
       componentFrame.projectionDepth++;
     }
   }
@@ -8818,7 +8960,7 @@ var SSRContainer = class extends import_core4._SharedContainer {
       this.write(element);
     }
   }
-  writeAttrs(tag, attrs, isConst) {
+  writeAttrs(tag, attrs, isConst, currentFile) {
     let innerHTML = void 0;
     if (attrs.length) {
       for (let i = 0; i < attrs.length; i++) {
@@ -8827,7 +8969,7 @@ var SSRContainer = class extends import_core4._SharedContainer {
         let styleScopedId = null;
         if (isSSRUnsafeAttr(key)) {
           if (import_build10.isDev) {
-            throw qError(51 /* unsafeAttr */);
+            throw qError(50 /* unsafeAttr */);
           }
           continue;
         }
@@ -8845,7 +8987,7 @@ var SSRContainer = class extends import_core4._SharedContainer {
             value(new DomRef(lastNode));
             continue;
           } else {
-            throw qError(32 /* invalidRefValue */);
+            throw qError(32 /* invalidRefValue */, [currentFile]);
           }
         }
         if ((0, import_core4.isSignal)(value)) {
@@ -8865,13 +9007,13 @@ var SSRContainer = class extends import_core4._SharedContainer {
           }
         }
         if (tag === "textarea" && key === "value") {
-          if (typeof value !== "string") {
+          if (value && typeof value !== "string") {
             if (import_build10.isDev) {
-              throw qError(40 /* wrongTextareaValue */);
+              throw qError(40 /* wrongTextareaValue */, [currentFile, value]);
             }
             continue;
           }
-          innerHTML = escapeHTML(value);
+          innerHTML = escapeHTML(value || "");
           key = QContainerAttr;
           value = "text" /* TEXT */;
         }