oak-domain 5.1.3 → 5.1.5

package/lib/store/IntrinsicCheckers.js

@@ -311,7 +311,7 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
     const checkers = [];
     for (const entity in attrUpdateMatrix) {
         const matrix = attrUpdateMatrix[entity];
-        const updateAttrs = Object.keys(matrix);
+        const updateAttrs = [types_1.UpdateAtAttribute, types_1.TriggerDataAttribute, types_1.TriggerUuidAttribute].concat(Object.keys(matrix));
         const { actions } = schema[entity];
         const updateActions = actions.filter((a) => !action_1.readOnlyActions.concat(['create', 'remove']).includes(a));
         /**
@@ -328,7 +328,7 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                     throw new types_1.OakAttrCantUpdateException(entity, extras, '更新了不允许的属性');
                 }
                 const condition = attrs.map(ele => matrix[ele]);
-                const actions = condition.map(ele => ele.actions).filter(ele => !!ele);
+                const actions = condition.map(ele => ele?.actions).filter(ele => !!ele);
                 const a = actions.length > 0 && (0, lodash_1.intersection)(actions.flat());
                 if (a) {
                     if (!a.includes(action)) {
@@ -338,10 +338,10 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                     }
                 }
                 const filters = condition.map(ele => {
-                    if (typeof ele.filter === 'function') {
+                    if (typeof ele?.filter === 'function') {
                         return ele.filter(action || 'select');
                     }
-                    return ele.filter;
+                    return ele?.filter;
                 }).filter(ele => !!ele);
                 const f = filters.length > 0 && (0, filter_1.combineFilters)(entity, schema, filters);
                 if (f) {

package/lib/store/RelationAuth.js

@@ -148,7 +148,7 @@ class RelationAuth {
                 if (!entity2) {
                     entity2 = relations[0]?.entity;
                 }
-                else {
+                else if (relations.length) {
                     (0, assert_1.default)(entity2 === relations[0]?.entity);
                 }
                 return relations.map(ele => ele.id);
@@ -156,6 +156,7 @@ class RelationAuth {
             const relationIds = getRelationIds();
             if (relationIds instanceof Promise) {
                 return relationIds.then((ids) => {
+                    (0, assert_1.default)(ids.length > 0);
                     return Promise.all(ids.map(ele => checkOnRelationId(entity2, ele, entityFilter))).then((value) => {
                         if (intersection) {
                             return !(value.includes(false));
@@ -164,6 +165,10 @@ class RelationAuth {
                     });
                 });
             }
+            if (relationIds.length === 0) {
+                // 如果没有relationId（前端cache中），直接返回false
+                return false;
+            }
             const value = relationIds.map(ele => checkOnRelationId(entity2, ele, entityFilter));
             if (intersection) {
                 return !(value.includes(false));

package/lib/types/Sync.d.ts

@@ -38,6 +38,8 @@ export interface PushEntityDef<ED extends EntityDict & BaseEntityDict, T extends
      * 同步结果回调，根据接口的幂等原理，同步一定要完全成功再回调
      */
     onSynchronized?: (result: {
+        remoteEntity: keyof ED;
+        remoteEntityId: string;
         action: ED[T]['Action'];
         data: ED[T]['Operation']['data'];
         rowIds: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.3",
+    "version": "5.1.5",
     "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,
+            },
+        },
+    ]
+};