@weapp-vite/web 2.0.0 → 2.1.0

package/dist/_virtual/_rolldown/runtime.mjs

@@ -1,4 +1,4 @@
-//#region \0rolldown/runtime.js
+// \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -32,5 +32,4 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 
-//#endregion
 export { __exportAll, __reExport };

package/dist/compiler/wxml/attributes.mjs

@@ -1,7 +1,7 @@
 import { CONTROL_ATTRS, EVENT_KIND_ALIAS, EVENT_PREFIX_RE, hasControlAttribute, normalizeAttributeName, resolveControlAttributeValue } from "../../shared/wxml.mjs";
-import { buildExpression, parseInterpolations } from "./interpolation.mjs";
+import { buildDatasetExpression, buildExpression, parseInterpolations } from "./interpolation.mjs";
 
-//#region src/compiler/wxml/attributes.ts
+// src/compiler/wxml/attributes.ts
 function extractFor(attribs) {
 	const expr = resolveControlAttributeValue(attribs, "for");
 	const itemName = resolveControlAttributeValue(attribs, "for-item")?.trim() || "item";
@@ -84,12 +84,20 @@ function renderAttributes(attribs, scopeVar, wxsVar, options) {
 		}
 		const useProperty = shouldBindAsProperty(rawName) && (options?.preferProperty || options?.propertyAttributes?.includes(rawName));
 		const name = useProperty ? normalizePropertyName(rawName) : normalizeAttributeName(rawName);
-		const expr = buildExpression(parseInterpolations(rawValue ?? ""), scopeVar, wxsVar);
+		if (!useProperty && name.startsWith("data-")) {
+			const expr = buildDatasetExpression(rawValue ?? "", scopeVar, wxsVar);
+			buffer += ` \${bindRuntimeDataset(${JSON.stringify(name)}, ${expr})}`;
+			continue;
+		}
+		const parts = parseInterpolations(rawValue ?? "");
+		const trimmedParts = name === "style" ? parseInterpolations((rawValue ?? "").trim()) : parts;
+		const valueParts = trimmedParts.length === 1 && trimmedParts[0]?.type === "expr" ? trimmedParts : parts;
+		const rawExpr = buildExpression(valueParts, scopeVar, wxsVar);
+		const expr = name === "style" ? `__weappInlineStyle(${rawExpr})` : rawExpr;
 		buffer += ` ${useProperty ? "." : ""}${name}=\${${expr}}`;
 	}
 	return buffer;
 }
 
-//#endregion
 export { extractFor, isConditionalElement, renderAttributes, resolveComponentTagName, stripControlAttributes };
 //# sourceMappingURL=attributes.mjs.map

package/dist/compiler/wxml/attributes.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"attributes.mjs","names":[],"sources":["../../../src/compiler/wxml/attributes.ts"],"sourcesContent":["import type { RenderElementNode, RenderNode } from './types'\nimport {\n  CONTROL_ATTRS,\n  EVENT_KIND_ALIAS,\n  EVENT_PREFIX_RE,\n  hasControlAttribute,\n  normalizeAttributeName,\n  resolveControlAttributeValue,\n} from '../../shared/wxml'\nimport { buildExpression, parseInterpolations } from './interpolation'\n\nexport function extractFor(attribs: Record<string, string>) {\n  const expr = resolveControlAttributeValue(attribs, 'for')\n  const itemName = resolveControlAttributeValue(attribs, 'for-item')?.trim() || 'item'\n  let indexName = resolveControlAttributeValue(attribs, 'for-index')?.trim() || 'index'\n  const key = resolveControlAttributeValue(attribs, 'key')\n  const restAttribs: Record<string, string> = {}\n  for (const [name, value] of Object.entries(attribs)) {\n    if (CONTROL_ATTRS.has(name)) {\n      continue\n    }\n    restAttribs[name] = value\n  }\n  if (itemName === indexName) {\n    indexName = `${indexName}Index`\n  }\n  return { expr, itemName, indexName, key, restAttribs }\n}\n\nexport function isConditionalElement(node: RenderNode): node is RenderElementNode {\n  if (node.type !== 'element') {\n    return false\n  }\n  const attribs = node.attribs ?? {}\n  return hasControlAttribute(attribs, 'if')\n    || hasControlAttribute(attribs, 'elif')\n    || hasControlAttribute(attribs, 'else')\n}\n\nexport function stripControlAttributes(attribs: Record<string, string>) {\n  const result: Record<string, string> = {}\n  for (const [name, value] of Object.entries(attribs)) {\n    if (!CONTROL_ATTRS.has(name)) {\n      result[name] = value\n    }\n  }\n  return result\n}\n\nfunction parseEventAttribute(name: string) {\n  if (name.includes(':')) {\n    const [prefix, rawEvent] = name.split(':', 2)\n    return { prefix, rawEvent }\n  }\n  const match = EVENT_PREFIX_RE.exec(name)\n  if (!match) {\n    return undefined\n  }\n  return { prefix: name.slice(0, name.length - match[1].length), rawEvent: match[1] }\n}\n\nexport function resolveComponentTagName(name: string, componentTags?: Record<string, string>) {\n  if (!componentTags) {\n    return undefined\n  }\n  return componentTags[name] ?? componentTags[name.toLowerCase()]\n}\n\nconst PROPERTY_BIND_EXCLUSIONS = new Set(['class', 'style', 'id', 'slot'])\n\nfunction shouldBindAsProperty(name: string) {\n  if (PROPERTY_BIND_EXCLUSIONS.has(name)) {\n    return false\n  }\n  if (name.startsWith('data-') || name.startsWith('aria-')) {\n    return false\n  }\n  return true\n}\n\nfunction normalizePropertyName(name: string) {\n  return name.replace(/-([a-z])/g, (_, char: string) => char.toUpperCase())\n}\n\nexport function renderAttributes(\n  attribs: Record<string, string>,\n  scopeVar: string,\n  wxsVar: string,\n  options?: {\n    skipControl?: boolean\n    preferProperty?: boolean\n    propertyAttributes?: readonly string[]\n  },\n) {\n  let buffer = ''\n  for (const [rawName, rawValue] of Object.entries(attribs)) {\n    if (options?.skipControl && CONTROL_ATTRS.has(rawName)) {\n      continue\n    }\n    const eventInfo = parseEventAttribute(rawName)\n    if (eventInfo) {\n      const normalizedEvent = eventInfo.rawEvent.toLowerCase()\n      const aliasedEvent = EVENT_KIND_ALIAS[normalizedEvent]\n      const event = aliasedEvent ? normalizedEvent : eventInfo.rawEvent\n      const domEvent = aliasedEvent ?? eventInfo.rawEvent\n      const handlerExpr = buildExpression(parseInterpolations(rawValue ?? ''), scopeVar, wxsVar)\n      const flags = {\n        catch: eventInfo.prefix.includes('catch'),\n        capture: eventInfo.prefix.includes('capture'),\n      }\n      buffer += ` \\${bindRuntimeEvent(${JSON.stringify(domEvent)}, ctx.event(${JSON.stringify(event)}, ${handlerExpr}, ${scopeVar}, ${wxsVar}, ${JSON.stringify(flags)}), ${JSON.stringify(flags)})}`\n      continue\n    }\n    const useProperty = shouldBindAsProperty(rawName)\n      && (options?.preferProperty || options?.propertyAttributes?.includes(rawName))\n    const name = useProperty ? normalizePropertyName(rawName) : normalizeAttributeName(rawName)\n    const expr = buildExpression(parseInterpolations(rawValue ?? ''), scopeVar, wxsVar)\n    buffer += ` ${useProperty ? '.' : ''}${name}=\\${${expr}}`\n  }\n  return buffer\n}\n"],"mappings":"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"}
+{"version":3,"file":"attributes.mjs","names":[],"sources":["../../../src/compiler/wxml/attributes.ts"],"sourcesContent":["import type { RenderElementNode, RenderNode } from './types'\nimport {\n  CONTROL_ATTRS,\n  EVENT_KIND_ALIAS,\n  EVENT_PREFIX_RE,\n  hasControlAttribute,\n  normalizeAttributeName,\n  resolveControlAttributeValue,\n} from '../../shared/wxml'\nimport { buildDatasetExpression, buildExpression, parseInterpolations } from './interpolation'\n\nexport function extractFor(attribs: Record<string, string>) {\n  const expr = resolveControlAttributeValue(attribs, 'for')\n  const itemName = resolveControlAttributeValue(attribs, 'for-item')?.trim() || 'item'\n  let indexName = resolveControlAttributeValue(attribs, 'for-index')?.trim() || 'index'\n  const key = resolveControlAttributeValue(attribs, 'key')\n  const restAttribs: Record<string, string> = {}\n  for (const [name, value] of Object.entries(attribs)) {\n    if (CONTROL_ATTRS.has(name)) {\n      continue\n    }\n    restAttribs[name] = value\n  }\n  if (itemName === indexName) {\n    indexName = `${indexName}Index`\n  }\n  return { expr, itemName, indexName, key, restAttribs }\n}\n\nexport function isConditionalElement(node: RenderNode): node is RenderElementNode {\n  if (node.type !== 'element') {\n    return false\n  }\n  const attribs = node.attribs ?? {}\n  return hasControlAttribute(attribs, 'if')\n    || hasControlAttribute(attribs, 'elif')\n    || hasControlAttribute(attribs, 'else')\n}\n\nexport function stripControlAttributes(attribs: Record<string, string>) {\n  const result: Record<string, string> = {}\n  for (const [name, value] of Object.entries(attribs)) {\n    if (!CONTROL_ATTRS.has(name)) {\n      result[name] = value\n    }\n  }\n  return result\n}\n\nfunction parseEventAttribute(name: string) {\n  if (name.includes(':')) {\n    const [prefix, rawEvent] = name.split(':', 2)\n    return { prefix, rawEvent }\n  }\n  const match = EVENT_PREFIX_RE.exec(name)\n  if (!match) {\n    return undefined\n  }\n  return { prefix: name.slice(0, name.length - match[1].length), rawEvent: match[1] }\n}\n\nexport function resolveComponentTagName(name: string, componentTags?: Record<string, string>) {\n  if (!componentTags) {\n    return undefined\n  }\n  return componentTags[name] ?? componentTags[name.toLowerCase()]\n}\n\nconst PROPERTY_BIND_EXCLUSIONS = new Set(['class', 'style', 'id', 'slot'])\n\nfunction shouldBindAsProperty(name: string) {\n  if (PROPERTY_BIND_EXCLUSIONS.has(name)) {\n    return false\n  }\n  if (name.startsWith('data-') || name.startsWith('aria-')) {\n    return false\n  }\n  return true\n}\n\nfunction normalizePropertyName(name: string) {\n  return name.replace(/-([a-z])/g, (_, char: string) => char.toUpperCase())\n}\n\nexport function renderAttributes(\n  attribs: Record<string, string>,\n  scopeVar: string,\n  wxsVar: string,\n  options?: {\n    skipControl?: boolean\n    preferProperty?: boolean\n    propertyAttributes?: readonly string[]\n  },\n) {\n  let buffer = ''\n  for (const [rawName, rawValue] of Object.entries(attribs)) {\n    if (options?.skipControl && CONTROL_ATTRS.has(rawName)) {\n      continue\n    }\n    const eventInfo = parseEventAttribute(rawName)\n    if (eventInfo) {\n      const normalizedEvent = eventInfo.rawEvent.toLowerCase()\n      const aliasedEvent = EVENT_KIND_ALIAS[normalizedEvent]\n      const event = aliasedEvent ? normalizedEvent : eventInfo.rawEvent\n      const domEvent = aliasedEvent ?? eventInfo.rawEvent\n      const handlerExpr = buildExpression(parseInterpolations(rawValue ?? ''), scopeVar, wxsVar)\n      const flags = {\n        catch: eventInfo.prefix.includes('catch'),\n        capture: eventInfo.prefix.includes('capture'),\n      }\n      buffer += ` \\${bindRuntimeEvent(${JSON.stringify(domEvent)}, ctx.event(${JSON.stringify(event)}, ${handlerExpr}, ${scopeVar}, ${wxsVar}, ${JSON.stringify(flags)}), ${JSON.stringify(flags)})}`\n      continue\n    }\n    const useProperty = shouldBindAsProperty(rawName)\n      && (options?.preferProperty || options?.propertyAttributes?.includes(rawName))\n    const name = useProperty ? normalizePropertyName(rawName) : normalizeAttributeName(rawName)\n    // DOM 属性保留字符串，完整表达式的值类型由运行时单独保存。\n    if (!useProperty && name.startsWith('data-')) {\n      const expr = buildDatasetExpression(rawValue ?? '', scopeVar, wxsVar)\n      buffer += ` \\${bindRuntimeDataset(${JSON.stringify(name)}, ${expr})}`\n      continue\n    }\n    const parts = parseInterpolations(rawValue ?? '')\n    const trimmedParts = name === 'style' ? parseInterpolations((rawValue ?? '').trim()) : parts\n    const valueParts = trimmedParts.length === 1 && trimmedParts[0]?.type === 'expr' ? trimmedParts : parts\n    const rawExpr = buildExpression(valueParts, scopeVar, wxsVar)\n    // WXML 内联 style 不经过 postcss 链路，rpx / vw / vh 需要在运行时换算，\n    // 否则浏览器会丢弃整条声明（详见 inlineStyle.ts）。\n    const expr = name === 'style' ? `__weappInlineStyle(${rawExpr})` : rawExpr\n    buffer += ` ${useProperty ? '.' : ''}${name}=\\${${expr}}`\n  }\n  return buffer\n}\n"],"mappings":"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"}

package/dist/compiler/wxml/compile.mjs

@@ -1,20 +1,26 @@
 import { RUNTIME_ID } from "../../plugin/constants.mjs";
-import { addDependency, createDependencyContext, warnCircularTemplate, warnReadTemplate } from "./dependency.mjs";
-import { buildNavigationBarAttrs, extractNavigationBarFromPageMeta } from "./navigation.mjs";
-import { parseWxml } from "./parser.mjs";
+import { addDependency, collectDependencies, createDependencyContext, warnCircularTemplate, warnReadTemplate } from "./dependency.mjs";
+import { buildNavigationBarAttrs } from "./navigation.mjs";
+import { normalizeTemplatePath, shouldMarkWxsImport, toRelativeImport } from "./specialNodes.mjs";
+import { prepareWxml } from "./prepare.mjs";
 import { renderer } from "./renderer.mjs";
-import { collectSpecialNodes, normalizeTemplatePath, shouldMarkWxsImport, toRelativeImport } from "./specialNodes.mjs";
+import { collectUnknownTags, formatUnknownTagWarning } from "./unknownTags.mjs";
 import { readFileSync } from "node:fs";
 
-//#region src/compiler/wxml/compile.ts
+// src/compiler/wxml/compile.ts
 const WEB_TEMPLATE_QUERY = "weapp-web-template";
 function appendTemplateQuery(pathname) {
 	return `${pathname}${pathname.includes("?") ? "&" : "?"}${WEB_TEMPLATE_QUERY}`;
 }
-function compileWxml(options) {
+function compileTemplate(options, diagnoseUnknownTags) {
 	const dependencyContext = options.dependencyContext ?? createDependencyContext();
 	const expandDependencies = options.expandDependencies ?? !options.dependencyContext;
 	const warnings = dependencyContext.warnings;
+	const warnUnknownTags = (prepared, id) => {
+		if (!diagnoseUnknownTags) return;
+		const tags = collectUnknownTags(prepared.renderNodes, options.componentTags, prepared.templates.flatMap((template) => template.nodes));
+		if (tags.length > 0) warnings.push(formatUnknownTagWarning(tags, id));
+	};
 	const expandDependencyTree = (dependencies, importer) => {
 		for (const target of dependencies) {
 			if (dependencyContext.active.has(target)) {
@@ -33,44 +39,24 @@ function compileWxml(options) {
 				continue;
 			}
 			try {
-				const result = compileWxml({
+				const result = prepareWxml({
 					id: target,
 					source,
 					resolveTemplatePath: options.resolveTemplatePath,
-					resolveWxsPath: options.resolveWxsPath,
-					dependencyContext,
-					expandDependencies: false
-				});
-				expandDependencyTree(result.dependencies, target);
+					resolveWxsPath: options.resolveWxsPath
+				}, dependencyContext);
+				warnUnknownTags(result, target);
+				collectDependencies(result, dependencyContext);
+				expandDependencyTree([...result.imports, ...result.includes].map((entry) => entry.id), target);
 			} catch (error) {
 				if (error instanceof Error && error.message) warnings.push(`[web] 无法解析模板依赖: ${target} ${error.message}`);
 			}
 			dependencyContext.active.delete(target);
 		}
 	};
-	let nodes = parseWxml(options.source);
-	let navigationBarAttrs;
-	if (options.navigationBar) {
-		const extracted = extractNavigationBarFromPageMeta(nodes);
-		nodes = extracted.nodes;
-		if (extracted.warnings.length > 0) warnings.push(...extracted.warnings);
-		navigationBarAttrs = extracted.attrs;
-	}
-	const templates = [];
-	const includes = [];
-	const imports = [];
-	const wxs = [];
-	const renderNodesList = collectSpecialNodes(nodes, {
-		templates,
-		includes,
-		imports,
-		wxs,
-		wxsModules: /* @__PURE__ */ new Map(),
-		warnings,
-		sourceId: options.id,
-		resolveTemplate: (raw) => options.resolveTemplatePath(raw, options.id),
-		resolveWxs: (raw) => options.resolveWxsPath(raw, options.id)
-	});
+	const prepared = prepareWxml(options, dependencyContext);
+	warnUnknownTags(prepared, options.id);
+	const { renderNodes: renderNodesList, navigationBarAttrs, templates, includes, imports, wxs } = prepared;
 	if (options.navigationBar && options.navigationBar.config.navigationStyle !== "custom") {
 		const attrs = buildNavigationBarAttrs(options.navigationBar.config, navigationBarAttrs);
 		renderNodesList.unshift({
@@ -82,7 +68,9 @@ function compileWxml(options) {
 	const importLines = [
 		`import { html } from 'lit'`,
 		`import { repeat } from 'lit/directives/repeat.js'`,
-		`import { bindRuntimeEvent } from '${RUNTIME_ID}'`
+		`import { bindRuntimeEvent } from '${RUNTIME_ID}'`,
+		`import { bindRuntimeDataset } from '${RUNTIME_ID}'`,
+		`import { transformInlineStyleValue as __weappInlineStyle } from '${RUNTIME_ID}'`
 	];
 	const bodyLines = [];
 	const directDependencies = [];
@@ -148,7 +136,7 @@ function compileWxml(options) {
 	if (expandDependencies) {
 		dependencyContext.visited.add(options.id);
 		dependencyContext.active.add(options.id);
-		expandDependencyTree(directDependencies, options.id);
+		expandDependencyTree([...imports, ...includes].map((entry) => entry.id), options.id);
 		dependencyContext.active.delete(options.id);
 	}
 	return {
@@ -161,7 +149,13 @@ function compileWxml(options) {
 		warnings: warnings.length > 0 ? warnings : void 0
 	};
 }
+function compileWxml(options) {
+	return compileTemplate(options, true);
+}
+/** 依赖模块的标签诊断由入口模板按其组件注册作用域统一收集。 */
+function compileWxmlDependency(options) {
+	return compileTemplate(options, false);
+}
 
-//#endregion
-export { compileWxml };
+export { compileWxml, compileWxmlDependency };
 //# sourceMappingURL=compile.mjs.map

package/dist/compiler/wxml/compile.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"compile.mjs","names":[],"sources":["../../../src/compiler/wxml/compile.ts"],"sourcesContent":["import type {\n  ImportEntry,\n  IncludeEntry,\n  TemplateDefinition,\n  WxmlCompileOptions,\n  WxmlCompileResult,\n  WxsEntry,\n} from './types'\n\nimport { readFileSync } from 'node:fs'\nimport { RUNTIME_ID } from '../../plugin/constants'\nimport { addDependency, createDependencyContext, warnCircularTemplate, warnReadTemplate } from './dependency'\nimport { buildNavigationBarAttrs, extractNavigationBarFromPageMeta } from './navigation'\nimport { parseWxml } from './parser'\nimport { renderer } from './renderer'\nimport { collectSpecialNodes, normalizeTemplatePath, shouldMarkWxsImport, toRelativeImport } from './specialNodes'\n\nconst WEB_TEMPLATE_QUERY = 'weapp-web-template'\n\nfunction appendTemplateQuery(pathname: string) {\n  return `${pathname}${pathname.includes('?') ? '&' : '?'}${WEB_TEMPLATE_QUERY}`\n}\n\nexport function compileWxml(options: WxmlCompileOptions): WxmlCompileResult {\n  const dependencyContext = options.dependencyContext ?? createDependencyContext()\n  const expandDependencies = options.expandDependencies ?? !options.dependencyContext\n  const warnings = dependencyContext.warnings\n\n  const expandDependencyTree = (dependencies: string[], importer: string) => {\n    for (const target of dependencies) {\n      if (dependencyContext.active.has(target)) {\n        warnCircularTemplate(dependencyContext, importer, target)\n        continue\n      }\n      if (dependencyContext.visited.has(target)) {\n        continue\n      }\n      dependencyContext.visited.add(target)\n      dependencyContext.active.add(target)\n      let source: string\n      try {\n        source = readFileSync(target, 'utf8')\n      }\n      catch {\n        warnReadTemplate(dependencyContext, target)\n        dependencyContext.active.delete(target)\n        continue\n      }\n      try {\n        const result = compileWxml({\n          id: target,\n          source,\n          resolveTemplatePath: options.resolveTemplatePath,\n          resolveWxsPath: options.resolveWxsPath,\n          dependencyContext,\n          expandDependencies: false,\n        })\n        expandDependencyTree(result.dependencies, target)\n      }\n      catch (error) {\n        if (error instanceof Error && error.message) {\n          warnings.push(`[web] 无法解析模板依赖: ${target} ${error.message}`)\n        }\n      }\n      dependencyContext.active.delete(target)\n    }\n  }\n\n  let nodes = parseWxml(options.source)\n  let navigationBarAttrs: Record<string, string> | undefined\n  if (options.navigationBar) {\n    const extracted = extractNavigationBarFromPageMeta(nodes)\n    nodes = extracted.nodes\n    if (extracted.warnings.length > 0) {\n      warnings.push(...extracted.warnings)\n    }\n    navigationBarAttrs = extracted.attrs\n  }\n\n  const templates: TemplateDefinition[] = []\n  const includes: IncludeEntry[] = []\n  const imports: ImportEntry[] = []\n  const wxs: WxsEntry[] = []\n  const wxsModules = new Map<string, string>()\n\n  const renderNodesList = collectSpecialNodes(nodes, {\n    templates,\n    includes,\n    imports,\n    wxs,\n    wxsModules,\n    warnings,\n    sourceId: options.id,\n    resolveTemplate: (raw: string) => options.resolveTemplatePath(raw, options.id),\n    resolveWxs: (raw: string) => options.resolveWxsPath(raw, options.id),\n  })\n\n  if (options.navigationBar && options.navigationBar.config.navigationStyle !== 'custom') {\n    const attrs = buildNavigationBarAttrs(options.navigationBar.config, navigationBarAttrs)\n    renderNodesList.unshift({\n      type: 'element',\n      name: 'weapp-navigation-bar',\n      attribs: attrs,\n    })\n  }\n\n  const importLines: string[] = [\n    `import { html } from 'lit'`,\n    `import { repeat } from 'lit/directives/repeat.js'`,\n    `import { bindRuntimeEvent } from '${RUNTIME_ID}'`,\n  ]\n  const bodyLines: string[] = []\n  const directDependencies: string[] = []\n\n  for (const entry of imports) {\n    const importPath = normalizeTemplatePath(toRelativeImport(options.id, entry.id))\n    importLines.push(`import { templates as ${entry.importName} } from '${appendTemplateQuery(importPath)}'`)\n    addDependency(entry.id, dependencyContext, directDependencies)\n  }\n\n  for (const entry of includes) {\n    const importPath = normalizeTemplatePath(toRelativeImport(options.id, entry.id))\n    importLines.push(`import { render as ${entry.importName} } from '${appendTemplateQuery(importPath)}'`)\n    addDependency(entry.id, dependencyContext, directDependencies)\n  }\n\n  for (const entry of wxs) {\n    if (entry.kind === 'src') {\n      const baseImport = normalizeTemplatePath(toRelativeImport(options.id, entry.value))\n      const importPath = shouldMarkWxsImport(entry.value)\n        ? `${baseImport}?wxs`\n        : baseImport\n      importLines.push(`import ${entry.importName} from '${importPath}'`)\n      addDependency(entry.value, dependencyContext, directDependencies)\n    }\n  }\n\n  if (templates.length > 0 || imports.length > 0) {\n    const templatePairs: string[] = []\n    for (const entry of imports) {\n      templatePairs.push(`...${entry.importName}`)\n    }\n    for (const template of templates) {\n      const rendered = renderer.renderNodes(template.nodes, 'scope', '__wxs_modules', options.componentTags)\n      templatePairs.push(`${JSON.stringify(template.name)}: (scope, ctx) => ${rendered}`)\n    }\n    bodyLines.push(`const __templates = { ${templatePairs.join(', ')} }`)\n  }\n  else {\n    bodyLines.push(`const __templates = {}`)\n  }\n\n  if (wxs.length > 0) {\n    bodyLines.push(`const __wxs_inline_cache = Object.create(null)`)\n    bodyLines.push(`let __wxs_modules = {}`)\n    const wxsMapEntries: string[] = []\n    for (const entry of wxs) {\n      if (entry.kind === 'inline') {\n        const inlineCode = entry.value.trim()\n        const cacheKey = JSON.stringify(entry.module)\n        if (inlineCode) {\n          bodyLines.push(`function ${entry.importName}(ctx) {`)\n          bodyLines.push(`  if (!__wxs_inline_cache[${cacheKey}]) {`)\n          bodyLines.push(`    __wxs_inline_cache[${cacheKey}] = ctx.createWxsModule(${JSON.stringify(inlineCode)}, ${JSON.stringify(options.id)})`)\n          bodyLines.push(`  }`)\n          bodyLines.push(`  return __wxs_inline_cache[${cacheKey}]`)\n          bodyLines.push(`}`)\n        }\n        else {\n          bodyLines.push(`function ${entry.importName}() { return {} }`)\n        }\n        wxsMapEntries.push(`${JSON.stringify(entry.module)}: ${entry.importName}(ctx)`)\n        continue\n      }\n      wxsMapEntries.push(`${JSON.stringify(entry.module)}: ${entry.importName}`)\n    }\n    bodyLines.push(`function __resolveWxsModules(ctx) {`)\n    bodyLines.push(`  return { ${wxsMapEntries.join(', ')} }`)\n    bodyLines.push(`}`)\n  }\n  else {\n    bodyLines.push(`const __wxs_modules = {}`)\n  }\n\n  const includesRender = includes.map(entry => `${entry.importName}(scope, ctx)`)\n  const renderContent = renderer.renderNodes(renderNodesList, 'scope', '__wxs_modules', options.componentTags)\n  const contentExpr = includesRender.length > 0\n    ? `[${[...includesRender, renderContent].join(', ')}]`\n    : renderContent\n\n  bodyLines.push(`export function render(scope, ctx) {`)\n  if (wxs.length > 0) {\n    bodyLines.push(`  __wxs_modules = __resolveWxsModules(ctx)`)\n  }\n  bodyLines.push(`  return ${contentExpr}`)\n  bodyLines.push(`}`)\n  bodyLines.push(`export const templates = __templates`)\n  bodyLines.push(`export default render`)\n\n  if (expandDependencies) {\n    dependencyContext.visited.add(options.id)\n    dependencyContext.active.add(options.id)\n    expandDependencyTree(directDependencies, options.id)\n    dependencyContext.active.delete(options.id)\n  }\n\n  const code = [...importLines, '', ...bodyLines].join('\\n')\n  const dependencies = expandDependencies ? dependencyContext.dependencies : directDependencies\n  return {\n    code,\n    dependencies,\n    warnings: warnings.length > 0 ? warnings : undefined,\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"compile.mjs","names":[],"sources":["../../../src/compiler/wxml/compile.ts"],"sourcesContent":["import type { WxmlCompileOptions, WxmlCompileResult } from './types'\n\nimport { readFileSync } from 'node:fs'\nimport { RUNTIME_ID } from '../../plugin/constants'\nimport { addDependency, collectDependencies, createDependencyContext, warnCircularTemplate, warnReadTemplate } from './dependency'\nimport { buildNavigationBarAttrs } from './navigation'\nimport { prepareWxml } from './prepare'\nimport { renderer } from './renderer'\nimport { normalizeTemplatePath, shouldMarkWxsImport, toRelativeImport } from './specialNodes'\nimport { collectUnknownTags, formatUnknownTagWarning } from './unknownTags'\n\nconst WEB_TEMPLATE_QUERY = 'weapp-web-template'\n\nfunction appendTemplateQuery(pathname: string) {\n  return `${pathname}${pathname.includes('?') ? '&' : '?'}${WEB_TEMPLATE_QUERY}`\n}\n\nfunction compileTemplate(options: WxmlCompileOptions, diagnoseUnknownTags: boolean): WxmlCompileResult {\n  const dependencyContext = options.dependencyContext ?? createDependencyContext()\n  const expandDependencies = options.expandDependencies ?? !options.dependencyContext\n  const warnings = dependencyContext.warnings\n\n  const warnUnknownTags = (prepared: ReturnType<typeof prepareWxml>, id: string) => {\n    if (!diagnoseUnknownTags) {\n      return\n    }\n    const tags = collectUnknownTags(prepared.renderNodes, options.componentTags, prepared.templates.flatMap(template => template.nodes))\n    if (tags.length > 0) {\n      warnings.push(formatUnknownTagWarning(tags, id))\n    }\n  }\n\n  const expandDependencyTree = (dependencies: string[], importer: string) => {\n    for (const target of dependencies) {\n      if (dependencyContext.active.has(target)) {\n        warnCircularTemplate(dependencyContext, importer, target)\n        continue\n      }\n      if (dependencyContext.visited.has(target)) {\n        continue\n      }\n      dependencyContext.visited.add(target)\n      dependencyContext.active.add(target)\n      let source: string\n      try {\n        source = readFileSync(target, 'utf8')\n      }\n      catch {\n        warnReadTemplate(dependencyContext, target)\n        dependencyContext.active.delete(target)\n        continue\n      }\n      try {\n        const result = prepareWxml({\n          id: target,\n          source,\n          resolveTemplatePath: options.resolveTemplatePath,\n          resolveWxsPath: options.resolveWxsPath,\n        }, dependencyContext)\n        warnUnknownTags(result, target)\n        collectDependencies(result, dependencyContext)\n        expandDependencyTree([...result.imports, ...result.includes].map(entry => entry.id), target)\n      }\n      catch (error) {\n        if (error instanceof Error && error.message) {\n          warnings.push(`[web] 无法解析模板依赖: ${target} ${error.message}`)\n        }\n      }\n      dependencyContext.active.delete(target)\n    }\n  }\n\n  const prepared = prepareWxml(options, dependencyContext)\n  warnUnknownTags(prepared, options.id)\n  const {\n    renderNodes: renderNodesList,\n    navigationBarAttrs,\n    templates,\n    includes,\n    imports,\n    wxs,\n  } = prepared\n\n  if (options.navigationBar && options.navigationBar.config.navigationStyle !== 'custom') {\n    const attrs = buildNavigationBarAttrs(options.navigationBar.config, navigationBarAttrs)\n    renderNodesList.unshift({\n      type: 'element',\n      name: 'weapp-navigation-bar',\n      attribs: attrs,\n    })\n  }\n\n  const importLines: string[] = [\n    `import { html } from 'lit'`,\n    `import { repeat } from 'lit/directives/repeat.js'`,\n    `import { bindRuntimeEvent } from '${RUNTIME_ID}'`,\n    `import { bindRuntimeDataset } from '${RUNTIME_ID}'`,\n    `import { transformInlineStyleValue as __weappInlineStyle } from '${RUNTIME_ID}'`,\n  ]\n  const bodyLines: string[] = []\n  const directDependencies: string[] = []\n\n  for (const entry of imports) {\n    const importPath = normalizeTemplatePath(toRelativeImport(options.id, entry.id))\n    importLines.push(`import { templates as ${entry.importName} } from '${appendTemplateQuery(importPath)}'`)\n    addDependency(entry.id, dependencyContext, directDependencies)\n  }\n\n  for (const entry of includes) {\n    const importPath = normalizeTemplatePath(toRelativeImport(options.id, entry.id))\n    importLines.push(`import { render as ${entry.importName} } from '${appendTemplateQuery(importPath)}'`)\n    addDependency(entry.id, dependencyContext, directDependencies)\n  }\n\n  for (const entry of wxs) {\n    if (entry.kind === 'src') {\n      const baseImport = normalizeTemplatePath(toRelativeImport(options.id, entry.value))\n      const importPath = shouldMarkWxsImport(entry.value)\n        ? `${baseImport}?wxs`\n        : baseImport\n      importLines.push(`import ${entry.importName} from '${importPath}'`)\n      addDependency(entry.value, dependencyContext, directDependencies)\n    }\n  }\n\n  if (templates.length > 0 || imports.length > 0) {\n    const templatePairs: string[] = []\n    for (const entry of imports) {\n      templatePairs.push(`...${entry.importName}`)\n    }\n    for (const template of templates) {\n      const rendered = renderer.renderNodes(template.nodes, 'scope', '__wxs_modules', options.componentTags)\n      templatePairs.push(`${JSON.stringify(template.name)}: (scope, ctx) => ${rendered}`)\n    }\n    bodyLines.push(`const __templates = { ${templatePairs.join(', ')} }`)\n  }\n  else {\n    bodyLines.push(`const __templates = {}`)\n  }\n\n  if (wxs.length > 0) {\n    bodyLines.push(`const __wxs_inline_cache = Object.create(null)`)\n    bodyLines.push(`let __wxs_modules = {}`)\n    const wxsMapEntries: string[] = []\n    for (const entry of wxs) {\n      if (entry.kind === 'inline') {\n        const inlineCode = entry.value.trim()\n        const cacheKey = JSON.stringify(entry.module)\n        if (inlineCode) {\n          bodyLines.push(`function ${entry.importName}(ctx) {`)\n          bodyLines.push(`  if (!__wxs_inline_cache[${cacheKey}]) {`)\n          bodyLines.push(`    __wxs_inline_cache[${cacheKey}] = ctx.createWxsModule(${JSON.stringify(inlineCode)}, ${JSON.stringify(options.id)})`)\n          bodyLines.push(`  }`)\n          bodyLines.push(`  return __wxs_inline_cache[${cacheKey}]`)\n          bodyLines.push(`}`)\n        }\n        else {\n          bodyLines.push(`function ${entry.importName}() { return {} }`)\n        }\n        wxsMapEntries.push(`${JSON.stringify(entry.module)}: ${entry.importName}(ctx)`)\n        continue\n      }\n      wxsMapEntries.push(`${JSON.stringify(entry.module)}: ${entry.importName}`)\n    }\n    bodyLines.push(`function __resolveWxsModules(ctx) {`)\n    bodyLines.push(`  return { ${wxsMapEntries.join(', ')} }`)\n    bodyLines.push(`}`)\n  }\n  else {\n    bodyLines.push(`const __wxs_modules = {}`)\n  }\n\n  const includesRender = includes.map(entry => `${entry.importName}(scope, ctx)`)\n  const renderContent = renderer.renderNodes(renderNodesList, 'scope', '__wxs_modules', options.componentTags)\n  const contentExpr = includesRender.length > 0\n    ? `[${[...includesRender, renderContent].join(', ')}]`\n    : renderContent\n\n  bodyLines.push(`export function render(scope, ctx) {`)\n  if (wxs.length > 0) {\n    bodyLines.push(`  __wxs_modules = __resolveWxsModules(ctx)`)\n  }\n  bodyLines.push(`  return ${contentExpr}`)\n  bodyLines.push(`}`)\n  bodyLines.push(`export const templates = __templates`)\n  bodyLines.push(`export default render`)\n\n  if (expandDependencies) {\n    dependencyContext.visited.add(options.id)\n    dependencyContext.active.add(options.id)\n    expandDependencyTree([...imports, ...includes].map(entry => entry.id), options.id)\n    dependencyContext.active.delete(options.id)\n  }\n\n  const code = [...importLines, '', ...bodyLines].join('\\n')\n  const dependencies = expandDependencies ? dependencyContext.dependencies : directDependencies\n  return {\n    code,\n    dependencies,\n    warnings: warnings.length > 0 ? warnings : undefined,\n  }\n}\n\nexport function compileWxml(options: WxmlCompileOptions): WxmlCompileResult {\n  return compileTemplate(options, true)\n}\n\n/** 依赖模块的标签诊断由入口模板按其组件注册作用域统一收集。 */\nexport function compileWxmlDependency(options: WxmlCompileOptions): WxmlCompileResult {\n  return compileTemplate(options, false)\n}\n"],"mappings":"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"}

package/dist/compiler/wxml/dependency.mjs

@@ -1,4 +1,4 @@
-//#region src/compiler/wxml/dependency.ts
+// src/compiler/wxml/dependency.ts
 function createDependencyContext() {
 	return {
 		warnings: [],
@@ -16,6 +16,14 @@ function addDependency(value, context, direct) {
 		direct?.push(value);
 	}
 }
+/** 依赖扫描完成分析后，按编译器的分组顺序登记直接依赖。 */
+function collectDependencies(entries, context) {
+	const dependencies = [];
+	for (const entry of entries.imports) addDependency(entry.id, context, dependencies);
+	for (const entry of entries.includes) addDependency(entry.id, context, dependencies);
+	for (const entry of entries.wxs) if (entry.kind === "src") addDependency(entry.value, context, dependencies);
+	return dependencies;
+}
 function warnReadTemplate(context, target) {
 	context.warnings.push(`[web] 无法读取模板依赖: ${target}`);
 }
@@ -26,6 +34,5 @@ function warnCircularTemplate(context, from, target) {
 	context.warnings.push(`[web] WXML 循环引用: ${from} -> ${target}`);
 }
 
-//#endregion
-export { addDependency, createDependencyContext, warnCircularTemplate, warnReadTemplate };
+export { addDependency, collectDependencies, createDependencyContext, warnCircularTemplate, warnReadTemplate };
 //# sourceMappingURL=dependency.mjs.map

package/dist/compiler/wxml/dependency.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dependency.mjs","names":[],"sources":["../../../src/compiler/wxml/dependency.ts"],"sourcesContent":["import type { WxmlDependencyContext } from './types'\n\nexport function createDependencyContext(): WxmlDependencyContext {\n  return {\n    warnings: [],\n    dependencies: [],\n    dependencySet: new Set(),\n    visited: new Set(),\n    active: new Set(),\n    circularWarnings: new Set(),\n  }\n}\n\nexport function addDependency(\n  value: string,\n  context: WxmlDependencyContext,\n  direct?: string[],\n) {\n  if (!context.dependencySet.has(value)) {\n    context.dependencySet.add(value)\n    context.dependencies.push(value)\n    direct?.push(value)\n  }\n}\n\nexport function warnReadTemplate(context: WxmlDependencyContext, target: string) {\n  context.warnings.push(`[web] 无法读取模板依赖: ${target}`)\n}\n\nexport function warnCircularTemplate(\n  context: WxmlDependencyContext,\n  from: string,\n  target: string,\n) {\n  const key = `${from}=>${target}`\n  if (context.circularWarnings.has(key)) {\n    return\n  }\n  context.circularWarnings.add(key)\n  context.warnings.push(`[web] WXML 循环引用: ${from} -> ${target}`)\n}\n"],"mappings":";AAEA,SAAgB,0BAAiD;CAC/D,OAAO;EACL,UAAU,CAAC;EACX,cAAc,CAAC;EACf,+BAAe,IAAI,IAAI;EACvB,yBAAS,IAAI,IAAI;EACjB,wBAAQ,IAAI,IAAI;EAChB,kCAAkB,IAAI,IAAI;CAC5B;AACF;AAEA,SAAgB,cACd,OACA,SACA,QACA;CACA,IAAI,CAAC,QAAQ,cAAc,IAAI,KAAK,GAAG;EACrC,QAAQ,cAAc,IAAI,KAAK;EAC/B,QAAQ,aAAa,KAAK,KAAK;EAC/B,QAAQ,KAAK,KAAK;CACpB;AACF;AAEA,SAAgB,iBAAiB,SAAgC,QAAgB;CAC/E,QAAQ,SAAS,KAAK,mBAAmB,QAAQ;AACnD;AAEA,SAAgB,qBACd,SACA,MACA,QACA;CACA,MAAM,MAAM,GAAG,KAAK,IAAI;CACxB,IAAI,QAAQ,iBAAiB,IAAI,GAAG,GAClC;CAEF,QAAQ,iBAAiB,IAAI,GAAG;CAChC,QAAQ,SAAS,KAAK,oBAAoB,KAAK,MAAM,QAAQ;AAC/D"}
+{"version":3,"file":"dependency.mjs","names":[],"sources":["../../../src/compiler/wxml/dependency.ts"],"sourcesContent":["import type { ImportEntry, IncludeEntry, WxmlDependencyContext, WxsEntry } from './types'\n\nexport function createDependencyContext(): WxmlDependencyContext {\n  return {\n    warnings: [],\n    dependencies: [],\n    dependencySet: new Set(),\n    visited: new Set(),\n    active: new Set(),\n    circularWarnings: new Set(),\n  }\n}\n\nexport function addDependency(\n  value: string,\n  context: WxmlDependencyContext,\n  direct?: string[],\n) {\n  if (!context.dependencySet.has(value)) {\n    context.dependencySet.add(value)\n    context.dependencies.push(value)\n    direct?.push(value)\n  }\n}\n\n/** 依赖扫描完成分析后，按编译器的分组顺序登记直接依赖。 */\nexport function collectDependencies(\n  entries: { imports: ImportEntry[], includes: IncludeEntry[], wxs: WxsEntry[] },\n  context: WxmlDependencyContext,\n) {\n  const dependencies: string[] = []\n  for (const entry of entries.imports) {\n    addDependency(entry.id, context, dependencies)\n  }\n  for (const entry of entries.includes) {\n    addDependency(entry.id, context, dependencies)\n  }\n  for (const entry of entries.wxs) {\n    if (entry.kind === 'src') {\n      addDependency(entry.value, context, dependencies)\n    }\n  }\n  return dependencies\n}\n\nexport function warnReadTemplate(context: WxmlDependencyContext, target: string) {\n  context.warnings.push(`[web] 无法读取模板依赖: ${target}`)\n}\n\nexport function warnCircularTemplate(\n  context: WxmlDependencyContext,\n  from: string,\n  target: string,\n) {\n  const key = `${from}=>${target}`\n  if (context.circularWarnings.has(key)) {\n    return\n  }\n  context.circularWarnings.add(key)\n  context.warnings.push(`[web] WXML 循环引用: ${from} -> ${target}`)\n}\n"],"mappings":";AAEA,SAAgB,0BAAiD;CAC/D,OAAO;EACL,UAAU,CAAC;EACX,cAAc,CAAC;EACf,+BAAe,IAAI,IAAI;EACvB,yBAAS,IAAI,IAAI;EACjB,wBAAQ,IAAI,IAAI;EAChB,kCAAkB,IAAI,IAAI;CAC5B;AACF;AAEA,SAAgB,cACd,OACA,SACA,QACA;CACA,IAAI,CAAC,QAAQ,cAAc,IAAI,KAAK,GAAG;EACrC,QAAQ,cAAc,IAAI,KAAK;EAC/B,QAAQ,aAAa,KAAK,KAAK;EAC/B,QAAQ,KAAK,KAAK;CACpB;AACF;;AAGA,SAAgB,oBACd,SACA,SACA;CACA,MAAM,eAAyB,CAAC;CAChC,KAAK,MAAM,SAAS,QAAQ,SAC1B,cAAc,MAAM,IAAI,SAAS,YAAY;CAE/C,KAAK,MAAM,SAAS,QAAQ,UAC1B,cAAc,MAAM,IAAI,SAAS,YAAY;CAE/C,KAAK,MAAM,SAAS,QAAQ,KAC1B,IAAI,MAAM,SAAS,OACjB,cAAc,MAAM,OAAO,SAAS,YAAY;CAGpD,OAAO;AACT;AAEA,SAAgB,iBAAiB,SAAgC,QAAgB;CAC/E,QAAQ,SAAS,KAAK,mBAAmB,QAAQ;AACnD;AAEA,SAAgB,qBACd,SACA,MACA,QACA;CACA,MAAM,MAAM,GAAG,KAAK,IAAI;CACxB,IAAI,QAAQ,iBAAiB,IAAI,GAAG,GAClC;CAEF,QAAQ,iBAAiB,IAAI,GAAG;CAChC,QAAQ,SAAS,KAAK,oBAAoB,KAAK,MAAM,QAAQ;AAC/D"}

package/dist/compiler/wxml/interpolation.mjs

@@ -1,4 +1,4 @@
-//#region src/compiler/wxml/interpolation.ts
+// src/compiler/wxml/interpolation.ts
 function parseInterpolations(value) {
 	const parts = [];
 	if (!value.includes("{{")) return [{
@@ -45,6 +45,17 @@ function buildExpression(parts, scopeVar, wxsVar) {
 		return `ctx.eval(${JSON.stringify(part.value)}, ${scopeVar}, ${wxsVar})`;
 	}).join(" + ")})`;
 }
+/** 完整表达式保留原值，混合插值逐段转为字符串，避免相邻数字执行加法。 */
+function buildDatasetExpression(value, scopeVar, wxsVar) {
+	const trimmedParts = parseInterpolations(value.trim());
+	if (trimmedParts.length === 1 && trimmedParts[0]?.type === "expr") return buildExpression(trimmedParts, scopeVar, wxsVar);
+	const parts = parseInterpolations(value);
+	if (parts.length <= 1) return buildExpression(parts, scopeVar, wxsVar);
+	return `(${parts.map((part) => {
+		const expression = buildExpression([part], scopeVar, wxsVar);
+		return part.type === "text" ? expression : `String(${expression} ?? '')`;
+	}).join(" + ")})`;
+}
 function hasTopLevelColon(expression) {
 	let depth = 0;
 	let inSingleQuote = false;
@@ -136,6 +147,5 @@ function buildTemplateDataExpression(raw, scopeVar, wxsVar) {
 	return buildExpression(parseInterpolations(raw), scopeVar, wxsVar);
 }
 
-//#endregion
-export { buildExpression, buildTemplateDataExpression, parseInterpolations };
+export { buildDatasetExpression, buildExpression, buildTemplateDataExpression, parseInterpolations };
 //# sourceMappingURL=interpolation.mjs.map

package/dist/compiler/wxml/interpolation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"interpolation.mjs","names":[],"sources":["../../../src/compiler/wxml/interpolation.ts"],"sourcesContent":["import type { InterpolationPart } from './types'\n\nexport function parseInterpolations(value: string): InterpolationPart[] {\n  const parts: InterpolationPart[] = []\n  if (!value.includes('{{')) {\n    return [{ type: 'text', value }]\n  }\n  let cursor = 0\n  while (cursor < value.length) {\n    const start = value.indexOf('{{', cursor)\n    if (start === -1) {\n      parts.push({ type: 'text', value: value.slice(cursor) })\n      break\n    }\n    if (start > cursor) {\n      parts.push({ type: 'text', value: value.slice(cursor, start) })\n    }\n    const end = value.indexOf('}}', start + 2)\n    if (end === -1) {\n      parts.push({ type: 'text', value: value.slice(start) })\n      break\n    }\n    const expr = value.slice(start + 2, end).trim()\n    if (expr) {\n      parts.push({ type: 'expr', value: expr })\n    }\n    cursor = end + 2\n  }\n  return parts\n}\n\nexport function buildExpression(parts: InterpolationPart[], scopeVar: string, wxsVar: string) {\n  if (parts.length === 0) {\n    return '\"\"'\n  }\n  if (parts.length === 1 && parts[0]?.type === 'text') {\n    return JSON.stringify(parts[0].value)\n  }\n  if (parts.length === 1 && parts[0]?.type === 'expr') {\n    return `ctx.eval(${JSON.stringify(parts[0].value)}, ${scopeVar}, ${wxsVar})`\n  }\n  const segments = parts.map((part) => {\n    if (part.type === 'text') {\n      return JSON.stringify(part.value)\n    }\n    return `ctx.eval(${JSON.stringify(part.value)}, ${scopeVar}, ${wxsVar})`\n  })\n  return `(${segments.join(' + ')})`\n}\n\nfunction hasTopLevelColon(expression: string) {\n  let depth = 0\n  let inSingleQuote = false\n  let inDoubleQuote = false\n  let inTemplate = false\n  let escaped = false\n  let sawTopLevelQuestion = false\n\n  for (let index = 0; index < expression.length; index += 1) {\n    const char = expression[index]!\n\n    if (inSingleQuote) {\n      if (escaped) {\n        escaped = false\n        continue\n      }\n      if (char === '\\\\') {\n        escaped = true\n        continue\n      }\n      if (char === '\\'') {\n        inSingleQuote = false\n      }\n      continue\n    }\n    if (inDoubleQuote) {\n      if (escaped) {\n        escaped = false\n        continue\n      }\n      if (char === '\\\\') {\n        escaped = true\n        continue\n      }\n      if (char === '\"') {\n        inDoubleQuote = false\n      }\n      continue\n    }\n    if (inTemplate) {\n      if (escaped) {\n        escaped = false\n        continue\n      }\n      if (char === '\\\\') {\n        escaped = true\n        continue\n      }\n      if (char === '`') {\n        inTemplate = false\n      }\n      continue\n    }\n\n    if (char === '\\'') {\n      inSingleQuote = true\n      continue\n    }\n    if (char === '\"') {\n      inDoubleQuote = true\n      continue\n    }\n    if (char === '`') {\n      inTemplate = true\n      continue\n    }\n\n    if (char === '(' || char === '[' || char === '{') {\n      depth += 1\n      continue\n    }\n    if (char === ')' || char === ']' || char === '}') {\n      depth = Math.max(0, depth - 1)\n      continue\n    }\n\n    if (depth !== 0) {\n      continue\n    }\n\n    if (char === '?') {\n      sawTopLevelQuestion = true\n      continue\n    }\n    if (char === ':') {\n      return !sawTopLevelQuestion\n    }\n  }\n\n  return false\n}\n\nfunction shouldWrapShorthandObject(expression: string) {\n  const trimmed = expression.trim()\n  if (trimmed.startsWith('{') || trimmed.startsWith('[') || trimmed.startsWith('(')) {\n    return false\n  }\n  return hasTopLevelColon(trimmed)\n}\n\nexport function buildTemplateDataExpression(raw: string, scopeVar: string, wxsVar: string) {\n  const trimmed = raw.trim()\n  const parts = parseInterpolations(trimmed)\n  if (parts.length === 1 && parts[0]?.type === 'expr') {\n    const expr = parts[0].value.trim()\n    const normalizedExpr = shouldWrapShorthandObject(expr) ? `{ ${expr} }` : expr\n    return buildExpression([{ type: 'expr', value: normalizedExpr }], scopeVar, wxsVar)\n  }\n  return buildExpression(parseInterpolations(raw), scopeVar, wxsVar)\n}\n"],"mappings":"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"}
+{"version":3,"file":"interpolation.mjs","names":[],"sources":["../../../src/compiler/wxml/interpolation.ts"],"sourcesContent":["import type { InterpolationPart } from './types'\n\nexport function parseInterpolations(value: string): InterpolationPart[] {\n  const parts: InterpolationPart[] = []\n  if (!value.includes('{{')) {\n    return [{ type: 'text', value }]\n  }\n  let cursor = 0\n  while (cursor < value.length) {\n    const start = value.indexOf('{{', cursor)\n    if (start === -1) {\n      parts.push({ type: 'text', value: value.slice(cursor) })\n      break\n    }\n    if (start > cursor) {\n      parts.push({ type: 'text', value: value.slice(cursor, start) })\n    }\n    const end = value.indexOf('}}', start + 2)\n    if (end === -1) {\n      parts.push({ type: 'text', value: value.slice(start) })\n      break\n    }\n    const expr = value.slice(start + 2, end).trim()\n    if (expr) {\n      parts.push({ type: 'expr', value: expr })\n    }\n    cursor = end + 2\n  }\n  return parts\n}\n\nexport function buildExpression(parts: InterpolationPart[], scopeVar: string, wxsVar: string) {\n  if (parts.length === 0) {\n    return '\"\"'\n  }\n  if (parts.length === 1 && parts[0]?.type === 'text') {\n    return JSON.stringify(parts[0].value)\n  }\n  if (parts.length === 1 && parts[0]?.type === 'expr') {\n    return `ctx.eval(${JSON.stringify(parts[0].value)}, ${scopeVar}, ${wxsVar})`\n  }\n  const segments = parts.map((part) => {\n    if (part.type === 'text') {\n      return JSON.stringify(part.value)\n    }\n    return `ctx.eval(${JSON.stringify(part.value)}, ${scopeVar}, ${wxsVar})`\n  })\n  return `(${segments.join(' + ')})`\n}\n\n/** 完整表达式保留原值，混合插值逐段转为字符串，避免相邻数字执行加法。 */\nexport function buildDatasetExpression(value: string, scopeVar: string, wxsVar: string) {\n  const trimmedParts = parseInterpolations(value.trim())\n  if (trimmedParts.length === 1 && trimmedParts[0]?.type === 'expr') {\n    return buildExpression(trimmedParts, scopeVar, wxsVar)\n  }\n  const parts = parseInterpolations(value)\n  if (parts.length <= 1) {\n    return buildExpression(parts, scopeVar, wxsVar)\n  }\n  const segments = parts.map((part) => {\n    const expression = buildExpression([part], scopeVar, wxsVar)\n    return part.type === 'text' ? expression : `String(${expression} ?? '')`\n  })\n  return `(${segments.join(' + ')})`\n}\n\nfunction hasTopLevelColon(expression: string) {\n  let depth = 0\n  let inSingleQuote = false\n  let inDoubleQuote = false\n  let inTemplate = false\n  let escaped = false\n  let sawTopLevelQuestion = false\n\n  for (let index = 0; index < expression.length; index += 1) {\n    const char = expression[index]!\n\n    if (inSingleQuote) {\n      if (escaped) {\n        escaped = false\n        continue\n      }\n      if (char === '\\\\') {\n        escaped = true\n        continue\n      }\n      if (char === '\\'') {\n        inSingleQuote = false\n      }\n      continue\n    }\n    if (inDoubleQuote) {\n      if (escaped) {\n        escaped = false\n        continue\n      }\n      if (char === '\\\\') {\n        escaped = true\n        continue\n      }\n      if (char === '\"') {\n        inDoubleQuote = false\n      }\n      continue\n    }\n    if (inTemplate) {\n      if (escaped) {\n        escaped = false\n        continue\n      }\n      if (char === '\\\\') {\n        escaped = true\n        continue\n      }\n      if (char === '`') {\n        inTemplate = false\n      }\n      continue\n    }\n\n    if (char === '\\'') {\n      inSingleQuote = true\n      continue\n    }\n    if (char === '\"') {\n      inDoubleQuote = true\n      continue\n    }\n    if (char === '`') {\n      inTemplate = true\n      continue\n    }\n\n    if (char === '(' || char === '[' || char === '{') {\n      depth += 1\n      continue\n    }\n    if (char === ')' || char === ']' || char === '}') {\n      depth = Math.max(0, depth - 1)\n      continue\n    }\n\n    if (depth !== 0) {\n      continue\n    }\n\n    if (char === '?') {\n      sawTopLevelQuestion = true\n      continue\n    }\n    if (char === ':') {\n      return !sawTopLevelQuestion\n    }\n  }\n\n  return false\n}\n\nfunction shouldWrapShorthandObject(expression: string) {\n  const trimmed = expression.trim()\n  if (trimmed.startsWith('{') || trimmed.startsWith('[') || trimmed.startsWith('(')) {\n    return false\n  }\n  return hasTopLevelColon(trimmed)\n}\n\nexport function buildTemplateDataExpression(raw: string, scopeVar: string, wxsVar: string) {\n  const trimmed = raw.trim()\n  const parts = parseInterpolations(trimmed)\n  if (parts.length === 1 && parts[0]?.type === 'expr') {\n    const expr = parts[0].value.trim()\n    const normalizedExpr = shouldWrapShorthandObject(expr) ? `{ ${expr} }` : expr\n    return buildExpression([{ type: 'expr', value: normalizedExpr }], scopeVar, wxsVar)\n  }\n  return buildExpression(parseInterpolations(raw), scopeVar, wxsVar)\n}\n"],"mappings":"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"}

package/dist/compiler/wxml/nativeTags.mjs

@@ -0,0 +1,60 @@
+// src/compiler/wxml/nativeTags.ts
+const NATIVE_COMPONENT_NAMES = /* @__PURE__ */ new Set([
+	"ad",
+	"ad-custom",
+	"audio",
+	"block",
+	"button",
+	"camera",
+	"canvas",
+	"checkbox",
+	"checkbox-group",
+	"cover-image",
+	"cover-view",
+	"editor",
+	"form",
+	"functional-page-navigator",
+	"icon",
+	"image",
+	"import",
+	"include",
+	"input",
+	"keyboard-accessory",
+	"label",
+	"live-player",
+	"live-pusher",
+	"map",
+	"match-media",
+	"movable-area",
+	"movable-view",
+	"navigation-bar",
+	"navigator",
+	"official-account",
+	"open-data",
+	"page-container",
+	"page-meta",
+	"picker",
+	"picker-view",
+	"picker-view-column",
+	"progress",
+	"radio",
+	"radio-group",
+	"rich-text",
+	"scroll-view",
+	"share-element",
+	"slider",
+	"slot",
+	"swiper",
+	"swiper-item",
+	"switch",
+	"template",
+	"text",
+	"textarea",
+	"video",
+	"view",
+	"voip-room",
+	"web-view"
+]);
+
+export { NATIVE_COMPONENT_NAMES };
+//# sourceMappingURL=nativeTags.mjs.map

package/dist/compiler/wxml/nativeTags.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"nativeTags.mjs","names":[],"sources":["../../../src/compiler/wxml/nativeTags.ts"],"sourcesContent":["// 本文件由 components.weapp.json 生成，请运行 node packages-runtime/web/scripts/generate-native-tags.mjs。\nexport const NATIVE_COMPONENT_NAMES = new Set([\n  'ad',\n  'ad-custom',\n  'audio',\n  'block',\n  'button',\n  'camera',\n  'canvas',\n  'checkbox',\n  'checkbox-group',\n  'cover-image',\n  'cover-view',\n  'editor',\n  'form',\n  'functional-page-navigator',\n  'icon',\n  'image',\n  'import',\n  'include',\n  'input',\n  'keyboard-accessory',\n  'label',\n  'live-player',\n  'live-pusher',\n  'map',\n  'match-media',\n  'movable-area',\n  'movable-view',\n  'navigation-bar',\n  'navigator',\n  'official-account',\n  'open-data',\n  'page-container',\n  'page-meta',\n  'picker',\n  'picker-view',\n  'picker-view-column',\n  'progress',\n  'radio',\n  'radio-group',\n  'rich-text',\n  'scroll-view',\n  'share-element',\n  'slider',\n  'slot',\n  'swiper',\n  'swiper-item',\n  'switch',\n  'template',\n  'text',\n  'textarea',\n  'video',\n  'view',\n  'voip-room',\n  'web-view',\n])\n"],"mappings":";AACA,MAAa,yCAAyB,IAAI,IAAI;CAC5C;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AACF,CAAC"}

package/dist/compiler/wxml/navigation.mjs

@@ -1,4 +1,4 @@
-//#region src/compiler/wxml/navigation.ts
+// src/compiler/wxml/navigation.ts
 const NAVIGATION_BAR_ATTRS = /* @__PURE__ */ new Set([
 	"title",
 	"background-color",
@@ -78,6 +78,5 @@ function buildNavigationBarAttrs(config, overrides) {
 	return attrs;
 }
 
-//#endregion
 export { buildNavigationBarAttrs, extractNavigationBarFromPageMeta };
 //# sourceMappingURL=navigation.mjs.map

package/dist/compiler/wxml/parser.mjs

@@ -1,6 +1,6 @@
 import { parseDocument } from "htmlparser2";
 
-//#region src/compiler/wxml/parser.ts
+// src/compiler/wxml/parser.ts
 function isRenderableNode(node) {
 	if (node.type === "directive" || node.type === "comment") return false;
 	if (node.type === "text") return node.data.trim().length > 0;
@@ -36,6 +36,5 @@ function parseWxml(source) {
 	}).children.filter(isRenderableNode).map((node) => convertNode(node)).filter((node) => Boolean(node));
 }
 
-//#endregion
 export { parseWxml };
 //# sourceMappingURL=parser.mjs.map

package/dist/compiler/wxml/prepare.mjs

@@ -0,0 +1,42 @@
+import { extractNavigationBarFromPageMeta } from "./navigation.mjs";
+import { parseWxml } from "./parser.mjs";
+import { collectSpecialNodes } from "./specialNodes.mjs";
+
+// src/compiler/wxml/prepare.ts
+/** 共享模板分析阶段，依赖扫描复用其结果而不生成渲染代码。 */
+function prepareWxml(options, dependencyContext) {
+	const warnings = dependencyContext.warnings;
+	let nodes = parseWxml(options.source);
+	let navigationBarAttrs;
+	if (options.navigationBar) {
+		const extracted = extractNavigationBarFromPageMeta(nodes);
+		nodes = extracted.nodes;
+		if (extracted.warnings.length > 0) warnings.push(...extracted.warnings);
+		navigationBarAttrs = extracted.attrs;
+	}
+	const templates = [];
+	const includes = [];
+	const imports = [];
+	const wxs = [];
+	return {
+		renderNodes: collectSpecialNodes(nodes, {
+			templates,
+			includes,
+			imports,
+			wxs,
+			wxsModules: /* @__PURE__ */ new Map(),
+			warnings,
+			sourceId: options.id,
+			resolveTemplate: (raw) => options.resolveTemplatePath(raw, options.id),
+			resolveWxs: (raw) => options.resolveWxsPath(raw, options.id)
+		}),
+		navigationBarAttrs,
+		templates,
+		includes,
+		imports,
+		wxs
+	};
+}
+
+export { prepareWxml };
+//# sourceMappingURL=prepare.mjs.map

package/dist/compiler/wxml/prepare.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepare.mjs","names":[],"sources":["../../../src/compiler/wxml/prepare.ts"],"sourcesContent":["import type {\n  ImportEntry,\n  IncludeEntry,\n  TemplateDefinition,\n  WxmlCompileOptions,\n  WxmlDependencyContext,\n  WxsEntry,\n} from './types'\nimport { extractNavigationBarFromPageMeta } from './navigation'\nimport { parseWxml } from './parser'\nimport { collectSpecialNodes } from './specialNodes'\n\n/** 共享模板分析阶段，依赖扫描复用其结果而不生成渲染代码。 */\nexport function prepareWxml(options: WxmlCompileOptions, dependencyContext: WxmlDependencyContext) {\n  const warnings = dependencyContext.warnings\n  let nodes = parseWxml(options.source)\n  let navigationBarAttrs: Record<string, string> | undefined\n  if (options.navigationBar) {\n    const extracted = extractNavigationBarFromPageMeta(nodes)\n    nodes = extracted.nodes\n    if (extracted.warnings.length > 0) {\n      warnings.push(...extracted.warnings)\n    }\n    navigationBarAttrs = extracted.attrs\n  }\n\n  const templates: TemplateDefinition[] = []\n  const includes: IncludeEntry[] = []\n  const imports: ImportEntry[] = []\n  const wxs: WxsEntry[] = []\n  const renderNodes = collectSpecialNodes(nodes, {\n    templates,\n    includes,\n    imports,\n    wxs,\n    wxsModules: new Map<string, string>(),\n    warnings,\n    sourceId: options.id,\n    resolveTemplate: (raw: string) => options.resolveTemplatePath(raw, options.id),\n    resolveWxs: (raw: string) => options.resolveWxsPath(raw, options.id),\n  })\n\n  return { renderNodes, navigationBarAttrs, templates, includes, imports, wxs }\n}\n"],"mappings":";;;;;;AAaA,SAAgB,YAAY,SAA6B,mBAA0C;CACjG,MAAM,WAAW,kBAAkB;CACnC,IAAI,QAAQ,UAAU,QAAQ,MAAM;CACpC,IAAI;CACJ,IAAI,QAAQ,eAAe;EACzB,MAAM,YAAY,iCAAiC,KAAK;EACxD,QAAQ,UAAU;EAClB,IAAI,UAAU,SAAS,SAAS,GAC9B,SAAS,KAAK,GAAG,UAAU,QAAQ;EAErC,qBAAqB,UAAU;CACjC;CAEA,MAAM,YAAkC,CAAC;CACzC,MAAM,WAA2B,CAAC;CAClC,MAAM,UAAyB,CAAC;CAChC,MAAM,MAAkB,CAAC;CAazB,OAAO;EAAE,aAZW,oBAAoB,OAAO;GAC7C;GACA;GACA;GACA;GACA,4BAAY,IAAI,IAAoB;GACpC;GACA,UAAU,QAAQ;GAClB,kBAAkB,QAAgB,QAAQ,oBAAoB,KAAK,QAAQ,EAAE;GAC7E,aAAa,QAAgB,QAAQ,eAAe,KAAK,QAAQ,EAAE;EACrE,CAEmB;EAAG;EAAoB;EAAW;EAAU;EAAS;CAAI;AAC9E"}

package/dist/compiler/wxml/renderer.mjs

@@ -3,7 +3,7 @@ import { SELF_CLOSING_TAGS, hasControlAttribute, normalizeTagName, resolveContro
 import { buildExpression, buildTemplateDataExpression, parseInterpolations } from "./interpolation.mjs";
 import { extractFor, isConditionalElement, renderAttributes, resolveComponentTagName, stripControlAttributes } from "./attributes.mjs";
 
-//#region src/compiler/wxml/renderer.ts
+// src/compiler/wxml/renderer.ts
 var Renderer = class {
 	renderNodes(nodes, scopeVar, wxsVar, componentTags) {
 		const parts = [];
@@ -113,6 +113,5 @@ var Renderer = class {
 };
 const renderer = new Renderer();
 
-//#endregion
 export { Renderer, renderer };
 //# sourceMappingURL=renderer.mjs.map

package/dist/compiler/wxml/specialNodes.mjs

@@ -2,7 +2,7 @@ import { isKnownUnsupportedNativeComponent } from "../../shared/nativeComponents
 import { TEMPLATE_IMPORT_TAG_NAMES, TEMPLATE_INCLUDE_TAG_NAMES } from "../../shared/wxml.mjs";
 import { dirname, relative } from "pathe";
 
-//#region src/compiler/wxml/specialNodes.ts
+// src/compiler/wxml/specialNodes.ts
 function shouldMarkWxsImport(pathname) {
 	const lower = pathname.toLowerCase();
 	if (lower.endsWith(".wxs") || lower.endsWith(".wxs.ts") || lower.endsWith(".wxs.js")) return false;
@@ -86,6 +86,5 @@ function toRelativeImport(from, target) {
 	return `./${rel}`;
 }
 
-//#endregion
 export { collectSpecialNodes, normalizeTemplatePath, shouldMarkWxsImport, toRelativeImport };
 //# sourceMappingURL=specialNodes.mjs.map

package/dist/compiler/wxml/types.d.mts

@@ -1,4 +1,3 @@
-//#region src/compiler/wxml/types.d.ts
 export interface NavigationBarConfig {
   title?: string;
   backgroundColor?: string;
@@ -7,5 +6,4 @@ export interface NavigationBarConfig {
   loading?: boolean;
   navigationStyle?: string;
 }
-//#endregion
 //# sourceMappingURL=types.d.mts.map

package/dist/compiler/wxml/unknownTags.mjs

@@ -0,0 +1,33 @@
+import { isKnownUnsupportedNativeComponent, resolveNativeComponentWebTag } from "../../shared/nativeComponents.mjs";
+import { NATIVE_COMPONENT_NAMES } from "./nativeTags.mjs";
+import { isHTMLTag, isMathMLTag, isSVGTag } from "@vue/shared";
+
+// src/compiler/wxml/unknownTags.ts
+const CONTROL_TAGS = /* @__PURE__ */ new Set(["wxs"]);
+function isKnownTag(name, componentTags) {
+	const normalized = name.toLowerCase();
+	const isRegistered = (tag) => componentTags && Object.hasOwn(componentTags, tag) && typeof componentTags[tag] === "string" && Boolean(componentTags[tag]);
+	if (!normalized || isRegistered(name) || isRegistered(normalized)) return true;
+	return CONTROL_TAGS.has(normalized) || NATIVE_COMPONENT_NAMES.has(normalized) || isHTMLTag(normalized) || isSVGTag(name) || isMathMLTag(normalized) || Boolean(resolveNativeComponentWebTag(normalized)) || isKnownUnsupportedNativeComponent(normalized);
+}
+function collectFromNodes(nodes, unknown, componentTags) {
+	for (const node of nodes ?? []) {
+		if (node.type !== "element") continue;
+		const name = node.name ?? "";
+		if (name && !isKnownTag(name, componentTags)) unknown.add(name);
+		collectFromNodes(node.children, unknown, componentTags);
+	}
+}
+/** 收集用户模板中可能拼写错误或尚未注册的标签，不改变渲染结果。 */
+function collectUnknownTags(nodes, componentTags, extraNodes = []) {
+	const unknown = /* @__PURE__ */ new Set();
+	collectFromNodes(nodes, unknown, componentTags);
+	collectFromNodes(extraNodes, unknown, componentTags);
+	return [...unknown];
+}
+function formatUnknownTagWarning(tags, filename) {
+	return `[web] 模板中使用了未知标签${filename ? ` (${filename})` : ""}：${tags.map((tag) => `<${tag}>`).join("、")}。这些标签可能尚未在 usingComponents 中注册或存在拼写错误，请检查组件注册和标签名称。`;
+}
+
+export { collectUnknownTags, formatUnknownTagWarning };
+//# sourceMappingURL=unknownTags.mjs.map

package/dist/compiler/wxml/unknownTags.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"unknownTags.mjs","names":[],"sources":["../../../src/compiler/wxml/unknownTags.ts"],"sourcesContent":["import type { RenderNode } from './types'\nimport { isHTMLTag, isMathMLTag, isSVGTag } from '@vue/shared'\nimport { isKnownUnsupportedNativeComponent, resolveNativeComponentWebTag } from '../../shared/nativeComponents'\nimport { NATIVE_COMPONENT_NAMES } from './nativeTags'\n\nconst CONTROL_TAGS = new Set(['wxs'])\n\nfunction isKnownTag(name: string, componentTags?: Record<string, string>) {\n  const normalized = name.toLowerCase()\n  const isRegistered = (tag: string) => componentTags\n    && Object.hasOwn(componentTags, tag)\n    && typeof componentTags[tag] === 'string'\n    && Boolean(componentTags[tag])\n  if (!normalized || isRegistered(name) || isRegistered(normalized)) {\n    return true\n  }\n  return CONTROL_TAGS.has(normalized)\n    || NATIVE_COMPONENT_NAMES.has(normalized)\n    || isHTMLTag(normalized)\n    || isSVGTag(name)\n    || isMathMLTag(normalized)\n    || Boolean(resolveNativeComponentWebTag(normalized))\n    || isKnownUnsupportedNativeComponent(normalized)\n}\n\nfunction collectFromNodes(nodes: RenderNode[] | undefined, unknown: Set<string>, componentTags?: Record<string, string>) {\n  for (const node of nodes ?? []) {\n    if (node.type !== 'element') {\n      continue\n    }\n    const name = node.name ?? ''\n    if (name && !isKnownTag(name, componentTags)) {\n      unknown.add(name)\n    }\n    collectFromNodes(node.children, unknown, componentTags)\n  }\n}\n\n/** 收集用户模板中可能拼写错误或尚未注册的标签，不改变渲染结果。 */\nexport function collectUnknownTags(\n  nodes: RenderNode[] | undefined,\n  componentTags?: Record<string, string>,\n  extraNodes: RenderNode[] = [],\n) {\n  const unknown = new Set<string>()\n  collectFromNodes(nodes, unknown, componentTags)\n  collectFromNodes(extraNodes, unknown, componentTags)\n  return [...unknown]\n}\n\nexport function formatUnknownTagWarning(tags: string[], filename?: string) {\n  const location = filename ? ` (${filename})` : ''\n  const list = tags.map(tag => `<${tag}>`).join('、')\n  return `[web] 模板中使用了未知标签${location}：${list}。`\n    + '这些标签可能尚未在 usingComponents 中注册或存在拼写错误，请检查组件注册和标签名称。'\n}\n"],"mappings":";;;;;AAKA,MAAM,+BAAe,IAAI,IAAI,CAAC,KAAK,CAAC;AAEpC,SAAS,WAAW,MAAc,eAAwC;CACxE,MAAM,aAAa,KAAK,YAAY;CACpC,MAAM,gBAAgB,QAAgB,iBACjC,OAAO,OAAO,eAAe,GAAG,KAChC,OAAO,cAAc,SAAS,YAC9B,QAAQ,cAAc,IAAI;CAC/B,IAAI,CAAC,cAAc,aAAa,IAAI,KAAK,aAAa,UAAU,GAC9D,OAAO;CAET,OAAO,aAAa,IAAI,UAAU,KAC7B,uBAAuB,IAAI,UAAU,KACrC,UAAU,UAAU,KACpB,SAAS,IAAI,KACb,YAAY,UAAU,KACtB,QAAQ,6BAA6B,UAAU,CAAC,KAChD,kCAAkC,UAAU;AACnD;AAEA,SAAS,iBAAiB,OAAiC,SAAsB,eAAwC;CACvH,KAAK,MAAM,QAAQ,SAAS,CAAC,GAAG;EAC9B,IAAI,KAAK,SAAS,WAChB;EAEF,MAAM,OAAO,KAAK,QAAQ;EAC1B,IAAI,QAAQ,CAAC,WAAW,MAAM,aAAa,GACzC,QAAQ,IAAI,IAAI;EAElB,iBAAiB,KAAK,UAAU,SAAS,aAAa;CACxD;AACF;;AAGA,SAAgB,mBACd,OACA,eACA,aAA2B,CAAC,GAC5B;CACA,MAAM,0BAAU,IAAI,IAAY;CAChC,iBAAiB,OAAO,SAAS,aAAa;CAC9C,iBAAiB,YAAY,SAAS,aAAa;CACnD,OAAO,CAAC,GAAG,OAAO;AACpB;AAEA,SAAgB,wBAAwB,MAAgB,UAAmB;CAGzE,OAAO,mBAFU,WAAW,KAAK,SAAS,KAAK,GAEZ,GADtB,KAAK,KAAI,QAAO,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,GACL,EAAE;AAE7C"}

package/dist/compiler/wxs.mjs

@@ -1,4 +1,4 @@
-//#region src/compiler/wxs.ts
+// src/compiler/wxs.ts
 const REQUIRE_RE = /require\(\s*['"]([^'"]+)['"]\s*\)/g;
 function normalizePath(p) {
 	return p.replace(/\\/g, "/");
@@ -78,6 +78,5 @@ function transformWxsToEsm(code, id, options) {
 	};
 }
 
-//#endregion
 export { transformWxsToEsm };
 //# sourceMappingURL=wxs.mjs.map