@cloudcome/utils-uni 1.12.0 → 1.14.0

package/dist/cloud.cjs

@@ -11,7 +11,13 @@ function createCloudObjectError(message, code) {
     errMsg: message
   });
 }
-async function respondCloudObject(fn, append) {
+function parseCloudModuleOutput(output, fallbackErrorMessage = "") {
+  if (output.errCode) {
+    throw createCloudObjectError(output.errMsg || fallbackErrorMessage, output.errCode);
+  }
+  return object.objectOmit(output, ["errCode", "errMsg"]);
+}
+async function respondCloudMethod(fn, append) {
   try {
     const data = await fn();
     return {
@@ -33,26 +39,26 @@ async function respondCloudObject(fn, append) {
     };
   }
 }
-function buildCloudObjectExposeCreator(options) {
+function buildCloudMethodCreator(options) {
   const buildOptions = object.objectDefaults(options || {}, {
     requiredUserErrCode: "uni-id-check-token-failed",
     requiredUserErrMsg: "需要登录后才能进行此操作",
     onlyLocalEnvErrMsg: "运行环境不匹配",
     respondAppend: () => ({})
   });
-  const createCloudObjectExpose = (arg0, arg1, arg2) => {
+  const createCloudMethod = (arg0, arg1, arg2) => {
     const optionsSource = type.isFunction(arg0) ? arg1 : arg2;
     const createOptions = object.objectDefaults(optionsSource || {}, {
       requiredUser: false,
       onlyLocalEnv: false
     });
     return async function(input) {
-      return await respondCloudObject(async () => {
+      return await respondCloudMethod(async () => {
         const runtimeEnv = this.getCloudInfo().runtimeEnv;
         if (createOptions.onlyLocalEnv && runtimeEnv !== "local") {
           throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);
         }
-        const user = await parseAppendUser(this, options?.uniIdCommonModule);
+        const user = await _parseAppendUser(this, options?.uniIdCommonModule);
         const append = {
           options: createOptions,
           user
@@ -75,9 +81,9 @@ function buildCloudObjectExposeCreator(options) {
       }, buildOptions.respondAppend(this));
     };
   };
-  return createCloudObjectExpose;
+  return createCloudMethod;
 }
-async function parseAppendUser(objectThis, uniIdCommonModule) {
+async function _parseAppendUser(objectThis, uniIdCommonModule) {
   const appendUser = {
     id: "",
     role: [],
@@ -98,15 +104,9 @@ async function parseAppendUser(objectThis, uniIdCommonModule) {
   appendUser.isAdmin = appendUser.role.includes("admin") && appendUser.permission.length === 0;
   return appendUser;
 }
-function parseCloudModuleOutput(output, fallbackErrorMessage = "") {
-  if (output.errCode) {
-    throw createCloudObjectError(output.errMsg || fallbackErrorMessage, output.errCode);
-  }
-  return object.objectOmit(output, ["errCode", "errMsg"]);
-}
-exports.parseCloudObjectOutput = _helpers.parseCloudObjectOutput;
-exports.buildCloudObjectExposeCreator = buildCloudObjectExposeCreator;
+exports.parseCloudMethodOutput = _helpers.parseCloudMethodOutput;
+exports.buildCloudMethodCreator = buildCloudMethodCreator;
 exports.createCloudObjectError = createCloudObjectError;
 exports.parseCloudModuleOutput = parseCloudModuleOutput;
-exports.respondCloudObject = respondCloudObject;
+exports.respondCloudMethod = respondCloudMethod;
 //# sourceMappingURL=cloud.cjs.map

package/dist/cloud.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"cloud.cjs","sources":["../src/cloud/error.ts","../src/cloud/respond.ts","../src/cloud/expose.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 { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport type { UniCloudObjectOutput } from './types';\n\n/**\n * 处理云函数响应结果，统一返回格式\n * @param fn - 执行函数，可以返回任意类型的值或Promise\n * @param append - 需要附加到响应结果中的额外字段\n * @returns 统一格式的云函数响应结果\n *\n * @example\n * ```typescript\n * // 成功情况\n * const result = await respondCloudObject(async () => {\n *   return { name: 'test', value: 123 };\n * });\n * // 返回: { errCode: 0, errMsg: '', data: { name: 'test', value: 123 } }\n *\n * // 失败情况\n * const result = await respondCloudObject(() => {\n *   throw new Error('操作失败');\n * });\n * // 返回: { errCode: -1, errMsg: '操作失败', data: null }\n * ```\n */\nexport async function respondCloudObject<O>(\n  fn: () => MaybePromise<O>,\n  append?: AnyObject,\n): Promise<UniCloudObjectOutput<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 Error & { errCode?: number | string; errMsg?: string });\n\n    return {\n      errCode: err2.errCode || -1,\n      errMsg: err2.errMsg || err2.message || '',\n      // @ts-ignore\n      data: null,\n      ...append,\n    };\n  }\n}\n","import { parseCloudObjectOutput } from '@/_helpers';\nimport { objectDefaults, objectOmit } 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 type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { respondCloudObject } from './respond';\nimport type { UniCloudModuleOutput, UniCloudObjectExpose, UniCloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\nexport type UniCloudObjectThisAppendUser = {\n  id: string;\n  role: string[];\n  permission: string[];\n  isAdmin: boolean;\n};\n\nexport type UniCloudObjectThisAppend = {\n  options: Required<CreateCloudObjectOptions>;\n  user: UniCloudObjectThisAppendUser;\n};\n\nexport type UniCloudObjectContext = UniCloudObjectThis & UniCloudObjectThisAppend;\n\n/**\n * 构建云函数暴露创建器的选项配置\n * 用于配置云函数暴露创建器的行为，目前支持传入UniIdCloudObject实例\n */\nexport type BuildCloudExposeCreatorOptions = {\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   * 用于在云对象响应中添加额外的上下文信息\n   * @param objectThis 云对象上下文\n   * @returns 返回要附加到响应中的数据对象\n   */\n  respondAppend?: (objectThis: UniCloudObjectThis) => AnyObject;\n};\n\nexport type CreateCloudObjectOptions = {\n  /**\n   * 是否需要用户登录态\n   * @default false\n   */\n  requiredUser?: boolean;\n\n  /**\n   * 是否仅在本地环境运行\n   * @default false\n   */\n  onlyLocalEnv?: boolean;\n};\n\nexport type CreateCloudObjectExpose = {\n  <S extends ZodObject, O>(\n    schema: S,\n    fn: (context: UniCloudObjectContext, input: z.infer<S>) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): UniCloudObjectExpose<z.infer<S>, O>;\n  <O>(\n    fn: (context: UniCloudObjectContext) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): UniCloudObjectExpose<void, O>;\n};\n\n/**\n * 构建云对象暴露创建器\n *\n * 该函数用于创建一个云对象暴露函数，可以处理用户身份验证、输入验证和错误处理等通用逻辑\n *\n * @param options 构建选项配置\n * @param options.uniIdCloudObject 可选的UniIdCloudObject实例，用于处理用户身份验证和权限管理\n * @param options.requiredUserErrCode 需要用户登录态时的错误码，默认为 'uni-id-check-token-failed'\n * @param options.requiredUserErrMsg 需要用户登录态时的错误消息，默认为 '需要登录后才能进行此操作'\n *\n * @returns 返回一个云对象暴露创建函数，支持两种重载形式：\n * 1. 无输入参数的形式：(fn, options) => UniCloudObject\n * 2. 有输入验证的形式：(schema, fn, options) => UniCloudObject\n *\n * @example\n * // 无输入参数的使用方式\n * const expose = buildCloudObjectExposeCreator();\n * export default expose(async (context) => {\n *   // 业务逻辑\n * });\n *\n * @example\n * // 有输入验证的使用方式\n * const expose = buildCloudObjectExposeCreator();\n * const schema = z.object({\n *   name: z.string().min(1)\n * });\n *\n * export default expose(schema, async (context, input) => {\n *   // 业务逻辑，input类型已自动推断\n * });\n */\nexport function buildCloudObjectExposeCreator(options?: BuildCloudExposeCreatorOptions) {\n  const buildOptions = objectDefaults(options || {}, {\n    requiredUserErrCode: 'uni-id-check-token-failed',\n    requiredUserErrMsg: '需要登录后才能进行此操作',\n    onlyLocalEnvErrMsg: '运行环境不匹配',\n    respondAppend: () => ({}),\n  }) as Required<BuildCloudExposeCreatorOptions>;\n\n  // @ts-ignore\n  const createCloudObjectExpose: CreateCloudObjectExpose = (arg0, arg1, arg2) => {\n    // 确定选项来源：如果arg0是函数，则选项在arg1；否则在arg2\n    const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n\n    // 设置默认选项值\n    const createOptions = objectDefaults(optionsSource || {}, {\n      requiredUser: false,\n      onlyLocalEnv: false,\n    }) as Required<CreateCloudObjectOptions>;\n\n    return async function (input) {\n      // 处理云函数响应逻辑，包括错误捕获和统一响应格式\n      return await respondCloudObject(async () => {\n        const runtimeEnv = this.getCloudInfo().runtimeEnv;\n\n        if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n          throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n        }\n\n        // 构建附加的上下文信息，包括用户身份和权限信息\n        const user = await parseAppendUser(this, options?.uniIdCommonModule);\n        const append: UniCloudObjectThisAppend = {\n          options: createOptions,\n          user: user,\n        };\n        const context = Object.assign(this, append) as UniCloudObjectContext;\n\n        // 如果需要用户登录态但用户未登录，则抛出错误\n        if (createOptions.requiredUser && !user.id) {\n          throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n        }\n\n        // 无入参函数调用\n        if (isFunction(arg0)) {\n          return await arg0(context);\n        }\n\n        // 有入参函数调用 - 验证输入数据\n        const parsed = arg0.safeParse(input);\n\n        // 输入验证失败处理\n        if (!parsed.success) {\n          console.log(parsed.error.issues);\n\n          const issue0 = parsed.error?.issues?.[0];\n\n          // 处理自定义验证错误\n          if (issue0?.code === 'custom') throw issue0.message;\n          throw new Error('请求数据不正确');\n        }\n\n        // 执行业务逻辑函数，传入上下文和验证后的数据\n        return await arg1(context, parsed.data);\n      }, buildOptions.respondAppend(this));\n    };\n  };\n\n  return createCloudObjectExpose;\n}\n\nasync function parseAppendUser(\n  objectThis: UniCloudObjectThis,\n  uniIdCommonModule?: UniIdCommonModule,\n): Promise<UniCloudObjectThisAppendUser> {\n  const appendUser: UniCloudObjectThisAppendUser = {\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  // 忽略错误1\n  const [err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() || ''));\n  if (!user) return appendUser;\n\n  // 忽略错误2\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\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: UniCloudModuleOutput<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"],"names":["errorAssign","errorNormalize","objectDefaults","isFunction","tryFlatten","objectOmit"],"mappings":";;;;;;;AAEgB,SAAA,uBAAuB,SAAiB,MAAwB;AAC9E,SAAOA,kBAAY,IAAI,MAAM,OAAO,GAAG;AAAA,IACrC,SAAS;AAAA,IACT,QAAQ;AAAA,EAAA,CACT;AACH;ACkBsB,eAAA,mBACpB,IACA,QACkC;AAC9B,MAAA;AACI,UAAA,OAAO,MAAM,GAAG;AAEf,WAAA;AAAA,MACL,SAAS;AAAA,MACT,QAAQ;AAAA,MACR;AAAA,MACA,GAAG;AAAA,IACL;AAAA,WACO,KAAK;AACZ,YAAQ,MAAM,0BAA0B;AACxC,YAAQ,MAAM,GAAG;AAEX,UAAA,OAAOC,qBAAe,GAA6D;AAElF,WAAA;AAAA,MACL,SAAS,KAAK,WAAW;AAAA,MACzB,QAAQ,KAAK,UAAU,KAAK,WAAW;AAAA;AAAA,MAEvC,MAAM;AAAA,MACN,GAAG;AAAA,IACL;AAAA,EAAA;AAEJ;ACuEO,SAAS,8BAA8B,SAA0C;AACtF,QAAM,eAAeC,OAAAA,eAAe,WAAW,IAAI;AAAA,IACjD,qBAAqB;AAAA,IACrB,oBAAoB;AAAA,IACpB,oBAAoB;AAAA,IACpB,eAAe,OAAO,CAAC;AAAA,EAAA,CACxB;AAGD,QAAM,0BAAmD,CAAC,MAAM,MAAM,SAAS;AAE7E,UAAM,gBAAiBC,KAAA,WAAW,IAAI,IAAI,OAAO;AAGjD,UAAM,gBAAgBD,OAAAA,eAAe,iBAAiB,IAAI;AAAA,MACxD,cAAc;AAAA,MACd,cAAc;AAAA,IAAA,CACf;AAED,WAAO,eAAgB,OAAO;AAErB,aAAA,MAAM,mBAAmB,YAAY;AACpC,cAAA,aAAa,KAAK,aAAA,EAAe;AAEnC,YAAA,cAAc,gBAAgB,eAAe,SAAS;AAClD,gBAAA,uBAAuB,aAAa,kBAAkB;AAAA,QAAA;AAI9D,cAAM,OAAO,MAAM,gBAAgB,MAAM,SAAS,iBAAiB;AACnE,cAAM,SAAmC;AAAA,UACvC,SAAS;AAAA,UACT;AAAA,QACF;AACA,cAAM,UAAU,OAAO,OAAO,MAAM,MAAM;AAG1C,YAAI,cAAc,gBAAgB,CAAC,KAAK,IAAI;AAC1C,gBAAM,uBAAuB,aAAa,oBAAoB,aAAa,mBAAmB;AAAA,QAAA;AAI5F,YAAAC,KAAAA,WAAW,IAAI,GAAG;AACb,iBAAA,MAAM,KAAK,OAAO;AAAA,QAAA;AAIrB,cAAA,SAAS,KAAK,UAAU,KAAK;AAG/B,YAAA,CAAC,OAAO,SAAS;AACX,kBAAA,IAAI,OAAO,MAAM,MAAM;AAE/B,gBAAM,SAAS,OAAO,OAAO,SAAS,CAAC;AAGvC,cAAI,QAAQ,SAAS,SAAU,OAAM,OAAO;AACtC,gBAAA,IAAI,MAAM,SAAS;AAAA,QAAA;AAI3B,eAAO,MAAM,KAAK,SAAS,OAAO,IAAI;AAAA,MAAA,GACrC,aAAa,cAAc,IAAI,CAAC;AAAA,IACrC;AAAA,EACF;AAEO,SAAA;AACT;AAEA,eAAe,gBACb,YACA,mBACuC;AACvC,QAAM,aAA2C;AAAA,IAC/C,IAAI;AAAA,IACJ,MAAM,CAAC;AAAA,IACP,YAAY,CAAC;AAAA,IACb,SAAS;AAAA,EACX;AAEI,MAAA,CAAC,kBAA0B,QAAA;AAEzB,QAAA,MAAM,kBAAkB,eAAe;AAAA,IAC3C,YAAY,WAAW,cAAc;AAAA,EAAA,CACtC;AAGD,QAAM,CAAC,MAAM,IAAI,IAAI,MAAMC,KAAA,WAAW,IAAI,WAAW,WAAW,cAAmB,KAAA,EAAE,CAAC;AAClF,MAAA,CAAC,KAAa,QAAA;AAGZ,QAAA,CAAC,MAAM,QAAQ,IAAIA,gBAAW,MAAM,uBAAuB,IAAI,CAAC;AAClE,MAAA,CAAC,SAAiB,QAAA;AAEX,aAAA,KAAK,SAAS,OAAO;AACrB,aAAA,OAAO,SAAS,QAAQ,CAAC;AACzB,aAAA,aAAa,SAAS,cAAc,CAAC;AACrC,aAAA,UAAU,WAAW,KAAK,SAAS,OAAO,KAAK,WAAW,WAAW,WAAW;AAEpF,SAAA;AACT;AA2BgB,SAAA,uBACd,QACA,uBAAuB,IACQ;AAC/B,MAAI,OAAO,SAAS;AAClB,UAAM,uBAAuB,OAAO,UAAU,sBAAsB,OAAO,OAAO;AAAA,EAAA;AAEpF,SAAOC,OAAW,WAAA,QAAQ,CAAC,WAAW,QAAQ,CAAC;AACjD;;;;;;"}
+{"version":3,"file":"cloud.cjs","sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.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 { 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 Error & { errCode?: number | string; errMsg?: string });\n\n    return {\n      errCode: err2.errCode || -1,\n      errMsg: err2.errMsg || err2.message || '',\n      // @ts-ignore\n      data: null,\n      ...append,\n    };\n  }\n}\n","import { parseCloudMethodOutput } from '@/_helpers';\nimport { objectDefaults, objectOmit } 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 type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudModuleOutput, 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\ntype _CloudObjectThisAppend = {\n  options: Required<CreateCloudObjectOptions>;\n  user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext = CloudObjectThis & _CloudObjectThisAppend;\n\nexport type BuildCloudMethodCreatorOptions = {\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   * 用于在云对象响应中添加额外的上下文信息\n   * @param objectThis 云对象上下文\n   * @returns 返回要附加到响应中的数据对象\n   */\n  respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n};\n\nexport type CreateCloudObjectOptions = {\n  /**\n   * 是否需要用户登录态\n   * @default false\n   */\n  requiredUser?: boolean;\n\n  /**\n   * 是否仅在本地环境运行\n   * @default false\n   */\n  onlyLocalEnv?: boolean;\n};\n\n/**\n * 云对象方法创建器类型定义\n *\n * 用于定义云对象方法的创建函数类型，支持两种重载形式：\n * 1. 带输入验证的版本：接收schema、处理函数和选项\n * 2. 无输入参数的版本：仅接收处理函数和选项\n */\nexport type CreateCloudMethod = {\n  /**\n   * 带输入验证的云对象方法创建器\n   * @template S - Zod验证模式类型\n   * @template O - 返回值类型\n   * @param schema - Zod验证模式，用于验证输入数据\n   * @param fn - 业务逻辑处理函数，接收上下文和验证后的输入数据\n   * @param options - 云对象创建选项\n   * @returns 云对象方法函数\n   */\n  <S extends ZodObject, O>(\n    schema: S,\n    fn: (context: CloudObjectContext, input: z.infer<S>) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): CloudMethod<z.infer<S>, O>;\n\n  /**\n   * 无输入参数的云对象方法创建器\n   * @template O - 返回值类型\n   * @param fn - 业务逻辑处理函数，仅接收上下文\n   * @param options - 云对象创建选项\n   * @returns 云对象方法函数\n   */\n  <O>(fn: (context: CloudObjectContext) => MaybePromise<O>, options?: CreateCloudObjectOptions): 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(options?: BuildCloudMethodCreatorOptions) {\n  const buildOptions = objectDefaults(options || {}, {\n    requiredUserErrCode: 'uni-id-check-token-failed',\n    requiredUserErrMsg: '需要登录后才能进行此操作',\n    onlyLocalEnvErrMsg: '运行环境不匹配',\n    respondAppend: () => ({}),\n  }) as Required<BuildCloudMethodCreatorOptions>;\n\n  // @ts-ignore\n  const createCloudMethod: CreateCloudMethod = (arg0, arg1, arg2) => {\n    // 确定选项来源：如果arg0是函数，则选项在arg1；否则在arg2\n    const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n\n    // 设置默认选项值\n    const createOptions = objectDefaults(optionsSource || {}, {\n      requiredUser: false,\n      onlyLocalEnv: false,\n    }) as Required<CreateCloudObjectOptions>;\n\n    return async function (input) {\n      // 处理云对象方法响应逻辑，包括错误捕获和统一响应格式\n      return await respondCloudMethod(async () => {\n        const runtimeEnv = this.getCloudInfo().runtimeEnv;\n\n        if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n          throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n        }\n\n        // 构建附加的上下文信息，包括用户身份和权限信息\n        const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n        const append: _CloudObjectThisAppend = {\n          options: createOptions,\n          user: user,\n        };\n        const context = Object.assign(this, append) as CloudObjectContext;\n\n        // 如果需要用户登录态但用户未登录，则抛出错误\n        if (createOptions.requiredUser && !user.id) {\n          throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n        }\n\n        // 无入参函数调用\n        if (isFunction(arg0)) {\n          return await arg0(context);\n        }\n\n        // 有入参函数调用 - 验证输入数据\n        const parsed = arg0.safeParse(input);\n\n        // 输入验证失败处理\n        if (!parsed.success) {\n          console.log(parsed.error.issues);\n\n          const issue0 = parsed.error?.issues?.[0];\n\n          // 处理自定义验证错误\n          if (issue0?.code === 'custom') throw issue0.message;\n          throw new Error('请求数据不正确');\n        }\n\n        // 执行业务逻辑函数，传入上下文和验证后的数据\n        return await arg1(context, parsed.data);\n      }, 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  // 验证用户token，忽略验证过程中的错误\n  const [err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() || ''));\n  if (!user) return appendUser;\n\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"],"names":["errorAssign","objectOmit","errorNormalize","objectDefaults","isFunction","tryFlatten"],"mappings":"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"}

package/dist/cloud.d.ts

@@ -1,6 +1,7 @@
-export { parseCloudObjectOutput } from './_helpers';
+export { parseCloudMethodOutput } from './_helpers';
 export * from './cloud/error';
-export * from './cloud/expose';
+export * from './cloud/method';
 export * from './cloud/types';
 export * from './cloud/respond';
 export * from './cloud/uni-id';
+export * from './cloud/module';

package/dist/cloud.mjs

@@ -1,6 +1,6 @@
 import { p } from "./_helpers.mjs";
 import { errorAssign, errorNormalize } from "@cloudcome/utils-core/error";
-import { objectDefaults, objectOmit } from "@cloudcome/utils-core/object";
+import { objectOmit, objectDefaults } from "@cloudcome/utils-core/object";
 import { tryFlatten } from "@cloudcome/utils-core/try";
 import { isFunction } from "@cloudcome/utils-core/type";
 function createCloudObjectError(message, code) {
@@ -9,7 +9,13 @@ function createCloudObjectError(message, code) {
     errMsg: message
   });
 }
-async function respondCloudObject(fn, append) {
+function parseCloudModuleOutput(output, fallbackErrorMessage = "") {
+  if (output.errCode) {
+    throw createCloudObjectError(output.errMsg || fallbackErrorMessage, output.errCode);
+  }
+  return objectOmit(output, ["errCode", "errMsg"]);
+}
+async function respondCloudMethod(fn, append) {
   try {
     const data = await fn();
     return {
@@ -31,26 +37,26 @@ async function respondCloudObject(fn, append) {
     };
   }
 }
-function buildCloudObjectExposeCreator(options) {
+function buildCloudMethodCreator(options) {
   const buildOptions = objectDefaults(options || {}, {
     requiredUserErrCode: "uni-id-check-token-failed",
     requiredUserErrMsg: "需要登录后才能进行此操作",
     onlyLocalEnvErrMsg: "运行环境不匹配",
     respondAppend: () => ({})
   });
-  const createCloudObjectExpose = (arg0, arg1, arg2) => {
+  const createCloudMethod = (arg0, arg1, arg2) => {
     const optionsSource = isFunction(arg0) ? arg1 : arg2;
     const createOptions = objectDefaults(optionsSource || {}, {
       requiredUser: false,
       onlyLocalEnv: false
     });
     return async function(input) {
-      return await respondCloudObject(async () => {
+      return await respondCloudMethod(async () => {
         const runtimeEnv = this.getCloudInfo().runtimeEnv;
         if (createOptions.onlyLocalEnv && runtimeEnv !== "local") {
           throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);
         }
-        const user = await parseAppendUser(this, options?.uniIdCommonModule);
+        const user = await _parseAppendUser(this, options?.uniIdCommonModule);
         const append = {
           options: createOptions,
           user
@@ -73,9 +79,9 @@ function buildCloudObjectExposeCreator(options) {
       }, buildOptions.respondAppend(this));
     };
   };
-  return createCloudObjectExpose;
+  return createCloudMethod;
 }
-async function parseAppendUser(objectThis, uniIdCommonModule) {
+async function _parseAppendUser(objectThis, uniIdCommonModule) {
   const appendUser = {
     id: "",
     role: [],
@@ -96,17 +102,11 @@ async function parseAppendUser(objectThis, uniIdCommonModule) {
   appendUser.isAdmin = appendUser.role.includes("admin") && appendUser.permission.length === 0;
   return appendUser;
 }
-function parseCloudModuleOutput(output, fallbackErrorMessage = "") {
-  if (output.errCode) {
-    throw createCloudObjectError(output.errMsg || fallbackErrorMessage, output.errCode);
-  }
-  return objectOmit(output, ["errCode", "errMsg"]);
-}
 export {
-  buildCloudObjectExposeCreator,
+  buildCloudMethodCreator,
   createCloudObjectError,
+  p as parseCloudMethodOutput,
   parseCloudModuleOutput,
-  p as parseCloudObjectOutput,
-  respondCloudObject
+  respondCloudMethod
 };
 //# sourceMappingURL=cloud.mjs.map

package/dist/cloud.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"cloud.mjs","sources":["../src/cloud/error.ts","../src/cloud/respond.ts","../src/cloud/expose.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 { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport type { UniCloudObjectOutput } from './types';\n\n/**\n * 处理云函数响应结果，统一返回格式\n * @param fn - 执行函数，可以返回任意类型的值或Promise\n * @param append - 需要附加到响应结果中的额外字段\n * @returns 统一格式的云函数响应结果\n *\n * @example\n * ```typescript\n * // 成功情况\n * const result = await respondCloudObject(async () => {\n *   return { name: 'test', value: 123 };\n * });\n * // 返回: { errCode: 0, errMsg: '', data: { name: 'test', value: 123 } }\n *\n * // 失败情况\n * const result = await respondCloudObject(() => {\n *   throw new Error('操作失败');\n * });\n * // 返回: { errCode: -1, errMsg: '操作失败', data: null }\n * ```\n */\nexport async function respondCloudObject<O>(\n  fn: () => MaybePromise<O>,\n  append?: AnyObject,\n): Promise<UniCloudObjectOutput<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 Error & { errCode?: number | string; errMsg?: string });\n\n    return {\n      errCode: err2.errCode || -1,\n      errMsg: err2.errMsg || err2.message || '',\n      // @ts-ignore\n      data: null,\n      ...append,\n    };\n  }\n}\n","import { parseCloudObjectOutput } from '@/_helpers';\nimport { objectDefaults, objectOmit } 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 type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { respondCloudObject } from './respond';\nimport type { UniCloudModuleOutput, UniCloudObjectExpose, UniCloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\nexport type UniCloudObjectThisAppendUser = {\n  id: string;\n  role: string[];\n  permission: string[];\n  isAdmin: boolean;\n};\n\nexport type UniCloudObjectThisAppend = {\n  options: Required<CreateCloudObjectOptions>;\n  user: UniCloudObjectThisAppendUser;\n};\n\nexport type UniCloudObjectContext = UniCloudObjectThis & UniCloudObjectThisAppend;\n\n/**\n * 构建云函数暴露创建器的选项配置\n * 用于配置云函数暴露创建器的行为，目前支持传入UniIdCloudObject实例\n */\nexport type BuildCloudExposeCreatorOptions = {\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   * 用于在云对象响应中添加额外的上下文信息\n   * @param objectThis 云对象上下文\n   * @returns 返回要附加到响应中的数据对象\n   */\n  respondAppend?: (objectThis: UniCloudObjectThis) => AnyObject;\n};\n\nexport type CreateCloudObjectOptions = {\n  /**\n   * 是否需要用户登录态\n   * @default false\n   */\n  requiredUser?: boolean;\n\n  /**\n   * 是否仅在本地环境运行\n   * @default false\n   */\n  onlyLocalEnv?: boolean;\n};\n\nexport type CreateCloudObjectExpose = {\n  <S extends ZodObject, O>(\n    schema: S,\n    fn: (context: UniCloudObjectContext, input: z.infer<S>) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): UniCloudObjectExpose<z.infer<S>, O>;\n  <O>(\n    fn: (context: UniCloudObjectContext) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): UniCloudObjectExpose<void, O>;\n};\n\n/**\n * 构建云对象暴露创建器\n *\n * 该函数用于创建一个云对象暴露函数，可以处理用户身份验证、输入验证和错误处理等通用逻辑\n *\n * @param options 构建选项配置\n * @param options.uniIdCloudObject 可选的UniIdCloudObject实例，用于处理用户身份验证和权限管理\n * @param options.requiredUserErrCode 需要用户登录态时的错误码，默认为 'uni-id-check-token-failed'\n * @param options.requiredUserErrMsg 需要用户登录态时的错误消息，默认为 '需要登录后才能进行此操作'\n *\n * @returns 返回一个云对象暴露创建函数，支持两种重载形式：\n * 1. 无输入参数的形式：(fn, options) => UniCloudObject\n * 2. 有输入验证的形式：(schema, fn, options) => UniCloudObject\n *\n * @example\n * // 无输入参数的使用方式\n * const expose = buildCloudObjectExposeCreator();\n * export default expose(async (context) => {\n *   // 业务逻辑\n * });\n *\n * @example\n * // 有输入验证的使用方式\n * const expose = buildCloudObjectExposeCreator();\n * const schema = z.object({\n *   name: z.string().min(1)\n * });\n *\n * export default expose(schema, async (context, input) => {\n *   // 业务逻辑，input类型已自动推断\n * });\n */\nexport function buildCloudObjectExposeCreator(options?: BuildCloudExposeCreatorOptions) {\n  const buildOptions = objectDefaults(options || {}, {\n    requiredUserErrCode: 'uni-id-check-token-failed',\n    requiredUserErrMsg: '需要登录后才能进行此操作',\n    onlyLocalEnvErrMsg: '运行环境不匹配',\n    respondAppend: () => ({}),\n  }) as Required<BuildCloudExposeCreatorOptions>;\n\n  // @ts-ignore\n  const createCloudObjectExpose: CreateCloudObjectExpose = (arg0, arg1, arg2) => {\n    // 确定选项来源：如果arg0是函数，则选项在arg1；否则在arg2\n    const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n\n    // 设置默认选项值\n    const createOptions = objectDefaults(optionsSource || {}, {\n      requiredUser: false,\n      onlyLocalEnv: false,\n    }) as Required<CreateCloudObjectOptions>;\n\n    return async function (input) {\n      // 处理云函数响应逻辑，包括错误捕获和统一响应格式\n      return await respondCloudObject(async () => {\n        const runtimeEnv = this.getCloudInfo().runtimeEnv;\n\n        if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n          throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n        }\n\n        // 构建附加的上下文信息，包括用户身份和权限信息\n        const user = await parseAppendUser(this, options?.uniIdCommonModule);\n        const append: UniCloudObjectThisAppend = {\n          options: createOptions,\n          user: user,\n        };\n        const context = Object.assign(this, append) as UniCloudObjectContext;\n\n        // 如果需要用户登录态但用户未登录，则抛出错误\n        if (createOptions.requiredUser && !user.id) {\n          throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n        }\n\n        // 无入参函数调用\n        if (isFunction(arg0)) {\n          return await arg0(context);\n        }\n\n        // 有入参函数调用 - 验证输入数据\n        const parsed = arg0.safeParse(input);\n\n        // 输入验证失败处理\n        if (!parsed.success) {\n          console.log(parsed.error.issues);\n\n          const issue0 = parsed.error?.issues?.[0];\n\n          // 处理自定义验证错误\n          if (issue0?.code === 'custom') throw issue0.message;\n          throw new Error('请求数据不正确');\n        }\n\n        // 执行业务逻辑函数，传入上下文和验证后的数据\n        return await arg1(context, parsed.data);\n      }, buildOptions.respondAppend(this));\n    };\n  };\n\n  return createCloudObjectExpose;\n}\n\nasync function parseAppendUser(\n  objectThis: UniCloudObjectThis,\n  uniIdCommonModule?: UniIdCommonModule,\n): Promise<UniCloudObjectThisAppendUser> {\n  const appendUser: UniCloudObjectThisAppendUser = {\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  // 忽略错误1\n  const [err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() || ''));\n  if (!user) return appendUser;\n\n  // 忽略错误2\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\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: UniCloudModuleOutput<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"],"names":[],"mappings":"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"}
+{"version":3,"file":"cloud.mjs","sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.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 { 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 Error & { errCode?: number | string; errMsg?: string });\n\n    return {\n      errCode: err2.errCode || -1,\n      errMsg: err2.errMsg || err2.message || '',\n      // @ts-ignore\n      data: null,\n      ...append,\n    };\n  }\n}\n","import { parseCloudMethodOutput } from '@/_helpers';\nimport { objectDefaults, objectOmit } 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 type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudModuleOutput, 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\ntype _CloudObjectThisAppend = {\n  options: Required<CreateCloudObjectOptions>;\n  user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext = CloudObjectThis & _CloudObjectThisAppend;\n\nexport type BuildCloudMethodCreatorOptions = {\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   * 用于在云对象响应中添加额外的上下文信息\n   * @param objectThis 云对象上下文\n   * @returns 返回要附加到响应中的数据对象\n   */\n  respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n};\n\nexport type CreateCloudObjectOptions = {\n  /**\n   * 是否需要用户登录态\n   * @default false\n   */\n  requiredUser?: boolean;\n\n  /**\n   * 是否仅在本地环境运行\n   * @default false\n   */\n  onlyLocalEnv?: boolean;\n};\n\n/**\n * 云对象方法创建器类型定义\n *\n * 用于定义云对象方法的创建函数类型，支持两种重载形式：\n * 1. 带输入验证的版本：接收schema、处理函数和选项\n * 2. 无输入参数的版本：仅接收处理函数和选项\n */\nexport type CreateCloudMethod = {\n  /**\n   * 带输入验证的云对象方法创建器\n   * @template S - Zod验证模式类型\n   * @template O - 返回值类型\n   * @param schema - Zod验证模式，用于验证输入数据\n   * @param fn - 业务逻辑处理函数，接收上下文和验证后的输入数据\n   * @param options - 云对象创建选项\n   * @returns 云对象方法函数\n   */\n  <S extends ZodObject, O>(\n    schema: S,\n    fn: (context: CloudObjectContext, input: z.infer<S>) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): CloudMethod<z.infer<S>, O>;\n\n  /**\n   * 无输入参数的云对象方法创建器\n   * @template O - 返回值类型\n   * @param fn - 业务逻辑处理函数，仅接收上下文\n   * @param options - 云对象创建选项\n   * @returns 云对象方法函数\n   */\n  <O>(fn: (context: CloudObjectContext) => MaybePromise<O>, options?: CreateCloudObjectOptions): 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(options?: BuildCloudMethodCreatorOptions) {\n  const buildOptions = objectDefaults(options || {}, {\n    requiredUserErrCode: 'uni-id-check-token-failed',\n    requiredUserErrMsg: '需要登录后才能进行此操作',\n    onlyLocalEnvErrMsg: '运行环境不匹配',\n    respondAppend: () => ({}),\n  }) as Required<BuildCloudMethodCreatorOptions>;\n\n  // @ts-ignore\n  const createCloudMethod: CreateCloudMethod = (arg0, arg1, arg2) => {\n    // 确定选项来源：如果arg0是函数，则选项在arg1；否则在arg2\n    const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n\n    // 设置默认选项值\n    const createOptions = objectDefaults(optionsSource || {}, {\n      requiredUser: false,\n      onlyLocalEnv: false,\n    }) as Required<CreateCloudObjectOptions>;\n\n    return async function (input) {\n      // 处理云对象方法响应逻辑，包括错误捕获和统一响应格式\n      return await respondCloudMethod(async () => {\n        const runtimeEnv = this.getCloudInfo().runtimeEnv;\n\n        if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n          throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n        }\n\n        // 构建附加的上下文信息，包括用户身份和权限信息\n        const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n        const append: _CloudObjectThisAppend = {\n          options: createOptions,\n          user: user,\n        };\n        const context = Object.assign(this, append) as CloudObjectContext;\n\n        // 如果需要用户登录态但用户未登录，则抛出错误\n        if (createOptions.requiredUser && !user.id) {\n          throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n        }\n\n        // 无入参函数调用\n        if (isFunction(arg0)) {\n          return await arg0(context);\n        }\n\n        // 有入参函数调用 - 验证输入数据\n        const parsed = arg0.safeParse(input);\n\n        // 输入验证失败处理\n        if (!parsed.success) {\n          console.log(parsed.error.issues);\n\n          const issue0 = parsed.error?.issues?.[0];\n\n          // 处理自定义验证错误\n          if (issue0?.code === 'custom') throw issue0.message;\n          throw new Error('请求数据不正确');\n        }\n\n        // 执行业务逻辑函数，传入上下文和验证后的数据\n        return await arg1(context, parsed.data);\n      }, 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  // 验证用户token，忽略验证过程中的错误\n  const [err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() || ''));\n  if (!user) return appendUser;\n\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"],"names":[],"mappings":"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"}

package/dist/database/_command.class.d.ts

@@ -0,0 +1,15 @@
+export declare class DbBaseCommand {
+    command: string;
+    parameter: unknown;
+    constructor(command: string, parameter: unknown);
+    getValue(db: UniCloud.Database): unknown;
+    getExpression(fieldName: string): {
+        [x: string]: unknown[];
+    };
+}
+export declare class DbQueryCommand extends DbBaseCommand {
+    isQueryCommand: boolean;
+}
+export declare class DbMutateCommand extends DbBaseCommand {
+    isMutateCommand: boolean;
+}

package/dist/database/{db.d.ts → _db.class.d.ts}

@@ -1,7 +1,7 @@
 import { AnyObject, Exact, HasProperty, IsEmptyObject, IsOnlyProperty, MergeIntersection } from '@cloudcome/utils-core/types';
-import { UniClientDatabaseOutput, UniCloudDatabaseOutput, UniDatabaseCommand, UniDatabaseMutateCommand, UniDatabaseQueryCommand } from './types';
+import { DbMutateCommand, DbQueryCommand } from './_command.class';
 export type DbWhere<T> = {
-    [K in keyof T]?: T[K] | UniDatabaseQueryCommand;
+    [K in keyof T]?: T[K] | DbQueryCommand;
 };
 export type DbSelect<T> = {
     [K in keyof T]?: K extends '_id' ? boolean : true;
@@ -9,35 +9,23 @@ export type DbSelect<T> = {
 export type DbFieldsDefault<T> = {
     [K in keyof T]: true;
 };
-type _OnlyFieldId<T, V> = IsOnlyProperty<T, '_id'> extends true ? '_id' extends keyof T ? T['_id'] extends V ? true : false : false : false;
-type _DbFields<T, S extends DbSelect<T>> = IsEmptyObject<S> extends true ? DbFieldsDefault<T> : _OnlyFieldId<S, false> extends true ? Omit<DbFieldsDefault<T>, '_id'> : _OnlyFieldId<S, true> extends true ? {
+type _OnlyFieldId<D, V> = IsOnlyProperty<D, '_id'> extends true ? '_id' extends keyof D ? D['_id'] extends V ? true : false : false : false;
+type _DbFields<D, S extends DbSelect<D>> = IsEmptyObject<S> extends true ? DbFieldsDefault<D> : _OnlyFieldId<S, false> extends true ? Omit<DbFieldsDefault<D>, '_id'> : _OnlyFieldId<S, true> extends true ? {
     _id: true;
 } : HasProperty<S, '_id'> extends true ? S : // 没有的话补上 {_id, ...}
 S & {
     _id: true;
 };
-type _DbQuery<T, S extends Record<keyof T, boolean>> = {
-    [K in keyof T as S[K] extends true ? K : never]: T[K];
+type _DbQuery<D1, S1 extends DbSelect<D1>> = {
+    [K in keyof D1 as S1[K] extends true ? K : never]: D1[K];
 };
-export type DbQuery<T, S extends DbSelect<T>, R> = _DbQuery<T, _DbFields<T, S>> & R;
-export type DbForeign<T, S extends DbSelect<T>, R, J extends DbJoinType, A> = Record<A & string, J extends '1:1' ? DbQuery<T, S, R> : DbQuery<T, S, R>[]>;
+export type DbQuery<D1, S1 extends DbSelect<D1>, D2> = _DbQuery<D1, _DbFields<D1, S1>> & D2;
+export type DbForeign<D1, S1 extends DbSelect<D1>, D2, JT extends DbJoinType, AS extends string> = Record<AS, JT extends '1:1' ? DbQuery<D1, S1, D2> : DbQuery<D1, S1, D2>[]>;
 export type DbCreate<T> = Partial<T>;
 export type DbUpdate<T> = {
-    [K in keyof T]?: T[K] | UniDatabaseMutateCommand;
+    [K in keyof T]?: T[K] | DbMutateCommand;
 };
 export type DbOrder<T> = Record<keyof T, 'asc' | 'desc'>;
-/**
- * 数据库操作符命令
- */
-export declare const dbCmd: UniDatabaseCommand;
-/**
- * 数据库聚合操作符命令
- */
-export declare const dbAgg: UniCloud.AggregateCommand & {
-    pipeline: () => UniCloud.AggregateReference & {
-        done: () => unknown;
-    };
-};
 export type DbOptions = {
     /**
      * 数据表名称
@@ -59,52 +47,50 @@ export type DbOptions = {
  * - 'n:1': 多对一关联，返回值 n 个
  */
 export type DbJoinType = '1:1' | '1:n' | 'n:1';
-export type DbLookupOptions<J extends DbJoinType, L, F, A> = {
+export type DbLookupOptions<JT extends DbJoinType, D1, FD1, AS, US extends boolean | undefined | void = undefined> = {
     /**
      * 关联类型
      */
-    type: J;
+    type: JT;
     /**
      * 主表字段
      */
-    localField: keyof L & string;
+    localField: keyof D1 & string;
     /**
      * 关联表字段
      */
-    foreignField: keyof F & string;
+    foreignField: keyof FD1 & string;
     /**
      * 关联数据在结果中的字段名
      */
-    as: A;
+    as: AS;
+    /**
+     * 是否取消筛选关联数据
+     */
+    unselect?: US;
 };
-export type DbLookup = {
+export type DbLookup = DbLookupOptions<any, unknown, unknown, string, boolean> & {
     /**
      * 关联表
      */
     table: Db<unknown>;
+};
+/**
+ * 数据库类
+ * @template D1 - 主表数据
+ * @template S1 - 主表筛选
+ * @template D2 - 副表数据
+ * @template W2 - 副表查询
+ */
+export declare class Db<D1, S1 extends DbSelect<D1> = {}, D2 extends AnyObject = {}, W2 extends AnyObject = {}> {
+    private _host;
     /**
-     * 关联类型
-     */
-    type: DbJoinType;
-    /**
-     * 主表字段
-     */
-    localField: string;
-    /**
-     * 关联表字段
-     */
-    foreignField: string;
-    /**
-     * 关联表名称
-     */
-    from: string;
-    /**
-     * 关联数据在结果中的字段名
+     * 是否为事务环境
+     * - 查询条件只能是 id
+     * - 不能聚合操作
      */
-    as: string;
-};
-export declare class Db<T, S extends DbSelect<T> = {}, R extends AnyObject = {}> {
-    #private;
+    private _isTransaction;
+    private _options;
     /**
      * 构造函数，初始化数据库集合引用
      * @param collection 数据表名称
@@ -117,57 +103,74 @@ export declare class Db<T, S extends DbSelect<T> = {}, R extends AnyObject = {}>
      * @returns 聚合操作实例
      */
     aggregate(): UniCloud.AggregateReference;
+    private _hasWhere;
+    private _hasWhereId;
+    private _where;
+    private _doWhere;
     /**
      * 设置查询条件
      * @param where 查询条件对象
      * @returns 当前Db实例，支持链式调用
      */
-    where(where: DbWhere<T>): this;
+    where(where: DbWhere<D1> & W2): this;
     /**
      * 根据ID设置查询条件
      * @param id 记录ID
      * @returns 当前Db实例，支持链式调用
      */
     whereId(id: string | number): this;
+    private _hasSelect;
+    private _select;
     /**
      * 指定要返回的字段
      * @param fields 要返回的字段对象，true表示返回，false表示不返回
      * @returns 当前Db实例，支持链式调用
      */
-    select<U extends DbSelect<T>>(fields: Exact<U, DbSelect<T>>): Db<T, S & U, R>;
+    select<S extends DbSelect<D1>>(fields: Exact<S, DbSelect<D1>>): this;
+    private _hasOrder;
+    private _order;
     /**
      * 设置排序规则
      * @param order 排序规则对象，key为字段名，value为"asc"或"desc"
      * @returns 当前Db实例，支持链式调用
      */
-    order(order: DbOrder<T>): this;
+    order(order: DbOrder<D1>): this;
+    private _hasSkip;
+    private _skip;
     /**
      * 跳过指定数量的记录
      * @param skip 要跳过的记录数
      * @returns 当前Db实例，支持链式调用
      */
     skip(skip: number): this;
+    private _hasLimit;
+    private _limit;
     /**
      * 限制返回的记录数量
      * @param limit 最大返回记录数
      * @returns 当前Db实例，支持链式调用
      */
     limit(limit: number): this;
+    private _hasLookup;
     get hasLookup(): boolean;
-    lookup<FT, FS extends DbSelect<FT>, FR extends AnyObject, J extends DbJoinType, A extends string>(table: Db<FT, FS, FR>, lookup: DbLookupOptions<J, T, FT, A>): Db<T, S, MergeIntersection<R & DbForeign<FT, FS, FR, J, A>>>;
+    private _lookups;
+    lookup<FD1, FS1 extends DbSelect<FD1>, FD2 extends AnyObject, FW2 extends AnyObject, JT extends DbJoinType, AS extends string, US extends boolean | undefined | void = undefined>(table: Db<FD1, FS1, FD2, FW2>, lookup: DbLookupOptions<JT, D1, FD1, AS, US>): Db<D1, S1, US extends true ? D2 : MergeIntersection<D2 & DbForeign<FD1, FS1, FD2, JT, AS>>, MergeIntersection<W2 & Partial<Record<AS, DbQueryCommand>>>>;
+    private _aggregated;
+    private _endAggregate;
+    private _endHost;
     /**
      * 执行查询操作
      * @returns 查询结果
      */
-    query(): Promise<DbQuery<T, S, R>[]>;
+    query(): Promise<DbQuery<D1, S1, D2>[]>;
     /**
      * 只查询一条，自动添加 limit(1) 条件
-     * @param ignoreMiss 是否忽略没有匹配到记录
+     * @param allowMiss 是否允许没有匹配到记录，如果为 true，则可能返回 undefined
      * @returns 查询结果
      */
-    queryOne(): Promise<DbQuery<T, S, R>>;
-    queryOne(ignoreMiss: false): Promise<DbQuery<T, S, R>>;
-    queryOne(ignoreMiss: true): Promise<DbQuery<T, S, R> | undefined>;
+    queryOne(): Promise<DbQuery<D1, S1, D2>>;
+    queryOne(allowMiss: false): Promise<DbQuery<D1, S1, D2>>;
+    queryOne(allowMiss: true): Promise<DbQuery<D1, S1, D2> | undefined>;
     /**
      * 获取匹配记录的数量
      * @returns 记录总数
@@ -178,7 +181,7 @@ export declare class Db<T, S extends DbSelect<T> = {}, R extends AnyObject = {}>
      * @param data 要创建的数据
      * @returns 创建结果
      */
-    create(data: DbCreate<T>): Promise<string>;
+    create(data: DbCreate<D1>): Promise<string>;
     /**
      * 更新记录
      * @param data 要更新的数据
@@ -191,29 +194,4 @@ export declare class Db<T, S extends DbSelect<T> = {}, R extends AnyObject = {}>
      */
     remove(): Promise<number>;
 }
-export type DbProxy<T, S extends DbSelect<T> = {}, R extends AnyObject = {}> = Db<T, S, R> & {
-    _isProxy: true;
-};
-/**
- * 数据库操作对象
- */
-export declare const db: {
-    /**
-     * 获取指定名称的数据库集合实例
-     * @param name 数据表名称
-     * @returns Db类实例，用于执行数据库操作
-     */
-    table<T, S extends DbSelect<T> = {}, R extends AnyObject = {}>(name: string): DbProxy<T>;
-};
-/**
- * 解析数据库执行结果
- * @param res 客户端、云端响应结果
- * @returns 处理后的结果
- */
-export declare function parseDatabaseOutput<T>(res: UniClientDatabaseOutput<T> | UniCloudDatabaseOutput<T>): T | Omit<T & {
-    code?: number | string;
-    errCode?: number | string;
-    errMsg?: string;
-    message?: string;
-}, "errCode" | "errMsg" | "code" | "message">;
 export {};