@mybricks/to-code-taro 1.0.3 → 1.0.4

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

@@ -29,17 +29,83 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/core/comlib/index.ts
 var comlib_exports = {};
 __export(comlib_exports, {
+  mybricks_taro_aesEncode: () => import_AesEncode.default,
+  mybricks_taro_backTo: () => import_BackTo.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_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_showToast: () => import_ShowToast.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(comlib_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_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_backTo,
+  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_openCamera,
+  mybricks_taro_openPetalMap,
+  mybricks_taro_openUrl,
+  mybricks_taro_removeStorage,
+  mybricks_taro_router,
   mybricks_taro_scanQrcode,
   mybricks_taro_setStorage,
-  mybricks_taro_showToast
+  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/utils/ComContext.js

@@ -20,12 +20,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var ComContext_exports = {};
 __export(ComContext_exports, {
   default: () => ComContext_default,
-  page: () => import_page.page,
+  pageRouter: () => import_pageRouter.pageRouter,
   useAppContext: () => useAppContext
 });
 module.exports = __toCommonJS(ComContext_exports);
 var import_react = require("react");
-var import_page = require("./page");
+var import_pageRouter = require("./pageRouter");
 var ComContext = (0, import_react.createContext)(void 0);
 function useAppContext() {
   const context = (0, import_react.useContext)(ComContext);
@@ -37,6 +37,6 @@ function useAppContext() {
 var ComContext_default = ComContext;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  page,
+  pageRouter,
   useAppContext
 });

package/dist/cjs/core/utils/PopupRenderer.js

@@ -0,0 +1,63 @@
+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/utils/PopupRenderer.tsx
+var PopupRenderer_exports = {};
+__export(PopupRenderer_exports, {
+  PopupRenderer: () => PopupRenderer
+});
+module.exports = __toCommonJS(PopupRenderer_exports);
+var import_react = __toESM(require("react"));
+var import_components = require("@tarojs/components");
+var import_ComContext = require("./ComContext");
+var PopupRenderer = ({ popupMap }) => {
+  const { popupState } = (0, import_ComContext.useAppContext)();
+  const ActivePopup = popupState.visible && popupMap[popupState.name] ? popupMap[popupState.name] : null;
+  if (!ActivePopup)
+    return null;
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_components.View,
+    {
+      className: "global-popup-container",
+      style: {
+        position: "fixed",
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        zIndex: 999999,
+        pointerEvents: "auto"
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_components.View, { style: { width: "100%", height: "100%" } }, /* @__PURE__ */ import_react.default.createElement(ActivePopup, null))
+  );
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PopupRenderer
+});

package/dist/cjs/core/utils/hooks.js

@@ -26,7 +26,7 @@ __export(hooks_exports, {
 });
 module.exports = __toCommonJS(hooks_exports);
 var import_react = require("react");
-var import_constant = require("../mybricks/constant");
+var import_createReactiveInputHandler = require("../mybricks/createReactiveInputHandler");
 function deepProxy(target, onSet) {
   if (target === null || typeof target !== "object" || target.__isProxy) {
     return target;
@@ -62,24 +62,30 @@ function useModel(rawData) {
     return deepProxy(dataRef.current, () => forceUpdate({}));
   }, []);
 }
-function useBindInputs(scope, id) {
-  const handlersRef = (0, import_react.useRef)({});
+function useBindInputs(scope, id, initialHandlers) {
+  const handlersRef = (0, import_react.useRef)({ ...initialHandlers });
+  if (initialHandlers) {
+    Object.assign(handlersRef.current, initialHandlers);
+  }
   return (0, import_react.useMemo)(() => {
     const proxy = new Proxy({}, {
       get: (_target, pin) => {
-        return (arg) => {
+        return (arg, ...args) => {
           if (typeof arg === "function") {
             handlersRef.current[pin] = arg;
           } else {
             const handler = handlersRef.current[pin];
             if (typeof handler === "function") {
-              if (arg && arg[import_constant.SUBJECT_SUBSCRIBE]) {
-                arg[import_constant.SUBJECT_SUBSCRIBE]((val) => {
-                  handler(val);
-                });
-              } else {
-                handler(arg);
+              if (pin === "_setData") {
+                return handler(arg, ...args);
               }
+              return (0, import_createReactiveInputHandler.createReactiveInputHandler)({
+                input: handler,
+                value: arg,
+                rels: {},
+                // 这里可以扩展 output 关联
+                title: id
+              });
             }
           }
         };

package/dist/cjs/core/utils/index.js

@@ -20,33 +20,45 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/core/utils/index.ts
 var utils_exports = {};
 __export(utils_exports, {
+  PopupRenderer: () => import_PopupRenderer.PopupRenderer,
   SUBJECT_SUBSCRIBE: () => import_constant.SUBJECT_SUBSCRIBE,
   SUBJECT_VALUE: () => import_constant.SUBJECT_VALUE,
   WithCom: () => import_with.WithCom,
   WithWrapper: () => import_with.WithWrapper,
+  closeActivePopupRouter: () => import_popupRouter.closeActivePopupRouter,
   createFx: () => import_mybricks.createFx,
   createVariable: () => import_mybricks.createVariable,
   merge: () => import_mybricks.merge,
-  page: () => import_page.page,
+  pageRouter: () => import_pageRouter.pageRouter,
+  popupRouter: () => import_popupRouter.popupRouter,
+  router: () => import_pageRouter.router,
+  subscribePopupRouter: () => import_popupRouter.subscribePopupRouter,
   useAppContext: () => import_ComContext.useAppContext
 });
 module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./hooks"), module.exports);
 var import_with = require("./with");
-var import_page = require("./page");
+var import_PopupRenderer = require("./PopupRenderer");
+var import_pageRouter = require("./pageRouter");
+var import_popupRouter = require("./popupRouter");
 var import_ComContext = require("./ComContext");
 var import_mybricks = require("../mybricks");
 var import_constant = require("../mybricks/constant");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PopupRenderer,
   SUBJECT_SUBSCRIBE,
   SUBJECT_VALUE,
   WithCom,
   WithWrapper,
+  closeActivePopupRouter,
   createFx,
   createVariable,
   merge,
-  page,
+  pageRouter,
+  popupRouter,
+  router,
+  subscribePopupRouter,
   useAppContext,
   ...require("./hooks")
 });

package/dist/cjs/core/utils/{page.js → pageRouter.js}

@@ -26,42 +26,56 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/core/utils/page.ts
-var page_exports = {};
-__export(page_exports, {
-  page: () => page
+// src/core/utils/pageRouter.ts
+var pageRouter_exports = {};
+__export(pageRouter_exports, {
+  pageRouter: () => pageRouter,
+  router: () => router
 });
-module.exports = __toCommonJS(page_exports);
+module.exports = __toCommonJS(pageRouter_exports);
 var import_taro = __toESM(require("@tarojs/taro"));
 var import_mybricks = require("../mybricks");
 var TaroRouter = class {
+  constructor() {
+    this.paramsBackup = {};
+  }
   getParams(name) {
     var _a;
     const instance = import_taro.default.getCurrentInstance();
-    return {
-      value: (_a = instance.router) == null ? void 0 : _a.params
-    };
+    let params = ((_a = instance.router) == null ? void 0 : _a.params) || {};
+    if (!params.data && this.paramsBackup[name]) {
+      params = { data: this.paramsBackup[name] };
+    }
+    return { value: params };
   }
   push(name, { value }) {
     const url = `/pages/${name}/index`;
-    const queryString = value ? `?data=${encodeURIComponent(JSON.stringify(value))}` : "";
+    const dataStr = value ? encodeURIComponent(JSON.stringify(value)) : "";
+    if (dataStr) {
+      this.paramsBackup[name] = dataStr;
+    }
     import_taro.default.navigateTo({
-      url: url + queryString
+      url: `${url}${dataStr ? `?data=${dataStr}` : ""}`
     });
   }
   replace(name, { value }) {
     const url = `/pages/${name}/index`;
-    const queryString = value ? `?data=${encodeURIComponent(JSON.stringify(value))}` : "";
+    const dataStr = value ? encodeURIComponent(JSON.stringify(value)) : "";
+    if (dataStr) {
+      this.paramsBackup[name] = dataStr;
+    }
     import_taro.default.redirectTo({
-      url: url + queryString
+      url: `${url}${dataStr ? `?data=${dataStr}` : ""}`
     });
   }
   pop() {
     import_taro.default.navigateBack();
   }
 };
-var page = new import_mybricks.Page(new TaroRouter());
+var router = new TaroRouter();
+var pageRouter = new import_mybricks.Page(router);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  page
+  pageRouter,
+  router
 });

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

@@ -0,0 +1,98 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/core/utils/popupRouter.ts
+var popupRouter_exports = {};
+__export(popupRouter_exports, {
+  closeActivePopupRouter: () => closeActivePopupRouter,
+  popupRouter: () => popupRouter,
+  subscribePopupRouter: () => subscribePopupRouter
+});
+module.exports = __toCommonJS(popupRouter_exports);
+var import_mybricks = require("../mybricks");
+var PopupStore = class {
+  constructor() {
+    this.activePopup = null;
+    this.listeners = /* @__PURE__ */ new Set();
+  }
+  /** 订阅弹窗状态变化 */
+  subscribe(listener) {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+  notify() {
+    this.listeners.forEach(
+      (l) => l(
+        this.activePopup || {
+          visible: false,
+          name: "",
+          value: null,
+          controller: null
+        }
+      )
+    );
+  }
+  /** 获取弹窗参数 */
+  getParams(name) {
+    if (this.activePopup && this.activePopup.name === name) {
+      return {
+        value: this.activePopup.value,
+        controller: this.activePopup.controller
+      };
+    }
+    return { value: null };
+  }
+  /** 获取当前激活的弹窗名称 */
+  getActiveName() {
+    var _a;
+    return (_a = this.activePopup) == null ? void 0 : _a.name;
+  }
+  /** 打开弹窗 */
+  push(name, { value, controller }) {
+    this.activePopup = { visible: true, name, value, controller };
+    this.notify();
+  }
+  /** 行为同 push */
+  replace(name, params) {
+    this.push(name, params);
+  }
+  /** 关闭弹窗 */
+  pop() {
+    this.activePopup = null;
+    this.notify();
+  }
+};
+var popupStore = new PopupStore();
+var subscribePopupRouter = (listener) => {
+  return popupStore.subscribe(listener);
+};
+var popupRouter = new import_mybricks.Page(popupStore);
+var closeActivePopupRouter = () => {
+  const name = popupStore.getActiveName();
+  if (!name)
+    return;
+  popupRouter.close(name);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  closeActivePopupRouter,
+  popupRouter,
+  subscribePopupRouter
+});

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

@@ -26,6 +26,12 @@ var import_react = require("react");
 var import_hooks = require("./hooks");
 function useAppCreateContext() {
   const comRefs = (0, import_react.useRef)((0, import_hooks.deepProxy)({}));
+  const [popupState, setPopupState] = (0, import_react.useState)({
+    visible: false,
+    name: "",
+    value: null,
+    controller: null
+  });
   const appContext = {
     canvas: {
       id: "u_7VvVn"
@@ -45,7 +51,9 @@ function useAppCreateContext() {
   };
   return {
     comRefs,
-    appContext
+    appContext,
+    popupState,
+    setPopupState
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -38,27 +38,41 @@ var import_components = require("@tarojs/components");
 var import_index = require("./index");
 var import_useContext = require("./useContext");
 var import_ComContext = __toESM(require("./ComContext"));
+var import_taro = require("@tarojs/taro");
 var WithCom = (props) => {
   const { component: Component, id = "", data, className, style, ...rest } = props;
   const { comRefs, appContext } = (0, import_ComContext.useAppContext)();
   const env = appContext;
+  const isPopup = Component.isPopup;
   const [show, setShow] = (0, import_react.useState)(true);
-  (0, import_react.useEffect)(() => {
-    comRefs.current[id].hide(() => {
-      setShow(false);
-    });
-    comRefs.current[id].show(() => {
-      setShow(true);
-    });
-    comRefs.current[id].showOrHide(() => {
-      setShow((prev) => !prev);
-    });
-  }, [comRefs]);
+  const [dynamicStyle, setDynamicStyle] = (0, import_react.useState)({});
   const _data = (0, import_index.useModel)(data || {});
-  const inputProxy = (0, import_index.useBindInputs)(comRefs, id);
+  const handlers = {
+    _setStyle: (style2) => {
+      setDynamicStyle((prev) => ({ ...prev, ...style2 }));
+    },
+    _setData: (path, value) => {
+      const paths = path.split(".");
+      let current = _data;
+      for (let 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: () => setShow(true),
+      hide: () => setShow(false),
+      showOrHide: () => setShow((prev) => !prev)
+    });
+  }
+  const inputProxy = (0, import_index.useBindInputs)(comRefs, id, handlers);
   const eventProxy = (0, import_index.useBindEvents)(rest);
   comRefs.current[id] = inputProxy;
-  return show ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style }, /* @__PURE__ */ import_react.default.createElement(
+  return show || isPopup ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style: { ...style, ...dynamicStyle } }, /* @__PURE__ */ import_react.default.createElement(
     Component,
     {
       ...rest,
@@ -74,6 +88,16 @@ var WithCom = (props) => {
 var WithWrapper = (Component) => {
   return function WrappedComponent(props) {
     const contextStore = (0, import_useContext.useAppCreateContext)();
+    const { setPopupState } = contextStore;
+    const isPopup = Component.isPopup;
+    (0, import_react.useEffect)(() => {
+      return (0, import_index.subscribePopupRouter)((state) => setPopupState(state));
+    }, [setPopupState]);
+    (0, import_taro.useTabItemTap)(() => {
+      if (isPopup)
+        return;
+      (0, import_index.closeActivePopupRouter)();
+    });
     return /* @__PURE__ */ import_react.default.createElement(import_ComContext.default.Provider, { value: contextStore }, /* @__PURE__ */ import_react.default.createElement(Component, { ...props }));
   };
 };

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -91,6 +91,29 @@ ${fileContent}` : fileContent;
     };
   });
   pagesDir.children.push(...generatedPages);
+  const popupComponentsDir = (0, import_fileNode.ensureDir)(srcDir, "src/popupComponents");
+  const popupScenes = files.filter((item) => item.type === "popup" && item.meta);
+  popupScenes.forEach((item) => {
+    var _a2;
+    const popupId = item.meta.id;
+    const importCode = ((_a2 = item.importManager) == null ? void 0 : _a2.toCode()) || "";
+    const fullContent = `${importCode}
+${item.content || ""}`;
+    popupComponentsDir.children.push({
+      path: `src/popupComponents/${popupId}`,
+      content: null,
+      children: [
+        {
+          path: `src/popupComponents/${popupId}/index.tsx`,
+          content: fullContent
+        },
+        {
+          path: `src/popupComponents/${popupId}/index.less`,
+          content: item.cssContent || ""
+        }
+      ]
+    });
+  });
   const appConfigFile = (_a = srcDir.children) == null ? void 0 : _a.find(
     (node) => node.path === "src/app.config.ts"
   );
@@ -99,6 +122,13 @@ ${fileContent}` : fileContent;
   }
   (0, import_tabBarImages.handleTabBarImages)(tabbarDir, imageFiles);
   (0, import_commonDir.handleCommonDir)(commonDir, files);
+  const popupFile = files.find((f) => f.type === "popup" && !f.meta);
+  if (popupFile) {
+    commonDir.children.push({
+      path: `src/common/${popupFile.name}.ts`,
+      content: popupFile.content
+    });
+  }
   return templateJson;
 };
 var generateTaroProjectJson_default = generateTaroProjectJson;

package/dist/cjs/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/cjs/handleSlot.js

@@ -44,7 +44,7 @@ var handleSlot = (ui, config) => {
     addParentDependencyImport: addDependencyImport,
     renderManager
   });
-  const effectCode = (0, import_processSceneLogic.processSceneLogic)(ui, config, addDependencyImport);
+  let effectCode = (0, import_processSceneLogic.processSceneLogic)(ui, config, addDependencyImport);
   let cssContent = ((0, import_utils.convertStyleAryToCss)((_b = props.style) == null ? void 0 : _b.styleAry, slotId) || "") + (childResults.cssContent ? "\n" + childResults.cssContent : "");
   let renderCodeBlock = isRoot && renderManager ? renderManager.toCode((0, import_utils.indentation)(config.codeStyle.indent)) : "";
   const combinedJsCode = `${envDefineCode}${childResults.js}${renderCodeBlock ? `
@@ -63,13 +63,21 @@ ${renderCodeBlock}` : ""}${(0, import_scene.wrapInEffect)(indent2, effectCode)}`
   };
 };
 var setupImports = (addImport, config, isRoot) => {
-  const utilsPkg = config.getUtilsPackageName();
-  const comPkg = config.getComponentPackageName();
+  const importParams = { isPopup: config.isPopup };
+  const utilsPkg = config.getUtilsPackageName(importParams);
+  const comPkg = config.getComponentPackageName(importParams);
   addImport({ packageName: "react", dependencyNames: ["useRef", "useEffect", "useState"], importType: "named" });
   addImport({ packageName: "@tarojs/components", dependencyNames: ["View"], importType: "named" });
-  addImport({ packageName: utilsPkg, dependencyNames: ["WithCom", "WithWrapper"], importType: "named" });
+  const dependencyNames = ["WithCom", "WithWrapper"];
+  if (isRoot && config.hasPopups) {
+    dependencyNames.push("PopupRenderer");
+  }
+  addImport({ packageName: utilsPkg, dependencyNames, importType: "named" });
   addImport({ packageName: comPkg, dependencyNames: ["useAppContext"], importType: "named" });
   if (isRoot) {
+    if (config.hasPopups) {
+      addImport({ packageName: "../../common/popup", dependencyNames: ["POPUP_MAP", "POPUP_IDS"], importType: "named" });
+    }
     addImport({ packageName: "./index.less", dependencyNames: [], importType: "module" });
   }
 };
@@ -88,7 +96,13 @@ var finalizeRootComponent = (ui, config, importManager, combinedJsCode, uiResult
   const fileName = ((_a = config.getFileName) == null ? void 0 : _a.call(config, ui.meta.slotId)) || ui.meta.title || "index";
   const componentId = ((_b = ui.meta) == null ? void 0 : _b.id) || ui.id || ((_c = ui.meta) == null ? void 0 : _c.slotId) || "Index";
   const componentName = `I${String(componentId).replace(/[^a-zA-Z0-9]/g, "_")}`;
-  const componentCode = (0, import_scene.genComponentTemplate)({ componentName, combinedJsCode, uiResult });
+  const componentCode = (0, import_scene.genComponentTemplate)({
+    componentName,
+    combinedJsCode,
+    uiResult,
+    isPopup: config.isPopup,
+    hasPopups: config.hasPopups
+  });
   config.add({ importManager, content: componentCode, cssContent, name: fileName });
 };
 var handleSlot_default = handleSlot;