@limetech/lime-crm-building-blocks 1.98.0 → 1.100.0

package/dist/components/lime-query-filter-expression.js

@@ -0,0 +1,315 @@
+import { proxyCustomElement, HTMLElement, createEvent, h } from '@stencil/core/internal/client';
+import { Z as Zt } from './index.esm.js';
+import { d as defineCustomElement$3 } from './lime-query-filter-comparison.js';
+import { d as defineCustomElement$5 } from './lime-query-value-input.js';
+import { d as defineCustomElement$4 } from './property-selector.js';
+
+const limeQueryFilterNotCss = "@charset \"UTF-8\";.expression{display:flex;flex-direction:column;margin-bottom:1rem;gap:1rem;padding:1rem;border-left:0.25rem solid rgb(var(--contrast-400));background-color:rgb(var(--contrast-100))}";
+const LimebbLimeQueryFilterNotStyle0 = limeQueryFilterNotCss;
+
+const LimeQueryFilterNotComponent = /*@__PURE__*/ proxyCustomElement(class LimeQueryFilterNotComponent extends HTMLElement {
+    constructor() {
+        super();
+        this.__registerHost();
+        this.__attachShadow();
+        this.expressionChange = createEvent(this, "expressionChange", 7);
+        this.handleExpressionChange = (event) => {
+            var _a;
+            event.stopPropagation();
+            const updatedExpression = (_a = event.detail) !== null && _a !== void 0 ? _a : undefined;
+            if (updatedExpression === undefined) {
+                this.expressionChange.emit(undefined);
+                return;
+            }
+            this.expressionChange.emit({
+                op: Zt.NOT,
+                exp: updatedExpression,
+            });
+        };
+    }
+    render() {
+        return (h("div", { key: 'f1dfd7fd4ec7dc1873841d1c8b3d2bb6677634fd', class: "expression" }, this.label && h("limel-header", { key: '91e1b754f6e45c70f49bf2a770898a590defaf22', heading: this.label }), h("limebb-lime-query-filter-expression", { key: 'bf42f3c71521a413e5ecc49a8e0d6401b34384a2', platform: this.platform, context: this.context, label: "Not", limetype: this.limetype, activeLimetype: this.activeLimetype, expression: this.expression.exp, onExpressionChange: this.handleExpressionChange })));
+    }
+    static get style() { return LimebbLimeQueryFilterNotStyle0; }
+}, [1, "limebb-lime-query-filter-not", {
+        "platform": [16],
+        "context": [16],
+        "label": [1],
+        "limetype": [1],
+        "activeLimetype": [1, "active-limetype"],
+        "expression": [16]
+    }]);
+function defineCustomElement$2() {
+    if (typeof customElements === "undefined") {
+        return;
+    }
+    const components = ["limebb-lime-query-filter-not", "limebb-lime-query-filter-comparison", "limebb-lime-query-filter-expression", "limebb-lime-query-filter-group", "limebb-lime-query-filter-not"];
+    components.forEach(tagName => { switch (tagName) {
+        case "limebb-lime-query-filter-not":
+            if (!customElements.get(tagName)) {
+                customElements.define(tagName, LimeQueryFilterNotComponent);
+            }
+            break;
+        case "limebb-lime-query-filter-comparison":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$3();
+            }
+            break;
+        case "limebb-lime-query-filter-expression":
+            if (!customElements.get(tagName)) {
+                defineCustomElement();
+            }
+            break;
+        case "limebb-lime-query-filter-group":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$1();
+            }
+            break;
+        case "limebb-lime-query-filter-not":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$2();
+            }
+            break;
+    } });
+}
+
+const limeQueryFilterGroupCss = "@charset \"UTF-8\";.expression{display:flex;flex-direction:column;margin-bottom:1rem;gap:0;background-color:rgb(var(--contrast-100));border:1px solid rgb(var(--contrast-500));border-radius:0.75rem}.expression .clickable-header{cursor:pointer;user-select:none}.expression .clickable-header:hover{background-color:rgb(var(--contrast-200))}.expression>ul{margin-top:0;margin-right:1rem;margin-bottom:1rem;margin-left:1rem;padding-left:1rem;list-style:disc}.expression>ul li{margin-top:1rem}.expression>ul li.add-button{list-style:none;display:flex;gap:0.5rem}";
+const LimebbLimeQueryFilterGroupStyle0 = limeQueryFilterGroupCss;
+
+const LimeQueryFilterGroupComponent = /*@__PURE__*/ proxyCustomElement(class LimeQueryFilterGroupComponent extends HTMLElement {
+    constructor() {
+        super();
+        this.__registerHost();
+        this.__attachShadow();
+        this.expressionChange = createEvent(this, "expressionChange", 7);
+        this.renderChildExpression = (expression, childIndex) => (h("li", null, h("limebb-lime-query-filter-expression", { platform: this.platform, context: this.context, limetype: this.limetype, activeLimetype: this.activeLimetype, expression: expression, onExpressionChange: this.handleExpressionChange(childIndex) })));
+        this.handleToggleOperator = () => {
+            const newOperator = this.expression.op === Zt.AND ? Zt.OR : Zt.AND;
+            this.expressionChange.emit({
+                op: newOperator,
+                exp: this.expression.exp,
+            });
+        };
+        this.handleAddChildExpression = () => {
+            // Always add a new comparison directly to the list
+            const newChild = {
+                key: '',
+                op: Zt.EQUALS,
+                exp: '',
+            };
+            this.expressionChange.emit({
+                op: this.expression.op,
+                exp: [...this.expression.exp, newChild],
+            });
+        };
+        this.handleAddChildGroup = () => {
+            // Add a nested group of the opposite type
+            const oppositeOp = this.expression.op === Zt.AND ? Zt.OR : Zt.AND;
+            const newChild = {
+                op: oppositeOp,
+                exp: [
+                    {
+                        key: '',
+                        op: Zt.EQUALS,
+                        exp: '',
+                    },
+                ],
+            };
+            this.expressionChange.emit({
+                op: this.expression.op,
+                exp: [...this.expression.exp, newChild],
+            });
+        };
+        this.handleExpressionChange = (updatedChildIndex) => (event) => {
+            event.stopPropagation();
+            const updatedExpression = event.detail;
+            const expressions = [...this.expression.exp];
+            if (updatedExpression === undefined) {
+                // Deletion - remove the child and potentially unwrap
+                expressions.splice(updatedChildIndex, 1);
+                if (expressions.length === 0) {
+                    this.expressionChange.emit(undefined);
+                    return;
+                }
+                if (expressions.length === 1) {
+                    // Unwrap when only one child remains after deletion
+                    this.expressionChange.emit(expressions[0]);
+                    return;
+                }
+            }
+            else {
+                // Update - replace the child, don't unwrap
+                expressions[updatedChildIndex] = updatedExpression;
+            }
+            this.expressionChange.emit({
+                op: this.expression.op,
+                exp: expressions,
+            });
+        };
+    }
+    render() {
+        const subheading = this.getSubheading();
+        return (h("div", { key: '43a1d99fd896e3ad49dd97594e54bccaf74c3aa0', class: "expression" }, subheading && (h("limel-header", { key: '534eb0a3db2f0194e8a28e2fb071beb545f38458', subheading: subheading, onClick: this.handleToggleOperator, class: "clickable-header" })), h("ul", { key: '9d29d98ab034bf2878e7dc19828bc045dbdd492f' }, this.expression.exp.map(this.renderChildExpression), h("li", { key: '44b266c8aeb390b8a68b3e08a51a0760a6421f93', class: "add-button" }, this.renderAddButton(), this.renderAddGroupButton()))));
+    }
+    getSubheading() {
+        if (this.expression.exp.length <= 1) {
+            return '';
+        }
+        return this.expression.op === Zt.AND
+            ? 'All of these conditions are true'
+            : 'Any of these conditions are true';
+    }
+    renderAddButton() {
+        const label = this.getAddButtonLabel();
+        return (h("limel-button", { label: label, icon: "plus_math", onClick: this.handleAddChildExpression }));
+    }
+    renderAddGroupButton() {
+        const label = this.getAddGroupButtonLabel();
+        return (h("limel-button", { label: label, icon: "tree_structure", onClick: this.handleAddChildGroup }));
+    }
+    getAddButtonLabel() {
+        const isAnd = this.expression.op === Zt.AND;
+        if (this.expression.exp.length === 0) {
+            return 'Add a condition';
+        }
+        return isAnd ? 'Add another condition' : 'Add alternative';
+    }
+    getAddGroupButtonLabel() {
+        const isAnd = this.expression.op === Zt.AND;
+        if (this.expression.exp.length === 0) {
+            return 'Add a group';
+        }
+        return isAnd ? 'Add another group' : 'Add alternative group';
+    }
+    static get style() { return LimebbLimeQueryFilterGroupStyle0; }
+}, [1, "limebb-lime-query-filter-group", {
+        "platform": [16],
+        "context": [16],
+        "limetype": [1],
+        "activeLimetype": [1, "active-limetype"],
+        "expression": [16]
+    }]);
+function defineCustomElement$1() {
+    if (typeof customElements === "undefined") {
+        return;
+    }
+    const components = ["limebb-lime-query-filter-group", "limebb-lime-query-filter-comparison", "limebb-lime-query-filter-expression", "limebb-lime-query-filter-group", "limebb-lime-query-filter-not"];
+    components.forEach(tagName => { switch (tagName) {
+        case "limebb-lime-query-filter-group":
+            if (!customElements.get(tagName)) {
+                customElements.define(tagName, LimeQueryFilterGroupComponent);
+            }
+            break;
+        case "limebb-lime-query-filter-comparison":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$3();
+            }
+            break;
+        case "limebb-lime-query-filter-expression":
+            if (!customElements.get(tagName)) {
+                defineCustomElement();
+            }
+            break;
+        case "limebb-lime-query-filter-group":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$1();
+            }
+            break;
+        case "limebb-lime-query-filter-not":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$2();
+            }
+            break;
+    } });
+}
+
+const limeQueryFilterExpressionCss = "@charset \"UTF-8\";.expression{display:flex;flex-direction:column;margin-bottom:1rem;gap:1rem}";
+const LimebbLimeQueryFilterExpressionStyle0 = limeQueryFilterExpressionCss;
+
+const LimeQueryFilterExpressionComponent = /*@__PURE__*/ proxyCustomElement(class LimeQueryFilterExpressionComponent extends HTMLElement {
+    constructor() {
+        super();
+        this.__registerHost();
+        this.__attachShadow();
+        this.expressionChange = createEvent(this, "expressionChange", 7);
+        this.handleExpressionChange = (event) => {
+            event.stopPropagation();
+            this.expressionChange.emit(event.detail);
+        };
+    }
+    render() {
+        if (!this.expression) {
+            return;
+        }
+        const props = {
+            platform: this.platform,
+            context: this.context,
+            label: this.label,
+            limetype: this.limetype,
+            activeLimetype: this.activeLimetype,
+        };
+        if ('key' in this.expression) {
+            return (h("limebb-lime-query-filter-comparison", Object.assign({}, props, { expression: this.expression, onExpressionChange: this.handleExpressionChange })));
+        }
+        if (this.expression.op === Zt.AND ||
+            this.expression.op === Zt.OR) {
+            return (h("limebb-lime-query-filter-group", Object.assign({}, props, { expression: this.expression, onExpressionChange: this.handleExpressionChange })));
+        }
+        if (this.expression.op === Zt.NOT) {
+            return (h("limebb-lime-query-filter-not", Object.assign({}, props, { expression: this.expression, onExpressionChange: this.handleExpressionChange })));
+        }
+    }
+    static get style() { return LimebbLimeQueryFilterExpressionStyle0; }
+}, [1, "limebb-lime-query-filter-expression", {
+        "platform": [16],
+        "context": [16],
+        "label": [1],
+        "limetype": [1],
+        "activeLimetype": [1, "active-limetype"],
+        "expression": [16]
+    }]);
+function defineCustomElement() {
+    if (typeof customElements === "undefined") {
+        return;
+    }
+    const components = ["limebb-lime-query-filter-expression", "limebb-lime-query-filter-comparison", "limebb-lime-query-filter-expression", "limebb-lime-query-filter-group", "limebb-lime-query-filter-not", "limebb-lime-query-value-input", "limebb-property-selector"];
+    components.forEach(tagName => { switch (tagName) {
+        case "limebb-lime-query-filter-expression":
+            if (!customElements.get(tagName)) {
+                customElements.define(tagName, LimeQueryFilterExpressionComponent);
+            }
+            break;
+        case "limebb-lime-query-filter-comparison":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$3();
+            }
+            break;
+        case "limebb-lime-query-filter-expression":
+            if (!customElements.get(tagName)) {
+                defineCustomElement();
+            }
+            break;
+        case "limebb-lime-query-filter-group":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$1();
+            }
+            break;
+        case "limebb-lime-query-filter-not":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$2();
+            }
+            break;
+        case "limebb-lime-query-value-input":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$5();
+            }
+            break;
+        case "limebb-property-selector":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$4();
+            }
+            break;
+    } });
+}
+
+export { LimeQueryFilterExpressionComponent as L, defineCustomElement$1 as a, defineCustomElement as b, LimeQueryFilterGroupComponent as c, defineCustomElement$2 as d, LimeQueryFilterNotComponent as e };

package/dist/components/limebb-lime-query-builder.js

@@ -1,69 +1,72 @@
 import { proxyCustomElement, HTMLElement, createEvent, h } from '@stencil/core/internal/client';
 import { T as Te } from './index.esm.js';
-import { L as LIME_QUERY_OPERATORS, d as defineCustomElement$a } from './lime-query-filter-comparison.js';
 import { g as getNormalizedProperties, a as getPropertyFromPath, d as defineCustomElement$4 } from './property-selector.js';
-import { d as defineCustomElement$7, a as defineCustomElement$8, b as defineCustomElement$9, c as defineCustomElement$b } from './lime-query-filter-and.js';
+import { d as defineCustomElement$b } from './lime-query-filter-builder.js';
+import { d as defineCustomElement$a } from './lime-query-filter-comparison.js';
+import { d as defineCustomElement$7, a as defineCustomElement$8, b as defineCustomElement$9 } from './lime-query-filter-expression.js';
 import { d as defineCustomElement$6 } from './lime-query-value-input.js';
 import { d as defineCustomElement$5 } from './limetype-field.js';
 import { d as defineCustomElement$3 } from './response-format-editor.js';
 import { d as defineCustomElement$2 } from './response-format-item.js';
 
 /**
- * Convert UI filter representation to Lime Query filter format
- * @param filter
+ * TypeScript type definitions for Lime Query DSL
+ *
+ * These types represent the structure of Lime Query as defined in:
+ * - lime-core/lime_query/schema.py
+ * - lime-core/lime_filter/schema.py
  */
-function guiFilterToLimeQuery(filter) {
-    if (filter.filter_type === '') {
-        return undefined;
-    }
-    if (filter.filter_type === 'comparison') {
-        return {
-            key: filter.property,
-            op: filter.operator,
-            exp: filter.value,
-        };
-    }
-    if (filter.filter_type === 'AND') {
-        const expressions = filter.expressions
-            .map(guiFilterToLimeQuery)
-            .filter((f) => f !== undefined);
-        if (expressions.length === 0) {
-            return undefined;
-        }
-        if (expressions.length === 1) {
-            return expressions[0];
-        }
-        return {
-            op: 'AND',
-            exp: expressions,
-        };
-    }
-    if (filter.filter_type === 'OR') {
-        const expressions = filter.expressions
-            .map(guiFilterToLimeQuery)
-            .filter((f) => f !== undefined);
-        if (expressions.length === 0) {
-            return undefined;
-        }
-        if (expressions.length === 1) {
-            return expressions[0];
-        }
-        return {
-            op: 'OR',
-            exp: expressions,
-        };
-    }
-    if (filter.filter_type === 'NOT') {
-        const innerFilter = guiFilterToLimeQuery(filter.expression);
-        if (innerFilter) {
-            return {
-                op: '!',
-                exp: innerFilter,
-            };
-        }
-    }
-    return undefined;
-}
+/**
+ * Available operators with display metadata
+ */
+const LIME_QUERY_OPERATORS = [
+    { value: '=', label: 'Equals', icon: 'equals' },
+    { value: '!=', label: 'Not Equals', icon: 'not-equal' },
+    {
+        value: '>',
+        label: 'Greater Than',
+        icon: 'greater-than',
+        applicableTypes: ['integer', 'decimal', 'date', 'time'],
+    },
+    {
+        value: '>=',
+        label: 'Greater or Equal',
+        icon: 'greater-or-equal',
+        applicableTypes: ['integer', 'decimal', 'date', 'time'],
+    },
+    {
+        value: '<',
+        label: 'Less Than',
+        icon: 'less-than',
+        applicableTypes: ['integer', 'decimal', 'date', 'time'],
+    },
+    {
+        value: '<=',
+        label: 'Less or Equal',
+        icon: 'less-or-equal',
+        applicableTypes: ['integer', 'decimal', 'date', 'time'],
+    },
+    { value: 'IN', label: 'In List', icon: 'list' },
+    {
+        value: '?',
+        label: 'Contains',
+        icon: '-lime-filter-contain',
+        applicableTypes: ['string', 'text'],
+    },
+    {
+        value: '=?',
+        label: 'Begins With',
+        icon: '-lime-filter-begin',
+        applicableTypes: ['string', 'text'],
+    },
+    {
+        value: '=$',
+        label: 'Ends With',
+        icon: '-lime-filter-end',
+        applicableTypes: ['string', 'text'],
+    },
+];
+
 /**
  * Validate and convert a FilterExpression (comparison filter)
  * @param filter
@@ -165,103 +168,6 @@ function limeQueryToGuiFilter(filter) {
     // It's a FilterGroup
     return validateAndConvertFilterGroup(filter);
 }
-/**
- * Normalize filter for GUI mode by ensuring proper AND/OR wrapper structure.
- * GUI mode requires filters to be wrapped in AND([OR(...)]) so users have
- * access to add/remove buttons on the AND and OR components.
- *
- * This function ensures that:
- * - Single comparisons are wrapped in AND([OR([comparison])])
- * - OR groups are wrapped in AND([OR group])
- * - AND groups have their comparison children wrapped in OR
- * - Empty/undefined filters become AND([])
- *
- * When converting back to Lime Query JSON, limeQueryFilterToLimeQuery()
- * automatically unwraps single-item AND/OR groups.
- *
- * @param filter The filter expression from limeQueryToLimeQueryFilter
- * @returns Normalized filter suitable for GUI editing
- */
-function normalizeLimeQueryFilterForGui(filter) {
-    // Empty AND is already correct for GUI
-    if (filter.filter_type === 'AND' && filter.expressions.length === 0) {
-        return filter;
-    }
-    // Single comparison needs wrapping
-    if (filter.filter_type === 'comparison') {
-        return {
-            filter_type: 'AND',
-            expressions: [
-                {
-                    filter_type: 'OR',
-                    expressions: [filter],
-                },
-            ],
-        };
-    }
-    // OR needs wrapping in AND
-    if (filter.filter_type === 'OR') {
-        return {
-            filter_type: 'AND',
-            expressions: [filter],
-        };
-    }
-    // NOT needs wrapping
-    if (filter.filter_type === 'NOT') {
-        return {
-            filter_type: 'AND',
-            expressions: [
-                {
-                    filter_type: 'OR',
-                    expressions: [filter],
-                },
-            ],
-        };
-    }
-    // AND group - check if children need OR wrappers
-    if (filter.filter_type === 'AND') {
-        const normalizedChildren = filter.expressions.map((child) => {
-            // If child is already OR, keep it
-            if (child.filter_type === 'OR') {
-                return child;
-            }
-            // If child is NOT, keep it (NOT can be a direct child of AND)
-            if (child.filter_type === 'NOT') {
-                return child;
-            }
-            // If child is comparison, wrap in OR
-            if (child.filter_type === 'comparison') {
-                return {
-                    filter_type: 'OR',
-                    expressions: [child],
-                };
-            }
-            // If child is nested AND, recursively normalize and wrap in OR
-            if (child.filter_type === 'AND') {
-                return {
-                    filter_type: 'OR',
-                    expressions: [normalizeLimeQueryFilterForGui(child)],
-                };
-            }
-            // Unknown filter type, keep as is
-            return child;
-        });
-        return {
-            filter_type: 'AND',
-            expressions: normalizedChildren,
-        };
-    }
-    // Fallback: wrap in AND/OR structure
-    return {
-        filter_type: 'AND',
-        expressions: [
-            {
-                filter_type: 'OR',
-                expressions: [filter],
-            },
-        ],
-    };
-}
 
 /**
  * Dynamic filter values and placeholders that are valid in Lime Query
@@ -662,18 +568,11 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
         this.mode = 'gui';
         this.codeValue = '';
         this.limetype = '';
-        this.filter = {
-            filter_type: 'AND',
-            expressions: [],
-        };
         this.handleLimetypeChange = (event) => {
             event.stopPropagation();
             this.limetype = event.detail;
             // Reset filter when limetype changes
-            this.filter = {
-                filter_type: 'AND',
-                expressions: [],
-            };
+            this.filter = undefined;
             // Reset response format when limetype changes
             this.internalResponseFormat = {
                 object: {
@@ -683,17 +582,9 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
             this.emitChange();
         };
         this.handleFilterChange = (event) => {
+            var _a;
             event.stopPropagation();
-            // Convert missing expression back to empty AND to keep the UI consistent
-            if (event.detail.filter_type === '') {
-                this.filter = {
-                    filter_type: 'AND',
-                    expressions: [],
-                };
-            }
-            else {
-                this.filter = event.detail;
-            }
+            this.filter = (_a = event.detail) !== null && _a !== void 0 ? _a : undefined;
             this.emitChange();
         };
         this.handleResponseFormatChange = (event) => {
@@ -719,7 +610,7 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
                 }
                 // Update internal state from parsed query
                 this.limetype = parsed.limetype || '';
-                this.filter = normalizeLimeQueryFilterForGui(limeQueryToGuiFilter(parsed.filter));
+                this.filter = parsed.filter;
                 this.internalResponseFormat = parsed.responseFormat;
                 this.limit = parsed.limit;
                 this.mode = 'gui';
@@ -760,7 +651,7 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
         }
         if (this.value) {
             this.limetype = this.value.limetype || '';
-            this.filter = normalizeLimeQueryFilterForGui(limeQueryToGuiFilter(this.value.filter));
+            this.filter = this.value.filter;
             this.internalResponseFormat = this.value.responseFormat;
             this.limit = this.value.limit;
         }
@@ -775,7 +666,7 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
     render() {
         const guiSupported = this.checkGuiSupport();
         const showCodeMode = !this.guiModeEnabled || this.mode === 'code';
-        return (h("div", { key: '96d1a933f699404c3806af3742e9ad30d53562aa', class: "lime-query-builder" }, this.renderLabel(), this.renderModeControls(guiSupported), showCodeMode
+        return (h("div", { key: '0b4d2bb5b4d503a775d8d3215e1e4c74fdb1eceb', class: "lime-query-builder" }, this.renderLabel(), this.renderModeControls(guiSupported), showCodeMode
             ? this.renderCodeMode(guiSupported)
             : this.renderGuiMode()));
     }
@@ -796,7 +687,7 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
         const limeQuery = {
             limetype: this.limetype,
             responseFormat: responseFormat,
-            filter: guiFilterToLimeQuery(this.filter),
+            filter: this.filter,
         };
         if (this.limit !== undefined && this.limit > 0) {
             limeQuery.limit = this.limit;
@@ -817,7 +708,7 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
         const limeQuery = {
             limetype: this.limetype,
             responseFormat: responseFormat,
-            filter: guiFilterToLimeQuery(this.filter),
+            filter: this.filter,
         };
         if (this.limit !== undefined && this.limit > 0) {
             limeQuery.limit = this.limit;
@@ -868,7 +759,7 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
             queryToCheck = {
                 limetype: this.limetype,
                 responseFormat: responseFormat,
-                filter: guiFilterToLimeQuery(this.filter),
+                filter: this.filter,
             };
             if (this.limit !== undefined && this.limit > 0) {
                 queryToCheck.limit = this.limit;
@@ -900,7 +791,7 @@ const LimeQueryBuilder = /*@__PURE__*/ proxyCustomElement(class LimeQueryBuilder
         if (!this.limetype) {
             return;
         }
-        return (h("div", { class: "filter-section" }, h("h4", { class: "section-label" }, "Filter Conditions"), h("limebb-lime-query-filter-expression", { platform: this.platform, context: this.context, limetype: this.limetype, activeLimetype: this.activeLimetype, expression: this.filter, onExpressionChange: this.handleFilterChange })));
+        return (h("div", { class: "filter-section" }, h("h4", { class: "section-label" }, "Filter Conditions"), h("limebb-lime-query-filter-builder", { platform: this.platform, context: this.context, limetype: this.limetype, activeLimetype: this.activeLimetype, expression: this.filter, onExpressionChange: this.handleFilterChange })));
     }
     renderQueryOptionsSection() {
         var _a;
@@ -949,14 +840,14 @@ function defineCustomElement$1() {
     if (typeof customElements === "undefined") {
         return;
     }
-    const components = ["limebb-lime-query-builder", "limebb-lime-query-filter-and", "limebb-lime-query-filter-comparison", "limebb-lime-query-filter-expression", "limebb-lime-query-filter-not", "limebb-lime-query-filter-or", "limebb-lime-query-value-input", "limebb-limetype-field", "limebb-property-selector", "limebb-response-format-editor", "limebb-response-format-item"];
+    const components = ["limebb-lime-query-builder", "limebb-lime-query-filter-builder", "limebb-lime-query-filter-comparison", "limebb-lime-query-filter-expression", "limebb-lime-query-filter-group", "limebb-lime-query-filter-not", "limebb-lime-query-value-input", "limebb-limetype-field", "limebb-property-selector", "limebb-response-format-editor", "limebb-response-format-item"];
     components.forEach(tagName => { switch (tagName) {
         case "limebb-lime-query-builder":
             if (!customElements.get(tagName)) {
                 customElements.define(tagName, LimeQueryBuilder);
             }
             break;
-        case "limebb-lime-query-filter-and":
+        case "limebb-lime-query-filter-builder":
             if (!customElements.get(tagName)) {
                 defineCustomElement$b();
             }
@@ -971,12 +862,12 @@ function defineCustomElement$1() {
                 defineCustomElement$9();
             }
             break;
-        case "limebb-lime-query-filter-not":
+        case "limebb-lime-query-filter-group":
             if (!customElements.get(tagName)) {
                 defineCustomElement$8();
             }
             break;
-        case "limebb-lime-query-filter-or":
+        case "limebb-lime-query-filter-not":
             if (!customElements.get(tagName)) {
                 defineCustomElement$7();
             }