npm - @finos/legend-query-builder - Versions diffs - 4.17.15 → 4.17.17 - Mend

@finos/legend-query-builder 4.17.15 → 4.17.17

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 (19) hide show

package/lib/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_QueryValueSpecificationBuilderHelper.d.ts","sourceRoot":"","sources":["../../../../../src/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAaH,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EAEzB,KAAK,IAAI,EACT,wBAAwB,EACxB,qBAAqB,EAoCtB,MAAM,qBAAqB,CAAC;AAoU7B,eAAO,MAAM,gCAAgC,GAC3C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAmBF,CAAC;AAEF,eAAO,MAAM,+CAA+C,GAC1D,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAwBF,CAAC;AAEF,eAAO,MAAM,wCAAwC,GACnD,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAyBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAkDF,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAqDF,CAAC;~~AA2QF~~,eAAO,MAAM,iCAAiC,GAC5C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBA0HF,CAAC;AAEF,eAAO,MAAM,oCAAoC,GAC/C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAuIF,CAAC;AAEF,eAAO,MAAM,sCAAsC,GACjD,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,~~wBAyLF~~,CAAC;AAEF,eAAO,MAAM,iCAAiC,GAC5C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAoBF,CAAC;AAEF,eAAO,MAAM,mCAAmC,GAC9C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAAwB,GAAG,SA8D7B,CAAC;AAEF,eAAO,MAAM,qCAAqC,GAChD,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAAwB,GAAG,SA4H7B,CAAC;AAEF,eAAO,MAAM,8CAA8C,GACzD,kBAAkB,wBAAwB,KACzC,IAAI,GAAG,SAGwB,CAAC"}
1	+ {"version":3,"file":"V1_QueryValueSpecificationBuilderHelper.d.ts","sourceRoot":"","sources":["../../../../../src/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAaH,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EAEzB,KAAK,IAAI,EACT,wBAAwB,EACxB,qBAAqB,EAoCtB,MAAM,qBAAqB,CAAC;AAoU7B,eAAO,MAAM,gCAAgC,GAC3C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAmBF,CAAC;AAEF,eAAO,MAAM,+CAA+C,GAC1D,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAwBF,CAAC;AAEF,eAAO,MAAM,wCAAwC,GACnD,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAyBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAkDF,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAqDF,CAAC;AAgRF,eAAO,MAAM,iCAAiC,GAC5C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBA0HF,CAAC;AAEF,eAAO,MAAM,oCAAoC,GAC/C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAuIF,CAAC;AAEF,eAAO,MAAM,sCAAsC,GACjD,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBA2LF,CAAC;AAEF,eAAO,MAAM,iCAAiC,GAC5C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAoBF,CAAC;AAEF,eAAO,MAAM,mCAAmC,GAC9C,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAAwB,GAAG,SA8D7B,CAAC;AAEF,eAAO,MAAM,qCAAqC,GAChD,cAAc,MAAM,EACpB,YAAY,qBAAqB,EAAE,EACnC,eAAe,MAAM,EAAE,EACvB,gBAAgB,sBAAsB,EACtC,mBAAmB,oBAAoB,KACtC,wBAAwB,GAAG,SA4H7B,CAAC;AAEF,eAAO,MAAM,8CAA8C,GACzD,kBAAkB,wBAAwB,KACzC,IAAI,GAAG,SAGwB,CAAC"}

package/lib/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.js CHANGED Viewed

@@ -214,7 +214,7 @@ const V1_buildTypedProjectFunctionExpression = (functionName, parameters, openVa
         pColSpec.name = colSpec.name;
         const returnType = getValueSpecificationReturnType(lambda);
         if (returnType) {
-            relationType.columns.push(new RelationColumn(colSpec.name, returnType));
+            relationType.columns.push(new RelationColumn(colSpec.name, GenericTypeExplicitReference.create(new GenericType(returnType))));
         }
         else {
             throw new UnsupportedOperationError('Unable to get return type for current lambda');
@@ -454,9 +454,9 @@ export const V1_buildTypedGroupByFunctionExpression = (functionName, parameters,
             // For now, we temporarily set the return type of the column in the groupBy() expression to be
             // the same as the return type of the column in the preceding project() expression.
             // The actual return type for the groupBy() expression will be determined when we process/build the graph.
-            const returnType = projectRelationReturnType.columns.find((_column) => _column.name === colSpec.name)?.type;
-            if (returnType) {
-                relationType.columns.push(new RelationColumn(colSpec.name, returnType));
+            const genericType = projectRelationReturnType.columns.find((_column) => _column.name === colSpec.name)?.genericType;
+            if (genericType) {
+                relationType.columns.push(new RelationColumn(colSpec.name, genericType));
             }
             else {
                 throw new UnsupportedOperationError(`Unable to find projected column with name ${colSpec.name}`);

package/lib/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_QueryValueSpecificationBuilderHelper.js","sourceRoot":"","sources":["../../../../../src/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"V1_QueryValueSpecificationBuilderHelper.js","sourceRoot":"","sources":["../../../../../src/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"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"}

package/lib/index.css CHANGED Viewed

@@ -1,4 +1,4 @@
-/** @license @finos/legend-query-builder v4.17.15
+/** @license @finos/legend-query-builder v4.17.17
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-query-builder",
-    "version": "4.17.15",
+    "version": "4.17.17",
     "description": "Legend query builder core",
     "keywords": [
         "legend",

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderRelationAggregationValueSpecBuilder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderRelationAggregationValueSpecBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderRelationAggregationValueSpecBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,kBAAkB,EAEvB,wBAAwB,EAczB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AASvE,eAAO,MAAM,wBAAwB,GACnC,qBAAqB,kBAAkB,EACvC,UAAU,oBAAoB,KAC7B,~~wBAmJF~~,CAAC"}
1	+ {"version":3,"file":"QueryBuilderRelationAggregationValueSpecBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderRelationAggregationValueSpecBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,kBAAkB,EAEvB,wBAAwB,EAczB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AASvE,eAAO,MAAM,wBAAwB,GACnC,qBAAqB,kBAAkB,EACvC,UAAU,oBAAoB,KAC7B,wBAyJF,CAAC"}

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderRelationAggregationValueSpecBuilder.js CHANGED Viewed

@@ -49,7 +49,7 @@ export const buildRelationAggregation = (precedingExpression, tdsState) => {
         groupByColSpecArray.colSpecs.push(colSpec);
         // Add column return type to relationType
         const returnType = guaranteeNonNullable(projectionColumnState.getColumnType(), `Can't create value spec for projection column ${projectionColumnState.columnName}. Missing type.`);
-        relationType.columns.push(new RelationColumn(projectionColumnState.columnName, returnType));
+        relationType.columns.push(new RelationColumn(projectionColumnState.columnName, GenericTypeExplicitReference.create(new GenericType(returnType))));
     });
     // Add aggregation columns to aggregationCols
     tdsState.aggregationState.columns.forEach((aggregationColumnState) => {
@@ -79,7 +79,7 @@ export const buildRelationAggregation = (precedingExpression, tdsState) => {
         colSpec.function2 = reduceLambda;
         // Add column return type to relationType
         const returnType = guaranteeNonNullable(aggregationColumnState.getColumnType(), `Can't create value spec for aggregation column ${aggregationColumnState.columnName}. Missing type.`);
-        relationType.columns.push(new RelationColumn(aggregationColumnState.columnName, returnType));
+        relationType.columns.push(new RelationColumn(aggregationColumnState.columnName, GenericTypeExplicitReference.create(new GenericType(returnType))));
     });
     groupByFunction.parametersValues = [
         precedingExpression,

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderRelationAggregationValueSpecBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderRelationAggregationValueSpecBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderRelationAggregationValueSpecBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,YAAY,EAEZ,0BAA0B,EAC1B,wBAAwB,EACxB,oBAAoB,EACpB,YAAY,EACZ,OAAO,EACP,WAAW,EACX,4BAA4B,EAC5B,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,QAAQ,EACR,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,iDAAiD,CAAC;AAEpG,OAAO,EAAE,uCAAuC,EAAE,MAAM,kDAAkD,CAAC;AAC3G,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAEvE,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,mBAAuC,EACvC,QAA8B,EACJ,EAAE;IAC5B,yDAAyD;IACzD,MAAM,eAAe,GAAG,aAAa,CACnC,mBAAmB,EACnB,wBAAwB,CACzB,CAAC;IACF,IACE,eAAe,CAAC,YAAY;QAC5B,0BAA0B,CACxB,iCAAiC,CAAC,gBAAgB,CACnD,EACD,CAAC;QACD,MAAM,IAAI,yBAAyB,CACjC,oGAAoG,CACrG,CAAC;IACJ,CAAC;IAED,6BAA6B;IAC7B,MAAM,eAAe,GAAG,IAAI,wBAAwB,CAClD,0BAA0B,CACxB,iCAAiC,CAAC,iBAAiB,CACpD,CACF,CAAC;IACF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;IAErD,iCAAiC;IACjC,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC1E,MAAM,mBAAmB,GAAG,IAAI,YAAY,EAAE,CAAC;IAC/C,WAAW,CAAC,MAAM,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAE3C,4BAA4B;IAC5B,MAAM,eAAe,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9E,MAAM,uBAAuB,GAAG,IAAI,YAAY,EAAE,CAAC;IACnD,eAAe,CAAC,MAAM,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAEnD,6BAA6B;IAC7B,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAEvD,qDAAqD;IACrD,QAAQ,CAAC,iBAAiB;SACvB,MAAM,CACL,CAAC,qBAAqB,EAAE,EAAE,CACxB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CACrC,CAAC,sBAAsB,EAAE,EAAE,CACzB,sBAAsB,CAAC,qBAAqB;QAC5C,qBAAqB,CACxB,CACJ;SACA,OAAO,CAAC,CAAC,qBAAqB,EAAE,EAAE;QACjC,+CAA+C;QAC/C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,GAAG,qBAAqB,CAAC,UAAU,CAAC;QAChD,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3C,yCAAyC;QACzC,MAAM,UAAU,GAAG,oBAAoB,CACrC,qBAAqB,CAAC,aAAa,EAAE,EACrC,iDAAiD,qBAAqB,CAAC,UAAU,iBAAiB,CACnG,CAAC;QACF,YAAY,CAAC,OAAO,CAAC,IAAI,CACvB,IAAI,cAAc,~~CAAC~~,qBAAqB,CAAC,UAAU,~~EAAE~~,UAAU,CAAC,CACjE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,6CAA6C;IAC7C,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,sBAAsB,EAAE,EAAE;QACnE,mDAAmD;QACnD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,GAAG,sBAAsB,CAAC,UAAU,CAAC;QACjD,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE/C,iCAAiC;QACjC,uGAAuG;QACvG,MAAM,iBAAiB,GAAG,oBAAoB,CAC5C,oBAAoB,CACjB,eAAe,CAAC,gBAAgB,CAAC,CAAC,CAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,EACvE,oEAAoE,CACrE,CAAC,QAAQ,CAAC,IAAI,CACb,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,sBAAsB,CAAC,UAAU,CAClE,EACD,gEAAgE,sBAAsB,CAAC,UAAU,GAAG,CACrG,CAAC;QACF,MAAM,2BAA2B,GAAG,aAAa,CAC/C,aAAa,CAAC,iBAAiB,CAAC,SAAS,EAAE,2BAA2B,CAAC;aACpE,MAAM,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,EACnC,0BAA0B,CAC3B,CAAC;QACF,MAAM,iBAAiB,GAAG,aAAa,CACrC,2BAA2B,CAAC,IAAI,CAAC,KAAK,EACtC,QAAQ,CACT,CAAC;QACF,sEAAsE;QACtE,MAAM,qBAAqB,GAAG,IAAI,0BAA0B,CAAC,EAAE,CAAC,CAAC;QACjE,qBAAqB,CAAC,IAAI,GAAG,yBAAyB,CAAC,MAAM,CAC3D,IAAI,QAAQ,CACV,iBAAiB,CAAC,IAAI,EACtB,iBAAiB,CAAC,YAAY,EAC9B,iBAAiB,CAAC,WAAW,EAC7B,iBAAiB,CAAC,MAAM,CACzB,CACF,CAAC;QACF,qBAAqB,CAAC,gBAAgB,GAAG;YACvC,IAAI,kBAAkB,CAAC,4BAA4B,EAAE,YAAY,CAAC,GAAG,CAAC;SACvE,CAAC;QACF,MAAM,SAAS,GAAG,uCAAuC,CACvD,4BAA4B,EAC5B,CAAC,qBAAqB,CAAC,EACvB,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC1C,CAAC;QACF,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QAE9B,8BAA8B;QAC9B,MAAM,YAAY,GAAG,uCAAuC,CAC1D,sBAAsB,CAAC,mBAAmB,EAC1C;YACE,sBAAsB,CAAC,QAAQ,CAAC,iCAAiC,CAC/D,sBAAsB,CACvB;SACF,EACD,sBAAsB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,iBAAiB;aAC/D,iBAAiB,CAAC,KAAK,CAC3B,CAAC;QACF,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;QAEjC,yCAAyC;QACzC,MAAM,UAAU,GAAG,oBAAoB,CACrC,sBAAsB,CAAC,aAAa,EAAE,EACtC,kDAAkD,sBAAsB,CAAC,UAAU,iBAAiB,CACrG,CAAC;QACF,YAAY,CAAC,OAAO,CAAC,IAAI,CACvB,IAAI,cAAc,~~CAAC~~,sBAAsB,CAAC,UAAU,~~EAAE~~,UAAU,CAAC,~~CAClE~~,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,eAAe,CAAC,gBAAgB,GAAG;QACjC,mBAAmB;QACnB,WAAW;QACX,eAAe;KAChB,CAAC;IACF,MAAM,mBAAmB,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/D,MAAM,uBAAuB,GAAG,IAAI,WAAW,CAAC,YAAY,CAAC,CAAC;IAC9D,mBAAmB,CAAC,aAAa,GAAG;QAClC,4BAA4B,CAAC,MAAM,CAAC,uBAAuB,CAAC;KAC7D,CAAC;IACF,eAAe,CAAC,WAAW;QACzB,4BAA4B,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC3D,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC"}
1	+ {"version":3,"file":"QueryBuilderRelationAggregationValueSpecBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderRelationAggregationValueSpecBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,YAAY,EAEZ,0BAA0B,EAC1B,wBAAwB,EACxB,oBAAoB,EACpB,YAAY,EACZ,OAAO,EACP,WAAW,EACX,4BAA4B,EAC5B,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,QAAQ,EACR,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,iDAAiD,CAAC;AAEpG,OAAO,EAAE,uCAAuC,EAAE,MAAM,kDAAkD,CAAC;AAC3G,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAEvE,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,mBAAuC,EACvC,QAA8B,EACJ,EAAE;IAC5B,yDAAyD;IACzD,MAAM,eAAe,GAAG,aAAa,CACnC,mBAAmB,EACnB,wBAAwB,CACzB,CAAC;IACF,IACE,eAAe,CAAC,YAAY;QAC5B,0BAA0B,CACxB,iCAAiC,CAAC,gBAAgB,CACnD,EACD,CAAC;QACD,MAAM,IAAI,yBAAyB,CACjC,oGAAoG,CACrG,CAAC;IACJ,CAAC;IAED,6BAA6B;IAC7B,MAAM,eAAe,GAAG,IAAI,wBAAwB,CAClD,0BAA0B,CACxB,iCAAiC,CAAC,iBAAiB,CACpD,CACF,CAAC;IACF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;IAErD,iCAAiC;IACjC,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC1E,MAAM,mBAAmB,GAAG,IAAI,YAAY,EAAE,CAAC;IAC/C,WAAW,CAAC,MAAM,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAE3C,4BAA4B;IAC5B,MAAM,eAAe,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9E,MAAM,uBAAuB,GAAG,IAAI,YAAY,EAAE,CAAC;IACnD,eAAe,CAAC,MAAM,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAEnD,6BAA6B;IAC7B,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAEvD,qDAAqD;IACrD,QAAQ,CAAC,iBAAiB;SACvB,MAAM,CACL,CAAC,qBAAqB,EAAE,EAAE,CACxB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CACrC,CAAC,sBAAsB,EAAE,EAAE,CACzB,sBAAsB,CAAC,qBAAqB;QAC5C,qBAAqB,CACxB,CACJ;SACA,OAAO,CAAC,CAAC,qBAAqB,EAAE,EAAE;QACjC,+CAA+C;QAC/C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,GAAG,qBAAqB,CAAC,UAAU,CAAC;QAChD,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3C,yCAAyC;QACzC,MAAM,UAAU,GAAG,oBAAoB,CACrC,qBAAqB,CAAC,aAAa,EAAE,EACrC,iDAAiD,qBAAqB,CAAC,UAAU,iBAAiB,CACnG,CAAC;QACF,YAAY,CAAC,OAAO,CAAC,IAAI,CACvB,IAAI,cAAc,CAChB,qBAAqB,CAAC,UAAU,EAChC,4BAA4B,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC,CACjE,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,6CAA6C;IAC7C,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,sBAAsB,EAAE,EAAE;QACnE,mDAAmD;QACnD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,GAAG,sBAAsB,CAAC,UAAU,CAAC;QACjD,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE/C,iCAAiC;QACjC,uGAAuG;QACvG,MAAM,iBAAiB,GAAG,oBAAoB,CAC5C,oBAAoB,CACjB,eAAe,CAAC,gBAAgB,CAAC,CAAC,CAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,EACvE,oEAAoE,CACrE,CAAC,QAAQ,CAAC,IAAI,CACb,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,sBAAsB,CAAC,UAAU,CAClE,EACD,gEAAgE,sBAAsB,CAAC,UAAU,GAAG,CACrG,CAAC;QACF,MAAM,2BAA2B,GAAG,aAAa,CAC/C,aAAa,CAAC,iBAAiB,CAAC,SAAS,EAAE,2BAA2B,CAAC;aACpE,MAAM,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,EACnC,0BAA0B,CAC3B,CAAC;QACF,MAAM,iBAAiB,GAAG,aAAa,CACrC,2BAA2B,CAAC,IAAI,CAAC,KAAK,EACtC,QAAQ,CACT,CAAC;QACF,sEAAsE;QACtE,MAAM,qBAAqB,GAAG,IAAI,0BAA0B,CAAC,EAAE,CAAC,CAAC;QACjE,qBAAqB,CAAC,IAAI,GAAG,yBAAyB,CAAC,MAAM,CAC3D,IAAI,QAAQ,CACV,iBAAiB,CAAC,IAAI,EACtB,iBAAiB,CAAC,YAAY,EAC9B,iBAAiB,CAAC,WAAW,EAC7B,iBAAiB,CAAC,MAAM,CACzB,CACF,CAAC;QACF,qBAAqB,CAAC,gBAAgB,GAAG;YACvC,IAAI,kBAAkB,CAAC,4BAA4B,EAAE,YAAY,CAAC,GAAG,CAAC;SACvE,CAAC;QACF,MAAM,SAAS,GAAG,uCAAuC,CACvD,4BAA4B,EAC5B,CAAC,qBAAqB,CAAC,EACvB,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC1C,CAAC;QACF,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QAE9B,8BAA8B;QAC9B,MAAM,YAAY,GAAG,uCAAuC,CAC1D,sBAAsB,CAAC,mBAAmB,EAC1C;YACE,sBAAsB,CAAC,QAAQ,CAAC,iCAAiC,CAC/D,sBAAsB,CACvB;SACF,EACD,sBAAsB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,iBAAiB;aAC/D,iBAAiB,CAAC,KAAK,CAC3B,CAAC;QACF,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;QAEjC,yCAAyC;QACzC,MAAM,UAAU,GAAG,oBAAoB,CACrC,sBAAsB,CAAC,aAAa,EAAE,EACtC,kDAAkD,sBAAsB,CAAC,UAAU,iBAAiB,CACrG,CAAC;QACF,YAAY,CAAC,OAAO,CAAC,IAAI,CACvB,IAAI,cAAc,CAChB,sBAAsB,CAAC,UAAU,EACjC,4BAA4B,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC,CACjE,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,eAAe,CAAC,gBAAgB,GAAG;QACjC,mBAAmB;QACnB,WAAW;QACX,eAAe;KAChB,CAAC;IACF,MAAM,mBAAmB,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/D,MAAM,uBAAuB,GAAG,IAAI,WAAW,CAAC,YAAY,CAAC,CAAC;IAC9D,mBAAmB,CAAC,aAAa,GAAG;QAClC,4BAA4B,CAAC,MAAM,CAAC,uBAAuB,CAAC;KAC7D,CAAC;IACF,eAAe,CAAC,WAAW;QACzB,4BAA4B,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC3D,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC"}

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderTypedAggregationStateBuilder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderTypedAggregationStateBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderTypedAggregationStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,cAAc,~~EAKnB~~,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,+BAA+B,CAAC;AAMvC,eAAO,MAAM,8BAA8B,GACzC,SAAS,OAAO,EAChB,kBAAkB,wBAAwB,GAAG,SAAS,EACtD,mBAAmB,iBAAiB,KACnC,~~IAuHF~~,CAAC;AAEF,eAAO,MAAM,6BAA6B,GACxC,YAAY,wBAAwB,EACpC,mBAAmB,iBAAiB,EACpC,cAAc,cAAc,KAC3B,IAiEF,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,YAAY,wBAAwB,KACnC,OAWF,CAAC"}
1	+ {"version":3,"file":"QueryBuilderTypedAggregationStateBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderTypedAggregationStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,cAAc,EAOnB,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,+BAA+B,CAAC;AAMvC,eAAO,MAAM,8BAA8B,GACzC,SAAS,OAAO,EAChB,kBAAkB,wBAAwB,GAAG,SAAS,EACtD,mBAAmB,iBAAiB,KACnC,IAyHF,CAAC;AAEF,eAAO,MAAM,6BAA6B,GACxC,YAAY,wBAAwB,EACpC,mBAAmB,iBAAiB,EACpC,cAAc,cAAc,KAC3B,IAiEF,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,YAAY,wBAAwB,KACnC,OAWF,CAAC"}

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderTypedAggregationStateBuilder.js CHANGED Viewed

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ColSpecArrayInstance, LambdaFunctionInstanceValue, matchFunctionName, RelationType, SimpleFunctionExpression, VariableExpression, } from '@finos/legend-graph';
+import { ColSpecArrayInstance, GenericType, GenericTypeExplicitReference, LambdaFunctionInstanceValue, matchFunctionName, RelationType, SimpleFunctionExpression, VariableExpression, } from '@finos/legend-graph';
 import { assertTrue, assertType, guaranteeNonNullable, guaranteeType, returnUndefOnError, UnsupportedOperationError, } from '@finos/legend-shared';
 import { QUERY_BUILDER_LAMBDA_WRITER_MODE, } from '../../../QueryBuilderState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
@@ -59,8 +59,10 @@ export const processTypedAggregationColSpec = (colSpec, parentExpression, queryB
                 const parentGroupByRelationType = guaranteeType(parentExpression?.genericType?.value.typeArguments?.[0]?.value
                     .rawType, RelationType, `Can't process colSpec: parent groupBy() expression's return type is not a relation`);
                 const relationTypeColumn = guaranteeNonNullable(parentGroupByRelationType.columns.find((_column) => _column.name === colSpec.name), `Can't process colSpec: Can't find column '${colSpec.name}' in parent groupBy() expression's relation return type`);
-                relationTypeColumn.type =
-                    aggregateColumnState.getColumnType() ?? relationTypeColumn.type;
+                const columnType = aggregateColumnState.getColumnType();
+                relationTypeColumn.genericType = columnType
+                    ? GenericTypeExplicitReference.create(new GenericType(columnType))
+                    : relationTypeColumn.genericType;
                 return;
             }
         }

package/lib/stores/fetch-structure/tds/aggregation/QueryBuilderTypedAggregationStateBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderTypedAggregationStateBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderTypedAggregationStateBuilder.ts"],"names":[],"mappings":"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~~kBAAkB~~,~~CAAC~~,~~IAAI;oBACrB~~,oBAAoB,CAAC,aAAa,EAAE,~~IAAI~~,kBAAkB,CAAC,IAAI,CAAC;~~gBAClE~~,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,IAAI,yBAAyB,CACjC,gHAAgH,CACjH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,UAAoC,EACpC,iBAAoC,EACpC,YAA4B,EACtB,EAAE;IACR,mBAAmB;IACnB,UAAU,CACR,UAAU,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EACxC,mEAAmE,CACpE,CAAC;IAEF,2EAA2E;IAC3E,MAAM,mBAAmB,GAAG,aAAa,CACvC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,wBAAwB,EACxB,gGAAgG,CACjG,CAAC;IACF,UAAU,CACR,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,EAAE;QAClD,iCAAiC,CAAC,gBAAgB;KACnD,CAAC,EACF,qGAAqG,CACtG,CAAC;IACF,uCAAuC,CAAC,OAAO,CAC7C,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,CAClB,CAAC;IAEF,MAAM,QAAQ,GAAG,aAAa,CAC5B,iBAAiB,CAAC,mBAAmB,CAAC,cAAc,EACpD,oBAAoB,CACrB,CAAC;IAEF,wFAAwF;IACxF,MAAM,iBAAiB,GAAG,aAAa,CACrC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,oBAAoB,EACpB,gGAAgG,CACjG,CAAC;IACF,UAAU,CACR,iBAAiB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EACrC,+GAA+G,CAChH,CAAC;IACF,iBAAiB,CAAC,kBAAkB,CAClC,gCAAgC,CAAC,qBAAqB,CACvD,CAAC;IACF,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACxD,UAAU,CACR,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAC/B,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,CAAC,UAAU,KAAK,OAAO,CAAC,IAAI,CACjE,CAAC,MAAM,KAAK,CAAC,EACd,+CAA+C,OAAO,CAAC,IAAI,qCAAqC,CACjG,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,8BAA8B;IAC9B,MAAM,kBAAkB,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC1D,UAAU,CACR,kBAAkB,EAClB,oBAAoB,EACpB,gGAAgG,CACjG,CAAC;IACF,uCAAuC,CAAC,YAAY,CAClD,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,iBAAiB,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,UAAoC,EAC3B,EAAE;IACX,OAAO,CACL,UAAU,CAAC,YAAY;QACrB,iCAAiC,CAAC,iBAAiB;QACrD,CAAC,iBAAiB,CAAC,UAAU,CAAC,YAAY,EAAE;YAC1C,iCAAiC,CAAC,YAAY;YAC9C,iCAAiC,CAAC,iBAAiB;SACpD,CAAC;YACA,UAAU,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC;YACxC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,YAAY,oBAAoB,CAAC,CAClE,CAAC;AACJ,CAAC,CAAC"}
1	+ {"version":3,"file":"QueryBuilderTypedAggregationStateBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/aggregation/QueryBuilderTypedAggregationStateBuilder.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuilder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderRelationProjectValueSpecBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,kBAAkB,EAEvB,wBAAwB,EAazB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,yDAAyD,CAAC;AAMjE,eAAO,MAAM,uBAAuB,GAClC,qBAAqB,kBAAkB,EACvC,UAAU,oBAAoB,EAC9B,UAAU,2BAA2B,KACpC,~~wBA8EF~~,CAAC"}
1	+ {"version":3,"file":"QueryBuilderRelationProjectValueSpecBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,kBAAkB,EAEvB,wBAAwB,EAazB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,yDAAyD,CAAC;AAMjE,eAAO,MAAM,uBAAuB,GAClC,qBAAqB,kBAAkB,EACvC,UAAU,oBAAoB,EAC9B,UAAU,2BAA2B,KACpC,wBAiFF,CAAC"}

package/lib/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuilder.js CHANGED Viewed

@@ -50,7 +50,7 @@ export const buildRelationProjection = (precedingExpression, tdsState, options)
         }
         colSpec.function1 = columnLambda;
         const returnType = guaranteeNonNullable(projectionColumnState.getColumnType(), `Can't create value spec for projection column ${projectionColumnState.columnName}`);
-        relationType.columns.push(new RelationColumn(projectionColumnState.columnName, returnType));
+        relationType.columns.push(new RelationColumn(projectionColumnState.columnName, GenericTypeExplicitReference.create(new GenericType(returnType))));
     });
     projectFunction.parametersValues = [precedingExpression, instanceVal];
     const relationGenericType = new GenericType(Relation.INSTANCE);

package/lib/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderRelationProjectValueSpecBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,YAAY,EAEZ,0BAA0B,EAC1B,wBAAwB,EACxB,oBAAoB,EACpB,YAAY,EACZ,OAAO,EACP,mCAAmC,EACnC,iCAAiC,EACjC,qBAAqB,EACrB,iCAAiC,EACjC,WAAW,EACX,4BAA4B,EAC5B,QAAQ,EACR,cAAc,EACd,YAAY,GACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,iDAAiD,CAAC;AACpG,OAAO,EACL,2CAA2C,EAC3C,uCAAuC,GACxC,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,uCAAuC,EAAE,MAAM,kDAAkD,CAAC;AAC3G,OAAO,EACL,4BAA4B,GAE7B,MAAM,yDAAyD,CAAC;AACjE,OAAO,EACL,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,mBAAuC,EACvC,QAA8B,EAC9B,OAAqC,EACX,EAAE;IAC5B,MAAM,eAAe,GAAG,IAAI,wBAAwB,CAClD,0BAA0B,CACxB,iCAAiC,CAAC,gBAAgB,CACnD,CACF,CAAC;IACF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;IAErD,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE1E,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IACxC,WAAW,CAAC,MAAM,GAAG,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAEvD,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,qBAAqB,EAAE,EAAE;QAC3D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpC,OAAO,CAAC,IAAI,GAAG,qBAAqB,CAAC,UAAU,CAAC;QAChD,oBAAoB;QACpB,IAAI,YAAgC,CAAC;QACrC,IACE,qBAAqB,YAAY,uCAAuC,EACxE,CAAC;YACD,YAAY,GAAG,uCAAuC,CACpD,qBAAqB,CAAC,mBAAmB,EACzC;gBACE,4BAA4B,CAC1B,qBAAqB,CAAC,uBAAuB,CAAC,kBAAkB,EAChE,qBAAqB,CAAC,uBAAuB,CAAC,iBAAiB,EAC/D,qBAAqB,CAAC,mBAAmB,EACzC,OAAO,CACR;aACF,EACD,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAC1C,CAAC;QACJ,CAAC;aAAM,IACL,qBAAqB;YACrB,2CAA2C,EAC3C,CAAC;YACD,YAAY,GAAG,IAAI,mCAAmC,CACpD,iCAAiC,CAC/B,qBAAqB,CACnB,qBAAqB,CAAC,MAAM,EAC5B,IAAI,iCAAiC;YACnC,iDAAiD;YACjD,EAAE,CACH;iBACE,6BAA6B,CAC5B,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC,CACxC;iBACA,KAAK,EAAE,CACX,CACF,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,yBAAyB,CACjC,uFAAuF,EACvF,qBAAqB,CACtB,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;QACjC,MAAM,UAAU,GAAG,oBAAoB,CACrC,qBAAqB,CAAC,aAAa,EAAE,EACrC,iDAAiD,qBAAqB,CAAC,UAAU,EAAE,CACpF,CAAC;QACF,YAAY,CAAC,OAAO,CAAC,IAAI,CACvB,IAAI,cAAc,~~CAAC~~,qBAAqB,CAAC,UAAU,~~EAAE~~,UAAU,CAAC,CACjE,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,eAAe,CAAC,gBAAgB,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;IACtE,MAAM,mBAAmB,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/D,MAAM,uBAAuB,GAAG,IAAI,WAAW,CAAC,YAAY,CAAC,CAAC;IAC9D,mBAAmB,CAAC,aAAa,GAAG;QAClC,4BAA4B,CAAC,MAAM,CAAC,uBAAuB,CAAC;KAC7D,CAAC;IACF,eAAe,CAAC,WAAW;QACzB,4BAA4B,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC3D,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC"}
1	+ {"version":3,"file":"QueryBuilderRelationProjectValueSpecBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuilder.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "4.17.15",
+  "version": "4.17.17",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -44,10 +44,10 @@
   "dependencies": {
     "@finos/legend-application": "16.0.58",
     "@finos/legend-art": "7.1.112",
-    "@finos/legend-code-editor": "2.0.97",
-    "@finos/legend-data-cube": "0.3.3",
-    "@finos/legend-graph": "32.1.55",
-    "@finos/legend-lego": "2.0.104",
+    "@finos/legend-code-editor": "2.0.99",
+    "@finos/legend-data-cube": "0.3.5",
+    "@finos/legend-graph": "32.1.57",
+    "@finos/legend-lego": "2.0.106",
     "@finos/legend-server-depot": "6.0.97",
     "@finos/legend-shared": "11.0.18",
     "@finos/legend-storage": "3.0.137",

package/src/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts CHANGED Viewed

@@ -691,7 +691,12 @@ const V1_buildTypedProjectFunctionExpression = (
     pColSpec.name = colSpec.name;
     const returnType = getValueSpecificationReturnType(lambda);
     if (returnType) {
-      relationType.columns.push(new RelationColumn(colSpec.name, returnType));
+      relationType.columns.push(
+        new RelationColumn(
+          colSpec.name,
+          GenericTypeExplicitReference.create(new GenericType(returnType)),
+        ),
+      );
     } else {
       throw new UnsupportedOperationError(
         'Unable to get return type for current lambda',
@@ -1299,11 +1304,13 @@ export const V1_buildTypedGroupByFunctionExpression = (
       // For now, we temporarily set the return type of the column in the groupBy() expression to be
       // the same as the return type of the column in the preceding project() expression.
       // The actual return type for the groupBy() expression will be determined when we process/build the graph.
-      const returnType = projectRelationReturnType.columns.find(
+      const genericType = projectRelationReturnType.columns.find(
         (_column) => _column.name === colSpec.name,
-      )?.type;
-      if (returnType) {
-        relationType.columns.push(new RelationColumn(colSpec.name, returnType));
+      )?.genericType;
+      if (genericType) {
+        relationType.columns.push(
+          new RelationColumn(colSpec.name, genericType),
+        );
       } else {
         throw new UnsupportedOperationError(
           `Unable to find projected column with name ${colSpec.name}`,

package/src/stores/fetch-structure/tds/aggregation/QueryBuilderRelationAggregationValueSpecBuilder.ts CHANGED Viewed

@@ -106,7 +106,10 @@ export const buildRelationAggregation = (
         `Can't create value spec for projection column ${projectionColumnState.columnName}. Missing type.`,
       );
       relationType.columns.push(
-        new RelationColumn(projectionColumnState.columnName, returnType),
+        new RelationColumn(
+          projectionColumnState.columnName,
+          GenericTypeExplicitReference.create(new GenericType(returnType)),
+        ),
       );
     });
@@ -176,7 +179,10 @@ export const buildRelationAggregation = (
       `Can't create value spec for aggregation column ${aggregationColumnState.columnName}. Missing type.`,
     );
     relationType.columns.push(
-      new RelationColumn(aggregationColumnState.columnName, returnType),
+      new RelationColumn(
+        aggregationColumnState.columnName,
+        GenericTypeExplicitReference.create(new GenericType(returnType)),
+      ),
     );
   });

package/src/stores/fetch-structure/tds/aggregation/QueryBuilderTypedAggregationStateBuilder.ts CHANGED Viewed

@@ -18,6 +18,8 @@ import {
   type ColSpec,
   type LambdaFunction,
   ColSpecArrayInstance,
+  GenericType,
+  GenericTypeExplicitReference,
   LambdaFunctionInstanceValue,
   matchFunctionName,
   RelationType,
@@ -155,8 +157,10 @@ export const processTypedAggregationColSpec = (
           ),
           `Can't process colSpec: Can't find column '${colSpec.name}' in parent groupBy() expression's relation return type`,
         );
-        relationTypeColumn.type =
-          aggregateColumnState.getColumnType() ?? relationTypeColumn.type;
+        const columnType = aggregateColumnState.getColumnType();
+        relationTypeColumn.genericType = columnType
+          ? GenericTypeExplicitReference.create(new GenericType(columnType))
+          : relationTypeColumn.genericType;
         return;
       }
     }

package/src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuilder.ts CHANGED Viewed

@@ -118,7 +118,10 @@ export const buildRelationProjection = (
       `Can't create value spec for projection column ${projectionColumnState.columnName}`,
     );
     relationType.columns.push(
-      new RelationColumn(projectionColumnState.columnName, returnType),
+      new RelationColumn(
+        projectionColumnState.columnName,
+        GenericTypeExplicitReference.create(new GenericType(returnType)),
+      ),
     );
   });
   projectFunction.parametersValues = [precedingExpression, instanceVal];