Oak-Team
/
oak-common-aspect
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' into release

This commit is contained in:
Xu Chang 2024-04-18 09:42:11 +08:00
parent a98e255ad1 e1f50422e6
commit 7335c85e52
12 changed files with 77 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
es/AspectDict.d.ts vendored
View File

@ -2,18 +2,18 @@ import { EntityDict, OperateOption, SelectOption, OperationResult, AggregationRe
import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";
export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> = {
export declare type AspectDict<ED extends EntityDict & BaseEntityDict> = {
operate: <T extends keyof ED, OP extends OperateOption>(params: {
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];
option?: OP;
}, context: Cxt) => Promise<OperationResult<ED>[] | OperationResult<ED>>;
}, context: AsyncContext<ED>) => Promise<OperationResult<ED>[] | OperationResult<ED>>;
select: <T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
selection: ED[T]['Selection'];
option?: OP;
getCount?: true;
}, context: Cxt) => Promise<{
}, context: AsyncContext<ED>) => Promise<{
data: Record<string, any>;
total?: number;
}>;
@ -21,17 +21,17 @@ export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt
entity: T;
aggregation: ED[T]['Aggregation'];
option?: OP;
}, context: Cxt) => Promise<AggregationResult<ED[T]['Schema']>>;
}, context: AsyncContext<ED>) => Promise<AggregationResult<ED[T]['Schema']>>;
count: <T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
selection: Pick<ED[T]['Selection'], 'filter'>;
option?: OP;
}, context: Cxt) => Promise<number>;
}, context: AsyncContext<ED>) => Promise<number>;
fetchRows: <OP extends SelectOption>(params: Array<{
entity: keyof ED;
selection: ED[keyof ED]['Selection'];
option?: OP;
}>, context: Cxt) => Promise<void>;
}>, context: AsyncContext<ED>) => Promise<void>;
amap: <T extends 'getDrivingPath' | 'regeo' | 'ipLoc' | 'getDistrict' | 'geocode'>(params: {
key: string;
method: T;
@ -41,16 +41,16 @@ export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt
namespace: string | string[];
locale: string;
}) => Promise<any>;
importEntity: (params: FormData, context: Cxt) => Promise<void | ArrayBuffer>;
importEntity: (params: FormData, context: AsyncContext<ED>) => Promise<void | ArrayBuffer>;
exportEntity: <T extends keyof ED>(params: {
entity: T;
id: string;
filter?: ED[T]['Selection']['filter'];
properties?: Record<string, any>;
}, context: Cxt) => Promise<ArrayBuffer>;
}, context: AsyncContext<ED>) => Promise<ArrayBuffer>;
getImportationTemplate: (params: {
id: string;
}, context: Cxt) => Promise<ArrayBuffer>;
}, context: AsyncContext<ED>) => Promise<ArrayBuffer>;
searchPoi: (options: {
value: string;
areaCode?: string;
@ -66,8 +66,9 @@ export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt
}[]>;
loadRelations: (params: {
entities: (keyof ED)[];
}, context: Cxt) => Promise<ED['userRelation']['OpSchema'][]>;
}, context: AsyncContext<ED>) => Promise<ED['userRelation']['OpSchema'][]>;
crossBridge: (params: {
url: string;
}) => Promise<ReadableStream<Uint8Array>>;
};
export default AspectDict;

20
es/crud.d.ts vendored
View File

@ -1,33 +1,33 @@
import { OperateOption, EntityDict, SelectOption } from 'oak-domain/lib/types';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
export declare function operate<ED extends BaseEntityDict & EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends OperateOption>(params: {
export declare function operate<ED extends BaseEntityDict & EntityDict, T extends keyof ED, OP extends OperateOption>(params: {
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];
option?: OP;
}, context: Cxt): Promise<import("oak-domain/lib/types").OperationResult<ED> | Awaited<import("oak-domain/lib/types").OperationResult<ED>>[]>;
export declare function select<ED extends BaseEntityDict & EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends SelectOption>(params: {
}, context: AsyncContext<ED>): Promise<import("oak-domain/lib/types").OperationResult<ED> | Awaited<import("oak-domain/lib/types").OperationResult<ED>>[]>;
export declare function select<ED extends BaseEntityDict & EntityDict, T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
selection: ED[T]['Selection'];
option?: OP;
getCount?: true;
maxCount?: number;
}, context: Cxt): Promise<{
}, context: AsyncContext<ED>): Promise<{
data: Record<string, any>;
total?: number | undefined;
}>;
export declare function aggregate<ED extends BaseEntityDict & EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends SelectOption>(params: {
export declare function aggregate<ED extends BaseEntityDict & EntityDict, T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
aggregation: ED[T]['Aggregation'];
option?: OP;
}, context: Cxt): Promise<import("oak-domain/lib/types").AggregationResult<ED[T]["Schema"]>>;
export declare function fetchRows<ED extends EntityDict & BaseEntityDict, OP extends SelectOption, Cxt extends AsyncContext<ED>>(params: Array<{
}, context: AsyncContext<ED>): Promise<import("oak-domain/lib/types").AggregationResult<ED[T]["Schema"]>>;
export declare function fetchRows<ED extends EntityDict & BaseEntityDict, OP extends SelectOption>(params: Array<{
entity: keyof ED;
selection: ED[keyof ED]['Selection'];
option?: OP;
}>, context: Cxt): Promise<void>;
export declare function count<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends SelectOption>(params: {
}>, context: AsyncContext<ED>): Promise<void>;
export declare function count<ED extends EntityDict & BaseEntityDict, T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
selection: Pick<ED[T]['Selection'], 'filter'>;
option?: OP;
}, context: Cxt): Promise<number>;
}, context: AsyncContext<ED>): Promise<number>;

4
es/relation.d.ts vendored
View File

@ -1,6 +1,6 @@
import { EntityDict } from 'oak-domain/lib/types';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
export declare function loadRelations<ED extends BaseEntityDict & EntityDict, Cxt extends AsyncContext<ED>>(params: {
export declare function loadRelations<ED extends BaseEntityDict & EntityDict>(params: {
entities: (keyof ED)[];
}, context: Cxt): Promise<ED["userRelation"]["OpSchema"][]>;
}, context: AsyncContext<ED>): Promise<ED["userRelation"]["OpSchema"][]>;

6
es/relation.js
View File

@ -61,9 +61,9 @@ export async function loadRelations(params, context) {
},
filter: {
userId,
/* entity: {
$in: entities as string[],
}, */
entity: {
$in: entities,
},
},
}, {});
const result = userRelations.map((userRelation) => omit(userRelation, 'relation'));

21
lib/AspectDict.d.ts vendored
View File

@ -2,18 +2,18 @@ import { EntityDict, OperateOption, SelectOption, OperationResult, AggregationRe
import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";
export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> = {
export declare type AspectDict<ED extends EntityDict & BaseEntityDict> = {
operate: <T extends keyof ED, OP extends OperateOption>(params: {
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];
option?: OP;
}, context: Cxt) => Promise<OperationResult<ED>[] | OperationResult<ED>>;
}, context: AsyncContext<ED>) => Promise<OperationResult<ED>[] | OperationResult<ED>>;
select: <T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
selection: ED[T]['Selection'];
option?: OP;
getCount?: true;
}, context: Cxt) => Promise<{
}, context: AsyncContext<ED>) => Promise<{
data: Record<string, any>;
total?: number;
}>;
@ -21,17 +21,17 @@ export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt
entity: T;
aggregation: ED[T]['Aggregation'];
option?: OP;
}, context: Cxt) => Promise<AggregationResult<ED[T]['Schema']>>;
}, context: AsyncContext<ED>) => Promise<AggregationResult<ED[T]['Schema']>>;
count: <T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
selection: Pick<ED[T]['Selection'], 'filter'>;
option?: OP;
}, context: Cxt) => Promise<number>;
}, context: AsyncContext<ED>) => Promise<number>;
fetchRows: <OP extends SelectOption>(params: Array<{
entity: keyof ED;
selection: ED[keyof ED]['Selection'];
option?: OP;
}>, context: Cxt) => Promise<void>;
}>, context: AsyncContext<ED>) => Promise<void>;
amap: <T extends 'getDrivingPath' | 'regeo' | 'ipLoc' | 'getDistrict' | 'geocode'>(params: {
key: string;
method: T;
@ -41,16 +41,16 @@ export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt
namespace: string | string[];
locale: string;
}) => Promise<any>;
importEntity: (params: FormData, context: Cxt) => Promise<void | ArrayBuffer>;
importEntity: (params: FormData, context: AsyncContext<ED>) => Promise<void | ArrayBuffer>;
exportEntity: <T extends keyof ED>(params: {
entity: T;
id: string;
filter?: ED[T]['Selection']['filter'];
properties?: Record<string, any>;
}, context: Cxt) => Promise<ArrayBuffer>;
}, context: AsyncContext<ED>) => Promise<ArrayBuffer>;
getImportationTemplate: (params: {
id: string;
}, context: Cxt) => Promise<ArrayBuffer>;
}, context: AsyncContext<ED>) => Promise<ArrayBuffer>;
searchPoi: (options: {
value: string;
areaCode?: string;
@ -66,8 +66,9 @@ export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt
}[]>;
loadRelations: (params: {
entities: (keyof ED)[];
}, context: Cxt) => Promise<ED['userRelation']['OpSchema'][]>;
}, context: AsyncContext<ED>) => Promise<ED['userRelation']['OpSchema'][]>;
crossBridge: (params: {
url: string;
}) => Promise<ReadableStream<Uint8Array>>;
};
export default AspectDict;

20
lib/crud.d.ts vendored
View File

@ -1,33 +1,33 @@
import { OperateOption, EntityDict, SelectOption } from 'oak-domain/lib/types';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
export declare function operate<ED extends BaseEntityDict & EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends OperateOption>(params: {
export declare function operate<ED extends BaseEntityDict & EntityDict, T extends keyof ED, OP extends OperateOption>(params: {
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];
option?: OP;
}, context: Cxt): Promise<import("oak-domain/lib/types").OperationResult<ED> | Awaited<import("oak-domain/lib/types").OperationResult<ED>>[]>;
export declare function select<ED extends BaseEntityDict & EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends SelectOption>(params: {
}, context: AsyncContext<ED>): Promise<import("oak-domain/lib/types").OperationResult<ED> | Awaited<import("oak-domain/lib/types").OperationResult<ED>>[]>;
export declare function select<ED extends BaseEntityDict & EntityDict, T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
selection: ED[T]['Selection'];
option?: OP;
getCount?: true;
maxCount?: number;
}, context: Cxt): Promise<{
}, context: AsyncContext<ED>): Promise<{
data: Record<string, any>;
total?: number | undefined;
}>;
export declare function aggregate<ED extends BaseEntityDict & EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends SelectOption>(params: {
export declare function aggregate<ED extends BaseEntityDict & EntityDict, T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
aggregation: ED[T]['Aggregation'];
option?: OP;
}, context: Cxt): Promise<import("oak-domain/lib/types").AggregationResult<ED[T]["Schema"]>>;
export declare function fetchRows<ED extends EntityDict & BaseEntityDict, OP extends SelectOption, Cxt extends AsyncContext<ED>>(params: Array<{
}, context: AsyncContext<ED>): Promise<import("oak-domain/lib/types").AggregationResult<ED[T]["Schema"]>>;
export declare function fetchRows<ED extends EntityDict & BaseEntityDict, OP extends SelectOption>(params: Array<{
entity: keyof ED;
selection: ED[keyof ED]['Selection'];
option?: OP;
}>, context: Cxt): Promise<void>;
export declare function count<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends SelectOption>(params: {
}>, context: AsyncContext<ED>): Promise<void>;
export declare function count<ED extends EntityDict & BaseEntityDict, T extends keyof ED, OP extends SelectOption>(params: {
entity: T;
selection: Pick<ED[T]['Selection'], 'filter'>;
option?: OP;
}, context: Cxt): Promise<number>;
}, context: AsyncContext<ED>): Promise<number>;

4
lib/relation.d.ts vendored
View File

@ -1,6 +1,6 @@
import { EntityDict } from 'oak-domain/lib/types';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
export declare function loadRelations<ED extends BaseEntityDict & EntityDict, Cxt extends AsyncContext<ED>>(params: {
export declare function loadRelations<ED extends BaseEntityDict & EntityDict>(params: {
entities: (keyof ED)[];
}, context: Cxt): Promise<ED["userRelation"]["OpSchema"][]>;
}, context: AsyncContext<ED>): Promise<ED["userRelation"]["OpSchema"][]>;

6
lib/relation.js
View File

@ -64,9 +64,9 @@ async function loadRelations(params, context) {
},
filter: {
userId,
/* entity: {
$in: entities as string[],
}, */
entity: {
$in: entities,
},
},
}, {});
const result = userRelations.map((userRelation) => (0, lodash_1.omit)(userRelation, 'relation'));

6
package.json
View File

@ -1,6 +1,6 @@
{
"name": "oak-common-aspect",
"version": "2.3.1",
"version": "3.0.0",
"description": "",
"author": {
"name": "XuChang"
@ -20,8 +20,8 @@
"license": "ISC",
"dependencies": {
"lodash": "^4.17.21",
"oak-domain": "^4.4.0",
"oak-external-sdk": "^2.2.0",
"oak-domain": "^5.0.0",
"oak-external-sdk": "^2.3.0",
"xlsx": "^0.18.5"
},
"devDependencies": {

22
src/AspectDict.ts
View File

@ -3,21 +3,21 @@ import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";
export type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> = {
export type AspectDict<ED extends EntityDict & BaseEntityDict> = {
operate: <T extends keyof ED, OP extends OperateOption>(
params: {
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];
option?: OP;
},
context: Cxt
context: AsyncContext<ED>
) => Promise<OperationResult<ED>[] | OperationResult<ED>>;
select: <
T extends keyof ED,
OP extends SelectOption
>(
params: { entity: T; selection: ED[T]['Selection']; option?: OP; getCount?: true },
context: Cxt
context: AsyncContext<ED>
) => Promise<{
data: Record<string, any>;
total?: number;
@ -28,14 +28,14 @@ export type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends
aggregation: ED[T]['Aggregation'];
option?: OP;
},
context: Cxt
context: AsyncContext<ED>
) => Promise<AggregationResult<ED[T]['Schema']>>;
count: <
T extends keyof ED,
OP extends SelectOption
>(
params: { entity: T; selection: Pick<ED[T]['Selection'], 'filter'>; option?: OP },
context: Cxt
context: AsyncContext<ED>
) => Promise<number>;
fetchRows: <OP extends SelectOption>(
params: Array<{
@ -43,7 +43,7 @@ export type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends
selection: ED[keyof ED]['Selection'];
option?: OP;
}>,
context: Cxt
context: AsyncContext<ED>
) => Promise<void>;
amap: <
T extends
@ -61,14 +61,14 @@ export type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends
namespace: string | string[];
locale: string;
}) => Promise<any>;
importEntity: (params: FormData, context: Cxt) => Promise<void | ArrayBuffer>;
importEntity: (params: FormData, context: AsyncContext<ED>) => Promise<void | ArrayBuffer>;
exportEntity: <T extends keyof ED>(params: {
entity: T;
id: string;
filter?: ED[T]['Selection']['filter'];
properties?: Record<string, any>;
}, context: Cxt) => Promise<ArrayBuffer>;
getImportationTemplate: (params: { id: string }, context: Cxt) => Promise<ArrayBuffer>;
}, context: AsyncContext<ED>) => Promise<ArrayBuffer>;
getImportationTemplate: (params: { id: string }, context: AsyncContext<ED>) => Promise<ArrayBuffer>;
searchPoi: (options: {
value: string;
areaCode?: string;
@ -78,6 +78,8 @@ export type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends
}) => Promise<{ id: string; areaId: string; poiName: string; detail: string; coordinate: [number, number] }[]>;
loadRelations: (params: {
entities: (keyof ED)[],
}, context: Cxt) => Promise<ED['userRelation']['OpSchema'][]>;
}, context: AsyncContext<ED>) => Promise<ED['userRelation']['OpSchema'][]>;
crossBridge: (params: { url: string }) => Promise<ReadableStream<Uint8Array>>;
};
export default AspectDict;

17
src/crud.ts
View File

@ -14,7 +14,6 @@ import { assert } from 'oak-domain/lib/utils/assert';
export async function operate<
ED extends BaseEntityDict & EntityDict,
T extends keyof ED,
Cxt extends AsyncContext<ED>,
OP extends OperateOption
>(
params: {
@ -22,7 +21,7 @@ export async function operate<
operation: ED[T]['Operation'] | ED[T]['Operation'][];
option?: OP;
},
context: Cxt
context: AsyncContext<ED>
) {
const { entity, operation, option } = params;
/* const userId = context.getCurrentUserId();
@ -124,7 +123,6 @@ function buildResultTree<ED extends BaseEntityDict & EntityDict, T extends keyof
export async function select<
ED extends BaseEntityDict & EntityDict,
T extends keyof ED,
Cxt extends AsyncContext<ED>,
OP extends SelectOption
>(
params: {
@ -134,7 +132,7 @@ export async function select<
getCount?: true;
maxCount?: number;
},
context: Cxt
context: AsyncContext<ED>
) {
const { entity, selection, option } = params;
let selection2 = selection;
@ -151,28 +149,26 @@ export async function select<
export async function aggregate<
ED extends BaseEntityDict & EntityDict,
T extends keyof ED,
Cxt extends AsyncContext<ED>,
OP extends SelectOption
>(params: {
entity: T,
aggregation: ED[T]['Aggregation'],
option?: OP,
}, context: Cxt) {
}, context: AsyncContext<ED>) {
const { entity, aggregation, option } = params;
return context.aggregate(entity, aggregation, option || {});
}
export async function fetchRows<
ED extends EntityDict & BaseEntityDict,
OP extends SelectOption,
Cxt extends AsyncContext<ED>,
OP extends SelectOption
>(
params: Array<{
entity: keyof ED;
selection: ED[keyof ED]['Selection'];
option?: OP;
}>,
context: Cxt
context: AsyncContext<ED>
) {
await Promise.all(
params.map((ele) =>
@ -188,7 +184,6 @@ export async function fetchRows<
export async function count<
ED extends EntityDict & BaseEntityDict,
T extends keyof ED,
Cxt extends AsyncContext<ED>,
OP extends SelectOption
>(
params: {
@ -196,7 +191,7 @@ export async function count<
selection: Pick<ED[T]['Selection'], 'filter'>;
option?: OP;
},
context: Cxt
context: AsyncContext<ED>
) {
const { entity, selection, option } = params;
const { filter } = selection;

9
src/relation.ts
View File

@ -11,11 +11,10 @@ import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
import { omit } from 'oak-domain/lib/utils/lodash';
export async function loadRelations<
ED extends BaseEntityDict & EntityDict,
Cxt extends AsyncContext<ED>
ED extends BaseEntityDict & EntityDict
>(params: {
entities: (keyof ED)[],
}, context: Cxt) {
}, context: AsyncContext<ED>) {
const { entities } = params;
const userId = context.getCurrentUserId();
if (!userId) {
@ -76,9 +75,9 @@ export async function loadRelations<
},
filter: {
userId,
/* entity: {
entity: {
$in: entities as string[],
}, */
},
},
}, {});
const result = userRelations.map(