@lark-apaas/client-toolkit 1.2.10-alpha.8 → 1.2.10

package/lib/components/AppContainer/utils/childApi.js

@@ -16,6 +16,7 @@ async function getRoutes() {
     return routes;
 }
 async function getSourceMap() {
+    if ('vite' === process.env.BUILD_TOOL) return '';
     let sourceMapContent = '';
     try {
         const basePath = normalizeBasePath(process.env.CLIENT_BASE_PATH);

package/lib/components/ErrorRender/index.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect } from "react";
 import { logger } from "../../logger/index.js";
-import { createApplyHandle, getModuleHot } from "../../utils/module-hot.js";
+import { getHmrApi } from "../../utils/hmr-api.js";
 import { submitPostMessage } from "../../utils/postMessage.js";
 const RenderError = (props)=>{
     const { error, resetErrorBoundary } = props;
@@ -27,16 +27,10 @@ const RenderError = (props)=>{
     ]);
     useEffect(()=>{
         if (!resetErrorBoundary) return;
-        const hot = getModuleHot();
-        if (hot) {
-            const handler = createApplyHandle((success)=>{
-                if (success) resetErrorBoundary();
-            });
-            hot.addStatusHandler(handler);
-            return ()=>{
-                hot.removeStatusHandler(handler);
-            };
-        }
+        const hmr = getHmrApi();
+        if (hmr) return hmr.onSuccess(()=>{
+            resetErrorBoundary();
+        });
     }, [
         resetErrorBoundary
     ]);

package/lib/components/User/UserSelect.js

@@ -67,20 +67,8 @@ const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholde
         if (!normalizedIds.length) return void setUiValue(void 0);
         const fetchProfiles = async ()=>{
             try {
-                const ids = normalizedIds.map((id)=>Number(id)).filter((id)=>Number.isFinite(id));
-                if (!ids.length) {
-                    const profiles = normalizedIds.map((id)=>inputProfilesMap.get(id) ?? {
-                            user_id: id,
-                            name: '',
-                            avatar: '',
-                            email: '',
-                            status: 1
-                        });
-                    setUiValue('single' === mode ? profiles[0] : profiles);
-                    return;
-                }
                 const dataloom = await getDataloom();
-                const response = await dataloom.service.user.getByIds(ids);
+                const response = await dataloom.service.user.getByIds(normalizedIds);
                 const fetchedList = Array.isArray(response?.data) ? response?.data : Array.isArray(response?.data?.user_list) ? response?.data?.user_list : [];
                 const fetchedMap = new Map();
                 fetchedList.forEach((profile)=>{

package/lib/logger/intercept-global-error.js

@@ -1,4 +1,4 @@
-import { createApplyHandle, getModuleHot } from "../utils/module-hot.js";
+import { getHmrApi } from "../utils/hmr-api.js";
 import { submitPostMessage, submitSlardarEvent } from "../utils/postMessage.js";
 import { levelSchema } from "./log-types.js";
 import { logger } from "./logger.js";
@@ -63,26 +63,28 @@ function processDevServerLog(log) {
     }
 }
 function listenModuleHmr() {
-    const hot = getModuleHot();
-    if (hot) hot.addStatusHandler(createApplyHandle((success, status)=>{
-        if (success) submitPostMessage({
-            type: 'DevServerMessage',
-            data: {
-                type: 'devServer-status',
-                status: 'hmr-apply-success'
-            }
+    const hmr = getHmrApi();
+    if (hmr) {
+        hmr.onSuccess(()=>{
+            submitPostMessage({
+                type: 'DevServerMessage',
+                data: {
+                    type: 'devServer-status',
+                    status: 'hmr-apply-success'
+                }
+            });
         });
-        else {
-            console.warn('hmr apply failed', status);
+        hmr.onError((error)=>{
+            console.warn('hmr apply failed', error);
             submitSlardarEvent({
                 name: 'sandbox-devServer',
                 categories: {
                     type: 'hmr-apply-failed',
-                    status
+                    error: String(error)
                 }
             });
-        }
-    }));
+        });
+    }
 }
 function interceptErrors() {
     window.addEventListener('error', (event)=>{

package/lib/logger/log-types.d.ts

@@ -1,7 +1,7 @@
 import z from 'zod';
 export declare const networkRequestLogSchema: z.ZodObject<{
     method: z.ZodString;
-    status: z.ZodInt;
+    status: z.ZodNumber;
     statusText: z.ZodString;
     path: z.ZodString;
     requestData: z.ZodOptional<z.ZodUnknown>;
@@ -27,11 +27,11 @@ export declare const logStackFrameSchema: z.ZodObject<{
     columnNumber: z.ZodNumber;
 }, z.core.$strip>;
 export declare const levelSchema: z.ZodEnum<{
+    error: "error";
     success: "success";
     debug: "debug";
     info: "info";
     warn: "warn";
-    error: "error";
 }>;
 export declare const logMeta: z.ZodObject<{
     stacktrace: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -52,11 +52,11 @@ export declare const logMeta: z.ZodObject<{
 export declare const selectedLogSchema: z.ZodObject<{
     type: z.ZodLiteral<"typedLogV2">;
     level: z.ZodEnum<{
+        error: "error";
         success: "success";
         debug: "debug";
         info: "info";
         warn: "warn";
-        error: "error";
     }>;
     id: z.ZodString;
     args: z.ZodArray<z.ZodUnknown>;
@@ -80,11 +80,11 @@ export declare const selectedLogSchema: z.ZodObject<{
 export type LogLevel = z.infer<typeof levelSchema>;
 export declare const logWithMetaSchema: z.ZodObject<{
     level: z.ZodEnum<{
+        error: "error";
         success: "success";
         debug: "debug";
         info: "info";
         warn: "warn";
-        error: "error";
     }>;
     args: z.ZodArray<z.ZodUnknown>;
     meta: z.ZodOptional<z.ZodObject<{

package/lib/logger/log-types.js

@@ -1,7 +1,7 @@
 import zod from "zod";
 const networkRequestLogSchema = zod.object({
     method: zod.string(),
-    status: zod.int(),
+    status: zod.number().int(),
     statusText: zod.string(),
     path: zod.string(),
     requestData: zod.optional(zod.unknown()),

package/lib/theme-layer.css

@@ -1,3 +1,4 @@
 @layer theme, base, antd, components, utilities;
-@import "tailwindcss";
+@import 'tailwindcss' source(none);
+@source "../**/*.{js,jsx,ts,tsx}";
 

package/lib/utils/hmr-api.d.ts

@@ -0,0 +1,39 @@
+/**
+ * 统一 HMR API
+ *
+ * 提供统一的 HMR 成功/失败回调接口，屏蔽 Webpack 和 Vite 的差异。
+ *
+ * - Webpack/Rspack: 通过 import.meta.webpackHot 或 module.hot
+ * - Vite: 通过 error-overlay 注入的 window.__VITE_HMR__
+ *
+ * @see docs/RFC_HMR_API.md
+ */
+export interface HmrApi {
+    /**
+     * 注册 HMR 成功回调
+     * @param callback 成功回调函数
+     * @returns cleanup 函数，用于取消注册
+     */
+    onSuccess(callback: () => void): () => void;
+    /**
+     * 注册 HMR 失败回调
+     * @param callback 失败回调函数，参数为错误信息
+     * @returns cleanup 函数，用于取消注册
+     */
+    onError(callback: (error: unknown) => void): () => void;
+}
+declare global {
+    interface Window {
+        __VITE_HMR__?: HmrApi;
+    }
+}
+/**
+ * 获取 HMR API 实例
+ *
+ * 自动检测当前构建工具（Webpack/Vite）并返回对应实现：
+ * - Webpack/Rspack: 使用内置适配器
+ * - Vite: 使用 error-overlay 注入的 window.__VITE_HMR__
+ *
+ * @returns HmrApi 实例，如果不在开发环境或不支持 HMR 则返回 null
+ */
+export declare function getHmrApi(): HmrApi | null;

package/lib/utils/hmr-api.js

@@ -0,0 +1,36 @@
+function createWebpackHmrApi(hot) {
+    return {
+        onSuccess (callback) {
+            let lastStatus = null;
+            const handler = (status)=>{
+                if ('idle' === status && 'apply' === lastStatus) try {
+                    callback();
+                } catch (e) {
+                    console.error('[HMR] Success callback error:', e);
+                }
+                lastStatus = status;
+            };
+            hot.addStatusHandler(handler);
+            return ()=>hot.removeStatusHandler(handler);
+        },
+        onError (callback) {
+            const handler = (status)=>{
+                if ('fail' === status || 'abort' === status) try {
+                    callback(new Error(`HMR ${status}`));
+                } catch (e) {
+                    console.error('[HMR] Error callback error:', e);
+                }
+            };
+            hot.addStatusHandler(handler);
+            return ()=>hot.removeStatusHandler(handler);
+        }
+    };
+}
+function getHmrApi() {
+    if ('production' === process.env.NODE_ENV) return null;
+    if (import.meta.webpackHot) return createWebpackHmrApi(import.meta.webpackHot);
+    'undefined' != typeof module && module.hot;
+    if (window.__VITE_HMR__) return window.__VITE_HMR__;
+    return null;
+}
+export { getHmrApi };

package/lib/utils/module-hot.d.ts

@@ -10,16 +10,20 @@
  * - abort: An update was aborted, but the system is still in its previous state
  * - fail: An update has thrown an exception and the system's state has been compromised
  */
-type ModuleHotType = 'idle' | 'check' | 'prepare' | 'ready' | 'dispose' | 'apply' | 'abort' | 'fail';
-interface ModuleHotInstance {
+export type ModuleHotType = 'idle' | 'check' | 'prepare' | 'ready' | 'dispose' | 'apply' | 'abort' | 'fail';
+export interface ModuleHotInstance {
     addStatusHandler: (handler: (status: ModuleHotType) => void) => void;
     removeStatusHandler: (handler: (status: ModuleHotType) => void) => void;
 }
+/**
+ * 获取 Webpack HMR 实例
+ * 仅支持 Webpack/Rspack 的 HMR API
+ */
 export declare function getModuleHot(): ModuleHotInstance | null;
 /**
  * 创建模块热更成功处理函数
- * 监听模块热更状态，当状态为apply时，调用回调函数并传入true
- * @param callback 热更成功回调函数，参数为是否成功
+ * 监听模块热更状态，检测 apply -> idle 转换表示热更成功
+ *
+ * @param callback 热更回调函数，参数为是否成功和当前状态
  */
 export declare function createApplyHandle(callback: (success: boolean, status: ModuleHotType) => void): (status: ModuleHotType) => void;
-export {};

package/lib/utils/module-hot.js

@@ -1,22 +1,21 @@
 function getModuleHot() {
     if ('production' === process.env.NODE_ENV) return null;
-    return import.meta.webpackHot || module.hot;
+    if (import.meta.webpackHot) return import.meta.webpackHot;
+    'undefined' != typeof module && module.hot;
+    return null;
 }
 function createApplyHandle(callback) {
-    let hasApply = false;
+    let lastStatus = null;
     return (status)=>{
         if ('fail' === status || 'abort' === status) {
-            hasApply = false;
+            lastStatus = status;
             return callback(false, status);
         }
-        if (hasApply) {
-            if ('idle' === status) {
-                hasApply = false;
-                callback(true, status);
-            }
-            return;
+        if ('idle' === status && 'apply' === lastStatus) {
+            lastStatus = status;
+            return callback(true, status);
         }
-        hasApply = 'apply' === status;
+        lastStatus = status;
     };
 }
 export { createApplyHandle, getModuleHot };

package/lib/utils/requestManager.js

@@ -4,9 +4,7 @@ async function fetchUserProfilesByIds(ids) {
     try {
         const dataloom = await getDataloom();
         if (!dataloom) throw new Error('Dataloom client is unavailable');
-        const numericIds = ids.map(Number).filter(Number.isFinite);
-        if (0 === numericIds.length) return [];
-        const response = await dataloom.service.user.getByIds(numericIds);
+        const response = await dataloom.service.user.getByIds(ids);
         return Array.isArray(response?.data) ? response.data : response?.data?.user_list || [];
     } catch (error) {
         console.error(`Failed to fetch profiles for user IDs ${ids.join(', ')}:`, error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.10-alpha.8",
+  "version": "1.2.10",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -93,10 +93,10 @@
   "dependencies": {
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
-    "@data-loom/js": "0.4.4-alpha.12",
+    "@data-loom/js": "0.4.4",
     "@lark-apaas/auth-sdk": "^0.1.0",
     "@lark-apaas/client-capability": "^0.1.3",
-    "@lark-apaas/miaoda-inspector": "^1.0.13",
+    "@lark-apaas/miaoda-inspector": "^1.0.14",
     "@lark-apaas/observable-web": "^1.0.1",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",