@mybricks/to-code-taro 1.0.2 → 1.0.4

package/dist/cjs/core/utils/index.js

@@ -14,75 +14,51 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/core/utils/index.ts
 var utils_exports = {};
 __export(utils_exports, {
+  PopupRenderer: () => import_PopupRenderer.PopupRenderer,
+  SUBJECT_SUBSCRIBE: () => import_constant.SUBJECT_SUBSCRIBE,
+  SUBJECT_VALUE: () => import_constant.SUBJECT_VALUE,
   WithCom: () => import_with.WithCom,
   WithWrapper: () => import_with.WithWrapper,
-  useBindEvents: () => useBindEvents,
-  useBindInputs: () => useBindInputs,
-  useModel: () => useModel
+  closeActivePopupRouter: () => import_popupRouter.closeActivePopupRouter,
+  createFx: () => import_mybricks.createFx,
+  createVariable: () => import_mybricks.createVariable,
+  merge: () => import_mybricks.merge,
+  pageRouter: () => import_pageRouter.pageRouter,
+  popupRouter: () => import_popupRouter.popupRouter,
+  router: () => import_pageRouter.router,
+  subscribePopupRouter: () => import_popupRouter.subscribePopupRouter,
+  useAppContext: () => import_ComContext.useAppContext
 });
 module.exports = __toCommonJS(utils_exports);
-var import_react = require("react");
+__reExport(utils_exports, require("./hooks"), module.exports);
 var import_with = require("./with");
-function useModel(rawData) {
-  const [, forceUpdate] = (0, import_react.useState)({});
-  const dataRef = (0, import_react.useRef)(rawData || {});
-  return (0, import_react.useMemo)(() => {
-    return new Proxy(dataRef.current, {
-      get(target, key) {
-        return Reflect.get(target, key);
-      },
-      set(target, key, value) {
-        const result = Reflect.set(target, key, value);
-        forceUpdate({});
-        return result;
-      }
-    });
-  }, []);
-}
-function useBindInputs(scope, id) {
-  return (0, import_react.useMemo)(() => {
-    const controller = scope[id] = scope[id] || {};
-    return new Proxy({}, {
-      get: (_target, pin) => {
-        return (arg) => {
-          if (typeof arg === "function") {
-            controller[pin] = arg;
-          } else {
-            const callback = controller[pin];
-            if (typeof callback === "function") {
-              callback(arg);
-            }
-          }
-        };
-      }
-    });
-  }, [scope, id]);
-}
-function useBindEvents(props) {
-  return (0, import_react.useMemo)(() => {
-    const _events = {};
-    Object.keys(props).forEach((key) => {
-      if (key.startsWith("on")) {
-        const handler = props[key];
-        if (typeof handler === "function") {
-          _events[key] = handler;
-          _events[key].getConnections = () => [1];
-        }
-      }
-    });
-    return _events;
-  }, [props]);
-}
+var import_PopupRenderer = require("./PopupRenderer");
+var import_pageRouter = require("./pageRouter");
+var import_popupRouter = require("./popupRouter");
+var import_ComContext = require("./ComContext");
+var import_mybricks = require("../mybricks");
+var import_constant = require("../mybricks/constant");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PopupRenderer,
+  SUBJECT_SUBSCRIBE,
+  SUBJECT_VALUE,
   WithCom,
   WithWrapper,
-  useBindEvents,
-  useBindInputs,
-  useModel
+  closeActivePopupRouter,
+  createFx,
+  createVariable,
+  merge,
+  pageRouter,
+  popupRouter,
+  router,
+  subscribePopupRouter,
+  useAppContext,
+  ...require("./hooks")
 });

package/dist/cjs/core/utils/pageRouter.js

@@ -0,0 +1,81 @@
+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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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/core/utils/pageRouter.ts
+var pageRouter_exports = {};
+__export(pageRouter_exports, {
+  pageRouter: () => pageRouter,
+  router: () => router
+});
+module.exports = __toCommonJS(pageRouter_exports);
+var import_taro = __toESM(require("@tarojs/taro"));
+var import_mybricks = require("../mybricks");
+var TaroRouter = class {
+  constructor() {
+    this.paramsBackup = {};
+  }
+  getParams(name) {
+    var _a;
+    const instance = import_taro.default.getCurrentInstance();
+    let params = ((_a = instance.router) == null ? void 0 : _a.params) || {};
+    if (!params.data && this.paramsBackup[name]) {
+      params = { data: this.paramsBackup[name] };
+    }
+    return { value: params };
+  }
+  push(name, { value }) {
+    const url = `/pages/${name}/index`;
+    const dataStr = value ? encodeURIComponent(JSON.stringify(value)) : "";
+    if (dataStr) {
+      this.paramsBackup[name] = dataStr;
+    }
+    import_taro.default.navigateTo({
+      url: `${url}${dataStr ? `?data=${dataStr}` : ""}`
+    });
+  }
+  replace(name, { value }) {
+    const url = `/pages/${name}/index`;
+    const dataStr = value ? encodeURIComponent(JSON.stringify(value)) : "";
+    if (dataStr) {
+      this.paramsBackup[name] = dataStr;
+    }
+    import_taro.default.redirectTo({
+      url: `${url}${dataStr ? `?data=${dataStr}` : ""}`
+    });
+  }
+  pop() {
+    import_taro.default.navigateBack();
+  }
+};
+var router = new TaroRouter();
+var pageRouter = new import_mybricks.Page(router);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  pageRouter,
+  router
+});

package/dist/cjs/core/utils/popupRouter.js

@@ -0,0 +1,98 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/core/utils/popupRouter.ts
+var popupRouter_exports = {};
+__export(popupRouter_exports, {
+  closeActivePopupRouter: () => closeActivePopupRouter,
+  popupRouter: () => popupRouter,
+  subscribePopupRouter: () => subscribePopupRouter
+});
+module.exports = __toCommonJS(popupRouter_exports);
+var import_mybricks = require("../mybricks");
+var PopupStore = class {
+  constructor() {
+    this.activePopup = null;
+    this.listeners = /* @__PURE__ */ new Set();
+  }
+  /** 订阅弹窗状态变化 */
+  subscribe(listener) {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+  notify() {
+    this.listeners.forEach(
+      (l) => l(
+        this.activePopup || {
+          visible: false,
+          name: "",
+          value: null,
+          controller: null
+        }
+      )
+    );
+  }
+  /** 获取弹窗参数 */
+  getParams(name) {
+    if (this.activePopup && this.activePopup.name === name) {
+      return {
+        value: this.activePopup.value,
+        controller: this.activePopup.controller
+      };
+    }
+    return { value: null };
+  }
+  /** 获取当前激活的弹窗名称 */
+  getActiveName() {
+    var _a;
+    return (_a = this.activePopup) == null ? void 0 : _a.name;
+  }
+  /** 打开弹窗 */
+  push(name, { value, controller }) {
+    this.activePopup = { visible: true, name, value, controller };
+    this.notify();
+  }
+  /** 行为同 push */
+  replace(name, params) {
+    this.push(name, params);
+  }
+  /** 关闭弹窗 */
+  pop() {
+    this.activePopup = null;
+    this.notify();
+  }
+};
+var popupStore = new PopupStore();
+var subscribePopupRouter = (listener) => {
+  return popupStore.subscribe(listener);
+};
+var popupRouter = new import_mybricks.Page(popupStore);
+var closeActivePopupRouter = () => {
+  const name = popupStore.getActiveName();
+  if (!name)
+    return;
+  popupRouter.close(name);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  closeActivePopupRouter,
+  popupRouter,
+  subscribePopupRouter
+});

package/dist/cjs/core/utils/useContext.js

@@ -23,8 +23,15 @@ __export(useContext_exports, {
 });
 module.exports = __toCommonJS(useContext_exports);
 var import_react = require("react");
+var import_hooks = require("./hooks");
 function useAppCreateContext() {
-  const comRefs = (0, import_react.useRef)({});
+  const comRefs = (0, import_react.useRef)((0, import_hooks.deepProxy)({}));
+  const [popupState, setPopupState] = (0, import_react.useState)({
+    visible: false,
+    name: "",
+    value: null,
+    controller: null
+  });
   const appContext = {
     canvas: {
       id: "u_7VvVn"
@@ -44,7 +51,9 @@ function useAppCreateContext() {
   };
   return {
     comRefs,
-    appContext
+    appContext,
+    popupState,
+    setPopupState
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/core/utils/with.js

@@ -38,27 +38,41 @@ var import_components = require("@tarojs/components");
 var import_index = require("./index");
 var import_useContext = require("./useContext");
 var import_ComContext = __toESM(require("./ComContext"));
+var import_taro = require("@tarojs/taro");
 var WithCom = (props) => {
   const { component: Component, id = "", data, className, style, ...rest } = props;
   const { comRefs, appContext } = (0, import_ComContext.useAppContext)();
   const env = appContext;
+  const isPopup = Component.isPopup;
   const [show, setShow] = (0, import_react.useState)(true);
-  (0, import_react.useEffect)(() => {
-    comRefs.current[id].hide(() => {
-      setShow(false);
-    });
-    comRefs.current[id].show(() => {
-      setShow(true);
-    });
-    comRefs.current[id].showOrHide(() => {
-      setShow((prev) => !prev);
-    });
-  }, [comRefs]);
+  const [dynamicStyle, setDynamicStyle] = (0, import_react.useState)({});
   const _data = (0, import_index.useModel)(data || {});
-  const inputProxy = (0, import_index.useBindInputs)(comRefs, id);
+  const handlers = {
+    _setStyle: (style2) => {
+      setDynamicStyle((prev) => ({ ...prev, ...style2 }));
+    },
+    _setData: (path, value) => {
+      const paths = path.split(".");
+      let current = _data;
+      for (let i = 0; i < paths.length - 1; i++) {
+        if (!current[paths[i]])
+          current[paths[i]] = {};
+        current = current[paths[i]];
+      }
+      current[paths[paths.length - 1]] = value;
+    }
+  };
+  if (!isPopup) {
+    Object.assign(handlers, {
+      show: () => setShow(true),
+      hide: () => setShow(false),
+      showOrHide: () => setShow((prev) => !prev)
+    });
+  }
+  const inputProxy = (0, import_index.useBindInputs)(comRefs, id, handlers);
   const eventProxy = (0, import_index.useBindEvents)(rest);
   comRefs.current[id] = inputProxy;
-  return show ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style }, /* @__PURE__ */ import_react.default.createElement(
+  return show || isPopup ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style: { ...style, ...dynamicStyle } }, /* @__PURE__ */ import_react.default.createElement(
     Component,
     {
       ...rest,
@@ -74,6 +88,16 @@ var WithCom = (props) => {
 var WithWrapper = (Component) => {
   return function WrappedComponent(props) {
     const contextStore = (0, import_useContext.useAppCreateContext)();
+    const { setPopupState } = contextStore;
+    const isPopup = Component.isPopup;
+    (0, import_react.useEffect)(() => {
+      return (0, import_index.subscribePopupRouter)((state) => setPopupState(state));
+    }, [setPopupState]);
+    (0, import_taro.useTabItemTap)(() => {
+      if (isPopup)
+        return;
+      (0, import_index.closeActivePopupRouter)();
+    });
     return /* @__PURE__ */ import_react.default.createElement(import_ComContext.default.Provider, { value: contextStore }, /* @__PURE__ */ import_react.default.createElement(Component, { ...props }));
   };
 };

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,44 @@ ${fileContent}` : fileContent;
     };
   });
   pagesDir.children.push(...generatedPages);
-  const appConfigFile = (_a = srcDir.children) == null ? void 0 : _a.find((node) => node.path === "src/app.config.ts");
+  const popupComponentsDir = (0, import_fileNode.ensureDir)(srcDir, "src/popupComponents");
+  const popupScenes = files.filter((item) => item.type === "popup" && item.meta);
+  popupScenes.forEach((item) => {
+    var _a2;
+    const popupId = item.meta.id;
+    const importCode = ((_a2 = item.importManager) == null ? void 0 : _a2.toCode()) || "";
+    const fullContent = `${importCode}
+${item.content || ""}`;
+    popupComponentsDir.children.push({
+      path: `src/popupComponents/${popupId}`,
+      content: null,
+      children: [
+        {
+          path: `src/popupComponents/${popupId}/index.tsx`,
+          content: fullContent
+        },
+        {
+          path: `src/popupComponents/${popupId}/index.less`,
+          content: item.cssContent || ""
+        }
+      ]
+    });
+  });
+  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);
+  const popupFile = files.find((f) => f.type === "popup" && !f.meta);
+  if (popupFile) {
+    commonDir.children.push({
+      path: `src/common/${popupFile.name}.ts`,
+      content: popupFile.content
+    });
+  }
   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";