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

package/dist/testing/index.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/testing 2.0.0-alpha.2-dev+58b6f8d
+ * @qwik.dev/core/testing 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
@@ -24367,46 +24367,45 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     }
   }
   function descendContentToProject(children, host) {
-    if (!Array.isArray(children)) {
-      children = [children];
-    }
-    if (children.length) {
-      const createProjectionJSXNode = (slotName) => {
-        return new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
-      };
-      const projections = [];
-      if (host) {
-        for (let i = vnode_getPropStartIndex(host); i < host.length; i = 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) => {
+      return new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
+    };
+    const projections = [];
+    if (host) {
+      for (let i = vnode_getPropStartIndex(host); i < host.length; i = 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;
-        if (idx >= 0) {
-          jsxBucket = projections[idx + 1];
-        } else {
-          projections.splice(~idx, 0, slotName, jsxBucket = createProjectionJSXNode(slotName));
-        }
-        const removeProjection = child === false;
-        if (!removeProjection) {
-          jsxBucket.children.push(child);
-        }
+    }
+    if (projections.length === 0 && children == null) {
+      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;
+      if (idx >= 0) {
+        jsxBucket = projections[idx + 1];
+      } else {
+        projections.splice(~idx, 0, slotName, jsxBucket = createProjectionJSXNode(slotName));
       }
-      for (let i = projections.length - 2; i >= 0; i = i - 2) {
-        projections.splice(i, 1);
+      const removeProjection = child === false;
+      if (!removeProjection) {
+        jsxBucket.children.push(child);
       }
-      descend(projections, true);
     }
+    for (let i = projections.length - 2; i >= 0; i = i - 2) {
+      projections.splice(i, 1);
+    }
+    descend(projections, true);
   }
   function expectProjection() {
     const jsxNode2 = jsxValue;
@@ -24858,7 +24857,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           container.$scheduler$(7 /* COMPONENT */, host, componentQRL, jsxProps);
         }
       }
-      jsxNode2.children != null && descendContentToProject(jsxNode2.children, host);
+      descendContentToProject(jsxNode2.children, host);
     } else {
       const lookupKey = jsxNode2.key;
       const vNodeLookupKey = getKey(host);
@@ -25172,7 +25171,17 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
             chore.$payload$
           ),
           (jsx5) => {
-            return chore.$type$ === 7 /* COMPONENT */ ? maybeThen(container.processJsx(host, jsx5), () => jsx5) : jsx5;
+            if (chore.$type$ === 7 /* COMPONENT */) {
+              const styleScopedId = container.getHostProp(host, QScopedStyle);
+              return vnode_diff(
+                container,
+                jsx5,
+                host,
+                addComponentStylePrefix(styleScopedId)
+              );
+            } else {
+              return jsx5;
+            }
           },
           (err) => container.handleError(err, host)
         );
@@ -26026,10 +26035,6 @@ var DomContainer = class extends _SharedContainer {
   parseQRL(qrl2) {
     return inflateQRL(this, parseQRL(qrl2));
   }
-  processJsx(host, jsx4) {
-    const styleScopedId = this.getHostProp(host, QScopedStyle);
-    return vnode_diff(this, jsx4, host, addComponentStylePrefix(styleScopedId));
-  }
   handleError(err, host) {
     if (qDev) {
       if (typeof document !== "undefined") {
@@ -27912,9 +27917,8 @@ var SsrNode = class {
   }
 };
 var DomRef = class {
-  /** @id is the same id as for SsrNode */
-  constructor(id) {
-    this.id = id;
+  constructor($ssrNode$) {
+    this.$ssrNode$ = $ssrNode$;
   }
 };
 var SsrComponentFrame = class {
@@ -28189,7 +28193,9 @@ var inflate = (container, target, typeId, data) => {
         if (valType === 0 /* RootRef */ || valType >= 12 /* Error */) {
           Object.defineProperty(target, key, {
             get() {
-              return deserializeData(container, valType, valData);
+              const value = deserializeData(container, valType, valData);
+              target[key] = value;
+              return value;
             },
             set(value) {
               Object.defineProperty(target, key, {
@@ -28531,6 +28537,7 @@ function inflateQRL(container, qrl2) {
   }
   return qrl2;
 }
+var isDomRef = (obj) => false;
 var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToChunkResolver, getProp, setProp, storeProxyMap, writer, prepVNodeData) => {
   if (!writer) {
     const buffer = [];
@@ -28555,7 +28562,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
     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);
@@ -28671,7 +28678,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
       } 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)) {
@@ -28896,7 +28903,8 @@ function serialize(serializationContext) {
         output(13 /* Object */, out);
       }
     } else if ($isDomRef$(value)) {
-      output(9 /* RefVNode */, value.id);
+      value.$ssrNode$.vnodeData[0] |= 8 /* SERIALIZE */;
+      output(9 /* 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) {
@@ -29161,6 +29169,8 @@ var canSerialize = (value) => {
       return true;
     } else if (value instanceof Uint8Array) {
       return true;
+    } else if (isDomRef == null ? void 0 : isDomRef(value)) {
+      return true;
     }
   } else if (typeof value === "function") {
     if (isQrl2(value) || isQwikComponent(value)) {
@@ -31197,9 +31207,6 @@ var SSRContainer = class extends import_core5._SharedContainer {
   }
   ensureProjectionResolved(host) {
   }
-  processJsx(host, jsx4) {
-    throw new Error("Should not get here.");
-  }
   handleError(err, $host$) {
     throw err;
   }
@@ -31955,10 +31962,10 @@ var SSRContainer = class extends import_core5._SharedContainer {
         if (key === "ref") {
           const lastNode = this.getLastNode();
           if ((0, import_core5.isSignal)(value)) {
-            value.value = new DomRef(lastNode.id);
+            value.value = new DomRef(lastNode);
             continue;
           } else if (typeof value === "function") {
-            value(new DomRef(lastNode.id));
+            value(new DomRef(lastNode));
             continue;
           }
         }

package/dist/testing/index.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/testing 2.0.0-alpha.2-dev+58b6f8d
+ * @qwik.dev/core/testing 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
@@ -24349,46 +24349,45 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     }
   }
   function descendContentToProject(children, host) {
-    if (!Array.isArray(children)) {
-      children = [children];
-    }
-    if (children.length) {
-      const createProjectionJSXNode = (slotName) => {
-        return new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
-      };
-      const projections = [];
-      if (host) {
-        for (let i = vnode_getPropStartIndex(host); i < host.length; i = 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) => {
+      return new JSXNodeImpl(Projection, EMPTY_OBJ, null, [], 0, slotName);
+    };
+    const projections = [];
+    if (host) {
+      for (let i = vnode_getPropStartIndex(host); i < host.length; i = 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;
-        if (idx >= 0) {
-          jsxBucket = projections[idx + 1];
-        } else {
-          projections.splice(~idx, 0, slotName, jsxBucket = createProjectionJSXNode(slotName));
-        }
-        const removeProjection = child === false;
-        if (!removeProjection) {
-          jsxBucket.children.push(child);
-        }
+    }
+    if (projections.length === 0 && children == null) {
+      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;
+      if (idx >= 0) {
+        jsxBucket = projections[idx + 1];
+      } else {
+        projections.splice(~idx, 0, slotName, jsxBucket = createProjectionJSXNode(slotName));
       }
-      for (let i = projections.length - 2; i >= 0; i = i - 2) {
-        projections.splice(i, 1);
+      const removeProjection = child === false;
+      if (!removeProjection) {
+        jsxBucket.children.push(child);
       }
-      descend(projections, true);
     }
+    for (let i = projections.length - 2; i >= 0; i = i - 2) {
+      projections.splice(i, 1);
+    }
+    descend(projections, true);
   }
   function expectProjection() {
     const jsxNode2 = jsxValue;
@@ -24840,7 +24839,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           container.$scheduler$(7 /* COMPONENT */, host, componentQRL, jsxProps);
         }
       }
-      jsxNode2.children != null && descendContentToProject(jsxNode2.children, host);
+      descendContentToProject(jsxNode2.children, host);
     } else {
       const lookupKey = jsxNode2.key;
       const vNodeLookupKey = getKey(host);
@@ -25154,7 +25153,17 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
             chore.$payload$
           ),
           (jsx5) => {
-            return chore.$type$ === 7 /* COMPONENT */ ? maybeThen(container.processJsx(host, jsx5), () => jsx5) : jsx5;
+            if (chore.$type$ === 7 /* COMPONENT */) {
+              const styleScopedId = container.getHostProp(host, QScopedStyle);
+              return vnode_diff(
+                container,
+                jsx5,
+                host,
+                addComponentStylePrefix(styleScopedId)
+              );
+            } else {
+              return jsx5;
+            }
           },
           (err) => container.handleError(err, host)
         );
@@ -26015,10 +26024,6 @@ var DomContainer = class extends _SharedContainer {
   parseQRL(qrl2) {
     return inflateQRL(this, parseQRL(qrl2));
   }
-  processJsx(host, jsx4) {
-    const styleScopedId = this.getHostProp(host, QScopedStyle);
-    return vnode_diff(this, jsx4, host, addComponentStylePrefix(styleScopedId));
-  }
   handleError(err, host) {
     if (qDev) {
       if (typeof document !== "undefined") {
@@ -27884,9 +27889,8 @@ __publicField(SsrNode, "TEXT_NODE", 3);
 __publicField(SsrNode, "DOCUMENT_NODE", 9);
 __publicField(SsrNode, "DOCUMENT_FRAGMENT_NODE", 11);
 var DomRef = class {
-  /** @id is the same id as for SsrNode */
-  constructor(id) {
-    this.id = id;
+  constructor($ssrNode$) {
+    this.$ssrNode$ = $ssrNode$;
   }
 };
 var SsrComponentFrame = class {
@@ -28160,7 +28164,9 @@ var inflate = (container, target, typeId, data) => {
         if (valType === 0 /* RootRef */ || valType >= 12 /* Error */) {
           Object.defineProperty(target, key, {
             get() {
-              return deserializeData(container, valType, valData);
+              const value = deserializeData(container, valType, valData);
+              target[key] = value;
+              return value;
             },
             set(value) {
               Object.defineProperty(target, key, {
@@ -28500,6 +28506,7 @@ function inflateQRL(container, qrl2) {
   }
   return qrl2;
 }
+var isDomRef = (obj) => false;
 var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToChunkResolver, getProp, setProp, storeProxyMap, writer, prepVNodeData) => {
   if (!writer) {
     const buffer = [];
@@ -28524,7 +28531,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
     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);
@@ -28640,7 +28647,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
       } 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)) {
@@ -28864,7 +28871,8 @@ function serialize(serializationContext) {
         output(13 /* Object */, out);
       }
     } else if ($isDomRef$(value)) {
-      output(9 /* RefVNode */, value.id);
+      value.$ssrNode$.vnodeData[0] |= 8 /* SERIALIZE */;
+      output(9 /* 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) {
@@ -29128,6 +29136,8 @@ var canSerialize = (value) => {
       return true;
     } else if (value instanceof Uint8Array) {
       return true;
+    } else if (isDomRef?.(value)) {
+      return true;
     }
   } else if (typeof value === "function") {
     if (isQrl2(value) || isQwikComponent(value)) {
@@ -31175,9 +31185,6 @@ var SSRContainer = class extends _SharedContainer2 {
   }
   ensureProjectionResolved(host) {
   }
-  processJsx(host, jsx4) {
-    throw new Error("Should not get here.");
-  }
   handleError(err, $host$) {
     throw err;
   }
@@ -31923,10 +31930,10 @@ var SSRContainer = class extends _SharedContainer2 {
         if (key === "ref") {
           const lastNode = this.getLastNode();
           if (isSignal3(value)) {
-            value.value = new DomRef(lastNode.id);
+            value.value = new DomRef(lastNode);
             continue;
           } else if (typeof value === "function") {
-            value(new DomRef(lastNode.id));
+            value(new DomRef(lastNode));
             continue;
           }
         }

package/dist/testing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/testing",
-  "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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/core",
   "description": "An open source framework for building instant loading web apps at any scale, without the extra effort.",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "author": "Qwik Team",
   "bin": {
     "qwik": "./qwik-cli.cjs"
@@ -17,7 +17,7 @@
     "prettier": "3.3.3",
     "ts-morph": "23.0.0",
     "vitest": "2.1.4",
-    "@qwik.dev/core": "2.0.0-alpha.2",
+    "@qwik.dev/core": "2.0.0-alpha.3",
     "@qwik.dev/dom": "2.1.19"
   },
   "engines": {
@@ -134,7 +134,7 @@
     "./qwikloader.debug.js": "./dist/qwikloader.debug.js",
     "./qwik-prefetch.js": "./dist/qwik-prefetch.js",
     "./qwik-prefetch.debug.js": "./dist/qwik-prefetch.debug.js",
-    "./package.json": "./dist/package.json"
+    "./package.json": "./package.json"
   },
   "exports_annotation": "We use the build for the optimizer because esbuild doesn't like the html?raw imports in the server plugin and it's only used in the vite configs",
   "files": [
@@ -191,7 +191,7 @@
     "directory": "packages/qwik"
   },
   "type": "module",
-  "types": "./dist/core.d.ts",
+  "types": "./public.d.ts",
   "scripts": {
     "build.insights": "cd src/insights && vite build --mode lib --emptyOutDir"
   }