oak-domain 5.0.15 → 5.0.16

package/lib/store/AsyncRowStore.d.ts

@@ -29,6 +29,12 @@ export declare abstract class AsyncContext<ED extends EntityDict> implements Con
     private resetEvents;
     on(event: 'commit' | 'rollback', callback: (records: OpRecord<ED>[], cxtStr: string) => Promise<void>): void;
     saveOpRecord<T extends keyof ED>(entity: T, operation: ED[T]['Operation']): void;
+    /**
+     * 查询某operation所处理的row ids
+     * 如果该operation还未执行，可能返回空数组（不知道实际关联的row id）；但是在after的trigger中，返回是准确的ids值（此时如果是空数组说明没有有关row id）
+     * @param id
+     */
+    getRowIdsOfOperation(operation: ED[keyof ED]['Operation']): string[];
     /**
      * 一个context中不应该有并发的事务，这里将事务串行化，使用的时候千万要注意不要自己等自己
      * @param options

package/lib/store/AsyncRowStore.js

@@ -4,6 +4,7 @@ exports.AsyncContext = void 0;
 const tslib_1 = require("tslib");
 const action_1 = require("../actions/action");
 const assert_1 = tslib_1.__importDefault(require("assert"));
+const filter_1 = require("./filter");
 /**
  * 服务器端执行的异步环境的底层抽象
  */
@@ -75,7 +76,7 @@ class AsyncContext {
                     id,
                     a: 'c',
                     e: entity,
-                    d: data
+                    d: data,
                 });
                 break;
             }
@@ -100,6 +101,35 @@ class AsyncContext {
             }
         }
     }
+    /**
+     * 查询某operation所处理的row ids
+     * 如果该operation还未执行，可能返回空数组（不知道实际关联的row id）；但是在after的trigger中，返回是准确的ids值（此时如果是空数组说明没有有关row id）
+     * @param id
+     */
+    getRowIdsOfOperation(operation) {
+        const { id, action, data, filter } = operation;
+        if (action === 'create') {
+            if (data instanceof Array) {
+                return data.map(ele => ele.id);
+            }
+            return [data.id];
+        }
+        else if (filter) {
+            const ids = (0, filter_1.getRelevantIds)(filter);
+            if (ids.length > 0) {
+                return ids;
+            }
+        }
+        const oper = this.opRecords.find(ele => ele.id === id);
+        if (oper) {
+            const { a } = oper;
+            (0, assert_1.default)(a !== 'create');
+            const { f } = oper;
+            (0, assert_1.default)(f && f?.id?.$in && f.id.$in instanceof Array);
+            return f.id.$in;
+        }
+        return [];
+    }
     /**
      * 一个context中不应该有并发的事务，这里将事务串行化，使用的时候千万要注意不要自己等自己
      * @param options

package/lib/store/CascadeStore.js

@@ -1217,6 +1217,7 @@ class CascadeStore extends RowStore_1.RowStore {
                     };
                     const rows = await this.selectAbjointRowAsync(entity, selection, context, {
                         dontCollect: true,
+                        forUpdate: true,
                     });
                     ids.push(...(rows.map(ele => ele.id)));
                 }

package/lib/store/IntrinsicCheckers.js

@@ -79,7 +79,7 @@ function createUniqueCheckers(schema) {
                         entity,
                         action: 'create',
                         type: 'logicalData',
-                        priority: types_1.CHECKER_MAX_PRIORITY,
+                        priority: types_1.CHECKER_MAX_PRIORITY, // 优先级要放在最低，所有前置的checker/trigger将数据完整之后再在这里检测
                         checker: (operation, context) => {
                             const { data } = operation;
                             if (data instanceof Array) {
@@ -95,9 +95,9 @@ function createUniqueCheckers(schema) {
                         }
                     }, {
                         entity,
-                        action: 'update',
+                        action: 'update', // 只检查update，其它状态转换的action应该不会涉及unique约束的属性
                         type: 'logicalData',
-                        priority: types_1.CHECKER_MAX_PRIORITY,
+                        priority: types_1.CHECKER_MAX_PRIORITY, // 优先级要放在最低，所有前置的checker/trigger将数据完整之后再在这里检测
                         checker: (operation, context) => {
                             const { data, filter: operationFilter } = operation;
                             if (data) {
@@ -227,7 +227,7 @@ function createActionTransformerCheckers(actionDefDict) {
                     action: 'create',
                     type: 'logical',
                     entity,
-                    priority: 10,
+                    priority: 10, // 优先级要高，先于真正的data检查进行
                     checker: (operation) => {
                         const { data } = operation;
                         if (data instanceof Array) {

package/lib/store/filter.js

@@ -645,6 +645,7 @@ function judgeValueRelation(value1, value2, contained) {
                         else if (r) {
                             return false;
                         }
+                        return;
                     }
                     // 互斥
                     if (r) {

package/lib/utils/assert.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 /**
  * 防止assert打包体积过大，从这里引用
  */

package/lib/utils/relationPath.js

@@ -60,7 +60,7 @@ function destructRelationPath(schema, entity, path, relationFilter, recursive) {
                         },
                         filter: relationFilter,
                     } // as ED['userRelation']['Selection']
-                },
+                }, // as ED[keyof ED]['Selection']['data'],
                 getData: (d) => {
                     return d.userRelation$entity;
                 },

package/lib/utils/url/index.native.d.ts

@@ -6,7 +6,7 @@ declare const url: {
     revokeObjectURL(url: string): void;
 };
 declare const urlSearchParams: {
-    new (init?: string | Record<string, string> | string[][] | URLSearchParams | undefined): URLSearchParams;
+    new (init?: string | string[][] | Record<string, string> | URLSearchParams | undefined): URLSearchParams;
     prototype: URLSearchParams;
 };
 export { url, urlSearchParams };

package/lib/utils/url/index.web.d.ts

@@ -6,7 +6,7 @@ declare const url: {
     revokeObjectURL(url: string): void;
 };
 declare const urlSearchParams: {
-    new (init?: string | Record<string, string> | string[][] | URLSearchParams | undefined): URLSearchParams;
+    new (init?: string | string[][] | Record<string, string> | URLSearchParams | undefined): URLSearchParams;
     prototype: URLSearchParams;
 };
 export { url, urlSearchParams };

package/package.json

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

package/src/entities/ModiEntity.ts

@@ -1,26 +1,26 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { Schema as Modi } from './Modi';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    modi: Modi,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '更新对象连接',
-            attr: {
-                modi: '更新',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { Schema as Modi } from './Modi';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    modi: Modi,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '更新对象连接',
+            attr: {
+                modi: '更新',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/OperEntity.ts

@@ -1,27 +1,27 @@
-import { String } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Schema as Oper } from './Oper';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    oper: Oper,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '操作对象连接',
-            attr: {
-                oper: '操作',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape, Configuration } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Schema as Oper } from './Oper';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    oper: Oper,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '操作对象连接',
+            attr: {
+                oper: '操作',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/Relation.ts

@@ -1,43 +1,43 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    entity: String<32>;
-    entityId?: String<64>;        // 可以为空
-    name?: String<32>;
-    display?: String<32>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                name: '关系',
-                entity: '目标对象',
-                entityId: '目标对象id',
-                display: '显示值',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_targetEntity_entityId_name',
-            attributes: [
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'name',
-                }
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    entity: String<32>;
+    entityId?: String<64>;        // 可以为空
+    name?: String<32>;
+    display?: String<32>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                name: '关系',
+                entity: '目标对象',
+                entityId: '目标对象id',
+                display: '显示值',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_targetEntity_entityId_name',
+            attributes: [
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'name',
+                }
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};

package/src/entities/UserEntityClaim.ts

@@ -1,30 +1,30 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-import { Schema as UserEntityGrant } from './UserEntityGrant';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { Schema as UserRelation } from './UserRelation';
-
-export interface Schema extends EntityShape {
-    ueg: UserEntityGrant;
-    user: User;
-    relation: Relation;
-    claimEntityId: String<64>;
-    userRelation: UserRelation;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权领取',
-            attr: {
-                ueg: '授权',
-                user: '用户',
-                relation: '关系',
-                claimEntityId: '对象Id',
-                userRelation: '用户关系',
-            },
-        },
-    },
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+import { Schema as UserEntityGrant } from './UserEntityGrant';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { Schema as UserRelation } from './UserRelation';
+
+export interface Schema extends EntityShape {
+    ueg: UserEntityGrant;
+    user: User;
+    relation: Relation;
+    claimEntityId: String<64>;
+    userRelation: UserRelation;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权领取',
+            attr: {
+                ueg: '授权',
+                user: '用户',
+                relation: '关系',
+                claimEntityId: '对象Id',
+                userRelation: '用户关系',
+            },
+        },
+    },
 };

package/src/entities/UserEntityGrant.ts

@@ -1,24 +1,24 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-type RelationIds = string[];
-
-export interface Schema extends EntityShape {
-    relationEntity: String<32>;
-    relationEntityFilter: Object;
-    relationIds: RelationIds;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                relationIds: '关系',
-                relationEntity: '关联对象',
-                relationEntityFilter: '对象限定条件',
-            },
-        },
-    },
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+type RelationIds = string[];
+
+export interface Schema extends EntityShape {
+    relationEntity: String<32>;
+    relationEntityFilter: Object;
+    relationIds: RelationIds;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                relationIds: '关系',
+                relationEntity: '关联对象',
+                relationEntityFilter: '对象限定条件',
+            },
+        },
+    },
+};

package/src/entities/UserRelation.ts

@@ -1,50 +1,50 @@
-import { String } from '../types/DataType';
-import { LocaleDef } from '../types/Locale';
-import { EntityShape } from '../types/Entity';
-import { Index } from '../types/Storage';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    user: User;
-    relation: Relation;
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户对象关系',
-            attr: {
-                user: '关系',
-                relation: '目标关系',
-                entity: '目标对象',
-                entityId: '目标对象ID',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_user_entity_entityId_relation',
-            attributes: [
-                {
-                    name: 'user',
-                },
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'relation',
-                },
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    user: User;
+    relation: Relation;
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户对象关系',
+            attr: {
+                user: '关系',
+                relation: '目标关系',
+                entity: '目标对象',
+                entityId: '目标对象ID',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_user_entity_entityId_relation',
+            attributes: [
+                {
+                    name: 'user',
+                },
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'relation',
+                },
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};