@finos/legend-extension-dsl-data-quality 2.1.31 → 2.1.32

package/lib/components/utils/DataQualityValidationNameGeneratorVisitor.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DataQualityValidationAssertionFunction, DataQualityValidationCustomHelperFunction, DataQualityValidationFilterCondition, DataQualityValidationFilterFunction, DataQualityValidationFunctionVisitor, DataQualityValidationLogicalGroupFunction } from './DataQualityValidationFunction.js';
+import { type DataQualityValidationAssertionFunction, type DataQualityValidationCustomHelperFunction, type DataQualityValidationFilterCondition, type DataQualityValidationFilterFunction, type DataQualityValidationFunctionVisitor, type DataQualityValidationLogicalGroupFunction } from './DataQualityValidationFunction.js';
 export declare class DataQualityValidationNameGeneratorVisitor implements DataQualityValidationFunctionVisitor<string> {
     depth: number;
     visitAssertion(func: DataQualityValidationAssertionFunction): string;
@@ -21,6 +21,7 @@ export declare class DataQualityValidationNameGeneratorVisitor implements DataQu
     visitFilter(func: DataQualityValidationFilterFunction): string;
     visitFilterCondition(func: DataQualityValidationFilterCondition): string;
     visitLogicalGroup(func: DataQualityValidationLogicalGroupFunction): string;
+    visitPropertyGuarantee(): string;
     private composeName;
     private splitAndHashLongNames;
     private capitalizeFirstLetter;

package/lib/components/utils/DataQualityValidationNameGeneratorVisitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataQualityValidationNameGeneratorVisitor.d.ts","sourceRoot":"","sources":["../../../src/components/utils/DataQualityValidationNameGeneratorVisitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,EACV,sCAAsC,EACtC,yCAAyC,EACzC,oCAAoC,EACpC,mCAAmC,EACnC,oCAAoC,EACpC,yCAAyC,EAC1C,MAAM,oCAAoC,CAAC;AAG5C,qBAAa,yCACX,YAAW,oCAAoC,CAAC,MAAM,CAAC;IAEvD,KAAK,SAAK;IACV,cAAc,CAAC,IAAI,EAAE,sCAAsC,GAAG,MAAM;IAIpE,iBAAiB,CAAC,IAAI,EAAE,yCAAyC,GAAG,MAAM;IA0B1E,WAAW,CAAC,IAAI,EAAE,mCAAmC,GAAG,MAAM;IAM9D,oBAAoB,CAAC,IAAI,EAAE,oCAAoC,GAAG,MAAM;IA0BxE,iBAAiB,CAAC,IAAI,EAAE,yCAAyC,GAAG,MAAM;IAgB1E,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,WAAW;CAwBpB"}
+{"version":3,"file":"DataQualityValidationNameGeneratorVisitor.d.ts","sourceRoot":"","sources":["../../../src/components/utils/DataQualityValidationNameGeneratorVisitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,EAEL,KAAK,sCAAsC,EAC3C,KAAK,yCAAyC,EAC9C,KAAK,oCAAoC,EACzC,KAAK,mCAAmC,EACxC,KAAK,oCAAoC,EACzC,KAAK,yCAAyC,EAC/C,MAAM,oCAAoC,CAAC;AAG5C,qBAAa,yCACX,YAAW,oCAAoC,CAAC,MAAM,CAAC;IAEvD,KAAK,SAAK;IACV,cAAc,CAAC,IAAI,EAAE,sCAAsC,GAAG,MAAM;IAIpE,iBAAiB,CAAC,IAAI,EAAE,yCAAyC,GAAG,MAAM;IA0B1E,WAAW,CAAC,IAAI,EAAE,mCAAmC,GAAG,MAAM;IAM9D,oBAAoB,CAAC,IAAI,EAAE,oCAAoC,GAAG,MAAM;IAiCxE,iBAAiB,CAAC,IAAI,EAAE,yCAAyC,GAAG,MAAM;IAgB1E,sBAAsB,IAAI,MAAM;IAIhC,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,WAAW;CAwBpB"}

package/lib/components/utils/DataQualityValidationNameGeneratorVisitor.js

@@ -15,6 +15,7 @@
  */
 import { CollectionInstanceValue, PrimitiveInstanceValue, } from '@finos/legend-graph';
 import { DataQualityFunctionDefaults } from './DataQualityFunctionDefaults.js';
+import { DataQualityValidationPropertyGuarantee, } from './DataQualityValidationFunction.js';
 import { hashArray } from '@finos/legend-shared';
 export class DataQualityValidationNameGeneratorVisitor {
     depth = 0;
@@ -48,7 +49,13 @@ export class DataQualityValidationNameGeneratorVisitor {
         const { property, otherParams } = func.parameters;
         const values = [];
         const nameTemplate = DataQualityFunctionDefaults.getFunctionNameTemplate(func.name);
-        const columnName = property.func.value.name;
+        let columnName = '';
+        if (property instanceof DataQualityValidationPropertyGuarantee) {
+            columnName = property.parameters.property.func.value.name;
+        }
+        else {
+            columnName = property.func.value.name;
+        }
         if (!columnName || !nameTemplate) {
             return '';
         }
@@ -72,6 +79,9 @@ export class DataQualityValidationNameGeneratorVisitor {
         }
         return `${leftName}${operator}${rightName}`;
     }
+    visitPropertyGuarantee() {
+        return '';
+    }
     composeName(columnName, params, nameTemplate) {
         let name = nameTemplate;
         name = name.replace(/\[column\]/gi, this.toCamelCase(columnName));

package/lib/components/utils/DataQualityValidationNameGeneratorVisitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataQualityValidationNameGeneratorVisitor.js","sourceRoot":"","sources":["../../../src/components/utils/DataQualityValidationNameGeneratorVisitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataQualityValidationNameGeneratorVisitor.js","sourceRoot":"","sources":["../../../src/components/utils/DataQualityValidationNameGeneratorVisitor.ts"],"names":[],"mappings":"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"}

package/lib/data-quality-custom-selector.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-extension-dsl-data-quality v2.1.31
+/** @license @finos/legend-extension-dsl-data-quality v2.1.32
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/index.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-extension-dsl-data-quality v2.1.31
+/** @license @finos/legend-extension-dsl-data-quality v2.1.32
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-extension-dsl-data-quality",
-    "version": "2.1.31",
+    "version": "2.1.32",
     "description": "Legend extension for Data Quality",
     "keywords": [
         "legend",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-extension-dsl-data-quality",
-  "version": "2.1.31",
+  "version": "2.1.32",
   "description": "Legend extension for Data Quality",
   "keywords": [
     "legend",
@@ -43,13 +43,13 @@
   },
   "dependencies": {
     "@finos/legend-application": "16.0.103",
-    "@finos/legend-application-studio": "28.19.111",
+    "@finos/legend-application-studio": "28.19.112",
     "@finos/legend-art": "7.1.145",
-    "@finos/legend-code-editor": "2.0.161",
-    "@finos/legend-extension-dsl-data-space": "10.4.207",
-    "@finos/legend-graph": "32.4.1",
-    "@finos/legend-lego": "2.0.180",
-    "@finos/legend-query-builder": "4.17.98",
+    "@finos/legend-code-editor": "2.0.162",
+    "@finos/legend-extension-dsl-data-space": "10.4.208",
+    "@finos/legend-graph": "32.4.2",
+    "@finos/legend-lego": "2.0.181",
+    "@finos/legend-query-builder": "4.17.99",
     "@finos/legend-shared": "11.0.23",
     "@finos/legend-storage": "3.0.144",
     "@types/react": "19.0.10",

package/src/components/DataQualityRelationLambdaGUIValidationEditor.tsx

@@ -50,7 +50,14 @@ export const DataQualityRelationLambdaGUIValidationEditor = observer(
     const { assertion, otherFunction } = dataQualityValidationLambdaFormState;
 
     return (
-      <div className="data-quality-validation-gui-editor">
+      <div
+        className="data-quality-validation-gui-editor"
+        role="group"
+        tabIndex={-1}
+        onFocus={() =>
+          validationState.debouncedHandleValidationFormChange.cancel()
+        }
+      >
         <div className="data-quality-validation-gui-editor__functions-list">
           {otherFunction instanceof DataQualityValidationFilterFunction && (
             <DataQualityValidationFilterEditor

package/src/components/DataQualityValidationFilterEditor.tsx

@@ -25,6 +25,7 @@ import {
 import {
   DataQualityValidationFilterCondition,
   DataQualityValidationLogicalGroupFunction,
+  DataQualityValidationPropertyGuarantee,
   type DataQualityValidationFilterFunction,
 } from './utils/DataQualityValidationFunction.js';
 import { DataQualityValidationFunctionRenderer } from './DataQualityValidationFunctionRenderer.js';
@@ -46,6 +47,7 @@ import {
 import { DataQualityValidationFunctionFactory } from './utils/DataQualityValidationFunctionFactory.js';
 import { DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS } from './constants/DataQualityConstants.js';
 import type { Option } from './DataQualityCustomSelector.js';
+import { useRef } from 'react';
 
 const DataQualityValidationFilterConditionEditor = observer(
   (props: {
@@ -54,13 +56,20 @@ const DataQualityValidationFilterConditionEditor = observer(
     disabled: boolean;
     showAddButton: boolean;
     showDeleteButton: boolean;
-    handleFunctionChange: (name: string, id: string) => void;
+    handleFunctionChange: (
+      name: string,
+      id: string,
+      isCurrentColOptional: boolean,
+    ) => void;
     handleColumnChange: (value: string) => void;
     handleFunctionParamChange: (
       param: PrimitiveInstanceValue | CollectionInstanceValue,
       index: number,
     ) => void;
-    onAdd?: (operator: DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS) => void;
+    onAdd?: (
+      operator: DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS,
+      isCurrentColOptional: boolean,
+    ) => void;
     onDelete?: () => void;
     getFunctionOptions: (type: string) => Option[];
   }) => {
@@ -77,11 +86,19 @@ const DataQualityValidationFilterConditionEditor = observer(
       handleColumnChange,
       handleFunctionParamChange,
     } = props;
+
+    const functionParamsRef = useRef<
+      [PrimitiveInstanceValue | CollectionInstanceValue, number] | []
+    >([]);
     const { columnOptions } = validationState;
     const observerContext =
       validationState.editorStore.changeDetectionState.observerContext;
     const graph = validationState.editorStore.graphManagerState.graph;
-    const column = condition.parameters.property;
+    const column =
+      condition.parameters.property instanceof
+      DataQualityValidationPropertyGuarantee
+        ? condition.parameters.property.parameters.property
+        : condition.parameters.property;
     const columnOption = columnOptions.find(
       ({ value }) => value === column.func.value.name,
     );
@@ -106,13 +123,20 @@ const DataQualityValidationFilterConditionEditor = observer(
             handleColumnChange(value);
           }}
           selectedColumn={columnOption}
-          handleFunctionChange={handleFunctionChange}
+          handleFunctionChange={(name: string, id: string) => {
+            handleFunctionChange(name, id, columnOption?.isOptional ?? false);
+          }}
           handleFunctionParametersChange={(
             param: PrimitiveInstanceValue | CollectionInstanceValue,
             index: number,
           ) => {
             condition.parameters.otherParams[index] = param;
-            handleFunctionParamChange(param, index);
+            functionParamsRef.current = [param, index];
+          }}
+          onInputBlur={() => {
+            if (functionParamsRef.current.length === 2) {
+              handleFunctionParamChange(...functionParamsRef.current);
+            }
           }}
         />
         {showAddButton && (
@@ -123,14 +147,20 @@ const DataQualityValidationFilterConditionEditor = observer(
               <MenuContent>
                 <MenuContentItem
                   onClick={() =>
-                    onAdd?.(DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS.AND)
+                    onAdd?.(
+                      DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS.AND,
+                      columnOption?.isOptional ?? false,
+                    )
                   }
                 >
                   And
                 </MenuContentItem>
                 <MenuContentItem
                   onClick={() => {
-                    onAdd?.(DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS.OR);
+                    onAdd?.(
+                      DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS.OR,
+                      columnOption?.isOptional ?? false,
+                    );
                   }}
                 >
                   Or
@@ -209,7 +239,11 @@ const RenderConditionTree = observer(
       );
     }
 
-    const handleFunctionChange = (name: string, id: string) => {
+    const handleFunctionChange = (
+      name: string,
+      id: string,
+      isCurrentColOptional: boolean,
+    ) => {
       const findAndChange = (
         node:
           | DataQualityValidationFilterCondition
@@ -225,6 +259,7 @@ const RenderConditionTree = observer(
               isLeftChild ? 'left' : 'right',
               functionFactory,
               observerContext,
+              isCurrentColOptional,
             );
             return true;
           }
@@ -267,13 +302,14 @@ const RenderConditionTree = observer(
             );
             validationState.debouncedHandleValidationFormChange();
           }}
-          onAdd={(newOperator) => {
+          onAdd={(newOperator, isCurrentColOptional) => {
             dataQualityValidationFilterFunction_transformConditionToLogicalGroup(
               validationFunction,
               condition,
               newOperator,
               functionFactory,
               observerContext,
+              isCurrentColOptional,
             );
             validationState.debouncedHandleValidationFormChange();
           }}
@@ -327,17 +363,18 @@ export const DataQualityValidationFilterEditor = observer(
               type,
             )
           }
-          handleFunctionChange={(name) => {
-            handleValidationBodyChange(name);
+          handleFunctionChange={(name, _, isCurrentColOptional) => {
+            handleValidationBodyChange(name, isCurrentColOptional);
             validationState.debouncedHandleValidationFormChange();
           }}
-          onAdd={(operator) => {
+          onAdd={(operator, isCurrentColOptional) => {
             dataQualityValidationFilterFunction_addLogicalOperation(
               validationFunction,
               body,
               operator,
               functionFactory,
               observerContext,
+              isCurrentColOptional,
             );
           }}
           handleColumnChange={() => {

package/src/components/DataQualityValidationFunctionRenderer.tsx

@@ -30,29 +30,25 @@ import {
 } from '@finos/legend-graph';
 import type { Option } from './DataQualityCustomSelector.js';
 import { useState } from 'react';
-
-interface ColumnOption {
-  value: string;
-  label: string;
-  type: string;
-}
+import type { ColumnOption } from './states/LambdaEditorWithGUIState.js';
 
 interface DataQualityValidationFunctionRendererProps {
   id: string;
   columnOptions: ColumnOption[];
   functionOptions?: Option[];
-  handleColChange: (value: string, type: string) => void;
+  handleColChange: (value: string, type: string, isOptional: boolean) => void;
   readOnly: boolean;
   selectedColumn: ColumnOption | undefined;
   functionName: string;
   functionParameters: ValueSpecification[];
   handleFunctionChange: (name: string, id: string) => void;
-  handleFunctionParametersChange: (
+  handleFunctionParametersChange?: (
     param: PrimitiveInstanceValue | CollectionInstanceValue,
     index: number,
   ) => void;
   graph: PureModel;
   observerContext: ObserverContext;
+  onInputBlur?: () => void;
 }
 
 export function DataQualityValidationFunctionRenderer({
@@ -68,7 +64,8 @@ export function DataQualityValidationFunctionRenderer({
   functionName,
   graph,
   observerContext,
-}: DataQualityValidationFunctionRendererProps) {
+  onInputBlur,
+}: Readonly<DataQualityValidationFunctionRendererProps>) {
   const [initializeAsEditable, setInitializeAsEditable] = useState(false);
 
   return (
@@ -76,8 +73,8 @@ export function DataQualityValidationFunctionRenderer({
       <div className="data-quality-validation-gui-editor__function__parameter">
         <RenderColumn
           column={selectedColumn}
-          onChange={({ value, type }) => {
-            handleColChange(value, type);
+          onChange={({ value, type, isOptional }) => {
+            handleColChange(value, type, isOptional);
           }}
           options={columnOptions}
           disabled={readOnly}
@@ -108,14 +105,19 @@ export function DataQualityValidationFunctionRenderer({
             className="data-quality-validation-gui-editor__function__parameter data-quality-validation-gui-editor__function__parameter--value"
             key={getParameterKey(param.hashCode, idx)}
             onFocus={() => setInitializeAsEditable(true)}
-            onBlur={() => setInitializeAsEditable(false)}
+            onBlur={() => {
+              setInitializeAsEditable(false);
+              onInputBlur?.();
+            }}
+            role="group"
+            tabIndex={-1}
           >
             <EditableBasicValueSpecificationEditor
               valueSpecification={param}
               enableExpressionCalculation={false}
               displayAsString={!isPrimitiveNumber(type)}
               setValueSpecification={(newValue) => {
-                handleFunctionParametersChange(
+                handleFunctionParametersChange?.(
                   newValue as PrimitiveInstanceValue | CollectionInstanceValue,
                   idx,
                 );

package/src/components/DataQualityValidationHelperFunctionEditor.tsx

@@ -70,7 +70,7 @@ export const DataQualityValidationHelperFunctionEditor = observer(
           handleValidationBodyChange(name);
           validationState.debouncedHandleValidationFormChange();
         }}
-        handleFunctionParametersChange={() => {
+        onInputBlur={() => {
           validationState.debouncedHandleValidationFormChange();
         }}
       />

package/src/components/constants/DataQualityConstants.ts

@@ -60,6 +60,10 @@ export enum DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS {
   AND = 'and',
 }
 
+export enum DATA_QUALITY_VALIDATION_PROPERTY_GUARANTEE_FUNCTIONS {
+  TO_ONE = 'toOne',
+}
+
 export enum PARAMETER_COMPONENTS {
   LIST = 'list',
   NUMBER = 'number',

package/src/components/states/DataQualityValidationLambdaFormState.ts

@@ -121,7 +121,10 @@ export class DataQualityValidationLambdaFormState {
     }
   };
 
-  handleValidationBodyChange = (name: string) => {
+  handleValidationBodyChange = (
+    name: string,
+    isCurrentColOptional?: boolean,
+  ) => {
     const currentFunc = this.rule.parameters.otherParam;
 
     if (currentFunc) {
@@ -129,6 +132,7 @@ export class DataQualityValidationLambdaFormState {
         name,
         this.validationFuncFactory,
         this.observerContext,
+        isCurrentColOptional ?? false,
       );
 
       this.rule.parameters.otherParam = currentFunc.accept<

package/src/components/states/LambdaEditorWithGUIState.ts

@@ -48,6 +48,7 @@ export type ColumnOption = {
   value: string;
   label: string;
   type: string;
+  isOptional: boolean;
 };
 
 export abstract class LambdaEditorWithGUIState extends LambdaEditorState {
@@ -256,13 +257,14 @@ export abstract class LambdaEditorWithGUIState extends LambdaEditorState {
   }
 
   setColumnOptions(columns: RelationTypeColumnMetadata[]) {
-    this.columnOptions = columns.map(({ name, type }) => {
+    this.columnOptions = columns.map(({ name, type, multiplicity }) => {
       return {
         value: name,
         label: name,
         type: getPrimitiveTypeEnumFromPrecisePrimitiveTypeEnum(
           type as PRECISE_PRIMITIVE_TYPE,
         ),
+        isOptional: multiplicity.lowerBound === 0,
       };
     });
   }

package/src/components/utils/DataQualityFunctionDefaults.ts

@@ -279,7 +279,7 @@ export class DataQualityFunctionDefaults {
       [DATA_QUALITY_FILTER_VALIDATION_HELPER_FUNCTIONS.ROWS_WITH_NON_EMPTY_COLUMN]:
         'Expect [column] to be null',
       [DATA_QUALITY_FILTER_VALIDATION_HELPER_FUNCTIONS.ROWS_WITH_COLUMN_LONGER_THAN]:
-        'Expect [column] to have length [param-1]',
+        'Expect [column] to be shorter than [param-1]',
       [DATA_QUALITY_FILTER_VALIDATION_HELPER_FUNCTIONS.ROWS_WITH_NEGATIVE_VALUE]:
         'Expect [column] to be positive',
       [DATA_QUALITY_FILTER_VALIDATION_HELPER_FUNCTIONS.ROWS_WITH_COLUMN_DIFFERS_FROM_PATTERN]:
@@ -311,4 +311,21 @@ export class DataQualityFunctionDefaults {
       'Expect [column] not match [param-1]',
     [DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.FILTER]: '',
   };
+
+  private static readonly FUNCTIONS_ACCEPTING_OPTIONAL: Set<string> = new Set([
+    DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.EQUAL,
+    DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.IS_EMPTY,
+    DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.IS_NOT_EMPTY,
+    DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.IN,
+    DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.GREATER_THAN,
+    DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.GREATER_THAN_EQUAL,
+    DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.LESS_THAN,
+    DATA_QUALITY_VALIDATION_PURE_FUNCTIONS.LESS_THAN_EQUAL,
+  ]);
+
+  static getIsPureFunctionColumnRequired(functionName: string): boolean {
+    return !DataQualityFunctionDefaults.FUNCTIONS_ACCEPTING_OPTIONAL.has(
+      functionName,
+    );
+  }
 }

package/src/components/utils/DataQualityLambdaParameterExtractorVisitor.ts

@@ -21,14 +21,16 @@ import type {
   DataQualityValidationCustomHelperFunction,
   DataQualityValidationFilterCondition,
   DataQualityValidationLogicalGroupFunction,
+  DataQualityValidationPropertyGuarantee,
 } from './DataQualityValidationFunction.js';
 import {
   DATA_QUALITY_VALIDATION_LOGICAL_FUNCTIONS,
+  DATA_QUALITY_VALIDATION_PROPERTY_GUARANTEE_FUNCTIONS,
   SUPPORTED_TYPES,
 } from '../constants/DataQualityConstants.js';
 import { assertTrue, UnsupportedOperationError } from '@finos/legend-shared';
 import {
-  type AbstractPropertyExpression,
+  AbstractPropertyExpression,
   type CollectionInstanceValue,
   type PrimitiveInstanceValue,
   type ObserverContext,
@@ -37,16 +39,19 @@ import {
 } from '@finos/legend-graph';
 import {
   DataQualityLambdaParameterParser,
+  ParsedFunctionExpression,
   type LambdaBody,
 } from './DataQualityLambdaParameterParser.js';
 import { DataQualityValidationFunctionFactory } from './DataQualityValidationFunctionFactory.js';
 import {
   observe_DataQualityValidationFilterCondition,
   observe_DataQualityValidationLogicalGroupFunction,
+  observe_DataQualityValidationPropertyGuarantee,
 } from './DataQualityValidationFunctionObserver.js';
 
 export class DataQualityLambdaParameterExtractorVisitor
-  implements DataQualityValidationFunctionVisitor<void>
+  implements
+    DataQualityValidationFunctionVisitor<void | DataQualityValidationPropertyGuarantee>
 {
   private lambdaBody: LambdaBody;
   private graph: PureModel;
@@ -206,7 +211,7 @@ export class DataQualityLambdaParameterExtractorVisitor
     );
 
     const {
-      processedParameters: [property, ...otherParams],
+      processedParameters: [firstParam, ...otherParams],
     } = DataQualityLambdaParameterParser.processFunctionParameter(
       this.filterBody as LambdaBody,
       this.graph,
@@ -217,10 +222,60 @@ export class DataQualityLambdaParameterExtractorVisitor
       | PrimitiveInstanceValue
       | CollectionInstanceValue
     )[];
-    func.parameters.property = property as AbstractPropertyExpression;
+    if (firstParam instanceof AbstractPropertyExpression) {
+      func.parameters.property = firstParam;
+    } else if (
+      firstParam instanceof ParsedFunctionExpression &&
+      matchFunctionName(
+        firstParam.name,
+        Object.values(DATA_QUALITY_VALIDATION_PROPERTY_GUARANTEE_FUNCTIONS),
+      )
+    ) {
+      func.parameters.property = new DataQualityValidationFunctionFactory(
+        this.graph,
+        this.observerContext,
+      )
+        .createPropertyGuaranteeFunction(firstParam.name)
+        .accept(this, {
+          propertyGuaranteeParameters: firstParam.processedParameters,
+        }) as unknown as DataQualityValidationPropertyGuarantee;
+    } else {
+      throw new UnsupportedOperationError(
+        'Logical function cannot be used as property parameter in filter condition',
+      );
+    }
     observe_DataQualityValidationFilterCondition(func);
   }
 
+  visitPropertyGuarantee(
+    func: DataQualityValidationPropertyGuarantee,
+    context: {
+      propertyGuaranteeParameters: ParsedFunctionExpression['processedParameters'];
+    },
+  ): DataQualityValidationPropertyGuarantee {
+    const { propertyGuaranteeParameters } = context;
+    assertTrue(
+      Boolean(propertyGuaranteeParameters),
+      `Expected ${func.name} parameters to be present`,
+    );
+
+    assertTrue(
+      propertyGuaranteeParameters.length === 1,
+      `Expected ${func.name} parameters to be 1, got ${propertyGuaranteeParameters.length}`,
+    );
+
+    const propertyParam = propertyGuaranteeParameters[0];
+
+    if (propertyParam instanceof AbstractPropertyExpression) {
+      func.parameters.property = propertyParam;
+      return observe_DataQualityValidationPropertyGuarantee(func);
+    }
+
+    throw new UnsupportedOperationError(
+      'Expected property parameter to be an AbstractPropertyExpression',
+    );
+  }
+
   visitLogicalGroup(func: DataQualityValidationLogicalGroupFunction) {
     assertTrue(Boolean(this.filterBody), 'Expected filter body to be present');
 

package/src/components/utils/DataQualityLambdaParameterParser.ts

@@ -36,6 +36,8 @@ import {
   observe_SimpleFunctionExpression,
   type ValueSpecification,
   observe_VariableExpression,
+  type CollectionInstanceValue,
+  type PrimitiveInstanceValue,
 } from '@finos/legend-graph';
 import {
   buildPrimitiveCollectionInstanceValue,
@@ -54,6 +56,24 @@ export type LambdaBody = {
   property?: string;
 };
 
+export class ParsedFunctionExpression {
+  name: string;
+  processedParameters: (
+    | CollectionInstanceValue
+    | PrimitiveInstanceValue
+    | AbstractPropertyExpression
+    | ParsedFunctionExpression
+  )[];
+
+  constructor(
+    name: string,
+    processedParameters: ParsedFunctionExpression['processedParameters'] = [],
+  ) {
+    this.name = name;
+    this.processedParameters = processedParameters;
+  }
+}
+
 export class DataQualityLambdaParameterParser {
   static processPrimitiveParameter(
     param: LambdaBody,
@@ -192,7 +212,7 @@ export class DataQualityLambdaParameterParser {
     { parameters = [], function: name = '' }: LambdaBody,
     graph: PureModel,
     observerContext: ObserverContext,
-  ) {
+  ): ParsedFunctionExpression {
     const processedParameters = parameters.map((parameter) => {
       if (
         DataQualityLambdaParameterParser.isSupportedPrimitive(parameter._type)
@@ -215,6 +235,12 @@ export class DataQualityLambdaParameterParser {
               graph,
               observerContext,
             );
+          case SUPPORTED_TYPES.FUNCTION:
+            return DataQualityLambdaParameterParser.processFunctionParameter(
+              parameter,
+              graph,
+              observerContext,
+            );
           default:
             throw new UnsupportedOperationError(
               `Cannot process type: ${parameter._type}`,
@@ -223,10 +249,7 @@ export class DataQualityLambdaParameterParser {
       }
     });
 
-    return {
-      name,
-      processedParameters,
-    };
+    return new ParsedFunctionExpression(name, processedParameters);
   }
 
   static createSimpleFunctionExpression(