@genesislcap/expression-builder 14.260.3 → 14.261.0

package/dist/custom-elements.json

@@ -427,7 +427,7 @@
         {
           "kind": "variable",
           "name": "template",
-          "default": "html<ExpressionBuilder>`\n  <div class=\"query-builder\">\n    <expression-group\n      :model=${(x) => x.model}\n      :config=${(x) => x.config}\n      :styles=${(x) => x.styles}\n    ></expression-group>\n  </div>\n`"
+          "default": "html<ExpressionBuilder>`\n  <div class=\"query-builder\">\n    ${when(\n      (x) => x.model !== null,\n      html<ExpressionBuilder>`\n        <expression-group\n          :model=${(x) => x.model}\n          :config=${(x) => x.config}\n          :styles=${(x) => x.styles}\n        ></expression-group>\n      `,\n    )}\n  </div>\n`"
         }
       ],
       "exports": [
@@ -506,6 +506,29 @@
                 }
               ]
             },
+            {
+              "kind": "method",
+              "name": "isValidConfig",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "config",
+                  "type": {
+                    "text": "Config"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "initBaseModel",
+              "privacy": "private"
+            },
             {
               "kind": "field",
               "name": "handleAddGroup",
@@ -681,6 +704,41 @@
         }
       ]
     },
+    {
+      "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",
@@ -930,41 +988,6 @@
         }
       ]
     },
-    {
-      "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/main/expression-group/expression-group.styles.ts",

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

@@ -144,6 +144,8 @@ export declare class ExpressionBuilder extends GenesisElement implements Metadat
     connectedCallback(): void;
     /** @internal */
     disconnectedCallback(): void;
+    private isValidConfig;
+    private initBaseModel;
     private handleAddGroup;
     private _handleAddGroup;
     private handleAddRule;

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;;;;;;;;;;;;;GAaG;AACH,qBAKa,iBAAkB,SAAQ,cAAe,YAAW,gBAAgB;IAC/E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6CG;IACS,MAAM,EAAE,MAAM,CAAC;IAE3B;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACS,MAAM,CAAC,EAAE,MAAM,CAAC;IAE5B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACS,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,gBAAgB;IAChB,iBAAiB;IA0BjB,gBAAgB;IAChB,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;;;;;;;;;;;;;GAaG;AACH,qBAKa,iBAAkB,SAAQ,cAAe,YAAW,gBAAgB;IAC/E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6CG;IACS,MAAM,EAAE,MAAM,CAAC;IAE3B;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACS,MAAM,CAAC,EAAE,MAAM,CAAC;IAE5B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACS,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;IAiB1C,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,gBAAgB;IAChB,iBAAiB;IAyBjB,gBAAgB;IAChB,oBAAoB,IAAI,IAAI;IAU5B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,aAAa;IAerB,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/dts/main/expression-builder.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-builder.template.d.ts","sourceRoot":"","sources":["../../../src/main/expression-builder.template.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAK9D,cAAc;AACd,eAAO,MAAM,QAAQ,wEAQpB,CAAC"}
+{"version":3,"file":"expression-builder.template.d.ts","sourceRoot":"","sources":["../../../src/main/expression-builder.template.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAK9D,cAAc;AACd,eAAO,MAAM,QAAQ,wEAapB,CAAC"}

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

@@ -68,6 +68,9 @@ let ExpressionBuilder = class ExpressionBuilder extends GenesisElement {
     }
     /** @internal */
     configChanged(_, newConfig) {
+        if (!this.isValidConfig(newConfig)) {
+            throw new Error("Invalid config passed to ExpressionBuilder. Verify you've defined operators, fields, and combinators.");
+        }
         if (newConfig.model) {
             this.ruleCount = 0;
             this.groupCount = 0;
@@ -75,6 +78,9 @@ let ExpressionBuilder = class ExpressionBuilder extends GenesisElement {
             this.model = groupToModelGroup(newConfig.model, this);
             this.userUpdatingModel = false;
         }
+        else if (this.model === null) {
+            this.initBaseModel();
+        }
     }
     /** @internal */
     modelChanged(_, newModel) {
@@ -117,24 +123,26 @@ let ExpressionBuilder = class ExpressionBuilder extends GenesisElement {
     /** @internal */
     connectedCallback() {
         super.connectedCallback();
-        if (!this.config || !this.config.combinators || !this.config.operators || !this.config.fields) {
-            throw new Error("Invalid config passed to ExpressionBuilder. Verify you've defined operators, fields, and combinators.");
-        }
         this.addEventListener(Events.AddGroup, this.handleAddGroup);
         this.addEventListener(Events.DelGroup, this.handleDeleteGroup);
         this.addEventListener(Events.AddRule, this.handleAddRule);
         this.addEventListener(Events.DelRule, this.handleDeleteRule);
         this.addEventListener(Events.UpdateGroup, this.handleUpdateGroupData);
         this.addEventListener(Events.UpdateRule, this.handleUpdateRuleData);
+        // When using other frameworks such as React we cannot guarantee that it sets the property on the component
+        // by the time connectedCallback is called, so we need to allow for lazy setting of the config
+        if (!this.isValidConfig(this.config)) {
+            if (this.config) {
+                console.warn("Config detected during connectedCallback but it isn't valid");
+            }
+            this.config = null;
+            return;
+        }
+        // If the property contains a model then let that be used, via configChanged
         if (this.config.model)
             return;
-        this.model = {
-            children: [],
-            level: 1,
-            groupId: ROOT_GROUP,
-            config: this.config,
-            combinator: this.config.combinators[0],
-        };
+        // Else, set a blank model
+        this.initBaseModel();
     }
     /** @internal */
     disconnectedCallback() {
@@ -146,6 +154,22 @@ let ExpressionBuilder = class ExpressionBuilder extends GenesisElement {
         this.removeEventListener(Events.UpdateGroup, this.handleUpdateGroupData);
         this.removeEventListener(Events.UpdateRule, this.handleUpdateRuleData);
     }
+    isValidConfig(config) {
+        var _a, _b, _c;
+        return Boolean(config && ((_a = config.combinators) === null || _a === void 0 ? void 0 : _a.length) && ((_b = config.operators) === null || _b === void 0 ? void 0 : _b.length) && ((_c = config.fields) === null || _c === void 0 ? void 0 : _c.length));
+    }
+    initBaseModel() {
+        if (!this.isValidConfig(this.config)) {
+            throw new Error("Invalid config set on ExpressionBuilder. Verify you've defined operators, fields, and combinators.");
+        }
+        this.model = {
+            children: [],
+            level: 1,
+            groupId: ROOT_GROUP,
+            config: this.config,
+            combinator: this.config.combinators[0],
+        };
+    }
     _handleAddGroup(event) {
         const { parentGroupId, newGroup: _newGroup } = event.detail;
         const newGroup = {

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

@@ -1,13 +1,15 @@
-import { html } from '@genesislcap/web-core';
+import { html, when } from '@genesislcap/web-core';
 import { ExpressionGroup } from './expression-group/expression-group';
 ExpressionGroup;
 /** @alpha **/
 export const template = html `
   <div class="query-builder">
-    <expression-group
-      :model=${(x) => x.model}
-      :config=${(x) => x.config}
-      :styles=${(x) => x.styles}
-    ></expression-group>
+    ${when((x) => x.model !== null, html `
+        <expression-group
+          :model=${(x) => x.model}
+          :config=${(x) => x.config}
+          :styles=${(x) => x.styles}
+        ></expression-group>
+      `)}
   </div>
 `;

package/dist/expression-builder.d.ts

@@ -333,6 +333,8 @@ export declare class ExpressionBuilder extends GenesisElement implements Metadat
     connectedCallback(): void;
     /** @internal */
     disconnectedCallback(): void;
+    private isValidConfig;
+    private initBaseModel;
     private handleAddGroup;
     private _handleAddGroup;
     private handleAddRule;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/expression-builder",
   "description": "Genesis Foundation Expression Builder",
-  "version": "14.260.3",
+  "version": "14.261.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": "8c2edfa09d71c8b6c5487873d1751da090c62480"
+  "gitHead": "0f53a72fa79fcfc3ffb9a4b741815aaaad1a8980"
 }