@vue/compiler-vapor 3.6.0-beta.1 → 3.6.0-beta.2

package/dist/compiler-vapor.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-vapor v3.6.0-beta.1
+* @vue/compiler-vapor v3.6.0-beta.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -149,6 +149,8 @@ class TransformContext {
     this.node = node;
     this.selfName = null;
     this.parent = null;
+    // cached parent that skips template tags
+    this.effectiveParent = null;
     this.index = 0;
     this.block = this.ir.block;
     this.template = "";
@@ -161,6 +163,12 @@ class TransformContext {
     this.component = this.ir.component;
     this.directive = this.ir.directive;
     this.slots = [];
+    // whether this node is the last effective child of its parent
+    // (all siblings after it are components, which don't appear in HTML template)
+    this.isLastEffectiveChild = true;
+    // whether this node is on the rightmost path of the tree
+    // (all ancestors are also last effective children)
+    this.isOnRightmostPath = true;
     this.globalId = 0;
     this.nextIdMap = null;
     this.increaseId = () => {
@@ -241,15 +249,31 @@ class TransformContext {
     this.block.operation.push(...node);
   }
   create(node, index) {
+    let effectiveParent = this;
+    while (effectiveParent && effectiveParent.node.type === 1 && effectiveParent.node.tagType === 3) {
+      effectiveParent = effectiveParent.parent;
+    }
+    const isLastEffectiveChild = this.isEffectivelyLastChild(index);
+    const isOnRightmostPath = this.isOnRightmostPath && isLastEffectiveChild;
     return Object.assign(Object.create(TransformContext.prototype), this, {
       node,
       parent: this,
       index,
       template: "",
       childrenTemplate: [],
-      dynamic: newDynamic()
+      dynamic: newDynamic(),
+      effectiveParent,
+      isLastEffectiveChild,
+      isOnRightmostPath
     });
   }
+  isEffectivelyLastChild(index) {
+    const children = this.node.children;
+    if (!children) return true;
+    return children.every(
+      (c, i) => i <= index || c.type === 1 && c.tagType === 1
+    );
+  }
 }
 const defaultOptions = {
   filename: "",
@@ -789,6 +813,10 @@ function analyzeExpressions(expressions) {
             end: id.end
           });
         });
+        const parentOfMemberExp = parentStack[parentStack.length - 2];
+        if (parentOfMemberExp && isCallExpression(parentOfMemberExp)) {
+          return;
+        }
         registerVariable(
           memberExp,
           exp,
@@ -1005,6 +1033,8 @@ function extractMemberExpression(exp, onIdentifier) {
       return `${extractMemberExpression(exp.left, onIdentifier)} ${exp.operator} ${extractMemberExpression(exp.right, onIdentifier)}`;
     case "CallExpression":
       return `${extractMemberExpression(exp.callee, onIdentifier)}(${exp.arguments.map((arg) => extractMemberExpression(arg, onIdentifier)).join(", ")})`;
+    case "OptionalCallExpression":
+      return `${extractMemberExpression(exp.callee, onIdentifier)}?.(${exp.arguments.map((arg) => extractMemberExpression(arg, onIdentifier)).join(", ")})`;
     case "MemberExpression":
     // foo[bar.baz]
     case "OptionalMemberExpression":
@@ -1017,6 +1047,9 @@ function extractMemberExpression(exp, onIdentifier) {
       return "";
   }
 }
+const isCallExpression = (node) => {
+  return node.type === "CallExpression" || node.type === "OptionalCallExpression";
+};
 const isMemberExpression = (node) => {
   return node.type === "MemberExpression" || node.type === "OptionalMemberExpression" || node.type === "TSNonNullExpression";
 };
@@ -2996,7 +3029,10 @@ const transformElement = (node, context) => {
         propsResult,
         singleRoot,
         context,
-        getEffectIndex
+        getEffectIndex,
+        // Root-level elements generate dedicated templates
+        // so closing tags can be omitted
+        context.root === context.effectiveParent || canOmitEndTag(node, context)
       );
     }
     if (parentSlots) {
@@ -3004,6 +3040,17 @@ const transformElement = (node, context) => {
     }
   };
 };
+function canOmitEndTag(node, context) {
+  const { block, parent } = context;
+  if (!parent) return false;
+  if (block !== parent.block) {
+    return true;
+  }
+  if (shared.isFormattingTag(node.tag) || parent.node.type === 1 && node.tag === parent.node.tag) {
+    return context.isOnRightmostPath;
+  }
+  return context.isLastEffectiveChild;
+}
 function isSingleRoot(context) {
   if (context.inVFor) {
     return false;
@@ -3093,7 +3140,8 @@ function resolveSetupReference(name, context) {
   return bindings[name] ? name : bindings[camelName] ? camelName : bindings[PascalName] ? PascalName : void 0;
 }
 const dynamicKeys = ["indeterminate"];
-function transformNativeElement(node, propsResult, singleRoot, context, getEffectIndex) {
+const NEEDS_QUOTES_RE = /[\s"'`=<>]/;
+function transformNativeElement(node, propsResult, singleRoot, context, getEffectIndex, omitEndTag) {
   const { tag } = node;
   const { scopeId } = context.options;
   let template = "";
@@ -3113,16 +3161,24 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
       getEffectIndex
     );
   } else {
+    let prevWasQuoted = false;
     for (const prop of propsResult[1]) {
       const { key, values } = prop;
       if (context.imports.some(
         (imported) => values[0].content.includes(imported.exp.content)
       )) {
-        template += ` ${key.content}="${IMPORT_EXP_START}${values[0].content}${IMPORT_EXP_END}"`;
+        if (!prevWasQuoted) template += ` `;
+        template += `${key.content}="${IMPORT_EXP_START}${values[0].content}${IMPORT_EXP_END}"`;
+        prevWasQuoted = true;
       } else if (key.isStatic && values.length === 1 && (values[0].isStatic || values[0].content === "''") && !dynamicKeys.includes(key.content)) {
-        template += ` ${key.content}`;
-        if (values[0].content)
-          template += `="${values[0].content === "''" ? "" : values[0].content}"`;
+        if (!prevWasQuoted) template += ` `;
+        const value = values[0].content === "''" ? "" : values[0].content;
+        template += key.content;
+        if (value) {
+          template += (prevWasQuoted = NEEDS_QUOTES_RE.test(value)) ? `="${value.replace(/"/g, "&quot;")}"` : `=${value}`;
+        } else {
+          prevWasQuoted = false;
+        }
       } else {
         dynamicProps.push(key.content);
         context.registerEffect(
@@ -3139,7 +3195,7 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
     }
   }
   template += `>` + context.childrenTemplate.join("");
-  if (!shared.isVoidTag(tag)) {
+  if (!shared.isVoidTag(tag) && !omitEndTag) {
     template += `</${tag}>`;
   }
   if (singleRoot) {

package/dist/compiler-vapor.d.ts

@@ -314,6 +314,7 @@ export declare class TransformContext<T extends AllNode = AllNode> {
     node: T;
     selfName: string | null;
     parent: TransformContext<RootNode | ElementNode> | null;
+    effectiveParent: TransformContext<RootNode | ElementNode> | null;
     root: TransformContext<RootNode>;
     index: number;
     block: BlockIRNode;
@@ -328,6 +329,8 @@ export declare class TransformContext<T extends AllNode = AllNode> {
     component: Set<string>;
     directive: Set<string>;
     slots: IRSlots[];
+    isLastEffectiveChild: boolean;
+    isOnRightmostPath: boolean;
     private globalId;
     private nextIdMap;
     constructor(ir: RootIRNode, node: T, options?: TransformOptions);
@@ -340,6 +343,7 @@ export declare class TransformContext<T extends AllNode = AllNode> {
     registerEffect(expressions: SimpleExpressionNode[], operation: OperationNode | OperationNode[], getIndex?: () => number): void;
     registerOperation(...node: OperationNode[]): void;
     create<T extends TemplateChildNode>(node: T, index: number): TransformContext<T>;
+    private isEffectivelyLastChild;
 }
 export declare function transform(node: RootNode, options?: TransformOptions): RootIRNode;
 export declare function createStructuralDirectiveTransform(name: string | string[], fn: StructuralDirectiveTransform): NodeTransform;

package/dist/compiler-vapor.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-vapor v3.6.0-beta.1
+* @vue/compiler-vapor v3.6.0-beta.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -66,10 +66,12 @@ const HTML_TAGS = "html,body,base,head,link,meta,style,title,address,article,asi
 const SVG_TAGS = "svg,animate,animateMotion,animateTransform,circle,clipPath,color-profile,defs,desc,discard,ellipse,feBlend,feColorMatrix,feComponentTransfer,feComposite,feConvolveMatrix,feDiffuseLighting,feDisplacementMap,feDistantLight,feDropShadow,feFlood,feFuncA,feFuncB,feFuncG,feFuncR,feGaussianBlur,feImage,feMerge,feMergeNode,feMorphology,feOffset,fePointLight,feSpecularLighting,feSpotLight,feTile,feTurbulence,filter,foreignObject,g,hatch,hatchpath,image,line,linearGradient,marker,mask,mesh,meshgradient,meshpatch,meshrow,metadata,mpath,path,pattern,polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,text,textPath,title,tspan,unknown,use,view";
 const MATH_TAGS = "annotation,annotation-xml,maction,maligngroup,malignmark,math,menclose,merror,mfenced,mfrac,mfraction,mglyph,mi,mlabeledtr,mlongdiv,mmultiscripts,mn,mo,mover,mpadded,mphantom,mprescripts,mroot,mrow,ms,mscarries,mscarry,msgroup,msline,mspace,msqrt,msrow,mstack,mstyle,msub,msubsup,msup,mtable,mtd,mtext,mtr,munder,munderover,none,semantics";
 const VOID_TAGS = "area,base,br,col,embed,hr,img,input,link,meta,param,source,track,wbr";
+const FORMATTING_TAGS = "a,b,big,code,em,font,i,nobr,s,small,strike,strong,tt,u";
 const isHTMLTag = /* @__PURE__ */ makeMap(HTML_TAGS);
 const isSVGTag = /* @__PURE__ */ makeMap(SVG_TAGS);
 const isMathMLTag = /* @__PURE__ */ makeMap(MATH_TAGS);
 const isVoidTag = /* @__PURE__ */ makeMap(VOID_TAGS);
+const isFormattingTag = /* @__PURE__ */ makeMap(FORMATTING_TAGS);
 
 function shouldSetAsAttr(tagName, key) {
   if (key === "spellcheck" || key === "draggable" || key === "translate" || key === "autocorrect") {
@@ -18629,8 +18631,7 @@ function walkIdentifiers(root, onIdentifier, includeAll = false, parentStack = [
         if (includeAll || isRefed && !isLocal) {
           onIdentifier(node, parent, parentStack, isRefed, isLocal);
         }
-      } else if (node.type === "ObjectProperty" && // eslint-disable-next-line no-restricted-syntax
-      (parent == null ? void 0 : parent.type) === "ObjectPattern") {
+      } else if (node.type === "ObjectProperty" && (parent == null ? void 0 : parent.type) === "ObjectPattern") {
         node.inPattern = true;
       } else if (isFunctionType(node)) {
         if (node.scopeIds) {
@@ -23810,6 +23811,8 @@ class TransformContext {
     this.node = node;
     this.selfName = null;
     this.parent = null;
+    // cached parent that skips template tags
+    this.effectiveParent = null;
     this.index = 0;
     this.block = this.ir.block;
     this.template = "";
@@ -23822,6 +23825,12 @@ class TransformContext {
     this.component = this.ir.component;
     this.directive = this.ir.directive;
     this.slots = [];
+    // whether this node is the last effective child of its parent
+    // (all siblings after it are components, which don't appear in HTML template)
+    this.isLastEffectiveChild = true;
+    // whether this node is on the rightmost path of the tree
+    // (all ancestors are also last effective children)
+    this.isOnRightmostPath = true;
     this.globalId = 0;
     this.nextIdMap = null;
     this.increaseId = () => {
@@ -23902,15 +23911,31 @@ class TransformContext {
     this.block.operation.push(...node);
   }
   create(node, index) {
+    let effectiveParent = this;
+    while (effectiveParent && effectiveParent.node.type === 1 && effectiveParent.node.tagType === 3) {
+      effectiveParent = effectiveParent.parent;
+    }
+    const isLastEffectiveChild = this.isEffectivelyLastChild(index);
+    const isOnRightmostPath = this.isOnRightmostPath && isLastEffectiveChild;
     return Object.assign(Object.create(TransformContext.prototype), this, {
       node,
       parent: this,
       index,
       template: "",
       childrenTemplate: [],
-      dynamic: newDynamic()
+      dynamic: newDynamic(),
+      effectiveParent,
+      isLastEffectiveChild,
+      isOnRightmostPath
     });
   }
+  isEffectivelyLastChild(index) {
+    const children = this.node.children;
+    if (!children) return true;
+    return children.every(
+      (c, i) => i <= index || c.type === 1 && c.tagType === 1
+    );
+  }
 }
 const defaultOptions = {
   filename: "",
@@ -24450,6 +24475,10 @@ function analyzeExpressions(expressions) {
             end: id.end
           });
         });
+        const parentOfMemberExp = parentStack[parentStack.length - 2];
+        if (parentOfMemberExp && isCallExpression(parentOfMemberExp)) {
+          return;
+        }
         registerVariable(
           memberExp,
           exp,
@@ -24666,6 +24695,8 @@ function extractMemberExpression(exp, onIdentifier) {
       return `${extractMemberExpression(exp.left, onIdentifier)} ${exp.operator} ${extractMemberExpression(exp.right, onIdentifier)}`;
     case "CallExpression":
       return `${extractMemberExpression(exp.callee, onIdentifier)}(${exp.arguments.map((arg) => extractMemberExpression(arg, onIdentifier)).join(", ")})`;
+    case "OptionalCallExpression":
+      return `${extractMemberExpression(exp.callee, onIdentifier)}?.(${exp.arguments.map((arg) => extractMemberExpression(arg, onIdentifier)).join(", ")})`;
     case "MemberExpression":
     // foo[bar.baz]
     case "OptionalMemberExpression":
@@ -24678,6 +24709,9 @@ function extractMemberExpression(exp, onIdentifier) {
       return "";
   }
 }
+const isCallExpression = (node) => {
+  return node.type === "CallExpression" || node.type === "OptionalCallExpression";
+};
 const isMemberExpression = (node) => {
   return node.type === "MemberExpression" || node.type === "OptionalMemberExpression" || node.type === "TSNonNullExpression";
 };
@@ -26657,7 +26691,10 @@ const transformElement = (node, context) => {
         propsResult,
         singleRoot,
         context,
-        getEffectIndex
+        getEffectIndex,
+        // Root-level elements generate dedicated templates
+        // so closing tags can be omitted
+        context.root === context.effectiveParent || canOmitEndTag(node, context)
       );
     }
     if (parentSlots) {
@@ -26665,6 +26702,17 @@ const transformElement = (node, context) => {
     }
   };
 };
+function canOmitEndTag(node, context) {
+  const { block, parent } = context;
+  if (!parent) return false;
+  if (block !== parent.block) {
+    return true;
+  }
+  if (isFormattingTag(node.tag) || parent.node.type === 1 && node.tag === parent.node.tag) {
+    return context.isOnRightmostPath;
+  }
+  return context.isLastEffectiveChild;
+}
 function isSingleRoot(context) {
   if (context.inVFor) {
     return false;
@@ -26754,7 +26802,8 @@ function resolveSetupReference(name, context) {
   return bindings[name] ? name : bindings[camelName] ? camelName : bindings[PascalName] ? PascalName : void 0;
 }
 const dynamicKeys = ["indeterminate"];
-function transformNativeElement(node, propsResult, singleRoot, context, getEffectIndex) {
+const NEEDS_QUOTES_RE = /[\s"'`=<>]/;
+function transformNativeElement(node, propsResult, singleRoot, context, getEffectIndex, omitEndTag) {
   const { tag } = node;
   const { scopeId } = context.options;
   let template = "";
@@ -26774,16 +26823,24 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
       getEffectIndex
     );
   } else {
+    let prevWasQuoted = false;
     for (const prop of propsResult[1]) {
       const { key, values } = prop;
       if (context.imports.some(
         (imported) => values[0].content.includes(imported.exp.content)
       )) {
-        template += ` ${key.content}="${IMPORT_EXP_START}${values[0].content}${IMPORT_EXP_END}"`;
+        if (!prevWasQuoted) template += ` `;
+        template += `${key.content}="${IMPORT_EXP_START}${values[0].content}${IMPORT_EXP_END}"`;
+        prevWasQuoted = true;
       } else if (key.isStatic && values.length === 1 && (values[0].isStatic || values[0].content === "''") && !dynamicKeys.includes(key.content)) {
-        template += ` ${key.content}`;
-        if (values[0].content)
-          template += `="${values[0].content === "''" ? "" : values[0].content}"`;
+        if (!prevWasQuoted) template += ` `;
+        const value = values[0].content === "''" ? "" : values[0].content;
+        template += key.content;
+        if (value) {
+          template += (prevWasQuoted = NEEDS_QUOTES_RE.test(value)) ? `="${value.replace(/"/g, "&quot;")}"` : `=${value}`;
+        } else {
+          prevWasQuoted = false;
+        }
       } else {
         dynamicProps.push(key.content);
         context.registerEffect(
@@ -26800,7 +26857,7 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
     }
   }
   template += `>` + context.childrenTemplate.join("");
-  if (!isVoidTag(tag)) {
+  if (!isVoidTag(tag) && !omitEndTag) {
     template += `</${tag}>`;
   }
   if (singleRoot) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-vapor",
-  "version": "3.6.0-beta.1",
+  "version": "3.6.0-beta.2",
   "description": "@vue/compiler-vapor",
   "main": "dist/compiler-vapor.cjs.js",
   "module": "dist/compiler-vapor.esm-bundler.js",
@@ -45,7 +45,7 @@
     "@babel/parser": "^7.28.5",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-dom": "3.6.0-beta.1",
-    "@vue/shared": "3.6.0-beta.1"
+    "@vue/compiler-dom": "3.6.0-beta.2",
+    "@vue/shared": "3.6.0-beta.2"
   }
 }