@cloudcome/utils-uni 1.5.1 → 1.7.0

package/dist/client.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const request = require("@cloudcome/utils-vue/request");
 const _helpers = require("./_helpers.cjs");
 function createUseCloudObject(objectName, options) {
-  const server = (options == null ? void 0 : options._mockServer) || uniCloud.importObject(objectName, options);
-  const fallbackErrorMessage = (options == null ? void 0 : options.fallbackErrorMessage) || "请求失败";
+  const server = options?._mockServer || uniCloud.importObject(objectName, options);
+  const fallbackErrorMessage = options?.fallbackErrorMessage || "请求失败";
   const useCloudObject = (caller, options2) => {
     return request.useRequest(async (...inputs) => {
       const result = await caller(server, ...inputs);
@@ -14,7 +14,7 @@ function createUseCloudObject(objectName, options) {
   return useCloudObject;
 }
 function useDatabase(caller, options) {
-  const db = (options == null ? void 0 : options._mockDatabase) || uniCloud.database();
+  const db = options?._mockDatabase || uniCloud.database();
   return request.useRequest(async (...inputs) => {
     const { result } = await caller(db, ...inputs);
     if (!result.errCode) return result;

package/dist/client.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"client.cjs","sources":["../src/client.ts"],"sourcesContent":["import type { UniCloudObjectOutput } from '@/cloud';\nimport type { UniClientDatabaseOutput } from '@/database';\nimport type { AnyArray } from '@cloudcome/utils-core/types';\nimport {\n  type UseRequestOptions,\n  type UseRequestOutput,\n  type UseRequestOutputFilled,\n  useRequest,\n} from '@cloudcome/utils-vue/request';\nimport { parseCloudObjectOutput } from './_helpers';\n\ntype ImportObject = UniCloudNamespace.UniCloud['importObject'];\ntype ImportObjectArgs = Parameters<ImportObject>;\n\nexport type UniCloudObjectServer<O> = Record<string, (...inputs: unknown[]) => Promise<UniCloudObjectOutput<O>>>;\n\nexport type CreateUseCloudObjectOptions = ImportObjectArgs[1] & {\n  /**\n   * 模拟云对象，用于单元测试\n   * @private\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: <explanation>\n  _mockServer?: any;\n\n  /**\n   * 回退错误信息\n   * @default '请求失败'\n   */\n  fallbackErrorMessage?: string;\n};\n\nexport type UseCloudObject = {\n  <I extends AnyArray, O>(\n    caller: (server: UniCloudObjectServer<O>, ...inputs: I) => Promise<UniCloudObjectOutput<O>>,\n    options: Omit<UseRequestOptions<I, O>, 'placeholder'> & { placeholder: () => O },\n  ): UseRequestOutputFilled<I, O>;\n  <I extends AnyArray, O>(\n    caller: (server: UniCloudObjectServer<O>, ...inputs: I) => Promise<UniCloudObjectOutput<O>>,\n    options?: UseRequestOptions<I, O>,\n  ): UseRequestOutput<I, O>;\n};\n\n/**\n * 创建一个用于调用云对象的hook工厂函数\n * @param objectName 云对象名称，用于导入对应的云对象\n * @param options 导入云对象时的可选配置参数\n * @returns 返回一个函数，该函数可以用于创建云对象调用hook\n */\nexport function createUseCloudObject(objectName: ImportObjectArgs[0], options?: CreateUseCloudObjectOptions) {\n  const server = options?._mockServer || uniCloud.importObject(objectName, options);\n  const fallbackErrorMessage = options?.fallbackErrorMessage || '请求失败';\n  const useCloudObject: UseCloudObject = (caller, options) => {\n    // 使用请求hook处理云对象调用\n    return useRequest(async (...inputs) => {\n      const result = await caller(server, ...inputs);\n      return parseCloudObjectOutput(result, fallbackErrorMessage);\n    }, options);\n  };\n\n  return useCloudObject;\n}\n\nexport type UseDatabaseOptions<I extends AnyArray, O> = UseRequestOptions<I, O> & {\n  /**\n   * 模拟数据库，用于单元测试\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: <explanation>\n  _mockDatabase?: any;\n};\n\n/**\n * 创建一个用于调用云数据库的hook\n * @param caller 调用云数据库的函数，接收数据库实例和输入参数，返回Promise\n * @param options 配置选项\n * @returns 返回一个请求hook，用于处理云数据库调用\n */\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options: Omit<UseDatabaseOptions<I, O>, 'placeholder'> & { placeholder: () => O },\n): UseRequestOutputFilled<I, O>;\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options?: UseDatabaseOptions<I, O>,\n): UseRequestOutput<I, O>;\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options?: UseDatabaseOptions<I, O>,\n): UseRequestOutput<I, O> {\n  // 获取数据库实例，优先使用模拟数据库（用于测试），否则使用uniCloud数据库\n  const db = options?._mockDatabase || uniCloud.database();\n  return useRequest(async (...inputs: I) => {\n    const { result } = await caller(db, ...inputs);\n    if (!result.errCode) return result;\n    throw new Error(result.errMsg || '请求失败');\n  }, options);\n}\n"],"names":["options","useRequest","parseCloudObjectOutput"],"mappings":";;;;AAgDgB,SAAA,qBAAqB,YAAiC,SAAuC;AAC3G,QAAM,UAAS,mCAAS,gBAAe,SAAS,aAAa,YAAY,OAAO;AAC1E,QAAA,wBAAuB,mCAAS,yBAAwB;AACxD,QAAA,iBAAiC,CAAC,QAAQA,aAAY;AAEnD,WAAAC,QAAA,WAAW,UAAU,WAAW;AACrC,YAAM,SAAS,MAAM,OAAO,QAAQ,GAAG,MAAM;AACtC,aAAAC,SAAA,uBAAuB,QAAQ,oBAAoB;AAAA,OACzDF,QAAO;AAAA,EACZ;AAEO,SAAA;AACT;AAwBgB,SAAA,YACd,QACA,SACwB;AAExB,QAAM,MAAK,mCAAS,kBAAiB,SAAS,SAAS;AAChD,SAAAC,QAAA,WAAW,UAAU,WAAc;AACxC,UAAM,EAAE,OAAO,IAAI,MAAM,OAAO,IAAI,GAAG,MAAM;AACzC,QAAA,CAAC,OAAO,QAAgB,QAAA;AAC5B,UAAM,IAAI,MAAM,OAAO,UAAU,MAAM;AAAA,KACtC,OAAO;AACZ;;;"}
+{"version":3,"file":"client.cjs","sources":["../src/client.ts"],"sourcesContent":["import type { UniCloudObjectOutput } from '@/cloud';\nimport type { UniClientDatabaseOutput } from '@/database';\nimport type { AnyArray } from '@cloudcome/utils-core/types';\nimport {\n  type UseRequestOptions,\n  type UseRequestOutput,\n  type UseRequestOutputFilled,\n  useRequest,\n} from '@cloudcome/utils-vue/request';\nimport { parseCloudObjectOutput } from './_helpers';\n\ntype ImportObject = UniCloudNamespace.UniCloud['importObject'];\ntype ImportObjectArgs = Parameters<ImportObject>;\n\nexport type UniCloudObjectServer<O> = Record<string, (...inputs: unknown[]) => Promise<UniCloudObjectOutput<O>>>;\n\nexport type CreateUseCloudObjectOptions = ImportObjectArgs[1] & {\n  /**\n   * 模拟云对象，用于单元测试\n   * @private\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: <explanation>\n  _mockServer?: any;\n\n  /**\n   * 回退错误信息\n   * @default '请求失败'\n   */\n  fallbackErrorMessage?: string;\n};\n\nexport type UseCloudObject = {\n  <I extends AnyArray, O>(\n    caller: (server: UniCloudObjectServer<O>, ...inputs: I) => Promise<UniCloudObjectOutput<O>>,\n    options: Omit<UseRequestOptions<I, O>, 'placeholder'> & { placeholder: () => O },\n  ): UseRequestOutputFilled<I, O>;\n  <I extends AnyArray, O>(\n    caller: (server: UniCloudObjectServer<O>, ...inputs: I) => Promise<UniCloudObjectOutput<O>>,\n    options?: UseRequestOptions<I, O>,\n  ): UseRequestOutput<I, O>;\n};\n\n/**\n * 创建一个用于调用云对象的hook工厂函数\n * @param objectName 云对象名称，用于导入对应的云对象\n * @param options 导入云对象时的可选配置参数\n * @returns 返回一个函数，该函数可以用于创建云对象调用hook\n */\nexport function createUseCloudObject(objectName: ImportObjectArgs[0], options?: CreateUseCloudObjectOptions) {\n  const server = options?._mockServer || uniCloud.importObject(objectName, options);\n  const fallbackErrorMessage = options?.fallbackErrorMessage || '请求失败';\n  const useCloudObject: UseCloudObject = (caller, options) => {\n    // 使用请求hook处理云对象调用\n    return useRequest(async (...inputs) => {\n      const result = await caller(server, ...inputs);\n      return parseCloudObjectOutput(result, fallbackErrorMessage);\n    }, options);\n  };\n\n  return useCloudObject;\n}\n\nexport type UseDatabaseOptions<I extends AnyArray, O> = UseRequestOptions<I, O> & {\n  /**\n   * 模拟数据库，用于单元测试\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: <explanation>\n  _mockDatabase?: any;\n};\n\n/**\n * 创建一个用于调用云数据库的hook\n * @param caller 调用云数据库的函数，接收数据库实例和输入参数，返回Promise\n * @param options 配置选项\n * @returns 返回一个请求hook，用于处理云数据库调用\n */\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options: Omit<UseDatabaseOptions<I, O>, 'placeholder'> & { placeholder: () => O },\n): UseRequestOutputFilled<I, O>;\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options?: UseDatabaseOptions<I, O>,\n): UseRequestOutput<I, O>;\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options?: UseDatabaseOptions<I, O>,\n): UseRequestOutput<I, O> {\n  // 获取数据库实例，优先使用模拟数据库（用于测试），否则使用uniCloud数据库\n  const db = options?._mockDatabase || uniCloud.database();\n  return useRequest(async (...inputs: I) => {\n    const { result } = await caller(db, ...inputs);\n    if (!result.errCode) return result;\n    throw new Error(result.errMsg || '请求失败');\n  }, options);\n}\n"],"names":["options","useRequest","parseCloudObjectOutput"],"mappings":";;;;AAgDgB,SAAA,qBAAqB,YAAiC,SAAuC;AAC3G,QAAM,SAAS,SAAS,eAAe,SAAS,aAAa,YAAY,OAAO;AAC1E,QAAA,uBAAuB,SAAS,wBAAwB;AACxD,QAAA,iBAAiC,CAAC,QAAQA,aAAY;AAEnD,WAAAC,QAAA,WAAW,UAAU,WAAW;AACrC,YAAM,SAAS,MAAM,OAAO,QAAQ,GAAG,MAAM;AACtC,aAAAC,SAAA,uBAAuB,QAAQ,oBAAoB;AAAA,OACzDF,QAAO;AAAA,EACZ;AAEO,SAAA;AACT;AAwBgB,SAAA,YACd,QACA,SACwB;AAExB,QAAM,KAAK,SAAS,iBAAiB,SAAS,SAAS;AAChD,SAAAC,QAAA,WAAW,UAAU,WAAc;AACxC,UAAM,EAAE,OAAO,IAAI,MAAM,OAAO,IAAI,GAAG,MAAM;AACzC,QAAA,CAAC,OAAO,QAAgB,QAAA;AAC5B,UAAM,IAAI,MAAM,OAAO,UAAU,MAAM;AAAA,KACtC,OAAO;AACZ;;;"}

package/dist/client.mjs

@@ -1,8 +1,8 @@
 import { useRequest } from "@cloudcome/utils-vue/request";
 import { p as parseCloudObjectOutput } from "./_helpers.mjs";
 function createUseCloudObject(objectName, options) {
-  const server = (options == null ? void 0 : options._mockServer) || uniCloud.importObject(objectName, options);
-  const fallbackErrorMessage = (options == null ? void 0 : options.fallbackErrorMessage) || "请求失败";
+  const server = options?._mockServer || uniCloud.importObject(objectName, options);
+  const fallbackErrorMessage = options?.fallbackErrorMessage || "请求失败";
   const useCloudObject = (caller, options2) => {
     return useRequest(async (...inputs) => {
       const result = await caller(server, ...inputs);
@@ -12,7 +12,7 @@ function createUseCloudObject(objectName, options) {
   return useCloudObject;
 }
 function useDatabase(caller, options) {
-  const db = (options == null ? void 0 : options._mockDatabase) || uniCloud.database();
+  const db = options?._mockDatabase || uniCloud.database();
   return useRequest(async (...inputs) => {
     const { result } = await caller(db, ...inputs);
     if (!result.errCode) return result;

package/dist/client.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"client.mjs","sources":["../src/client.ts"],"sourcesContent":["import type { UniCloudObjectOutput } from '@/cloud';\nimport type { UniClientDatabaseOutput } from '@/database';\nimport type { AnyArray } from '@cloudcome/utils-core/types';\nimport {\n  type UseRequestOptions,\n  type UseRequestOutput,\n  type UseRequestOutputFilled,\n  useRequest,\n} from '@cloudcome/utils-vue/request';\nimport { parseCloudObjectOutput } from './_helpers';\n\ntype ImportObject = UniCloudNamespace.UniCloud['importObject'];\ntype ImportObjectArgs = Parameters<ImportObject>;\n\nexport type UniCloudObjectServer<O> = Record<string, (...inputs: unknown[]) => Promise<UniCloudObjectOutput<O>>>;\n\nexport type CreateUseCloudObjectOptions = ImportObjectArgs[1] & {\n  /**\n   * 模拟云对象，用于单元测试\n   * @private\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: <explanation>\n  _mockServer?: any;\n\n  /**\n   * 回退错误信息\n   * @default '请求失败'\n   */\n  fallbackErrorMessage?: string;\n};\n\nexport type UseCloudObject = {\n  <I extends AnyArray, O>(\n    caller: (server: UniCloudObjectServer<O>, ...inputs: I) => Promise<UniCloudObjectOutput<O>>,\n    options: Omit<UseRequestOptions<I, O>, 'placeholder'> & { placeholder: () => O },\n  ): UseRequestOutputFilled<I, O>;\n  <I extends AnyArray, O>(\n    caller: (server: UniCloudObjectServer<O>, ...inputs: I) => Promise<UniCloudObjectOutput<O>>,\n    options?: UseRequestOptions<I, O>,\n  ): UseRequestOutput<I, O>;\n};\n\n/**\n * 创建一个用于调用云对象的hook工厂函数\n * @param objectName 云对象名称，用于导入对应的云对象\n * @param options 导入云对象时的可选配置参数\n * @returns 返回一个函数，该函数可以用于创建云对象调用hook\n */\nexport function createUseCloudObject(objectName: ImportObjectArgs[0], options?: CreateUseCloudObjectOptions) {\n  const server = options?._mockServer || uniCloud.importObject(objectName, options);\n  const fallbackErrorMessage = options?.fallbackErrorMessage || '请求失败';\n  const useCloudObject: UseCloudObject = (caller, options) => {\n    // 使用请求hook处理云对象调用\n    return useRequest(async (...inputs) => {\n      const result = await caller(server, ...inputs);\n      return parseCloudObjectOutput(result, fallbackErrorMessage);\n    }, options);\n  };\n\n  return useCloudObject;\n}\n\nexport type UseDatabaseOptions<I extends AnyArray, O> = UseRequestOptions<I, O> & {\n  /**\n   * 模拟数据库，用于单元测试\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: <explanation>\n  _mockDatabase?: any;\n};\n\n/**\n * 创建一个用于调用云数据库的hook\n * @param caller 调用云数据库的函数，接收数据库实例和输入参数，返回Promise\n * @param options 配置选项\n * @returns 返回一个请求hook，用于处理云数据库调用\n */\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options: Omit<UseDatabaseOptions<I, O>, 'placeholder'> & { placeholder: () => O },\n): UseRequestOutputFilled<I, O>;\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options?: UseDatabaseOptions<I, O>,\n): UseRequestOutput<I, O>;\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options?: UseDatabaseOptions<I, O>,\n): UseRequestOutput<I, O> {\n  // 获取数据库实例，优先使用模拟数据库（用于测试），否则使用uniCloud数据库\n  const db = options?._mockDatabase || uniCloud.database();\n  return useRequest(async (...inputs: I) => {\n    const { result } = await caller(db, ...inputs);\n    if (!result.errCode) return result;\n    throw new Error(result.errMsg || '请求失败');\n  }, options);\n}\n"],"names":["options"],"mappings":";;AAgDgB,SAAA,qBAAqB,YAAiC,SAAuC;AAC3G,QAAM,UAAS,mCAAS,gBAAe,SAAS,aAAa,YAAY,OAAO;AAC1E,QAAA,wBAAuB,mCAAS,yBAAwB;AACxD,QAAA,iBAAiC,CAAC,QAAQA,aAAY;AAEnD,WAAA,WAAW,UAAU,WAAW;AACrC,YAAM,SAAS,MAAM,OAAO,QAAQ,GAAG,MAAM;AACtC,aAAA,uBAAuB,QAAQ,oBAAoB;AAAA,OACzDA,QAAO;AAAA,EACZ;AAEO,SAAA;AACT;AAwBgB,SAAA,YACd,QACA,SACwB;AAExB,QAAM,MAAK,mCAAS,kBAAiB,SAAS,SAAS;AAChD,SAAA,WAAW,UAAU,WAAc;AACxC,UAAM,EAAE,OAAO,IAAI,MAAM,OAAO,IAAI,GAAG,MAAM;AACzC,QAAA,CAAC,OAAO,QAAgB,QAAA;AAC5B,UAAM,IAAI,MAAM,OAAO,UAAU,MAAM;AAAA,KACtC,OAAO;AACZ;"}
+{"version":3,"file":"client.mjs","sources":["../src/client.ts"],"sourcesContent":["import type { UniCloudObjectOutput } from '@/cloud';\nimport type { UniClientDatabaseOutput } from '@/database';\nimport type { AnyArray } from '@cloudcome/utils-core/types';\nimport {\n  type UseRequestOptions,\n  type UseRequestOutput,\n  type UseRequestOutputFilled,\n  useRequest,\n} from '@cloudcome/utils-vue/request';\nimport { parseCloudObjectOutput } from './_helpers';\n\ntype ImportObject = UniCloudNamespace.UniCloud['importObject'];\ntype ImportObjectArgs = Parameters<ImportObject>;\n\nexport type UniCloudObjectServer<O> = Record<string, (...inputs: unknown[]) => Promise<UniCloudObjectOutput<O>>>;\n\nexport type CreateUseCloudObjectOptions = ImportObjectArgs[1] & {\n  /**\n   * 模拟云对象，用于单元测试\n   * @private\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: <explanation>\n  _mockServer?: any;\n\n  /**\n   * 回退错误信息\n   * @default '请求失败'\n   */\n  fallbackErrorMessage?: string;\n};\n\nexport type UseCloudObject = {\n  <I extends AnyArray, O>(\n    caller: (server: UniCloudObjectServer<O>, ...inputs: I) => Promise<UniCloudObjectOutput<O>>,\n    options: Omit<UseRequestOptions<I, O>, 'placeholder'> & { placeholder: () => O },\n  ): UseRequestOutputFilled<I, O>;\n  <I extends AnyArray, O>(\n    caller: (server: UniCloudObjectServer<O>, ...inputs: I) => Promise<UniCloudObjectOutput<O>>,\n    options?: UseRequestOptions<I, O>,\n  ): UseRequestOutput<I, O>;\n};\n\n/**\n * 创建一个用于调用云对象的hook工厂函数\n * @param objectName 云对象名称，用于导入对应的云对象\n * @param options 导入云对象时的可选配置参数\n * @returns 返回一个函数，该函数可以用于创建云对象调用hook\n */\nexport function createUseCloudObject(objectName: ImportObjectArgs[0], options?: CreateUseCloudObjectOptions) {\n  const server = options?._mockServer || uniCloud.importObject(objectName, options);\n  const fallbackErrorMessage = options?.fallbackErrorMessage || '请求失败';\n  const useCloudObject: UseCloudObject = (caller, options) => {\n    // 使用请求hook处理云对象调用\n    return useRequest(async (...inputs) => {\n      const result = await caller(server, ...inputs);\n      return parseCloudObjectOutput(result, fallbackErrorMessage);\n    }, options);\n  };\n\n  return useCloudObject;\n}\n\nexport type UseDatabaseOptions<I extends AnyArray, O> = UseRequestOptions<I, O> & {\n  /**\n   * 模拟数据库，用于单元测试\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: <explanation>\n  _mockDatabase?: any;\n};\n\n/**\n * 创建一个用于调用云数据库的hook\n * @param caller 调用云数据库的函数，接收数据库实例和输入参数，返回Promise\n * @param options 配置选项\n * @returns 返回一个请求hook，用于处理云数据库调用\n */\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options: Omit<UseDatabaseOptions<I, O>, 'placeholder'> & { placeholder: () => O },\n): UseRequestOutputFilled<I, O>;\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options?: UseDatabaseOptions<I, O>,\n): UseRequestOutput<I, O>;\nexport function useDatabase<I extends AnyArray, O>(\n  caller: (db: UniCloud.Database, ...inputs: I) => Promise<UniClientDatabaseOutput<O>>,\n  options?: UseDatabaseOptions<I, O>,\n): UseRequestOutput<I, O> {\n  // 获取数据库实例，优先使用模拟数据库（用于测试），否则使用uniCloud数据库\n  const db = options?._mockDatabase || uniCloud.database();\n  return useRequest(async (...inputs: I) => {\n    const { result } = await caller(db, ...inputs);\n    if (!result.errCode) return result;\n    throw new Error(result.errMsg || '请求失败');\n  }, options);\n}\n"],"names":["options"],"mappings":";;AAgDgB,SAAA,qBAAqB,YAAiC,SAAuC;AAC3G,QAAM,SAAS,SAAS,eAAe,SAAS,aAAa,YAAY,OAAO;AAC1E,QAAA,uBAAuB,SAAS,wBAAwB;AACxD,QAAA,iBAAiC,CAAC,QAAQA,aAAY;AAEnD,WAAA,WAAW,UAAU,WAAW;AACrC,YAAM,SAAS,MAAM,OAAO,QAAQ,GAAG,MAAM;AACtC,aAAA,uBAAuB,QAAQ,oBAAoB;AAAA,OACzDA,QAAO;AAAA,EACZ;AAEO,SAAA;AACT;AAwBgB,SAAA,YACd,QACA,SACwB;AAExB,QAAM,KAAK,SAAS,iBAAiB,SAAS,SAAS;AAChD,SAAA,WAAW,UAAU,WAAc;AACxC,UAAM,EAAE,OAAO,IAAI,MAAM,OAAO,IAAI,GAAG,MAAM;AACzC,QAAA,CAAC,OAAO,QAAgB,QAAA;AAC5B,UAAM,IAAI,MAAM,OAAO,UAAU,MAAM;AAAA,KACtC,OAAO;AACZ;"}

package/dist/cloud.cjs

@@ -21,6 +21,8 @@ async function respondCloudObject(fn, requestId) {
       errMsg: ""
     };
   } catch (err) {
+    console.error("respondCloudObject error");
+    console.error(err);
     const err2 = error.errorNormalize(err);
     return {
       requestId,
@@ -43,8 +45,7 @@ function buildCloudObjectExposeCreator(options) {
     });
     return async function(input) {
       return await respondCloudObject(async () => {
-        var _a, _b;
-        const user = await parseAppendUser(this, options == null ? void 0 : options.uniIdCloudObject);
+        const user = await parseAppendUser(this, options?.uniIdCloudObject);
         const append = {
           options: createOptions,
           user
@@ -59,8 +60,8 @@ function buildCloudObjectExposeCreator(options) {
         const parsed = arg0.safeParse(input);
         if (!parsed.success) {
           console.log(parsed.error.issues);
-          const issue0 = (_b = (_a = parsed.error) == null ? void 0 : _a.issues) == null ? void 0 : _b[0];
-          if ((issue0 == null ? void 0 : issue0.code) === "custom") throw issue0.message;
+          const issue0 = parsed.error?.issues?.[0];
+          if (issue0?.code === "custom") throw issue0.message;
           throw new Error("请求数据不正确");
         }
         return await arg1(context, parsed.data);

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 './object';\n\nexport async function respondCloudObject<O>(\n  fn: () => MaybePromise<O>,\n  requestId?: string,\n): Promise<UniCloudObjectOutput<O>> {\n  try {\n    const data = await fn();\n\n    return {\n      requestId,\n      data,\n      errCode: 0,\n      errMsg: '',\n    };\n  } catch (err) {\n    const err2 = errorNormalize(err as Error & { errCode?: number | string; errMsg?: string });\n\n    return {\n      requestId,\n      // @ts-ignore\n      data: null,\n      errCode: err2.errCode || -1,\n      errMsg: err2.errMsg || err2.message || '',\n    };\n  }\n}\n","import { parseCloudObjectOutput } from '@/_helpers';\nimport { 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 type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport type { UniCloudObject, UniCloudObjectThis } from './object';\nimport { respondCloudObject } from './respond';\nimport type { UniIdCloudObject } 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   * 可选的UniIdCloudObject实例\n   * 用于处理用户身份验证和权限管理相关功能\n   */\n  uniIdCloudObject?: UniIdCloudObject;\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\nexport type CreateCloudObjectOptions = {\n  /**\n   * 是否需要用户登录态\n   * @default false\n   */\n  requiredUser?: 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  ): UniCloudObject<z.infer<S>, O>;\n  <O>(\n    fn: (context: UniCloudObjectContext) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): UniCloudObject<void, O>;\n};\n\nexport function buildCloudObjectExposeCreator(options?: BuildCloudExposeCreatorOptions) {\n  const buildOptions = objectDefaults(options || {}, {\n    requiredUserErrCode: 'uni-id-check-token-failed',\n    requiredUserErrMsg: '需要登录后才能进行此操作',\n  }) as Required<BuildCloudExposeCreatorOptions>;\n\n  // @ts-ignore\n  const createCloudObjectExpose: CreateCloudObjectExpose = (arg0, arg1, arg2) => {\n    // 选项来源\n    const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n    // 设置默认选项值\n    const createOptions = objectDefaults(optionsSource || {}, {\n      requiredUser: false,\n    }) as Required<CreateCloudObjectOptions>;\n\n    return async function (input) {\n      // 处理云函数响应逻辑\n      return await respondCloudObject(async () => {\n        // 构建附加的上下文信息\n        const user = await parseAppendUser(this, options?.uniIdCloudObject);\n        const append: UniCloudObjectThisAppend = {\n          options: createOptions,\n          user: user,\n        };\n        const context = Object.assign(this, append) as UniCloudObjectContext;\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        // 验证输入数据\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          // 处理验证错误\n          if (issue0?.code === 'custom') throw issue0.message;\n          throw new Error('请求数据不正确');\n        }\n\n        return await arg1(context, parsed.data);\n      }, this.getUniCloudRequestId());\n    };\n  };\n\n  return createCloudObjectExpose;\n}\n\nasync function parseAppendUser(\n  objectThis: UniCloudObjectThis,\n  uniIdCloudObject?: UniIdCloudObject,\n): Promise<UniCloudObjectThisAppendUser> {\n  const appendUser: UniCloudObjectThisAppendUser = {\n    id: '',\n    role: [],\n    permission: [],\n    isAdmin: false,\n  };\n\n  if (!uniIdCloudObject) return appendUser;\n\n  const uniId = uniIdCloudObject.createInstance({\n    clientInfo: objectThis.getClientInfo(),\n  });\n\n  // 忽略错误1\n  const [err1, user] = await tryFlatten(uniId.checkToken(objectThis.getUniIdToken() || ''));\n  if (!user) return appendUser;\n\n  // 忽略错误2\n  const [err2, userData] = tryFlatten(() => parseCloudObjectOutput(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","errorNormalize","objectDefaults","isFunction","tryFlatten","parseCloudObjectOutput"],"mappings":";;;;;;;AAEgB,SAAA,uBAAuB,SAAiB,MAAwB;AAC9E,SAAOA,kBAAY,IAAI,MAAM,OAAO,GAAG;AAAA,IACrC,SAAS;AAAA,IACT,QAAQ;AAAA,EAAA,CACT;AACH;ACHsB,eAAA,mBACpB,IACA,WACkC;AAC9B,MAAA;AACI,UAAA,OAAO,MAAM,GAAG;AAEf,WAAA;AAAA,MACL;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT,QAAQ;AAAA,IACV;AAAA,WACO,KAAK;AACN,UAAA,OAAOC,qBAAe,GAA6D;AAElF,WAAA;AAAA,MACL;AAAA;AAAA,MAEA,MAAM;AAAA,MACN,SAAS,KAAK,WAAW;AAAA,MACzB,QAAQ,KAAK,UAAU,KAAK,WAAW;AAAA,IACzC;AAAA,EAAA;AAEJ;AC0CO,SAAS,8BAA8B,SAA0C;AACtF,QAAM,eAAeC,OAAAA,eAAe,WAAW,IAAI;AAAA,IACjD,qBAAqB;AAAA,IACrB,oBAAoB;AAAA,EAAA,CACrB;AAGD,QAAM,0BAAmD,CAAC,MAAM,MAAM,SAAS;AAE7E,UAAM,gBAAiBC,KAAA,WAAW,IAAI,IAAI,OAAO;AAEjD,UAAM,gBAAgBD,OAAAA,eAAe,iBAAiB,IAAI;AAAA,MACxD,cAAc;AAAA,IAAA,CACf;AAED,WAAO,eAAgB,OAAO;AAErB,aAAA,MAAM,mBAAmB,YAAY;;AAE1C,cAAM,OAAO,MAAM,gBAAgB,MAAM,mCAAS,gBAAgB;AAClE,cAAM,SAAmC;AAAA,UACvC,SAAS;AAAA,UACT;AAAA,QACF;AACA,cAAM,UAAU,OAAO,OAAO,MAAM,MAAM;AAE1C,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;AAKrB,cAAA,SAAS,KAAK,UAAU,KAAK;AAE/B,YAAA,CAAC,OAAO,SAAS;AACX,kBAAA,IAAI,OAAO,MAAM,MAAM;AAE/B,gBAAM,UAAS,kBAAO,UAAP,mBAAc,WAAd,mBAAuB;AAGtC,eAAI,iCAAQ,UAAS,SAAU,OAAM,OAAO;AACtC,gBAAA,IAAI,MAAM,SAAS;AAAA,QAAA;AAG3B,eAAO,MAAM,KAAK,SAAS,OAAO,IAAI;AAAA,MAAA,GACrC,KAAK,sBAAsB;AAAA,IAChC;AAAA,EACF;AAEO,SAAA;AACT;AAEA,eAAe,gBACb,YACA,kBACuC;AACvC,QAAM,aAA2C;AAAA,IAC/C,IAAI;AAAA,IACJ,MAAM,CAAC;AAAA,IACP,YAAY,CAAC;AAAA,IACb,SAAS;AAAA,EACX;AAEI,MAAA,CAAC,iBAAyB,QAAA;AAExB,QAAA,QAAQ,iBAAiB,eAAe;AAAA,IAC5C,YAAY,WAAW,cAAc;AAAA,EAAA,CACtC;AAGD,QAAM,CAAC,MAAM,IAAI,IAAI,MAAMC,KAAA,WAAW,MAAM,WAAW,WAAW,cAAmB,KAAA,EAAE,CAAC;AACpF,MAAA,CAAC,KAAa,QAAA;AAGZ,QAAA,CAAC,MAAM,QAAQ,IAAIA,gBAAW,MAAMC,SAAAA,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;;;;"}
+{"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 './object';\n\nexport async function respondCloudObject<O>(\n  fn: () => MaybePromise<O>,\n  requestId?: string,\n): Promise<UniCloudObjectOutput<O>> {\n  try {\n    const data = await fn();\n\n    return {\n      requestId,\n      data,\n      errCode: 0,\n      errMsg: '',\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      requestId,\n      // @ts-ignore\n      data: null,\n      errCode: err2.errCode || -1,\n      errMsg: err2.errMsg || err2.message || '',\n    };\n  }\n}\n","import { parseCloudObjectOutput } from '@/_helpers';\nimport { 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 type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport type { UniCloudObject, UniCloudObjectThis } from './object';\nimport { respondCloudObject } from './respond';\nimport type { UniIdCloudObject } 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   * 可选的UniIdCloudObject实例\n   * 用于处理用户身份验证和权限管理相关功能\n   */\n  uniIdCloudObject?: UniIdCloudObject;\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\nexport type CreateCloudObjectOptions = {\n  /**\n   * 是否需要用户登录态\n   * @default false\n   */\n  requiredUser?: 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  ): UniCloudObject<z.infer<S>, O>;\n  <O>(\n    fn: (context: UniCloudObjectContext) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): UniCloudObject<void, O>;\n};\n\nexport function buildCloudObjectExposeCreator(options?: BuildCloudExposeCreatorOptions) {\n  const buildOptions = objectDefaults(options || {}, {\n    requiredUserErrCode: 'uni-id-check-token-failed',\n    requiredUserErrMsg: '需要登录后才能进行此操作',\n  }) as Required<BuildCloudExposeCreatorOptions>;\n\n  // @ts-ignore\n  const createCloudObjectExpose: CreateCloudObjectExpose = (arg0, arg1, arg2) => {\n    // 选项来源\n    const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n    // 设置默认选项值\n    const createOptions = objectDefaults(optionsSource || {}, {\n      requiredUser: false,\n    }) as Required<CreateCloudObjectOptions>;\n\n    return async function (input) {\n      // 处理云函数响应逻辑\n      return await respondCloudObject(async () => {\n        // 构建附加的上下文信息\n        const user = await parseAppendUser(this, options?.uniIdCloudObject);\n        const append: UniCloudObjectThisAppend = {\n          options: createOptions,\n          user: user,\n        };\n        const context = Object.assign(this, append) as UniCloudObjectContext;\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        // 验证输入数据\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          // 处理验证错误\n          if (issue0?.code === 'custom') throw issue0.message;\n          throw new Error('请求数据不正确');\n        }\n\n        return await arg1(context, parsed.data);\n      }, this.getUniCloudRequestId());\n    };\n  };\n\n  return createCloudObjectExpose;\n}\n\nasync function parseAppendUser(\n  objectThis: UniCloudObjectThis,\n  uniIdCloudObject?: UniIdCloudObject,\n): Promise<UniCloudObjectThisAppendUser> {\n  const appendUser: UniCloudObjectThisAppendUser = {\n    id: '',\n    role: [],\n    permission: [],\n    isAdmin: false,\n  };\n\n  if (!uniIdCloudObject) return appendUser;\n\n  const uniId = uniIdCloudObject.createInstance({\n    clientInfo: objectThis.getClientInfo(),\n  });\n\n  // 忽略错误1\n  const [err1, user] = await tryFlatten(uniId.checkToken(objectThis.getUniIdToken() || ''));\n  if (!user) return appendUser;\n\n  // 忽略错误2\n  const [err2, userData] = tryFlatten(() => parseCloudObjectOutput(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","errorNormalize","objectDefaults","isFunction","tryFlatten","parseCloudObjectOutput"],"mappings":";;;;;;;AAEgB,SAAA,uBAAuB,SAAiB,MAAwB;AAC9E,SAAOA,kBAAY,IAAI,MAAM,OAAO,GAAG;AAAA,IACrC,SAAS;AAAA,IACT,QAAQ;AAAA,EAAA,CACT;AACH;ACHsB,eAAA,mBACpB,IACA,WACkC;AAC9B,MAAA;AACI,UAAA,OAAO,MAAM,GAAG;AAEf,WAAA;AAAA,MACL;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT,QAAQ;AAAA,IACV;AAAA,WACO,KAAK;AACZ,YAAQ,MAAM,0BAA0B;AACxC,YAAQ,MAAM,GAAG;AAEX,UAAA,OAAOC,qBAAe,GAA6D;AAElF,WAAA;AAAA,MACL;AAAA;AAAA,MAEA,MAAM;AAAA,MACN,SAAS,KAAK,WAAW;AAAA,MACzB,QAAQ,KAAK,UAAU,KAAK,WAAW;AAAA,IACzC;AAAA,EAAA;AAEJ;ACuCO,SAAS,8BAA8B,SAA0C;AACtF,QAAM,eAAeC,OAAAA,eAAe,WAAW,IAAI;AAAA,IACjD,qBAAqB;AAAA,IACrB,oBAAoB;AAAA,EAAA,CACrB;AAGD,QAAM,0BAAmD,CAAC,MAAM,MAAM,SAAS;AAE7E,UAAM,gBAAiBC,KAAA,WAAW,IAAI,IAAI,OAAO;AAEjD,UAAM,gBAAgBD,OAAAA,eAAe,iBAAiB,IAAI;AAAA,MACxD,cAAc;AAAA,IAAA,CACf;AAED,WAAO,eAAgB,OAAO;AAErB,aAAA,MAAM,mBAAmB,YAAY;AAE1C,cAAM,OAAO,MAAM,gBAAgB,MAAM,SAAS,gBAAgB;AAClE,cAAM,SAAmC;AAAA,UACvC,SAAS;AAAA,UACT;AAAA,QACF;AACA,cAAM,UAAU,OAAO,OAAO,MAAM,MAAM;AAE1C,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;AAKrB,cAAA,SAAS,KAAK,UAAU,KAAK;AAE/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;AAG3B,eAAO,MAAM,KAAK,SAAS,OAAO,IAAI;AAAA,MAAA,GACrC,KAAK,sBAAsB;AAAA,IAChC;AAAA,EACF;AAEO,SAAA;AACT;AAEA,eAAe,gBACb,YACA,kBACuC;AACvC,QAAM,aAA2C;AAAA,IAC/C,IAAI;AAAA,IACJ,MAAM,CAAC;AAAA,IACP,YAAY,CAAC;AAAA,IACb,SAAS;AAAA,EACX;AAEI,MAAA,CAAC,iBAAyB,QAAA;AAExB,QAAA,QAAQ,iBAAiB,eAAe;AAAA,IAC5C,YAAY,WAAW,cAAc;AAAA,EAAA,CACtC;AAGD,QAAM,CAAC,MAAM,IAAI,IAAI,MAAMC,KAAA,WAAW,MAAM,WAAW,WAAW,cAAmB,KAAA,EAAE,CAAC;AACpF,MAAA,CAAC,KAAa,QAAA;AAGZ,QAAA,CAAC,MAAM,QAAQ,IAAIA,gBAAW,MAAMC,SAAAA,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;;;;"}

package/dist/cloud.mjs

@@ -19,6 +19,8 @@ async function respondCloudObject(fn, requestId) {
       errMsg: ""
     };
   } catch (err) {
+    console.error("respondCloudObject error");
+    console.error(err);
     const err2 = errorNormalize(err);
     return {
       requestId,
@@ -41,8 +43,7 @@ function buildCloudObjectExposeCreator(options) {
     });
     return async function(input) {
       return await respondCloudObject(async () => {
-        var _a, _b;
-        const user = await parseAppendUser(this, options == null ? void 0 : options.uniIdCloudObject);
+        const user = await parseAppendUser(this, options?.uniIdCloudObject);
         const append = {
           options: createOptions,
           user
@@ -57,8 +58,8 @@ function buildCloudObjectExposeCreator(options) {
         const parsed = arg0.safeParse(input);
         if (!parsed.success) {
           console.log(parsed.error.issues);
-          const issue0 = (_b = (_a = parsed.error) == null ? void 0 : _a.issues) == null ? void 0 : _b[0];
-          if ((issue0 == null ? void 0 : issue0.code) === "custom") throw issue0.message;
+          const issue0 = parsed.error?.issues?.[0];
+          if (issue0?.code === "custom") throw issue0.message;
           throw new Error("请求数据不正确");
         }
         return await arg1(context, parsed.data);

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 './object';\n\nexport async function respondCloudObject<O>(\n  fn: () => MaybePromise<O>,\n  requestId?: string,\n): Promise<UniCloudObjectOutput<O>> {\n  try {\n    const data = await fn();\n\n    return {\n      requestId,\n      data,\n      errCode: 0,\n      errMsg: '',\n    };\n  } catch (err) {\n    const err2 = errorNormalize(err as Error & { errCode?: number | string; errMsg?: string });\n\n    return {\n      requestId,\n      // @ts-ignore\n      data: null,\n      errCode: err2.errCode || -1,\n      errMsg: err2.errMsg || err2.message || '',\n    };\n  }\n}\n","import { parseCloudObjectOutput } from '@/_helpers';\nimport { 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 type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport type { UniCloudObject, UniCloudObjectThis } from './object';\nimport { respondCloudObject } from './respond';\nimport type { UniIdCloudObject } 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   * 可选的UniIdCloudObject实例\n   * 用于处理用户身份验证和权限管理相关功能\n   */\n  uniIdCloudObject?: UniIdCloudObject;\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\nexport type CreateCloudObjectOptions = {\n  /**\n   * 是否需要用户登录态\n   * @default false\n   */\n  requiredUser?: 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  ): UniCloudObject<z.infer<S>, O>;\n  <O>(\n    fn: (context: UniCloudObjectContext) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): UniCloudObject<void, O>;\n};\n\nexport function buildCloudObjectExposeCreator(options?: BuildCloudExposeCreatorOptions) {\n  const buildOptions = objectDefaults(options || {}, {\n    requiredUserErrCode: 'uni-id-check-token-failed',\n    requiredUserErrMsg: '需要登录后才能进行此操作',\n  }) as Required<BuildCloudExposeCreatorOptions>;\n\n  // @ts-ignore\n  const createCloudObjectExpose: CreateCloudObjectExpose = (arg0, arg1, arg2) => {\n    // 选项来源\n    const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n    // 设置默认选项值\n    const createOptions = objectDefaults(optionsSource || {}, {\n      requiredUser: false,\n    }) as Required<CreateCloudObjectOptions>;\n\n    return async function (input) {\n      // 处理云函数响应逻辑\n      return await respondCloudObject(async () => {\n        // 构建附加的上下文信息\n        const user = await parseAppendUser(this, options?.uniIdCloudObject);\n        const append: UniCloudObjectThisAppend = {\n          options: createOptions,\n          user: user,\n        };\n        const context = Object.assign(this, append) as UniCloudObjectContext;\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        // 验证输入数据\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          // 处理验证错误\n          if (issue0?.code === 'custom') throw issue0.message;\n          throw new Error('请求数据不正确');\n        }\n\n        return await arg1(context, parsed.data);\n      }, this.getUniCloudRequestId());\n    };\n  };\n\n  return createCloudObjectExpose;\n}\n\nasync function parseAppendUser(\n  objectThis: UniCloudObjectThis,\n  uniIdCloudObject?: UniIdCloudObject,\n): Promise<UniCloudObjectThisAppendUser> {\n  const appendUser: UniCloudObjectThisAppendUser = {\n    id: '',\n    role: [],\n    permission: [],\n    isAdmin: false,\n  };\n\n  if (!uniIdCloudObject) return appendUser;\n\n  const uniId = uniIdCloudObject.createInstance({\n    clientInfo: objectThis.getClientInfo(),\n  });\n\n  // 忽略错误1\n  const [err1, user] = await tryFlatten(uniId.checkToken(objectThis.getUniIdToken() || ''));\n  if (!user) return appendUser;\n\n  // 忽略错误2\n  const [err2, userData] = tryFlatten(() => parseCloudObjectOutput(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":";;;;;AAEgB,SAAA,uBAAuB,SAAiB,MAAwB;AAC9E,SAAO,YAAY,IAAI,MAAM,OAAO,GAAG;AAAA,IACrC,SAAS;AAAA,IACT,QAAQ;AAAA,EAAA,CACT;AACH;ACHsB,eAAA,mBACpB,IACA,WACkC;AAC9B,MAAA;AACI,UAAA,OAAO,MAAM,GAAG;AAEf,WAAA;AAAA,MACL;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT,QAAQ;AAAA,IACV;AAAA,WACO,KAAK;AACN,UAAA,OAAO,eAAe,GAA6D;AAElF,WAAA;AAAA,MACL;AAAA;AAAA,MAEA,MAAM;AAAA,MACN,SAAS,KAAK,WAAW;AAAA,MACzB,QAAQ,KAAK,UAAU,KAAK,WAAW;AAAA,IACzC;AAAA,EAAA;AAEJ;AC0CO,SAAS,8BAA8B,SAA0C;AACtF,QAAM,eAAe,eAAe,WAAW,IAAI;AAAA,IACjD,qBAAqB;AAAA,IACrB,oBAAoB;AAAA,EAAA,CACrB;AAGD,QAAM,0BAAmD,CAAC,MAAM,MAAM,SAAS;AAE7E,UAAM,gBAAiB,WAAW,IAAI,IAAI,OAAO;AAEjD,UAAM,gBAAgB,eAAe,iBAAiB,IAAI;AAAA,MACxD,cAAc;AAAA,IAAA,CACf;AAED,WAAO,eAAgB,OAAO;AAErB,aAAA,MAAM,mBAAmB,YAAY;;AAE1C,cAAM,OAAO,MAAM,gBAAgB,MAAM,mCAAS,gBAAgB;AAClE,cAAM,SAAmC;AAAA,UACvC,SAAS;AAAA,UACT;AAAA,QACF;AACA,cAAM,UAAU,OAAO,OAAO,MAAM,MAAM;AAE1C,YAAI,cAAc,gBAAgB,CAAC,KAAK,IAAI;AAC1C,gBAAM,uBAAuB,aAAa,oBAAoB,aAAa,mBAAmB;AAAA,QAAA;AAI5F,YAAA,WAAW,IAAI,GAAG;AACb,iBAAA,MAAM,KAAK,OAAO;AAAA,QAAA;AAKrB,cAAA,SAAS,KAAK,UAAU,KAAK;AAE/B,YAAA,CAAC,OAAO,SAAS;AACX,kBAAA,IAAI,OAAO,MAAM,MAAM;AAE/B,gBAAM,UAAS,kBAAO,UAAP,mBAAc,WAAd,mBAAuB;AAGtC,eAAI,iCAAQ,UAAS,SAAU,OAAM,OAAO;AACtC,gBAAA,IAAI,MAAM,SAAS;AAAA,QAAA;AAG3B,eAAO,MAAM,KAAK,SAAS,OAAO,IAAI;AAAA,MAAA,GACrC,KAAK,sBAAsB;AAAA,IAChC;AAAA,EACF;AAEO,SAAA;AACT;AAEA,eAAe,gBACb,YACA,kBACuC;AACvC,QAAM,aAA2C;AAAA,IAC/C,IAAI;AAAA,IACJ,MAAM,CAAC;AAAA,IACP,YAAY,CAAC;AAAA,IACb,SAAS;AAAA,EACX;AAEI,MAAA,CAAC,iBAAyB,QAAA;AAExB,QAAA,QAAQ,iBAAiB,eAAe;AAAA,IAC5C,YAAY,WAAW,cAAc;AAAA,EAAA,CACtC;AAGD,QAAM,CAAC,MAAM,IAAI,IAAI,MAAM,WAAW,MAAM,WAAW,WAAW,cAAmB,KAAA,EAAE,CAAC;AACpF,MAAA,CAAC,KAAa,QAAA;AAGZ,QAAA,CAAC,MAAM,QAAQ,IAAI,WAAW,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;"}
+{"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 './object';\n\nexport async function respondCloudObject<O>(\n  fn: () => MaybePromise<O>,\n  requestId?: string,\n): Promise<UniCloudObjectOutput<O>> {\n  try {\n    const data = await fn();\n\n    return {\n      requestId,\n      data,\n      errCode: 0,\n      errMsg: '',\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      requestId,\n      // @ts-ignore\n      data: null,\n      errCode: err2.errCode || -1,\n      errMsg: err2.errMsg || err2.message || '',\n    };\n  }\n}\n","import { parseCloudObjectOutput } from '@/_helpers';\nimport { 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 type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport type { UniCloudObject, UniCloudObjectThis } from './object';\nimport { respondCloudObject } from './respond';\nimport type { UniIdCloudObject } 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   * 可选的UniIdCloudObject实例\n   * 用于处理用户身份验证和权限管理相关功能\n   */\n  uniIdCloudObject?: UniIdCloudObject;\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\nexport type CreateCloudObjectOptions = {\n  /**\n   * 是否需要用户登录态\n   * @default false\n   */\n  requiredUser?: 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  ): UniCloudObject<z.infer<S>, O>;\n  <O>(\n    fn: (context: UniCloudObjectContext) => MaybePromise<O>,\n    options?: CreateCloudObjectOptions,\n  ): UniCloudObject<void, O>;\n};\n\nexport function buildCloudObjectExposeCreator(options?: BuildCloudExposeCreatorOptions) {\n  const buildOptions = objectDefaults(options || {}, {\n    requiredUserErrCode: 'uni-id-check-token-failed',\n    requiredUserErrMsg: '需要登录后才能进行此操作',\n  }) as Required<BuildCloudExposeCreatorOptions>;\n\n  // @ts-ignore\n  const createCloudObjectExpose: CreateCloudObjectExpose = (arg0, arg1, arg2) => {\n    // 选项来源\n    const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n    // 设置默认选项值\n    const createOptions = objectDefaults(optionsSource || {}, {\n      requiredUser: false,\n    }) as Required<CreateCloudObjectOptions>;\n\n    return async function (input) {\n      // 处理云函数响应逻辑\n      return await respondCloudObject(async () => {\n        // 构建附加的上下文信息\n        const user = await parseAppendUser(this, options?.uniIdCloudObject);\n        const append: UniCloudObjectThisAppend = {\n          options: createOptions,\n          user: user,\n        };\n        const context = Object.assign(this, append) as UniCloudObjectContext;\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        // 验证输入数据\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          // 处理验证错误\n          if (issue0?.code === 'custom') throw issue0.message;\n          throw new Error('请求数据不正确');\n        }\n\n        return await arg1(context, parsed.data);\n      }, this.getUniCloudRequestId());\n    };\n  };\n\n  return createCloudObjectExpose;\n}\n\nasync function parseAppendUser(\n  objectThis: UniCloudObjectThis,\n  uniIdCloudObject?: UniIdCloudObject,\n): Promise<UniCloudObjectThisAppendUser> {\n  const appendUser: UniCloudObjectThisAppendUser = {\n    id: '',\n    role: [],\n    permission: [],\n    isAdmin: false,\n  };\n\n  if (!uniIdCloudObject) return appendUser;\n\n  const uniId = uniIdCloudObject.createInstance({\n    clientInfo: objectThis.getClientInfo(),\n  });\n\n  // 忽略错误1\n  const [err1, user] = await tryFlatten(uniId.checkToken(objectThis.getUniIdToken() || ''));\n  if (!user) return appendUser;\n\n  // 忽略错误2\n  const [err2, userData] = tryFlatten(() => parseCloudObjectOutput(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":";;;;;AAEgB,SAAA,uBAAuB,SAAiB,MAAwB;AAC9E,SAAO,YAAY,IAAI,MAAM,OAAO,GAAG;AAAA,IACrC,SAAS;AAAA,IACT,QAAQ;AAAA,EAAA,CACT;AACH;ACHsB,eAAA,mBACpB,IACA,WACkC;AAC9B,MAAA;AACI,UAAA,OAAO,MAAM,GAAG;AAEf,WAAA;AAAA,MACL;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT,QAAQ;AAAA,IACV;AAAA,WACO,KAAK;AACZ,YAAQ,MAAM,0BAA0B;AACxC,YAAQ,MAAM,GAAG;AAEX,UAAA,OAAO,eAAe,GAA6D;AAElF,WAAA;AAAA,MACL;AAAA;AAAA,MAEA,MAAM;AAAA,MACN,SAAS,KAAK,WAAW;AAAA,MACzB,QAAQ,KAAK,UAAU,KAAK,WAAW;AAAA,IACzC;AAAA,EAAA;AAEJ;ACuCO,SAAS,8BAA8B,SAA0C;AACtF,QAAM,eAAe,eAAe,WAAW,IAAI;AAAA,IACjD,qBAAqB;AAAA,IACrB,oBAAoB;AAAA,EAAA,CACrB;AAGD,QAAM,0BAAmD,CAAC,MAAM,MAAM,SAAS;AAE7E,UAAM,gBAAiB,WAAW,IAAI,IAAI,OAAO;AAEjD,UAAM,gBAAgB,eAAe,iBAAiB,IAAI;AAAA,MACxD,cAAc;AAAA,IAAA,CACf;AAED,WAAO,eAAgB,OAAO;AAErB,aAAA,MAAM,mBAAmB,YAAY;AAE1C,cAAM,OAAO,MAAM,gBAAgB,MAAM,SAAS,gBAAgB;AAClE,cAAM,SAAmC;AAAA,UACvC,SAAS;AAAA,UACT;AAAA,QACF;AACA,cAAM,UAAU,OAAO,OAAO,MAAM,MAAM;AAE1C,YAAI,cAAc,gBAAgB,CAAC,KAAK,IAAI;AAC1C,gBAAM,uBAAuB,aAAa,oBAAoB,aAAa,mBAAmB;AAAA,QAAA;AAI5F,YAAA,WAAW,IAAI,GAAG;AACb,iBAAA,MAAM,KAAK,OAAO;AAAA,QAAA;AAKrB,cAAA,SAAS,KAAK,UAAU,KAAK;AAE/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;AAG3B,eAAO,MAAM,KAAK,SAAS,OAAO,IAAI;AAAA,MAAA,GACrC,KAAK,sBAAsB;AAAA,IAChC;AAAA,EACF;AAEO,SAAA;AACT;AAEA,eAAe,gBACb,YACA,kBACuC;AACvC,QAAM,aAA2C;AAAA,IAC/C,IAAI;AAAA,IACJ,MAAM,CAAC;AAAA,IACP,YAAY,CAAC;AAAA,IACb,SAAS;AAAA,EACX;AAEI,MAAA,CAAC,iBAAyB,QAAA;AAExB,QAAA,QAAQ,iBAAiB,eAAe;AAAA,IAC5C,YAAY,WAAW,cAAc;AAAA,EAAA,CACtC;AAGD,QAAM,CAAC,MAAM,IAAI,IAAI,MAAM,WAAW,MAAM,WAAW,WAAW,cAAmB,KAAA,EAAE,CAAC;AACpF,MAAA,CAAC,KAAa,QAAA;AAGZ,QAAA,CAAC,MAAM,QAAQ,IAAI,WAAW,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;"}

package/dist/database/db.d.ts

@@ -1,16 +1,25 @@
-import { AnyObject, LowercaseStartString } from '@cloudcome/utils-core/types';
+import { AnyObject, HasProperty, IsEmptyObject, IsOnlyProperty } from '@cloudcome/utils-core/types';
 import { UniClientDatabaseOutput, UniCloudDatabaseOutput } from './types';
-type DbSelectPositive = {
-    [key: LowercaseStartString]: true;
+export type DbWhere<T> = {
+    [K in keyof T]?: unknown;
 };
-type DbSelectNegative = {
-    _id?: false;
+export type DbSelect<T> = {
+    [K in keyof T]?: K extends '_id' ? false : true;
 };
-export type DbSelect = Omit<DbSelectPositive, '_id'> & DbSelectNegative;
-export type DbOrder = Record<string, 'asc' | 'desc'>;
-export type DbRecord<S extends Record<string, boolean>> = {
-    [K in keyof S as S[K] extends true ? K : never]: unknown;
+export type DbFieldsDefault<T> = {
+    [K in keyof T]: true;
 };
+type _DbFields<T, S extends DbSelect<T>> = IsEmptyObject<S> extends true ? DbFieldsDefault<T> : IsOnlyProperty<S, '_id'> extends true ? Omit<DbFieldsDefault<T>, '_id'> : 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];
+};
+export type DbQuery<T, S extends DbSelect<T>> = _DbQuery<T, _DbFields<T, S>>;
+export type DbCreate<T> = Partial<T>;
+export type DbUpdate<T> = Partial<T>;
+export type DbOrder<T> = Record<keyof T, 'asc' | 'desc'>;
 /**
  * 数据库操作符命令
  */
@@ -21,9 +30,9 @@ export declare const dbCmd: UniCloud.QueryCommand;
 export declare const dbAgg: UniCloud.AggregateCommand;
 export type DbOptions = {
     /**
-     * 集合名称
+     * 数据表名称
      */
-    collection: string;
+    table: string;
     /**
      * 事务对象，用于事务操作
      */
@@ -33,11 +42,11 @@ export type DbOptions = {
      */
     _mockDatabase?: any;
 };
-export declare class Db {
+export declare class Db<T, S extends DbSelect<T> = Record<string, never>> {
     #private;
     /**
      * 构造函数，初始化数据库集合引用
-     * @param collection 集合名称
+     * @param collection 数据表名称
      * @param _mockDatabase 模拟数据库，用于单元测试
      */
     constructor(options: DbOptions);
@@ -49,31 +58,37 @@ export declare class Db {
     /**
      * 设置查询条件
      * @param where 查询条件对象
-     * @returns 当前Db实例，支持链式执行
+     * @returns 当前Db实例，支持链式调用
+     */
+    where(where: DbWhere<T>): this;
+    /**
+     * 根据ID设置查询条件
+     * @param id 记录ID
+     * @returns 当前Db实例，支持链式调用
      */
-    where(where: AnyObject): this;
+    whereId(id: string): this;
     /**
      * 指定要返回的字段
      * @param fields 要返回的字段对象，true表示返回，false表示不返回
-     * @returns 当前Db实例，支持链式执行
+     * @returns 当前Db实例，支持链式调用
      */
-    select(fields: DbSelect): this;
+    select<U extends DbSelect<T>>(fields: U): Db<T, U>;
     /**
      * 设置排序规则
      * @param order 排序规则对象，key为字段名，value为"asc"或"desc"
-     * @returns 当前Db实例，支持链式执行
+     * @returns 当前Db实例，支持链式调用
      */
-    order(order: DbOrder): this;
+    order(order: DbOrder<T>): this;
     /**
      * 跳过指定数量的记录
      * @param skip 要跳过的记录数
-     * @returns 当前Db实例，支持链式执行
+     * @returns 当前Db实例，支持链式调用
      */
     skip(skip: number): this;
     /**
      * 限制返回的记录数量
      * @param limit 最大返回记录数
-     * @returns 当前Db实例，支持链式执行
+     * @returns 当前Db实例，支持链式调用
      */
     limit(limit: number): this;
     /**
@@ -81,81 +96,36 @@ export declare class Db {
      * @param data 要创建的数据
      * @returns 创建结果
      */
-    create(data: AnyObject): Promise<{
-        id: string;
-    } | Omit<{
-        id: string;
-    } & {
-        code?: number | string;
-        errCode?: number | string;
-        errMsg?: string;
-        message?: string;
-    }, "errCode" | "errMsg" | "code" | "message">>;
+    create(data: DbCreate<T>): Promise<string>;
     /**
      * 执行查询操作
      * @returns 查询结果
      */
-    query<T>(): Promise<{
-        data: T[];
-    } | Omit<{
-        data: T[];
-    } & {
-        code?: number | string;
-        errCode?: number | string;
-        errMsg?: string;
-        message?: string;
-    }, "errCode" | "errMsg" | "code" | "message">>;
+    query(): Promise<_DbQuery<T, _DbFields<T, S>>[]>;
     /**
      * 只查询一条，自动添加 limit(1) 条件
      * @param ignoreMiss 是否忽略没有匹配到记录
      * @returns 查询结果
      */
-    queryOne<T>(): Promise<T>;
-    queryOne<T>(ignoreMiss: false): Promise<T>;
-    queryOne<T>(ignoreMiss: true): Promise<T | undefined>;
+    queryOne(): Promise<DbQuery<T, S>>;
+    queryOne(ignoreMiss: false): Promise<DbQuery<T, S>>;
+    queryOne(ignoreMiss: true): Promise<DbQuery<T, S> | undefined>;
     /**
      * 获取匹配记录的数量
      * @returns 记录总数
      */
-    count(): Promise<{
-        total: number;
-    } | Omit<{
-        total: number;
-    } & {
-        code?: number | string;
-        errCode?: number | string;
-        errMsg?: string;
-        message?: string;
-    }, "errCode" | "errMsg" | "code" | "message">>;
+    count(): Promise<number>;
     /**
      * 更新记录
      * @param data 要更新的数据
      * @returns 更新结果
      */
-    update(data: AnyObject): Promise<{
-        updated: number;
-    } | Omit<{
-        updated: number;
-    } & {
-        code?: number | string;
-        errCode?: number | string;
-        errMsg?: string;
-        message?: string;
-    }, "errCode" | "errMsg" | "code" | "message">>;
+    update(data: AnyObject): Promise<number>;
     /**
      * 删除记录
      * @returns 删除结果
      */
-    remove(): Promise<{
-        deleted: number;
-    } | Omit<{
-        deleted: number;
-    } & {
-        code?: number | string;
-        errCode?: number | string;
-        errMsg?: string;
-        message?: string;
-    }, "errCode" | "errMsg" | "code" | "message">>;
+    remove(): Promise<number>;
 }
 /**
  * 数据库操作对象
@@ -163,10 +133,10 @@ export declare class Db {
 export declare const db: {
     /**
      * 获取指定名称的数据库集合实例
-     * @param collection 集合名称
+     * @param name 数据表名称
      * @returns Db类实例，用于执行数据库操作
      */
-    collection(collection: string): Db;
+    table<T>(name: string): Db<T>;
 };
 /**
  * 解析数据库执行结果

package/dist/database/fns.d.ts

@@ -1,5 +1,4 @@
-import { AnyObject } from '@cloudcome/utils-core/types';
-import { Db, DbSelect } from './db';
+import { Db, DbCreate, DbQuery, DbSelect, DbUpdate, DbWhere } from './db';
 /**
  * 数据库 upsert 操作的配置选项
  *
@@ -9,7 +8,7 @@ import { Db, DbSelect } from './db';
  * @template U - 更新数据类型
  * @template R - 查询结果类型
  */
-export type DbUpsertOptions<W extends AnyObject, S extends DbSelect, C extends AnyObject, U extends AnyObject, R extends AnyObject> = {
+export type DbUpsertOptions<T, W extends DbWhere<T>, S extends DbSelect<T>, C extends DbCreate<T>, U extends DbUpdate<T>> = {
     /** 集合名称 */
     collection: string;
     /** 查询条件 */
@@ -22,7 +21,7 @@ export type DbUpsertOptions<W extends AnyObject, S extends DbSelect, C extends A
      * 更新数据，可以是对象或根据查询结果生成更新对象的函数
      * @param row 查询到的文档数据，仅在传入函数时可用
      */
-    update: U | ((row: R) => U);
+    update: U | ((row: DbQuery<T, S>) => U);
     /** 创建前回调函数 */
     onBeforeCreate?: () => unknown;
     /**
@@ -34,17 +33,13 @@ export type DbUpsertOptions<W extends AnyObject, S extends DbSelect, C extends A
      * 更新前回调函数
      * @param row 查询到的文档
      */
-    onBeforeUpdate?: (row: R) => unknown;
+    onBeforeUpdate?: (row: DbQuery<T, S>) => unknown;
     /** 更新后回调函数 */
     onAfterUpdate?: () => unknown;
     /** 用于测试的模拟数据库实例 */
     _mockDb?: (collection: string) => any;
 };
-export declare function dbUpsert<W extends AnyObject, S extends DbSelect, C extends AnyObject, U extends AnyObject, R extends AnyObject>(options: DbUpsertOptions<W, S, C, U, R>): Promise<{
-    updated: number;
-} | {
-    id: string;
-}>;
+export declare function dbUpsert<T, W extends DbWhere<T>, S extends DbSelect<T>, C extends DbCreate<T>, U extends DbUpdate<T>>(options: DbUpsertOptions<T, W, S, C, U>): Promise<string | number>;
 type _TransactionDb = {
     startTransaction: () => Promise<_Transaction>;
 };
@@ -69,5 +64,5 @@ type _Transaction = {
  * });
  * ```
  */
-export declare function dbTransaction<T>(transact: (ta: Db) => Promise<T>, _mockDatabase?: _TransactionDb): Promise<T>;
+export declare function dbTransaction<T, S extends DbSelect<T> = {}>(transact: (ta: Db<T, S>) => Promise<unknown>, _mockDatabase?: _TransactionDb): Promise<unknown>;
 export {};