oak-db 2.1.1 → 2.2.0

package/lib/MySQL/store.d.ts

@@ -1,4 +1,4 @@
-import { EntityDict, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, TxnOption, StorageSchema, DeduceCreateMultipleOperation, SelectOption } from 'oak-domain/lib/types';
+import { EntityDict, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, TxnOption, StorageSchema, DeduceCreateMultipleOperation, SelectOption, AggregationResult } 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';
@@ -7,11 +7,14 @@ import { MySqlTranslator, MySqlSelectOption, MysqlOperateOption } from './transl
 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 aggregateSync<T extends keyof ED, OP extends SelectOption, Cxt extends SyncContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): AggregationResult<ED[T]['Schema']>;
     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 aggregateAsync<T extends keyof ED, OP extends SelectOption, Cxt extends AsyncContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): Promise<AggregationResult<ED[T]['Schema']>>;
+    aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): Promise<AggregationResult<ED[T]['Schema']>>;
     protected supportManyToOneJoin(): boolean;
     protected supportMultipleCreate(): boolean;
     private formResult;

package/lib/MySQL/store.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlStore = void 0;
 var tslib_1 = require("tslib");
+var selection_1 = require("oak-domain/lib/store/selection");
 var CascadeStore_1 = require("oak-domain/lib/store/CascadeStore");
 var connector_1 = require("./connector");
 var translator_1 = require("./translator");
@@ -28,12 +29,33 @@ var MysqlStore = /** @class */ (function (_super) {
         _this.translator = new translator_1.MySqlTranslator(storageSchema);
         return _this;
     }
+    MysqlStore.prototype.aggregateSync = function (entity, aggregation, context, option) {
+        throw new Error('MySQL store不支持同步取数据，不应该跑到这儿');
+    };
     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.aggregateAsync = function (entity, aggregation, context, option) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var sql, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        sql = this.translator.translateAggregate(entity, aggregation, option);
+                        return [4 /*yield*/, this.connector.exec(sql, context.getCurrentTxnId())];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, this.formResult(entity, result)];
+                }
+            });
+        });
+    };
+    MysqlStore.prototype.aggregate = function (entity, aggregation, context, option) {
+        return this.aggregateAsync(entity, aggregation, context, option);
+    };
     MysqlStore.prototype.supportManyToOneJoin = function () {
         return true;
     };
@@ -54,7 +76,10 @@ var MysqlStore = /** @class */ (function (_super) {
                         r[attrHead] = {};
                     }
                     var rel = (0, relation_1.judgeRelation)(schema, entity2, attrHead);
-                    if (rel === 2) {
+                    if (rel === 0) {
+                        resolveAttribute(entity2, r[attrHead], attrTail, value);
+                    }
+                    else if (rel === 2) {
                         resolveAttribute(attrHead, r[attrHead], attrTail, value);
                     }
                     else {
@@ -133,7 +158,7 @@ var MysqlStore = /** @class */ (function (_super) {
             }
         }
         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));
+            // assert(r.id && typeof r.id === 'string', `对象${<string>e}取数据时发现id为非法值${r.id},rowId是${r.id}`)
             for (var attr in r) {
                 var rel = (0, relation_1.judgeRelation)(schema, e, attr);
                 if (rel === 2) {
@@ -270,7 +295,9 @@ var MysqlStore = /** @class */ (function (_super) {
             var result;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.cascadeSelectAsync(entity, selection, context, option)];
+                    case 0:
+                        (0, selection_1.reinforceSelection)(this.storageSchema, entity, selection);
+                        return [4 /*yield*/, this.cascadeSelectAsync(entity, selection, context, option)];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result];

package/lib/MySQL/translator.d.ts

@@ -98,7 +98,7 @@ export declare class MySqlTranslator<ED extends EntityDict> extends SqlTranslato
     }): string[];
     private translateFnName;
     protected translateExpression<T extends keyof ED>(alias: string, expression: RefOrExpression<keyof ED[T]["OpSchema"]>, refDict: Record<string, string>): string;
-    protected populateSelectStmt<T extends keyof ED>(projectionText: string, fromText: string, selection: ED[T]['Selection'], aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: MySqlSelectOption): string;
+    protected populateSelectStmt<T extends keyof ED>(projectionText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, groupByText?: string, indexFrom?: number, count?: number, option?: MySqlSelectOption): string;
     protected populateUpdateStmt(updateText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: MysqlOperateOption): string;
     protected populateRemoveStmt(removeText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: MysqlOperateOption): string;
 }

package/lib/MySQL/translator.js

@@ -537,7 +537,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
         };
         return translateInner(expression);
     };
-    MySqlTranslator.prototype.populateSelectStmt = function (projectionText, fromText, selection, aliasDict, filterText, sorterText, indexFrom, count, option) {
+    MySqlTranslator.prototype.populateSelectStmt = function (projectionText, fromText, aliasDict, filterText, sorterText, groupByText, indexFrom, count, option) {
         // todo hint of use index
         var sql = "select ".concat(projectionText, " from ").concat(fromText);
         if (filterText) {
@@ -546,6 +546,9 @@ var MySqlTranslator = /** @class */ (function (_super) {
         if (sorterText) {
             sql += " order by ".concat(sorterText);
         }
+        if (groupByText) {
+            sql += " group by ".concat(groupByText);
+        }
         if (typeof indexFrom === 'number') {
             (0, assert_1.default)(typeof count === 'number');
             sql += " limit ".concat(indexFrom, ", ").concat(count);

package/lib/sqlTranslator.d.ts

@@ -15,7 +15,7 @@ export declare abstract class SqlTranslator<ED extends EntityDict> {
     abstract translateCreateEntity<T extends keyof ED>(entity: T, option: {
         replace?: boolean;
     }): string[];
-    protected abstract populateSelectStmt<T extends keyof ED, OP extends SqlSelectOption>(projectionText: string, fromText: string, selection: ED[T]['Selection'], aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: OP): string;
+    protected abstract populateSelectStmt<T extends keyof ED, OP extends SqlSelectOption>(projectionText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, groupByText?: string, indexFrom?: number, count?: number, option?: OP, selection?: ED[T]['Selection'], aggregation?: ED[T]['Aggregation']): string;
     protected abstract populateUpdateStmt<OP extends SqlOperateOption>(updateText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: OP): string;
     protected abstract populateRemoveStmt<OP extends SqlOperateOption>(removeText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: OP): string;
     protected abstract translateExpression<T extends keyof ED>(alias: string, expression: RefOrExpression<keyof ED[T]['OpSchema']>, refDict: Record<string, string>): string;
@@ -43,6 +43,7 @@ export declare abstract class SqlTranslator<ED extends EntityDict> {
     private translateProjection;
     private translateSelectInner;
     translateSelect<T extends keyof ED, OP extends SqlSelectOption>(entity: T, selection: ED[T]['Selection'], option?: OP): string;
+    translateAggregate<T extends keyof ED, OP extends SqlSelectOption>(entity: T, aggregation: ED[T]['Aggregation'], option?: OP): string;
     translateCount<T extends keyof ED, OP extends SqlSelectOption>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, option?: OP): string;
     translateRemove<T extends keyof ED, OP extends SqlOperateOption>(entity: T, operation: ED[T]['Remove'], option?: OP): string;
     translateUpdate<T extends keyof ED, OP extends SqlOperateOption>(entity: T, operation: ED[T]['Update'], option?: OP): string;

package/lib/sqlTranslator.js

@@ -163,7 +163,7 @@ var SqlTranslator = /** @class */ (function () {
      */
     SqlTranslator.prototype.analyzeJoin = function (entity, _a, initialNumber) {
         var _this = this;
-        var projection = _a.projection, filter = _a.filter, sorter = _a.sorter, isStat = _a.isStat;
+        var projection = _a.projection, filter = _a.filter, sorter = _a.sorter, aggregation = _a.aggregation;
         var schema = this.schema;
         var number = initialNumber || 1;
         var projectionRefAlias = {};
@@ -366,7 +366,7 @@ var SqlTranslator = /** @class */ (function () {
                 }
             });
             if (node['#id']) {
-                (0, assert_1.default)(!projectionRefAlias[node['#id']]);
+                (0, assert_1.default)(!projectionRefAlias[node['#id']], "projection\u4E0A\u6709\u91CD\u590D\u7684#id\u5B9A\u4E49\u300C".concat(node['#id'], "\u300D"));
                 (0, lodash_1.assign)(projectionRefAlias, (_b = {},
                     _b[node['#id']] = alias,
                     _b));
@@ -375,6 +375,16 @@ var SqlTranslator = /** @class */ (function () {
         if (projection) {
             analyzeProjectionNode({ node: projection, path: './', entityName: entity, alias: alias });
         }
+        else if (aggregation) {
+            for (var k in aggregation) {
+                analyzeProjectionNode({
+                    node: aggregation[k],
+                    path: './',
+                    entityName: entity,
+                    alias: alias,
+                });
+            }
+        }
         return {
             aliasDict: aliasDict,
             from: from,
@@ -625,9 +635,10 @@ var SqlTranslator = /** @class */ (function () {
         });
         return sortText;
     };
-    SqlTranslator.prototype.translateProjection = function (entity, projection, aliasDict, projectionRefAlias) {
+    SqlTranslator.prototype.translateProjection = function (entity, projection, aliasDict, projectionRefAlias, commonPrefix, disableAs) {
         var _this = this;
         var schema = this.schema;
+        var as = '';
         var translateInner = function (entity2, projection2, path) {
             var alias = aliasDict[path];
             var attributes = schema[entity2].attributes;
@@ -641,9 +652,21 @@ var SqlTranslator = /** @class */ (function () {
                 return [1, 2].includes(rel) || typeof rel === 'string';
             });
             attrs.forEach(function (attr, idx) {
+                var prefix2 = commonPrefix ? "".concat(commonPrefix, ".").concat(prefix) : prefix;
                 if (attr.toLowerCase().startsWith(types_1.EXPRESSION_PREFIX)) {
                     var exprText = _this.translateExpression(alias, projection2[attr], projectionRefAlias);
-                    projText += " ".concat(exprText, " as ").concat(prefix).concat(attr);
+                    if (disableAs) {
+                        projText += " ".concat(exprText);
+                    }
+                    else {
+                        projText += " ".concat(exprText, " as `").concat(prefix2).concat(attr, "`");
+                        if (!as) {
+                            as = "`".concat(prefix2).concat(attr, "`");
+                        }
+                        else {
+                            as += ", `".concat(prefix2).concat(attr, "`");
+                        }
+                    }
                 }
                 else {
                     var rel = (0, relation_1.judgeRelation)(_this.schema, entity2, attr);
@@ -656,11 +679,33 @@ var SqlTranslator = /** @class */ (function () {
                     else if (rel === 1) {
                         var type = attributes[attr].type;
                         if (projection2[attr] === 1) {
-                            projText += " ".concat(_this.translateAttrProjection(type, alias, attr), " as `").concat(prefix).concat(attr, "`");
+                            if (disableAs) {
+                                projText += " ".concat(_this.translateAttrProjection(type, alias, attr));
+                            }
+                            else {
+                                projText += " ".concat(_this.translateAttrProjection(type, alias, attr), " as `").concat(prefix2).concat(attr, "`");
+                                if (!as) {
+                                    as = "`".concat(prefix2).concat(attr, "`");
+                                }
+                                else {
+                                    as += ", `".concat(prefix2).concat(attr, "`");
+                                }
+                            }
                         }
                         else {
                             (0, assert_1.default)(typeof projection2 === 'string');
-                            projText += " ".concat(_this.translateAttrProjection(type, alias, attr), " as `").concat(prefix).concat(projection2[attr], "`");
+                            if (disableAs) {
+                                projText += " ".concat(_this.translateAttrProjection(type, alias, attr));
+                            }
+                            else {
+                                projText += " ".concat(_this.translateAttrProjection(type, alias, attr), " as `").concat(prefix2).concat(projection2[attr], "`");
+                                if (!as) {
+                                    as = "`".concat(prefix2).concat(projection2[attr], "`");
+                                }
+                                else {
+                                    as += "`".concat(prefix2).concat(projection2[attr], "`");
+                                }
+                            }
                         }
                     }
                 }
@@ -670,7 +715,10 @@ var SqlTranslator = /** @class */ (function () {
             });
             return projText;
         };
-        return translateInner(entity, projection, './');
+        return {
+            projText: translateInner(entity, projection, './'),
+            as: as,
+        };
     };
     SqlTranslator.prototype.translateSelectInner = function (entity, selection, initialNumber, refAlias, option) {
         var data = selection.data, filter = selection.filter, sorter = selection.sorter, indexFrom = selection.indexFrom, count = selection.count;
@@ -681,11 +729,11 @@ var SqlTranslator = /** @class */ (function () {
         }, initialNumber), fromText = _a.from, aliasDict = _a.aliasDict, projectionRefAlias = _a.projectionRefAlias, extraWhere = _a.extraWhere, filterRefAlias = _a.filterRefAlias, currentNumber = _a.currentNumber;
         (0, assert_1.default)((0, lodash_1.intersection)((0, lodash_1.keys)(refAlias), (0, lodash_1.keys)(filterRefAlias)).length === 0, 'filter中的#node结点定义有重复');
         (0, lodash_1.assign)(refAlias, filterRefAlias);
-        var projText = this.translateProjection(entity, data, aliasDict, projectionRefAlias);
+        var projText = this.translateProjection(entity, data, aliasDict, projectionRefAlias).projText;
         var _b = this.translateFilter(entity, selection, aliasDict, refAlias, currentNumber, extraWhere, option), filterText = _b.stmt, currentNumber2 = _b.currentNumber;
         var sorterText = sorter && this.translateSorter(entity, sorter, aliasDict);
         return {
-            stmt: this.populateSelectStmt(projText, fromText, selection, aliasDict, filterText, sorterText, indexFrom, count, option),
+            stmt: this.populateSelectStmt(projText, fromText, aliasDict, filterText, sorterText, undefined, indexFrom, count, option, selection),
             currentNumber: currentNumber2,
         };
     };
@@ -693,6 +741,57 @@ var SqlTranslator = /** @class */ (function () {
         var stmt = this.translateSelectInner(entity, selection, 1, {}, option).stmt;
         return stmt;
     };
+    SqlTranslator.prototype.translateAggregate = function (entity, aggregation, option) {
+        var data = aggregation.data, filter = aggregation.filter, sorter = aggregation.sorter, indexFrom = aggregation.indexFrom, count = aggregation.count;
+        var _a = this.analyzeJoin(entity, {
+            aggregation: data,
+            filter: filter,
+            sorter: sorter,
+        }, 1), fromText = _a.from, aliasDict = _a.aliasDict, projectionRefAlias = _a.projectionRefAlias, extraWhere = _a.extraWhere, filterRefAlias = _a.filterRefAlias, currentNumber = _a.currentNumber;
+        var projText = '';
+        var groupByText = '';
+        for (var k in data) {
+            if (k === '#aggr') {
+                var _b = this.translateProjection(entity, data[k], aliasDict, projectionRefAlias, '#data'), projSubText = _b.projText, as = _b.as;
+                if (!projText) {
+                    projText = projSubText;
+                }
+                else {
+                    projText += ", ".concat(projSubText);
+                }
+                groupByText = as;
+            }
+            else {
+                var projSubText = this.translateProjection(entity, data[k], aliasDict, projectionRefAlias, undefined, true).projText;
+                var projSubText2 = '';
+                if (k.startsWith('#max')) {
+                    projSubText2 = "max(".concat(projSubText, ") as `").concat(k, "`");
+                }
+                else if (k.startsWith('#min')) {
+                    projSubText2 = "min(".concat(projSubText, ") as `").concat(k, "`");
+                }
+                else if (k.startsWith('#count')) {
+                    projSubText2 = "count(".concat(projSubText, ") as `").concat(k, "`");
+                }
+                else if (k.startsWith('#sum')) {
+                    projSubText2 = "sum(".concat(projSubText, ") as `").concat(k, "`");
+                }
+                else {
+                    (0, assert_1.default)(k.startsWith('#avg'));
+                    projSubText2 = "avg(".concat(projSubText, ") as `").concat(k, "`");
+                }
+                if (!projText) {
+                    projText = projSubText2;
+                }
+                else {
+                    projText += ", ".concat(projSubText2);
+                }
+            }
+        }
+        var filterText = this.translateFilter(entity, aggregation, aliasDict, {}, currentNumber, extraWhere, option).stmt;
+        var sorterText = sorter && this.translateSorter(entity, sorter, aliasDict);
+        return this.populateSelectStmt(projText, fromText, aliasDict, filterText, sorterText, groupByText, indexFrom, count, option, undefined, aggregation);
+    };
     SqlTranslator.prototype.translateCount = function (entity, selection, option) {
         var filter = selection.filter, count = selection.count;
         var _a = this.analyzeJoin(entity, {
@@ -701,10 +800,10 @@ var SqlTranslator = /** @class */ (function () {
         var projText = 'count(1) cnt';
         var filterText = this.translateFilter(entity, selection, aliasDict, filterRefAlias, currentNumber, extraWhere, option).stmt;
         if (count) {
-            var subQuerySql = this.populateSelectStmt('1', fromText, Object.assign({}, selection, { indexFrom: 0, count: count }), aliasDict, filterText, undefined, undefined, undefined, option);
+            var subQuerySql = this.populateSelectStmt('1', fromText, aliasDict, filterText, undefined, undefined, undefined, undefined, option, Object.assign({}, selection, { indexFrom: 0, count: count }));
             return "select count(1) cnt from (".concat(subQuerySql, ") __tmp");
         }
-        return this.populateSelectStmt(projText, fromText, selection, aliasDict, filterText, undefined, undefined, undefined, option);
+        return this.populateSelectStmt(projText, fromText, aliasDict, filterText, undefined, undefined, undefined, undefined, option, selection);
     };
     SqlTranslator.prototype.translateRemove = function (entity, operation, option) {
         var filter = operation.filter, sorter = operation.sorter, indexFrom = operation.indexFrom, count = operation.count;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "2.1.1",
+	"version": "2.2.0",
 	"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": "^2.1.0",
+		"oak-domain": "^2.3.0",
 		"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": "^2.1.0",
+		"oak-general-business": "^2.3.0",
 		"ts-node": "~10.9.1",
 		"tslib": "^2.4.0",
 		"typescript": "~4.7.4"