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

package/dist/core.prod.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core 2.0.0-beta.3-dev+aa098fc
+ * @qwik.dev/core 2.0.0-beta.4-dev+9849dcf
  * Copyright QwikDev. All Rights Reserved.
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://github.com/QwikDev/qwik/blob/main/LICENSE
@@ -55,6 +55,19 @@ const createAndLogError = (asyncThrow, message, ...optionalParams) => {
     }, 0), err;
 };
 
+const isSerializableObject = v => {
+    const proto = Object.getPrototypeOf(v);
+    return proto === Object.prototype || proto === Array.prototype || null === proto;
+};
+
+const isObject = v => "object" == typeof v && null !== v;
+
+const isArray = v => Array.isArray(v);
+
+const isString = v => "string" == typeof v;
+
+const isFunction = v => "function" == typeof v;
+
 const codeToText = code => `Code(Q${code}) https://github.com/QwikDev/qwik/blob/main/packages/qwik/src/core/error/error.ts#L${8 + code}`;
 
 const qError = (code, errorMessageArgs = []) => {
@@ -273,19 +286,6 @@ function retryOnPromise(fn, retryCount = 0) {
     }
 }
 
-const isSerializableObject = v => {
-    const proto = Object.getPrototypeOf(v);
-    return proto === Object.prototype || proto === Array.prototype || null === proto;
-};
-
-const isObject = v => !!v && "object" == typeof v;
-
-const isArray = v => Array.isArray(v);
-
-const isString = v => "string" == typeof v;
-
-const isFunction = v => "function" == typeof v;
-
 const ASSERT_DISCLAIMER = "Internal assert, this is likely caused by a bug in Qwik: ";
 
 function assertDefined() {
@@ -413,11 +413,11 @@ class WrappedSignalImpl extends SignalImpl {
         super(container, NEEDS_COMPUTATION), this.$args$ = args, this.$func$ = fn, this.$funcStr$ = fnStr, 
         this.$flags$ = flags;
     }
-    $invalidate$() {
+    invalidate() {
         this.$flags$ |= 1, this.$forceRunEffects$ = !1, this.$container$?.$scheduler$(7, this.$hostElement$, this, this.$effects$);
     }
     force() {
-        this.$flags$ |= 1, this.$forceRunEffects$ = !1, triggerEffects(this.$container$, this, this.$effects$);
+        this.$forceRunEffects$ = !0, this.$container$?.$scheduler$(7, this.$hostElement$, this, this.$effects$);
     }
     get untrackedValue() {
         const didChange = this.$computeIfNeeded$();
@@ -524,7 +524,7 @@ const newInvokeContext = (locale, hostElement, element, event, url) => {
         $event$: event,
         $qrl$: void 0,
         $effectSubscriber$: void 0,
-        $locale$: locale || ("object" == typeof event && event && "locale" in event ? event.locale : void 0),
+        $locale$: locale || (event && isObject(event) && "locale" in event ? event.locale : void 0),
         $container$: void 0
     };
     return seal(), ctx;
@@ -565,6 +565,13 @@ const _getContextEvent = () => {
     }
 };
 
+const _getContextContainer = () => {
+    const iCtx = tryGetInvokeContext();
+    if (iCtx) {
+        return iCtx.$container$;
+    }
+};
+
 const _jsxBranch = input => input;
 
 const _waitUntilRendered = elm => {
@@ -696,7 +703,7 @@ const ERROR_CONTEXT = /*#__PURE__*/ createContextId("qk-error");
 
 const isRecoverable = err => !(err && err instanceof Error && "plugin" in err);
 
-const version = "2.0.0-beta.3-dev+aa098fc";
+const version = "2.0.0-beta.4-dev+9849dcf";
 
 const EMPTY_ARRAY = [];
 
@@ -798,6 +805,8 @@ const _VAR_PROPS = Symbol("VAR");
 
 const _IMMUTABLE = Symbol("IMMUTABLE");
 
+const _UNINITIALIZED = Symbol("UNINITIALIZED");
+
 const implicit$FirstArg = fn => function(first, ...rest) {
     return fn.call(null, dollar(first), ...rest);
 };
@@ -811,10 +820,10 @@ class ComputedSignalImpl extends SignalImpl {
     $flags$;
     $forceRunEffects$=!1;
     [_EFFECT_BACK_REF]=null;
-    constructor(container, fn, flags = 1) {
+    constructor(container, fn, flags = 17) {
         super(container, NEEDS_COMPUTATION), this.$computeQrl$ = fn, this.$flags$ = flags;
     }
-    $invalidate$() {
+    invalidate() {
         this.$flags$ |= 1, this.$forceRunEffects$ = !1, this.$container$?.$scheduler$(7, null, this, this.$effects$);
     }
     force() {
@@ -856,7 +865,7 @@ class ComputedSignalImpl extends SignalImpl {
 
 class SerializerSignalImpl extends ComputedSignalImpl {
     constructor(container, argQrl) {
-        super(container, argQrl);
+        super(container, argQrl, 17);
     }
     $didInitialize$=!1;
     $computeIfNeeded$() {
@@ -869,7 +878,7 @@ class SerializerSignalImpl extends ComputedSignalImpl {
         const {deserialize, initial} = arg;
         const update = arg.update;
         const currentValue = this.$untrackedValue$ === NEEDS_COMPUTATION ? initial : this.$untrackedValue$;
-        const untrackedValue = trackSignal(() => this.$didInitialize$ ? update?.(currentValue) : deserialize(currentValue), this, ".", this.$container$);
+        const untrackedValue = trackSignal(() => this.$didInitialize$ ? update?.(currentValue) || currentValue : deserialize(currentValue), this, ".", this.$container$);
         const didChange = this.$didInitialize$ && "undefined" !== untrackedValue || untrackedValue !== this.$untrackedValue$;
         return this.$flags$ &= -2, this.$didInitialize$ = !0, didChange && (this.$untrackedValue$ = untrackedValue), 
         didChange;
@@ -928,7 +937,7 @@ class StoreHandler {
         if ("toString" === prop && value === Object.prototype.toString) {
             return this.toString;
         }
-        return 1 & this.$flags$ && "object" == typeof value && null !== value && !Object.isFrozen(value) && !isStore(value) && !Object.isFrozen(target) ? getOrCreateStore(value, this.$flags$, this.$container$) : value;
+        return 1 & this.$flags$ && isObject(value) && !Object.isFrozen(value) && !isStore(value) && !Object.isFrozen(target) ? getOrCreateStore(value, this.$flags$, this.$container$) : value;
     }
     set(target, prop, value) {
         if ("symbol" == typeof prop) {
@@ -1051,7 +1060,7 @@ class AsyncComputedSignalImpl extends ComputedSignalImpl {
     $loadingEffects$=null;
     $errorEffects$=null;
     $destroy$;
-    $promiseValue$=null;
+    $promiseValue$=NEEDS_COMPUTATION;
     [_EFFECT_BACK_REF]=null;
     constructor(container, fn, flags = 1) {
         super(container, fn, flags);
@@ -1074,6 +1083,9 @@ class AsyncComputedSignalImpl extends ComputedSignalImpl {
     get untrackedError() {
         return this.$untrackedError$;
     }
+    invalidate() {
+        super.invalidate(), this.$promiseValue$ = NEEDS_COMPUTATION;
+    }
     $computeIfNeeded$() {
         if (!(1 & this.$flags$)) {
             return !1;
@@ -1081,18 +1093,18 @@ class AsyncComputedSignalImpl extends ComputedSignalImpl {
         const computeQrl = this.$computeQrl$;
         throwIfQRLNotResolved(computeQrl);
         const [cleanup] = cleanupFn(this, err => this.$container$?.handleError(err, null));
-        const untrackedValue = this.$promiseValue$ ?? computeQrl.getFn()({
+        const untrackedValue = this.$promiseValue$ === NEEDS_COMPUTATION ? computeQrl.getFn()({
             track: trackFn(this, this.$container$),
             cleanup
-        });
+        }) : this.$promiseValue$;
         if (isPromise(untrackedValue)) {
             throw this.untrackedLoading = !0, this.untrackedError = null, untrackedValue.then(promiseValue => {
                 this.$promiseValue$ = promiseValue, this.untrackedLoading = !1, this.untrackedError = null;
             }).catch(err => {
-                this.untrackedLoading = !1, this.untrackedError = err;
+                this.$promiseValue$ = err, this.untrackedLoading = !1, this.untrackedError = err;
             });
         }
-        this.$promiseValue$ = null, this.$flags$ &= -2;
+        this.$promiseValue$ = NEEDS_COMPUTATION, this.$flags$ &= -2;
         const didChange = untrackedValue !== this.$untrackedValue$;
         return didChange && (this.$untrackedValue$ = untrackedValue), didChange;
     }
@@ -1100,14 +1112,18 @@ class AsyncComputedSignalImpl extends ComputedSignalImpl {
 
 const createSignal$1 = value => new SignalImpl(null, value);
 
-const createComputedSignal = qrl => (throwIfQRLNotResolved(qrl), new ComputedSignalImpl(null, qrl));
+const createComputedSignal = (qrl, options) => new ComputedSignalImpl(options?.container || null, qrl, getComputedSignalFlags(options?.serializationStrategy || "always"));
+
+const createAsyncComputedSignal = (qrl, options) => new AsyncComputedSignalImpl(options?.container || null, qrl, getComputedSignalFlags(options?.serializationStrategy || "never"));
 
-const createSerializerSignal = arg => (throwIfQRLNotResolved(arg), new SerializerSignalImpl(null, arg));
+const createSerializerSignal = arg => new SerializerSignalImpl(null, arg);
 
 const createSignal = createSignal$1;
 
 const createComputed$ = /*#__PURE__*/ implicit$FirstArg(createComputedSignal);
 
+const createAsyncComputed$ = /*#__PURE__*/ implicit$FirstArg(createAsyncComputedSignal);
+
 const createSerializer$ = implicit$FirstArg(createSerializerSignal);
 
 const getValueProp = p0 => p0.value;
@@ -1141,11 +1157,6 @@ const _wrapProp = (...args) => {
     return obj[prop];
 };
 
-const _wrapStore = (obj, prop) => {
-    const value = getStoreTarget(obj)[prop];
-    return isSignal(value) ? value : new WrappedSignalImpl(null, getProp, [ obj, prop ], null, 1);
-};
-
 const _wrapSignal = (obj, prop) => {
     const r = _wrapProp(obj, prop);
     return r === _IMMUTABLE ? obj[prop] : r;
@@ -1417,7 +1428,10 @@ const executeComponent = (container, renderHost, subscriptionHost, componentQRL,
         return useOnEvents ? addUseOnEvents(jsx, useOnEvents) : jsx;
     }, err => {
         if (isPromise(err) && retryCount < 100) {
-            return err.then(() => executeComponentWithPromiseExceptionRetry(retryCount++));
+            return err.then(() => executeComponentWithPromiseExceptionRetry(++retryCount));
+        }
+        if (retryCount >= 100) {
+            throw new Error("Max retry count of component execution reached");
         }
         throw err;
     });
@@ -2798,7 +2812,14 @@ function getResourceValueAsPromise(props) {
         const value = resource.value;
         return value ? value.then(useBindInvokeContext(props.onResolved), useBindInvokeContext(props.onRejected)) : Promise.resolve(void 0);
     }
-    return isPromise(resource) ? resource.then(useBindInvokeContext(props.onResolved), useBindInvokeContext(props.onRejected)) : isSignal(resource) ? Promise.resolve(resource.value).then(useBindInvokeContext(props.onResolved), useBindInvokeContext(props.onRejected)) : Promise.resolve(resource).then(useBindInvokeContext(props.onResolved), useBindInvokeContext(props.onRejected));
+    if (isPromise(resource)) {
+        return resource.then(useBindInvokeContext(props.onResolved), useBindInvokeContext(props.onRejected));
+    }
+    if (isSignal(resource)) {
+        const value = retryOnPromise(() => resource.value);
+        return (isPromise(value) ? value : Promise.resolve(value)).then(useBindInvokeContext(props.onResolved));
+    }
+    return Promise.resolve(resource).then(useBindInvokeContext(props.onResolved));
 }
 
 const _createResourceReturn = opts => ({
@@ -3117,7 +3138,7 @@ const createScheduler = (container, scheduleDrain, journalFlush) => {
                     const ctx = newInvokeContext();
                     if (ctx.$container$ = container, target instanceof ComputedSignalImpl || target instanceof WrappedSignalImpl) {
                         const forceRunEffects = target.$forceRunEffects$;
-                        if (target.$forceRunEffects$ = !1, !effects?.size) {
+                        if (target.$forceRunEffects$ = !1, !effects?.size && !forceRunEffects) {
                             break;
                         }
                         returnValue = maybeThen(retryOnPromise(() => invoke.call(target, ctx, target.$computeIfNeeded$)), didChange => {
@@ -3652,7 +3673,7 @@ const triggerEffects = (container, signal, effects) => {
                 1 & consumer.$flags$ && (choreType = 32), container.$scheduler$(choreType, consumer);
             } else if (consumer instanceof SignalImpl) {
                 consumer instanceof ComputedSignalImpl && (consumer.$computeQrl$.resolved || container.$scheduler$(1, null, consumer.$computeQrl$)), 
-                consumer.$invalidate$();
+                consumer.invalidate();
             } else if (":" === property) {
                 const host = consumer;
                 const qrl = container.getHostProp(host, "q:renderFn");
@@ -3680,7 +3701,20 @@ const triggerEffects = (container, signal, effects) => {
     }
 };
 
-const isSerializerObj = obj => "object" == typeof obj && null !== obj && "function" == typeof obj[SerializerSymbol];
+const isSerializerObj = obj => isObject(obj) && "function" == typeof obj[SerializerSymbol];
+
+const getComputedSignalFlags = serializationStrategy => {
+    let flags = 1;
+    switch (serializationStrategy) {
+      case "never":
+        flags |= 8;
+        break;
+
+      case "always":
+        flags |= 16;
+    }
+    return flags;
+};
 
 const stringifyPath = [];
 
@@ -4698,7 +4732,7 @@ const VNodeArray = class VNode extends Array {
 
 const deserializedProxyMap = new WeakMap;
 
-const isDeserializerProxy = value => "object" == typeof value && null !== value && SERIALIZER_PROXY_UNWRAP in value;
+const isDeserializerProxy = value => isObject(value) && SERIALIZER_PROXY_UNWRAP in value;
 
 const SERIALIZER_PROXY_UNWRAP = Symbol("UNWRAP");
 
@@ -4856,7 +4890,7 @@ const inflate = (container, target, typeId, data) => {
             asyncComputed.$computeQrl$ = d[0], asyncComputed.$effects$ = new Set(d[1]), asyncComputed.$loadingEffects$ = new Set(d[2]), 
             asyncComputed.$errorEffects$ = new Set(d[3]), asyncComputed.$untrackedLoading$ = d[4], 
             asyncComputed.$untrackedError$ = d[5];
-            d.length > 6 ? asyncComputed.$untrackedValue$ = d[6] : asyncComputed.$flags$ |= 1;
+            d.length > 6 && (asyncComputed.$untrackedValue$ = d[6]), asyncComputed.$flags$ |= 1;
             break;
         }
 
@@ -4956,9 +4990,9 @@ const inflate = (container, target, typeId, data) => {
     return target;
 };
 
-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 _constants = [ void 0, null, !0, !1, "", EMPTY_ARRAY, EMPTY_OBJ, NEEDS_COMPUTATION, STORE_ALL_PROPS, _UNINITIALIZED, Slot, Fragment, NaN, 1 / 0, -1 / 0, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER - 1, Number.MIN_SAFE_INTEGER ];
 
-const _constantNames = [ "undefined", "null", "true", "false", "''", "EMPTY_ARRAY", "EMPTY_OBJ", "NEEDS_COMPUTATION", "STORE_ALL_PROPS", "Slot", "Fragment", "NaN", "Infinity", "-Infinity", "MAX_SAFE_INTEGER", "MAX_SAFE_INTEGER-1", "MIN_SAFE_INTEGER" ];
+const _constantNames = [ "undefined", "null", "true", "false", "''", "EMPTY_ARRAY", "EMPTY_OBJ", "NEEDS_COMPUTATION", "STORE_ALL_PROPS", "_UNINITIALIZED", "Slot", "Fragment", "NaN", "Infinity", "-Infinity", "MAX_SAFE_INTEGER", "MAX_SAFE_INTEGER-1", "MIN_SAFE_INTEGER" ];
 
 const allocate = (container, typeId, value) => {
     if (void 0 === value) {
@@ -4972,7 +5006,8 @@ const allocate = (container, typeId, value) => {
         if (!container.$forwardRefs$) {
             throw qError(18, [ "forward ref" ]);
         }
-        return container.$getObjectById$(container.$forwardRefs$[value]);
+        const rootRef = container.$forwardRefs$[value];
+        return -1 === rootRef ? _UNINITIALIZED : container.$getObjectById$(rootRef);
 
       case 2:
       case 4:
@@ -5124,12 +5159,12 @@ const createSerializationContext = (NodeConstructor, DomRefConstructor, symbolTo
         };
     }
     const seenObjsMap = new Map;
-    const rootsPathMap = new Map;
+    const objectPathStringCache = new Map;
     const syncFnMap = new Map;
     const syncFns = [];
     const roots = [];
     const $addRootPath$ = obj => {
-        const rootPath = rootsPathMap.get(obj);
+        const rootPath = objectPathStringCache.get(obj);
         if (rootPath) {
             return rootPath;
         }
@@ -5143,7 +5178,7 @@ const createSerializationContext = (NodeConstructor, DomRefConstructor, symbolTo
             current = seenObjsMap.get(current.$parent$);
         }
         const pathStr = path.length > 1 ? path.join(" ") : path.length ? path[0] : seen.$index$;
-        return rootsPathMap.set(obj, pathStr), pathStr;
+        return objectPathStringCache.set(obj, pathStr), pathStr;
     };
     const isSsrNode = NodeConstructor ? obj => obj instanceof NodeConstructor : () => !1;
     return isDomRef = DomRefConstructor ? obj => obj instanceof DomRefConstructor : () => !1, 
@@ -5206,7 +5241,7 @@ const createSerializationContext = (NodeConstructor, DomRefConstructor, symbolTo
         $storeProxyMap$: storeProxyMap,
         $getProp$: getProp,
         $setProp$: setProp,
-        $pathMap$: rootsPathMap
+        $objectPathStringCache$: objectPathStringCache
     };
 };
 
@@ -5225,7 +5260,7 @@ const discoverValuesForVNodeData = (vnodeData, callback) => {
         if (isSsrAttrs(value)) {
             for (let i = 1; i < value.length; i += 2) {
                 const attrValue = value[i];
-                "string" == typeof attrValue || "q:props" === value[i - 1] && 0 === Object.keys(attrValue).length || callback(attrValue);
+                null == attrValue || "string" == typeof attrValue || "q:props" === value[i - 1] && 0 === Object.keys(attrValue).length || callback(attrValue);
             }
         }
     }
@@ -5243,13 +5278,24 @@ class PromiseResult {
     }
 }
 
+class SerializationWeakRef {
+    $obj$;
+    constructor($obj$) {
+        this.$obj$ = $obj$;
+    }
+}
+
+const _serializationWeakRef = obj => new SerializationWeakRef(obj);
+
 async function serialize(serializationContext) {
-    const {$writer$, $isSsrNode$, $isDomRef$, $storeProxyMap$, $addRoot$, $pathMap$, $wasSeen$} = serializationContext;
+    const {$writer$, $isSsrNode$, $isDomRef$, $storeProxyMap$, $addRoot$, $objectPathStringCache$, $wasSeen$} = serializationContext;
     let depth = 0;
+    let rootIdx = 0;
     const forwardRefs = [];
     let forwardRefsId = 0;
     const promises = new Set;
     const preloadQrls = new Set;
+    const s11nWeakRefs = new Map;
     let parent = null;
     const outputArray = (value, writeFn) => {
         $writer$.write("[");
@@ -5277,14 +5323,26 @@ async function serialize(serializationContext) {
         }
     };
     const addPreloadQrl = qrl => {
-        preloadQrls.add(qrl), serializationContext.$addRoot$(qrl, null);
+        preloadQrls.add(qrl), serializationContext.$addRoot$(qrl);
     };
-    const outputRootRef = (value, rootDepth = 0) => {
+    const outputAsRootRef = (value, rootDepth = 0) => {
         const seen = $wasSeen$(value);
-        const rootRefPath = $pathMap$.get(value);
-        return rootDepth === depth && seen && null !== seen.$parent$ && rootRefPath ? (output(0, rootRefPath), 
-        !0) : !!(depth > rootDepth && seen && -1 !== seen.$rootIndex$) && (output(0, seen.$rootIndex$), 
-        !0);
+        const rootRefPath = $objectPathStringCache$.get(value);
+        if (rootDepth === depth && seen && null !== seen.$parent$ && rootRefPath) {
+            return output(0, rootRefPath), !0;
+        }
+        if (depth > rootDepth && seen && -1 !== seen.$rootIndex$) {
+            return output(0, seen.$rootIndex$), !0;
+        }
+        if (s11nWeakRefs.has(value)) {
+            const forwardRefId = s11nWeakRefs.get(value);
+            if (rootDepth !== depth) {
+                const rootRef = $addRoot$(value);
+                return output(0, rootRef), forwardRefs[forwardRefId] = rootRef, !0;
+            }
+            forwardRefs[forwardRefId] = rootIdx;
+        }
+        return !1;
     };
     const writeValue = value => {
         if (fastSkipSerialize(value)) {
@@ -5295,11 +5353,11 @@ async function serialize(serializationContext) {
             output(3, value ? 2 : 3);
         } else if ("function" == typeof value) {
             if (value === Slot) {
-                output(3, 9);
-            } else if (value === Fragment) {
                 output(3, 10);
+            } else if (value === Fragment) {
+                output(3, 11);
             } else if (isQrl(value)) {
-                if (!outputRootRef(value)) {
+                if (!outputAsRootRef(value)) {
                     const qrl = qrlToString(serializationContext, value);
                     const type = preloadQrls.has(value) ? 21 : 20;
                     if (0 === depth) {
@@ -5319,7 +5377,7 @@ async function serialize(serializationContext) {
                 }
             }
         } else if ("number" == typeof value) {
-            Number.isNaN(value) ? output(3, 11) : Number.isFinite(value) ? value === Number.MAX_SAFE_INTEGER ? output(3, 14) : value === Number.MAX_SAFE_INTEGER - 1 ? output(3, 15) : value === Number.MIN_SAFE_INTEGER ? output(3, 16) : output(4, value) : output(3, value < 0 ? 13 : 12);
+            Number.isNaN(value) ? output(3, 12) : Number.isFinite(value) ? value === Number.MAX_SAFE_INTEGER ? output(3, 15) : value === Number.MAX_SAFE_INTEGER - 1 ? output(3, 16) : value === Number.MIN_SAFE_INTEGER ? output(3, 17) : output(4, value) : output(3, value < 0 ? 14 : 13);
         } else if ("object" == typeof value) {
             if (value === EMPTY_ARRAY) {
                 output(3, 5);
@@ -5333,20 +5391,22 @@ async function serialize(serializationContext) {
                 parent = value, writeObjectValue(value), parent = oldParent, depth--;
             }
         } else if ("string" == typeof value) {
-            0 === value.length ? output(3, 4) : outputRootRef(value) || output(5, value);
+            0 === value.length ? output(3, 4) : outputAsRootRef(value) || output(5, value);
         } else if (void 0 === value) {
             output(3, 0);
         } else if (value === NEEDS_COMPUTATION) {
             output(3, 7);
+        } else if (value === STORE_ALL_PROPS) {
+            output(3, 8);
         } else {
-            if (value !== STORE_ALL_PROPS) {
+            if (value !== _UNINITIALIZED) {
                 throw qError(20, [ typeof value ]);
             }
-            output(3, 8);
+            output(3, 9);
         }
     };
     const writeObjectValue = value => {
-        if (!outputRootRef(value, 1)) {
+        if (!outputAsRootRef(value, 1)) {
             if (isPropsProxy(value)) {
                 const varProps = value[_VAR_PROPS];
                 const constProps = value[_CONST_PROPS];
@@ -5404,19 +5464,22 @@ async function serialize(serializationContext) {
                     const forwardRefId = $resolvePromise$($getCustomSerializerPromise$(value, value.$untrackedValue$), $addRoot$, (resolved, resolvedValue) => new PromiseResult(29, resolved, resolvedValue, value.$effects$, value.$computeQrl$));
                     return void output(1, forwardRefId);
                 }
-                const v = value instanceof ComputedSignalImpl && (1 & value.$flags$ || fastSkipSerialize(value.$untrackedValue$)) ? NEEDS_COMPUTATION : value.$untrackedValue$;
                 if (value instanceof WrappedSignalImpl) {
                     output(26, [ ...serializeWrappingFn(serializationContext, value), filterEffectBackRefs(value[_EFFECT_BACK_REF]), value.$flags$, value.$hostElement$, ...value.$effects$ || [] ]);
-                } else if (value instanceof AsyncComputedSignalImpl) {
-                    addPreloadQrl(value.$computeQrl$);
-                    const out = [ value.$computeQrl$, value.$effects$, value.$loadingEffects$, value.$errorEffects$, value.$untrackedLoading$, value.$untrackedError$ ];
-                    v !== NEEDS_COMPUTATION && out.push(v), output(28, out);
                 } else if (value instanceof ComputedSignalImpl) {
+                    let v = value.$untrackedValue$;
+                    const shouldAlwaysSerialize = 16 & value.$flags$;
+                    const shouldNeverSerialize = 8 & value.$flags$;
+                    const isInvalid = 1 & value.$flags$;
+                    const isSkippable = fastSkipSerialize(value.$untrackedValue$);
+                    shouldAlwaysSerialize ? v = value.$untrackedValue$ : (shouldNeverSerialize || isInvalid || isSkippable) && (v = NEEDS_COMPUTATION), 
                     addPreloadQrl(value.$computeQrl$);
                     const out = [ value.$computeQrl$, value.$effects$ ];
-                    v !== NEEDS_COMPUTATION && out.push(v), output(27, out);
+                    const isAsync = value instanceof AsyncComputedSignalImpl;
+                    isAsync && out.push(value.$loadingEffects$, value.$errorEffects$, value.$untrackedLoading$, value.$untrackedError$), 
+                    v !== NEEDS_COMPUTATION && out.push(v), output(isAsync ? 28 : 27, out);
                 } else {
-                    output(25, [ v, ...value.$effects$ || [] ]);
+                    output(25, [ value.$untrackedValue$, ...value.$effects$ || [] ]);
                 }
             } else if (value instanceof URL) {
                 output(7, value.href);
@@ -5494,6 +5557,9 @@ async function serialize(serializationContext) {
                 }
                 const out = btoa(buf).replace(/=+$/, "");
                 output(19, out);
+            } else if (value instanceof SerializationWeakRef) {
+                const forwardRefId = forwardRefsId++;
+                s11nWeakRefs.set(value.$obj$, forwardRefId), forwardRefs[forwardRefId] = -1, output(1, forwardRefId);
             } else {
                 if (!vnode_isVNode(value)) {
                     throw qError(20, [ typeof value ]);
@@ -5512,20 +5578,19 @@ async function serialize(serializationContext) {
     }
     await (async () => {
         $writer$.write("[");
-        let lastRootsLength = 0;
         let rootsLength = serializationContext.$roots$.length;
-        for (;lastRootsLength < rootsLength || promises.size; ) {
-            0 !== lastRootsLength && $writer$.write(",");
+        for (;rootIdx < rootsLength || promises.size; ) {
+            0 !== rootIdx && $writer$.write(",");
             let separator = !1;
-            for (let i = lastRootsLength; i < rootsLength; i++) {
-                separator ? $writer$.write(",") : separator = !0, writeValue(serializationContext.$roots$[i]);
+            for (;rootIdx < rootsLength; rootIdx++) {
+                separator ? $writer$.write(",") : separator = !0, writeValue(serializationContext.$roots$[rootIdx]);
             }
             if (promises.size) {
                 try {
                     await Promise.race(promises);
                 } catch {}
             }
-            lastRootsLength = rootsLength, rootsLength = serializationContext.$roots$.length;
+            rootsLength = serializationContext.$roots$.length;
         }
         forwardRefs.length && ($writer$.write(","), $writer$.write("2,"), outputArray(forwardRefs, value => {
             $writer$.write(String(value));
@@ -5675,7 +5740,7 @@ function preprocessState(data, container) {
 }
 
 function shouldTrackObj(obj) {
-    return "object" == typeof obj && null !== obj || "string" == typeof obj && obj.length > 1;
+    return isObject(obj) || "string" == typeof obj && obj.length > 1;
 }
 
 function isObjectLiteral(obj) {
@@ -5687,7 +5752,7 @@ function isResource(value) {
     return "__brand" in value && "resource" === value.__brand;
 }
 
-const frameworkType = obj => "object" == typeof obj && null !== obj && (obj instanceof SignalImpl || obj instanceof Task || isJSXNode(obj)) || isQrl(obj);
+const frameworkType = obj => isObject(obj) && (obj instanceof SignalImpl || obj instanceof Task || isJSXNode(obj)) || isQrl(obj);
 
 const canSerialize = (value, seen = new WeakSet) => {
     if (null == value || "string" == typeof value || "number" == typeof value || "boolean" == typeof value || "bigint" == typeof value) {
@@ -5757,7 +5822,11 @@ const canSerialize = (value, seen = new WeakSet) => {
         if (isDomRef?.(value)) {
             return !0;
         }
-    } else if ("function" == typeof value && (isQrl(value) || isQwikComponent(value))) {
+    } else if ("function" == typeof value) {
+        if (isQrl(value) || isQwikComponent(value)) {
+            return !0;
+        }
+    } else if (value === _UNINITIALIZED) {
         return !0;
     }
     return !1;
@@ -5765,12 +5834,12 @@ const canSerialize = (value, seen = new WeakSet) => {
 
 const QRL_RUNTIME_CHUNK = "mock-chunk";
 
-const _typeIdNames = [ "RootRef", "ForwardRef", "ForwardRefs", "Constant", "Number", "String", "Array", "URL", "Date", "Regex", "VNode", "RefVNode", "BigInt", "URLSearchParams", "Error", "Object", "Promise", "Set", "Map", "Uint8Array", "QRL", "PreloadQRL", "Task", "Resource", "Component", "Signal", "WrappedSignal", "ComputedSignal", "AsyncComputedSignal", "SerializerSignal", "Store", "StoreArray", "FormData", "JSXNode", "PropsProxy", "EffectData" ];
+const _typeIdNames = [ "RootRef", "ForwardRef", "ForwardRefs", "Constant", "Number", "String", "Array", "URL", "Date", "Regex", "VNode", "RefVNode", "BigInt", "URLSearchParams", "Error", "Object", "Promise", "Set", "Map", "Uint8Array", "QRL", "PreloadQRL", "Task", "Resource", "Component", "Signal", "WrappedSignal", "ComputedSignal", "AsyncComputedSignal", "SerializerSignal", "Store", "StoreArray", "FormData", "JSXNode", "PropsProxy", "SubscriptionData" ];
 
 const circularProofJson = (obj, indent) => {
     const seen = new WeakSet;
-    return JSON.stringify(obj, (key, value) => {
-        if ("object" == typeof value && null !== value) {
+    return JSON.stringify(obj, (_, value) => {
+        if (isObject(value)) {
             if (seen.has(value)) {
                 return `[Circular ${value.constructor.name}]`;
             }
@@ -5800,7 +5869,7 @@ const dumpState = (state, color = !1, prefix = "", limit = 20) => {
         }
         const key = state[i];
         let value = state[++i];
-        void 0 === key ? (hasRaw = !0, out.push(`${RED}[raw${"object" == typeof value && value ? ` ${value.constructor.name}` : ""}]${RESET} ${printRaw(value, `${prefix}  `)}`)) : (3 === key ? value = constantToName(value) : "string" == typeof value ? (value = JSON.stringify(value), 
+        void 0 === key ? (hasRaw = !0, out.push(`${RED}[raw${isObject(value) ? ` ${value.constructor.name}` : ""}]${RESET} ${printRaw(value, `${prefix}  `)}`)) : (3 === key ? value = constantToName(value) : "string" == typeof value ? (value = JSON.stringify(value), 
         value.length > 120 && (value = value.slice(0, 120) + '"...')) : 2 === key ? value = `[\n${prefix}  ${value.join(`\n${prefix}  `)}\n${prefix}]` : Array.isArray(value) && (value = value.length ? `[\n${dumpState(value, color, `${prefix}  `)}\n${prefix}]` : "[]"), 
         out.push(`${RED}${typeIdToName(key)}${RESET} ${value}`));
     }
@@ -5885,17 +5954,13 @@ const _verifySerializable = (value, seen, ctx, preMessage) => {
 
 const noSerializeSet = /*#__PURE__*/ new WeakSet;
 
-const weakSerializeSet = /*#__PURE__*/ new WeakSet;
-
 const shouldSerialize = obj => !isObject(obj) && !isFunction(obj) || !noSerializeSet.has(obj);
 
-const fastSkipSerialize = obj => obj && ("object" == typeof obj || "function" == typeof obj) && (NoSerializeSymbol in obj || noSerializeSet.has(obj));
+const fastSkipSerialize = obj => obj && (isObject(obj) || "function" == typeof obj) && (NoSerializeSymbol in obj || noSerializeSet.has(obj));
 
-const noSerialize = input => (("object" == typeof input && null !== input || "function" == typeof input) && noSerializeSet.add(input), 
+const noSerialize = input => ((isObject(input) && null !== input || "function" == typeof input) && noSerializeSet.add(input), 
 input);
 
-const _weakSerialize = input => (weakSerializeSet.add(input), input);
-
 const NoSerializeSymbol = Symbol("noSerialize");
 
 const SerializerSymbol = Symbol("serialize");
@@ -6391,21 +6456,21 @@ const useConstant = value => {
     return null != val ? val : set(value = isFunction(value) && !isQwikComponent(value) ? value() : value);
 };
 
-const useComputedCommon = (qrl, Class) => {
+const useComputedCommon = (qrl, createFn, options) => {
     const {val, set} = useSequentialScope();
     if (val) {
         return val;
     }
     assertQrl(qrl);
-    const signal = new Class(null, qrl);
+    const signal = createFn(qrl, options);
     return set(signal), throwIfQRLNotResolved(qrl), signal;
 };
 
-const useComputedQrl = qrl => useComputedCommon(qrl, ComputedSignalImpl);
+const useComputedQrl = (qrl, options) => useComputedCommon(qrl, createComputedSignal, options);
 
 const useComputed$ = implicit$FirstArg(useComputedQrl);
 
-const useSerializerQrl = qrl => useComputedCommon(qrl, SerializerSignalImpl);
+const useSerializerQrl = qrl => useComputedCommon(qrl, createSerializerSignal);
 
 const useSerializer$ = implicit$FirstArg(useSerializerQrl);
 
@@ -6433,7 +6498,7 @@ const useTask$ = /*#__PURE__*/ implicit$FirstArg(useTaskQrl);
 
 const useVisibleTask$ = /*#__PURE__*/ implicit$FirstArg(useVisibleTaskQrl);
 
-const useAsyncComputedQrl = qrl => useComputedCommon(qrl, AsyncComputedSignalImpl);
+const useAsyncComputedQrl = (qrl, options) => useComputedCommon(qrl, createAsyncComputedSignal, options);
 
 const useAsyncComputed$ = implicit$FirstArg(useAsyncComputedQrl);
 
@@ -6475,4 +6540,4 @@ const PREFETCH_CODE = /*#__PURE__*/ (c => {
 
 const PrefetchGraph = () => null;
 
-export { $, Fragment, NoSerializeSymbol, PrefetchGraph, PrefetchServiceWorker, RenderOnce, Resource, SSRComment, SSRRaw, SSRStream, SSRStreamBlock, SerializerSymbol, SkipRender, Slot, _CONST_PROPS, DomContainer as _DomContainer, _EFFECT_BACK_REF, EMPTY_ARRAY as _EMPTY_ARRAY, _IMMUTABLE, _SharedContainer, SubscriptionData as _SubscriptionData, _VAR_PROPS, _deserialize, dumpState as _dumpState, _fnSignal, _getContextElement, _getContextEvent, getDomContainer as _getDomContainer, _getQContainerElement, isJSXNode as _isJSXNode, isStringifiable as _isStringifiable, _jsxBranch, _jsxC, _jsxQ, _jsxS, _jsxSorted, _jsxSplit, _noopQrl, _noopQrlDEV, preprocessState as _preprocessState, _qrlSync, _regSymbol, _restProps, queueQRL as _run, _serialize, scheduleTask as _task, verifySerializable as _verifySerializable, vnode_toString as _vnode_toString, _waitUntilRendered, _walkJSX, _weakSerialize, _wrapProp, _wrapSignal, _wrapStore, component$, componentQrl, createComputed$, createComputedSignal as createComputedQrl, createContextId, h as createElement, createSerializer$, createSerializerSignal as createSerializerQrl, 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, useAsyncComputed$, useAsyncComputedQrl, useComputed$, useComputedQrl, useConstant, useContext, useContextProvider, useErrorBoundary, useId, useLexicalScope, useOn, useOnDocument, useOnWindow, useResource$, useResourceQrl, useSerializer$, useSerializerQrl, useServerData, useSignal, useStore, useStyles$, useStylesQrl, useStylesScoped$, useStylesScopedQrl, useTask$, useTaskQrl, useVisibleTask$, useVisibleTaskQrl, version, withLocale };
+export { $, Fragment, NoSerializeSymbol, PrefetchGraph, PrefetchServiceWorker, RenderOnce, Resource, SSRComment, SSRRaw, SSRStream, SSRStreamBlock, SerializerSymbol, SkipRender, Slot, _CONST_PROPS, DomContainer as _DomContainer, _EFFECT_BACK_REF, EMPTY_ARRAY as _EMPTY_ARRAY, _IMMUTABLE, _SharedContainer, SubscriptionData as _SubscriptionData, _UNINITIALIZED, _VAR_PROPS, _deserialize, dumpState as _dumpState, _fnSignal, _getContextContainer, _getContextElement, _getContextEvent, getDomContainer as _getDomContainer, _getQContainerElement, isJSXNode as _isJSXNode, isStringifiable as _isStringifiable, _jsxBranch, _jsxC, _jsxQ, _jsxS, _jsxSorted, _jsxSplit, _noopQrl, _noopQrlDEV, preprocessState as _preprocessState, _qrlSync, _regSymbol, _restProps, queueQRL as _run, _serializationWeakRef, _serialize, scheduleTask as _task, useInvokeContext as _useInvokeContext, verifySerializable as _verifySerializable, vnode_toString as _vnode_toString, _waitUntilRendered, _walkJSX, _wrapProp, _wrapSignal, component$, componentQrl, createAsyncComputed$, createAsyncComputedSignal as createAsyncComputedQrl, createComputed$, createComputedSignal as createComputedQrl, createContextId, h as createElement, createSerializer$, createSerializerSignal as createSerializerQrl, 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, useAsyncComputed$, useAsyncComputedQrl, useComputed$, useComputedQrl, useConstant, useContext, useContextProvider, useErrorBoundary, useId, useLexicalScope, useOn, useOnDocument, useOnWindow, useResource$, useResourceQrl, useSerializer$, useSerializerQrl, useServerData, useSignal, useStore, useStyles$, useStylesQrl, useStylesScoped$, useStylesScopedQrl, useTask$, useTaskQrl, useVisibleTask$, useVisibleTaskQrl, version, withLocale };

package/dist/loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/loader",
-  "version": "2.0.0-beta.3-dev+aa098fc",
+  "version": "2.0.0-beta.4-dev+9849dcf",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,