oak-backend-base 4.1.20 → 4.1.21

package/lib/AppLoader.js

@@ -17,6 +17,7 @@ const DataSubscriber_1 = tslib_1.__importDefault(require("./cluster/DataSubscrib
 const env_1 = require("./cluster/env");
 const Synchronizer_1 = tslib_1.__importDefault(require("./Synchronizer"));
 const i18n_1 = tslib_1.__importDefault(require("oak-domain/lib/data/i18n"));
+const requirePrj_1 = tslib_1.__importDefault(require("./utils/requirePrj"));
 class AppLoader extends types_1.AppLoader {
     dbStore;
     aspectDict;
@@ -28,21 +29,7 @@ class AppLoader extends types_1.AppLoader {
     watcherTimerId;
     scheduledJobs = {};
     requireSth(filePath) {
-        const depFilePath = (0, path_1.join)(this.path, filePath);
-        let sth;
-        if ((0, fs_1.existsSync)(`${depFilePath}.js`)) {
-            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) {
-            sthExternal.push(sth);
-        }
-        return (0, lodash_1.mergeConcatMany)(sthExternal);
+        return (0, requirePrj_1.default)(this.path, filePath, this.externalDependencies);
     }
     async makeContext(cxtStr, headers) {
         const context = this.contextBuilder(this.dbStore);
@@ -506,7 +493,15 @@ class AppLoader extends types_1.AppLoader {
     }
     async execRoutine(routine) {
         const context = await this.makeContext();
-        await routine(context);
+        try {
+            const result = await routine(context);
+            await context.commit();
+            return result;
+        }
+        catch (e) {
+            await context.rollback();
+            throw e;
+        }
     }
 }
 exports.AppLoader = AppLoader;

package/lib/DbStore.d.ts

@@ -8,6 +8,7 @@ export declare class DbStore<ED extends EntityDict & BaseEntityDict, Cxt extends
     private executor;
     private relationAuth;
     constructor(storageSchema: StorageSchema<ED>, contextBuilder: () => Cxt, mysqlConfiguration: MySQLConfiguration, authDeduceRelationMap: AuthDeduceRelationMap<ED>, selectFreeEntities?: SelectFreeEntities<ED>, updateFreeDict?: UpdateFreeDict<ED>, onVolatileTrigger?: <T extends keyof ED>(entity: T, trigger: VolatileTrigger<ED, T, Cxt>, ids: string[], cxtStr: string, option: OperateOption) => Promise<void>);
+    checkRelationAsync<T extends keyof ED, Cxt extends AsyncContext<ED>>(entity: T, operation: Omit<ED[T]["Operation"] | ED[T]["Selection"], "id">, context: Cxt): Promise<void>;
     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

@@ -12,6 +12,9 @@ class DbStore extends oak_db_1.MysqlStore {
         this.executor = new TriggerExecutor_1.TriggerExecutor(contextBuilder, undefined, onVolatileTrigger);
         this.relationAuth = new RelationAuth_1.RelationAuth(storageSchema, authDeduceRelationMap, selectFreeEntities, updateFreeDict);
     }
+    checkRelationAsync(entity, operation, context) {
+        return this.relationAuth.checkRelationAsync(entity, operation, context);
+    }
     async cascadeUpdateAsync(entity, operation, context, option) {
         // 如果是在modi处理过程中，所有的trigger也可以延时到apply时再处理（这时候因为modi中的数据并不实际存在，处理会有问题）
         if (!option.blockTrigger) {

package/lib/routines/i18n.d.ts

@@ -0,0 +1,15 @@
+import { EntityDict } from 'oak-domain/lib/types';
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
+import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
+/**
+ * 检查项目目录下的i18n数据和数据库中的差异
+ * @param context
+ * @returns
+ */
+export declare function checkI18n<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>>(context: Cxt): Promise<(void | Awaited<import("oak-domain/lib/types").OperationResult<ED>>)[]>;
+/**
+ * 检查项目目录下的i18n数据和数据库中的差异，并更新
+ * @param context
+ * @returns
+ */
+export declare function checkAndUpdateI18n<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>>(context: Cxt): Promise<(void | Awaited<import("oak-domain/lib/types").OperationResult<ED>>)[]>;

package/lib/routines/i18n.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkAndUpdateI18n = exports.checkI18n = void 0;
+const tslib_1 = require("tslib");
+const node_path_1 = require("node:path");
+const requirePrj_1 = tslib_1.__importDefault(require("../utils/requirePrj"));
+const dependencyBuilder_1 = require("oak-domain/lib/compiler/dependencyBuilder");
+const node_assert_1 = tslib_1.__importDefault(require("node:assert"));
+const lodash_1 = require("lodash");
+const uuid_1 = require("oak-domain/lib/utils/uuid");
+async function checkAndUpdateI18nInner(context, onlyCheck) {
+    const pwd = process.cwd();
+    const i18nData = (0, requirePrj_1.default)(pwd, (0, node_path_1.join)('lib', 'data', 'i18n'), (0, dependencyBuilder_1.analyzeDepedency)(pwd).ascOrder);
+    const originI18nData = await context.select('i18n', {
+        data: {
+            id: 1,
+            namespace: 1,
+            language: 1,
+            module: 1,
+            position: 1,
+            data: 1,
+        },
+    }, { dontCollect: true });
+    const originDataDict = {};
+    originI18nData.forEach((data) => originDataDict[data.id] = data);
+    const result = i18nData.map(async (i18n) => {
+        const { id, namespace, language, module, position, data } = i18n;
+        const origin = originDataDict[id];
+        if (origin) {
+            (0, node_assert_1.default)(namespace === origin.namespace && language === origin.language && module === origin.module && position === origin.position);
+            if (!(0, lodash_1.isEqual)(data, origin.data)) {
+                console.log(`[${namespace}]数据${onlyCheck ? '需要更新' : '将被更新'}`);
+                if (!onlyCheck) {
+                    return context.operate('i18n', {
+                        id: await (0, uuid_1.generateNewIdAsync)(),
+                        action: 'update',
+                        data: {
+                            data,
+                        },
+                        filter: {
+                            id,
+                        },
+                    }, {});
+                }
+            }
+        }
+        else {
+            console.log(`[${namespace}]数据${onlyCheck ? '需要新建' : '将被新建'}`);
+            if (!onlyCheck) {
+                return context.operate('i18n', {
+                    id: await (0, uuid_1.generateNewIdAsync)(),
+                    action: 'create',
+                    data: i18n,
+                }, {});
+            }
+        }
+        return Promise.resolve();
+    });
+    return await Promise.all(result);
+}
+/**
+ * 检查项目目录下的i18n数据和数据库中的差异
+ * @param context
+ * @returns
+ */
+function checkI18n(context) {
+    return checkAndUpdateI18nInner(context, true);
+}
+exports.checkI18n = checkI18n;
+/**
+ * 检查项目目录下的i18n数据和数据库中的差异，并更新
+ * @param context
+ * @returns
+ */
+function checkAndUpdateI18n(context) {
+    return checkAndUpdateI18nInner(context);
+}
+exports.checkAndUpdateI18n = checkAndUpdateI18n;

package/lib/utils/requirePrj.d.ts

@@ -0,0 +1 @@
+export default function requireSth(prjPath: string, filePath: string, dependencies: string[]): any;

package/lib/utils/requirePrj.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const lodash_1 = require("oak-domain/lib/utils/lodash");
+const path_1 = require("path");
+function requireSth(prjPath, filePath, dependencies) {
+    const depFilePath = (0, path_1.join)(prjPath, filePath);
+    let sth;
+    if ((0, fs_1.existsSync)(`${depFilePath}.js`)) {
+        sth = require((0, path_1.join)(prjPath, filePath)).default;
+    }
+    const sthExternal = dependencies.map(ele => {
+        const depFilePath = (0, path_1.join)(prjPath, 'node_modules', ele, filePath);
+        if ((0, fs_1.existsSync)(`${depFilePath}.js`)) {
+            return require(depFilePath).default;
+        }
+    }).filter(ele => !!ele);
+    if (sth) {
+        sthExternal.push(sth);
+    }
+    return (0, lodash_1.mergeConcatMany)(sthExternal);
+}
+exports.default = requireSth;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.20",
+    "version": "4.1.21",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -23,8 +23,8 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.5",
         "oak-db": "^3.3.8",
-        "oak-domain": "^5.1.26",
-        "oak-frontend-base": "^5.3.33",
+        "oak-domain": "^5.1.27",
+        "oak-frontend-base": "^5.3.34",
         "socket.io": "^4.8.1",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"