@proteus-vue/compiler 0.3.0-beta.11 → 0.3.0-beta.15

package/dist/index.js

@@ -14677,7 +14677,87 @@ var TAG_MAP = {
   video: "video",
   canvas: "canvas",
   "scroll-view": "scroll-view",
-  slot: "slot"
+  slot: "slot",
+  // ★★2026-09-20（外部实战报告第二十三/二十四节）：**补全常见 HTML 标签 → WXML 等价映射**。
+  //   此前这些标签落到「未知标签逃生舱」**原样输出** → 微信 wxml 编译器直接拒绝（或渲染异常）：
+  //   外部工程实测因 <details>/<summary>/<pre>/<table>/<select>/<option>/<label>/<br> 等
+  //   导致**模拟器整屏黑屏**（构建期零报错、产物看似齐全）。
+  //   语义映射原则：块级 → view；行内/文本类 → text；表格/列表/折叠等无对等物 → view/text
+  //   （样式与交互由 CSS + 显式状态承担，见报告第二十四节的正当适配）。
+  //   块级容器
+  section: "view",
+  article: "view",
+  aside: "view",
+  nav: "view",
+  main: "view",
+  header: "view",
+  footer: "view",
+  figure: "view",
+  figcaption: "text",
+  details: "view",
+  summary: "text",
+  dialog: "view",
+  form: "form",
+  fieldset: "view",
+  legend: "text",
+  // 列表
+  ul: "view",
+  ol: "view",
+  li: "view",
+  dl: "view",
+  dt: "text",
+  dd: "text",
+  // 表格（微信无表格组件 → view 结构 + CSS）
+  table: "view",
+  thead: "view",
+  tbody: "view",
+  tfoot: "view",
+  tr: "view",
+  th: "text",
+  td: "text",
+  caption: "text",
+  // 行内 / 语义文本
+  strong: "text",
+  b: "text",
+  em: "text",
+  i: "text",
+  u: "text",
+  s: "text",
+  small: "text",
+  mark: "text",
+  sub: "text",
+  sup: "text",
+  code: "text",
+  pre: "text",
+  kbd: "text",
+  samp: "text",
+  var: "text",
+  abbr: "text",
+  cite: "text",
+  q: "text",
+  blockquote: "view",
+  time: "text",
+  address: "text",
+  // 表单控件（无对等物者映射为 view/text，交互由 picker/state 承担）
+  select: "view",
+  option: "view",
+  optgroup: "view",
+  // ★注：`label` / `audio` **不映射**——它们是微信 wxml 原生组件（表单组件/媒体组件），
+  //   映射会把可用能力降级（p-label 的 `for` 关联、p-media 的 audio 分支都会失效；
+  //   实测被 tests/component-b6 与 tests/p-batch3-contract 抓住）。
+  datalist: "view",
+  output: "text",
+  meter: "view",
+  progress: "progress",
+  // 其它常见
+  hr: "view",
+  br: "view",
+  picture: "image",
+  source: "view",
+  track: "view",
+  iframe: "web-view"
+  // ★注：`template` **不映射**——它在 WXML 里是定义块（is=/data=），语义与 Vue 的片段容器不同，
+  //   属「须改写法」而非「可映射」（见第二十四节：`<template v-if>` 应改为 `<view v-if>`）。
 };
 var EVENT_MAP = {
   click: "tap",
@@ -14716,6 +14796,29 @@ var SEMANTIC_CLASS = {
   a: "proteus-a"
 };
 
+// src/model-path.ts
+function modelHandlerSuffix(model) {
+  const raw = String(model ?? "").trim();
+  if (!raw) return "";
+  const segs = raw.replace(/\[([^\]]*)\]/g, ".$1").split(".").map((s) => s.trim()).filter(Boolean);
+  const cap = (s) => s ? s.charAt(0).toUpperCase() + s.slice(1) : "";
+  return segs.map(cap).join("");
+}
+function isSimpleModel(model) {
+  return /^[A-Za-z_$][\w$]*$/.test(String(model ?? "").trim());
+}
+function setDataEntry(model, valueExpr) {
+  const m = String(model ?? "").trim();
+  if (isSimpleModel(m)) return `${m}: ${valueExpr}`;
+  return `'${m}': ${valueExpr}`;
+}
+function inputModelHandler(model) {
+  return `proteusOn${modelHandlerSuffix(model)}Input`;
+}
+function componentModelHandler(model) {
+  return `proteusUpdate${modelHandlerSuffix(model)}Model`;
+}
+
 // src/transforms/template.ts
 function tagRule(id, title, tags, extra) {
   return {
@@ -15217,13 +15320,13 @@ var TEMPLATE_RULES = [
           kind: "component",
           model,
           propName,
-          updateHandler: `proteusUpdate${capitalize(model)}Model`
+          updateHandler: componentModelHandler(model)
         };
       } else {
         ctx.output = {
           kind: "input",
           model,
-          inputHandler: `proteusOn${capitalize(model)}Input`
+          inputHandler: inputModelHandler(model)
         };
       }
     }
@@ -17020,6 +17123,99 @@ function scanWxmlPlatformIssues(wxml) {
       seenKeys.add(key);
     }
   }
+  for (const m of wxml.matchAll(/\{\{([\s\S]*?)\}\}/g)) {
+    const expr = m[1] ?? "";
+    if (expr.includes(String.fromCharCode(96)) || expr.includes("${")) {
+      issues.push({
+        code: "TemplateLiteralInExpression",
+        message: `\u7ED1\u5B9A\u8868\u8FBE\u5F0F\u542B\u6A21\u677F\u5B57\u9762\u91CF\uFF08\u53CD\u5F15\u53F7 / \u7F8E\u5143\u5927\u62EC\u53F7\uFF09\uFF1A{{ ${expr.trim().slice(0, 60)} }}\u2014\u2014WXML \u8868\u8FBE\u5F0F\u4E0D\u652F\u6301\uFF0C\u5FAE\u4FE1\u62A5 "unexpected character inside expression"\u3002\u8BF7\u628A\u5B57\u7B26\u4E32\u62FC\u63A5\u79FB\u5230 script \u9884\u8BA1\u7B97\uFF08computed \u6216 data \u5B57\u6BB5\uFF09`,
+        at: m.index ?? 0
+      });
+    }
+  }
+  for (const m of wxml.matchAll(/<template\b([^>]*?)>([\s\S]*?)<\/template>/g)) {
+    const attrs = m[1] ?? "";
+    const body = m[2] ?? "";
+    const hasChildren = /<[a-zA-Z]/.test(body.trim());
+    if (hasChildren && /wx:(if|elif|else|for)\b/.test(attrs)) {
+      issues.push({
+        code: "TemplateChildNodes",
+        message: `<template${attrs.trim() ? " " + attrs.trim().slice(0, 40) : ""}> \u542B\u5B50\u5143\u7D20\u2014\u2014WXML \u7684 <template> \u662F\u5B9A\u4E49\u5757\uFF08is=/data=\uFF09\uFF0C\u4E0D\u662F Vue \u7684\u7247\u6BB5\u5BB9\u5668\uFF08\u5FAE\u4FE1\u62A5 "child nodes are not allowed"/"missing module name"\uFF09\u3002\u8BF7\u6539\u7528 <view wx:if>`,
+        at: m.index ?? 0
+      });
+    }
+  }
+  const KNOWN_HTML_TAGS = /* @__PURE__ */ new Set([
+    "section",
+    "article",
+    "aside",
+    "nav",
+    "main",
+    "header",
+    "footer",
+    "figure",
+    "figcaption",
+    "details",
+    "summary",
+    "dialog",
+    "fieldset",
+    "legend",
+    "ul",
+    "ol",
+    "li",
+    "dl",
+    "dt",
+    "dd",
+    "table",
+    "thead",
+    "tbody",
+    "tfoot",
+    "tr",
+    "th",
+    "td",
+    "caption",
+    "strong",
+    "b",
+    "em",
+    "i",
+    "u",
+    "s",
+    "small",
+    "mark",
+    "sub",
+    "sup",
+    "code",
+    "pre",
+    "kbd",
+    "samp",
+    "var",
+    "abbr",
+    "cite",
+    "q",
+    "blockquote",
+    "time",
+    "address",
+    "select",
+    "option",
+    "optgroup",
+    "datalist",
+    "output",
+    "meter",
+    "hr",
+    "br",
+    "picture",
+    "source",
+    "track",
+    "iframe"
+  ]);
+  for (const tag of scanOpenTags(wxml)) {
+    if (!KNOWN_HTML_TAGS.has(tag.name)) continue;
+    issues.push({
+      code: "UnknownHtmlTag",
+      message: `\u6807\u7B7E <${tag.name}> \u662F HTML \u6807\u7B7E\u3001\u5FAE\u4FE1 wxml \u65E0\u6B64\u539F\u751F\u6807\u7B7E\u2014\u2014\u672A\u88AB\u6620\u5C04\uFF08TAG_MAP \u9057\u6F0F\uFF09\u800C\u539F\u6837\u8FDB\u4EA7\u7269\uFF0C\u5FAE\u4FE1\u7F16\u8BD1\u4F1A\u5931\u8D25\u6216\u6E32\u67D3\u5F02\u5E38\u3002\u8BF7\u6539\u7528 WXML \u7B49\u4EF7\u7ED3\u6784\uFF08\u5757\u7EA7 \u2192 <view>\u3001\u6587\u672C\u7C7B \u2192 <text>\uFF09`,
+      at: tag.at
+    });
+  }
   return issues;
 }
 function splitStyleDecls(styleVal) {
@@ -18879,6 +19075,25 @@ ${inner}
     }
   }
   if (staticStyle) attrs.push(`style="${escapeXml(staticStyle)}"`);
+  {
+    const bindIdx = attrs.map((a, i) => a.startsWith('bindinput="') ? i : -1).filter((i) => i >= 0);
+    if (bindIdx.length > 1) {
+      const names = bindIdx.map((i) => /bindinput="([^"]*)"/.exec(attrs[i])?.[1] ?? "").filter(Boolean);
+      const [vmodelHandler, ...userHandlers] = names;
+      const suffix2 = vmodelHandler.replace(/^proteusOn/, "").replace(/Input$/, "");
+      const merged = `proteusMerge${suffix2}And${userHandlers.map((h) => h.charAt(0).toUpperCase() + h.slice(1)).join("And")}`;
+      if (!ctx.vModelMergedHandlers.some((h) => h.name === merged)) {
+        ctx.vModelMergedHandlers.push({ name: merged, calls: [vmodelHandler, ...userHandlers] });
+      }
+      for (const i of [...bindIdx].reverse()) attrs.splice(i, 1);
+      attrs.push(`bindinput="${merged}"`);
+      ctx.trace?.add("directive/v-model", {
+        line: node.loc.start.line,
+        before: `v-model + ${userHandlers.map((h) => "@input=" + h).join(" / ")}\uFF08\u540C\u5143\u7D20 \u2192 bindinput \u91CD\u590D\uFF09`,
+        after: `bindinput="${merged}"\uFF08\u5408\u5E76\uFF1A\u5148\u56DE\u5199\u518D\u8C03\u7528\u6237 handler\uFF09`
+      });
+    }
+  }
   const attrStr = attrs.length ? ` ${attrs.join(" ")}` : "";
   const lineNote = ctx.annotateLines ? `<!-- @${node.loc.start.line} ${node.tag} -->
 ` : "";
@@ -19038,6 +19253,7 @@ function transformTemplateToWxml(source, opts = { px2rpx: true, rpxRatio: 2, ann
     // ★2026-09-08 useTemplateRef/模板 ref 承接（ref="x" → id + 收集）
     templateRefNames: /* @__PURE__ */ new Set(),
     vModelComponentHandlers: [],
+    vModelMergedHandlers: [],
     // ★#496 柔性语义编译：p-grid 收集
     semanticGrids: [],
     isPage: opts.isComponent !== true,
@@ -19113,6 +19329,7 @@ ${inner}
     dynamicSvgs: ctx.dynamicSvgs,
     // ★#500 自定义组件 v-model 回写处理器
     vModelComponentHandlers: ctx.vModelComponentHandlers,
+    vModelMergedHandlers: ctx.vModelMergedHandlers,
     semanticGrids: ctx.semanticGrids,
     // ★15-page-scroll-container：已自动包滚动容器（compileVueSfc 据此注入高度样式）
     pageScrollWrapped: autoScroll && !alreadyScroll,
@@ -21924,7 +22141,16 @@ function transformScriptToPage(source, _opts = { px2rpx: true, rpxRatio: 2 }, ex
   }
   for (const ni of reactiveInits) dataExtra[ni.name] = null;
   const storeBindings = extra.storeBindings ?? [];
-  const storeVar = runtimeInits.find((i) => i.name === "store" && /^use\w*Store\(/.test(i.call))?.name;
+  const storeCandidates = runtimeInits.filter((i) => /^use\w*Store\(/.test(i.call));
+  const strict = storeCandidates.find((i) => i.name === "store");
+  const storeVar = strict?.name ?? (storeCandidates.length === 1 ? storeCandidates[0].name : void 0);
+  if (storeBindings.length && !storeVar) {
+    warnings.push(
+      `\u6A21\u677F\u5F15\u7528\u4E86 store \u5B57\u6BB5\uFF08${storeBindings.join(" / ")}\uFF09\uFF0C\u4F46\u672A\u80FD\u8BC6\u522B\u51FA store \u53D8\u91CF\u2014\u2014MP \u7AEF\u7ED1\u5B9A\u4E0D\u4F1A\u751F\u6548\uFF08\u6784\u5EFA\u901A\u8FC7\u4F46\u771F\u673A\u53D6\u4E0D\u5230\u503C\uFF09\u3002
+  \u8BC6\u522B\u8981\u6C42\uFF1A\u2460 \u53D8\u91CF\u58F0\u660E\u4E3A \`const store = useXxxStore()\`\uFF08\u53D8\u91CF\u540D\u987B\u4E3A store\uFF09\uFF0C\u6216 \u2461 \u672C\u6587\u4EF6**\u53EA\u6709\u4E00\u4E2A** \`useXxxStore()\` \u8C03\u7528\u3002
+  \u5F53\u524D\u672A\u6EE1\u8DB3${storeCandidates.length > 1 ? `\uFF08\u68C0\u6D4B\u5230\u591A\u4E2A useXxxStore()\uFF1A${storeCandidates.map((i) => i.name).join(" / ")}\u2014\u2014\u8BF7\u628A\u7528\u4E8E\u6A21\u677F\u7ED1\u5B9A\u7684\u90A3\u4E2A\u547D\u540D\u4E3A store\uFF09` : "\uFF08\u672A\u68C0\u6D4B\u5230\u4EFB\u4F55 useXxxStore() \u5F62\u6001\u7684\u8C03\u7528\uFF09"}\u3002`
+    );
+  }
   const storeBindingInit = storeVar && storeBindings.length ? storeBindingLine(storeBindings, storeVar) : "";
   if (storeBindingInit) {
     trace?.add("script/store-binding", {
@@ -22091,16 +22317,22 @@ function transformScriptToPage(source, _opts = { px2rpx: true, rpxRatio: 2 }, ex
   const vmodelDisabled = disabled.has("script/vmodel-handler");
   for (const name of vModelBindings) {
     if (!vmodelDisabled) {
-      methodNames.add(`proteusOn${capitalize2(name)}Input`);
-      pushMethod(`  proteusOn${capitalize2(name)}Input(e) { this.setData({ ${name}: e.detail.value }) },`);
+      methodNames.add(inputModelHandler(name));
+      pushMethod(`  ${inputModelHandler(name)}(e) { this.setData({ ${setDataEntry(name, "e.detail.value")} }) },`);
     }
   }
   for (const h of extra.vModelComponentHandlers ?? []) {
     if (!vmodelDisabled) {
       methodNames.add(h.name);
-      pushMethod(`  ${h.name}(e) { this.setData({ ${h.model}: e.detail }) },`);
+      pushMethod(`  ${h.name}(e) { this.setData({ ${setDataEntry(h.model, "e.detail")} }) },`);
     }
   }
+  for (const h of extra.vModelMergedHandlers ?? []) {
+    if (vmodelDisabled) continue;
+    methodNames.add(h.name);
+    const body = h.calls.map((c) => `this.${c}(e)`).join("; ");
+    pushMethod(`  ${h.name}(e) { ${body} },`);
+  }
   if (vModelBindings.length && !vmodelDisabled) {
     trace?.add("script/vmodel-handler", {
       before: `v-model="${vModelBindings.join('", "')}"`,
@@ -23188,6 +23420,8 @@ function compileVueSfc(source, options = {}) {
     dynamicSvgs: tplResult.dynamicSvgs,
     // ★#500 自定义组件 v-model 回写处理器
     vModelComponentHandlers: tplResult.vModelComponentHandlers,
+    // ★2026-09-20（F-28/Bug E）：v-model + @input 同元素 → 合并处理器（script 生成方法）
+    vModelMergedHandlers: tplResult.vModelMergedHandlers,
     semanticGrids: tplResult.semanticGrids,
     moduleImports: options.moduleImports,
     modelRefs: sfcMacros.ok ? sfcMacros.modelRefs : void 0,

package/dist/model-path.d.ts

@@ -0,0 +1,14 @@
+/** 路径 → 合法标识符片段（各段首字母大写并拼接；非标识符字符丢弃后按段切分） */
+export declare function modelHandlerSuffix(model: string): string;
+/** 绑定表达式是否为**简单标识符**（无路径）——简单标识符可走原来的简洁产物，路径才需要特殊处理 */
+export declare function isSimpleModel(model: string): boolean;
+/**
+ * setData 条目文本。
+ * · 简单标识符 → `name: expr`（与原产物一致，保持向后兼容）
+ * · 路径 → `'a.b': expr` / `'arr[0]': expr`（**键加引号**；小程序 setData 支持路径键写入嵌套字段）
+ */
+export declare function setDataEntry(model: string, valueExpr: string): string;
+/** v-model（原生/input 形态）的 handler 名——template 与 script 两侧共用 */
+export declare function inputModelHandler(model: string): string;
+/** v-model（组件形态，回写目标）的 handler 名——同上 */
+export declare function componentModelHandler(model: string): string;

package/dist/validate.d.ts

@@ -34,7 +34,7 @@ export declare function validateWxml(wxml: string): {
 export declare function assertValidResult(result: CompileResult, filename: string): void;
 /** 单条 wxml 平台违规（code = 官方 ParseErrorKind 蓝本） */
 export interface WxmlPlatformIssue {
-    code: 'DataBindingNotAllowed' | 'DuplicatedAttribute' | 'AvoidUppercaseLetters' | 'UnsupportedSyntax' | 'InvalidAttribute' | 'DuplicatedStylePropertyNames';
+    code: 'DataBindingNotAllowed' | 'DuplicatedAttribute' | 'AvoidUppercaseLetters' | 'UnsupportedSyntax' | 'InvalidAttribute' | 'DuplicatedStylePropertyNames' | 'TemplateLiteralInExpression' | 'TemplateChildNodes' | 'UnknownHtmlTag';
     message: string;
     /** wxml 字符偏移（定位用） */
     at: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proteus-vue/compiler",
-  "version": "0.3.0-beta.11",
+  "version": "0.3.0-beta.15",
   "description": "Proteus 编译引擎 —— 标准 Vue SFC → 小程序四件套（纯函数、零运行时依赖、规则注册表 + AI 说明书）",
   "type": "module",
   "license": "Apache-2.0",
@@ -42,7 +42,7 @@
     "@babel/plugin-transform-optional-chaining": "^7.29.0",
     "@proteus-vue/component-ir": "0.3.0-beta.11",
     "@proteus-vue/contracts": "0.3.0-beta.11",
-    "@proteus-vue/types": "0.3.0-beta.11"
+    "@proteus-vue/types": "0.3.0-beta.12"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json --emitDeclarationOnly && esbuild src/index.ts src/style-safety/index.ts --bundle --format=esm --platform=node --outdir=dist --external:@vue/compiler-sfc --external:@vue/compiler-dom --external:@proteus-vue/contracts --external:@proteus-vue/component-ir --external:@babel/core --external:@babel/plugin-transform-nullish-coalescing-operator --external:@babel/plugin-transform-optional-chaining --external:@babel/plugin-transform-logical-assignment-operators --external:@babel/plugin-transform-object-rest-spread"