@vue/compiler-dom 3.5.0-alpha.2 → 3.5.0-alpha.3

package/dist/compiler-dom.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-dom v3.5.0-alpha.2
+* @vue/compiler-dom v3.5.0-alpha.3
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -349,8 +349,7 @@ const transformClick = (key, event) => {
 const transformOn = (dir, node, context) => {
   return compilerCore.transformOn(dir, node, context, (baseResult) => {
     const { modifiers } = dir;
-    if (!modifiers.length)
-      return baseResult;
+    if (!modifiers.length) return baseResult;
     let { key, value: handlerExp } = baseResult.props[0];
     const { keyModifiers, nonKeyModifiers, eventOptionModifiers } = resolveModifiers(key, modifiers, context, dir.loc);
     if (nonKeyModifiers.includes("right")) {
@@ -446,6 +445,7 @@ const stringifyStatic = (children, context, parent) => {
   if (context.scopes.vSlot > 0) {
     return;
   }
+  const isParentCached = parent.type === 1 && parent.codegenNode && parent.codegenNode.type === 13 && parent.codegenNode.children && !shared.isArray(parent.codegenNode.children) && parent.codegenNode.children.type === 20;
   let nc = 0;
   let ec = 0;
   const currentChunk = [];
@@ -459,14 +459,25 @@ const stringifyStatic = (children, context, parent) => {
         // will insert / hydrate
         String(currentChunk.length)
       ]);
-      replaceHoist(currentChunk[0], staticCall, context);
-      if (currentChunk.length > 1) {
-        for (let i2 = 1; i2 < currentChunk.length; i2++) {
-          replaceHoist(currentChunk[i2], null, context);
+      if (isParentCached) {
+        parent.codegenNode.children.value = compilerCore.createArrayExpression([staticCall]);
+      } else {
+        currentChunk[0].codegenNode.value = staticCall;
+        if (currentChunk.length > 1) {
+          const deleteCount = currentChunk.length - 1;
+          children.splice(currentIndex - currentChunk.length + 1, deleteCount);
+          const cacheIndex = context.cached.indexOf(
+            currentChunk[currentChunk.length - 1].codegenNode
+          );
+          if (cacheIndex > -1) {
+            for (let i2 = cacheIndex; i2 < context.cached.length; i2++) {
+              const c = context.cached[i2];
+              if (c) c.index -= deleteCount;
+            }
+            context.cached.splice(cacheIndex - deleteCount + 1, deleteCount);
+          }
+          return deleteCount;
         }
-        const deleteCount = currentChunk.length - 1;
-        children.splice(currentIndex - currentChunk.length + 1, deleteCount);
-        return deleteCount;
       }
     }
     return 0;
@@ -474,14 +485,13 @@ const stringifyStatic = (children, context, parent) => {
   let i = 0;
   for (; i < children.length; i++) {
     const child = children[i];
-    const hoisted = getHoistedNode(child);
-    if (hoisted) {
-      const node = child;
-      const result = analyzeNode(node);
+    const isCached = isParentCached || getCachedNode(child);
+    if (isCached) {
+      const result = analyzeNode(child);
       if (result) {
         nc += result[0];
         ec += result[1];
-        currentChunk.push(node);
+        currentChunk.push(child);
         continue;
       }
     }
@@ -492,15 +502,15 @@ const stringifyStatic = (children, context, parent) => {
   }
   stringifyCurrentChunk(i);
 };
-const getHoistedNode = (node) => (node.type === 1 && node.tagType === 0 || node.type == 12) && node.codegenNode && node.codegenNode.type === 4 && node.codegenNode.hoisted;
+const getCachedNode = (node) => {
+  if ((node.type === 1 && node.tagType === 0 || node.type === 12) && node.codegenNode && node.codegenNode.type === 20) {
+    return node.codegenNode;
+  }
+};
 const dataAriaRE = /^(data|aria)-/;
 const isStringifiableAttr = (name, ns) => {
   return (ns === 0 ? shared.isKnownHtmlAttr(name) : ns === 1 ? shared.isKnownSvgAttr(name) : false) || dataAriaRE.test(name);
 };
-const replaceHoist = (node, replacement, context) => {
-  const hoistToReplace = node.codegenNode.hoisted;
-  context.hoists[context.hoists.indexOf(hoistToReplace)] = replacement;
-};
 const isNonStringifiable = /* @__PURE__ */ shared.makeMap(
   `caption,thead,tr,th,tbody,td,tfoot,colgroup,col`
 );
@@ -519,6 +529,7 @@ function analyzeNode(node) {
     return false;
   };
   function walk(node2) {
+    const isOptionTag = node2.tag === "option" && node2.ns === 0;
     for (let i = 0; i < node2.props.length; i++) {
       const p = node2.props[i];
       if (p.type === 6 && !isStringifiableAttr(p.name, node2.ns)) {
@@ -531,6 +542,9 @@ function analyzeNode(node) {
         if (p.exp && (p.exp.type === 8 || p.exp.constType < 3)) {
           return bail();
         }
+        if (isOptionTag && compilerCore.isStaticArgOf(p.arg, "value") && p.exp && p.exp.ast && p.exp.ast.type !== "StringLiteral") {
+          return bail();
+        }
       }
     }
     for (let i = 0; i < node2.children.length; i++) {
@@ -672,12 +686,10 @@ function isValidHTMLNesting(parent, child) {
     return onlyValidParents[child].has(parent);
   }
   if (parent in knownInvalidChildren) {
-    if (knownInvalidChildren[parent].has(child))
-      return false;
+    if (knownInvalidChildren[parent].has(child)) return false;
   }
   if (child in knownInvalidParents) {
-    if (knownInvalidParents[child].has(parent))
-      return false;
+    if (knownInvalidParents[child].has(parent)) return false;
   }
   return true;
 }

package/dist/compiler-dom.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-dom v3.5.0-alpha.2
+* @vue/compiler-dom v3.5.0-alpha.3
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -331,8 +331,7 @@ const transformClick = (key, event) => {
 const transformOn = (dir, node, context) => {
   return compilerCore.transformOn(dir, node, context, (baseResult) => {
     const { modifiers } = dir;
-    if (!modifiers.length)
-      return baseResult;
+    if (!modifiers.length) return baseResult;
     let { key, value: handlerExp } = baseResult.props[0];
     const { keyModifiers, nonKeyModifiers, eventOptionModifiers } = resolveModifiers(key, modifiers, context, dir.loc);
     if (nonKeyModifiers.includes("right")) {
@@ -382,6 +381,7 @@ const stringifyStatic = (children, context, parent) => {
   if (context.scopes.vSlot > 0) {
     return;
   }
+  const isParentCached = parent.type === 1 && parent.codegenNode && parent.codegenNode.type === 13 && parent.codegenNode.children && !shared.isArray(parent.codegenNode.children) && parent.codegenNode.children.type === 20;
   let nc = 0;
   let ec = 0;
   const currentChunk = [];
@@ -395,14 +395,25 @@ const stringifyStatic = (children, context, parent) => {
         // will insert / hydrate
         String(currentChunk.length)
       ]);
-      replaceHoist(currentChunk[0], staticCall, context);
-      if (currentChunk.length > 1) {
-        for (let i2 = 1; i2 < currentChunk.length; i2++) {
-          replaceHoist(currentChunk[i2], null, context);
+      if (isParentCached) {
+        parent.codegenNode.children.value = compilerCore.createArrayExpression([staticCall]);
+      } else {
+        currentChunk[0].codegenNode.value = staticCall;
+        if (currentChunk.length > 1) {
+          const deleteCount = currentChunk.length - 1;
+          children.splice(currentIndex - currentChunk.length + 1, deleteCount);
+          const cacheIndex = context.cached.indexOf(
+            currentChunk[currentChunk.length - 1].codegenNode
+          );
+          if (cacheIndex > -1) {
+            for (let i2 = cacheIndex; i2 < context.cached.length; i2++) {
+              const c = context.cached[i2];
+              if (c) c.index -= deleteCount;
+            }
+            context.cached.splice(cacheIndex - deleteCount + 1, deleteCount);
+          }
+          return deleteCount;
         }
-        const deleteCount = currentChunk.length - 1;
-        children.splice(currentIndex - currentChunk.length + 1, deleteCount);
-        return deleteCount;
       }
     }
     return 0;
@@ -410,14 +421,13 @@ const stringifyStatic = (children, context, parent) => {
   let i = 0;
   for (; i < children.length; i++) {
     const child = children[i];
-    const hoisted = getHoistedNode(child);
-    if (hoisted) {
-      const node = child;
-      const result = analyzeNode(node);
+    const isCached = isParentCached || getCachedNode(child);
+    if (isCached) {
+      const result = analyzeNode(child);
       if (result) {
         nc += result[0];
         ec += result[1];
-        currentChunk.push(node);
+        currentChunk.push(child);
         continue;
       }
     }
@@ -428,15 +438,15 @@ const stringifyStatic = (children, context, parent) => {
   }
   stringifyCurrentChunk(i);
 };
-const getHoistedNode = (node) => (node.type === 1 && node.tagType === 0 || node.type == 12) && node.codegenNode && node.codegenNode.type === 4 && node.codegenNode.hoisted;
+const getCachedNode = (node) => {
+  if ((node.type === 1 && node.tagType === 0 || node.type === 12) && node.codegenNode && node.codegenNode.type === 20) {
+    return node.codegenNode;
+  }
+};
 const dataAriaRE = /^(data|aria)-/;
 const isStringifiableAttr = (name, ns) => {
   return (ns === 0 ? shared.isKnownHtmlAttr(name) : ns === 1 ? shared.isKnownSvgAttr(name) : false) || dataAriaRE.test(name);
 };
-const replaceHoist = (node, replacement, context) => {
-  const hoistToReplace = node.codegenNode.hoisted;
-  context.hoists[context.hoists.indexOf(hoistToReplace)] = replacement;
-};
 const isNonStringifiable = /* @__PURE__ */ shared.makeMap(
   `caption,thead,tr,th,tbody,td,tfoot,colgroup,col`
 );
@@ -455,6 +465,7 @@ function analyzeNode(node) {
     return false;
   };
   function walk(node2) {
+    const isOptionTag = node2.tag === "option" && node2.ns === 0;
     for (let i = 0; i < node2.props.length; i++) {
       const p = node2.props[i];
       if (p.type === 6 && !isStringifiableAttr(p.name, node2.ns)) {
@@ -467,6 +478,9 @@ function analyzeNode(node) {
         if (p.exp && (p.exp.type === 8 || p.exp.constType < 3)) {
           return bail();
         }
+        if (isOptionTag && compilerCore.isStaticArgOf(p.arg, "value") && p.exp && p.exp.ast && p.exp.ast.type !== "StringLiteral") {
+          return bail();
+        }
       }
     }
     for (let i = 0; i < node2.children.length; i++) {