npm - @cloudcome/utils-uni - Versions diffs - 1.43.0 → 1.45.0 - Mend

@cloudcome/utils-uni 1.43.0 → 1.45.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/dist/cloud/method.d.ts +11 -3
package/dist/cloud/respond.d.ts +17 -4
package/dist/cloud.cjs +14 -11
package/dist/cloud.cjs.map +1 -1
package/dist/cloud.mjs +14 -11
package/dist/cloud.mjs.map +1 -1
package/dist/database/_db.class.d.ts +0 -1
package/dist/database.cjs +25 -23
package/dist/database.cjs.map +1 -1
package/dist/database.mjs +26 -24
package/dist/database.mjs.map +1 -1
package/dist/index.cjs +1 -1
package/dist/index.mjs +1 -1
package/package.json +3 -3

package/dist/cloud/method.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
-import { MaybePromise } from '@cloudcome/utils-core/types';
+import { MaybePromise, AnyObject } from '@cloudcome/utils-core/types';
 import { default as z, ZodObject } from 'zod';
+import { UniError } from '../_types';
 import { CloudMethod, CloudObjectThis } from './types';
 import { UniIdCommonModule } from './uni-id';
 type _CloudObjectThisAppendUser = {
@@ -72,6 +73,13 @@ export type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> =
      * @returns 返回要附加到响应中的数据对象
      */
     respondAppend?: (objectThis: CloudObjectThis) => AnyObject;
+    /**
+     * 自定义错误处理函数
+     * 用于在云对象响应中处理错误信息，如脱敏、转换错误码等
+     * @param err 原始错误对象
+     * @returns 处理后的错误对象，其 errCode/errMsg 将被用于响应
+     */
+    parseError?: (err: unknown) => UniError;
     /**
      * 所有云对象执行前钩子函数
      * @param context 云对象上下文，包含用户信息、扩展配置选项等
@@ -79,7 +87,7 @@ export type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> =
      */
     onBefore?: (context: CloudObjectContext<ExtraConfig>, options: _ResolvedCreateCloudOptions<ExtraConfig>) => MaybePromise<unknown>;
 };
-export type CreateCloudObjectOptions<ExtraConfig extends object = object> = ExtraConfig & {
+export type CreateCloudObjectOptions<ExtraConfig extends AnyObject = AnyObject> = ExtraConfig & {
     /**
      * 是否需要用户登录态
      * @default false
@@ -104,7 +112,7 @@ export type CreateCloudObjectOptions<ExtraConfig extends object = object> = Extr
      */
     noRespond?: boolean;
 };
-export type CreateCloudMethod<ExtraConfig extends object = object> = {
+export type CreateCloudMethod<ExtraConfig extends AnyObject = AnyObject> = {
     <S extends ZodObject, O>(schema: S, fn: (context: CloudObjectContext<ExtraConfig>, input: z.infer<S>) => MaybePromise<O>, options?: CreateCloudObjectOptions<ExtraConfig>): CloudMethod<z.infer<S>, O>;
     <O>(fn: (context: CloudObjectContext<ExtraConfig>) => MaybePromise<O>, options?: CreateCloudObjectOptions<ExtraConfig>): CloudMethod<void, O>;
 };

package/dist/cloud/respond.d.ts CHANGED Viewed

@@ -1,18 +1,31 @@
-import { MaybePromise } from '@cloudcome/utils-core/types';
+import { MaybePromise, AnyObject } from '@cloudcome/utils-core/types';
+import { UniError } from '../_types';
 import { CloudMethodOutput } from './types';
+export type RespondCloudMethodOptions = {
+    /** 要附加到响应中的额外数据 */
+    append?: AnyObject;
+    /**
+     * 自定义错误处理函数
+     * @param err {unknown} 错误
+     * @returns 处理后的错误对象，其 errCode/errMsg 将被用于响应
+     */
+    parseError?: (err: unknown) => UniError;
+};
 /**
  * 执行云对象方法并标准化响应格式
  *
  * @template O - 函数返回值的类型
  * @param fn - 要执行的异步函数
- * @param append - 要附加到响应中的额外数据
+ * @param options - 可选配置
+ * @param options.append - 要附加到响应中的额外数据
+ * @param options.parseError - 自定义错误处理函数
  * @returns 标准化的云对象响应对象
  *
  * @example
  * ```typescript
  * const result = await respondCloudMethod(async () => {
  *   return await getData();
- * }, { extra: 'data' });
+ * }, { append: { extra: 'data' } });
  * ```
  */
-export declare function respondCloudMethod<O>(fn: () => MaybePromise<O>, append?: AnyObject): Promise<CloudMethodOutput<O>>;
+export declare function respondCloudMethod<O>(fn: () => MaybePromise<O>, options?: RespondCloudMethodOptions): Promise<CloudMethodOutput<O>>;

package/dist/cloud.cjs CHANGED Viewed

@@ -51,33 +51,33 @@ function parseCloudModuleOutput(output, fallbackErrorMessage = "") {
 *
 * @template O - 函数返回值的类型
 * @param fn - 要执行的异步函数
-* @param append - 要附加到响应中的额外数据
+* @param options - 可选配置
+* @param options.append - 要附加到响应中的额外数据
+* @param options.parseError - 自定义错误处理函数
 * @returns 标准化的云对象响应对象
 *
 * @example
 * ```typescript
 * const result = await respondCloudMethod(async () => {
 *   return await getData();
-* }, { extra: 'data' });
+* }, { append: { extra: 'data' } });
 * ```
 */
-async function respondCloudMethod(fn, append) {
+async function respondCloudMethod(fn, options) {
 	try {
 		return {
 			errCode: 0,
 			errMsg: "",
 			data: await fn(),
-			...append
+			...options?.append
 		};
 	} catch (err) {
-		console.error("respondCloudObject error");
-		console.error(err);
-		const err2 = (0, _cloudcome_utils_core_error.errorNormalize)(err);
+		const err3 = options?.parseError?.(err) || (0, _cloudcome_utils_core_error.errorNormalize)(err);
 		return {
-			errCode: err2.errCode || -1,
-			errMsg: err2.errMsg || err2.message || "",
+			errCode: err3.errCode ?? -1,
+			errMsg: err3.errMsg || err3.message || "",
 			data: null,
-			...append
+			...options?.append
 		};
 	}
 }
@@ -140,7 +140,10 @@ function buildCloudMethodCreator(options) {
 				return await arg1(context, parsed.data);
 			};
 			if (createOptions.noRespond) return await cloudMethod();
-			return await respondCloudMethod(cloudMethod, buildOptions.respondAppend(this));
+			return await respondCloudMethod(cloudMethod, {
+				append: buildOptions.respondAppend(this),
+				parseError: buildOptions.parseError
+			});
 		};
 	};
 	return createCloudMethod;

package/dist/cloud.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cloud.cjs","names":[],"sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.ts","../src/cloud/request.ts"],"sourcesContent":["import { errorAssign } from '@cloudcome/utils-core/error';\n\nexport function createCloudObjectError(message: string, code?: number \| string) {\n return errorAssign(new Error(message), {\n errCode: code,\n errMsg: message,\n });\n}\n","import { objectOmit } from '@cloudcome/utils-core/object';\nimport { createCloudObjectError } from './error';\nimport type { CloudModuleOutput } from './types';\n\n/*\n 解析云模块输出结果\n \n 该函数用于处理云模块的输出，如果输出中包含错误码，则抛出相应的错误；\n * 否则返回去除错误码和错误信息后的数据部分。\n \n @template O - 输出数据的类型\n * @param output - 云模块的输出结果，包含errCode、errMsg和数据部分\n * @param fallbackErrorMessage - 当输出中没有错误信息时使用的默认错误消息\n * @returns 返回去除errCode和errMsg字段后的数据对象\n * @throws {CloudObjectError} 当output中存在errCode时抛出包含错误码和错误信息的异常\n \n @example\n * // 成功情况\n * const result = parseCloudModuleOutput({ value: 'success', errCode: 0, errMsg: '' });\n * // 返回: { value: 'success' }\n \n @example\n * // 错误情况\n * try {\n * parseCloudModuleOutput({ errCode: 404, errMsg: 'Not Found' });\n * } catch (error) {\n * // 抛出错误: CloudObjectError('Not Found', 404)\n * }\n /\nexport function parseCloudModuleOutput<O>(\n output: CloudModuleOutput<O>,\n fallbackErrorMessage = '',\n): Omit<O, 'errCode' \| 'errMsg'> {\n if (output.errCode) {\n throw createCloudObjectError(output.errMsg \|\| fallbackErrorMessage, output.errCode);\n }\n return objectOmit(output, ['errCode', 'errMsg']);\n}\n","import { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport type { UniError } from '@/_types';\nimport type { CloudMethodOutput } from './types';\n\n/\n 执行云对象方法并标准化响应格式\n \n @template O - 函数返回值的类型\n * @param fn - 要执行的异步函数\n * @param append - 要附加到响应中的额外数据\n * @returns 标准化的云对象响应对象\n \n @example\n * ```typescript\n * const result = await respondCloudMethod(async () => {\n * return await getData();\n * }, { extra: 'data' });\n * ```\n /\nexport async function respondCloudMethod<O>(\n fn: () => MaybePromise<O>,\n append?: AnyObject,\n): Promise<CloudMethodOutput<O>> {\n try {\n const data = await fn();\n\n return {\n errCode: 0,\n errMsg: '',\n data,\n ...append,\n };\n } catch (err) {\n console.error('respondCloudObject error');\n console.error(err);\n\n const err2 = errorNormalize(err as UniError);\n\n return {\n errCode: err2.errCode \|\| -1,\n errMsg: err2.errMsg \|\| err2.message \|\| '',\n // @ts-expect-error\n data: null,\n ...append,\n };\n }\n}\n","import { objectDefaults } from '@cloudcome/utils-core/object';\nimport { tryFlatten } from '@cloudcome/utils-core/try';\nimport { isFunction } from '@cloudcome/utils-core/type';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport { versionCompare } from '@cloudcome/utils-core/version';\nimport type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\ntype _CloudObjectThisAppendUser = {\n id: string;\n role: string[];\n permission: string[];\n isAdmin: boolean;\n};\n\n/\n 云对象创建选项的运行时解析类型。\n \n 将 `CreateCloudObjectOptions` 中的内置字段设为必填（已应用默认值），\n * 同时保留 `ExtraConfig` 扩展字段的原始可选性。\n \n @template ExtraConfig - 自定义扩展配置类型\n /\ntype _ResolvedCreateCloudOptions<ExtraConfig extends AnyObject = {}> = ExtraConfig & {\n /* 是否需要用户登录态 /\n requiredUser: boolean;\n /* 是否仅在本地环境运行 /\n onlyLocalEnv: boolean;\n /* 最小支持版本 /\n minVersion?: string;\n /* 最大支持版本 /\n maxVersion?: string;\n /* 非响应模式，常用于钩子函数中 /\n noRespond?: boolean;\n};\n\ntype _CloudObjectThisAppend<ExtraConfig extends AnyObject = {}> = {\n options: _ResolvedCreateCloudOptions<ExtraConfig>;\n user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext<ExtraConfig extends AnyObject = {}> = CloudObjectThis &\n _CloudObjectThisAppend<ExtraConfig>;\n\nexport type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> = {\n /\n UniId 通用模块\n * 用于处理用户身份验证和权限管理\n * 如果提供，将在云对象执行前验证用户身份\n /\n uniIdCommonModule?: UniIdCommonModule;\n\n /\n 需要用户登录态的错误码\n * @default 'uni-id-check-token-failed'\n /\n requiredUserErrCode?: number \| string;\n\n /\n 需要用户登录态的错误消息\n * @default '需要登录后才能进行此操作'\n /\n requiredUserErrMsg?: string;\n\n /\n 仅允许本地环境运行的错误消息\n * @default '运行环境不匹配'\n /\n onlyLocalEnvErrMsg?: string;\n\n /\n 版本不匹配错误消息\n * @default '应用版本过低'\n /\n appVersionTooLowErrMsg?: string;\n\n /\n 应用版本过高错误消息\n * @default '应用版本过高'\n /\n appVersionTooHighErrMsg?: string;\n\n /\n 响应附加数据函数\n * 用于在云对象响应中添加额外的上下文信息\n * @param objectThis 云对象上下文\n * @returns 返回要附加到响应中的数据对象\n /\n respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n\n /\n 所有云对象执行前钩子函数\n * @param context 云对象上下文，包含用户信息、扩展配置选项等\n * @param options 云对象创建选项，包含 requiredUser、onlyLocalEnv 及自定义扩展配置\n /\n onBefore?: (\n context: CloudObjectContext<ExtraConfig>,\n options: _ResolvedCreateCloudOptions<ExtraConfig>,\n ) => MaybePromise<unknown>;\n};\n\nexport type CreateCloudObjectOptions<ExtraConfig extends object = object> = ExtraConfig & {\n /\n 是否需要用户登录态\n * @default false\n /\n requiredUser?: boolean;\n\n /\n 是否仅在本地环境运行\n * @default false\n /\n onlyLocalEnv?: boolean;\n\n /\n 最小支持版本\n /\n minVersion?: string;\n\n /\n 最大支持版本\n /\n maxVersion?: string;\n\n /\n 非响应模式，常用于钩子函数中，如 _before, _after 等，\n * 文档：https://doc.dcloud.net.cn/uniCloud/cloud-obj.html#before-and-after\n /\n noRespond?: boolean;\n};\n\nexport type CreateCloudMethod<ExtraConfig extends object = object> = {\n <S extends ZodObject, O>(\n schema: S,\n fn: (context: CloudObjectContext<ExtraConfig>, input: z.infer<S>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<z.infer<S>, O>;\n\n <O>(\n fn: (context: CloudObjectContext<ExtraConfig>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<void, O>;\n};\n\n/\n 构建云对象方法创建器\n \n 该函数用于创建云对象方法的工厂函数，支持输入验证、用户身份验证、环境检查等功能。\n * 返回的创建器函数可以根据不同的配置创建云对象方法。\n \n @param options 构建选项，用于配置云对象方法创建器的行为\n * @returns 返回一个云对象方法创建器函数\n \n @example\n * // 创建一个需要用户登录的云对象方法\n * const createMethod = buildCloudMethodCreator({ uniIdCommonModule });\n * const myMethod = createMethod(async (context) => {\n * return { message: 'Hello ' + context.user.id };\n * }, { requiredUser: true });\n /\nexport function buildCloudMethodCreator<ExtraConfig extends AnyObject = {}>(\n options?: BuildCloudMethodCreatorOptions<ExtraConfig>,\n) {\n const buildOptions = objectDefaults(options \|\| {}, {\n requiredUserErrCode: 'uni-id-check-token-failed',\n requiredUserErrMsg: '需要登录后才能进行此操作',\n onlyLocalEnvErrMsg: '运行环境不匹配',\n appVersionTooLowErrMsg: '应用版本过低',\n appVersionTooHighErrMsg: '应用版本过高',\n respondAppend: () => ({}),\n onBefore: () => {},\n }) as Required<BuildCloudMethodCreatorOptions>;\n\n // @ts-expect-error\n const createCloudMethod: CreateCloudMethod<ExtraConfig> = (arg0, arg1, arg2) => {\n const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions<ExtraConfig> \| undefined;\n const createOptions = objectDefaults(optionsSource \|\| {}, {\n requiredUser: false,\n onlyLocalEnv: false,\n }) as _ResolvedCreateCloudOptions<ExtraConfig>;\n\n return async function (this: CloudObjectThis, input) {\n const cloudMethod = async () => {\n const { runtimeEnv } = this.getCloudInfo();\n\n if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n }\n\n const { appVersion } = this.getClientInfo();\n\n if (createOptions.minVersion && versionCompare(appVersion, createOptions.minVersion) < 0) {\n throw createCloudObjectError(buildOptions.appVersionTooLowErrMsg);\n }\n\n if (createOptions.maxVersion && versionCompare(appVersion, createOptions.maxVersion) > 0) {\n throw createCloudObjectError(buildOptions.appVersionTooHighErrMsg);\n }\n\n const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n const append: _CloudObjectThisAppend<ExtraConfig> = {\n options: createOptions,\n user: user,\n };\n const context = Object.assign(this, append) as CloudObjectContext<ExtraConfig>;\n\n if (createOptions.requiredUser && !user.id) {\n throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n }\n\n await buildOptions.onBefore(context, createOptions);\n\n if (isFunction(arg0)) {\n return await arg0(context);\n }\n\n const parsed = arg0.safeParse(input);\n\n if (!parsed.success) {\n console.log(parsed.error.issues);\n\n const issue0 = parsed.error?.issues?.[0];\n\n if (issue0?.code === 'custom') throw issue0.message;\n throw new Error('请求数据不正确');\n }\n\n return await arg1(context, parsed.data);\n };\n\n if (createOptions.noRespond) {\n return await cloudMethod();\n }\n\n return await respondCloudMethod(cloudMethod, buildOptions.respondAppend(this));\n };\n };\n\n return createCloudMethod;\n}\n\n/\n 解析并附加用户信息到云对象上下文\n \n 该函数用于验证用户身份并获取用户权限信息，将结果附加到云对象上下文中的user字段\n * 如果未提供uniIdCommonModule或验证失败，则返回默认的空用户信息\n \n @param objectThis 云对象上下文，包含客户端信息和token等\n * @param uniIdCommonModule 可选的UniId通用模块实例，用于验证用户token\n * @returns 返回包含用户ID、角色、权限等信息的对象\n \n @example\n * // 成功验证用户身份\n * const user = await _parseAppendUser(this, uniIdModule);\n * // 返回: { id: 'user123', role: ['user'], permission: ['read'], isAdmin: false }\n \n @example\n * // 验证失败或未提供模块\n * const user = await _parseAppendUser(this);\n * // 返回: { id: '', role: [], permission: [], isAdmin: false }\n /\nasync function _parseAppendUser(\n objectThis: CloudObjectThis,\n uniIdCommonModule?: UniIdCommonModule,\n): Promise<_CloudObjectThisAppendUser> {\n const appendUser: _CloudObjectThisAppendUser = {\n id: '',\n role: [],\n permission: [],\n isAdmin: false,\n };\n\n if (!uniIdCommonModule) return appendUser;\n\n const uic = uniIdCommonModule.createInstance({\n clientInfo: objectThis.getClientInfo(),\n });\n\n const [_err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() \|\| ''));\n if (!user) return appendUser;\n\n const [_err2, userData] = tryFlatten(() => parseCloudModuleOutput(user));\n if (!userData) return appendUser;\n\n appendUser.id = userData.uid \|\| '';\n appendUser.role = userData.role \|\| [];\n appendUser.permission = userData.permission \|\| [];\n appendUser.isAdmin = appendUser.role.includes('admin') && appendUser.permission.length === 0;\n\n return appendUser;\n}\n","import { qsStringify } from '@cloudcome/utils-core/qs';\nimport type { AnyObject } from '@cloudcome/utils-core/types';\n\n/\n HTTP 请求配置选项\n /\nexport type RequestOptions = {\n /\n 请求 URL 地址\n /\n url: string;\n\n /\n URL 查询参数，会自动拼接到 url 后面\n /\n query?: Record<string, string>;\n\n /\n HTTP 请求方法\n * @default 'GET'\n /\n method?: 'GET' \| 'POST' \| 'PUT' \| 'DELETE' \| 'HEAD' \| 'OPTIONS';\n\n /\n 请求头\n /\n headers?: Record<string, string>;\n\n /\n 请求体数据\n /\n data?: AnyObject;\n\n /\n 返回数据格式\n * @default 'json'\n /\n dataType?: string;\n\n /\n 请求内容类型\n * - 'json': application/json\n * - 'form': application/x-www-form-urlencoded\n * @default 'json'\n /\n contentType?: string;\n\n /\n 请求超时时间，单位毫秒\n * @default 10000\n /\n timeout?: number;\n};\n\n/\n 发起 HTTP 请求\n \n 基于 uniCloud.httpclient 发起 HTTP 请求，支持 GET、POST、PUT、DELETE 等方法。\n * 查询参数会自动通过 qsStringify 拼接到 URL 上。\n \n @template T - 响应数据的类型\n * @param options 请求配置选项\n * @returns 包含 data、status、headers 的响应对象\n \n @example\n * ```ts\n * // GET 请求\n * const res = await request<{ name: string }>({\n * url: 'https://api.example.com/users/1',\n * })\n * console.log(res.data) // { name: 'Alice' }\n * console.log(res.status) // 200\n \n // POST 请求\n * const res = await request<{ id: string }>({\n * url: 'https://api.example.com/users',\n * method: 'POST',\n * data: { name: 'Alice', age: 25 },\n * })\n \n // 带查询参数\n * const res = await request<{ list: any[] }>({\n * url: 'https://api.example.com/users',\n * query: { page: '1', size: '10' },\n * })\n * ```\n */\nexport async function request<T>(options: RequestOptions) {\n const {\n url,\n query = {},\n method = 'GET',\n headers = {},\n data,\n dataType = 'json',\n contentType = 'json',\n timeout = 10000,\n } = options;\n\n const fullUrl = `${url}?${qsStringify(query)}`;\n\n // 使用uniCloud.httpclient发起请求\n // @ts-expect-error: uniCloud类型定义中可能缺少httpclient属性\n const res = await uniCloud.httpclient.request(fullUrl, {\n method,\n headers,\n data,\n dataType,\n contentType,\n timeout,\n });\n\n return res as { data: T; status: number; headers: Record<string, string> };\n}\n"],"mappings":"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"}
1	+ {"version":3,"file":"cloud.cjs","names":[],"sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.ts","../src/cloud/request.ts"],"sourcesContent":["import { errorAssign } from '@cloudcome/utils-core/error';\n\nexport function createCloudObjectError(message: string, code?: number \| string) {\n return errorAssign(new Error(message), {\n errCode: code,\n errMsg: message,\n });\n}\n","import { objectOmit } from '@cloudcome/utils-core/object';\nimport { createCloudObjectError } from './error';\nimport type { CloudModuleOutput } from './types';\n\n/*\n 解析云模块输出结果\n \n 该函数用于处理云模块的输出，如果输出中包含错误码，则抛出相应的错误；\n * 否则返回去除错误码和错误信息后的数据部分。\n \n @template O - 输出数据的类型\n * @param output - 云模块的输出结果，包含errCode、errMsg和数据部分\n * @param fallbackErrorMessage - 当输出中没有错误信息时使用的默认错误消息\n * @returns 返回去除errCode和errMsg字段后的数据对象\n * @throws {CloudObjectError} 当output中存在errCode时抛出包含错误码和错误信息的异常\n \n @example\n * // 成功情况\n * const result = parseCloudModuleOutput({ value: 'success', errCode: 0, errMsg: '' });\n * // 返回: { value: 'success' }\n \n @example\n * // 错误情况\n * try {\n * parseCloudModuleOutput({ errCode: 404, errMsg: 'Not Found' });\n * } catch (error) {\n * // 抛出错误: CloudObjectError('Not Found', 404)\n * }\n /\nexport function parseCloudModuleOutput<O>(\n output: CloudModuleOutput<O>,\n fallbackErrorMessage = '',\n): Omit<O, 'errCode' \| 'errMsg'> {\n if (output.errCode) {\n throw createCloudObjectError(output.errMsg \|\| fallbackErrorMessage, output.errCode);\n }\n return objectOmit(output, ['errCode', 'errMsg']);\n}\n","import { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise, AnyObject } from '@cloudcome/utils-core/types';\nimport type { UniError } from '@/_types';\nimport type { CloudMethodOutput } from './types';\n\nexport type RespondCloudMethodOptions = {\n /* 要附加到响应中的额外数据 /\n append?: AnyObject;\n /\n 自定义错误处理函数\n * @param err {unknown} 错误\n * @returns 处理后的错误对象，其 errCode/errMsg 将被用于响应\n /\n parseError?: (err: unknown) => UniError;\n};\n\n/\n 执行云对象方法并标准化响应格式\n \n @template O - 函数返回值的类型\n * @param fn - 要执行的异步函数\n * @param options - 可选配置\n * @param options.append - 要附加到响应中的额外数据\n * @param options.parseError - 自定义错误处理函数\n * @returns 标准化的云对象响应对象\n \n @example\n * ```typescript\n * const result = await respondCloudMethod(async () => {\n * return await getData();\n * }, { append: { extra: 'data' } });\n * ```\n /\nexport async function respondCloudMethod<O>(\n fn: () => MaybePromise<O>,\n options?: RespondCloudMethodOptions,\n): Promise<CloudMethodOutput<O>> {\n try {\n const data = await fn();\n\n return {\n errCode: 0,\n errMsg: '',\n data,\n ...options?.append,\n };\n } catch (err) {\n const err3 = options?.parseError?.(err) \|\| (errorNormalize(err) as UniError);\n\n return {\n errCode: err3.errCode ?? -1,\n errMsg: err3.errMsg \|\| err3.message \|\| '',\n // @ts-expect-error\n data: null,\n ...options?.append,\n };\n }\n}\n","import { objectDefaults } from '@cloudcome/utils-core/object';\nimport { tryFlatten } from '@cloudcome/utils-core/try';\nimport { isFunction } from '@cloudcome/utils-core/type';\nimport type { MaybePromise, AnyObject } from '@cloudcome/utils-core/types';\nimport { versionCompare } from '@cloudcome/utils-core/version';\nimport type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport type { UniError } from '@/_types';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\ntype _CloudObjectThisAppendUser = {\n id: string;\n role: string[];\n permission: string[];\n isAdmin: boolean;\n};\n\n/\n 云对象创建选项的运行时解析类型。\n \n 将 `CreateCloudObjectOptions` 中的内置字段设为必填（已应用默认值），\n * 同时保留 `ExtraConfig` 扩展字段的原始可选性。\n \n @template ExtraConfig - 自定义扩展配置类型\n /\ntype _ResolvedCreateCloudOptions<ExtraConfig extends AnyObject = {}> = ExtraConfig & {\n /* 是否需要用户登录态 /\n requiredUser: boolean;\n /* 是否仅在本地环境运行 /\n onlyLocalEnv: boolean;\n /* 最小支持版本 /\n minVersion?: string;\n /* 最大支持版本 /\n maxVersion?: string;\n /* 非响应模式，常用于钩子函数中 /\n noRespond?: boolean;\n};\n\ntype _CloudObjectThisAppend<ExtraConfig extends AnyObject = {}> = {\n options: _ResolvedCreateCloudOptions<ExtraConfig>;\n user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext<ExtraConfig extends AnyObject = {}> = CloudObjectThis &\n _CloudObjectThisAppend<ExtraConfig>;\n\nexport type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> = {\n /\n UniId 通用模块\n * 用于处理用户身份验证和权限管理\n * 如果提供，将在云对象执行前验证用户身份\n /\n uniIdCommonModule?: UniIdCommonModule;\n\n /\n 需要用户登录态的错误码\n * @default 'uni-id-check-token-failed'\n /\n requiredUserErrCode?: number \| string;\n\n /\n 需要用户登录态的错误消息\n * @default '需要登录后才能进行此操作'\n /\n requiredUserErrMsg?: string;\n\n /\n 仅允许本地环境运行的错误消息\n * @default '运行环境不匹配'\n /\n onlyLocalEnvErrMsg?: string;\n\n /\n 版本不匹配错误消息\n * @default '应用版本过低'\n /\n appVersionTooLowErrMsg?: string;\n\n /\n 应用版本过高错误消息\n * @default '应用版本过高'\n /\n appVersionTooHighErrMsg?: string;\n\n /\n 响应附加数据函数\n * 用于在云对象响应中添加额外的上下文信息\n * @param objectThis 云对象上下文\n * @returns 返回要附加到响应中的数据对象\n /\n respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n\n /\n 自定义错误处理函数\n * 用于在云对象响应中处理错误信息，如脱敏、转换错误码等\n * @param err 原始错误对象\n * @returns 处理后的错误对象，其 errCode/errMsg 将被用于响应\n /\n parseError?: (err: unknown) => UniError;\n\n /\n 所有云对象执行前钩子函数\n * @param context 云对象上下文，包含用户信息、扩展配置选项等\n * @param options 云对象创建选项，包含 requiredUser、onlyLocalEnv 及自定义扩展配置\n /\n onBefore?: (\n context: CloudObjectContext<ExtraConfig>,\n options: _ResolvedCreateCloudOptions<ExtraConfig>,\n ) => MaybePromise<unknown>;\n};\n\nexport type CreateCloudObjectOptions<ExtraConfig extends AnyObject = AnyObject> = ExtraConfig & {\n /\n 是否需要用户登录态\n * @default false\n /\n requiredUser?: boolean;\n\n /\n 是否仅在本地环境运行\n * @default false\n /\n onlyLocalEnv?: boolean;\n\n /\n 最小支持版本\n /\n minVersion?: string;\n\n /\n 最大支持版本\n /\n maxVersion?: string;\n\n /\n 非响应模式，常用于钩子函数中，如 _before, _after 等，\n * 文档：https://doc.dcloud.net.cn/uniCloud/cloud-obj.html#before-and-after\n /\n noRespond?: boolean;\n};\n\nexport type CreateCloudMethod<ExtraConfig extends AnyObject = AnyObject> = {\n <S extends ZodObject, O>(\n schema: S,\n fn: (context: CloudObjectContext<ExtraConfig>, input: z.infer<S>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<z.infer<S>, O>;\n\n <O>(\n fn: (context: CloudObjectContext<ExtraConfig>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<void, O>;\n};\n\n/\n 构建云对象方法创建器\n \n 该函数用于创建云对象方法的工厂函数，支持输入验证、用户身份验证、环境检查等功能。\n * 返回的创建器函数可以根据不同的配置创建云对象方法。\n \n @param options 构建选项，用于配置云对象方法创建器的行为\n * @returns 返回一个云对象方法创建器函数\n \n @example\n * // 创建一个需要用户登录的云对象方法\n * const createMethod = buildCloudMethodCreator({ uniIdCommonModule });\n * const myMethod = createMethod(async (context) => {\n * return { message: 'Hello ' + context.user.id };\n * }, { requiredUser: true });\n /\nexport function buildCloudMethodCreator<ExtraConfig extends AnyObject = {}>(\n options?: BuildCloudMethodCreatorOptions<ExtraConfig>,\n) {\n const buildOptions = objectDefaults(options \|\| {}, {\n requiredUserErrCode: 'uni-id-check-token-failed',\n requiredUserErrMsg: '需要登录后才能进行此操作',\n onlyLocalEnvErrMsg: '运行环境不匹配',\n appVersionTooLowErrMsg: '应用版本过低',\n appVersionTooHighErrMsg: '应用版本过高',\n respondAppend: () => ({}),\n onBefore: () => {},\n }) as Required<BuildCloudMethodCreatorOptions>;\n\n // @ts-expect-error\n const createCloudMethod: CreateCloudMethod<ExtraConfig> = (arg0, arg1, arg2) => {\n const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions<ExtraConfig> \| undefined;\n const createOptions = objectDefaults(optionsSource \|\| {}, {\n requiredUser: false,\n onlyLocalEnv: false,\n }) as _ResolvedCreateCloudOptions<ExtraConfig>;\n\n return async function (this: CloudObjectThis, input) {\n const cloudMethod = async () => {\n const { runtimeEnv } = this.getCloudInfo();\n\n if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n }\n\n const { appVersion } = this.getClientInfo();\n\n if (createOptions.minVersion && versionCompare(appVersion, createOptions.minVersion) < 0) {\n throw createCloudObjectError(buildOptions.appVersionTooLowErrMsg);\n }\n\n if (createOptions.maxVersion && versionCompare(appVersion, createOptions.maxVersion) > 0) {\n throw createCloudObjectError(buildOptions.appVersionTooHighErrMsg);\n }\n\n const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n const append: _CloudObjectThisAppend<ExtraConfig> = {\n options: createOptions,\n user: user,\n };\n const context = Object.assign(this, append) as CloudObjectContext<ExtraConfig>;\n\n if (createOptions.requiredUser && !user.id) {\n throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n }\n\n await buildOptions.onBefore(context, createOptions);\n\n if (isFunction(arg0)) {\n return await arg0(context);\n }\n\n const parsed = arg0.safeParse(input);\n\n if (!parsed.success) {\n console.log(parsed.error.issues);\n\n const issue0 = parsed.error?.issues?.[0];\n\n if (issue0?.code === 'custom') throw issue0.message;\n throw new Error('请求数据不正确');\n }\n\n return await arg1(context, parsed.data);\n };\n\n if (createOptions.noRespond) {\n return await cloudMethod();\n }\n\n return await respondCloudMethod(cloudMethod, {\n append: buildOptions.respondAppend(this),\n parseError: buildOptions.parseError,\n });\n };\n };\n\n return createCloudMethod;\n}\n\n/\n 解析并附加用户信息到云对象上下文\n \n 该函数用于验证用户身份并获取用户权限信息，将结果附加到云对象上下文中的user字段\n * 如果未提供uniIdCommonModule或验证失败，则返回默认的空用户信息\n \n @param objectThis 云对象上下文，包含客户端信息和token等\n * @param uniIdCommonModule 可选的UniId通用模块实例，用于验证用户token\n * @returns 返回包含用户ID、角色、权限等信息的对象\n \n @example\n * // 成功验证用户身份\n * const user = await _parseAppendUser(this, uniIdModule);\n * // 返回: { id: 'user123', role: ['user'], permission: ['read'], isAdmin: false }\n \n @example\n * // 验证失败或未提供模块\n * const user = await _parseAppendUser(this);\n * // 返回: { id: '', role: [], permission: [], isAdmin: false }\n /\nasync function _parseAppendUser(\n objectThis: CloudObjectThis,\n uniIdCommonModule?: UniIdCommonModule,\n): Promise<_CloudObjectThisAppendUser> {\n const appendUser: _CloudObjectThisAppendUser = {\n id: '',\n role: [],\n permission: [],\n isAdmin: false,\n };\n\n if (!uniIdCommonModule) return appendUser;\n\n const uic = uniIdCommonModule.createInstance({\n clientInfo: objectThis.getClientInfo(),\n });\n\n const [_err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() \|\| ''));\n if (!user) return appendUser;\n\n const [_err2, userData] = tryFlatten(() => parseCloudModuleOutput(user));\n if (!userData) return appendUser;\n\n appendUser.id = userData.uid \|\| '';\n appendUser.role = userData.role \|\| [];\n appendUser.permission = userData.permission \|\| [];\n appendUser.isAdmin = appendUser.role.includes('admin') && appendUser.permission.length === 0;\n\n return appendUser;\n}\n","import { qsStringify } from '@cloudcome/utils-core/qs';\nimport type { AnyObject } from '@cloudcome/utils-core/types';\n\n/\n HTTP 请求配置选项\n /\nexport type RequestOptions = {\n /\n 请求 URL 地址\n /\n url: string;\n\n /\n URL 查询参数，会自动拼接到 url 后面\n /\n query?: Record<string, string>;\n\n /\n HTTP 请求方法\n * @default 'GET'\n /\n method?: 'GET' \| 'POST' \| 'PUT' \| 'DELETE' \| 'HEAD' \| 'OPTIONS';\n\n /\n 请求头\n /\n headers?: Record<string, string>;\n\n /\n 请求体数据\n /\n data?: AnyObject;\n\n /\n 返回数据格式\n * @default 'json'\n /\n dataType?: string;\n\n /\n 请求内容类型\n * - 'json': application/json\n * - 'form': application/x-www-form-urlencoded\n * @default 'json'\n /\n contentType?: string;\n\n /\n 请求超时时间，单位毫秒\n * @default 10000\n /\n timeout?: number;\n};\n\n/\n 发起 HTTP 请求\n \n 基于 uniCloud.httpclient 发起 HTTP 请求，支持 GET、POST、PUT、DELETE 等方法。\n * 查询参数会自动通过 qsStringify 拼接到 URL 上。\n \n @template T - 响应数据的类型\n * @param options 请求配置选项\n * @returns 包含 data、status、headers 的响应对象\n \n @example\n * ```ts\n * // GET 请求\n * const res = await request<{ name: string }>({\n * url: 'https://api.example.com/users/1',\n * })\n * console.log(res.data) // { name: 'Alice' }\n * console.log(res.status) // 200\n \n // POST 请求\n * const res = await request<{ id: string }>({\n * url: 'https://api.example.com/users',\n * method: 'POST',\n * data: { name: 'Alice', age: 25 },\n * })\n \n // 带查询参数\n * const res = await request<{ list: any[] }>({\n * url: 'https://api.example.com/users',\n * query: { page: '1', size: '10' },\n * })\n * ```\n */\nexport async function request<T>(options: RequestOptions) {\n const {\n url,\n query = {},\n method = 'GET',\n headers = {},\n data,\n dataType = 'json',\n contentType = 'json',\n timeout = 10000,\n } = options;\n\n const fullUrl = `${url}?${qsStringify(query)}`;\n\n // 使用uniCloud.httpclient发起请求\n // @ts-expect-error: uniCloud类型定义中可能缺少httpclient属性\n const res = await uniCloud.httpclient.request(fullUrl, {\n method,\n headers,\n data,\n dataType,\n contentType,\n timeout,\n });\n\n return res as { data: T; status: number; headers: Record<string, string> };\n}\n"],"mappings":"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"}

package/dist/cloud.mjs CHANGED Viewed

@@ -50,33 +50,33 @@ function parseCloudModuleOutput(output, fallbackErrorMessage = "") {
 *
 * @template O - 函数返回值的类型
 * @param fn - 要执行的异步函数
-* @param append - 要附加到响应中的额外数据
+* @param options - 可选配置
+* @param options.append - 要附加到响应中的额外数据
+* @param options.parseError - 自定义错误处理函数
 * @returns 标准化的云对象响应对象
 *
 * @example
 * ```typescript
 * const result = await respondCloudMethod(async () => {
 *   return await getData();
-* }, { extra: 'data' });
+* }, { append: { extra: 'data' } });
 * ```
 */
-async function respondCloudMethod(fn, append) {
+async function respondCloudMethod(fn, options) {
 	try {
 		return {
 			errCode: 0,
 			errMsg: "",
 			data: await fn(),
-			...append
+			...options?.append
 		};
 	} catch (err) {
-		console.error("respondCloudObject error");
-		console.error(err);
-		const err2 = errorNormalize(err);
+		const err3 = options?.parseError?.(err) || errorNormalize(err);
 		return {
-			errCode: err2.errCode || -1,
-			errMsg: err2.errMsg || err2.message || "",
+			errCode: err3.errCode ?? -1,
+			errMsg: err3.errMsg || err3.message || "",
 			data: null,
-			...append
+			...options?.append
 		};
 	}
 }
@@ -139,7 +139,10 @@ function buildCloudMethodCreator(options) {
 				return await arg1(context, parsed.data);
 			};
 			if (createOptions.noRespond) return await cloudMethod();
-			return await respondCloudMethod(cloudMethod, buildOptions.respondAppend(this));
+			return await respondCloudMethod(cloudMethod, {
+				append: buildOptions.respondAppend(this),
+				parseError: buildOptions.parseError
+			});
 		};
 	};
 	return createCloudMethod;

package/dist/cloud.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cloud.mjs","names":[],"sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.ts","../src/cloud/request.ts"],"sourcesContent":["import { errorAssign } from '@cloudcome/utils-core/error';\n\nexport function createCloudObjectError(message: string, code?: number \| string) {\n return errorAssign(new Error(message), {\n errCode: code,\n errMsg: message,\n });\n}\n","import { objectOmit } from '@cloudcome/utils-core/object';\nimport { createCloudObjectError } from './error';\nimport type { CloudModuleOutput } from './types';\n\n/*\n 解析云模块输出结果\n \n 该函数用于处理云模块的输出，如果输出中包含错误码，则抛出相应的错误；\n * 否则返回去除错误码和错误信息后的数据部分。\n \n @template O - 输出数据的类型\n * @param output - 云模块的输出结果，包含errCode、errMsg和数据部分\n * @param fallbackErrorMessage - 当输出中没有错误信息时使用的默认错误消息\n * @returns 返回去除errCode和errMsg字段后的数据对象\n * @throws {CloudObjectError} 当output中存在errCode时抛出包含错误码和错误信息的异常\n \n @example\n * // 成功情况\n * const result = parseCloudModuleOutput({ value: 'success', errCode: 0, errMsg: '' });\n * // 返回: { value: 'success' }\n \n @example\n * // 错误情况\n * try {\n * parseCloudModuleOutput({ errCode: 404, errMsg: 'Not Found' });\n * } catch (error) {\n * // 抛出错误: CloudObjectError('Not Found', 404)\n * }\n /\nexport function parseCloudModuleOutput<O>(\n output: CloudModuleOutput<O>,\n fallbackErrorMessage = '',\n): Omit<O, 'errCode' \| 'errMsg'> {\n if (output.errCode) {\n throw createCloudObjectError(output.errMsg \|\| fallbackErrorMessage, output.errCode);\n }\n return objectOmit(output, ['errCode', 'errMsg']);\n}\n","import { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport type { UniError } from '@/_types';\nimport type { CloudMethodOutput } from './types';\n\n/\n 执行云对象方法并标准化响应格式\n \n @template O - 函数返回值的类型\n * @param fn - 要执行的异步函数\n * @param append - 要附加到响应中的额外数据\n * @returns 标准化的云对象响应对象\n \n @example\n * ```typescript\n * const result = await respondCloudMethod(async () => {\n * return await getData();\n * }, { extra: 'data' });\n * ```\n /\nexport async function respondCloudMethod<O>(\n fn: () => MaybePromise<O>,\n append?: AnyObject,\n): Promise<CloudMethodOutput<O>> {\n try {\n const data = await fn();\n\n return {\n errCode: 0,\n errMsg: '',\n data,\n ...append,\n };\n } catch (err) {\n console.error('respondCloudObject error');\n console.error(err);\n\n const err2 = errorNormalize(err as UniError);\n\n return {\n errCode: err2.errCode \|\| -1,\n errMsg: err2.errMsg \|\| err2.message \|\| '',\n // @ts-expect-error\n data: null,\n ...append,\n };\n }\n}\n","import { objectDefaults } from '@cloudcome/utils-core/object';\nimport { tryFlatten } from '@cloudcome/utils-core/try';\nimport { isFunction } from '@cloudcome/utils-core/type';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport { versionCompare } from '@cloudcome/utils-core/version';\nimport type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\ntype _CloudObjectThisAppendUser = {\n id: string;\n role: string[];\n permission: string[];\n isAdmin: boolean;\n};\n\n/\n 云对象创建选项的运行时解析类型。\n \n 将 `CreateCloudObjectOptions` 中的内置字段设为必填（已应用默认值），\n * 同时保留 `ExtraConfig` 扩展字段的原始可选性。\n \n @template ExtraConfig - 自定义扩展配置类型\n /\ntype _ResolvedCreateCloudOptions<ExtraConfig extends AnyObject = {}> = ExtraConfig & {\n /* 是否需要用户登录态 /\n requiredUser: boolean;\n /* 是否仅在本地环境运行 /\n onlyLocalEnv: boolean;\n /* 最小支持版本 /\n minVersion?: string;\n /* 最大支持版本 /\n maxVersion?: string;\n /* 非响应模式，常用于钩子函数中 /\n noRespond?: boolean;\n};\n\ntype _CloudObjectThisAppend<ExtraConfig extends AnyObject = {}> = {\n options: _ResolvedCreateCloudOptions<ExtraConfig>;\n user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext<ExtraConfig extends AnyObject = {}> = CloudObjectThis &\n _CloudObjectThisAppend<ExtraConfig>;\n\nexport type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> = {\n /\n UniId 通用模块\n * 用于处理用户身份验证和权限管理\n * 如果提供，将在云对象执行前验证用户身份\n /\n uniIdCommonModule?: UniIdCommonModule;\n\n /\n 需要用户登录态的错误码\n * @default 'uni-id-check-token-failed'\n /\n requiredUserErrCode?: number \| string;\n\n /\n 需要用户登录态的错误消息\n * @default '需要登录后才能进行此操作'\n /\n requiredUserErrMsg?: string;\n\n /\n 仅允许本地环境运行的错误消息\n * @default '运行环境不匹配'\n /\n onlyLocalEnvErrMsg?: string;\n\n /\n 版本不匹配错误消息\n * @default '应用版本过低'\n /\n appVersionTooLowErrMsg?: string;\n\n /\n 应用版本过高错误消息\n * @default '应用版本过高'\n /\n appVersionTooHighErrMsg?: string;\n\n /\n 响应附加数据函数\n * 用于在云对象响应中添加额外的上下文信息\n * @param objectThis 云对象上下文\n * @returns 返回要附加到响应中的数据对象\n /\n respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n\n /\n 所有云对象执行前钩子函数\n * @param context 云对象上下文，包含用户信息、扩展配置选项等\n * @param options 云对象创建选项，包含 requiredUser、onlyLocalEnv 及自定义扩展配置\n /\n onBefore?: (\n context: CloudObjectContext<ExtraConfig>,\n options: _ResolvedCreateCloudOptions<ExtraConfig>,\n ) => MaybePromise<unknown>;\n};\n\nexport type CreateCloudObjectOptions<ExtraConfig extends object = object> = ExtraConfig & {\n /\n 是否需要用户登录态\n * @default false\n /\n requiredUser?: boolean;\n\n /\n 是否仅在本地环境运行\n * @default false\n /\n onlyLocalEnv?: boolean;\n\n /\n 最小支持版本\n /\n minVersion?: string;\n\n /\n 最大支持版本\n /\n maxVersion?: string;\n\n /\n 非响应模式，常用于钩子函数中，如 _before, _after 等，\n * 文档：https://doc.dcloud.net.cn/uniCloud/cloud-obj.html#before-and-after\n /\n noRespond?: boolean;\n};\n\nexport type CreateCloudMethod<ExtraConfig extends object = object> = {\n <S extends ZodObject, O>(\n schema: S,\n fn: (context: CloudObjectContext<ExtraConfig>, input: z.infer<S>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<z.infer<S>, O>;\n\n <O>(\n fn: (context: CloudObjectContext<ExtraConfig>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<void, O>;\n};\n\n/\n 构建云对象方法创建器\n \n 该函数用于创建云对象方法的工厂函数，支持输入验证、用户身份验证、环境检查等功能。\n * 返回的创建器函数可以根据不同的配置创建云对象方法。\n \n @param options 构建选项，用于配置云对象方法创建器的行为\n * @returns 返回一个云对象方法创建器函数\n \n @example\n * // 创建一个需要用户登录的云对象方法\n * const createMethod = buildCloudMethodCreator({ uniIdCommonModule });\n * const myMethod = createMethod(async (context) => {\n * return { message: 'Hello ' + context.user.id };\n * }, { requiredUser: true });\n /\nexport function buildCloudMethodCreator<ExtraConfig extends AnyObject = {}>(\n options?: BuildCloudMethodCreatorOptions<ExtraConfig>,\n) {\n const buildOptions = objectDefaults(options \|\| {}, {\n requiredUserErrCode: 'uni-id-check-token-failed',\n requiredUserErrMsg: '需要登录后才能进行此操作',\n onlyLocalEnvErrMsg: '运行环境不匹配',\n appVersionTooLowErrMsg: '应用版本过低',\n appVersionTooHighErrMsg: '应用版本过高',\n respondAppend: () => ({}),\n onBefore: () => {},\n }) as Required<BuildCloudMethodCreatorOptions>;\n\n // @ts-expect-error\n const createCloudMethod: CreateCloudMethod<ExtraConfig> = (arg0, arg1, arg2) => {\n const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions<ExtraConfig> \| undefined;\n const createOptions = objectDefaults(optionsSource \|\| {}, {\n requiredUser: false,\n onlyLocalEnv: false,\n }) as _ResolvedCreateCloudOptions<ExtraConfig>;\n\n return async function (this: CloudObjectThis, input) {\n const cloudMethod = async () => {\n const { runtimeEnv } = this.getCloudInfo();\n\n if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n }\n\n const { appVersion } = this.getClientInfo();\n\n if (createOptions.minVersion && versionCompare(appVersion, createOptions.minVersion) < 0) {\n throw createCloudObjectError(buildOptions.appVersionTooLowErrMsg);\n }\n\n if (createOptions.maxVersion && versionCompare(appVersion, createOptions.maxVersion) > 0) {\n throw createCloudObjectError(buildOptions.appVersionTooHighErrMsg);\n }\n\n const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n const append: _CloudObjectThisAppend<ExtraConfig> = {\n options: createOptions,\n user: user,\n };\n const context = Object.assign(this, append) as CloudObjectContext<ExtraConfig>;\n\n if (createOptions.requiredUser && !user.id) {\n throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n }\n\n await buildOptions.onBefore(context, createOptions);\n\n if (isFunction(arg0)) {\n return await arg0(context);\n }\n\n const parsed = arg0.safeParse(input);\n\n if (!parsed.success) {\n console.log(parsed.error.issues);\n\n const issue0 = parsed.error?.issues?.[0];\n\n if (issue0?.code === 'custom') throw issue0.message;\n throw new Error('请求数据不正确');\n }\n\n return await arg1(context, parsed.data);\n };\n\n if (createOptions.noRespond) {\n return await cloudMethod();\n }\n\n return await respondCloudMethod(cloudMethod, buildOptions.respondAppend(this));\n };\n };\n\n return createCloudMethod;\n}\n\n/\n 解析并附加用户信息到云对象上下文\n \n 该函数用于验证用户身份并获取用户权限信息，将结果附加到云对象上下文中的user字段\n * 如果未提供uniIdCommonModule或验证失败，则返回默认的空用户信息\n \n @param objectThis 云对象上下文，包含客户端信息和token等\n * @param uniIdCommonModule 可选的UniId通用模块实例，用于验证用户token\n * @returns 返回包含用户ID、角色、权限等信息的对象\n \n @example\n * // 成功验证用户身份\n * const user = await _parseAppendUser(this, uniIdModule);\n * // 返回: { id: 'user123', role: ['user'], permission: ['read'], isAdmin: false }\n \n @example\n * // 验证失败或未提供模块\n * const user = await _parseAppendUser(this);\n * // 返回: { id: '', role: [], permission: [], isAdmin: false }\n /\nasync function _parseAppendUser(\n objectThis: CloudObjectThis,\n uniIdCommonModule?: UniIdCommonModule,\n): Promise<_CloudObjectThisAppendUser> {\n const appendUser: _CloudObjectThisAppendUser = {\n id: '',\n role: [],\n permission: [],\n isAdmin: false,\n };\n\n if (!uniIdCommonModule) return appendUser;\n\n const uic = uniIdCommonModule.createInstance({\n clientInfo: objectThis.getClientInfo(),\n });\n\n const [_err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() \|\| ''));\n if (!user) return appendUser;\n\n const [_err2, userData] = tryFlatten(() => parseCloudModuleOutput(user));\n if (!userData) return appendUser;\n\n appendUser.id = userData.uid \|\| '';\n appendUser.role = userData.role \|\| [];\n appendUser.permission = userData.permission \|\| [];\n appendUser.isAdmin = appendUser.role.includes('admin') && appendUser.permission.length === 0;\n\n return appendUser;\n}\n","import { qsStringify } from '@cloudcome/utils-core/qs';\nimport type { AnyObject } from '@cloudcome/utils-core/types';\n\n/\n HTTP 请求配置选项\n /\nexport type RequestOptions = {\n /\n 请求 URL 地址\n /\n url: string;\n\n /\n URL 查询参数，会自动拼接到 url 后面\n /\n query?: Record<string, string>;\n\n /\n HTTP 请求方法\n * @default 'GET'\n /\n method?: 'GET' \| 'POST' \| 'PUT' \| 'DELETE' \| 'HEAD' \| 'OPTIONS';\n\n /\n 请求头\n /\n headers?: Record<string, string>;\n\n /\n 请求体数据\n /\n data?: AnyObject;\n\n /\n 返回数据格式\n * @default 'json'\n /\n dataType?: string;\n\n /\n 请求内容类型\n * - 'json': application/json\n * - 'form': application/x-www-form-urlencoded\n * @default 'json'\n /\n contentType?: string;\n\n /\n 请求超时时间，单位毫秒\n * @default 10000\n /\n timeout?: number;\n};\n\n/\n 发起 HTTP 请求\n \n 基于 uniCloud.httpclient 发起 HTTP 请求，支持 GET、POST、PUT、DELETE 等方法。\n * 查询参数会自动通过 qsStringify 拼接到 URL 上。\n \n @template T - 响应数据的类型\n * @param options 请求配置选项\n * @returns 包含 data、status、headers 的响应对象\n \n @example\n * ```ts\n * // GET 请求\n * const res = await request<{ name: string }>({\n * url: 'https://api.example.com/users/1',\n * })\n * console.log(res.data) // { name: 'Alice' }\n * console.log(res.status) // 200\n \n // POST 请求\n * const res = await request<{ id: string }>({\n * url: 'https://api.example.com/users',\n * method: 'POST',\n * data: { name: 'Alice', age: 25 },\n * })\n \n // 带查询参数\n * const res = await request<{ list: any[] }>({\n * url: 'https://api.example.com/users',\n * query: { page: '1', size: '10' },\n * })\n * ```\n */\nexport async function request<T>(options: RequestOptions) {\n const {\n url,\n query = {},\n method = 'GET',\n headers = {},\n data,\n dataType = 'json',\n contentType = 'json',\n timeout = 10000,\n } = options;\n\n const fullUrl = `${url}?${qsStringify(query)}`;\n\n // 使用uniCloud.httpclient发起请求\n // @ts-expect-error: uniCloud类型定义中可能缺少httpclient属性\n const res = await uniCloud.httpclient.request(fullUrl, {\n method,\n headers,\n data,\n dataType,\n contentType,\n timeout,\n });\n\n return res as { data: T; status: number; headers: Record<string, string> };\n}\n"],"mappings":"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"}
1	+ {"version":3,"file":"cloud.mjs","names":[],"sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.ts","../src/cloud/request.ts"],"sourcesContent":["import { errorAssign } from '@cloudcome/utils-core/error';\n\nexport function createCloudObjectError(message: string, code?: number \| string) {\n return errorAssign(new Error(message), {\n errCode: code,\n errMsg: message,\n });\n}\n","import { objectOmit } from '@cloudcome/utils-core/object';\nimport { createCloudObjectError } from './error';\nimport type { CloudModuleOutput } from './types';\n\n/*\n 解析云模块输出结果\n \n 该函数用于处理云模块的输出，如果输出中包含错误码，则抛出相应的错误；\n * 否则返回去除错误码和错误信息后的数据部分。\n \n @template O - 输出数据的类型\n * @param output - 云模块的输出结果，包含errCode、errMsg和数据部分\n * @param fallbackErrorMessage - 当输出中没有错误信息时使用的默认错误消息\n * @returns 返回去除errCode和errMsg字段后的数据对象\n * @throws {CloudObjectError} 当output中存在errCode时抛出包含错误码和错误信息的异常\n \n @example\n * // 成功情况\n * const result = parseCloudModuleOutput({ value: 'success', errCode: 0, errMsg: '' });\n * // 返回: { value: 'success' }\n \n @example\n * // 错误情况\n * try {\n * parseCloudModuleOutput({ errCode: 404, errMsg: 'Not Found' });\n * } catch (error) {\n * // 抛出错误: CloudObjectError('Not Found', 404)\n * }\n /\nexport function parseCloudModuleOutput<O>(\n output: CloudModuleOutput<O>,\n fallbackErrorMessage = '',\n): Omit<O, 'errCode' \| 'errMsg'> {\n if (output.errCode) {\n throw createCloudObjectError(output.errMsg \|\| fallbackErrorMessage, output.errCode);\n }\n return objectOmit(output, ['errCode', 'errMsg']);\n}\n","import { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise, AnyObject } from '@cloudcome/utils-core/types';\nimport type { UniError } from '@/_types';\nimport type { CloudMethodOutput } from './types';\n\nexport type RespondCloudMethodOptions = {\n /* 要附加到响应中的额外数据 /\n append?: AnyObject;\n /\n 自定义错误处理函数\n * @param err {unknown} 错误\n * @returns 处理后的错误对象，其 errCode/errMsg 将被用于响应\n /\n parseError?: (err: unknown) => UniError;\n};\n\n/\n 执行云对象方法并标准化响应格式\n \n @template O - 函数返回值的类型\n * @param fn - 要执行的异步函数\n * @param options - 可选配置\n * @param options.append - 要附加到响应中的额外数据\n * @param options.parseError - 自定义错误处理函数\n * @returns 标准化的云对象响应对象\n \n @example\n * ```typescript\n * const result = await respondCloudMethod(async () => {\n * return await getData();\n * }, { append: { extra: 'data' } });\n * ```\n /\nexport async function respondCloudMethod<O>(\n fn: () => MaybePromise<O>,\n options?: RespondCloudMethodOptions,\n): Promise<CloudMethodOutput<O>> {\n try {\n const data = await fn();\n\n return {\n errCode: 0,\n errMsg: '',\n data,\n ...options?.append,\n };\n } catch (err) {\n const err3 = options?.parseError?.(err) \|\| (errorNormalize(err) as UniError);\n\n return {\n errCode: err3.errCode ?? -1,\n errMsg: err3.errMsg \|\| err3.message \|\| '',\n // @ts-expect-error\n data: null,\n ...options?.append,\n };\n }\n}\n","import { objectDefaults } from '@cloudcome/utils-core/object';\nimport { tryFlatten } from '@cloudcome/utils-core/try';\nimport { isFunction } from '@cloudcome/utils-core/type';\nimport type { MaybePromise, AnyObject } from '@cloudcome/utils-core/types';\nimport { versionCompare } from '@cloudcome/utils-core/version';\nimport type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport type { UniError } from '@/_types';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\ntype _CloudObjectThisAppendUser = {\n id: string;\n role: string[];\n permission: string[];\n isAdmin: boolean;\n};\n\n/\n 云对象创建选项的运行时解析类型。\n \n 将 `CreateCloudObjectOptions` 中的内置字段设为必填（已应用默认值），\n * 同时保留 `ExtraConfig` 扩展字段的原始可选性。\n \n @template ExtraConfig - 自定义扩展配置类型\n /\ntype _ResolvedCreateCloudOptions<ExtraConfig extends AnyObject = {}> = ExtraConfig & {\n /* 是否需要用户登录态 /\n requiredUser: boolean;\n /* 是否仅在本地环境运行 /\n onlyLocalEnv: boolean;\n /* 最小支持版本 /\n minVersion?: string;\n /* 最大支持版本 /\n maxVersion?: string;\n /* 非响应模式，常用于钩子函数中 /\n noRespond?: boolean;\n};\n\ntype _CloudObjectThisAppend<ExtraConfig extends AnyObject = {}> = {\n options: _ResolvedCreateCloudOptions<ExtraConfig>;\n user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext<ExtraConfig extends AnyObject = {}> = CloudObjectThis &\n _CloudObjectThisAppend<ExtraConfig>;\n\nexport type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> = {\n /\n UniId 通用模块\n * 用于处理用户身份验证和权限管理\n * 如果提供，将在云对象执行前验证用户身份\n /\n uniIdCommonModule?: UniIdCommonModule;\n\n /\n 需要用户登录态的错误码\n * @default 'uni-id-check-token-failed'\n /\n requiredUserErrCode?: number \| string;\n\n /\n 需要用户登录态的错误消息\n * @default '需要登录后才能进行此操作'\n /\n requiredUserErrMsg?: string;\n\n /\n 仅允许本地环境运行的错误消息\n * @default '运行环境不匹配'\n /\n onlyLocalEnvErrMsg?: string;\n\n /\n 版本不匹配错误消息\n * @default '应用版本过低'\n /\n appVersionTooLowErrMsg?: string;\n\n /\n 应用版本过高错误消息\n * @default '应用版本过高'\n /\n appVersionTooHighErrMsg?: string;\n\n /\n 响应附加数据函数\n * 用于在云对象响应中添加额外的上下文信息\n * @param objectThis 云对象上下文\n * @returns 返回要附加到响应中的数据对象\n /\n respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n\n /\n 自定义错误处理函数\n * 用于在云对象响应中处理错误信息，如脱敏、转换错误码等\n * @param err 原始错误对象\n * @returns 处理后的错误对象，其 errCode/errMsg 将被用于响应\n /\n parseError?: (err: unknown) => UniError;\n\n /\n 所有云对象执行前钩子函数\n * @param context 云对象上下文，包含用户信息、扩展配置选项等\n * @param options 云对象创建选项，包含 requiredUser、onlyLocalEnv 及自定义扩展配置\n /\n onBefore?: (\n context: CloudObjectContext<ExtraConfig>,\n options: _ResolvedCreateCloudOptions<ExtraConfig>,\n ) => MaybePromise<unknown>;\n};\n\nexport type CreateCloudObjectOptions<ExtraConfig extends AnyObject = AnyObject> = ExtraConfig & {\n /\n 是否需要用户登录态\n * @default false\n /\n requiredUser?: boolean;\n\n /\n 是否仅在本地环境运行\n * @default false\n /\n onlyLocalEnv?: boolean;\n\n /\n 最小支持版本\n /\n minVersion?: string;\n\n /\n 最大支持版本\n /\n maxVersion?: string;\n\n /\n 非响应模式，常用于钩子函数中，如 _before, _after 等，\n * 文档：https://doc.dcloud.net.cn/uniCloud/cloud-obj.html#before-and-after\n /\n noRespond?: boolean;\n};\n\nexport type CreateCloudMethod<ExtraConfig extends AnyObject = AnyObject> = {\n <S extends ZodObject, O>(\n schema: S,\n fn: (context: CloudObjectContext<ExtraConfig>, input: z.infer<S>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<z.infer<S>, O>;\n\n <O>(\n fn: (context: CloudObjectContext<ExtraConfig>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<void, O>;\n};\n\n/\n 构建云对象方法创建器\n \n 该函数用于创建云对象方法的工厂函数，支持输入验证、用户身份验证、环境检查等功能。\n * 返回的创建器函数可以根据不同的配置创建云对象方法。\n \n @param options 构建选项，用于配置云对象方法创建器的行为\n * @returns 返回一个云对象方法创建器函数\n \n @example\n * // 创建一个需要用户登录的云对象方法\n * const createMethod = buildCloudMethodCreator({ uniIdCommonModule });\n * const myMethod = createMethod(async (context) => {\n * return { message: 'Hello ' + context.user.id };\n * }, { requiredUser: true });\n /\nexport function buildCloudMethodCreator<ExtraConfig extends AnyObject = {}>(\n options?: BuildCloudMethodCreatorOptions<ExtraConfig>,\n) {\n const buildOptions = objectDefaults(options \|\| {}, {\n requiredUserErrCode: 'uni-id-check-token-failed',\n requiredUserErrMsg: '需要登录后才能进行此操作',\n onlyLocalEnvErrMsg: '运行环境不匹配',\n appVersionTooLowErrMsg: '应用版本过低',\n appVersionTooHighErrMsg: '应用版本过高',\n respondAppend: () => ({}),\n onBefore: () => {},\n }) as Required<BuildCloudMethodCreatorOptions>;\n\n // @ts-expect-error\n const createCloudMethod: CreateCloudMethod<ExtraConfig> = (arg0, arg1, arg2) => {\n const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions<ExtraConfig> \| undefined;\n const createOptions = objectDefaults(optionsSource \|\| {}, {\n requiredUser: false,\n onlyLocalEnv: false,\n }) as _ResolvedCreateCloudOptions<ExtraConfig>;\n\n return async function (this: CloudObjectThis, input) {\n const cloudMethod = async () => {\n const { runtimeEnv } = this.getCloudInfo();\n\n if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n }\n\n const { appVersion } = this.getClientInfo();\n\n if (createOptions.minVersion && versionCompare(appVersion, createOptions.minVersion) < 0) {\n throw createCloudObjectError(buildOptions.appVersionTooLowErrMsg);\n }\n\n if (createOptions.maxVersion && versionCompare(appVersion, createOptions.maxVersion) > 0) {\n throw createCloudObjectError(buildOptions.appVersionTooHighErrMsg);\n }\n\n const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n const append: _CloudObjectThisAppend<ExtraConfig> = {\n options: createOptions,\n user: user,\n };\n const context = Object.assign(this, append) as CloudObjectContext<ExtraConfig>;\n\n if (createOptions.requiredUser && !user.id) {\n throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n }\n\n await buildOptions.onBefore(context, createOptions);\n\n if (isFunction(arg0)) {\n return await arg0(context);\n }\n\n const parsed = arg0.safeParse(input);\n\n if (!parsed.success) {\n console.log(parsed.error.issues);\n\n const issue0 = parsed.error?.issues?.[0];\n\n if (issue0?.code === 'custom') throw issue0.message;\n throw new Error('请求数据不正确');\n }\n\n return await arg1(context, parsed.data);\n };\n\n if (createOptions.noRespond) {\n return await cloudMethod();\n }\n\n return await respondCloudMethod(cloudMethod, {\n append: buildOptions.respondAppend(this),\n parseError: buildOptions.parseError,\n });\n };\n };\n\n return createCloudMethod;\n}\n\n/\n 解析并附加用户信息到云对象上下文\n \n 该函数用于验证用户身份并获取用户权限信息，将结果附加到云对象上下文中的user字段\n * 如果未提供uniIdCommonModule或验证失败，则返回默认的空用户信息\n \n @param objectThis 云对象上下文，包含客户端信息和token等\n * @param uniIdCommonModule 可选的UniId通用模块实例，用于验证用户token\n * @returns 返回包含用户ID、角色、权限等信息的对象\n \n @example\n * // 成功验证用户身份\n * const user = await _parseAppendUser(this, uniIdModule);\n * // 返回: { id: 'user123', role: ['user'], permission: ['read'], isAdmin: false }\n \n @example\n * // 验证失败或未提供模块\n * const user = await _parseAppendUser(this);\n * // 返回: { id: '', role: [], permission: [], isAdmin: false }\n /\nasync function _parseAppendUser(\n objectThis: CloudObjectThis,\n uniIdCommonModule?: UniIdCommonModule,\n): Promise<_CloudObjectThisAppendUser> {\n const appendUser: _CloudObjectThisAppendUser = {\n id: '',\n role: [],\n permission: [],\n isAdmin: false,\n };\n\n if (!uniIdCommonModule) return appendUser;\n\n const uic = uniIdCommonModule.createInstance({\n clientInfo: objectThis.getClientInfo(),\n });\n\n const [_err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() \|\| ''));\n if (!user) return appendUser;\n\n const [_err2, userData] = tryFlatten(() => parseCloudModuleOutput(user));\n if (!userData) return appendUser;\n\n appendUser.id = userData.uid \|\| '';\n appendUser.role = userData.role \|\| [];\n appendUser.permission = userData.permission \|\| [];\n appendUser.isAdmin = appendUser.role.includes('admin') && appendUser.permission.length === 0;\n\n return appendUser;\n}\n","import { qsStringify } from '@cloudcome/utils-core/qs';\nimport type { AnyObject } from '@cloudcome/utils-core/types';\n\n/\n HTTP 请求配置选项\n /\nexport type RequestOptions = {\n /\n 请求 URL 地址\n /\n url: string;\n\n /\n URL 查询参数，会自动拼接到 url 后面\n /\n query?: Record<string, string>;\n\n /\n HTTP 请求方法\n * @default 'GET'\n /\n method?: 'GET' \| 'POST' \| 'PUT' \| 'DELETE' \| 'HEAD' \| 'OPTIONS';\n\n /\n 请求头\n /\n headers?: Record<string, string>;\n\n /\n 请求体数据\n /\n data?: AnyObject;\n\n /\n 返回数据格式\n * @default 'json'\n /\n dataType?: string;\n\n /\n 请求内容类型\n * - 'json': application/json\n * - 'form': application/x-www-form-urlencoded\n * @default 'json'\n /\n contentType?: string;\n\n /\n 请求超时时间，单位毫秒\n * @default 10000\n /\n timeout?: number;\n};\n\n/\n 发起 HTTP 请求\n \n 基于 uniCloud.httpclient 发起 HTTP 请求，支持 GET、POST、PUT、DELETE 等方法。\n * 查询参数会自动通过 qsStringify 拼接到 URL 上。\n \n @template T - 响应数据的类型\n * @param options 请求配置选项\n * @returns 包含 data、status、headers 的响应对象\n \n @example\n * ```ts\n * // GET 请求\n * const res = await request<{ name: string }>({\n * url: 'https://api.example.com/users/1',\n * })\n * console.log(res.data) // { name: 'Alice' }\n * console.log(res.status) // 200\n \n // POST 请求\n * const res = await request<{ id: string }>({\n * url: 'https://api.example.com/users',\n * method: 'POST',\n * data: { name: 'Alice', age: 25 },\n * })\n \n // 带查询参数\n * const res = await request<{ list: any[] }>({\n * url: 'https://api.example.com/users',\n * query: { page: '1', size: '10' },\n * })\n * ```\n */\nexport async function request<T>(options: RequestOptions) {\n const {\n url,\n query = {},\n method = 'GET',\n headers = {},\n data,\n dataType = 'json',\n contentType = 'json',\n timeout = 10000,\n } = options;\n\n const fullUrl = `${url}?${qsStringify(query)}`;\n\n // 使用uniCloud.httpclient发起请求\n // @ts-expect-error: uniCloud类型定义中可能缺少httpclient属性\n const res = await uniCloud.httpclient.request(fullUrl, {\n method,\n headers,\n data,\n dataType,\n contentType,\n timeout,\n });\n\n return res as { data: T; status: number; headers: Record<string, string> };\n}\n"],"mappings":"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"}

package/dist/database/_db.class.d.ts CHANGED Viewed

@@ -89,7 +89,6 @@ export declare class Db<D1, S1 extends DbSelect<D1> = {}, D2 extends AnyObject =
     private _hasWhere;
     private _hasWhereId;
     private _where;
-    private _doWhere;
     /**
      * 设置查询条件
      * @param where 查询条件对象

package/dist/database.cjs CHANGED Viewed

@@ -317,26 +317,21 @@ var Db = class Db {
 	_createAggregate() {
 		return this._createHost().aggregate();
 	}
-	_hasWhere = void 0;
-	_hasWhereId = void 0;
+	_hasWhere = false;
+	_hasWhereId = false;
 	_where = {};
-	_doWhere(where, from) {
-		if (this._hasWhere) throw new Error(`已调用过一次 db.${_toWhereMethod(this._hasWhere)} 了`);
-		const realWhere = (0, _cloudcome_utils_core_object.objectFilter)(where, (value) => value !== void 0);
-		const isWhereId = Object.keys(realWhere).length === 1 && "_id" in realWhere && ((0, _cloudcome_utils_core_type.isString)(realWhere._id) || (0, _cloudcome_utils_core_type.isNumber)(realWhere._id));
-		if (isWhereId && this._hasLimit) throw new Error(`db.${_toWhereIdMethod(from)} 方法不能与 db.limit() 方法同时调用`);
-		this._hasWhere = from;
-		this._where = realWhere;
-		if (isWhereId) this._hasWhereId = from;
-		return this;
-	}
 	/**
 	* 设置查询条件
 	* @param where 查询条件对象
 	* @returns 当前Db实例，支持链式调用
 	*/
 	where(where) {
-		return this._doWhere(where, "where");
+		if (this._isTransaction) throw new Error("事务模式下请使用 whereId() 方法");
+		if (this._hasWhere) throw new Error("已调用过一次 db.where({...}) 或 db.whereId(id) 了");
+		const realWhere = (0, _cloudcome_utils_core_object.objectFilter)(where, (value) => value !== void 0);
+		this._hasWhere = true;
+		this._where = realWhere;
+		return this;
 	}
 	/**
 	* 获取当前查询条件
@@ -352,7 +347,12 @@ var Db = class Db {
 	* @returns 当前Db实例，支持链式调用
 	*/
 	whereId(id) {
-		return this._doWhere({ _id: id }, "whereId");
+		if (this._hasWhere) throw new Error("已调用过一次 db.where({...}) 或 db.whereId(id) 了");
+		if (this._hasLimit) throw new Error("db.whereId(id) 方法不能与 db.limit() 方法同时调用");
+		this._hasWhere = true;
+		this._hasWhereId = true;
+		this._where = { _id: id };
+		return this;
 	}
 	_hasSelect = 0;
 	_select = {};
@@ -375,6 +375,7 @@ var Db = class Db {
 	* @returns 当前Db实例，支持链式调用
 	*/
 	order(order) {
+		if (this._isTransaction) throw new Error("db.order() 方法不支持事务模式");
 		this._hasOrder++;
 		this._order = order;
 		return this;
@@ -387,6 +388,7 @@ var Db = class Db {
 	* @returns 当前Db实例，支持链式调用
 	*/
 	skip(skip) {
+		if (this._isTransaction) throw new Error("db.skip() 方法不支持事务模式");
 		if (this._hasSkip) throw new Error("db.skip() 方法只能调用一次");
 		this._hasSkip++;
 		this._skip = skip;
@@ -400,8 +402,9 @@ var Db = class Db {
 	* @returns 当前Db实例，支持链式调用
 	*/
 	limit(limit) {
+		if (this._isTransaction) throw new Error("db.limit() 方法不支持事务模式");
 		if (this._hasLimit) throw new Error("db.limit() 方法只能调用一次");
-		if (this._hasWhereId) throw new Error(`db.limit() 方法不能与 ${_toWhereIdMethod(this._hasWhereId)} 方法同时调用`);
+		if (this._hasWhereId) throw new Error("db.limit() 方法不能与 db.whereId(id) 方法同时调用");
 		this._hasLimit++;
 		this._limit = limit;
 		return this;
@@ -413,6 +416,7 @@ var Db = class Db {
 	* @returns 当前Db实例，支持链式调用
 	*/
 	sample(size) {
+		if (this._isTransaction) throw new Error("db.sample() 方法不支持事务模式");
 		if (this._hasSample) throw new Error("db.sample() 方法只能调用一次");
 		if (this._hasLimit) throw new Error("db.sample() 方法不支持 limit 条件");
 		this._hasSample++;
@@ -425,6 +429,7 @@ var Db = class Db {
 	}
 	_lookups = [];
 	lookup(table, lookup) {
+		if (this._isTransaction) throw new Error("db.lookup() 方法不支持事务模式");
 		table._hasLookup++;
 		this._hasLookup++;
 		this._lookups.push({
@@ -486,8 +491,9 @@ var Db = class Db {
 	_endHost(host, action) {
 		if (this._ending) throw new Error(`相同的数据表实例(${this.table})不能重复使用`);
 		this._ending = true;
+		if (this._isTransaction && (action === "query" || action === "update" || action === "remove") && !this._hasWhereId) throw new Error("事务模式下查询/更新/删除条件只能是 ID，请使用 whereId() 方法");
 		let hostRef = host;
-		if (this._hasWhere) if ((action === "update" || action === "remove") && this._isTransaction) hostRef = hostRef.doc(this._where._id);
+		if (this._hasWhere) if (this._isTransaction && (action === "update" || action === "remove" || action === "query")) hostRef = hostRef.doc(this._where._id);
 		else hostRef = hostRef.where(_mapCommandRaw(this._where));
 		if (this._hasSelect) hostRef = hostRef.field(_mergeSelect(this._select, this._order));
 		if (this._hasOrder) (0, _cloudcome_utils_core_object.objectEach)(this._order, (val, key) => {
@@ -495,7 +501,7 @@ var Db = class Db {
 		});
 		if (this._hasSkip) hostRef = hostRef.skip(this._skip);
 		if (this._hasLimit && action === "query") hostRef = hostRef.limit(this._limit);
-		else if (this._hasWhereId && action === "query") hostRef = hostRef.limit(1);
+		else if (this._hasWhereId && action === "query" && !this._isTransaction) hostRef = hostRef.limit(1);
 		return hostRef;
 	}
 	/**
@@ -531,6 +537,7 @@ var Db = class Db {
 	async many() {
 		try {
 			let res;
+			if (this._isTransaction && (this._hasLookup || this._hasSample)) throw new Error("事务模式下不支持 lookup 聚合或 sample 取样查询");
 			if (this._hasLookup || this._hasSample) {
 				let aggRef = this._createAggregate();
 				aggRef = this._endAggregate(aggRef);
@@ -573,6 +580,7 @@ var Db = class Db {
 	* @returns 记录总数
 	*/
 	async count() {
+		if (this._isTransaction) throw new Error("db.count() 方法不支持事务模式");
 		if (this._hasSample) throw new Error("db.count() 方法不支持 sample 取样");
 		if (this._hasLookup) throw new Error("db.count() 方法不支持 lookup 聚合");
 		if (this._hasSelect) throw new Error("db.count() 方法不支持 select 条件");
@@ -653,12 +661,6 @@ var Db = class Db {
 		}
 	}
 };
-function _toWhereMethod(whereFrom) {
-	return whereFrom === "where" ? "where({...})" : "whereId(id)";
-}
-function _toWhereIdMethod(whereFrom) {
-	return whereFrom === "where" ? "where({ _id })" : "whereId(id)";
-}
 function _mapCommandRaw(data) {
 	const map = (val) => {
 		if (!(0, _cloudcome_utils_core_type.isObject)(val)) return val;