@mybricks/to-code-taro 1.1.0 → 1.1.2

package/dist/cjs/core/comlib/{index.js → Index.js}

@@ -26,11 +26,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/core/comlib/index.ts
-var comlib_exports = {};
-__export(comlib_exports, {
+// src/core/comlib/Index.ts
+var Index_exports = {};
+__export(Index_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,
@@ -41,6 +40,7 @@ __export(comlib_exports, {
   mybricks_taro_getStorage: () => import_GetStorage.default,
   mybricks_taro_getSystemInfo: () => import_GetSystemInfo.default,
   mybricks_taro_modal: () => import_Modal.default,
+  mybricks_taro_navigateBack: () => import_BackTo.default,
   mybricks_taro_openCamera: () => import_OpenCamera.default,
   mybricks_taro_openPetalMap: () => import_OpenPetalMap.default,
   mybricks_taro_openUrl: () => import_OpenUrl.default,
@@ -56,7 +56,7 @@ __export(comlib_exports, {
   mybricks_taro_timerThrottle: () => import_TimerThrottle.default,
   mybricks_taro_vibrate: () => import_Vibrate.default
 });
-module.exports = __toCommonJS(comlib_exports);
+module.exports = __toCommonJS(Index_exports);
 var import_ShowToast = __toESM(require("./_ShowToast"));
 var import_ScanQrcode = __toESM(require("./_ScanQrcode"));
 var import_SetStorage = __toESM(require("./_SetStorage"));
@@ -86,7 +86,6 @@ 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,
@@ -97,6 +96,7 @@ var import_TimerThrottle = __toESM(require("./_TimerThrottle"));
   mybricks_taro_getStorage,
   mybricks_taro_getSystemInfo,
   mybricks_taro_modal,
+  mybricks_taro_navigateBack,
   mybricks_taro_openCamera,
   mybricks_taro_openPetalMap,
   mybricks_taro_openUrl,

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -38,6 +38,7 @@ 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 import_genJSModules = require("../utils/logic/genJSModules");
 var generateTaroProjectJson = (result) => {
   var _a, _b;
   const { files = [], assets = {} } = result;
@@ -84,6 +85,16 @@ ${fileContent}` : fileContent;
         content: fullContent
       }
     ];
+    if (item.jsModules && item.jsModules.length > 0) {
+      pageChildren.push({
+        path: `src/pages/${pageName}/index.jsModules.ts`,
+        content: (0, import_genJSModules.genScopedJSModules)(
+          item.jsModules,
+          "../../core/mybricks/index",
+          "../../common/jsModulesRuntime"
+        )
+      });
+    }
     return {
       path: `src/pages/${pageName}`,
       content: null,
@@ -99,19 +110,30 @@ ${fileContent}` : fileContent;
     const importCode = ((_a2 = item.importManager) == null ? void 0 : _a2.toCode()) || "";
     const fullContent = `${importCode}
 ${item.content || ""}`;
+    const popupChildren = [
+      {
+        path: `src/popupComponents/${popupId}/index.tsx`,
+        content: fullContent
+      },
+      {
+        path: `src/popupComponents/${popupId}/index.global.less`,
+        content: item.cssContent || ""
+      }
+    ];
+    if (item.jsModules && item.jsModules.length > 0) {
+      popupChildren.push({
+        path: `src/popupComponents/${popupId}/index.jsModules.ts`,
+        content: (0, import_genJSModules.genScopedJSModules)(
+          item.jsModules,
+          "../../core/mybricks/index",
+          "../../common/jsModulesRuntime"
+        )
+      });
+    }
     popupComponentsDir.children.push({
       path: `src/popupComponents/${popupId}`,
       content: null,
-      children: [
-        {
-          path: `src/popupComponents/${popupId}/index.tsx`,
-          content: fullContent
-        },
-        {
-          path: `src/popupComponents/${popupId}/index.global.less`,
-          content: item.cssContent || ""
-        }
-      ]
+      children: popupChildren
     });
   });
   const appConfigFile = (_a = srcDir.children) == null ? void 0 : _a.find(
@@ -123,7 +145,7 @@ ${item.content || ""}`;
   (0, import_tabBarImages.handleTabBarImages)(tabbarDir, imageFiles);
   const CUSTOM_TAB_BAR_CONFIG_PATH = "src/custom-tab-bar/mybricks/tabbar-config.ts";
   const customTabBarItem = files.find((item) => item.type === "customTabBar");
-  if (customTabBarItem.content) {
+  if (customTabBarItem == null ? void 0 : customTabBarItem.content) {
     const customTabBarDir = (0, import_fileNode.ensureDir)(srcDir, "src/custom-tab-bar");
     const mybricksDir = (0, import_fileNode.ensureDir)(customTabBarDir, "src/custom-tab-bar/mybricks");
     const tabbarConfigFileIndex = (_b = mybricksDir.children) == null ? void 0 : _b.findIndex(

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

@@ -25,24 +25,17 @@ module.exports = __toCommonJS(commonDir_exports);
 function handleCommonDir(commonDir, items) {
   var _a;
   commonDir.children = commonDir.children || [];
-  const jsModulesItem = items.find((item) => item.type === "jsModules");
-  if (jsModulesItem) {
-    const importCode = ((_a = jsModulesItem.importManager) == null ? void 0 : _a.toCode()) || "";
-    const fileContent = jsModulesItem.content || "";
+  const jsModulesRuntimeItem = items.find((item) => item.type === "jsModulesRuntime");
+  if (jsModulesRuntimeItem) {
+    const importCode = ((_a = jsModulesRuntimeItem.importManager) == null ? void 0 : _a.toCode()) || "";
+    const fileContent = jsModulesRuntimeItem.content || "";
     const fullContent = importCode ? `${importCode}
 ${fileContent}` : fileContent;
     commonDir.children.push({
-      path: "src/common/jsModules.ts",
+      path: "src/common/jsModulesRuntime.ts",
       content: fullContent
     });
   }
-  const commonIndexItem = items.find((item) => item.type === "commonIndex");
-  if (commonIndexItem) {
-    commonDir.children.push({
-      path: "src/common/index.ts",
-      content: commonIndexItem.content || ""
-    });
-  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/handleSlot.js

@@ -40,7 +40,7 @@ var handleSlot = (ui, config) => {
     const utilsPkg = config.getUtilsPackageName({ isRoot, isPopup: config.isPopup });
     addDependencyImport({
       packageName: utilsPkg,
-      dependencyNames: ["useAppContext", "ScopedComContextProvider"],
+      dependencyNames: ["useAppContext"],
       importType: "named"
     });
     addDependencyImport({
@@ -82,9 +82,13 @@ var setupImports = (addImport, config, isRoot) => {
   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: "react",
+    dependencyNames: ["useRef", "useEffect", "useState", "createContext", "useContext"],
+    importType: "named"
+  });
   addImport({ packageName: "@tarojs/components", dependencyNames: ["View"], importType: "named" });
-  const dependencyNames = ["WithCom", "WithWrapper", "SlotProvider"];
+  const dependencyNames = ["WithCom", "WithWrapper"];
   if (isRoot && config.hasPopups) {
     dependencyNames.push("PopupRenderer");
   }

package/dist/cjs/processors/processScene.js

@@ -53,6 +53,7 @@ var processScene = (params) => {
     pageConfigHandler
   } = params;
   (0, import_collectJSModules.collectJSModulesFromScene)(scene, jsModulesMap);
+  const localJsModules = Object.entries(scene.coms || {}).map(([comId, comInfo]) => (0, import_collectJSModules.extractJSModuleFromCom)(comId, comInfo)).filter(Boolean);
   const fileName = (_a = config.getFileName) == null ? void 0 : _a.call(config, ui.meta.slotId);
   const currentProvider = (0, import_createProvider.createProvider)(fileName, true);
   const providerMap = (0, import_createProvider.createProviderMap)(currentProvider);
@@ -134,7 +135,8 @@ var processScene = (params) => {
         ...value,
         type: isPopup ? "popup" : (originalScene == null ? void 0 : originalScene.type) ? originalScene.type : "normal",
         meta: scene,
-        pageConfigContent
+        pageConfigContent,
+        jsModules: localJsModules
       });
     },
     addJSModule: (module2) => {