@cloudbase/js-sdk 3.8.2-beta.0 → 3.8.2-beta.2

package/auth/dist/type.d.ts

@@ -0,0 +1,295 @@
+import type { authModels, OAUTH_TYPE } from '@cloudbase/js-sdk/oauth';
+import { AuthError, AuthErrorCategory, AuthErrorCode } from '@cloudbase/js-sdk/oauth';
+export { AuthErrorCategory, AuthErrorCode };
+export type AuthResult<D extends object> = {
+    data: D;
+    error: null;
+} | {
+    data: {
+        [K in keyof D]: null;
+    };
+    error: AuthError;
+};
+export interface SignInAnonymouslyCredentials {
+    provider_token?: string;
+}
+export type SignInAnonymouslyReq = SignInAnonymouslyCredentials;
+export declare type User = {
+    id: any;
+    aud: string;
+    role: string[];
+    email: any;
+    email_confirmed_at: string;
+    phone: any;
+    phone_confirmed_at: string;
+    confirmed_at: string;
+    last_sign_in_at: string;
+    app_metadata: {
+        provider: any;
+        providers: any[];
+    };
+    user_metadata: {
+        name: any;
+        picture: any;
+        username: any;
+        gender: any;
+        locale: any;
+        uid: any;
+        nickName: any;
+        avatarUrl: any;
+        location: any;
+        hasPassword: any;
+    };
+    identities: any;
+    created_at: string;
+    updated_at: string;
+    is_anonymous: boolean;
+};
+export declare type Session = {
+    access_token?: string;
+    refresh_token?: string;
+    expires_in?: number;
+    token_type?: string;
+    user: User;
+};
+export type SignInWithPasswordCredentials = PasswordCredentialsBase & {
+    is_encrypt?: boolean;
+    options?: {
+        is_encrypt?: boolean;
+        captchaToken?: string;
+    };
+};
+export type PasswordCredentialsBase = {
+    email: string;
+    password: string;
+} | {
+    phone: string;
+    password: string;
+} | {
+    username: string;
+    password: string;
+};
+export type SignInWithPasswordReq = SignInWithPasswordCredentials;
+export type CommonRes = AuthResult<{}>;
+export type SignInRes = AuthResult<{
+    user?: User | null;
+    session?: Session | null;
+}>;
+export type AuthResponse = SignInRes;
+export type AuthTokenResponsePassword = SignInRes;
+export type GetUserRes = AuthResult<{
+    user?: User | null;
+}>;
+export type UserResponse = GetUserRes;
+export interface UpdateUserVerifyOtpParams {
+    email?: string;
+    phone?: string;
+    token: string | number;
+}
+declare type UpdateUserVerifyCallback = (params: UpdateUserVerifyOtpParams) => Promise<GetUserRes>;
+export type UpdateUserWithVerificationRes = AuthResult<{
+    verifyOtp?: UpdateUserVerifyCallback;
+    messageId?: string;
+}>;
+export interface SignInWithIdTokenReq {
+    provider?: string;
+    token: string;
+}
+export interface SignInWithOAuthCredentials {
+    provider: string;
+    options?: {
+        redirectTo?: string;
+        skipBrowserRedirect?: boolean;
+        state?: string;
+        queryParams?: Record<string, string>;
+        type?: (typeof OAUTH_TYPE)[keyof typeof OAUTH_TYPE];
+    };
+}
+export type SignInWithOAuthReq = SignInWithOAuthCredentials;
+export type SignInOAuthRes = AuthResult<{
+    url?: string | null;
+    provider?: string | null;
+    scopes?: string;
+}>;
+export type OAuthResponse = SignInOAuthRes;
+export type GetClaimsRes = AuthResult<{
+    claims?: {
+        iss: string;
+        sub: string;
+        aud: string;
+        exp: number;
+        iat: number;
+        at_hash: string;
+        name: string;
+        picture?: string;
+        email?: string;
+        phone_number?: string;
+        scope: string;
+        project_id: string;
+        provider?: string;
+        provider_type?: string;
+        groups?: string[];
+        meta?: {
+            wxOpenId?: string;
+            wxUnionId?: string;
+        };
+        user_id: string;
+        roles: string[];
+        user_type: string;
+        client_type: string;
+        is_system_admin: boolean;
+    };
+    header?: {
+        alg: string;
+        kid: string;
+    };
+    signature?: string | null;
+}>;
+export interface UserAttributes extends authModels.ModifyUserBasicInfoRequest {
+    email?: string;
+    phone?: string;
+    username?: string;
+    description?: string;
+    avatar_url?: string;
+    nickname?: string;
+    gender?: 'MALE' | 'FEMALE';
+    password?: never;
+    new_password?: never;
+}
+export type UpdateUserReq = UserAttributes;
+export type GetUserIdentitiesRes = AuthResult<{
+    identities?: Array<{
+        id: string;
+        name: string;
+        picture: string;
+    }> | null;
+}>;
+export interface LinkIdentityReq {
+    provider: string;
+}
+export interface UnlinkIdentityReq {
+    provider: string;
+}
+export type LinkIdentityRes = AuthResult<{
+    provider?: string | null;
+    type?: (typeof OAUTH_TYPE)[keyof typeof OAUTH_TYPE];
+}>;
+export declare type OnAuthStateChangeEvent = 'SIGNED_OUT' | 'SIGNED_IN' | 'INITIAL_SESSION' | 'PASSWORD_RECOVERY' | 'TOKEN_REFRESHED' | 'USER_UPDATED' | 'BIND_IDENTITY';
+export declare type OnAuthStateChangeCallback = (event: OnAuthStateChangeEvent, session: Session, info?: Record<string, any>) => void;
+export type MobileOtpType = 'sms' | 'phone_change' | (string & {});
+export type EmailOtpType = 'signup' | 'invite' | 'magiclink' | 'recovery' | 'email_change' | 'email' | (string & {});
+export interface VerifyMobileOtpParams {
+    phone: string;
+    token: string | number;
+    type?: MobileOtpType | EmailOtpType;
+    messageId?: string;
+}
+export interface VerifyEmailOtpParams {
+    email: string;
+    token: string | number;
+    type?: MobileOtpType | EmailOtpType;
+    messageId?: string;
+}
+export type VerifyOtpParams = VerifyMobileOtpParams | VerifyEmailOtpParams;
+export type VerifyOtpReq = VerifyOtpParams;
+export type SignInWithPasswordlessCredentials = {
+    email: string;
+    options?: {
+        shouldCreateUser?: boolean;
+        emailRedirectTo?: string;
+        captchaToken?: string;
+    };
+} | {
+    phone: string;
+    options?: {
+        shouldCreateUser?: boolean;
+        captchaToken?: string;
+    };
+};
+export type SignInWithOtpReq = SignInWithPasswordlessCredentials;
+export interface VerifyOtpCallbackParams {
+    token: string | number;
+    messageId?: string;
+}
+declare type OtpCallback = (params: VerifyOtpCallbackParams) => Promise<SignInRes>;
+export type SignInWithOtpRes = AuthResult<{
+    user?: User | null;
+    session?: Session | null;
+    verifyOtp?: OtpCallback;
+}>;
+export type AuthOtpResponse = SignInWithOtpRes;
+export type SignUpRes = AuthResult<{
+    user?: User;
+    session?: Session;
+    verifyOtp?: OtpCallback;
+}>;
+export type SignUpWithPasswordCredentials = {
+    email: string;
+    password?: string;
+    options?: {
+        data?: Record<string, any>;
+        emailRedirectTo?: string;
+        captchaToken?: string;
+    };
+} | {
+    phone: string;
+    password?: string;
+    options?: {
+        data?: Record<string, any>;
+        channel?: 'sms' | 'whatsapp';
+        captchaToken?: string;
+    };
+};
+export interface ResendParamsBase {
+    type: 'signup' | 'email_change' | 'phone_change' | 'sms';
+}
+export type ResendParams = {
+    type?: 'signup' | 'email_change';
+    email: string;
+    phone?: never;
+} | {
+    type?: 'sms' | 'phone_change';
+    phone: string;
+    email?: never;
+};
+export type ResendReq = ResendParams;
+export type ResendRes = AuthResult<{
+    messageId?: string | null;
+}>;
+export interface GetAccessTokenRes {
+    accessToken: string;
+    env: string;
+}
+export interface VerifyOAuthReq {
+    code?: string;
+    state?: string;
+    provider?: string;
+}
+export interface UpdateUserAttributes {
+    nonce: string;
+    password: string;
+}
+export type ResetPasswordForEmailRes = AuthResult<{
+    updateUser?: ((attributes: UpdateUserAttributes) => Promise<SignInRes>) | null;
+}>;
+export type ReauthenticateRes = AuthResult<{
+    updateUser?: ((attributes: UpdateUserAttributes) => Promise<SignInRes>) | null;
+}>;
+export interface SetSessionReq {
+    access_token: string;
+    refresh_token: string;
+}
+export interface DeleteMeReq {
+    password: string;
+}
+export interface ResetPasswordForOldReq {
+    old_password: string;
+    new_password: string;
+}
+export type VerifyOAuthRes = AuthResult<{
+    user?: User;
+    session?: Session;
+    redirectUrl?: string;
+    provider?: string;
+    type?: (typeof OAUTH_TYPE)[keyof typeof OAUTH_TYPE];
+}>;

package/auth/dist/utilities.d.ts

@@ -0,0 +1,7 @@
+export { printWarn, throwError } from '@cloudbase/js-sdk/utilities/dist/cjs/libs/util';
+export { ERRORS, COMMUNITY_SITE_URL } from '@cloudbase/js-sdk/utilities/dist/cjs/constants/index';
+export { catchErrorsDecorator } from '@cloudbase/js-sdk/utilities/dist/cjs/helpers/index';
+export { CloudbaseEventEmitter } from '@cloudbase/js-sdk/utilities/dist/cjs/libs/events';
+export { CloudbaseCache } from '@cloudbase/js-sdk/utilities/dist/cjs/libs/cache';
+export { default as adapterForWxMp } from '@cloudbase/adapter-wx_mp';
+export { useDefaultAdapter } from '@cloudbase/js-sdk/utilities/dist/cjs/adapters/index';

package/auth/dist/utils.d.ts

@@ -0,0 +1,5 @@
+export declare function saveToBrowserSession(key: string, value: Record<string, any>): void;
+export declare function getBrowserSession(key: string): any;
+export declare function removeBrowserSession(key: string): boolean;
+export declare function addUrlSearch(search: Location['search'], hash?: Location['hash']): string;
+export declare function removeUrlParams(params: string[]): void;

package/auth/dist/v1-compat.d.ts

@@ -0,0 +1,77 @@
+import type { authModels } from '@cloudbase/js-sdk/oauth';
+import type { SignUpRes } from './type';
+export declare class WeixinAuthProvider {
+    constructor(_options: {
+        authInstance: any;
+        appid: string;
+        scope: string;
+    });
+    signInWithRedirect(): void;
+    getRedirectResult(_options?: {
+        createUser?: boolean;
+        syncUserInfo?: boolean;
+    }): Promise<any>;
+    getLinkRedirectResult(_options?: {
+        withUnionId?: boolean;
+    }): Promise<void>;
+}
+export declare class CustomAuthProvider {
+    private authInstance;
+    constructor(options: {
+        authInstance: any;
+    });
+    signIn(ticket: string): Promise<void>;
+}
+export declare class AnonymousAuthProvider {
+    private authInstance;
+    constructor(options: {
+        authInstance: any;
+    });
+    signIn(): Promise<void>;
+}
+export declare abstract class AuthV1Compat {
+    abstract readonly config: any;
+    weixinAuthProvider(options: {
+        appid: string;
+        scope: string;
+    }): WeixinAuthProvider;
+    customAuthProvider(): CustomAuthProvider;
+    anonymousAuthProvider(): AnonymousAuthProvider;
+    signUpWithEmailAndPassword(email: string, password: string): Promise<SignUpRes>;
+    signInWithEmailAndPassword(email: string, password: string): Promise<any>;
+    sendPasswordResetEmail(email: string): Promise<void>;
+    signInWithUsernameAndPassword(username: string, password: string): Promise<any>;
+    sendPhoneCode(phoneNumber: string): Promise<boolean>;
+    signUpWithPhoneCode(phoneNumber: string, phoneCode: string, password?: string): Promise<any>;
+    signInWithPhoneCodeOrPassword(params: {
+        phoneNumber: string;
+        phoneCode?: string;
+        password?: string;
+    }): Promise<any>;
+    forceResetPwdByPhoneCode(params: {
+        phoneNumber: string;
+        phoneCode: string;
+        password: string;
+    }): Promise<any>;
+    shouldRefreshAccessToken(_callback: () => boolean): void;
+    onLoginStateExpired(callback: Function): void;
+    onAccessTokenRefreshed(callback: Function): void;
+    onAnonymousConverted(callback: Function): void;
+    onLoginTypeChanged(callback: Function): void;
+    abstract signIn(params: authModels.SignInRequest): Promise<any>;
+    abstract signUp(params: authModels.SignUpRequest & {
+        phone?: string;
+    }): Promise<SignUpRes>;
+    abstract signInWithCustomTicket(getTickFn?: authModels.GetCustomSignTicketFn): Promise<any>;
+    abstract signInAnonymously(params: any): Promise<any>;
+    abstract getVerification(params: any, options?: any): Promise<authModels.GetVerificationResponse>;
+    abstract resetPassword(params: authModels.ResetPasswordRequest): Promise<void>;
+    abstract onLoginStateChanged(callback: Function): Promise<void>;
+    abstract onAuthStateChange(callback: any): any;
+    abstract createLoginState(params?: any, options?: any): Promise<any>;
+    abstract signInWithOAuth(params: any): Promise<any>;
+    abstract grantProviderToken(params: authModels.GrantProviderTokenRequest): Promise<authModels.GrantProviderTokenResponse>;
+    abstract bindWithProvider(params: authModels.BindWithProviderRequest): Promise<void>;
+    protected abstract formatPhone(phone: string): string;
+}
+export declare function applyUserV1Compat(UserClass: any): void;

package/cloudrun/dist/index.d.ts

@@ -1 +1,4 @@
-export * from '@cloudbase/cloudrun';
+import { ICloudbase } from '@cloudbase/js-sdk/types';
+import { ICallFunctionOptions, ICustomReqOpts } from '@cloudbase/js-sdk/types/functions';
+export declare function requestContainer(this: any, options: ICallFunctionOptions, customReqOpts?: ICustomReqOpts): Promise<any>;
+export declare function registerCloudrun(app: Pick<ICloudbase, 'registerComponent'>): void;

package/container/dist/constants/index.d.ts

@@ -0,0 +1 @@
+export declare const COMPONENT_NAME = "container";

package/container/dist/go_wams_exec.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/container/dist/index.d.ts

@@ -1,2 +1,13 @@
-import { ICloudbase } from '@cloudbase/types';
-export declare const registerContainers: (app: ICloudbase) => void;
+import { ICloudbase } from '@cloudbase/js-sdk/types';
+import { ICallContainerOptions, IContianerConfig } from '@cloudbase/js-sdk/types/container';
+export declare let t: (str: any) => any;
+export declare class CloudbaseContainers {
+    private readonly config;
+    private wasm;
+    private containerInitPromise;
+    private defaultHeaders;
+    constructor(config: IContianerConfig);
+    callContainer(options: ICallContainerOptions, callback?: Function): Promise<any>;
+    initContainer(config: Omit<IContianerConfig, 'wasmUrl' | 'jsUrl'>): Promise<any>;
+}
+export declare function registerContainers(app: Pick<ICloudbase, 'registerComponent'>): void;

package/container/dist/utils/index.d.ts

@@ -0,0 +1,3 @@
+export declare function parseURL(_url: string): HTMLAnchorElement | URL;
+export declare function isBuffer(buf: any): boolean;
+export declare function serializeRequestBody<T>(headers: any, data: T, method?: string): T | string;

package/container/dist/utils/loader.d.ts

@@ -0,0 +1,8 @@
+export declare function getExportFunction(url: any, module: any, mode?: string): Promise<WebAssembly.Exports | {
+    callContainer: any;
+    initContainer: any;
+}>;
+export declare function loadJSExportFunction(config?: {
+    vm: string;
+    vender?: string;
+}): Promise<any>;

package/container/dist/utils/request.d.ts

@@ -0,0 +1,12 @@
+interface IRequestPorps {
+    url: string;
+    data?: string | object | ArrayBuffer;
+    header?: Record<string, string>;
+    timeout?: number;
+    method?: string;
+    dataType?: 'json' | string;
+    responseType?: 'text' | 'arrayBuffer';
+    mode?: 'cors' | 'no-cors' | 'same-origin';
+}
+export declare function request({ url, method, header, data, timeout, dataType, responseType, mode, }: IRequestPorps): Promise<any>;
+export {};

package/core.d.ts

@@ -35,92 +35,93 @@ declare namespace cloudbase {
   }
 
   // ===== 外部依赖类型别名（内联 import 类型，避免顶层 import 使本文件成为模块）=====
-  type OrmClient = import('@cloudbase/model').OrmClient
-  type OrmRawQueryClient = import('@cloudbase/model').OrmRawQueryClient
-  type IMySqlClient = import('@cloudbase/mysql').IMySqlClient
-  type AI = import('@cloudbase/ai').AI
+  type OrmClient = import('@cloudbase/js-sdk/model').OrmClient
+  type OrmRawQueryClient = import('@cloudbase/js-sdk/model').OrmRawQueryClient
+  type IMySqlClient = import('@cloudbase/js-sdk/mysql').IMySqlClient
+  type AI = import('@cloudbase/js-sdk/ai').AI
   type CloudbaseAdapter = import('@cloudbase/adapter-interface').CloudbaseAdapter
   type ResponseObject = import('@cloudbase/adapter-interface').ResponseObject
-  type ICloudbaseUpgradedConfig = import('@cloudbase/types').ICloudbaseUpgradedConfig
-  type ICloudbase = import('@cloudbase/types').ICloudbase
-  type Persistence = import('@cloudbase/types').Persistence
-  type LANGS = import('@cloudbase/types').LANGS
-  type ICustomReqOpts = import('@cloudbase/types/functions').ICustomReqOpts
+  type ICloudbaseUpgradedConfig = import('@cloudbase/js-sdk/types').ICloudbaseUpgradedConfig
+  type ICloudbase = import('@cloudbase/js-sdk/types').ICloudbase
+  type Persistence = import('@cloudbase/js-sdk/types').Persistence
+  type LANGS = import('@cloudbase/js-sdk/types').LANGS
+  type ICustomReqOpts = import('@cloudbase/js-sdk/types/functions').ICustomReqOpts
 
   // ===== @cloudbase/auth 相关类型别名 =====
-  type SignInRes = import('@cloudbase/auth').SignInRes
-  type GetUserRes = import('@cloudbase/auth').GetUserRes
-  type CommonRes = import('@cloudbase/auth').CommonRes
-  type SignInWithOtpRes = import('@cloudbase/auth').SignInWithOtpRes
-  type SignInOAuthRes = import('@cloudbase/auth').SignInOAuthRes
-  type GetClaimsRes = import('@cloudbase/auth').GetClaimsRes
-  type ResetPasswordForEmailRes = import('@cloudbase/auth').ResetPasswordForEmailRes
-  type GetUserIdentitiesRes = import('@cloudbase/auth').GetUserIdentitiesRes
-  type LinkIdentityRes = import('@cloudbase/auth').LinkIdentityRes
-  type ReauthenticateRes = import('@cloudbase/auth').ReauthenticateRes
-  type ResendRes = import('@cloudbase/auth').ResendRes
-  type UpdateUserWithVerificationRes = import('@cloudbase/auth').UpdateUserWithVerificationRes
-  type OnAuthStateChangeCallback = import('@cloudbase/auth').OnAuthStateChangeCallback
-  type SignInWithPasswordReq = import('@cloudbase/auth').SignInWithPasswordReq
-  type SignInWithIdTokenReq = import('@cloudbase/auth').SignInWithIdTokenReq
-  type SignInWithOAuthReq = import('@cloudbase/auth').SignInWithOAuthReq
-  type VerifyOAuthReq = import('@cloudbase/auth').VerifyOAuthReq
-  type VerifyOtpReq = import('@cloudbase/auth').VerifyOtpReq
-  type LinkIdentityReq = import('@cloudbase/auth').LinkIdentityReq
-  type UnlinkIdentityReq = import('@cloudbase/auth').UnlinkIdentityReq
-  type UpdateUserReq = import('@cloudbase/auth').UpdateUserReq
-  type SignInWithOtpReq = import('@cloudbase/auth').SignInWithOtpReq
-  type ResetPasswordForOldReq = import('@cloudbase/auth').ResetPasswordForOldReq
-  type ResendReq = import('@cloudbase/auth').ResendReq
-  type SetSessionReq = import('@cloudbase/auth').SetSessionReq
-  type DeleteMeReq = import('@cloudbase/auth').DeleteMeReq
-  type SignUpRes = import('@cloudbase/auth').SignUpRes
+  type SignInRes = import('@cloudbase/js-sdk/auth').SignInRes
+  type GetUserRes = import('@cloudbase/js-sdk/auth').GetUserRes
+  type CommonRes = import('@cloudbase/js-sdk/auth').CommonRes
+  type SignInWithOtpRes = import('@cloudbase/js-sdk/auth').SignInWithOtpRes
+  type SignInOAuthRes = import('@cloudbase/js-sdk/auth').SignInOAuthRes
+  type GetClaimsRes = import('@cloudbase/js-sdk/auth').GetClaimsRes
+  type ResetPasswordForEmailRes = import('@cloudbase/js-sdk/auth').ResetPasswordForEmailRes
+  type GetUserIdentitiesRes = import('@cloudbase/js-sdk/auth').GetUserIdentitiesRes
+  type LinkIdentityRes = import('@cloudbase/js-sdk/auth').LinkIdentityRes
+  type ReauthenticateRes = import('@cloudbase/js-sdk/auth').ReauthenticateRes
+  type ResendRes = import('@cloudbase/js-sdk/auth').ResendRes
+  type UpdateUserWithVerificationRes = import('@cloudbase/js-sdk/auth').UpdateUserWithVerificationRes
+  type OnAuthStateChangeCallback = import('@cloudbase/js-sdk/auth').OnAuthStateChangeCallback
+  type SignInWithPasswordReq = import('@cloudbase/js-sdk/auth').SignInWithPasswordReq
+  type SignInWithIdTokenReq = import('@cloudbase/js-sdk/auth').SignInWithIdTokenReq
+  type SignInWithOAuthReq = import('@cloudbase/js-sdk/auth').SignInWithOAuthReq
+  type VerifyOAuthReq = import('@cloudbase/js-sdk/auth').VerifyOAuthReq
+  type VerifyOtpReq = import('@cloudbase/js-sdk/auth').VerifyOtpReq
+  type LinkIdentityReq = import('@cloudbase/js-sdk/auth').LinkIdentityReq
+  type UnlinkIdentityReq = import('@cloudbase/js-sdk/auth').UnlinkIdentityReq
+  type UpdateUserReq = import('@cloudbase/js-sdk/auth').UpdateUserReq
+  type SignInWithOtpReq = import('@cloudbase/js-sdk/auth').SignInWithOtpReq
+  type ResetPasswordForOldReq = import('@cloudbase/js-sdk/auth').ResetPasswordForOldReq
+  type ResendReq = import('@cloudbase/js-sdk/auth').ResendReq
+  type SetSessionReq = import('@cloudbase/js-sdk/auth').SetSessionReq
+  type DeleteMeReq = import('@cloudbase/js-sdk/auth').DeleteMeReq
+  type SignUpRes = import('@cloudbase/js-sdk/auth').SignUpRes
 
   // ===== @cloudbase/oauth authModels 命名空间别名 =====
   namespace authModels {
-    type BindPhoneRequest = import('@cloudbase/oauth').authModels.BindPhoneRequest
-    type BindEmailRequest = import('@cloudbase/oauth').authModels.BindEmailRequest
-    type UnbindProviderRequest = import('@cloudbase/oauth').authModels.UnbindProviderRequest
-    type VerifyRequest = import('@cloudbase/oauth').authModels.VerifyRequest
-    type VerifyResponse = import('@cloudbase/oauth').authModels.VerifyResponse
-    type GetVerificationRequest = import('@cloudbase/oauth').authModels.GetVerificationRequest
-    type GetVerificationResponse = import('@cloudbase/oauth').authModels.GetVerificationResponse
-    type GetCustomSignTicketFn = import('@cloudbase/oauth').authModels.GetCustomSignTicketFn
-    type SetPasswordRequest = import('@cloudbase/oauth').authModels.SetPasswordRequest
-    type ModifyUserBasicInfoRequest = import('@cloudbase/oauth').authModels.ModifyUserBasicInfoRequest
-    type BindWithProviderRequest = import('@cloudbase/oauth').authModels.BindWithProviderRequest
-    type QueryUserProfileRequest = import('@cloudbase/oauth').authModels.QueryUserProfileRequest
-    type QueryUserProfileResponse = import('@cloudbase/oauth').authModels.QueryUserProfileResponse
-    type GrantProviderTokenRequest = import('@cloudbase/oauth').authModels.GrantProviderTokenRequest
-    type GrantProviderTokenResponse = import('@cloudbase/oauth').authModels.GrantProviderTokenResponse
-    type PatchProviderTokenRequest = import('@cloudbase/oauth').authModels.PatchProviderTokenRequest
-    type PatchProviderTokenResponse = import('@cloudbase/oauth').authModels.PatchProviderTokenResponse
-    type SignInWithProviderRequest = import('@cloudbase/oauth').authModels.SignInWithProviderRequest
-    type GrantTokenRequest = import('@cloudbase/oauth').authModels.GrantTokenRequest
-    type GenProviderRedirectUriRequest = import('@cloudbase/oauth').authModels.GenProviderRedirectUriRequest
-    type GenProviderRedirectUriResponse = import('@cloudbase/oauth').authModels.GenProviderRedirectUriResponse
-    type ResetPasswordRequest = import('@cloudbase/oauth').authModels.ResetPasswordRequest
-    type DeviceAuthorizeRequest = import('@cloudbase/oauth').authModels.DeviceAuthorizeRequest
-    type DeviceAuthorizeResponse = import('@cloudbase/oauth').authModels.DeviceAuthorizeResponse
-    type SudoRequest = import('@cloudbase/oauth').authModels.SudoRequest
-    type SudoResponse = import('@cloudbase/oauth').authModels.SudoResponse
-    type WithSudoRequest = import('@cloudbase/oauth').authModels.WithSudoRequest
-    type UserProfile = import('@cloudbase/oauth').authModels.UserProfile
-    type UserProfileProvider = import('@cloudbase/oauth').authModels.UserProfileProvider
-    type Credentials = import('@cloudbase/oauth').authModels.Credentials
-    type ProviderSubType = import('@cloudbase/oauth').authModels.ProviderSubType
-    type ModifyPasswordWithoutLoginRequest = import('@cloudbase/oauth').authModels.ModifyPasswordWithoutLoginRequest
-    type GetUserBehaviorLog = import('@cloudbase/oauth').authModels.GetUserBehaviorLog
-    type GetUserBehaviorLogRes = import('@cloudbase/oauth').authModels.GetUserBehaviorLogRes
-    type GetMiniProgramQrCodeRequest = import('@cloudbase/oauth').authModels.GetMiniProgramQrCodeRequest
-    type GetMiniProgramQrCodeResponse = import('@cloudbase/oauth').authModels.GetMiniProgramQrCodeResponse
-    type GetMiniProgramQrCodeStatusRequest = import('@cloudbase/oauth').authModels.GetMiniProgramQrCodeStatusRequest
-    type GetMiniProgramQrCodeStatusResponse = import('@cloudbase/oauth').authModels.GetMiniProgramQrCodeStatusResponse
-    type ToDefaultLoginPage = import('@cloudbase/oauth').authModels.ToDefaultLoginPage
-    type SignoutRequest = import('@cloudbase/oauth').authModels.SignoutRequest
-    type SignoutResponse = import('@cloudbase/oauth').authModels.SignoutResponse
-    type SignInRequest = import('@cloudbase/oauth').authModels.SignInRequest
-    type SignUpRequest = import('@cloudbase/oauth').authModels.SignUpRequest
+    type BindPhoneRequest = import('@cloudbase/js-sdk/oauth').authModels.BindPhoneRequest
+    type BindEmailRequest = import('@cloudbase/js-sdk/oauth').authModels.BindEmailRequest
+    type UnbindProviderRequest = import('@cloudbase/js-sdk/oauth').authModels.UnbindProviderRequest
+    type VerifyRequest = import('@cloudbase/js-sdk/oauth').authModels.VerifyRequest
+    type VerifyResponse = import('@cloudbase/js-sdk/oauth').authModels.VerifyResponse
+    type GetVerificationRequest = import('@cloudbase/js-sdk/oauth').authModels.GetVerificationRequest
+    type GetVerificationResponse = import('@cloudbase/js-sdk/oauth').authModels.GetVerificationResponse
+    type GetCustomSignTicketFn = import('@cloudbase/js-sdk/oauth').authModels.GetCustomSignTicketFn
+    type SetPasswordRequest = import('@cloudbase/js-sdk/oauth').authModels.SetPasswordRequest
+    type ModifyUserBasicInfoRequest = import('@cloudbase/js-sdk/oauth').authModels.ModifyUserBasicInfoRequest
+    type BindWithProviderRequest = import('@cloudbase/js-sdk/oauth').authModels.BindWithProviderRequest
+    type QueryUserProfileRequest = import('@cloudbase/js-sdk/oauth').authModels.QueryUserProfileRequest
+    type QueryUserProfileResponse = import('@cloudbase/js-sdk/oauth').authModels.QueryUserProfileResponse
+    type GrantProviderTokenRequest = import('@cloudbase/js-sdk/oauth').authModels.GrantProviderTokenRequest
+    type GrantProviderTokenResponse = import('@cloudbase/js-sdk/oauth').authModels.GrantProviderTokenResponse
+    type PatchProviderTokenRequest = import('@cloudbase/js-sdk/oauth').authModels.PatchProviderTokenRequest
+    type PatchProviderTokenResponse = import('@cloudbase/js-sdk/oauth').authModels.PatchProviderTokenResponse
+    type SignInWithProviderRequest = import('@cloudbase/js-sdk/oauth').authModels.SignInWithProviderRequest
+    type GrantTokenRequest = import('@cloudbase/js-sdk/oauth').authModels.GrantTokenRequest
+    type GenProviderRedirectUriRequest = import('@cloudbase/js-sdk/oauth').authModels.GenProviderRedirectUriRequest
+    type GenProviderRedirectUriResponse = import('@cloudbase/js-sdk/oauth').authModels.GenProviderRedirectUriResponse
+    type ResetPasswordRequest = import('@cloudbase/js-sdk/oauth').authModels.ResetPasswordRequest
+    type DeviceAuthorizeRequest = import('@cloudbase/js-sdk/oauth').authModels.DeviceAuthorizeRequest
+    type DeviceAuthorizeResponse = import('@cloudbase/js-sdk/oauth').authModels.DeviceAuthorizeResponse
+    type SudoRequest = import('@cloudbase/js-sdk/oauth').authModels.SudoRequest
+    type SudoResponse = import('@cloudbase/js-sdk/oauth').authModels.SudoResponse
+    type WithSudoRequest = import('@cloudbase/js-sdk/oauth').authModels.WithSudoRequest
+    type UserProfile = import('@cloudbase/js-sdk/oauth').authModels.UserProfile
+    type UserProfileProvider = import('@cloudbase/js-sdk/oauth').authModels.UserProfileProvider
+    // Credentials 定义在 oauth2client/models 并从 @cloudbase/oauth 顶层导出（authModels 命名空间中不存在）
+    type Credentials = import('@cloudbase/js-sdk/oauth').Credentials
+    type ProviderSubType = import('@cloudbase/js-sdk/oauth').authModels.ProviderSubType
+    type ModifyPasswordWithoutLoginRequest = import('@cloudbase/js-sdk/oauth').authModels.ModifyPasswordWithoutLoginRequest
+    type GetUserBehaviorLog = import('@cloudbase/js-sdk/oauth').authModels.GetUserBehaviorLog
+    type GetUserBehaviorLogRes = import('@cloudbase/js-sdk/oauth').authModels.GetUserBehaviorLogRes
+    type GetMiniProgramQrCodeRequest = import('@cloudbase/js-sdk/oauth').authModels.GetMiniProgramQrCodeRequest
+    type GetMiniProgramQrCodeResponse = import('@cloudbase/js-sdk/oauth').authModels.GetMiniProgramQrCodeResponse
+    type GetMiniProgramQrCodeStatusRequest = import('@cloudbase/js-sdk/oauth').authModels.GetMiniProgramQrCodeStatusRequest
+    type GetMiniProgramQrCodeStatusResponse = import('@cloudbase/js-sdk/oauth').authModels.GetMiniProgramQrCodeStatusResponse
+    type ToDefaultLoginPage = import('@cloudbase/js-sdk/oauth').authModels.ToDefaultLoginPage
+    type SignoutRequest = import('@cloudbase/js-sdk/oauth').authModels.SignoutRequest
+    type SignoutResponse = import('@cloudbase/js-sdk/oauth').authModels.SignoutResponse
+    type SignInRequest = import('@cloudbase/js-sdk/oauth').authModels.SignInRequest
+    type SignUpRequest = import('@cloudbase/js-sdk/oauth').authModels.SignUpRequest
   }
   interface SimpleStorage {
     getItem: (key: string) => Promise<string | null>
@@ -385,7 +386,9 @@ declare namespace cloudbase {
    */
   function registerHook(hook: ICloudbaseHook): void
 
-  export interface models extends OrmClient, OrmRawQueryClient {}
+  // 交叉类型而非 interface extends：OrmClient 带 [modelName: string] 索引签名，
+  // 与 OrmRawQueryClient 的 $runSQL/$runSQLRaw 方法在 interface 继承下触发 TS2411
+  export type models = OrmClient & OrmRawQueryClient
 }
 /**
  * instance
@@ -1221,7 +1224,7 @@ declare namespace cloudbase.auth {
      */
     loginScope(): Promise<string>
     loginGroups(): Promise<string[]>
-    onLoginStateChanged(callback: Function)
+    onLoginStateChanged(callback: Function): void
     createLoginState(
       params?: { version?: string; query?: any },
       options?: { asyncRefreshUser?: boolean; userInfo?: any },

package/database/dist/index.d.ts

@@ -1,3 +1,3 @@
-import { ICloudbase } from '@cloudbase/types';
+import { ICloudbase } from '@cloudbase/js-sdk/types';
 import cloudbaseNS from '../../index';
 export declare function registerDatabase(app: ICloudbase | typeof cloudbaseNS): void;