diff --git a/packages/koishi-core/src/database.ts b/packages/koishi-core/src/database.ts index 3a6c67c8dd..c72e163380 100644 --- a/packages/koishi-core/src/database.ts +++ b/packages/koishi-core/src/database.ts @@ -23,7 +23,7 @@ export namespace User { export type Field = keyof User export const fields: Field[] = [] - export type Observed = utils.Observed> + export type Observed = utils.Observed, Promise> type Getter = (id: number, authority: number) => Partial const getters: Getter[] = [] @@ -94,13 +94,13 @@ export interface Database { getUser(userId: number, defaultAuthority?: number, fields?: readonly K[]): Promise> getUsers(fields?: readonly K[]): Promise[]> getUsers(ids: readonly number[], fields?: readonly K[]): Promise[]> - setUser(userId: number, data: Partial): Promise + setUser(userId: number, data: Partial): Promise getGroup(groupId: number, fields?: readonly K[]): Promise> getGroup(groupId: number, selfId?: number, fields?: readonly K[]): Promise> getAllGroups(assignees?: readonly number[]): Promise[]> getAllGroups(fields?: readonly K[], assignees?: readonly number[]): Promise[]> - setGroup(groupId: number, data: Partial): Promise + setGroup(groupId: number, data: Partial): Promise } type DatabaseExtensionMethods = { diff --git a/packages/koishi-core/src/session.ts b/packages/koishi-core/src/session.ts index 669ff78d11..b496d9f860 100644 --- a/packages/koishi-core/src/session.ts +++ b/packages/koishi-core/src/session.ts @@ -200,7 +200,7 @@ export class Session Promise.resolve()) return this.$user = user } diff --git a/packages/koishi-utils/src/observe.ts b/packages/koishi-utils/src/observe.ts index a2fc74592c..14b2e5e88c 100644 --- a/packages/koishi-utils/src/observe.ts +++ b/packages/koishi-utils/src/observe.ts @@ -134,7 +134,7 @@ export function observe(target: T, ...args: [(string | numb const observer = observeObject(target, label, null) as Observed - defineProperty(observer, '_update', function (this: Observed) { + defineProperty(observer, '_update', function _update(this: Observed) { const diff = { ...this._diff } const fields = Object.keys(diff) if (fields.length) { @@ -146,7 +146,7 @@ export function observe(target: T, ...args: [(string | numb } }) - defineProperty(observer, '_merge', function (this: Observed, value: Partial) { + defineProperty(observer, '_merge', function _merge(this: Observed, value: Partial) { for (const key in value) { if (key in this._diff) { throw new Error(`unresolved diff key "${key}"`)