@finos/legend-query-builder 4.9.3 → 4.9.4

package/src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateCalendarFunction.ts

@@ -23,7 +23,6 @@ import {
   AbstractPropertyExpression,
   INTERNAL__UnknownValueSpecification,
   LambdaFunctionInstanceValue,
-  type PrimitiveInstanceValue,
   type SimpleFunctionExpression,
   type ValueSpecification,
 } from '@finos/legend-graph';
@@ -42,7 +41,7 @@ export abstract class QueryBuilderAggregateCalendarFunction
 {
   dateColumn?: AbstractPropertyExpression | undefined;
   calendarType!: QUERY_BUILDER_CALENDAR_TYPE;
-  endDate!: PrimitiveInstanceValue;
+  endDate!: ValueSpecification;
   lambdaParameterName: string = DEFAULT_LAMBDA_VARIABLE_NAME;
 
   constructor() {
@@ -122,7 +121,7 @@ export abstract class QueryBuilderAggregateCalendarFunction
     this.calendarType = val;
   }
 
-  setEndDate(val: PrimitiveInstanceValue): void {
+  setEndDate(val: ValueSpecification): void {
     this.endDate = val;
   }
 

package/src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.ts

@@ -15,7 +15,7 @@
  */
 
 import {
-  type ValueSpecification,
+  ValueSpecification,
   SimpleFunctionExpression,
   extractElementNameFromPath,
   matchFunctionName,
@@ -44,7 +44,7 @@ export const buildCalendarFunctionExpression = (
   calendarFunctionFullPath: string,
   dateColumn: AbstractPropertyExpression | undefined,
   calendarType: QUERY_BUILDER_CALENDAR_TYPE,
-  endDate: PrimitiveInstanceValue,
+  endDate: ValueSpecification,
   targetColumn:
     | AbstractPropertyExpression
     | INTERNAL__UnknownValueSpecification,
@@ -165,15 +165,16 @@ export const updateAggregateColumnState = (
 
     const endDate = guaranteeType(
       expression.parametersValues[2],
-      PrimitiveInstanceValue,
+      ValueSpecification,
       `Can't process ${extractElementNameFromPath(
         calendarFunctionFullPath,
       )}() expression: only support ${extractElementNameFromPath(
         calendarFunctionFullPath,
-      )}() with third parameter as PrimitiveInstancevalue`,
+      )}() with third parameter as ValueSpecification`,
     );
     assertTrue(
-      endDate.genericType.value.rawType.name === PRIMITIVE_TYPE.STRICTDATE ||
+      endDate.genericType?.value.rawType.name === PRIMITIVE_TYPE.STRICTDATE ||
+        endDate.genericType?.value.rawType.name === PRIMITIVE_TYPE.DATE ||
         dateColumn.func.value.genericType.value.rawType.name ===
           PRIMITIVE_TYPE.DATE,
 
@@ -181,7 +182,7 @@ export const updateAggregateColumnState = (
         calendarFunctionFullPath,
       )}() expression: only support ${extractElementNameFromPath(
         calendarFunctionFullPath,
-      )}() with third parameter of type StrictDate`,
+      )}() with third parameter of type Date`,
     );
 
     calendarFunction.calendarType = calendarTypeParameter