@finos/legend-query-builder 4.17.97 → 4.17.99

package/src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts

@@ -24,6 +24,7 @@ import {
   type SimpleFunctionExpression,
   Enumeration,
   PrimitiveType,
+  PrecisePrimitiveType,
 } from '@finos/legend-graph';
 import {
   buildFilterConditionState,
@@ -62,7 +63,8 @@ export class QueryBuilderFilterOperator_IsEmpty
     }
     return (
       propertyType instanceof Enumeration ||
-      propertyType instanceof PrimitiveType
+      propertyType instanceof PrimitiveType ||
+      propertyType instanceof PrecisePrimitiveType
     );
   }
 

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts

@@ -35,7 +35,10 @@ import {
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
-import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
+import {
+  getStandardPrimitiveTypeEquivalent,
+  isTypeCompatibleForAssignment,
+} from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
@@ -53,17 +56,21 @@ export class QueryBuilderFilterOperator_LessThan
     const propertyType =
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType;
+    const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
-      [
-        PRIMITIVE_TYPE.NUMBER,
-        PRIMITIVE_TYPE.INTEGER,
-        PRIMITIVE_TYPE.DECIMAL,
-        PRIMITIVE_TYPE.FLOAT,
-        PRIMITIVE_TYPE.DATE,
-        PRIMITIVE_TYPE.STRICTDATE,
-        PRIMITIVE_TYPE.DATETIME,
-      ] as string[]
-    ).includes(propertyType.path);
+      normalizedType !== undefined &&
+      (
+        [
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+          PRIMITIVE_TYPE.DATE,
+          PRIMITIVE_TYPE.STRICTDATE,
+          PRIMITIVE_TYPE.DATETIME,
+        ] as string[]
+      ).includes(normalizedType)
+    );
   }
 
   isCompatibleWithFilterConditionValue(

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts

@@ -35,7 +35,10 @@ import {
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
-import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
+import {
+  getStandardPrimitiveTypeEquivalent,
+  isTypeCompatibleForAssignment,
+} from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
@@ -53,17 +56,21 @@ export class QueryBuilderFilterOperator_LessThanEqual
     const propertyType =
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType;
+    const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
-      [
-        PRIMITIVE_TYPE.NUMBER,
-        PRIMITIVE_TYPE.INTEGER,
-        PRIMITIVE_TYPE.DECIMAL,
-        PRIMITIVE_TYPE.FLOAT,
-        PRIMITIVE_TYPE.DATE,
-        PRIMITIVE_TYPE.STRICTDATE,
-        PRIMITIVE_TYPE.DATETIME,
-      ] as string[]
-    ).includes(propertyType.path);
+      normalizedType !== undefined &&
+      (
+        [
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+          PRIMITIVE_TYPE.DATE,
+          PRIMITIVE_TYPE.STRICTDATE,
+          PRIMITIVE_TYPE.DATETIME,
+        ] as string[]
+      ).includes(normalizedType)
+    );
   }
 
   isCompatibleWithFilterConditionValue(

package/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -37,6 +36,7 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
+  getStandardPrimitiveTypeEquivalent,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
@@ -54,9 +54,10 @@ export class QueryBuilderFilterOperator_StartWith
     filterConditionState: FilterConditionState,
   ): boolean {
     return (
-      PrimitiveType.STRING ===
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType
+      getStandardPrimitiveTypeEquivalent(
+        filterConditionState.propertyExpressionState.propertyExpression.func
+          .value.genericType.value.rawType,
+      ) === PRIMITIVE_TYPE.STRING
     );
   }
 
@@ -68,7 +69,10 @@ export class QueryBuilderFilterOperator_StartWith
       !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined;
-    return PrimitiveType.STRING === type;
+    return (
+      type !== undefined &&
+      getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING
+    );
   }
 
   getDefaultFilterConditionValue(

package/src/stores/shared/ValueSpecificationEditorHelper.ts

@@ -53,7 +53,10 @@ import {
   guaranteeNonNullable,
   returnUndefOnError,
 } from '@finos/legend-shared';
-import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationHelper.js';
+import {
+  generateDefaultValueForPrimitiveType,
+  getStandardPrimitiveTypeEquivalent,
+} from '../QueryBuilderValueSpecificationHelper.js';
 import {
   functionExpression_setParametersValues,
   instanceValue_setValues,
@@ -248,7 +251,8 @@ export const buildDefaultInstanceValue = (
   observerContext: ObserverContext,
   enableInitializingDefaultValue: boolean,
 ): ValueSpecification => {
-  const path = type.path;
+  // Normalize precise primitive types to their standard equivalents
+  const path = getStandardPrimitiveTypeEquivalent(type) ?? type.path;
   switch (path) {
     case PRIMITIVE_TYPE.STRING:
     case PRIMITIVE_TYPE.STRICTDATE: