@qwik.dev/core 2.0.0-beta.24 → 2.0.0-beta.25

package/dist/testing/index.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/testing 2.0.0-beta.24-dev+314726b
+ * @qwik.dev/core/testing 2.0.0-beta.25-dev+2677279
  * 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
@@ -24346,6 +24346,9 @@ var ElementVNode = class extends VirtualVNode {
   }
 };
 
+// packages/qwik/src/core/shared/serdes/inflate.ts
+import { isServer as isServer9 } from "@qwik.dev/core/build";
+
 // packages/qwik/src/core/shared/serdes/qrl-to-string.ts
 import { isDev as isDev6 } from "@qwik.dev/core/build";
 function qrlToString(serializationContext, qrl, raw) {
@@ -28332,11 +28335,11 @@ function walkCursor(cursor, options) {
   );
   finishWalk(container, cursor, cursorData, isRunningOnServer);
 }
-function finishWalk(container, cursor, cursorData, isServer12) {
+function finishWalk(container, cursor, cursorData, isServer13) {
   if (!(cursor.dirty & 127 /* DIRTY_MASK */)) {
     removeCursorFromQueue(cursor, container);
     DEBUG6 && console.warn("walkCursor: cursor done", cursor.toString());
-    if (!isServer12) {
+    if (!isServer13) {
       executeFlushPhase(cursor, container);
     }
     if (cursorData.extraPromises) {
@@ -29081,12 +29084,7 @@ var Serializer = class {
         value.data.$isConst$
       ]);
     } else if (value instanceof EffectSubscription) {
-      this.output(32 /* EffectSubscription */, [
-        value.consumer,
-        value.property,
-        value.backRef,
-        value.data
-      ]);
+      this.output(32 /* EffectSubscription */, [value.consumer, value.property, value.data]);
     } else if (isStore(value)) {
       const storeHandler = getStoreHandler(value);
       const storeTarget = getStoreTarget(value);
@@ -29156,19 +29154,13 @@ var Serializer = class {
           });
           this.output(2 /* ForwardRef */, forwardRefId);
         } else {
-          this.output(26 /* SerializerSignal */, [
-            value.$computeQrl$,
-            filterEffectBackRefs(value[_EFFECT_BACK_REF]),
-            value.$effects$,
-            maybeValue
-          ]);
+          this.output(26 /* SerializerSignal */, [value.$computeQrl$, value.$effects$, maybeValue]);
         }
         return;
       }
       if (value instanceof WrappedSignalImpl) {
         this.output(23 /* WrappedSignal */, [
           ...serializeWrappingFn(this.$serializationContext$, value),
-          filterEffectBackRefs(value[_EFFECT_BACK_REF]),
           value.$flags$,
           value.$hostElement$,
           ...value.$effects$ || []
@@ -29191,11 +29183,7 @@ var Serializer = class {
         } else if (shouldNeverSerialize) {
           v = NEEDS_COMPUTATION;
         }
-        const out = [
-          value.$computeQrl$,
-          filterEffectBackRefs(value[_EFFECT_BACK_REF]),
-          value.$effects$
-        ];
+        const out = [value.$computeQrl$, value.$effects$];
         if (isAsync) {
           out.push(value.$loadingEffects$, value.$errorEffects$, value.$untrackedError$);
           out.push(asyncFlags || void 0);
@@ -29298,14 +29286,7 @@ var Serializer = class {
       }
       this.output(29 /* JSXNode */, out);
     } else if (value instanceof Task) {
-      const out = [
-        value.$qrl$,
-        value.$flags$,
-        value.$index$,
-        value.$el$,
-        value[_EFFECT_BACK_REF],
-        value.$state$
-      ];
+      const out = [value.$qrl$, value.$flags$, value.$index$, value.$el$, value.$state$];
       while (out[out.length - 1] === void 0) {
         out.pop();
       }
@@ -29474,18 +29455,6 @@ function serializeWrappingFn(serializationContext, value) {
   );
   return [syncFnId, value.$args$];
 }
-function filterEffectBackRefs(effectBackRef) {
-  let effectBackRefToSerialize = void 0;
-  if (effectBackRef) {
-    for (const [effectProp, effect] of effectBackRef) {
-      if (effect.backRef) {
-        effectBackRefToSerialize || (effectBackRefToSerialize = /* @__PURE__ */ new Map());
-        effectBackRefToSerialize.set(effectProp, effect);
-      }
-    }
-  }
-  return effectBackRefToSerialize;
-}
 function tryGetBackRefs(props) {
   return Object.prototype.hasOwnProperty.call(props, QBackRefs) ? props[QBackRefs] : void 0;
 }
@@ -29830,8 +29799,7 @@ var inflate = (container, target, typeId, data) => {
       task.$flags$ = v[1];
       task.$index$ = v[2];
       task.$el$ = v[3];
-      task[_EFFECT_BACK_REF] = v[4];
-      task.$state$ = v[5];
+      task.$state$ = v[4];
       break;
     case 21 /* Component */:
       target[SERIALIZABLE_STATE][0] = data[0];
@@ -29847,6 +29815,7 @@ var inflate = (container, target, typeId, data) => {
       const storeHandler = getStoreHandler(target);
       storeHandler.$flags$ = flags;
       storeHandler.$effects$ = effects;
+      restoreEffectBackRefForEffectsMap(storeHandler.$effects$, store);
       break;
     }
     case 22 /* Signal */: {
@@ -29854,6 +29823,7 @@ var inflate = (container, target, typeId, data) => {
       const d2 = data;
       signal.$untrackedValue$ = d2[0];
       signal.$effects$ = new Set(d2.slice(1));
+      restoreEffectBackRefForEffects(signal.$effects$, signal);
       break;
     }
     case 23 /* WrappedSignal */: {
@@ -29861,38 +29831,40 @@ var inflate = (container, target, typeId, data) => {
       const d2 = data;
       signal.$func$ = container.getSyncFn(d2[0]);
       signal.$args$ = d2[1];
-      signal[_EFFECT_BACK_REF] = d2[2];
       signal.$untrackedValue$ = NEEDS_COMPUTATION;
-      signal.$flags$ = d2[3];
+      signal.$flags$ = d2[2];
       signal.$flags$ |= 1 /* INVALID */;
-      signal.$hostElement$ = d2[4];
-      signal.$effects$ = new Set(d2.slice(5));
+      signal.$hostElement$ = d2[3];
+      signal.$effects$ = new Set(d2.slice(4));
       inflateWrappedSignalValue(signal);
+      restoreEffectBackRefForEffects(signal.$effects$, signal);
       break;
     }
     case 25 /* AsyncSignal */: {
       const asyncSignal = target;
       const d2 = data;
       asyncSignal.$computeQrl$ = d2[0];
-      asyncSignal[_EFFECT_BACK_REF] = d2[1];
-      asyncSignal.$effects$ = new Set(d2[2]);
-      asyncSignal.$loadingEffects$ = new Set(d2[3]);
-      asyncSignal.$errorEffects$ = new Set(d2[4]);
-      asyncSignal.$untrackedError$ = d2[5];
-      asyncSignal.$flags$ = d2[6] ?? 0;
+      asyncSignal.$effects$ = new Set(d2[1]);
+      asyncSignal.$loadingEffects$ = new Set(d2[2]);
+      asyncSignal.$errorEffects$ = new Set(d2[3]);
+      asyncSignal.$untrackedError$ = d2[4];
+      asyncSignal.$flags$ = d2[5] ?? 0;
       if (asyncSignal.$flags$ & 64 /* CLIENT_ONLY */) {
         asyncSignal.$untrackedLoading$ = true;
       }
-      const hasValue = d2.length > 7;
+      const hasValue = d2.length > 6;
       if (hasValue) {
-        asyncSignal.$untrackedValue$ = d2[7];
+        asyncSignal.$untrackedValue$ = d2[6];
       }
       if (asyncSignal.$untrackedValue$ === NEEDS_COMPUTATION) {
         asyncSignal.$flags$ |= 1 /* INVALID */;
       }
-      asyncSignal.interval = d2[8] ?? 0;
-      asyncSignal.$concurrency$ = d2[9] ?? 1;
-      asyncSignal.$timeoutMs$ = d2[10] ?? 0;
+      asyncSignal.interval = d2[7] ?? 0;
+      asyncSignal.$concurrency$ = d2[8] ?? 1;
+      asyncSignal.$timeoutMs$ = d2[9] ?? 0;
+      restoreEffectBackRefForEffects(asyncSignal.$effects$, asyncSignal);
+      restoreEffectBackRefForEffects(asyncSignal.$loadingEffects$, asyncSignal);
+      restoreEffectBackRefForEffects(asyncSignal.$errorEffects$, asyncSignal);
       break;
     }
     // Inflating a SerializerSignal is the same as inflating a ComputedSignal
@@ -29904,17 +29876,17 @@ var inflate = (container, target, typeId, data) => {
       const p = computed.$computeQrl$.resolve(container).catch(() => {
       });
       loading = loading.finally(() => p);
-      computed[_EFFECT_BACK_REF] = d2[1];
-      if (d2[2]) {
-        computed.$effects$ = new Set(d2[2]);
+      if (d2[1]) {
+        computed.$effects$ = new Set(d2[1]);
       }
-      const hasValue = d2.length > 3;
+      const hasValue = d2.length > 2;
       if (hasValue) {
-        computed.$untrackedValue$ = d2[3];
+        computed.$untrackedValue$ = d2[2];
       }
       if (typeId !== 26 /* SerializerSignal */ && computed.$untrackedValue$ !== NEEDS_COMPUTATION) {
         computed.$flags$ &= ~1 /* INVALID */;
       }
+      restoreEffectBackRefForEffects(computed.$effects$, computed);
       break;
     }
     case 15 /* Error */: {
@@ -29988,7 +29960,9 @@ var inflate = (container, target, typeId, data) => {
         owner._proxy = propsProxy;
       }
       propsProxy[_OWNER] = owner;
-      propsProxy[_PROPS_HANDLER].$effects$ = d[3];
+      const propsHandler = propsProxy[_PROPS_HANDLER];
+      propsHandler.$effects$ = d[3];
+      restoreEffectBackRefForEffectsMap(propsHandler.$effects$, propsProxy);
       break;
     case 31 /* SubscriptionData */: {
       const effectData = target;
@@ -30001,8 +29975,8 @@ var inflate = (container, target, typeId, data) => {
       const d2 = data;
       effectSub.consumer = d2[0];
       effectSub.property = d2[1];
-      effectSub.backRef = d2[2];
-      effectSub.data = d2[3];
+      effectSub.data = d2[2];
+      restoreEffectBackRefForConsumer(effectSub);
       break;
     }
     default:
@@ -30051,6 +30025,31 @@ function inflateWrappedSignalValue(signal) {
     }
   }
 }
+function restoreEffectBackRefForConsumer(effect) {
+  var _a6;
+  const isServerSide = import.meta.env.TEST ? isServerPlatform() : isServer9;
+  const consumerBackRef = effect.consumer;
+  if (isServerSide && !consumerBackRef) {
+    return;
+  }
+  consumerBackRef[_a6 = _EFFECT_BACK_REF] || (consumerBackRef[_a6] = /* @__PURE__ */ new Map());
+  consumerBackRef[_EFFECT_BACK_REF].set(effect.property, effect);
+}
+function restoreEffectBackRefForEffects(effects, consumer) {
+  if (effects) {
+    for (const effect of effects) {
+      effect.backRef || (effect.backRef = /* @__PURE__ */ new Set());
+      effect.backRef.add(consumer);
+    }
+  }
+}
+function restoreEffectBackRefForEffectsMap(effectsMap, consumer) {
+  if (effectsMap) {
+    for (const [, effects] of effectsMap) {
+      restoreEffectBackRefForEffects(effects, consumer);
+    }
+  }
+}
 
 // packages/qwik/src/core/shared/qrl/qrl-class.ts
 var _captures = null;
@@ -30285,6 +30284,10 @@ var _jsxSplit = (type, varProps, constProps, children, flags, key, dev) => {
             constProps[attr] = constProps[k];
           }
           delete constProps[k];
+        } else if (k === BIND_CHECKED) {
+          bindCheckedSignal = constProps[k];
+        } else if (k === BIND_VALUE) {
+          bindValueSignal = constProps[k];
         }
         processedKeys.add(k);
       }
@@ -30310,40 +30313,59 @@ var _jsxSplit = (type, varProps, constProps, children, flags, key, dev) => {
         }
         processedKeys.add(k);
       }
-      if (bindCheckedSignal || bindValueSignal) {
-        if (!varPropsCopied) {
-          varProps = { ...varProps };
-          varPropsCopied = true;
-        }
-        if (bindCheckedSignal) {
+    }
+    if (bindCheckedSignal || bindValueSignal) {
+      if (!varPropsCopied) {
+        varProps = { ...varProps };
+        varPropsCopied = true;
+      }
+      varProps || (varProps = {});
+      if (bindCheckedSignal) {
+        if (varProps && _hasOwnProperty3.call(varProps, BIND_CHECKED)) {
           delete varProps[BIND_CHECKED];
-          varProps.checked = bindCheckedSignal;
-          const handler = createQRL(null, "_chk", _chk, null, [bindCheckedSignal]);
-          if (constProps && _hasOwnProperty3.call(constProps, "q-e:input")) {
-            if (!constPropsCopied) {
-              constProps = { ...constProps };
-              constPropsCopied = true;
-            }
-            const existingHandler = constProps["q-e:input"];
-            delete constProps["q-e:input"];
-            toSort = mergeHandlers(varProps, "q-e:input", existingHandler) || toSort;
-          }
-          toSort = mergeHandlers(varProps, "q-e:input", handler) || toSort;
-        } else if (bindValueSignal) {
+        }
+        if (constProps && _hasOwnProperty3.call(constProps, BIND_CHECKED)) {
+          if (!constPropsCopied) {
+            constProps = { ...constProps };
+            constPropsCopied = true;
+          }
+          delete constProps[BIND_CHECKED];
+        }
+        varProps.checked = bindCheckedSignal;
+        const handler = createQRL(null, "_chk", _chk, null, [bindCheckedSignal]);
+        if (constProps && _hasOwnProperty3.call(constProps, "q-e:input")) {
+          if (!constPropsCopied) {
+            constProps = { ...constProps };
+            constPropsCopied = true;
+          }
+          const existingHandler = constProps["q-e:input"];
+          delete constProps["q-e:input"];
+          toSort = mergeHandlers(varProps, "q-e:input", existingHandler) || toSort;
+        }
+        toSort = mergeHandlers(varProps, "q-e:input", handler) || toSort;
+      } else if (bindValueSignal) {
+        if (varProps && _hasOwnProperty3.call(varProps, BIND_VALUE)) {
           delete varProps[BIND_VALUE];
-          varProps.value = bindValueSignal;
-          const handler = createQRL(null, "_val", _val, null, [bindValueSignal]);
-          if (constProps && _hasOwnProperty3.call(constProps, "q-e:input")) {
-            if (!constPropsCopied) {
-              constProps = { ...constProps };
-              constPropsCopied = true;
-            }
-            const existingHandler = constProps["q-e:input"];
-            delete constProps["q-e:input"];
-            toSort = mergeHandlers(varProps, "q-e:input", existingHandler) || toSort;
+        }
+        if (constProps && _hasOwnProperty3.call(constProps, BIND_VALUE)) {
+          if (!constPropsCopied) {
+            constProps = { ...constProps };
+            constPropsCopied = true;
+          }
+          delete constProps[BIND_VALUE];
+        }
+        varProps.value = bindValueSignal;
+        const handler = createQRL(null, "_val", _val, null, [bindValueSignal]);
+        if (constProps && _hasOwnProperty3.call(constProps, "q-e:input")) {
+          if (!constPropsCopied) {
+            constProps = { ...constProps };
+            constPropsCopied = true;
           }
-          toSort = mergeHandlers(varProps, "q-e:input", handler) || toSort;
+          const existingHandler = constProps["q-e:input"];
+          delete constProps["q-e:input"];
+          toSort = mergeHandlers(varProps, "q-e:input", existingHandler) || toSort;
         }
+        toSort = mergeHandlers(varProps, "q-e:input", handler) || toSort;
       }
     }
     if (varProps && _hasOwnProperty3.call(varProps, "className")) {
@@ -31331,10 +31353,10 @@ if (isBrowser4) {
 }
 
 // packages/qwik/src/core/use/use-locale.ts
-import { isServer as isServer9 } from "@qwik.dev/core/build";
+import { isServer as isServer10 } from "@qwik.dev/core/build";
 var _locale = void 0;
 var localAsyncStore;
-if (isServer9) {
+if (isServer10) {
   import("node:async_hooks").then((module) => {
     localAsyncStore = new module.AsyncLocalStorage();
   }).catch(() => {
@@ -31458,7 +31480,7 @@ var trackSignalAndAssignHost = (value, host, property, container, data) => {
 };
 
 // packages/qwik/src/core/reactive-primitives/impl/store.ts
-import { isDev as isDev21, isServer as isServer10 } from "@qwik.dev/core/build";
+import { isDev as isDev21, isServer as isServer11 } from "@qwik.dev/core/build";
 var DEBUG7 = false;
 var log6 = (...args) => console.log("STORE", ...args.map(qwikDebugToString));
 var getStoreHandler = (value) => {
@@ -31622,7 +31644,7 @@ function addStoreEffect(target, prop, store, effectSubscription) {
   }
   ensureContainsSubscription(effects, effectSubscription);
   ensureContainsBackRef(effectSubscription, target);
-  (import.meta.env.TEST ? !isDomContainer(store.$container$) : isServer10) && addQrlToSerializationCtx(effectSubscription, store.$container$);
+  (import.meta.env.TEST ? !isDomContainer(store.$container$) : isServer11) && addQrlToSerializationCtx(effectSubscription, store.$container$);
   DEBUG7 && log6(
     "sub",
     pad(
@@ -31963,7 +31985,7 @@ var NoSerializeSymbol = /* @__PURE__ */ Symbol("noSerialize");
 var SerializerSymbol = /* @__PURE__ */ Symbol("serialize");
 
 // packages/qwik/src/core/reactive-primitives/utils.ts
-import { isDev as isDev23, isServer as isServer11 } from "@qwik.dev/core/build";
+import { isDev as isDev23, isServer as isServer12 } from "@qwik.dev/core/build";
 var DEBUG8 = false;
 var log7 = (...args) => console.log("SIGNAL", ...args.map(qwikDebugToString));
 var throwIfQRLNotResolved = (qrl) => {
@@ -31999,7 +32021,7 @@ var addQrlToSerializationCtx = (effectSubscriber, container) => {
   }
 };
 var scheduleEffects = (container, signal, effects) => {
-  const isBrowser5 = import.meta.env.TEST ? !isServerPlatform() : !isServer11;
+  const isBrowser5 = import.meta.env.TEST ? !isServerPlatform() : !isServer12;
   if (effects) {
     const scheduleEffect = (effectSubscription) => {
       const consumer = effectSubscription.consumer;
@@ -33488,6 +33510,15 @@ function materializeFromVNodeData(vParent, vData, element, child) {
         vnode_ensureElementKeyInflated(elementVNode);
         addVNode(elementVNode);
         child = fastNextSibling(child);
+        while (
+          // skip only elements, not text nodes
+          isElement(child) && shouldSkipElement(child)
+        ) {
+          child = fastNextSibling(child);
+          if (!child && value > 0) {
+            throw qError(27 /* materializeVNodeDataError */, [vData, peek(), nextToConsumeIdx]);
+          }
+        }
       }
     } else if (peek() === VNodeDataChar.SCOPED_STYLE) {
       vnode_setProp(vParent, QScopedStyle, consumeValue());
@@ -34209,10 +34240,7 @@ function diffJsxVNode(received, expected, path = [], container, isSsr) {
     return [path.join(" > ") + " missing"];
   }
   if (!container.qContainer) {
-    try {
-      _getDomContainer(container);
-    } catch {
-    }
+    _getDomContainer(container);
   }
   const diffs = [];
   if (typeof expected === "string") {

package/dist/testing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/testing",
-  "version": "2.0.0-beta.24-dev+314726b",
+  "version": "2.0.0-beta.25-dev+2677279",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/core",
   "description": "An open source framework for building instant loading web apps at any scale, without the extra effort.",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.25",
   "author": "Qwik Team",
   "bin": {
     "qwik": "./qwik-cli.mjs"
@@ -21,7 +21,7 @@
     "kleur": "4.1.5",
     "prettier": "3.7.4",
     "vitest": "4.0.16",
-    "@qwik.dev/core": "2.0.0-beta.24",
+    "@qwik.dev/core": "2.0.0-beta.25",
     "@qwik.dev/dom": "2.1.19"
   },
   "engines": {