oak-domain 4.0.1 → 4.0.3

package/lib/store/RelationAuth.d.ts

@@ -14,6 +14,13 @@ export declare class RelationAuth<ED extends EntityDict & BaseEntityDict> {
     });
     checkRelationSync<T extends keyof ED, Cxt extends SyncContext<ED>>(entity: T, operation: Omit<ED[T]['Operation'] | ED[T]['Selection'], 'id'>, context: Cxt): void;
     checkRelationAsync<T extends keyof ED, Cxt extends AsyncContext<ED>>(entity: T, operation: Omit<ED[T]['Operation'] | ED[T]['Selection'], 'id'>, context: Cxt): Promise<void>;
+    /**
+     * 检查当前用户有无权限对filter约束的userRelation进行action操作
+     * @param context
+     * @param action
+     * @param filter
+     * @returns
+     */
     private checkUserRelation;
     private checkOperateSpecialEntities2;
     private getDeducedEntityFilters;

package/lib/store/RelationAuth.js

@@ -38,6 +38,13 @@ class RelationAuth {
         }
         await this.checkActions2(entity, operation, context);
     }
+    /**
+     * 检查当前用户有无权限对filter约束的userRelation进行action操作
+     * @param context
+     * @param action
+     * @param filter
+     * @returns
+     */
     checkUserRelation(context, action, filter) {
         const userId = context.getCurrentUserId();
         let filter2 = {
@@ -1030,12 +1037,12 @@ class RelationAuth {
             if (result instanceof Promise) {
                 return result.then((r) => {
                     if (!r) {
-                        throw new types_1.OakUserInvisibleException();
+                        throw new types_1.OakUserInvisibleException(entity, operation);
                     }
                 });
             }
             if (!result) {
-                throw new types_1.OakUserInvisibleException();
+                throw new types_1.OakUserInvisibleException(entity, operation);
             }
         }
         else {
@@ -1043,12 +1050,12 @@ class RelationAuth {
             if (result instanceof Promise) {
                 return result.then((r) => {
                     if (!r) {
-                        throw new types_1.OakUserUnpermittedException();
+                        throw new types_1.OakUserUnpermittedException(entity, operation);
                     }
                 });
             }
             if (!result) {
-                throw new types_1.OakUserUnpermittedException();
+                throw new types_1.OakUserUnpermittedException(entity, operation);
             }
         }
     }

package/lib/store/SyncRowStore.d.ts

@@ -1,29 +1,29 @@
-import { EntityDict, RowStore, OperateOption, OperationResult, SelectOption, TxnOption, Context, AggregationResult } from "../types";
-export declare abstract class SyncContext<ED extends EntityDict> implements Context {
-    rowStore: SyncRowStore<ED, this>;
-    private uuid?;
-    constructor(rowStore: SyncRowStore<ED, SyncContext<ED>>);
-    abstract getCurrentUserId(allowUnloggedIn?: boolean): string | undefined;
-    abstract isRoot(): boolean;
-    abstract toString(): string;
-    begin(option?: TxnOption): void;
-    commit(): void;
-    rollback(): void;
-    getCurrentTxnId(): string | undefined;
-    getSchema(): import("../types").StorageSchema<ED>;
-    operate<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], option: OP): OperationResult<ED>;
-    select<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], option: OP): Partial<ED[T]["Schema"]>[];
-    aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], option: OP): AggregationResult<ED[T]["Schema"]>;
-    count<T extends keyof ED, OP extends SelectOption>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, option: OP): number;
-    mergeMultipleResults(toBeMerged: OperationResult<ED>[]): OperationResult<ED>;
-    abstract allowUserUpdate(): boolean;
-}
-export interface SyncRowStore<ED extends EntityDict, Cxt extends SyncContext<ED>> extends RowStore<ED> {
-    operate<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: OP): OperationResult<ED>;
-    select<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: OP): Partial<ED[T]['Schema']>[];
-    count<T extends keyof ED, OP extends SelectOption>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: OP): number;
-    aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): AggregationResult<ED[T]['Schema']>;
-    begin(option?: TxnOption): string;
-    commit(txnId: string): void;
-    rollback(txnId: string): void;
-}
+import { EntityDict, RowStore, OperateOption, OperationResult, SelectOption, TxnOption, Context, AggregationResult } from "../types";
+export declare abstract class SyncContext<ED extends EntityDict> implements Context {
+    rowStore: SyncRowStore<ED, this>;
+    private uuid?;
+    constructor(rowStore: SyncRowStore<ED, SyncContext<ED>>);
+    abstract getCurrentUserId(allowUnloggedIn?: boolean): string | undefined;
+    abstract isRoot(): boolean;
+    abstract toString(): string;
+    begin(option?: TxnOption): void;
+    commit(): void;
+    rollback(): void;
+    getCurrentTxnId(): string | undefined;
+    getSchema(): import("../types").StorageSchema<ED>;
+    operate<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], option: OP): OperationResult<ED>;
+    select<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], option: OP): Partial<ED[T]["Schema"]>[];
+    aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], option: OP): AggregationResult<ED[T]["Schema"]>;
+    count<T extends keyof ED, OP extends SelectOption>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, option: OP): number;
+    mergeMultipleResults(toBeMerged: OperationResult<ED>[]): OperationResult<ED>;
+    abstract allowUserUpdate(): boolean;
+}
+export interface SyncRowStore<ED extends EntityDict, Cxt extends SyncContext<ED>> extends RowStore<ED> {
+    operate<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: OP): OperationResult<ED>;
+    select<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: OP): Partial<ED[T]['Schema']>[];
+    count<T extends keyof ED, OP extends SelectOption>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: OP): number;
+    aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): AggregationResult<ED[T]['Schema']>;
+    begin(option?: TxnOption): string;
+    commit(txnId: string): void;
+    rollback(txnId: string): void;
+}

package/lib/store/SyncRowStore.js

@@ -1,50 +1,50 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SyncContext = void 0;
-const tslib_1 = require("tslib");
-const assert_1 = tslib_1.__importDefault(require("assert"));
-class SyncContext {
-    rowStore;
-    uuid;
-    constructor(rowStore) {
-        this.rowStore = rowStore;
-    }
-    begin(option) {
-        (0, assert_1.default)(!this.uuid, '事务不允许嵌套');
-        this.uuid = this.rowStore.begin(option);
-    }
-    commit() {
-        (0, assert_1.default)(this.uuid);
-        this.rowStore.commit(this.uuid);
-        this.uuid = undefined;
-    }
-    rollback() {
-        (0, assert_1.default)(this.uuid);
-        this.rowStore.rollback(this.uuid);
-        this.uuid = undefined;
-    }
-    getCurrentTxnId() {
-        return this.uuid;
-    }
-    getSchema() {
-        return this.rowStore.getSchema();
-    }
-    operate(entity, operation, option) {
-        return this.rowStore.operate(entity, operation, this, option);
-    }
-    select(entity, selection, option) {
-        return this.rowStore.select(entity, selection, this, option);
-    }
-    aggregate(entity, aggregation, option) {
-        return this.rowStore.aggregate(entity, aggregation, this, option);
-    }
-    count(entity, selection, option) {
-        return this.rowStore.count(entity, selection, this, option);
-    }
-    mergeMultipleResults(toBeMerged) {
-        return this.rowStore.mergeMultipleResults(toBeMerged);
-    }
-}
-exports.SyncContext = SyncContext;
-;
-;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SyncContext = void 0;
+const tslib_1 = require("tslib");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+class SyncContext {
+    rowStore;
+    uuid;
+    constructor(rowStore) {
+        this.rowStore = rowStore;
+    }
+    begin(option) {
+        (0, assert_1.default)(!this.uuid, '事务不允许嵌套');
+        this.uuid = this.rowStore.begin(option);
+    }
+    commit() {
+        (0, assert_1.default)(this.uuid);
+        this.rowStore.commit(this.uuid);
+        this.uuid = undefined;
+    }
+    rollback() {
+        (0, assert_1.default)(this.uuid);
+        this.rowStore.rollback(this.uuid);
+        this.uuid = undefined;
+    }
+    getCurrentTxnId() {
+        return this.uuid;
+    }
+    getSchema() {
+        return this.rowStore.getSchema();
+    }
+    operate(entity, operation, option) {
+        return this.rowStore.operate(entity, operation, this, option);
+    }
+    select(entity, selection, option) {
+        return this.rowStore.select(entity, selection, this, option);
+    }
+    aggregate(entity, aggregation, option) {
+        return this.rowStore.aggregate(entity, aggregation, this, option);
+    }
+    count(entity, selection, option) {
+        return this.rowStore.count(entity, selection, this, option);
+    }
+    mergeMultipleResults(toBeMerged) {
+        return this.rowStore.mergeMultipleResults(toBeMerged);
+    }
+}
+exports.SyncContext = SyncContext;
+;
+;

package/lib/store/TriggerExecutor.d.ts

@@ -1,41 +1,41 @@
-import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
-import { EntityDict as BaseEntityDict } from '../base-app-domain';
-import { Logger } from "../types/Logger";
-import { Checker } from '../types/Auth';
-import { Trigger, VolatileTrigger } from "../types/Trigger";
-import { AsyncContext } from './AsyncRowStore';
-/**
- * update可能会传入多种不同的action，此时都需要检查update trigger
- */
-export declare class TriggerExecutor<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> {
-    private counter;
-    private triggerMap;
-    private triggerNameMap;
-    private volatileEntities;
-    private logger;
-    private contextBuilder;
-    private onVolatileTrigger;
-    constructor(contextBuilder: (cxtString?: string) => Promise<Cxt>, logger?: Logger, onVolatileTrigger?: <T extends keyof ED>(entity: T, trigger: VolatileTrigger<ED, T, Cxt>, ids: string[], cxtStr: string, option: OperateOption) => Promise<void>);
-    setOnVolatileTrigger(onVolatileTrigger: <T extends keyof ED>(entity: T, trigger: VolatileTrigger<ED, T, Cxt>, ids: string[], cxtStr: string, option: OperateOption) => Promise<void>): void;
-    registerChecker<T extends keyof ED>(checker: Checker<ED, T, Cxt>): void;
-    registerTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>): void;
-    unregisterTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>): void;
-    private preCommitTrigger;
-    private postCommitTrigger;
-    preOperation<T extends keyof ED>(entity: T, operation: ED[T]['Operation'] | ED[T]['Selection'] & {
-        action: 'select';
-    }, context: Cxt, option: OperateOption | SelectOption): Promise<void> | void;
-    execVolatileTrigger<T extends keyof ED>(entity: T, name: string, ids: string[], context: Cxt, option: OperateOption): Promise<void>;
-    /**
-     * 判断一个trigger和当前modi上下文是否符合
-     * trigger的默认行为是：如果是commit时机的trigger，不显式声明则只能在modi apply时执行（create时不执行）；非commit时机的trigger，不显式声明则只在modi create时执行
-     * @param option
-     * @param trigger
-     * @returns
-     */
-    private judgeModiTurn;
-    postOperation<T extends keyof ED>(entity: T, operation: ED[T]['Operation'] | ED[T]['Selection'] & {
-        action: 'select';
-    }, context: Cxt, option: OperateOption | SelectOption, result?: Partial<ED[T]['Schema']>[]): Promise<void> | void;
-    checkpoint(timestamp: number): Promise<number>;
-}
+import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
+import { Logger } from "../types/Logger";
+import { Checker } from '../types/Auth';
+import { Trigger, VolatileTrigger } from "../types/Trigger";
+import { AsyncContext } from './AsyncRowStore';
+/**
+ * update可能会传入多种不同的action，此时都需要检查update trigger
+ */
+export declare class TriggerExecutor<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> {
+    private counter;
+    private triggerMap;
+    private triggerNameMap;
+    private volatileEntities;
+    private logger;
+    private contextBuilder;
+    private onVolatileTrigger;
+    constructor(contextBuilder: (cxtString?: string) => Promise<Cxt>, logger?: Logger, onVolatileTrigger?: <T extends keyof ED>(entity: T, trigger: VolatileTrigger<ED, T, Cxt>, ids: string[], cxtStr: string, option: OperateOption) => Promise<void>);
+    setOnVolatileTrigger(onVolatileTrigger: <T extends keyof ED>(entity: T, trigger: VolatileTrigger<ED, T, Cxt>, ids: string[], cxtStr: string, option: OperateOption) => Promise<void>): void;
+    registerChecker<T extends keyof ED>(checker: Checker<ED, T, Cxt>): void;
+    registerTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>): void;
+    unregisterTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>): void;
+    private preCommitTrigger;
+    private postCommitTrigger;
+    preOperation<T extends keyof ED>(entity: T, operation: ED[T]['Operation'] | ED[T]['Selection'] & {
+        action: 'select';
+    }, context: Cxt, option: OperateOption | SelectOption): Promise<void> | void;
+    execVolatileTrigger<T extends keyof ED>(entity: T, name: string, ids: string[], context: Cxt, option: OperateOption): Promise<void>;
+    /**
+     * 判断一个trigger和当前modi上下文是否符合
+     * trigger的默认行为是：如果是commit时机的trigger，不显式声明则只能在modi apply时执行（create时不执行）；非commit时机的trigger，不显式声明则只在modi create时执行
+     * @param option
+     * @param trigger
+     * @returns
+     */
+    private judgeModiTurn;
+    postOperation<T extends keyof ED>(entity: T, operation: ED[T]['Operation'] | ED[T]['Selection'] & {
+        action: 'select';
+    }, context: Cxt, option: OperateOption | SelectOption, result?: Partial<ED[T]['Schema']>[]): Promise<void> | void;
+    checkpoint(timestamp: number): Promise<number>;
+}