@cloudcome/utils-uni 1.7.1 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cloud/object.d.ts +1 -1
- package/dist/cloud.cjs +6 -6
- package/dist/cloud.cjs.map +1 -1
- package/dist/cloud.mjs +6 -6
- package/dist/cloud.mjs.map +1 -1
- package/dist/database/db.d.ts +82 -18
- package/dist/database/fns.d.ts +34 -33
- package/dist/database/test.d.ts +1 -0
- package/dist/database.cjs +155 -53
- package/dist/database.cjs.map +1 -1
- package/dist/database.mjs +156 -54
- package/dist/database.mjs.map +1 -1
- package/dist/index.cjs +1 -1
- package/dist/index.mjs +1 -1
- package/package.json +3 -3
package/dist/cloud/object.d.ts
CHANGED
|
@@ -124,9 +124,9 @@ export type UniCloudObjectThis = {
|
|
|
124
124
|
getHttpInfo: () => HttpInfo | undefined;
|
|
125
125
|
};
|
|
126
126
|
export type UniCloudObjectOutput<T> = {
|
|
127
|
-
requestId?: string;
|
|
128
127
|
errCode?: number | string;
|
|
129
128
|
errMsg?: string;
|
|
130
129
|
data: T;
|
|
130
|
+
requestId?: string;
|
|
131
131
|
};
|
|
132
132
|
export type UniCloudObject<I, O> = (this: UniCloudObjectThis, input: I) => Promise<UniCloudObjectOutput<O>>;
|
package/dist/cloud.cjs
CHANGED
|
@@ -15,21 +15,21 @@ async function respondCloudObject(fn, requestId) {
|
|
|
15
15
|
try {
|
|
16
16
|
const data = await fn();
|
|
17
17
|
return {
|
|
18
|
-
requestId,
|
|
19
|
-
data,
|
|
20
18
|
errCode: 0,
|
|
21
|
-
errMsg: ""
|
|
19
|
+
errMsg: "",
|
|
20
|
+
data,
|
|
21
|
+
requestId
|
|
22
22
|
};
|
|
23
23
|
} catch (err) {
|
|
24
24
|
console.error("respondCloudObject error");
|
|
25
25
|
console.error(err);
|
|
26
26
|
const err2 = error.errorNormalize(err);
|
|
27
27
|
return {
|
|
28
|
-
|
|
28
|
+
errCode: err2.errCode || -1,
|
|
29
|
+
errMsg: err2.errMsg || err2.message || "",
|
|
29
30
|
// @ts-ignore
|
|
30
31
|
data: null,
|
|
31
|
-
|
|
32
|
-
errMsg: err2.errMsg || err2.message || ""
|
|
32
|
+
requestId
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
}
|
package/dist/cloud.cjs.map
CHANGED
|
@@ -1 +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
|
|
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 errCode: 0,\n errMsg: '',\n data,\n requestId,\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 requestId,\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,SAAS;AAAA,MACT,QAAQ;AAAA,MACR;AAAA,MACA;AAAA,IACF;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;AAAA,IACF;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
CHANGED
|
@@ -13,21 +13,21 @@ async function respondCloudObject(fn, requestId) {
|
|
|
13
13
|
try {
|
|
14
14
|
const data = await fn();
|
|
15
15
|
return {
|
|
16
|
-
requestId,
|
|
17
|
-
data,
|
|
18
16
|
errCode: 0,
|
|
19
|
-
errMsg: ""
|
|
17
|
+
errMsg: "",
|
|
18
|
+
data,
|
|
19
|
+
requestId
|
|
20
20
|
};
|
|
21
21
|
} catch (err) {
|
|
22
22
|
console.error("respondCloudObject error");
|
|
23
23
|
console.error(err);
|
|
24
24
|
const err2 = errorNormalize(err);
|
|
25
25
|
return {
|
|
26
|
-
|
|
26
|
+
errCode: err2.errCode || -1,
|
|
27
|
+
errMsg: err2.errMsg || err2.message || "",
|
|
27
28
|
// @ts-ignore
|
|
28
29
|
data: null,
|
|
29
|
-
|
|
30
|
-
errMsg: err2.errMsg || err2.message || ""
|
|
30
|
+
requestId
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
33
|
}
|
package/dist/cloud.mjs.map
CHANGED
|
@@ -1 +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
|
|
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 errCode: 0,\n errMsg: '',\n data,\n requestId,\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 requestId,\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,SAAS;AAAA,MACT,QAAQ;AAAA,MACR;AAAA,MACA;AAAA,IACF;AAAA,WACO,KAAK;AACZ,YAAQ,MAAM,0BAA0B;AACxC,YAAQ,MAAM,GAAG;AAEX,UAAA,OAAO,eAAe,GAA6D;AAElF,WAAA;AAAA,MACL,SAAS,KAAK,WAAW;AAAA,MACzB,QAAQ,KAAK,UAAU,KAAK,WAAW;AAAA;AAAA,MAEvC,MAAM;AAAA,MACN;AAAA,IACF;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
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AnyObject, HasProperty, IsEmptyObject, IsOnlyProperty } from '@cloudcome/utils-core/types';
|
|
1
|
+
import { AnyObject, HasProperty, IsEmptyObject, IsOnlyProperty, MergeIntersection } from '@cloudcome/utils-core/types';
|
|
2
2
|
import { UniClientDatabaseOutput, UniCloudDatabaseOutput } from './types';
|
|
3
3
|
export type DbWhere<T> = {
|
|
4
4
|
[K in keyof T]?: unknown;
|
|
@@ -16,18 +16,25 @@ S & {
|
|
|
16
16
|
type _DbQuery<T, S extends Record<keyof T, boolean>> = {
|
|
17
17
|
[K in keyof T as S[K] extends true ? K : never]: T[K];
|
|
18
18
|
};
|
|
19
|
-
export type DbQuery<T, S extends DbSelect<T
|
|
19
|
+
export type DbQuery<T, S extends DbSelect<T>, R> = _DbQuery<T, _DbFields<T, S>> & R;
|
|
20
|
+
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>[]>;
|
|
20
21
|
export type DbCreate<T> = Partial<T>;
|
|
21
22
|
export type DbUpdate<T> = Partial<T>;
|
|
22
23
|
export type DbOrder<T> = Record<keyof T, 'asc' | 'desc'>;
|
|
23
24
|
/**
|
|
24
25
|
* 数据库操作符命令
|
|
25
26
|
*/
|
|
26
|
-
export declare const dbCmd: UniCloud.QueryCommand
|
|
27
|
+
export declare const dbCmd: UniCloud.QueryCommand & {
|
|
28
|
+
expr: (expr: unknown) => unknown;
|
|
29
|
+
};
|
|
27
30
|
/**
|
|
28
31
|
* 数据库聚合操作符命令
|
|
29
32
|
*/
|
|
30
|
-
export declare const dbAgg: UniCloud.AggregateCommand
|
|
33
|
+
export declare const dbAgg: UniCloud.AggregateCommand & {
|
|
34
|
+
pipeline: () => UniCloud.AggregateReference & {
|
|
35
|
+
done: () => unknown;
|
|
36
|
+
};
|
|
37
|
+
};
|
|
31
38
|
export type DbOptions = {
|
|
32
39
|
/**
|
|
33
40
|
* 数据表名称
|
|
@@ -42,7 +49,58 @@ export type DbOptions = {
|
|
|
42
49
|
*/
|
|
43
50
|
_mockDatabase?: any;
|
|
44
51
|
};
|
|
45
|
-
|
|
52
|
+
/**
|
|
53
|
+
* 数据库关联类型
|
|
54
|
+
* - '1:1': 一对一关联，返回值 1 个
|
|
55
|
+
* - '1:n': 一对多关联，返回值 n 个
|
|
56
|
+
* - 'n:1': 多对一关联，返回值 n 个
|
|
57
|
+
*/
|
|
58
|
+
export type DbJoinType = '1:1' | '1:n' | 'n:1';
|
|
59
|
+
export type DbLookupOptions<J extends DbJoinType, L, F, A> = {
|
|
60
|
+
/**
|
|
61
|
+
* 关联类型
|
|
62
|
+
*/
|
|
63
|
+
type: J;
|
|
64
|
+
/**
|
|
65
|
+
* 主表字段
|
|
66
|
+
*/
|
|
67
|
+
localField: keyof L & string;
|
|
68
|
+
/**
|
|
69
|
+
* 关联表字段
|
|
70
|
+
*/
|
|
71
|
+
foreignField: keyof F & string;
|
|
72
|
+
/**
|
|
73
|
+
* 关联数据在结果中的字段名
|
|
74
|
+
*/
|
|
75
|
+
as: A;
|
|
76
|
+
};
|
|
77
|
+
export type DbLookup = {
|
|
78
|
+
/**
|
|
79
|
+
* 关联表
|
|
80
|
+
*/
|
|
81
|
+
table: Db<unknown>;
|
|
82
|
+
/**
|
|
83
|
+
* 关联类型
|
|
84
|
+
*/
|
|
85
|
+
type: DbJoinType;
|
|
86
|
+
/**
|
|
87
|
+
* 主表字段
|
|
88
|
+
*/
|
|
89
|
+
localField: string;
|
|
90
|
+
/**
|
|
91
|
+
* 关联表字段
|
|
92
|
+
*/
|
|
93
|
+
foreignField: string;
|
|
94
|
+
/**
|
|
95
|
+
* 关联表名称
|
|
96
|
+
*/
|
|
97
|
+
from: string;
|
|
98
|
+
/**
|
|
99
|
+
* 关联数据在结果中的字段名
|
|
100
|
+
*/
|
|
101
|
+
as: string;
|
|
102
|
+
};
|
|
103
|
+
export declare class Db<T, S extends DbSelect<T> = {}, R extends AnyObject = {}> {
|
|
46
104
|
#private;
|
|
47
105
|
/**
|
|
48
106
|
* 构造函数，初始化数据库集合引用
|
|
@@ -50,8 +108,9 @@ export declare class Db<T, S extends DbSelect<T> = Record<string, never>> {
|
|
|
50
108
|
* @param _mockDatabase 模拟数据库，用于单元测试
|
|
51
109
|
*/
|
|
52
110
|
constructor(options: DbOptions);
|
|
111
|
+
get table(): string;
|
|
53
112
|
/**
|
|
54
|
-
*
|
|
113
|
+
* 获取聚合操作实例
|
|
55
114
|
* @returns 聚合操作实例
|
|
56
115
|
*/
|
|
57
116
|
aggregate(): UniCloud.AggregateReference;
|
|
@@ -72,7 +131,7 @@ export declare class Db<T, S extends DbSelect<T> = Record<string, never>> {
|
|
|
72
131
|
* @param fields 要返回的字段对象，true表示返回，false表示不返回
|
|
73
132
|
* @returns 当前Db实例，支持链式调用
|
|
74
133
|
*/
|
|
75
|
-
select<U extends DbSelect<T>>(fields: U): Db<T, U>;
|
|
134
|
+
select<U extends DbSelect<T>>(fields: U): Db<T, S & U, R>;
|
|
76
135
|
/**
|
|
77
136
|
* 设置排序规则
|
|
78
137
|
* @param order 排序规则对象，key为字段名，value为"asc"或"desc"
|
|
@@ -91,30 +150,32 @@ export declare class Db<T, S extends DbSelect<T> = Record<string, never>> {
|
|
|
91
150
|
* @returns 当前Db实例，支持链式调用
|
|
92
151
|
*/
|
|
93
152
|
limit(limit: number): this;
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
* @param data 要创建的数据
|
|
97
|
-
* @returns 创建结果
|
|
98
|
-
*/
|
|
99
|
-
create(data: DbCreate<T>): Promise<string>;
|
|
153
|
+
get hasLookup(): boolean;
|
|
154
|
+
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>>>;
|
|
100
155
|
/**
|
|
101
156
|
* 执行查询操作
|
|
102
157
|
* @returns 查询结果
|
|
103
158
|
*/
|
|
104
|
-
query(): Promise<
|
|
159
|
+
query(): Promise<DbQuery<T, S, R>[]>;
|
|
105
160
|
/**
|
|
106
161
|
* 只查询一条，自动添加 limit(1) 条件
|
|
107
162
|
* @param ignoreMiss 是否忽略没有匹配到记录
|
|
108
163
|
* @returns 查询结果
|
|
109
164
|
*/
|
|
110
|
-
queryOne(): Promise<DbQuery<T, S>>;
|
|
111
|
-
queryOne(ignoreMiss: false): Promise<DbQuery<T, S>>;
|
|
112
|
-
queryOne(ignoreMiss: true): Promise<DbQuery<T, S> | undefined>;
|
|
165
|
+
queryOne(): Promise<DbQuery<T, S, R>>;
|
|
166
|
+
queryOne(ignoreMiss: false): Promise<DbQuery<T, S, R>>;
|
|
167
|
+
queryOne(ignoreMiss: true): Promise<DbQuery<T, S, R> | undefined>;
|
|
113
168
|
/**
|
|
114
169
|
* 获取匹配记录的数量
|
|
115
170
|
* @returns 记录总数
|
|
116
171
|
*/
|
|
117
172
|
count(): Promise<number>;
|
|
173
|
+
/**
|
|
174
|
+
* 创建新记录
|
|
175
|
+
* @param data 要创建的数据
|
|
176
|
+
* @returns 创建结果
|
|
177
|
+
*/
|
|
178
|
+
create(data: DbCreate<T>): Promise<string>;
|
|
118
179
|
/**
|
|
119
180
|
* 更新记录
|
|
120
181
|
* @param data 要更新的数据
|
|
@@ -127,6 +188,9 @@ export declare class Db<T, S extends DbSelect<T> = Record<string, never>> {
|
|
|
127
188
|
*/
|
|
128
189
|
remove(): Promise<number>;
|
|
129
190
|
}
|
|
191
|
+
export type DbProxy<T, S extends DbSelect<T> = {}, R extends AnyObject = {}> = Db<T, S, R> & {
|
|
192
|
+
_isProxy: true;
|
|
193
|
+
};
|
|
130
194
|
/**
|
|
131
195
|
* 数据库操作对象
|
|
132
196
|
*/
|
|
@@ -136,7 +200,7 @@ export declare const db: {
|
|
|
136
200
|
* @param name 数据表名称
|
|
137
201
|
* @returns Db类实例，用于执行数据库操作
|
|
138
202
|
*/
|
|
139
|
-
table<T>(name: string):
|
|
203
|
+
table<T, S extends DbSelect<T> = {}, R extends AnyObject = {}>(name: string): DbProxy<T>;
|
|
140
204
|
};
|
|
141
205
|
/**
|
|
142
206
|
* 解析数据库执行结果
|
package/dist/database/fns.d.ts
CHANGED
|
@@ -1,18 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
*
|
|
5
|
-
* @template W - 查询条件类型
|
|
6
|
-
* @template S - 查询返回字段类型
|
|
7
|
-
* @template C - 创建数据类型
|
|
8
|
-
* @template U - 更新数据类型
|
|
9
|
-
* @template R - 查询结果类型
|
|
10
|
-
*/
|
|
11
|
-
export type DbUpsertOptions<T, W extends DbWhere<T>, S extends DbSelect<T>, C extends DbCreate<T>, U extends DbUpdate<T>> = {
|
|
12
|
-
/** 集合名称 */
|
|
13
|
-
collection: string;
|
|
1
|
+
import { AnyObject } from '@cloudcome/utils-core/types';
|
|
2
|
+
import { Db, DbCreate, DbProxy, DbQuery, DbSelect, DbUpdate, DbWhere } from './db';
|
|
3
|
+
export type DbUpsertOptions<T, S extends DbSelect<T>, C extends DbCreate<T>, U extends DbUpdate<T>> = {
|
|
14
4
|
/** 查询条件 */
|
|
15
|
-
where:
|
|
5
|
+
where: DbWhere<T>;
|
|
16
6
|
/** 查询返回字段 */
|
|
17
7
|
select?: S;
|
|
18
8
|
/** 创建数据 */
|
|
@@ -21,7 +11,7 @@ export type DbUpsertOptions<T, W extends DbWhere<T>, S extends DbSelect<T>, C ex
|
|
|
21
11
|
* 更新数据，可以是对象或根据查询结果生成更新对象的函数
|
|
22
12
|
* @param row 查询到的文档数据，仅在传入函数时可用
|
|
23
13
|
*/
|
|
24
|
-
update: U | ((
|
|
14
|
+
update: U | ((existed: DbQuery<T, S, {}>) => U);
|
|
25
15
|
/** 创建前回调函数 */
|
|
26
16
|
onBeforeCreate?: () => unknown;
|
|
27
17
|
/**
|
|
@@ -31,38 +21,49 @@ export type DbUpsertOptions<T, W extends DbWhere<T>, S extends DbSelect<T>, C ex
|
|
|
31
21
|
onAfterCreate?: (id: string) => unknown;
|
|
32
22
|
/**
|
|
33
23
|
* 更新前回调函数
|
|
34
|
-
* @param
|
|
24
|
+
* @param existed 查询到的原始文档数据
|
|
25
|
+
* @returns 如果返回 false，则取消更新操作
|
|
26
|
+
*/
|
|
27
|
+
onBeforeUpdate?: (existed: DbQuery<T, S, {}>) => false | unknown;
|
|
28
|
+
/**
|
|
29
|
+
* 更新后回调函数
|
|
30
|
+
* @param updateData 实际更新的数据
|
|
31
|
+
* @param existed 查询到的原始文档数据
|
|
35
32
|
*/
|
|
36
|
-
|
|
37
|
-
/** 更新后回调函数 */
|
|
38
|
-
onAfterUpdate?: () => unknown;
|
|
33
|
+
onAfterUpdate?: (updateData: U, existed: DbQuery<T, S, {}>) => unknown;
|
|
39
34
|
/** 用于测试的模拟数据库实例 */
|
|
40
|
-
|
|
41
|
-
};
|
|
42
|
-
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>;
|
|
43
|
-
type _TransactionDb = {
|
|
44
|
-
startTransaction: () => Promise<_Transaction>;
|
|
35
|
+
_mockDbInstance?: any;
|
|
45
36
|
};
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
37
|
+
/**
|
|
38
|
+
* 数据库 upsert 操作的返回结果类型
|
|
39
|
+
*/
|
|
40
|
+
export type DbUpsertOutput = {
|
|
41
|
+
/** 操作的文档ID */
|
|
42
|
+
id: string;
|
|
43
|
+
/** 是否为创建操作 */
|
|
44
|
+
created: boolean;
|
|
45
|
+
/** 是否为更新操作 */
|
|
46
|
+
updated: boolean;
|
|
49
47
|
};
|
|
48
|
+
export declare function dbUpsert<T, S extends DbSelect<T>, C extends DbCreate<T>, U extends DbUpdate<T>>(dbProxy: DbProxy<T, S, C>, options: DbUpsertOptions<T, S, C, U>): Promise<DbUpsertOutput>;
|
|
49
|
+
type _WithTransaction = <T, S extends DbSelect<T>, R extends AnyObject>(table: DbProxy<T, S, R>) => Db<T, S, R>;
|
|
50
50
|
/**
|
|
51
51
|
* 在数据库事务中执行操作
|
|
52
52
|
*
|
|
53
53
|
* @template T - 事务操作返回值类型
|
|
54
|
-
* @param
|
|
55
|
-
* @param _mockDatabase -
|
|
54
|
+
* @param transacting - 事务执行函数，接收事务数据库实例作为参数
|
|
55
|
+
* @param _mockDatabase - 用于测试的模拟数据库对象
|
|
56
|
+
* @param _mockDbInstance - 用于测试的模拟数据库实例
|
|
56
57
|
* @returns 事务操作的返回结果
|
|
57
58
|
*
|
|
58
59
|
* @example
|
|
59
60
|
* ```typescript
|
|
60
|
-
* const result = await dbTransaction(async (
|
|
61
|
-
* const
|
|
62
|
-
* const order = await
|
|
61
|
+
* const result = await dbTransaction(async (withTransaction) => {
|
|
62
|
+
* const userId = await withTransaction(db.table('user')).create({ name: 'John' });
|
|
63
|
+
* const order = await withTransaction(db.table('orders')).create({ userId, amount: 100 });
|
|
63
64
|
* return { user, order };
|
|
64
65
|
* });
|
|
65
66
|
* ```
|
|
66
67
|
*/
|
|
67
|
-
export declare function dbTransaction<
|
|
68
|
+
export declare function dbTransaction<K>(transacting: (withTransaction: _WithTransaction) => Promise<K>, _mockDatabase?: any, _mockDbInstance?: any): Promise<K>;
|
|
68
69
|
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|