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

package/dist/core.mjs

@@ -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
@@ -313,8 +313,7 @@ const OnRenderProp = 'q:renderFn';
 const ComponentStylesPrefixContent = '⚡️';
 /** `<some-element q:slot="...">` */
 const QSlot = 'q:slot';
-const QSlotParent = ':';
-const QSlotRef = 'q:sref';
+const QSlotParent = 'q:sparent';
 const QSlotS = 'q:s';
 const QStyle = 'q:style';
 const QStyleSelector = 'style[q\\:style]';
@@ -351,6 +350,7 @@ const MATH_NS = 'http://www.w3.org/1998/Math/MathML';
 const ResourceEvent = 'qResource';
 const RenderEvent = 'qRender';
 const TaskEvent = 'qTask';
+/** `<q:slot name="...">` */
 const QDefaultSlot = '';
 /**
  * Attribute to mark that this VNode has a pointer to itself from the `qwik/json` state.
@@ -1150,7 +1150,7 @@ const styleKey = (qStyles, index) => {
 
 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";
@@ -1225,7 +1225,7 @@ class StoreHandler {
             }
             const effectSubscriber = ctx.$effectSubscriber$;
             if (effectSubscriber) {
-                addEffect(target, Array.isArray(target) ? STORE_ARRAY_PROP : prop, this, effectSubscriber);
+                addStoreEffect(target, Array.isArray(target) ? STORE_ALL_PROPS : prop, this, effectSubscriber);
             }
         }
         if (prop === 'toString' && value === Object.prototype.toString) {
@@ -1276,7 +1276,7 @@ class StoreHandler {
             if (ctx) {
                 const effectSubscriber = ctx.$effectSubscriber$;
                 if (effectSubscriber) {
-                    addEffect(target, Array.isArray(target) ? STORE_ARRAY_PROP : prop, this, effectSubscriber);
+                    addStoreEffect(target, Array.isArray(target) ? STORE_ALL_PROPS : prop, this, effectSubscriber);
                 }
             }
         }
@@ -1286,7 +1286,7 @@ class StoreHandler {
         const ctx = tryGetInvokeContext();
         const effectSubscriber = ctx?.$effectSubscriber$;
         if (effectSubscriber) {
-            addEffect(target, STORE_ARRAY_PROP, this, effectSubscriber);
+            addStoreEffect(target, STORE_ALL_PROPS, this, effectSubscriber);
         }
         return Reflect.ownKeys(target);
     }
@@ -1304,7 +1304,7 @@ class StoreHandler {
         };
     }
 }
-function addEffect(target, prop, store, effectSubscription) {
+function addStoreEffect(target, prop, store, effectSubscription) {
     const effectsMap = (store.$effects$ ||= new Map());
     let effects = effectsMap.get(prop);
     if (!effects) {
@@ -1340,7 +1340,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 ||= new Set();
         for (const effect of storeArrayValue) {
@@ -1589,6 +1589,11 @@ const runTask = (task, container, host) => {
             else if (isSignal(obj)) {
                 return obj.value;
             }
+            else if (isStore(obj)) {
+                // track whole store
+                addStoreEffect(getStoreTarget(obj), STORE_ALL_PROPS, getStoreHandler(obj), ctx.$effectSubscriber$);
+                return obj;
+            }
             else {
                 throw qError(QError.trackObjectWithoutProp);
             }
@@ -1746,13 +1751,13 @@ var VirtualVNodeProps;
     VirtualVNodeProps[VirtualVNodeProps["PROPS_OFFSET"] = 6] = "PROPS_OFFSET";
 })(VirtualVNodeProps || (VirtualVNodeProps = {}));
 
-const mapApp_findIndx = (elementVNode, key, start) => {
+const mapApp_findIndx = (array, key, start) => {
     assertTrue(start % 2 === 0, 'Expecting even number.');
     let bottom = start >> 1;
-    let top = (elementVNode.length - 2) >> 1;
+    let top = (array.length - 2) >> 1;
     while (bottom <= top) {
         const mid = bottom + ((top - bottom) >> 1);
-        const midKey = elementVNode[mid << 1];
+        const midKey = array[mid << 1];
         if (midKey === key) {
             return mid << 1;
         }
@@ -1765,24 +1770,24 @@ const mapApp_findIndx = (elementVNode, key, start) => {
     }
     return (bottom << 1) ^ -1;
 };
-const mapArray_set = (elementVNode, key, value, start) => {
-    const indx = mapApp_findIndx(elementVNode, key, start);
+const mapArray_set = (array, key, value, start) => {
+    const indx = mapApp_findIndx(array, key, start);
     if (indx >= 0) {
         if (value == null) {
-            elementVNode.splice(indx, 2);
+            array.splice(indx, 2);
         }
         else {
-            elementVNode[indx + 1] = value;
+            array[indx + 1] = value;
         }
     }
     else if (value != null) {
-        elementVNode.splice(indx ^ -1, 0, key, value);
+        array.splice(indx ^ -1, 0, key, value);
     }
 };
-const mapArray_get = (elementVNode, key, start) => {
-    const indx = mapApp_findIndx(elementVNode, key, start);
+const mapArray_get = (array, key, start) => {
+    const indx = mapApp_findIndx(array, key, start);
     if (indx >= 0) {
-        return elementVNode[indx + 1];
+        return array[indx + 1];
     }
     else {
         return null;
@@ -2350,9 +2355,6 @@ const _IMMUTABLE = Symbol('IMMUTABLE');
 function isSlotProp(prop) {
     return !prop.startsWith('q:') && !prop.startsWith(NON_SERIALIZABLE_MARKER_PREFIX);
 }
-function isParentSlotProp(prop) {
-    return prop.startsWith(QSlotParent);
-}
 /** @internal */
 const _restProps = (props, omit, target = {}) => {
     let constPropsTarget = null;
@@ -2746,6 +2748,8 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         // console.log('expectProjection', JSON.stringify(slotName));
         vCurrent = vnode_getProp(vParent, // The parent is the component and it should have our portal.
         slotName, (id) => vnode_locate(container.rootVNode, id));
+        // if projection is marked as deleted then we need to create a new one
+        vCurrent = vCurrent && vCurrent[VNodeProps.flags] & VNodeFlags.Deleted ? null : vCurrent;
         if (vCurrent == null) {
             vNewNode = vnode_newVirtual();
             // you may be tempted to add the projection into the current parent, but
@@ -2782,6 +2786,19 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         }
         else if (vProjectedNode === vCurrent) ;
         else {
+            const parent = vnode_getParent(vProjectedNode);
+            const isAlreadyProjected = !!parent && !(vnode_isElementVNode(parent) && vnode_getElementName(parent) === QTemplate);
+            if (isAlreadyProjected && vParent !== parent) {
+                /**
+                 * The node is already projected, but structure has been changed. In next steps we will
+                 * insert the vProjectedNode at the end. However we will find existing projection elements
+                 * (from already projected THE SAME projection as vProjectedNode!) during
+                 * vnode_insertBefore. We need to remove vnode from the vnode tree to avoid referencing it
+                 * to self and cause infinite loop. Don't remove it from DOM to avoid additional operations
+                 * and flickering.
+                 */
+                vnode_remove(journal, parent, vProjectedNode, false);
+            }
             // move from q:template to the target node
             vnode_insertBefore(journal, vParent, (vNewNode = vProjectedNode), vCurrent && getInsertBefore());
             vnode_setProp(vNewNode, QSlot, slotNameKey);
@@ -2835,8 +2852,8 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
             while (vCurrent) {
                 const toRemove = vCurrent;
                 advanceToNextSibling();
-                cleanup(container, toRemove);
                 if (vParent === vnode_getParent(toRemove)) {
+                    cleanup(container, toRemove);
                     // If we are diffing projection than the parent is not the parent of the node.
                     // If that is the case we don't want to remove the node from the parent.
                     vnode_remove(journal, vParent, toRemove, true);
@@ -3276,10 +3293,8 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
             }
             else if (!hashesAreEqual) {
                 insertNewComponent(host, componentQRL, jsxProps);
-                if (vNewNode) {
-                    host = vNewNode;
-                    shouldRender = true;
-                }
+                host = vNewNode;
+                shouldRender = true;
             }
             if (host) {
                 const vNodeProps = vnode_getProp(host, ELEMENT_PROPS, container.$getObjectById$);
@@ -3300,6 +3315,7 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
             const lookupKey = jsxNode.key;
             const vNodeLookupKey = getKey(host);
             const lookupKeysAreEqual = lookupKey === vNodeLookupKey;
+            const vNodeComponentHash = getComponentHash(host, container.$getObjectById$);
             if (!lookupKeysAreEqual) {
                 // See if we already have this inline component later on.
                 vNewNode = retrieveChildWithKey(null, lookupKey);
@@ -3313,6 +3329,11 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
                 }
                 host = vNewNode;
             }
+            // inline components don't have component hash - q:renderFn prop, so it should be null
+            else if (vNodeComponentHash != null) {
+                insertNewInlineComponent();
+                host = vNewNode;
+            }
             if (host) {
                 let componentHost = host;
                 // Find the closest component host which has `OnRender` prop. This is need for subscriptions context.
@@ -3457,6 +3478,7 @@ function cleanup(container, vNode) {
     let vCursor = vNode;
     // Depth first traversal
     if (vnode_isTextVNode(vNode)) {
+        markVNodeAsDeleted(vCursor);
         // Text nodes don't have subscriptions or children;
         return;
     }
@@ -3492,7 +3514,7 @@ function cleanup(container, vNode) {
                 const attrs = vnode_getProps(vCursor);
                 for (let i = 0; i < attrs.length; i = i + 2) {
                     const key = attrs[i];
-                    if (!isParentSlotProp(key) && isSlotProp(key)) {
+                    if (isSlotProp(key)) {
                         const value = attrs[i + 1];
                         if (value) {
                             attrs[i + 1] = null; // prevent infinite loop
@@ -3509,7 +3531,7 @@ function cleanup(container, vNode) {
                     }
                 }
             }
-            const isProjection = type & VNodeFlags.Virtual && vnode_getProp(vCursor, QSlot, null) !== null;
+            const isProjection = vnode_isProjection(vCursor);
             // Descend into children
             if (!isProjection) {
                 // Only if it is not a projection
@@ -3532,6 +3554,9 @@ function cleanup(container, vNode) {
                 }
             }
         }
+        else if (type & VNodeFlags.Text) {
+            markVNodeAsDeleted(vCursor);
+        }
         // Out of children
         if (vCursor === vNode) {
             // we are where we started, this means that vNode has no children, so we are done.
@@ -4470,6 +4495,15 @@ function debugTrace(action, arg, currentChore, queue) {
 const DEBUG = false;
 // eslint-disable-next-line no-console
 const log = (...args) => console.log('SIGNAL', ...args.map(qwikDebugToString));
+var SignalFlags;
+(function (SignalFlags) {
+    SignalFlags[SignalFlags["INVALID"] = 1] = "INVALID";
+})(SignalFlags || (SignalFlags = {}));
+var WrappedSignalFlags;
+(function (WrappedSignalFlags) {
+    // should subscribe to value and be unwrapped for PropsProxy
+    WrappedSignalFlags[WrappedSignalFlags["UNWRAP"] = 2] = "UNWRAP";
+})(WrappedSignalFlags || (WrappedSignalFlags = {}));
 const throwIfQRLNotResolved = (qrl) => {
     const resolved = qrl.resolved;
     if (!resolved) {
@@ -4562,7 +4596,7 @@ class Signal {
         }
     }
     toString() {
-        return (`[${this.constructor.name}${this.$invalid$ ? ' INVALID' : ''} ${String(this.$untrackedValue$)}]` +
+        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') || ''));
@@ -4669,18 +4703,21 @@ class ComputedSignal extends Signal {
      * resolve the QRL during the mark dirty phase so that any call to it will be synchronous). )
      */
     $computeQrl$;
+    $flags$;
+    $forceRunEffects$ = false;
+    [_EFFECT_BACK_REF] = null;
+    constructor(container, fn, 
     // We need a separate flag to know when the computation needs running because
     // we need the old value to know if effects need running after computation
-    $invalid$ = true;
-    $forceRunEffects$ = false;
-    constructor(container, fn) {
+    flags = SignalFlags.INVALID) {
         // The value is used for comparison when signals trigger, which can only happen
         // when it was calculated before. Therefore we can pass whatever we like.
         super(container, NEEDS_COMPUTATION);
         this.$computeQrl$ = fn;
+        this.$flags$ = flags;
     }
     $invalidate$() {
-        this.$invalid$ = true;
+        this.$flags$ |= SignalFlags.INVALID;
         this.$forceRunEffects$ = false;
         // We should only call subscribers if the calculation actually changed.
         // Therefore, we need to calculate the value now.
@@ -4691,7 +4728,7 @@ class ComputedSignal extends Signal {
      * remained the same object
      */
     force() {
-        this.$invalid$ = true;
+        this.$flags$ |= SignalFlags.INVALID;
         this.$forceRunEffects$ = false;
         triggerEffects(this.$container$, this, this.$effects$);
     }
@@ -4704,7 +4741,7 @@ class ComputedSignal extends Signal {
         return this.$untrackedValue$;
     }
     $computeIfNeeded$() {
-        if (!this.$invalid$) {
+        if (!(this.$flags$ & SignalFlags.INVALID)) {
             return false;
         }
         const computeQrl = this.$computeQrl$;
@@ -4721,7 +4758,7 @@ class ComputedSignal extends Signal {
                 ]);
             }
             DEBUG && log('Signal.$compute$', untrackedValue);
-            this.$invalid$ = false;
+            this.$flags$ &= ~SignalFlags.INVALID;
             const didChange = untrackedValue !== this.$untrackedValue$;
             if (didChange) {
                 this.$untrackedValue$ = untrackedValue;
@@ -4746,20 +4783,22 @@ class WrappedSignal extends Signal {
     $args$;
     $func$;
     $funcStr$;
-    // We need a separate flag to know when the computation needs running because
-    // we need the old value to know if effects need running after computation
-    $invalid$ = true;
+    $flags$;
     $hostElement$ = null;
     $forceRunEffects$ = false;
     [_EFFECT_BACK_REF] = null;
-    constructor(container, fn, args, fnStr) {
+    constructor(container, fn, args, fnStr, 
+    // We need a separate flag to know when the computation needs running because
+    // we need the old value to know if effects need running after computation
+    flags = SignalFlags.INVALID | WrappedSignalFlags.UNWRAP) {
         super(container, NEEDS_COMPUTATION);
         this.$args$ = args;
         this.$func$ = fn;
         this.$funcStr$ = fnStr;
+        this.$flags$ = flags;
     }
     $invalidate$() {
-        this.$invalid$ = true;
+        this.$flags$ |= SignalFlags.INVALID;
         this.$forceRunEffects$ = false;
         // We should only call subscribers if the calculation actually changed.
         // Therefore, we need to calculate the value now.
@@ -4770,7 +4809,7 @@ class WrappedSignal extends Signal {
      * remained the same object
      */
     force() {
-        this.$invalid$ = true;
+        this.$flags$ |= SignalFlags.INVALID;
         this.$forceRunEffects$ = false;
         triggerEffects(this.$container$, this, this.$effects$);
     }
@@ -4783,10 +4822,12 @@ class WrappedSignal extends Signal {
         return 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$);
+        // TODO: we should remove invalid flag here
+        // this.$flags$ &= ~SignalFlags.INVALID;
         const didChange = untrackedValue !== this.$untrackedValue$;
         if (didChange) {
             this.$untrackedValue$ = untrackedValue;
@@ -4948,7 +4989,7 @@ function processJSXNode(ssr, enqueue, value, options) {
                     if (componentFrame) {
                         const compId = componentFrame.componentNode.id || '';
                         const projectionAttrs = isDev ? [DEBUG_TYPE, VirtualType.Projection] : [];
-                        projectionAttrs.push(':', compId);
+                        projectionAttrs.push(QSlotParent, compId);
                         ssr.openProjection(projectionAttrs);
                         const host = componentFrame.componentNode;
                         const node = ssr.getLastNode();
@@ -5216,7 +5257,7 @@ function appendClassIfScopedStyleExists(jsx, styleScoped) {
  *
  * @public
  */
-const version = "2.0.0-alpha.7-dev+a26598a";
+const version = "2.0.0-alpha.8-dev+66037b5";
 
 /** @internal */
 class _SharedContainer {
@@ -5271,7 +5312,7 @@ const _wrapProp = (...args) => {
     }
     if (isSignal(obj)) {
         assertEqual(prop, 'value', 'Left side is a signal, prop must be value');
-        if (obj instanceof WrappedSignal) {
+        if (obj instanceof WrappedSignal && obj.flags & WrappedSignalFlags.UNWRAP) {
             return obj;
         }
         return getWrapped(args);
@@ -5297,6 +5338,17 @@ const _wrapProp = (...args) => {
     // We need to forward the access to the original object
     return getWrapped(args);
 };
+/** @internal */
+const _wrapStore = (obj, prop) => {
+    const target = getStoreTarget(obj);
+    const value = target[prop];
+    if (isSignal(value)) {
+        return value;
+    }
+    else {
+        return new WrappedSignal(null, getProp, [obj, prop], null, SignalFlags.INVALID);
+    }
+};
 /** @internal @deprecated v1 compat */
 const _wrapSignal = (obj, prop) => {
     const r = _wrapProp(obj, prop);
@@ -5567,7 +5619,9 @@ class PropsProxyHandler {
             ? this.$constProps$[prop]
             : this.$varProps$[prop];
         // a proxied value that the optimizer made
-        return value instanceof WrappedSignal ? value.value : value;
+        return value instanceof WrappedSignal && value.$flags$ & WrappedSignalFlags.UNWRAP
+            ? value.value
+            : value;
     }
     set(_, prop, value) {
         if (prop === _CONST_PROPS) {
@@ -5801,8 +5855,8 @@ const VNodeDataChar = {
     ID_CHAR: /* ********* */ '=',
     PROPS: /* ************** */ 62, // `>` - `q:props' - Component Props
     PROPS_CHAR: /* ****** */ '>',
-    SLOT_REF: /* *********** */ 63, // `?` - `q:sref` - Slot reference.
-    SLOT_REF_CHAR: /* *** */ '?',
+    SLOT_PARENT: /* ******** */ 63, // `?` - `q:sparent` - Slot parent.
+    SLOT_PARENT_CHAR: /*  */ '?',
     KEY: /* **************** */ 64, // `@` - `q:key` - Element key.
     KEY_CHAR: /* ******** */ '@',
     SEQ: /* **************** */ 91, // `[` - `q:seq' - Seq value from `useSequentialScope()`
@@ -6050,6 +6104,12 @@ const vnode_isVirtualVNode = (vNode) => {
     const flag = vNode[VNodeProps.flags];
     return (flag & VNodeFlags.Virtual) === VNodeFlags.Virtual;
 };
+const vnode_isProjection = (vNode) => {
+    assertDefined(vNode, 'Missing vNode');
+    const flag = vNode[VNodeProps.flags];
+    return ((flag & VNodeFlags.Virtual) === VNodeFlags.Virtual &&
+        vnode_getProp(vNode, QSlot, null) !== null);
+};
 const ensureTextVNode = (vNode) => {
     assertTrue(vnode_isTextVNode(vNode), 'Expecting TextVNode was: ' + vnode_getNodeTypeName(vNode));
     return vNode;
@@ -6494,7 +6554,7 @@ const vnode_applyJournal = (journal) => {
                     element[key] = parseBoolean(value);
                 }
                 else if (key === 'value' && key in element) {
-                    element.value = escapeHTML(String(value));
+                    element.value = String(value);
                 }
                 else if (key === dangerouslySetInnerHTML) {
                     element.innerHTML = value;
@@ -7246,9 +7306,6 @@ function materializeFromVNodeData(vParent, vData, element, child) {
         else if (peek() === VNodeDataChar.PROPS) {
             vnode_setAttr(null, vParent, ELEMENT_PROPS, consumeValue());
         }
-        else if (peek() === VNodeDataChar.SLOT_REF) {
-            vnode_setAttr(null, vParent, QSlotRef, consumeValue());
-        }
         else if (peek() === VNodeDataChar.KEY) {
             vnode_setAttr(null, vParent, ELEMENT_KEY, consumeValue());
         }
@@ -7264,6 +7321,9 @@ function materializeFromVNodeData(vParent, vData, element, child) {
             }
             setEffectBackRefFromVNodeData(vParent, consumeValue(), container);
         }
+        else if (peek() === VNodeDataChar.SLOT_PARENT) {
+            vnode_setProp(vParent, QSlotParent, consumeValue());
+        }
         else if (peek() === VNodeDataChar.CONTEXT) {
             vnode_setAttr(null, vParent, QCtxAttr, consumeValue());
         }
@@ -8166,7 +8226,7 @@ class DomContainer extends _SharedContainer {
     $styleIds$ = null;
     $renderCount$ = 0;
     constructor(element) {
-        super(() => this.scheduleRender(), () => vnode_applyJournal(this.$journal$), {}, element.getAttribute('q:locale'));
+        super(() => this.scheduleRender(), () => vnode_applyJournal(this.$journal$), {}, element.getAttribute(QLocaleAttr));
         this.qContainer = element.getAttribute(QContainerAttr);
         if (!this.qContainer) {
             throw qError(QError.elementWithoutContainer);
@@ -8566,8 +8626,9 @@ const inflate = (container, target, typeId, data) => {
             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.$flags$ = d[4];
+            signal.$hostElement$ = d[5];
+            signal.$effects$ = new Set(d.slice(6));
             break;
         }
         case TypeIds.ComputedSignal: {
@@ -8579,7 +8640,7 @@ const inflate = (container, target, typeId, data) => {
                 computed.$untrackedValue$ = d[2];
             }
             else {
-                computed.$invalid$ = true;
+                computed.$flags$ |= SignalFlags.INVALID;
                 /**
                  * If we try to compute value and the qrl is not resolved, then system throws an error with
                  * qrl promise. To prevent that we should early resolve computed qrl while computed
@@ -8687,7 +8748,7 @@ const _constants = [
     EMPTY_ARRAY,
     EMPTY_OBJ,
     NEEDS_COMPUTATION,
-    STORE_ARRAY_PROP,
+    STORE_ALL_PROPS,
     Slot,
     Fragment,
     NaN,
@@ -8992,14 +9053,15 @@ prepVNodeData) => {
                  */
                 const v = obj instanceof WrappedSignal
                     ? obj.untrackedValue
-                    : obj instanceof ComputedSignal && (obj.$invalid$ || fastSkipSerialize(obj))
+                    : obj instanceof ComputedSignal &&
+                        (obj.$flags$ & SignalFlags.INVALID || fastSkipSerialize(obj))
                         ? NEEDS_COMPUTATION
                         : obj.$untrackedValue$;
                 if (v !== NEEDS_COMPUTATION) {
                     discoveredValues.push(v);
                 }
                 if (obj.$effects$) {
-                    discoveredValues.push(...obj.$effects$);
+                    discoveredValues.push(obj.$effects$);
                 }
                 // WrappedSignal uses syncQrl which has no captured refs
                 if (obj instanceof WrappedSignal) {
@@ -9012,6 +9074,7 @@ prepVNodeData) => {
                     }
                 }
                 else if (obj instanceof ComputedSignal) {
+                    discoverEffectBackRefs(obj[_EFFECT_BACK_REF], discoveredValues);
                     discoveredValues.push(obj.$computeQrl$);
                 }
             }
@@ -9108,18 +9171,7 @@ const discoverValuesForVNodeData = (vnodeData, discoveredValues) => {
 };
 const discoverEffectBackRefs = (effectsBackRefs, discoveredValues) => {
     if (effectsBackRefs) {
-        // We need serialize effect subscriptions with back refs
-        let hasBackRefs = false;
-        for (const [, effect] of effectsBackRefs) {
-            const backRefs = effect[EffectSubscriptionProp.BACK_REF];
-            if (backRefs) {
-                hasBackRefs = true;
-                break;
-            }
-        }
-        if (hasBackRefs) {
-            discoveredValues.push(effectsBackRefs);
-        }
+        discoveredValues.push(effectsBackRefs);
     }
 };
 const promiseResults = new WeakMap();
@@ -9268,8 +9320,8 @@ function serialize(serializationContext) {
         else if (value === NEEDS_COMPUTATION) {
             output(TypeIds.Constant, Constants.NEEDS_COMPUTATION);
         }
-        else if (value === STORE_ARRAY_PROP) {
-            output(TypeIds.Constant, Constants.STORE_ARRAY_PROP);
+        else if (value === STORE_ALL_PROPS) {
+            output(TypeIds.Constant, Constants.STORE_ALL_PROPS);
         }
         else {
             throw qError(QError.serializeErrorUnknownType, [typeof value]);
@@ -9368,7 +9420,7 @@ function serialize(serializationContext) {
              * It can never be meant to become a vNode, because vNodes are internal only.
              */
             const v = value instanceof ComputedSignal &&
-                (value.$invalid$ || fastSkipSerialize(value.$untrackedValue$))
+                (value.$flags$ & SignalFlags.INVALID || fastSkipSerialize(value.$untrackedValue$))
                 ? NEEDS_COMPUTATION
                 : value.$untrackedValue$;
             if (value instanceof WrappedSignal) {
@@ -9376,6 +9428,7 @@ function serialize(serializationContext) {
                     ...serializeWrappingFn(serializationContext, value),
                     filterEffectBackRefs(value[_EFFECT_BACK_REF]),
                     v,
+                    value.$flags$,
                     value.$hostElement$,
                     ...(value.$effects$ || []),
                 ]);
@@ -9853,7 +9906,7 @@ var Constants;
     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["STORE_ALL_PROPS"] = 8] = "STORE_ALL_PROPS";
     Constants[Constants["Slot"] = 9] = "Slot";
     Constants[Constants["Fragment"] = 10] = "Fragment";
     Constants[Constants["NaN"] = 11] = "NaN";
@@ -11346,5 +11399,5 @@ const PrefetchGraph = (opts = {}) => {
     return _jsxSorted('script', null, props, null, 0, 'prefetch-graph');
 };
 
-export { $, Fragment, PrefetchGraph, PrefetchServiceWorker, RenderOnce, Resource, SSRComment, SSRRaw, SSRStream, SSRStreamBlock, SkipRender, Slot, _CONST_PROPS, DomContainer as _DomContainer, _EFFECT_BACK_REF, EMPTY_ARRAY as _EMPTY_ARRAY, SubscriptionData as _EffectData, _IMMUTABLE, _SharedContainer, _VAR_PROPS, _deserialize, _fnSignal, _getContextElement, _getContextEvent, getDomContainer as _getDomContainer, _getQContainerElement, isJSXNode as _isJSXNode, isStringifiable as _isStringifiable, _jsxBranch, _jsxC, _jsxQ, _jsxS, _jsxSorted, _jsxSplit, _noopQrl, _noopQrlDEV, _qrlSync, _regSymbol, _restProps, queueQRL as _run, _serialize, scheduleTask as _task, verifySerializable as _verifySerializable, _waitUntilRendered, _walkJSX, _weakSerialize, _wrapProp, _wrapSignal, component$, componentQrl, createComputed$, createComputedQrl, createContextId, h as createElement, createSignal, event$, eventQrl, getDomContainer, getLocale, getPlatform, h, implicit$FirstArg, inlinedQrl, inlinedQrlDEV, isSignal, jsx, jsxDEV, jsx as jsxs, noSerialize, qrl, qrlDEV, render, setPlatform, sync$, untrack, unwrapStore, useComputed$, useComputedQrl, useConstant, useContext, useContextProvider, useErrorBoundary, useId, useLexicalScope, useOn, useOnDocument, useOnWindow, useResource$, useResourceQrl, useServerData, useSignal, useStore, useStyles$, useStylesQrl, useStylesScoped$, useStylesScopedQrl, useTask$, useTaskQrl, useVisibleTask$, useVisibleTaskQrl, version, withLocale };
+export { $, Fragment, PrefetchGraph, PrefetchServiceWorker, RenderOnce, Resource, SSRComment, SSRRaw, SSRStream, SSRStreamBlock, SkipRender, Slot, _CONST_PROPS, DomContainer as _DomContainer, _EFFECT_BACK_REF, EMPTY_ARRAY as _EMPTY_ARRAY, SubscriptionData as _EffectData, _IMMUTABLE, _SharedContainer, _VAR_PROPS, _deserialize, _fnSignal, _getContextElement, _getContextEvent, getDomContainer as _getDomContainer, _getQContainerElement, isJSXNode as _isJSXNode, isStringifiable as _isStringifiable, _jsxBranch, _jsxC, _jsxQ, _jsxS, _jsxSorted, _jsxSplit, _noopQrl, _noopQrlDEV, _qrlSync, _regSymbol, _restProps, queueQRL as _run, _serialize, scheduleTask as _task, verifySerializable as _verifySerializable, _waitUntilRendered, _walkJSX, _weakSerialize, _wrapProp, _wrapSignal, _wrapStore, component$, componentQrl, createComputed$, createComputedQrl, createContextId, h as createElement, createSignal, event$, eventQrl, getDomContainer, getLocale, getPlatform, h, implicit$FirstArg, inlinedQrl, inlinedQrlDEV, isSignal, jsx, jsxDEV, jsx as jsxs, noSerialize, qrl, qrlDEV, render, setPlatform, sync$, untrack, unwrapStore, useComputed$, useComputedQrl, useConstant, useContext, useContextProvider, useErrorBoundary, useId, useLexicalScope, useOn, useOnDocument, useOnWindow, useResource$, useResourceQrl, useServerData, useSignal, useStore, useStyles$, useStylesQrl, useStylesScoped$, useStylesScopedQrl, useTask$, useTaskQrl, useVisibleTask$, useVisibleTaskQrl, version, withLocale };
 //# sourceMappingURL=core.mjs.map