@finos/legend-application-query 5.0.1 → 5.0.2

package/src/stores/filterOperators/QueryBuilderFilterOperator_LessThan.ts

@@ -24,7 +24,6 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type AbstractPropertyExpression,
-  isSuperType,
   SUPPORTED_FUNCTIONS,
   buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
@@ -35,7 +34,10 @@ import {
 } from './QueryBuilderFilterOperatorHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
 import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
-import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
+import {
+  getNonCollectionValueSpecificationType,
+  isTypeCompatibleWithConditionValueType,
+} from '../QueryBuilderOperatorsHelper.js';
 
 export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOperator {
   getLabel(filterConditionState: FilterConditionState): string {
@@ -64,41 +66,12 @@ export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOpera
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
+    return isTypeCompatibleWithConditionValueType(
+      filterConditionState.value
+        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+        : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func
-        .genericType.value.rawType;
-    const type = filterConditionState.value
-      ? getNonCollectionValueSpecificationType(filterConditionState.value)
-      : undefined;
-    const NUMERIC_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.NUMBER,
-      PRIMITIVE_TYPE.INTEGER,
-      PRIMITIVE_TYPE.DECIMAL,
-      PRIMITIVE_TYPE.FLOAT,
-    ] as string[];
-
-    const DATE_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.DATE,
-      PRIMITIVE_TYPE.DATETIME,
-      PRIMITIVE_TYPE.STRICTDATE,
-      PRIMITIVE_TYPE.LATESTDATE,
-    ] as string[];
-
-    // When changing the return type for LHS, the RHS value should be adjusted accordingly.
-    return (
-      type !== undefined &&
-      // Numeric value is handled loosely because of autoboxing
-      // e.g. LHS (integer) = RHS (float) is acceptable
-      ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
-        NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
-        // Date value is handled loosely as well if the LHS is of type DateTime
-        // This is because we would simulate auto-boxing for date by altering the
-        // Pure function used for the operation
-        // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
-        (propertyType.path === PRIMITIVE_TYPE.DATETIME &&
-          DATE_PRIMITIVE_TYPES.includes(type.path)) ||
-        type === propertyType ||
-        isSuperType(propertyType, type))
+        .genericType.value.rawType,
     );
   }
 

package/src/stores/filterOperators/QueryBuilderFilterOperator_LessThanEqual.ts

@@ -24,7 +24,6 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type AbstractPropertyExpression,
-  isSuperType,
   SUPPORTED_FUNCTIONS,
   buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
@@ -35,7 +34,10 @@ import {
 } from './QueryBuilderFilterOperatorHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
 import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
-import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
+import {
+  getNonCollectionValueSpecificationType,
+  isTypeCompatibleWithConditionValueType,
+} from '../QueryBuilderOperatorsHelper.js';
 
 export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilterOperator {
   getLabel(filterConditionState: FilterConditionState): string {
@@ -64,40 +66,12 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
+    return isTypeCompatibleWithConditionValueType(
+      filterConditionState.value
+        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+        : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func
-        .genericType.value.rawType;
-    const type = filterConditionState.value
-      ? getNonCollectionValueSpecificationType(filterConditionState.value)
-      : undefined;
-    const NUMERIC_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.NUMBER,
-      PRIMITIVE_TYPE.INTEGER,
-      PRIMITIVE_TYPE.DECIMAL,
-      PRIMITIVE_TYPE.FLOAT,
-    ] as string[];
-
-    const DATE_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.DATE,
-      PRIMITIVE_TYPE.DATETIME,
-      PRIMITIVE_TYPE.STRICTDATE,
-      PRIMITIVE_TYPE.LATESTDATE,
-    ] as string[];
-
-    // When changing the return type for LHS, the RHS value should be adjusted accordingly.
-    return (
-      type !== undefined &&
-      // Numeric value is handled loosely because of autoboxing
-      // e.g. LHS (integer) = RHS (float) is acceptable
-      ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
-        NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
-        // Date value is handled loosely as well if the LHS is of type DateTime
-        // This is because we would simulate auto-boxing for date by altering the
-        // Pure function used for the operation
-        // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
-        DATE_PRIMITIVE_TYPES.includes(type.path) ||
-        type === propertyType ||
-        isSuperType(propertyType, type))
+        .genericType.value.rawType,
     );
   }
 

package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_Equal.ts

@@ -28,7 +28,6 @@ import {
   GenericTypeExplicitReference,
   PRIMITIVE_TYPE,
   TYPICAL_MULTIPLICITY_TYPE,
-  isSuperType,
   SUPPORTED_FUNCTIONS,
   buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
@@ -40,6 +39,7 @@ import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
 import {
   buildNotExpression,
   getNonCollectionValueSpecificationType,
+  isTypeCompatibleWithConditionValueType,
   unwrapNotExpression,
 } from '../QueryBuilderOperatorsHelper.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
@@ -79,40 +79,13 @@ export class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilter
   isCompatibleWithConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
-    const lhsType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getReturnType(),
-    );
     const valueSpecification = postFilterConditionState.value;
     if (valueSpecification) {
-      const type = getNonCollectionValueSpecificationType(valueSpecification);
-      const NUMERIC_PRIMITIVE_TYPES = [
-        PRIMITIVE_TYPE.NUMBER,
-        PRIMITIVE_TYPE.INTEGER,
-        PRIMITIVE_TYPE.DECIMAL,
-        PRIMITIVE_TYPE.FLOAT,
-      ] as string[];
-
-      const DATE_PRIMITIVE_TYPES = [
-        PRIMITIVE_TYPE.DATE,
-        PRIMITIVE_TYPE.DATETIME,
-        PRIMITIVE_TYPE.STRICTDATE,
-        PRIMITIVE_TYPE.LATESTDATE,
-      ] as string[];
-
-      // When changing the return type for LHS, the RHS value should be adjusted accordingly.
-      return (
-        type !== undefined &&
-        // Numeric value is handled loosely because of autoboxing
-        // e.g. LHS (integer) = RHS (float) is acceptable
-        ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
-          NUMERIC_PRIMITIVE_TYPES.includes(lhsType.path)) ||
-          // Date value is handled loosely as well if the LHS is of type DateTime
-          // This is because we would simulate auto-boxing for date by altering the
-          // Pure function used for the operation
-          // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
-          DATE_PRIMITIVE_TYPES.includes(type.path) ||
-          type === lhsType ||
-          isSuperType(lhsType, type))
+      return isTypeCompatibleWithConditionValueType(
+        getNonCollectionValueSpecificationType(valueSpecification),
+        guaranteeNonNullable(
+          postFilterConditionState.columnState.getReturnType(),
+        ),
       );
     }
     return false;

package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_GreaterThan.ts

@@ -20,7 +20,6 @@ import {
   type FunctionExpression,
   AbstractPropertyExpression,
   PRIMITIVE_TYPE,
-  isSuperType,
   SUPPORTED_FUNCTIONS,
   buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
@@ -29,7 +28,10 @@ import {
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
+import {
+  getNonCollectionValueSpecificationType,
+  isTypeCompatibleWithConditionValueType,
+} from '../QueryBuilderOperatorsHelper.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
 import { buildPostFilterConditionState } from '../QueryBuilderPostFilterProcessor.js';
 import type {
@@ -61,40 +63,13 @@ export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPost
   isCompatibleWithConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
-    const lhsType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getReturnType(),
-    );
-    const type = postFilterConditionState.value
-      ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
-      : undefined;
-    const NUMERIC_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.NUMBER,
-      PRIMITIVE_TYPE.INTEGER,
-      PRIMITIVE_TYPE.DECIMAL,
-      PRIMITIVE_TYPE.FLOAT,
-    ] as string[];
-
-    const DATE_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.DATE,
-      PRIMITIVE_TYPE.DATETIME,
-      PRIMITIVE_TYPE.STRICTDATE,
-      PRIMITIVE_TYPE.LATESTDATE,
-    ] as string[];
-
-    // When changing the return type for LHS, the RHS value should be adjusted accordingly.
-    return (
-      type !== undefined &&
-      // Numeric value is handled loosely because of autoboxing
-      // e.g. LHS (integer) = RHS (float) is acceptable
-      ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
-        NUMERIC_PRIMITIVE_TYPES.includes(lhsType.path)) ||
-        // Date value is handled loosely as well if the LHS is of type DateTime
-        // This is because we would simulate auto-boxing for date by altering the
-        // Pure function used for the operation
-        // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
-        DATE_PRIMITIVE_TYPES.includes(type.path) ||
-        type === lhsType ||
-        isSuperType(lhsType, type))
+    return isTypeCompatibleWithConditionValueType(
+      postFilterConditionState.value
+        ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
+        : undefined,
+      guaranteeNonNullable(
+        postFilterConditionState.columnState.getReturnType(),
+      ),
     );
   }
 

package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_LessThan.ts

@@ -21,7 +21,6 @@ import {
   type FunctionExpression,
   PRIMITIVE_TYPE,
   SUPPORTED_FUNCTIONS,
-  isSuperType,
   buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
 import {
@@ -29,7 +28,10 @@ import {
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
+import {
+  getNonCollectionValueSpecificationType,
+  isTypeCompatibleWithConditionValueType,
+} from '../QueryBuilderOperatorsHelper.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
 import { buildPostFilterConditionState } from '../QueryBuilderPostFilterProcessor.js';
 import type {
@@ -61,40 +63,13 @@ export class QueryBuilderPostFilterOperator_LessThan extends QueryBuilderPostFil
   isCompatibleWithConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
-    const lhsType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getReturnType(),
-    );
-    const type = postFilterConditionState.value
-      ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
-      : undefined;
-    const NUMERIC_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.NUMBER,
-      PRIMITIVE_TYPE.INTEGER,
-      PRIMITIVE_TYPE.DECIMAL,
-      PRIMITIVE_TYPE.FLOAT,
-    ] as string[];
-
-    const DATE_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.DATE,
-      PRIMITIVE_TYPE.DATETIME,
-      PRIMITIVE_TYPE.STRICTDATE,
-      PRIMITIVE_TYPE.LATESTDATE,
-    ] as string[];
-
-    // When changing the return type for LHS, the RHS value should be adjusted accordingly.
-    return (
-      type !== undefined &&
-      // Numeric value is handled loosely because of autoboxing
-      // e.g. LHS (integer) = RHS (float) is acceptable
-      ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
-        NUMERIC_PRIMITIVE_TYPES.includes(lhsType.path)) ||
-        // Date value is handled loosely as well if the LHS is of type DateTime
-        // This is because we would simulate auto-boxing for date by altering the
-        // Pure function used for the operation
-        // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
-        DATE_PRIMITIVE_TYPES.includes(type.path) ||
-        type === lhsType ||
-        isSuperType(lhsType, type))
+    return isTypeCompatibleWithConditionValueType(
+      postFilterConditionState.value
+        ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
+        : undefined,
+      guaranteeNonNullable(
+        postFilterConditionState.columnState.getReturnType(),
+      ),
     );
   }