oak-backend-base 1.0.8 → 2.0.1

package/lib/AppLoader.d.ts

@@ -1,14 +1,16 @@
 import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
-import { AppLoader as GeneralAppLoader, RowStore, Context, EntityDict } from "oak-domain/lib/types";
+import { AppLoader as GeneralAppLoader, EntityDict } from "oak-domain/lib/types";
+import { DbStore } from "./DbStore";
 import { MySQLConfiguration } from 'oak-db/lib/MySQL/types/Configuration';
-export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> extends GeneralAppLoader<ED, Cxt> {
+import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";
+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: RowStore<ED, Cxt>) => Promise<Cxt>, dbConfig: MySQLConfiguration);
+    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(): RowStore<ED, Cxt>;
+    getStore(): DbStore<ED, Cxt>;
 }

package/lib/DbStore.d.ts

@@ -1,14 +1,16 @@
 import { MysqlStore, MySqlSelectOption, MysqlOperateOption } from 'oak-db';
-import { EntityDict, Context, StorageSchema, SelectionResult, Trigger, Checker, SelectRowShape, RowStore } from 'oak-domain/lib/types';
+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';
-export declare class DbStore<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> extends MysqlStore<ED, Cxt> {
+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: RowStore<ED, Cxt>) => Promise<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']>[]>;
+    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>>;
+    protected cascadeSelectAsync<T extends keyof ED>(entity: T, selection: ED[T]["Selection"], context: AsyncContext<ED>, option: MySqlSelectOption): Promise<Partial<ED[T]['Schema']>[]>;
     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"]>>;
+    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

@@ -9,24 +9,24 @@ class DbStore extends oak_db_1.MysqlStore {
         super(storageSchema, mysqlConfiguration);
         this.executor = new TriggerExecutor_1.TriggerExecutor((scene) => contextBuilder(scene)(this));
     }
-    async cascadeUpdate(entity, operation, context, option) {
+    async cascadeUpdateAsync(entity, operation, context, option) {
         if (!option.blockTrigger) {
             await this.executor.preOperation(entity, operation, context, option);
         }
-        const result = super.cascadeUpdate(entity, operation, context, option);
+        const result = super.cascadeUpdateAsync(entity, operation, context, option);
         if (!option.blockTrigger) {
             await this.executor.postOperation(entity, operation, context, option);
         }
         return result;
     }
-    async cascadeSelect(entity, selection, context, option) {
+    async cascadeSelectAsync(entity, selection, context, option) {
         const selection2 = Object.assign({
             action: 'select',
         }, selection);
         if (!option.blockTrigger) {
             await this.executor.preOperation(entity, selection2, context, option);
         }
-        const result = await super.cascadeSelect(entity, selection2, context, option);
+        const result = await super.cascadeSelectAsync(entity, selection2, context, option);
         if (!option.blockTrigger) {
             await this.executor.postOperation(entity, selection2, context, option, result);
         }
@@ -68,6 +68,34 @@ class DbStore extends oak_db_1.MysqlStore {
         }
         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);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oak-backend-base",
-  "version": "1.0.8",
+  "version": "2.0.1",
   "description": "oak-backend-base",
   "main": "lib/index",
   "author": {
@@ -19,8 +19,8 @@
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
     "oak-common-aspect": "1.0.5",
-    "oak-db": "^1.0.4",
-    "oak-domain": "^1.1.11",
+    "oak-db": "^2.0.2",
+    "oak-domain": "^2.0.1",
     "uuid": "^8.3.2"
   },
   "license": "ISC",