@mybricks/to-code-taro 1.1.2 → 1.1.4

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

@@ -1,16 +1,14 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 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 { useState, useRef, useMemo, useEffect } from 'react';
 import { createReactiveInputHandler } from "../mybricks/createReactiveInputHandler";
+import { useAppContext, useParentSlot } from "./ComContext";
 
-/**
- * 深度代理，支持自动路径初始化和响应式更新（鸿蒙化处理方案）
- */
+/** 深度代理：支持响应式更新 */
 export function deepProxy(target, onSet) {
-  if (target === null || _typeof(target) !== 'object' || target.__isProxy) {
-    return target;
-  }
+  if (target === null || _typeof(target) !== 'object' || target.__isProxy) return target;
   return new Proxy(target, {
     get: function get(obj, prop) {
       if (prop === '__isProxy') return true;
@@ -18,9 +16,6 @@ export function deepProxy(target, onSet) {
         return obj;
       };
       var value = obj[prop];
-
-      // 只代理已存在的对象属性，不自动创建空对象
-      // 避免访问不存在的属性（如 disabled）时污染原始数据
       if (_typeof(value) === 'object' && value !== null && !value.__isProxy) {
         obj[prop] = deepProxy(value, onSet);
       }
@@ -28,11 +23,13 @@ export function deepProxy(target, onSet) {
     },
     set: function set(obj, prop, value) {
       var result = Reflect.set(obj, prop, value);
-      if (onSet) onSet();
+      onSet === null || onSet === void 0 || onSet();
       return result;
     }
   });
 }
+
+/** 状态 Hook：提供响应式数据能力 */
 export function useModel(rawData) {
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -44,36 +41,131 @@ export function useModel(rawData) {
     });
   }, []);
 }
+
+/** 
+ * 组件引用代理：
+ * 1. 自动缓冲：访问未渲染组件时返回影子对象，缓冲后续指令
+ * 2. 引用渗透：子作用域注册的真实引用自动同步至父级
+ * 3. 自动同步清理：卸载时从作用域链中彻底移除，防止僵尸引用
+ */
+export function proxyRefs(target, parentComRefs, globalTodoPool) {
+  return new Proxy(target, {
+    get: function get(obj, prop) {
+      if (prop === '__isProxy') return true;
+      if (prop === 'toJSON') return function () {
+        return obj;
+      };
+      if (typeof prop === 'string' && prop.startsWith('u_') && obj[prop] === undefined) {
+        // 懒加载影子对象
+        return obj[prop] = new Proxy({
+          __isShadow: true
+        }, {
+          get: function get(_, method) {
+            if (method === '__isShadow') return true;
+            return function () {
+              var _obj$$index;
+              if (!(globalTodoPool instanceof Map)) return;
+              var instances = globalTodoPool.get(prop) || [];
+              if (!globalTodoPool.has(prop)) globalTodoPool.set(prop, instances);
+              var index = (_obj$$index = obj.$index) !== null && _obj$$index !== void 0 ? _obj$$index : 0;
+              var todo = instances[index] || (instances[index] = {});
+              for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+                args[_key] = arguments[_key];
+              }
+              todo[method] = args;
+            };
+          }
+        });
+      }
+      return obj[prop];
+    },
+    set: function set(obj, prop, value) {
+      var result = Reflect.set(obj, prop, value);
+      var isRealRef = typeof prop === 'string' && !prop.startsWith('$') && (value === null || value === void 0 ? void 0 : value.__isShadow) !== true;
+      if (isRealRef && parentComRefs !== null && parentComRefs !== void 0 && parentComRefs.current) {
+        try {
+          parentComRefs.current[prop] = value;
+        } catch (_unused) {}
+      }
+      return result;
+    },
+    deleteProperty: function deleteProperty(obj, prop) {
+      var result = Reflect.deleteProperty(obj, prop);
+      var isRealRef = typeof prop === 'string' && !prop.startsWith('$');
+      if (isRealRef && parentComRefs !== null && parentComRefs !== void 0 && parentComRefs.current) {
+        try {
+          delete parentComRefs.current[prop];
+        } catch (_unused2) {}
+      }
+      return result;
+    }
+  });
+}
+
+/** 
+ * 组件输入绑定 Hook：
+ * 1. 注册输入执行器
+ * 2. 自动重放缓冲指令（精准索引匹配）
+ * 3. 生命周期自动化：卸载时自动注销引用渗透路径
+ */
 export function useBindInputs(scope, id, initialHandlers) {
+  var _parentSlot$params$in, _parentSlot$params;
   var handlersRef = useRef(_objectSpread({}, initialHandlers));
-
-  // 同步最新的 initialHandlers
-  if (initialHandlers) {
-    Object.assign(handlersRef.current, initialHandlers);
-  }
+  var _useAppContext = useAppContext(),
+    globalTodoInputs = _useAppContext.globalTodoInputs;
+  var parentSlot = useParentSlot();
+  var index = (_parentSlot$params$in = parentSlot === null || parentSlot === void 0 || (_parentSlot$params = parentSlot.params) === null || _parentSlot$params === void 0 || (_parentSlot$params = _parentSlot$params.inputValues) === null || _parentSlot$params === void 0 ? void 0 : _parentSlot$params.index) !== null && _parentSlot$params$in !== void 0 ? _parentSlot$params$in : 0;
+  useEffect(function () {
+    return function () {
+      if (scope !== null && scope !== void 0 && scope.current) {
+        delete scope.current[id];
+      }
+    };
+  }, [scope, id]);
   return useMemo(function () {
     var proxy = new Proxy({}, {
-      get: function get(_target, pin) {
+      get: function get(target, pin) {
+        if (pin === '__isShadow') return false;
+        if (pin === 'toJSON') return function () {
+          return target;
+        };
         return function (arg) {
           if (typeof arg === 'function') {
-            // 组件注册回调
             handlersRef.current[pin] = arg;
+
+            // 处理指令重放
+            var instances = globalTodoInputs === null || globalTodoInputs === void 0 ? void 0 : globalTodoInputs.get(id);
+            var todo = (instances === null || instances === void 0 ? void 0 : instances[index]) || (instances === null || instances === void 0 ? void 0 : instances[0]);
+            if (todo !== null && todo !== void 0 && todo[pin]) {
+              var pendingArgs = todo[pin];
+              if (pin === '_setData') {
+                arg.apply(void 0, _toConsumableArray(pendingArgs));
+              } else {
+                createReactiveInputHandler({
+                  input: arg,
+                  value: pendingArgs[0],
+                  rels: {},
+                  title: id
+                });
+              }
+              delete todo[pin];
+
+              // 检查全局清理
+              var hasTasks = instances === null || instances === void 0 ? void 0 : instances.some(function (inst) {
+                return inst && Object.keys(inst).length > 0;
+              });
+              if (!hasTasks) globalTodoInputs.delete(id);
+            }
           } 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));
+              for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+                args[_key2 - 1] = arguments[_key2];
               }
-              // 构造 createReactiveInputHandler 需要的参数
-              return createReactiveInputHandler({
+              return pin === '_setData' ? handler.apply(void 0, [arg].concat(args)) : createReactiveInputHandler({
                 input: handler,
                 value: arg,
                 rels: {},
-                // 这里可以扩展 output 关联
                 title: id
               });
             }
@@ -81,34 +173,30 @@ export function useBindInputs(scope, id, initialHandlers) {
         };
       }
     });
-
-    // 将代理对象挂载到作用域，供外部 comRefs.current.id.pin() 调用
-    if (scope && scope.current) {
-      scope.current[id] = proxy;
+    if (scope !== null && scope !== void 0 && scope.current) scope.current[id] = proxy;
+    if (initialHandlers) {
+      Object.keys(initialHandlers).forEach(function (pin) {
+        return proxy[pin](initialHandlers[pin]);
+      });
     }
     return proxy;
-  }, [scope, id]);
+  }, [scope, id, globalTodoInputs, index]);
 }
+
+/** 组件事件绑定 Hook */
 export function useBindEvents(props, context) {
   return useMemo(function () {
-    var _events = {};
-
-    // 预处理已存在的事件
+    var events = {};
     Object.keys(props).forEach(function (key) {
-      // 兼容：MyBricks 输出 pin 既可能是 onChange，也可能是 changeTab 这种非 on 前缀
       if (typeof props[key] === 'function') {
         var handler = props[key];
-        var wrapped = function wrapped(originalValue) {
+        var wrapped = function wrapped(original) {
           var _context$parentSlot;
-          // 鸿蒙/render-web 规范：如果是在插槽中触发事件，且存在父级协议，则自动封装元数据
-          // 这解决了 FormContainer 等组件识别子项的需求
-          // 注意：不要仅凭 parentSlot 存在就封装，否则会影响 Tabs2/changeTab 这类事件直接给 JS 计算组件传参
-          // 仅在父级 slot 使用 itemWrap 协议时才需要这层元数据
           var value = context !== null && context !== void 0 && (_context$parentSlot = context.parentSlot) !== null && _context$parentSlot !== void 0 && (_context$parentSlot = _context$parentSlot.params) !== null && _context$parentSlot !== void 0 && _context$parentSlot.itemWrap ? {
             id: context.id,
             name: context.name,
-            value: originalValue
-          } : originalValue;
+            value: original
+          } : original;
           return handler(value);
         };
         wrapped.getConnections = function () {
@@ -116,22 +204,18 @@ export function useBindEvents(props, context) {
             id: 'default'
           }];
         };
-        _events[key] = wrapped;
+        events[key] = wrapped;
       }
     });
-    return new Proxy(_events, {
+    return new Proxy(events, {
       get: function get(target, key) {
-        // 对 onXXX 事件（不少组件 runtime 直接 outputs["onChange"](...)）提供兜底函数，避免未连线时报错
         if (typeof key === 'string' && key.startsWith('on')) {
-          if (target[key]) {
-            return target[key];
-          }
-          // 对未连接的事件返回兜底函数
-          var emptyFn = function emptyFn() {};
-          emptyFn.getConnections = function () {
+          if (target[key]) return target[key];
+          var fn = function fn() {};
+          fn.getConnections = function () {
             return [];
           };
-          return emptyFn;
+          return fn;
         }
         return target[key];
       }

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

@@ -4,7 +4,8 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { Page } from "../mybricks";
 
 /**
- * 弹窗在 Taro 中被视为组件 兼容APP TODO
+ * 弹窗状态管理（解耦版）
+ * 弹窗在 Taro 中被视为组件，不走路由栈
  */
 var PopupStore = /*#__PURE__*/function () {
   function PopupStore() {

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

@@ -3,6 +3,21 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useMemo, useRef } from "react";
 import ComContext, { SlotProvider, useAppContext, useParentSlot } from "./ComContext";
 import { createReactiveInputHandler } from "../mybricks/createReactiveInputHandler";
+import { proxyRefs } from "./hooks";
+/**
+ * 创建一个具有“向上渗透”和“隔离 Todo 池”能力的 comRefs 对象
+ */
+function createPenetratingComRefs(parentComRefs, globalTodoPool) {
+  var index = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var localTarget = {
+    $inputs: {},
+    $outputs: {},
+    $index: index
+  };
+  return {
+    current: proxyRefs(localTarget, parentComRefs, globalTodoPool)
+  };
+}
 function SlotParamsBridge(props) {
   var _props$params, _parentSlot$params, _props$children;
   var parentSlot = useParentSlot();
@@ -39,13 +54,10 @@ function createChannelProxy(title) {
     }
   });
 }
-
-/**
- * 参考鸿蒙的 createSlotsIO：
- * - 确保每个 slot 都具备 inputs / outputs / _inputs 三套通道，避免 runtime 访问时报 undefined
- * - render 时通过 SlotProvider 注入 parentSlot（slot 内子组件可 useParentSlot 获取）
- */
 export function useEnhancedSlots(rawSlots, id) {
+  var _useAppContext = useAppContext(),
+    parentComRefs = _useAppContext.comRefs,
+    globalTodoInputs = _useAppContext.globalTodoInputs;
   var slotStoreRef = useRef({});
   return useMemo(function () {
     if (!rawSlots) return {};
@@ -61,7 +73,7 @@ export function useEnhancedSlots(rawSlots, id) {
         _scopedComRefs: {},
         _render: undefined,
         render: function render(params) {
-          var _ref3, _params$key, _params$inputValues, _params$inputValues2, _ref4;
+          var _ref3, _params$key, _params$inputValues, _params$inputValues2, _params$inputValues$i, _params$inputValues3, _ref4;
           var r = state._render;
           // 只有存在 key 或 index 时才认为是“多实例作用域插槽”，需要实例隔离
           var rawScope = (_ref3 = (_params$key = params === null || params === void 0 ? void 0 : params.key) !== null && _params$key !== void 0 ? _params$key : params === null || params === void 0 || (_params$inputValues = params.inputValues) === null || _params$inputValues === void 0 ? void 0 : _params$inputValues.index) !== null && _ref3 !== void 0 ? _ref3 : params === null || params === void 0 || (_params$inputValues2 = params.inputValues) === null || _params$inputValues2 === void 0 || (_params$inputValues2 = _params$inputValues2.itemData) === null || _params$inputValues2 === void 0 ? void 0 : _params$inputValues2.id;
@@ -73,24 +85,16 @@ export function useEnhancedSlots(rawSlots, id) {
             });
           }
           var scopeId = "".concat(id, ".").concat(slotKey, "::").concat(String(rawScope));
-          var scopedComRefs = (_ref4 = state._scopedComRefs)[scopeId] || (_ref4[scopeId] = {
-            current: {
-              $inputs: {},
-              $outputs: {}
-            }
-          });
-          return /*#__PURE__*/React.createElement(SlotProvider, {
-            value: _objectSpread(_objectSpread({}, state), {}, {
-              params: params
-            })
-          }, /*#__PURE__*/React.createElement(ScopedComContextProvider, {
+          var index = (_params$inputValues$i = params === null || params === void 0 || (_params$inputValues3 = params.inputValues) === null || _params$inputValues3 === void 0 ? void 0 : _params$inputValues3.index) !== null && _params$inputValues$i !== void 0 ? _params$inputValues$i : 0;
+          var scopedComRefs = (_ref4 = state._scopedComRefs)[scopeId] || (_ref4[scopeId] = createPenetratingComRefs(parentComRefs, globalTodoInputs, index));
+          return /*#__PURE__*/React.createElement(ScopedComContextProvider, {
             comRefs: scopedComRefs,
             scopeId: scopeId
           }, /*#__PURE__*/React.createElement(SlotParamsBridge, {
             state: state,
             params: params,
             render: r
-          })));
+          }));
         }
       });
       state._render = slotDef === null || slotDef === void 0 ? void 0 : slotDef.render;
@@ -102,13 +106,11 @@ export function useEnhancedSlots(rawSlots, id) {
       });
     });
     return nextSlots;
-  }, [rawSlots, id]);
+  }, [rawSlots, id, parentComRefs, globalTodoInputs]);
 }
 export function ScopedComContextProvider(props) {
   var parent = useAppContext();
   var value = useMemo(function () {
-    // $outputs 与 $inputs 一样：在 scoped 下应当隔离（由 scopedComRefs.current.$outputs 提供）
-    // 如果没有显式传 comRefs，则沿用父级的，但依然带上新的 scopeId
     return _objectSpread(_objectSpread({}, parent), {}, {
       comRefs: props.comRefs || parent.comRefs,
       $scopeId: props.scopeId

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

@@ -1,16 +1,13 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState, useMemo } from 'react';
-import { deepProxy } from "./hooks";
-export function useAppCreateContext() {
-  // 约定：场景级 inputs 统一挂载到 $inputs，避免与组件 runtime 的 inputs 命名冲突
-  // 同时可避免 `Cannot set property 'open' of undefined`
-  // 注册表拆分：
-  // - comRefs: 组件实例/inputs/outputs 注册表（可 scoped）
-  // - $vars/$fxs: 逻辑能力注册表（仅页面级，全作用域共享）
-  var comRefs = useRef(deepProxy({
+import { proxyRefs } from "./hooks";
+var GLOBAL_TODO_POOL = new Map();
+export function useAppCreateContext(id) {
+  var globalTodoInputs = useRef(GLOBAL_TODO_POOL);
+  var comRefs = useRef(proxyRefs({
     $inputs: {},
     $outputs: {}
-  }));
+  }, undefined, globalTodoInputs.current));
   var $vars = useRef({});
   var $fxs = useRef({});
   var _useState = useState({
@@ -24,7 +21,7 @@ export function useAppCreateContext() {
     setPopupState = _useState2[1];
   var appContext = useRef({
     canvas: {
-      id: "u_7VvVn" // 使用 data 中的 id
+      id: id
     },
     runtime: {
       debug: false
@@ -45,6 +42,7 @@ export function useAppCreateContext() {
       comRefs: comRefs,
       $vars: $vars,
       $fxs: $fxs,
+      globalTodoInputs: globalTodoInputs.current,
       appContext: appContext,
       popupState: popupState,
       setPopupState: setPopupState

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

@@ -122,11 +122,11 @@ export var WithCom = function WithCom(props) {
   return show || isPopup ? /*#__PURE__*/React.createElement(View, {
     className: className,
     style: _objectSpread(_objectSpread({}, style), dynamicStyle)
-  }, jsx) : null;
+  }, jsx, props.children) : null;
 };
-export var WithWrapper = function WithWrapper(Component) {
+export var WithWrapper = function WithWrapper(id, Component) {
   return function WrappedComponent(props) {
-    var contextStore = useAppCreateContext();
+    var contextStore = useAppCreateContext(id);
     var setPopupState = contextStore.setPopupState;
     var isPopup = Component.isPopup;
 

package/dist/esm/generate/generateTaroProjectJson.js

@@ -4,6 +4,7 @@ import * as path from "path";
 import { findDir, ensureDir } from "./utils/fileNode";
 import { handleCommonDir } from "./utils/commonDir";
 import { handleTabBarImages } from "./utils/tabBarImages";
+import { handlePageImages } from "./utils/pageImages";
 import { updateAppConfig } from "./utils/appConfig";
 import { genScopedJSModules } from "../utils/logic/genJSModules";
 /**
@@ -47,6 +48,7 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
 
   // 从 assets 中获取 TabBar 图片文件信息
   var imageFiles = assets.tabBarImages || [];
+  var pageImages = assets.pageImages || [];
 
   // 过滤出类型为 normal 的项
   var normalItems = files.filter(function (item) {
@@ -81,7 +83,7 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
     if (item.jsModules && item.jsModules.length > 0) {
       pageChildren.push({
         path: "src/pages/".concat(pageName, "/index.jsModules.ts"),
-        content: genScopedJSModules(item.jsModules, "../../core/mybricks/index", "../../common/jsModulesRuntime")
+        content: genScopedJSModules(item.jsModules, "@/core/mybricks/index", "@/common/jsModulesRuntime")
       });
     }
 
@@ -116,7 +118,7 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
     if (item.jsModules && item.jsModules.length > 0) {
       popupChildren.push({
         path: "src/popupComponents/".concat(popupId, "/index.jsModules.ts"),
-        content: genScopedJSModules(item.jsModules, "../../core/mybricks/index", "../../common/jsModulesRuntime")
+        content: genScopedJSModules(item.jsModules, "@/core/mybricks/index", "@/common/jsModulesRuntime")
       });
     }
     popupComponentsDir.children.push({
@@ -137,6 +139,9 @@ var generateTaroProjectJson = function generateTaroProjectJson(result) {
   // 处理 TabBar 图片文件
   handleTabBarImages(tabbarDir, imageFiles);
 
+  // 处理页面 base64 图片文件（与 tabbar 同级别）
+  handlePageImages(assetsDir, pageImages);
+
   // 替换自定义 Tabbar 配置文件
   var CUSTOM_TAB_BAR_CONFIG_PATH = "src/custom-tab-bar/mybricks/tabbar-config.ts";
   var customTabBarItem = files.find(function (item) {

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

@@ -22,4 +22,19 @@ export function handleCommonDir(commonDir, items) {
       content: fullContent
     });
   }
+
+  // 处理 global
+  var globalItem = items.find(function (item) {
+    return item.type === 'global';
+  });
+  if (globalItem) {
+    var _globalItem$importMan;
+    var _importCode = ((_globalItem$importMan = globalItem.importManager) === null || _globalItem$importMan === void 0 ? void 0 : _globalItem$importMan.toCode()) || '';
+    var _fileContent = globalItem.content || '';
+    var _fullContent = _importCode ? "".concat(_importCode, "\n").concat(_fileContent) : _fileContent;
+    commonDir.children.push({
+      path: 'src/common/global.ts',
+      content: _fullContent
+    });
+  }
 }

package/dist/esm/generate/utils/pageImages.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 页面图片文件处理工具
+ */
+import type { ImageFileInfo } from '../../utils/config/content';
+interface FileNode {
+    path: string;
+    content: string | null;
+    children?: FileNode[];
+}
+/**
+ * 处理页面 base64 图片文件
+ */
+export declare function handlePageImages(assetsDir: FileNode, imageFiles: ImageFileInfo[]): void;
+export {};

package/dist/esm/generate/utils/pageImages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pageImages.d.ts","sourceRoot":"","sources":["pageImages.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,QAAQ,EACnB,UAAU,EAAE,aAAa,EAAE,GAC1B,IAAI,CAON"}

package/dist/esm/generate/utils/pageImages.js

@@ -0,0 +1,15 @@
+/**
+ * 页面图片文件处理工具
+ */
+
+/**
+ * 处理页面 base64 图片文件
+ */
+export function handlePageImages(assetsDir, imageFiles) {
+  imageFiles.forEach(function (imageFile) {
+    assetsDir.children.push({
+      path: imageFile.filePath,
+      content: imageFile.fileContent.toString('base64')
+    });
+  });
+}