@qwik.dev/core 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/testing/index.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/testing 2.0.0-beta.2-dev+3ddc6c7
+ * @qwik.dev/core/testing 2.0.0-beta.4-dev+9849dcf
  * 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
@@ -22151,7 +22151,7 @@ module.exports = __toCommonJS(index_exports);
 
 // packages/qwik/src/testing/vdom-diff.unit-util.ts
 var import_core = require("../core.cjs");
-var import_internal3 = require("@qwik.dev/core/internal");
+var import_internal4 = require("@qwik.dev/core/internal");
 var import_vitest = require("vitest");
 
 // packages/qwik/src/core/client/vnode.ts
@@ -22242,6 +22242,24 @@ function assertNumber(value1, text, ...parts) {
   }
 }
 
+// packages/qwik/src/core/shared/utils/types.ts
+var isSerializableObject = (v) => {
+  const proto = Object.getPrototypeOf(v);
+  return proto === Object.prototype || proto === Array.prototype || proto === null;
+};
+var isObject = (v) => {
+  return typeof v === "object" && v !== null;
+};
+var isArray = (v) => {
+  return Array.isArray(v);
+};
+var isString = (v) => {
+  return typeof v === "string";
+};
+var isFunction = (v) => {
+  return typeof v === "function";
+};
+
 // packages/qwik/src/core/shared/error/error.ts
 var codeToText = (code2, ...parts) => {
   if (qDev) {
@@ -22322,7 +22340,7 @@ See https://qwik.dev/docs/components/tasks/#use-method-rules`,
     if (parts.length) {
       text = text.replaceAll(/{{(\d+)}}/g, (_, index) => {
         let v = parts[index];
-        if (v && typeof v === "object" && v.constructor === Object) {
+        if (v && isObject(v) && v.constructor === Object) {
           v = JSON.stringify(v).slice(0, 50);
         }
         return v;
@@ -22394,24 +22412,6 @@ function retryOnPromise(fn, retryCount = 0) {
   }
 }
 
-// packages/qwik/src/core/shared/utils/types.ts
-var isSerializableObject = (v) => {
-  const proto = Object.getPrototypeOf(v);
-  return proto === Object.prototype || proto === Array.prototype || proto === null;
-};
-var isObject = (v) => {
-  return !!v && typeof v === "object";
-};
-var isArray = (v) => {
-  return Array.isArray(v);
-};
-var isString = (v) => {
-  return typeof v === "string";
-};
-var isFunction = (v) => {
-  return typeof v === "function";
-};
-
 // packages/qwik/src/build/index.dev.ts
 var isDev2 = true;
 
@@ -22619,7 +22619,7 @@ var WrappedSignalImpl = class extends SignalImpl {
     this.$funcStr$ = fnStr;
     this.$flags$ = flags;
   }
-  $invalidate$() {
+  invalidate() {
     var _a;
     this.$flags$ |= 1 /* INVALID */;
     this.$forceRunEffects$ = false;
@@ -22635,9 +22635,14 @@ var WrappedSignalImpl = class extends SignalImpl {
    * remained the same object.
    */
   force() {
-    this.$flags$ |= 1 /* INVALID */;
-    this.$forceRunEffects$ = false;
-    triggerEffects(this.$container$, this, this.$effects$);
+    var _a;
+    this.$forceRunEffects$ = true;
+    (_a = this.$container$) == null ? void 0 : _a.$scheduler$(
+      7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
+      this.$hostElement$,
+      this,
+      this.$effects$
+    );
   }
   get untrackedValue() {
     const didChange = this.$computeIfNeeded$();
@@ -22744,7 +22749,7 @@ var newInvokeContextFromTuple = ([element, event, url]) => {
   return newInvokeContext(locale, hostElement, element, event, url);
 };
 var newInvokeContext = (locale, hostElement, element, event, url) => {
-  const $locale$ = locale || (typeof event === "object" && event && "locale" in event ? event.locale : void 0);
+  const $locale$ = locale || (event && isObject(event) && "locale" in event ? event.locale : void 0);
   const ctx = {
     $url$: url,
     $i$: 0,
@@ -22863,7 +22868,7 @@ var StoreHandler = class {
       return this.toString;
     }
     const flags = this.$flags$;
-    if (flags & 1 /* RECURSIVE */ && typeof value === "object" && value !== null && !Object.isFrozen(value) && !isStore(value) && !Object.isFrozen(target)) {
+    if (flags & 1 /* RECURSIVE */ && isObject(value) && !Object.isFrozen(value) && !isStore(value) && !Object.isFrozen(target)) {
       return getOrCreateStore(value, this.$flags$, this.$container$);
     }
     return value;
@@ -23083,6 +23088,7 @@ var isServerPlatform = () => {
 // packages/qwik/src/core/shared/qrl/qrl-class.ts
 var import_build6 = require("@qwik.dev/core/build");
 var import_preloader = require("@qwik.dev/core/preloader");
+var resolvedSymbol = Symbol("resolved");
 var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
   if (qDev && qSerialize) {
     if (captureRef) {
@@ -23131,9 +23137,6 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
     };
     return bound;
   }
-  const resolveLazy = (containerEl) => {
-    return symbolRef !== null ? symbolRef : resolve(containerEl);
-  };
   const wrapFn = (fn) => {
     if (typeof fn !== "function" || !(capture == null ? void 0 : capture.length) && !(captureRef == null ? void 0 : captureRef.length)) {
       return fn;
@@ -23159,7 +23162,10 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
       return invoke.call(this, context, fn, ...args);
     };
   };
-  const resolve = async (containerEl) => {
+  if (symbolFn && resolvedSymbol in symbolFn) {
+    symbolRef = symbolFn[resolvedSymbol];
+  }
+  const resolve = symbolRef ? async () => symbolRef : async (containerEl) => {
     if (symbolRef !== null) {
       return symbolRef;
     }
@@ -23179,14 +23185,17 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
     const start = now();
     const ctx = tryGetInvokeContext();
     if (symbolFn !== null) {
-      symbolRef = symbolFn().then(
-        (module2) => qrl.resolved = wrapFn(symbolRef = module2[symbol])
-      );
+      symbolRef = symbolFn().then((module2) => {
+        const resolved = wrapFn(symbolRef = module2[symbol]);
+        symbolFn[resolvedSymbol] = resolved;
+        qrl.resolved = resolved;
+        return resolved;
+      });
     } else {
       const imported = getPlatform().importSymbol(_containerEl, chunk, symbol);
       symbolRef = maybeThen(imported, (ref) => qrl.resolved = wrapFn(symbolRef = ref));
     }
-    if (typeof symbolRef === "object" && isPromise(symbolRef)) {
+    if (isPromise(symbolRef)) {
       symbolRef.then(
         () => emitUsedSymbol(symbol, ctx == null ? void 0 : ctx.$element$, start),
         (err) => {
@@ -23212,7 +23221,6 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
     getHash: () => hash3,
     getCaptured: () => captureRef,
     resolve,
-    $resolveLazy$: resolveLazy,
     $setContainer$: setContainer,
     $chunk$: chunk,
     $symbol$: symbol,
@@ -23281,6 +23289,7 @@ var inlinedQrl = (symbol, symbolName, lexicalScopeCapture = EMPTY_ARRAY) => {
 var _CONST_PROPS = Symbol("CONST");
 var _VAR_PROPS = Symbol("VAR");
 var _IMMUTABLE = Symbol("IMMUTABLE");
+var _UNINITIALIZED = Symbol("UNINITIALIZED");
 
 // packages/qwik/src/core/shared/qrl/qrl.public.ts
 var runtimeSymbolId = 0;
@@ -23315,12 +23324,12 @@ var ComputedSignalImpl = class extends SignalImpl {
   $flags$;
   $forceRunEffects$ = false;
   [_EFFECT_BACK_REF] = null;
-  constructor(container, fn, flags = 1 /* INVALID */) {
+  constructor(container, fn, flags = 1 /* INVALID */ | 16 /* SERIALIZATION_STRATEGY_ALWAYS */) {
     super(container, NEEDS_COMPUTATION);
     this.$computeQrl$ = fn;
     this.$flags$ = flags;
   }
-  $invalidate$() {
+  invalidate() {
     var _a;
     this.$flags$ |= 1 /* INVALID */;
     this.$forceRunEffects$ = false;
@@ -23398,7 +23407,11 @@ var DEBUG4 = false;
 var log4 = (...args) => console.log("SERIALIZER SIGNAL", ...args.map(qwikDebugToString));
 var SerializerSignalImpl = class extends ComputedSignalImpl {
   constructor(container, argQrl) {
-    super(container, argQrl);
+    super(
+      container,
+      argQrl,
+      1 /* INVALID */ | 16 /* SERIALIZATION_STRATEGY_ALWAYS */
+    );
   }
   $didInitialize$ = false;
   $computeIfNeeded$() {
@@ -23414,7 +23427,7 @@ var SerializerSignalImpl = class extends ComputedSignalImpl {
     const update = arg.update;
     const currentValue = this.$untrackedValue$ === NEEDS_COMPUTATION ? initial : this.$untrackedValue$;
     const untrackedValue = trackSignal(
-      () => this.$didInitialize$ ? update == null ? void 0 : update(currentValue) : deserialize(currentValue),
+      () => this.$didInitialize$ ? (update == null ? void 0 : update(currentValue)) || currentValue : deserialize(currentValue),
       this,
       "." /* VNODE */,
       this.$container$
@@ -23491,7 +23504,7 @@ var AsyncComputedSignalImpl = class extends ComputedSignalImpl {
   $loadingEffects$ = null;
   $errorEffects$ = null;
   $destroy$;
-  $promiseValue$ = null;
+  $promiseValue$ = NEEDS_COMPUTATION;
   [_EFFECT_BACK_REF] = null;
   constructor(container, fn, flags = 1 /* INVALID */) {
     super(container, fn, flags);
@@ -23545,6 +23558,10 @@ var AsyncComputedSignalImpl = class extends ComputedSignalImpl {
   get untrackedError() {
     return this.$untrackedError$;
   }
+  invalidate() {
+    super.invalidate();
+    this.$promiseValue$ = NEEDS_COMPUTATION;
+  }
   $computeIfNeeded$() {
     if (!(this.$flags$ & 1 /* INVALID */)) {
       return false;
@@ -23555,10 +23572,10 @@ var AsyncComputedSignalImpl = class extends ComputedSignalImpl {
       var _a;
       return (_a = this.$container$) == null ? void 0 : _a.handleError(err, null);
     });
-    const untrackedValue = this.$promiseValue$ ?? computeQrl.getFn()({
+    const untrackedValue = this.$promiseValue$ === NEEDS_COMPUTATION ? computeQrl.getFn()({
       track: trackFn(this, this.$container$),
       cleanup: cleanup2
-    });
+    }) : this.$promiseValue$;
     if (isPromise(untrackedValue)) {
       this.untrackedLoading = true;
       this.untrackedError = null;
@@ -23567,11 +23584,12 @@ var AsyncComputedSignalImpl = class extends ComputedSignalImpl {
         this.untrackedLoading = false;
         this.untrackedError = null;
       }).catch((err) => {
+        this.$promiseValue$ = err;
         this.untrackedLoading = false;
         this.untrackedError = err;
       });
     }
-    this.$promiseValue$ = null;
+    this.$promiseValue$ = NEEDS_COMPUTATION;
     DEBUG5 && log5("Signal.$asyncCompute$", untrackedValue);
     this.$flags$ &= ~1 /* INVALID */;
     const didChange = untrackedValue !== this.$untrackedValue$;
@@ -23584,7 +23602,6 @@ var AsyncComputedSignalImpl = class extends ComputedSignalImpl {
 
 // packages/qwik/src/core/reactive-primitives/signal-api.ts
 var createSerializerSignal = (arg) => {
-  throwIfQRLNotResolved(arg);
   return new SerializerSignalImpl(null, arg);
 };
 
@@ -24148,7 +24165,6 @@ var executeComponent = (container, renderHost, subscriptionHost, componentQRL, p
       if (!isInlineComponent) {
         container.setHostProp(renderHost, ELEMENT_SEQ_IDX, null);
         container.setHostProp(renderHost, USE_ON_LOCAL_SEQ_IDX, null);
-        container.setHostProp(renderHost, ELEMENT_PROPS, props);
       }
       if (vnode_isVNode(renderHost)) {
         clearAllEffects(container, renderHost);
@@ -24165,9 +24181,12 @@ var executeComponent = (container, renderHost, subscriptionHost, componentQRL, p
     (err) => {
       if (isPromise(err) && retryCount < MAX_RETRY_ON_PROMISE_COUNT) {
         return err.then(
-          () => executeComponentWithPromiseExceptionRetry(retryCount++)
+          () => executeComponentWithPromiseExceptionRetry(++retryCount)
         );
       } else {
+        if (retryCount >= MAX_RETRY_ON_PROMISE_COUNT) {
+          throw new Error(`Max retry count of component execution reached`);
+        }
         throw err;
       }
     }
@@ -25160,11 +25179,22 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         shouldRender = true;
       }
       if (host) {
-        const vNodeProps = vnode_getProp(host, ELEMENT_PROPS, container.$getObjectById$);
-        shouldRender = shouldRender || propsDiffer(jsxProps, vNodeProps);
+        let vNodeProps = vnode_getProp(host, ELEMENT_PROPS, container.$getObjectById$);
+        const propsAreDifferent = propsDiffer(jsxProps, vNodeProps);
+        shouldRender = shouldRender || propsAreDifferent;
         if (shouldRender) {
+          if (propsAreDifferent) {
+            if (vNodeProps) {
+              vNodeProps[_CONST_PROPS] = jsxProps[_CONST_PROPS];
+              vNodeProps[_VAR_PROPS] = jsxProps[_VAR_PROPS];
+            } else if (jsxProps) {
+              vnode_setProp(host, ELEMENT_PROPS, jsxProps);
+              vNodeProps = jsxProps;
+            }
+          }
+          vnode_setProp(host, OnRenderProp, componentQRL);
           host[0 /* flags */] &= ~32 /* Deleted */;
-          container.$scheduler$(6 /* COMPONENT */, host, componentQRL, jsxProps);
+          container.$scheduler$(6 /* COMPONENT */, host, componentQRL, vNodeProps);
         }
       }
       descendContentToProject(jsxNode2.children, host);
@@ -25572,7 +25602,7 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
     return runUptoChore.$returnValue$;
   }
   function executeChore(chore, isServer5) {
-    var _a, _b, _c;
+    var _a, _b;
     const host = chore.$host$;
     DEBUG6 && debugTrace("execute", chore, currentChore, choreQueue);
     assertEqual(currentChore, null, "Chore already running.");
@@ -25708,21 +25738,24 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
           {
             const target = chore.$target$;
             const effects = chore.$payload$;
+            const ctx = newInvokeContext();
+            ctx.$container$ = container;
             if (target instanceof ComputedSignalImpl || target instanceof WrappedSignalImpl) {
               const forceRunEffects = target.$forceRunEffects$;
               target.$forceRunEffects$ = false;
-              if (!((_b = target.$effects$) == null ? void 0 : _b.size)) {
+              if (!(effects == null ? void 0 : effects.size) && !forceRunEffects) {
                 break;
               }
-              returnValue = retryOnPromise(() => {
-                if (target.$computeIfNeeded$() || forceRunEffects) {
-                  triggerEffects(container, target, effects);
+              returnValue = maybeThen(
+                retryOnPromise(() => invoke.call(target, ctx, target.$computeIfNeeded$)),
+                (didChange) => {
+                  if (didChange || forceRunEffects) {
+                    return retryOnPromise(() => triggerEffects(container, target, effects));
+                  }
                 }
-              });
+              );
             } else {
-              returnValue = retryOnPromise(() => {
-                triggerEffects(container, target, effects);
-              });
+              returnValue = retryOnPromise(() => triggerEffects(container, target, effects));
             }
           }
           break;
@@ -25746,7 +25779,7 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
     };
     if (isPromise(returnValue)) {
       chore.$promise$ = returnValue.then(after, (error) => after(void 0, error));
-      (_c = chore.$resolve$) == null ? void 0 : _c.call(chore, chore.$promise$);
+      (_b = chore.$resolve$) == null ? void 0 : _b.call(chore, chore.$promise$);
       chore.$resolve$ = void 0;
     } else {
       after(returnValue);
@@ -25787,7 +25820,10 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
     if (idxDiff !== 0) {
       return idxDiff;
     }
-    if (a.$target$ !== b.$target$ || a.$payload$ !== b.$payload$) {
+    if (a.$target$ !== b.$target$) {
+      if (isQrl(a.$target$) && isQrl(b.$target$) && a.$target$.$hash$ === b.$target$.$hash$) {
+        return 0;
+      }
       return 1;
     }
     if (b === currentChore) {
@@ -25819,7 +25855,7 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
       return value;
     }
     const existing = sortedArray[idx];
-    if (existing.$type$ === 4 /* NODE_DIFF */) {
+    if (existing.$payload$ !== value.$payload$) {
       existing.$payload$ = value.$payload$;
     }
     if (existing.$executed$) {
@@ -26206,7 +26242,7 @@ var ignoreErrorToPreventNodeFromCrashing = (err) => {
 // packages/qwik/src/core/shared/shared-serialization.ts
 var deserializedProxyMap = /* @__PURE__ */ new WeakMap();
 var isDeserializerProxy = (value) => {
-  return typeof value === "object" && value !== null && SERIALIZER_PROXY_UNWRAP in value;
+  return isObject(value) && SERIALIZER_PROXY_UNWRAP in value;
 };
 var SERIALIZER_PROXY_UNWRAP = Symbol("UNWRAP");
 var wrapDeserializerProxy = (container, data) => {
@@ -26396,9 +26432,8 @@ var inflate = (container, target, typeId, data) => {
       const hasValue = d.length > 6;
       if (hasValue) {
         asyncComputed.$untrackedValue$ = d[6];
-      } else {
-        asyncComputed.$flags$ |= 1 /* INVALID */;
       }
+      asyncComputed.$flags$ |= 1 /* INVALID */;
       break;
     }
     // Inflating a SerializerSignal is the same as inflating a ComputedSignal
@@ -26493,7 +26528,7 @@ var inflate = (container, target, typeId, data) => {
       propsProxy[_VAR_PROPS] = data === 0 ? {} : data[0];
       propsProxy[_CONST_PROPS] = data[1];
       break;
-    case 35 /* EffectData */: {
+    case 35 /* SubscriptionData */: {
       const effectData = target;
       effectData.data.$scopedStyleIdPrefix$ = data[0];
       effectData.data.$isConst$ = data[1];
@@ -26514,6 +26549,7 @@ var _constants = [
   EMPTY_OBJ,
   NEEDS_COMPUTATION,
   STORE_ALL_PROPS,
+  _UNINITIALIZED,
   Slot,
   Fragment,
   NaN,
@@ -26533,6 +26569,7 @@ var _constantNames = [
   "EMPTY_OBJ",
   "NEEDS_COMPUTATION",
   "STORE_ALL_PROPS",
+  "_UNINITIALIZED",
   "Slot",
   "Fragment",
   "NaN",
@@ -26553,7 +26590,12 @@ var allocate = (container, typeId, value) => {
       if (!container.$forwardRefs$) {
         throw qError(18 /* serializeErrorCannotAllocate */, ["forward ref"]);
       }
-      return container.$getObjectById$(container.$forwardRefs$[value]);
+      const rootRef = container.$forwardRefs$[value];
+      if (rootRef === -1) {
+        return _UNINITIALIZED;
+      } else {
+        return container.$getObjectById$(rootRef);
+      }
     case 2 /* ForwardRefs */:
       return value;
     case 3 /* Constant */:
@@ -26649,7 +26691,7 @@ var allocate = (container, typeId, value) => {
       } else {
         throw qError(17 /* serializeErrorExpectedVNode */, [typeof vNode]);
       }
-    case 35 /* EffectData */:
+    case 35 /* SubscriptionData */:
       return new SubscriptionData({});
     default:
       throw qError(18 /* serializeErrorCannotAllocate */, [typeId]);
@@ -26692,7 +26734,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
     };
   }
   const seenObjsMap = /* @__PURE__ */ new Map();
-  const rootsPathMap = /* @__PURE__ */ new Map();
+  const objectPathStringCache = /* @__PURE__ */ new Map();
   const syncFnMap = /* @__PURE__ */ new Map();
   const syncFns = [];
   const roots = [];
@@ -26701,7 +26743,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
     return seenObjsMap.set(obj, { $parent$: parent, $index$: index, $rootIndex$: -1 });
   };
   const $addRootPath$ = (obj) => {
-    const rootPath = rootsPathMap.get(obj);
+    const rootPath = objectPathStringCache.get(obj);
     if (rootPath) {
       return rootPath;
     }
@@ -26719,7 +26761,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
       current = seenObjsMap.get(current.$parent$);
     }
     const pathStr = path.length > 1 ? path.join(" ") : path.length ? path[0] : seen.$index$;
-    rootsPathMap.set(obj, pathStr);
+    objectPathStringCache.set(obj, pathStr);
     return pathStr;
   };
   const $addRoot$ = (obj, parent = null) => {
@@ -26784,7 +26826,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
     $storeProxyMap$: storeProxyMap,
     $getProp$: getProp,
     $setProp$: setProp,
-    $pathMap$: rootsPathMap
+    $objectPathStringCache$: objectPathStringCache
   };
 };
 function $discoverRoots$(serializationContext, obj, parent, index) {
@@ -26806,7 +26848,7 @@ var discoverValuesForVNodeData = (vnodeData, callback) => {
       for (let i = 1; i < value.length; i += 2) {
         const keyValue = value[i - 1];
         const attrValue = value[i];
-        if (typeof attrValue === "string" || // skip empty props
+        if (attrValue == null || typeof attrValue === "string" || // skip empty props
         keyValue === ELEMENT_PROPS && Object.keys(attrValue).length === 0) {
           continue;
         }
@@ -26824,13 +26866,28 @@ var PromiseResult = class {
     this.$qrl$ = $qrl$;
   }
 };
+var SerializationWeakRef = class {
+  constructor($obj$) {
+    this.$obj$ = $obj$;
+  }
+};
 async function serialize(serializationContext) {
-  const { $writer$, $isSsrNode$, $isDomRef$, $storeProxyMap$, $addRoot$, $pathMap$, $wasSeen$ } = serializationContext;
+  const {
+    $writer$,
+    $isSsrNode$,
+    $isDomRef$,
+    $storeProxyMap$,
+    $addRoot$,
+    $objectPathStringCache$,
+    $wasSeen$
+  } = serializationContext;
   let depth = 0;
+  let rootIdx = 0;
   const forwardRefs = [];
   let forwardRefsId = 0;
   const promises = /* @__PURE__ */ new Set();
   const preloadQrls = /* @__PURE__ */ new Set();
+  const s11nWeakRefs = /* @__PURE__ */ new Map();
   let parent = null;
   const isRootObject = () => depth === 0;
   const outputArray = (value, writeFn) => {
@@ -26871,17 +26928,27 @@ async function serialize(serializationContext) {
   };
   const addPreloadQrl = (qrl) => {
     preloadQrls.add(qrl);
-    serializationContext.$addRoot$(qrl, null);
+    serializationContext.$addRoot$(qrl);
   };
-  const outputRootRef = (value, rootDepth = 0) => {
+  const outputAsRootRef = (value, rootDepth = 0) => {
     const seen = $wasSeen$(value);
-    const rootRefPath = $pathMap$.get(value);
+    const rootRefPath = $objectPathStringCache$.get(value);
     if (rootDepth === depth && seen && seen.$parent$ !== null && rootRefPath) {
       output(0 /* RootRef */, rootRefPath);
       return true;
     } else if (depth > rootDepth && seen && seen.$rootIndex$ !== -1) {
       output(0 /* RootRef */, seen.$rootIndex$);
       return true;
+    } else if (s11nWeakRefs.has(value)) {
+      const forwardRefId = s11nWeakRefs.get(value);
+      if (rootDepth === depth) {
+        forwardRefs[forwardRefId] = rootIdx;
+      } else {
+        const rootRef = $addRoot$(value);
+        output(0 /* RootRef */, rootRef);
+        forwardRefs[forwardRefId] = rootRef;
+        return true;
+      }
     }
     return false;
   };
@@ -26894,11 +26961,11 @@ async function serialize(serializationContext) {
       output(3 /* Constant */, value ? 2 /* True */ : 3 /* False */);
     } else if (typeof value === "function") {
       if (value === Slot) {
-        output(3 /* Constant */, 9 /* Slot */);
+        output(3 /* Constant */, 10 /* Slot */);
       } else if (value === Fragment) {
-        output(3 /* Constant */, 10 /* Fragment */);
+        output(3 /* Constant */, 11 /* Fragment */);
       } else if (isQrl(value)) {
-        if (!outputRootRef(value)) {
+        if (!outputAsRootRef(value)) {
           const qrl = qrlToString(serializationContext, value);
           const type = preloadQrls.has(value) ? 21 /* PreloadQRL */ : 20 /* QRL */;
           if (isRootObject()) {
@@ -26917,18 +26984,18 @@ async function serialize(serializationContext) {
       }
     } else if (typeof value === "number") {
       if (Number.isNaN(value)) {
-        output(3 /* Constant */, 11 /* NaN */);
+        output(3 /* Constant */, 12 /* NaN */);
       } else if (!Number.isFinite(value)) {
         output(
           3 /* Constant */,
-          value < 0 ? 13 /* NegativeInfinity */ : 12 /* PositiveInfinity */
+          value < 0 ? 14 /* NegativeInfinity */ : 13 /* PositiveInfinity */
         );
       } else if (value === Number.MAX_SAFE_INTEGER) {
-        output(3 /* Constant */, 14 /* MaxSafeInt */);
+        output(3 /* Constant */, 15 /* MaxSafeInt */);
       } else if (value === Number.MAX_SAFE_INTEGER - 1) {
-        output(3 /* Constant */, 15 /* AlmostMaxSafeInt */);
+        output(3 /* Constant */, 16 /* AlmostMaxSafeInt */);
       } else if (value === Number.MIN_SAFE_INTEGER) {
-        output(3 /* Constant */, 16 /* MinSafeInt */);
+        output(3 /* Constant */, 17 /* MinSafeInt */);
       } else {
         output(4 /* Number */, value);
       }
@@ -26951,7 +27018,7 @@ async function serialize(serializationContext) {
       if (value.length === 0) {
         output(3 /* Constant */, 4 /* EmptyString */);
       } else {
-        if (!outputRootRef(value)) {
+        if (!outputAsRootRef(value)) {
           output(5 /* String */, value);
         }
       }
@@ -26961,12 +27028,14 @@ async function serialize(serializationContext) {
       output(3 /* Constant */, 7 /* NEEDS_COMPUTATION */);
     } else if (value === STORE_ALL_PROPS) {
       output(3 /* Constant */, 8 /* STORE_ALL_PROPS */);
+    } else if (value === _UNINITIALIZED) {
+      output(3 /* Constant */, 9 /* UNINITIALIZED */);
     } else {
       throw qError(20 /* serializeErrorUnknownType */, [typeof value]);
     }
   };
   const writeObjectValue = (value) => {
-    if (outputRootRef(value, 1)) {
+    if (outputAsRootRef(value, 1)) {
       return;
     }
     if (isPropsProxy(value)) {
@@ -26975,7 +27044,7 @@ async function serialize(serializationContext) {
       const out = constProps ? [varProps, constProps] : Object.keys(varProps).length ? [varProps] : 0;
       output(34 /* PropsProxy */, out);
     } else if (value instanceof SubscriptionData) {
-      output(35 /* EffectData */, [value.data.$scopedStyleIdPrefix$, value.data.$isConst$]);
+      output(35 /* SubscriptionData */, [value.data.$scopedStyleIdPrefix$, value.data.$isConst$]);
     } else if (isStore(value)) {
       if (isResource(value)) {
         serializationContext.$resources$.add(value);
@@ -27054,7 +27123,6 @@ async function serialize(serializationContext) {
         output(1 /* ForwardRef */, forwardRefId);
         return;
       }
-      const v = value instanceof ComputedSignalImpl && (value.$flags$ & 1 /* INVALID */ || fastSkipSerialize(value.$untrackedValue$)) ? NEEDS_COMPUTATION : value.$untrackedValue$;
       if (value instanceof WrappedSignalImpl) {
         output(26 /* WrappedSignal */, [
           ...serializeWrappingFn(serializationContext, value),
@@ -27063,33 +27131,36 @@ async function serialize(serializationContext) {
           value.$hostElement$,
           ...value.$effects$ || []
         ]);
-      } else if (value instanceof AsyncComputedSignalImpl) {
-        addPreloadQrl(value.$computeQrl$);
-        const out = [
-          value.$computeQrl$,
-          value.$effects$,
-          value.$loadingEffects$,
-          value.$errorEffects$,
-          value.$untrackedLoading$,
-          value.$untrackedError$
-        ];
-        if (v !== NEEDS_COMPUTATION) {
-          out.push(v);
-        }
-        output(28 /* AsyncComputedSignal */, out);
       } else if (value instanceof ComputedSignalImpl) {
+        let v = value.$untrackedValue$;
+        const shouldAlwaysSerialize = value.$flags$ & 16 /* SERIALIZATION_STRATEGY_ALWAYS */;
+        const shouldNeverSerialize = value.$flags$ & 8 /* SERIALIZATION_STRATEGY_NEVER */;
+        const isInvalid = value.$flags$ & 1 /* INVALID */;
+        const isSkippable = fastSkipSerialize(value.$untrackedValue$);
+        if (shouldAlwaysSerialize) {
+          v = value.$untrackedValue$;
+        } else if (shouldNeverSerialize) {
+          v = NEEDS_COMPUTATION;
+        } else if (isInvalid || isSkippable) {
+          v = NEEDS_COMPUTATION;
+        }
         addPreloadQrl(value.$computeQrl$);
-        const out = [
-          value.$computeQrl$,
-          // TODO check if we can use domVRef for effects
-          value.$effects$
-        ];
+        const out = [value.$computeQrl$, value.$effects$];
+        const isAsync = value instanceof AsyncComputedSignalImpl;
+        if (isAsync) {
+          out.push(
+            value.$loadingEffects$,
+            value.$errorEffects$,
+            value.$untrackedLoading$,
+            value.$untrackedError$
+          );
+        }
         if (v !== NEEDS_COMPUTATION) {
           out.push(v);
         }
-        output(27 /* ComputedSignal */, out);
+        output(isAsync ? 28 /* AsyncComputedSignal */ : 27 /* ComputedSignal */, out);
       } else {
-        output(25 /* Signal */, [v, ...value.$effects$ || []]);
+        output(25 /* Signal */, [value.$untrackedValue$, ...value.$effects$ || []]);
       }
     } else if (value instanceof URL) {
       output(7 /* URL */, value.href);
@@ -27198,6 +27269,11 @@ async function serialize(serializationContext) {
       }
       const out = btoa(buf).replace(/=+$/, "");
       output(19 /* Uint8Array */, out);
+    } else if (value instanceof SerializationWeakRef) {
+      const forwardRefId = forwardRefsId++;
+      s11nWeakRefs.set(value.$obj$, forwardRefId);
+      forwardRefs[forwardRefId] = -1;
+      output(1 /* ForwardRef */, forwardRefId);
     } else if (vnode_isVNode(value)) {
       output(3 /* Constant */, 0 /* Undefined */);
     } else {
@@ -27218,20 +27294,19 @@ async function serialize(serializationContext) {
   }
   const outputRoots = async () => {
     $writer$.write("[");
-    let lastRootsLength = 0;
     let rootsLength = serializationContext.$roots$.length;
-    while (lastRootsLength < rootsLength || promises.size) {
-      if (lastRootsLength !== 0) {
+    while (rootIdx < rootsLength || promises.size) {
+      if (rootIdx !== 0) {
         $writer$.write(",");
       }
       let separator = false;
-      for (let i = lastRootsLength; i < rootsLength; i++) {
+      for (; rootIdx < rootsLength; rootIdx++) {
         if (separator) {
           $writer$.write(",");
         } else {
           separator = true;
         }
-        writeValue(serializationContext.$roots$[i]);
+        writeValue(serializationContext.$roots$[rootIdx]);
       }
       if (promises.size) {
         try {
@@ -27239,7 +27314,6 @@ async function serialize(serializationContext) {
         } catch {
         }
       }
-      lastRootsLength = rootsLength;
       rootsLength = serializationContext.$roots$.length;
     }
     if (forwardRefs.length) {
@@ -27414,7 +27488,7 @@ function shouldTrackObj(obj) {
   return (
     // THINK: Not sure if we need to keep track of functions (QRLs) Let's skip them for now.
     // and see if we have a test case which requires them.
-    typeof obj === "object" && obj !== null || /**
+    isObject(obj) || /**
      * We track all strings greater than 1 character, because those take at least 6 bytes to encode
      * and even with 999 root objects it saves one byte per reference. Tracking more objects makes
      * the map bigger so we want to strike a balance
@@ -27430,7 +27504,7 @@ function isResource(value) {
   return "__brand" in value && value.__brand === "resource";
 }
 var frameworkType = (obj) => {
-  return typeof obj === "object" && obj !== null && (obj instanceof SignalImpl || obj instanceof Task || isJSXNode(obj)) || isQrl(obj);
+  return isObject(obj) && (obj instanceof SignalImpl || obj instanceof Task || isJSXNode(obj)) || isQrl(obj);
 };
 var canSerialize = (value, seen = /* @__PURE__ */ new WeakSet()) => {
   if (value == null || typeof value === "string" || typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
@@ -27494,6 +27568,8 @@ var canSerialize = (value, seen = /* @__PURE__ */ new WeakSet()) => {
     if (isQrl(value) || isQwikComponent(value)) {
       return true;
     }
+  } else if (value === _UNINITIALIZED) {
+    return true;
   }
   return false;
 };
@@ -27534,14 +27610,14 @@ var _typeIdNames = [
   "FormData",
   "JSXNode",
   "PropsProxy",
-  "EffectData"
+  "SubscriptionData"
 ];
 var circularProofJson = (obj, indent) => {
   const seen = /* @__PURE__ */ new WeakSet();
   return JSON.stringify(
     obj,
-    (key, value) => {
-      if (typeof value === "object" && value !== null) {
+    (_, value) => {
+      if (isObject(value)) {
         if (seen.has(value)) {
           return `[Circular ${value.constructor.name}]`;
         }
@@ -27577,7 +27653,7 @@ var dumpState = (state, color = false, prefix = "", limit = 20) => {
     if (key === void 0) {
       hasRaw = true;
       out.push(
-        `${RED}[raw${typeof value === "object" && value ? ` ${value.constructor.name}` : ""}]${RESET} ${printRaw(value, `${prefix}  `)}`
+        `${RED}[raw${isObject(value) ? ` ${value.constructor.name}` : ""}]${RESET} ${printRaw(value, `${prefix}  `)}`
       );
     } else {
       if (key === 3 /* Constant */) {
@@ -27705,10 +27781,10 @@ var shouldSerialize = (obj) => {
   return true;
 };
 var fastSkipSerialize = (obj) => {
-  return obj && (typeof obj === "object" || typeof obj === "function") && (NoSerializeSymbol in obj || noSerializeSet.has(obj));
+  return obj && (isObject(obj) || typeof obj === "function") && (NoSerializeSymbol in obj || noSerializeSet.has(obj));
 };
 var noSerialize = (input) => {
-  if (typeof input === "object" && input !== null || typeof input === "function") {
+  if (isObject(input) && input !== null || typeof input === "function") {
     noSerializeSet.add(input);
   }
   return input;
@@ -28646,7 +28722,7 @@ var triggerEffects = (container, signal, effects) => {
             container.$scheduler$(1 /* QRL_RESOLVE */, null, consumer.$computeQrl$);
           }
         }
-        consumer.$invalidate$();
+        consumer.invalidate();
       } else if (property === ":" /* COMPONENT */) {
         const host = consumer;
         const qrl = container.getHostProp(host, OnRenderProp);
@@ -28678,7 +28754,7 @@ var triggerEffects = (container, signal, effects) => {
   DEBUG7 && log6("done scheduling");
 };
 var isSerializerObj = (obj) => {
-  return typeof obj === "object" && obj !== null && typeof obj[SerializerSymbol] === "function";
+  return isObject(obj) && typeof obj[SerializerSymbol] === "function";
 };
 
 // packages/qwik/src/core/debug.ts
@@ -29674,11 +29750,14 @@ var processVNodeData2 = (vData, callback) => {
   let nextToConsumeIdx = 0;
   let ch = 0;
   let peekCh = 0;
+  const getChar = (idx) => {
+    return idx < vData.length ? vData.charCodeAt(idx) : 0;
+  };
   const peek = () => {
     if (peekCh !== 0) {
       return peekCh;
     } else {
-      return peekCh = nextToConsumeIdx < vData.length ? vData.charCodeAt(nextToConsumeIdx) : 0;
+      return peekCh = getChar(nextToConsumeIdx);
     }
   };
   const consume = () => {
@@ -29696,7 +29775,7 @@ var processVNodeData2 = (vData, callback) => {
     return vData.substring(start, nextToConsumeIdx);
   };
   while (peek() !== 0) {
-    callback(peek, consumeValue, consume, nextToConsumeIdx);
+    callback(peek, consumeValue, consume, getChar, nextToConsumeIdx);
   }
 };
 var vnode_getNextSibling = (vnode) => {
@@ -29905,17 +29984,17 @@ function materializeFromVNodeData(vParent, vData, element, child) {
   let textIdx = 0;
   let combinedText = null;
   let container = null;
-  processVNodeData2(vData, (peek, consumeValue, consume, nextToConsumeIdx) => {
+  processVNodeData2(vData, (peek, consumeValue, consume, getChar, nextToConsumeIdx) => {
     if (isNumber(peek())) {
-      while (!isElement2(child)) {
+      while (!isElement2(child) || // We pretend that style element's don't exist as they can get moved out.
+      // skip over style elements, as those need to be moved to the head
+      // and are not included in the counts.
+      isQStyleElement(child)) {
         child = fastNextSibling(child);
         if (!child) {
           throw qError(27 /* materializeVNodeDataError */, [vData, peek(), nextToConsumeIdx]);
         }
       }
-      while (isQStyleElement(child)) {
-        child = fastNextSibling(child);
-      }
       combinedText = null;
       previousTextNode = null;
       let value = 0;
@@ -29941,7 +30020,16 @@ function materializeFromVNodeData(vParent, vData, element, child) {
     } else if (peek() === VNodeDataChar.PROPS) {
       vnode_setAttr(null, vParent, ELEMENT_PROPS, consumeValue());
     } else if (peek() === VNodeDataChar.KEY) {
-      vnode_setAttr(null, vParent, ELEMENT_KEY, consumeValue());
+      const isEscapedValue = getChar(nextToConsumeIdx + 1) === VNodeDataChar.SEPARATOR;
+      let value;
+      if (isEscapedValue) {
+        consume();
+        value = decodeURI(consumeValue());
+        consume();
+      } else {
+        value = consumeValue();
+      }
+      vnode_setAttr(null, vParent, ELEMENT_KEY, value);
     } else if (peek() === VNodeDataChar.SEQ) {
       vnode_setAttr(null, vParent, ELEMENT_SEQ, consumeValue());
     } else if (peek() === VNodeDataChar.SEQ_IDX) {
@@ -29977,6 +30065,9 @@ function materializeFromVNodeData(vParent, vData, element, child) {
     } else if (peek() === VNodeDataChar.SLOT) {
       vnode_setAttr(null, vParent, QSlot, consumeValue());
     } else {
+      while (isQStyleElement(child)) {
+        child = fastNextSibling(child);
+      }
       const textNode = child && fastNodeType(child) === /* Node.TEXT_NODE */
       3 ? child : null;
       if (combinedText === null) {
@@ -30633,7 +30724,7 @@ function diffJsxVNodeChildren(received, expected, path, container, isSsr, diffs)
   const expectedChildren = getFilteredJSXChildren(allExpectedChildren, isSsr, {
     mergedText: void 0
   });
-  if ((0, import_internal3._isJSXNode)(expected)) {
+  if ((0, import_internal4._isJSXNode)(expected)) {
     expected.children = expectedChildren;
   }
   const receivedChildren = getVNodeChildren(container, received);
@@ -30670,7 +30761,7 @@ function getFilteredJSXChildren(children, isSsr, data) {
         }
         continue;
       }
-      if (isSsr && (0, import_internal3._isJSXNode)(child) && isSkippableNode(child)) {
+      if (isSsr && (0, import_internal4._isJSXNode)(child) && isSkippableNode(child)) {
         const skippedNodeChildren = getJSXChildren(child);
         processChildren(skippedNodeChildren);
       } else {
@@ -30751,7 +30842,7 @@ function shouldSkip(vNode) {
   return false;
 }
 function walkJSX(jsx3, apply) {
-  if ((0, import_internal3._isJSXNode)(jsx3)) {
+  if ((0, import_internal4._isJSXNode)(jsx3)) {
     apply.enter(jsx3);
     if (Array.isArray(jsx3.children)) {
       for (const child of jsx3.children) {
@@ -30768,9 +30859,9 @@ function walkJSX(jsx3, apply) {
     if ((0, import_core.isSignal)(child)) {
       child = child.value;
     }
-    if ((0, import_internal3._isStringifiable)(child)) {
+    if ((0, import_internal4._isStringifiable)(child)) {
       apply.text(child);
-    } else if ((0, import_internal3._isJSXNode)(child)) {
+    } else if ((0, import_internal4._isJSXNode)(child)) {
       walkJSX(child, apply);
     } else {
       throw new Error("Unknown type: " + child);
@@ -32497,6 +32588,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
       for (let i = 0; i < fragmentAttrs.length; ) {
         const key = fragmentAttrs[i++];
         let value = fragmentAttrs[i++];
+        let encodeValue = false;
         if (typeof value !== "string") {
           const rootId = addRoot(value);
           if (rootId === void 0) {
@@ -32518,6 +32610,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
             write(VNodeDataChar.PROPS_CHAR);
             break;
           case ELEMENT_KEY:
+            encodeValue = true;
             write(VNodeDataChar.KEY_CHAR);
             break;
           case ELEMENT_SEQ:
@@ -32544,7 +32637,15 @@ var SSRContainer = class extends import_core6._SharedContainer {
             write(key);
             write(VNodeDataChar.SEPARATOR_CHAR);
         }
-        write(value);
+        const encodedValue = encodeValue ? encodeURI(value) : value;
+        const isEncoded = encodeValue ? encodedValue !== value : false;
+        if (isEncoded) {
+          write(VNodeDataChar.SEPARATOR_CHAR);
+          write(encodedValue);
+          write(VNodeDataChar.SEPARATOR_CHAR);
+        } else {
+          write(value);
+        }
       }
     }
     this.closeElement();
@@ -32638,7 +32739,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
     if (unclaimedProjections.length) {
       const previousCurrentComponentNode = this.currentComponentNode;
       try {
-        this.openElement(QTemplate, ["style", "display:none"], null);
+        this.openElement(QTemplate, ["hidden", true, "aria-hidden", "true"], null);
         let idx = 0;
         let ssrComponentNode = null;
         let ssrComponentFrame = null;