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

package/dist/index.js

@@ -14716,6 +14716,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 +15240,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)
         };
       }
     }
@@ -18879,6 +18902,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 +19080,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 +19156,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,
@@ -22091,16 +22135,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 +23238,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proteus-vue/compiler",
-  "version": "0.3.0-beta.11",
+  "version": "0.3.0-beta.12",
   "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"