@finos/legend-data-cube 0.0.43 → 0.0.45

package/src/stores/core/aggregation/DataCubeQueryAggregateOperation__VariancePopulation.tsx

@@ -21,9 +21,12 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   ofDataType,
+  type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
-import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
+import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
+import type { V1_ColSpec } from '@finos/legend-graph';
+import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__VariancePopulation extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,11 +45,30 @@ export class DataCubeQueryAggregateOperation__VariancePopulation extends DataCub
     return DataCubeQueryAggregateOperator.VARIANCE_POPULATION;
   }
 
-  isCompatibleWithColumn(column: DataCubeColumn) {
+  override isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }
 
-  buildAggregateColumn(column: DataCubeColumnConfiguration) {
-    return _aggCol_basic(column, DataCubeFunction.VARIANCE_POPULATION);
+  override isCompatibleWithParameterValues(values: DataCubeOperationValue[]) {
+    return !values.length;
+  }
+
+  override generateDefaultParameterValues(
+    column: DataCubeColumn,
+  ): DataCubeOperationValue[] {
+    return [];
+  }
+
+  override buildAggregateColumnSnapshot(
+    colSpec: V1_ColSpec,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeAggregateColumnSnapshot(
+      _agg_base(colSpec, DataCubeFunction.VARIANCE_POPULATION, columnGetter),
+    );
+  }
+
+  override buildAggregateColumnExpression(column: DataCubeColumnConfiguration) {
+    return _aggCol_base(column, DataCubeFunction.VARIANCE_POPULATION);
   }
 }

package/src/stores/core/aggregation/DataCubeQueryAggregateOperation__VarianceSample.tsx

@@ -21,9 +21,12 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   ofDataType,
+  type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
-import { _aggCol_basic } from '../DataCubeQueryBuilderUtils.js';
+import { _aggCol_base } from '../DataCubeQueryBuilderUtils.js';
 import type { DataCubeColumnConfiguration } from '../model/DataCubeConfiguration.js';
+import type { V1_ColSpec } from '@finos/legend-graph';
+import { _agg_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryAggregateOperation__VarianceSample extends DataCubeQueryAggregateOperation {
   override get label() {
@@ -42,11 +45,30 @@ export class DataCubeQueryAggregateOperation__VarianceSample extends DataCubeQue
     return DataCubeQueryAggregateOperator.VARIANCE_SAMPLE;
   }
 
-  isCompatibleWithColumn(column: DataCubeColumn) {
+  override isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.NUMBER]);
   }
 
-  buildAggregateColumn(column: DataCubeColumnConfiguration) {
-    return _aggCol_basic(column, DataCubeFunction.VARIANCE_SAMPLE);
+  override isCompatibleWithParameterValues(values: DataCubeOperationValue[]) {
+    return !values.length;
+  }
+
+  override generateDefaultParameterValues(
+    column: DataCubeColumn,
+  ): DataCubeOperationValue[] {
+    return [];
+  }
+
+  override buildAggregateColumnSnapshot(
+    colSpec: V1_ColSpec,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeAggregateColumnSnapshot(
+      _agg_base(colSpec, DataCubeFunction.VARIANCE_SAMPLE, columnGetter),
+    );
+  }
+
+  override buildAggregateColumnExpression(column: DataCubeColumnConfiguration) {
+    return _aggCol_base(column, DataCubeFunction.VARIANCE_SAMPLE);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation.ts

@@ -14,60 +14,10 @@
  * limitations under the License.
  */
 
-import {
-  formatDate,
-  guaranteeNonNullable,
-  UnsupportedOperationError,
-} from '@finos/legend-shared';
 import type { DataCubeOperationValue } from '../DataCubeQueryEngine.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
-import {
-  DATE_FORMAT,
-  DATE_TIME_FORMAT,
-  PRIMITIVE_TYPE,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-
-// --------------------------------- UTILITIES ---------------------------------
-
-export function _defaultPrimitiveTypeValue(type: string): unknown {
-  switch (type) {
-    case PRIMITIVE_TYPE.STRING:
-      return '';
-    case PRIMITIVE_TYPE.BOOLEAN:
-      return false;
-    case PRIMITIVE_TYPE.BYTE:
-      return btoa('');
-    case PRIMITIVE_TYPE.NUMBER:
-    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:
-      return formatDate(new Date(Date.now()), DATE_FORMAT);
-    case PRIMITIVE_TYPE.DATETIME:
-      return formatDate(new Date(Date.now()), DATE_TIME_FORMAT);
-    default:
-      throw new UnsupportedOperationError(
-        `Can't generate value for type '${type}'`,
-      );
-  }
-}
-
-export function getFilterOperation(
-  operator: string,
-  operators: DataCubeQueryFilterOperation[],
-) {
-  return guaranteeNonNullable(
-    operators.find((op) => op.operator === operator),
-    `Can't find filter operation '${operator}'`,
-  );
-}
-
-// --------------------------------- CONTRACT ---------------------------------
+import { type V1_AppliedFunction } from '@finos/legend-graph';
 
 export abstract class DataCubeQueryFilterOperation {
   abstract get label(): React.ReactNode;
@@ -77,7 +27,6 @@ export abstract class DataCubeQueryFilterOperation {
 
   abstract isCompatibleWithColumn(column: DataCubeColumn): boolean;
   abstract isCompatibleWithValue(value: DataCubeOperationValue): boolean;
-
   abstract generateDefaultValue(column: DataCubeColumn): DataCubeOperationValue;
 
   abstract buildConditionSnapshot(

package/src/stores/core/filter/DataCubeQueryFilterOperation__Contain.tsx

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  DataCubeQueryFilterOperation,
-  _defaultPrimitiveTypeValue,
-} from './DataCubeQueryFilterOperation.js';
+import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
@@ -25,6 +22,7 @@ import {
   DataCubeQueryFilterOperator,
   isPrimitiveType,
   ofDataType,
+  _defaultPrimitiveTypeValue,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
 import {
@@ -33,9 +31,9 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { isString } from '@finos/legend-shared';
 
 export class DataCubeQueryFilterOperation__Contain extends DataCubeQueryFilterOperation {
   override get label() {
@@ -63,7 +61,8 @@ export class DataCubeQueryFilterOperation__Contain extends DataCubeQueryFilterOp
       value.value !== undefined &&
       isPrimitiveType(value.type) &&
       ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-      !Array.isArray(value.value)
+      !Array.isArray(value.value) &&
+      isString(value.value)
     );
   }
 
@@ -79,14 +78,18 @@ export class DataCubeQueryFilterOperation__Contain extends DataCubeQueryFilterOp
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(expression, columnGetter, DataCubeFunction.CONTAINS),
+      _filterCondition_base(
+        expression,
+        DataCubeFunction.CONTAINS,
+        columnGetter,
+      ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
     return _function(_functionName(DataCubeFunction.CONTAINS), [
       _property(condition.name),
-      _value(guaranteeNonNullable(condition.value)),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__ContainCaseInsensitive.tsx

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  DataCubeQueryFilterOperation,
-  _defaultPrimitiveTypeValue,
-} from './DataCubeQueryFilterOperation.js';
+import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
@@ -25,6 +22,7 @@ import {
   DataCubeQueryFilterOperator,
   isPrimitiveType,
   ofDataType,
+  _defaultPrimitiveTypeValue,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
 import {
@@ -32,11 +30,10 @@ import {
   _functionName,
   _property,
   _value,
-  _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_caseSensitive } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { isString } from '@finos/legend-shared';
 
 export class DataCubeQueryFilterOperation__ContainCaseInsensitive extends DataCubeQueryFilterOperation {
   override get label() {
@@ -64,7 +61,8 @@ export class DataCubeQueryFilterOperation__ContainCaseInsensitive extends DataCu
       value.value !== undefined &&
       isPrimitiveType(value.type) &&
       ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-      !Array.isArray(value.value)
+      !Array.isArray(value.value) &&
+      isString(value.value)
     );
   }
 
@@ -80,22 +78,21 @@ export class DataCubeQueryFilterOperation__ContainCaseInsensitive extends DataCu
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _caseSensitiveBaseFilterCondition(
+      _filterCondition_caseSensitive(
         expression,
-        columnGetter,
         DataCubeFunction.CONTAINS,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.CONTAINS), [
       _function(_functionName(DataCubeFunction.TO_LOWERCASE), [
-        _property(condition.name, variable),
+        _property(condition.name),
       ]),
       _function(_functionName(DataCubeFunction.TO_LOWERCASE), [
-        _value(guaranteeNonNullable(condition.value), variable),
+        _value(condition.value),
       ]),
     ]);
   }

package/src/stores/core/filter/DataCubeQueryFilterOperation__EndWith.tsx

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  DataCubeQueryFilterOperation,
-  _defaultPrimitiveTypeValue,
-} from './DataCubeQueryFilterOperation.js';
+import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
@@ -25,6 +22,7 @@ import {
   DataCubeQueryFilterOperator,
   isPrimitiveType,
   ofDataType,
+  _defaultPrimitiveTypeValue,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
 import {
@@ -33,9 +31,9 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { isString } from '@finos/legend-shared';
 
 export class DataCubeQueryFilterOperation__EndWith extends DataCubeQueryFilterOperation {
   override get label() {
@@ -63,7 +61,8 @@ export class DataCubeQueryFilterOperation__EndWith extends DataCubeQueryFilterOp
       value.value !== undefined &&
       isPrimitiveType(value.type) &&
       ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-      !Array.isArray(value.value)
+      !Array.isArray(value.value) &&
+      isString(value.value)
     );
   }
 
@@ -79,10 +78,10 @@ export class DataCubeQueryFilterOperation__EndWith extends DataCubeQueryFilterOp
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.ENDS_WITH,
+        columnGetter,
       ),
     );
   }
@@ -90,7 +89,7 @@ export class DataCubeQueryFilterOperation__EndWith extends DataCubeQueryFilterOp
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
     return _function(_functionName(DataCubeFunction.ENDS_WITH), [
       _property(condition.name),
-      _value(guaranteeNonNullable(condition.value)),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__EndWithCaseInsensitive.tsx

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  DataCubeQueryFilterOperation,
-  _defaultPrimitiveTypeValue,
-} from './DataCubeQueryFilterOperation.js';
+import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
@@ -25,6 +22,7 @@ import {
   DataCubeQueryFilterOperator,
   isPrimitiveType,
   ofDataType,
+  _defaultPrimitiveTypeValue,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
 import {
@@ -32,11 +30,10 @@ import {
   _functionName,
   _property,
   _value,
-  _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_caseSensitive } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { isString } from '@finos/legend-shared';
 
 export class DataCubeQueryFilterOperation__EndWithCaseInsensitive extends DataCubeQueryFilterOperation {
   override get label() {
@@ -64,7 +61,8 @@ export class DataCubeQueryFilterOperation__EndWithCaseInsensitive extends DataCu
       value.value !== undefined &&
       isPrimitiveType(value.type) &&
       ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-      !Array.isArray(value.value)
+      !Array.isArray(value.value) &&
+      isString(value.value)
     );
   }
 
@@ -80,22 +78,21 @@ export class DataCubeQueryFilterOperation__EndWithCaseInsensitive extends DataCu
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _caseSensitiveBaseFilterCondition(
+      _filterCondition_caseSensitive(
         expression,
-        columnGetter,
         DataCubeFunction.ENDS_WITH,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.ENDS_WITH), [
       _function(_functionName(DataCubeFunction.TO_LOWERCASE), [
-        _property(condition.name, variable),
+        _property(condition.name),
       ]),
       _function(_functionName(DataCubeFunction.TO_LOWERCASE), [
-        _value(guaranteeNonNullable(condition.value), variable),
+        _value(condition.value),
       ]),
     ]);
   }

package/src/stores/core/filter/DataCubeQueryFilterOperation__Equal.tsx

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  DataCubeQueryFilterOperation,
-  _defaultPrimitiveTypeValue,
-} from './DataCubeQueryFilterOperation.js';
+import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
@@ -25,6 +22,7 @@ import {
   DataCubeQueryFilterOperator,
   isPrimitiveType,
   ofDataType,
+  _defaultPrimitiveTypeValue,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
 import {
@@ -33,9 +31,8 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__Equal extends DataCubeQueryFilterOperation {
   override get label() {
@@ -89,14 +86,14 @@ export class DataCubeQueryFilterOperation__Equal extends DataCubeQueryFilterOper
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(expression, columnGetter, DataCubeFunction.EQUAL),
+      _filterCondition_base(expression, DataCubeFunction.EQUAL, columnGetter),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
     return _function(_functionName(DataCubeFunction.EQUAL), [
       _property(condition.name),
-      _value(guaranteeNonNullable(condition.value)),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.tsx

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  DataCubeQueryFilterOperation,
-  _defaultPrimitiveTypeValue,
-} from './DataCubeQueryFilterOperation.js';
+import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
@@ -25,6 +22,7 @@ import {
   DataCubeQueryFilterOperator,
   isPrimitiveType,
   ofDataType,
+  _defaultPrimitiveTypeValue,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
 import {
@@ -32,11 +30,10 @@ import {
   _functionName,
   _property,
   _value,
-  _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_caseSensitive } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { isString } from '@finos/legend-shared';
 
 export class DataCubeQueryFilterOperation__EqualCaseInsensitive extends DataCubeQueryFilterOperation {
   override get label() {
@@ -64,7 +61,8 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitive extends DataCube
       value.value !== undefined &&
       isPrimitiveType(value.type) &&
       ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-      !Array.isArray(value.value)
+      !Array.isArray(value.value) &&
+      isString(value.value)
     );
   }
 
@@ -80,22 +78,21 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitive extends DataCube
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _caseSensitiveBaseFilterCondition(
+      _filterCondition_caseSensitive(
         expression,
-        columnGetter,
         DataCubeFunction.EQUAL,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.EQUAL), [
       _function(_functionName(DataCubeFunction.TO_LOWERCASE), [
-        _property(condition.name, variable),
+        _property(condition.name),
       ]),
       _function(_functionName(DataCubeFunction.TO_LOWERCASE), [
-        _value(guaranteeNonNullable(condition.value), variable),
+        _value(condition.value),
       ]),
     ]);
   }

package/src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.tsx

@@ -29,11 +29,10 @@ import {
   _functionName,
   _property,
   _value,
-  _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable, isString } from '@finos/legend-shared';
+import { isString } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_caseSensitive } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -76,22 +75,21 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn extends Da
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _caseSensitiveBaseFilterCondition(
+      _filterCondition_caseSensitive(
         expression,
-        columnGetter,
         DataCubeFunction.EQUAL,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.EQUAL), [
       _function(_functionName(DataCubeFunction.TO_LOWERCASE), [
-        _property(condition.name, variable),
+        _property(condition.name),
       ]),
       _function(_functionName(DataCubeFunction.TO_LOWERCASE), [
-        _value(guaranteeNonNullable(condition.value), variable),
+        _value(condition.value),
       ]),
     ]);
   }

package/src/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.tsx

@@ -29,11 +29,10 @@ import {
   _functionName,
   _property,
   _value,
-  _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable, isString } from '@finos/legend-shared';
+import { isString } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -81,15 +80,14 @@ export class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQueryFilt
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(expression, columnGetter, DataCubeFunction.EQUAL),
+      _filterCondition_base(expression, DataCubeFunction.EQUAL, columnGetter),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.EQUAL), [
-      _property(condition.name, variable),
-      _value(guaranteeNonNullable(condition.value), variable),
+      _property(condition.name),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.tsx

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  DataCubeQueryFilterOperation,
-  _defaultPrimitiveTypeValue,
-} from './DataCubeQueryFilterOperation.js';
+import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
@@ -25,6 +22,7 @@ import {
   DataCubeQueryFilterOperator,
   isPrimitiveType,
   ofDataType,
+  _defaultPrimitiveTypeValue,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
 import {
@@ -33,9 +31,8 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQueryFilterOperation {
   override get label() {
@@ -87,10 +84,10 @@ export class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQueryFilt
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.GREATER_THAN,
+        columnGetter,
       ),
     );
   }
@@ -98,7 +95,7 @@ export class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQueryFilt
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
     return _function(_functionName(DataCubeFunction.GREATER_THAN), [
       _property(condition.name),
-      _value(guaranteeNonNullable(condition.value)),
+      _value(condition.value),
     ]);
   }
 }