@qwik.dev/core 2.0.0-alpha.2 → 2.0.0-alpha.3

package/dist/core.prod.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core 2.0.0-alpha.2-dev+58b6f8d
+ * @qwik.dev/core 2.0.0-alpha.3-dev+418fd6d
  * 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
@@ -1560,21 +1560,22 @@
                     }(jsxProps, vNodeProps), shouldRender && (host[VNodeProps.flags] &= ~VNodeFlags.Deleted, 
                     container.$scheduler$(ChoreType.COMPONENT, host, componentQRL, jsxProps));
                 }
-                null != jsxNode.children && function(children, host) {
-                    if (Array.isArray(children) || (children = [ children ]), children.length) {
-                        const createProjectionJSXNode = slotName => new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
-                        const projections = [];
-                        if (host) {
-                            for (let i = vnode_getPropStartIndex(host); i < host.length; i += 2) {
-                                const prop = host[i];
-                                if (isSlotProp(prop)) {
-                                    const slotName = prop;
-                                    projections.push(slotName), projections.push(createProjectionJSXNode(slotName));
-                                }
+                !function(children, host) {
+                    const projectionChildren = Array.isArray(children) ? children : [ children ];
+                    const createProjectionJSXNode = slotName => new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
+                    const projections = [];
+                    if (host) {
+                        for (let i = vnode_getPropStartIndex(host); i < host.length; i += 2) {
+                            const prop = host[i];
+                            if (isSlotProp(prop)) {
+                                const slotName = prop;
+                                projections.push(slotName), projections.push(createProjectionJSXNode(slotName));
                             }
                         }
-                        for (let i = 0; i < children.length; i++) {
-                            const child = children[i];
+                    }
+                    if (0 !== projections.length || null != children) {
+                        for (let i = 0; i < projectionChildren.length; i++) {
+                            const child = projectionChildren[i];
                             const slotName = String(isJSXNode(child) && directGetPropsProxyProp(child, QSlot) || "");
                             const idx = mapApp_findIndx(projections, slotName, 0);
                             let jsxBucket;
@@ -1824,7 +1825,13 @@
 
               case ChoreType.COMPONENT:
               case ChoreType.COMPONENT_SSR:
-                returnValue = safeCall((() => executeComponent(container, host, host, chore.$target$, chore.$payload$)), (jsx => chore.$type$ === ChoreType.COMPONENT ? maybeThen(container.processJsx(host, jsx), (() => jsx)) : jsx), (err => container.handleError(err, host)));
+                returnValue = safeCall((() => executeComponent(container, host, host, chore.$target$, chore.$payload$)), (jsx => {
+                    if (chore.$type$ === ChoreType.COMPONENT) {
+                        const styleScopedId = container.getHostProp(host, "q:sstyle");
+                        return vnode_diff(container, jsx, host, addComponentStylePrefix(styleScopedId));
+                    }
+                    return jsx;
+                }), (err => container.handleError(err, host)));
                 break;
 
               case ChoreType.RESOURCE:
@@ -1914,7 +1921,7 @@
         }
         return 0;
     }
-    const version = "2.0.0-alpha.2-dev+58b6f8d";
+    const version = "2.0.0-alpha.3-dev+418fd6d";
     class _SharedContainer {
         $version$;
         $scheduler$;
@@ -2163,10 +2170,6 @@
         parseQRL(qrl) {
             return inflateQRL(this, parseQRL(qrl));
         }
-        processJsx(host, jsx) {
-            const styleScopedId = this.getHostProp(host, "q:sstyle");
-            return vnode_diff(this, jsx, host, addComponentStylePrefix(styleScopedId));
-        }
         handleError(err, host) {
             const errorStore = this.resolveContext(host, ERROR_CONTEXT);
             if (!errorStore) {
@@ -3763,7 +3766,10 @@
                     const valType = data[i + 2];
                     const valData = data[i + 3];
                     valType === TypeIds.RootRef || valType >= TypeIds.Error ? Object.defineProperty(target, key, {
-                        get: () => deserializeData(container, valType, valData),
+                        get() {
+                            const value = deserializeData(container, valType, valData);
+                            return target[key] = value, value;
+                        },
                         set(value) {
                             Object.defineProperty(target, key, {
                                 value,
@@ -4063,6 +4069,7 @@
         return qrl.$captureRef$ = captureIds ? captureIds.map((id => container.$getObjectById$(id))) : null, 
         container.element && qrl.$setContainer$(container.element), qrl;
     }
+    let isDomRef = () => !1;
     const createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToChunkResolver, getProp, setProp, storeProxyMap, writer, prepVNodeData) => {
         if (!writer) {
             const buffer = [];
@@ -4083,8 +4090,8 @@
             roots.push(obj)), id;
         };
         const isSsrNode = NodeConstructor ? obj => obj instanceof NodeConstructor : () => !1;
-        const isDomRef = DomRefConstructor ? obj => obj instanceof DomRefConstructor : () => !1;
-        return {
+        return isDomRef = DomRefConstructor ? obj => obj instanceof DomRefConstructor : () => !1, 
+        {
             $serialize$() {
                 !function(serializationContext) {
                     const {$writer$, $isSsrNode$, $isDomRef$, $setProp$, $storeProxyMap$} = serializationContext;
@@ -4206,7 +4213,7 @@
                                 output(TypeIds.Object, out);
                             }
                         } else if ($isDomRef$(value)) {
-                            output(TypeIds.RefVNode, value.id);
+                            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$;
                             if (value instanceof WrappedSignal) {
@@ -4357,7 +4364,7 @@
                     } else if (isSsrNode(obj)) {
                         discoveredValues.push(obj.vnodeData);
                     } else if (isDomRef(obj)) {
-                        discoveredValues.push(obj.id);
+                        discoveredValues.push(obj.$ssrNode$.id);
                     } else if (isJSXNode(obj)) {
                         discoveredValues.push(obj.type, obj.props, obj.constProps, obj.children);
                     } else if (Array.isArray(obj)) {
@@ -4535,6 +4542,9 @@
             if (value instanceof Uint8Array) {
                 return !0;
             }
+            if (isDomRef?.(value)) {
+                return !0;
+            }
         } else if ("function" == typeof value && (isQrl(value) || isQwikComponent(value))) {
             return !0;
         }

package/dist/core.prod.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core 2.0.0-alpha.2-dev+58b6f8d
+ * @qwik.dev/core 2.0.0-alpha.3-dev+418fd6d
  * 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
@@ -2025,21 +2025,22 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
                 shouldRender = shouldRender || propsDiffer(jsxProps, vNodeProps), shouldRender && (host[VNodeProps.flags] &= ~VNodeFlags.Deleted, 
                 container.$scheduler$(ChoreType.COMPONENT, host, componentQRL, jsxProps));
             }
-            null != jsxNode.children && function(children, host) {
-                if (Array.isArray(children) || (children = [ children ]), children.length) {
-                    const createProjectionJSXNode = slotName => new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
-                    const projections = [];
-                    if (host) {
-                        for (let i = vnode_getPropStartIndex(host); i < host.length; i += 2) {
-                            const prop = host[i];
-                            if (isSlotProp(prop)) {
-                                const slotName = prop;
-                                projections.push(slotName), projections.push(createProjectionJSXNode(slotName));
-                            }
+            !function(children, host) {
+                const projectionChildren = Array.isArray(children) ? children : [ children ];
+                const createProjectionJSXNode = slotName => new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
+                const projections = [];
+                if (host) {
+                    for (let i = vnode_getPropStartIndex(host); i < host.length; i += 2) {
+                        const prop = host[i];
+                        if (isSlotProp(prop)) {
+                            const slotName = prop;
+                            projections.push(slotName), projections.push(createProjectionJSXNode(slotName));
                         }
                     }
-                    for (let i = 0; i < children.length; i++) {
-                        const child = children[i];
+                }
+                if (0 !== projections.length || null != children) {
+                    for (let i = 0; i < projectionChildren.length; i++) {
+                        const child = projectionChildren[i];
                         const slotName = String(isJSXNode(child) && directGetPropsProxyProp(child, QSlot) || "");
                         const idx = mapApp_findIndx(projections, slotName, 0);
                         let jsxBucket;
@@ -2299,7 +2300,13 @@ const createScheduler = (container, scheduleDrain, journalFlush) => {
 
           case ChoreType.COMPONENT:
           case ChoreType.COMPONENT_SSR:
-            returnValue = safeCall((() => executeComponent(container, host, host, chore.$target$, chore.$payload$)), (jsx => chore.$type$ === ChoreType.COMPONENT ? maybeThen(container.processJsx(host, jsx), (() => jsx)) : jsx), (err => container.handleError(err, host)));
+            returnValue = safeCall((() => executeComponent(container, host, host, chore.$target$, chore.$payload$)), (jsx => {
+                if (chore.$type$ === ChoreType.COMPONENT) {
+                    const styleScopedId = container.getHostProp(host, "q:sstyle");
+                    return vnode_diff(container, jsx, host, addComponentStylePrefix(styleScopedId));
+                }
+                return jsx;
+            }), (err => container.handleError(err, host)));
             break;
 
           case ChoreType.RESOURCE:
@@ -2423,7 +2430,7 @@ function sortedInsert(sortedArray, value) {
     return choreUpdate(existing, value), existing;
 }
 
-const version = "2.0.0-alpha.2-dev+58b6f8d";
+const version = "2.0.0-alpha.3-dev+418fd6d";
 
 class _SharedContainer {
     $version$;
@@ -2754,10 +2761,6 @@ class DomContainer extends _SharedContainer {
     parseQRL(qrl) {
         return inflateQRL(this, parseQRL(qrl));
     }
-    processJsx(host, jsx) {
-        const styleScopedId = this.getHostProp(host, "q:sstyle");
-        return vnode_diff(this, jsx, host, addComponentStylePrefix(styleScopedId));
-    }
     handleError(err, host) {
         const errorStore = this.resolveContext(host, ERROR_CONTEXT);
         if (!errorStore) {
@@ -4564,7 +4567,10 @@ const inflate = (container, target, typeId, data) => {
                 const valType = data[i + 2];
                 const valData = data[i + 3];
                 valType === TypeIds.RootRef || valType >= TypeIds.Error ? Object.defineProperty(target, key, {
-                    get: () => deserializeData(container, valType, valData),
+                    get() {
+                        const value = deserializeData(container, valType, valData);
+                        return target[key] = value, value;
+                    },
                     set(value) {
                         Object.defineProperty(target, key, {
                             value,
@@ -4870,6 +4876,8 @@ function inflateQRL(container, qrl) {
     container.element && qrl.$setContainer$(container.element), qrl;
 }
 
+let isDomRef = () => !1;
+
 const createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToChunkResolver, getProp, setProp, storeProxyMap, writer, prepVNodeData) => {
     if (!writer) {
         const buffer = [];
@@ -4890,8 +4898,8 @@ const createSerializationContext = (NodeConstructor, DomRefConstructor, symbolTo
         roots.push(obj)), id;
     };
     const isSsrNode = NodeConstructor ? obj => obj instanceof NodeConstructor : () => !1;
-    const isDomRef = DomRefConstructor ? obj => obj instanceof DomRefConstructor : () => !1;
-    return {
+    return isDomRef = DomRefConstructor ? obj => obj instanceof DomRefConstructor : () => !1, 
+    {
         $serialize$() {
             serialize(this);
         },
@@ -4966,7 +4974,7 @@ const createSerializationContext = (NodeConstructor, DomRefConstructor, symbolTo
                 } else if (isSsrNode(obj)) {
                     discoveredValues.push(obj.vnodeData);
                 } else if (isDomRef(obj)) {
-                    discoveredValues.push(obj.id);
+                    discoveredValues.push(obj.$ssrNode$.id);
                 } else if (isJSXNode(obj)) {
                     discoveredValues.push(obj.type, obj.props, obj.constProps, obj.children);
                 } else if (Array.isArray(obj)) {
@@ -5138,7 +5146,7 @@ function serialize(serializationContext) {
                 output(TypeIds.Object, out);
             }
         } else if ($isDomRef$(value)) {
-            output(TypeIds.RefVNode, value.id);
+            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$;
             if (value instanceof WrappedSignal) {
@@ -5384,6 +5392,9 @@ const canSerialize = value => {
         if (value instanceof Uint8Array) {
             return !0;
         }
+        if (isDomRef?.(value)) {
+            return !0;
+        }
     } else if ("function" == typeof value && (isQrl(value) || isQwikComponent(value))) {
         return !0;
     }

package/dist/insights/index.qwik.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const core = require("@qwik.dev/core");
 /**
  * @license
- * @qwik.dev/core 2.0.0-alpha.2-dev+58b6f8d
+ * @qwik.dev/core 2.0.0-alpha.3-dev+418fd6d
  * 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

package/dist/insights/index.qwik.mjs

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 import { sync$, component$ } from "@qwik.dev/core";
 /**
  * @license
- * @qwik.dev/core 2.0.0-alpha.2-dev+58b6f8d
+ * @qwik.dev/core 2.0.0-alpha.3-dev+418fd6d
  * 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

package/dist/loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/loader",
-  "version": "2.0.0-alpha.2-dev+58b6f8d",
+  "version": "2.0.0-alpha.3-dev+418fd6d",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

package/dist/optimizer.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/optimizer 2.0.0-alpha.2-dev+58b6f8d
+ * @qwik.dev/core/optimizer 2.0.0-alpha.3-dev+418fd6d
  * 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
@@ -1226,7 +1226,7 @@ globalThis.qwikOptimizer = function(module) {
   }
   var QWIK_BINDING_MAP = {};
   var versions = {
-    qwik: "2.0.0-alpha.2-dev+58b6f8d"
+    qwik: "2.0.0-alpha.3-dev+418fd6d"
   };
   async function getSystem() {
     const sysEnv = getEnv();
@@ -4265,34 +4265,35 @@ globalThis.qwikOptimizer = function(module) {
       return peekNextSibling();
     }
     function descendContentToProject(children, host) {
-      Array.isArray(children) || (children = [ children ]);
-      if (children.length) {
-        const createProjectionJSXNode = slotName => new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
-        const projections = [];
-        if (host) {
-          for (let i = vnode_getPropStartIndex(host); i < host.length; i += 2) {
-            const prop = host[i];
-            if (isSlotProp(prop)) {
-              const slotName = prop;
-              projections.push(slotName);
-              projections.push(createProjectionJSXNode(slotName));
-            }
+      const projectionChildren = Array.isArray(children) ? children : [ children ];
+      const createProjectionJSXNode = slotName => new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
+      const projections = [];
+      if (host) {
+        for (let i = vnode_getPropStartIndex(host); i < host.length; i += 2) {
+          const prop = host[i];
+          if (isSlotProp(prop)) {
+            const slotName = prop;
+            projections.push(slotName);
+            projections.push(createProjectionJSXNode(slotName));
           }
         }
-        for (let i = 0; i < children.length; i++) {
-          const child = children[i];
-          const slotName = String(isJSXNode(child) && directGetPropsProxyProp(child, QSlot) || QDefaultSlot);
-          const idx = mapApp_findIndx(projections, slotName, 0);
-          let jsxBucket;
-          idx >= 0 ? jsxBucket = projections[idx + 1] : projections.splice(~idx, 0, slotName, jsxBucket = createProjectionJSXNode(slotName));
-          const removeProjection = false === child;
-          removeProjection || jsxBucket.children.push(child);
-        }
-        for (let i = projections.length - 2; i >= 0; i -= 2) {
-          projections.splice(i, 1);
-        }
-        descend(projections, true);
       }
+      if (0 === projections.length && null == children) {
+        return;
+      }
+      for (let i = 0; i < projectionChildren.length; i++) {
+        const child = projectionChildren[i];
+        const slotName = String(isJSXNode(child) && directGetPropsProxyProp(child, QSlot) || QDefaultSlot);
+        const idx = mapApp_findIndx(projections, slotName, 0);
+        let jsxBucket;
+        idx >= 0 ? jsxBucket = projections[idx + 1] : projections.splice(~idx, 0, slotName, jsxBucket = createProjectionJSXNode(slotName));
+        const removeProjection = false === child;
+        removeProjection || jsxBucket.children.push(child);
+      }
+      for (let i = projections.length - 2; i >= 0; i -= 2) {
+        projections.splice(i, 1);
+      }
+      descend(projections, true);
     }
     function expectProjection() {
       const jsxNode2 = jsxValue;
@@ -4658,7 +4659,7 @@ globalThis.qwikOptimizer = function(module) {
             container.$scheduler$(7, host, componentQRL, jsxProps);
           }
         }
-        null != jsxNode2.children && descendContentToProject(jsxNode2.children, host);
+        descendContentToProject(jsxNode2.children, host);
       } else {
         const lookupKey = jsxNode2.key;
         const vNodeLookupKey = getKey(host);
@@ -4922,7 +4923,13 @@ globalThis.qwikOptimizer = function(module) {
 
        case 7:
        case 6:
-        returnValue = safeCall((() => executeComponent(container, host, host, chore.$target$, chore.$payload$)), (jsx3 => 7 === chore.$type$ ? maybeThen(container.processJsx(host, jsx3), (() => jsx3)) : jsx3), (err => container.handleError(err, host)));
+        returnValue = safeCall((() => executeComponent(container, host, host, chore.$target$, chore.$payload$)), (jsx3 => {
+          if (7 === chore.$type$) {
+            const styleScopedId = container.getHostProp(host, QScopedStyle);
+            return vnode_diff(container, jsx3, host, addComponentStylePrefix(styleScopedId));
+          }
+          return jsx3;
+        }), (err => container.handleError(err, host)));
         break;
 
        case 2:
@@ -5086,7 +5093,7 @@ globalThis.qwikOptimizer = function(module) {
     }));
     console.log(lines.join("\n  ") + "\n");
   }
-  var version = "2.0.0-alpha.2-dev+58b6f8d";
+  var version = "2.0.0-alpha.3-dev+418fd6d";
   var _SharedContainer = class {
     $version$;
     $scheduler$;
@@ -5468,10 +5475,6 @@ globalThis.qwikOptimizer = function(module) {
     parseQRL(qrl2) {
       return inflateQRL(this, parseQRL(qrl2));
     }
-    processJsx(host, jsx2) {
-      const styleScopedId = this.getHostProp(host, QScopedStyle);
-      return vnode_diff(this, jsx2, host, addComponentStylePrefix(styleScopedId));
-    }
     handleError(err, host) {
       if (qDev) {
         if ("undefined" !== typeof document) {
@@ -7146,7 +7149,11 @@ globalThis.qwikOptimizer = function(module) {
         const valType = data[i2 + 2];
         const valData = data[i2 + 3];
         0 === valType || valType >= 12 ? Object.defineProperty(target, key, {
-          get: () => deserializeData(container, valType, valData),
+          get() {
+            const value = deserializeData(container, valType, valData);
+            target[key] = value;
+            return value;
+          },
           set(value) {
             Object.defineProperty(target, key, {
               value: value,
@@ -7487,6 +7494,7 @@ globalThis.qwikOptimizer = function(module) {
     container.element && qrl2.$setContainer$(container.element);
     return qrl2;
   }
+  var isDomRef = obj => false;
   var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToChunkResolver, getProp, setProp, storeProxyMap, writer, prepVNodeData) => {
     if (!writer) {
       const buffer = [];
@@ -7511,7 +7519,7 @@ globalThis.qwikOptimizer = function(module) {
       return id;
     };
     const isSsrNode = NodeConstructor ? obj => obj instanceof NodeConstructor : () => false;
-    const isDomRef = DomRefConstructor ? obj => obj instanceof DomRefConstructor : () => false;
+    isDomRef = DomRefConstructor ? obj => obj instanceof DomRefConstructor : () => false;
     return {
       $serialize$() {
         serialize(this);
@@ -7608,7 +7616,7 @@ globalThis.qwikOptimizer = function(module) {
         } else if (isSsrNode(obj)) {
           discoveredValues.push(obj.vnodeData);
         } else if (isDomRef(obj)) {
-          discoveredValues.push(obj.id);
+          discoveredValues.push(obj.$ssrNode$.id);
         } else if (isJSXNode(obj)) {
           discoveredValues.push(obj.type, obj.props, obj.constProps, obj.children);
         } else if (Array.isArray(obj)) {
@@ -7794,7 +7802,8 @@ globalThis.qwikOptimizer = function(module) {
           output(13, out);
         }
       } else if ($isDomRef$(value)) {
-        output(9, value.id);
+        value.$ssrNode$.vnodeData[0] |= 8;
+        output(9, value.$ssrNode$.id);
       } else if (value instanceof Signal) {
         const v = value instanceof ComputedSignal && (value.$invalid$ || fastSkipSerialize(value.$untrackedValue$)) ? NEEDS_COMPUTATION : value.$untrackedValue$;
         if (value instanceof WrappedSignal) {
@@ -8010,6 +8019,9 @@ globalThis.qwikOptimizer = function(module) {
       if (value instanceof Uint8Array) {
         return true;
       }
+      if (null == isDomRef ? void 0 : isDomRef(value)) {
+        return true;
+      }
     } else if ("function" === typeof value && (isQrl2(value) || isQwikComponent(value))) {
       return true;
     }