@rytass/bpm-core-nestjs-module 0.18.1 → 0.20.0

package/src/lib/form-data-source/form-data-source.expression.js

@@ -0,0 +1,267 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EXPRESSION_BINDING_DIALECT = void 0;
+exports.readExpressionBindingDependencies = readExpressionBindingDependencies;
+exports.callsOnlyBuiltInExpressionFunctions = callsOnlyBuiltInExpressionFunctions;
+exports.isExpressionBindingValue = isExpressionBindingValue;
+exports.createFormDataSourceExpressionEvaluator = createFormDataSourceExpressionEvaluator;
+exports.readExpressionBindingResultType = readExpressionBindingResultType;
+exports.lintExpressionBindings = lintExpressionBindings;
+const bpm_core_shared_1 = require("@rytass/bpm-core-shared");
+const cel_v2_adapter_1 = require("../condition/adapters/cel-v2.adapter");
+const expression_ast_1 = require("../condition/expression-ast");
+const expression_errors_1 = require("../condition/expression-errors");
+const form_data_source_errors_1 = require("./form-data-source.errors");
+/*
+ * `EXPRESSION` binding sources (ADR 22 §3.7, docs/24 §2.8). One evaluator is
+ * shared by search, resolve and submit through `readBindingValues`, so the
+ * three paths cannot compute different parameter values for the same input.
+ *
+ * An `EXPRESSION` binding is always cel-v2 and may only call the built-in
+ * functions. It is evaluated from the stored schema; nothing the browser sends
+ * is ever read as an expression.
+ */
+/** The binding dialect: there is no field for it (docs/24 §2.4). */
+exports.EXPRESSION_BINDING_DIALECT = 'cel-v2';
+/** The roots a DataSource binding may read: `form`, and `row` in a table column. */
+const DATA_SOURCE_BINDING_ROOTS = bpm_core_shared_1.EXPRESSION_ROOT_IDENTIFIERS_BY_USAGE_POINT.DATA_SOURCE_BINDING;
+/** The roots a top-level field's binding may read: `form` only. */
+const TOP_LEVEL_BINDING_ROOTS = ['form'];
+const BUILT_IN_FUNCTION_NAMES = new Set(bpm_core_shared_1.BPM_BUILT_IN_EXPRESSION_FUNCTION_NAMES);
+/**
+ * The static dependencies of a binding expression, or `null` when they cannot
+ * be known: it does not parse, reads a root other than `form` and `row`, uses
+ * a root as a whole value, or indexes with a computed key. The publish lint
+ * refuses each of those; reaching one at run time means the schema was written
+ * around it, and the caller fails closed.
+ */
+function readExpressionBindingDependencies(expression) {
+    const parsed = (0, expression_ast_1.readExpressionReferences)(expression.trim(), exports.EXPRESSION_BINDING_DIALECT);
+    if (parsed.status !== 'OK') {
+        return null;
+    }
+    const { references } = parsed;
+    if (references.roots.some((root) => !DATA_SOURCE_BINDING_ROOTS.includes(root)) ||
+        references.wholeRootReferences.length > 0 ||
+        references.computedKeys.length > 0 ||
+        references.reservedSegments.length > 0) {
+        return null;
+    }
+    const rowColumnKeys = [
+        ...new Set(references.fieldPaths
+            .filter((path) => path.root === 'row' && path.segments.length > 0)
+            .map((path) => path.segments[0])),
+    ];
+    const formFieldKeys = [
+        ...new Set(references.fieldPaths
+            .filter((path) => path.root === 'form' && path.segments.length > 0)
+            .map((path) => path.segments[0])),
+    ];
+    return { formFieldKeys, rowColumnKeys };
+}
+/**
+ * Whether the expression calls only cel-v2's own functions and the nine
+ * built-ins (docs/24 §1: no host functions in a binding in v1). `false` for an
+ * expression that cannot be read.
+ */
+function callsOnlyBuiltInExpressionFunctions(expression) {
+    const names = (0, expression_ast_1.readExpressionHostFunctionNames)(expression.trim(), exports.EXPRESSION_BINDING_DIALECT);
+    return names !== null && names.every((name) => BUILT_IN_FUNCTION_NAMES.has(name));
+}
+function isExpressionBindingValue(value) {
+    return (value === null ||
+        typeof value === 'boolean' ||
+        typeof value === 'string' ||
+        (typeof value === 'number' && Number.isFinite(value)));
+}
+const EXPRESSION_BINDING_LABEL = 'dataSource.binding';
+const invalidBinding = () => new form_data_source_errors_1.BPMFormDataSourceException(form_data_source_errors_1.BPM_FORM_DATA_SOURCE_ERROR_CODES.INVALID_BINDING);
+/**
+ * Picks own properties only: a field may be named `constructor`, and a plain
+ * index would hand the engine a function off the prototype.
+ */
+function pickOwnValues(source, keys) {
+    return Object.fromEntries(keys
+        .filter((key) => Object.prototype.hasOwnProperty.call(source, key))
+        .map((key) => [key, source[key]]));
+}
+function createFormDataSourceExpressionEvaluator(options) {
+    return {
+        evaluate({ expression, formData, isPresent, position, }) {
+            const conditionService = options.conditionService;
+            if (!conditionService || typeof expression !== 'string') {
+                throw invalidBinding();
+            }
+            const dependencies = readExpressionBindingDependencies(expression);
+            if (dependencies === null ||
+                !callsOnlyBuiltInExpressionFunctions(expression)) {
+                throw invalidBinding();
+            }
+            // Roots by position (docs/24 §2.8), mirroring the publish lint: only a
+            // table column has a row, so at the top level `row` is not a root at
+            // all. A top-level field whose stored expression reads `row` was
+            // written around the lint and fails closed instead of waiting forever.
+            const rowValues = position.kind === 'TABLE_COLUMN' ? position.rowValues : undefined;
+            const allowedRootIdentifiers = position.kind === 'TABLE_COLUMN'
+                ? DATA_SOURCE_BINDING_ROOTS
+                : TOP_LEVEL_BINDING_ROOTS;
+            if (position.kind === 'TOP_LEVEL' && dependencies.rowColumnKeys.length > 0) {
+                throw invalidBinding();
+            }
+            const form = pickOwnValues(formData, dependencies.formFieldKeys);
+            const row = rowValues
+                ? pickOwnValues(rowValues, dependencies.rowColumnKeys)
+                : undefined;
+            const waiting = dependencies.formFieldKeys.some((key) => !isPresent(form[key])) ||
+                (dependencies.rowColumnKeys.length > 0 &&
+                    (!row ||
+                        dependencies.rowColumnKeys.some((key) => !isPresent(row[key]))));
+            if (waiting) {
+                return undefined;
+            }
+            const value = (() => {
+                try {
+                    return conditionService.evaluateValue(expression, row ? { form, row } : { form }, EXPRESSION_BINDING_LABEL, {
+                        allowedRootIdentifiers,
+                        ...(options.budget ? { budget: options.budget } : {}),
+                        dialect: exports.EXPRESSION_BINDING_DIALECT,
+                    });
+                }
+                catch (error) {
+                    // Out of budget keeps the source's existing UNAVAILABLE meaning;
+                    // anything else the expression did wrong is a binding that does not
+                    // work (docs/24 §2.1: no new DataSource code). The engine's text
+                    // never leaves: only the code is read.
+                    throw new form_data_source_errors_1.BPMFormDataSourceException(error instanceof expression_errors_1.ExpressionRuntimeError &&
+                        error.code === 'EXPRESSION_BUDGET_EXCEEDED'
+                        ? form_data_source_errors_1.BPM_FORM_DATA_SOURCE_ERROR_CODES.TIMEOUT
+                        : form_data_source_errors_1.BPM_FORM_DATA_SOURCE_ERROR_CODES.INVALID_BINDING);
+                }
+            })();
+            if (!isExpressionBindingValue(value)) {
+                throw invalidBinding();
+            }
+            return value;
+        },
+    };
+}
+// ------------------------------------------------------------- publish lint --
+/** CEL base types a parameter of each type accepts from an expression. */
+const ACCEPTED_RESULT_TYPES = {
+    BOOLEAN: ['bool'],
+    NUMBER: ['double', 'int', 'uint'],
+    STRING: ['string'],
+    // ADR 22 §3.7: an expression yields a scalar, never a list.
+    STRING_ARRAY: [],
+};
+const readSchemaVariable = (fields) => Object.fromEntries(fields
+    .filter((field) => typeof field?.fieldKey === 'string' &&
+    !expression_ast_1.RESERVED_PATH_SEGMENTS.has(field.fieldKey))
+    .map((field) => [
+    field.fieldKey,
+    (0, expression_ast_1.readExpressionFieldType)(field),
+]));
+/**
+ * The CEL type the expression evaluates to, read with `form` (and `row`) at
+ * their schema types, then untyped; `null` when neither check passes or the
+ * engine cannot say. Only built-ins can appear here (host functions are
+ * refused first), so the built-ins environment is the right one.
+ */
+function readExpressionBindingResultType(expression, schema, columns) {
+    const check = (typed) => {
+        try {
+            const environment = (0, cel_v2_adapter_1.loadCelV2Environment)().clone();
+            if (typed) {
+                environment.registerVariable({
+                    name: 'form',
+                    schema: readSchemaVariable(schema.fields),
+                });
+                if (columns) {
+                    environment.registerVariable({
+                        name: 'row',
+                        schema: readSchemaVariable(columns),
+                    });
+                }
+            }
+            const result = environment.parse(expression).check();
+            return result.valid && typeof result.type === 'string'
+                ? result.type
+                : null;
+        }
+        catch {
+            return null;
+        }
+    };
+    return check(true) ?? check(false);
+}
+const isResultTypeAccepted = (type, parameterType) => {
+    if (parameterType === 'STRING_ARRAY') {
+        return false;
+    }
+    if (type === null) {
+        return true;
+    }
+    const base = type.split('<')[0].trim();
+    return (base === 'dyn' ||
+        base === 'null_type' ||
+        ACCEPTED_RESULT_TYPES[parameterType].includes(base));
+};
+/**
+ * The publish lint of a field's `EXPRESSION` bindings (docs/24 §2.8): each
+ * one must pass the cel-v2 lint of `DATA_SOURCE_BINDING` — roots by position
+ * (`form`; `form` and `row` in a table column), built-in functions only
+ * (`EXPR_FUNCTION_NOT_ALLOWED`), the bound form's fields and types — read only
+ * sibling columns through `row`, and produce a value of the parameter's type
+ * (`EXPR_RESULT_TYPE_MISMATCH`; a `STRING_ARRAY` parameter never fits).
+ *
+ * Lines are `<path>.bindings[<i>].from.expression: <code>[ <subject>]`. Lint
+ * and evaluation share the injected `ConditionService`; without one the
+ * binding cannot be checked and the line says so.
+ */
+function lintExpressionBindings(input) {
+    const parameterTypes = new Map(input.descriptor.parameters.map((parameter) => [
+        parameter.key,
+        parameter.type,
+    ]));
+    return input.reference.bindings.flatMap((binding, index) => {
+        if (binding.from.kind !== 'EXPRESSION') {
+            return [];
+        }
+        const label = `${input.path}.bindings[${index}].from.expression`;
+        const expression = typeof binding.from.expression === 'string'
+            ? binding.from.expression.trim()
+            : '';
+        if (!input.conditionService) {
+            return [
+                `${input.path}.bindings expression cannot be checked: no ConditionService is available`,
+            ];
+        }
+        const lintErrors = input.conditionService.lintExpression(expression, label, {
+            allowedRootIdentifiers: input.columns
+                ? DATA_SOURCE_BINDING_ROOTS
+                : TOP_LEVEL_BINDING_ROOTS,
+            dialect: exports.EXPRESSION_BINDING_DIALECT,
+            formSchema: input.schema,
+            usagePoint: 'DATA_SOURCE_BINDING',
+        });
+        if (lintErrors.length > 0) {
+            return lintErrors;
+        }
+        const dependencies = readExpressionBindingDependencies(expression);
+        const columnKeys = new Set((input.columns ?? []).map((column) => column.fieldKey));
+        const unknownColumns = (dependencies?.rowColumnKeys ?? []).filter((key) => !columnKeys.has(key));
+        if (dependencies === null) {
+            return [`${label}: EXPR_PARSE_FAILED`];
+        }
+        if (unknownColumns.length > 0) {
+            return unknownColumns.map((key) => `${label}: EXPR_FIELD_UNKNOWN ${key}`);
+        }
+        const parameterType = parameterTypes.get(binding.parameter);
+        // An unknown parameter is reported by the binding lint already.
+        return parameterType &&
+            !isResultTypeAccepted(readExpressionBindingResultType(expression, input.schema, input.columns), parameterType)
+            ? [`${label}: EXPR_RESULT_TYPE_MISMATCH`]
+            : [];
+    });
+}
+//# sourceMappingURL=form-data-source.expression.js.map

package/src/lib/form-data-source/form-data-source.expression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-data-source.expression.js","sourceRoot":"","sources":["../../../../../../libs/bpm-core/src/lib/form-data-source/form-data-source.expression.ts"],"names":[],"mappings":"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"}

package/src/lib/form-data-source/form-data-source.module.js

@@ -5,6 +5,7 @@ exports.FormDataSourceModule = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
+const condition_module_1 = require("../condition/condition.module");
 const workflow_engine_module_1 = require("../workflow-engine/workflow-engine.module");
 const approval_template_version_entity_1 = require("../template/approval-template-version.entity");
 const form_definition_version_entity_1 = require("../form/form-definition-version.entity");
@@ -26,6 +27,9 @@ let FormDataSourceModule = FormDataSourceModule_1 = class FormDataSourceModule {
             imports: [
                 ...(options.imports ?? []),
                 workflow_engine_module_1.WorkflowEngineModule,
+                // `EXPRESSION` bindings are linted and evaluated by the shared
+                // `ConditionService`, with the host's function registry.
+                condition_module_1.ConditionModule,
                 typeorm_1.TypeOrmModule.forFeature([
                     approval_template_version_entity_1.ApprovalTemplateVersionEntity,
                     form_definition_version_entity_1.FormDefinitionVersionEntity,

package/src/lib/form-data-source/form-data-source.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-data-source.module.js","sourceRoot":"","sources":["../../../../../../libs/bpm-core/src/lib/form-data-source/form-data-source.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAMwB;AACxB,6CAAgD;AAChD,sFAAiF;AACjF,mGAA6F;AAC7F,2FAAqF;AACrF,2EAAoF;AACpF,yEAAmE;AACnE,yEAAmE;AACnE,uGAA+F;AAC/F,qEAIkC;AAW3B,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAC/B,MAAM,CAAC,OAAO,CAAC,UAAuC,EAAE;QACtD,MAAM,gBAAgB,GACpB,OAAO,CAAC,gBAAgB,IAAI,iEAAqC,CAAC;QAEpE,OAAO;YACL,OAAO,EAAE;gBACP,sDAA6B;gBAC7B,4DAAmC;gBACnC,gDAAqB;aACtB;YACD,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE;gBACP,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;gBAC1B,6CAAoB;gBACpB,uBAAa,CAAC,UAAU,CAAC;oBACvB,gEAA6B;oBAC7B,4DAA2B;iBAC5B,CAAC;aACH;YACD,MAAM,EAAE,sBAAoB;YAC5B,SAAS,EAAE;gBACT,gBAAgB;gBAChB,gDAAqB;gBACrB,gDAAqB;gBACrB,4EAAkC;gBAClC;oBACE,OAAO,EAAE,4DAAmC;oBAC5C,WAAW,EAAE,4EAAkC;iBAChD;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAjCY,oDAAoB;+BAApB,oBAAoB;IAFhC,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,oBAAoB,CAiChC"}
+{"version":3,"file":"form-data-source.module.js","sourceRoot":"","sources":["../../../../../../libs/bpm-core/src/lib/form-data-source/form-data-source.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAMwB;AACxB,6CAAgD;AAChD,oEAAgE;AAChE,sFAAiF;AACjF,mGAA6F;AAC7F,2FAAqF;AACrF,2EAAoF;AACpF,yEAAmE;AACnE,yEAAmE;AACnE,uGAA+F;AAC/F,qEAIkC;AAW3B,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAC/B,MAAM,CAAC,OAAO,CAAC,UAAuC,EAAE;QACtD,MAAM,gBAAgB,GACpB,OAAO,CAAC,gBAAgB,IAAI,iEAAqC,CAAC;QAEpE,OAAO;YACL,OAAO,EAAE;gBACP,sDAA6B;gBAC7B,4DAAmC;gBACnC,gDAAqB;aACtB;YACD,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE;gBACP,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;gBAC1B,6CAAoB;gBACpB,+DAA+D;gBAC/D,yDAAyD;gBACzD,kCAAe;gBACf,uBAAa,CAAC,UAAU,CAAC;oBACvB,gEAA6B;oBAC7B,4DAA2B;iBAC5B,CAAC;aACH;YACD,MAAM,EAAE,sBAAoB;YAC5B,SAAS,EAAE;gBACT,gBAAgB;gBAChB,gDAAqB;gBACrB,gDAAqB;gBACrB,4EAAkC;gBAClC;oBACE,OAAO,EAAE,4DAAmC;oBAC5C,WAAW,EAAE,4EAAkC;iBAChD;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AApCY,oDAAoB;+BAApB,oBAAoB;IAFhC,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,oBAAoB,CAoChC"}

package/src/lib/form-data-source/form-data-source.service.d.ts

@@ -1,11 +1,14 @@
 import { FormDefinitionSchema, FormOptionFieldDefinition } from '@rytass/bpm-core-shared/form';
 import { Repository } from 'typeorm';
 import { BPMAuthContext } from '../bpm-auth';
+import { ConditionService } from '../condition/condition.service';
 import { ApprovalTemplateVersionEntity } from '../template/approval-template-version.entity';
 import { FormDefinitionVersionEntity } from '../form/form-definition-version.entity';
 import { WorkflowEngineService } from '../workflow-engine/workflow-engine.service';
 import { BPMFormDataSourceDescriptor, BPMFormDataSourceOptionResult, BPMFormDataSourceRegistry, BPMFormDataSourceResolveResult } from './form-data-source.types';
-import { RowFieldValues } from './form-data-source.validation';
+import { FormDataSourceBindingPosition } from './form-data-source.validation';
+export type { FormDataSourceBindingPosition } from './form-data-source.validation';
+export { createTableColumnBindingPosition, TOP_LEVEL_BINDING_POSITION, } from './form-data-source.validation';
 export interface BPMFormDataSourcePreviewInput {
     readonly cursor?: string | null;
     readonly fieldKey: string;
@@ -45,8 +48,9 @@ export declare class FormDataSourceService {
     private readonly approvalTemplateVersionRepository;
     private readonly formDefinitionVersionRepository;
     private readonly workflowEngineService;
+    private readonly conditionService?;
     private readonly logger;
-    constructor(registry: BPMFormDataSourceRegistry, approvalTemplateVersionRepository: Repository<ApprovalTemplateVersionEntity>, formDefinitionVersionRepository: Repository<FormDefinitionVersionEntity>, workflowEngineService: WorkflowEngineService);
+    constructor(registry: BPMFormDataSourceRegistry, approvalTemplateVersionRepository: Repository<ApprovalTemplateVersionEntity>, formDefinitionVersionRepository: Repository<FormDefinitionVersionEntity>, workflowEngineService: WorkflowEngineService, conditionService?: (ConditionService | null) | undefined);
     listDescriptors(): readonly BPMFormDataSourceDescriptor[];
     lintDefinitionSchemaEnvironment(schema: FormDefinitionSchema): readonly string[];
     private readFieldEnvironmentErrors;
@@ -54,14 +58,19 @@ export declare class FormDataSourceService {
     formFieldOptions(input: BPMFormDataSourceRuntimeInput, authContext: BPMAuthContext): Promise<BPMFormDataSourceOptionResult>;
     previewResolveFormFieldOptionValues(input: BPMFormDataSourcePreviewResolveInput, authContext: BPMAuthContext): Promise<BPMFormDataSourceResolveResult>;
     resolveFormFieldOptionValues(input: BPMFormDataSourceRuntimeResolveInput, authContext: BPMAuthContext): Promise<BPMFormDataSourceResolveResult>;
+    /**
+     * One search is one expression operation (ADR 22 §3.2): its `EXPRESSION`
+     * bindings share one cumulative budget.
+     */
     searchFormFieldOptions(input: {
         readonly authContext: BPMAuthContext;
         readonly cursor: string | null;
         readonly field: FormOptionFieldDefinition;
         readonly formData: Readonly<Record<string, unknown>>;
-        readonly rowValues?: RowFieldValues;
+        readonly position: FormDataSourceBindingPosition;
         readonly searchText: string;
     }): Promise<BPMFormDataSourceOptionResult>;
+    private searchInOperation;
     /**
      * Read-only value check for the renderer. A value the provider no longer
      * offers is reported in `unresolvedValues` rather than thrown, because the
@@ -69,6 +78,7 @@ export declare class FormDataSourceService {
      * contract breaches and transport failures still throw.
      */
     private reportFormFieldOptionValues;
+    private reportInOperation;
     private callResolve;
     /**
      * Wraps the runtime context lookup so a failure from the storage layer never
@@ -84,6 +94,15 @@ export declare class FormDataSourceService {
     private parseSchema;
     private assertEnvironmentSchema;
     private parseFormData;
+    /**
+     * Where the queried field sits, read from the schema: a table column
+     * carries its row (empty when the caller sent none), a top-level field none.
+     * For a top-level field whatever the browser sent is dropped, so neither a
+     * `ROW_FIELD` nor an `EXPRESSION` binding's `row` root can read it there even
+     * if a schema got past the publish lint (ADR 22 §3.7: roots by position).
+     * Matches `readOptionField`, which prefers a top-level field of that key.
+     */
+    private readBindingPosition;
     /**
      * The cell values of the row a column query belongs to. Absent is legal and
      * distinct from empty: it means the caller sent none, so a `ROW_FIELD`

package/src/lib/form-data-source/form-data-source.service.js

@@ -1,12 +1,14 @@
 "use strict";
 var FormDataSourceService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormDataSourceService = void 0;
+exports.FormDataSourceService = exports.TOP_LEVEL_BINDING_POSITION = exports.createTableColumnBindingPosition = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const form_1 = require("@rytass/bpm-core-shared/form");
 const typeorm_2 = require("typeorm");
+const condition_service_1 = require("../condition/condition.service");
+const expression_budget_1 = require("../condition/expression-budget");
 const approval_template_version_entity_1 = require("../template/approval-template-version.entity");
 const template_enums_1 = require("../template/template.enums");
 const form_definition_version_entity_1 = require("../form/form-definition-version.entity");
@@ -15,14 +17,19 @@ const form_schema_validator_1 = require("../form/form-schema.validator");
 const workflow_engine_enums_1 = require("../workflow-engine/workflow-engine.enums");
 const workflow_engine_service_1 = require("../workflow-engine/workflow-engine.service");
 const form_data_source_errors_1 = require("./form-data-source.errors");
+const form_data_source_expression_1 = require("./form-data-source.expression");
 const form_data_source_types_1 = require("./form-data-source.types");
 const form_data_source_validation_1 = require("./form-data-source.validation");
+var form_data_source_validation_2 = require("./form-data-source.validation");
+Object.defineProperty(exports, "createTableColumnBindingPosition", { enumerable: true, get: function () { return form_data_source_validation_2.createTableColumnBindingPosition; } });
+Object.defineProperty(exports, "TOP_LEVEL_BINDING_POSITION", { enumerable: true, get: function () { return form_data_source_validation_2.TOP_LEVEL_BINDING_POSITION; } });
 let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceService {
-    constructor(registry, approvalTemplateVersionRepository, formDefinitionVersionRepository, workflowEngineService) {
+    constructor(registry, approvalTemplateVersionRepository, formDefinitionVersionRepository, workflowEngineService, conditionService) {
         this.registry = registry;
         this.approvalTemplateVersionRepository = approvalTemplateVersionRepository;
         this.formDefinitionVersionRepository = formDefinitionVersionRepository;
         this.workflowEngineService = workflowEngineService;
+        this.conditionService = conditionService;
         this.logger = new common_1.Logger(FormDataSourceService_1.name);
     }
     listDescriptors() {
@@ -38,12 +45,12 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
             // whose source is gone must block publication exactly like a top-level
             // one (ADR 16 §3.7).
             if ((0, form_1.isTableFieldDefinition)(field)) {
-                return field.columns.flatMap((column, columnIndex) => this.readFieldEnvironmentErrors(column, `schema.fields[${index}].columns[${columnIndex}].dataSource`));
+                return field.columns.flatMap((column, columnIndex) => this.readFieldEnvironmentErrors(column, `schema.fields[${index}].columns[${columnIndex}].dataSource`, { columns: field.columns, schema }));
             }
-            return this.readFieldEnvironmentErrors(field, `schema.fields[${index}].dataSource`);
+            return this.readFieldEnvironmentErrors(field, `schema.fields[${index}].dataSource`, { columns: null, schema });
         });
     }
-    readFieldEnvironmentErrors(field, path) {
+    readFieldEnvironmentErrors(field, path, scope) {
         if (!(0, form_1.isFormDataSourceFieldDefinition)(field)) {
             return [];
         }
@@ -56,7 +63,24 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
         const descriptorErrors = (0, form_data_source_validation_1.readDescriptorErrors)(source.descriptor);
         const controlErrors = this.readControlErrors(field, source.descriptor, path);
         const bindingErrors = this.readBindingEnvironmentErrors(field.dataSource, source.descriptor, path);
-        return [...descriptorErrors, ...controlErrors, ...bindingErrors];
+        // The cel-v2 lint of every `EXPRESSION` binding (docs/24 §2.8): roots by
+        // position, built-in functions only, the bound form's field types, and
+        // a result that fits the parameter. It needs the descriptor for the
+        // parameter types, so it lives here with the other registry checks.
+        const expressionErrors = (0, form_data_source_expression_1.lintExpressionBindings)({
+            columns: scope.columns,
+            conditionService: this.conditionService,
+            descriptor: source.descriptor,
+            path,
+            reference: field.dataSource,
+            schema: scope.schema,
+        });
+        return [
+            ...descriptorErrors,
+            ...controlErrors,
+            ...bindingErrors,
+            ...expressionErrors,
+        ];
     }
     async previewFormFieldOptions(input, authContext) {
         const { schema } = this.parseSchema(input.schemaJson, input.uiSchemaJson);
@@ -68,7 +92,7 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
             cursor: input.cursor ?? null,
             field,
             formData,
-            rowValues: this.parseRowValues(input.rowValuesJson),
+            position: this.readBindingPosition(schema, input.fieldKey, input.rowValuesJson),
             searchText: input.searchText ?? '',
         });
     }
@@ -81,7 +105,7 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
             cursor: input.cursor ?? null,
             field,
             formData,
-            rowValues: this.parseRowValues(input.rowValuesJson),
+            position: this.readBindingPosition(context.schema, input.fieldKey, input.rowValuesJson),
             searchText: input.searchText ?? '',
         });
     }
@@ -93,7 +117,7 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
             authContext,
             field,
             formData: this.parseFormData(input.formDataJson),
-            rowValues: this.parseRowValues(input.rowValuesJson),
+            position: this.readBindingPosition(schema, input.fieldKey, input.rowValuesJson),
             values: this.parseValues(input.valuesJson),
         });
     }
@@ -104,15 +128,24 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
             authContext,
             field,
             formData: this.parseFormData(input.formDataJson),
-            rowValues: this.parseRowValues(input.rowValuesJson),
+            position: this.readBindingPosition(context.schema, input.fieldKey, input.rowValuesJson),
             values: this.parseValues(input.valuesJson),
         });
     }
-    async searchFormFieldOptions(input) {
+    /**
+     * One search is one expression operation (ADR 22 §3.2): its `EXPRESSION`
+     * bindings share one cumulative budget.
+     */
+    searchFormFieldOptions(input) {
+        return (0, expression_budget_1.runExpressionOperation)(() => this.searchInOperation(input));
+    }
+    async searchInOperation(input) {
         const field = (0, form_data_source_validation_1.readDynamicOptionField)(input.field);
         const source = (0, form_data_source_validation_1.readSourceOrThrow)(this.registry, field.dataSource);
         (0, form_data_source_validation_1.assertControlSupported)(field, source.descriptor);
-        const bindings = (0, form_data_source_validation_1.readBindingValues)(field, source.descriptor, input.formData, input.rowValues);
+        const bindings = (0, form_data_source_validation_1.readBindingValues)(field, source.descriptor, input.formData, input.position, (0, form_data_source_expression_1.createFormDataSourceExpressionEvaluator)({
+            conditionService: this.conditionService,
+        }));
         // Waiting on a dependency is a state, not a failure: the caller needs the
         // field names to prompt for, and an error carries none of them.
         if (bindings.missingParameters.length > 0) {
@@ -121,7 +154,10 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
                 dataSourceVersion: source.descriptor.version,
                 nextCursor: null,
                 options: [],
-                waitingForFieldKeys: (0, form_data_source_validation_1.readWaitingForFieldKeys)(field, bindings.missingParameters),
+                waitingForFieldKeys: (0, form_data_source_validation_1.readWaitingForFieldKeys)(field, bindings.missingParameters, {
+                    formData: input.formData,
+                    rowValues: (0, form_data_source_validation_1.readBindingPositionRowValues)(input.position),
+                }),
             };
         }
         const searchText = input.searchText.trim();
@@ -153,7 +189,10 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
      * field has to show which of several selected options went dead. Provider
      * contract breaches and transport failures still throw.
      */
-    async reportFormFieldOptionValues(input) {
+    reportFormFieldOptionValues(input) {
+        return (0, expression_budget_1.runExpressionOperation)(() => this.reportInOperation(input));
+    }
+    async reportInOperation(input) {
         const field = (0, form_data_source_validation_1.readDynamicOptionField)(input.field);
         const source = (0, form_data_source_validation_1.readSourceOrThrow)(this.registry, field.dataSource);
         (0, form_data_source_validation_1.assertControlSupported)(field, source.descriptor);
@@ -169,14 +208,19 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
             };
         }
         const values = (0, form_data_source_validation_1.validateRequestedValues)(input.values, source.descriptor.maximumResultCount);
-        const bindings = (0, form_data_source_validation_1.readBindingValues)(field, source.descriptor, input.formData, input.rowValues);
+        const bindings = (0, form_data_source_validation_1.readBindingValues)(field, source.descriptor, input.formData, input.position, (0, form_data_source_expression_1.createFormDataSourceExpressionEvaluator)({
+            conditionService: this.conditionService,
+        }));
         if (bindings.missingParameters.length > 0) {
             return {
                 dataSourceKey: source.descriptor.key,
                 dataSourceVersion: source.descriptor.version,
                 options: [],
                 unresolvedValues: [],
-                waitingForFieldKeys: (0, form_data_source_validation_1.readWaitingForFieldKeys)(field, bindings.missingParameters),
+                waitingForFieldKeys: (0, form_data_source_validation_1.readWaitingForFieldKeys)(field, bindings.missingParameters, {
+                    formData: input.formData,
+                    rowValues: (0, form_data_source_validation_1.readBindingPositionRowValues)(input.position),
+                }),
             };
         }
         const result = await this.callResolve(source, input.authContext, bindings.values, values);
@@ -314,6 +358,20 @@ let FormDataSourceService = FormDataSourceService_1 = class FormDataSourceServic
         }
         throw new form_data_source_errors_1.BPMFormDataSourceException(form_data_source_errors_1.BPM_FORM_DATA_SOURCE_ERROR_CODES.INVALID_BINDING);
     }
+    /**
+     * Where the queried field sits, read from the schema: a table column
+     * carries its row (empty when the caller sent none), a top-level field none.
+     * For a top-level field whatever the browser sent is dropped, so neither a
+     * `ROW_FIELD` nor an `EXPRESSION` binding's `row` root can read it there even
+     * if a schema got past the publish lint (ADR 22 §3.7: roots by position).
+     * Matches `readOptionField`, which prefers a top-level field of that key.
+     */
+    readBindingPosition(schema, fieldKey, rowValuesJson) {
+        const isTopLevelField = schema.fields.some((candidate) => candidate.fieldKey === fieldKey);
+        return isTopLevelField
+            ? form_data_source_validation_1.TOP_LEVEL_BINDING_POSITION
+            : (0, form_data_source_validation_1.createTableColumnBindingPosition)(this.parseRowValues(rowValuesJson));
+    }
     /**
      * The cell values of the row a column query belongs to. Absent is legal and
      * distinct from empty: it means the caller sent none, so a `ROW_FIELD`
@@ -435,9 +493,11 @@ exports.FormDataSourceService = FormDataSourceService = FormDataSourceService_1
     tslib_1.__param(0, (0, common_1.Inject)(form_data_source_types_1.BPM_FORM_DATA_SOURCE_REGISTRY)),
     tslib_1.__param(1, (0, typeorm_1.InjectRepository)(approval_template_version_entity_1.ApprovalTemplateVersionEntity)),
     tslib_1.__param(2, (0, typeorm_1.InjectRepository)(form_definition_version_entity_1.FormDefinitionVersionEntity)),
+    tslib_1.__param(4, (0, common_1.Optional)()),
+    tslib_1.__param(4, (0, common_1.Inject)(condition_service_1.ConditionService)),
     tslib_1.__metadata("design:paramtypes", [Object, typeorm_2.Repository,
         typeorm_2.Repository,
-        workflow_engine_service_1.WorkflowEngineService])
+        workflow_engine_service_1.WorkflowEngineService, Object])
 ], FormDataSourceService);
 function isFormOptionField(field) {
     return (field.type === 'select' ||
@@ -467,7 +527,7 @@ const LINT_LINE_CODE_PATTERN = /^\S+\.dataSource (FORM_DATA_SOURCE_[A-Z_]+)$/u;
  * Without this the preview would fall back to `INVALID_DESCRIPTOR` ("contact
  * your administrator") for a binding the designer can fix themselves.
  */
-const LINT_BINDING_LINE_PATTERN = /^schema\.fields\[\d+\](?:\.columns\[\d+\])?\.dataSource\.bindings /u;
+const LINT_BINDING_LINE_PATTERN = /^schema\.fields\[\d+\](?:\.columns\[\d+\])?\.dataSource\.bindings(?: |\[\d+\]\.from\.expression: EXPR_)/u;
 function readBindingLintErrorCode(error) {
     return LINT_BINDING_LINE_PATTERN.test(error)
         ? [form_data_source_errors_1.BPM_FORM_DATA_SOURCE_ERROR_CODES.INVALID_BINDING]