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

package/dist/testing/index.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/testing 2.0.0-beta.1-dev+495e8d9
+ * @qwik.dev/core/testing 2.0.0-beta.3-dev+aa098fc
  * 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
@@ -23066,6 +23066,7 @@ var isServerPlatform = () => {
 // packages/qwik/src/core/shared/qrl/qrl-class.ts
 import { isBrowser as isBrowser2, isDev as isDev5 } from "@qwik.dev/core/build";
 import { p as preload } from "@qwik.dev/core/preloader";
+var resolvedSymbol = Symbol("resolved");
 var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
   if (qDev && qSerialize) {
     if (captureRef) {
@@ -23114,9 +23115,6 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
     };
     return bound;
   }
-  const resolveLazy = (containerEl) => {
-    return symbolRef !== null ? symbolRef : resolve(containerEl);
-  };
   const wrapFn = (fn) => {
     if (typeof fn !== "function" || !capture?.length && !captureRef?.length) {
       return fn;
@@ -23141,7 +23139,10 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
       return invoke.call(this, context, fn, ...args);
     };
   };
-  const resolve = async (containerEl) => {
+  if (symbolFn && resolvedSymbol in symbolFn) {
+    symbolRef = symbolFn[resolvedSymbol];
+  }
+  const resolve = symbolRef ? async () => symbolRef : async (containerEl) => {
     if (symbolRef !== null) {
       return symbolRef;
     }
@@ -23161,14 +23162,17 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
     const start = now();
     const ctx = tryGetInvokeContext();
     if (symbolFn !== null) {
-      symbolRef = symbolFn().then(
-        (module) => qrl.resolved = wrapFn(symbolRef = module[symbol])
-      );
+      symbolRef = symbolFn().then((module) => {
+        const resolved = wrapFn(symbolRef = module[symbol]);
+        symbolFn[resolvedSymbol] = resolved;
+        qrl.resolved = resolved;
+        return resolved;
+      });
     } else {
       const imported = getPlatform().importSymbol(_containerEl, chunk, symbol);
       symbolRef = maybeThen(imported, (ref) => qrl.resolved = wrapFn(symbolRef = ref));
     }
-    if (typeof symbolRef === "object" && isPromise(symbolRef)) {
+    if (isPromise(symbolRef)) {
       symbolRef.then(
         () => emitUsedSymbol(symbol, ctx?.$element$, start),
         (err) => {
@@ -23194,7 +23198,6 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
     getHash: () => hash3,
     getCaptured: () => captureRef,
     resolve,
-    $resolveLazy$: resolveLazy,
     $setContainer$: setContainer,
     $chunk$: chunk,
     $symbol$: symbol,
@@ -24129,7 +24132,6 @@ var executeComponent = (container, renderHost, subscriptionHost, componentQRL, p
       if (!isInlineComponent) {
         container.setHostProp(renderHost, ELEMENT_SEQ_IDX, null);
         container.setHostProp(renderHost, USE_ON_LOCAL_SEQ_IDX, null);
-        container.setHostProp(renderHost, ELEMENT_PROPS, props);
       }
       if (vnode_isVNode(renderHost)) {
         clearAllEffects(container, renderHost);
@@ -25140,11 +25142,22 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         shouldRender = true;
       }
       if (host) {
-        const vNodeProps = vnode_getProp(host, ELEMENT_PROPS, container.$getObjectById$);
-        shouldRender = shouldRender || propsDiffer(jsxProps, vNodeProps);
+        let vNodeProps = vnode_getProp(host, ELEMENT_PROPS, container.$getObjectById$);
+        const propsAreDifferent = propsDiffer(jsxProps, vNodeProps);
+        shouldRender = shouldRender || propsAreDifferent;
         if (shouldRender) {
+          if (propsAreDifferent) {
+            if (vNodeProps) {
+              vNodeProps[_CONST_PROPS] = jsxProps[_CONST_PROPS];
+              vNodeProps[_VAR_PROPS] = jsxProps[_VAR_PROPS];
+            } else if (jsxProps) {
+              vnode_setProp(host, ELEMENT_PROPS, jsxProps);
+              vNodeProps = jsxProps;
+            }
+          }
+          vnode_setProp(host, OnRenderProp, componentQRL);
           host[0 /* flags */] &= ~32 /* Deleted */;
-          container.$scheduler$(6 /* COMPONENT */, host, componentQRL, jsxProps);
+          container.$scheduler$(6 /* COMPONENT */, host, componentQRL, vNodeProps);
         }
       }
       descendContentToProject(jsxNode2.children, host);
@@ -25686,21 +25699,24 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
           {
             const target = chore.$target$;
             const effects = chore.$payload$;
+            const ctx = newInvokeContext();
+            ctx.$container$ = container;
             if (target instanceof ComputedSignalImpl || target instanceof WrappedSignalImpl) {
               const forceRunEffects = target.$forceRunEffects$;
               target.$forceRunEffects$ = false;
-              if (!target.$effects$?.size) {
+              if (!effects?.size) {
                 break;
               }
-              returnValue = retryOnPromise(() => {
-                if (target.$computeIfNeeded$() || forceRunEffects) {
-                  triggerEffects(container, target, effects);
+              returnValue = maybeThen(
+                retryOnPromise(() => invoke.call(target, ctx, target.$computeIfNeeded$)),
+                (didChange) => {
+                  if (didChange || forceRunEffects) {
+                    return retryOnPromise(() => triggerEffects(container, target, effects));
+                  }
                 }
-              });
+              );
             } else {
-              returnValue = retryOnPromise(() => {
-                triggerEffects(container, target, effects);
-              });
+              returnValue = retryOnPromise(() => triggerEffects(container, target, effects));
             }
           }
           break;
@@ -25764,7 +25780,10 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
     if (idxDiff !== 0) {
       return idxDiff;
     }
-    if (a.$target$ !== b.$target$ || a.$payload$ !== b.$payload$) {
+    if (a.$target$ !== b.$target$) {
+      if (isQrl(a.$target$) && isQrl(b.$target$) && a.$target$.$hash$ === b.$target$.$hash$) {
+        return 0;
+      }
       return 1;
     }
     if (b === currentChore) {
@@ -25796,7 +25815,7 @@ var createScheduler = (container, scheduleDrain, journalFlush) => {
       return value;
     }
     const existing = sortedArray[idx];
-    if (existing.$type$ === 4 /* NODE_DIFF */) {
+    if (existing.$payload$ !== value.$payload$) {
       existing.$payload$ = value.$payload$;
     }
     if (existing.$executed$) {
@@ -29640,11 +29659,14 @@ var processVNodeData2 = (vData, callback) => {
   let nextToConsumeIdx = 0;
   let ch = 0;
   let peekCh = 0;
+  const getChar = (idx) => {
+    return idx < vData.length ? vData.charCodeAt(idx) : 0;
+  };
   const peek = () => {
     if (peekCh !== 0) {
       return peekCh;
     } else {
-      return peekCh = nextToConsumeIdx < vData.length ? vData.charCodeAt(nextToConsumeIdx) : 0;
+      return peekCh = getChar(nextToConsumeIdx);
     }
   };
   const consume = () => {
@@ -29662,7 +29684,7 @@ var processVNodeData2 = (vData, callback) => {
     return vData.substring(start, nextToConsumeIdx);
   };
   while (peek() !== 0) {
-    callback(peek, consumeValue, consume, nextToConsumeIdx);
+    callback(peek, consumeValue, consume, getChar, nextToConsumeIdx);
   }
 };
 var vnode_getNextSibling = (vnode) => {
@@ -29870,17 +29892,17 @@ function materializeFromVNodeData(vParent, vData, element, child) {
   let textIdx = 0;
   let combinedText = null;
   let container = null;
-  processVNodeData2(vData, (peek, consumeValue, consume, nextToConsumeIdx) => {
+  processVNodeData2(vData, (peek, consumeValue, consume, getChar, nextToConsumeIdx) => {
     if (isNumber(peek())) {
-      while (!isElement2(child)) {
+      while (!isElement2(child) || // We pretend that style element's don't exist as they can get moved out.
+      // skip over style elements, as those need to be moved to the head
+      // and are not included in the counts.
+      isQStyleElement(child)) {
         child = fastNextSibling(child);
         if (!child) {
           throw qError(27 /* materializeVNodeDataError */, [vData, peek(), nextToConsumeIdx]);
         }
       }
-      while (isQStyleElement(child)) {
-        child = fastNextSibling(child);
-      }
       combinedText = null;
       previousTextNode = null;
       let value = 0;
@@ -29906,7 +29928,16 @@ function materializeFromVNodeData(vParent, vData, element, child) {
     } else if (peek() === VNodeDataChar.PROPS) {
       vnode_setAttr(null, vParent, ELEMENT_PROPS, consumeValue());
     } else if (peek() === VNodeDataChar.KEY) {
-      vnode_setAttr(null, vParent, ELEMENT_KEY, consumeValue());
+      const isEscapedValue = getChar(nextToConsumeIdx + 1) === VNodeDataChar.SEPARATOR;
+      let value;
+      if (isEscapedValue) {
+        consume();
+        value = decodeURI(consumeValue());
+        consume();
+      } else {
+        value = consumeValue();
+      }
+      vnode_setAttr(null, vParent, ELEMENT_KEY, value);
     } else if (peek() === VNodeDataChar.SEQ) {
       vnode_setAttr(null, vParent, ELEMENT_SEQ, consumeValue());
     } else if (peek() === VNodeDataChar.SEQ_IDX) {
@@ -29942,6 +29973,9 @@ function materializeFromVNodeData(vParent, vData, element, child) {
     } else if (peek() === VNodeDataChar.SLOT) {
       vnode_setAttr(null, vParent, QSlot, consumeValue());
     } else {
+      while (isQStyleElement(child)) {
+        child = fastNextSibling(child);
+      }
       const textNode = child && fastNodeType(child) === /* Node.TEXT_NODE */
       3 ? child : null;
       if (combinedText === null) {
@@ -31494,8 +31528,8 @@ import {
 } from "../core.mjs";
 import { isDev as isDev10 } from "@qwik.dev/core/build";
 var SsrNode = class {
-  constructor(parentSsrNode, id, attrs, cleanupQueue, vnodeData) {
-    this.attrs = attrs;
+  constructor(parentSsrNode, id, attributesIndex, cleanupQueue, vnodeData) {
+    this.attributesIndex = attributesIndex;
     this.cleanupQueue = cleanupQueue;
     this.vnodeData = vnodeData;
     __publicField(this, "__brand__", "SsrNode");
@@ -31507,11 +31541,13 @@ var SsrNode = class {
     __publicField(this, "id");
     __publicField(this, "parentSsrNode");
     __publicField(this, "children", null);
+    __publicField(this, "attrs");
     /** Local props which don't serialize; */
     __publicField(this, "localProps", null);
     this.parentSsrNode = parentSsrNode;
     this.parentSsrNode?.addChild(this);
     this.id = id;
+    this.attrs = this.attributesIndex >= 0 ? this.vnodeData[this.attributesIndex] : _EMPTY_ARRAY;
     if (isDev10 && id.indexOf("undefined") != -1) {
       throw new Error(`Invalid SSR node id: ${id}`);
     }
@@ -31521,7 +31557,7 @@ var SsrNode = class {
   }
   setProp(name, value) {
     if (this.attrs === _EMPTY_ARRAY) {
-      this.attrs = [];
+      this.setEmptyArrayAsVNodeDataAttributes();
     }
     if (name.startsWith(NON_SERIALIZABLE_MARKER_PREFIX)) {
       mapArray_set(this.localProps || (this.localProps = []), name, value, 0);
@@ -31532,6 +31568,17 @@ var SsrNode = class {
       this.cleanupQueue.push(value);
     }
   }
+  setEmptyArrayAsVNodeDataAttributes() {
+    if (this.attributesIndex >= 0) {
+      this.vnodeData[this.attributesIndex] = [];
+      this.attrs = this.vnodeData[this.attributesIndex];
+    } else {
+      const newAttributesIndex = this.vnodeData.length > 1 ? 1 : 0;
+      this.vnodeData.splice(newAttributesIndex, 0, []);
+      this.attributesIndex = newAttributesIndex;
+      this.attrs = this.vnodeData[this.attributesIndex];
+    }
+  }
   getProp(name) {
     if (name.startsWith(NON_SERIALIZABLE_MARKER_PREFIX)) {
       return this.localProps ? mapArray_get(this.localProps, name, 0) : null;
@@ -31645,7 +31692,6 @@ var SsrComponentFrame = class {
 };
 
 // packages/qwik/src/server/vnode-data.ts
-import { _EMPTY_ARRAY as _EMPTY_ARRAY2 } from "../core.mjs";
 var OPEN_FRAGMENT = Number.MAX_SAFE_INTEGER;
 var CLOSE_FRAGMENT = Number.MAX_SAFE_INTEGER - 1;
 var WRITE_ELEMENT_ATTRS = Number.MAX_SAFE_INTEGER - 2;
@@ -31682,12 +31728,12 @@ function vNodeData_openElement(vNodeData) {
 }
 function vNodeData_createSsrNodeReference(currentComponentNode, vNodeData, depthFirstElementIdx, cleanupQueue) {
   vNodeData[0] |= 8 /* REFERENCE */;
-  let fragmentAttrs = _EMPTY_ARRAY2;
   const stack2 = [-1];
+  let attributesIndex = -1;
   for (let i = 1; i < vNodeData.length; i++) {
     const value = vNodeData[i];
     if (Array.isArray(value)) {
-      fragmentAttrs = value;
+      attributesIndex = i;
       i++;
       if (vNodeData[i] !== WRITE_ELEMENT_ATTRS) {
         stack2[stack2.length - 1]++;
@@ -31695,7 +31741,6 @@ function vNodeData_createSsrNodeReference(currentComponentNode, vNodeData, depth
       }
     } else if (value === CLOSE_FRAGMENT) {
       stack2.pop();
-      fragmentAttrs = _EMPTY_ARRAY2;
     } else if (value < 0) {
       const numberOfElements = 0 - value;
       stack2[stack2.length - 1] += numberOfElements;
@@ -31712,7 +31757,7 @@ function vNodeData_createSsrNodeReference(currentComponentNode, vNodeData, depth
       }
     }
   }
-  return new SsrNode(currentComponentNode, refId, fragmentAttrs, cleanupQueue, vNodeData);
+  return new SsrNode(currentComponentNode, refId, attributesIndex, cleanupQueue, vNodeData);
 }
 var ALPHANUMERIC = [];
 function encodeAsAlphanumeric(value) {
@@ -32457,6 +32502,7 @@ var SSRContainer = class extends _SharedContainer2 {
       for (let i = 0; i < fragmentAttrs.length; ) {
         const key = fragmentAttrs[i++];
         let value = fragmentAttrs[i++];
+        let encodeValue = false;
         if (typeof value !== "string") {
           const rootId = addRoot(value);
           if (rootId === void 0) {
@@ -32478,6 +32524,7 @@ var SSRContainer = class extends _SharedContainer2 {
             write(VNodeDataChar.PROPS_CHAR);
             break;
           case ELEMENT_KEY:
+            encodeValue = true;
             write(VNodeDataChar.KEY_CHAR);
             break;
           case ELEMENT_SEQ:
@@ -32504,7 +32551,15 @@ var SSRContainer = class extends _SharedContainer2 {
             write(key);
             write(VNodeDataChar.SEPARATOR_CHAR);
         }
-        write(value);
+        const encodedValue = encodeValue ? encodeURI(value) : value;
+        const isEncoded = encodeValue ? encodedValue !== value : false;
+        if (isEncoded) {
+          write(VNodeDataChar.SEPARATOR_CHAR);
+          write(encodedValue);
+          write(VNodeDataChar.SEPARATOR_CHAR);
+        } else {
+          write(value);
+        }
       }
     }
     this.closeElement();
@@ -32593,7 +32648,7 @@ var SSRContainer = class extends _SharedContainer2 {
     if (unclaimedProjections.length) {
       const previousCurrentComponentNode = this.currentComponentNode;
       try {
-        this.openElement(QTemplate, ["style", "display:none"], null);
+        this.openElement(QTemplate, ["hidden", true, "aria-hidden", "true"], null);
         let idx = 0;
         let ssrComponentNode = null;
         let ssrComponentFrame = null;

package/dist/testing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/testing",
-  "version": "2.0.0-beta.1-dev+495e8d9",
+  "version": "2.0.0-beta.3-dev+aa098fc",
   "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-beta.1",
+  "version": "2.0.0-beta.3",
   "author": "Qwik Team",
   "bin": {
     "qwik": "./qwik-cli.cjs"
@@ -9,16 +9,16 @@
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "csstype": "^3.1",
-    "rollup": ">= 4.39.0"
+    "rollup": "^4.44.0"
   },
   "devDependencies": {
     "ignore": "5.3.1",
     "image-size": "1.1.1",
     "kleur": "4.1.5",
-    "prettier": "3.4.2",
+    "prettier": "3.5.3",
     "ts-morph": "23.0.0",
-    "vitest": "3.1.1",
-    "@qwik.dev/core": "2.0.0-beta.1",
+    "vitest": "3.2.4",
+    "@qwik.dev/core": "2.0.0-beta.3",
     "@qwik.dev/dom": "2.1.19"
   },
   "engines": {
@@ -181,7 +181,7 @@
   "main": "./src/index.ts",
   "peerDependencies": {
     "prettier": "*",
-    "vite": ">=5 <7",
+    "vite": ">=5 <8",
     "vitest": ">=2 <3"
   },
   "peerDependenciesMeta": {