oak-backend-base 4.0.4 → 4.1.1

package/lib/AppLoader.d.ts

@@ -31,7 +31,7 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
         result: any;
         message?: string;
     }>;
-    initialize(truncate?: boolean): Promise<void>;
+    initialize(): Promise<void>;
     getStore(): DbStore<ED, Cxt>;
     getEndpoints(prefix: string): [string, "post" | "get" | "put" | "delete", string, (params: Record<string, string>, headers: IncomingHttpHeaders, req: IncomingMessage, body?: any) => Promise<any>][];
     protected operateInWatcher<T extends keyof ED>(entity: T, operation: ED[T]['Update'], context: Cxt): Promise<OperationResult<ED>>;

package/lib/AppLoader.js

@@ -11,7 +11,6 @@ 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"));
 const dependencyBuilder_1 = require("oak-domain/lib/compiler/dependencyBuilder");
 const DataSubscriber_1 = tslib_1.__importDefault(require("./cluster/DataSubscriber"));
 const env_1 = require("./cluster/env");
@@ -94,7 +93,9 @@ class AppLoader extends types_1.AppLoader {
                     Object.keys(eventOperationMap).forEach((event) => {
                         const ids = eventOperationMap[event];
                         const opRecordsToPublish = opRecords.filter((ele) => !!ele.id && ids.includes(ele.id));
-                        (0, assert_1.default)(opRecordsToPublish.length === ids.length, '要推送的事件的operation数量不足，请检查确保');
+                        if (opRecordsToPublish.length !== ids.length && process.env.NODE_ENV === 'development') {
+                            console.warn('要推送的事件的operation数量不足event事件中记录的数据，请检查是否有空operation被加入了推送事件');
+                        }
                         loaderThis.dataSubscriber.publishEvent(event, opRecordsToPublish, this.getSubscriberId());
                     });
                 }
@@ -110,7 +111,8 @@ class AppLoader extends types_1.AppLoader {
         const triggers = this.requireSth('lib/triggers/index');
         const checkers = this.requireSth('lib/checkers/index');
         const { actionDefDict } = require(`${this.path}/lib/oak-app-domain/ActionDefDict`);
-        const { triggers: adTriggers, checkers: adCheckers } = (0, IntrinsicLogics_1.makeIntrinsicLogics)(this.dbStore.getSchema(), actionDefDict);
+        const attrUpdateMatrix = this.requireSth('lib/configuration/attrUpdateMatrix');
+        const { triggers: adTriggers, checkers: adCheckers } = (0, IntrinsicLogics_1.makeIntrinsicLogics)(this.dbStore.getSchema(), actionDefDict, attrUpdateMatrix);
         triggers.forEach((trigger) => this.registerTrigger(trigger));
         adTriggers.forEach((trigger) => this.registerTrigger(trigger));
         checkers.forEach((checker) => this.dbStore.registerChecker(checker));
@@ -162,28 +164,49 @@ class AppLoader extends types_1.AppLoader {
             throw err;
         }
     }
-    async initialize(truncate) {
+    async initialize() {
         await this.dbStore.initialize({ ifExists: 'dropIfNotStatic' });
         const data = this.requireSth('lib/data/index');
         const context = this.contextBuilder(this.dbStore);
+        context.openRootMode();
         for (const entity in data) {
             let rows = data[entity];
-            if (entity === 'area') {
-                //  对area暂时处理一下
-                rows = require('./data/area.json');
-            }
-            if (rows.length > 0 && (!truncate || !this.dbStore.getSchema()[entity].static)) {
+            if (rows.length > 0) {
                 await context.begin();
-                context.openRootMode();
+                // 如果是static的对象，只要表中有数据就pass
+                const [first] = await this.dbStore.select(entity, {
+                    data: {
+                        id: 1,
+                    },
+                    indexFrom: 0,
+                    count: 1,
+                }, context, {});
+                if (this.dbStore.getSchema()[entity].static) {
+                    if (first) {
+                        await context.commit();
+                        console.log(`data in ${entity} omitted, ${rows.length} rows passed`);
+                        continue;
+                    }
+                }
+                // 再插入所有的行
                 try {
-                    await this.dbStore.operate(entity, {
-                        data: rows,
-                        action: 'create',
-                    }, context, {
-                        dontCollect: true,
-                        dontCreateOper: true,
-                        blockTrigger: true,
-                    });
+                    const insertRows = async (idx) => {
+                        const rows2 = rows.slice(idx, 1000);
+                        if (rows2.length > 0) {
+                            await this.dbStore.operate(entity, {
+                                data: rows,
+                                action: 'create',
+                            }, context, {
+                                dontCollect: true,
+                                dontCreateOper: true,
+                                blockTrigger: true,
+                            });
+                            if (rows2.length === 1000) {
+                                await insertRows(idx + 1000);
+                            }
+                        }
+                    };
+                    await insertRows(0);
                     await context.commit();
                     console.log(`data in ${entity} initialized, ${rows.length} rows inserted`);
                 }
@@ -268,7 +291,7 @@ class AppLoader extends types_1.AppLoader {
                 const data = typeof actionData === 'function' ? await (actionData)() : actionData;
                 result = await this.operateInWatcher(entity, {
                     id: await (0, uuid_1.generateNewIdAsync)(),
-                    action,
+                    action: action,
                     data,
                     filter: filter2
                 }, context);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.0.4",
+    "version": "4.1.1",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -22,8 +22,8 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "~3.0.0",
         "oak-db": "~3.3.0",
-        "oak-domain": "~5.0.6",
-        "oak-frontend-base": "~5.0.6",
+        "oak-domain": "~5.0.9",
+        "oak-frontend-base": "~5.1.2",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"