@finos/legend-data-cube 0.0.43 → 0.0.44

package/src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.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__GreaterThanColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -80,19 +79,18 @@ export class DataCubeQueryFilterOperation__GreaterThanColumn extends DataCubeQue
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.GREATER_THAN,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.GREATER_THAN), [
-      _property(condition.name, variable),
-      _value(guaranteeNonNullable(condition.value), variable),
+      _property(condition.name),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqual.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__GreaterThanOrEqual extends DataCubeQueryFilterOperation {
   override get label() {
@@ -87,10 +84,10 @@ export class DataCubeQueryFilterOperation__GreaterThanOrEqual extends DataCubeQu
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.GREATER_THAN_OR_EQUAL,
+        columnGetter,
       ),
     );
   }
@@ -98,7 +95,7 @@ export class DataCubeQueryFilterOperation__GreaterThanOrEqual extends DataCubeQu
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
     return _function(_functionName(DataCubeFunction.GREATER_THAN_OR_EQUAL), [
       _property(condition.name),
-      _value(guaranteeNonNullable(condition.value)),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqualColumn.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__GreaterThanOrEqualColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -80,19 +79,18 @@ export class DataCubeQueryFilterOperation__GreaterThanOrEqualColumn extends Data
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.GREATER_THAN_OR_EQUAL,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.GREATER_THAN_OR_EQUAL), [
-      _property(condition.name, variable),
-      _value(guaranteeNonNullable(condition.value), variable),
+      _property(condition.name),
+      _value(condition.value),
     ]);
   }
 }

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

@@ -33,7 +33,7 @@ import {
 import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
   _unwrapNotFilterCondition,
-  _baseFilterCondition,
+  _filterCondition_base,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 import { returnUndefOnError } from '@finos/legend-shared';
 
@@ -80,14 +80,12 @@ export class DataCubeQueryFilterOperation__IsNotNull extends DataCubeQueryFilter
     expression: V1_AppliedFunction,
     columnGetter: (name: string) => DataCubeColumn,
   ) {
-    const unwrapped = returnUndefOnError(() =>
-      _unwrapNotFilterCondition(expression),
-    );
-    if (!unwrapped) {
-      return undefined;
-    }
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.IS_EMPTY),
+      _filterCondition_base(
+        returnUndefOnError(() => _unwrapNotFilterCondition(expression)),
+        DataCubeFunction.IS_EMPTY,
+        columnGetter,
+      ),
     );
   }
 

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

@@ -30,7 +30,7 @@ import {
   _property,
 } from '../DataCubeQueryBuilderUtils.js';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
-import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { _filterCondition_base } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__IsNull extends DataCubeQueryFilterOperation {
   override get label() {
@@ -76,7 +76,11 @@ export class DataCubeQueryFilterOperation__IsNull extends DataCubeQueryFilterOpe
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(expression, columnGetter, DataCubeFunction.IS_EMPTY),
+      _filterCondition_base(
+        expression,
+        DataCubeFunction.IS_EMPTY,
+        columnGetter,
+      ),
     );
   }
 

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

@@ -14,10 +14,7 @@
  * 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 {
@@ -26,6 +23,7 @@ import {
   DataCubeQueryFilterOperator,
   isPrimitiveType,
   ofDataType,
+  _defaultPrimitiveTypeValue,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
 import {
@@ -34,9 +32,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__LessThan extends DataCubeQueryFilterOperation {
   override get label() {
@@ -88,10 +85,10 @@ export class DataCubeQueryFilterOperation__LessThan extends DataCubeQueryFilterO
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.LESS_THAN,
+        columnGetter,
       ),
     );
   }
@@ -99,7 +96,7 @@ export class DataCubeQueryFilterOperation__LessThan extends DataCubeQueryFilterO
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
     return _function(_functionName(DataCubeFunction.LESS_THAN), [
       _property(condition.name),
-      _value(guaranteeNonNullable(condition.value)),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__LessThanColumn.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__LessThanColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -80,19 +79,18 @@ export class DataCubeQueryFilterOperation__LessThanColumn extends DataCubeQueryF
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.LESS_THAN,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.LESS_THAN), [
-      _property(condition.name, variable),
-      _value(guaranteeNonNullable(condition.value), variable),
+      _property(condition.name),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__LessThanOrEqual.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__LessThanOrEqual extends DataCubeQueryFilterOperation {
   override get label() {
@@ -87,10 +84,10 @@ export class DataCubeQueryFilterOperation__LessThanOrEqual extends DataCubeQuery
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.LESS_THAN_OR_EQUAL,
+        columnGetter,
       ),
     );
   }
@@ -98,7 +95,7 @@ export class DataCubeQueryFilterOperation__LessThanOrEqual extends DataCubeQuery
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
     return _function(_functionName(DataCubeFunction.LESS_THAN_OR_EQUAL), [
       _property(condition.name),
-      _value(guaranteeNonNullable(condition.value)),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__LessThanOrEqualColumn.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__LessThanOrEqualColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -80,19 +79,18 @@ export class DataCubeQueryFilterOperation__LessThanOrEqualColumn extends DataCub
     columnGetter: (name: string) => DataCubeColumn,
   ) {
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(
+      _filterCondition_base(
         expression,
-        columnGetter,
         DataCubeFunction.LESS_THAN_OR_EQUAL,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _function(_functionName(DataCubeFunction.LESS_THAN_OR_EQUAL), [
-      _property(condition.name, variable),
-      _value(guaranteeNonNullable(condition.value), variable),
+      _property(condition.name),
+      _value(condition.value),
     ]);
   }
 }

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotContain.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 {
@@ -34,11 +32,11 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { isString, returnUndefOnError } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
   _unwrapNotFilterCondition,
-  _baseFilterCondition,
+  _filterCondition_base,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilterOperation {
@@ -67,7 +65,8 @@ export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilte
       value.value !== undefined &&
       isPrimitiveType(value.type) &&
       ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-      !Array.isArray(value.value)
+      !Array.isArray(value.value) &&
+      isString(value.value)
     );
   }
 
@@ -82,14 +81,12 @@ export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilte
     expression: V1_AppliedFunction,
     columnGetter: (name: string) => DataCubeColumn,
   ) {
-    const unwrapped = returnUndefOnError(() =>
-      _unwrapNotFilterCondition(expression),
-    );
-    if (!unwrapped) {
-      return undefined;
-    }
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.CONTAINS),
+      _filterCondition_base(
+        returnUndefOnError(() => _unwrapNotFilterCondition(expression)),
+        DataCubeFunction.CONTAINS,
+        columnGetter,
+      ),
     );
   }
 
@@ -97,7 +94,7 @@ export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilte
     return _not(
       _function(_functionName(DataCubeFunction.CONTAINS), [
         _property(condition.name),
-        _value(guaranteeNonNullable(condition.value)),
+        _value(condition.value),
       ]),
     );
   }

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEndWith.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 {
@@ -34,11 +32,11 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { isString, returnUndefOnError } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
   _unwrapNotFilterCondition,
-  _baseFilterCondition,
+  _filterCondition_base,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilterOperation {
@@ -67,7 +65,8 @@ export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilte
       value.value !== undefined &&
       isPrimitiveType(value.type) &&
       ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-      !Array.isArray(value.value)
+      !Array.isArray(value.value) &&
+      isString(value.value)
     );
   }
 
@@ -82,14 +81,12 @@ export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilte
     expression: V1_AppliedFunction,
     columnGetter: (name: string) => DataCubeColumn,
   ) {
-    const unwrapped = returnUndefOnError(() =>
-      _unwrapNotFilterCondition(expression),
-    );
-    if (!unwrapped) {
-      return undefined;
-    }
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.ENDS_WITH),
+      _filterCondition_base(
+        returnUndefOnError(() => _unwrapNotFilterCondition(expression)),
+        DataCubeFunction.ENDS_WITH,
+        columnGetter,
+      ),
     );
   }
 
@@ -97,7 +94,7 @@ export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilte
     return _not(
       _function(_functionName(DataCubeFunction.ENDS_WITH), [
         _property(condition.name),
-        _value(guaranteeNonNullable(condition.value)),
+        _value(condition.value),
       ]),
     );
   }

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqual.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 {
@@ -34,11 +32,11 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { returnUndefOnError } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
   _unwrapNotFilterCondition,
-  _baseFilterCondition,
+  _filterCondition_base,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotEqual extends DataCubeQueryFilterOperation {
@@ -92,14 +90,12 @@ export class DataCubeQueryFilterOperation__NotEqual extends DataCubeQueryFilterO
     expression: V1_AppliedFunction,
     columnGetter: (name: string) => DataCubeColumn,
   ) {
-    const unwrapped = returnUndefOnError(() =>
-      _unwrapNotFilterCondition(expression),
-    );
-    if (!unwrapped) {
-      return undefined;
-    }
     return this._finalizeConditionSnapshot(
-      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.EQUAL),
+      _filterCondition_base(
+        returnUndefOnError(() => _unwrapNotFilterCondition(expression)),
+        DataCubeFunction.EQUAL,
+        columnGetter,
+      ),
     );
   }
 
@@ -107,7 +103,7 @@ export class DataCubeQueryFilterOperation__NotEqual extends DataCubeQueryFilterO
     return _not(
       _function(_functionName(DataCubeFunction.EQUAL), [
         _property(condition.name),
-        _value(guaranteeNonNullable(condition.value)),
+        _value(condition.value),
       ]),
     );
   }

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqualCaseInsensitive.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,12 +31,11 @@ import {
   _not,
   _property,
   _value,
-  _var,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { isString, returnUndefOnError } from '@finos/legend-shared';
 import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
-  _caseSensitiveBaseFilterCondition,
+  _filterCondition_caseSensitive,
   _unwrapNotFilterCondition,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
@@ -68,7 +65,8 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitive extends DataC
       value.value !== undefined &&
       isPrimitiveType(value.type) &&
       ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-      !Array.isArray(value.value)
+      !Array.isArray(value.value) &&
+      isString(value.value)
     );
   }
 
@@ -83,30 +81,23 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitive extends DataC
     expression: V1_AppliedFunction,
     columnGetter: (name: string) => DataCubeColumn,
   ) {
-    const unwrapped = returnUndefOnError(() =>
-      _unwrapNotFilterCondition(expression),
-    );
-    if (!unwrapped) {
-      return undefined;
-    }
     return this._finalizeConditionSnapshot(
-      _caseSensitiveBaseFilterCondition(
-        unwrapped,
-        columnGetter,
+      _filterCondition_caseSensitive(
+        returnUndefOnError(() => _unwrapNotFilterCondition(expression)),
         DataCubeFunction.EQUAL,
+        columnGetter,
       ),
     );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {
-    const variable = _var();
     return _not(
       _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),
         ]),
       ]),
     );