@mybricks/to-code-taro 1.0.2 → 1.0.4

package/dist/esm/core/utils/hooks.js

@@ -0,0 +1,130 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import { useState, useRef, useMemo } from 'react';
+import { createReactiveInputHandler } from "../mybricks/createReactiveInputHandler";
+
+/**
+ * 深度代理，支持自动路径初始化和响应式更新（鸿蒙化处理方案）
+ */
+export function deepProxy(target, onSet) {
+  if (target === null || _typeof(target) !== 'object' || target.__isProxy) {
+    return target;
+  }
+  return new Proxy(target, {
+    get: function get(obj, prop) {
+      if (prop === '__isProxy') return true;
+      if (prop === 'toJSON') return function () {
+        return obj;
+      };
+      var value = obj[prop];
+
+      // 只有在访问不存在的对象属性时，才自动创建（实现类似 ensure 的效果）
+      // 特意排除 MyBricks 内置的方法名，以便在生成代码中进行初始化判断
+      var mybricksMethods = ['get', 'set', 'changed', 'reset', 'registerChange', 'call', 'apply', 'bind', 'push', 'pop'];
+      if (value === undefined && typeof prop === 'string' && !mybricksMethods.includes(prop)) {
+        value = obj[prop] = {};
+      }
+      if (_typeof(value) === 'object' && value !== null && !value.__isProxy) {
+        obj[prop] = deepProxy(value, onSet);
+      }
+      return obj[prop];
+    },
+    set: function set(obj, prop, value) {
+      var result = Reflect.set(obj, prop, value);
+      if (onSet) onSet();
+      return result;
+    }
+  });
+}
+export function useModel(rawData) {
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    forceUpdate = _useState2[1];
+  var dataRef = useRef(rawData || {});
+  return useMemo(function () {
+    return deepProxy(dataRef.current, function () {
+      return forceUpdate({});
+    });
+  }, []);
+}
+export function useBindInputs(scope, id, initialHandlers) {
+  var handlersRef = useRef(_objectSpread({}, initialHandlers));
+
+  // 同步最新的 initialHandlers
+  if (initialHandlers) {
+    Object.assign(handlersRef.current, initialHandlers);
+  }
+  return useMemo(function () {
+    var proxy = new Proxy({}, {
+      get: function get(_target, pin) {
+        return function (arg) {
+          if (typeof arg === 'function') {
+            // 组件注册回调
+            handlersRef.current[pin] = arg;
+          } else {
+            // 逻辑流触发输入
+            var handler = handlersRef.current[pin];
+            if (typeof handler === 'function') {
+              if (pin === '_setData') {
+                for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                  args[_key - 1] = arguments[_key];
+                }
+                return handler.apply(void 0, [arg].concat(args));
+              }
+              // 构造 createReactiveInputHandler 需要的参数
+              return createReactiveInputHandler({
+                input: handler,
+                value: arg,
+                rels: {},
+                // 这里可以扩展 output 关联
+                title: id
+              });
+            }
+          }
+        };
+      }
+    });
+
+    // 将代理对象挂载到作用域，供外部 comRefs.current.id.pin() 调用
+    scope[id] = proxy;
+    return proxy;
+  }, [scope, id]);
+}
+export function useBindEvents(props) {
+  return useMemo(function () {
+    var _events = {};
+
+    // 预处理已存在的事件
+    Object.keys(props).forEach(function (key) {
+      if (key.startsWith('on') && typeof props[key] === 'function') {
+        var handler = props[key];
+        var wrapped = function wrapped() {
+          return handler.apply(void 0, arguments);
+        };
+        wrapped.getConnections = function () {
+          return [{
+            id: 'default'
+          }];
+        };
+        _events[key] = wrapped;
+      }
+    });
+    return new Proxy(_events, {
+      get: function get(target, key) {
+        if (typeof key === 'string' && key.startsWith('on')) {
+          if (target[key]) {
+            return target[key];
+          }
+          // 对未连接的事件返回兜底函数
+          var emptyFn = function emptyFn() {};
+          emptyFn.getConnections = function () {
+            return [];
+          };
+          return emptyFn;
+        }
+        return target[key];
+      }
+    });
+  }, [props]);
+}

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

@@ -1,57 +1,8 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useState, useRef, useMemo } from 'react';
-export function useModel(rawData) {
-  var _useState = useState({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    forceUpdate = _useState2[1];
-  var dataRef = useRef(rawData || {});
-  return useMemo(function () {
-    return new Proxy(dataRef.current, {
-      get: function get(target, key) {
-        return Reflect.get(target, key);
-      },
-      set: function set(target, key, value) {
-        var result = Reflect.set(target, key, value);
-        forceUpdate({});
-        return result;
-      }
-    });
-  }, []);
-}
-export function useBindInputs(scope, id) {
-  return useMemo(function () {
-    var controller = scope[id] = scope[id] || {};
-    return new Proxy({}, {
-      get: function get(_target, pin) {
-        return function (arg) {
-          if (typeof arg === 'function') {
-            controller[pin] = arg;
-          } else {
-            var callback = controller[pin];
-            if (typeof callback === 'function') {
-              callback(arg);
-            }
-          }
-        };
-      }
-    });
-  }, [scope, id]);
-}
-export function useBindEvents(props) {
-  return useMemo(function () {
-    var _events = {};
-    Object.keys(props).forEach(function (key) {
-      if (key.startsWith('on')) {
-        var handler = props[key];
-        if (typeof handler === 'function') {
-          _events[key] = handler;
-          _events[key].getConnections = function () {
-            return [1];
-          };
-        }
-      }
-    });
-    return _events;
-  }, [props]);
-}
-export { WithCom, WithWrapper } from "./with";
+export * from "./hooks";
+export { WithCom, WithWrapper } from "./with";
+export { PopupRenderer } from "./PopupRenderer";
+export { pageRouter, router } from "./pageRouter";
+export { popupRouter, subscribePopupRouter, closeActivePopupRouter } from "./popupRouter";
+export { useAppContext } from "./ComContext";
+export { createVariable, createFx, merge } from "../mybricks";
+export { SUBJECT_SUBSCRIBE, SUBJECT_VALUE } from "../mybricks/constant";

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

@@ -0,0 +1,69 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+// @ts-ignore 运行时由宿主项目提供 @tarojs/taro
+import Taro from '@tarojs/taro';
+import { Page } from "../mybricks";
+
+/**
+ * Taro 路由驱动 (纯粹版)
+ * 只负责处理真正的 Taro 页面跳转
+ */
+var TaroRouter = /*#__PURE__*/function () {
+  function TaroRouter() {
+    _classCallCheck(this, TaroRouter);
+    _defineProperty(this, "paramsBackup", {});
+  }
+  _createClass(TaroRouter, [{
+    key: "getParams",
+    value: function getParams(name) {
+      var _instance$router;
+      var instance = Taro.getCurrentInstance();
+      var params = ((_instance$router = instance.router) === null || _instance$router === void 0 ? void 0 : _instance$router.params) || {};
+
+      // 备份参数，解决某些生命周期下 Taro 获取不到 params 的问题
+      if (!params.data && this.paramsBackup[name]) {
+        params = {
+          data: this.paramsBackup[name]
+        };
+      }
+      return {
+        value: params
+      };
+    }
+  }, {
+    key: "push",
+    value: function push(name, _ref) {
+      var value = _ref.value;
+      var url = "/pages/".concat(name, "/index");
+      var dataStr = value ? encodeURIComponent(JSON.stringify(value)) : '';
+      if (dataStr) {
+        this.paramsBackup[name] = dataStr;
+      }
+      Taro.navigateTo({
+        url: "".concat(url).concat(dataStr ? "?data=".concat(dataStr) : '')
+      });
+    }
+  }, {
+    key: "replace",
+    value: function replace(name, _ref2) {
+      var value = _ref2.value;
+      var url = "/pages/".concat(name, "/index");
+      var dataStr = value ? encodeURIComponent(JSON.stringify(value)) : '';
+      if (dataStr) {
+        this.paramsBackup[name] = dataStr;
+      }
+      Taro.redirectTo({
+        url: "".concat(url).concat(dataStr ? "?data=".concat(dataStr) : '')
+      });
+    }
+  }, {
+    key: "pop",
+    value: function pop() {
+      Taro.navigateBack();
+    }
+  }]);
+  return TaroRouter;
+}();
+export var router = new TaroRouter();
+export var pageRouter = new Page(router);

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

@@ -0,0 +1,116 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { Page } from "../mybricks";
+
+/**
+ * 弹窗在 Taro 中被视为组件 兼容APP TODO
+ */
+var PopupStore = /*#__PURE__*/function () {
+  function PopupStore() {
+    _classCallCheck(this, PopupStore);
+    _defineProperty(this, "activePopup", null);
+    _defineProperty(this, "listeners", new Set());
+  }
+  _createClass(PopupStore, [{
+    key: "subscribe",
+    value: /** 订阅弹窗状态变化 */
+    function subscribe(listener) {
+      var _this = this;
+      this.listeners.add(listener);
+      // 返回取消订阅函数
+      return function () {
+        _this.listeners.delete(listener);
+      };
+    }
+  }, {
+    key: "notify",
+    value: function notify() {
+      var _this2 = this;
+      this.listeners.forEach(function (l) {
+        return l(_this2.activePopup || {
+          visible: false,
+          name: '',
+          value: null,
+          controller: null
+        });
+      });
+    }
+
+    /** 获取弹窗参数 */
+  }, {
+    key: "getParams",
+    value: function getParams(name) {
+      if (this.activePopup && this.activePopup.name === name) {
+        return {
+          value: this.activePopup.value,
+          controller: this.activePopup.controller
+        };
+      }
+      return {
+        value: null
+      };
+    }
+
+    /** 获取当前激活的弹窗名称 */
+  }, {
+    key: "getActiveName",
+    value: function getActiveName() {
+      var _this$activePopup;
+      return (_this$activePopup = this.activePopup) === null || _this$activePopup === void 0 ? void 0 : _this$activePopup.name;
+    }
+
+    /** 打开弹窗 */
+  }, {
+    key: "push",
+    value: function push(name, _ref) {
+      var value = _ref.value,
+        controller = _ref.controller;
+      this.activePopup = {
+        visible: true,
+        name: name,
+        value: value,
+        controller: controller
+      };
+      this.notify();
+    }
+
+    /** 行为同 push */
+  }, {
+    key: "replace",
+    value: function replace(name, params) {
+      this.push(name, params);
+    }
+
+    /** 关闭弹窗 */
+  }, {
+    key: "pop",
+    value: function pop() {
+      this.activePopup = null;
+      this.notify();
+    }
+  }]);
+  return PopupStore;
+}();
+var popupStore = new PopupStore();
+
+/**
+ * 订阅弹窗状态变化（统一入口，避免外部依赖内部实现细节）
+ */
+export var subscribePopupRouter = function subscribePopupRouter(listener) {
+  return popupStore.subscribe(listener);
+};
+
+/** 弹窗控制器（命名与文件名保持一致） */
+export var popupRouter = new Page(popupStore);
+
+/**
+ * 关闭当前激活的弹窗（用于 TabBar 点击等场景）
+ * 不需要知道弹窗 id
+ */
+export var closeActivePopupRouter = function closeActivePopupRouter() {
+  var name = popupStore.getActiveName();
+  if (!name) return;
+  // 走 Page.close，保证 close/commit/cancel 等控制器语义保持一致
+  popupRouter.close(name);
+};

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

@@ -1,6 +1,17 @@
-import { useRef } from 'react';
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useRef, useState } from 'react';
+import { deepProxy } from "./hooks";
 export function useAppCreateContext() {
-  var comRefs = useRef({});
+  var comRefs = useRef(deepProxy({}));
+  var _useState = useState({
+      visible: false,
+      name: '',
+      value: null,
+      controller: null
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    popupState = _useState2[0],
+    setPopupState = _useState2[1];
   var appContext = {
     canvas: {
       id: "u_7VvVn" // 使用 data 中的 id
@@ -19,6 +30,8 @@ export function useAppCreateContext() {
   };
   return {
     comRefs: comRefs,
-    appContext: appContext
+    appContext: appContext,
+    popupState: popupState,
+    setPopupState: setPopupState
   };
 }

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

@@ -1,12 +1,15 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["component", "id", "data", "className", "style"];
-import React, { useEffect, useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { View } from '@tarojs/components';
-import { useModel, useBindInputs, useBindEvents } from "./index";
+import { useModel, useBindInputs, useBindEvents, subscribePopupRouter, closeActivePopupRouter } from "./index";
 import { useAppCreateContext } from "./useContext";
 import ComContext, { useAppContext } from "./ComContext";
+// @ts-ignore 运行时由宿主项目提供 @tarojs/taro
+import { useTabItemTap } from '@tarojs/taro';
 export var WithCom = function WithCom(props) {
   var Component = props.component,
     _props$id = props.id,
@@ -20,34 +23,59 @@ export var WithCom = function WithCom(props) {
     appContext = _useAppContext.appContext;
   var env = appContext; //TODO: 需要根据实际情况修改
 
+  var isPopup = Component.isPopup;
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     show = _useState2[0],
     setShow = _useState2[1];
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    dynamicStyle = _useState4[0],
+    setDynamicStyle = _useState4[1];
 
-  //默认事件注册
-  useEffect(function () {
-    comRefs.current[id].hide(function () {
-      setShow(false);
-    });
-    comRefs.current[id].show(function () {
-      setShow(true);
-    });
-    comRefs.current[id].showOrHide(function () {
-      setShow(function (prev) {
-        return !prev;
+  //数据模型
+  var _data = useModel(data || {});
+
+  // 内置通用能力
+  var handlers = {
+    _setStyle: function _setStyle(style) {
+      setDynamicStyle(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), style);
       });
+    },
+    _setData: function _setData(path, value) {
+      var paths = path.split('.');
+      var current = _data;
+      for (var 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: function show() {
+        return setShow(true);
+      },
+      hide: function hide() {
+        return setShow(false);
+      },
+      showOrHide: function showOrHide() {
+        return setShow(function (prev) {
+          return !prev;
+        });
+      }
     });
-  }, [comRefs]);
+  }
 
-  //数据模型
-  var _data = useModel(data || {});
-  var inputProxy = useBindInputs(comRefs, id);
+  // 绑定输入，传入初始 handlers
+  var inputProxy = useBindInputs(comRefs, id, handlers);
   var eventProxy = useBindEvents(rest);
   comRefs.current[id] = inputProxy;
-  return show ? /*#__PURE__*/React.createElement(View, {
+  return show || isPopup ? /*#__PURE__*/React.createElement(View, {
     className: className,
-    style: style
+    style: _objectSpread(_objectSpread({}, style), dynamicStyle)
   }, /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
     inputs: inputProxy,
     outputs: eventProxy,
@@ -60,6 +88,21 @@ export var WithCom = function WithCom(props) {
 export var WithWrapper = function WithWrapper(Component) {
   return function WrappedComponent(props) {
     var contextStore = useAppCreateContext();
+    var setPopupState = contextStore.setPopupState;
+    var isPopup = Component.isPopup;
+
+    // 通过发布订阅模式解耦弹窗状态变化
+    useEffect(function () {
+      return subscribePopupRouter(function (state) {
+        return setPopupState(state);
+      });
+    }, [setPopupState]);
+
+    // 点击 TabBar 时自动关闭弹窗（自定义 TabBar 或原生 TabBar 点击均会触发）
+    useTabItemTap(function () {
+      if (isPopup) return;
+      closeActivePopupRouter();
+    });
     return /*#__PURE__*/React.createElement(ComContext.Provider, {
       value: contextStore
     }, /*#__PURE__*/React.createElement(Component, props));

package/dist/esm/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;