oak-db 1.0.7 → 2.0.3

package/lib/MySQL/store.d.ts

@@ -1,20 +1,24 @@
-import { EntityDict, Context, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, SelectionResult, TxnOption, SelectRowShape, StorageSchema, DeduceCreateMultipleOperation, SelectOption } from 'oak-domain/lib/types';
+import { EntityDict, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, TxnOption, 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 & BaseEntityDict, Cxt extends Context<ED>> extends CascadeStore<ED, Cxt> {
+import { AsyncContext, AsyncRowStore } from 'oak-domain/lib/store/AsyncRowStore';
+import { SyncContext } from 'oak-domain/lib/store/SyncRowStore';
+export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends CascadeStore<ED> implements AsyncRowStore<ED, Cxt> {
+    protected selectAbjointRow<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], context: SyncContext<ED>, option: OP): Partial<ED[T]['Schema']>[];
+    protected updateAbjointRow<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], context: SyncContext<ED>, option: OP): number;
     connector: MySqlConnector;
     translator: MySqlTranslator<ED>;
     constructor(storageSchema: StorageSchema<ED>, configuration: MySQLConfiguration);
     protected supportManyToOneJoin(): boolean;
     protected supportMultipleCreate(): boolean;
     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>;
+    protected selectAbjointRowAsync<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: AsyncContext<ED>, option?: MySqlSelectOption): Promise<Partial<ED[T]['Schema']>[]>;
+    protected updateAbjointRowAsync<T extends keyof ED>(entity: T, operation: DeduceCreateMultipleOperation<ED[T]['Schema']> | DeduceCreateSingleOperation<ED[T]['Schema']> | DeduceUpdateOperation<ED[T]['Schema']> | DeduceRemoveOperation<ED[T]['Schema']>, context: AsyncContext<ED>, option?: MysqlOperateOption): 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']>>;
+    select<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: SelectOption): 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>;
     begin(option?: TxnOption): Promise<string>;
     commit(txnId: string): Promise<void>;

package/lib/MySQL/store.js

@@ -28,6 +28,12 @@ var MysqlStore = /** @class */ (function (_super) {
         _this.translator = new translator_1.MySqlTranslator(storageSchema);
         return _this;
     }
+    MysqlStore.prototype.selectAbjointRow = function (entity, selection, context, option) {
+        throw new Error('MySQL store不支持同步取数据，不应该跑到这儿');
+    };
+    MysqlStore.prototype.updateAbjointRow = function (entity, operation, context, option) {
+        throw new Error('MySQL store不支持同步更新数据，不应该跑到这儿');
+    };
     MysqlStore.prototype.supportManyToOneJoin = function () {
         return true;
     };
@@ -44,24 +50,16 @@ var MysqlStore = /** @class */ (function (_super) {
                 if (i !== -1) {
                     var attrHead = attr.slice(0, i);
                     var attrTail = attr.slice(i + 1);
+                    if (!r[attrHead]) {
+                        r[attrHead] = {};
+                    }
                     var rel = (0, relation_1.judgeRelation)(schema, entity2, attrHead);
-                    (0, assert_1.default)(rel === 2 || typeof rel === 'string');
                     if (rel === 2) {
-                        if (r.entity === attrHead) {
-                            if (!r[attrHead]) {
-                                r[attrHead] = {};
-                            }
-                            resolveAttribute(attrHead, r[attrHead], attrTail, value);
-                        }
+                        resolveAttribute(attrHead, r[attrHead], attrTail, value);
                     }
                     else {
                         (0, assert_1.default)(typeof rel === 'string');
-                        if (typeof r["".concat(attrHead, "Id")] === 'string') {
-                            if (!r[attrHead]) {
-                                r[attrHead] = {};
-                            }
-                            resolveAttribute(rel, r[attrHead], attrTail, value);
-                        }
+                        resolveAttribute(rel, r[attrHead], attrTail, value);
                     }
                 }
                 else if (attributes[attr]) {
@@ -134,23 +132,32 @@ var MysqlStore = /** @class */ (function (_super) {
                     _a));
             }
         }
-        function formalizeNullObject(r, e) {
-            var a2 = schema[e].attributes;
-            var allowFormalize = true;
+        function removeNullObjects(r, e) {
+            (0, assert_1.default)(r.id && typeof r.id === 'string', "\u5BF9\u8C61".concat(e, "\u53D6\u6570\u636E\u65F6\u53D1\u73B0id\u4E3A\u975E\u6CD5\u503C").concat(r.id, ",rowId\u662F").concat(r.id));
             for (var attr in r) {
-                if (typeof r[attr] === 'object' && a2[attr] && a2[attr].type === 'ref') {
-                    if (formalizeNullObject(r[attr], a2[attr].ref)) {
-                        r[attr] = null;
-                    }
-                    else {
-                        allowFormalize = false;
+                var rel = (0, relation_1.judgeRelation)(schema, e, attr);
+                if (rel === 2) {
+                    // 边界，如果是toModi的对象，这里的外键确实有可能为空
+                    (0, assert_1.default)(schema[e].toModi || r.entityId === r[attr].id, "\u5BF9\u8C61".concat(e, "\u53D6\u6570\u636E\u65F6\uFF0C\u53D1\u73B0entityId\u4E0E\u8FDE\u63A5\u7684\u5BF9\u8C61\u7684\u4E3B\u952E\u4E0D\u4E00\u81F4\uFF0CrowId\u662F").concat(r.id, "\uFF0C\u5176entityId\u503C\u4E3A").concat(r.entityId, "\uFF0C\u8FDE\u63A5\u7684\u5BF9\u8C61\u7684\u4E3B\u952E\u4E3A").concat(r[attr].id));
+                    if (r[attr].id === null) {
+                        (0, assert_1.default)(schema[e].toModi);
+                        delete r[attr];
+                        continue;
                     }
+                    (0, assert_1.default)(r.entity === attr, "\u5BF9\u8C61".concat(e, "\u53D6\u6570\u636E\u65F6\uFF0C\u53D1\u73B0entity\u503C\u4E0E\u8FDE\u63A5\u7684\u5916\u952E\u5BF9\u8C61\u4E0D\u4E00\u81F4\uFF0CrowId\u662F").concat(r.id, "\uFF0C\u5176entity\u503C\u4E3A").concat(r.entity, "\uFF0C\u8FDE\u63A5\u7684\u5BF9\u8C61\u4E3A").concat(attr));
+                    removeNullObjects(r[attr], attr);
                 }
-                else if (r[attr] !== null) {
-                    allowFormalize = false;
+                else if (typeof rel === 'string') {
+                    // 边界，如果是toModi的对象，这里的外键确实有可能为空
+                    (0, assert_1.default)(schema[e].toModi || r["".concat(attr, "Id")] === r[attr].id, "\u5BF9\u8C61".concat(e, "\u53D6\u6570\u636E\u65F6\uFF0C\u53D1\u73B0\u5176\u5916\u952E\u4E0E\u8FDE\u63A5\u7684\u5BF9\u8C61\u7684\u4E3B\u952E\u4E0D\u4E00\u81F4\uFF0CrowId\u662F").concat(r.id, "\uFF0C\u5176").concat(attr, "Id\u503C\u4E3A").concat(r["".concat(attr, "Id")], "\uFF0C\u8FDE\u63A5\u7684\u5BF9\u8C61\u7684\u4E3B\u952E\u4E3A").concat(r[attr].id));
+                    if (r[attr].id === null) {
+                        (0, assert_1.default)(schema[e].toModi);
+                        delete r[attr];
+                        continue;
+                    }
+                    removeNullObjects(r[attr], rel);
                 }
             }
-            return allowFormalize;
         }
         function formSingleRow(r) {
             var result2 = {};
@@ -158,7 +165,7 @@ var MysqlStore = /** @class */ (function (_super) {
                 var value = r[attr];
                 resolveAttribute(entity, result2, attr, value);
             }
-            formalizeNullObject(result2, entity);
+            removeNullObjects(result2, entity);
             return result2;
         }
         if (result instanceof Array) {
@@ -166,7 +173,7 @@ var MysqlStore = /** @class */ (function (_super) {
         }
         return formSingleRow(result);
     };
-    MysqlStore.prototype.selectAbjointRow = function (entity, selection, context, option) {
+    MysqlStore.prototype.selectAbjointRowAsync = function (entity, selection, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var sql, result;
             return tslib_1.__generator(this, function (_a) {
@@ -181,7 +188,7 @@ var MysqlStore = /** @class */ (function (_super) {
             });
         });
     };
-    MysqlStore.prototype.updateAbjointRow = function (entity, operation, context, option) {
+    MysqlStore.prototype.updateAbjointRowAsync = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, translator, connector, action, txn, _b, data, sql, sql, sql;
             return tslib_1.__generator(this, function (_c) {
@@ -252,7 +259,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, option)];
+                        return [4 /*yield*/, this.cascadeUpdateAsync(entity, operation, context, option)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -263,12 +270,10 @@ var MysqlStore = /** @class */ (function (_super) {
             var result;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.cascadeSelect(entity, selection, context, option)];
+                    case 0: return [4 /*yield*/, this.cascadeSelectAsync(entity, selection, context, option)];
                     case 1:
                         result = _a.sent();
-                        return [2 /*return*/, {
-                                result: result,
-                            }];
+                        return [2 /*return*/, result];
                 }
             });
         });

package/lib/MySQL/translator.js

@@ -124,7 +124,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
         }
     };
     MySqlTranslator.prototype.populateDataTypeDef = function (type, params) {
-        if (['date', 'datetime', 'time'].includes(type)) {
+        if (['date', 'datetime', 'time', 'sequence'].includes(type)) {
             return 'bigint ';
         }
         if (['object', 'array'].includes(type)) {
@@ -250,6 +250,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
         var schema = this.schema;
         var entityDef = schema[entity];
         var storageName = entityDef.storageName, attributes = entityDef.attributes, indexes = entityDef.indexes, view = entityDef.view;
+        var hasSequence = false;
         // todo view暂还不支持
         var entityType = view ? 'view' : 'table';
         var sql = "create ".concat(entityType, " ");
@@ -267,7 +268,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
             // 翻译所有的属性
             Object.keys(attributes).forEach(function (attr, idx) {
                 var attrDef = attributes[attr];
-                var type = attrDef.type, params = attrDef.params, defaultValue = attrDef.default, unique = attrDef.unique, notNull = attrDef.notNull;
+                var type = attrDef.type, params = attrDef.params, defaultValue = attrDef.default, unique = attrDef.unique, notNull = attrDef.notNull, sequenceStart = attrDef.sequenceStart;
                 sql += "`".concat(attr, "` ");
                 sql += _this.populateDataTypeDef(type, params);
                 if (notNull || type === 'geometry') {
@@ -276,6 +277,13 @@ var MySqlTranslator = /** @class */ (function (_super) {
                 if (unique) {
                     sql += ' unique ';
                 }
+                if (sequenceStart) {
+                    if (hasSequence) {
+                        throw new Error("\u300C".concat(entity, "\u300D\u53EA\u80FD\u6709\u4E00\u4E2Asequence\u5217"));
+                    }
+                    hasSequence = sequenceStart;
+                    sql += ' auto_increment unique ';
+                }
                 if (defaultValue !== undefined) {
                     (0, assert_1.default)(type !== 'ref');
                     sql += " default ".concat(_this.translateAttrValue(type, defaultValue));
@@ -338,6 +346,9 @@ var MySqlTranslator = /** @class */ (function (_super) {
             }
         }
         sql += ')';
+        if (typeof hasSequence === 'number') {
+            sql += "auto_increment = ".concat(hasSequence);
+        }
         if (!replace) {
             return [sql];
         }

package/lib/sqlTranslator.js

@@ -24,6 +24,10 @@ var SqlTranslator = /** @class */ (function () {
                         length: 36,
                     },
                 },
+                $$seq$$: {
+                    type: 'sequence',
+                    sequenceStart: 10000,
+                },
                 $$createAt$$: {
                     type: 'datetime',
                     notNull: true,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "1.0.7",
+	"version": "2.0.3",
 	"description": "oak-db",
 	"main": "lib/index",
 	"author": {
@@ -18,7 +18,7 @@
 		"lodash": "^4.17.21",
 		"mysql": "^2.18.1",
 		"mysql2": "^2.3.3",
-		"oak-domain": "^1.1.13",
+		"oak-domain": "^2.0.2",
 		"uuid": "^8.3.2"
 	},
 	"license": "ISC",
@@ -29,7 +29,7 @@
 		"@types/node": "^17.0.42",
 		"@types/uuid": "^8.3.4",
 		"mocha": "^10.0.0",
-		"oak-general-business": "file:../oak-general-business",
+		"oak-general-business": "^2.0.2",
 		"ts-node": "~10.9.1",
 		"tslib": "^2.4.0",
 		"typescript": "~4.7.4"