@finos/legend-query-builder 4.16.0 → 4.16.1
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/index.css +1 -1
- package/lib/package.json +3 -3
- package/lib/stores/data-cube/QueryBuilderDataCubeEngine.d.ts +3 -3
- package/lib/stores/data-cube/QueryBuilderDataCubeEngine.d.ts.map +1 -1
- package/lib/stores/data-cube/QueryBuilderDataCubeEngine.js +4 -14
- package/lib/stores/data-cube/QueryBuilderDataCubeEngine.js.map +1 -1
- package/package.json +12 -12
- package/src/stores/data-cube/QueryBuilderDataCubeEngine.ts +3 -18
package/lib/index.css
CHANGED
package/lib/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-query-builder",
|
|
3
|
-
"version": "4.16.
|
|
3
|
+
"version": "4.16.1",
|
|
4
4
|
"description": "Legend query builder core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -56,8 +56,8 @@
|
|
|
56
56
|
"@types/react": "19.0.8",
|
|
57
57
|
"@types/react-dom": "19.0.3",
|
|
58
58
|
"chart.js": "4.4.7",
|
|
59
|
-
"mathjs": "14.1
|
|
60
|
-
"mobx": "6.13.
|
|
59
|
+
"mathjs": "14.2.1",
|
|
60
|
+
"mobx": "6.13.6",
|
|
61
61
|
"mobx-react-lite": "4.1.0",
|
|
62
62
|
"monaco-editor": "0.52.2",
|
|
63
63
|
"react": "19.0.0",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { V1_Lambda, RawLambda, TDSExecutionResult,
|
|
16
|
+
import { V1_Lambda, RawLambda, TDSExecutionResult, type GraphManagerState, type V1_ValueSpecification, type ParameterValue } from '@finos/legend-graph';
|
|
17
17
|
import { DataCubeEngine, DataCubeSource, type CompletionItem, DataCubeQuery } from '@finos/legend-data-cube';
|
|
18
18
|
import { LogService, type PlainObject } from '@finos/legend-shared';
|
|
19
19
|
declare class QueryBuilderDataCubeSource extends DataCubeSource {
|
|
@@ -29,7 +29,7 @@ export declare class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
29
29
|
readonly runtimePath: string | undefined;
|
|
30
30
|
readonly parameters: object | undefined;
|
|
31
31
|
constructor(selectQuery: RawLambda, parameterValues: ParameterValue[] | undefined, mappingPath: string | undefined, runtimePath: string | undefined, graphManagerState: GraphManagerState);
|
|
32
|
-
processQuerySource(
|
|
32
|
+
processQuerySource(sourceData: PlainObject): Promise<QueryBuilderDataCubeSource>;
|
|
33
33
|
parseValueSpecification(code: string, returnSourceInformation?: boolean): Promise<V1_ValueSpecification>;
|
|
34
34
|
getValueSpecificationCode(value: V1_ValueSpecification, pretty?: boolean | undefined): Promise<string>;
|
|
35
35
|
getQueryTypeahead(code: string, baseQuery: V1_Lambda, source: DataCubeSource): Promise<CompletionItem[]>;
|
|
@@ -41,7 +41,7 @@ export declare class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
41
41
|
executedSQL: string;
|
|
42
42
|
executionTime: number;
|
|
43
43
|
}>;
|
|
44
|
-
buildExecutionContext(source: DataCubeSource): V1_AppliedFunction | undefined;
|
|
44
|
+
buildExecutionContext(source: DataCubeSource): import("@finos/legend-graph").V1_AppliedFunction | undefined;
|
|
45
45
|
private buildRawLambdaFromValueSpec;
|
|
46
46
|
private getSourceFunctionExpression;
|
|
47
47
|
generateInitialQuery(): Promise<DataCubeQuery>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCubeEngine.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,SAAS,EAET,kBAAkB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCubeEngine.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,SAAS,EAET,kBAAkB,EAKlB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,cAAc,EACd,cAAc,EAGd,KAAK,cAAc,EACnB,aAAa,EACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,UAAU,EACV,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAE9B,cAAM,0BAA2B,SAAQ,cAAc;IACrD,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B;AAED,qBAAa,0BAA2B,SAAQ,cAAc;IAC5D,QAAQ,CAAC,UAAU,aAAoB;IACvC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGtC,WAAW,EAAE,SAAS,EACtB,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,EAC7C,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,iBAAiB,EAAE,iBAAiB;IAYvB,kBAAkB,CAAC,UAAU,EAAE,WAAW;IAe1C,uBAAuB,CACpC,IAAI,EAAE,MAAM,EACZ,uBAAuB,CAAC,EAAE,OAAO;IAWpB,yBAAyB,CACtC,KAAK,EAAE,qBAAqB,EAC5B,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS;IAQf,iBAAiB,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,cAAc;IAmBT,0BAA0B,CACvC,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,cAAc;IAKT,8BAA8B,CAC3C,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,MAAM,EAAE,cAAc;IAYT,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc;;;;;;IAmC3D,qBAAqB,CAAC,MAAM,EAAE,cAAc;IAkBrD,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,2BAA2B;IAmB7B,oBAAoB;IASpB,eAAe,CAAC,KAAK,EAAE,SAAS;CAQvC"}
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { V1_Lambda, RawLambda, RelationalExecutionActivities, TDSExecutionResult,
|
|
17
|
-
import { _elementPtr, DataCubeEngine, DataCubeSource, _function, DataCubeFunction,
|
|
16
|
+
import { V1_Lambda, RawLambda, RelationalExecutionActivities, TDSExecutionResult, V1_deserializeRawValueSpecification, V1_deserializeValueSpecification, V1_RawLambda, V1_serializeValueSpecification, LAMBDA_PIPE, } from '@finos/legend-graph';
|
|
17
|
+
import { _elementPtr, DataCubeEngine, DataCubeSource, _function, DataCubeFunction, DataCubeQuery, } from '@finos/legend-data-cube';
|
|
18
18
|
import { guaranteeType, isNonNullable, LogService, } from '@finos/legend-shared';
|
|
19
19
|
class QueryBuilderDataCubeSource extends DataCubeSource {
|
|
20
20
|
mapping;
|
|
@@ -37,7 +37,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
37
37
|
this.parameterValues = parameterValues;
|
|
38
38
|
this.parameters = selectQuery.parameters;
|
|
39
39
|
}
|
|
40
|
-
async processQuerySource(
|
|
40
|
+
async processQuerySource(sourceData) {
|
|
41
41
|
// TODO: this is an abnormal usage of this method, this is the place
|
|
42
42
|
// where we can enforce which source this engine supports, instead
|
|
43
43
|
// of hardcoding the logic like this.
|
|
@@ -115,7 +115,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
115
115
|
}
|
|
116
116
|
getSourceFunctionExpression() {
|
|
117
117
|
let srcFuncExp = V1_deserializeValueSpecification(this.graphState.graphManager.serializeRawValueSpecification(this.selectInitialQuery), []);
|
|
118
|
-
// We could do a further check here to ensure the
|
|
118
|
+
// We could do a further check here to ensure the experession is an applied funciton
|
|
119
119
|
// this is because data cube expects an expression to be able to built further upon the queery
|
|
120
120
|
if (srcFuncExp instanceof V1_Lambda &&
|
|
121
121
|
srcFuncExp.body.length === 1 &&
|
|
@@ -125,16 +125,6 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
125
125
|
return srcFuncExp;
|
|
126
126
|
}
|
|
127
127
|
async generateInitialQuery() {
|
|
128
|
-
const srcFuncExp = this.getSourceFunctionExpression();
|
|
129
|
-
const fromFuncExp = new V1_AppliedFunction();
|
|
130
|
-
fromFuncExp.function = _functionName(SUPPORTED_FUNCTIONS.FROM);
|
|
131
|
-
fromFuncExp.parameters = [srcFuncExp];
|
|
132
|
-
if (this.mappingPath) {
|
|
133
|
-
fromFuncExp.parameters.push(_elementPtr(this.mappingPath));
|
|
134
|
-
}
|
|
135
|
-
if (this.runtimePath) {
|
|
136
|
-
fromFuncExp.parameters.push(_elementPtr(this.runtimePath));
|
|
137
|
-
}
|
|
138
128
|
const columns = (await this.getRelationType(this.selectInitialQuery))
|
|
139
129
|
.columns;
|
|
140
130
|
const query = new DataCubeQuery();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderDataCubeEngine.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,SAAS,EACT,6BAA6B,EAC7B,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderDataCubeEngine.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-query-builder",
|
|
3
|
-
"version": "4.16.
|
|
3
|
+
"version": "4.16.1",
|
|
4
4
|
"description": "Legend query builder core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -42,22 +42,22 @@
|
|
|
42
42
|
"test:watch": "jest --watch"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@finos/legend-application": "16.0.
|
|
46
|
-
"@finos/legend-art": "7.1.
|
|
47
|
-
"@finos/legend-code-editor": "2.0.
|
|
48
|
-
"@finos/legend-data-cube": "0.1.
|
|
49
|
-
"@finos/legend-graph": "32.1.
|
|
50
|
-
"@finos/legend-lego": "2.0.
|
|
51
|
-
"@finos/legend-server-depot": "6.0.
|
|
52
|
-
"@finos/legend-shared": "11.0.
|
|
53
|
-
"@finos/legend-storage": "3.0.
|
|
45
|
+
"@finos/legend-application": "16.0.23",
|
|
46
|
+
"@finos/legend-art": "7.1.80",
|
|
47
|
+
"@finos/legend-code-editor": "2.0.43",
|
|
48
|
+
"@finos/legend-data-cube": "0.1.1",
|
|
49
|
+
"@finos/legend-graph": "32.1.1",
|
|
50
|
+
"@finos/legend-lego": "2.0.46",
|
|
51
|
+
"@finos/legend-server-depot": "6.0.79",
|
|
52
|
+
"@finos/legend-shared": "11.0.2",
|
|
53
|
+
"@finos/legend-storage": "3.0.121",
|
|
54
54
|
"@testing-library/dom": "10.4.0",
|
|
55
55
|
"@testing-library/react": "16.2.0",
|
|
56
56
|
"@types/react": "19.0.8",
|
|
57
57
|
"@types/react-dom": "19.0.3",
|
|
58
58
|
"chart.js": "4.4.7",
|
|
59
|
-
"mathjs": "14.1
|
|
60
|
-
"mobx": "6.13.
|
|
59
|
+
"mathjs": "14.2.1",
|
|
60
|
+
"mobx": "6.13.6",
|
|
61
61
|
"mobx-react-lite": "4.1.0",
|
|
62
62
|
"monaco-editor": "0.52.2",
|
|
63
63
|
"react": "19.0.0",
|
|
@@ -19,7 +19,6 @@ import {
|
|
|
19
19
|
RawLambda,
|
|
20
20
|
RelationalExecutionActivities,
|
|
21
21
|
TDSExecutionResult,
|
|
22
|
-
V1_AppliedFunction,
|
|
23
22
|
V1_deserializeRawValueSpecification,
|
|
24
23
|
V1_deserializeValueSpecification,
|
|
25
24
|
V1_RawLambda,
|
|
@@ -28,7 +27,6 @@ import {
|
|
|
28
27
|
type V1_ValueSpecification,
|
|
29
28
|
type ParameterValue,
|
|
30
29
|
LAMBDA_PIPE,
|
|
31
|
-
SUPPORTED_FUNCTIONS,
|
|
32
30
|
} from '@finos/legend-graph';
|
|
33
31
|
import {
|
|
34
32
|
_elementPtr,
|
|
@@ -37,7 +35,6 @@ import {
|
|
|
37
35
|
_function,
|
|
38
36
|
DataCubeFunction,
|
|
39
37
|
type CompletionItem,
|
|
40
|
-
_functionName,
|
|
41
38
|
DataCubeQuery,
|
|
42
39
|
} from '@finos/legend-data-cube';
|
|
43
40
|
import {
|
|
@@ -78,7 +75,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
78
75
|
this.parameters = selectQuery.parameters;
|
|
79
76
|
}
|
|
80
77
|
|
|
81
|
-
override async processQuerySource(
|
|
78
|
+
override async processQuerySource(sourceData: PlainObject) {
|
|
82
79
|
// TODO: this is an abnormal usage of this method, this is the place
|
|
83
80
|
// where we can enforce which source this engine supports, instead
|
|
84
81
|
// of hardcoding the logic like this.
|
|
@@ -195,9 +192,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
195
192
|
};
|
|
196
193
|
}
|
|
197
194
|
|
|
198
|
-
override buildExecutionContext(
|
|
199
|
-
source: DataCubeSource,
|
|
200
|
-
): V1_AppliedFunction | undefined {
|
|
195
|
+
override buildExecutionContext(source: DataCubeSource) {
|
|
201
196
|
if (source instanceof QueryBuilderDataCubeSource) {
|
|
202
197
|
const appendFromFunc = Boolean(source.mapping ?? source.runtime);
|
|
203
198
|
return appendFromFunc
|
|
@@ -232,7 +227,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
232
227
|
),
|
|
233
228
|
[],
|
|
234
229
|
);
|
|
235
|
-
// We could do a further check here to ensure the
|
|
230
|
+
// We could do a further check here to ensure the experession is an applied funciton
|
|
236
231
|
// this is because data cube expects an expression to be able to built further upon the queery
|
|
237
232
|
if (
|
|
238
233
|
srcFuncExp instanceof V1_Lambda &&
|
|
@@ -245,16 +240,6 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
|
|
|
245
240
|
}
|
|
246
241
|
|
|
247
242
|
async generateInitialQuery() {
|
|
248
|
-
const srcFuncExp = this.getSourceFunctionExpression();
|
|
249
|
-
const fromFuncExp = new V1_AppliedFunction();
|
|
250
|
-
fromFuncExp.function = _functionName(SUPPORTED_FUNCTIONS.FROM);
|
|
251
|
-
fromFuncExp.parameters = [srcFuncExp];
|
|
252
|
-
if (this.mappingPath) {
|
|
253
|
-
fromFuncExp.parameters.push(_elementPtr(this.mappingPath));
|
|
254
|
-
}
|
|
255
|
-
if (this.runtimePath) {
|
|
256
|
-
fromFuncExp.parameters.push(_elementPtr(this.runtimePath));
|
|
257
|
-
}
|
|
258
243
|
const columns = (await this.getRelationType(this.selectInitialQuery))
|
|
259
244
|
.columns;
|
|
260
245
|
const query = new DataCubeQuery();
|