oak-backend-base 2.4.1 → 3.0.0

package/lib/AppLoader.d.ts

@@ -21,4 +21,5 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
     getEndpoints(): Record<string, Endpoint<ED, Cxt>>;
     startTimers(): void;
     execStartRoutines(): Promise<void>;
+    execRoutine(routine: (context: Cxt) => Promise<void>): Promise<void>;
 }

package/lib/AppLoader.js

@@ -5,10 +5,9 @@ const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const node_schedule_1 = require("node-schedule");
+const env_1 = require("oak-domain/lib/compiler/env");
 const actionDef_1 = require("oak-domain/lib/store/actionDef");
 const lodash_1 = require("oak-domain/lib/utils/lodash");
-const checkers_1 = require("oak-domain/lib/checkers");
-const triggers_1 = require("oak-domain/lib/triggers");
 const uuid_1 = require("oak-domain/lib/utils/uuid");
 const types_1 = require("oak-domain/lib/types");
 const DbStore_1 = require("./DbStore");
@@ -41,20 +40,44 @@ class AppLoader extends types_1.AppLoader {
             const inter = (0, lodash_1.intersection)(Object.keys(sthOut), Object.keys(sth2));
             if (inter.length > 0) {
                 console.warn(`${(0, path_1.join)(this.path, 'node_modules', this.externalDependencies[idx], filePath)}中的default输出对象中的key值【${inter.join(',')}】与其它对应路径输出的key值有冲突，请仔细检查避免错误`);
+                inter.forEach((ele) => {
+                    if (sth2[ele] instanceof Array && sthOut[ele]) {
+                        (0, assert_1.default)(sthOut[ele] instanceof Array, `${(0, path_1.join)(this.path, 'node_modules', this.externalDependencies[idx], filePath)}中的default输出对象的${ele}键值是数组，但之前的相应对象的${ele}却不是，请仔细检查以避免错误`);
+                        console.warn(`${(0, path_1.join)(this.path, 'node_modules', this.externalDependencies[idx], filePath)}中的default输出对象中的key值【${ele}】与其它对应路径输出的key值【${ele}】将以数组格式进行合并，请仔细检查避免错误`);
+                        sth2[ele].push(...sthOut[ele]);
+                    }
+                    else if (!(sth2[ele] instanceof Array) && sthOut[ele]) {
+                        (0, assert_1.default)(!(sthOut[ele] instanceof Array), `${(0, path_1.join)(this.path, 'node_modules', this.externalDependencies[idx], filePath)}中的default输出对象的${ele}键值不是数组，但之前的相应对象的${ele}却是，请仔细检查以避免错误`);
+                        console.warn(`${(0, path_1.join)(this.path, 'node_modules', this.externalDependencies[idx], filePath)}中的default输出对象中的key值【${ele}】将对与其它对应路径输出的key值【${ele}】进行覆盖，请仔细检查避免错误`);
+                    }
+                });
             }
             Object.assign(sthOut, sth2);
         });
         const inter = (0, lodash_1.intersection)(Object.keys(sthOut), Object.keys(sth));
-        (0, assert_1.default)(inter.length === 0, `项目${filePath}中的default输出与第三方库中的输出在键值${inter.join(',')}上冲突，请处理`);
+        if (inter.length > 0) {
+            inter.forEach((ele) => {
+                if (sth[ele] instanceof Array && sthOut[ele]) {
+                    (0, assert_1.default)(sthOut[ele] instanceof Array, `项目${filePath}中的default输出对象的${ele}键值是数组，但之前的相应对象的${ele}却不是，请仔细检查以避免错误`);
+                    console.warn(`项目${filePath}中的default输出对象中的key值【${ele}】与其它引用包该路径输出的key值【${ele}】将以数组格式进行合并，请仔细检查避免错误`);
+                    sth[ele].push(...sthOut[ele]);
+                }
+                else if (!(sth[ele] instanceof Array) && sthOut[ele]) {
+                    (0, assert_1.default)(!(sthOut[ele] instanceof Array), `项目${filePath}中的default输出对象的${ele}键值不是数组，但之前的相应对象的${ele}却是，请仔细检查以避免错误`);
+                    console.warn(`项目${filePath}中的default输出对象中的key值【${ele}】将对其它引用包该路径输出的key值【${ele}】进行覆盖，请仔细检查避免错误`);
+                }
+            });
+        }
         Object.assign(sthOut, sth);
         return sthOut;
     }
     constructor(path, contextBuilder, dbConfig) {
         super(path);
         const { storageSchema } = require(`${path}/lib/oak-app-domain/Storage`);
-        this.externalDependencies = require(`${path}/lib/config/externalDependencies`).default;
+        const { ActionCascadePathGraph, RelationCascadePathGraph, selectFreeEntities, createFreeEntities, updateFreeEntities, deducedRelationMap } = require(`${path}/lib/oak-app-domain/Relation`);
+        this.externalDependencies = require((0, env_1.OAK_EXTERNAL_LIBS_FILEPATH)((0, path_1.join)(path, 'lib')));
         this.aspectDict = Object.assign({}, index_1.default, this.requireSth('lib/aspects/index'));
-        this.dbStore = new DbStore_1.DbStore(storageSchema, contextBuilder, dbConfig);
+        this.dbStore = new DbStore_1.DbStore(storageSchema, contextBuilder, dbConfig, ActionCascadePathGraph, RelationCascadePathGraph, deducedRelationMap, selectFreeEntities, createFreeEntities, updateFreeEntities);
         this.contextBuilder = contextBuilder;
     }
     initTriggers() {
@@ -62,20 +85,16 @@ class AppLoader extends types_1.AppLoader {
         const checkers = this.requireSth('lib/checkers/index');
         const authDict = this.requireSth('lib/auth/index');
         const { ActionDefDict } = require(`${this.path}/lib/oak-app-domain/ActionDefDict`);
-        const { triggers: adTriggers, checkers: adCheckers } = (0, actionDef_1.analyzeActionDefDict)(this.dbStore.getSchema(), ActionDefDict);
+        const { triggers: adTriggers, checkers: adCheckers } = (0, actionDef_1.makeIntrinsicCTWs)(this.dbStore.getSchema(), ActionDefDict);
         triggers.forEach((trigger) => this.dbStore.registerTrigger(trigger));
         adTriggers.forEach((trigger) => this.dbStore.registerTrigger(trigger));
         checkers.forEach((checker) => this.dbStore.registerChecker(checker));
         adCheckers.forEach((checker) => this.dbStore.registerChecker(checker));
-        const dynamicCheckers = (0, checkers_1.createDynamicCheckers)(this.dbStore.getSchema(), authDict);
-        dynamicCheckers.forEach((checker) => this.dbStore.registerChecker(checker));
-        const dynamicTriggers = (0, triggers_1.createDynamicTriggers)(this.dbStore.getSchema());
-        dynamicTriggers.forEach((trigger) => this.dbStore.registerTrigger(trigger));
     }
     startWatchers() {
         const watchers = this.requireSth('lib/watchers/index');
         const { ActionDefDict } = require(`${this.path}/lib/oak-app-domain/ActionDefDict`);
-        const { watchers: adWatchers } = (0, actionDef_1.analyzeActionDefDict)(this.dbStore.getSchema(), ActionDefDict);
+        const { watchers: adWatchers } = (0, actionDef_1.makeIntrinsicCTWs)(this.dbStore.getSchema(), ActionDefDict);
         const totalWatchers = watchers.concat(adWatchers);
         let count = 0;
         const doWatchers = async () => {
@@ -150,7 +169,6 @@ class AppLoader extends types_1.AppLoader {
         await this.dbStore.initialize(dropIfExists);
         const data = this.requireSth('lib/data/index');
         const context = await this.contextBuilder()(this.dbStore);
-        await context.begin();
         for (const entity in data) {
             let rows = data[entity];
             if (entity === 'area') {
@@ -158,17 +176,25 @@ class AppLoader extends types_1.AppLoader {
                 rows = require('./data/area.json');
             }
             if (rows.length > 0) {
-                await this.dbStore.operate(entity, {
-                    data: rows,
-                    action: 'create',
-                }, context, {
-                    dontCollect: true,
-                    dontCreateOper: true,
-                });
-                console.log(`data in ${entity} initialized!`);
+                await context.begin();
+                try {
+                    await this.dbStore.operate(entity, {
+                        data: rows,
+                        action: 'create',
+                    }, context, {
+                        dontCollect: true,
+                        dontCreateOper: true,
+                    });
+                    await context.commit();
+                    console.log(`data in ${entity} initialized!`);
+                }
+                catch (err) {
+                    await context.rollback();
+                    console.error(`data on ${entity} initilization failed!`);
+                    throw err;
+                }
             }
         }
-        await context.commit();
         this.dbStore.disconnect();
     }
     getStore() {
@@ -217,5 +243,9 @@ class AppLoader extends types_1.AppLoader {
             }
         }
     }
+    async execRoutine(routine) {
+        const context = await this.contextBuilder()(this.dbStore);
+        await routine(context);
+    }
 }
 exports.AppLoader = AppLoader;

package/lib/DbStore.d.ts

@@ -1,11 +1,12 @@
 import { MysqlStore, MySqlSelectOption, MysqlOperateOption } from 'oak-db';
-import { EntityDict, StorageSchema, Trigger, Checker, SelectOption } from 'oak-domain/lib/types';
+import { EntityDict, StorageSchema, Trigger, Checker, AuthDeduceRelationMap, SelectOption, AuthCascadePath } from 'oak-domain/lib/types';
 import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
 import { MySQLConfiguration } from 'oak-db/lib/MySQL/types/Configuration';
 import { AsyncContext, AsyncRowStore } from 'oak-domain/lib/store/AsyncRowStore';
 export declare class DbStore<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends MysqlStore<ED, Cxt> implements AsyncRowStore<ED, Cxt> {
     private executor;
-    constructor(storageSchema: StorageSchema<ED>, contextBuilder: (scene?: string) => (store: DbStore<ED, Cxt>) => Promise<AsyncContext<ED>>, mysqlConfiguration: MySQLConfiguration);
+    private relationAuth;
+    constructor(storageSchema: StorageSchema<ED>, contextBuilder: (scene?: string) => (store: DbStore<ED, Cxt>) => Promise<Cxt>, mysqlConfiguration: MySQLConfiguration, actionCascadeGraph: AuthCascadePath<ED>[], relationCascadeGraph: AuthCascadePath<ED>[], authDeduceRelationMap: AuthDeduceRelationMap<ED>, selectFreeEntities?: (keyof ED)[], createFreeEntities?: (keyof ED)[], updateFreeEntities?: (keyof ED)[]);
     protected cascadeUpdateAsync<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: AsyncContext<ED>, option: MysqlOperateOption): Promise<import("oak-domain/lib/types").OperationResult<ED>>;
     operate<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: MysqlOperateOption): Promise<import("oak-domain/lib/types").OperationResult<ED>>;
     select<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: MySqlSelectOption): Promise<Partial<ED[T]["Schema"]>[]>;

package/lib/DbStore.js

@@ -3,18 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbStore = void 0;
 const oak_db_1 = require("oak-db");
 const TriggerExecutor_1 = require("oak-domain/lib/store/TriggerExecutor");
+const RelationAuth_1 = require("oak-domain/lib/store/RelationAuth");
 class DbStore extends oak_db_1.MysqlStore {
     executor;
-    constructor(storageSchema, contextBuilder, mysqlConfiguration) {
+    relationAuth;
+    constructor(storageSchema, contextBuilder, mysqlConfiguration, actionCascadeGraph, relationCascadeGraph, authDeduceRelationMap, selectFreeEntities = [], createFreeEntities = [], updateFreeEntities = []) {
         super(storageSchema, mysqlConfiguration);
         this.executor = new TriggerExecutor_1.TriggerExecutor((scene) => contextBuilder(scene)(this));
+        this.relationAuth = new RelationAuth_1.RelationAuth(storageSchema, actionCascadeGraph, relationCascadeGraph, authDeduceRelationMap, selectFreeEntities, createFreeEntities, updateFreeEntities);
     }
     async cascadeUpdateAsync(entity, operation, context, option) {
-        if (!option.blockTrigger) {
+        // 如果是在modi处理过程中，所有的trigger也可以延时到apply时再处理（这时候因为modi中的数据并不实际存在，处理会有问题）
+        if (!option.blockTrigger && !option.modiParentEntity) {
             await this.executor.preOperation(entity, operation, context, option);
         }
         const result = await super.cascadeUpdateAsync(entity, operation, context, option);
-        if (!option.blockTrigger) {
+        if (!option.blockTrigger && !option.modiParentEntity) {
             await this.executor.postOperation(entity, operation, context, option);
         }
         return result;
@@ -26,6 +30,7 @@ class DbStore extends oak_db_1.MysqlStore {
             await context.begin();
         }
         try {
+            await this.relationAuth.checkRelationAsync(entity, operation, context);
             result = await super.operate(entity, operation, context, option);
         }
         catch (err) {
@@ -50,6 +55,9 @@ class DbStore extends oak_db_1.MysqlStore {
         if (!option.blockTrigger) {
             await this.executor.preOperation(entity, selection, context, option);
         }
+        if (!option.dontCollect) {
+            await this.relationAuth.checkRelationAsync(entity, selection, context);
+        }
         try {
             result = await super.select(entity, selection, context, option);
             if (!option.blockTrigger) {
@@ -72,12 +80,13 @@ class DbStore extends oak_db_1.MysqlStore {
             await context.begin();
         }
         try {
-            const selection2 = Object.assign({
-                action: 'select',
-            }, selection);
-            if (!option.blockTrigger) {
-                await this.executor.preOperation(entity, selection2, context, option);
-            }
+            // const selection2 = Object.assign({
+            //     action: 'select',
+            // }, selection) as ED[T]['Operation'];
+            // await this.relationAuth.checkRelationAsync(entity, selection2, context);
+            // if (!option.blockTrigger) {
+            //     await this.executor.preOperation(entity, selection2, context, option);
+            // }
             result = await super.count(entity, selection, context, option);
             /*  count应该不存在后trigger吧
             if (!option.blockTrigger) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oak-backend-base",
-  "version": "2.4.1",
+  "version": "3.0.0",
   "description": "oak-backend-base",
   "main": "lib/index",
   "author": {
@@ -20,9 +20,9 @@
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
     "node-schedule": "^2.1.0",
-    "oak-common-aspect": "^2.1.5",
-    "oak-db": "^2.2.6",
-    "oak-domain": "^2.6.2",
+    "oak-common-aspect": "^2.2.1",
+    "oak-db": "^3.0.0",
+    "oak-domain": "^3.0.0",
     "uuid": "^8.3.2"
   },
   "license": "ISC",
@@ -32,6 +32,6 @@
     "copyfiles": "^2.4.1",
     "ts-node": "~10.9.1",
     "tslib": "^2.4.0",
-    "typescript": "~4.7.4"
+    "typescript": "^4.7.4"
   }
 }