@lark-apaas/client-toolkit 1.2.54-alpha.6 → 1.2.54-alpha.8

package/lib/integrations/dataloom.d.ts

@@ -1,4 +1,4 @@
-declare const createDataLoomClient: () => import("@lark-apaas/dataloom").DataloomClient;
+declare const createDataLoomClient: (url?: string, pat?: string) => import("@lark-apaas/dataloom").DataloomClient;
 /** 获取dataloom实例 */
 export declare function getDataloom(): Promise<ReturnType<typeof createDataLoomClient>>;
 export {};

package/lib/integrations/dataloom.js

@@ -1,10 +1,14 @@
+import { splitWorkspaceUrl } from "../utils/url.js";
 import { createClient } from "@lark-apaas/dataloom";
 import { authClient } from "@lark-apaas/auth-sdk";
 import { getAppId } from "../utils/getAppId.js";
-import { getInitialInfo } from "../utils/getInitialInfo.js";
-const createDataLoomClient = ()=>{
+import { getAppPublished } from "../utils/getInitialInfo.js";
+const createDataLoomClient = (url, pat)=>{
+    const { baseUrl } = url ? splitWorkspaceUrl(url) : {
+        baseUrl: ''
+    };
     const appId = getAppId();
-    return createClient({
+    return createClient(baseUrl, pat, {
         global: {
             enableDataloomLog: 'production' !== process.env.NODE_ENV,
             requestRateLimit: 'production' !== process.env.NODE_ENV ? 100 : void 0,
@@ -22,8 +26,10 @@ let pendingPromise = null;
 function getDataloom() {
     if (dataloom) return Promise.resolve(dataloom);
     if (pendingPromise) return pendingPromise;
-    pendingPromise = getInitialInfo().then(()=>{
-        dataloom = createDataLoomClient();
+    pendingPromise = getAppPublished().then((info)=>{
+        const DATALOOM_CLIENT_URL = info?.app_runtime_extra?.url;
+        const DATALOOM_PAT = info?.app_runtime_extra?.token;
+        dataloom = createDataLoomClient(DATALOOM_CLIENT_URL, DATALOOM_PAT);
         return dataloom;
     }).finally(()=>{
         pendingPromise = null;

package/lib/integrations/services/types.d.ts

@@ -6,6 +6,15 @@ export type I18nText = {
 export type DepartmentBasic = {
     departmentID: string;
     name: I18nText;
+    /** 飞书部门 open id（od- 开头），调飞书部门能力时使用 */
+    openDepartmentID?: string;
+};
+/** 直属上级 / 虚线上级，仅在 needFullFields 时返回 */
+export type LeaderUser = {
+    /** 飞书企业内 user_id */
+    employeeID?: string;
+    /** 妙搭用户全局唯一 ID */
+    miaodaUserID?: string;
 };
 export type UserInfo = {
     userID: string;
@@ -16,11 +25,32 @@ export type UserInfo = {
     department: DepartmentBasic;
     email?: string;
     tenantName?: string;
+    /** 妙搭用户全局唯一 ID（来源同 userID，向前兼容别名） */
+    miaodaUserID?: string;
+    /** 飞书企业内 user_id，仅内部飞书用户；调飞书开放平台能力时使用 */
+    employeeID?: string;
+    /** 飞书用户全局唯一 ID（来源同 larkUserID 别名） */
+    larkID?: string;
+    nickname?: string;
+    mobile?: string;
+    gender?: number;
+    country?: string;
+    workStation?: string;
+    employeeNo?: string;
+    city?: string;
+    jobTitle?: string;
+    employeeType?: number;
+    /** 直属上级 */
+    leader?: LeaderUser;
+    /** 虚线上级 */
+    dottedLineLeaders?: LeaderUser[];
 };
 export type DepartmentInfo = {
     departmentID: string;
     larkDepartmentID: string;
     name: I18nText;
+    /** 飞书部门 open id（od- 开头） */
+    openDepartmentID?: string;
 };
 export type AccountType = 'apaas' | 'lark';
 export type SearchAvatar = {
@@ -35,6 +65,8 @@ export type SearchUsersParams = {
     offset?: number;
     pageSize?: number;
     searchExternalContact?: boolean;
+    /** 是否返回 full 字段（手机号/职位/上级等），默认 false */
+    needFullFields?: boolean;
 };
 export type SearchUsersResponse = {
     data: {
@@ -75,6 +107,8 @@ export type SearchDepartmentsResponse = {
 export type ChatInfo = {
     /** 群组 ID */
     chatID: string;
+    /** 飞书群组 open id（oc_ 开头），调飞书群组能力时使用 */
+    openChatID?: string;
     /** 群组名称（国际化文本） */
     name: I18nText;
     /** 头像：URL 或 16 进制 RGB 颜色 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.54-alpha.6",
+  "version": "1.2.54-alpha.8",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -100,9 +100,9 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@lark-apaas/aily-web-sdk": "^0.0.11",
-    "@lark-apaas/auth-sdk": "^0.1.5",
+    "@lark-apaas/auth-sdk": "0.1.6-alpha.0",
     "@lark-apaas/client-capability": "^0.1.7",
-    "@lark-apaas/dataloom": "0.1.4-alpha.9",
+    "@lark-apaas/dataloom": "^0.1.3",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
     "@lark-apaas/observable-web": "^1.0.6",

package/lib/integrations/__test__/dataloom.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/integrations/__test__/dataloom.test.js

@@ -1,83 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { getDataloom } from "../dataloom.js";
-const { getInitialInfoMock, getAppPublishedMock, getAppIdMock, createClientMock, authUserMock, authSessionMock } = vi.hoisted(()=>({
-        getInitialInfoMock: vi.fn(),
-        getAppPublishedMock: vi.fn(),
-        getAppIdMock: vi.fn(),
-        createClientMock: vi.fn(),
-        authUserMock: {},
-        authSessionMock: {}
-    }));
-vi.mock('../../utils/getInitialInfo', ()=>({
-        getInitialInfo: getInitialInfoMock,
-        getAppPublished: getAppPublishedMock
-    }));
-vi.mock('../../utils/getAppId', ()=>({
-        getAppId: getAppIdMock
-    }));
-vi.mock('@lark-apaas/dataloom', ()=>({
-        createClient: createClientMock
-    }));
-vi.mock('@lark-apaas/auth-sdk', ()=>({
-        authClient: {
-            user: authUserMock,
-            session: authSessionMock
-        }
-    }));
-beforeEach(()=>{
-    getInitialInfoMock.mockReset();
-    getAppPublishedMock.mockReset();
-    getAppIdMock.mockReset();
-    createClientMock.mockReset();
-});
-afterEach(()=>{
-    vi.restoreAllMocks();
-});
-describe('getDataloom', ()=>{
-    it('返回-createClient实例-改用getInitialInfo-新签名不取token/url-appId注入-并发去重-缓存复用', async ()=>{
-        getAppIdMock.mockReturnValue('app-1');
-        getInitialInfoMock.mockResolvedValue({
-            app_runtime_extra: {
-                token: 'pat',
-                url: 'https://x'
-            }
-        });
-        const client = {
-            __id: 'client-1'
-        };
-        createClientMock.mockReturnValue(client);
-        const p1 = getDataloom();
-        const p2 = getDataloom();
-        expect(p1).toBe(p2);
-        const [c1, c2] = await Promise.all([
-            p1,
-            p2
-        ]);
-        expect(c1).toBe(client);
-        expect(c2).toBe(client);
-        expect(getInitialInfoMock).toHaveBeenCalledTimes(1);
-        expect(getAppPublishedMock).not.toHaveBeenCalled();
-        expect(createClientMock).toHaveBeenCalledTimes(1);
-        const args = createClientMock.mock.calls[0];
-        expect(args).toHaveLength(1);
-        const options = args[0];
-        expect(typeof options).toBe('object');
-        expect(options).not.toBe('https://x');
-        expect(options).not.toBe('pat');
-        expect(options.global).toBeDefined();
-        expect(options.global).not.toHaveProperty('url');
-        expect(options.global).not.toHaveProperty('key');
-        expect(options.global?.appId).toBe('app-1');
-        expect(options.global?.accountServices).toEqual({
-            user: authUserMock,
-            session: authSessionMock
-        });
-        const cached1 = await getDataloom();
-        const cached2 = await getDataloom();
-        expect(cached1).toBe(client);
-        expect(cached2).toBe(client);
-        expect(cached1).toBe(cached2);
-        expect(getInitialInfoMock).toHaveBeenCalledTimes(1);
-        expect(createClientMock).toHaveBeenCalledTimes(1);
-    });
-});