参数定义重写

This commit is contained in:
Xu Chang 2022-09-22 16:30:43 +08:00
parent 9179480993
commit 346944c80b
4 changed files with 9 additions and 6 deletions

3
lib/AspectDict.d.ts vendored
View File

@ -1,6 +1,7 @@
import { Context, EntityDict, OperateOption, SelectOption, OperationResult, SelectRowShape } from "oak-domain/lib/types";
import { AmapInstance } from "oak-external-sdk";
export declare type CommonAspectDict<ED extends EntityDict, Cxt extends Context<ED>> = {
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> = {
operate: <T extends keyof ED, OP extends OperateOption>(params: {
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];

4
lib/crud.d.ts vendored
View File

@ -15,12 +15,12 @@ export declare function select<ED extends EntityDict, T extends keyof ED, Cxt ex
data: SelectRowShape<ED[T]['Schema'], S['data']>[];
count?: number | undefined;
}>;
export declare function fetchRows<ED extends EntityDict, OP extends SelectOption, Cxt extends Context<ED>>(params: Array<{
export declare function fetchRows<ED extends EntityDict & BaseEntityDict, OP extends SelectOption, Cxt extends Context<ED>>(params: Array<{
entity: keyof ED;
selection: ED[keyof ED]['Selection'];
option?: OP;
}>, context: Cxt): Promise<void>;
export declare function count<ED extends EntityDict, T extends keyof ED, Cxt extends Context<ED>, S extends ED[T]['Selection'], OP extends SelectOption>(params: {
export declare function count<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends Context<ED>, S extends ED[T]['Selection'], OP extends SelectOption>(params: {
entity: T;
selection: S;
option?: OP;

View File

@ -1,7 +1,9 @@
import { Context, EntityDict, OperateOption, SelectOption, OperationResult, SelectRowShape } from "oak-domain/lib/types";
import { AmapInstance } from "oak-external-sdk";
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
export type CommonAspectDict<ED extends EntityDict, Cxt extends Context<ED>> = {
export type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> = {
operate: <T extends keyof ED, OP extends OperateOption>(
params: {
entity: T;

View File

@ -94,7 +94,7 @@ export async function select<
}
export async function fetchRows<
ED extends EntityDict,
ED extends EntityDict & BaseEntityDict,
OP extends SelectOption,
Cxt extends Context<ED>
>(
@ -118,7 +118,7 @@ export async function fetchRows<
}
export async function count<
ED extends EntityDict,
ED extends EntityDict & BaseEntityDict,
T extends keyof ED,
Cxt extends Context<ED>,
S extends ED[T]['Selection'],