@mybricks/to-code-taro 1.0.1 → 1.0.3

package/dist/cjs/generate/generateTaroProjectJson.d.ts

@@ -1,24 +1,13 @@
+import type { GenerationResult } from "../toCodeTaro";
 interface FileNode {
     path: string;
     content: string | null;
     children?: FileNode[];
 }
-interface GenerateItem {
-    type: string;
-    content?: string;
-    cssContent?: string;
-    pageConfigContent?: string;
-    name?: string;
-    importManager?: {
-        toCode: () => string;
-    };
-    tabBarConfig?: string;
-    [key: string]: any;
-}
 /**
  * 根据数组生成文件结构 JSON 对象
- * @param items 包含 content、cssContent、pageConfigContent、tabBarConfig 等信息的数组
+ * @param result 包含 files 和 assets 的生成结果对象
  * @returns 返回文件结构的 JSON 对象数组
  */
-declare const generateTaroProjectJson: (items?: GenerateItem[]) => FileNode[];
+declare const generateTaroProjectJson: (result: GenerationResult) => FileNode[];
 export default generateTaroProjectJson;

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -38,8 +38,9 @@ var import_fileNode = require("./utils/fileNode");
 var import_commonDir = require("./utils/commonDir");
 var import_tabBarImages = require("./utils/tabBarImages");
 var import_appConfig = require("./utils/appConfig");
-var generateTaroProjectJson = (items = []) => {
+var generateTaroProjectJson = (result) => {
   var _a;
+  const { files = [], assets = {} } = result;
   const templateJsonPath = path.join(__dirname, "../taro-template.json");
   if (!fs.existsSync(templateJsonPath)) {
     throw new Error(`模板文件不存在: ${templateJsonPath}`);
@@ -57,8 +58,8 @@ var generateTaroProjectJson = (items = []) => {
   const commonDir = (0, import_fileNode.ensureDir)(srcDir, "src/common");
   const assetsDir = (0, import_fileNode.ensureDir)(srcDir, "src/assets");
   const tabbarDir = (0, import_fileNode.ensureDir)(assetsDir, "src/assets/tabbar");
-  const imageFiles = items.__tabBarImageFiles || [];
-  const normalItems = items.filter((item) => item.type === "normal");
+  const imageFiles = assets.tabBarImages || [];
+  const normalItems = files.filter((item) => item.type === "normal");
   const generatedPages = normalItems.map((item) => {
     var _a2;
     const pageName = item.meta.id;
@@ -90,12 +91,14 @@ ${fileContent}` : fileContent;
     };
   });
   pagesDir.children.push(...generatedPages);
-  const appConfigFile = (_a = srcDir.children) == null ? void 0 : _a.find((node) => node.path === "src/app.config.ts");
+  const appConfigFile = (_a = srcDir.children) == null ? void 0 : _a.find(
+    (node) => node.path === "src/app.config.ts"
+  );
   if (appConfigFile) {
-    (0, import_appConfig.updateAppConfig)(appConfigFile, normalItems, items);
+    (0, import_appConfig.updateAppConfig)(appConfigFile, normalItems, files);
   }
   (0, import_tabBarImages.handleTabBarImages)(tabbarDir, imageFiles);
-  (0, import_commonDir.handleCommonDir)(commonDir, items);
+  (0, import_commonDir.handleCommonDir)(commonDir, files);
   return templateJson;
 };
 var generateTaroProjectJson_default = generateTaroProjectJson;

package/dist/cjs/generate/utils/tabBarImages.d.ts

@@ -1,7 +1,7 @@
 /**
  * TabBar 图片文件处理工具
  */
-import type { ImageFileInfo } from '../../utils/pageConfig';
+import type { ImageFileInfo } from '../../utils/config/content';
 interface FileNode {
     path: string;
     content: string | null;

package/dist/cjs/handleCom.d.ts

@@ -1,5 +1,5 @@
 import { ImportManager } from "./utils";
-import { RenderManager } from "./utils/code/renderManager";
+import { RenderManager } from "./utils/templates/renderManager";
 import type { UI, BaseConfig } from "./toCodeTaro";
 export type Com = Extract<UI["children"][0], {
     type: "com";

package/dist/cjs/handleCom.js

@@ -33,38 +33,32 @@ __export(handleCom_exports, {
 });
 module.exports = __toCommonJS(handleCom_exports);
 var import_utils = require("./utils");
-var import_code = require("./utils/code");
+var import_templates = require("./utils/templates");
 var import_handleSlot = __toESM(require("./handleSlot"));
-var import_component = require("./utils/code/component");
-var import_renderManager = require("./utils/code/renderManager");
-var import_handleProcess = require("./utils/handleProcess");
+var import_renderManager = require("./utils/templates/renderManager");
+var import_processComEvents = require("./processors/processComEvents");
+var import_component = require("./utils/templates/component");
 var handleCom = (com, config) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  const { meta, props, slots, events } = com;
-  const isModule = meta.def.namespace.startsWith("mybricks.taro.module");
-  const { importInfo, callName } = config.getComponentMeta(meta);
-  const isJsCalculationComponent = meta.def.namespace === "mybricks.taro._muilt-inputJs" || meta.def.namespace === "mybricks.core-comlib.js-ai";
-  if (isJsCalculationComponent) {
-    const transformCode = ((_b = (_a = props.data) == null ? void 0 : _a.fns) == null ? void 0 : _b.code) || ((_d = (_c = props.data) == null ? void 0 : _c.fns) == null ? void 0 : _d.transformCode) || ((_e = props.data) == null ? void 0 : _e.fns);
-    if (transformCode && config.addJSModule) {
-      config.addJSModule({
-        id: meta.id,
-        title: meta.title || "JS计算",
-        transformCode: typeof transformCode === "string" ? transformCode : "",
-        inputs: ((_f = meta.model) == null ? void 0 : _f.inputs) || [],
-        outputs: ((_g = meta.model) == null ? void 0 : _g.outputs) || [],
-        data: props.data || {}
-      });
-    }
-    return {
-      slots: [],
-      scopeSlots: [],
-      ui: "",
-      js: "",
-      cssContent: "",
-      outputsConfig: void 0
-    };
+  const { meta, props } = com;
+  if (isJsCalculation(meta)) {
+    return handleJsCalculation(com, config);
   }
+  const { componentName, eventHandlers, comEventCode } = prepareComponent(com, config);
+  const { cssContent, rootStyle } = prepareStyles(com);
+  const { slotsCode, accumulatedCssContent, eventCode } = processComSlots(com, config, cssContent);
+  const ui = generateUiCode(com, config, componentName, rootStyle, comEventCode, slotsCode, eventHandlers);
+  return {
+    slots: [],
+    scopeSlots: [],
+    ui,
+    js: eventCode,
+    cssContent: accumulatedCssContent,
+    outputsConfig: Object.keys(eventHandlers).length > 0 ? { [meta.id]: eventHandlers } : void 0
+  };
+};
+var prepareComponent = (com, config) => {
+  const { meta } = com;
+  const { importInfo, callName } = config.getComponentMeta(meta);
   const componentName = (0, import_utils.firstCharToUpperCase)(callName || importInfo.name);
   const importName = (0, import_utils.firstCharToUpperCase)(importInfo.name);
   config.addParentDependencyImport({
@@ -73,188 +67,108 @@ var handleCom = (com, config) => {
     importType: importInfo.type
   });
   const currentProvider = config.getCurrentProvider();
-  const providerName = currentProvider.name;
-  const componentController = ((_h = config.getComponentController) == null ? void 0 : _h.call(config, {
-    com: meta,
-    scene: config.getCurrentScene()
-  })) || `controller_${meta.id}`;
-  const providerPath = `controllers.current.${providerName}`;
-  const controllerPath = `${providerPath}.${componentController}`;
-  const indentJs = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 1));
-  let eventCode = "";
+  currentProvider.coms.add(meta.id);
+  currentProvider.controllers.add(meta.id);
+  const { comEventCode, outputsConfig } = (0, import_processComEvents.processComEvents)(com, config);
+  return {
+    componentName,
+    eventHandlers: outputsConfig[meta.id] || {},
+    comEventCode
+  };
+};
+var prepareStyles = (com) => {
+  var _a;
+  const { meta, props } = com;
+  const resultStyle = (0, import_utils.convertComponentStyle)(props.style);
+  const cssContent = (0, import_utils.convertStyleAryToCss)((_a = props.style) == null ? void 0 : _a.styleAry, meta.id);
+  return { cssContent, rootStyle: resultStyle.root || {} };
+};
+var generateUiCode = (com, config, componentName, rootStyle, comEventCode, slotsCode, eventHandlers) => {
+  var _a;
+  const { meta, props } = com;
   const scene = config.getCurrentScene();
-  const sceneCom = (_i = scene.coms) == null ? void 0 : _i[meta.id];
+  const sceneCom = (_a = scene.coms) == null ? void 0 : _a[meta.id];
   const componentInputs = (sceneCom == null ? void 0 : sceneCom.inputs) || [];
   const componentOutputs = (sceneCom == null ? void 0 : sceneCom.outputs) || meta.outputs || [];
-  let comEventCode = "";
-  const outputsConfig = {};
-  const eventConfig = {};
-  const resultStyle = (0, import_utils.convertComponentStyle)(props.style);
-  const cssContent = (0, import_utils.convertStyleAryToCss)((_j = props.style) == null ? void 0 : _j.styleAry, meta.id);
-  const outputEvents = events || {};
-  Object.entries(outputEvents).forEach(
-    ([eventId, eventInfo]) => {
-      const { type, isAbstract, diagramId, schema, active } = eventInfo;
-      if (active === false)
-        return;
-      if (isAbstract) {
-        config.setAbstractEventTypeDefMap({
-          comId: com.meta.id,
-          eventId,
-          typeDef: config.getTypeDef(),
-          schema
-        });
-        return;
-      }
-      if (type === "fx") {
-        const fxsMap = config.getFxsMap();
-        const currentProvider2 = config.getCurrentProvider();
-        const scene2 = config.getCurrentScene();
-        const pinProxy = scene2.pinProxies[`${props.id}-${eventId}`];
-        const fxProvider = fxsMap[pinProxy.frameId];
-        const isGlobal = fxProvider.name === "global";
-        if (fxProvider.name !== currentProvider2.name) {
-          if (isGlobal) {
-            config.addParentDependencyImport({
-              packageName: config.getComponentPackageName(),
-              dependencyNames: ["globalFxs"],
-              importType: "named"
-            });
-          } else {
-            config.addConsumer(fxProvider);
-          }
-        }
-        const indent3 = (0, import_utils.indentation)(
-          config.codeStyle.indent * (config.depth + 2)
-        );
-        comEventCode += `${indent3}${eventId}: ${isGlobal ? `globalFxs` : `comRefs.current.${fxProvider.name}_Fxs`}.${pinProxy.frameId},
-`;
-        eventConfig[eventId] = { connected: true };
-        return;
-      }
-      if (type !== "defined") {
-        return;
-      }
-      if (!diagramId) {
-        return;
-      }
-      const event = config.getEventByDiagramId(diagramId);
-      if (!event) {
-        return;
-      }
-      const paramName = "value";
-      let process = (0, import_handleProcess.handleProcess)(event, {
-        ...config,
-        target: "comRefs.current",
-        depth: config.depth + 3,
-        addParentDependencyImport: config.addParentDependencyImport,
-        getParams: () => {
-          return {
-            [eventId]: paramName
-          };
-        }
-      }).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")) {
-        config.addParentDependencyImport({
-          packageName: config.getComponentPackageName(),
-          dependencyNames: ["page"],
-          importType: "named"
-        });
-        process = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 3)) + `const pageParams: any = page.getParams("${config.getCurrentScene().id}");
-` + process;
-      }
-      const handlerCode = `(${paramName}: any) => {
-${process}
-${(0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 2))}}`;
-      if (!outputsConfig[meta.id]) {
-        outputsConfig[meta.id] = {};
-      }
-      const onEventName = eventId.startsWith("on") ? eventId : `on${eventId.charAt(0).toUpperCase()}${eventId.slice(1)}`;
-      outputsConfig[meta.id][onEventName] = handlerCode;
-      eventConfig[eventId] = { connected: true };
+  return (0, import_templates.getUiComponentCode)(
+    {
+      componentName,
+      meta,
+      props,
+      resultStyle: { root: rootStyle },
+      componentInputs: componentInputs.length > 0 ? componentInputs : void 0,
+      componentOutputs: componentOutputs.length > 0 ? componentOutputs : void 0,
+      comEventCode,
+      slotsCode,
+      eventHandlers
+    },
+    {
+      codeStyle: config.codeStyle,
+      depth: config.depth + 1,
+      verbose: config.verbose
     }
   );
-  currentProvider.coms.add(meta.id);
-  currentProvider.controllers.add(meta.id);
-  const indent = (0, import_utils.indentation)(config.codeStyle.indent * config.depth);
-  const indent2 = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 1));
+};
+var isJsCalculation = (meta) => meta.def.namespace === "mybricks.taro._muilt-inputJs" || meta.def.namespace === "mybricks.core-comlib.js-ai";
+var handleJsCalculation = (com, config) => {
+  var _a, _b, _c, _d, _e, _f, _g;
+  const { meta, props } = com;
+  const transformCode = ((_b = (_a = props.data) == null ? void 0 : _a.fns) == null ? void 0 : _b.code) || ((_d = (_c = props.data) == null ? void 0 : _c.fns) == null ? void 0 : _d.transformCode) || ((_e = props.data) == null ? void 0 : _e.fns);
+  if (transformCode && config.addJSModule) {
+    config.addJSModule({
+      id: meta.id,
+      title: meta.title || "JS计算",
+      transformCode: typeof transformCode === "string" ? transformCode : "",
+      inputs: ((_f = meta.model) == null ? void 0 : _f.inputs) || [],
+      outputs: ((_g = meta.model) == null ? void 0 : _g.outputs) || [],
+      data: props.data || {}
+    });
+  }
+  return { slots: [], scopeSlots: [], ui: "", js: "", cssContent: "", outputsConfig: void 0 };
+};
+var processComSlots = (com, config, initialCss) => {
+  const { meta, props, slots } = com;
   let slotsCode = "";
-  let accumulatedCssContent = cssContent;
-  let renderCode = "";
-  const renderManager = config.renderManager || new import_renderManager.RenderManager();
+  let accumulatedCssContent = initialCss;
+  let eventCode = "";
   if (slots) {
-    let slotsObjectCode = "";
+    const renderManager = config.renderManager || new import_renderManager.RenderManager();
     const slotEntries = Object.entries(slots);
     slotEntries.forEach(([slotId, slot], index) => {
-      var _a2, _b2;
-      const rawSlotInfo = (_b2 = (_a2 = props.style) == null ? void 0 : _a2.slots) == null ? void 0 : _b2[slotId];
+      var _a, _b;
+      const rawSlotInfo = (_b = (_a = props.style) == null ? void 0 : _a.slots) == null ? void 0 : _b[slotId];
       if (rawSlotInfo == null ? void 0 : rawSlotInfo.layout) {
         slot.layout = rawSlotInfo.layout;
       }
-      const { js, ui: ui2, cssContent: slotCssContent } = (0, import_handleSlot.default)(slot, {
+      const result = (0, import_handleSlot.default)(slot, {
         ...config,
         checkIsRoot: () => false,
         depth: 1,
-        // 参照鸿蒙：非作用域插槽 depth 从 1 开始
         renderManager
-        // 传递 renderManager
       });
-      eventCode += js;
-      if (slotCssContent) {
-        accumulatedCssContent += (accumulatedCssContent ? "\n" : "") + slotCssContent;
+      eventCode += result.js;
+      if (result.cssContent) {
+        accumulatedCssContent += (accumulatedCssContent ? "\n" : "") + result.cssContent;
       }
       const renderId = `${meta.id}_${slotId}`;
       const baseIndentSize = config.codeStyle.indent;
       const rootIndent = config.codeStyle.indent;
       const renderBodyIndent = (0, import_utils.indentation)(rootIndent + config.codeStyle.indent);
       const formattedContent = (0, import_component.formatSlotContent)({
-        uiContent: ui2,
+        uiContent: result.ui,
         baseIndentSize,
         renderBodyIndent
       });
       renderManager.register(renderId, formattedContent);
       const slotIndent = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 2));
-      slotsObjectCode += (0, import_component.genSlotRenderRef)({
+      slotsCode += (0, import_component.genSlotRenderRef)({
         slotId,
         renderId,
         indent: slotIndent,
         isLast: index === slotEntries.length - 1
       });
     });
-    slotsCode = slotsObjectCode;
   }
-  const componentResultStyle = { ...resultStyle };
-  const rootStyle = componentResultStyle.root || {};
-  delete componentResultStyle.root;
-  const eventHandlers = outputsConfig[meta.id] || {};
-  const uiComponentCode = (0, import_code.getUiComponentCode)(
-    {
-      componentName,
-      meta,
-      props,
-      resultStyle: { root: rootStyle },
-      // 传递 root style
-      componentInputs: componentInputs.length > 0 ? componentInputs : void 0,
-      componentOutputs: componentOutputs.length > 0 ? componentOutputs : void 0,
-      comEventCode,
-      slotsCode,
-      eventHandlers
-      // 传递事件处理函数
-    },
-    {
-      codeStyle: config.codeStyle,
-      depth: config.depth + 1,
-      verbose: config.verbose
-    }
-  );
-  const ui = uiComponentCode;
-  return {
-    slots: [],
-    scopeSlots: [],
-    ui,
-    js: eventCode,
-    cssContent: accumulatedCssContent,
-    outputsConfig: Object.keys(outputsConfig).length > 0 ? outputsConfig : void 0
-  };
+  return { slotsCode, accumulatedCssContent, eventCode };
 };
 var handleCom_default = handleCom;

package/dist/cjs/handleDom.js

@@ -1,8 +1,6 @@
-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)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/handleDom.ts
@@ -33,53 +23,26 @@ __export(handleDom_exports, {
 });
 module.exports = __toCommonJS(handleDom_exports);
 var import_utils = require("./utils");
-var import_handleCom = __toESM(require("./handleCom"));
+var import_processChildren = require("./utils/logic/processChildren");
 var handleDom = (dom, config) => {
   var _a;
   const { props, children } = dom;
   const domProps = props;
-  let uiCode = "";
-  let jsCode = "";
-  let cssContent = (0, import_utils.convertStyleAryToCss)((_a = domProps.style) == null ? void 0 : _a.styleAry, domProps.id);
-  const level0Slots = [];
-  const level1Slots = [];
-  const nextConfig = {
+  const childResults = (0, import_processChildren.processChildren)(children, {
     ...config,
     depth: config.depth + 1
-  };
-  children.forEach((child) => {
-    if (child.type === "com") {
-      const { ui: ui2, js, slots, scopeSlots, cssContent: childCssContent } = (0, import_handleCom.default)(child, nextConfig);
-      uiCode += uiCode ? "\n" + ui2 : ui2;
-      jsCode += js;
-      if (childCssContent) {
-        cssContent += (cssContent ? "\n" : "") + childCssContent;
-      }
-      level0Slots.push(...slots);
-      level1Slots.push(...scopeSlots);
-    } else if (child.type === "module") {
-      uiCode += uiCode ? "\n模块" : "模块";
-    } else {
-      const { ui: ui2, js, slots, scopeSlots, cssContent: childCssContent } = handleDom(child, nextConfig);
-      uiCode += uiCode ? "\n" + ui2 : ui2;
-      jsCode += js;
-      if (childCssContent) {
-        cssContent += (cssContent ? "\n" : "") + childCssContent;
-      }
-      level0Slots.push(...slots);
-      level1Slots.push(...scopeSlots);
-    }
   });
+  const cssContent = ((0, import_utils.convertStyleAryToCss)((_a = domProps.style) == null ? void 0 : _a.styleAry, domProps.id) || "") + (childResults.cssContent ? "\n" + childResults.cssContent : "");
   const indent = (0, import_utils.indentation)(config.codeStyle.indent * config.depth);
   const styleCode = JSON.stringify((0, import_utils.convertRootStyle)(domProps.style));
   const ui = `${indent}<View${domProps.id ? ` id="${domProps.id}" className="${domProps.id}"` : ""} style={${styleCode}}>
-${uiCode}
+${childResults.ui}
 ${indent}</View>`;
   return {
     ui,
-    js: jsCode,
-    slots: level0Slots,
-    scopeSlots: level1Slots,
+    js: childResults.js,
+    slots: childResults.slots,
+    scopeSlots: childResults.scopeSlots,
     cssContent
   };
 };

package/dist/cjs/handleExtension.d.ts

@@ -1,10 +1,10 @@
 /**
  * 处理Extension事件卡片
  */
-import type { ToTaroCodeConfig, Result } from "./toCodeTaro";
+import type { ToTaroCodeConfig, GeneratedFile } from "./toCodeTaro";
 interface HandleExtensionParams {
     tojson: any;
     extensionEvents: any[];
 }
-declare const handleExtension: (params: HandleExtensionParams, config: ToTaroCodeConfig) => Result;
+declare const handleExtension: (params: HandleExtensionParams, config: ToTaroCodeConfig) => GeneratedFile[];
 export default handleExtension;

package/dist/cjs/handleExtension.js

@@ -23,10 +23,10 @@ __export(handleExtension_exports, {
 });
 module.exports = __toCommonJS(handleExtension_exports);
 var import_utils = require("./utils");
-var import_handleProcess = require("./utils/handleProcess");
+var import_handleProcess = require("./utils/logic/handleProcess");
 var handleExtension = (params, config) => {
   const { tojson, extensionEvents } = params;
-  const result = [];
+  const files = [];
   const importManager = new import_utils.ImportManager(config);
   const addDependencyImport = importManager.addImport.bind(importManager);
   const eventCode = genEvent(
@@ -56,7 +56,7 @@ var handleExtension = (params, config) => {
     },
     { ...config, addParentDependencyImport: addDependencyImport }
   );
-  result.push({
+  files.push({
     type: "api",
     content: (apiCode ? `${apiCode}
 
@@ -78,14 +78,14 @@ var handleExtension = (params, config) => {
     { ...config, addParentDependencyImport: addDependencyExtensionBusImport }
   );
   if (busCode) {
-    result.push({
+    files.push({
       content: busCode,
       importManager: extensionBusImportManager,
       type: "extension-bus",
       name: "系统总线"
     });
   }
-  return result;
+  return files;
 };
 var handleExtension_default = handleExtension;
 var genConfig = (params, config) => {

package/dist/cjs/handleGlobal.d.ts

@@ -1,21 +1,11 @@
 /**
  * 处理全局变量和全局Fx
  */
-import { ImportManager } from "./utils";
-import type { ToTaroCodeConfig } from "./toCodeTaro";
+import type { ToTaroCodeConfig, GeneratedFile } from "./toCodeTaro";
 interface HandleGlobalParams {
     tojson: any;
     globalFxs: any[];
     globalVars: any[];
 }
-declare const handleGlobal: (params: HandleGlobalParams, config: ToTaroCodeConfig) => {
-    content: string;
-    cssContent?: string;
-    pageConfigContent?: string;
-    importManager: ImportManager;
-    type: "module" | "fx" | "global" | "extension-event" | "extension-api" | "extension-config" | "api" | "normal" | "popup" | "extension-bus" | "abstractEventTypeDef" | "jsModules" | "commonIndex" | "tabBarConfig";
-    meta?: import("@mybricks/to-code-react/dist/cjs/toCode/types").Scene;
-    name: string;
-    tabBarConfig?: string;
-};
+declare const handleGlobal: (params: HandleGlobalParams, config: ToTaroCodeConfig) => GeneratedFile[];
 export default handleGlobal;

package/dist/cjs/handleGlobal.js

@@ -23,7 +23,7 @@ __export(handleGlobal_exports, {
 });
 module.exports = __toCommonJS(handleGlobal_exports);
 var import_utils = require("./utils");
-var import_handleProcess = require("./utils/handleProcess");
+var import_handleProcess = require("./utils/logic/handleProcess");
 var handleGlobal = (params, config) => {
   const { tojson, globalFxs, globalVars } = params;
   const globalImportManager = new import_utils.ImportManager(config);
@@ -138,6 +138,20 @@ class GlobalFxs {
 ${globalFxsInitCode}}
 
 export const globalFxs = new GlobalFxs()`;
+  if (varCode.includes("createVariable(")) {
+    globalAddDependencyImport({
+      packageName: config.getUtilsPackageName(),
+      dependencyNames: ["createVariable"],
+      importType: "named"
+    });
+  }
+  if (fxCode.includes("createFx(")) {
+    globalAddDependencyImport({
+      packageName: config.getUtilsPackageName(),
+      dependencyNames: ["createFx"],
+      importType: "named"
+    });
+  }
   if (fxCode.includes("merge(")) {
     globalAddDependencyImport({
       packageName: config.getUtilsPackageName(),
@@ -145,11 +159,13 @@ export const globalFxs = new GlobalFxs()`;
       importType: "named"
     });
   }
-  return {
-    type: "global",
-    content: varCode + "\n\n" + fxCode,
-    importManager: globalImportManager,
-    name: "global"
-  };
+  return [
+    {
+      type: "global",
+      content: varCode + "\n\n" + fxCode,
+      importManager: globalImportManager,
+      name: "global"
+    }
+  ];
 };
 var handleGlobal_default = handleGlobal;

package/dist/cjs/handleModule.js

@@ -23,7 +23,7 @@ __export(handleModule_exports, {
 });
 module.exports = __toCommonJS(handleModule_exports);
 var import_utils = require("./utils");
-var import_handleProcess = require("./utils/handleProcess");
+var import_handleProcess = require("./utils/logic/handleProcess");
 var handleModule = (module2, config) => {
   var _a, _b, _c;
   const { events, moduleId, props } = module2;
@@ -54,10 +54,10 @@ var handleModule = (module2, config) => {
     if (process.includes("pageParams")) {
       config.addParentDependencyImport({
         packageName: config.getComponentPackageName(),
-        dependencyNames: ["page"],
+        dependencyNames: ["page", "SUBJECT_VALUE"],
         importType: "named"
       });
-      process = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 2)) + `const pageParams: any = page.getParams("${config.getCurrentScene().id}");
+      process = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 2)) + `const pageParams: any = page.getParams("${config.getCurrentScene().id}")[SUBJECT_VALUE];
 ` + process;
     }
     comEventCode += `${indent}${eventId}: (${defaultValue}: any) => {

package/dist/cjs/handleSlot.d.ts

@@ -1,5 +1,5 @@
 import { ImportManager } from "./utils";
-import { RenderManager } from "./utils/code/renderManager";
+import { RenderManager } from "./utils/templates/renderManager";
 import type { UI, BaseConfig } from "./toCodeTaro";
 interface HandleSlotConfig extends BaseConfig {
     addParentDependencyImport?: (typeof ImportManager)["prototype"]["addImport"];
@@ -7,14 +7,7 @@ interface HandleSlotConfig extends BaseConfig {
     addConsumer?: (provider: ReturnType<BaseConfig["getCurrentProvider"]>) => void;
     checkIsRoot: () => boolean;
     renderManager?: RenderManager;
-    addJSModule?: (module: {
-        id: string;
-        title: string;
-        transformCode: string;
-        inputs: string[];
-        outputs: string[];
-        data: any;
-    }) => void;
+    addJSModule?: (module: any) => void;
 }
 declare const handleSlot: (ui: UI, config: HandleSlotConfig) => {
     js: string;