@genesislcap/expression-builder 14.253.0 → 14.254.0

package/dist/dts/main/expression-group/expression-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-group.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-group/expression-group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAMrE,qBAQa,eAAgB,SAAQ,cAAc;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IAE1B,iBAAiB,IAAI,IAAI;IAKzB,IACI,gBAAgB,IAAI,OAAO,CAI9B;IAaD,eAAe,CAAC,KAAK,EAAE,KAAK;IAQ5B,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAY7B,mBAAmB,CAAC,KAAK,EAAE,KAAK;IAQhC,sBAAsB,CAAC,KAAK,EAAE,KAAK;IAQnC,4BAA4B,CAAC,KAAK,EAAE,KAAK;IAazC,OAAO,CAAC,gBAAgB;IAcxB,wBAAwB,CAAC,UAAU,EAAE,UAAU;CAWhD"}
+{"version":3,"file":"expression-group.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-group/expression-group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAMrE,qBAQa,eAAgB,SAAQ,cAAc;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IAE1B,iBAAiB,IAAI,IAAI;IAKzB,IACI,gBAAgB,IAAI,OAAO,CAI9B;IAED,eAAe,CAAC,KAAK,EAAE,KAAK;IAQ5B,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAY7B,mBAAmB,CAAC,KAAK,EAAE,KAAK;IAQhC,sBAAsB,CAAC,KAAK,EAAE,KAAK;IAQnC,4BAA4B,CAAC,KAAK,EAAE,KAAK;IAazC,OAAO,CAAC,gBAAgB;IAcxB,wBAAwB,CAAC,UAAU,EAAE,UAAU;CAWhD"}

package/dist/dts/main/expression-group/expression-group.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-group.template.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-group/expression-group.template.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,eAAO,MAAM,QAAQ,sEA4HpB,CAAC"}
+{"version":3,"file":"expression-group.template.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-group/expression-group.template.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,eAAO,MAAM,QAAQ,sEA0IpB,CAAC"}

package/dist/dts/main/expression-rule/expression-rule.d.ts

@@ -6,6 +6,7 @@ export declare class ExpressionRule extends GenesisElement {
     styles?: Styles;
     model: ModelRule | null;
     index: number;
+    error: boolean;
     connectedCallback(): void;
     variadicRule(model: ModelRule): model is ModelRule & {
         operator: VariadicOperator;

package/dist/dts/main/expression-rule/expression-rule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-rule.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAEL,MAAM,EAEN,SAAS,EAET,MAAM,EAGN,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAYpD,qBAQa,cAAe,SAAQ,cAAc;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IAE1B,iBAAiB,IAAI,IAAI;IAKzB,YAAY,CACV,KAAK,EAAE,SAAS,GACf,KAAK,IAAI,SAAS,GAAG;QAAE,QAAQ,EAAE,gBAAgB,CAAC;QAAC,KAAK,EAAE,GAAG,EAAE,CAAA;KAAE;IAIpE;;;OAGG;IACH,IACI,eAAe,IAAI,IAAI,EAAE,CAM5B;IAED,YAAY,CAAC,KAAK,EAAE,MAAM;IAc1B,iBAAiB,IAAI,IAAI;IAgBzB,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI;IAiBlF,kBAAkB,CAAC,KAAK,EAAE,KAAK;IAQ/B,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAqB7E,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAkC3E,sBAAsB,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;CAkDpF"}
+{"version":3,"file":"expression-rule.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAClG,OAAO,EAAE,MAAM,EAAE,SAAS,EAAQ,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEhF,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAiBpD,qBAQa,cAAe,SAAQ,cAAc;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IAEC,KAAK,UAAS;IAEzC,iBAAiB,IAAI,IAAI;IAQzB,YAAY,CACV,KAAK,EAAE,SAAS,GACf,KAAK,IAAI,SAAS,GAAG;QAAE,QAAQ,EAAE,gBAAgB,CAAC;QAAC,KAAK,EAAE,GAAG,EAAE,CAAA;KAAE;IAIpE;;;OAGG;IACH,IACI,eAAe,IAAI,IAAI,EAAE,CAM5B;IAED,YAAY,CAAC,KAAK,EAAE,MAAM;IAc1B,iBAAiB,IAAI,IAAI;IAgBzB,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI;IAiBlF,kBAAkB,CAAC,KAAK,EAAE,KAAK;IAQ/B,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAqB7E,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAY3E,sBAAsB,CAAC,KAAK,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;CAsBpF"}

package/dist/dts/main/expression-rule/expression-rule.helpers.d.ts

@@ -1,4 +1,17 @@
-import { Field } from '../../types';
+import { Field, ModelRule, Operator, Rule } from '../../types';
 export declare const defaultVal: (f: Field) => any;
+export declare const getValue: (m: ModelRule) => (index: number) => any;
 export declare const fieldDefault: (f: Field) => string | false | 0;
+export declare const operatorChangedUpdatedModel: (newOperator: Operator, model: ModelRule) => Rule;
+export declare const valueChangedUpdateModel: (model: ModelRule, value: any, argIndex: number) => Rule;
+/**
+ * Test a value considered to be allowed for validation reasons
+ * A boolean cast to falsy is considered invalid, except special case
+ * that we allow `0` because that's a valid numeric comparison.
+ * This will consider blank strings invalid, to test against that explicitly the user
+ * should define an operator such as `is_blank`
+ * This shouldn't be used on a boolean value
+ */
+export declare const isValueInvalid: (x: any) => boolean;
+export declare const isPartialRuleError: (model: ModelRule) => boolean;
 //# sourceMappingURL=expression-rule.helpers.d.ts.map

package/dist/dts/main/expression-rule/expression-rule.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-rule.helpers.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,eAAO,MAAM,UAAU,MAAO,KAAK,QAC8B,CAAC;AAElE,eAAO,MAAM,YAAY,MAAO,KAAK,uBAqBpC,CAAC"}
+{"version":3,"file":"expression-rule.helpers.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EACL,SAAS,EACT,QAAQ,EACR,IAAI,EAIL,MAAM,aAAa,CAAC;AAGrB,eAAO,MAAM,UAAU,MAAO,KAAK,QAC8B,CAAC;AAElE,eAAO,MAAM,QAAQ,MAAO,SAAS,aAAa,MAAM,QAKvD,CAAC;AAEF,eAAO,MAAM,YAAY,MAAO,KAAK,uBAqBpC,CAAC;AAEF,eAAO,MAAM,2BAA2B,gBAAiB,QAAQ,SAAS,SAAS,KAAG,IA4BrF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAAW,SAAS,SAAS,GAAG,YAAY,MAAM,KAAG,IAqBxF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,MAAO,GAAG,YAAkB,CAAC;AAExD,eAAO,MAAM,kBAAkB,UAAW,SAAS,KAAG,OASrD,CAAC"}

package/dist/dts/main/expression-rule/expression-rule.styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-rule.styles.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.styles.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,iDAuDlB,CAAC"}
+{"version":3,"file":"expression-rule.styles.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.styles.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,iDA2DlB,CAAC"}

package/dist/dts/main/rule-operator/rule-operator.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rule-operator.template.d.ts","sourceRoot":"","sources":["../../../../src/main/rule-operator/rule-operator.template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,eAAO,MAAM,QAAQ,mEAiDpB,CAAC"}
+{"version":3,"file":"rule-operator.template.d.ts","sourceRoot":"","sources":["../../../../src/main/rule-operator/rule-operator.template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,eAAO,MAAM,QAAQ,mEAmDpB,CAAC"}

package/dist/dts/types/public.types.d.ts

@@ -52,12 +52,16 @@ export type Config = {
     model?: Group;
     /** If set and more than 0, is a 1-indexed config for the nesting of groups */
     maxNesting?: number;
+    /** If set a rule will highlight in an error colour when it's not complete
+     * (doesn't have a field + operator + (maybe value) selected) */
+    partialRuleValidationWarning?: boolean;
 };
 /** @alpha **/
 export type _Operator = {
     applyTo: FieldTypes['type'][];
     optgroup?: string | null;
     type: string;
+    tooltip?: string;
 };
 /** @alpha **/
 export type UniraryOperator = {

package/dist/dts/types/public.types.d.ts.map

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

package/dist/esm/main/expression-group/expression-group.js

@@ -17,16 +17,6 @@ let ExpressionGroup = class ExpressionGroup extends GenesisElement {
             return true;
         return this.config.maxNesting > this.model.level;
     }
-    // configChanged(_, newConfig: Config) {
-    // if (!this.combinator) {
-    // this.combinator =  newConfig.combinators[0];
-    // }
-    // }
-    //
-    // modelChanged(_, newModel: ModelGroup) {
-    // if (!newModel) return;
-    // this.combinator = newModel.combinator;
-    // }
     dispatchAddRule(event) {
         event.stopPropagation();
         const detail = {

package/dist/esm/main/expression-group/expression-group.template.js

@@ -7,6 +7,8 @@ export const template = html `
     const { radioTag, radioGroupTag } = maybeRadioBlock
         ? { radioTag: maybeRadioBlock.input, radioGroupTag: maybeRadioBlock.group }
         : { radioTag: 'input', radioGroupTag: 'div' };
+    const ruleTooltip = `Add a new condition with field (e.g. CURRENCY), operator (e.g. EQUALS), and value (e.g. GBP) that will be combined with other conditions in this group using the selected logic (e.g. ${context.config.combinators[0].type})`;
+    const groupTooltip = `Add a new nested sub-group to create more complex expressions, joined by combinatorial logic (e.g. ${context.config.combinators[0].type})`;
     return html `
       <div class="rules-group-container">
         <div class="rules-group-header">
@@ -16,6 +18,7 @@ export const template = html `
               class="btn btn-sm btn-success"
               data-add="rule"
               @click="${(x, c) => x.dispatchAddRule(c.event)}"
+              title=${(_) => ruleTooltip}
             >
               Add Rule
             </${buttonTag}>
@@ -25,6 +28,7 @@ export const template = html `
                   class="btn btn-sm btn-success"
                   data-add="group"
                   @click="${(x, c) => x.dispatchAddGroup(c.event)}"
+                  title="${(_) => groupTooltip}"
                 >
                   Add Group
                 </${buttonTag}>
@@ -92,6 +96,11 @@ export const template = html `
                         :index=${(_, c) => c.index}
                       ></expression-rule>
                     `)}
+                  ${when((_, loopCtx) => !loopCtx.isLast, html `
+                      <p class="group-combinator-link">
+                        ${(_, innerCtx) => innerCtx.parent.model.combinator.type}
+                      </p>
+                    `)}
                 `, { recycle: false, positioning: true })}
             </div>
           </div>

package/dist/esm/main/expression-rule/expression-rule.helpers.js

@@ -1,5 +1,13 @@
 import { formatDateString, formatDateTimeString } from '../../utils';
 export const defaultVal = (f) => f.defaultValue !== undefined ? f.defaultValue : fieldDefault(f);
+export const getValue = (m) => (index) => {
+    if (!('value' in m) || !m.value || !m.operator)
+        return null;
+    const value = m.operator.nbInputs === 1 ? [m.value] : m.value;
+    if (index >= value.length)
+        return null;
+    return value[index];
+};
 export const fieldDefault = (f) => {
     switch (f.type) {
         case 'string':
@@ -23,3 +31,79 @@ export const fieldDefault = (f) => {
         }
     }
 };
+export const operatorChangedUpdatedModel = (newOperator, model) => {
+    var _a, _b, _c, _d;
+    const tryPrevVal = getValue(model);
+    switch (newOperator.nbInputs) {
+        case 0:
+            return {
+                field: model.field,
+                operator: newOperator,
+            };
+        case 1:
+            return {
+                field: model.field,
+                operator: newOperator,
+                value: (_a = tryPrevVal(0)) !== null && _a !== void 0 ? _a : defaultVal(model.field),
+            };
+        case 2:
+            return {
+                field: model.field,
+                operator: newOperator,
+                value: [(_b = tryPrevVal(0)) !== null && _b !== void 0 ? _b : defaultVal(model.field), (_c = tryPrevVal(1)) !== null && _c !== void 0 ? _c : defaultVal(model.field)],
+            };
+        case 'many':
+            return {
+                field: model.field,
+                operator: newOperator,
+                // Variadic operators always start with 1 operand
+                value: [(_d = tryPrevVal(0)) !== null && _d !== void 0 ? _d : defaultVal(model.field)],
+            };
+    }
+};
+export const valueChangedUpdateModel = (model, value, argIndex) => {
+    switch (model.operator.nbInputs) {
+        case 0:
+            throw new Error('Cannot set the value for a UniraryOperator');
+        case 1:
+            return {
+                field: model.field,
+                operator: model.operator,
+                value,
+            };
+        case 2:
+        case 'many': {
+            if (!('value' in model) || !Array.isArray(model.value))
+                throw new Error('Invalid value shape for rule');
+            return {
+                field: model.field,
+                operator: model.operator,
+                value: model.value.map((v, i) => (i === argIndex ? value : v)),
+            };
+        }
+    }
+};
+/**
+ * Test a value considered to be allowed for validation reasons
+ * A boolean cast to falsy is considered invalid, except special case
+ * that we allow `0` because that's a valid numeric comparison.
+ * This will consider blank strings invalid, to test against that explicitly the user
+ * should define an operator such as `is_blank`
+ * This shouldn't be used on a boolean value
+ */
+export const isValueInvalid = (x) => !x && x !== 0;
+export const isPartialRuleError = (model) => {
+    if (!model.field || !model.operator)
+        return true;
+    if (model.operator.nbInputs === 0)
+        return false;
+    if (!('value' in model))
+        throw new Error('No value set as required for operator');
+    // Checking against either false or true boolean is valid
+    if (model.field.type === 'boolean')
+        return false;
+    const value = Array.isArray(model.value) ? model.value : [model.value];
+    if (value.some(isValueInvalid))
+        return true;
+    return false;
+};

package/dist/esm/main/expression-rule/expression-rule.js

@@ -1,20 +1,27 @@
 import { __decorate } from "tslib";
-import { customElement, GenesisElement, observable, volatile } from '@genesislcap/web-core';
+import { attr, customElement, GenesisElement, observable, volatile } from '@genesislcap/web-core';
 import { applyCustomStyles } from '../../utils/misc';
 import { Events } from '../events';
 import { RuleField } from '../rule-field/rule-field';
 import { RuleOperator } from '../rule-operator/rule-operator';
 import { RuleValue } from '../rule-value/rule-value';
-import { defaultVal } from './expression-rule.helpers';
+import { operatorChangedUpdatedModel, defaultVal, valueChangedUpdateModel, isPartialRuleError, } from './expression-rule.helpers';
 import { styles } from './expression-rule.styles';
 import { template } from './expression-rule.template';
 RuleOperator;
 RuleField;
 RuleValue;
 let ExpressionRule = class ExpressionRule extends GenesisElement {
+    constructor() {
+        super(...arguments);
+        this.error = false;
+    }
     connectedCallback() {
         super.connectedCallback();
         applyCustomStyles(this, this.styles, 'rule');
+        if (this.config.partialRuleValidationWarning) {
+            this.error = isPartialRuleError(this.model);
+        }
     }
     variadicRule(model) {
         return model.operator.nbInputs === 'many' && 'value' in model && Array.isArray(model.value);
@@ -100,31 +107,9 @@ let ExpressionRule = class ExpressionRule extends GenesisElement {
     handleValueChanged(event) {
         event.stopPropagation();
         const { value, index } = event.detail;
-        const buildUpdatedModel = (operator) => {
-            switch (operator.nbInputs) {
-                case 0:
-                    throw new Error('Cannot set the value for a UniraryOperator');
-                case 1:
-                    return {
-                        field: this.model.field,
-                        operator: operator,
-                        value,
-                    };
-                case 2:
-                case 'many': {
-                    if (!('value' in this.model) || !Array.isArray(this.model.value))
-                        throw new Error('Invalid value shape for rule');
-                    return {
-                        field: this.model.field,
-                        operator: operator,
-                        value: this.model.value.map((v, i) => (i === index ? value : v)),
-                    };
-                }
-            }
-        };
         const detail = {
             ruleId: this.model.ruleId,
-            newData: buildUpdatedModel(this.model.operator),
+            newData: valueChangedUpdateModel(this.model, value, index),
         };
         this.dispatchEvent(new CustomEvent(Events.UpdateRule, { detail, bubbles: true, composed: true }));
     }
@@ -138,37 +123,10 @@ let ExpressionRule = class ExpressionRule extends GenesisElement {
         if (!newOperator) {
             throw new Error(`Unable to find operator of type ${operatorType}`);
         }
-        const buildUpdatedModel = (operator) => {
-            switch (operator.nbInputs) {
-                case 0:
-                    return {
-                        field: this.model.field,
-                        operator: operator,
-                    };
-                case 1:
-                    return {
-                        field: this.model.field,
-                        operator: operator,
-                        value: defaultVal(this.model.field),
-                    };
-                case 2:
-                    return {
-                        field: this.model.field,
-                        operator: operator,
-                        value: [defaultVal(this.model.field), defaultVal(this.model.field)],
-                    };
-                case 'many':
-                    return {
-                        field: this.model.field,
-                        operator: operator,
-                        value: [defaultVal(this.model.field)],
-                    };
-            }
-        };
         this.dispatchEvent(new CustomEvent(Events.UpdateRule, {
             detail: {
                 ruleId: this.model.ruleId,
-                newData: buildUpdatedModel(newOperator),
+                newData: operatorChangedUpdatedModel(newOperator, this.model),
             },
             bubbles: true,
             composed: true,
@@ -187,6 +145,9 @@ __decorate([
 __decorate([
     observable
 ], ExpressionRule.prototype, "index", void 0);
+__decorate([
+    attr({ mode: 'boolean' })
+], ExpressionRule.prototype, "error", void 0);
 __decorate([
     volatile
 ], ExpressionRule.prototype, "operandIterator", null);

package/dist/esm/main/expression-rule/expression-rule.styles.js

@@ -8,6 +8,10 @@ export const styles = css `
     grid-template-columns: auto 1fr;
   }
 
+  .rule-container.error {
+    border-color: red;
+  }
+
   .margin {
     margin-left: calc(var(--design-unit) * 1px);
     margin-right: calc(var(--design-unit) * 1px);

package/dist/esm/main/expression-rule/expression-rule.template.js

@@ -1,10 +1,10 @@
-import { html, repeat, when } from '@genesislcap/web-core';
+import { classNames, html, repeat, when } from '@genesislcap/web-core';
 export const template = html `
   ${(context) => {
     var _a, _b;
     const buttonTag = ((_b = (_a = context.styles) === null || _a === void 0 ? void 0 : _a.customElements) === null || _b === void 0 ? void 0 : _b.button) || 'button';
     return html `
-      <div class="rule-container">
+      <div class="rule-container ${(x) => classNames(['error', x.error])}">
         <div class="rule-content">
           <expression-rule-field
 class="margin"

package/dist/esm/main/rule-operator/rule-operator.template.js

@@ -21,6 +21,7 @@ export const template = html `
                         <${optionTag}
                           value="${(x) => x.type}"
                           ?selected=${(x, c) => { var _a; return x.type === ((_a = c.parentContext.parent.operator) === null || _a === void 0 ? void 0 : _a.type); }}
+                          title=${(x) => x.tooltip}
                         >
                           ${(x) => x.type}
                         </${optionTag}>
@@ -33,6 +34,7 @@ export const template = html `
                   <${optionTag}
                     value="${(x) => x.type}"
                     ?selected=${(x, c) => { var _a; return ((_a = c.parent.operator) === null || _a === void 0 ? void 0 : _a.type) === x.type; }}
+                    title=${(x) => x.tooltip}
                   >
                     ${(x) => x.type}
                   </${optionTag}>

package/dist/expression-builder.d.ts

@@ -50,6 +50,9 @@ declare type Config_2 = {
     model?: Group;
     /** If set and more than 0, is a 1-indexed config for the nesting of groups */
     maxNesting?: number;
+    /** If set a rule will highlight in an error colour when it's not complete
+     * (doesn't have a field + operator + (maybe value) selected) */
+    partialRuleValidationWarning?: boolean;
 };
 
 /** @alpha **/
@@ -232,6 +235,7 @@ declare type _Operator = {
     applyTo: FieldTypes['type'][];
     optgroup?: string | null;
     type: string;
+    tooltip?: string;
 };
 
 /** @alpha **/

package/docs/api-report.md

@@ -54,6 +54,7 @@ type Config_2 = {
     combinators: Combinator[];
     model?: Group;
     maxNesting?: number;
+    partialRuleValidationWarning?: boolean;
 };
 
 // @alpha (undocumented)
@@ -167,6 +168,7 @@ type _Operator = {
     applyTo: FieldTypes['type'][];
     optgroup?: string | null;
     type: string;
+    tooltip?: string;
 };
 
 // @alpha (undocumented)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/expression-builder",
   "description": "Genesis Foundation Expression Builder",
-  "version": "14.253.0",
+  "version": "14.254.0",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
   "types": "dist/expression-builder.d.ts",
@@ -62,5 +62,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "fb4d5d95c8012d110b7e5ca82fc03a037fdb12ef"
+  "gitHead": "de0da7f3f592bd417917da9dc7b163e57984ea7c"
 }