@genesislcap/expression-builder 14.289.1 → 14.290.0

package/dist/custom-elements.json

@@ -883,6 +883,30 @@
       "kind": "javascript-module",
       "path": "src/utils/misc.ts",
       "declarations": [
+        {
+          "kind": "function",
+          "name": "getFieldInput",
+          "parameters": [
+            {
+              "name": "context",
+              "type": {
+                "text": "RuleValue | ModelRule"
+              }
+            }
+          ]
+        },
+        {
+          "kind": "function",
+          "name": "getFieldType",
+          "parameters": [
+            {
+              "name": "context",
+              "type": {
+                "text": "RuleValue | ModelRule"
+              }
+            }
+          ]
+        },
         {
           "kind": "function",
           "name": "processOptGroups",
@@ -935,6 +959,22 @@
         }
       ],
       "exports": [
+        {
+          "kind": "js",
+          "name": "getFieldInput",
+          "declaration": {
+            "name": "getFieldInput",
+            "module": "src/utils/misc.ts"
+          }
+        },
+        {
+          "kind": "js",
+          "name": "getFieldType",
+          "declaration": {
+            "name": "getFieldType",
+            "module": "src/utils/misc.ts"
+          }
+        },
         {
           "kind": "js",
           "name": "processOptGroups",
@@ -1212,33 +1252,53 @@
           "name": "defaultVal",
           "parameters": [
             {
-              "name": "f",
+              "name": "newOpt",
               "type": {
-                "text": "Field"
+                "text": "Operator"
+              }
+            },
+            {
+              "name": "m",
+              "type": {
+                "text": "ModelRule"
               }
             }
-          ]
+          ],
+          "description": "Gets the default value for a field accounting for\n- any default value hard coded on the config\n- any previous values when appropriate\n- account for different value types when switching operators"
         },
         {
           "kind": "function",
           "name": "getValue",
           "parameters": [
+            {
+              "name": "newOpt",
+              "type": {
+                "text": "Operator"
+              }
+            },
             {
               "name": "m",
               "type": {
                 "text": "ModelRule"
               }
             }
-          ]
+          ],
+          "description": "If the user has changed the operator on a rule then we try and remember their value when possible\nIf the operators differ with type (e.g. an operator has a `valueType`) then we always create a new field default via returning null)"
         },
         {
           "kind": "function",
           "name": "fieldDefault",
           "parameters": [
             {
-              "name": "f",
+              "name": "newOpt",
               "type": {
-                "text": "Field"
+                "text": "Operator"
+              }
+            },
+            {
+              "name": "m",
+              "type": {
+                "text": "ModelRule"
               }
             }
           ]
@@ -1413,7 +1473,7 @@
         {
           "kind": "variable",
           "name": "template",
-          "default": "html<ExpressionRule>`\n  ${(context) => {\n    const buttonTag = context.styles?.customElements?.button || 'button';\n\n    return html<ExpressionRule>`\n      <div class=\"rule-container ${(x) => classNames(['error', x.error])}\">\n        <div class=\"rule-content\">\n          <expression-rule-field\nclass=\"margin\"\n          :fields=${(x) => x.config.fields}\n          :field=${(x) => x.model?.field}\n          :config=${(x) => x.config}\n          :styles=${(x) => x.styles}\n          @field-selected=${(x, c) =>\n            x.handleFieldSelected(c.event as CustomEvent<EventsDetailMap[Events.FieldSelected]>)}\n        ></expression-rule-field>\n        <expression-rule-operator\nclass=\"margin\"\n          :operators=${(x) => x.config.operators}\n          :field=${(x) => x.model.field}\n          :operator=${(x) => x.model?.operator}\n          :config=${(x) => x.config}\n          :styles=${(x) => x.styles}\n          @operator-selected=${(x, c) =>\n            x.handleOperatorSelected(\n              c.event as CustomEvent<EventsDetailMap[Events.OperatorSelected]>,\n            )}\n        ></expression-rule-operator>\n        ${repeat(\n          (x) => x.operandIterator,\n          html<true, ExpressionRule>`\n            <expression-rule-value\n              class=\"margin\"\n              :config=${(_, c) => c.parent.config}\n              :styles=${(_, c) => c.parent.styles}\n              :field=${(_, c) => c.parent.model.field}\n              :value=${(_, c) => c.parent.operandValue(c.index)}\n              value-index=${(_, c) => c.index}\n              ?variadic=${(_, c) => c.parent.model?.operator?.nbInputs === 'many'}\n              @value-updated=${(_, c) =>\n                c.parent.handleValueChanged(\n                  c.event as CustomEvent<EventsDetailMap[Events.ValueUpdated]>,\n                )}\n              @remove-variadic-operand=${(_, c) =>\n                c.parent.handleRemoveVarArg(\n                  c.event as CustomEvent<EventsDetailMap[Events.RemoveVarArg]>,\n                )}\n            ></expression-rule-value>\n          `,\n          { positioning: true, recycle: false },\n        )}\n        ${when(\n          (x) => x.model?.operator?.nbInputs === 'many',\n          html<ExpressionRule>`\n            <${buttonTag}\n              type=\"button\"\n              class=\"btn btn-sm btn-accept\"\n              @click=\"${(x) => x.dispatchAddVarArg()}\"\n            >\n              +\n            </${buttonTag}>\n          `,\n        )}\n        </div>\n\n        <div class=\"rule-header\">\n          <div class=\"btn-group rule-actions\">\n            <${buttonTag}\n              type=\"button\"\n              class=\"btn btn-sm btn-danger\"\n              data-delete=\"rule\"\n              @click=\"${(x, c) => x.dispatchDeleteRule(c.event)}\"\n            >\n              Delete Rule\n            </${buttonTag}>\n          </div>\n        </div>\n      </div>\n    `;\n  }}\n`"
+          "default": "html<ExpressionRule>`\n  ${(context) => {\n    const buttonTag = context.styles?.customElements?.button || 'button';\n\n    return html<ExpressionRule>`\n      <div class=\"rule-container ${(x) => classNames(['error', x.error])}\">\n        <div class=\"rule-content\">\n          <expression-rule-field\nclass=\"margin\"\n          :fields=${(x) => x.config.fields}\n          :field=${(x) => x.model?.field}\n          :config=${(x) => x.config}\n          :styles=${(x) => x.styles}\n          @field-selected=${(x, c) =>\n            x.handleFieldSelected(c.event as CustomEvent<EventsDetailMap[Events.FieldSelected]>)}\n        ></expression-rule-field>\n        <expression-rule-operator\nclass=\"margin\"\n          :operators=${(x) => x.config.operators}\n          :field=${(x) => x.model.field}\n          :operator=${(x) => x.model?.operator}\n          :config=${(x) => x.config}\n          :styles=${(x) => x.styles}\n          @operator-selected=${(x, c) =>\n            x.handleOperatorSelected(\n              c.event as CustomEvent<EventsDetailMap[Events.OperatorSelected]>,\n            )}\n        ></expression-rule-operator>\n        ${repeat(\n          (x) => x.operandIterator,\n          html<true, ExpressionRule>`\n            <expression-rule-value\n              class=\"margin\"\n              :config=${(_, c) => c.parent.config}\n              :styles=${(_, c) => c.parent.styles}\n              :field=${(_, c) => c.parent.model.field}\n              :operator=${(_, c) => c.parent.model.operator}\n              :value=${(_, c) => c.parent.operandValue(c.index)}\n              value-index=${(_, c) => c.index}\n              ?variadic=${(_, c) => c.parent.model?.operator?.nbInputs === 'many'}\n              @value-updated=${(_, c) =>\n                c.parent.handleValueChanged(\n                  c.event as CustomEvent<EventsDetailMap[Events.ValueUpdated]>,\n                )}\n              @remove-variadic-operand=${(_, c) =>\n                c.parent.handleRemoveVarArg(\n                  c.event as CustomEvent<EventsDetailMap[Events.RemoveVarArg]>,\n                )}\n            ></expression-rule-value>\n          `,\n          { positioning: true, recycle: false },\n        )}\n        ${when(\n          (x) => x.model?.operator?.nbInputs === 'many',\n          html<ExpressionRule>`\n            <${buttonTag}\n              type=\"button\"\n              class=\"btn btn-sm btn-accept\"\n              @click=\"${(x) => x.dispatchAddVarArg()}\"\n            >\n              +\n            </${buttonTag}>\n          `,\n        )}\n        </div>\n\n        <div class=\"rule-header\">\n          <div class=\"btn-group rule-actions\">\n            <${buttonTag}\n              type=\"button\"\n              class=\"btn btn-sm btn-danger\"\n              data-delete=\"rule\"\n              @click=\"${(x, c) => x.dispatchDeleteRule(c.event)}\"\n            >\n              Delete Rule\n            </${buttonTag}>\n          </div>\n        </div>\n      </div>\n    `;\n  }}\n`"
         }
       ],
       "exports": [
@@ -2051,6 +2111,14 @@
               },
               "default": "null"
             },
+            {
+              "kind": "field",
+              "name": "operator",
+              "type": {
+                "text": "Operator | null"
+              },
+              "default": "null"
+            },
             {
               "kind": "field",
               "name": "value",

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

@@ -1,7 +1,17 @@
-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;
+import { ModelRule, Operator, Rule } from '../../types';
+/**
+ * Gets the default value for a field accounting for
+ * - any default value hard coded on the config
+ * - any previous values when appropriate
+ * - account for different value types when switching operators
+ */
+export declare const defaultVal: (newOpt: Operator, m: ModelRule) => any;
+/**
+ * If the user has changed the operator on a rule then we try and remember their value when possible
+ * If the operators differ with type (e.g. an operator has a `valueType`) then we always create a new field default via returning null)
+ */
+export declare const getValue: (newOpt: Operator, m: ModelRule) => (index: number) => any;
+export declare const fieldDefault: (newOpt: Operator, m: ModelRule) => string | false | 0;
 export declare const operatorChangedUpdatedModel: (newOperator: Operator, model: ModelRule) => Rule;
 export declare const valueChangedUpdateModel: (model: ModelRule, value: any, argIndex: number) => Rule;
 /**

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,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"}
+{"version":3,"file":"expression-rule.helpers.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EACT,QAAQ,EACR,IAAI,EAIL,MAAM,aAAa,CAAC;AAIrB;;;;;GAKG;AACH,eAAO,MAAM,UAAU,WAAY,QAAQ,KAAK,SAAS,QAC4B,CAAC;AAEtF;;;GAGG;AACH,eAAO,MAAM,QAAQ,WAAY,QAAQ,KAAK,SAAS,aAAa,MAAM,QAOzE,CAAC;AAEF,eAAO,MAAM,YAAY,WAAY,QAAQ,KAAK,SAAS,uBA2B1D,CAAC;AAEF,eAAO,MAAM,2BAA2B,gBAAiB,QAAQ,SAAS,SAAS,KAAG,IAgCrF,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.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-rule.template.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,eAAO,MAAM,QAAQ,qEAgFpB,CAAC"}
+{"version":3,"file":"expression-rule.template.d.ts","sourceRoot":"","sources":["../../../../src/main/expression-rule/expression-rule.template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,eAAO,MAAM,QAAQ,qEAiFpB,CAAC"}

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

@@ -1,11 +1,12 @@
 import { GenesisElement } from '@genesislcap/web-core';
-import { Config, Field, Styles } from '../../types';
+import { Config, Field, Operator, Styles } from '../../types';
 export declare class RuleValue extends GenesisElement {
     valueIndex: string;
     variadic: boolean;
     validationError: boolean;
     validationMsg: string;
     field: Field | null;
+    operator: Operator | null;
     value: any;
     config: Config;
     styles?: Styles;

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

@@ -1 +1 @@
-{"version":3,"file":"rule-value.d.ts","sourceRoot":"","sources":["../../../../src/main/rule-value/rule-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAOpD,qBAQa,SAAU,SAAQ,cAAc;IACP,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,OAAO,CAAS;IACK,eAAe,EAAE,OAAO,CAAS;IACpD,aAAa,EAAE,MAAM,CAAC;IACjD,KAAK,EAAE,KAAK,GAAG,IAAI,CAAQ;IAC3B,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAE5B,iBAAiB,IAAI,IAAI;IAMzB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAc3C,iBAAiB,CAAC,KAAK,EAAE,KAAK;IA6C9B,2BAA2B;CAS5B"}
+{"version":3,"file":"rule-value.d.ts","sourceRoot":"","sources":["../../../../src/main/rule-value/rule-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAO9D,qBAQa,SAAU,SAAQ,cAAc;IACP,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,OAAO,CAAS;IACK,eAAe,EAAE,OAAO,CAAS;IACpD,aAAa,EAAE,MAAM,CAAC;IACjD,KAAK,EAAE,KAAK,GAAG,IAAI,CAAQ;IAC3B,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAQ;IACjC,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAE5B,iBAAiB,IAAI,IAAI;IAMzB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAc3C,iBAAiB,CAAC,KAAK,EAAE,KAAK;IA6C9B,2BAA2B;CAS5B"}

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

@@ -1 +1 @@
-{"version":3,"file":"rule-value.template.d.ts","sourceRoot":"","sources":["../../../../src/main/rule-value/rule-value.template.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AA4H9C,eAAO,MAAM,iBAAiB,gEAQ7B,CAAC"}
+{"version":3,"file":"rule-value.template.d.ts","sourceRoot":"","sources":["../../../../src/main/rule-value/rule-value.template.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAuI9C,eAAO,MAAM,iBAAiB,gEAQ7B,CAAC"}

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

@@ -117,6 +117,8 @@ export type Config = {
  * `type`: The name of the operator (e.g. one_of)
  *
  * `tooltip`: Optional tooltip to display on mouse hover
+ *
+ * `valueType`: [EXPERIMENTAL] Optional override to change the input type for the operator (e.g. a date field could present a string input)
  */
 /** @beta **/
 export type _Operator = {
@@ -124,6 +126,7 @@ export type _Operator = {
     optgroup?: string | null;
     type: string;
     tooltip?: string;
+    valueType?: FieldTypes;
 };
 /**
  * An operator which doesn't have any value. Example `is_null`

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/dts/utils/misc.d.ts

@@ -1,4 +1,7 @@
-import { Field, Operator, Styles } from '../types';
+import type { RuleValue } from '../main/rule-value/rule-value';
+import type { Field, ModelRule, Operator, Styles } from '../types';
+export declare const getFieldInput: (context: RuleValue | ModelRule) => "number" | "date" | "text" | "checkbox" | "select" | "datetime-local";
+export declare const getFieldType: (context: RuleValue | ModelRule) => "string" | "boolean" | "int" | "short" | "double" | "long" | "bigdecimal" | "enum" | "date" | "date-time";
 export declare const processOptGroups: <T extends Operator | Field>(xs: T[]) => (T | {
     optgroup: string | null;
     xs: T[];

package/dist/dts/utils/misc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEnD,eAAO,MAAM,gBAAgB;cAET,MAAM,GAAG,IAAI;;IAyChC,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EACjC,QAAQ,EAAE,MAAM,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAClD,IAAI,CAeN"}
+{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEnE,eAAO,MAAM,aAAa,YAAa,SAAS,GAAG,SAAS,0EACD,CAAC;AAE5D,eAAO,MAAM,YAAY,YAAa,SAAS,GAAG,SAAS,8GACF,CAAC;AAE1D,eAAO,MAAM,gBAAgB;cAET,MAAM,GAAG,IAAI;;IAyChC,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EACjC,QAAQ,EAAE,MAAM,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAClD,IAAI,CAeN"}

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

@@ -1,6 +1,20 @@
-import { formatDateString, formatDateTimeString } from '../../utils';
-export const defaultVal = (f) => f.defaultValue !== undefined ? f.defaultValue : fieldDefault(f);
-export const getValue = (m) => (index) => {
+import { formatDateString, formatDateTimeString, getFieldType } from '../../utils';
+/**
+ * Gets the default value for a field accounting for
+ * - any default value hard coded on the config
+ * - any previous values when appropriate
+ * - account for different value types when switching operators
+ */
+export const defaultVal = (newOpt, m) => m.field.defaultValue !== undefined ? m.field.defaultValue : fieldDefault(newOpt, m);
+/**
+ * If the user has changed the operator on a rule then we try and remember their value when possible
+ * If the operators differ with type (e.g. an operator has a `valueType`) then we always create a new field default via returning null)
+ */
+export const getValue = (newOpt, m) => (index) => {
+    var _a, _b, _c;
+    // If neither opt uses a value type then we compare null and don't exit early
+    if (((_a = newOpt === null || newOpt === void 0 ? void 0 : newOpt.valueType) === null || _a === void 0 ? void 0 : _a.type) !== ((_c = (_b = m.operator) === null || _b === void 0 ? void 0 : _b.valueType) === null || _c === void 0 ? void 0 : _c.type))
+        return null;
     if (!('value' in m) || !m.value || !m.operator)
         return null;
     const value = m.operator.nbInputs === 1 ? [m.value] : m.value;
@@ -8,8 +22,9 @@ export const getValue = (m) => (index) => {
         return null;
     return value[index];
 };
-export const fieldDefault = (f) => {
-    switch (f.type) {
+export const fieldDefault = (newOpt, m) => {
+    var _a, _b;
+    switch (getFieldType(Object.assign(Object.assign({}, m), { operator: newOpt }))) {
         case 'string':
             return '';
         case 'boolean':
@@ -25,39 +40,48 @@ export const fieldDefault = (f) => {
         case 'long':
             return 0;
         case 'enum': {
-            if (Object.keys(f.values).length === 0)
+            const values = ((_a = newOpt === null || newOpt === void 0 ? void 0 : newOpt.valueType) === null || _a === void 0 ? void 0 : _a.type) === 'enum'
+                ? (_b = newOpt === null || newOpt === void 0 ? void 0 : newOpt.valueType) === null || _b === void 0 ? void 0 : _b.values
+                : m.field.type === 'enum'
+                    ? m.field.values
+                    : {};
+            if (Object.keys(values).length === 0)
                 throw new Error('Enums require configured values');
-            return Object.keys(f.values)[0];
+            return Object.keys(values)[0];
         }
     }
 };
 export const operatorChangedUpdatedModel = (newOperator, model) => {
     var _a, _b, _c, _d;
-    const tryPrevVal = getValue(model);
+    const tryPrevVal = getValue(newOperator, model);
     switch (newOperator.nbInputs) {
         case 0:
             return {
                 field: model.field,
                 operator: newOperator,
+                value: undefined,
             };
         case 1:
             return {
                 field: model.field,
                 operator: newOperator,
-                value: (_a = tryPrevVal(0)) !== null && _a !== void 0 ? _a : defaultVal(model.field),
+                value: (_a = tryPrevVal(0)) !== null && _a !== void 0 ? _a : defaultVal(newOperator, model),
             };
         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)],
+                value: [
+                    (_b = tryPrevVal(0)) !== null && _b !== void 0 ? _b : defaultVal(newOperator, model),
+                    (_c = tryPrevVal(1)) !== null && _c !== void 0 ? _c : defaultVal(newOperator, model),
+                ],
             };
         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)],
+                value: [(_d = tryPrevVal(0)) !== null && _d !== void 0 ? _d : defaultVal(newOperator, model)],
             };
     }
 };
@@ -100,7 +124,7 @@ export const isPartialRuleError = (model) => {
     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')
+    if (getFieldType(model) === 'boolean')
         return false;
     const value = Array.isArray(model.value) ? model.value : [model.value];
     if (value.some(isValueInvalid))

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

@@ -60,7 +60,7 @@ let ExpressionRule = class ExpressionRule extends GenesisElement {
             newData: {
                 operator: this.model.operator,
                 field: this.model.field,
-                value: [...this.model.value, defaultVal(this.model.field)],
+                value: [...this.model.value, defaultVal(this.model.operator, this.model)],
             },
         };
         this.dispatchEvent(new CustomEvent(Events.UpdateRule, { detail, bubbles: true, composed: true }));

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

@@ -29,6 +29,7 @@ class="margin"
               :config=${(_, c) => c.parent.config}
               :styles=${(_, c) => c.parent.styles}
               :field=${(_, c) => c.parent.model.field}
+              :operator=${(_, c) => c.parent.model.operator}
               :value=${(_, c) => c.parent.operandValue(c.index)}
               value-index=${(_, c) => c.index}
               ?variadic=${(_, c) => { var _a, _b; return ((_b = (_a = c.parent.model) === null || _a === void 0 ? void 0 : _a.operator) === null || _b === void 0 ? void 0 : _b.nbInputs) === 'many'; }}

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

@@ -1,6 +1,6 @@
 import { __decorate } from "tslib";
 import { attr, customElement, GenesisElement, observable } from '@genesislcap/web-core';
-import { applyCustomStyles } from '../../utils/misc';
+import { applyCustomStyles, getFieldType } from '../../utils/misc';
 import { Events } from '../events';
 import { isFloatType, isIntType, numberPatternValidator } from './rule-value.helpers';
 import { styles } from './rule-value.styles';
@@ -11,6 +11,7 @@ let RuleValue = class RuleValue extends GenesisElement {
         this.variadic = false;
         this.validationError = false;
         this.field = null;
+        this.operator = null;
     }
     connectedCallback() {
         super.connectedCallback();
@@ -22,7 +23,7 @@ let RuleValue = class RuleValue extends GenesisElement {
             return null;
         const errorMsg = [
             'validation' in this.field ? this.field.validation(value) : null,
-            numberPatternValidator(this.field.type, value),
+            numberPatternValidator(getFieldType(this), value),
         ]
             .filter((v) => !!v)
             .join(', ');
@@ -53,10 +54,10 @@ let RuleValue = class RuleValue extends GenesisElement {
         else if (target.type === 'select-one') {
             newValue = event.target.value;
         }
-        else if (this.field && isIntType(this.field.type)) {
+        else if (this.field && isIntType(getFieldType(this))) {
             newValue = parseInt(target.value);
         }
-        else if (this.field && isFloatType(this.field.type)) {
+        else if (this.field && isFloatType(getFieldType(this))) {
             newValue = parseFloat(target.value);
         }
         else {
@@ -93,6 +94,9 @@ __decorate([
 __decorate([
     observable
 ], RuleValue.prototype, "field", void 0);
+__decorate([
+    observable
+], RuleValue.prototype, "operator", void 0);
 __decorate([
     observable
 ], RuleValue.prototype, "value", void 0);

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

@@ -1,9 +1,10 @@
 import { classNames, html, repeat, when, whenElse } from '@genesislcap/web-core';
+import { getFieldInput } from '../../utils';
 // Simple input template with custom element tags support
 const simpleTemplate = html `
   ${(context) => {
     var _a, _b;
-    const inputType = context.field.input;
+    const inputType = getFieldInput(context);
     // Convert datetime-local to datetimeLocal for the config property name
     const configKey = inputType === 'datetime-local' ? 'datetimeLocal' : inputType;
     // Get custom tag if available
@@ -33,9 +34,13 @@ const selectTemplate = html `
         value=${(x) => x.value}
       >
         ${repeat((x) => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         // Ensure values is defined and an object before calling Object.entries
-        const values = ((_a = x.field) === null || _a === void 0 ? void 0 : _a.type) === 'enum' && ((_b = x.field) === null || _b === void 0 ? void 0 : _b.values) ? x.field.values : {};
+        const values = ((_b = (_a = x.operator) === null || _a === void 0 ? void 0 : _a.valueType) === null || _b === void 0 ? void 0 : _b.type) === 'enum' && ((_d = (_c = x === null || x === void 0 ? void 0 : x.operator) === null || _c === void 0 ? void 0 : _c.valueType) === null || _d === void 0 ? void 0 : _d.values)
+            ? x.operator.valueType.values
+            : x.field.type === 'enum' && x.field.values
+                ? x.field.values
+                : {};
         return Object.entries(values);
     }, () => html `
             <${optionTag} value="${(x) => x[0]}" ?selected=${(x, c) => x[0] === c.parent.value}>
@@ -69,24 +74,27 @@ const checkboxTemplate = html `
 `;
 // Unsupported input template
 const unsupportedTemplate = html `
-  <div>Input type "${(x) => x.field.input}" not yet supported.</div>
+  <div>Input type "${(x) => getFieldInput(x)}" not yet supported.</div>
 `;
 // Template switcher
 const templateSwitcher = html `
-  <div class="value-and-validation">
-    ${when((x) => ['text', 'number', 'date', 'datetime-local'].includes(x.field.input), simpleTemplate)}
-    ${when((x) => x.field.input === 'select', selectTemplate)}
-    ${when((x) => x.field.input === 'checkbox', checkboxTemplate)}
-    ${when((x) => !['text', 'number', 'select', 'checkbox', 'date', 'datetime-local'].includes(x.field.input), unsupportedTemplate)}
-    ${when((x) => x.validationMsg, html `
-        <p class="validation-msg">${(x) => x.validationMsg}</p>
-      `)}
-  </div>
-  ${when((x) => x.variadic && x.valueIndex !== '0', 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';
+  ${(context) => {
+    const inputFieldType = getFieldInput(context);
     return html `
+      <div class="value-and-validation">
+        ${when(() => ['text', 'number', 'date', 'datetime-local'].includes(inputFieldType), simpleTemplate)}
+        ${when(() => inputFieldType === 'select', selectTemplate)}
+        ${when(() => inputFieldType === 'checkbox', checkboxTemplate)}
+        ${when(() => !['text', 'number', 'select', 'checkbox', 'date', 'datetime-local'].includes(inputFieldType), unsupportedTemplate)}
+        ${when((x) => x.validationMsg, html `
+            <p class="validation-msg">${(x) => x.validationMsg}</p>
+          `)}
+      </div>
+      ${when((x) => x.variadic && x.valueIndex !== '0', html `
+          ${() => {
+        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 `
           <${buttonTag}
             type="button"
             class="btn btn-sm btn-remove"
@@ -95,8 +103,10 @@ const templateSwitcher = html `
             -
           </${buttonTag}>
         `;
+    }}
+        `)}
+    `;
 }}
-    `)}
 `;
 // Main template
 export const ruleValueTemplate = html `

package/dist/esm/utils/misc.js

@@ -1,3 +1,5 @@
+export const getFieldInput = (context) => { var _a, _b, _c; return (_c = (_b = (_a = context.operator) === null || _a === void 0 ? void 0 : _a.valueType) === null || _b === void 0 ? void 0 : _b.input) !== null && _c !== void 0 ? _c : context.field.input; };
+export const getFieldType = (context) => { var _a, _b, _c; return (_c = (_b = (_a = context.operator) === null || _a === void 0 ? void 0 : _a.valueType) === null || _b === void 0 ? void 0 : _b.type) !== null && _c !== void 0 ? _c : context.field.type; };
 export const processOptGroups = (xs) => {
     const grouped = {};
     const ungrouped = [];

package/dist/expression-builder.api.json

@@ -562,7 +562,16 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "['type'][];\n    optgroup?: string | null;\n    type: string;\n    tooltip?: string;\n}"
+                  "text": "['type'][];\n    optgroup?: string | null;\n    type: string;\n    tooltip?: string;\n    valueType?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "FieldTypes",
+                  "canonicalReference": "@genesislcap/expression-builder!Types.FieldTypes:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";\n}"
                 },
                 {
                   "kind": "Content",
@@ -574,7 +583,7 @@
               "name": "_Operator",
               "typeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 4
+                "endIndex": 6
               }
             },
             {

package/dist/expression-builder.d.ts

@@ -494,6 +494,8 @@ declare type Operator = UniraryOperator | BinaryOperator | TernararyOperator | V
  * `type`: The name of the operator (e.g. one_of)
  *
  * `tooltip`: Optional tooltip to display on mouse hover
+ *
+ * `valueType`: [EXPERIMENTAL] Optional override to change the input type for the operator (e.g. a date field could present a string input)
  */
 /** @beta **/
 declare type _Operator = {
@@ -501,6 +503,7 @@ declare type _Operator = {
     optgroup?: string | null;
     type: string;
     tooltip?: string;
+    valueType?: FieldTypes;
 };
 
 /**

package/docs/api/expression-builder.types._operator.md

@@ -17,6 +17,7 @@ export type _Operator = {
     optgroup?: string | null;
     type: string;
     tooltip?: string;
+    valueType?: FieldTypes;
 };
 ```
 **References:** [FieldTypes](./expression-builder.types.fieldtypes.md)

package/docs/api-report.md

@@ -169,6 +169,7 @@ type _Operator = {
     optgroup?: string | null;
     type: string;
     tooltip?: string;
+    valueType?: FieldTypes;
 };
 
 // @beta

package/package.json

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