@mybricks/to-code-taro 1.1.5 → 1.1.7

package/dist/esm/toCodeTaro.d.ts

@@ -64,10 +64,9 @@ export interface GeneratedFile {
     /** 当前页面/弹窗内用到的 JS 计算组件（用于生成 index.jsModules.ts） */
     jsModules?: import("./utils/context/collectJSModules").JSModule[];
     importManager: ImportManager;
-    type: "normal" | "popup" | "module" | "global" | "extension-config" | "extension-api" | "extension-bus" | "abstractEventTypeDef" | "fx" | "api" | "connector-api" | "extension-event" | "jsModulesRuntime" | "tabBarConfig" | "customTabBar";
+    type: "normal" | "popup" | "module" | "global" | "extension-config" | "extension-api" | "extension-bus" | "abstractEventTypeDef" | "fx" | "api" | "rootConfig" | "connector-api" | "extension-event" | "jsModulesRuntime" | "tabBarConfig" | "customTabBar";
     meta?: ReturnType<typeof toCode>["scenes"][0]["scene"];
     name: string;
-    tabBarConfig?: string;
 }
 /** 统一的生成结果结构 */
 export interface GenerationResult {

package/dist/esm/toCodeTaro.js

@@ -79,7 +79,7 @@ var getCode = function getCode(params, config) {
   var globalVarTypeDef = buildGlobalVarTypeDef(tojson.global.comsReg);
   var defaultFxsMap = buildDefaultFxsMap(tojson.global.fxFrames || []);
 
-  // ========== 第四步：处理全局变量和 FX ==========
+  // ========== 第四步：处理全局变量、FX、其他全局配置 ==========
   files.push.apply(files, _toConsumableArray(handleGlobal({
     tojson: tojson,
     globalFxs: globalFxs,

package/dist/esm/utils/builder/buildResult.js

@@ -74,8 +74,7 @@ export var buildFinalResults = function buildFinalResults(params) {
       type: "tabBarConfig",
       content: globalTabBarConfig,
       importManager: new ImportManager(config),
-      name: "tabBarConfig",
-      tabBarConfig: globalTabBarConfig
+      name: "tabBarConfig"
     });
     files.push({
       type: "customTabBar",

package/dist/esm/utils/common/ImportManager.d.ts

@@ -14,6 +14,13 @@ export declare class ImportManager {
         dependencyNames: string[];
         importType: ImportType;
     }): void;
+    /**
+     * 获取 import 排序优先级
+     * 1. 第三方包（react, @tarojs 等）
+     * 2. 绝对路径别名（@/xxx）
+     * 3. 相对路径（./xxx, ../xxx）
+     */
+    private getImportPriority;
     /** 依赖解析为code */
     toCode(): string;
 }

package/dist/esm/utils/common/ImportManager.js

@@ -40,24 +40,52 @@ export var ImportManager = /*#__PURE__*/function () {
       }
     }
 
+    /**
+     * 获取 import 排序优先级
+     * 1. 第三方包（react, @tarojs 等）
+     * 2. 绝对路径别名（@/xxx）
+     * 3. 相对路径（./xxx, ../xxx）
+     */
+  }, {
+    key: "getImportPriority",
+    value: function getImportPriority(packageName) {
+      if (packageName.startsWith('./') || packageName.startsWith('../')) {
+        return 3; // 相对路径
+      }
+      if (packageName.startsWith('@/')) {
+        return 2; // 绝对路径别名
+      }
+      return 1; // 第三方包
+    }
+
     /** 依赖解析为code */
   }, {
     key: "toCode",
     value: function toCode() {
+      var _this = this;
       var indent = indentation(this._config.codeStyle.indent);
-      return Object.entries(this._imports).reduce(function (pre, _ref2) {
+
+      // 对 imports 按优先级排序
+      var sortedEntries = Object.entries(this._imports).sort(function (_ref2, _ref3) {
+        var _ref4 = _slicedToArray(_ref2, 1),
+          a = _ref4[0];
+        var _ref5 = _slicedToArray(_ref3, 1),
+          b = _ref5[0];
+        return _this.getImportPriority(a) - _this.getImportPriority(b);
+      });
+      return sortedEntries.reduce(function (pre, _ref6) {
         var _dependencies$__modul;
-        var _ref3 = _slicedToArray(_ref2, 2),
-          packageName = _ref3[0],
-          dependencies = _ref3[1];
+        var _ref7 = _slicedToArray(_ref6, 2),
+          packageName = _ref7[0],
+          dependencies = _ref7[1];
         var defaultDependency = "";
         var namedDependencies = "";
         var dependencyEntries = Object.entries(dependencies);
 
         // 检查是否有 module 类型的导入（如 import './index.less'）
-        var hasModuleType = ((_dependencies$__modul = dependencies["__module__"]) === null || _dependencies$__modul === void 0 ? void 0 : _dependencies$__modul.importType) === "module" || dependencyEntries.some(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 2),
-            importType = _ref5[1].importType;
+        var hasModuleType = ((_dependencies$__modul = dependencies["__module__"]) === null || _dependencies$__modul === void 0 ? void 0 : _dependencies$__modul.importType) === "module" || dependencyEntries.some(function (_ref8) {
+          var _ref9 = _slicedToArray(_ref8, 2),
+            importType = _ref9[1].importType;
           return importType === "module";
         });
         if (hasModuleType) {
@@ -65,16 +93,16 @@ export var ImportManager = /*#__PURE__*/function () {
         }
 
         /** 超过三项换行 */
-        var validEntries = dependencyEntries.filter(function (_ref6) {
-          var _ref7 = _slicedToArray(_ref6, 1),
-            key = _ref7[0];
+        var validEntries = dependencyEntries.filter(function (_ref10) {
+          var _ref11 = _slicedToArray(_ref10, 1),
+            key = _ref11[0];
           return key !== "__module__";
         });
         var wrap = validEntries.length > 3;
-        validEntries.forEach(function (_ref8, index) {
-          var _ref9 = _slicedToArray(_ref8, 2),
-            dependencyName = _ref9[0],
-            importType = _ref9[1].importType;
+        validEntries.forEach(function (_ref12, index) {
+          var _ref13 = _slicedToArray(_ref12, 2),
+            dependencyName = _ref13[0],
+            importType = _ref13[1].importType;
           if (importType === "default") {
             defaultDependency = dependencyName;
           } else if (importType === "named") {

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

@@ -12,7 +12,7 @@ export var genJSModulesRuntime = function genJSModulesRuntime() {
  * 输出：export const jsModules = { u_xxx: (props, appContext) => createJSHandle(...) }
  */
 export var genScopedJSModules = function genScopedJSModules(jsModules, importCreateJSHandleFrom, importRuntimeFrom) {
-  var code = "/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { createJSHandle } from \"".concat(importCreateJSHandleFrom, "\";\nimport { _execJs } from \"").concat(importRuntimeFrom, "\";\n\nexport const jsModules: Record<string, (props: any, appContext: any) => any> = {};\n");
+  var code = "/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { createJSHandle } from \"".concat(importCreateJSHandleFrom, "\";\nimport { _execJs } from \"").concat(importRuntimeFrom, "\";\n\nexport const jsModules: Record<string, (props: any, appContext: any, handleKey?: string) => any> = {};\n");
   jsModules.forEach(function (module) {
     var id = module.id,
       title = module.title,
@@ -26,7 +26,7 @@ export var genScopedJSModules = function genScopedJSModules(jsModules, importCre
     code += "\n// ".concat(title, "\n");
     code += "const js_".concat(id, " = ").concat(decodedCode, ";\n");
     code += "const _execJs_".concat(id, " = _execJs(js_").concat(id, ");\n");
-    code += "jsModules.".concat(id, " = (props, appContext) => createJSHandle(_execJs_").concat(id, ", { props, appContext });\n");
+    code += "jsModules.".concat(id, " = (props, appContext, handleKey) => createJSHandle(_execJs_").concat(id, ", { props, appContext }, handleKey);\n");
   });
   code += "\n";
   return code;

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

@@ -16,7 +16,10 @@ var isJsCalculationComponent = function isJsCalculationComponent(namespace) {
  * 判断是否是 JS API 组件
  */
 var isJsApiComponent = function isJsApiComponent(namespace, rtType) {
-  return namespace.startsWith("mybricks.taro._") && (rtType === null || rtType === void 0 ? void 0 : rtType.match(/^js/gi)) !== null;
+  var jsCompNamespace = ['mybricks.taro.', 'mybricks.normal-pc.'];
+  return jsCompNamespace.some(function (_namespace) {
+    return namespace.startsWith(_namespace);
+  }) && (rtType === null || rtType === void 0 ? void 0 : rtType.match(/^js/gi)) !== null;
 };
 export var handleProcess = function handleProcess(event, config) {
   var code = "";
@@ -109,14 +112,22 @@ export var handleProcess = function handleProcess(event, config) {
   });
 
   // 处理节点调用
+  // 边遍历边构建映射：确保引用时只能看到已声明的变量
+  var outputToInputPinMap = new Map();
   process.nodesInvocation.forEach(function (props) {
-    var _config$getCallTempla, _props$meta$model;
+    var _props$nextParam, _config$getCallTempla, _props$meta$model;
     var componentType = props.componentType,
       category = props.category,
       runType = props.runType;
-    var nextValue = getNextValue(props, config, event);
+    var nextValue = getNextValue(props, config, event, outputToInputPinMap);
     var isSameScope = checkIsSameScope(event, props);
     var nextCode = getNextCode(props, config, isSameScope, event);
+
+    // 声明后记录映射，供后续引用
+    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);
+    });
     if (code) {
       code += "\n";
     }
@@ -189,7 +200,22 @@ export var handleProcess = function handleProcess(event, config) {
       }
     } else {
       // UI 组件处理
-      code += "".concat(indent, "/** \u8C03\u7528 ").concat(props.meta.title, " \u7684 ").concat(props.title, " */") + "\n".concat(indent).concat(nextCode, "this.").concat(props.meta.id, ".").concat(props.id, "(").concat(nextValue, ")");
+      if (props.type === "frameOutput") {
+        var _event$meta, _currentScene$coms;
+        // 帧输出：找到拥有该帧的组件，通过 $outputs 调用
+        var _currentScene = config.getCurrentScene();
+        var parentComId = event.comId || ((_event$meta = event.meta) === null || _event$meta === void 0 ? void 0 : _event$meta.parentComId);
+        var frameConEntry = Object.values(_currentScene.cons || {}).flat().find(function (con) {
+          if (con.type !== "frame" || con.pinId !== props.id) return false;
+          if (parentComId && con.comId) return con.comId === parentComId;
+          return true;
+        });
+        var comId = (frameConEntry === null || frameConEntry === void 0 ? void 0 : frameConEntry.comId) || props.meta.id;
+        var comTitle = ((_currentScene$coms = _currentScene.coms) === null || _currentScene$coms === void 0 || (_currentScene$coms = _currentScene$coms[comId]) === null || _currentScene$coms === void 0 ? void 0 : _currentScene$coms.title) || props.meta.title || comId;
+        code += "".concat(indent, "/** \u8C03\u7528 ").concat(comTitle, " \u7684 ").concat(props.title, " */") + "\n".concat(indent).concat(nextCode, "$outputs['").concat(comId, "'].").concat(props.id, "(").concat(nextValue, ")");
+      } else {
+        code += "".concat(indent, "/** \u8C03\u7528 ").concat(props.meta.title, " \u7684 ").concat(props.title, " */") + "\n".concat(indent).concat(nextCode, "this.").concat(props.meta.id, ".").concat(props.id, "(").concat(nextValue, ")");
+      }
     }
   });
   if (["fx", "extension-api", "extension-bus"].includes(event.type)) {
@@ -263,7 +289,11 @@ var getNextCode = function getNextCode(props, config, isSameScope, event) {
     return "";
   }
   var componentNameWithId = getComponentNameWithId(props, config, event);
-  return "const ".concat(componentNameWithId, "_result = ");
+  // 使用输入端口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 = ");
 };
 
 /**
@@ -282,13 +312,20 @@ 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), "]");
   }
 }
-var getNextValue = function getNextValue(props, config, event) {
+var getNextValue = function getNextValue(props, config, event, outputToInputPinMap) {
   var paramSource = props.paramSource;
   var nextValue = paramSource.map(function (param) {
-    var _param$meta, _param$meta2;
+    var _param$meta, _param$meta2, _param$meta4;
     if (param.type === "params") {
       var params = config.getParams();
       return params[param.id];
@@ -303,28 +340,52 @@ var getNextValue = function getNextValue(props, config, event) {
     var componentNameWithId = getComponentNameWithId(param, config, event);
     // 变量组件直接返回 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
+      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");
+      }
       return "".concat(componentNameWithId, "_result");
     }
+
+    // 从 outputToInputPinMap 中查找对应的输入端口ID
+    // 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);
+    }
     return "".concat(componentNameWithId, "_result.").concat(param.id);
   });
   return nextValue.join(", ");
 };
 var getNextValueWithParam = function getNextValueWithParam(param, config, event) {
-  var _param$meta3, _param$meta4;
+  var _param$meta5, _param$meta6;
   if (param.type === "params") {
     var params = config.getParams();
     return params[param.id];
   }
 
   // frame-input：直接从 slot params 读取（不生成 frameInput_xxx_result 临时变量）
-  if (((_param$meta3 = param.meta) === null || _param$meta3 === void 0 || (_param$meta3 = _param$meta3.def) === null || _param$meta3 === void 0 ? void 0 : _param$meta3.namespace) === "mybricks.core-comlib.frame-input" && param.id === "return") {
+  if (((_param$meta5 = param.meta) === null || _param$meta5 === void 0 || (_param$meta5 = _param$meta5.def) === null || _param$meta5 === void 0 ? void 0 : _param$meta5.namespace) === "mybricks.core-comlib.frame-input" && param.id === "return") {
     return getFrameInputValueExpr(param.meta, config, event);
   }
   var componentNameWithId = getComponentNameWithId(param, config, event);
   // 变量组件直接返回 Subject
-  if ((_param$meta4 = param.meta) !== null && _param$meta4 !== void 0 && (_param$meta4 = _param$meta4.def) !== null && _param$meta4 !== void 0 && (_param$meta4 = _param$meta4.namespace) !== null && _param$meta4 !== void 0 && _param$meta4.includes(".var")) {
+  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");
+    }
     return "".concat(componentNameWithId, "_result");
   }
+  // 使用 connectId（连接ID）来引用对应的 result 变量
+  var connectId = param.connectId;
+  if (connectId) {
+    return "".concat(componentNameWithId, "_").concat(connectId, "_result.").concat(param.id);
+  }
   return "".concat(componentNameWithId, "_result.").concat(param.id);
 };
 var getCurrentProvider = function getCurrentProvider(params, config) {
@@ -381,7 +442,7 @@ var generateJsCalculationComponentCode = function generateJsCalculationComponent
     return "\"".concat(input, "\"");
   }).join(", "), "],") : "") + (props.outputs ? "\n".concat(indent2, "outputs: [").concat(props.outputs.map(function (output) {
     return "\"".concat(output, "\"");
-  }).join(", "), "],") : "") + "\n".concat(indent, "}, appContext)\n");
+  }).join(", "), "],") : "") + "\n".concat(indent, "}, appContext, '").concat(meta.id, "')\n");
 };
 
 /**
@@ -430,5 +491,5 @@ var generateJsApiComponentCode = function generateJsApiComponentCode(params) {
     return "\"".concat(input, "\"");
   }).join(", "), "],") : "") + (props.outputs ? "\n".concat(indent2, "  outputs: [").concat(props.outputs.map(function (output) {
     return "\"".concat(output, "\"");
-  }).join(", "), "],") : "") + "\n".concat(indent2, "},") + "\n".concat(indent2, "appContext") + "\n".concat(indent, "})\n");
+  }).join(", "), "],") : "") + "\n".concat(indent2, "},") + "\n".concat(indent2, "appContext") + "\n".concat(indent, "}, '").concat(meta.id, "')\n");
 };

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

@@ -54,7 +54,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

@@ -55,11 +55,10 @@ export var RenderManager = /*#__PURE__*/function () {
           code += "".concat(indent, "/** ").concat(description, " */\n");
         }
         code += "".concat(indent, "function ").concat(renderFunctionName, "(params: any) {\n");
-        // render 函数内的事件处理代码可能会用到 appContext（例如 jsModules.xxx(..., appContext)）
-        // outputs 统一从 comRefs.current.$outputs 读取（不再通过 context.outputs 透出）
         code += "".concat(indent).concat(indent2, "const { comRefs, $vars, $fxs, appContext } = useAppContext();\n");
-        // code += `${indent}${indent2}const outputs = comRefs.current.$outputs;\n`;
-
+        if (logicCode !== null && logicCode !== void 0 && logicCode.includes('$outputs')) {
+          code += "".concat(indent).concat(indent2, "const $outputs = comRefs.current.$outputs;\n");
+        }
         if (logicCode) {
           code += logicCode.split("\n").map(function (line) {
             return "".concat(indent).concat(line);
@@ -101,7 +100,7 @@ export var RenderManager = /*#__PURE__*/function () {
               code += "".concat(indent).concat(indent4, "name: ").concat(child.name !== undefined ? "'".concat(child.name, "'") : 'undefined', ",\n");
               code += "".concat(indent).concat(indent4, "style: ").concat(childStyle, ",\n");
               code += "".concat(indent).concat(indent4, "get inputs() { return comRefs.current['").concat(child.id, "'] },\n");
-              code += "".concat(indent).concat(indent4, "get outputs() { return outputs['").concat(child.id, "'] },\n");
+              code += "".concat(indent).concat(indent4, "get outputs() { return comRefs.current.$outputs['").concat(child.id, "'] },\n");
               code += "".concat(indent).concat(indent4, "jsx: ").concat(varName, ",\n");
               code += "".concat(indent).concat(indent3, "},\n");
             }
@@ -115,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");

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

@@ -48,9 +48,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.5",
+  "version": "1.1.7",
   "description": "To code for Taro",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/dist/cjs/core/comlib/Index.js

@@ -1,114 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/core/comlib/Index.ts
-var Index_exports = {};
-__export(Index_exports, {
-  mybricks_taro_aesEncode: () => import_AesEncode.default,
-  mybricks_taro_callPhone: () => import_CallPhone.default,
-  mybricks_taro_chooseFile: () => import_ChooseFile.default,
-  mybricks_taro_chooseMedia: () => import_ChooseMedia.default,
-  mybricks_taro_connector: () => import_Connector.default,
-  mybricks_taro_connectorGlobalHeaders: () => import_ConnectorGlobalHeaders.default,
-  mybricks_taro_format: () => import_Format.default,
-  mybricks_taro_getLocation: () => import_GetLocation.default,
-  mybricks_taro_getStorage: () => import_GetStorage.default,
-  mybricks_taro_getSystemInfo: () => import_GetSystemInfo.default,
-  mybricks_taro_modal: () => import_Modal.default,
-  mybricks_taro_navigateBack: () => import_BackTo.default,
-  mybricks_taro_openCamera: () => import_OpenCamera.default,
-  mybricks_taro_openPetalMap: () => import_OpenPetalMap.default,
-  mybricks_taro_openUrl: () => import_OpenUrl.default,
-  mybricks_taro_removeStorage: () => import_RemoveStorage.default,
-  mybricks_taro_router: () => import_Router.default,
-  mybricks_taro_scanQrcode: () => import_ScanQrcode.default,
-  mybricks_taro_setStorage: () => import_SetStorage.default,
-  mybricks_taro_share: () => import_Share.default,
-  mybricks_taro_showToast: () => import_ShowToast.default,
-  mybricks_taro_textToSpeech: () => import_TextToSpeech.default,
-  mybricks_taro_timerDebounce: () => import_TimerDebounce.default,
-  mybricks_taro_timerDelay: () => import_TimerDelay.default,
-  mybricks_taro_timerThrottle: () => import_TimerThrottle.default,
-  mybricks_taro_vibrate: () => import_Vibrate.default
-});
-module.exports = __toCommonJS(Index_exports);
-var import_ShowToast = __toESM(require("./_ShowToast"));
-var import_ScanQrcode = __toESM(require("./_ScanQrcode"));
-var import_SetStorage = __toESM(require("./_SetStorage"));
-var import_GetStorage = __toESM(require("./_GetStorage"));
-var import_RemoveStorage = __toESM(require("./_RemoveStorage"));
-var import_GetLocation = __toESM(require("./_GetLocation"));
-var import_Vibrate = __toESM(require("./_Vibrate"));
-var import_CallPhone = __toESM(require("./_CallPhone"));
-var import_OpenCamera = __toESM(require("./_OpenCamera"));
-var import_OpenUrl = __toESM(require("./_OpenUrl"));
-var import_Share = __toESM(require("./_Share"));
-var import_GetSystemInfo = __toESM(require("./_GetSystemInfo"));
-var import_AesEncode = __toESM(require("./_AesEncode"));
-var import_Modal = __toESM(require("./_Modal"));
-var import_Format = __toESM(require("./_Format"));
-var import_ChooseFile = __toESM(require("./_ChooseFile"));
-var import_ChooseMedia = __toESM(require("./_ChooseMedia"));
-var import_Connector = __toESM(require("./_Connector"));
-var import_ConnectorGlobalHeaders = __toESM(require("./_ConnectorGlobalHeaders"));
-var import_BackTo = __toESM(require("./_BackTo"));
-var import_Router = __toESM(require("./_Router"));
-var import_OpenPetalMap = __toESM(require("./_OpenPetalMap"));
-var import_TextToSpeech = __toESM(require("./_TextToSpeech"));
-var import_TimerDebounce = __toESM(require("./_TimerDebounce"));
-var import_TimerDelay = __toESM(require("./_TimerDelay"));
-var import_TimerThrottle = __toESM(require("./_TimerThrottle"));
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  mybricks_taro_aesEncode,
-  mybricks_taro_callPhone,
-  mybricks_taro_chooseFile,
-  mybricks_taro_chooseMedia,
-  mybricks_taro_connector,
-  mybricks_taro_connectorGlobalHeaders,
-  mybricks_taro_format,
-  mybricks_taro_getLocation,
-  mybricks_taro_getStorage,
-  mybricks_taro_getSystemInfo,
-  mybricks_taro_modal,
-  mybricks_taro_navigateBack,
-  mybricks_taro_openCamera,
-  mybricks_taro_openPetalMap,
-  mybricks_taro_openUrl,
-  mybricks_taro_removeStorage,
-  mybricks_taro_router,
-  mybricks_taro_scanQrcode,
-  mybricks_taro_setStorage,
-  mybricks_taro_share,
-  mybricks_taro_showToast,
-  mybricks_taro_textToSpeech,
-  mybricks_taro_timerDebounce,
-  mybricks_taro_timerDelay,
-  mybricks_taro_timerThrottle,
-  mybricks_taro_vibrate
-});

package/dist/cjs/core/comlib/_AesEncode.js

@@ -1,115 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/core/comlib/_AesEncode.ts
-var AesEncode_exports = {};
-__export(AesEncode_exports, {
-  default: () => AesEncode_default
-});
-module.exports = __toCommonJS(AesEncode_exports);
-var import_crypto_js = __toESM(require("crypto-js"));
-var AesEncode_default = (context) => {
-  var _a, _b;
-  const data = context.data;
-  const inputs = context.inputs;
-  const outputs = context.outputs;
-  const modeMap = {
-    CBC: import_crypto_js.default.mode.CBC,
-    ECB: import_crypto_js.default.mode.ECB,
-    CFB: import_crypto_js.default.mode.CFB,
-    OFB: import_crypto_js.default.mode.OFB,
-    CTR: import_crypto_js.default.mode.CTR
-  };
-  const paddingMap = {
-    Pkcs7: import_crypto_js.default.pad.Pkcs7,
-    Iso97971: import_crypto_js.default.pad.Iso97971,
-    AnsiX923: import_crypto_js.default.pad.AnsiX923,
-    Iso10126: import_crypto_js.default.pad.Iso10126,
-    ZeroPadding: import_crypto_js.default.pad.ZeroPadding,
-    NoPadding: import_crypto_js.default.pad.NoPadding
-  };
-  (_a = inputs.encrypt) == null ? void 0 : _a.call(inputs, (val) => {
-    try {
-      const text = val.text || "";
-      const key = val.key || data.key || "defaultKey1234567890123456";
-      const iv = val.iv || data.iv;
-      const mode = modeMap[val.mode || data.mode || "CBC"];
-      const padding = paddingMap[val.padding || data.padding || "Pkcs7"];
-      if (!text) {
-        outputs.onFail("待加密文本不能为空");
-        return;
-      }
-      const keyBytes = import_crypto_js.default.enc.Utf8.parse(key);
-      const ivBytes = iv ? import_crypto_js.default.enc.Utf8.parse(iv) : void 0;
-      const encrypted = import_crypto_js.default.AES.encrypt(text, keyBytes, {
-        mode,
-        padding,
-        iv: ivBytes
-      });
-      outputs.onEncryptSuccess({
-        encryptedText: encrypted.toString(),
-        originalText: text
-      });
-    } catch (error) {
-      console.error("AES加密失败:", error);
-      outputs.onFail((error == null ? void 0 : error.message) || "AES加密失败");
-    }
-  });
-  (_b = inputs.decrypt) == null ? void 0 : _b.call(inputs, (val) => {
-    try {
-      const encryptedText = val.encryptedText || "";
-      const key = val.key || data.key || "defaultKey1234567890123456";
-      const iv = val.iv || data.iv;
-      const mode = modeMap[val.mode || data.mode || "CBC"];
-      const padding = paddingMap[val.padding || data.padding || "Pkcs7"];
-      if (!encryptedText) {
-        outputs.onFail("待解密文本不能为空");
-        return;
-      }
-      const keyBytes = import_crypto_js.default.enc.Utf8.parse(key);
-      const ivBytes = iv ? import_crypto_js.default.enc.Utf8.parse(iv) : void 0;
-      const decrypted = import_crypto_js.default.AES.decrypt(encryptedText, keyBytes, {
-        mode,
-        padding,
-        iv: ivBytes
-      });
-      const decryptedText = decrypted.toString(import_crypto_js.default.enc.Utf8);
-      if (!decryptedText) {
-        outputs.onFail("解密失败，可能密钥或参数不正确");
-        return;
-      }
-      outputs.onDecryptSuccess({
-        decryptedText,
-        encryptedText
-      });
-    } catch (error) {
-      console.error("AES解密失败:", error);
-      outputs.onFail((error == null ? void 0 : error.message) || "AES解密失败");
-    }
-  });
-};