@finos/legend-data-cube 0.0.46 → 0.0.48

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.
Files changed (11) hide show
  1. package/lib/index.css +1 -1
  2. package/lib/package.json +3 -3
  3. package/lib/stores/core/DataCubeConfigurationBuilder.d.ts.map +1 -1
  4. package/lib/stores/core/DataCubeConfigurationBuilder.js +3 -5
  5. package/lib/stores/core/DataCubeConfigurationBuilder.js.map +1 -1
  6. package/lib/stores/core/DataCubeQuerySnapshotBuilder.d.ts.map +1 -1
  7. package/lib/stores/core/DataCubeQuerySnapshotBuilder.js +9 -3
  8. package/lib/stores/core/DataCubeQuerySnapshotBuilder.js.map +1 -1
  9. package/package.json +8 -8
  10. package/src/stores/core/DataCubeConfigurationBuilder.ts +3 -4
  11. package/src/stores/core/DataCubeQuerySnapshotBuilder.ts +16 -2
package/lib/index.css CHANGED
@@ -1,4 +1,4 @@
1
- /** @license @finos/legend-data-cube v0.0.46
1
+ /** @license @finos/legend-data-cube v0.0.48
2
2
  * Copyright (c) 2020-present, Goldman Sachs
3
3
  *
4
4
  * Licensed under the Apache License, Version 2.0 (the "License");
package/lib/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-data-cube",
3
- "version": "0.0.46",
3
+ "version": "0.0.48",
4
4
  "description": "Legend DataCube",
5
5
  "keywords": [
6
6
  "legend",
@@ -50,7 +50,7 @@
50
50
  "ag-grid-community": "33.0.4",
51
51
  "ag-grid-enterprise": "33.0.4",
52
52
  "ag-grid-react": "33.0.4",
53
- "mathjs": "14.0.1",
53
+ "mathjs": "14.1.0",
54
54
  "mobx": "6.13.5",
55
55
  "mobx-react-lite": "4.1.0",
56
56
  "monaco-editor": "0.52.2",
@@ -62,7 +62,7 @@
62
62
  "@finos/legend-dev-utils": "workspace:*",
63
63
  "@jest/globals": "29.7.0",
64
64
  "cross-env": "7.0.3",
65
- "eslint": "9.18.0",
65
+ "eslint": "9.19.0",
66
66
  "jest": "29.7.0",
67
67
  "npm-run-all": "4.1.5",
68
68
  "rimraf": "6.0.1",
package/lib/stores/core/DataCubeConfigurationBuilder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeConfigurationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/core/DataCubeConfigurationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,4BAA4B,CAAC;AAGzF,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE,sCAAsC,GAAG,SAAS,GAC3D,2BAA2B,CA2E7B;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,sCAAsC,GAC9C,qBAAqB,CA6BvB"}
1
+ {"version":3,"file":"DataCubeConfigurationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/core/DataCubeConfigurationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,4BAA4B,CAAC;AAGzF,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE,sCAAsC,GAAG,SAAS,GAC3D,2BAA2B,CA0E7B;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,sCAAsC,GAC9C,qBAAqB,CA6BvB"}
package/lib/stores/core/DataCubeConfigurationBuilder.js CHANGED
@@ -52,16 +52,14 @@ export function newColumnConfiguration(column, context) {
52
52
  if (data.groupBy ?? data.pivot) {
53
53
  const groupByAggCol = _findCol(groupByAggColumns, name);
54
54
  const pivotAggCol = _findCol(pivotAggColumns, name);
55
- const aggCol = groupByAggCol ?? pivotAggCol;
56
55
  // process column kind
57
- if (aggCol) {
58
- config.kind = DataCubeColumnKind.MEASURE;
59
- }
60
- else if (_findCol(data.pivot?.columns ?? [], name) ??
56
+ if (_findCol(data.pivot?.columns ?? [], name) ??
61
57
  _findCol(data.groupBy?.columns ?? [], name)) {
62
58
  config.kind = DataCubeColumnKind.DIMENSION;
59
+ config.excludedFromPivot = true;
63
60
  }
64
61
  // aggregation
62
+ const aggCol = groupByAggCol ?? pivotAggCol;
65
63
  if (aggCol) {
66
64
  config.aggregateOperator = aggCol.operator;
67
65
  config.aggregationParameters = aggCol.parameterValues;
package/lib/stores/core/DataCubeConfigurationBuilder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeConfigurationBuilder.js","sourceRoot":"","sources":["../../../src/stores/core/DataCubeConfigurationBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataCubeConfigurationBuilder.js","sourceRoot":"","sources":["../../../src/stores/core/DataCubeConfigurationBuilder.ts"],"names":[],"mappings":"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"}
package/lib/stores/core/DataCubeQuerySnapshotBuilder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeQuerySnapshotBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/core/DataCubeQuerySnapshotBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;yFAMyF;AAEzF,OAAO,EAKL,KAAK,qBAAqB,EAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,qBAAqB,EAItB,MAAM,4BAA4B,CAAC;AAkCpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAoR1D;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,qBAAqB,EACnC,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,aAAa,EACxB,MAAM,EAAE,cAAc,kCAiQvB"}
1
+ {"version":3,"file":"DataCubeQuerySnapshotBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/core/DataCubeQuerySnapshotBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;yFAMyF;AAEzF,OAAO,EAKL,KAAK,qBAAqB,EAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,qBAAqB,EAItB,MAAM,4BAA4B,CAAC;AAmCpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAoR1D;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,qBAAqB,EACnC,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,aAAa,EACxB,MAAM,EAAE,cAAc,kCAiQvB"}
package/lib/stores/core/DataCubeQuerySnapshotBuilder.js CHANGED
@@ -24,7 +24,7 @@ import { V1_AppliedFunction, V1_CInteger, extractElementNameFromPath as _name, m
24
24
  import { DataCubeQuerySnapshot, } from './DataCubeQuerySnapshot.js';
25
25
  import { _findCol, _toCol, } from './model/DataCubeColumn.js';
26
26
  import { assertTrue, at, guaranteeNonNullable, isNonNullable, } from '@finos/legend-shared';
27
- import { DataCubeFunction, } from './DataCubeQueryEngine.js';
27
+ import { DataCubeColumnKind, DataCubeFunction, } from './DataCubeQueryEngine.js';
28
28
  import { newConfiguration } from './DataCubeConfigurationBuilder.js';
29
29
  import { _colSpecArrayParam, _param, _extractExtendedColumns, _filter, _relationType, _genericTypeParam, _packageableType, _aggCol, _sort, _unwrapLambda, _pivotSort, _groupBySort, _validatePivot, _checkDuplicateColumns, _validateGroupBy, } from './DataCubeQuerySnapshotBuilderUtils.js';
30
30
  import { _deserializeValueSpecification, _serializeValueSpecification, } from './DataCubeQueryBuilderUtils.js';
@@ -452,8 +452,9 @@ function validateAndBuildConfiguration(context, baseQuery, engine) {
452
452
  assertTrue(column.type === _column.type, `Can't process configuration: type mismatch for column '${column.name}' (expected: '${_column.type}', found: '${column.type}')`);
453
453
  // check selection
454
454
  assertTrue(column.isSelected === _column.isSelected, `Can't process configuration: selection mismatch for column '${column.name}' (expected: '${_column.isSelected}', found: '${column.isSelected}')`);
455
- // check kind (only relevant if aggregation is present)
456
- if (data.pivot ?? data.groupBy) {
455
+ // check kind (only relevant if column is either pivot column or group column)
456
+ if (_findCol(data.pivot?.columns ?? [], column.name) ??
457
+ _findCol(data.groupBy?.columns ?? [], column.name)) {
457
458
  assertTrue(column.kind === _column.kind, `Can't process configuration: kind mismatch for column '${column.name}' (expected: '${_column.kind.toLowerCase()}', found: '${column.kind.toLowerCase()}')`);
458
459
  }
459
460
  // check aggregation (only relevant if aggregation is present)
@@ -468,6 +469,11 @@ function validateAndBuildConfiguration(context, baseQuery, engine) {
468
469
  assertTrue(column.excludedFromPivot === _column.excludedFromPivot, `Can't process configuration: pivot exclusion mismatch for column '${column.name}' (expected: '${_column.excludedFromPivot}', found: '${column.excludedFromPivot}')`);
469
470
  assertTrue(column.pivotSortDirection === _column.pivotSortDirection, `Can't process configuration: pivot sort direction mismatch for column '${column.name}' (expected: '${_column.pivotSortDirection?.toLowerCase() ?? 'none'}', found: '${column.pivotSortDirection?.toLowerCase() ?? 'none'}')`);
470
471
  }
472
+ // check for pivot exclusion and column kind enforcement
473
+ if (column.kind === DataCubeColumnKind.DIMENSION &&
474
+ !column.excludedFromPivot) {
475
+ throw new Error(`Can't process configuration: column '${column.name}' is a dimension but not excluded from pivot`);
476
+ }
471
477
  });
472
478
  return config;
473
479
  }
package/lib/stores/core/DataCubeQuerySnapshotBuilder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeQuerySnapshotBuilder.js","sourceRoot":"","sources":["../../../src/stores/core/DataCubeQuerySnapshotBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataCubeQuerySnapshotBuilder.js","sourceRoot":"","sources":["../../../src/stores/core/DataCubeQuerySnapshotBuilder.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-data-cube",
3
- "version": "0.0.46",
3
+ "version": "0.0.48",
4
4
  "description": "Legend DataCube",
5
5
  "keywords": [
6
6
  "legend",
@@ -42,15 +42,15 @@
42
42
  "test:watch": "jest --watch"
43
43
  },
44
44
  "dependencies": {
45
- "@finos/legend-art": "7.1.78",
46
- "@finos/legend-code-editor": "2.0.39",
47
- "@finos/legend-graph": "32.0.7",
48
- "@finos/legend-shared": "11.0.0",
45
+ "@finos/legend-art": "7.1.79",
46
+ "@finos/legend-code-editor": "2.0.41",
47
+ "@finos/legend-graph": "32.0.9",
48
+ "@finos/legend-shared": "11.0.1",
49
49
  "@types/react": "19.0.8",
50
50
  "ag-grid-community": "33.0.4",
51
51
  "ag-grid-enterprise": "33.0.4",
52
52
  "ag-grid-react": "33.0.4",
53
- "mathjs": "14.0.1",
53
+ "mathjs": "14.1.0",
54
54
  "mobx": "6.13.5",
55
55
  "mobx-react-lite": "4.1.0",
56
56
  "monaco-editor": "0.52.2",
@@ -59,10 +59,10 @@
59
59
  "serializr": "3.0.3"
60
60
  },
61
61
  "devDependencies": {
62
- "@finos/legend-dev-utils": "2.1.36",
62
+ "@finos/legend-dev-utils": "2.1.37",
63
63
  "@jest/globals": "29.7.0",
64
64
  "cross-env": "7.0.3",
65
- "eslint": "9.18.0",
65
+ "eslint": "9.19.0",
66
66
  "jest": "29.7.0",
67
67
  "npm-run-all": "4.1.5",
68
68
  "rimraf": "6.0.1",
package/src/stores/core/DataCubeConfigurationBuilder.ts CHANGED
@@ -72,19 +72,18 @@ export function newColumnConfiguration(
72
72
  if (data.groupBy ?? data.pivot) {
73
73
  const groupByAggCol = _findCol(groupByAggColumns, name);
74
74
  const pivotAggCol = _findCol(pivotAggColumns, name);
75
- const aggCol = groupByAggCol ?? pivotAggCol;
76
75
 
77
76
  // process column kind
78
- if (aggCol) {
79
- config.kind = DataCubeColumnKind.MEASURE;
80
- } else if (
77
+ if (
81
78
  _findCol(data.pivot?.columns ?? [], name) ??
82
79
  _findCol(data.groupBy?.columns ?? [], name)
83
80
  ) {
84
81
  config.kind = DataCubeColumnKind.DIMENSION;
82
+ config.excludedFromPivot = true;
85
83
  }
86
84
 
87
85
  // aggregation
86
+ const aggCol = groupByAggCol ?? pivotAggCol;
88
87
  if (aggCol) {
89
88
  config.aggregateOperator = aggCol.operator;
90
89
  config.aggregationParameters = aggCol.parameterValues;
package/src/stores/core/DataCubeQuerySnapshotBuilder.ts CHANGED
@@ -49,6 +49,7 @@ import {
49
49
  isNonNullable,
50
50
  } from '@finos/legend-shared';
51
51
  import {
52
+ DataCubeColumnKind,
52
53
  DataCubeFunction,
53
54
  type DataCubeQueryFunctionMap,
54
55
  } from './DataCubeQueryEngine.js';
@@ -732,8 +733,11 @@ function validateAndBuildConfiguration(
732
733
  `Can't process configuration: selection mismatch for column '${column.name}' (expected: '${_column.isSelected}', found: '${column.isSelected}')`,
733
734
  );
734
735
 
735
- // check kind (only relevant if aggregation is present)
736
- if (data.pivot ?? data.groupBy) {
736
+ // check kind (only relevant if column is either pivot column or group column)
737
+ if (
738
+ _findCol(data.pivot?.columns ?? [], column.name) ??
739
+ _findCol(data.groupBy?.columns ?? [], column.name)
740
+ ) {
737
741
  assertTrue(
738
742
  column.kind === _column.kind,
739
743
  `Can't process configuration: kind mismatch for column '${column.name}' (expected: '${_column.kind.toLowerCase()}', found: '${column.kind.toLowerCase()}')`,
@@ -765,6 +769,16 @@ function validateAndBuildConfiguration(
765
769
  `Can't process configuration: pivot sort direction mismatch for column '${column.name}' (expected: '${_column.pivotSortDirection?.toLowerCase() ?? 'none'}', found: '${column.pivotSortDirection?.toLowerCase() ?? 'none'}')`,
766
770
  );
767
771
  }
772
+
773
+ // check for pivot exclusion and column kind enforcement
774
+ if (
775
+ column.kind === DataCubeColumnKind.DIMENSION &&
776
+ !column.excludedFromPivot
777
+ ) {
778
+ throw new Error(
779
+ `Can't process configuration: column '${column.name}' is a dimension but not excluded from pivot`,
780
+ );
781
+ }
768
782
  });
769
783
 
770
784
  return config;