oak-domain 2.4.4 → 2.5.2

package/lib/store/checker.js

@@ -5,10 +5,12 @@ var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var filter_1 = require("../store/filter");
 var Exception_1 = require("../types/Exception");
+var types_1 = require("../types");
 var actionDef_1 = require("./actionDef");
 var string_1 = require("../utils/string");
 var lodash_1 = require("../utils/lodash");
 var relation_1 = require("./relation");
+var uuid_1 = require("../utils/uuid");
 function translateCheckerInAsyncContext(checker) {
     var _this = this;
     var entity = checker.entity, type = checker.type, action = checker.action;
@@ -406,12 +408,12 @@ function createAuthCheckers(schema, authDict) {
             var _b = authDict[entity], relationAuth = _b.relationAuth, actionAuth = _b.actionAuth;
             if (relationAuth) {
                 var raFilterMakerDict_1 = {};
+                var userEntityName_1 = "user".concat((0, string_1.firstLetterUpperCase)(entity));
                 for (var r in relationAuth) {
                     Object.assign(raFilterMakerDict_1, (_a = {},
                         _a[r] = translateActionAuthFilterMaker(schema, relationAuth[r], entity),
                         _a));
                 }
-                var userEntityName_1 = "user".concat((0, string_1.firstLetterUpperCase)(entity));
                 var entityIdAttr_1 = "".concat(entity, "Id");
                 checkers.push({
                     entity: userEntityName_1,
@@ -508,7 +510,7 @@ exports.createAuthCheckers = createAuthCheckers;
  * @returns
  * 如果有的对象允许删除，需要使用trigger来处理其相关联的外键对象，这些trigger写作before，则会在checker之前执行，仍然可以删除成功
  */
-function createRemoveCheckers(schema) {
+function createRemoveCheckers(schema, authDict) {
     var e_1, _a;
     var checkers = [];
     // 先建立所有的一对多的关系
@@ -546,8 +548,8 @@ function createRemoveCheckers(schema) {
         }
     };
     for (var entity in schema) {
-        if (['operEntity'].includes(entity)) {
-            continue; // OperEntity会指向每一个对象，不必处理
+        if (['operEntity', 'modiEntity', 'userEntityGrant'].includes(entity)) {
+            continue; // 系统功能性数据，不用处理
         }
         var attributes = schema[entity].attributes;
         for (var attr in attributes) {
@@ -565,7 +567,7 @@ function createRemoveCheckers(schema) {
         }
     }
     // 当删除一时，要确认多上面没有指向一的数据
-    var entities = (0, lodash_1.intersection)(Object.keys(OneToManyMatrix), Object.keys(OneToManyOnEntityMatrix));
+    var entities = (0, lodash_1.union)(Object.keys(OneToManyMatrix), Object.keys(OneToManyOnEntityMatrix));
     var _loop_3 = function (entity) {
         checkers.push({
             entity: entity,
@@ -575,7 +577,7 @@ function createRemoveCheckers(schema) {
                 var e_3, _a, e_4, _b;
                 var promises = [];
                 if (OneToManyMatrix[entity]) {
-                    var _loop_4 = function (otm) {
+                    var _loop_5 = function (otm) {
                         var _g, _h, _j, _k;
                         var _l = tslib_1.__read(otm, 2), e = _l[0], attr = _l[1];
                         var proj = (_g = {
@@ -627,7 +629,7 @@ function createRemoveCheckers(schema) {
                     try {
                         for (var _c = (e_3 = void 0, tslib_1.__values(OneToManyMatrix[entity])), _d = _c.next(); !_d.done; _d = _c.next()) {
                             var otm = _d.value;
-                            _loop_4(otm);
+                            _loop_5(otm);
                         }
                     }
                     catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -639,7 +641,7 @@ function createRemoveCheckers(schema) {
                     }
                 }
                 if (OneToManyOnEntityMatrix[entity]) {
-                    var _loop_5 = function (otm) {
+                    var _loop_6 = function (otm) {
                         var _o, _p, _q;
                         var proj = {
                             id: 1,
@@ -690,7 +692,7 @@ function createRemoveCheckers(schema) {
                     try {
                         for (var _e = (e_4 = void 0, tslib_1.__values(OneToManyOnEntityMatrix[entity])), _f = _e.next(); !_f.done; _f = _e.next()) {
                             var otm = _f.value;
-                            _loop_5(otm);
+                            _loop_6(otm);
                         }
                     }
                     catch (e_4_1) { e_4 = { error: e_4_1 }; }
@@ -720,6 +722,146 @@ function createRemoveCheckers(schema) {
         }
         finally { if (e_1) throw e_1.error; }
     }
+    var _loop_4 = function (entity) {
+        var e_5, _b;
+        var cascadeRemove = authDict[entity].cascadeRemove;
+        if (cascadeRemove) {
+            var entitiesOnEntityAttr = [];
+            var hasAllEntity = false;
+            var _loop_7 = function (attr) {
+                if (attr === '@entity') {
+                    hasAllEntity = true;
+                    return "continue";
+                }
+                var rel = (0, relation_1.judgeRelation)(schema, entity, attr);
+                if (rel === 2) {
+                    entitiesOnEntityAttr.push(attr);
+                    checkers.push({
+                        entity: attr,
+                        action: 'remove',
+                        type: 'logical',
+                        priority: types_1.REMOVE_CASCADE_PRIORITY,
+                        checker: function (operation, context) {
+                            var _a, _b;
+                            var filter = operation.filter;
+                            if (cascadeRemove[attr] === 'remove') {
+                                return context.operate(entity, {
+                                    id: (0, uuid_1.generateNewId)(),
+                                    action: 'remove',
+                                    data: {},
+                                    filter: filter ? (_a = {},
+                                        _a[attr] = filter,
+                                        _a) : undefined,
+                                }, { dontCollect: true });
+                            }
+                            return context.operate(entity, {
+                                id: (0, uuid_1.generateNewId)(),
+                                action: 'update',
+                                data: {
+                                    entity: null,
+                                    entityId: null,
+                                },
+                                filter: filter ? (_b = {},
+                                    _b[attr] = filter,
+                                    _b) : undefined,
+                            }, { dontCollect: true });
+                        }
+                    });
+                }
+                else {
+                    (0, assert_1.default)(typeof rel === 'string');
+                    checkers.push({
+                        entity: rel,
+                        action: 'remove',
+                        type: 'logical',
+                        priority: types_1.REMOVE_CASCADE_PRIORITY,
+                        checker: function (operation, context) {
+                            var _a, _b, _c;
+                            var filter = operation.filter;
+                            if (cascadeRemove[attr] === 'remove') {
+                                return context.operate(entity, {
+                                    id: (0, uuid_1.generateNewId)(),
+                                    action: 'remove',
+                                    data: {},
+                                    filter: filter ? (_a = {},
+                                        _a[attr] = filter,
+                                        _a) : undefined,
+                                }, { dontCollect: true });
+                            }
+                            return context.operate(entity, {
+                                id: (0, uuid_1.generateNewId)(),
+                                action: 'update',
+                                data: (_b = {},
+                                    _b["".concat(attr, "Id")] = null,
+                                    _b),
+                                filter: filter ? (_c = {},
+                                    _c[attr] = filter,
+                                    _c) : undefined,
+                            }, { dontCollect: true });
+                        }
+                    });
+                }
+            };
+            for (var attr in cascadeRemove) {
+                _loop_7(attr);
+            }
+            if (hasAllEntity) {
+                var attributes = schema[entity].attributes;
+                var ref = attributes.entity.ref;
+                var restEntities = (0, lodash_1.difference)(ref, entitiesOnEntityAttr);
+                var _loop_8 = function (e) {
+                    checkers.push({
+                        entity: e,
+                        action: 'remove',
+                        type: 'logical',
+                        priority: types_1.REMOVE_CASCADE_PRIORITY,
+                        checker: function (operation, context) {
+                            var _a, _b;
+                            var filter = operation.filter;
+                            if (cascadeRemove['@entity'] === 'remove') {
+                                return context.operate(entity, {
+                                    id: (0, uuid_1.generateNewId)(),
+                                    action: 'remove',
+                                    data: {},
+                                    filter: filter ? (_a = {},
+                                        _a[e] = filter,
+                                        _a) : undefined,
+                                }, { dontCollect: true });
+                            }
+                            return context.operate(entity, {
+                                id: (0, uuid_1.generateNewId)(),
+                                action: 'update',
+                                data: {
+                                    entity: null,
+                                    entityId: null,
+                                },
+                                filter: filter ? (_b = {},
+                                    _b[e] = filter,
+                                    _b) : undefined,
+                            }, { dontCollect: true });
+                        }
+                    });
+                };
+                try {
+                    for (var restEntities_1 = (e_5 = void 0, tslib_1.__values(restEntities)), restEntities_1_1 = restEntities_1.next(); !restEntities_1_1.done; restEntities_1_1 = restEntities_1.next()) {
+                        var e = restEntities_1_1.value;
+                        _loop_8(e);
+                    }
+                }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (restEntities_1_1 && !restEntities_1_1.done && (_b = restEntities_1.return)) _b.call(restEntities_1);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
+            }
+        }
+    };
+    // 注入声明的cascade删除时的外键处理动作
+    for (var entity in authDict) {
+        _loop_4(entity);
+    }
     return checkers;
 }
 exports.createRemoveCheckers = createRemoveCheckers;

package/lib/store/modi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createModiRelatedTriggers = exports.createModiRelatedCheckers = exports.abandonModis = exports.applyModis = exports.createOperationsFromModies = void 0;
 var tslib_1 = require("tslib");
+var types_1 = require("../types");
 var action_1 = require("../actions/action");
 var lodash_1 = require("../utils/lodash");
 var uuid_1 = require("../utils/uuid");
@@ -154,35 +155,52 @@ function createModiRelatedTriggers(schema) {
         if (inModi) {
             // 当关联modi的对象被删除时，对应的modi也删除
             triggers.push({
-                name: "\u5F53\u5220\u9664".concat(entity, "\u5BF9\u8C61\u65F6\uFF0C\u5220\u9664\u76F8\u5173\u8054\u8FD8\u6D3B\u8DC3\u7684modi"),
+                name: "\u5F53\u5220\u9664".concat(entity, "\u5BF9\u8C61\u65F6\uFF0C\u5220\u9664\u76F8\u5173\u8054\u7684modi\u7684modiEntity"),
                 action: 'remove',
                 entity: entity,
                 when: 'after',
+                priority: types_1.REMOVE_CASCADE_PRIORITY,
                 fn: function (_a, context, option) {
                     var operation = _a.operation;
                     return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var data, id, _b, _c, _d;
-                        var _e;
-                        return tslib_1.__generator(this, function (_f) {
-                            switch (_f.label) {
+                        var data, id, _b, _c, _d, _e, _f, _g;
+                        var _h, _j;
+                        return tslib_1.__generator(this, function (_k) {
+                            switch (_k.label) {
                                 case 0:
                                     data = operation.data;
                                     id = data.id;
                                     _c = (_b = context).operate;
-                                    _d = ['modi'];
-                                    _e = {};
+                                    _d = ['modiEntity'];
+                                    _h = {};
                                     return [4 /*yield*/, (0, uuid_1.generateNewIdAsync)()];
-                                case 1: return [4 /*yield*/, _c.apply(_b, _d.concat([(_e.id = _f.sent(),
-                                            _e.action = 'remove',
-                                            _e.data = {},
-                                            _e.filter = {
+                                case 1: return [4 /*yield*/, _c.apply(_b, _d.concat([(_h.id = _k.sent(),
+                                            _h.action = 'remove',
+                                            _h.data = {},
+                                            _h.filter = {
+                                                modi: {
+                                                    entity: entity,
+                                                    entityId: id,
+                                                },
+                                            },
+                                            _h), { dontCollect: true }]))];
+                                case 2:
+                                    _k.sent();
+                                    _f = (_e = context).operate;
+                                    _g = ['modi'];
+                                    _j = {};
+                                    return [4 /*yield*/, (0, uuid_1.generateNewIdAsync)()];
+                                case 3: return [4 /*yield*/, _f.apply(_e, _g.concat([(_j.id = _k.sent(),
+                                            _j.action = 'remove',
+                                            _j.data = {},
+                                            _j.filter = {
                                                 entity: entity,
                                                 entityId: id,
                                             },
-                                            _e), option]))];
-                                case 2:
-                                    _f.sent();
-                                    return [2 /*return*/, 1];
+                                            _j), { dontCollect: true }]))];
+                                case 4:
+                                    _k.sent();
+                                    return [2 /*return*/, 0];
                             }
                         });
                     });

package/lib/types/Action.d.ts

@@ -13,6 +13,8 @@ export declare type ActionDictOfEntityDict<E extends EntityDict> = {
         [A in keyof E[T]['OpSchema']]?: ActionDef<string, string>;
     };
 };
+export declare type CascadeActionItem = CascadeRelationItem;
 export declare type CascadeActionAuth<A extends Action = ''> = {
-    [K in A | GenericAction]?: CascadeRelationItem | (CascadeRelationItem | CascadeRelationItem[])[];
+    [K in A | GenericAction]?: CascadeActionItem | (CascadeActionItem | CascadeActionItem[])[];
 };
+export declare type ActionOnRemove = 'setNull' | 'remove';

package/lib/types/Auth.d.ts

@@ -1,4 +1,4 @@
-import { CascadeActionAuth, CascadeRelationAuth } from ".";
+import { CascadeActionAuth, CascadeRelationAuth, ActionOnRemove } from ".";
 import { AsyncContext } from "../store/AsyncRowStore";
 import { SyncContext } from "../store/SyncRowStore";
 import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
@@ -60,6 +60,9 @@ export declare type Checker<ED extends EntityDict, T extends keyof ED, Cxt exten
 export declare type AuthDef<ED extends EntityDict, T extends keyof ED> = {
     relationAuth?: CascadeRelationAuth<NonNullable<ED[T]['Relation']>>;
     actionAuth?: CascadeActionAuth<ED[T]['Action']>;
+    cascadeRemove?: {
+        [E in keyof ED[T]['OpSchema'] | '@entity']?: ActionOnRemove;
+    };
 };
 export declare type AuthDefDict<ED extends EntityDict> = {
     [K in keyof ED]?: AuthDef<ED, K>;

package/lib/types/Trigger.d.ts

@@ -12,6 +12,7 @@ export declare const TRIGGER_MIN_PRIORITY = 1;
 export declare const TRIGGER_MAX_PRIORITY = 99;
 export declare const DATA_CHECKER_DEFAULT_PRIORITY = 60;
 export declare const CHECKER_DEFAULT_PRIORITY = 99;
+export declare const REMOVE_CASCADE_PRIORITY = 70;
 interface TriggerBase<ED extends EntityDict, T extends keyof ED> {
     checkerType?: CheckerType;
     entity: T;

package/lib/types/Trigger.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CHECKER_DEFAULT_PRIORITY = exports.DATA_CHECKER_DEFAULT_PRIORITY = exports.TRIGGER_MAX_PRIORITY = exports.TRIGGER_MIN_PRIORITY = exports.TRIGGER_DEFAULT_PRIORITY = void 0;
+exports.REMOVE_CASCADE_PRIORITY = exports.CHECKER_DEFAULT_PRIORITY = exports.DATA_CHECKER_DEFAULT_PRIORITY = exports.TRIGGER_MAX_PRIORITY = exports.TRIGGER_MIN_PRIORITY = exports.TRIGGER_DEFAULT_PRIORITY = void 0;
 /**
  * 优先级越小，越早执行。定义在1～99之间
  */
@@ -9,6 +9,7 @@ exports.TRIGGER_MIN_PRIORITY = 1;
 exports.TRIGGER_MAX_PRIORITY = 99;
 exports.DATA_CHECKER_DEFAULT_PRIORITY = 60;
 exports.CHECKER_DEFAULT_PRIORITY = 99;
+exports.REMOVE_CASCADE_PRIORITY = 70;
 ;
 ;
 ;

package/package.json

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

package/src/entities/User.ts

@@ -1,20 +1,45 @@
 import { String, Int, Text, Image, Datetime } from '../types/DataType';
 import { LocaleDef } from '../types/Locale';
 import { EntityShape } from '../types/Entity';
+import { ActionDef } from '../types/Action';
 
 export interface Schema extends EntityShape {
     name?: String<16>;
     nickname?: String<64>;
     password?: Text;
+    ref?: Schema;
 };
 
+type UserAction = 'mergeTo';
+type UserState = 'normal' | 'merged';
 
-const locale: LocaleDef<Schema, '', '', {}> = {
+type Action = UserAction;
+
+const UserActionDef: ActionDef<UserAction, UserState> = {
+    stm: {
+        mergeTo: ['normal', 'merged'],
+    },
+};
+
+const locale: LocaleDef<Schema, Action, '', {
+    userState: UserState;
+}> = {
     zh_CN: {
         attr: {
             name: '姓名',
             nickname: '昵称',
             password: '密码',
+            ref: '指向用户',
+            userState: '状态',
+        },
+        action: {
+            mergeTo: '合并',
         },
+        v: {
+            userState: {
+                normal: '正常',
+                merged: '已被合并',
+            },
+        }
     },
 };

package/src/entities/UserEntityGrant.ts

@@ -0,0 +1,24 @@
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+
+export interface Schema extends EntityShape {
+    entity: String<32>;
+    entityId: String<64>;
+    relation: String<32>;
+};
+
+const locale: LocaleDef<
+    Schema,
+    '',
+    '',
+    {}
+> = {
+    zh_CN: {
+        attr: {
+            relation: '关系',
+            entity: '关联对象',
+            entityId: '关联对象id',
+        },
+    },
+};