@qwik.dev/core 2.0.0-alpha.7 → 2.0.0-alpha.8

package/dist/insights/index.qwik.cjs

@@ -2,7 +2,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var _a, _b, _c;
+var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const core = require("@qwik.dev/core");
 var isBrowser = /* @__PURE__ */ (() => typeof window !== "undefined" && typeof HTMLElement !== "undefined" && !!window.document && String(HTMLElement).includes("[native code]"))();
@@ -10,7 +10,7 @@ var isServer = !isBrowser;
 var isDev = false;
 /**
  * @license
- * @qwik.dev/core 2.0.0-alpha.7-dev+a26598a
+ * @qwik.dev/core 2.0.0-alpha.8-dev+66037b5
  * 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
@@ -316,7 +316,7 @@ function isAriaAttribute(prop) {
 }
 const STORE_TARGET = Symbol("store.target");
 const STORE_HANDLER = Symbol("store.handler");
-const STORE_ARRAY_PROP = Symbol("store.array");
+const STORE_ALL_PROPS = Symbol("store.all");
 var StoreFlags;
 !function(StoreFlags2) {
   StoreFlags2[StoreFlags2.NONE = 0] = "NONE", StoreFlags2[StoreFlags2.RECURSIVE = 1] = "RECURSIVE", StoreFlags2[StoreFlags2.IMMUTABLE = 2] = "IMMUTABLE";
@@ -361,7 +361,7 @@ class StoreHandler {
         assertTrue(!ctx.$container$ || ctx.$container$ === this.$container$);
       }
       const effectSubscriber = ctx.$effectSubscriber$;
-      effectSubscriber && addEffect(target, Array.isArray(target) ? STORE_ARRAY_PROP : prop, this, effectSubscriber);
+      effectSubscriber && addStoreEffect(target, Array.isArray(target) ? STORE_ALL_PROPS : prop, this, effectSubscriber);
     }
     if ("toString" === prop && value === Object.prototype.toString) {
       return this.toString;
@@ -391,7 +391,7 @@ class StoreHandler {
       const ctx = tryGetInvokeContext();
       if (ctx) {
         const effectSubscriber = ctx.$effectSubscriber$;
-        effectSubscriber && addEffect(target, Array.isArray(target) ? STORE_ARRAY_PROP : prop, this, effectSubscriber);
+        effectSubscriber && addStoreEffect(target, Array.isArray(target) ? STORE_ALL_PROPS : prop, this, effectSubscriber);
       }
     }
     return Object.prototype.hasOwnProperty.call(target, prop);
@@ -399,7 +399,7 @@ class StoreHandler {
   ownKeys(target) {
     const ctx = tryGetInvokeContext();
     const effectSubscriber = ctx?.$effectSubscriber$;
-    return effectSubscriber && addEffect(target, STORE_ARRAY_PROP, this, effectSubscriber), Reflect.ownKeys(target);
+    return effectSubscriber && addStoreEffect(target, STORE_ALL_PROPS, this, effectSubscriber), Reflect.ownKeys(target);
   }
   getOwnPropertyDescriptor(target, prop) {
     const descriptor = Reflect.getOwnPropertyDescriptor(target, prop);
@@ -409,7 +409,7 @@ class StoreHandler {
     };
   }
 }
-function addEffect(target, prop, store, effectSubscription) {
+function addStoreEffect(target, prop, store, effectSubscription) {
   const effectsMap = store.$effects$ || (store.$effects$ = /* @__PURE__ */ new Map());
   let effects = effectsMap.get(prop);
   effects || (effects = /* @__PURE__ */ new Set(), effectsMap.set(prop, effects)), ensureContainsSubscription(effects, effectSubscription), ensureContainsBackRef(effectSubscription, target), addQrlToSerializationCtx(effectSubscription, store.$container$);
@@ -431,7 +431,7 @@ function getEffects(target, prop, storeEffects) {
       effectsToTrigger = storeEffects.get(prop);
     }
   }
-  const storeArrayValue = storeEffects?.get(STORE_ARRAY_PROP);
+  const storeArrayValue = storeEffects?.get(STORE_ALL_PROPS);
   if (storeArrayValue) {
     effectsToTrigger || (effectsToTrigger = /* @__PURE__ */ new Set());
     for (const effect of storeArrayValue) {
@@ -523,6 +523,9 @@ const runTask = (task, container, host) => {
         if (isSignal(obj)) {
           return obj.value;
         }
+        if (isStore(obj)) {
+          return addStoreEffect(getStoreTarget(obj), STORE_ALL_PROPS, getStoreHandler(obj), ctx.$effectSubscriber$), obj;
+        }
         throw qError(QError.trackObjectWithoutProp);
       });
     },
@@ -578,12 +581,12 @@ var VirtualVNodeProps;
 }(TextVNodeProps || (TextVNodeProps = {})), function(VirtualVNodeProps2) {
   VirtualVNodeProps2[VirtualVNodeProps2.firstChild = 4] = "firstChild", VirtualVNodeProps2[VirtualVNodeProps2.lastChild = 5] = "lastChild", VirtualVNodeProps2[VirtualVNodeProps2.PROPS_OFFSET = 6] = "PROPS_OFFSET";
 }(VirtualVNodeProps || (VirtualVNodeProps = {}));
-const mapApp_findIndx = (elementVNode, key, start) => {
+const mapApp_findIndx = (array, key, start) => {
   let bottom = start >> 1;
-  let top = elementVNode.length - 2 >> 1;
+  let top = array.length - 2 >> 1;
   for (; bottom <= top; ) {
     const mid = bottom + (top - bottom >> 1);
-    const midKey = elementVNode[mid << 1];
+    const midKey = array[mid << 1];
     if (midKey === key) {
       return mid << 1;
     }
@@ -591,13 +594,13 @@ const mapApp_findIndx = (elementVNode, key, start) => {
   }
   return ~(bottom << 1);
 };
-const mapArray_set = (elementVNode, key, value, start) => {
-  const indx = mapApp_findIndx(elementVNode, key, start);
-  indx >= 0 ? null == value ? elementVNode.splice(indx, 2) : elementVNode[indx + 1] = value : null != value && elementVNode.splice(~indx, 0, key, value);
+const mapArray_set = (array, key, value, start) => {
+  const indx = mapApp_findIndx(array, key, start);
+  indx >= 0 ? null == value ? array.splice(indx, 2) : array[indx + 1] = value : null != value && array.splice(~indx, 0, key, value);
 };
-const mapArray_get = (elementVNode, key, start) => {
-  const indx = mapApp_findIndx(elementVNode, key, start);
-  return indx >= 0 ? elementVNode[indx + 1] : null;
+const mapArray_get = (array, key, start) => {
+  const indx = mapApp_findIndx(array, key, start);
+  return indx >= 0 ? array[indx + 1] : null;
 };
 const isForeignObjectElement = (elementName) => "foreignObject" === elementName;
 const isSvgElement = (elementName) => "svg" === elementName || isForeignObjectElement(elementName);
@@ -825,9 +828,6 @@ const _VAR_PROPS = Symbol("VAR");
 function isSlotProp(prop) {
   return !prop.startsWith("q:") && !prop.startsWith(":");
 }
-function isParentSlotProp(prop) {
-  return prop.startsWith(":");
-}
 function escapeHTML(html) {
   let escapedHTML = "";
   const length = html.length;
@@ -955,7 +955,7 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
   }
   function expectProjection() {
     const slotName = jsxValue.key;
-    vCurrent = vnode_getProp(vParent, slotName, (id) => vnode_locate(container.rootVNode, id)), null == vCurrent && (vNewNode = vnode_newVirtual(), vnode_setProp(vNewNode, QSlot, slotName), vnode_setProp(vNewNode, ":", vParent), vnode_setProp(vParent, slotName, vNewNode));
+    vCurrent = vnode_getProp(vParent, slotName, (id) => vnode_locate(container.rootVNode, id)), vCurrent = vCurrent && vCurrent[VNodeProps.flags] & VNodeFlags.Deleted ? null : vCurrent, null == vCurrent && (vNewNode = vnode_newVirtual(), vnode_setProp(vNewNode, QSlot, slotName), vnode_setProp(vNewNode, "q:sparent", vParent), vnode_setProp(vParent, slotName, vNewNode));
   }
   function expectSlot() {
     const vHost = vnode_getProjectionParentComponent(vParent, container.rootVNode);
@@ -971,13 +971,21 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       return directGetPropsProxyProp(jsxNode2, "name") || "";
     }(vHost);
     const vProjectedNode = vHost ? vnode_getProp(vHost, slotNameKey, null) : null;
-    return null == vProjectedNode ? (vnode_insertBefore(journal, vParent, vNewNode = vnode_newVirtual(), vCurrent && getInsertBefore()), vnode_setProp(vNewNode, QSlot, slotNameKey), vHost && vnode_setProp(vHost, slotNameKey, vNewNode), false) : (vProjectedNode === vCurrent || (vnode_insertBefore(journal, vParent, vNewNode = vProjectedNode, vCurrent && getInsertBefore()), vnode_setProp(vNewNode, QSlot, slotNameKey), vHost && vnode_setProp(vHost, slotNameKey, vNewNode), isDev), true);
+    if (null == vProjectedNode) {
+      return vnode_insertBefore(journal, vParent, vNewNode = vnode_newVirtual(), vCurrent && getInsertBefore()), vnode_setProp(vNewNode, QSlot, slotNameKey), vHost && vnode_setProp(vHost, slotNameKey, vNewNode), false;
+    }
+    if (vProjectedNode === vCurrent) ;
+    else {
+      const parent = vnode_getParent(vProjectedNode);
+      !(!parent || vnode_isElementVNode(parent) && vnode_getElementName(parent) === QTemplate) && vParent !== parent && vnode_remove(journal, parent, vProjectedNode, false), vnode_insertBefore(journal, vParent, vNewNode = vProjectedNode, vCurrent && getInsertBefore()), vnode_setProp(vNewNode, QSlot, slotNameKey), vHost && vnode_setProp(vHost, slotNameKey, vNewNode);
+    }
+    return true;
   }
   function expectNoMore() {
     if (null !== vCurrent) {
       for (; vCurrent; ) {
         const toRemove = vCurrent;
-        advanceToNextSibling(), cleanup(container, toRemove), vParent === vnode_getParent(toRemove) && vnode_remove(journal, vParent, toRemove, true);
+        advanceToNextSibling(), vParent === vnode_getParent(toRemove) && (cleanup(container, toRemove), vnode_remove(journal, vParent, toRemove, true));
       }
     }
   }
@@ -1177,7 +1185,7 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       const componentHash = componentQRL.$hash$;
       const vNodeComponentHash = getComponentHash(host, container.$getObjectById$);
       const lookupKey = jsxNode2.key || componentHash;
-      if (lookupKey === (getKey(host) || vNodeComponentHash) ? componentHash === vNodeComponentHash || (insertNewComponent(host, componentQRL, jsxProps), vNewNode && (host = vNewNode, shouldRender = true)) : (vNewNode = retrieveChildWithKey(null, lookupKey), vNewNode ? vnode_insertBefore(journal, vParent, vNewNode, vCurrent) : insertNewComponent(host, componentQRL, jsxProps), host = vNewNode, shouldRender = true), host) {
+      if (lookupKey === (getKey(host) || vNodeComponentHash) ? componentHash === vNodeComponentHash || (insertNewComponent(host, componentQRL, jsxProps), host = vNewNode, shouldRender = true) : (vNewNode = retrieveChildWithKey(null, lookupKey), vNewNode ? vnode_insertBefore(journal, vParent, vNewNode, vCurrent) : insertNewComponent(host, componentQRL, jsxProps), host = vNewNode, shouldRender = true), host) {
         const vNodeProps = vnode_getProp(host, "q:props", container.$getObjectById$);
         shouldRender = shouldRender || propsDiffer(jsxProps, vNodeProps), shouldRender && (host[VNodeProps.flags] &= ~VNodeFlags.Deleted, container.$scheduler$(ChoreType.COMPONENT, host, componentQRL, jsxProps));
       }
@@ -1211,11 +1219,9 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       }(jsxNode2.children, host);
     } else {
       const lookupKey = jsxNode2.key;
-      if (lookupKey === getKey(host) || (vNewNode = retrieveChildWithKey(null, lookupKey), vNewNode ? vnode_insertBefore(journal, vParent, vNewNode, vCurrent) : function() {
-        vnode_insertBefore(journal, vParent, vNewNode = vnode_newVirtual(), vCurrent && getInsertBefore());
-        const jsxNode3 = jsxValue;
-        vnode_setProp(vNewNode, "q:props", jsxNode3.props), jsxNode3.key && vnode_setProp(vNewNode, "q:key", jsxNode3.key);
-      }(), host = vNewNode), host) {
+      const lookupKeysAreEqual = lookupKey === getKey(host);
+      const vNodeComponentHash = getComponentHash(host, container.$getObjectById$);
+      if (lookupKeysAreEqual ? null != vNodeComponentHash && (insertNewInlineComponent(), host = vNewNode) : (vNewNode = retrieveChildWithKey(null, lookupKey), vNewNode ? vnode_insertBefore(journal, vParent, vNewNode, vCurrent) : insertNewInlineComponent(), host = vNewNode), host) {
         let componentHost = host;
         for (; componentHost && (!vnode_isVirtualVNode(componentHost) || null === vnode_getProp(componentHost, "q:renderFn", null)); ) {
           componentHost = vnode_getParent(componentHost);
@@ -1230,6 +1236,11 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     const jsxNode2 = jsxValue;
     container.setHostProp(vNewNode, "q:renderFn", componentQRL), container.setHostProp(vNewNode, "q:props", jsxProps), container.setHostProp(vNewNode, "q:key", jsxNode2.key);
   }
+  function insertNewInlineComponent() {
+    vnode_insertBefore(journal, vParent, vNewNode = vnode_newVirtual(), vCurrent && getInsertBefore());
+    const jsxNode2 = jsxValue;
+    vnode_setProp(vNewNode, "q:props", jsxNode2.props), jsxNode2.key && vnode_setProp(vNewNode, "q:key", jsxNode2.key);
+  }
   function expectText(text) {
     if (null !== vCurrent) {
       if (3 === vnode_getType(vCurrent)) {
@@ -1280,7 +1291,7 @@ function removePropsKeys(keys, propKeys) {
 function cleanup(container, vNode) {
   let vCursor = vNode;
   if (vnode_isTextVNode(vNode)) {
-    return;
+    return void markVNodeAsDeleted(vCursor);
   }
   let vParent = null;
   for (; ; ) {
@@ -1301,8 +1312,7 @@ function cleanup(container, vNode) {
       if (type & VNodeFlags.Virtual && null !== vnode_getProp(vCursor, "q:renderFn", null)) {
         const attrs = vnode_getProps(vCursor);
         for (let i = 0; i < attrs.length; i += 2) {
-          const key = attrs[i];
-          if (!isParentSlotProp(key) && isSlotProp(key)) {
+          if (isSlotProp(attrs[i])) {
             const value = attrs[i + 1];
             if (value) {
               attrs[i + 1] = null;
@@ -1316,7 +1326,7 @@ function cleanup(container, vNode) {
           }
         }
       }
-      if (type & VNodeFlags.Virtual && null !== vnode_getProp(vCursor, QSlot, null)) {
+      if (vnode_isProjection(vCursor)) {
         if (vCursor === vNode) {
           const vFirstChild = vnode_getFirstChild(vCursor);
           if (vFirstChild) {
@@ -1330,6 +1340,8 @@ function cleanup(container, vNode) {
           continue;
         }
       }
+    } else {
+      type & VNodeFlags.Text && markVNodeAsDeleted(vCursor);
     }
     if (vCursor === vNode) {
       return;
@@ -1453,10 +1465,10 @@ const vnode_documentPosition = (a2, b, rootVNode) => {
   let aDepth = -1;
   let bDepth = -1;
   for (; a2; ) {
-    a2 = (aVNodePath[++aDepth] = a2)[VNodeProps.parent] || rootVNode && vnode_getProp(a2, ":", (id) => vnode_locate(rootVNode, id));
+    a2 = (aVNodePath[++aDepth] = a2)[VNodeProps.parent] || rootVNode && vnode_getProp(a2, "q:sparent", (id) => vnode_locate(rootVNode, id));
   }
   for (; b; ) {
-    b = (bVNodePath[++bDepth] = b)[VNodeProps.parent] || rootVNode && vnode_getProp(b, ":", (id) => vnode_locate(rootVNode, id));
+    b = (bVNodePath[++bDepth] = b)[VNodeProps.parent] || rootVNode && vnode_getProp(b, "q:sparent", (id) => vnode_locate(rootVNode, id));
   }
   for (; aDepth >= 0 && bDepth >= 0; ) {
     if ((a2 = aVNodePath[aDepth]) !== (b = bVNodePath[bDepth])) {
@@ -1472,7 +1484,7 @@ const vnode_documentPosition = (a2, b, rootVNode) => {
           return -1;
         }
       } while (cursor);
-      return rootVNode && vnode_getProp(b, ":", (id) => vnode_locate(rootVNode, id)) ? -1 : 1;
+      return rootVNode && vnode_getProp(b, "q:sparent", (id) => vnode_locate(rootVNode, id)) ? -1 : 1;
     }
     aDepth--, bDepth--;
   }
@@ -1718,6 +1730,13 @@ const toNumber = (value) => "number" == typeof value ? value : -1;
 function vNodeAlreadyDeleted(chore) {
   return !!(chore.$host$ && vnode_isVNode(chore.$host$) && chore.$host$[VNodeProps.flags] & VNodeFlags.Deleted);
 }
+var SignalFlags;
+var WrappedSignalFlags;
+!function(SignalFlags2) {
+  SignalFlags2[SignalFlags2.INVALID = 1] = "INVALID";
+}(SignalFlags || (SignalFlags = {})), function(WrappedSignalFlags2) {
+  WrappedSignalFlags2[WrappedSignalFlags2.UNWRAP = 2] = "UNWRAP";
+}(WrappedSignalFlags || (WrappedSignalFlags = {}));
 const throwIfQRLNotResolved = (qrl2) => {
   if (!qrl2.resolved) {
     throw qrl2.resolve();
@@ -1775,7 +1794,7 @@ class Signal {
   valueOf() {
   }
   toString() {
-    return `[${this.constructor.name}${this.$invalid$ ? " INVALID" : ""} ${String(this.$untrackedValue$)}]` + (Array.from(this.$effects$ || []).map((e) => "\n -> " + pad(qwikDebugToString(e[0]), "    ")).join("\n") || "");
+    return `[${this.constructor.name}${this.$flags$ & SignalFlags.INVALID ? " INVALID" : ""} ${String(this.$untrackedValue$)}]` + (Array.from(this.$effects$ || []).map((e) => "\n -> " + pad(qwikDebugToString(e[0]), "    ")).join("\n") || "");
   }
   toJSON() {
     return {
@@ -1835,26 +1854,27 @@ const triggerEffects = (container, signal, effects) => {
     }
   }
 };
-class ComputedSignal extends Signal {
-  constructor(container, fn) {
+class ComputedSignal extends (_c = Signal, _b = _EFFECT_BACK_REF, _c) {
+  constructor(container, fn, flags = SignalFlags.INVALID) {
     super(container, NEEDS_COMPUTATION);
     __publicField(this, "$computeQrl$");
-    __publicField(this, "$invalid$", true);
+    __publicField(this, "$flags$");
     __publicField(this, "$forceRunEffects$", false);
-    this.$computeQrl$ = fn;
+    __publicField(this, _b, null);
+    this.$computeQrl$ = fn, this.$flags$ = flags;
   }
   $invalidate$() {
-    this.$invalid$ = true, this.$forceRunEffects$ = false, this.$container$?.$scheduler$(ChoreType.RECOMPUTE_AND_SCHEDULE_EFFECTS, null, this);
+    this.$flags$ |= SignalFlags.INVALID, this.$forceRunEffects$ = false, this.$container$?.$scheduler$(ChoreType.RECOMPUTE_AND_SCHEDULE_EFFECTS, null, this);
   }
   force() {
-    this.$invalid$ = true, this.$forceRunEffects$ = false, triggerEffects(this.$container$, this, this.$effects$);
+    this.$flags$ |= SignalFlags.INVALID, this.$forceRunEffects$ = false, triggerEffects(this.$container$, this, this.$effects$);
   }
   get untrackedValue() {
     const didChange = this.$computeIfNeeded$();
     return didChange && (this.$forceRunEffects$ = didChange), assertFalse(this.$untrackedValue$ === NEEDS_COMPUTATION), this.$untrackedValue$;
   }
   $computeIfNeeded$() {
-    if (!this.$invalid$) {
+    if (!(this.$flags$ & SignalFlags.INVALID)) {
       return false;
     }
     const computeQrl = this.$computeQrl$;
@@ -1867,7 +1887,7 @@ class ComputedSignal extends Signal {
       if (isPromise(untrackedValue)) {
         throw qError(QError.computedNotSync, [computeQrl.dev ? computeQrl.dev.file : "", computeQrl.$hash$]);
       }
-      this.$invalid$ = false;
+      this.$flags$ &= ~SignalFlags.INVALID;
       const didChange = untrackedValue !== this.$untrackedValue$;
       return didChange && (this.$untrackedValue$ = untrackedValue), didChange;
     } finally {
@@ -1881,30 +1901,30 @@ class ComputedSignal extends Signal {
     throw qError(QError.computedReadOnly);
   }
 }
-class WrappedSignal extends (_c = Signal, _b = _EFFECT_BACK_REF, _c) {
-  constructor(container, fn, args, fnStr) {
+class WrappedSignal extends (_e = Signal, _d = _EFFECT_BACK_REF, _e) {
+  constructor(container, fn, args, fnStr, flags = SignalFlags.INVALID | WrappedSignalFlags.UNWRAP) {
     super(container, NEEDS_COMPUTATION);
     __publicField(this, "$args$");
     __publicField(this, "$func$");
     __publicField(this, "$funcStr$");
-    __publicField(this, "$invalid$", true);
+    __publicField(this, "$flags$");
     __publicField(this, "$hostElement$", null);
     __publicField(this, "$forceRunEffects$", false);
-    __publicField(this, _b, null);
-    this.$args$ = args, this.$func$ = fn, this.$funcStr$ = fnStr;
+    __publicField(this, _d, null);
+    this.$args$ = args, this.$func$ = fn, this.$funcStr$ = fnStr, this.$flags$ = flags;
   }
   $invalidate$() {
-    this.$invalid$ = true, this.$forceRunEffects$ = false, this.$container$?.$scheduler$(ChoreType.RECOMPUTE_AND_SCHEDULE_EFFECTS, this.$hostElement$, this);
+    this.$flags$ |= SignalFlags.INVALID, this.$forceRunEffects$ = false, this.$container$?.$scheduler$(ChoreType.RECOMPUTE_AND_SCHEDULE_EFFECTS, this.$hostElement$, this);
   }
   force() {
-    this.$invalid$ = true, this.$forceRunEffects$ = false, triggerEffects(this.$container$, this, this.$effects$);
+    this.$flags$ |= SignalFlags.INVALID, this.$forceRunEffects$ = false, triggerEffects(this.$container$, this, this.$effects$);
   }
   get untrackedValue() {
     const didChange = this.$computeIfNeeded$();
     return didChange && (this.$forceRunEffects$ = didChange), assertFalse(this.$untrackedValue$ === NEEDS_COMPUTATION), this.$untrackedValue$;
   }
   $computeIfNeeded$() {
-    if (!this.$invalid$) {
+    if (!(this.$flags$ & SignalFlags.INVALID)) {
       return false;
     }
     const untrackedValue = trackSignal(() => this.$func$(...this.$args$), this, EffectProperty.VNODE, this.$container$);
@@ -1918,7 +1938,7 @@ class WrappedSignal extends (_c = Signal, _b = _EFFECT_BACK_REF, _c) {
     throw qError(QError.wrappedReadOnly);
   }
 }
-const version = "2.0.0-alpha.7-dev+a26598a";
+const version = "2.0.0-alpha.8-dev+66037b5";
 class _SharedContainer {
   constructor(scheduleDrain, journalFlush, serverData, locale) {
     __publicField(this, "$version$");
@@ -1994,7 +2014,7 @@ class PropsProxyHandler {
       return this.$children$;
     }
     const value = this.$constProps$ && prop in this.$constProps$ ? this.$constProps$[prop] : this.$varProps$[prop];
-    return value instanceof WrappedSignal ? value.value : value;
+    return value instanceof WrappedSignal && value.$flags$ & WrappedSignalFlags.UNWRAP ? value.value : value;
   }
   set(_, prop, value) {
     return prop === _CONST_PROPS ? (this.$constProps$ = value, true) : prop === _VAR_PROPS ? (this.$varProps$ = value, true) : (this.$constProps$ && prop in this.$constProps$ ? this.$constProps$[prop] = value : this.$varProps$[prop] = value, true);
@@ -2134,8 +2154,8 @@ const VNodeDataChar = {
   ID_CHAR: "=",
   PROPS: 62,
   PROPS_CHAR: ">",
-  SLOT_REF: 63,
-  SLOT_REF_CHAR: "?",
+  SLOT_PARENT: 63,
+  SLOT_PARENT_CHAR: "?",
   KEY: 64,
   KEY_CHAR: "@",
   SEQ: 91,
@@ -2199,6 +2219,9 @@ const vnode_isTextVNode = (vNode) => {
 const vnode_isVirtualVNode = (vNode) => {
   return (vNode[VNodeProps.flags] & VNodeFlags.Virtual) === VNodeFlags.Virtual;
 };
+const vnode_isProjection = (vNode) => {
+  return (vNode[VNodeProps.flags] & VNodeFlags.Virtual) === VNodeFlags.Virtual && null !== vnode_getProp(vNode, QSlot, null);
+};
 const ensureTextVNode = (vNode) => (assertTrue(vnode_isTextVNode(vNode), "Expecting TextVNode was: " + vnode_getNodeTypeName(vNode)), vNode);
 const ensureElementOrVirtualVNode = (vNode) => {
   assertTrue(!!(vNode[VNodeProps.flags] & VNodeFlags.ELEMENT_OR_VIRTUAL_MASK), "Expecting ElementVNode or VirtualVNode was: " + vnode_getNodeTypeName(vNode));
@@ -2447,7 +2470,7 @@ const vnode_applyJournal = (journal) => {
         let key = journal[idx++];
         "className" === key && (key = "class");
         const value = journal[idx++];
-        isBooleanAttr(element, key) ? element[key] = parseBoolean(value) : "value" === key && key in element ? element.value = escapeHTML(String(value)) : key === dangerouslySetInnerHTML ? element.innerHTML = value : null == value || false === value ? element.removeAttribute(key) : element.setAttribute(key, String(value));
+        isBooleanAttr(element, key) ? element[key] = parseBoolean(value) : "value" === key && key in element ? element.value = String(value) : key === dangerouslySetInnerHTML ? element.innerHTML = value : null == value || false === value ? element.removeAttribute(key) : element.setAttribute(key, String(value));
         break;
       case VNodeJournalOpCode.HoistStyles:
         const document2 = journal[idx++];
@@ -2800,8 +2823,6 @@ function materializeFromVNodeData(vParent, vData, element, child) {
       container.$setRawState$(parseInt(id), vParent);
     } else if (peek() === VNodeDataChar.PROPS) {
       vnode_setAttr(null, vParent, "q:props", consumeValue());
-    } else if (peek() === VNodeDataChar.SLOT_REF) {
-      vnode_setAttr(null, vParent, "q:sref", consumeValue());
     } else if (peek() === VNodeDataChar.KEY) {
       vnode_setAttr(null, vParent, "q:key", consumeValue());
     } else if (peek() === VNodeDataChar.SEQ) {
@@ -2810,6 +2831,8 @@ function materializeFromVNodeData(vParent, vData, element, child) {
       vnode_setAttr(null, vParent, "q:seqIdx", consumeValue());
     } else if (peek() === VNodeDataChar.BACK_REFS) {
       container || (container = getDomContainer(element)), setEffectBackRefFromVNodeData(vParent, consumeValue(), container);
+    } else if (peek() === VNodeDataChar.SLOT_PARENT) {
+      vnode_setProp(vParent, "q:sparent", consumeValue());
     } else if (peek() === VNodeDataChar.CONTEXT) {
       vnode_setAttr(null, vParent, "q:ctx", consumeValue());
     } else if (peek() === VNodeDataChar.OPEN) {
@@ -2853,7 +2876,7 @@ const vnode_getProjectionParentComponent = (vHost, rootVNode) => {
   let projectionDepth = 1;
   for (; projectionDepth--; ) {
     for (; vHost && (!vnode_isVirtualVNode(vHost) || null === vnode_getProp(vHost, "q:renderFn", null)); ) {
-      const qSlotParent = vnode_getProp(vHost, ":", (id) => vnode_locate(rootVNode, id));
+      const qSlotParent = vnode_getProp(vHost, "q:sparent", (id) => vnode_locate(rootVNode, id));
       const vProjectionParent = vnode_isVirtualVNode(vHost) && qSlotParent;
       vProjectionParent && projectionDepth++, vHost = vProjectionParent || vnode_getParent(vHost);
     }
@@ -3199,7 +3222,7 @@ class DomContainer extends _SharedContainer {
         if (null !== vnode_getProp(vNode, "q:renderFn", null)) {
           return vNode;
         }
-        vNode = vnode_getParent(vNode) || vnode_getProp(vNode, ":", this.vNodeLocate);
+        vNode = vnode_getParent(vNode) || vnode_getProp(vNode, "q:sparent", this.vNodeLocate);
       } else {
         vNode = vnode_getParent(vNode);
       }
@@ -3399,13 +3422,13 @@ const inflate = (container, target, typeId, data) => {
     case TypeIds.WrappedSignal: {
       const signal = target;
       const d = data;
-      signal.$func$ = container.getSyncFn(d[0]), signal.$args$ = d[1], signal[_EFFECT_BACK_REF] = d[2], signal.$untrackedValue$ = d[3], signal.$hostElement$ = d[4], signal.$effects$ = new Set(d.slice(5));
+      signal.$func$ = container.getSyncFn(d[0]), signal.$args$ = d[1], signal[_EFFECT_BACK_REF] = d[2], signal.$untrackedValue$ = d[3], signal.$flags$ = d[4], signal.$hostElement$ = d[5], signal.$effects$ = new Set(d.slice(6));
       break;
     }
     case TypeIds.ComputedSignal: {
       const computed = target;
       const d = data;
-      computed.$computeQrl$ = d[0], computed.$effects$ = d[1], 3 === d.length ? computed.$untrackedValue$ = d[2] : (computed.$invalid$ = true, computed.$computeQrl$.resolve(), container.$scheduler$?.(ChoreType.QRL_RESOLVE, null, computed.$computeQrl$));
+      computed.$computeQrl$ = d[0], computed.$effects$ = d[1], 3 === d.length ? computed.$untrackedValue$ = d[2] : (computed.$flags$ |= SignalFlags.INVALID, computed.$computeQrl$.resolve(), container.$scheduler$?.(ChoreType.QRL_RESOLVE, null, computed.$computeQrl$));
       break;
     }
     case TypeIds.Error: {
@@ -3481,7 +3504,7 @@ const inflate = (container, target, typeId, data) => {
   }
   return target;
 };
-const _constants = [void 0, null, true, false, "", EMPTY_ARRAY, EMPTY_OBJ, NEEDS_COMPUTATION, STORE_ARRAY_PROP, Slot, Fragment, NaN, 1 / 0, -1 / 0, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER - 1, Number.MIN_SAFE_INTEGER];
+const _constants = [void 0, null, true, false, "", EMPTY_ARRAY, EMPTY_OBJ, NEEDS_COMPUTATION, STORE_ALL_PROPS, Slot, Fragment, NaN, 1 / 0, -1 / 0, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER - 1, Number.MIN_SAFE_INTEGER];
 const allocate = (container, typeId, value) => {
   if (void 0 === value) {
     return typeId;
@@ -3678,8 +3701,8 @@ const createSerializationContext = (NodeConstructor, DomRefConstructor, symbolTo
             discoveredValues.push(k, v);
           });
         } else if (obj instanceof Signal) {
-          const v = obj instanceof WrappedSignal ? obj.untrackedValue : obj instanceof ComputedSignal && (obj.$invalid$ || fastSkipSerialize(obj)) ? NEEDS_COMPUTATION : obj.$untrackedValue$;
-          v !== NEEDS_COMPUTATION && discoveredValues.push(v), obj.$effects$ && discoveredValues.push(...obj.$effects$), obj instanceof WrappedSignal ? (discoverEffectBackRefs(obj[_EFFECT_BACK_REF], discoveredValues), obj.$args$ && discoveredValues.push(...obj.$args$), obj.$hostElement$ && discoveredValues.push(obj.$hostElement$)) : obj instanceof ComputedSignal && discoveredValues.push(obj.$computeQrl$);
+          const v = obj instanceof WrappedSignal ? obj.untrackedValue : obj instanceof ComputedSignal && (obj.$flags$ & SignalFlags.INVALID || fastSkipSerialize(obj)) ? NEEDS_COMPUTATION : obj.$untrackedValue$;
+          v !== NEEDS_COMPUTATION && discoveredValues.push(v), obj.$effects$ && discoveredValues.push(obj.$effects$), obj instanceof WrappedSignal ? (discoverEffectBackRefs(obj[_EFFECT_BACK_REF], discoveredValues), obj.$args$ && discoveredValues.push(...obj.$args$), obj.$hostElement$ && discoveredValues.push(obj.$hostElement$)) : obj instanceof ComputedSignal && (discoverEffectBackRefs(obj[_EFFECT_BACK_REF], discoveredValues), discoveredValues.push(obj.$computeQrl$));
         } else if (obj instanceof Task) {
           discoveredValues.push(obj.$el$, obj.$qrl$, obj.$state$), discoverEffectBackRefs(obj[_EFFECT_BACK_REF], discoveredValues);
         } else if (isSsrNode2(obj)) {
@@ -3752,16 +3775,7 @@ const discoverValuesForVNodeData = (vnodeData, discoveredValues) => {
   }
 };
 const discoverEffectBackRefs = (effectsBackRefs, discoveredValues) => {
-  if (effectsBackRefs) {
-    let hasBackRefs = false;
-    for (const [, effect] of effectsBackRefs) {
-      if (effect[EffectSubscriptionProp.BACK_REF]) {
-        hasBackRefs = true;
-        break;
-      }
-    }
-    hasBackRefs && discoveredValues.push(effectsBackRefs);
-  }
+  effectsBackRefs && discoveredValues.push(effectsBackRefs);
 };
 const promiseResults = /* @__PURE__ */ new WeakMap();
 function serialize(serializationContext) {
@@ -3826,10 +3840,10 @@ function serialize(serializationContext) {
     } else if (value === NEEDS_COMPUTATION) {
       output(TypeIds.Constant, Constants.NEEDS_COMPUTATION);
     } else {
-      if (value !== STORE_ARRAY_PROP) {
+      if (value !== STORE_ALL_PROPS) {
         throw qError(QError.serializeErrorUnknownType, [typeof value]);
       }
-      output(TypeIds.Constant, Constants.STORE_ARRAY_PROP);
+      output(TypeIds.Constant, Constants.STORE_ALL_PROPS);
     }
   };
   const writeObjectValue = (value, idx) => {
@@ -3887,9 +3901,9 @@ function serialize(serializationContext) {
     } else if ($isDomRef$(value)) {
       value.$ssrNode$.vnodeData[0] |= VNodeDataFlag.SERIALIZE, output(TypeIds.RefVNode, value.$ssrNode$.id);
     } else if (value instanceof Signal) {
-      const v = value instanceof ComputedSignal && (value.$invalid$ || fastSkipSerialize(value.$untrackedValue$)) ? NEEDS_COMPUTATION : value.$untrackedValue$;
+      const v = value instanceof ComputedSignal && (value.$flags$ & SignalFlags.INVALID || fastSkipSerialize(value.$untrackedValue$)) ? NEEDS_COMPUTATION : value.$untrackedValue$;
       if (value instanceof WrappedSignal) {
-        output(TypeIds.WrappedSignal, [...serializeWrappingFn(serializationContext, value), filterEffectBackRefs(value[_EFFECT_BACK_REF]), v, value.$hostElement$, ...value.$effects$ || []]);
+        output(TypeIds.WrappedSignal, [...serializeWrappingFn(serializationContext, value), filterEffectBackRefs(value[_EFFECT_BACK_REF]), v, value.$flags$, value.$hostElement$, ...value.$effects$ || []]);
       } else if (value instanceof ComputedSignal) {
         const out = [value.$computeQrl$, value.$effects$];
         v !== NEEDS_COMPUTATION && out.push(v), output(TypeIds.ComputedSignal, out);
@@ -4033,7 +4047,7 @@ var Constants;
 !function(TypeIds2) {
   TypeIds2[TypeIds2.RootRef = 0] = "RootRef", TypeIds2[TypeIds2.Constant = 1] = "Constant", TypeIds2[TypeIds2.Number = 2] = "Number", TypeIds2[TypeIds2.String = 3] = "String", TypeIds2[TypeIds2.Array = 4] = "Array", TypeIds2[TypeIds2.URL = 5] = "URL", TypeIds2[TypeIds2.Date = 6] = "Date", TypeIds2[TypeIds2.Regex = 7] = "Regex", TypeIds2[TypeIds2.VNode = 8] = "VNode", TypeIds2[TypeIds2.RefVNode = 9] = "RefVNode", TypeIds2[TypeIds2.BigInt = 10] = "BigInt", TypeIds2[TypeIds2.URLSearchParams = 11] = "URLSearchParams", TypeIds2[TypeIds2.Error = 12] = "Error", TypeIds2[TypeIds2.Object = 13] = "Object", TypeIds2[TypeIds2.Promise = 14] = "Promise", TypeIds2[TypeIds2.Set = 15] = "Set", TypeIds2[TypeIds2.Map = 16] = "Map", TypeIds2[TypeIds2.Uint8Array = 17] = "Uint8Array", TypeIds2[TypeIds2.QRL = 18] = "QRL", TypeIds2[TypeIds2.Task = 19] = "Task", TypeIds2[TypeIds2.Resource = 20] = "Resource", TypeIds2[TypeIds2.Component = 21] = "Component", TypeIds2[TypeIds2.Signal = 22] = "Signal", TypeIds2[TypeIds2.WrappedSignal = 23] = "WrappedSignal", TypeIds2[TypeIds2.ComputedSignal = 24] = "ComputedSignal", TypeIds2[TypeIds2.Store = 25] = "Store", TypeIds2[TypeIds2.StoreArray = 26] = "StoreArray", TypeIds2[TypeIds2.FormData = 27] = "FormData", TypeIds2[TypeIds2.JSXNode = 28] = "JSXNode", TypeIds2[TypeIds2.PropsProxy = 29] = "PropsProxy", TypeIds2[TypeIds2.EffectData = 30] = "EffectData";
 }(TypeIds || (TypeIds = {})), function(Constants2) {
-  Constants2[Constants2.Undefined = 0] = "Undefined", Constants2[Constants2.Null = 1] = "Null", Constants2[Constants2.True = 2] = "True", Constants2[Constants2.False = 3] = "False", Constants2[Constants2.EmptyString = 4] = "EmptyString", Constants2[Constants2.EMPTY_ARRAY = 5] = "EMPTY_ARRAY", Constants2[Constants2.EMPTY_OBJ = 6] = "EMPTY_OBJ", Constants2[Constants2.NEEDS_COMPUTATION = 7] = "NEEDS_COMPUTATION", Constants2[Constants2.STORE_ARRAY_PROP = 8] = "STORE_ARRAY_PROP", Constants2[Constants2.Slot = 9] = "Slot", Constants2[Constants2.Fragment = 10] = "Fragment", Constants2[Constants2.NaN = 11] = "NaN", Constants2[Constants2.PositiveInfinity = 12] = "PositiveInfinity", Constants2[Constants2.NegativeInfinity = 13] = "NegativeInfinity", Constants2[Constants2.MaxSafeInt = 14] = "MaxSafeInt", Constants2[Constants2.AlmostMaxSafeInt = 15] = "AlmostMaxSafeInt", Constants2[Constants2.MinSafeInt = 16] = "MinSafeInt";
+  Constants2[Constants2.Undefined = 0] = "Undefined", Constants2[Constants2.Null = 1] = "Null", Constants2[Constants2.True = 2] = "True", Constants2[Constants2.False = 3] = "False", Constants2[Constants2.EmptyString = 4] = "EmptyString", Constants2[Constants2.EMPTY_ARRAY = 5] = "EMPTY_ARRAY", Constants2[Constants2.EMPTY_OBJ = 6] = "EMPTY_OBJ", Constants2[Constants2.NEEDS_COMPUTATION = 7] = "NEEDS_COMPUTATION", Constants2[Constants2.STORE_ALL_PROPS = 8] = "STORE_ALL_PROPS", Constants2[Constants2.Slot = 9] = "Slot", Constants2[Constants2.Fragment = 10] = "Fragment", Constants2[Constants2.NaN = 11] = "NaN", Constants2[Constants2.PositiveInfinity = 12] = "PositiveInfinity", Constants2[Constants2.NegativeInfinity = 13] = "NegativeInfinity", Constants2[Constants2.MaxSafeInt = 14] = "MaxSafeInt", Constants2[Constants2.AlmostMaxSafeInt = 15] = "AlmostMaxSafeInt", Constants2[Constants2.MinSafeInt = 16] = "MinSafeInt";
 }(Constants || (Constants = {}));
 const noSerializeSet = /* @__PURE__ */ new WeakSet();
 const fastSkipSerialize = (obj) => noSerializeSet.has(obj);