@mybricks/to-code-taro 1.0.3 → 1.0.5

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

@@ -0,0 +1,116 @@
+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 { Page } from "../mybricks";
+
+/**
+ * 弹窗在 Taro 中被视为组件 兼容APP TODO
+ */
+var PopupStore = /*#__PURE__*/function () {
+  function PopupStore() {
+    _classCallCheck(this, PopupStore);
+    _defineProperty(this, "activePopup", null);
+    _defineProperty(this, "listeners", new Set());
+  }
+  _createClass(PopupStore, [{
+    key: "subscribe",
+    value: /** 订阅弹窗状态变化 */
+    function subscribe(listener) {
+      var _this = this;
+      this.listeners.add(listener);
+      // 返回取消订阅函数
+      return function () {
+        _this.listeners.delete(listener);
+      };
+    }
+  }, {
+    key: "notify",
+    value: function notify() {
+      var _this2 = this;
+      this.listeners.forEach(function (l) {
+        return l(_this2.activePopup || {
+          visible: false,
+          name: '',
+          value: null,
+          controller: null
+        });
+      });
+    }
+
+    /** 获取弹窗参数 */
+  }, {
+    key: "getParams",
+    value: function getParams(name) {
+      if (this.activePopup && this.activePopup.name === name) {
+        return {
+          value: this.activePopup.value,
+          controller: this.activePopup.controller
+        };
+      }
+      return {
+        value: null
+      };
+    }
+
+    /** 获取当前激活的弹窗名称 */
+  }, {
+    key: "getActiveName",
+    value: function getActiveName() {
+      var _this$activePopup;
+      return (_this$activePopup = this.activePopup) === null || _this$activePopup === void 0 ? void 0 : _this$activePopup.name;
+    }
+
+    /** 打开弹窗 */
+  }, {
+    key: "push",
+    value: function push(name, _ref) {
+      var value = _ref.value,
+        controller = _ref.controller;
+      this.activePopup = {
+        visible: true,
+        name: name,
+        value: value,
+        controller: controller
+      };
+      this.notify();
+    }
+
+    /** 行为同 push */
+  }, {
+    key: "replace",
+    value: function replace(name, params) {
+      this.push(name, params);
+    }
+
+    /** 关闭弹窗 */
+  }, {
+    key: "pop",
+    value: function pop() {
+      this.activePopup = null;
+      this.notify();
+    }
+  }]);
+  return PopupStore;
+}();
+var popupStore = new PopupStore();
+
+/**
+ * 订阅弹窗状态变化（统一入口，避免外部依赖内部实现细节）
+ */
+export var subscribePopupRouter = function subscribePopupRouter(listener) {
+  return popupStore.subscribe(listener);
+};
+
+/** 弹窗控制器（命名与文件名保持一致） */
+export var popupRouter = new Page(popupStore);
+
+/**
+ * 关闭当前激活的弹窗（用于 TabBar 点击等场景）
+ * 不需要知道弹窗 id
+ */
+export var closeActivePopupRouter = function closeActivePopupRouter() {
+  var name = popupStore.getActiveName();
+  if (!name) return;
+  // 走 Page.close，保证 close/commit/cancel 等控制器语义保持一致
+  popupRouter.close(name);
+};

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

@@ -1,7 +1,17 @@
-import { useRef } from 'react';
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useRef, useState } from 'react';
 import { deepProxy } from "./hooks";
 export function useAppCreateContext() {
   var comRefs = useRef(deepProxy({}));
+  var _useState = useState({
+      visible: false,
+      name: '',
+      value: null,
+      controller: null
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    popupState = _useState2[0],
+    setPopupState = _useState2[1];
   var appContext = {
     canvas: {
       id: "u_7VvVn" // 使用 data 中的 id
@@ -20,6 +30,8 @@ export function useAppCreateContext() {
   };
   return {
     comRefs: comRefs,
-    appContext: appContext
+    appContext: appContext,
+    popupState: popupState,
+    setPopupState: setPopupState
   };
 }

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

@@ -1,12 +1,15 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["component", "id", "data", "className", "style"];
-import React, { useEffect, useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { View } from '@tarojs/components';
-import { useModel, useBindInputs, useBindEvents } from "./index";
+import { useModel, useBindInputs, useBindEvents, subscribePopupRouter, closeActivePopupRouter } from "./index";
 import { useAppCreateContext } from "./useContext";
 import ComContext, { useAppContext } from "./ComContext";
+// @ts-ignore 运行时由宿主项目提供 @tarojs/taro
+import { useTabItemTap } from '@tarojs/taro';
 export var WithCom = function WithCom(props) {
   var Component = props.component,
     _props$id = props.id,
@@ -20,34 +23,59 @@ export var WithCom = function WithCom(props) {
     appContext = _useAppContext.appContext;
   var env = appContext; //TODO: 需要根据实际情况修改
 
+  var isPopup = Component.isPopup;
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     show = _useState2[0],
     setShow = _useState2[1];
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    dynamicStyle = _useState4[0],
+    setDynamicStyle = _useState4[1];
 
-  //默认事件注册
-  useEffect(function () {
-    comRefs.current[id].hide(function () {
-      setShow(false);
-    });
-    comRefs.current[id].show(function () {
-      setShow(true);
-    });
-    comRefs.current[id].showOrHide(function () {
-      setShow(function (prev) {
-        return !prev;
+  //数据模型
+  var _data = useModel(data || {});
+
+  // 内置通用能力
+  var handlers = {
+    _setStyle: function _setStyle(style) {
+      setDynamicStyle(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), style);
       });
+    },
+    _setData: function _setData(path, value) {
+      var paths = path.split('.');
+      var current = _data;
+      for (var i = 0; i < paths.length - 1; i++) {
+        if (!current[paths[i]]) current[paths[i]] = {};
+        current = current[paths[i]];
+      }
+      current[paths[paths.length - 1]] = value;
+    }
+  };
+  if (!isPopup) {
+    Object.assign(handlers, {
+      show: function show() {
+        return setShow(true);
+      },
+      hide: function hide() {
+        return setShow(false);
+      },
+      showOrHide: function showOrHide() {
+        return setShow(function (prev) {
+          return !prev;
+        });
+      }
     });
-  }, [comRefs]);
+  }
 
-  //数据模型
-  var _data = useModel(data || {});
-  var inputProxy = useBindInputs(comRefs, id);
+  // 绑定输入，传入初始 handlers
+  var inputProxy = useBindInputs(comRefs, id, handlers);
   var eventProxy = useBindEvents(rest);
   comRefs.current[id] = inputProxy;
-  return show ? /*#__PURE__*/React.createElement(View, {
+  return show || isPopup ? /*#__PURE__*/React.createElement(View, {
     className: className,
-    style: style
+    style: _objectSpread(_objectSpread({}, style), dynamicStyle)
   }, /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
     inputs: inputProxy,
     outputs: eventProxy,
@@ -60,6 +88,21 @@ export var WithCom = function WithCom(props) {
 export var WithWrapper = function WithWrapper(Component) {
   return function WrappedComponent(props) {
     var contextStore = useAppCreateContext();
+    var setPopupState = contextStore.setPopupState;
+    var isPopup = Component.isPopup;
+
+    // 通过发布订阅模式解耦弹窗状态变化
+    useEffect(function () {
+      return subscribePopupRouter(function (state) {
+        return setPopupState(state);
+      });
+    }, [setPopupState]);
+
+    // 点击 TabBar 时自动关闭弹窗（自定义 TabBar 或原生 TabBar 点击均会触发）
+    useTabItemTap(function () {
+      if (isPopup) return;
+      closeActivePopupRouter();
+    });
     return /*#__PURE__*/React.createElement(ComContext.Provider, {
       value: contextStore
     }, /*#__PURE__*/React.createElement(Component, props));

package/dist/esm/generate/generateTaroProjectJson.js

@@ -88,7 +88,30 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
   // 一次性将所有生成的页面添加到 pages 目录
   (_pagesDir$children = pagesDir.children).push.apply(_pagesDir$children, _toConsumableArray(generatedPages));
 
-  // 更新 app.config.ts
+  // --- 处理弹窗场景 (popup) ---
+  var popupComponentsDir = ensureDir(srcDir, "src/popupComponents");
+  var popupScenes = files.filter(function (item) {
+    return item.type === "popup" && item.meta;
+  });
+  popupScenes.forEach(function (item) {
+    var _item$importManager2;
+    var popupId = item.meta.id;
+    var importCode = ((_item$importManager2 = item.importManager) === null || _item$importManager2 === void 0 ? void 0 : _item$importManager2.toCode()) || "";
+    var fullContent = "".concat(importCode, "\n").concat(item.content || "");
+    popupComponentsDir.children.push({
+      path: "src/popupComponents/".concat(popupId),
+      content: null,
+      children: [{
+        path: "src/popupComponents/".concat(popupId, "/index.tsx"),
+        content: fullContent
+      }, {
+        path: "src/popupComponents/".concat(popupId, "/index.less"),
+        content: item.cssContent || ""
+      }]
+    });
+  });
+
+  // 更新 app.config.ts (只传入 normalItems 作为真正的页面)
   var appConfigFile = (_srcDir$children = srcDir.children) === null || _srcDir$children === void 0 ? void 0 : _srcDir$children.find(function (node) {
     return node.path === "src/app.config.ts";
   });
@@ -101,6 +124,17 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
 
   // 处理 common 目录下的文件
   handleCommonDir(commonDir, files);
+
+  // 处理 popup 汇总文件 (type 为 popup 且无 meta)
+  var popupFile = files.find(function (f) {
+    return f.type === "popup" && !f.meta;
+  });
+  if (popupFile) {
+    commonDir.children.push({
+      path: "src/common/".concat(popupFile.name, ".ts"),
+      content: popupFile.content
+    });
+  }
   return templateJson;
 };
 export default generateTaroProjectJson;

package/dist/esm/handleSlot.d.ts

@@ -8,6 +8,8 @@ interface HandleSlotConfig extends BaseConfig {
     checkIsRoot: () => boolean;
     renderManager?: RenderManager;
     addJSModule?: (module: any) => void;
+    isPopup?: boolean;
+    hasPopups?: boolean;
 }
 declare const handleSlot: (ui: UI, config: HandleSlotConfig) => {
     js: string;

package/dist/esm/handleSlot.js

@@ -57,8 +57,11 @@ var handleSlot = function handleSlot(ui, config) {
  * 设置基础导入
  */
 var setupImports = function setupImports(addImport, config, isRoot) {
-  var utilsPkg = config.getUtilsPackageName();
-  var comPkg = config.getComponentPackageName();
+  var importParams = {
+    isPopup: config.isPopup
+  };
+  var utilsPkg = config.getUtilsPackageName(importParams);
+  var comPkg = config.getComponentPackageName(importParams);
   addImport({
     packageName: "react",
     dependencyNames: ["useRef", "useEffect", "useState"],
@@ -69,9 +72,13 @@ var setupImports = function setupImports(addImport, config, isRoot) {
     dependencyNames: ["View"],
     importType: "named"
   });
+  var dependencyNames = ["WithCom", "WithWrapper"];
+  if (isRoot && config.hasPopups) {
+    dependencyNames.push("PopupRenderer");
+  }
   addImport({
     packageName: utilsPkg,
-    dependencyNames: ["WithCom", "WithWrapper"],
+    dependencyNames: dependencyNames,
     importType: "named"
   });
   addImport({
@@ -80,6 +87,13 @@ var setupImports = function setupImports(addImport, config, isRoot) {
     importType: "named"
   });
   if (isRoot) {
+    if (config.hasPopups) {
+      addImport({
+        packageName: "../../common/popup",
+        dependencyNames: ["POPUP_MAP", "POPUP_IDS"],
+        importType: "named"
+      });
+    }
     addImport({
       packageName: "./index.less",
       dependencyNames: [],
@@ -116,7 +130,9 @@ var finalizeRootComponent = function finalizeRootComponent(ui, config, importMan
   var componentCode = genComponentTemplate({
     componentName: componentName,
     combinedJsCode: combinedJsCode,
-    uiResult: uiResult
+    uiResult: uiResult,
+    isPopup: config.isPopup,
+    hasPopups: config.hasPopups
   });
   config.add({
     importManager: importManager,

package/dist/esm/processors/processComEvents.js

@@ -7,6 +7,7 @@ import { handleProcess } from "../utils/logic/handleProcess";
  * 处理组件事件
  */
 export var processComEvents = function processComEvents(com, config) {
+  var _meta$def;
   var meta = com.meta,
     events = com.events;
   var comEventCode = "";
@@ -14,6 +15,7 @@ export var processComEvents = function processComEvents(com, config) {
   var eventConfig = {};
   var outputEvents = events || {};
   Object.entries(outputEvents).forEach(function (_ref) {
+    var _eventInfo$options, _eventInfo$options2;
     var _ref2 = _slicedToArray(_ref, 2),
       eventId = _ref2[0],
       eventInfo = _ref2[1];
@@ -41,8 +43,12 @@ export var processComEvents = function processComEvents(com, config) {
       };
       return;
     }
-    if (type !== "defined" || !diagramId) return;
-    var event = config.getEventByDiagramId(diagramId);
+    if (type !== "defined") return;
+
+    // 兼容：部分数据把 diagramId 放在 options.id（例如 test-data.json 的 outputEvents）
+    var resolvedDiagramId = diagramId || (eventInfo === null || eventInfo === void 0 || (_eventInfo$options = eventInfo.options) === null || _eventInfo$options === void 0 ? void 0 : _eventInfo$options.diagramId) || (eventInfo === null || eventInfo === void 0 || (_eventInfo$options2 = eventInfo.options) === null || _eventInfo$options2 === void 0 ? void 0 : _eventInfo$options2.id);
+    if (!resolvedDiagramId) return;
+    var event = config.getEventByDiagramId(resolvedDiagramId);
     if (!event) return;
     var paramName = "value";
     var process = handleProcess(event, _objectSpread(_objectSpread({}, config), {}, {
@@ -54,14 +60,18 @@ export var processComEvents = function processComEvents(com, config) {
       }
     })).replace(/this\./g, "comRefs.current.").replace(/comRefs\.current\.([a-zA-Z0-9_]+)\.controller_/g, "comRefs.current.$1.").replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
     if (process.includes("pageParams")) {
+      var importParams = {
+        isPopup: config.isPopup
+      };
+      var controllerName = config.isPopup ? "popupRouter" : "pageRouter";
       config.addParentDependencyImport({
-        packageName: config.getComponentPackageName(),
-        dependencyNames: ["page", "SUBJECT_VALUE"],
+        packageName: config.getComponentPackageName(importParams),
+        dependencyNames: [controllerName, "SUBJECT_VALUE"],
         importType: "named"
       });
       var indent = indentation(config.codeStyle.indent * (config.depth + 3));
       // 使用 SUBJECT_VALUE 获取当前参数值，保持与 MyBricks 逻辑一致
-      process = "".concat(indent, "const pageParams: any = page.getParams(\"").concat(config.getCurrentScene().id, "\")[SUBJECT_VALUE];\n").concat(process);
+      process = "".concat(indent, "const pageParams: any = ").concat(controllerName, ".getParams(\"").concat(config.getCurrentScene().id, "\")[SUBJECT_VALUE];\n").concat(process);
     }
     var handlerIndent = indentation(config.codeStyle.indent * (config.depth + 2));
     var handlerCode = "(".concat(paramName, ": any) => {\n").concat(process, "\n").concat(handlerIndent, "}");
@@ -74,6 +84,53 @@ export var processComEvents = function processComEvents(com, config) {
       connected: true
     };
   });
+
+  // 针对 mybricks.taro.popup 的特殊处理
+  if (((_meta$def = meta.def) === null || _meta$def === void 0 ? void 0 : _meta$def.namespace) === 'mybricks.taro.popup') {
+    var _config$getCurrentSce, _sceneCom$model;
+    if (!outputsConfig[meta.id]) {
+      outputsConfig[meta.id] = {};
+    }
+    var importParams = {
+      isPopup: config.isPopup
+    };
+    var sceneCom = (_config$getCurrentSce = config.getCurrentScene().coms) === null || _config$getCurrentSce === void 0 ? void 0 : _config$getCurrentSce[meta.id];
+    var popupData = (sceneCom === null || sceneCom === void 0 || (_sceneCom$model = sceneCom.model) === null || _sceneCom$model === void 0 ? void 0 : _sceneCom$model.data) || {};
+    var isTrue = function isTrue(v) {
+      return v === true || v === "true";
+    };
+
+    // 如果 onClose 没被连接，且 visibleClose=true（会渲染关闭按钮），才添加默认 close
+    // visibleClose=false 时，运行时不会触发 onClose（模板里只在 close 按钮点击时触发）
+    if (!eventConfig['onClose'] && isTrue(popupData.visibleClose)) {
+      config.addParentDependencyImport({
+        packageName: config.getComponentPackageName(importParams),
+        dependencyNames: ["popupRouter"],
+        importType: "named"
+      });
+      var handlerIndent = indentation(config.codeStyle.indent * (config.depth + 2));
+      var processIndent = indentation(config.codeStyle.indent * (config.depth + 3));
+      outputsConfig[meta.id]['onClose'] = "() => {\n".concat(processIndent, "popupRouter.close(\"").concat(config.getCurrentScene().id, "\");\n").concat(handlerIndent, "}");
+      eventConfig['onClose'] = {
+        connected: true
+      };
+    }
+
+    // 如果 onClickOverlay 没被连接，且组件配置了点击遮罩关闭
+    if (!eventConfig['onClickOverlay'] && isTrue(popupData.maskClose)) {
+      config.addParentDependencyImport({
+        packageName: config.getComponentPackageName(importParams),
+        dependencyNames: ["popupRouter"],
+        importType: "named"
+      });
+      var _handlerIndent = indentation(config.codeStyle.indent * (config.depth + 2));
+      var _processIndent = indentation(config.codeStyle.indent * (config.depth + 3));
+      outputsConfig[meta.id]['onClickOverlay'] = "() => {\n".concat(_processIndent, "popupRouter.close(\"").concat(config.getCurrentScene().id, "\");\n").concat(_handlerIndent, "}");
+      eventConfig['onClickOverlay'] = {
+        connected: true
+      };
+    }
+  }
   return {
     comEventCode: comEventCode,
     outputsConfig: outputsConfig,

package/dist/esm/processors/processScene.js

@@ -12,7 +12,7 @@ import { collectJSModulesFromScene } from "../utils/context/collectJSModules";
  * 处理单个场景
  */
 export var processScene = function processScene(params) {
-  var _config$getFileName;
+  var _config$getFileName, _originalScene$deps;
   var _params$scene = params.scene,
     scene = _params$scene.scene,
     ui = _params$scene.ui,
@@ -45,14 +45,22 @@ export var processScene = function processScene(params) {
   // 创建 FX Map
   var fxsMap = Object.assign({}, defaultFxsMap);
 
+  // 参考鸿蒙逻辑：如果场景中包含 popup 组件，则标记场景类型为 popup
+  var originalScene = getSceneById(scene.id);
+  var isPopup = (originalScene === null || originalScene === void 0 ? void 0 : originalScene.type) === 'popup' || (originalScene === null || originalScene === void 0 || (_originalScene$deps = originalScene.deps) === null || _originalScene$deps === void 0 ? void 0 : _originalScene$deps.some(function (dep) {
+    return dep.namespace === 'mybricks.taro.popup';
+  }));
+
   // 处理页面配置
-  var pageConfigContent = pageConfigHandler.handle(scene);
+  var pageConfigContent = pageConfigHandler.handle(scene, isPopup);
 
   // 创建事件查询函数
   var eventQueries = createEventQueries(event);
 
   // 处理 Slot
   handleSlot(ui, _objectSpread(_objectSpread({}, config), {}, {
+    isPopup: isPopup,
+    // 标记当前场景是否为弹窗
     getCurrentScene: function getCurrentScene() {
       var originalScene = getSceneById(scene.id);
       return _objectSpread(_objectSpread(_objectSpread({}, scene), originalScene), {}, {
@@ -61,7 +69,7 @@ export var processScene = function processScene(params) {
     },
     add: function add(value) {
       params.addResult(_objectSpread(_objectSpread({}, value), {}, {
-        type: scene.type ? scene.type : "normal",
+        type: isPopup ? "popup" : originalScene !== null && originalScene !== void 0 && originalScene.type ? originalScene.type : "normal",
         meta: scene,
         pageConfigContent: pageConfigContent
       }));

package/dist/esm/processors/processSceneLogic.js

@@ -39,8 +39,11 @@ var processLogicalInit = function processLogicalInit(scene, config, addDependenc
     return com.def.namespace === "mybricks.core-comlib.var";
   });
   if (vars.length > 0) {
+    var importParams = {
+      isPopup: config.isPopup
+    };
     addDependencyImport({
-      packageName: config.getUtilsPackageName(),
+      packageName: config.getUtilsPackageName(importParams),
       dependencyNames: ["createVariable"],
       importType: "named"
     });
@@ -58,8 +61,11 @@ var processLogicalInit = function processLogicalInit(scene, config, addDependenc
   // 2. 初始化 Fxs (使用 getFxEvents 获取 FX 列表)
   var fxEvents = config.getFxEvents();
   if (fxEvents.length > 0) {
+    var _importParams = {
+      isPopup: config.isPopup
+    };
     addDependencyImport({
-      packageName: config.getUtilsPackageName(),
+      packageName: config.getUtilsPackageName(_importParams),
       dependencyNames: ["createFx"],
       importType: "named"
     });
@@ -146,13 +152,17 @@ var processSceneInputs = function processSceneInputs(currentScene, config, addDe
     if (process.trim()) {
       code += "\n".concat(indent, "  inputs.").concat(input.id, " = (data: any) => {\n").concat(process, "\n").concat(indent, "  };");
       if (input.id === "open") {
+        var importParams = {
+          isPopup: config.isPopup
+        };
+        var controllerName = config.isPopup ? "popupRouter" : "pageRouter";
         addDependencyImport({
-          packageName: config.getComponentPackageName(),
-          dependencyNames: ["page", "SUBJECT_SUBSCRIBE"],
+          packageName: config.getComponentPackageName(importParams),
+          dependencyNames: [controllerName, "SUBJECT_SUBSCRIBE"],
           importType: "named"
         });
         // 使用 SUBJECT_SUBSCRIBE 订阅，不修改 Subject.js
-        code += "\n".concat(indent, "  page.getParams()[SUBJECT_SUBSCRIBE]((val: any) => {\n").concat(indent, "    if (val) inputs.open(val);\n").concat(indent, "  });");
+        code += "\n".concat(indent, "  ").concat(controllerName, ".getParams(\"").concat(currentScene.id, "\")[SUBJECT_SUBSCRIBE]((val: any) => {\n").concat(indent, "    if (val) inputs.open(val);\n").concat(indent, "  });");
       }
     }
   });

package/dist/esm/shims-taro.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 由于本仓库以生成代码为主，运行时依赖由宿主项目提供，
+ * 这里补充最小化的模块声明以避免编辑器/类型检查报错。
+ */
+
+declare module '@tarojs/taro' {
+  const Taro: any;
+  export default Taro;
+}
+
+declare module '@tarojs/components' {
+  export const View: any;
+  export const Text: any;
+  export const Image: any;
+  export const Button: any;
+  const components: any;
+  export default components;
+}
+
+