@mybricks/to-code-taro 1.1.4 → 1.1.6

package/dist/cjs/handleCom.js

@@ -42,8 +42,9 @@ var import_handleDom = __toESM(require("./handleDom"));
 var import_processComEvents = require("./processors/processComEvents");
 var import_handleProcess = require("./utils/logic/handleProcess");
 var COM_PROTOCOL = {
-  "mybricks.taro.formContainer": { useWrap: true },
-  "mybricks.taro.formAdditionContainer": { useWrap: true }
+  "mybricks.taro.formContainer": { useWrap: true }
+  // 移除 FormAdditionContainer 的配置，因为它的 runtime 没有传递 wrap 函数
+  // "mybricks.taro.formAdditionContainer": { useWrap: true },
 };
 var handleCom = (com, config) => {
   const { meta, props } = com;
@@ -110,14 +111,10 @@ var prepareComponent = (com, config) => {
   };
 };
 var prepareStyles = (com) => {
-  var _a, _b, _c;
+  var _a;
   const { meta, props } = com;
-  const styleWithLayout = {
-    ...props.style || {},
-    layout: ((_a = props.data) == null ? void 0 : _a.layout) || ((_b = props.style) == null ? void 0 : _b.layout)
-  };
-  const resultStyle = (0, import_converter.convertComponentStyle)(styleWithLayout);
-  const cssContent = (0, import_converter.convertStyleAryToCss)((_c = props.style) == null ? void 0 : _c.styleAry, meta.id);
+  const resultStyle = (0, import_converter.convertComponentStyle)(props.style || {});
+  const cssContent = (0, import_converter.convertStyleAryToCss)((_a = props.style) == null ? void 0 : _a.styleAry, meta.id);
   return { cssContent, rootStyle: resultStyle.root || {} };
 };
 var processComSlots = (com, config, initialCss) => {
@@ -131,18 +128,20 @@ var processComSlots = (com, config, initialCss) => {
   const renderManager = config.renderManager || new import_renderManager.RenderManager();
   const slotEntries = Object.entries(slots);
   slotEntries.forEach(([slotId, slot], index) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const children = slot.comAry || slot.children || [];
     const isLast = index === slotEntries.length - 1;
     const slotIndent = (0, import_templates.indentation)(config.codeStyle.indent * (config.depth + 2));
-    if (children.length === 0) {
+    const effectEvent = (_a = config.getEffectEvent) == null ? void 0 : _a.call(config, { comId: meta.id, slotId });
+    const hasSlotLogic = effectEvent && (((_c = (_b = effectEvent.process) == null ? void 0 : _b.nodesDeclaration) == null ? void 0 : _c.length) > 0 || ((_e = (_d = effectEvent.process) == null ? void 0 : _d.nodesInvocation) == null ? void 0 : _e.length) > 0);
+    if (children.length === 0 && !hasSlotLogic) {
       slotsCode += `${slotIndent}${slotId}: {
 ${slotIndent}  render: () => null
 ${slotIndent}}${isLast ? "" : ","}
 `;
       return;
     }
-    const slotLayout = (_a = com.props.data) == null ? void 0 : _a.layout;
+    const slotLayout = (_f = com.props.data) == null ? void 0 : _f.layout;
     const result = (0, import_handleSlot.default)(slot, {
       ...config,
       checkIsRoot: () => false,
@@ -160,8 +159,8 @@ ${slotIndent}}${isLast ? "" : ","}
     }
     const renderId = `${meta.id}_${slotId}`;
     const rawContent = result.ui;
-    if (meta.def.namespace === "mybricks.taro.formContainer" && Array.isArray((_b = props.data) == null ? void 0 : _b.items) && result.directChildren) {
-      const items = (_c = props.data) == null ? void 0 : _c.items;
+    if (meta.def.namespace === "mybricks.taro.formContainer" && Array.isArray((_g = props.data) == null ? void 0 : _g.items) && result.directChildren) {
+      const items = (_h = props.data) == null ? void 0 : _h.items;
       result.directChildren.forEach((childRes) => {
         const itemConfig = items.find((it) => it.id === childRes.id);
         if (itemConfig == null ? void 0 : itemConfig.comName) {
@@ -183,7 +182,7 @@ ${slotIndent}}${isLast ? "" : ","}
       // 仅传入直接子组件，避免递归替换导致的结构破坏
       logicCode,
       slot.type,
-      slot.wrap || slot.itemWrap || ((_d = COM_PROTOCOL[meta.def.namespace]) == null ? void 0 : _d.useWrap),
+      slot.wrap || slot.itemWrap || ((_i = COM_PROTOCOL[meta.def.namespace]) == null ? void 0 : _i.useWrap),
       description
     );
     if (result.childrenResults) {
@@ -219,7 +218,7 @@ var buildSlotLogicCode = (args) => {
     addParentDependencyImport: config.addParentDependencyImport,
     addConsumer: config.addConsumer,
     getParams: () => paramsProxy
-  }).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.");
+  }).replace(/this\.\$vars\./g, "$vars.current.").replace(/this\.\$fxs\./g, "$fxs.current.").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.trim())
     return "";
   let code = `${indent}useEffect(() => {

package/dist/cjs/handleGlobal.d.ts

@@ -1,5 +1,5 @@
 /**
- * 处理全局变量和全局Fx
+ * 处理全局变量、全局Fx、其他全局配置
  */
 import type { ToTaroCodeConfig, GeneratedFile } from "./toCodeTaro";
 interface HandleGlobalParams {

package/dist/cjs/handleGlobal.js

@@ -162,6 +162,12 @@ export const globalFxs = new GlobalFxs()`;
     });
   }
   return [
+    {
+      type: "rootConfig",
+      content: JSON.stringify(tojson.rootConfig, null, 2),
+      importManager: null,
+      name: "rootConfig"
+    },
     {
       type: "global",
       content: varCode + "\n\n" + fxCode,

package/dist/cjs/handleSlot.js

@@ -108,16 +108,17 @@ var generateSlotUi = (ui, props, childrenUi, childrenResults, config) => {
   const slotStyle = ui.style || {};
   const propsStyle = props.style || {};
   const mergedStyle = { width: "100%", height: "100%", ...slotStyle, ...propsStyle };
-  const layout = config.layout || ui.layout || mergedStyle.layout;
+  const layout = ui.layout || mergedStyle.layout;
   const smart = isSmartLayout(layout);
-  const layoutAdjustment = smart ? { position: isHasInSmartLayout(childrenResults) ? "fixed" : "relative" } : hasFixedChildren(childrenResults) ? { transform: "translateX(0)" } : {};
+  const layoutAdjustment = smart ? { position: "relative" } : hasFixedChildren(childrenResults) ? { transform: "translateX(0)" } : {};
   const styleCode = JSON.stringify((0, import_utils.convertRootStyle)({ ...mergedStyle, layout, ...layoutAdjustment }));
   const rootClassName = (0, import_utils.getRootComponentClassName)(config.getCurrentScene(), config.checkIsRoot());
   const parentComId = config == null ? void 0 : config.parentComId;
   const slotMarkClass = parentComId ? `slot-${parentComId}` : "";
   const classNameStr = [rootClassName, slotMarkClass].filter(Boolean).join(" ");
   const classNameAttr = classNameStr ? ` className='${classNameStr}'` : "";
-  return `${indent}<View${classNameAttr} style={${styleCode}}>
+  const styleAttr = slotMarkClass ? `style={{...params.style || {}, ...${styleCode}}}` : `style={${styleCode}}`;
+  return `${indent}<View${classNameAttr} ${styleAttr}>
 ${childrenUi}
 ${indent}</View>`;
 };
@@ -146,10 +147,4 @@ var hasFixedChildren = (childrenResults) => {
 var isSmartLayout = (layout) => {
   return layout === "smart" || (layout == null ? void 0 : layout.position) === "smart";
 };
-var isHasInSmartLayout = (childrenResults) => {
-  return childrenResults.some((item) => {
-    var _a;
-    return ((_a = item == null ? void 0 : item.rootStyle) == null ? void 0 : _a.inSmartLayout) === true;
-  });
-};
 var handleSlot_default = handleSlot;

package/dist/cjs/processors/processScene.js

@@ -38,6 +38,17 @@ var import_renderManager = require("../utils/templates/renderManager");
 var import_createProvider = require("../utils/context/createProvider");
 var import_createEventQueries = require("../utils/context/createEventQueries");
 var import_collectJSModules = require("../utils/context/collectJSModules");
+var getCallMethodName = (com, pinId, isTargetPopup) => {
+  var _a, _b;
+  if (pinId !== "open" || isTargetPopup)
+    return pinId;
+  const OPEN_TYPE_MAP = {
+    "blank": "open",
+    "redirect": "replace"
+  };
+  const openType = (_b = (_a = com == null ? void 0 : com.model) == null ? void 0 : _a.data) == null ? void 0 : _b.openType;
+  return OPEN_TYPE_MAP[openType] || openType || pinId;
+};
 var processScene = (params) => {
   var _a, _b, _c;
   const {
@@ -112,9 +123,10 @@ var processScene = (params) => {
         const routerName = isTargetPopup ? "popupRouter" : "pageRouter";
         const isInput = (_b2 = targetScene == null ? void 0 : targetScene.inputs) == null ? void 0 : _b2.some((pin) => pin.id === pinId);
         const isOutput = (_c2 = targetScene == null ? void 0 : targetScene.outputs) == null ? void 0 : _c2.some((pin) => pin.id === pinId);
+        const callMethodName = getCallMethodName(com, pinId, isTargetPopup);
         if (isInput || isOutput) {
           return {
-            code: `${routerName}.${pinId}("${((_d = config.getPageId) == null ? void 0 : _d.call(config, sceneId)) || sceneId}"${args ? `, ${args}` : ""})`,
+            code: `${routerName}.${callMethodName}("${((_d = config.getPageId) == null ? void 0 : _d.call(config, sceneId)) || sceneId}"${args ? `, ${args}` : ""})`,
             import: {
               packageName: config.getComponentPackageName(),
               dependencyNames: [routerName],

package/dist/cjs/processors/processSceneLogic.js

@@ -53,7 +53,7 @@ var processVarEvents = (currentScene, config, addDependencyImport, indent) => {
   const importParams = { isPopup: config.isPopup };
   addDependencyImport({
     packageName: config.getUtilsPackageName(importParams),
-    dependencyNames: ["SUBJECT_SUBSCRIBE", "SUBJECT_VALUE"],
+    dependencyNames: ["SUBJECT_SUBSCRIBE"],
     importType: "named"
   });
   varEvents.forEach((varEvent) => {
@@ -85,10 +85,6 @@ ${process}
 ${indent}  };`;
     code += `
 ${indent}  $vars.current.${varName}.${pinId}?.()[SUBJECT_SUBSCRIBE](run_${varName}_${pinId});`;
-    code += `
-${indent}  const init_${varName}_${pinId} = $vars.current.${varName}.get?.();`;
-    code += `
-${indent}  run_${varName}_${pinId}(init_${varName}_${pinId}?.[SUBJECT_VALUE]);`;
   });
   return code;
 };
@@ -217,7 +213,7 @@ ${indent}  };`;
         });
         code += `
 ${indent}  ${controllerName}.getParams("${currentScene.id}")[SUBJECT_SUBSCRIBE]((val: any) => {
-${indent}    if (val) inputs.open(val);
+${indent}    inputs.open(val);
 ${indent}  });`;
       }
     }