@finos/legend-query-builder 0.4.4 → 0.5.0

package/lib/stores/QueryBuilderStateBuilder.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { QueryBuilderState } from './QueryBuilderState.js';
-import { type EnumValueInstanceValue, type FunctionExpression, type GraphFetchTreeInstanceValue, type ValueSpecificationVisitor, type InstanceValue, type INTERNAL__UnknownValueSpecification, type LambdaFunction, type CollectionInstanceValue, type LambdaFunctionInstanceValue, type PrimitiveInstanceValue, SimpleFunctionExpression, type VariableExpression, type AbstractPropertyExpression, type INTERNAL__PropagatedValue, type ValueSpecification } from '@finos/legend-graph';
+import { type EnumValueInstanceValue, type FunctionExpression, type GraphFetchTreeInstanceValue, type ValueSpecificationVisitor, type InstanceValue, type INTERNAL__UnknownValueSpecification, type LambdaFunction, type CollectionInstanceValue, type LambdaFunctionInstanceValue, PrimitiveInstanceValue, SimpleFunctionExpression, type VariableExpression, type AbstractPropertyExpression, type INTERNAL__PropagatedValue, type ValueSpecification } from '@finos/legend-graph';
 /**
  * This is the value specification processor (a.k.a state builder) for query builder.
  *
@@ -93,13 +93,14 @@ export declare class QueryBuilderValueSpecificationProcessor implements ValueSpe
      * value specification.
      */
     readonly parentExpression?: SimpleFunctionExpression | undefined;
+    readonly parentLambda: LambdaFunction;
     private constructor();
-    static process(valueSpecification: ValueSpecification, queryBuilderState: QueryBuilderState): void;
+    static process(valueSpecification: ValueSpecification, parentLambda: LambdaFunction, queryBuilderState: QueryBuilderState): void;
     /**
      * Process value specification with information about parent function expression
      * in order to be used in some validation/assertion
      */
-    static processChild(valueSpecification: ValueSpecification, parentExpression: SimpleFunctionExpression, queryBuilderState: QueryBuilderState): void;
+    static processChild(valueSpecification: ValueSpecification, parentExpression: SimpleFunctionExpression, parentLambda: LambdaFunction, queryBuilderState: QueryBuilderState): void;
     visit_INTERNAL__UnknownValueSpecification(valueSpecification: INTERNAL__UnknownValueSpecification): void;
     visit_INTERNAL__PropagatedValue(valueSpecification: INTERNAL__PropagatedValue): void;
     visit_FunctionExpression(valueSpecification: FunctionExpression): void;

package/lib/stores/QueryBuilderStateBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderStateBuilder.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,KAAK,yBAAyB,EAC9B,KAAK,aAAa,EAClB,KAAK,mCAAmC,EACxC,KAAK,cAAc,EAInB,KAAK,uBAAuB,EAC5B,KAAK,2BAA2B,EAChC,KAAK,sBAAsB,EAC3B,wBAAwB,EACxB,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAE/B,KAAK,yBAAyB,EAC9B,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAuF7B;;;;;;;;;;;;;GAaG;AACH,qBAAa,uCACX,YAAW,yBAAyB,CAAC,IAAI,CAAC;IAE1C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4DG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;IAEjE,OAAO;IAQP,MAAM,CAAC,OAAO,CACZ,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB,GACnC,IAAI;IAMP;;;OAGG;IACH,MAAM,CAAC,YAAY,CACjB,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,wBAAwB,EAC1C,iBAAiB,EAAE,iBAAiB,GACnC,IAAI;IASP,yCAAyC,CACvC,kBAAkB,EAAE,mCAAmC,GACtD,IAAI;IA0BP,+BAA+B,CAC7B,kBAAkB,EAAE,yBAAyB,GAC5C,IAAI;IAIP,wBAAwB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAItE,8BAA8B,CAC5B,kBAAkB,EAAE,wBAAwB,GAC3C,IAAI;IA0LP,wBAAwB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAItE,gCAAgC,CAC9B,kBAAkB,EAAE,0BAA0B,GAC7C,IAAI;IAyBP,mBAAmB,CAAC,kBAAkB,EAAE,aAAa,GAAG,IAAI;IAI5D,6BAA6B,CAC3B,kBAAkB,EAAE,uBAAuB,GAC1C,IAAI;IAIP,4BAA4B,CAC1B,kBAAkB,EAAE,sBAAsB,GACzC,IAAI;IAIP,4BAA4B,CAC1B,kBAAkB,EAAE,sBAAsB,GACzC,IAAI;IAIP,iCAAiC,CAC/B,kBAAkB,EAAE,2BAA2B,GAC9C,IAAI;IAaP,iCAAiC,CAC/B,kBAAkB,EAAE,2BAA2B,GAC9C,IAAI;CAGR;AAED,eAAO,MAAM,iBAAiB,eAChB,kBAAkB,EAAE,qBACb,iBAAiB,KACnC,IAWF,CAAC;AAEF,eAAO,MAAM,0BAA0B,mBACrB,cAAc,qBACX,iBAAiB,KACnC,IAaF,CAAC"}
+{"version":3,"file":"QueryBuilderStateBuilder.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAWH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,KAAK,yBAAyB,EAC9B,KAAK,aAAa,EAClB,KAAK,mCAAmC,EACxC,KAAK,cAAc,EAGnB,KAAK,uBAAuB,EAC5B,KAAK,2BAA2B,EAChC,sBAAsB,EACtB,wBAAwB,EACxB,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAE/B,KAAK,yBAAyB,EAC9B,KAAK,kBAAkB,EAExB,MAAM,qBAAqB,CAAC;AA6F7B;;;;;;;;;;;;;GAaG;AACH,qBAAa,uCACX,YAAW,yBAAyB,CAAC,IAAI,CAAC;IAE1C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4DG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC;IAEtC,OAAO;IAUP,MAAM,CAAC,OAAO,CACZ,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,cAAc,EAC5B,iBAAiB,EAAE,iBAAiB,GACnC,IAAI;IAUP;;;OAGG;IACH,MAAM,CAAC,YAAY,CACjB,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,wBAAwB,EAC1C,YAAY,EAAE,cAAc,EAC5B,iBAAiB,EAAE,iBAAiB,GACnC,IAAI;IAUP,yCAAyC,CACvC,kBAAkB,EAAE,mCAAmC,GACtD,IAAI;IA0BP,+BAA+B,CAC7B,kBAAkB,EAAE,yBAAyB,GAC5C,IAAI;IAIP,wBAAwB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAItE,8BAA8B,CAC5B,kBAAkB,EAAE,wBAAwB,GAC3C,IAAI;IAiOP,wBAAwB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAItE,gCAAgC,CAC9B,kBAAkB,EAAE,0BAA0B,GAC7C,IAAI;IAyBP,mBAAmB,CAAC,kBAAkB,EAAE,aAAa,GAAG,IAAI;IAI5D,6BAA6B,CAC3B,kBAAkB,EAAE,uBAAuB,GAC1C,IAAI;IAIP,4BAA4B,CAC1B,kBAAkB,EAAE,sBAAsB,GACzC,IAAI;IAIP,4BAA4B,CAC1B,kBAAkB,EAAE,sBAAsB,GACzC,IAAI;IAIP,iCAAiC,CAC/B,kBAAkB,EAAE,2BAA2B,GAC9C,IAAI;IAcP,iCAAiC,CAC/B,kBAAkB,EAAE,2BAA2B,GAC9C,IAAI;CAGR;AAED,eAAO,MAAM,iBAAiB,eAChB,kBAAkB,EAAE,qBACb,iBAAiB,KACnC,IAWF,CAAC;AAEF,eAAO,MAAM,0BAA0B,mBACrB,cAAc,qBACX,iBAAiB,KACnC,IAcF,CAAC"}

package/lib/stores/QueryBuilderStateBuilder.js

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { assertNonNullable, assertTrue, assertType, guaranteeType, UnsupportedOperationError, } from '@finos/legend-shared';
-import { MILESTONING_STEREOTYPE, matchFunctionName, Class, SimpleFunctionExpression, getMilestoneTemporalStereotype, } from '@finos/legend-graph';
+import { assertNonNullable, assertTrue, assertType, guaranteeIsString, guaranteeNonNullable, guaranteeType, UnsupportedOperationError, } from '@finos/legend-shared';
+import { matchFunctionName, Class, PrimitiveInstanceValue, SimpleFunctionExpression, getMilestoneTemporalStereotype, SUPPORTED_FUNCTIONS, } from '@finos/legend-graph';
 import { processTDSPostFilterExpression } from './fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.js';
 import { processFilterExpression } from './filter/QueryBuilderFilterStateBuilder.js';
 import { processTDSAggregateExpression, processTDSGroupByExpression, } from './fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.js';
@@ -22,37 +22,39 @@ import { processGraphFetchExpression, processGraphFetchSerializeExpression, } fr
 import { processTDSDistinctExpression, processTDSProjectExpression, processTDSProjectionColumnPropertyExpression, processTDSProjectionDerivationExpression, processTDSSortDirectionExpression, processTDSSortExpression, processTDSTakeExpression, } from './fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
 import { LambdaParameterState } from './shared/LambdaParameterState.js';
-import { processTDS_OLAPGroupByExpression } from './fetch-structure/tds/olapGroupBy/QueryBuilderOLAPGroupByStateBuilder_.js';
+import { processTDS_OLAPGroupByExpression } from './fetch-structure/tds/olapGroupBy/QueryBuilderOLAPGroupByStateBuilder.js';
 import { processWatermarkExpression } from './watermark/QueryBuilderWatermarkStateBuilder.js';
+import { QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
 const processGetAllExpression = (expression, queryBuilderState) => {
     const _class = expression.genericType?.value.rawType;
     assertType(_class, Class, `Can't process getAll() expression: getAll() return type is missing`);
     queryBuilderState.setClass(_class);
-    queryBuilderState.milestoningState.updateMilestoningConfiguration();
+    queryBuilderState.milestoningState.clearMilestoningDates();
     queryBuilderState.explorerState.refreshTreeData();
     // check parameters (milestoning) and build state
-    let acceptedNoOfParameters = 1;
+    const acceptedNoOfParameters = 1;
     const stereotype = getMilestoneTemporalStereotype(_class, queryBuilderState.graphManagerState.graph);
-    switch (stereotype) {
-        case MILESTONING_STEREOTYPE.BITEMPORAL:
-            acceptedNoOfParameters = 3;
-            assertTrue(expression.parametersValues.length === acceptedNoOfParameters, `Can't process getAll() expression: when used with a bitemporal milestoned class getAll() expects two parameters`);
-            queryBuilderState.milestoningState.setProcessingDate(expression.parametersValues[1]);
-            queryBuilderState.milestoningState.setBusinessDate(expression.parametersValues[2]);
-            break;
-        case MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL:
-            acceptedNoOfParameters = 2;
-            assertTrue(expression.parametersValues.length === acceptedNoOfParameters, `Can't process getAll() expression: when used with a milestoned class getAll() expects a parameter`);
-            queryBuilderState.milestoningState.setBusinessDate(expression.parametersValues[1]);
-            break;
-        case MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL:
-            acceptedNoOfParameters = 2;
-            assertTrue(expression.parametersValues.length === acceptedNoOfParameters, `Can't process getAll() expression: when used with a milestoned class getAll() expects a parameter`);
-            queryBuilderState.milestoningState.setProcessingDate(expression.parametersValues[1]);
-            break;
-        default:
-            assertTrue(expression.parametersValues.length === acceptedNoOfParameters, `Can't process getAll() expression: getAll() expects no arguments`);
+    if (stereotype) {
+        queryBuilderState.milestoningState
+            .getMilestoningImplementation(stereotype)
+            .processGetAllParamaters(expression.parametersValues);
     }
+    else {
+        assertTrue(expression.parametersValues.length === acceptedNoOfParameters, `Can't process getAll() expression: getAll() expects no arguments`);
+    }
+};
+const processLetExpression = (expression, queryBuilderState, parentLambda) => {
+    const parameters = expression.parametersValues;
+    assertTrue(expression.parametersValues.length === 2, 'Let function expected to have two parameters (left and right side value)');
+    // process left side (var)
+    const letVariable = guaranteeIsString(guaranteeType(parameters[0], PrimitiveInstanceValue, 'Can`t process let function: left side should be a primitive instance value').values[0], 'Can`t process let function: left side should be a string primitive instance value');
+    const varExp = guaranteeNonNullable(parentLambda.openVariables.get(letVariable), `Unable to find variable ${letVariable} in lambda function`);
+    // process right side (value)
+    const rightSide = guaranteeNonNullable(parameters[1]);
+    // final
+    const constantExpression = new QueryBuilderConstantExpressionState(queryBuilderState, varExp, rightSide);
+    queryBuilderState.constantState.setShowConstantPanel(true);
+    queryBuilderState.constantState.addConstant(constantExpression);
 };
 /**
  * This is the value specification processor (a.k.a state builder) for query builder.
@@ -132,19 +134,21 @@ export class QueryBuilderValueSpecificationProcessor {
      * value specification.
      */
     parentExpression;
-    constructor(queryBuilderState, parentExpression) {
+    parentLambda;
+    constructor(queryBuilderState, parentLambda, parentExpression) {
         this.queryBuilderState = queryBuilderState;
         this.parentExpression = parentExpression;
+        this.parentLambda = parentLambda;
     }
-    static process(valueSpecification, queryBuilderState) {
-        valueSpecification.accept_ValueSpecificationVisitor(new QueryBuilderValueSpecificationProcessor(queryBuilderState, undefined));
+    static process(valueSpecification, parentLambda, queryBuilderState) {
+        valueSpecification.accept_ValueSpecificationVisitor(new QueryBuilderValueSpecificationProcessor(queryBuilderState, parentLambda, undefined));
     }
     /**
      * Process value specification with information about parent function expression
      * in order to be used in some validation/assertion
      */
-    static processChild(valueSpecification, parentExpression, queryBuilderState) {
-        valueSpecification.accept_ValueSpecificationVisitor(new QueryBuilderValueSpecificationProcessor(queryBuilderState, parentExpression));
+    static processChild(valueSpecification, parentExpression, parentLambda, queryBuilderState) {
+        valueSpecification.accept_ValueSpecificationVisitor(new QueryBuilderValueSpecificationProcessor(queryBuilderState, parentLambda, parentExpression));
     }
     visit_INTERNAL__UnknownValueSpecification(valueSpecification) {
         assertNonNullable(this.parentExpression, `Can't process unknown value: parent expression cannot be retrieved`);
@@ -182,7 +186,7 @@ export class QueryBuilderValueSpecificationProcessor {
             assertTrue(valueSpecification.parametersValues.length === 2, `Can't process filter() expression: filter() expects 1 argument`);
             // check preceding expression
             const precedingExpression = guaranteeType(valueSpecification.parametersValues[0], SimpleFunctionExpression, `Can't process filter() expression: only support filter() immediately following an expression`);
-            QueryBuilderValueSpecificationProcessor.process(precedingExpression, this.queryBuilderState);
+            QueryBuilderValueSpecificationProcessor.process(precedingExpression, this.parentLambda, this.queryBuilderState);
             if (matchFunctionName(precedingExpression.functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.GET_ALL)) {
                 assertTrue(matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.FILTER), `Can't process filter() expression: only supports ${QUERY_BUILDER_SUPPORTED_FUNCTIONS.FILTER}() immediately following getAll() (got '${functionName}')`);
                 processFilterExpression(valueSpecification, this.queryBuilderState);
@@ -208,23 +212,23 @@ export class QueryBuilderValueSpecificationProcessor {
             }
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.WATERMARK)) {
-            processWatermarkExpression(valueSpecification, this.queryBuilderState);
+            processWatermarkExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT)) {
-            processTDSProjectExpression(valueSpecification, this.queryBuilderState);
+            processTDSProjectExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_TAKE)) {
-            processTDSTakeExpression(valueSpecification, this.queryBuilderState);
+            processTDSTakeExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DISTINCT)) {
-            processTDSDistinctExpression(valueSpecification, this.queryBuilderState);
+            processTDSDistinctExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_SORT)) {
-            processTDSSortExpression(valueSpecification, this.queryBuilderState);
+            processTDSSortExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, [
@@ -235,26 +239,30 @@ export class QueryBuilderValueSpecificationProcessor {
             return;
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY)) {
-            processTDSGroupByExpression(valueSpecification, this.queryBuilderState);
+            processTDSGroupByExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_AGG)) {
-            processTDSAggregateExpression(valueSpecification, this.parentExpression, this.queryBuilderState);
+            processTDSAggregateExpression(valueSpecification, this.parentExpression, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY)) {
-            processTDS_OLAPGroupByExpression(valueSpecification, this.queryBuilderState);
+            processTDS_OLAPGroupByExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.SERIALIZE)) {
-            processGraphFetchSerializeExpression(valueSpecification, this.queryBuilderState);
+            processGraphFetchSerializeExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         else if (matchFunctionName(functionName, [
             QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED,
             QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH,
         ])) {
-            processGraphFetchExpression(valueSpecification, this.queryBuilderState);
+            processGraphFetchExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
+            return;
+        }
+        else if (matchFunctionName(functionName, [SUPPORTED_FUNCTIONS.LET])) {
+            processLetExpression(valueSpecification, this.queryBuilderState, this.parentLambda);
             return;
         }
         throw new UnsupportedOperationError(`Can't process expression of function ${functionName}()`);
@@ -287,7 +295,7 @@ export class QueryBuilderValueSpecificationProcessor {
         throw new UnsupportedOperationError();
     }
     visit_LambdaFunctionInstanceValue(valueSpecification) {
-        valueSpecification.values.forEach((value) => value.expressionSequence.forEach((expression) => expression.accept_ValueSpecificationVisitor(new QueryBuilderValueSpecificationProcessor(this.queryBuilderState, this.parentExpression))));
+        valueSpecification.values.forEach((value) => value.expressionSequence.forEach((expression) => expression.accept_ValueSpecificationVisitor(new QueryBuilderValueSpecificationProcessor(this.queryBuilderState, this.parentLambda, this.parentExpression))));
     }
     visit_GraphFetchTreeInstanceValue(valueSpecification) {
         throw new UnsupportedOperationError();
@@ -305,6 +313,6 @@ export const processQueryLambdaFunction = (lambdaFunction, queryBuilderState) =>
     if (lambdaFunction.functionType.parameters.length) {
         processParameters(lambdaFunction.functionType.parameters, queryBuilderState);
     }
-    lambdaFunction.expressionSequence.map((expression) => QueryBuilderValueSpecificationProcessor.process(expression, queryBuilderState));
+    lambdaFunction.expressionSequence.map((expression) => QueryBuilderValueSpecificationProcessor.process(expression, lambdaFunction, queryBuilderState));
 };
 //# sourceMappingURL=QueryBuilderStateBuilder.js.map

package/lib/stores/QueryBuilderStateBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderStateBuilder.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderStateBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderStateBuilder.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderStateBuilder.ts"],"names":[],"mappings":"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"}

package/lib/stores/QueryBuilderValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAWL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAiCpG,eAAO,MAAM,mBAAmB,sBACX,iBAAiB,YAC1B,2BAA2B,KACpC,cAuGF,CAAC"}
+{"version":3,"file":"QueryBuilderValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAWL,cAAc,EAKf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAkDpG,eAAO,MAAM,mBAAmB,sBACX,iBAAiB,YAC1B,2BAA2B,KACpC,cAmEF,CAAC"}

package/lib/stores/QueryBuilderValueSpecificationBuilder.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { Multiplicity, getMilestoneTemporalStereotype, extractElementNameFromPath, InstanceValue, PackageableElementExplicitReference, CORE_PURE_PATH, FunctionType, GenericType, GenericTypeExplicitReference, LambdaFunction, SimpleFunctionExpression, MILESTONING_STEREOTYPE, } from '@finos/legend-graph';
+import { Multiplicity, getMilestoneTemporalStereotype, extractElementNameFromPath, InstanceValue, PackageableElementExplicitReference, CORE_PURE_PATH, FunctionType, GenericType, GenericTypeExplicitReference, LambdaFunction, SimpleFunctionExpression, PrimitiveInstanceValue, PrimitiveType, SUPPORTED_FUNCTIONS, } from '@finos/legend-graph';
 import { buildFilterExpression } from './filter/QueryBuilderFilterValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
 import { buildWatermarkExpression } from './watermark/QueryBuilderWatermarkValueSpecificationBuilder.js';
@@ -26,6 +26,15 @@ const buildGetAllFunction = (_class, multiplicity) => {
     _func.parametersValues.push(classInstance);
     return _func;
 };
+const buildLetExpression = (constantExpressionState) => {
+    const varName = constantExpressionState.variable.name;
+    const value = constantExpressionState.value;
+    const leftSide = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)));
+    leftSide.values = [varName];
+    const letFunc = new SimpleFunctionExpression(extractElementNameFromPath(SUPPORTED_FUNCTIONS.LET));
+    letFunc.parametersValues = [leftSide, value];
+    return letFunc;
+};
 const buildFetchStructure = (fetchStructureState, lambdaFunction, options) => {
     fetchStructureState.implementation.appendFetchStructure(lambdaFunction, options);
 };
@@ -37,36 +46,25 @@ export const buildLambdaFunction = (queryBuilderState, options) => {
     // build milestoning parameter(s) for getAll()
     const milestoningStereotype = getMilestoneTemporalStereotype(_class, queryBuilderState.graphManagerState.graph);
     if (milestoningStereotype) {
-        switch (milestoningStereotype) {
-            case MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL: {
-                getAllFunction.parametersValues.push(guaranteeNonNullable(queryBuilderState.milestoningState.businessDate, `Milestoning class should have a parameter of type 'Date'`));
-                break;
-            }
-            case MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL: {
-                getAllFunction.parametersValues.push(guaranteeNonNullable(queryBuilderState.milestoningState.processingDate, `Milestoning class should have a parameter of type 'Date'`));
-                break;
-            }
-            case MILESTONING_STEREOTYPE.BITEMPORAL: {
-                getAllFunction.parametersValues.push(guaranteeNonNullable(queryBuilderState.milestoningState.processingDate, `Milestoning class should have a parameter of type 'Date'`));
-                getAllFunction.parametersValues.push(guaranteeNonNullable(queryBuilderState.milestoningState.businessDate, `Milestoning class should have a parameter of type 'Date'`));
-                break;
-            }
-            default:
-        }
+        queryBuilderState.milestoningState
+            .getMilestoningImplementation(milestoningStereotype)
+            .buildGetAllParameters(getAllFunction);
     }
     lambdaFunction.expressionSequence[0] = getAllFunction;
     // build watermark
-    const watermarkFunction = buildWatermarkExpression(queryBuilderState.watermarkState, getAllFunction);
-    if (watermarkFunction) {
-        lambdaFunction.expressionSequence[0] = watermarkFunction;
-    }
+    buildWatermarkExpression(queryBuilderState.watermarkState, lambdaFunction);
     // build filter
-    const filterFunction = buildFilterExpression(queryBuilderState.filterState, watermarkFunction ?? getAllFunction);
-    if (filterFunction) {
-        lambdaFunction.expressionSequence[0] = filterFunction;
-    }
+    buildFilterExpression(queryBuilderState.filterState, lambdaFunction);
     // build fetch-structure
     buildFetchStructure(queryBuilderState.fetchStructureState, lambdaFunction, options);
+    // build variable expressions
+    if (queryBuilderState.constantState.constants.length) {
+        const letExpressions = queryBuilderState.constantState.constants.map(buildLetExpression);
+        lambdaFunction.expressionSequence = [
+            ...letExpressions,
+            ...lambdaFunction.expressionSequence,
+        ];
+    }
     // build parameters
     if (queryBuilderState.parametersState.parameterStates.length) {
         if (options?.isBuildingExecutionQuery) {

package/lib/stores/QueryBuilderValueSpecificationBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderValueSpecificationBuilder.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderValueSpecificationBuilder.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}

package/lib/stores/QueryBuilderValueSpecificationBuilderHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderValueSpecificationBuilderHelper.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAS1B,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAkGhE,eAAO,MAAM,4BAA4B,uBACnB,0BAA0B,qBAC3B,iBAAiB,uBACf,MAAM,sCAOS,OAAO,KAC1C,kBAyFF,CAAC;AAEF,oBAAY,2BAA2B,GAAG;IACxC;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C,CAAC"}
+{"version":3,"file":"QueryBuilderValueSpecificationBuilderHelper.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAM1B,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAO7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAiBhE,eAAO,MAAM,4BAA4B,uBACnB,0BAA0B,qBAC3B,iBAAiB,uBACf,MAAM,sCAOS,OAAO,KAC1C,kBAqFF,CAAC;AAEF,oBAAY,2BAA2B,GAAG;IACxC;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C,CAAC"}

package/lib/stores/QueryBuilderValueSpecificationBuilderHelper.js

@@ -13,82 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AbstractPropertyExpression, Class, DerivedProperty, getMilestoneTemporalStereotype, INTERNAL__PropagatedValue, matchFunctionName, MILESTONING_STEREOTYPE, SimpleFunctionExpression, VariableExpression, } from '@finos/legend-graph';
+import { AbstractPropertyExpression, DerivedProperty, INTERNAL__PropagatedValue, matchFunctionName, SimpleFunctionExpression, VariableExpression, } from '@finos/legend-graph';
 import { getNullableFirstElement, guaranteeNonNullable, guaranteeType, } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
-import { getDerivedPropertyMilestoningSteoreotype } from './QueryBuilderPropertyEditorState.js';
+import { variableExpression_setName } from './shared/ValueSpecificationModifierHelper.js';
 /**
- * Checks if the provided property expression match the criteria for default
- * date propagation so we know whether we need to fill in values for the parameter
- * or just propgate values from the parent's expression
- *
- * NOTE: this takes date propgation into account. See the table below for all
- * the combination:
- *
- *             | [source] |          |          |          |          |
- * ----------------------------------------------------------------------
- *   [target]  |          |   NONE   |  PR_TMP  |  BI_TMP  |  BU_TMP  |
- * ----------------------------------------------------------------------
- *             |   NONE   |   N.A.   |   PRD    | PRD,BUD  |    BUD   |
- * ----------------------------------------------------------------------
- *             |  PR_TMP  |   N.A.   |    X     | PRD,BUD  |    BUD   |
- * ----------------------------------------------------------------------
- *             |  BI_TMP  |   N.A.   |    X     |    X     |    X     |
- * ----------------------------------------------------------------------
- *             |  BU_TMP  |   N.A.   |   PRD    | PRD,BUD  |    X     |
- * ----------------------------------------------------------------------
- *
- * Annotations:
- *
- * [source]: source temporal type
- * [target]: target temporal type
- *
- * PR_TMP  : processing temporal
- * BI_TMP  : bitemporal
- * BU_TMP  : business temporal
- *
- * X       : no default date propagated
- * PRD     : default processing date is propagated
- * BUD     : default business date is propgated
+ * Gets the value of ValueSpecification given INTERNAL__PropagatedValue is pointing to.
  */
-const isDefaultDatePropagationSupported = (currentPropertyExpression, queryBuilderState, prevPropertyExpression) => {
-    const property = currentPropertyExpression.func.value;
-    const graph = queryBuilderState.graphManagerState.graph;
-    // Default date propagation is not supported for current expression when the previous property expression is a derived property.
-    if (prevPropertyExpression &&
-        prevPropertyExpression.func.value instanceof DerivedProperty &&
-        prevPropertyExpression.func.value._OWNER.derivedProperties.includes(prevPropertyExpression.func.value)) {
-        return false;
-    }
-    // Default date propagation is not supported for current expression when the milestonedParameterValues of
-    // the previous property expression doesn't match with the global milestonedParameterValues
-    if (prevPropertyExpression &&
-        prevPropertyExpression.func.value.genericType.value.rawType instanceof Class) {
-        const milestoningStereotype = getMilestoneTemporalStereotype(prevPropertyExpression.func.value.genericType.value.rawType, graph);
-        if (milestoningStereotype &&
-            !prevPropertyExpression.parametersValues
-                .slice(1)
-                .every((parameterValue) => parameterValue instanceof INTERNAL__PropagatedValue)) {
-            return false;
-        }
-    }
-    if (property.genericType.value.rawType instanceof Class) {
-        // the stereotype of source class of current property expression.
-        const sourceStereotype = property instanceof DerivedProperty
-            ? getDerivedPropertyMilestoningSteoreotype(property, graph)
-            : undefined;
-        // Default date propagation is always supported if the source is `bitemporal`
-        if (sourceStereotype === MILESTONING_STEREOTYPE.BITEMPORAL) {
-            return true;
-        }
-        // the stereotype (if exists) of the generic type of current property expression.
-        const targetStereotype = getMilestoneTemporalStereotype(property.genericType.value.rawType, graph);
-        // Default date propagation is supported when stereotype of both source and target matches
-        if (sourceStereotype && targetStereotype) {
-            return sourceStereotype === targetStereotype;
-        }
+const getValueOfInternalPropagatedValue = (valueSpec) => {
+    if (valueSpec.getValue() instanceof INTERNAL__PropagatedValue) {
+        return getValueOfInternalPropagatedValue(guaranteeType(valueSpec.getValue(), INTERNAL__PropagatedValue));
     }
-    return false;
+    return valueSpec.getValue();
 };
 export const buildPropertyExpressionChain = (propertyExpression, queryBuilderState, lambdaParameterName, 
 /**
@@ -122,9 +58,7 @@ TEMPORARY__disableDatePropagation) => {
                 if (parameterValue instanceof INTERNAL__PropagatedValue) {
                     // Replace with argumentless derived property expression only when default date propagation is supported
                     if (!TEMPORARY__disableDatePropagation &&
-                        isDefaultDatePropagationSupported(currentPropertyExpression, queryBuilderState, nextExpression instanceof AbstractPropertyExpression
-                            ? nextExpression
-                            : undefined)) {
+                        parameterValue.isPropagatedValue) {
                         // NOTE: For `bitemporal` property check if the property expression has parameters which are not instance of
                         // `INTERNAL_PropagatedValue` then pass the parameters as user explicitly changed values of either of the parameters.
                         if ((index === 1 &&
@@ -132,9 +66,11 @@ TEMPORARY__disableDatePropagation) => {
                             (index === 0 &&
                                 currentPropertyExpression.parametersValues.length === 3 &&
                                 !(currentPropertyExpression.parametersValues[2] instanceof
-                                    INTERNAL__PropagatedValue))) {
+                                    INTERNAL__PropagatedValue &&
+                                    currentPropertyExpression.parametersValues[2]
+                                        .isPropagatedValue === true))) {
                             currentPropertyExpression.parametersValues[index + 1] =
-                                parameterValue.getValue();
+                                getValueOfInternalPropagatedValue(parameterValue);
                         }
                         else {
                             currentPropertyExpression.parametersValues = [
@@ -145,7 +81,7 @@ TEMPORARY__disableDatePropagation) => {
                     }
                     else {
                         currentPropertyExpression.parametersValues[index + 1] =
-                            parameterValue.getValue();
+                            getValueOfInternalPropagatedValue(parameterValue);
                     }
                 }
             });
@@ -160,7 +96,7 @@ TEMPORARY__disableDatePropagation) => {
     }
     // Update the root lambda name based on the parent's lambda parameter name.
     if (currentExpression instanceof VariableExpression) {
-        currentExpression.name = lambdaParameterName;
+        variableExpression_setName(currentExpression, lambdaParameterName);
     }
     return newPropertyExpression;
 };

package/lib/stores/QueryBuilderValueSpecificationBuilderHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderValueSpecificationBuilderHelper.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderValueSpecificationBuilderHelper.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"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"}

package/lib/stores/QueryBuilderValueSpecificationHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderValueSpecificationHelper.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,kBAAkB,EAIvB,2BAA2B,EAC3B,cAAc,EAKd,KAAK,IAAI,EAGT,wBAAwB,EAIxB,0BAA0B,EAQ1B,uBAAuB,EAGxB,MAAM,qBAAqB,CAAC;AAa7B,eAAO,MAAM,sCAAsC,uBAC7B,kBAAkB,KACrC,IAAI,GAAG,SAWT,CAAC;AAEF,eAAO,MAAM,mCAAmC,UACvC,SAAS,UACR,kBAAkB,EAAE,KAC3B,IAAI,GAAG,SAsCT,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,wBAAwB,KACnC,wBAAwB,GAAG,SAa7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,eACjB,kBAAkB,KAC7B,kBAMF,CAAC;AAEF,eAAO,MAAM,iCAAiC,eAChC,kBAAkB,GAAG,SAAS,KACzC,OAiBF,CAAC;AAEF,eAAO,MAAM,6BAA6B,SAClC,IAAI,GAAG,SAAS,kBACN,IAAI,KACnB,OA6BF,CAAC;AAEF,eAAO,MAAM,oCAAoC,SACzC,cAAc,KACnB,OAqBF,CAAC;AAEF,eAAO,MAAM,uCAAuC,wBAC7B,MAAM,yBACJ,kBAAkB,EAAE,SACpC,SAAS,KACf,2BAeF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,eAAO,MAAM,+BAA+B,uBACtB,0BAA0B,SACvC,SAAS,KACf,IAoDF,CAAC;AAEF,eAAO,MAAM,sCAAsC,UAC1C,kBAAkB,KACxB,MAAM,GAAG,SAKX,CAAC;AAEF,eAAO,MAAM,sCAAsC,UAC1C,kBAAkB,KACxB,MAAM,GAAG,SAKX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,UAAW,SAAS,KAAG,uBAMnD,CAAC"}
+{"version":3,"file":"QueryBuilderValueSpecificationHelper.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,kBAAkB,EAIvB,2BAA2B,EAC3B,cAAc,EAKd,KAAK,IAAI,EAGT,wBAAwB,EAIxB,0BAA0B,EAO1B,uBAAuB,EAGxB,MAAM,qBAAqB,CAAC;AAgB7B,eAAO,MAAM,sCAAsC,uBAC7B,kBAAkB,KACrC,IAAI,GAAG,SAWT,CAAC;AAEF,eAAO,MAAM,mCAAmC,UACvC,SAAS,UACR,kBAAkB,EAAE,KAC3B,IAAI,GAAG,SAsCT,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,wBAAwB,KACnC,wBAAwB,GAAG,SAa7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,eACjB,kBAAkB,KAC7B,kBAMF,CAAC;AAEF,eAAO,MAAM,iCAAiC,eAChC,kBAAkB,GAAG,SAAS,KACzC,OAiBF,CAAC;AAEF,eAAO,MAAM,6BAA6B,SAClC,IAAI,GAAG,SAAS,kBACN,IAAI,KACnB,OA6BF,CAAC;AAEF,eAAO,MAAM,oCAAoC,SACzC,cAAc,KACnB,OAsBF,CAAC;AAEF,eAAO,MAAM,uCAAuC,wBAC7B,MAAM,yBACJ,kBAAkB,EAAE,SACpC,SAAS,KACf,2BAeF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,eAAO,MAAM,+BAA+B,uBACtB,0BAA0B,SACvC,SAAS,KACf,IA8BF,CAAC;AAEF,eAAO,MAAM,sCAAsC,UAC1C,kBAAkB,KACxB,MAAM,GAAG,SAKX,CAAC;AAEF,eAAO,MAAM,sCAAsC,UAC1C,kBAAkB,KACxB,MAAM,GAAG,SAKX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,UAAW,SAAS,KAAG,uBAMnD,CAAC"}

package/lib/stores/QueryBuilderValueSpecificationHelper.js

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { CORE_PURE_PATH, FunctionType, LambdaFunction, LambdaFunctionInstanceValue, PRIMITIVE_TYPE, VariableExpression, DATE_FORMAT, DATE_TIME_FORMAT, matchFunctionName, PrimitiveInstanceValue, EnumValueInstanceValue, SimpleFunctionExpression, PrimitiveType, extractElementNameFromPath, AbstractPropertyExpression, isSuperType, Class, getMilestoneTemporalStereotype, DerivedProperty, MILESTONING_STEREOTYPE, PackageableElementExplicitReference, Multiplicity, CollectionInstanceValue, GenericTypeExplicitReference, GenericType, } from '@finos/legend-graph';
+import { CORE_PURE_PATH, FunctionType, LambdaFunction, LambdaFunctionInstanceValue, PRIMITIVE_TYPE, VariableExpression, DATE_FORMAT, DATE_TIME_FORMAT, matchFunctionName, PrimitiveInstanceValue, EnumValueInstanceValue, SimpleFunctionExpression, PrimitiveType, extractElementNameFromPath, AbstractPropertyExpression, isSuperType, Class, getMilestoneTemporalStereotype, DerivedProperty, PackageableElementExplicitReference, Multiplicity, CollectionInstanceValue, GenericTypeExplicitReference, GenericType, } from '@finos/legend-graph';
 import { addUniqueEntry, formatDate, guaranteeNonNullable, guaranteeType, isNumber, isString, UnsupportedOperationError, } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
-import { getDerivedPropertyMilestoningSteoreotype } from './QueryBuilderPropertyEditorState.js';
+import { getDerivedPropertyMilestoningSteoreotype, validateMilestoningPropertyExpressionChain, } from './milestoning/QueryBuilderMilestoningHelper.js';
 export const getNonCollectionValueSpecificationType = (valueSpecification) => {
     if (valueSpecification instanceof PrimitiveInstanceValue) {
         return valueSpecification.genericType.value.rawType;
@@ -133,6 +133,7 @@ export const generateDefaultValueForPrimitiveType = (type) => {
         case PRIMITIVE_TYPE.DECIMAL:
         case PRIMITIVE_TYPE.FLOAT:
         case PRIMITIVE_TYPE.INTEGER:
+        case PRIMITIVE_TYPE.BINARY:
             return 0;
         case PRIMITIVE_TYPE.DATE:
         case PRIMITIVE_TYPE.STRICTDATE:
@@ -195,24 +196,7 @@ export const validatePropertyExpressionChain = (propertyExpression, graph) => {
             const targetStereotype = getMilestoneTemporalStereotype(propertyExpression.func.value.genericType.value.rawType, graph);
             if (targetStereotype) {
                 const sourceStereotype = getDerivedPropertyMilestoningSteoreotype(guaranteeType(func, DerivedProperty), graph);
-                if (sourceStereotype !== MILESTONING_STEREOTYPE.BITEMPORAL &&
-                    targetStereotype !== sourceStereotype) {
-                    if (targetStereotype === MILESTONING_STEREOTYPE.BITEMPORAL) {
-                        if (propertyExpression.parametersValues.length !== 3 &&
-                            !sourceStereotype) {
-                            throw new UnsupportedOperationError(`Property of milestoning sterotype '${MILESTONING_STEREOTYPE.BITEMPORAL}' should have exactly two parameters`);
-                        }
-                        else if (propertyExpression.parametersValues.length < 2) {
-                            throw new UnsupportedOperationError(`Property of milestoning sterotype '${MILESTONING_STEREOTYPE.BITEMPORAL}' should have at least one parameter`);
-                        }
-                        else if (propertyExpression.parametersValues.length > 3) {
-                            throw new UnsupportedOperationError(`Property of milestoning sterotype '${MILESTONING_STEREOTYPE.BITEMPORAL}' should not have more than two parameters`);
-                        }
-                    }
-                    else if (propertyExpression.parametersValues.length !== 2) {
-                        throw new UnsupportedOperationError(`Property of milestoning sterotype '${targetStereotype}' should have exactly one parameter`);
-                    }
-                }
+                validateMilestoningPropertyExpressionChain(sourceStereotype, targetStereotype, propertyExpression);
             }
         }
     }