wip(app-vapor): 同步编译器

fxy060608 · fxy060608 · commit 5418c88d9a0b · 2025-07-26T15:43:20.000+08:00
diff --git a/packages/uni-cli-shared/lib/vapor/@vue/compiler-sfc/dist/compiler-sfc.esm-browser.js b/packages/uni-cli-shared/lib/vapor/@vue/compiler-sfc/dist/compiler-sfc.esm-browser.js
@@ -45001,9 +45001,14 @@ class DomCodeGenerator {
   }
   genTextElementCode(params) {
     const { tag, attrs, children } = params;
-    const textContent = this.extractTextContent(children);
-    const finalAttrs = this.mergeTextAttributes(attrs, textContent);
-    return this.buildElementStatements(tag, finalAttrs, void 0);
+    const hasComplexChildren = children && children.some((child) => child.type === NODE_TYPE_ELEMENT);
+    if (hasComplexChildren) {
+      return this.buildElementStatements(tag, attrs, children);
+    } else {
+      const textContent = this.extractTextContent(children);
+      const finalAttrs = this.mergeTextAttributes(attrs, textContent);
+      return this.buildElementStatements(tag, finalAttrs, void 0);
+    }
   }
   genRegularElementCode(params) {
     const { tag, attrs, children } = params;
@@ -45045,7 +45050,7 @@ class DomCodeGenerator {
         }
       }
     }
-    if (children && children.length > 0 && tag !== NODE_TYPE_TEXT) {
+    if (children && children.length > 0) {
       for (const child of children) {
         const inlineCode = this.tryInlineChild(child);
         if (inlineCode) {
diff --git a/packages/uni-cli-shared/lib/vapor/@vue/compiler-vapor/dist/compiler-vapor.cjs.js b/packages/uni-cli-shared/lib/vapor/@vue/compiler-vapor/dist/compiler-vapor.cjs.js
@@ -1937,9 +1937,14 @@ class DomCodeGenerator {
   }
   genTextElementCode(params) {
     const { tag, attrs, children } = params;
-    const textContent = this.extractTextContent(children);
-    const finalAttrs = this.mergeTextAttributes(attrs, textContent);
-    return this.buildElementStatements(tag, finalAttrs, void 0);
+    const hasComplexChildren = children && children.some((child) => child.type === NODE_TYPE_ELEMENT);
+    if (hasComplexChildren) {
+      return this.buildElementStatements(tag, attrs, children);
+    } else {
+      const textContent = this.extractTextContent(children);
+      const finalAttrs = this.mergeTextAttributes(attrs, textContent);
+      return this.buildElementStatements(tag, finalAttrs, void 0);
+    }
   }
   genRegularElementCode(params) {
     const { tag, attrs, children } = params;
@@ -1981,7 +1986,7 @@ class DomCodeGenerator {
         }
       }
     }
-    if (children && children.length > 0 && tag !== NODE_TYPE_TEXT) {
+    if (children && children.length > 0) {
       for (const child of children) {
         const inlineCode = this.tryInlineChild(child);
         if (inlineCode) {
diff --git a/packages/uni-cli-shared/lib/vapor/@vue/compiler-vapor/dist/compiler-vapor.esm-browser.js b/packages/uni-cli-shared/lib/vapor/@vue/compiler-vapor/dist/compiler-vapor.esm-browser.js
@@ -34465,9 +34465,14 @@ class DomCodeGenerator {
   }
   genTextElementCode(params) {
     const { tag, attrs, children } = params;
-    const textContent = this.extractTextContent(children);
-    const finalAttrs = this.mergeTextAttributes(attrs, textContent);
-    return this.buildElementStatements(tag, finalAttrs, void 0);
+    const hasComplexChildren = children && children.some((child) => child.type === NODE_TYPE_ELEMENT);
+    if (hasComplexChildren) {
+      return this.buildElementStatements(tag, attrs, children);
+    } else {
+      const textContent = this.extractTextContent(children);
+      const finalAttrs = this.mergeTextAttributes(attrs, textContent);
+      return this.buildElementStatements(tag, finalAttrs, void 0);
+    }
   }
   genRegularElementCode(params) {
     const { tag, attrs, children } = params;
@@ -34509,7 +34514,7 @@ class DomCodeGenerator {
         }
       }
     }
-    if (children && children.length > 0 && tag !== NODE_TYPE_TEXT) {
+    if (children && children.length > 0) {
       for (const child of children) {
         const inlineCode = this.tryInlineChild(child);
         if (inlineCode) {

Original file line number	Diff line number	Diff line change
`@@ -45001,9 +45001,14 @@ class DomCodeGenerator {`
`45001`	`45001`	`}`
`45002`	`45002`	`genTextElementCode(params) {`
`45003`	`45003`	`const { tag, attrs, children } = params;`
`45004`		`- const textContent = this.extractTextContent(children);`
`45005`		`- const finalAttrs = this.mergeTextAttributes(attrs, textContent);`
`45006`		`- return this.buildElementStatements(tag, finalAttrs, void 0);`
	`45004`	`+ const hasComplexChildren = children && children.some((child) => child.type === NODE_TYPE_ELEMENT);`
	`45005`	`+ if (hasComplexChildren) {`
	`45006`	`+ return this.buildElementStatements(tag, attrs, children);`
	`45007`	`+ } else {`
	`45008`	`+ const textContent = this.extractTextContent(children);`
	`45009`	`+ const finalAttrs = this.mergeTextAttributes(attrs, textContent);`
	`45010`	`+ return this.buildElementStatements(tag, finalAttrs, void 0);`
	`45011`	`+ }`
`45007`	`45012`	`}`
`45008`	`45013`	`genRegularElementCode(params) {`
`45009`	`45014`	`const { tag, attrs, children } = params;`
`@@ -45045,7 +45050,7 @@ class DomCodeGenerator {`
`45045`	`45050`	`}`
`45046`	`45051`	`}`
`45047`	`45052`	`}`
`45048`		`- if (children && children.length > 0 && tag !== NODE_TYPE_TEXT) {`
	`45053`	`+ if (children && children.length > 0) {`
`45049`	`45054`	`for (const child of children) {`
`45050`	`45055`	`const inlineCode = this.tryInlineChild(child);`
`45051`	`45056`	`if (inlineCode) {`
Original file line number	Diff line number	Diff line change
`@@ -1937,9 +1937,14 @@ class DomCodeGenerator {`
`1937`	`1937`	`}`
`1938`	`1938`	`genTextElementCode(params) {`
`1939`	`1939`	`const { tag, attrs, children } = params;`
`1940`		`- const textContent = this.extractTextContent(children);`
`1941`		`- const finalAttrs = this.mergeTextAttributes(attrs, textContent);`
`1942`		`- return this.buildElementStatements(tag, finalAttrs, void 0);`
	`1940`	`+ const hasComplexChildren = children && children.some((child) => child.type === NODE_TYPE_ELEMENT);`
	`1941`	`+ if (hasComplexChildren) {`
	`1942`	`+ return this.buildElementStatements(tag, attrs, children);`
	`1943`	`+ } else {`
	`1944`	`+ const textContent = this.extractTextContent(children);`
	`1945`	`+ const finalAttrs = this.mergeTextAttributes(attrs, textContent);`
	`1946`	`+ return this.buildElementStatements(tag, finalAttrs, void 0);`
	`1947`	`+ }`
`1943`	`1948`	`}`
`1944`	`1949`	`genRegularElementCode(params) {`
`1945`	`1950`	`const { tag, attrs, children } = params;`
`@@ -1981,7 +1986,7 @@ class DomCodeGenerator {`
`1981`	`1986`	`}`
`1982`	`1987`	`}`
`1983`	`1988`	`}`
`1984`		`- if (children && children.length > 0 && tag !== NODE_TYPE_TEXT) {`
	`1989`	`+ if (children && children.length > 0) {`
`1985`	`1990`	`for (const child of children) {`
`1986`	`1991`	`const inlineCode = this.tryInlineChild(child);`
`1987`	`1992`	`if (inlineCode) {`
Original file line number	Diff line number	Diff line change
`@@ -34465,9 +34465,14 @@ class DomCodeGenerator {`
`34465`	`34465`	`}`
`34466`	`34466`	`genTextElementCode(params) {`
`34467`	`34467`	`const { tag, attrs, children } = params;`
`34468`		`- const textContent = this.extractTextContent(children);`
`34469`		`- const finalAttrs = this.mergeTextAttributes(attrs, textContent);`
`34470`		`- return this.buildElementStatements(tag, finalAttrs, void 0);`
	`34468`	`+ const hasComplexChildren = children && children.some((child) => child.type === NODE_TYPE_ELEMENT);`
	`34469`	`+ if (hasComplexChildren) {`
	`34470`	`+ return this.buildElementStatements(tag, attrs, children);`
	`34471`	`+ } else {`
	`34472`	`+ const textContent = this.extractTextContent(children);`
	`34473`	`+ const finalAttrs = this.mergeTextAttributes(attrs, textContent);`
	`34474`	`+ return this.buildElementStatements(tag, finalAttrs, void 0);`
	`34475`	`+ }`
`34471`	`34476`	`}`
`34472`	`34477`	`genRegularElementCode(params) {`
`34473`	`34478`	`const { tag, attrs, children } = params;`
`@@ -34509,7 +34514,7 @@ class DomCodeGenerator {`
`34509`	`34514`	`}`
`34510`	`34515`	`}`
`34511`	`34516`	`}`
`34512`		`- if (children && children.length > 0 && tag !== NODE_TYPE_TEXT) {`
	`34517`	`+ if (children && children.length > 0) {`
`34513`	`34518`	`for (const child of children) {`
`34514`	`34519`	`const inlineCode = this.tryInlineChild(child);`
`34515`	`34520`	`if (inlineCode) {`