@mybricks/to-code-taro 1.1.6 → 1.1.8

package/dist/esm/toCodeTaro.js

@@ -32,6 +32,16 @@ import { processModules } from "./processors/processModule";
  * Taro 代码生成主函数
  */
 var toCodeTaro = function toCodeTaro(tojson, config) {
+  // 将 modules 中的场景展开到 scenes 中，使 toCode 能识别并处理模块
+  if (tojson.modules) {
+    Object.values(tojson.modules).forEach(function (mod) {
+      if (mod.json) {
+        tojson.scenes.push(mod.json);
+      }
+    });
+    // 预处理：从 modules.json 重建 frames 中模块的事件数据
+    rebuildModuleFrames(tojson);
+  }
   return getCode({
     tojson: tojson,
     toCodejson: toCode(tojson)
@@ -60,6 +70,15 @@ var getCode = function getCode(params, config) {
 
   // 构建场景和事件映射
   var sceneMap = buildSceneMap(tojson.scenes);
+  // 将模块场景也加入 sceneMap，使 getSceneById 能查到模块
+  if (tojson.modules) {
+    Object.values(tojson.modules).forEach(function (mod) {
+      var _mod$json;
+      if ((_mod$json = mod.json) !== null && _mod$json !== void 0 && _mod$json.id) {
+        sceneMap[mod.json.id] = mod.json;
+      }
+    });
+  }
   var eventsMap = buildEventsMap(tojson.frames);
   var getSceneById = createGetSceneById(sceneMap);
   var getExtensionEventById = createGetExtensionEventById(eventsMap);
@@ -242,6 +261,99 @@ var getCode = function getCode(params, config) {
   };
 };
 
+/**
+ * 预处理：从 modules.json 重建 frames 中模块的事件数据
+ *
+ * 背景：tojson.frames 中模块的 frame 可能是空壳（coms: {}, diagrams[0].conAry: []），
+ * 而完整的组件事件数据在 modules[moduleId].json 中（coms/cons/outputEvents）。
+ * toCode 的 handleFrame 需要 frame.coms 包含组件事件子 frames 才能生成事件代码。
+ */
+var rebuildModuleFrames = function rebuildModuleFrames(tojson) {
+  var modules = tojson.modules;
+  if (!modules) return;
+  Object.values(modules).forEach(function (mod) {
+    var moduleJson = mod.json;
+    if (!moduleJson) return;
+    var frame = tojson.frames.find(function (f) {
+      return f.id === moduleJson.id;
+    });
+    if (!frame || Object.keys(frame.coms).length > 0) return;
+    var coms = moduleJson.coms || {};
+    var cons = moduleJson.cons || {};
+    Object.values(coms).forEach(function (com) {
+      var _com$model2;
+      var outputEvents = (_com$model2 = com.model) === null || _com$model2 === void 0 ? void 0 : _com$model2.outputEvents;
+      if (!outputEvents || Object.keys(outputEvents).length === 0) return;
+      var comFrames = [];
+      Object.entries(outputEvents).forEach(function (_ref4) {
+        var _activeEvent$options;
+        var _ref5 = _slicedToArray(_ref4, 2),
+          pinId = _ref5[0],
+          events = _ref5[1];
+        var activeEvent = Array.isArray(events) ? events.find(function (e) {
+          return e.active;
+        }) : null;
+        if (!(activeEvent !== null && activeEvent !== void 0 && (_activeEvent$options = activeEvent.options) !== null && _activeEvent$options !== void 0 && _activeEvent$options.id)) return;
+        var diagramId = activeEvent.options.id;
+        var consKey = "".concat(com.id, "-").concat(pinId);
+        var connections = cons[consKey] || [];
+        var conAry = connections.map(function (con) {
+          return {
+            id: con.id,
+            from: {
+              id: pinId,
+              title: activeEvent.options.title || pinId,
+              parent: {
+                id: com.id,
+                type: "com"
+              }
+            },
+            to: {
+              id: con.pinId,
+              title: con.pinId,
+              parent: {
+                id: con.comId,
+                type: "com"
+              }
+            },
+            startPinParentKey: con.startPinParentKey || con.frameKey,
+            finishPinParentKey: con.finishPinParentKey || con.targetFrameKey
+          };
+        });
+        if (conAry.length === 0) return;
+        comFrames.push({
+          id: "".concat(com.id, "_").concat(pinId, "_frame"),
+          title: activeEvent.options.title || "".concat(com.title, " > ").concat(pinId),
+          type: "com",
+          coms: {},
+          autoRunComs: {},
+          inputs: [],
+          outputs: [],
+          frames: [],
+          diagrams: [{
+            id: diagramId,
+            title: activeEvent.options.title || "".concat(com.title, " > ").concat(pinId),
+            starter: {
+              type: "com",
+              comId: com.id,
+              pinId: pinId
+            },
+            conAry: conAry,
+            runtimeBefore: [],
+            runtimeAfter: []
+          }]
+        });
+      });
+      if (comFrames.length > 0) {
+        frame.coms[com.id] = {
+          id: com.id,
+          frames: comFrames
+        };
+      }
+    });
+  });
+};
+
 /**
  * 初始化配置
  */

package/dist/esm/utils/logic/handleProcess.js

@@ -114,6 +114,8 @@ export var handleProcess = function handleProcess(event, config) {
   // 处理节点调用
   // 边遍历边构建映射：确保引用时只能看到已声明的变量
   var outputToInputPinMap = new Map();
+  // 跟踪已声明的变量名，用于去重（同一组件+pin 多次调用时追加后缀）
+  var declaredVarCount = new Map();
   process.nodesInvocation.forEach(function (props) {
     var _props$nextParam, _config$getCallTempla, _props$meta$model;
     var componentType = props.componentType,
@@ -121,12 +123,13 @@ export var handleProcess = function handleProcess(event, config) {
       runType = props.runType;
     var nextValue = getNextValue(props, config, event, outputToInputPinMap);
     var isSameScope = checkIsSameScope(event, props);
-    var nextCode = getNextCode(props, config, isSameScope, event);
+    var _getNextCode = getNextCode(props, config, isSameScope, event, declaredVarCount),
+      nextCode = _getNextCode.code,
+      declaredVarName = _getNextCode.varName;
 
-    // 声明后记录映射，供后续引用
-    var inputPinId = props.id.replace(/[^a-zA-Z0-9_]/g, '_');
+    // 声明后记录映射，供后续引用（存储完整变量名，支持去重后缀）
     (_props$nextParam = props.nextParam) === null || _props$nextParam === void 0 || _props$nextParam.forEach(function (np) {
-      outputToInputPinMap.set("".concat(props.meta.id, "_").concat(np.id), inputPinId);
+      outputToInputPinMap.set("".concat(props.meta.id, "_").concat(np.id), declaredVarName);
     });
     if (code) {
       code += "\n";
@@ -167,20 +170,24 @@ export var handleProcess = function handleProcess(event, config) {
         var componentNameWithId = getComponentNameWithId(props, config, event);
         code += "".concat(indent, "/** \u8C03\u7528 ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode).concat(componentNameWithId, "(").concat(runType === "input" ? nextValue : "", ")");
       } else if (category === "var") {
+        var _props$extData;
         var varKey = getSafeVarName(props.meta);
+        // 处理 xpath：如 "/a" -> "a"，"/a/b" -> "a.b"，用于读取变量的指定属性
+        var xpath = (_props$extData = props.extData) === null || _props$extData === void 0 ? void 0 : _props$extData.xpath;
+        var xpathArg = xpath ? ", \"".concat(xpath.replace(/^\//, "").replace(/\//g, "."), "\"") : "";
         if (props.meta.global) {
           config.addParentDependencyImport({
             packageName: "../../common/global",
             dependencyNames: ["globalVars"],
             importType: "named"
           });
-          code += "".concat(indent, "/** ").concat(props.title, " \u5168\u5C40\u53D8\u91CF ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode, "globalVars.").concat(varKey, ".").concat(props.id, "(").concat(nextValue, ")");
+          code += "".concat(indent, "/** ").concat(props.title, " \u5168\u5C40\u53D8\u91CF ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode, "globalVars.").concat(varKey, ".").concat(props.id, "(").concat(nextValue).concat(xpathArg, ")");
         } else {
           var currentProvider = getCurrentProvider({
             isSameScope: isSameScope,
             props: props
           }, config);
-          code += "".concat(indent, "/** ").concat(props.title, " \u53D8\u91CF ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode, "this.$vars.").concat(varKey, ".").concat(props.id, "(").concat(nextValue, ")");
+          code += "".concat(indent, "/** ").concat(props.title, " \u53D8\u91CF ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode, "this.$vars.").concat(varKey, ".").concat(props.id, "(").concat(nextValue).concat(xpathArg, ")");
         }
       } else if (category === "fx") {
         if (props.meta.global) {
@@ -283,17 +290,31 @@ var getComponentNameWithId = function getComponentNameWithId(props, config, even
   var sanitizedName = name.replace(/-/g, '_');
   return "".concat(sanitizedName, "_").concat(props.meta.id);
 };
-var getNextCode = function getNextCode(props, config, isSameScope, event) {
+var getNextCode = function getNextCode(props, config, isSameScope, event, declaredVarCount) {
   var nextParam = props.nextParam;
   if (!nextParam.length) {
-    return "";
+    return {
+      code: "",
+      varName: ""
+    };
   }
   var componentNameWithId = getComponentNameWithId(props, config, event);
   // 使用输入端口ID（props.id）来区分同一组件的不同调用
   // 这样可以确保 trigger 和 cancel 两个输入端口生成不同的变量名
   var pinId = props.id;
   var sanitizedPinId = pinId.replace(/[^a-zA-Z0-9_]/g, '_');
-  return "const ".concat(componentNameWithId, "_").concat(sanitizedPinId, "_result: any = ");
+  var varName = "".concat(componentNameWithId, "_").concat(sanitizedPinId, "_result");
+
+  // 去重：同一变量名多次声明时追加后缀
+  var count = declaredVarCount.get(varName) || 0;
+  declaredVarCount.set(varName, count + 1);
+  if (count > 0) {
+    varName = "".concat(varName, "_").concat(count);
+  }
+  return {
+    code: "const ".concat(varName, ": any = "),
+    varName: varName
+  };
 };
 
 /**
@@ -312,6 +333,13 @@ function getFrameInputValueExpr(meta, config, event) {
   var pinProxy = scene === null || scene === void 0 || (_pinValueProxies = scene.pinValueProxies) === null || _pinValueProxies === void 0 ? void 0 : _pinValueProxies[proxyKey];
   var pinId = pinProxy === null || pinProxy === void 0 ? void 0 : pinProxy.pinId;
   if (typeof pinId === "string" && pinId) {
+    var _config$getParams;
+    // 优先使用 getParams 映射（场景级输入：回调参数名如 data）
+    var paramsMap = (_config$getParams = config.getParams) === null || _config$getParams === void 0 ? void 0 : _config$getParams.call(config);
+    if (paramsMap !== null && paramsMap !== void 0 && paramsMap[pinId]) {
+      return paramsMap[pinId];
+    }
+    // fallback：插槽场景使用 params.inputValues
     return "params?.inputValues?.[".concat(JSON.stringify(pinId), "]");
   }
 }
@@ -334,21 +362,21 @@ var getNextValue = function getNextValue(props, config, event, outputToInputPinM
     // 变量组件直接返回 Subject，不加 .id 后缀
     if ((_param$meta2 = param.meta) !== null && _param$meta2 !== void 0 && (_param$meta2 = _param$meta2.def) !== null && _param$meta2 !== void 0 && (_param$meta2 = _param$meta2.namespace) !== null && _param$meta2 !== void 0 && _param$meta2.includes(".var")) {
       var _param$meta3;
-      // 从 outputToInputPinMap 中查找对应的输入端口ID
+      // 从 outputToInputPinMap 中查找完整变量名（已包含去重后缀）
       var _key = "".concat((_param$meta3 = param.meta) === null || _param$meta3 === void 0 ? void 0 : _param$meta3.id, "_").concat(param.id);
-      var _inputPinId = outputToInputPinMap === null || outputToInputPinMap === void 0 ? void 0 : outputToInputPinMap.get(_key);
-      if (_inputPinId) {
-        return "".concat(componentNameWithId, "_").concat(_inputPinId, "_result");
+      var _fullVarName = outputToInputPinMap === null || outputToInputPinMap === void 0 ? void 0 : outputToInputPinMap.get(_key);
+      if (_fullVarName) {
+        return _fullVarName;
       }
       return "".concat(componentNameWithId, "_result");
     }
 
-    // 从 outputToInputPinMap 中查找对应的输入端口ID
+    // 从 outputToInputPinMap 中查找完整变量名（已包含去重后缀）
     // key = `${componentId}_${outputPinId}`
     var key = "".concat((_param$meta4 = param.meta) === null || _param$meta4 === void 0 ? void 0 : _param$meta4.id, "_").concat(param.id);
-    var inputPinId = outputToInputPinMap === null || outputToInputPinMap === void 0 ? void 0 : outputToInputPinMap.get(key);
-    if (inputPinId) {
-      return "".concat(componentNameWithId, "_").concat(inputPinId, "_result.").concat(param.id);
+    var fullVarName = outputToInputPinMap === null || outputToInputPinMap === void 0 ? void 0 : outputToInputPinMap.get(key);
+    if (fullVarName) {
+      return "".concat(fullVarName, ".").concat(param.id);
     }
     return "".concat(componentNameWithId, "_result.").concat(param.id);
   });

package/dist/esm/utils/templates/component.js

@@ -1,4 +1,4 @@
-import { indentation, toPascalCase } from "./index";
+import { indentation, toSlotFunctionName } from "./index";
 /** 生成组件 Inputs 映射代码 */
 export var genComponentInputsCode = function genComponentInputsCode(indent, providerName, comId) {
   return "".concat(indent, "inputs['").concat(comId, "'] = useBindInputs(controllers.current.").concat(providerName, ", '").concat(comId, "');\n");
@@ -21,7 +21,7 @@ export var genSlotRenderRef = function genSlotRenderRef(_ref) {
     renderId = _ref.renderId,
     indent = _ref.indent,
     isLast = _ref.isLast;
-  var renderFunctionName = toPascalCase("".concat(renderId, "_Render"));
+  var renderFunctionName = toSlotFunctionName(renderId);
   return "".concat(indent).concat(slotId, ": {\n").concat(indent, "  render: ").concat(renderFunctionName, ",\n").concat(indent, "}").concat(isLast ? '' : ',', "\n");
 };
 

package/dist/esm/utils/templates/index.d.ts

@@ -6,6 +6,8 @@ export declare const firstCharToUpperCase: (str: string) => string;
 export declare const formatSlotContent: (uiContent: string, baseIndentSize: number, renderBodyIndent: string) => string;
 /** 将字符串转为大驼峰 */
 export declare const toPascalCase: (str: string) => string;
+/** 生成插槽渲染函数名：S${ID} (SCREAMING_SNAKE_CASE) */
+export declare const toSlotFunctionName: (renderId: string) => string;
 /** Taro/React UI 组件代码生成 */
 export declare const getUiComponentCode: (params: {
     componentName: string;

package/dist/esm/utils/templates/index.js

@@ -23,6 +23,11 @@ export var toPascalCase = function toPascalCase(str) {
   }).join("");
 };
 
+/** 生成插槽渲染函数名：S${ID} (SCREAMING_SNAKE_CASE) */
+export var toSlotFunctionName = function toSlotFunctionName(renderId) {
+  return "S".concat(renderId.replace(/[^a-zA-Z0-9]/g, "_").toUpperCase());
+};
+
 /** 根节点data去除无用属性 */
 var formatData = function formatData(data, isRoot) {
   if (!data) return {};
@@ -54,7 +59,7 @@ export var getUiComponentCode = function getUiComponentCode(params, config) {
   var ui = "".concat(indent, "<WithCom");
   ui += "\n".concat(indent2, "component={").concat(componentName, "}");
   ui += "\n".concat(indent2, "id='").concat(meta.id, "'");
-  ui += "\n".concat(indent2, "className='").concat(meta.id, " mybricks_com'");
+  ui += "\n".concat(indent2, "className='mybricks_com ").concat(meta.id, "'");
   if (meta.name) {
     ui += "\n".concat(indent2, "name='").concat(meta.name, "'");
   }

package/dist/esm/utils/templates/renderManager.js

@@ -1,7 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { indentation, toPascalCase } from "./index";
+import { indentation, toSlotFunctionName } from "./index";
 
 /** Render 函数管理器 */
 export var RenderManager = /*#__PURE__*/function () {
@@ -50,7 +50,7 @@ export var RenderManager = /*#__PURE__*/function () {
           logicCode = _ref.logicCode,
           useWrap = _ref.useWrap,
           description = _ref.description;
-        var renderFunctionName = toPascalCase("".concat(renderId, "_Render"));
+        var renderFunctionName = toSlotFunctionName(renderId);
         if (description) {
           code += "".concat(indent, "/** ").concat(description, " */\n");
         }
@@ -114,11 +114,9 @@ export var RenderManager = /*#__PURE__*/function () {
           // 如果是容器协议插槽，直接调用 wrap
           code += "".concat(indent).concat(indent3, "params?.wrap?.(descriptors)\n");
         } else {
-          code += "".concat(indent).concat(indent3, "<>\n");
           code += modifiedRenderCode.split("\n").map(function (line) {
             return "".concat(indent).concat(indent2).concat(line);
           }).join("\n") + "\n";
-          code += "".concat(indent).concat(indent3, "</>\n");
         }
         code += "".concat(indent).concat(indent2, ");\n");
         code += "".concat(indent, "}\n\n");
@@ -139,7 +137,7 @@ export var RenderManager = /*#__PURE__*/function () {
   }, {
     key: "genRenderRef",
     value: function genRenderRef(slotId, renderId, indent) {
-      var renderFunctionName = toPascalCase("".concat(renderId, "_Render"));
+      var renderFunctionName = toSlotFunctionName(renderId);
       return "".concat(indent).concat(slotId, ": {\n").concat(indent, "  render: ").concat(renderFunctionName, ",\n").concat(indent, "},\n");
     }
   }]);

package/dist/esm/utils/templates/scene.d.ts

@@ -1,7 +1,7 @@
 /** 生成响应式 data 管理器 */
 export declare const genReactiveDataManager: (indent: string, utilsPackageName: string) => string;
 /** 生成根组件定义代码 (useAppContext) */
-export declare const genRootDefineCode: (indent: string, utilsPackageName: string, hasJsModules?: boolean) => string;
+export declare const genRootDefineCode: (indent: string, utilsPackageName: string, hasJsModules?: boolean, isModule?: boolean) => string;
 /** 生成普通插槽定义代码 */
 export declare const genSlotDefineCode: (indent: string) => string;
 /** 生成控制器初始化代码 */

package/dist/esm/utils/templates/scene.js

@@ -6,9 +6,12 @@ export var genReactiveDataManager = function genReactiveDataManager(indent, util
 /** 生成根组件定义代码 (useAppContext) */
 export var genRootDefineCode = function genRootDefineCode(indent, utilsPackageName) {
   var hasJsModules = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var isModule = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   // 使用 useAppContext 获取 comRefs / $vars / $fxs / appContext
   var code = "".concat(indent, "const {comRefs, $vars, $fxs, appContext} = useAppContext();\n");
-  code += "".concat(indent, "usePageLife();\n");
+  if (!isModule) {
+    code += "".concat(indent, "usePageLife();\n");
+  }
   // 如果有 JS 计算组件，需要初始化 comModules
   if (hasJsModules) {
     code += "".concat(indent, "const comModules = jsModules({ createJSHandle });\n");
@@ -48,9 +51,9 @@ export var genComponentTemplate = function genComponentTemplate(_ref) {
   var pageScopeCode = "const PageScopeContext = createContext<any>(null);\n" + "function usePageScope<T = any>() {\n" + "  return useContext(PageScopeContext) as T;\n" + "}\n\n";
 
   // 渲染定义放在组件外部，保持引用稳定
-  var code = "".concat(pageScopeCode).concat(renderDefinitions, "\n") + "function ".concat(componentName, "() {\n") + "  // \u9875\u9762\u7EA7 scope\uFF1A\u4F60\u53EF\u4EE5\u628A useState/useMemo \u7684\u7ED3\u679C\u653E\u5230\u8FD9\u4E2A ref \u4E0A\uFF0C\u8BA9\u63D2\u69FD\u8BFB\u53D6\n" + "  const pageScopeRef = useRef<any>({});\n" + "".concat(combinedJsCode, "\n") + "  return (\n" + "    <PageScopeContext.Provider value={pageScopeRef}>\n" + "    <>\n" + "".concat(uiResult.split('\n').map(function (line) {
+  var code = "".concat(pageScopeCode).concat(renderDefinitions, "\n") + "function ".concat(componentName, "() {\n") + "  // \u9875\u9762\u7EA7 scope\uFF1A\u4F60\u53EF\u4EE5\u628A useState/useMemo \u7684\u7ED3\u679C\u653E\u5230\u8FD9\u4E2A ref \u4E0A\uFF0C\u8BA9\u63D2\u69FD\u8BFB\u53D6\n" + "  const pageScopeRef = useRef<any>({});\n" + "".concat(combinedJsCode, "\n") + "  return (\n" + "    <PageScopeContext.Provider value={pageScopeRef}>\n" + (hasPopups ? "    <>\n" : "") + "".concat(uiResult.split('\n').map(function (line) {
     return "      ".concat(line);
-  }).join('\n'), "\n") + (hasPopups ? "      <PopupRenderer popupMap={POPUP_MAP} />\n" : "") + "    </>\n" + "    </PageScopeContext.Provider>\n" + "  );\n" + "}\n\n";
+  }).join('\n'), "\n") + (hasPopups ? "      <PopupRenderer popupMap={POPUP_MAP} />\n" : "") + (hasPopups ? "    </>\n" : "") + "    </PageScopeContext.Provider>\n" + "  );\n" + "}\n\n";
   if (isPopup) {
     code += "(".concat(componentName, " as any).isPopup = true;\n\n");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mybricks/to-code-taro",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "To code for Taro",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",