@easyquery/enterprise 7.1.3-beta02 → 7.2.0-rc04
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser/eq.enterprise.js +4124 -3644
- package/dist/browser/eq.enterprise.js.map +1 -1
- package/dist/browser/eq.enterprise.min.js +3 -3
- package/dist/browser/eq.enterprise.min.js.LICENSE.txt +0 -2
- package/dist/browser/eq.enterprise.min.js.map +1 -1
- package/dist/bundles/easyquery.enterprise.js +722 -367
- package/dist/bundles/easyquery.enterprise.js.map +1 -1
- package/dist/bundles/easyquery.enterprise.min.js +1 -1
- package/dist/bundles/easyquery.enterprise.min.js.LICENSE.txt +0 -2
- package/dist/bundles/easyquery.enterprise.min.js.map +1 -1
- package/dist/lib/data/data_table_aggr_calculator.d.ts +46 -0
- package/dist/lib/data/data_table_aggr_calculator.js +166 -0
- package/dist/lib/data/data_table_aggr_calculator.js.map +1 -0
- package/dist/lib/data/eqs_aggr_calculator.d.ts +4 -1
- package/dist/lib/data/eqs_aggr_calculator.js +21 -11
- package/dist/lib/data/eqs_aggr_calculator.js.map +1 -1
- package/dist/lib/extensions.js +3 -3
- package/dist/lib/extensions.js.map +1 -1
- package/dist/lib/utils/lcv.js +1 -1
- package/package.json +5 -7
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { AggregatesCalculator, AggregatesContainer, AggrCalculationOptions, DataRow } from '@easydata/core';
|
|
2
|
+
import { EqContext } from '@easyquery/core';
|
|
3
|
+
interface ColumnAggregates {
|
|
4
|
+
sum: number;
|
|
5
|
+
min: number;
|
|
6
|
+
max: number;
|
|
7
|
+
}
|
|
8
|
+
interface ColumnsWithAggregates {
|
|
9
|
+
[columnId: string]: ColumnAggregates;
|
|
10
|
+
}
|
|
11
|
+
interface RowAggregates {
|
|
12
|
+
count: number;
|
|
13
|
+
columns: ColumnsWithAggregates;
|
|
14
|
+
}
|
|
15
|
+
export declare class DataTableAggregatesCalculator implements AggregatesCalculator {
|
|
16
|
+
protected context: EqContext;
|
|
17
|
+
private aggrContainer;
|
|
18
|
+
private aggrSettings;
|
|
19
|
+
private groups;
|
|
20
|
+
private aggregates;
|
|
21
|
+
private aggrColIds;
|
|
22
|
+
private aggrCols;
|
|
23
|
+
private levelsTotals;
|
|
24
|
+
constructor(context: EqContext);
|
|
25
|
+
getAggrContainer(): AggregatesContainer;
|
|
26
|
+
protected initObjects(): void;
|
|
27
|
+
private createColumnAggregatesObject;
|
|
28
|
+
calculate(options?: AggrCalculationOptions): Promise<void>;
|
|
29
|
+
protected resetLevelTotals(rowTotals: RowAggregates): void;
|
|
30
|
+
private prevRow;
|
|
31
|
+
protected processDataRow(row: DataRow): void;
|
|
32
|
+
/** Checks if the values in group columns were changed
|
|
33
|
+
and return the level number they were */
|
|
34
|
+
protected checkLevelChange(row: DataRow): number;
|
|
35
|
+
/** Saves the current values in levelData for the specified level to AggregateContainer
|
|
36
|
+
and then reset the data row for that level
|
|
37
|
+
*/
|
|
38
|
+
protected flushLevelTotals(levelIndex: number): void;
|
|
39
|
+
/** Updates the totals by values in the current DataRow
|
|
40
|
+
* and according to the specified aggregate
|
|
41
|
+
*/
|
|
42
|
+
protected updateLevelTotals(levelIndex: number, row: DataRow): void;
|
|
43
|
+
needRecalculation(): boolean;
|
|
44
|
+
reset(): void;
|
|
45
|
+
}
|
|
46
|
+
export {};
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
import { EqAggregatesContainer } from '@easyquery/core';
|
|
2
|
+
var DataTableAggregatesCalculator = /** @class */ (function () {
|
|
3
|
+
function DataTableAggregatesCalculator(context) {
|
|
4
|
+
this.context = context;
|
|
5
|
+
//stores current totals by level (group) number
|
|
6
|
+
this.levelsTotals = [];
|
|
7
|
+
this.prevRow = null;
|
|
8
|
+
this.aggrContainer = new EqAggregatesContainer(context);
|
|
9
|
+
}
|
|
10
|
+
DataTableAggregatesCalculator.prototype.getAggrContainer = function () {
|
|
11
|
+
return this.aggrContainer;
|
|
12
|
+
};
|
|
13
|
+
DataTableAggregatesCalculator.prototype.initObjects = function () {
|
|
14
|
+
var _this = this;
|
|
15
|
+
this.aggrSettings = this.context.getQuery().getAggregationSettings();
|
|
16
|
+
this.groups = this.aggrSettings.getGroups();
|
|
17
|
+
this.aggregates = this.aggrSettings.getAggregates();
|
|
18
|
+
this.aggrColIds = this.aggrSettings.getAggregates().map(function (a) { return a.colId; });
|
|
19
|
+
this.aggrCols = this.context.resultTable.columns.getItems()
|
|
20
|
+
.filter(function (col) { return _this.aggrColIds.indexOf(col.id) >= 0; });
|
|
21
|
+
this.levelsTotals = [];
|
|
22
|
+
this.prevRow = null;
|
|
23
|
+
};
|
|
24
|
+
DataTableAggregatesCalculator.prototype.createColumnAggregatesObject = function () {
|
|
25
|
+
return {
|
|
26
|
+
sum: 0,
|
|
27
|
+
min: Number.MAX_VALUE,
|
|
28
|
+
max: Number.MIN_VALUE
|
|
29
|
+
};
|
|
30
|
+
};
|
|
31
|
+
DataTableAggregatesCalculator.prototype.calculate = function (options) {
|
|
32
|
+
this.initObjects();
|
|
33
|
+
this.aggrContainer.clear();
|
|
34
|
+
options = options || {};
|
|
35
|
+
options.maxLevel = options.maxLevel >= 0
|
|
36
|
+
? options.maxLevel : 0;
|
|
37
|
+
var levelNumber = this.groups.length + 1; //number of groups plus grand totals
|
|
38
|
+
for (var levelIndex = 0; levelIndex < levelNumber; levelIndex++) {
|
|
39
|
+
var levelTotals = { count: 0, columns: {} };
|
|
40
|
+
this.resetLevelTotals(levelTotals);
|
|
41
|
+
this.levelsTotals.push(levelTotals);
|
|
42
|
+
}
|
|
43
|
+
var allRows = this.context.resultTable.getCachedRows();
|
|
44
|
+
if (allRows.length > 0) {
|
|
45
|
+
for (var _i = 0, allRows_1 = allRows; _i < allRows_1.length; _i++) {
|
|
46
|
+
var row = allRows_1[_i];
|
|
47
|
+
this.processDataRow(row);
|
|
48
|
+
}
|
|
49
|
+
//flusing the totals for all group levels
|
|
50
|
+
for (var levelIndex = 1; levelIndex < levelNumber; levelIndex++) {
|
|
51
|
+
this.flushLevelTotals(levelIndex);
|
|
52
|
+
}
|
|
53
|
+
//flusing the grand totals (if they are turned on)
|
|
54
|
+
if (this.aggrSettings.hasGrandTotals()) {
|
|
55
|
+
this.flushLevelTotals(0);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return Promise.resolve();
|
|
59
|
+
};
|
|
60
|
+
DataTableAggregatesCalculator.prototype.resetLevelTotals = function (rowTotals) {
|
|
61
|
+
for (var _i = 0, _a = this.aggrCols; _i < _a.length; _i++) {
|
|
62
|
+
var aggrCol = _a[_i];
|
|
63
|
+
rowTotals.columns[aggrCol.id] = this.createColumnAggregatesObject();
|
|
64
|
+
}
|
|
65
|
+
rowTotals.count = 0;
|
|
66
|
+
};
|
|
67
|
+
DataTableAggregatesCalculator.prototype.processDataRow = function (row) {
|
|
68
|
+
var levelIndexChanged = this.checkLevelChange(row);
|
|
69
|
+
if (levelIndexChanged >= 0) {
|
|
70
|
+
for (var levelIndex_1 = levelIndexChanged; levelIndex_1 < this.levelsTotals.length; levelIndex_1++) {
|
|
71
|
+
this.flushLevelTotals(levelIndex_1);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
if (this.aggrSettings.hasGrandTotals()) {
|
|
75
|
+
this.updateLevelTotals(0, row);
|
|
76
|
+
}
|
|
77
|
+
var levelIndex = 1;
|
|
78
|
+
for (var _i = 0, _a = this.groups; _i < _a.length; _i++) {
|
|
79
|
+
var group = _a[_i];
|
|
80
|
+
this.updateLevelTotals(levelIndex, row);
|
|
81
|
+
levelIndex++;
|
|
82
|
+
}
|
|
83
|
+
this.prevRow = row;
|
|
84
|
+
};
|
|
85
|
+
/** Checks if the values in group columns were changed
|
|
86
|
+
and return the level number they were */
|
|
87
|
+
DataTableAggregatesCalculator.prototype.checkLevelChange = function (row) {
|
|
88
|
+
if (this.prevRow == null)
|
|
89
|
+
return -1;
|
|
90
|
+
for (var groupIndex = 0; groupIndex < this.groups.length; groupIndex++) {
|
|
91
|
+
var group = this.groups[groupIndex];
|
|
92
|
+
for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
|
|
93
|
+
var colId = _a[_i];
|
|
94
|
+
var value = row.getValue(colId);
|
|
95
|
+
var prevValue = this.prevRow.getValue(colId);
|
|
96
|
+
if (!this.aggrSettings.compareValues(prevValue, value)) {
|
|
97
|
+
return groupIndex + 1;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return -1;
|
|
102
|
+
};
|
|
103
|
+
/** Saves the current values in levelData for the specified level to AggregateContainer
|
|
104
|
+
and then reset the data row for that level
|
|
105
|
+
*/
|
|
106
|
+
DataTableAggregatesCalculator.prototype.flushLevelTotals = function (levelIndex) {
|
|
107
|
+
var levelTotals = this.levelsTotals[levelIndex];
|
|
108
|
+
var group = levelIndex > 0 ? this.groups[levelIndex - 1] : null;
|
|
109
|
+
var groupKey = this.aggrSettings.buildGroupKey(group, this.prevRow);
|
|
110
|
+
var groupTotals = {};
|
|
111
|
+
for (var _i = 0, _a = this.aggregates; _i < _a.length; _i++) {
|
|
112
|
+
var aggr = _a[_i];
|
|
113
|
+
var columnTotals = levelTotals.columns[aggr.colId];
|
|
114
|
+
switch (aggr.funcId) {
|
|
115
|
+
case "SUM":
|
|
116
|
+
groupTotals[aggr.colId] = columnTotals.sum;
|
|
117
|
+
break;
|
|
118
|
+
case "AVG":
|
|
119
|
+
groupTotals[aggr.colId] = columnTotals.sum / levelTotals.count;
|
|
120
|
+
break;
|
|
121
|
+
case "COUNT":
|
|
122
|
+
case "CNTDST":
|
|
123
|
+
groupTotals[aggr.colId] = levelTotals.count;
|
|
124
|
+
break;
|
|
125
|
+
case "MIN":
|
|
126
|
+
groupTotals[aggr.colId] = columnTotals.min;
|
|
127
|
+
break;
|
|
128
|
+
case "MAX":
|
|
129
|
+
groupTotals[aggr.colId] = columnTotals.max;
|
|
130
|
+
break;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
if (this.aggrSettings.hasRecordCount()) {
|
|
134
|
+
groupTotals[this.aggrSettings.COUNT_FIELD_NAME] = levelTotals.count;
|
|
135
|
+
}
|
|
136
|
+
this.aggrContainer.updateAggregateData(levelIndex, groupKey, groupTotals);
|
|
137
|
+
this.resetLevelTotals(levelTotals);
|
|
138
|
+
};
|
|
139
|
+
/** Updates the totals by values in the current DataRow
|
|
140
|
+
* and according to the specified aggregate
|
|
141
|
+
*/
|
|
142
|
+
DataTableAggregatesCalculator.prototype.updateLevelTotals = function (levelIndex, row) {
|
|
143
|
+
var levelTotals = this.levelsTotals[levelIndex];
|
|
144
|
+
levelTotals.count += 1;
|
|
145
|
+
for (var _i = 0, _a = this.aggregates; _i < _a.length; _i++) {
|
|
146
|
+
var aggr = _a[_i];
|
|
147
|
+
var value = row.getValue(aggr.colId);
|
|
148
|
+
var columnTotals = levelTotals.columns[aggr.colId];
|
|
149
|
+
columnTotals.sum += value;
|
|
150
|
+
if (value < columnTotals.min) {
|
|
151
|
+
columnTotals.min = value;
|
|
152
|
+
}
|
|
153
|
+
if (value > columnTotals.max) {
|
|
154
|
+
columnTotals.max = value;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
};
|
|
158
|
+
DataTableAggregatesCalculator.prototype.needRecalculation = function () {
|
|
159
|
+
return true;
|
|
160
|
+
};
|
|
161
|
+
DataTableAggregatesCalculator.prototype.reset = function () {
|
|
162
|
+
};
|
|
163
|
+
return DataTableAggregatesCalculator;
|
|
164
|
+
}());
|
|
165
|
+
export { DataTableAggregatesCalculator };
|
|
166
|
+
//# sourceMappingURL=data_table_aggr_calculator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"data_table_aggr_calculator.js","sourceRoot":"","sources":["../../../src/data/data_table_aggr_calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AggregatesCalculator, AggregatesContainer, AggrCalculationOptions } from '@easydata/core';
|
|
2
2
|
import { EqContext } from '@easyquery/core';
|
|
3
|
-
export declare class
|
|
3
|
+
export declare class EqServerAggregatesCalculator implements AggregatesCalculator {
|
|
4
4
|
protected context: EqContext;
|
|
5
5
|
constructor(context: EqContext);
|
|
6
6
|
private aggrContainer;
|
|
@@ -8,4 +8,7 @@ export declare class EqAggregatesCalculator implements AggregatesCalculator {
|
|
|
8
8
|
calculate(options?: AggrCalculationOptions): Promise<void>;
|
|
9
9
|
private processLevel;
|
|
10
10
|
private buildLevelData;
|
|
11
|
+
private _needRecalculation;
|
|
12
|
+
needRecalculation(): boolean;
|
|
13
|
+
reset(): void;
|
|
11
14
|
}
|
|
@@ -11,15 +11,17 @@ var __assign = (this && this.__assign) || function () {
|
|
|
11
11
|
};
|
|
12
12
|
import { EasyDataTable } from '@easydata/core';
|
|
13
13
|
import { ExprTag, EqAggregatesContainer, Expression } from '@easyquery/core';
|
|
14
|
-
var
|
|
15
|
-
function
|
|
14
|
+
var EqServerAggregatesCalculator = /** @class */ (function () {
|
|
15
|
+
function EqServerAggregatesCalculator(context) {
|
|
16
16
|
this.context = context;
|
|
17
|
+
this._needRecalculation = true;
|
|
17
18
|
this.aggrContainer = new EqAggregatesContainer(context);
|
|
18
19
|
}
|
|
19
|
-
|
|
20
|
+
EqServerAggregatesCalculator.prototype.getAggrContainer = function () {
|
|
20
21
|
return this.aggrContainer;
|
|
21
22
|
};
|
|
22
|
-
|
|
23
|
+
EqServerAggregatesCalculator.prototype.calculate = function (options) {
|
|
24
|
+
this._needRecalculation = false;
|
|
23
25
|
this.aggrContainer.clear();
|
|
24
26
|
options = options || {};
|
|
25
27
|
options.maxLevel = options.maxLevel >= 0
|
|
@@ -83,10 +85,12 @@ var EqAggregatesCalculator = /** @class */ (function () {
|
|
|
83
85
|
}));
|
|
84
86
|
}
|
|
85
87
|
return Promise.all(levelPromises)
|
|
86
|
-
.then(function () {
|
|
88
|
+
.then(function () {
|
|
89
|
+
return;
|
|
90
|
+
})
|
|
87
91
|
.catch(function (error) { return console.error(error); });
|
|
88
92
|
};
|
|
89
|
-
|
|
93
|
+
EqServerAggregatesCalculator.prototype.processLevel = function (options) {
|
|
90
94
|
var _this = this;
|
|
91
95
|
var fetcher = this.context.getServices()
|
|
92
96
|
.getDataFetcher();
|
|
@@ -112,19 +116,19 @@ var EqAggregatesCalculator = /** @class */ (function () {
|
|
|
112
116
|
dataTable.addRow(row);
|
|
113
117
|
}
|
|
114
118
|
var levelData = _this.buildLevelData(options.level, dataTable);
|
|
115
|
-
_this.aggrContainer.
|
|
119
|
+
_this.aggrContainer.setAggregateData(options.level, levelData);
|
|
116
120
|
if (options.resultObtainedCallback) {
|
|
117
121
|
options.resultObtainedCallback(result, options.level);
|
|
118
122
|
}
|
|
119
123
|
})
|
|
120
124
|
.catch(function (error) {
|
|
121
125
|
if (options.errorOccurredCallback) {
|
|
122
|
-
options.errorOccurredCallback(__assign({}, error, { level: options.level }));
|
|
126
|
+
options.errorOccurredCallback(__assign(__assign({}, error), { level: options.level }));
|
|
123
127
|
}
|
|
124
128
|
});
|
|
125
129
|
return resultPromise;
|
|
126
130
|
};
|
|
127
|
-
|
|
131
|
+
EqServerAggregatesCalculator.prototype.buildLevelData = function (level, dataTable) {
|
|
128
132
|
var aggrSettings = this.context.getQuery().getAggregationSettings();
|
|
129
133
|
var keyColumns = level > 0
|
|
130
134
|
? aggrSettings.getGroups()[level - 1].columns
|
|
@@ -157,7 +161,13 @@ var EqAggregatesCalculator = /** @class */ (function () {
|
|
|
157
161
|
}
|
|
158
162
|
return data;
|
|
159
163
|
};
|
|
160
|
-
|
|
164
|
+
EqServerAggregatesCalculator.prototype.needRecalculation = function () {
|
|
165
|
+
return this._needRecalculation;
|
|
166
|
+
};
|
|
167
|
+
EqServerAggregatesCalculator.prototype.reset = function () {
|
|
168
|
+
this._needRecalculation = true;
|
|
169
|
+
};
|
|
170
|
+
return EqServerAggregatesCalculator;
|
|
161
171
|
}());
|
|
162
|
-
export {
|
|
172
|
+
export { EqServerAggregatesCalculator };
|
|
163
173
|
//# sourceMappingURL=eqs_aggr_calculator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eqs_aggr_calculator.js","sourceRoot":"","sources":["../../../src/data/eqs_aggr_calculator.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAGH,aAAa,EAChB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACQ,OAAO,EACX,qBAAqB,EAAoB,UAAU,EAC7D,MAAM,iBAAiB,CAAC;AAUzB;IACI,
|
|
1
|
+
{"version":3,"file":"eqs_aggr_calculator.js","sourceRoot":"","sources":["../../../src/data/eqs_aggr_calculator.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/extensions.js
CHANGED
|
@@ -4,7 +4,7 @@ import { QueryEx } from './query/query_ex';
|
|
|
4
4
|
import { EqServerQueryStorage } from './main/eqs_query_storage';
|
|
5
5
|
import { DataModelEx } from './dm/model_ex';
|
|
6
6
|
import { lcv } from './utils/lcv';
|
|
7
|
-
import {
|
|
7
|
+
import { DataTableAggregatesCalculator } from './data/data_table_aggr_calculator';
|
|
8
8
|
EqContext.prototype.setLicenseKeyEndpoint = function (endpoint) {
|
|
9
9
|
console.warn('This method is deprecated and will be ignored.\n '
|
|
10
10
|
+ 'The main EasyQuery endpoint (set via useEndpoint() function) is used to get the license since version 7.0.\n '
|
|
@@ -19,7 +19,7 @@ EqContext.prototype.useEnterprise = function (keyOrInitCallback) {
|
|
|
19
19
|
services.registerDataModelResolver(function (context) { return new DataModelEx(); });
|
|
20
20
|
services.registerQueryResolver(function (context) { return new QueryEx(context.getModel()); });
|
|
21
21
|
services.registerQueryStorageResolver(function (context) { return new EqServerQueryStorage(context); });
|
|
22
|
-
services.registerAggregatesCalculator(function (context) { return new
|
|
22
|
+
services.registerAggregatesCalculator(function (context) { return new DataTableAggregatesCalculator(context); });
|
|
23
23
|
if (lcv.__kt === 2) {
|
|
24
24
|
console.warn('EasyQuery.JS is working in the TRIAL MODE!\n'
|
|
25
25
|
+ 'Please order a license (https://korzh.com/eq) to get a proper product key.');
|
|
@@ -69,7 +69,7 @@ function showLCDialog() {
|
|
|
69
69
|
break;
|
|
70
70
|
default:
|
|
71
71
|
title = "Invalid key for EasyQuery!";
|
|
72
|
-
body = "The EasyQuery product key is either invalid or was issued for a different version of the library.\n The version you are using now is 7.
|
|
72
|
+
body = "The EasyQuery product key is either invalid or was issued for a different version of the library.\n The version you are using now is 7.2,\n\tso please <a href=\"https://korzh.com/account\">login to your account</a> to get a proper key for version 7.2.";
|
|
73
73
|
buttonTitle = 'Get key';
|
|
74
74
|
buttonUrl = 'https://korzh.com/account';
|
|
75
75
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../src/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../src/extensions.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/utils/lcv.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@easyquery/enterprise",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.2.0-rc04",
|
|
4
4
|
"description": "EasyQuery.JS Enterprise",
|
|
5
5
|
"types": "./dist/lib/public_api.d.ts",
|
|
6
6
|
"main": "./dist/bundles/easyquery.enterprise.js",
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"bugs": "https://korzh.com/support",
|
|
30
30
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
31
31
|
"peerDependencies": {
|
|
32
|
-
"@easyquery/core": "^7.
|
|
33
|
-
"@easydata/core": "^1.4.
|
|
32
|
+
"@easyquery/core": "^7.2.0-rc04",
|
|
33
|
+
"@easydata/core": "^1.4.1"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/jasmine": "^3.3.9",
|
|
@@ -44,15 +44,13 @@
|
|
|
44
44
|
"ts-node": "^8.0.2",
|
|
45
45
|
"typedoc": "^0.15.0",
|
|
46
46
|
"typedoc-webpack-plugin": "^1.1.4",
|
|
47
|
-
"typescript": "3.
|
|
47
|
+
"typescript": "3.7.*",
|
|
48
48
|
"webpack": "^4.36.1",
|
|
49
49
|
"webpack-cli": "^3.3.6"
|
|
50
50
|
},
|
|
51
51
|
"nodemonConfig": {
|
|
52
52
|
"watch": [
|
|
53
|
-
"src"
|
|
54
|
-
"../core/dist/lib",
|
|
55
|
-
"../easydata.ui/dist/lib"
|
|
53
|
+
"src"
|
|
56
54
|
],
|
|
57
55
|
"delay": "1000",
|
|
58
56
|
"ext": "ts,js",
|