@mybricks/to-code-taro 1.1.6 → 1.1.8

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -139,6 +139,51 @@ ${item.content || ""}`;
       children: popupChildren
     });
   });
+  const compsDir = (0, import_fileNode.ensureDir)(srcDir, "src/comps");
+  const moduleScenes = files.filter((item) => item.type === "module" && item.meta);
+  const moduleExports = [];
+  moduleScenes.forEach((item) => {
+    var _a2;
+    const moduleId = item.meta.id;
+    const exportName = `C${String(moduleId).replace(/[^a-zA-Z0-9]/g, "_").toUpperCase()}`;
+    const importCode = ((_a2 = item.importManager) == null ? void 0 : _a2.toCode()) || "";
+    const fullContent = `${importCode}
+${item.content || ""}`;
+    const moduleChildren = [
+      {
+        path: `src/comps/${moduleId}/index.tsx`,
+        content: fullContent
+      },
+      {
+        path: `src/comps/${moduleId}/index.global.less`,
+        content: item.cssContent || ""
+      }
+    ];
+    if (item.jsModules && item.jsModules.length > 0) {
+      moduleChildren.push({
+        path: `src/comps/${moduleId}/index.jsModules.ts`,
+        content: (0, import_genJSModules.genScopedJSModules)(
+          item.jsModules,
+          "@/core/mybricks/index",
+          "@/common/jsModulesRuntime"
+        )
+      });
+    }
+    compsDir.children.push({
+      path: `src/comps/${moduleId}`,
+      content: null,
+      children: moduleChildren
+    });
+    moduleExports.push(
+      `export { default as ${exportName} } from "./${moduleId}/index";`
+    );
+  });
+  if (moduleExports.length > 0) {
+    compsDir.children.push({
+      path: "src/comps/Index.ts",
+      content: moduleExports.join("\n") + "\n"
+    });
+  }
   const appConfigFile = (_a = srcDir.children) == null ? void 0 : _a.find(
     (node) => node.path === "src/app.config.ts"
   );

package/dist/cjs/generate/utils/appConfig.js

@@ -44,11 +44,10 @@ function updateAppConfig(appConfigFile, normalItems, items) {
   if (entryPagePath) {
     content.entryPagePath = entryPagePath;
   }
-  content.window = content.window || {};
   const tabBarConfigItem = items.find((item) => item.type === "tabBarConfig");
   if (tabBarConfigItem == null ? void 0 : tabBarConfigItem.content) {
     const tabBar = (0, import_fileNode.parseLooseObject)(`{${tabBarConfigItem.content}}`);
-    Object.assign(content.window, tabBar);
+    Object.assign(content, tabBar);
   }
   appConfigFile.content = `export default defineAppConfig(${JSON.stringify(content, null, 2)})`;
 }

package/dist/cjs/handleCom.js

@@ -157,7 +157,7 @@ ${slotIndent}}${isLast ? "" : ","}
     if (result.cssContent) {
       accumulatedCssContent += (accumulatedCssContent ? "\n" : "") + result.cssContent;
     }
-    const renderId = `${meta.id}_${slotId}`;
+    const renderId = slotEntries.length > 1 ? `${meta.id}_${slotId}` : meta.id;
     const rawContent = result.ui;
     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;

package/dist/cjs/handleModule.js

@@ -25,11 +25,9 @@ module.exports = __toCommonJS(handleModule_exports);
 var import_utils = require("./utils");
 var import_handleProcess = require("./utils/logic/handleProcess");
 var handleModule = (module2, config) => {
-  var _a, _b, _c;
+  var _a, _b;
   const { events, moduleId, props } = module2;
-  const moduleScene = config.getSceneById(moduleId);
-  const rawName = ((_a = config.getFileName) == null ? void 0 : _a.call(config, moduleId)) || moduleScene.title;
-  const name = (0, import_utils.firstCharToUpperCase)(rawName);
+  const name = `C${String(moduleId).replace(/[^a-zA-Z0-9]/g, "_").toUpperCase()}`;
   let comEventCode = "";
   const indent = (0, import_utils.indentation)(config.codeStyle.indent * (config.depth + 1));
   Object.entries(events).forEach(([eventId, { diagramId }]) => {
@@ -66,7 +64,7 @@ ${indent}},
 `;
   });
   config.addParentDependencyImport({
-    packageName: "../sections/Index",
+    packageName: "@/comps/Index",
     dependencyNames: [name],
     importType: "named"
   });
@@ -75,8 +73,8 @@ ${indent}},
   currentProvider.coms.add(module2.meta.id);
   currentProvider.controllers.add(module2.meta.id);
   const resultStyle = (0, import_utils.convertComponentStyle)(module2.props.style);
-  const cssContent = (0, import_utils.convertStyleAryToCss)((_b = props.style) == null ? void 0 : _b.styleAry, module2.meta.id);
-  const componentController = ((_c = config.getComponentController) == null ? void 0 : _c.call(config, {
+  const cssContent = (0, import_utils.convertStyleAryToCss)((_a = props.style) == null ? void 0 : _a.styleAry, module2.meta.id);
+  const componentController = ((_b = config.getComponentController) == null ? void 0 : _b.call(config, {
     com: module2.meta,
     scene: config.getCurrentScene()
   })) || `controller_${module2.meta.id}`;
@@ -90,7 +88,7 @@ ${indent3}data={${(0, import_utils.genObjectCode)(configs, {
     initialIndent: initialIndent + config.codeStyle.indent * 2,
     indentSize: config.codeStyle.indent
   })}}` : "") + `
-${indent3}controller={this.${currentProvider.name}.${componentController}}` + (comEventCode ? `
+${indent3}controller={comRefs.current.${componentController}}` + (comEventCode ? `
 ${indent3}onEvents={{${comEventCode.replace(/\n/g, "\n" + indent3)}}}` : "") + `
 ${indent2}/>`;
   const ui = `${indentView}<View id="${module2.meta.id}" className="${module2.meta.id}" style={${JSON.stringify(resultStyle.root)}}>

package/dist/cjs/handleSlot.d.ts

@@ -9,6 +9,7 @@ interface HandleSlotConfig extends BaseConfig {
     renderManager?: RenderManager;
     addJSModule?: (module: any) => void;
     isPopup?: boolean;
+    isModule?: boolean;
     hasPopups?: boolean;
     /** handleCom 处理 slots 时的 slot key（如 item/content），用于识别 scope 入参 */
     slotKey?: string;

package/dist/cjs/handleSlot.js

@@ -50,7 +50,7 @@ var handleSlot = (ui, config) => {
     });
   }
   const indent2 = (0, import_utils.indentation)(config.codeStyle.indent);
-  const envDefineCode = isRoot ? (0, import_scene.genRootDefineCode)(indent2, config.getUtilsPackageName()) : (0, import_scene.genSlotDefineCode)(indent2);
+  const envDefineCode = isRoot ? (0, import_scene.genRootDefineCode)(indent2, config.getUtilsPackageName(), false, config.isModule) : (0, import_scene.genSlotDefineCode)(indent2);
   const renderManager = isRoot ? new import_renderManager.RenderManager() : config.renderManager || new import_renderManager.RenderManager();
   const childResults = (0, import_processChildren.processChildren)(children, {
     ...config,
@@ -96,7 +96,9 @@ var setupImports = (addImport, config, isRoot) => {
   addImport({ packageName: utilsPkg, dependencyNames, importType: "named" });
   addImport({ packageName: comPkg, dependencyNames: ["useAppContext"], importType: "named" });
   if (isRoot) {
-    addImport({ packageName: "@/common/pageLife", dependencyNames: ["usePageLife"], importType: "named" });
+    if (!config.isModule) {
+      addImport({ packageName: "@/common/pageLife", dependencyNames: ["usePageLife"], importType: "named" });
+    }
     if (config.hasPopups) {
       addImport({ packageName: "@/common/popup", dependencyNames: ["POPUP_MAP", "POPUP_IDS"], importType: "named" });
     }
@@ -114,7 +116,7 @@ var generateSlotUi = (ui, props, childrenUi, childrenResults, config) => {
   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 slotMarkClass = parentComId ? `mybricks_slot slot-${parentComId}` : "";
   const classNameStr = [rootClassName, slotMarkClass].filter(Boolean).join(" ");
   const classNameAttr = classNameStr ? ` className='${classNameStr}'` : "";
   const styleAttr = slotMarkClass ? `style={{...params.style || {}, ...${styleCode}}}` : `style={${styleCode}}`;
@@ -126,7 +128,8 @@ var finalizeRootComponent = (ui, config, importManager, combinedJsCode, renderDe
   var _a, _b, _c;
   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 prefix = config.isModule ? "C" : "P";
+  const componentName = `${prefix}${String(componentId).replace(/[^a-zA-Z0-9]/g, "_").toUpperCase()}`;
   const componentCode = (0, import_scene.genComponentTemplate)({
     componentId,
     componentName,

package/dist/cjs/processors/processModule.js

@@ -64,6 +64,7 @@ var processModule = (params) => {
   const eventQueries = (0, import_createEventQueries.createEventQueries)(event);
   (0, import_handleSlot.default)(ui, {
     ...config,
+    isModule: true,
     getCurrentScene: () => {
       const originalScene = getSceneById(scene.id);
       return { ...scene, ...originalScene, event };

package/dist/cjs/processors/processSceneLogic.js

@@ -84,7 +84,11 @@ ${indent}  const run_${varName}_${pinId} = (value: any) => {
 ${process}
 ${indent}  };`;
     code += `
-${indent}  $vars.current.${varName}.${pinId}?.()[SUBJECT_SUBSCRIBE](run_${varName}_${pinId});`;
+${indent}  $vars.current.${varName}.registerChange((changeValue: any) => {`;
+    code += `
+${indent}    changeValue[SUBJECT_SUBSCRIBE](run_${varName}_${pinId});`;
+    code += `
+${indent}  });`;
   });
   return code;
 };