oak-backend-base 2.3.4 → 2.4.2

package/lib/AppLoader.d.ts

@@ -1,21 +1,25 @@
-import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
-import { AppLoader as GeneralAppLoader, EntityDict } from "oak-domain/lib/types";
-import { DbStore } from "./DbStore";
-import { MySQLConfiguration } from 'oak-db/lib/MySQL/types/Configuration';
-import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";
-import { Endpoint } from 'oak-domain/lib/types/Endpoint';
-export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends GeneralAppLoader<ED, Cxt> {
-    private dbStore;
-    private aspectDict;
-    private contextBuilder;
-    constructor(path: string, contextBuilder: (scene?: string) => (store: DbStore<ED, Cxt>) => Promise<Cxt>, dbConfig: MySQLConfiguration);
-    mount(initialize?: true): Promise<void>;
-    unmount(): Promise<void>;
-    execAspect(name: string, context: Cxt, params?: any): Promise<any>;
-    initialize(dropIfExists?: boolean): Promise<void>;
-    getStore(): DbStore<ED, Cxt>;
-    getEndpoints(): Record<string, Endpoint<ED, Cxt>>;
-    startWatchers(): void;
-    startTimers(): void;
-    execStartRoutines(): Promise<void>;
-}
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
+import { AppLoader as GeneralAppLoader, EntityDict } from "oak-domain/lib/types";
+import { DbStore } from "./DbStore";
+import { MySQLConfiguration } from 'oak-db/lib/MySQL/types/Configuration';
+import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";
+import { Endpoint } from 'oak-domain/lib/types/Endpoint';
+export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends GeneralAppLoader<ED, Cxt> {
+    private dbStore;
+    private aspectDict;
+    private externalDependencies;
+    private contextBuilder;
+    private requireSth;
+    constructor(path: string, contextBuilder: (scene?: string) => (store: DbStore<ED, Cxt>) => Promise<Cxt>, dbConfig: MySQLConfiguration);
+    initTriggers(): void;
+    startWatchers(): void;
+    mount(initialize?: true): Promise<void>;
+    unmount(): Promise<void>;
+    execAspect(name: string, context: Cxt, params?: any): Promise<any>;
+    initialize(dropIfExists?: boolean): Promise<void>;
+    getStore(): DbStore<ED, Cxt>;
+    getEndpoints(): Record<string, Endpoint<ED, Cxt>>;
+    startTimers(): void;
+    execStartRoutines(): Promise<void>;
+    execRoutine(routine: (context: Cxt) => Promise<void>): Promise<void>;
+}

package/lib/AppLoader.js

@@ -1,188 +1,225 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppLoader = void 0;
-const tslib_1 = require("tslib");
-const node_schedule_1 = require("node-schedule");
-const actionDef_1 = require("oak-domain/lib/store/actionDef");
-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");
-const index_1 = tslib_1.__importStar(require("oak-common-aspect/lib/index"));
-function initTriggers(dbStore, path) {
-    const triggers = require(`${path}/lib/triggers/index`).default;
-    const checkers = require(`${path}/lib/checkers/index`).default;
-    const authDict = require(`${path}/lib/auth/index`).default;
-    const { ActionDefDict } = require(`${path}/lib/oak-app-domain/ActionDefDict`);
-    const { triggers: adTriggers, checkers: adCheckers } = (0, actionDef_1.analyzeActionDefDict)(dbStore.getSchema(), ActionDefDict);
-    triggers.forEach((trigger) => dbStore.registerTrigger(trigger));
-    adTriggers.forEach((trigger) => dbStore.registerTrigger(trigger));
-    checkers.forEach((checker) => dbStore.registerChecker(checker));
-    adCheckers.forEach((checker) => dbStore.registerChecker(checker));
-    const dynamicCheckers = (0, checkers_1.createDynamicCheckers)(dbStore.getSchema(), authDict);
-    dynamicCheckers.forEach((checker) => dbStore.registerChecker(checker));
-    const dynamicTriggers = (0, triggers_1.createDynamicTriggers)(dbStore.getSchema());
-    dynamicTriggers.forEach((trigger) => dbStore.registerTrigger(trigger));
-}
-function startWatchers(dbStore, path, contextBuilder) {
-    const watchers = require(`${path}/lib/watchers/index`).default;
-    const { ActionDefDict } = require(`${path}/lib/oak-app-domain/ActionDefDict`);
-    const { watchers: adWatchers } = (0, actionDef_1.analyzeActionDefDict)(dbStore.getSchema(), ActionDefDict);
-    const totalWatchers = watchers.concat(adWatchers);
-    let count = 0;
-    const doWatchers = async () => {
-        count++;
-        const start = Date.now();
-        const context = await contextBuilder()(dbStore);
-        for (const w of totalWatchers) {
-            await context.begin();
-            try {
-                if (w.hasOwnProperty('actionData')) {
-                    const { entity, action, filter, actionData } = w;
-                    const filter2 = typeof filter === 'function' ? await filter() : filter;
-                    const data = typeof actionData === 'function' ? await actionData() : actionData; // 这里有个奇怪的编译错误，不理解 by Xc
-                    const result = await dbStore.operate(entity, {
-                        id: await (0, uuid_1.generateNewIdAsync)(),
-                        action,
-                        data,
-                        filter: filter2
-                    }, context, {
-                        dontCollect: true,
-                    });
-                    console.log(`执行了watcher【${w.name}】，结果是：`, result);
-                }
-                else {
-                    const { entity, projection, fn, filter } = w;
-                    const filter2 = typeof filter === 'function' ? await filter() : filter;
-                    const projection2 = typeof projection === 'function' ? await projection() : projection;
-                    const rows = await dbStore.select(entity, {
-                        data: projection2,
-                        filter: filter2,
-                    }, context, {
-                        dontCollect: true,
-                        blockTrigger: true,
-                    });
-                    const result = await fn(context, rows);
-                    console.log(`执行了watcher【${w.name}】，结果是：`, result);
-                }
-                await context.commit();
-            }
-            catch (err) {
-                await context.rollback();
-                console.error(`执行了watcher【${w.name}】，发生错误：`, err);
-            }
-        }
-        const duration = Date.now() - start;
-        console.log(`第${count}次执行watchers，共执行${watchers.length}个，耗时${duration}毫秒`);
-        setTimeout(() => doWatchers(), 120000);
-    };
-    doWatchers();
-}
-class AppLoader extends types_1.AppLoader {
-    dbStore;
-    aspectDict;
-    contextBuilder;
-    constructor(path, contextBuilder, dbConfig) {
-        super(path);
-        const { storageSchema } = require(`${path}/lib/oak-app-domain/Storage`);
-        this.aspectDict = Object.assign({}, index_1.default, require(`${path}/lib/aspects/index`).default);
-        this.dbStore = new DbStore_1.DbStore(storageSchema, contextBuilder, dbConfig);
-        this.contextBuilder = contextBuilder;
-    }
-    async mount(initialize) {
-        const { path } = this;
-        if (!initialize) {
-            initTriggers(this.dbStore, path);
-        }
-        const { importations, exportations } = require(`${path}/lib/ports/index`);
-        (0, index_1.registerPorts)(importations || [], exportations || []);
-        this.dbStore.connect();
-    }
-    async unmount() {
-        (0, index_1.clearPorts)();
-        this.dbStore.disconnect();
-    }
-    async execAspect(name, context, params) {
-        const fn = this.aspectDict[name];
-        if (!fn) {
-            throw new Error(`不存在的接口名称: ${name}`);
-        }
-        return await fn(params, context);
-    }
-    async initialize(dropIfExists) {
-        await this.dbStore.initialize(dropIfExists);
-        const data = require(`${this.path}/lib/data/index`).default;
-        const context = await this.contextBuilder()(this.dbStore);
-        await context.begin();
-        for (const entity in data) {
-            let rows = data[entity];
-            if (entity === 'area') {
-                //  对area暂时处理一下
-                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.commit();
-        this.dbStore.disconnect();
-    }
-    getStore() {
-        return this.dbStore;
-    }
-    getEndpoints() {
-        const endpoints = require(`${this.path}/lib/endpoints/index`).default;
-        return endpoints;
-    }
-    startWatchers() {
-        startWatchers(this.dbStore, this.path, this.contextBuilder);
-    }
-    startTimers() {
-        const timers = require(`${this.path}/lib/timers/index`).default;
-        for (const timer of timers) {
-            const { cron, fn, name } = timer;
-            (0, node_schedule_1.scheduleJob)(name, cron, async (date) => {
-                const start = Date.now();
-                const context = await this.contextBuilder()(this.dbStore);
-                await context.begin();
-                console.log(`定时器【${name}】开始执行，时间是【${date.toLocaleTimeString()}】`);
-                try {
-                    const result = await fn(context);
-                    console.log(`定时器【${name}】执行完成，耗时${Date.now() - start}毫秒，结果是【${result}】`);
-                    await context.commit();
-                }
-                catch (err) {
-                    console.warn(`定时器【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
-                    await context.rollback();
-                }
-            });
-        }
-    }
-    async execStartRoutines() {
-        const routines = require(`${this.path}/lib/routines/start`).default;
-        for (const routine of routines) {
-            const { name, fn } = routine;
-            const context = await this.contextBuilder()(this.dbStore);
-            const start = Date.now();
-            await context.begin();
-            try {
-                const result = await fn(context);
-                console.log(`例程【${name}】执行完成，耗时${Date.now() - start}毫秒，结果是【${result}】`);
-                await context.commit();
-            }
-            catch (err) {
-                console.warn(`例程【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
-                await context.rollback();
-            }
-        }
-    }
-}
-exports.AppLoader = AppLoader;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppLoader = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const node_schedule_1 = require("node-schedule");
+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");
+const index_1 = tslib_1.__importStar(require("oak-common-aspect/lib/index"));
+const assert_1 = tslib_1.__importDefault(require("assert"));
+class AppLoader extends types_1.AppLoader {
+    dbStore;
+    aspectDict;
+    externalDependencies;
+    contextBuilder;
+    requireSth(filePath) {
+        const sth = require((0, path_1.join)(this.path, filePath)).default;
+        const sthExternal = this.externalDependencies.map(ele => {
+            const depFilePath = (0, path_1.join)(this.path, 'node_modules', ele, filePath);
+            if ((0, fs_1.existsSync)(`${depFilePath}.js`)) {
+                return require(depFilePath).default;
+            }
+        }).filter(ele => !!ele);
+        if (sth instanceof Array) {
+            sthExternal.forEach((sth2, idx) => {
+                (0, assert_1.default)(sth2 instanceof Array, `${(0, path_1.join)(this.path, 'node_modules', this.externalDependencies[idx], filePath)}中的default输出对象不是数组，与项目对应路径的输出不一致`);
+                sth.push(...sth2);
+            });
+            return sth;
+        }
+        (0, assert_1.default)(typeof sth === 'object');
+        const sthOut = {};
+        sthExternal.forEach((sth2, idx) => {
+            (0, assert_1.default)(typeof sth2 === 'object' && !(sth2 instanceof Array), `${(0, path_1.join)(this.path, 'node_modules', this.externalDependencies[idx], filePath)}中的default输出对象不是非数组对象，与项目对应路径的输出不一致`);
+            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值有冲突，请仔细检查避免错误`);
+            }
+            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(',')}上冲突，请处理`);
+        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;
+        this.aspectDict = Object.assign({}, index_1.default, this.requireSth('lib/aspects/index'));
+        this.dbStore = new DbStore_1.DbStore(storageSchema, contextBuilder, dbConfig);
+        this.contextBuilder = contextBuilder;
+    }
+    initTriggers() {
+        const triggers = this.requireSth('lib/triggers/index');
+        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);
+        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 totalWatchers = watchers.concat(adWatchers);
+        let count = 0;
+        const doWatchers = async () => {
+            count++;
+            const start = Date.now();
+            const context = await this.contextBuilder()(this.dbStore);
+            for (const w of totalWatchers) {
+                await context.begin();
+                try {
+                    if (w.hasOwnProperty('actionData')) {
+                        const { entity, action, filter, actionData } = w;
+                        const filter2 = typeof filter === 'function' ? await filter() : filter;
+                        const data = typeof actionData === 'function' ? await actionData() : actionData; // 这里有个奇怪的编译错误，不理解 by Xc
+                        const result = await this.dbStore.operate(entity, {
+                            id: await (0, uuid_1.generateNewIdAsync)(),
+                            action,
+                            data,
+                            filter: filter2
+                        }, context, {
+                            dontCollect: true,
+                        });
+                        console.log(`执行了watcher【${w.name}】，结果是：`, result);
+                    }
+                    else {
+                        const { entity, projection, fn, filter } = w;
+                        const filter2 = typeof filter === 'function' ? await filter() : filter;
+                        const projection2 = typeof projection === 'function' ? await projection() : projection;
+                        const rows = await this.dbStore.select(entity, {
+                            data: projection2,
+                            filter: filter2,
+                        }, context, {
+                            dontCollect: true,
+                            blockTrigger: true,
+                        });
+                        const result = await fn(context, rows);
+                        console.log(`执行了watcher【${w.name}】，结果是：`, result);
+                    }
+                    await context.commit();
+                }
+                catch (err) {
+                    await context.rollback();
+                    console.error(`执行了watcher【${w.name}】，发生错误：`, err);
+                }
+            }
+            const duration = Date.now() - start;
+            console.log(`第${count}次执行watchers，共执行${watchers.length}个，耗时${duration}毫秒`);
+            setTimeout(() => doWatchers(), 120000);
+        };
+        doWatchers();
+    }
+    async mount(initialize) {
+        const { path } = this;
+        if (!initialize) {
+            this.initTriggers();
+        }
+        const { importations, exportations } = require(`${path}/lib/ports/index`);
+        (0, index_1.registerPorts)(importations || [], exportations || []);
+        this.dbStore.connect();
+    }
+    async unmount() {
+        (0, index_1.clearPorts)();
+        this.dbStore.disconnect();
+    }
+    async execAspect(name, context, params) {
+        const fn = this.aspectDict[name];
+        if (!fn) {
+            throw new Error(`不存在的接口名称: ${name}`);
+        }
+        return await fn(params, context);
+    }
+    async initialize(dropIfExists) {
+        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') {
+                //  对area暂时处理一下
+                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.commit();
+        this.dbStore.disconnect();
+    }
+    getStore() {
+        return this.dbStore;
+    }
+    getEndpoints() {
+        const endpoints = this.requireSth('lib/endpoints/index');
+        return endpoints;
+    }
+    startTimers() {
+        const timers = this.requireSth('lib/timers/index');
+        for (const timer of timers) {
+            const { cron, fn, name } = timer;
+            (0, node_schedule_1.scheduleJob)(name, cron, async (date) => {
+                const start = Date.now();
+                const context = await this.contextBuilder()(this.dbStore);
+                await context.begin();
+                console.log(`定时器【${name}】开始执行，时间是【${date.toLocaleTimeString()}】`);
+                try {
+                    const result = await fn(context);
+                    console.log(`定时器【${name}】执行完成，耗时${Date.now() - start}毫秒，结果是【${result}】`);
+                    await context.commit();
+                }
+                catch (err) {
+                    console.warn(`定时器【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
+                    await context.rollback();
+                }
+            });
+        }
+    }
+    async execStartRoutines() {
+        const routines = this.requireSth('lib/routines/start');
+        for (const routine of routines) {
+            const { name, fn } = routine;
+            const context = await this.contextBuilder()(this.dbStore);
+            const start = Date.now();
+            await context.begin();
+            try {
+                const result = await fn(context);
+                console.log(`例程【${name}】执行完成，耗时${Date.now() - start}毫秒，结果是【${result}】`);
+                await context.commit();
+            }
+            catch (err) {
+                console.warn(`例程【${name}】执行失败，耗时${Date.now() - start}毫秒，错误是`, err);
+                await context.rollback();
+            }
+        }
+    }
+    async execRoutine(routine) {
+        const context = await this.contextBuilder()(this.dbStore);
+        await routine(context);
+    }
+}
+exports.AppLoader = AppLoader;

package/lib/DbStore.d.ts

@@ -1,15 +1,15 @@
-import { MysqlStore, MySqlSelectOption, MysqlOperateOption } from 'oak-db';
-import { EntityDict, StorageSchema, Trigger, Checker, SelectOption } 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);
-    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"]>[]>;
-    count<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: SelectOption): Promise<number>;
-    registerTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>): void;
-    registerChecker<T extends keyof ED>(checker: Checker<ED, T, Cxt>): void;
-}
+import { MysqlStore, MySqlSelectOption, MysqlOperateOption } from 'oak-db';
+import { EntityDict, StorageSchema, Trigger, Checker, SelectOption } 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);
+    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"]>[]>;
+    count<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: SelectOption): Promise<number>;
+    registerTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>): void;
+    registerChecker<T extends keyof ED>(checker: Checker<ED, T, Cxt>): void;
+}

package/lib/DbStore.js

@@ -1,103 +1,103 @@
-"use strict";
-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");
-class DbStore extends oak_db_1.MysqlStore {
-    executor;
-    constructor(storageSchema, contextBuilder, mysqlConfiguration) {
-        super(storageSchema, mysqlConfiguration);
-        this.executor = new TriggerExecutor_1.TriggerExecutor((scene) => contextBuilder(scene)(this));
-    }
-    async cascadeUpdateAsync(entity, operation, context, option) {
-        if (!option.blockTrigger) {
-            await this.executor.preOperation(entity, operation, context, option);
-        }
-        const result = await super.cascadeUpdateAsync(entity, operation, context, option);
-        if (!option.blockTrigger) {
-            await this.executor.postOperation(entity, operation, context, option);
-        }
-        return result;
-    }
-    async operate(entity, operation, context, option) {
-        const autoCommit = !context.getCurrentTxnId();
-        let result;
-        if (autoCommit) {
-            await context.begin();
-        }
-        try {
-            result = await super.operate(entity, operation, context, option);
-        }
-        catch (err) {
-            await context.rollback();
-            throw err;
-        }
-        if (autoCommit) {
-            await context.commit();
-        }
-        return result;
-    }
-    async select(entity, selection, context, option) {
-        const autoCommit = !context.getCurrentTxnId();
-        if (autoCommit) {
-            await context.begin();
-        }
-        let result;
-        // select的trigger应加在根select之前，cascade的select不加处理
-        Object.assign(selection, {
-            action: 'select',
-        });
-        if (!option.blockTrigger) {
-            await this.executor.preOperation(entity, selection, context, option);
-        }
-        try {
-            result = await super.select(entity, selection, context, option);
-            if (!option.blockTrigger) {
-                await this.executor.postOperation(entity, selection, context, option, result);
-            }
-        }
-        catch (err) {
-            await context.rollback();
-            throw err;
-        }
-        if (autoCommit) {
-            await context.commit();
-        }
-        return result;
-    }
-    async count(entity, selection, context, option) {
-        const autoCommit = !context.getCurrentTxnId();
-        let result;
-        if (autoCommit) {
-            await context.begin();
-        }
-        try {
-            const selection2 = Object.assign({
-                action: 'select',
-            }, selection);
-            if (!option.blockTrigger) {
-                await this.executor.preOperation(entity, selection2, context, option);
-            }
-            result = await super.count(entity, selection, context, option);
-            /*  count应该不存在后trigger吧
-            if (!option.blockTrigger) {
-                await this.executor.postOperation(entity, selection2, context, option);
-            } */
-        }
-        catch (err) {
-            await context.rollback();
-            throw err;
-        }
-        if (autoCommit) {
-            await context.commit();
-        }
-        return result;
-    }
-    registerTrigger(trigger) {
-        this.executor.registerTrigger(trigger);
-    }
-    registerChecker(checker) {
-        this.executor.registerChecker(checker);
-    }
-}
-exports.DbStore = DbStore;
+"use strict";
+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");
+class DbStore extends oak_db_1.MysqlStore {
+    executor;
+    constructor(storageSchema, contextBuilder, mysqlConfiguration) {
+        super(storageSchema, mysqlConfiguration);
+        this.executor = new TriggerExecutor_1.TriggerExecutor((scene) => contextBuilder(scene)(this));
+    }
+    async cascadeUpdateAsync(entity, operation, context, option) {
+        if (!option.blockTrigger) {
+            await this.executor.preOperation(entity, operation, context, option);
+        }
+        const result = await super.cascadeUpdateAsync(entity, operation, context, option);
+        if (!option.blockTrigger) {
+            await this.executor.postOperation(entity, operation, context, option);
+        }
+        return result;
+    }
+    async operate(entity, operation, context, option) {
+        const autoCommit = !context.getCurrentTxnId();
+        let result;
+        if (autoCommit) {
+            await context.begin();
+        }
+        try {
+            result = await super.operate(entity, operation, context, option);
+        }
+        catch (err) {
+            await context.rollback();
+            throw err;
+        }
+        if (autoCommit) {
+            await context.commit();
+        }
+        return result;
+    }
+    async select(entity, selection, context, option) {
+        const autoCommit = !context.getCurrentTxnId();
+        if (autoCommit) {
+            await context.begin();
+        }
+        let result;
+        // select的trigger应加在根select之前，cascade的select不加处理
+        Object.assign(selection, {
+            action: 'select',
+        });
+        if (!option.blockTrigger) {
+            await this.executor.preOperation(entity, selection, context, option);
+        }
+        try {
+            result = await super.select(entity, selection, context, option);
+            if (!option.blockTrigger) {
+                await this.executor.postOperation(entity, selection, context, option, result);
+            }
+        }
+        catch (err) {
+            await context.rollback();
+            throw err;
+        }
+        if (autoCommit) {
+            await context.commit();
+        }
+        return result;
+    }
+    async count(entity, selection, context, option) {
+        const autoCommit = !context.getCurrentTxnId();
+        let result;
+        if (autoCommit) {
+            await context.begin();
+        }
+        try {
+            const selection2 = Object.assign({
+                action: 'select',
+            }, selection);
+            if (!option.blockTrigger) {
+                await this.executor.preOperation(entity, selection2, context, option);
+            }
+            result = await super.count(entity, selection, context, option);
+            /*  count应该不存在后trigger吧
+            if (!option.blockTrigger) {
+                await this.executor.postOperation(entity, selection2, context, option);
+            } */
+        }
+        catch (err) {
+            await context.rollback();
+            throw err;
+        }
+        if (autoCommit) {
+            await context.commit();
+        }
+        return result;
+    }
+    registerTrigger(trigger) {
+        this.executor.registerTrigger(trigger);
+    }
+    registerChecker(checker) {
+        this.executor.registerChecker(checker);
+    }
+}
+exports.DbStore = DbStore;

package/lib/index.d.ts

@@ -1 +1 @@
-export { AppLoader } from './AppLoader';
+export { AppLoader } from './AppLoader';

package/lib/index.js

@@ -1,5 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppLoader = void 0;
-var AppLoader_1 = require("./AppLoader");
-Object.defineProperty(exports, "AppLoader", { enumerable: true, get: function () { return AppLoader_1.AppLoader; } });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppLoader = void 0;
+var AppLoader_1 = require("./AppLoader");
+Object.defineProperty(exports, "AppLoader", { enumerable: true, get: function () { return AppLoader_1.AppLoader; } });

package/lib/polyfill.d.ts

@@ -1,3 +1,3 @@
-export declare type GenerateIdOption = {
-    shuffle?: boolean;
-};
+export declare type GenerateIdOption = {
+    shuffle?: boolean;
+};

package/lib/polyfill.js

@@ -1,12 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const uuid_1 = require("uuid");
-async function generateNewId(option) {
-    if (option?.shuffle && process.env.NODE_ENV === 'development') {
-        return (0, uuid_1.v4)();
-    }
-    return (0, uuid_1.v1)();
-}
-Object.assign(global, {
-    generateNewId,
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const uuid_1 = require("uuid");
+async function generateNewId(option) {
+    if (option?.shuffle && process.env.NODE_ENV === 'development') {
+        return (0, uuid_1.v4)();
+    }
+    return (0, uuid_1.v1)();
+}
+Object.assign(global, {
+    generateNewId,
+});

package/package.json

@@ -1,37 +1,37 @@
-{
-  "name": "oak-backend-base",
-  "version": "2.3.4",
-  "description": "oak-backend-base",
-  "main": "lib/index",
-  "author": {
-    "name": "XuChang"
-  },
-  "files": [
-    "lib/**/*"
-  ],
-  "scripts": {
-    "copy-files": "copyfiles -u 1 src/**/*.json lib/",
-    "test": "ts-node test/test.ts",
-    "build": "tsc && npm run copy-files"
-  },
-  "dependencies": {
-    "@types/node-schedule": "^2.1.0",
-    "lodash": "^4.17.21",
-    "mysql": "^2.18.1",
-    "mysql2": "^2.3.3",
-    "node-schedule": "^2.1.0",
-    "oak-common-aspect": "^2.1.5",
-    "oak-db": "^2.2.5",
-    "oak-domain": "^2.4.3",
-    "uuid": "^8.3.2"
-  },
-  "license": "ISC",
-  "devDependencies": {
-    "@types/node": "^17.0.40",
-    "@types/uuid": "^8.3.4",
-    "copyfiles": "^2.4.1",
-    "ts-node": "~10.9.1",
-    "tslib": "^2.4.0",
-    "typescript": "~4.7.4"
-  }
-}
+{
+  "name": "oak-backend-base",
+  "version": "2.4.2",
+  "description": "oak-backend-base",
+  "main": "lib/index",
+  "author": {
+    "name": "XuChang"
+  },
+  "files": [
+    "lib/**/*"
+  ],
+  "scripts": {
+    "copy-files": "copyfiles -u 1 src/**/*.json lib/",
+    "test": "ts-node test/test.ts",
+    "build": "tsc && npm run copy-files"
+  },
+  "dependencies": {
+    "@types/node-schedule": "^2.1.0",
+    "lodash": "^4.17.21",
+    "mysql": "^2.18.1",
+    "mysql2": "^2.3.3",
+    "node-schedule": "^2.1.0",
+    "oak-common-aspect": "^2.1.9",
+    "oak-db": "^2.2.11",
+    "oak-domain": "^2.6.9",
+    "uuid": "^8.3.2"
+  },
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^17.0.40",
+    "@types/uuid": "^8.3.4",
+    "copyfiles": "^2.4.1",
+    "ts-node": "~10.9.1",
+    "tslib": "^2.4.0",
+    "typescript": "~4.7.4"
+  }
+}