@mybricks/to-code-taro 1.0.3 → 1.0.4

package/dist/cjs/processors/processComEvents.js

@@ -25,12 +25,14 @@ module.exports = __toCommonJS(processComEvents_exports);
 var import_utils = require("../utils");
 var import_handleProcess = require("../utils/logic/handleProcess");
 var processComEvents = (com, config) => {
+  var _a, _b, _c;
   const { meta, events } = com;
   let comEventCode = "";
   const outputsConfig = {};
   const eventConfig = {};
   const outputEvents = events || {};
   Object.entries(outputEvents).forEach(([eventId, eventInfo]) => {
+    var _a2, _b2;
     const { type, isAbstract, diagramId, schema, active } = eventInfo;
     if (active === false)
       return;
@@ -50,9 +52,12 @@ var processComEvents = (com, config) => {
       eventConfig[eventId] = { connected: true };
       return;
     }
-    if (type !== "defined" || !diagramId)
+    if (type !== "defined")
       return;
-    const event = config.getEventByDiagramId(diagramId);
+    const resolvedDiagramId = diagramId || ((_a2 = eventInfo == null ? void 0 : eventInfo.options) == null ? void 0 : _a2.diagramId) || ((_b2 = eventInfo == null ? void 0 : eventInfo.options) == null ? void 0 : _b2.id);
+    if (!resolvedDiagramId)
+      return;
+    const event = config.getEventByDiagramId(resolvedDiagramId);
     if (!event)
       return;
     const paramName = "value";
@@ -67,13 +72,15 @@ var processComEvents = (com, config) => {
       "comRefs.current.$1."
     ).replace(/comRefs\.current\.slot_Index\./g, "comRefs.current.");
     if (process.includes("pageParams")) {
+      const importParams = { isPopup: config.isPopup };
+      const controllerName = config.isPopup ? "popupRouter" : "pageRouter";
       config.addParentDependencyImport({
-        packageName: config.getComponentPackageName(),
-        dependencyNames: ["page", "SUBJECT_VALUE"],
+        packageName: config.getComponentPackageName(importParams),
+        dependencyNames: [controllerName, "SUBJECT_VALUE"],
         importType: "named"
       });
       const indent = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 3));
-      process = `${indent}const pageParams: any = page.getParams("${config.getCurrentScene().id}")[SUBJECT_VALUE];
+      process = `${indent}const pageParams: any = ${controllerName}.getParams("${config.getCurrentScene().id}")[SUBJECT_VALUE];
 ${process}`;
     }
     const handlerIndent = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 2));
@@ -87,6 +94,41 @@ ${handlerIndent}}`;
     outputsConfig[meta.id][onEventName] = handlerCode;
     eventConfig[eventId] = { connected: true };
   });
+  if (((_a = meta.def) == null ? void 0 : _a.namespace) === "mybricks.taro.popup") {
+    if (!outputsConfig[meta.id]) {
+      outputsConfig[meta.id] = {};
+    }
+    const importParams = { isPopup: config.isPopup };
+    const sceneCom = (_b = config.getCurrentScene().coms) == null ? void 0 : _b[meta.id];
+    const popupData = ((_c = sceneCom == null ? void 0 : sceneCom.model) == null ? void 0 : _c.data) || {};
+    const isTrue = (v) => v === true || v === "true";
+    if (!eventConfig["onClose"] && isTrue(popupData.visibleClose)) {
+      config.addParentDependencyImport({
+        packageName: config.getComponentPackageName(importParams),
+        dependencyNames: ["popupRouter"],
+        importType: "named"
+      });
+      const handlerIndent = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 2));
+      const processIndent = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 3));
+      outputsConfig[meta.id]["onClose"] = `() => {
+${processIndent}popupRouter.close("${config.getCurrentScene().id}");
+${handlerIndent}}`;
+      eventConfig["onClose"] = { connected: true };
+    }
+    if (!eventConfig["onClickOverlay"] && isTrue(popupData.maskClose)) {
+      config.addParentDependencyImport({
+        packageName: config.getComponentPackageName(importParams),
+        dependencyNames: ["popupRouter"],
+        importType: "named"
+      });
+      const handlerIndent = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 2));
+      const processIndent = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 3));
+      outputsConfig[meta.id]["onClickOverlay"] = `() => {
+${processIndent}popupRouter.close("${config.getCurrentScene().id}");
+${handlerIndent}}`;
+      eventConfig["onClickOverlay"] = { connected: true };
+    }
+  }
   return { comEventCode, outputsConfig, eventConfig };
 };
 var processFxEvent = (eventId, com, config, addCode) => {

package/dist/cjs/processors/processScene.js

@@ -38,7 +38,7 @@ var import_createProvider = require("../utils/context/createProvider");
 var import_createEventQueries = require("../utils/context/createEventQueries");
 var import_collectJSModules = require("../utils/context/collectJSModules");
 var processScene = (params) => {
-  var _a;
+  var _a, _b;
   const {
     scene: { scene, ui, event },
     config,
@@ -61,18 +61,22 @@ var processScene = (params) => {
     outputs: {}
   };
   const fxsMap = Object.assign({}, defaultFxsMap);
-  const pageConfigContent = pageConfigHandler.handle(scene);
+  const originalScene = getSceneById(scene.id);
+  const isPopup = (originalScene == null ? void 0 : originalScene.type) === "popup" || ((_b = originalScene == null ? void 0 : originalScene.deps) == null ? void 0 : _b.some((dep) => dep.namespace === "mybricks.taro.popup"));
+  const pageConfigContent = pageConfigHandler.handle(scene, isPopup);
   const eventQueries = (0, import_createEventQueries.createEventQueries)(event);
   (0, import_handleSlot.default)(ui, {
     ...config,
+    isPopup,
+    // 标记当前场景是否为弹窗
     getCurrentScene: () => {
-      const originalScene = getSceneById(scene.id);
-      return { ...scene, ...originalScene, event };
+      const originalScene2 = getSceneById(scene.id);
+      return { ...scene, ...originalScene2, event };
     },
     add: (value) => {
       params.addResult({
         ...value,
-        type: scene.type ? scene.type : "normal",
+        type: isPopup ? "popup" : (originalScene == null ? void 0 : originalScene.type) ? originalScene.type : "normal",
         meta: scene,
         pageConfigContent
       });

package/dist/cjs/processors/processSceneLogic.js

@@ -42,8 +42,9 @@ var processLogicalInit = (scene, config, addDependencyImport, indent, providerNa
     return com.def.namespace === "mybricks.core-comlib.var";
   });
   if (vars.length > 0) {
+    const importParams = { isPopup: config.isPopup };
     addDependencyImport({
-      packageName: config.getUtilsPackageName(),
+      packageName: config.getUtilsPackageName(importParams),
       dependencyNames: ["createVariable"],
       importType: "named"
     });
@@ -58,8 +59,9 @@ ${indent}if (!vars.${com.title}.get) vars.${com.title} = createVariable(${initVa
   }
   const fxEvents = config.getFxEvents();
   if (fxEvents.length > 0) {
+    const importParams = { isPopup: config.isPopup };
     addDependencyImport({
-      packageName: config.getUtilsPackageName(),
+      packageName: config.getUtilsPackageName(importParams),
       dependencyNames: ["createFx"],
       importType: "named"
     });
@@ -146,13 +148,15 @@ ${indent}  inputs.${input.id} = (data: any) => {
 ${process}
 ${indent}  };`;
       if (input.id === "open") {
+        const importParams = { isPopup: config.isPopup };
+        const controllerName = config.isPopup ? "popupRouter" : "pageRouter";
         addDependencyImport({
-          packageName: config.getComponentPackageName(),
-          dependencyNames: ["page", "SUBJECT_SUBSCRIBE"],
+          packageName: config.getComponentPackageName(importParams),
+          dependencyNames: [controllerName, "SUBJECT_SUBSCRIBE"],
           importType: "named"
         });
         code += `
-${indent}  page.getParams()[SUBJECT_SUBSCRIBE]((val: any) => {
+${indent}  ${controllerName}.getParams("${currentScene.id}")[SUBJECT_SUBSCRIBE]((val: any) => {
 ${indent}    if (val) inputs.open(val);
 ${indent}  });`;
       }

package/dist/cjs/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;
+}
+
+