@mybricks/to-code-taro 1.2.3 → 1.2.4

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -194,6 +194,17 @@ ${item.content || ""}`;
   (0, import_pageImages.handlePageImages)(assetsDir, pageImages);
   (0, import_customTabBar.updateCustomTabBar)(srcDir, files);
   (0, import_commonDir.handleCommonDir)(commonDir, files);
+  const globalItem = files.find((item) => item.type === "global");
+  if ((globalItem == null ? void 0 : globalItem.jsModules) && globalItem.jsModules.length > 0) {
+    commonDir.children.push({
+      path: "src/common/index.jsModules.ts",
+      content: (0, import_genJSModules.genScopedJSModules)(
+        globalItem.jsModules,
+        "@mybricks/taro-core",
+        "@/common/jsModulesRuntime"
+      )
+    });
+  }
   const apiItem = files.find((item) => item.type === "connector-api");
   if (apiItem) {
     commonDir.children = commonDir.children || [];

package/dist/cjs/handleGlobal.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(handleGlobal_exports);
 var import_utils = require("./utils");
 var import_handleProcess = require("./utils/logic/handleProcess");
 var import_string = require("./utils/common/string");
+var import_collectJSModules = require("./utils/context/collectJSModules");
 var handleGlobal = (params, config) => {
   const { tojson, globalFxs, globalVars } = params;
   const globalImportManager = new import_utils.ImportManager(config);
@@ -121,8 +122,9 @@ ${indent2}})`;
       }
       return `value${index}: any`;
     }).join(", ");
+    const fxParams = values ? `${values}, appContext: any` : `appContext: any`;
     globalFxsInitCode += `${indent}/** ${event.title} */
-${indent}${event.frameId}: any = createFx((${values}) => {
+${indent}${event.frameId}: any = createFx((${fxParams}) => {
 ${res}
 ${indent}})
 `;
@@ -161,6 +163,15 @@ export const globalFxs = new GlobalFxs()`;
       importType: "named"
     });
   }
+  const globalJsModules = [];
+  (tojson.global.fxFrames || []).forEach((fxFrame) => {
+    Object.entries(fxFrame.coms || {}).forEach(([comId, comInfo]) => {
+      const jsModule = (0, import_collectJSModules.extractJSModuleFromCom)(comId, comInfo);
+      if (jsModule && !globalJsModules.some((m) => m.id === comId)) {
+        globalJsModules.push(jsModule);
+      }
+    });
+  });
   return [
     {
       type: "rootConfig",
@@ -172,7 +183,8 @@ export const globalFxs = new GlobalFxs()`;
       type: "global",
       content: varCode + "\n\n" + fxCode,
       importManager: globalImportManager,
-      name: "global"
+      name: "global",
+      jsModules: globalJsModules
     }
   ];
 };

package/dist/cjs/processors/processModule.js

@@ -70,10 +70,12 @@ var processModule = (params) => {
       return { ...scene, ...originalScene, event };
     },
     add: (value) => {
+      const jsModules = Array.from(jsModulesMap.values());
       addResult({
         ...value,
         type: scene.type,
-        meta: scene
+        meta: scene,
+        jsModules
       });
     },
     addJSModule: (module2) => {

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

@@ -186,7 +186,7 @@ ${indent}${nextCode}this.$vars.${varKey}.${props.id}(${nextValue}${xpathArg})`;
             importType: "named"
           });
           code += `${indent}/** 调用全局Fx ${props.meta.title} */
-${indent}${nextCode}globalFxs.${props.meta.ioProxy.id}(${nextValue})`;
+${indent}${nextCode}globalFxs.${props.meta.ioProxy.id}(${nextValue}${nextValue ? ", " : ""}appContext)`;
         } else {
           const currentProvider = getCurrentProvider(
             { isSameScope, props },
@@ -225,7 +225,7 @@ ${indent}${nextCode}this.${props.meta.id}.${props.id}(${nextValue})`;
 `;
         } else {
           const next = outputs.map((output) => {
-            return getNextValueWithParam(output, config, event);
+            return getNextValueWithParam(output, config, event, outputToInputPinMap);
           }).join(", ");
           return pre + `${indent2}${id}: ${next},
 `;
@@ -343,8 +343,8 @@ var getNextValue = (props, config, event, outputToInputPinMap) => {
   });
   return nextValue.join(", ");
 };
-var getNextValueWithParam = (param, config, event) => {
-  var _a, _b, _c, _d, _e;
+var getNextValueWithParam = (param, config, event, outputToInputPinMap) => {
+  var _a, _b, _c, _d, _e, _f, _g;
   if (param.type === "params") {
     const params = config.getParams();
     return params[param.id];
@@ -354,15 +354,17 @@ var getNextValueWithParam = (param, config, event) => {
   }
   const componentNameWithId = getComponentNameWithId(param, config, event);
   if ((_e = (_d = (_c = param.meta) == null ? void 0 : _c.def) == null ? void 0 : _d.namespace) == null ? void 0 : _e.includes(".var")) {
-    const connectId2 = param.connectId;
-    if (connectId2) {
-      return `${componentNameWithId}_${connectId2}_result`;
+    const key2 = `${(_f = param.meta) == null ? void 0 : _f.id}_${param.id}`;
+    const fullVarName2 = outputToInputPinMap == null ? void 0 : outputToInputPinMap.get(key2);
+    if (fullVarName2) {
+      return fullVarName2;
     }
     return `${componentNameWithId}_result`;
   }
-  const connectId = param.connectId;
-  if (connectId) {
-    return `${componentNameWithId}_${connectId}_result.${param.id}`;
+  const key = `${(_g = param.meta) == null ? void 0 : _g.id}_${param.id}`;
+  const fullVarName = outputToInputPinMap == null ? void 0 : outputToInputPinMap.get(key);
+  if (fullVarName) {
+    return `${fullVarName}.${param.id}`;
   }
   return `${componentNameWithId}_result.${param.id}`;
 };

package/dist/esm/generate/generateTaroProjectJson.js

@@ -190,6 +190,17 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
   // 处理 common 目录下的文件
   handleCommonDir(commonDir, files);
 
+  // 生成全局 jsModules（如果全局 Fx 中有 JS 计算组件）
+  var globalItem = files.find(function (item) {
+    return item.type === 'global';
+  });
+  if (globalItem !== null && globalItem !== void 0 && globalItem.jsModules && globalItem.jsModules.length > 0) {
+    commonDir.children.push({
+      path: 'src/common/index.jsModules.ts',
+      content: genScopedJSModules(globalItem.jsModules, "@mybricks/taro-core", "@/common/jsModulesRuntime")
+    });
+  }
+
   // 处理 common 目录下的 api.ts
   var apiItem = files.find(function (item) {
     return item.type === 'connector-api';

package/dist/esm/handleGlobal.js

@@ -9,6 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { ImportManager, indentation } from "./utils";
 import { handleProcess } from "./utils/logic/handleProcess";
 import { getSafeVarName } from "./utils/common/string";
+import { extractJSModuleFromCom } from "./utils/context/collectJSModules";
 var handleGlobal = function handleGlobal(params, config) {
   var tojson = params.tojson,
     globalFxs = params.globalFxs,
@@ -98,7 +99,8 @@ var handleGlobal = function handleGlobal(params, config) {
       }
       return "value".concat(index, ": any");
     }).join(", ");
-    globalFxsInitCode += "".concat(indent, "/** ").concat(event.title, " */") + "\n".concat(indent).concat(event.frameId, ": any = createFx((").concat(values, ") => {") + "\n".concat(res) + "\n".concat(indent, "})\n");
+    var fxParams = values ? "".concat(values, ", appContext: any") : "appContext: any";
+    globalFxsInitCode += "".concat(indent, "/** ").concat(event.title, " */") + "\n".concat(indent).concat(event.frameId, ": any = createFx((").concat(fxParams, ") => {") + "\n".concat(res) + "\n".concat(indent, "})\n");
   });
   var varCode = "/** 全局变量 */" + "\nclass GlobalVars {" + "\n".concat(globalVarsInitCode) + "\n".concat(indent, "init() {") + "".concat(globalVarsRegisterChangeCode) + "\n".concat(indent, "}") + "\n}" + "\n\nexport const globalVars = new GlobalVars()";
   var fxCode = "/** 全局Fx */" + "\nclass GlobalFxs {" + "\n".concat(globalFxsInitCode) + "}" + "\n\nexport const globalFxs = new GlobalFxs()";
@@ -123,6 +125,22 @@ var handleGlobal = function handleGlobal(params, config) {
       importType: "named"
     });
   }
+
+  // 收集全局 JS 计算组件（从 fxFrames 的 coms 中提取）
+  var globalJsModules = [];
+  (tojson.global.fxFrames || []).forEach(function (fxFrame) {
+    Object.entries(fxFrame.coms || {}).forEach(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+        comId = _ref5[0],
+        comInfo = _ref5[1];
+      var jsModule = extractJSModuleFromCom(comId, comInfo);
+      if (jsModule && !globalJsModules.some(function (m) {
+        return m.id === comId;
+      })) {
+        globalJsModules.push(jsModule);
+      }
+    });
+  });
   return [{
     type: "rootConfig",
     content: JSON.stringify(tojson.rootConfig, null, 2),
@@ -132,7 +150,8 @@ var handleGlobal = function handleGlobal(params, config) {
     type: "global",
     content: varCode + "\n\n" + fxCode,
     importManager: globalImportManager,
-    name: "global"
+    name: "global",
+    jsModules: globalJsModules
   }];
 };
 export default handleGlobal;

package/dist/esm/processors/processModule.js

@@ -58,9 +58,11 @@ export var processModule = function processModule(params) {
       });
     },
     add: function add(value) {
+      var jsModules = Array.from(jsModulesMap.values());
       addResult(_objectSpread(_objectSpread({}, value), {}, {
         type: scene.type,
-        meta: scene
+        meta: scene,
+        jsModules: jsModules
       }));
     },
     addJSModule: function addJSModule(module) {

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

@@ -196,7 +196,7 @@ export var handleProcess = function handleProcess(event, config) {
             dependencyNames: ["globalFxs"],
             importType: "named"
           });
-          code += "".concat(indent, "/** \u8C03\u7528\u5168\u5C40Fx ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode, "globalFxs.").concat(props.meta.ioProxy.id, "(").concat(nextValue, ")");
+          code += "".concat(indent, "/** \u8C03\u7528\u5168\u5C40Fx ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode, "globalFxs.").concat(props.meta.ioProxy.id, "(").concat(nextValue).concat(nextValue ? ', ' : '', "appContext)");
         } else {
           var _currentProvider = getCurrentProvider({
             isSameScope: isSameScope,
@@ -235,7 +235,7 @@ export var handleProcess = function handleProcess(event, config) {
         return pre + "".concat(indent2).concat(id, ": undefined,\n");
       } else {
         var next = outputs.map(function (output) {
-          return getNextValueWithParam(output, config, event);
+          return getNextValueWithParam(output, config, event, outputToInputPinMap);
         }).join(", ");
         return pre + "".concat(indent2).concat(id, ": ").concat(next, ",\n");
       }
@@ -382,8 +382,8 @@ var getNextValue = function getNextValue(props, config, event, outputToInputPinM
   });
   return nextValue.join(", ");
 };
-var getNextValueWithParam = function getNextValueWithParam(param, config, event) {
-  var _param$meta5, _param$meta6;
+var getNextValueWithParam = function getNextValueWithParam(param, config, event, outputToInputPinMap) {
+  var _param$meta5, _param$meta6, _param$meta8;
   if (param.type === "params") {
     var params = config.getParams();
     return params[param.id];
@@ -396,16 +396,20 @@ var getNextValueWithParam = function getNextValueWithParam(param, config, event)
   var componentNameWithId = getComponentNameWithId(param, config, event);
   // 变量组件直接返回 Subject
   if ((_param$meta6 = param.meta) !== null && _param$meta6 !== void 0 && (_param$meta6 = _param$meta6.def) !== null && _param$meta6 !== void 0 && (_param$meta6 = _param$meta6.namespace) !== null && _param$meta6 !== void 0 && _param$meta6.includes(".var")) {
-    var _connectId = param.connectId;
-    if (_connectId) {
-      return "".concat(componentNameWithId, "_").concat(_connectId, "_result");
+    var _param$meta7;
+    var _key2 = "".concat((_param$meta7 = param.meta) === null || _param$meta7 === void 0 ? void 0 : _param$meta7.id, "_").concat(param.id);
+    var _fullVarName2 = outputToInputPinMap === null || outputToInputPinMap === void 0 ? void 0 : outputToInputPinMap.get(_key2);
+    if (_fullVarName2) {
+      return _fullVarName2;
     }
     return "".concat(componentNameWithId, "_result");
   }
-  // 使用 connectId（连接ID）来引用对应的 result 变量
-  var connectId = param.connectId;
-  if (connectId) {
-    return "".concat(componentNameWithId, "_").concat(connectId, "_result.").concat(param.id);
+
+  // 从 outputToInputPinMap 中查找完整变量名（已包含去重后缀）
+  var key = "".concat((_param$meta8 = param.meta) === null || _param$meta8 === void 0 ? void 0 : _param$meta8.id, "_").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/package.json

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