@mybricks/to-code-taro 1.0.3 → 1.0.5

package/dist/esm/toCodeTaro.d.ts

@@ -24,7 +24,7 @@ export interface ToTaroCodeConfig {
         callName?: string;
     };
     getComponentPackageName: (props?: any) => string;
-    getUtilsPackageName: () => string;
+    getUtilsPackageName: (props?: any) => string;
     getPageId?: (id: string) => string;
     getBus?: (namespace: string) => {
         title: string;

package/dist/esm/toCodeTaro.js

@@ -91,9 +91,23 @@ var getCode = function getCode(params, config) {
   var jsModulesCollector = createJSModulesCollector();
   var pageConfigHandler = new HandlePageConfig();
 
+  // 提前识别所有弹窗场景
+  var popupIds = new Set();
+  tojson.scenes.forEach(function (s) {
+    var _s$deps;
+    if (s.type === 'popup' || (_s$deps = s.deps) !== null && _s$deps !== void 0 && _s$deps.some(function (dep) {
+      return dep.namespace === 'mybricks.taro.popup';
+    })) {
+      popupIds.add(s.id);
+    }
+  });
+
   // ========== 第六步：处理场景 ==========
   processScenes(scenes, {
-    config: config,
+    config: _objectSpread(_objectSpread({}, config), {}, {
+      // @ts-ignore
+      hasPopups: popupIds.size > 0
+    }),
     globalVarTypeDef: globalVarTypeDef,
     defaultFxsMap: defaultFxsMap,
     abstractEventTypeDefMap: abstractEventTypeDefMap,
@@ -128,6 +142,7 @@ var getCode = function getCode(params, config) {
     jsModulesMap: jsModulesCollector.getMap(),
     globalTabBarConfig: pageConfigHandler.getTabBarConfig(),
     tabBarImageFiles: pageConfigHandler.getTabBarImageFiles(),
+    popupIds: Array.from(popupIds),
     config: config
   });
   files.push.apply(files, _toConsumableArray(finalResultData.files));

package/dist/esm/utils/builder/buildResult.d.ts

@@ -9,6 +9,7 @@ interface BuildResultParams {
     jsModulesMap: JSModulesMap;
     globalTabBarConfig: string | null;
     tabBarImageFiles: any[];
+    popupIds: string[];
     config: ToTaroCodeConfig;
 }
 /**

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

@@ -14,6 +14,7 @@ export var buildFinalResults = function buildFinalResults(params) {
     jsModulesMap = params.jsModulesMap,
     globalTabBarConfig = params.globalTabBarConfig,
     tabBarImageFiles = params.tabBarImageFiles,
+    popupIds = params.popupIds,
     config = params.config;
   var files = [];
 
@@ -44,6 +45,26 @@ export var buildFinalResults = function buildFinalResults(params) {
     });
   }
 
+  // 生成弹窗汇总文件 (popup.ts)
+  if (popupIds.length > 0) {
+    var registryContent = "";
+    popupIds.forEach(function (id) {
+      registryContent += "import Scene_".concat(id, " from '../popupComponents/").concat(id, "/index';\n");
+    });
+    registryContent += "\nexport const POPUP_MAP: Record<string, any> = {\n";
+    popupIds.forEach(function (id) {
+      registryContent += "  '".concat(id, "': Scene_").concat(id, ",\n");
+    });
+    registryContent += "};\n\n";
+    registryContent += "export const POPUP_IDS = ".concat(JSON.stringify(popupIds), ";\n");
+    files.push({
+      type: "popup",
+      content: registryContent,
+      importManager: new ImportManager(config),
+      name: "popup"
+    });
+  }
+
   // 添加 TabBar 配置项（如果存在）
   if (globalTabBarConfig) {
     files.push({

package/dist/esm/utils/config/handlePageConfig.d.ts

@@ -10,9 +10,10 @@ export declare class HandlePageConfig {
     /**
      * 处理页面配置（提取 systemPage 组件数据）
      * @param scene 场景数据
+     * @param isPopup 是否为弹窗场景
      * @returns 页面配置内容
      */
-    handle(scene: ReturnType<typeof toCode>["scenes"][0]["scene"]): string | undefined;
+    handle(scene: ReturnType<typeof toCode>["scenes"][0]["scene"], isPopup?: boolean): string | undefined;
     /**
      * 获取全局 TabBar 配置
      */

package/dist/esm/utils/config/handlePageConfig.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -19,10 +20,12 @@ export var HandlePageConfig = /*#__PURE__*/function () {
     /**
      * 处理页面配置（提取 systemPage 组件数据）
      * @param scene 场景数据
+     * @param isPopup 是否为弹窗场景
      * @returns 页面配置内容
      */
     function handle(scene) {
       var _systemPageCom$model;
+      var isPopup = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       // 提取 systemPage 组件数据，生成 pageConfigContent
       var pageConfigContent;
       var systemPageCom = Object.values(scene.coms || {}).find(function (com) {
@@ -30,7 +33,8 @@ export var HandlePageConfig = /*#__PURE__*/function () {
         return ((_com$def = com.def) === null || _com$def === void 0 ? void 0 : _com$def.namespace) === 'mybricks.taro.systemPage';
       });
       if (systemPageCom !== null && systemPageCom !== void 0 && (_systemPageCom$model = systemPageCom.model) !== null && _systemPageCom$model !== void 0 && _systemPageCom$model.data) {
-        var systemPageData = systemPageCom.model.data;
+        var systemPageData = _objectSpread({}, systemPageCom.model.data);
+
         // 生成页面配置
         pageConfigContent = generatePageConfigContent(systemPageData);
 

package/dist/esm/utils/context/createEventQueries.js

@@ -65,8 +65,9 @@ export var createEventQueries = function createEventQueries(events) {
     getFxEvents: createGetFxEvents(events),
     getEffectEvent: createGetEffectEvent(events),
     getEventByDiagramId: function getEventByDiagramId(diagramId) {
+      // 兼容：部分 event 没有 diagramId 字段，而是直接用 id 存储 diagramId
       return events.find(function (event) {
-        return event.diagramId === diagramId;
+        return event.diagramId === diagramId || event.id === diagramId;
       });
     },
     /** 获取场景/区块的输入项事件 */

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

@@ -119,15 +119,42 @@ export var handleProcess = function handleProcess(event, config) {
     }
     if (componentType === "js") {
       if (category === "scene") {
-        var _config$getPageId;
+        var _targetScene$deps, _config$getPageId;
+        var _sceneId = props.meta.model.data._sceneId;
+        var targetScene = config.getSceneById(_sceneId);
+        var isPopup = (targetScene === null || targetScene === void 0 ? void 0 : targetScene.type) === 'popup' || (targetScene === null || targetScene === void 0 || (_targetScene$deps = targetScene.deps) === null || _targetScene$deps === void 0 ? void 0 : _targetScene$deps.some(function (dep) {
+          return dep.namespace === 'mybricks.taro.popup';
+        }));
+        var controllerName = isPopup ? "popupRouter" : "pageRouter";
         config.addParentDependencyImport({
           packageName: config.getComponentPackageName(),
-          dependencyNames: ["page"],
+          dependencyNames: [controllerName],
           importType: "named"
         });
-        var _sceneId = props.meta.model.data._sceneId;
         var operateName = props.meta.model.data.openType === "redirect" ? "replace" : "open";
-        code += "".concat(indent, "/** \u6253\u5F00 ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode, "page.").concat(operateName, "(\"").concat(((_config$getPageId = config.getPageId) === null || _config$getPageId === void 0 ? void 0 : _config$getPageId.call(config, _sceneId)) || _sceneId, "\", ").concat(nextValue, ")");
+        code += "".concat(indent, "/** \u6253\u5F00 ").concat(props.meta.title, " */") + "\n".concat(indent).concat(nextCode).concat(controllerName, ".").concat(operateName, "(\"").concat(((_config$getPageId = config.getPageId) === null || _config$getPageId === void 0 ? void 0 : _config$getPageId.call(config, _sceneId)) || _sceneId, "\", ").concat(nextValue, ")");
+      } else if (category === "frameOutput") {
+        var _pinProxies;
+        // 场景/弹窗输出（commit/cancel/apply/close）
+        var currentScene = config.getCurrentScene();
+        // pinProxies 的结构在不同数据/版本里不完全一致，这里按最小字段兼容
+        var pinProxy = currentScene === null || currentScene === void 0 || (_pinProxies = currentScene.pinProxies) === null || _pinProxies === void 0 ? void 0 : _pinProxies["".concat(props.meta.id, "-").concat(props.id)];
+        if (pinProxy !== null && pinProxy !== void 0 && pinProxy.frameId && pinProxy !== null && pinProxy !== void 0 && pinProxy.pinId) {
+          var method = pinProxy.pinId;
+          var _controllerName = config.isPopup ? "popupRouter" : "pageRouter";
+          config.addParentDependencyImport({
+            packageName: config.getComponentPackageName(),
+            dependencyNames: [_controllerName],
+            importType: "named"
+          });
+
+          // 仅支持 Page 内置的四种输出方法
+          if (["commit", "cancel", "apply", "close"].includes(method)) {
+            var sceneId = pinProxy.frameId || (currentScene === null || currentScene === void 0 ? void 0 : currentScene.id);
+            var argCode = nextValue ? ", ".concat(nextValue) : "";
+            code += "".concat(indent, "/** ").concat(props.meta.title, " \u8F93\u51FA ").concat(method, " */") + "\n".concat(indent).concat(nextCode).concat(_controllerName, ".").concat(method, "(\"").concat(sceneId, "\"").concat(argCode, ")");
+          }
+        }
       } else if (category === "normal") {
         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 : "", ")");

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

@@ -7,13 +7,15 @@ export declare const genSlotDefineCode: (indent: string) => string;
 /** 生成控制器初始化代码 */
 export declare const genControllerInitCode: (indent: string, providerName: string) => string;
 /** 生成完整的函数组件模板 */
-export declare const genComponentTemplate: ({ componentName, combinedJsCode, uiResult, outputsConfig, scopeName, utilsPackageName, }: {
+export declare const genComponentTemplate: ({ componentName, combinedJsCode, uiResult, outputsConfig, scopeName, utilsPackageName, isPopup, hasPopups, }: {
     componentName: string;
     combinedJsCode: string;
     uiResult: string;
     outputsConfig?: Record<string, Record<string, any>>;
     scopeName?: string;
     utilsPackageName?: string;
+    isPopup?: boolean;
+    hasPopups?: boolean;
 }) => string;
 /** 生成 useEffect 包装代码 */
 export declare const wrapInEffect: (indent: string, effectCode: string) => string;

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

@@ -33,12 +33,20 @@ export var genComponentTemplate = function genComponentTemplate(_ref) {
     uiResult = _ref.uiResult,
     outputsConfig = _ref.outputsConfig,
     scopeName = _ref.scopeName,
-    utilsPackageName = _ref.utilsPackageName;
+    utilsPackageName = _ref.utilsPackageName,
+    _ref$isPopup = _ref.isPopup,
+    isPopup = _ref$isPopup === void 0 ? false : _ref$isPopup,
+    _ref$hasPopups = _ref.hasPopups,
+    hasPopups = _ref$hasPopups === void 0 ? false : _ref$hasPopups;
   // 使用 WithWrapper 作为高阶组件包裹根组件
-  // 格式：export default WithWrapper(ComponentName)
-  return "function ".concat(componentName, "() {\n") + "".concat(combinedJsCode, "\n") + "  return (\n" + "".concat(uiResult.split('\n').map(function (line) {
-    return "    ".concat(line);
-  }).join('\n'), "\n") + "  );\n" + "}\n\n" + "export default WithWrapper(".concat(componentName, ")");
+  var code = "function ".concat(componentName, "() {\n") + "".concat(combinedJsCode, "\n") + "  return (\n" + "    <>\n" + "".concat(uiResult.split('\n').map(function (line) {
+    return "      ".concat(line);
+  }).join('\n'), "\n") + (hasPopups ? "      <PopupRenderer popupMap={POPUP_MAP} />\n" : "") + "    </>\n" + "  );\n" + "}\n\n";
+  if (isPopup) {
+    code += "(".concat(componentName, " as any).isPopup = true;\n\n");
+  }
+  code += "export default WithWrapper(".concat(componentName, ")");
+  return code;
 };
 
 /** 生成 useEffect 包装代码 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mybricks/to-code-taro",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "To code for Taro",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -39,7 +39,9 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.26.0",
-    "@mybricks/to-code-react": "^0.0.5-next.160"
+    "@mybricks/to-code-react": "^0.0.5-next.160",
+    "@types/crypto-js": "^4.2.2",
+    "crypto-js": "^4.2.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/dist/esm/core/utils/page.js

@@ -1,50 +0,0 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import Taro from '@tarojs/taro';
-import { Page } from "../mybricks";
-
-/**
- * Taro 路由实现
- */
-var TaroRouter = /*#__PURE__*/function () {
-  function TaroRouter() {
-    _classCallCheck(this, TaroRouter);
-  }
-  _createClass(TaroRouter, [{
-    key: "getParams",
-    value: function getParams(name) {
-      var _instance$router;
-      var instance = Taro.getCurrentInstance();
-      return {
-        value: (_instance$router = instance.router) === null || _instance$router === void 0 ? void 0 : _instance$router.params
-      };
-    }
-  }, {
-    key: "push",
-    value: function push(name, _ref) {
-      var value = _ref.value;
-      var url = "/pages/".concat(name, "/index");
-      var queryString = value ? "?data=".concat(encodeURIComponent(JSON.stringify(value))) : '';
-      Taro.navigateTo({
-        url: url + queryString
-      });
-    }
-  }, {
-    key: "replace",
-    value: function replace(name, _ref2) {
-      var value = _ref2.value;
-      var url = "/pages/".concat(name, "/index");
-      var queryString = value ? "?data=".concat(encodeURIComponent(JSON.stringify(value))) : '';
-      Taro.redirectTo({
-        url: url + queryString
-      });
-    }
-  }, {
-    key: "pop",
-    value: function pop() {
-      Taro.navigateBack();
-    }
-  }]);
-  return TaroRouter;
-}();
-export var page = new Page(new TaroRouter());