oak-db 1.0.1 → 1.0.2

package/lib/MySQL/store.d.ts

@@ -1,9 +1,10 @@
 import { EntityDict, Context, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, SelectionResult, TxnOption, SelectRowShape, StorageSchema, DeduceCreateMultipleOperation, SelectOption } from 'oak-domain/lib/types';
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
 import { CascadeStore } from 'oak-domain/lib/store/CascadeStore';
 import { MySQLConfiguration } from './types/Configuration';
 import { MySqlConnector } from './connector';
 import { MySqlTranslator, MySqlSelectOption, MysqlOperateOption } from './translator';
-export declare class MysqlStore<ED extends EntityDict, Cxt extends Context<ED>> extends CascadeStore<ED, Cxt> {
+export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> extends CascadeStore<ED, Cxt> {
     connector: MySqlConnector;
     translator: MySqlTranslator<ED>;
     constructor(storageSchema: StorageSchema<ED>, configuration: MySQLConfiguration);
@@ -12,9 +13,9 @@ export declare class MysqlStore<ED extends EntityDict, Cxt extends Context<ED>>
     private formResult;
     protected selectAbjointRow<T extends keyof ED, S extends ED[T]['Selection']>(entity: T, selection: S, context: Cxt, option?: MySqlSelectOption): Promise<SelectRowShape<ED[T]['Schema'], S['data']>[]>;
     protected updateAbjointRow<T extends keyof ED>(entity: T, operation: DeduceCreateMultipleOperation<ED[T]['Schema']> | DeduceCreateSingleOperation<ED[T]['Schema']> | DeduceUpdateOperation<ED[T]['Schema']> | DeduceRemoveOperation<ED[T]['Schema']>, context: Cxt, option?: MysqlOperateOption): Promise<number>;
-    operate<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: Cxt, params?: OperateOption): Promise<OperationResult<ED>>;
-    select<T extends keyof ED, S extends ED[T]['Selection']>(entity: T, selection: S, context: Cxt, option?: SelectOption): Promise<SelectionResult<ED[T]['Schema'], S['data']>>;
-    count<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option?: SelectOption): Promise<number>;
+    operate<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: OperateOption): Promise<OperationResult<ED>>;
+    select<T extends keyof ED, S extends ED[T]['Selection']>(entity: T, selection: S, context: Cxt, option: SelectOption): Promise<SelectionResult<ED[T]['Schema'], S['data']>>;
+    count<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: SelectOption): Promise<number>;
     begin(option?: TxnOption): Promise<string>;
     commit(txnId: string): Promise<void>;
     rollback(txnId: string): Promise<void>;

package/lib/MySQL/store.js

@@ -231,7 +231,7 @@ var MysqlStore = /** @class */ (function (_super) {
             });
         });
     };
-    MysqlStore.prototype.operate = function (entity, operation, context, params) {
+    MysqlStore.prototype.operate = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var action;
             return tslib_1.__generator(this, function (_a) {
@@ -239,7 +239,7 @@ var MysqlStore = /** @class */ (function (_super) {
                     case 0:
                         action = operation.action;
                         (0, assert_1.default)(!['select', 'download', 'stat'].includes(action), '现在不支持使用select operation');
-                        return [4 /*yield*/, this.cascadeUpdate(entity, operation, context, params)];
+                        return [4 /*yield*/, this.cascadeUpdate(entity, operation, context, option)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"description": "oak-db",
 	"main": "src/index.ts",
 	"author": {
@@ -19,7 +19,7 @@
 		"luxon": "^2.4.0",
 		"mysql": "^2.18.1",
 		"mysql2": "^2.3.3",
-		"oak-domain": "^1.0.4",
+		"oak-domain": "^1.1.0",
 		"uuid": "^8.3.2"
 	},
 	"license": "ISC",
@@ -30,7 +30,7 @@
 		"@types/node": "^17.0.42",
 		"@types/uuid": "^8.3.4",
 		"mocha": "^10.0.0",
-		"oak-general-business": "^1.0.2",
+		"oak-general-business": "^1.0.5",
 		"ts-node": "~10.9.1",
 		"tslib": "^2.4.0",
 		"typescript": "~4.7.4"