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

package/dist/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/build",
-  "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/cli.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/cli 2.0.0-alpha.2-dev+58b6f8d
+ * @qwik.dev/core/cli 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
@@ -5504,7 +5504,7 @@ async function printHelp(app) {
   await runCommand2(Object.assign(app, { task: args[0], args }));
 }
 function printVersion() {
-  console.log("2.0.0-alpha.2-dev+58b6f8d");
+  console.log("2.0.0-alpha.3-dev+418fd6d");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/core-internal.d.ts

@@ -530,7 +530,6 @@ declare interface Container {
     readonly $getObjectById$: (id: number | string) => any;
     readonly $serverData$: Record<string, any>;
     $currentUniqueId$: number;
-    processJsx(host: HostElement, jsx: JSXOutput): ValueOrPromise<void>;
     handleError(err: any, $host$: HostElement): void;
     getParentHost(host: HostElement): HostElement | null;
     setContext<T>(host: HostElement, context: ContextId<T>, value: T): void;
@@ -554,7 +553,7 @@ declare interface Container {
         };
     } | null, DomRefConstructor: {
         new (...rest: any[]): {
-            id: string;
+            $ssrNode$: ISsrNode;
         };
     } | null, symbolToChunkResolver: SymbolToChunkResolver, writer?: StreamWriter): SerializationContext;
 }
@@ -872,7 +871,6 @@ declare class DomContainer extends _SharedContainer implements ClientContainer {
     constructor(element: _ContainerElement);
     $setRawState$(id: number, vParent: _ElementVNode | _VirtualVNode): void;
     parseQRL<T = unknown>(qrl: string): QRL<T>;
-    processJsx(host: HostElement, jsx: JSXOutput): ValueOrPromise<void>;
     handleError(err: any, host: HostElement): void;
     setContext<T>(host: HostElement, context: ContextId<T>, value: T): void;
     resolveContext<T>(host: HostElement, contextId: ContextId<T>): T | undefined;
@@ -890,7 +888,7 @@ export { DomContainer }
 export { DomContainer as _DomContainer }
 
 declare type DomRef = {
-    id: string;
+    $ssrNode$: SsrNode;
 };
 
 /** @public */
@@ -2338,11 +2336,10 @@ export declare abstract class _SharedContainer implements Container {
         };
     } | null, DomRefConstructor: {
         new (...rest: any[]): {
-            id: string;
+            $ssrNode$: ISsrNode;
         };
     } | null, symbolToChunkResolver: SymbolToChunkResolver, writer?: StreamWriter, prepVNodeData?: (vNode: any) => void): SerializationContext;
     abstract ensureProjectionResolved(host: HostElement): void;
-    abstract processJsx(host: HostElement, jsx: JSXOutput): ValueOrPromise<void>;
     abstract handleError(err: any, $host$: HostElement): void;
     abstract getParentHost(host: HostElement): HostElement | null;
     abstract setContext<T>(host: HostElement, context: ContextId<T>, value: T): void;
@@ -3721,7 +3718,7 @@ export declare const _VAR_PROPS: unique symbol;
 export declare const _verifySerializable: <T>(value: T, preMessage?: string) => T;
 
 /**
- * 2.0.0-alpha.2-dev+58b6f8d
+ * 2.0.0-alpha.3-dev+418fd6d
  *
  * @public
  */

package/dist/core.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
@@ -3295,48 +3295,48 @@
         /////////////////////////////////////////////////////////////////////////////
         /////////////////////////////////////////////////////////////////////////////
         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;
@@ -3858,7 +3858,7 @@
                         container.$scheduler$(ChoreType.COMPONENT, host, componentQRL, jsxProps);
                     }
                 }
-                jsxNode.children != null && descendContentToProject(jsxNode.children, host);
+                descendContentToProject(jsxNode.children, host);
             }
             else {
                 const lookupKey = jsxNode.key;
@@ -4359,9 +4359,13 @@
                 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:
@@ -4536,7 +4540,7 @@
      *
      * @public
      */
-    const version = "2.0.0-alpha.2-dev+58b6f8d";
+    const version = "2.0.0-alpha.3-dev+418fd6d";
 
     /** @internal */
     class _SharedContainer {
@@ -5086,11 +5090,6 @@
         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
@@ -8052,7 +8051,10 @@
                     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, {
@@ -8394,6 +8396,7 @@
         }
         return qrl;
     }
+    let isDomRef = (obj) => false;
     const createSerializationContext = (
     /**
      * Node constructor, for instanceof checks.
@@ -8429,7 +8432,7 @@
             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);
@@ -8582,7 +8585,7 @@
                     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);
@@ -8880,7 +8883,8 @@
                 }
             }
             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) {
                 /**
@@ -9298,6 +9302,9 @@
             else if (value instanceof Uint8Array) {
                 return true;
             }
+            else if (isDomRef?.(value)) {
+                return true;
+            }
         }
         else if (typeof value === 'function') {
             if (isQrl(value) || isQwikComponent(value)) {