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

package/dist/core.prod.cjs

@@ -1,6 +1,6 @@
 /**
  * @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
@@ -416,7 +416,7 @@
     const setValueForStyle = (styleName, value) => "number" != typeof value || 0 === value || unitlessNumbers.has(styleName) ? value : value + "px";
     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(StoreFlags) {
         StoreFlags[StoreFlags.NONE = 0] = "NONE", StoreFlags[StoreFlags.RECURSIVE = 1] = "RECURSIVE", 
@@ -463,7 +463,7 @@
                     assertTrue();
                 }
                 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;
@@ -494,7 +494,7 @@
                 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);
@@ -502,7 +502,7 @@
         ownKeys(target) {
             const ctx = tryGetInvokeContext();
             const effectSubscriber = ctx?.$effectSubscriber$;
-            return effectSubscriber && addEffect(target, STORE_ARRAY_PROP, this, effectSubscriber), 
+            return effectSubscriber && addStoreEffect(target, STORE_ALL_PROPS, this, effectSubscriber), 
             Reflect.ownKeys(target);
         }
         getOwnPropertyDescriptor(target, prop) {
@@ -513,7 +513,7 @@
             };
         }
     }
-    function addEffect(target, prop, store, effectSubscription) {
+    function addStoreEffect(target, prop, store, effectSubscription) {
         const effectsMap = store.$effects$ ||= new Map;
         let effects = effectsMap.get(prop);
         effects || (effects = new Set, effectsMap.set(prop, effects)), ensureContainsSubscription(effects, effectSubscription), 
@@ -536,7 +536,7 @@
                 effectsToTrigger = storeEffects.get(prop);
             }
         }
-        const storeArrayValue = storeEffects?.get(STORE_ARRAY_PROP);
+        const storeArrayValue = storeEffects?.get(STORE_ALL_PROPS);
         if (storeArrayValue) {
             effectsToTrigger ||= new Set;
             for (const effect of storeArrayValue) {
@@ -660,6 +660,10 @@
                     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);
                 }));
             },
@@ -735,13 +739,13 @@
         VirtualVNodeProps[VirtualVNodeProps.firstChild = 4] = "firstChild", VirtualVNodeProps[VirtualVNodeProps.lastChild = 5] = "lastChild", 
         VirtualVNodeProps[VirtualVNodeProps.PROPS_OFFSET = 6] = "PROPS_OFFSET";
     }(VirtualVNodeProps || (VirtualVNodeProps = {}));
-    const mapApp_findIndx = (elementVNode, key, start) => {
+    const mapApp_findIndx = (array, key, start) => {
         assertTrue();
         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;
             }
@@ -749,13 +753,13 @@
         }
         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 => build.isDev ? "foreignobject" === elementName.toLowerCase() : "foreignObject" === elementName;
     function cloneElementWithNamespace(element, elementName, namespace) {
@@ -1140,9 +1144,10 @@
         function expectProjection() {
             const slotName = jsxValue.key;
             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(), build.isDev && vnode_setProp(vNewNode, "q:type", VirtualType.Projection), 
             build.isDev && vnode_setProp(vNewNode, "q:code", "expectProjection"), vnode_setProp(vNewNode, QSlot, slotName), 
-            vnode_setProp(vNewNode, ":", vParent), vnode_setProp(vParent, slotName, vNewNode));
+            vnode_setProp(vNewNode, "q:sparent", vParent), vnode_setProp(vParent, slotName, vNewNode));
         }
         function expectSlot() {
             const vHost = vnode_getProjectionParentComponent(vParent, container.rootVNode);
@@ -1158,19 +1163,27 @@
                 return directGetPropsProxyProp(jsxNode, "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), 
-            build.isDev && vnode_setProp(vNewNode, "q:type", VirtualType.Projection), build.isDev && vnode_setProp(vNewNode, "q:code", "expectSlot" + count++), 
-            !1) : (vProjectedNode === vCurrent || (vnode_insertBefore(journal, vParent, vNewNode = vProjectedNode, vCurrent && getInsertBefore()), 
-            vnode_setProp(vNewNode, QSlot, slotNameKey), vHost && vnode_setProp(vHost, slotNameKey, vNewNode), 
-            build.isDev && vnode_setProp(vNewNode, "q:type", VirtualType.Projection), build.isDev && vnode_setProp(vNewNode, "q:code", "expectSlot" + count++)), 
-            !0);
+            if (null == vProjectedNode) {
+                return vnode_insertBefore(journal, vParent, vNewNode = vnode_newVirtual(), vCurrent && getInsertBefore()), 
+                vnode_setProp(vNewNode, QSlot, slotNameKey), vHost && vnode_setProp(vHost, slotNameKey, vNewNode), 
+                build.isDev && vnode_setProp(vNewNode, "q:type", VirtualType.Projection), build.isDev && vnode_setProp(vNewNode, "q:code", "expectSlot" + count++), 
+                !1;
+            }
+            if (vProjectedNode === vCurrent) {} else {
+                const parent = vnode_getParent(vProjectedNode);
+                !(!parent || vnode_isElementVNode(parent) && "q:template" === vnode_getElementName(parent)) && vParent !== parent && vnode_remove(journal, parent, vProjectedNode, !1), 
+                vnode_insertBefore(journal, vParent, vNewNode = vProjectedNode, vCurrent && getInsertBefore()), 
+                vnode_setProp(vNewNode, QSlot, slotNameKey), vHost && vnode_setProp(vHost, slotNameKey, vNewNode), 
+                build.isDev && vnode_setProp(vNewNode, "q:type", VirtualType.Projection), build.isDev && vnode_setProp(vNewNode, "q:code", "expectSlot" + count++);
+            }
+            return !0;
         }
         function expectNoMore() {
             if (assertFalse(), null !== vCurrent) {
                 for (;vCurrent; ) {
                     const toRemove = vCurrent;
-                    advanceToNextSibling(), cleanup(container, toRemove), vParent === vnode_getParent(toRemove) && vnode_remove(journal, vParent, toRemove, !0);
+                    advanceToNextSibling(), vParent === vnode_getParent(toRemove) && (cleanup(container, toRemove), 
+                    vnode_remove(journal, vParent, toRemove, !0));
                 }
             }
         }
@@ -1390,7 +1403,7 @@
                 const vNodeComponentHash = getComponentHash(host, container.$getObjectById$);
                 const lookupKey = jsxNode.key || componentHash;
                 if (lookupKey === (getKey(host) || vNodeComponentHash) ? componentHash === vNodeComponentHash || (insertNewComponent(host, componentQRL, jsxProps), 
-                vNewNode && (host = vNewNode, shouldRender = !0)) : (vNewNode = retrieveChildWithKey(null, lookupKey), 
+                host = vNewNode, shouldRender = !0) : (vNewNode = retrieveChildWithKey(null, lookupKey), 
                 vNewNode ? vnode_insertBefore(journal, vParent, vNewNode, vCurrent) : insertNewComponent(host, componentQRL, jsxProps), 
                 host = vNewNode, shouldRender = !0), host) {
                     const vNodeProps = vnode_getProp(host, "q:props", container.$getObjectById$);
@@ -1446,13 +1459,11 @@
                 }(jsxNode.children, host);
             } else {
                 const lookupKey = jsxNode.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 jsxNode = jsxValue;
-                    build.isDev && vnode_setProp(vNewNode, "q:type", VirtualType.InlineComponent), vnode_setProp(vNewNode, "q:props", jsxNode.props), 
-                    jsxNode.key && vnode_setProp(vNewNode, "q:key", jsxNode.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);
@@ -1468,6 +1479,12 @@
             build.isDev && vnode_setProp(vNewNode, "q:type", VirtualType.Component), container.setHostProp(vNewNode, "q:renderFn", componentQRL), 
             container.setHostProp(vNewNode, "q:props", jsxProps), container.setHostProp(vNewNode, "q:key", jsxNode.key);
         }
+        function insertNewInlineComponent() {
+            vnode_insertBefore(journal, vParent, vNewNode = vnode_newVirtual(), vCurrent && getInsertBefore());
+            const jsxNode = jsxValue;
+            build.isDev && vnode_setProp(vNewNode, "q:type", VirtualType.InlineComponent), vnode_setProp(vNewNode, "q:props", jsxNode.props), 
+            jsxNode.key && vnode_setProp(vNewNode, "q:key", jsxNode.key);
+        }
         function expectText(text) {
             if (null !== vCurrent) {
                 if (3 === vnode_getType(vCurrent)) {
@@ -1498,7 +1515,7 @@
     function cleanup(container, vNode) {
         let vCursor = vNode;
         if (vnode_isTextVNode(vNode)) {
-            return;
+            return void markVNodeAsDeleted(vCursor);
         }
         let vParent = null;
         for (;;) {
@@ -1519,8 +1536,7 @@
                 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 (!key.startsWith(":") && isSlotProp(key)) {
+                        if (isSlotProp(attrs[i])) {
                             const value = attrs[i + 1];
                             if (value) {
                                 attrs[i + 1] = null;
@@ -1534,7 +1550,7 @@
                         }
                     }
                 }
-                if (type & VNodeFlags.Virtual && null !== vnode_getProp(vCursor, QSlot, null)) {
+                if (vnode_isProjection(vCursor)) {
                     if (vCursor === vNode) {
                         const vFirstChild = vnode_getFirstChild(vCursor);
                         if (vFirstChild) {
@@ -1548,6 +1564,8 @@
                         continue;
                     }
                 }
+            } else {
+                type & VNodeFlags.Text && markVNodeAsDeleted(vCursor);
             }
             if (vCursor === vNode) {
                 return;
@@ -1896,10 +1914,10 @@
                         let aDepth = -1;
                         let bDepth = -1;
                         for (;a; ) {
-                            a = (aVNodePath[++aDepth] = a)[VNodeProps.parent] || rootVNode && vnode_getProp(a, ":", (id => vnode_locate(rootVNode, id)));
+                            a = (aVNodePath[++aDepth] = a)[VNodeProps.parent] || rootVNode && vnode_getProp(a, "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 ((a = aVNodePath[aDepth]) !== (b = bVNodePath[bDepth])) {
@@ -1915,7 +1933,7 @@
                                         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--;
                         }
@@ -1962,6 +1980,13 @@
         }
     };
     const toNumber = value => "number" == typeof value ? value : -1;
+    var SignalFlags;
+    var WrappedSignalFlags;
+    !function(SignalFlags) {
+        SignalFlags[SignalFlags.INVALID = 1] = "INVALID";
+    }(SignalFlags || (SignalFlags = {})), function(WrappedSignalFlags) {
+        WrappedSignalFlags[WrappedSignalFlags.UNWRAP = 2] = "UNWRAP";
+    }(WrappedSignalFlags || (WrappedSignalFlags = {}));
     const throwIfQRLNotResolved = qrl => {
         if (!qrl.resolved) {
             throw qrl.resolve();
@@ -2022,7 +2047,7 @@
             qDev;
         }
         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 {
@@ -2086,23 +2111,24 @@
     };
     class ComputedSignal extends Signal {
         $computeQrl$;
-        $invalid$=!0;
+        $flags$;
         $forceRunEffects$=!1;
-        constructor(container, fn) {
-            super(container, NEEDS_COMPUTATION), this.$computeQrl$ = fn;
+        [_EFFECT_BACK_REF]=null;
+        constructor(container, fn, flags = SignalFlags.INVALID) {
+            super(container, NEEDS_COMPUTATION), this.$computeQrl$ = fn, this.$flags$ = flags;
         }
         $invalidate$() {
-            this.$invalid$ = !0, this.$forceRunEffects$ = !1, this.$container$?.$scheduler$(ChoreType.RECOMPUTE_AND_SCHEDULE_EFFECTS, null, this);
+            this.$flags$ |= SignalFlags.INVALID, this.$forceRunEffects$ = !1, this.$container$?.$scheduler$(ChoreType.RECOMPUTE_AND_SCHEDULE_EFFECTS, null, this);
         }
         force() {
-            this.$invalid$ = !0, this.$forceRunEffects$ = !1, triggerEffects(this.$container$, this, this.$effects$);
+            this.$flags$ |= SignalFlags.INVALID, this.$forceRunEffects$ = !1, triggerEffects(this.$container$, this, this.$effects$);
         }
         get untrackedValue() {
             const didChange = this.$computeIfNeeded$();
             return didChange && (this.$forceRunEffects$ = didChange), assertFalse(), this.$untrackedValue$;
         }
         $computeIfNeeded$() {
-            if (!this.$invalid$) {
+            if (!(this.$flags$ & SignalFlags.INVALID)) {
                 return !1;
             }
             const computeQrl = this.$computeQrl$;
@@ -2115,7 +2141,7 @@
                 if (isPromise(untrackedValue)) {
                     throw qError(QError.computedNotSync, [ computeQrl.dev ? computeQrl.dev.file : "", computeQrl.$hash$ ]);
                 }
-                this.$invalid$ = !1;
+                this.$flags$ &= ~SignalFlags.INVALID;
                 const didChange = untrackedValue !== this.$untrackedValue$;
                 return didChange && (this.$untrackedValue$ = untrackedValue), didChange;
             } finally {
@@ -2133,25 +2159,26 @@
         $args$;
         $func$;
         $funcStr$;
-        $invalid$=!0;
+        $flags$;
         $hostElement$=null;
         $forceRunEffects$=!1;
         [_EFFECT_BACK_REF]=null;
-        constructor(container, fn, args, fnStr) {
-            super(container, NEEDS_COMPUTATION), this.$args$ = args, this.$func$ = fn, this.$funcStr$ = fnStr;
+        constructor(container, fn, args, fnStr, flags = SignalFlags.INVALID | WrappedSignalFlags.UNWRAP) {
+            super(container, NEEDS_COMPUTATION), this.$args$ = args, this.$func$ = fn, this.$funcStr$ = fnStr, 
+            this.$flags$ = flags;
         }
         $invalidate$() {
-            this.$invalid$ = !0, this.$forceRunEffects$ = !1, this.$container$?.$scheduler$(ChoreType.RECOMPUTE_AND_SCHEDULE_EFFECTS, this.$hostElement$, this);
+            this.$flags$ |= SignalFlags.INVALID, this.$forceRunEffects$ = !1, this.$container$?.$scheduler$(ChoreType.RECOMPUTE_AND_SCHEDULE_EFFECTS, this.$hostElement$, this);
         }
         force() {
-            this.$invalid$ = !0, this.$forceRunEffects$ = !1, triggerEffects(this.$container$, this, this.$effects$);
+            this.$flags$ |= SignalFlags.INVALID, this.$forceRunEffects$ = !1, triggerEffects(this.$container$, this, this.$effects$);
         }
         get untrackedValue() {
             const didChange = this.$computeIfNeeded$();
             return didChange && (this.$forceRunEffects$ = didChange), assertFalse(), this.$untrackedValue$;
         }
         $computeIfNeeded$() {
-            if (!this.$invalid$) {
+            if (!(this.$flags$ & SignalFlags.INVALID)) {
                 return !1;
             }
             const untrackedValue = trackSignal((() => this.$func$(...this.$args$)), this, EffectProperty.VNODE, this.$container$);
@@ -2256,7 +2283,7 @@
                         const componentFrame = options.parentComponentFrame || ssr.unclaimedProjectionComponentFrameQueue.shift();
                         if (componentFrame) {
                             const projectionAttrs = build.isDev ? [ "q:type", VirtualType.Projection ] : [];
-                            projectionAttrs.push(":", componentFrame.componentNode.id || ""), ssr.openProjection(projectionAttrs);
+                            projectionAttrs.push("q:sparent", componentFrame.componentNode.id || ""), ssr.openProjection(projectionAttrs);
                             const host = componentFrame.componentNode;
                             const node = ssr.getLastNode();
                             const slotName = function(host, jsx, ssr) {
@@ -2399,7 +2426,7 @@
         const eventName = key.substring(15);
         eventName && serializationCtx.$eventNames$.add(eventName);
     }
-    const version = "2.0.0-alpha.7-dev+a26598a";
+    const version = "2.0.0-alpha.8-dev+66037b5";
     class _SharedContainer {
         $version$;
         $scheduler$;
@@ -2432,7 +2459,7 @@
             return obj[prop];
         }
         if (isSignal(obj)) {
-            return assertEqual(), obj instanceof WrappedSignal ? obj : getWrapped(args);
+            return assertEqual(), obj instanceof WrappedSignal && obj.flags & WrappedSignalFlags.UNWRAP ? obj : getWrapped(args);
         }
         if (isPropsProxy(obj)) {
             const constProps = obj[_CONST_PROPS];
@@ -2526,7 +2553,7 @@
                 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, !0) : prop === _VAR_PROPS ? (this.$varProps$ = value, 
@@ -2626,7 +2653,7 @@
         return String(value);
     };
     const VNodeDataSeparator_REFERENCE = 126, VNodeDataSeparator_ADVANCE_1 = 33, VNodeDataSeparator_ADVANCE_8192 = 46;
-    const VNodeDataChar_OPEN = 123, VNodeDataChar_CLOSE = 125, VNodeDataChar_SCOPED_STYLE = 59, VNodeDataChar_RENDER_FN = 60, VNodeDataChar_ID = 61, VNodeDataChar_PROPS = 62, VNodeDataChar_SLOT_REF = 63, VNodeDataChar_KEY = 64, VNodeDataChar_SEQ = 91, VNodeDataChar_CONTEXT = 93, VNodeDataChar_SEQ_IDX = 94, VNodeDataChar_BACK_REFS = 96, VNodeDataChar_SEPARATOR = 124, VNodeDataChar_SLOT = 126;
+    const VNodeDataChar_OPEN = 123, VNodeDataChar_CLOSE = 125, VNodeDataChar_SCOPED_STYLE = 59, VNodeDataChar_RENDER_FN = 60, VNodeDataChar_ID = 61, VNodeDataChar_PROPS = 62, VNodeDataChar_SLOT_PARENT = 63, VNodeDataChar_KEY = 64, VNodeDataChar_SEQ = 91, VNodeDataChar_CONTEXT = 93, VNodeDataChar_SEQ_IDX = 94, VNodeDataChar_BACK_REFS = 96, VNodeDataChar_SEPARATOR = 124, VNodeDataChar_SLOT = 126;
     var VNodeJournalOpCode;
     !function(VNodeJournalOpCode) {
         VNodeJournalOpCode[VNodeJournalOpCode.SetText = 1] = "SetText", VNodeJournalOpCode[VNodeJournalOpCode.SetAttribute = 2] = "SetAttribute", 
@@ -2677,6 +2704,10 @@
         assertDefined();
         return (vNode[VNodeProps.flags] & VNodeFlags.Virtual) === VNodeFlags.Virtual;
     };
+    const vnode_isProjection = vNode => {
+        assertDefined();
+        return (vNode[VNodeProps.flags] & VNodeFlags.Virtual) === VNodeFlags.Virtual && null !== vnode_getProp(vNode, QSlot, null);
+    };
     const ensureTextVNode = vNode => (assertTrue(vnode_isTextVNode(vNode), vnode_getNodeTypeName(vNode)), 
     vNode);
     const ensureElementOrVirtualVNode = vNode => {
@@ -2935,7 +2966,7 @@
                 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)) : "dangerouslySetInnerHTML" === key ? element.innerHTML = value : null == value || !1 === 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) : "dangerouslySetInnerHTML" === key ? element.innerHTML = value : null == value || !1 === value ? element.removeAttribute(key) : element.setAttribute(key, String(value));
                 break;
 
               case VNodeJournalOpCode.HoistStyles:
@@ -3138,8 +3169,6 @@
                         container.$setRawState$(parseInt(id), vParent), build.isDev && vnode_setAttr(null, vParent, "q:id", id);
                     } 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) {
@@ -3148,6 +3177,8 @@
                         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) {
@@ -3484,7 +3515,7 @@
         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);
             }
@@ -3858,7 +3889,7 @@
                     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);
                 }
@@ -4082,7 +4113,8 @@
                 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.$untrackedValue$ = d[3], signal.$flags$ = d[4], signal.$hostElement$ = d[5], 
+                signal.$effects$ = new Set(d.slice(6));
                 break;
             }
 
@@ -4090,7 +4122,7 @@
             {
                 const computed = target;
                 const d = data;
-                computed.$computeQrl$ = d[0], computed.$effects$ = d[1], 3 === d.length ? computed.$untrackedValue$ = d[2] : (computed.$invalid$ = !0, 
+                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;
             }
@@ -4185,7 +4217,7 @@
         }
         return target;
     };
-    const _constants = [ void 0, null, !0, !1, "", 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, !0, !1, "", 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;
@@ -4412,10 +4444,10 @@
                         } 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) => {
@@ -4475,9 +4507,9 @@
                         } 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);
@@ -4618,10 +4650,11 @@
                             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$), 
+                        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 && discoveredValues.push(obj.$computeQrl$);
+                        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 (isSsrNode(obj)) {
@@ -4694,16 +4727,7 @@
         }
     };
     const discoverEffectBackRefs = (effectsBackRefs, discoveredValues) => {
-        if (effectsBackRefs) {
-            let hasBackRefs = !1;
-            for (const [, effect] of effectsBackRefs) {
-                if (effect[EffectSubscriptionProp.BACK_REF]) {
-                    hasBackRefs = !0;
-                    break;
-                }
-            }
-            hasBackRefs && discoveredValues.push(effectsBackRefs);
-        }
+        effectsBackRefs && discoveredValues.push(effectsBackRefs);
     };
     const promiseResults = new WeakMap;
     function filterEffectBackRefs(effectBackRef) {
@@ -4880,7 +4904,7 @@
         Constants[Constants.True = 2] = "True", Constants[Constants.False = 3] = "False", 
         Constants[Constants.EmptyString = 4] = "EmptyString", Constants[Constants.EMPTY_ARRAY = 5] = "EMPTY_ARRAY", 
         Constants[Constants.EMPTY_OBJ = 6] = "EMPTY_OBJ", Constants[Constants.NEEDS_COMPUTATION = 7] = "NEEDS_COMPUTATION", 
-        Constants[Constants.STORE_ARRAY_PROP = 8] = "STORE_ARRAY_PROP", Constants[Constants.Slot = 9] = "Slot", 
+        Constants[Constants.STORE_ALL_PROPS = 8] = "STORE_ALL_PROPS", Constants[Constants.Slot = 9] = "Slot", 
         Constants[Constants.Fragment = 10] = "Fragment", Constants[Constants.NaN = 11] = "NaN", 
         Constants[Constants.PositiveInfinity = 12] = "PositiveInfinity", Constants[Constants.NegativeInfinity = 13] = "NegativeInfinity", 
         Constants[Constants.MaxSafeInt = 14] = "MaxSafeInt", Constants[Constants.AlmostMaxSafeInt = 15] = "AlmostMaxSafeInt", 
@@ -5450,6 +5474,9 @@
     input), exports._wrapProp = _wrapProp, exports._wrapSignal = (obj, prop) => {
         const r = _wrapProp(obj, prop);
         return r === _IMMUTABLE ? obj[prop] : r;
+    }, exports._wrapStore = (obj, prop) => {
+        const value = getStoreTarget(obj)[prop];
+        return isSignal(value) ? value : new WrappedSignal(null, getProp, [ obj, prop ], null, SignalFlags.INVALID);
     }, exports.component$ = onMount => componentQrl(dollar(onMount)), exports.componentQrl = componentQrl, 
     exports.createComputed$ = createComputed$, exports.createComputedQrl = createComputedQrl, 
     exports.createContextId = createContextId, exports.createElement = h, exports.createSignal = createSignal,