@genesislcap/expression-builder 14.251.0 → 14.251.2

package/dist/custom-elements.json

@@ -136,255 +136,6 @@
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "src/utils/data-model.ts",
-      "declarations": [
-        {
-          "kind": "function",
-          "name": "groupToModelGroup",
-          "return": {
-            "type": {
-              "text": "ModelGroup"
-            }
-          },
-          "parameters": [
-            {
-              "name": "group",
-              "type": {
-                "text": "Group"
-              }
-            },
-            {
-              "name": "provider",
-              "type": {
-                "text": "MetadataProvider"
-              }
-            }
-          ],
-          "description": "Converts a Group to a ModelGroup (adds required metadata)"
-        },
-        {
-          "kind": "function",
-          "name": "modelGroupToGroup",
-          "return": {
-            "type": {
-              "text": ""
-            }
-          },
-          "parameters": [
-            {
-              "name": "modelGroup",
-              "type": {
-                "text": "ModelGroup"
-              },
-              "description": "The internal ModelGroup to convert."
-            }
-          ],
-          "description": "Converts a ModelGroup (internal data structure) to a public Group structure.\nThis function recursively processes the rules within the group."
-        },
-        {
-          "kind": "function",
-          "name": "modelRuleToRule",
-          "return": {
-            "type": {
-              "text": ""
-            }
-          },
-          "parameters": [
-            {
-              "name": "modelRule",
-              "type": {
-                "text": "ModelRule"
-              },
-              "description": "The internal ModelRule to convert."
-            }
-          ],
-          "description": "Converts a ModelRule (internal data structure) to a public Rule structure."
-        }
-      ],
-      "exports": [
-        {
-          "kind": "js",
-          "name": "groupToModelGroup",
-          "declaration": {
-            "name": "groupToModelGroup",
-            "module": "src/utils/data-model.ts"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "modelGroupToGroup",
-          "declaration": {
-            "name": "modelGroupToGroup",
-            "module": "src/utils/data-model.ts"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "modelRuleToRule",
-          "declaration": {
-            "name": "modelRuleToRule",
-            "module": "src/utils/data-model.ts"
-          }
-        }
-      ]
-    },
-    {
-      "kind": "javascript-module",
-      "path": "src/utils/formatting.ts",
-      "declarations": [
-        {
-          "kind": "function",
-          "name": "formatDateString",
-          "parameters": [
-            {
-              "name": "date",
-              "type": {
-                "text": "Date"
-              }
-            }
-          ],
-          "description": "Gets the string representation from a `Date` which is the format a `date` input uses.\n`yyyy-mm-dd`"
-        },
-        {
-          "kind": "function",
-          "name": "formatDateTimeString",
-          "parameters": [
-            {
-              "name": "date",
-              "type": {
-                "text": "Date"
-              }
-            }
-          ],
-          "description": "Gets the string representation from a `Date` which is the format a `datetime-local` input uses.\n`yyyy-mm-ddThh:mm:ss`"
-        }
-      ],
-      "exports": [
-        {
-          "kind": "js",
-          "name": "formatDateString",
-          "declaration": {
-            "name": "formatDateString",
-            "module": "src/utils/formatting.ts"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "formatDateTimeString",
-          "declaration": {
-            "name": "formatDateTimeString",
-            "module": "src/utils/formatting.ts"
-          }
-        }
-      ]
-    },
-    {
-      "kind": "javascript-module",
-      "path": "src/utils/index.ts",
-      "declarations": [],
-      "exports": [
-        {
-          "kind": "js",
-          "name": "*",
-          "declaration": {
-            "name": "*",
-            "package": "./data-model"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "*",
-          "declaration": {
-            "name": "*",
-            "package": "./formatting"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "*",
-          "declaration": {
-            "name": "*",
-            "package": "./misc"
-          }
-        }
-      ]
-    },
-    {
-      "kind": "javascript-module",
-      "path": "src/utils/misc.ts",
-      "declarations": [
-        {
-          "kind": "function",
-          "name": "processOptGroups",
-          "return": {
-            "type": {
-              "text": "(T | { optgroup: string | null; xs: T[] })[]"
-            }
-          },
-          "parameters": [
-            {
-              "name": "xs",
-              "type": {
-                "text": "T[]"
-              }
-            }
-          ]
-        },
-        {
-          "kind": "function",
-          "name": "applyCustomStyles",
-          "return": {
-            "type": {
-              "text": "void"
-            }
-          },
-          "parameters": [
-            {
-              "name": "component",
-              "type": {
-                "text": "HTMLElement"
-              },
-              "description": "The web component instance"
-            },
-            {
-              "name": "styles",
-              "type": {
-                "text": "Styles | undefined | null"
-              },
-              "description": "The styles configuration object"
-            },
-            {
-              "name": "styleKey",
-              "type": {
-                "text": "keyof NonNullable<Styles['customStyles']>"
-              },
-              "description": "The key in styles.customStyles to use for custom styles"
-            }
-          ],
-          "description": "Utility function to add custom styles to a web component's shadow root"
-        }
-      ],
-      "exports": [
-        {
-          "kind": "js",
-          "name": "processOptGroups",
-          "declaration": {
-            "name": "processOptGroups",
-            "module": "src/utils/misc.ts"
-          }
-        },
-        {
-          "kind": "js",
-          "name": "applyCustomStyles",
-          "declaration": {
-            "name": "applyCustomStyles",
-            "module": "src/utils/misc.ts"
-          }
-        }
-      ]
-    },
     {
       "kind": "javascript-module",
       "path": "src/main/events.ts",
@@ -829,57 +580,267 @@
               "privacy": "private"
             },
             {
-              "kind": "method",
-              "name": "_handleUpdateRuleData",
-              "privacy": "private",
-              "parameters": [
-                {
-                  "name": "event",
-                  "type": {
-                    "text": "CustomEvent<EventsDetailMap[Events.UpdateRule]>"
-                  }
-                }
-              ]
+              "kind": "method",
+              "name": "_handleUpdateRuleData",
+              "privacy": "private",
+              "parameters": [
+                {
+                  "name": "event",
+                  "type": {
+                    "text": "CustomEvent<EventsDetailMap[Events.UpdateRule]>"
+                  }
+                }
+              ]
+            }
+          ],
+          "events": [
+            {
+              "name": "change",
+              "type": {
+                "text": "CustomEvent"
+              }
+            }
+          ],
+          "superclass": {
+            "name": "GenesisElement",
+            "package": "@genesislcap/web-core"
+          },
+          "tagName": "expression-builder",
+          "customElement": true
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "ExpressionBuilder",
+          "declaration": {
+            "name": "ExpressionBuilder",
+            "module": "src/main/expression-builder.ts"
+          }
+        },
+        {
+          "kind": "custom-element-definition",
+          "name": "expression-builder",
+          "declaration": {
+            "name": "ExpressionBuilder",
+            "module": "src/main/expression-builder.ts"
+          }
+        }
+      ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/main/index.ts",
+      "declarations": [],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "*",
+          "declaration": {
+            "name": "*",
+            "package": "./expression-builder"
+          }
+        },
+        {
+          "kind": "js",
+          "name": "*",
+          "declaration": {
+            "name": "*",
+            "package": "./expression-builder.styles"
+          }
+        },
+        {
+          "kind": "js",
+          "name": "*",
+          "declaration": {
+            "name": "*",
+            "package": "./expression-builder.template"
+          }
+        }
+      ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/types/index.ts",
+      "declarations": [],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "*",
+          "declaration": {
+            "name": "*",
+            "package": "./public.types"
+          }
+        },
+        {
+          "kind": "js",
+          "name": "*",
+          "declaration": {
+            "name": "*",
+            "package": "./private.types"
+          }
+        }
+      ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/types/private.types.ts",
+      "declarations": [],
+      "exports": []
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/types/public.types.ts",
+      "declarations": [],
+      "exports": []
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/utils/data-model.ts",
+      "declarations": [
+        {
+          "kind": "function",
+          "name": "groupToModelGroup",
+          "return": {
+            "type": {
+              "text": "ModelGroup"
+            }
+          },
+          "parameters": [
+            {
+              "name": "group",
+              "type": {
+                "text": "Group"
+              }
+            },
+            {
+              "name": "provider",
+              "type": {
+                "text": "MetadataProvider"
+              }
+            }
+          ],
+          "description": "Converts a Group to a ModelGroup (adds required metadata)"
+        },
+        {
+          "kind": "function",
+          "name": "modelGroupToGroup",
+          "return": {
+            "type": {
+              "text": ""
+            }
+          },
+          "parameters": [
+            {
+              "name": "modelGroup",
+              "type": {
+                "text": "ModelGroup"
+              },
+              "description": "The internal ModelGroup to convert."
+            }
+          ],
+          "description": "Converts a ModelGroup (internal data structure) to a public Group structure.\nThis function recursively processes the rules within the group."
+        },
+        {
+          "kind": "function",
+          "name": "modelRuleToRule",
+          "return": {
+            "type": {
+              "text": ""
+            }
+          },
+          "parameters": [
+            {
+              "name": "modelRule",
+              "type": {
+                "text": "ModelRule"
+              },
+              "description": "The internal ModelRule to convert."
+            }
+          ],
+          "description": "Converts a ModelRule (internal data structure) to a public Rule structure."
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "groupToModelGroup",
+          "declaration": {
+            "name": "groupToModelGroup",
+            "module": "src/utils/data-model.ts"
+          }
+        },
+        {
+          "kind": "js",
+          "name": "modelGroupToGroup",
+          "declaration": {
+            "name": "modelGroupToGroup",
+            "module": "src/utils/data-model.ts"
+          }
+        },
+        {
+          "kind": "js",
+          "name": "modelRuleToRule",
+          "declaration": {
+            "name": "modelRuleToRule",
+            "module": "src/utils/data-model.ts"
+          }
+        }
+      ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "src/utils/formatting.ts",
+      "declarations": [
+        {
+          "kind": "function",
+          "name": "formatDateString",
+          "parameters": [
+            {
+              "name": "date",
+              "type": {
+                "text": "Date"
+              }
             }
           ],
-          "events": [
+          "description": "Gets the string representation from a `Date` which is the format a `date` input uses.\n`yyyy-mm-dd`"
+        },
+        {
+          "kind": "function",
+          "name": "formatDateTimeString",
+          "parameters": [
             {
-              "name": "change",
+              "name": "date",
               "type": {
-                "text": "CustomEvent"
+                "text": "Date"
               }
             }
           ],
-          "superclass": {
-            "name": "GenesisElement",
-            "package": "@genesislcap/web-core"
-          },
-          "tagName": "expression-builder",
-          "customElement": true
+          "description": "Gets the string representation from a `Date` which is the format a `datetime-local` input uses.\n`yyyy-mm-ddThh:mm:ss`"
         }
       ],
       "exports": [
         {
           "kind": "js",
-          "name": "ExpressionBuilder",
+          "name": "formatDateString",
           "declaration": {
-            "name": "ExpressionBuilder",
-            "module": "src/main/expression-builder.ts"
+            "name": "formatDateString",
+            "module": "src/utils/formatting.ts"
           }
         },
         {
-          "kind": "custom-element-definition",
-          "name": "expression-builder",
+          "kind": "js",
+          "name": "formatDateTimeString",
           "declaration": {
-            "name": "ExpressionBuilder",
-            "module": "src/main/expression-builder.ts"
+            "name": "formatDateTimeString",
+            "module": "src/utils/formatting.ts"
           }
         }
       ]
     },
     {
       "kind": "javascript-module",
-      "path": "src/main/index.ts",
+      "path": "src/utils/index.ts",
       "declarations": [],
       "exports": [
         {
@@ -887,7 +848,7 @@
           "name": "*",
           "declaration": {
             "name": "*",
-            "package": "./expression-builder"
+            "package": "./data-model"
           }
         },
         {
@@ -895,7 +856,7 @@
           "name": "*",
           "declaration": {
             "name": "*",
-            "package": "./expression-builder.styles"
+            "package": "./formatting"
           }
         },
         {
@@ -903,46 +864,85 @@
           "name": "*",
           "declaration": {
             "name": "*",
-            "package": "./expression-builder.template"
+            "package": "./misc"
           }
         }
       ]
     },
     {
       "kind": "javascript-module",
-      "path": "src/types/index.ts",
-      "declarations": [],
+      "path": "src/utils/misc.ts",
+      "declarations": [
+        {
+          "kind": "function",
+          "name": "processOptGroups",
+          "return": {
+            "type": {
+              "text": "(T | { optgroup: string | null; xs: T[] })[]"
+            }
+          },
+          "parameters": [
+            {
+              "name": "xs",
+              "type": {
+                "text": "T[]"
+              }
+            }
+          ]
+        },
+        {
+          "kind": "function",
+          "name": "applyCustomStyles",
+          "return": {
+            "type": {
+              "text": "void"
+            }
+          },
+          "parameters": [
+            {
+              "name": "component",
+              "type": {
+                "text": "HTMLElement"
+              },
+              "description": "The web component instance"
+            },
+            {
+              "name": "styles",
+              "type": {
+                "text": "Styles | undefined | null"
+              },
+              "description": "The styles configuration object"
+            },
+            {
+              "name": "styleKey",
+              "type": {
+                "text": "keyof NonNullable<Styles['customStyles']>"
+              },
+              "description": "The key in styles.customStyles to use for custom styles"
+            }
+          ],
+          "description": "Utility function to add custom styles to a web component's shadow root"
+        }
+      ],
       "exports": [
         {
           "kind": "js",
-          "name": "*",
+          "name": "processOptGroups",
           "declaration": {
-            "name": "*",
-            "package": "./public.types"
+            "name": "processOptGroups",
+            "module": "src/utils/misc.ts"
           }
         },
         {
           "kind": "js",
-          "name": "*",
+          "name": "applyCustomStyles",
           "declaration": {
-            "name": "*",
-            "package": "./private.types"
+            "name": "applyCustomStyles",
+            "module": "src/utils/misc.ts"
           }
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "src/types/private.types.ts",
-      "declarations": [],
-      "exports": []
-    },
-    {
-      "kind": "javascript-module",
-      "path": "src/types/public.types.ts",
-      "declarations": [],
-      "exports": []
-    },
     {
       "kind": "javascript-module",
       "path": "src/main/expression-group/expression-group.styles.ts",
@@ -1417,12 +1417,12 @@
     },
     {
       "kind": "javascript-module",
-      "path": "src/main/rule-field/rule-field.template.ts",
+      "path": "src/main/rule-operator/rule-operator.template.ts",
       "declarations": [
         {
           "kind": "variable",
           "name": "template",
-          "default": "html<RuleField>`\n  ${(context) => {\n    const selectTag = context.styles?.customElements?.select || 'select';\n    const optionTag = context.styles?.customElements?.option || 'option';\n    const optgroupTag = 'optgroup'; // Not supporting custom optgroup for now\n\n    return html<RuleField>`\n      <${selectTag}\n        class=\"form-select\"\n        @change=${(x, c) => x.dispatchFieldsChanged(c.event)}\n        value=${(x) => x.field?.fieldId}\n      >\n        <${optionTag} value=\"\">Select a field</${optionTag}>\n        ${repeat(\n          (x) => x.groupedFieldss,\n          html<{ optgroup: string | null; xs: Field[] } | Field, RuleField>`\n            ${(groupOrFields) => {\n              if ('xs' in groupOrFields) {\n                return html<{\n                  optgroup: string | null;\n                  xs: Field[];\n                }>`\n                  <${optgroupTag} label=\"${(x) => x.optgroup}\">\n                    ${repeat(\n                      (x) => x.xs,\n                      html<Field>`\n                        <${optionTag}\n                          value=\"${(x) => x.fieldId}\"\n                          ?selected=${(x, c) => x.fieldId === c.parentContext.parent?.field?.fieldId}\n                        >\n                          ${(x) => x.label}\n                        </${optionTag}>\n                      `,\n                    )}\n                  </${optgroupTag}>\n                `;\n              } else {\n                return html<Field>`\n                  <${optionTag}\n                    value=\"${(x) => x.fieldId}\"\n                    ?selected=${(x, c) => x.fieldId === c.parent?.field?.fieldId}\n                  >\n                    ${(x) => x.label}\n                  </${optionTag}>\n                `;\n              }\n            }}\n          `,\n        )}\n      </${selectTag}>\n    `;\n  }}\n`"
+          "default": "html<RuleOperator>`\n  ${(context) => {\n    const selectTag = context.styles?.customElements?.select || 'select';\n    const optionTag = context.styles?.customElements?.option || 'option';\n    const optgroupTag = 'optgroup'; // Not supporting custom optgroup for now\n\n    return html<RuleOperator>`\n      <${selectTag}\n        class=\"form-select\"\n        @change=${(x, c) => x.handleOperatorChange(c.event)}\n        value=${(x) => x.operator?.type}\n      >\n        <${optionTag} value=\"\">Select an operator</${optionTag}>\n        ${repeat(\n          (x) => x.groupedOperators,\n          html<{ optgroup: string | null; xs: Operator[] } | Operator, RuleOperator>`\n            ${(groupOrOperator) => {\n              if ('xs' in groupOrOperator) {\n                return html<{ optgroup: string | null; xs: Operator[] }, RuleOperator>`\n                  <${optgroupTag} label=\"${groupOrOperator.optgroup}\">\n                    ${repeat(\n                      (x) => x.xs,\n                      html<Operator>`\n                        <${optionTag}\n                          value=\"${(x) => x.type}\"\n                          ?selected=${(x, c) => x.type === c.parentContext.parent.operator?.type}\n                        >\n                          ${(x) => x.type}\n                        </${optionTag}>\n                      `,\n                    )}\n                  </${optgroupTag}>\n                `;\n              } else {\n                return html<Operator, RuleOperator>`\n                  <${optionTag}\n                    value=\"${(x) => x.type}\"\n                    ?selected=${(x, c) => c.parent.operator?.type === x.type}\n                  >\n                    ${(x) => x.type}\n                  </${optionTag}>\n                `;\n              }\n            }}\n          `,\n        )}\n      </${selectTag}>\n    `;\n  }}\n`"
         }
       ],
       "exports": [
@@ -1431,35 +1431,43 @@
           "name": "template",
           "declaration": {
             "name": "template",
-            "module": "src/main/rule-field/rule-field.template.ts"
+            "module": "src/main/rule-operator/rule-operator.template.ts"
           }
         }
       ]
     },
     {
       "kind": "javascript-module",
-      "path": "src/main/rule-field/rule-field.ts",
+      "path": "src/main/rule-operator/rule-operator.ts",
       "declarations": [
         {
           "kind": "class",
           "description": "",
-          "name": "RuleField",
+          "name": "RuleOperator",
           "members": [
             {
               "kind": "field",
-              "name": "fields",
+              "name": "operators",
               "type": {
-                "text": "Field[]"
+                "text": "Operator[]"
               },
               "default": "[]"
             },
             {
               "kind": "field",
-              "name": "field",
+              "name": "operator",
               "type": {
-                "text": "Field"
+                "text": "Operator"
               }
             },
+            {
+              "kind": "field",
+              "name": "field",
+              "type": {
+                "text": "Field | null"
+              },
+              "default": "null"
+            },
             {
               "kind": "field",
               "name": "config",
@@ -1476,15 +1484,23 @@
             },
             {
               "kind": "field",
-              "name": "groupedFieldss",
+              "name": "allowedOperators",
               "type": {
-                "text": "(Field | { optgroup: string | null; xs: Field[] })[]"
+                "text": "Operator[]"
+              },
+              "readonly": true
+            },
+            {
+              "kind": "field",
+              "name": "groupedOperators",
+              "type": {
+                "text": "(Operator | { optgroup: string | null; xs: Operator[] })[]"
               },
               "readonly": true
             },
             {
               "kind": "method",
-              "name": "dispatchFieldsChanged",
+              "name": "handleOperatorChange",
               "parameters": [
                 {
                   "name": "event",
@@ -1506,37 +1522,37 @@
             "name": "GenesisElement",
             "package": "@genesislcap/web-core"
           },
-          "tagName": "expression-rule-field",
+          "tagName": "expression-rule-operator",
           "customElement": true
         }
       ],
       "exports": [
         {
           "kind": "js",
-          "name": "RuleField",
+          "name": "RuleOperator",
           "declaration": {
-            "name": "RuleField",
-            "module": "src/main/rule-field/rule-field.ts"
+            "name": "RuleOperator",
+            "module": "src/main/rule-operator/rule-operator.ts"
           }
         },
         {
           "kind": "custom-element-definition",
-          "name": "expression-rule-field",
+          "name": "expression-rule-operator",
           "declaration": {
-            "name": "RuleField",
-            "module": "src/main/rule-field/rule-field.ts"
+            "name": "RuleOperator",
+            "module": "src/main/rule-operator/rule-operator.ts"
           }
         }
       ]
     },
     {
       "kind": "javascript-module",
-      "path": "src/main/rule-operator/rule-operator.template.ts",
+      "path": "src/main/rule-field/rule-field.template.ts",
       "declarations": [
         {
           "kind": "variable",
           "name": "template",
-          "default": "html<RuleOperator>`\n  ${(context) => {\n    const selectTag = context.styles?.customElements?.select || 'select';\n    const optionTag = context.styles?.customElements?.option || 'option';\n    const optgroupTag = 'optgroup'; // Not supporting custom optgroup for now\n\n    return html<RuleOperator>`\n      <${selectTag}\n        class=\"form-select\"\n        @change=${(x, c) => x.handleOperatorChange(c.event)}\n        value=${(x) => x.operator?.type}\n      >\n        <${optionTag} value=\"\">Select an operator</${optionTag}>\n        ${repeat(\n          (x) => x.groupedOperators,\n          html<{ optgroup: string | null; xs: Operator[] } | Operator, RuleOperator>`\n            ${(groupOrOperator) => {\n              if ('xs' in groupOrOperator) {\n                return html<{ optgroup: string | null; xs: Operator[] }, RuleOperator>`\n                  <${optgroupTag} label=\"${groupOrOperator.optgroup}\">\n                    ${repeat(\n                      (x) => x.xs,\n                      html<Operator>`\n                        <${optionTag}\n                          value=\"${(x) => x.type}\"\n                          ?selected=${(x, c) => x.type === c.parentContext.parent.operator?.type}\n                        >\n                          ${(x) => x.type}\n                        </${optionTag}>\n                      `,\n                    )}\n                  </${optgroupTag}>\n                `;\n              } else {\n                return html<Operator, RuleOperator>`\n                  <${optionTag}\n                    value=\"${(x) => x.type}\"\n                    ?selected=${(x, c) => c.parent.operator?.type === x.type}\n                  >\n                    ${(x) => x.type}\n                  </${optionTag}>\n                `;\n              }\n            }}\n          `,\n        )}\n      </${selectTag}>\n    `;\n  }}\n`"
+          "default": "html<RuleField>`\n  ${(context) => {\n    const selectTag = context.styles?.customElements?.select || 'select';\n    const optionTag = context.styles?.customElements?.option || 'option';\n    const optgroupTag = 'optgroup'; // Not supporting custom optgroup for now\n\n    return html<RuleField>`\n      <${selectTag}\n        class=\"form-select\"\n        @change=${(x, c) => x.dispatchFieldsChanged(c.event)}\n        value=${(x) => x.field?.fieldId}\n      >\n        <${optionTag} value=\"\">Select a field</${optionTag}>\n        ${repeat(\n          (x) => x.groupedFieldss,\n          html<{ optgroup: string | null; xs: Field[] } | Field, RuleField>`\n            ${(groupOrFields) => {\n              if ('xs' in groupOrFields) {\n                return html<{\n                  optgroup: string | null;\n                  xs: Field[];\n                }>`\n                  <${optgroupTag} label=\"${(x) => x.optgroup}\">\n                    ${repeat(\n                      (x) => x.xs,\n                      html<Field>`\n                        <${optionTag}\n                          value=\"${(x) => x.fieldId}\"\n                          ?selected=${(x, c) => x.fieldId === c.parentContext.parent?.field?.fieldId}\n                        >\n                          ${(x) => x.label}\n                        </${optionTag}>\n                      `,\n                    )}\n                  </${optgroupTag}>\n                `;\n              } else {\n                return html<Field>`\n                  <${optionTag}\n                    value=\"${(x) => x.fieldId}\"\n                    ?selected=${(x, c) => x.fieldId === c.parent?.field?.fieldId}\n                  >\n                    ${(x) => x.label}\n                  </${optionTag}>\n                `;\n              }\n            }}\n          `,\n        )}\n      </${selectTag}>\n    `;\n  }}\n`"
         }
       ],
       "exports": [
@@ -1545,42 +1561,34 @@
           "name": "template",
           "declaration": {
             "name": "template",
-            "module": "src/main/rule-operator/rule-operator.template.ts"
+            "module": "src/main/rule-field/rule-field.template.ts"
           }
         }
       ]
     },
     {
       "kind": "javascript-module",
-      "path": "src/main/rule-operator/rule-operator.ts",
+      "path": "src/main/rule-field/rule-field.ts",
       "declarations": [
         {
           "kind": "class",
           "description": "",
-          "name": "RuleOperator",
+          "name": "RuleField",
           "members": [
             {
               "kind": "field",
-              "name": "operators",
+              "name": "fields",
               "type": {
-                "text": "Operator[]"
+                "text": "Field[]"
               },
               "default": "[]"
             },
-            {
-              "kind": "field",
-              "name": "operator",
-              "type": {
-                "text": "Operator"
-              }
-            },
             {
               "kind": "field",
               "name": "field",
               "type": {
-                "text": "Field | null"
-              },
-              "default": "null"
+                "text": "Field"
+              }
             },
             {
               "kind": "field",
@@ -1598,23 +1606,15 @@
             },
             {
               "kind": "field",
-              "name": "allowedOperators",
-              "type": {
-                "text": "Operator[]"
-              },
-              "readonly": true
-            },
-            {
-              "kind": "field",
-              "name": "groupedOperators",
+              "name": "groupedFieldss",
               "type": {
-                "text": "(Operator | { optgroup: string | null; xs: Operator[] })[]"
+                "text": "(Field | { optgroup: string | null; xs: Field[] })[]"
               },
               "readonly": true
             },
             {
               "kind": "method",
-              "name": "handleOperatorChange",
+              "name": "dispatchFieldsChanged",
               "parameters": [
                 {
                   "name": "event",
@@ -1636,25 +1636,25 @@
             "name": "GenesisElement",
             "package": "@genesislcap/web-core"
           },
-          "tagName": "expression-rule-operator",
+          "tagName": "expression-rule-field",
           "customElement": true
         }
       ],
       "exports": [
         {
           "kind": "js",
-          "name": "RuleOperator",
+          "name": "RuleField",
           "declaration": {
-            "name": "RuleOperator",
-            "module": "src/main/rule-operator/rule-operator.ts"
+            "name": "RuleField",
+            "module": "src/main/rule-field/rule-field.ts"
           }
         },
         {
           "kind": "custom-element-definition",
-          "name": "expression-rule-operator",
+          "name": "expression-rule-field",
           "declaration": {
-            "name": "RuleOperator",
-            "module": "src/main/rule-operator/rule-operator.ts"
+            "name": "RuleField",
+            "module": "src/main/rule-field/rule-field.ts"
           }
         }
       ]

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

@@ -8,6 +8,13 @@ export declare class ExpressionBuilder extends GenesisElement implements Metadat
     model: ModelGroup | null;
     private ruleCount;
     private groupCount;
+    /**
+     * @internal
+     * We don't want to dispatch a change event for the model if it's just changed because
+     * the user updated it themselves, otherwise if they automatically update the config property
+     * on change it'll get into an infinite loop
+     */
+    private userUpdatingModel;
     /** @internal */
     configChanged(_: Config, newConfig: Config): void;
     /** @internal */

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

@@ -1 +1 @@
-{"version":3,"file":"expression-builder.d.ts","sourceRoot":"","sources":["../../../src/main/expression-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAa,MAAM,EAAE,MAAM,UAAU,CAAC;AACxE,OAAO,EAAqB,gBAAgB,EAAqB,MAAM,qBAAqB,CAAC;AAkB7F,cAAc;AACd,qBAKa,iBAAkB,SAAQ,cAAe,YAAW,gBAAgB;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,GAAG,IAAI,CAAQ;IAE5C,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,UAAU,CAAK;IAEvB,gBAAgB;IAChB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAQ1C,gBAAgB;IAChB,YAAY,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAM5C;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK;IAa1C,gBAAgB;IAChB,SAAS,IAAI,MAAM;IAInB,gBAAgB;IAChB,UAAU;IAKV,gBAAgB;IAChB,SAAS;IAOT,iBAAiB;IA0BjB,oBAAoB,IAAI,IAAI;IAU5B,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB,CAAsC;IAC/D,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,gBAAgB,CAAqC;IAC7D,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,qBAAqB,CAA0C;IACvE,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,oBAAoB,CAAyC;IACrE,OAAO,CAAC,qBAAqB;CAI9B"}
+{"version":3,"file":"expression-builder.d.ts","sourceRoot":"","sources":["../../../src/main/expression-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAc,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAa,MAAM,EAAE,MAAM,UAAU,CAAC;AACxE,OAAO,EAAqB,gBAAgB,EAAqB,MAAM,qBAAqB,CAAC;AAkB7F,cAAc;AACd,qBAKa,iBAAkB,SAAQ,cAAe,YAAW,gBAAgB;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,GAAG,IAAI,CAAQ;IAE5C,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,UAAU,CAAK;IAEvB;;;;;OAKG;IACH,OAAO,CAAC,iBAAiB,CAAS;IAElC,gBAAgB;IAChB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAU1C,gBAAgB;IAChB,YAAY,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAM5C;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK;IAa1C,gBAAgB;IAChB,SAAS,IAAI,MAAM;IAInB,gBAAgB;IAChB,UAAU;IAKV,gBAAgB;IAChB,SAAS;IAOT,iBAAiB;IA0BjB,oBAAoB,IAAI,IAAI;IAU5B,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB,CAAsC;IAC/D,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,gBAAgB,CAAqC;IAC7D,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,qBAAqB,CAA0C;IACvE,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,oBAAoB,CAAyC;IACrE,OAAO,CAAC,qBAAqB;CAI9B"}

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

@@ -16,6 +16,13 @@ let ExpressionBuilder = class ExpressionBuilder extends GenesisElement {
         this.model = null;
         this.ruleCount = 0;
         this.groupCount = 0;
+        /**
+         * @internal
+         * We don't want to dispatch a change event for the model if it's just changed because
+         * the user updated it themselves, otherwise if they automatically update the config property
+         * on change it'll get into an infinite loop
+         */
+        this.userUpdatingModel = false;
         this.handleAddGroup = this._handleAddGroup.bind(this);
         this.handleAddRule = this._handleAddRule.bind(this);
         this.handleDeleteGroup = this._handleDeleteGroup.bind(this);
@@ -28,12 +35,14 @@ let ExpressionBuilder = class ExpressionBuilder extends GenesisElement {
         if (newConfig.model) {
             this.ruleCount = 0;
             this.groupCount = 0;
+            this.userUpdatingModel = true;
             this.model = groupToModelGroup(newConfig.model, this);
+            this.userUpdatingModel = false;
         }
     }
     /** @internal */
     modelChanged(_, newModel) {
-        if (!newModel)
+        if (!newModel || this.userUpdatingModel)
             return;
         const group = modelGroupToGroup(newModel);
         this.dispatchChangeEvent(group);

package/dist/expression-builder.d.ts

@@ -113,6 +113,13 @@ export declare class ExpressionBuilder extends GenesisElement implements Metadat
     model: ModelGroup | null;
     private ruleCount;
     private groupCount;
+    /**
+     * @internal
+     * We don't want to dispatch a change event for the model if it's just changed because
+     * the user updated it themselves, otherwise if they automatically update the config property
+     * on change it'll get into an infinite loop
+     */
+    private userUpdatingModel;
     /** @internal */
     configChanged(_: Config_2, newConfig: Config_2): void;
     /** @internal */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/expression-builder",
   "description": "Genesis Foundation Expression Builder",
-  "version": "14.251.0",
+  "version": "14.251.2",
   "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": "2ab61e47fbc752e88ecb2d83d794c590a8093829"
+  "gitHead": "328275e4c0bc2bf60422f750f9a0dc4e081a81b4"
 }