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

package/dist/core.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
@@ -3292,48 +3292,48 @@ const 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) {
-                // we need to create empty projections for all the slots to remove unused slots content
-                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) {
+            // we need to create empty projections for all the slots to remove unused slots content
+            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));
                 }
             }
-            /// STEP 1: Bucketize the children based on the projection name.
-            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) {
+            // We did not find any existing slots and we don't have any children to project.
+            return;
+        }
+        /// STEP 1: Bucketize the children based on the projection name.
+        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)));
             }
-            /// STEP 2: remove the names
-            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);
         }
+        /// STEP 2: remove the names
+        for (let i = projections.length - 2; i >= 0; i = i - 2) {
+            projections.splice(i, 1);
+        }
+        descend(projections, true);
     }
     function expectProjection() {
         const jsxNode = jsxValue;
@@ -3855,7 +3855,7 @@ const vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
                     container.$scheduler$(ChoreType.COMPONENT, host, componentQRL, jsxProps);
                 }
             }
-            jsxNode.children != null && descendContentToProject(jsxNode.children, host);
+            descendContentToProject(jsxNode.children, host);
         }
         else {
             const lookupKey = jsxNode.key;
@@ -4356,9 +4356,13 @@ const createScheduler = (container, scheduleDrain, journalFlush) => {
             case ChoreType.COMPONENT:
             case ChoreType.COMPONENT_SSR:
                 returnValue = safeCall(() => executeComponent(container, host, host, chore.$target$, chore.$payload$), (jsx) => {
-                    return chore.$type$ === ChoreType.COMPONENT
-                        ? maybeThen(container.processJsx(host, jsx), () => jsx)
-                        : jsx;
+                    if (chore.$type$ === ChoreType.COMPONENT) {
+                        const styleScopedId = container.getHostProp(host, QScopedStyle);
+                        return vnode_diff(container, jsx, host, addComponentStylePrefix(styleScopedId));
+                    }
+                    else {
+                        return jsx;
+                    }
                 }, (err) => container.handleError(err, host));
                 break;
             case ChoreType.RESOURCE:
@@ -4533,7 +4537,7 @@ function sortedInsert(sortedArray, value) {
  *
  * @public
  */
-const version = "2.0.0-alpha.2-dev+58b6f8d";
+const version = "2.0.0-alpha.3-dev+418fd6d";
 
 /** @internal */
 class _SharedContainer {
@@ -5083,11 +5087,6 @@ class DomContainer extends _SharedContainer {
     parseQRL(qrl) {
         return inflateQRL(this, parseQRL(qrl));
     }
-    processJsx(host, jsx) {
-        // console.log('>>>> processJsx', String(host));
-        const styleScopedId = this.getHostProp(host, QScopedStyle);
-        return vnode_diff(this, jsx, host, addComponentStylePrefix(styleScopedId));
-    }
     handleError(err, host) {
         if (qDev) {
             // Clean vdom
@@ -8049,7 +8048,10 @@ const inflate = (container, target, typeId, data) => {
                 if (valType === TypeIds.RootRef || valType >= TypeIds.Error) {
                     Object.defineProperty(target, key, {
                         get() {
-                            return deserializeData(container, valType, valData);
+                            const value = deserializeData(container, valType, valData);
+                            // after first deserialize, we can replace the Object.defineProperty with the value
+                            target[key] = value;
+                            return value;
                         },
                         set(value) {
                             Object.defineProperty(target, key, {
@@ -8391,6 +8393,7 @@ function inflateQRL(container, qrl) {
     }
     return qrl;
 }
+let isDomRef = (obj) => false;
 const createSerializationContext = (
 /**
  * Node constructor, for instanceof checks.
@@ -8426,7 +8429,7 @@ prepVNodeData) => {
         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);
@@ -8579,7 +8582,7 @@ prepVNodeData) => {
                 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);
@@ -8877,7 +8880,8 @@ function serialize(serializationContext) {
             }
         }
         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) {
             /**
@@ -9295,6 +9299,9 @@ const canSerialize = (value) => {
         else if (value instanceof Uint8Array) {
             return true;
         }
+        else if (isDomRef?.(value)) {
+            return true;
+        }
     }
     else if (typeof value === 'function') {
         if (isQrl(value) || isQwikComponent(value)) {