oak-backend-base 1.0.1 → 1.0.2

package/lib/AppLoader.d.ts

@@ -1,6 +1,7 @@
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
 import { AppLoader as GeneralAppLoader, RowStore, Context, EntityDict } from "oak-domain/lib/types";
 import { MySQLConfiguration } from 'oak-db/lib/MySQL/types/Configuration';
-export declare class AppLoader<ED extends EntityDict, Cxt extends Context<ED>> extends GeneralAppLoader<ED, Cxt> {
+export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> extends GeneralAppLoader<ED, Cxt> {
     private dbStore;
     private aspectDict;
     private contextBuilder;

package/lib/AppLoader.js

@@ -58,7 +58,10 @@ class AppLoader extends types_1.AppLoader {
             await this.dbStore.operate(entity, {
                 data: rows,
                 action: 'create',
-            }, context);
+            }, context, {
+                dontCollect: true,
+                dontCreateOper: true,
+            });
             console.log(`data in ${entity} initialized!`);
         }
         await context.commit();

package/lib/BackendContext.d.ts

@@ -1,6 +1,7 @@
 import { RowStore } from 'oak-domain/lib/types';
 import { GeneralRuntimeContext } from 'oak-general-business';
 import { EntityDict } from 'oak-general-business/lib/general-app-domain';
-export declare class Context<ED extends EntityDict> extends GeneralRuntimeContext<ED> {
-    static FromCxtStr(cxtStr?: string): <ED extends EntityDict>(store: RowStore<ED, Context<ED>>) => Context<ED>;
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
+export declare class Context<ED extends EntityDict & BaseEntityDict> extends GeneralRuntimeContext<ED> {
+    static FromCxtStr(cxtStr?: string): <ED extends EntityDict & BaseEntityDict>(store: RowStore<ED, Context<ED>>) => Context<ED>;
 }

package/lib/DbStore.d.ts

@@ -1,13 +1,14 @@
 import { MysqlStore, MySqlSelectOption, MysqlOperateOption } from 'oak-db';
 import { EntityDict, Context, StorageSchema, SelectionResult, Trigger, Checker, SelectRowShape, RowStore } 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';
-export declare class DbStore<ED extends EntityDict, Cxt extends Context<ED>> extends MysqlStore<ED, Cxt> {
+export declare class DbStore<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> extends MysqlStore<ED, Cxt> {
     private executor;
     constructor(storageSchema: StorageSchema<ED>, contextBuilder: (scene?: string) => (store: RowStore<ED, Cxt>) => Cxt, mysqlConfiguration: MySQLConfiguration);
-    protected cascadeUpdate<T extends keyof ED>(entity: T, operation: ED[T]['Create'] | ED[T]['Update'] | ED[T]['Remove'], context: Cxt, option?: MysqlOperateOption): Promise<import("oak-domain/lib/types").OperationResult<ED>>;
-    protected cascadeSelect<T extends keyof ED, S extends ED[T]["Selection"]>(entity: T, selection: S, context: Cxt, option?: MySqlSelectOption): Promise<SelectRowShape<ED[T]['Schema'], S['data']>[]>;
-    operate<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: Cxt, params?: MysqlOperateOption): Promise<import("oak-domain/lib/types").OperationResult<ED>>;
-    select<T extends keyof ED, S extends ED[T]['Selection']>(entity: T, selection: S, context: Cxt, params?: MySqlSelectOption): Promise<SelectionResult<ED[T]["Schema"], S["data"]>>;
+    protected cascadeUpdate<T extends keyof ED>(entity: T, operation: ED[T]['Create'] | ED[T]['Update'] | ED[T]['Remove'], context: Cxt, option: MysqlOperateOption): Promise<import("oak-domain/lib/types").OperationResult<ED>>;
+    protected cascadeSelect<T extends keyof ED, S extends ED[T]["Selection"]>(entity: T, selection: S, context: Cxt, option: MySqlSelectOption): Promise<SelectRowShape<ED[T]['Schema'], S['data']>[]>;
+    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, S extends ED[T]['Selection']>(entity: T, selection: S, context: Cxt, option: MySqlSelectOption): Promise<SelectionResult<ED[T]["Schema"], S["data"]>>;
     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

@@ -10,32 +10,36 @@ class DbStore extends oak_db_1.MysqlStore {
         this.executor = new TriggerExecutor_1.TriggerExecutor(async (scene) => contextBuilder(scene)(this));
     }
     async cascadeUpdate(entity, operation, context, option) {
-        await this.executor.preOperation(entity, operation, context, option);
+        if (!option.blockTrigger) {
+            await this.executor.preOperation(entity, operation, context, option);
+        }
         const result = super.cascadeUpdate(entity, operation, context, option);
-        await this.executor.postOperation(entity, operation, context, option);
+        if (!option.blockTrigger) {
+            await this.executor.postOperation(entity, operation, context, option);
+        }
         return result;
     }
     async cascadeSelect(entity, selection, context, option) {
         const selection2 = Object.assign({
             action: 'select',
         }, selection);
-        if (!option?.ignoreTrigger) {
+        if (!option.blockTrigger) {
             await this.executor.preOperation(entity, selection2, context, option);
         }
         const result = await super.cascadeSelect(entity, selection2, context, option);
-        if (!option?.ignoreTrigger) {
+        if (!option.blockTrigger) {
             await this.executor.postOperation(entity, selection2, context, option, result);
         }
         return result;
     }
-    async operate(entity, operation, context, params) {
+    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, params);
+            result = await super.operate(entity, operation, context, option);
         }
         catch (err) {
             await context.rollback();
@@ -46,14 +50,14 @@ class DbStore extends oak_db_1.MysqlStore {
         }
         return result;
     }
-    async select(entity, selection, context, params) {
+    async select(entity, selection, context, option) {
         const autoCommit = !context.getCurrentTxnId();
         if (autoCommit) {
             await context.begin();
         }
         let result;
         try {
-            result = await super.select(entity, selection, context, params);
+            result = await super.select(entity, selection, context, option);
         }
         catch (err) {
             await context.rollback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oak-backend-base",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "oak-backend-base",
   "main": "lib/index.js",
   "author": {
@@ -20,10 +20,10 @@
     "lodash": "^4.17.21",
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
-    "oak-db": "^1.0.1",
-    "oak-domain": "^1.0.4",
-    "oak-general-business": "^1.0.1",
-    "oak-common-aspect": "^1.0.1",
+    "oak-db": "^1.0.2",
+    "oak-domain": "^1.1.0",
+    "oak-general-business": "^1.0.5",
+    "oak-common-aspect": "^1.0.3",
     "uuid": "^8.3.2"
   },
   "license": "ISC",