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

package/dist/server.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/server 2.0.0-alpha.5-dev+cb53bbd
+ * @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
@@ -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.5-dev+cb53bbd",
+  qwik: "2.0.0-alpha.6-dev+d848ba5",
   qwikDom: "2.1.19"
 };
 
@@ -1142,6 +1149,17 @@ function clearArgEffect(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);
@@ -2597,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) => {
@@ -2644,7 +2737,7 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
     }
     while (choreQueue.length) {
       const nextChore = choreQueue.shift();
-      const order = choreComparator(nextChore, runUptoChore, rootVNode, false);
+      const order = choreComparator(nextChore, runUptoChore, rootVNode);
       if (order === null) {
         continue;
       }
@@ -2690,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;
@@ -2723,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$;
@@ -2786,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, rootVNode, shouldThrowOnHostMismatch) {
+function choreComparator(a, b, rootVNode) {
   const macroTypeDiff = (a.$type$ & 240 /* MACRO */) - (b.$type$ & 240 /* MACRO */);
   if (macroTypeDiff !== 0) {
     return macroTypeDiff;
@@ -2805,11 +2902,11 @@ function choreComparator(a, b, rootVNode, 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 */);
@@ -2832,7 +2929,7 @@ function sortedFindIndex(sortedArray, value, rootVNode) {
   while (bottom < top) {
     const middle = bottom + (top - bottom >> 1);
     const midChore = sortedArray[middle];
-    const comp = choreComparator(value, midChore, rootVNode, true);
+    const comp = choreComparator(value, midChore, rootVNode);
     if (comp < 0) {
       top = middle;
     } else if (comp > 0) {
@@ -3057,7 +3154,7 @@ var Signal = class {
   // prevent accidental use as value
   valueOf() {
     if (qDev) {
-      throw qError(46 /* cannotCoerceSignal */);
+      throw qError(45 /* cannotCoerceSignal */);
     }
   }
   toString() {
@@ -3224,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$
         ]);
@@ -3247,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 {
@@ -3314,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.5-dev+cb53bbd";
+var version = "2.0.0-alpha.6-dev+d848ba5";
 
 // packages/qwik/src/core/shared/shared-container.ts
 var _SharedContainer = class {
@@ -5163,51 +5260,6 @@ 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, rootVNode) => {
-  if (a === b) {
-    return 0;
-  }
-  let aDepth = -1;
-  let bDepth = -1;
-  while (a) {
-    const vNode = aPath[++aDepth] = a;
-    a = vNode[1 /* parent */] || rootVNode && vnode_getProp(a, QSlotParent, (id) => vnode_locate(rootVNode, id));
-  }
-  while (b) {
-    const vNode = bPath[++bDepth] = b;
-    b = vNode[1 /* parent */] || rootVNode && vnode_getProp(b, QSlotParent, (id) => vnode_locate(rootVNode, id));
-  }
-  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);
-      if (rootVNode && vnode_getProp(b, QSlotParent, (id) => vnode_locate(rootVNode, id))) {
-        return -1;
-      }
-      return 1;
-    }
-  }
-  return aDepth < bDepth ? -1 : 1;
-};
 var vnode_getProjectionParentComponent = (vHost, rootVNode) => {
   let projectionDepth = 1;
   while (projectionDepth--) {
@@ -8917,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;
         }