oak-domain 5.1.27 → 5.1.28

package/lib/base-app-domain/ActionAuth/Storage.js

@@ -18,7 +18,6 @@ exports.desc = {
             type: "object"
         }
     },
-    static: true,
     actionType: "crud",
     actions: action_1.genericActions,
     indexes: [

package/lib/base-app-domain/EntityDict.d.ts

@@ -43,12 +43,14 @@ export type ActionAuth = {
     Aggregation: DeduceAggregation<ActionAuth["Projection"], ActionAuth["Filter"], ActionAuth["Sorter"]>;
     CreateOperationData: FormCreateData<BaseActionAuth.OpSchema & {
         relation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]>;
+        path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"]>;
     }>;
     CreateSingle: OakOperation<"create", ActionAuth["CreateOperationData"]>;
     CreateMulti: OakOperation<"create", Array<ActionAuth["CreateOperationData"]>>;
     Create: ActionAuth["CreateSingle"] | ActionAuth["CreateMulti"];
     UpdateOperationData: FormUpdateData<BaseActionAuth.OpSchema & {
         relation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]> | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>;
+        path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"]> | OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"]>;
     }>;
     Update: OakOperation<BaseActionAuth.OpUpdateAction, ActionAuth["UpdateOperationData"], ActionAuth["Filter"], ActionAuth["Sorter"]>;
     RemoveOperationData: {};
@@ -326,11 +328,17 @@ export type Path = {
     Sorter: Path["SortNode"][];
     Selection: OakSelection<"select", Path["Projection"], Path["Filter"], Path["Sorter"]>;
     Aggregation: DeduceAggregation<Path["Projection"], Path["Filter"], Path["Sorter"]>;
-    CreateOperationData: FormCreateData<BasePath.OpSchema>;
+    CreateOperationData: FormCreateData<BasePath.OpSchema & {
+        actionAuth$path?: (OakOperation<"create", Omit<ActionAuth["CreateOperationData"], "path"> | Omit<ActionAuth["CreateOperationData"], "path">[]> | OakOperation<BaseActionAuth.OpUpdateAction, Omit<ActionAuth["UpdateOperationData"], "path">, ActionAuth["Filter"]>)[];
+        relationAuth$path?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "path"> | Omit<RelationAuth["CreateOperationData"], "path">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "path">, RelationAuth["Filter"]>)[];
+    }>;
     CreateSingle: OakOperation<"create", Path["CreateOperationData"]>;
     CreateMulti: OakOperation<"create", Array<Path["CreateOperationData"]>>;
     Create: Path["CreateSingle"] | Path["CreateMulti"];
-    UpdateOperationData: FormUpdateData<BasePath.OpSchema>;
+    UpdateOperationData: FormUpdateData<BasePath.OpSchema & {
+        actionAuth$path?: (OakOperation<"create", Omit<ActionAuth["CreateOperationData"], "path"> | Omit<ActionAuth["CreateOperationData"], "path">[]> | OakOperation<BaseActionAuth.OpUpdateAction, Omit<ActionAuth["UpdateOperationData"], "path">, ActionAuth["Filter"]> | OakOperation<"remove", ActionAuth["RemoveOperationData"], ActionAuth["Filter"]>)[];
+        relationAuth$path?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "path"> | Omit<RelationAuth["CreateOperationData"], "path">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "path">, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[];
+    }>;
     Update: OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"], Path["Sorter"]>;
     RemoveOperationData: {};
     Remove: OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"], Path["Sorter"]>;
@@ -400,6 +408,9 @@ export type Relation = {
     Selection: OakSelection<"select", Relation["Projection"], Relation["Filter"], Relation["Sorter"]>;
     Aggregation: DeduceAggregation<Relation["Projection"], Relation["Filter"], Relation["Sorter"]>;
     CreateOperationData: FormCreateData<BaseRelation.OpSchema & {
+        actionAuth$relation?: (OakOperation<"create", Omit<ActionAuth["CreateOperationData"], "relation"> | Omit<ActionAuth["CreateOperationData"], "relation">[]> | OakOperation<BaseActionAuth.OpUpdateAction, Omit<ActionAuth["UpdateOperationData"], "relation">, ActionAuth["Filter"]>)[];
+        relationAuth$sourceRelation?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "sourceRelation"> | Omit<RelationAuth["CreateOperationData"], "sourceRelation">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "sourceRelation">, RelationAuth["Filter"]>)[];
+        relationAuth$destRelation?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "destRelation"> | Omit<RelationAuth["CreateOperationData"], "destRelation">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "destRelation">, RelationAuth["Filter"]>)[];
         userEntityClaim$relation?: (OakOperation<"create", Omit<UserEntityClaim["CreateOperationData"], "relation"> | Omit<UserEntityClaim["CreateOperationData"], "relation">[]> | OakOperation<BaseUserEntityClaim.OpUpdateAction, Omit<UserEntityClaim["UpdateOperationData"], "relation">, UserEntityClaim["Filter"]>)[];
         userRelation$relation?: (OakOperation<"create", Omit<UserRelation["CreateOperationData"], "relation"> | Omit<UserRelation["CreateOperationData"], "relation">[]> | OakOperation<BaseUserRelation.OpUpdateAction, Omit<UserRelation["UpdateOperationData"], "relation">, UserRelation["Filter"]>)[];
     }>;
@@ -407,6 +418,9 @@ export type Relation = {
     CreateMulti: OakOperation<"create", Array<Relation["CreateOperationData"]>>;
     Create: Relation["CreateSingle"] | Relation["CreateMulti"];
     UpdateOperationData: FormUpdateData<BaseRelation.OpSchema & {
+        actionAuth$relation?: (OakOperation<"create", Omit<ActionAuth["CreateOperationData"], "relation"> | Omit<ActionAuth["CreateOperationData"], "relation">[]> | OakOperation<BaseActionAuth.OpUpdateAction, Omit<ActionAuth["UpdateOperationData"], "relation">, ActionAuth["Filter"]> | OakOperation<"remove", ActionAuth["RemoveOperationData"], ActionAuth["Filter"]>)[];
+        relationAuth$sourceRelation?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "sourceRelation"> | Omit<RelationAuth["CreateOperationData"], "sourceRelation">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "sourceRelation">, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[];
+        relationAuth$destRelation?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "destRelation"> | Omit<RelationAuth["CreateOperationData"], "destRelation">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "destRelation">, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[];
         userEntityClaim$relation?: (OakOperation<"create", Omit<UserEntityClaim["CreateOperationData"], "relation"> | Omit<UserEntityClaim["CreateOperationData"], "relation">[]> | OakOperation<BaseUserEntityClaim.OpUpdateAction, Omit<UserEntityClaim["UpdateOperationData"], "relation">, UserEntityClaim["Filter"]> | OakOperation<"remove", UserEntityClaim["RemoveOperationData"], UserEntityClaim["Filter"]>)[];
         userRelation$relation?: (OakOperation<"create", Omit<UserRelation["CreateOperationData"], "relation"> | Omit<UserRelation["CreateOperationData"], "relation">[]> | OakOperation<BaseUserRelation.OpUpdateAction, Omit<UserRelation["UpdateOperationData"], "relation">, UserRelation["Filter"]> | OakOperation<"remove", UserRelation["RemoveOperationData"], UserRelation["Filter"]>)[];
     }>;
@@ -448,6 +462,7 @@ export type RelationAuth = {
     Aggregation: DeduceAggregation<RelationAuth["Projection"], RelationAuth["Filter"], RelationAuth["Sorter"]>;
     CreateOperationData: FormCreateData<BaseRelationAuth.OpSchema & {
         sourceRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]>;
+        path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"]>;
         destRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]>;
     }>;
     CreateSingle: OakOperation<"create", RelationAuth["CreateOperationData"]>;
@@ -455,6 +470,7 @@ export type RelationAuth = {
     Create: RelationAuth["CreateSingle"] | RelationAuth["CreateMulti"];
     UpdateOperationData: FormUpdateData<BaseRelationAuth.OpSchema & {
         sourceRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]> | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>;
+        path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"]> | OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"]>;
         destRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]> | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>;
     }>;
     Update: OakOperation<BaseRelationAuth.OpUpdateAction, RelationAuth["UpdateOperationData"], RelationAuth["Filter"], RelationAuth["Sorter"]>;

package/lib/base-app-domain/I18n/Storage.js

@@ -37,7 +37,6 @@ exports.desc = {
             type: "object"
         }
     },
-    static: true,
     actionType: "crud",
     actions: action_1.genericActions,
     indexes: [

package/lib/base-app-domain/Path/Storage.js

@@ -19,7 +19,6 @@ exports.desc = {
             }
         },
         recursive: {
-            notNull: true,
             type: "boolean"
         },
         sourceEntity: {
@@ -36,7 +35,6 @@ exports.desc = {
             }
         }
     },
-    static: true,
     actionType: "crud",
     actions: action_1.genericActions,
     indexes: [

package/lib/base-app-domain/Path/_baseSchema.d.ts

@@ -5,7 +5,7 @@ import { String, Boolean } from "../../types/DataType";
 export type OpSchema = EntityShape & {
     destEntity: String<32>;
     value: String<256>;
-    recursive: Boolean;
+    recursive?: Boolean | null;
     sourceEntity: String<32>;
     desc?: String<256> | null;
 } & {

package/lib/base-app-domain/RelationAuth/Storage.js

@@ -20,7 +20,6 @@ exports.desc = {
             ref: "relation"
         }
     },
-    static: true,
     actionType: "crud",
     actions: action_1.genericActions,
     indexes: [

package/lib/entities/ActionAuth.js

@@ -28,7 +28,4 @@ const entityDesc = {
             },
         },
     ],
-    configuration: {
-        static: true,
-    }
 };

package/lib/entities/I18n.js

@@ -30,7 +30,4 @@ const entityDesc = {
             },
         }
     ],
-    configuration: {
-        static: true,
-    }
 };

package/lib/entities/Path.d.ts

@@ -3,7 +3,7 @@ import { EntityShape } from '../types/Entity';
 export interface Schema extends EntityShape {
     destEntity: String<32>;
     value: String<256>;
-    recursive: Boolean;
+    recursive?: Boolean;
     sourceEntity: String<32>;
     desc?: String<256>;
 }

package/lib/entities/Path.js

@@ -33,7 +33,4 @@ const entityDesc = {
             },
         },
     },
-    configuration: {
-        static: true,
-    }
 };

package/lib/entities/RelationAuth.js

@@ -31,7 +31,4 @@ const entityDesc = {
             },
         },
     },
-    configuration: {
-        static: true,
-    }
 };

package/lib/store/AsyncRowStore.d.ts

@@ -72,4 +72,5 @@ export interface AsyncRowStore<ED extends EntityDict & BaseEntityDict, Cxt exten
     commit(txnId: string): Promise<void>;
     rollback(txnId: string): Promise<void>;
     exec(script: string, txnId?: string): Promise<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>;
 }

package/lib/store/IntrinsicLogics.js

@@ -34,7 +34,7 @@ function createExpiredWatchers(schema) {
 function makeIntrinsicLogics(schema, actionDefDict, attrUpdateMatrix) {
     const checkers = (0, IntrinsicCheckers_1.makeIntrinsicCheckers)(schema, actionDefDict, attrUpdateMatrix);
     const triggers = (0, modi_1.createModiRelatedTriggers)(schema);
-    triggers.push(...triggers_1.actionAuthTriggers, ...triggers_1.logTriggers);
+    triggers.push(...triggers_1.actionAuthTriggers, ...triggers_1.triggers);
     const watchers = createExpiredWatchers(schema);
     return {
         triggers,

package/lib/store/TriggerExecutor.js

@@ -276,12 +276,17 @@ class TriggerExecutor {
             // 加上modi的过滤条件
             && this.judgeModiTurn(option, trigger));
         if (triggers) {
-            const preTriggers = triggers.filter(ele => ele.when === 'before' && (!ele.check || ele.check(operation))
-                && (!ele.attributes || (0, lodash_1.difference)(ele.attributes, Object.keys(operation.data)).length === 0));
-            const commitTriggers = triggers.filter(ele => ele.when === 'commit' &&
-                (!ele.check || ele.check(operation)));
+            // 这里的check和attribute的检查要到trigger实际执行的时候再做，前面的trigger可能对后面的有影响
+            const preTriggers = triggers.filter(ele => ele.when === 'before');
+            const commitTriggers = triggers.filter(ele => ele.when === 'commit');
             if (context instanceof SyncRowStore_1.SyncContext) {
                 for (const trigger of preTriggers) {
+                    if (trigger.check && !trigger.check(operation)) {
+                        continue;
+                    }
+                    if (trigger.attributes && (0, lodash_1.difference)(trigger.attributes, Object.keys(operation.data)).length === 0) {
+                        continue;
+                    }
                     if (trigger.filter) {
                         // trigger只对满足条件的前项进行判断，如果确定不满足可以pass
                         (0, assert_1.default)(operation.action !== 'create');
@@ -307,6 +312,12 @@ class TriggerExecutor {
                         return;
                     }
                     const trigger = preTriggers[idx];
+                    if (trigger.check && !trigger.check(operation)) {
+                        return execPreTrigger(idx + 1);
+                    }
+                    if (trigger.attributes && (0, lodash_1.difference)(trigger.attributes, Object.keys(operation.data)).length === 0) {
+                        return execPreTrigger(idx + 1);
+                    }
                     if (trigger.filter) {
                         (0, assert_1.default)(operation.action !== 'create');
                         const { filter } = trigger;
@@ -336,6 +347,12 @@ class TriggerExecutor {
                     }
                     (0, assert_1.default)(!action_1.readOnlyActions.includes(operation.action), '当前应该不支持select的跨事务trigger');
                     const trigger = commitTriggers[idx];
+                    if (trigger.check && !trigger.check(operation)) {
+                        return execCommitTrigger(idx + 1);
+                    }
+                    if (trigger.attributes && (0, lodash_1.difference)(trigger.attributes, Object.keys(operation.data)).length === 0) {
+                        return execCommitTrigger(idx + 1);
+                    }
                     if (trigger.filter) {
                         (0, assert_1.default)(operation.action !== 'create');
                         const { filter } = trigger;
@@ -426,6 +443,7 @@ class TriggerExecutor {
     }
     postOperation(entity, operation, context, option, result) {
         const { action } = operation;
+        // 后trigger不会再改operation中的Data了，在这里检查好像没太大问题。by Xc 20251010
         const triggers = this.triggerMap[entity] && this.triggerMap[entity][action]?.filter(trigger => (typeof trigger.action === 'string' && trigger.action === operation.action
             || trigger.action instanceof Array && trigger.action.includes(operation.action))
             // 加上modi的过滤条件

package/lib/store/filter.js

@@ -21,7 +21,8 @@ function translateCreateDataToFilter(schema, entity, data, allowUnrecoganized) {
                 'sequence',
                 'array',
                 'object'
-            ].includes(schema[entity].attributes[attr]?.type)) {
+            ].includes(schema[entity].attributes[attr]?.type) || entity === 'userEntityGrant') {
+                // 这里要过滤掉userEntityGrant这一特殊对象，因为其relationIds和relationEntityFilter这两个属性后面要用
                 if (data[attr] === null) {
                     data2[attr] = {
                         $exists: false,

package/lib/store/triggers.d.ts

@@ -3,4 +3,4 @@ import { EntityDict } from '../types/Entity';
 import { Trigger } from '../types';
 import { AsyncContext } from './AsyncRowStore';
 export declare const actionAuthTriggers: Trigger<EntityDict & BaseEntityDict, 'actionAuth', AsyncContext<EntityDict & BaseEntityDict>>[];
-export declare const logTriggers: Trigger<EntityDict & BaseEntityDict, 'log', AsyncContext<EntityDict & BaseEntityDict>>[];
+export declare const triggers: Trigger<EntityDict & BaseEntityDict, keyof (EntityDict & BaseEntityDict), AsyncContext<EntityDict & BaseEntityDict>>[];

package/lib/store/triggers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logTriggers = exports.actionAuthTriggers = void 0;
+exports.triggers = exports.actionAuthTriggers = void 0;
 const tslib_1 = require("tslib");
 const types_1 = require("../types");
 const uuid_1 = require("../utils/uuid");
@@ -176,7 +176,7 @@ async function redoLog(log, context) {
         dontCreateOper: true,
     });
 }
-exports.logTriggers = [
+exports.triggers = [
     {
         name: '当log被undo时，同一entity上所有在其之后的log全部回滚',
         entity: 'log',
@@ -383,4 +383,25 @@ exports.logTriggers = [
             return result.oper?.remove || 0;
         }
     },
+    // 当删除userRelation时，一并删除掉关联的userEntityClaim，这个设计似乎不是太好
+    {
+        name: '当删除userRelation时，一并删除掉关联的userEntityClaim',
+        action: 'remove',
+        entity: 'userRelation',
+        when: 'before',
+        fn: async ({ operation }, context, option) => {
+            const { filter } = operation;
+            const close = context.openRootMode();
+            const result = await context.operate('userEntityClaim', {
+                id: await (0, uuid_1.generateNewIdAsync)(),
+                action: 'remove',
+                data: {},
+                filter: {
+                    userRelation: filter,
+                },
+            }, option);
+            close();
+            return result.userEntityClaim?.remove || 0;
+        }
+    },
 ];

package/lib/types/AppLoader.d.ts

@@ -11,7 +11,7 @@ export declare abstract class AppLoader<ED extends EntityDict & BaseEntityDict,
         message?: string;
         result: any;
     }>;
-    abstract initialize(dropIfExists?: boolean): Promise<void>;
+    abstract initialize(ifExists?: 'drop' | 'omit' | 'dropIfNotStatic'): Promise<void>;
     abstract mount(): Promise<void>;
     abstract unmount(): Promise<void>;
     abstract getStore(): AsyncRowStore<ED, Cxt>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.27",
+    "version": "5.1.28",
     "author": {
         "name": "XuChang"
     },

package/src/entities/ActionAuth.ts

@@ -38,7 +38,4 @@ const entityDesc: EntityDesc<Schema> = {
             },
         },
     ],
-    configuration: {
-        static: true,
-    }
 };

package/src/entities/I18n.ts

@@ -39,7 +39,4 @@ const entityDesc: EntityDesc<Schema> = {
             },
         }
     ],
-    configuration: {
-        static: true,
-    }
 };

package/src/entities/Path.ts

@@ -5,7 +5,7 @@ import { EntityDesc } from '../types/EntityDesc';
 export interface Schema extends EntityShape {
     destEntity: String<32>;
     value: String<256>;
-    recursive: Boolean;
+    recursive?: Boolean;
     sourceEntity: String<32>;
     desc?: String<256>;
 };
@@ -42,7 +42,4 @@ const entityDesc: EntityDesc<Schema> = {
             },
         },
     },
-    configuration: {
-        static: true,
-    }
 };

package/src/entities/RelationAuth.ts

@@ -41,7 +41,4 @@ const entityDesc: EntityDesc<Schema> = {
             },
         },
     },
-    configuration: {
-        static: true,
-    }
 };