@genesislcap/foundation-forms 14.70.3 → 14.70.4-es2021.1

package/dist/custom-elements.json

@@ -118,6 +118,117 @@
               "name": "reset",
               "description": "Reset the form state",
               "privacy": "public"
+            },
+            {
+              "kind": "field",
+              "name": "_presentation",
+              "type": {
+                "text": "ComponentPresentation | null | undefined"
+              },
+              "privacy": "private",
+              "default": "void 0",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "$presentation",
+              "type": {
+                "text": "ComponentPresentation | null"
+              },
+              "privacy": "public",
+              "description": "A property which resolves the ComponentPresentation instance\nfor the current component.",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "template",
+              "type": {
+                "text": "ElementViewTemplate | void | null"
+              },
+              "privacy": "public",
+              "description": "Sets the template of the element instance. When undefined,\nthe element will attempt to resolve the template from\nthe associated presentation or custom element definition.",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "templateChanged",
+              "privacy": "protected",
+              "return": {
+                "type": {
+                  "text": "void"
+                }
+              },
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "styles",
+              "type": {
+                "text": "ElementStyles | void | null"
+              },
+              "privacy": "public",
+              "description": "Sets the default styles for the element instance. When undefined,\nthe element will attempt to resolve default styles from\nthe associated presentation or custom element definition.",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "stylesChanged",
+              "privacy": "protected",
+              "return": {
+                "type": {
+                  "text": "void"
+                }
+              },
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "compose",
+              "privacy": "public",
+              "static": true,
+              "return": {
+                "type": {
+                  "text": "(\n        overrideDefinition?: OverrideFoundationElementDefinition<T>\n    ) => FoundationElementRegistry<T, K>"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "this",
+                  "type": {
+                    "text": "K"
+                  }
+                },
+                {
+                  "name": "elementDefinition",
+                  "type": {
+                    "text": "T"
+                  },
+                  "description": "The definition of the element to create the registry\nfunction for."
+                }
+              ],
+              "description": "Defines an element registry function with a set of element definition defaults.",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
             }
           ],
           "attributes": [
@@ -374,6 +485,117 @@
             {
               "kind": "method",
               "name": "valueChanged"
+            },
+            {
+              "kind": "field",
+              "name": "_presentation",
+              "type": {
+                "text": "ComponentPresentation | null | undefined"
+              },
+              "privacy": "private",
+              "default": "void 0",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "$presentation",
+              "type": {
+                "text": "ComponentPresentation | null"
+              },
+              "privacy": "public",
+              "description": "A property which resolves the ComponentPresentation instance\nfor the current component.",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "template",
+              "type": {
+                "text": "ElementViewTemplate | void | null"
+              },
+              "privacy": "public",
+              "description": "Sets the template of the element instance. When undefined,\nthe element will attempt to resolve the template from\nthe associated presentation or custom element definition.",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "templateChanged",
+              "privacy": "protected",
+              "return": {
+                "type": {
+                  "text": "void"
+                }
+              },
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "styles",
+              "type": {
+                "text": "ElementStyles | void | null"
+              },
+              "privacy": "public",
+              "description": "Sets the default styles for the element instance. When undefined,\nthe element will attempt to resolve default styles from\nthe associated presentation or custom element definition.",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "stylesChanged",
+              "privacy": "protected",
+              "return": {
+                "type": {
+                  "text": "void"
+                }
+              },
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "compose",
+              "privacy": "public",
+              "static": true,
+              "return": {
+                "type": {
+                  "text": "(\n        overrideDefinition?: OverrideFoundationElementDefinition<T>\n    ) => FoundationElementRegistry<T, K>"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "this",
+                  "type": {
+                    "text": "K"
+                  }
+                },
+                {
+                  "name": "elementDefinition",
+                  "type": {
+                    "text": "T"
+                  },
+                  "description": "The definition of the element to create the registry\nfunction for."
+                }
+              ],
+              "description": "Defines an element registry function with a set of element definition defaults.",
+              "inheritedFrom": {
+                "name": "FoundationElement",
+                "module": "src/foundation-element/foundation-element.ts"
+              }
             }
           ],
           "events": [

package/dist/esm/filters/filters.js

@@ -1,4 +1,4 @@
-import { __awaiter, __decorate } from "tslib";
+import { __decorate } from "tslib";
 import { Connect } from '@genesislcap/foundation-comms';
 import { CriteriaBuilder, Join } from '@genesislcap/foundation-criteria';
 import { createLogger } from '@genesislcap/foundation-utils';
@@ -64,16 +64,13 @@ let Filters = class Filters extends FoundationElement {
          */
         this.data = {};
     }
-    resourceNameChanged() {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            this.jsonSchema = undefined;
-            if (this.resourceName) {
-                const jsonSchemaResponse = yield this.connect.getJSONSchema(this.resourceName);
-                this.jsonSchema = (_b = (_a = jsonSchemaResponse === null || jsonSchemaResponse === void 0 ? void 0 : jsonSchemaResponse.OUTBOUND) === null || _a === void 0 ? void 0 : _a.$defs) === null || _b === void 0 ? void 0 : _b['global.genesis.message.core.dataserver.QueryRow'];
-                (_c = this.jsonSchema) === null || _c === void 0 ? true : delete _c.properties['DETAILS'];
-            }
-        });
+    async resourceNameChanged() {
+        this.jsonSchema = undefined;
+        if (this.resourceName) {
+            const jsonSchemaResponse = await this.connect.getJSONSchema(this.resourceName);
+            this.jsonSchema = jsonSchemaResponse?.OUTBOUND?.$defs?.['global.genesis.message.core.dataserver.QueryRow'];
+            delete this.jsonSchema?.properties['DETAILS'];
+        }
     }
     clearFiltersData() {
         this.data = {};
@@ -87,7 +84,7 @@ let Filters = class Filters extends FoundationElement {
      */
     searchFilters() {
         this.value = '';
-        const payload = Object.assign({}, this.data);
+        const payload = { ...this.data };
         const expressions = createExpressions(payload);
         const criteriaBuilder = new CriteriaBuilder();
         filtersLogger.debug({ payload });

package/dist/esm/form.js

@@ -1,4 +1,4 @@
-import { __awaiter, __decorate } from "tslib";
+import { __decorate } from "tslib";
 import { Connect } from '@genesislcap/foundation-comms';
 import { createLogger } from '@genesislcap/foundation-utils';
 import { isControl, isStringControl, mapStateToControlProps, rankWith, } from '@jsonforms/core';
@@ -71,15 +71,12 @@ let Form = class Form extends FoundationElement {
          */
         this.data = {};
     }
-    resourceNameChanged() {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            this.jsonSchema = undefined;
-            if (this.resourceName) {
-                const jsonSchemaResponse = yield this.connect.getJSONSchema(this.resourceName);
-                this.jsonSchema = (_b = (_a = jsonSchemaResponse === null || jsonSchemaResponse === void 0 ? void 0 : jsonSchemaResponse.INBOUND) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b.DETAILS;
-            }
-        });
+    async resourceNameChanged() {
+        this.jsonSchema = undefined;
+        if (this.resourceName) {
+            const jsonSchemaResponse = await this.connect.getJSONSchema(this.resourceName);
+            this.jsonSchema = jsonSchemaResponse?.INBOUND?.properties?.DETAILS;
+        }
     }
     removeDataProperties() {
         if (!this.jsonSchema || !this.data) {
@@ -97,37 +94,35 @@ let Form = class Form extends FoundationElement {
         });
         // force update of the data object to trigger error validation
         if (removedPropertiesCount > 0) {
-            this.data = Object.assign({}, this.data);
+            this.data = { ...this.data };
         }
         return removedPropertiesCount > 0;
     }
     /**
      * @internal
      */
-    _submit() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.submitting) {
-                return;
-            }
-            if (this.removeDataProperties()) {
-                yield DOM.nextUpdate();
+    async _submit() {
+        if (this.submitting) {
+            return;
+        }
+        if (this.removeDataProperties()) {
+            await DOM.nextUpdate();
+        }
+        this.submitted = true;
+        const payload = { ...this.data };
+        logger.debug({ payload, errors: this.errors });
+        this.$emit('submit', { payload, errors: this.errors });
+        if (Object.entries(payload).length !== 0 && this.resourceName) {
+            this.submitting = true;
+            const formSubmitReq = await this.connect.commitEvent(this.resourceName, { DETAILS: payload });
+            this.submitting = false;
+            if (formSubmitReq.ERROR) {
+                this.$emit('submit-failure', { payload, errors: formSubmitReq.ERROR });
             }
-            this.submitted = true;
-            const payload = Object.assign({}, this.data);
-            logger.debug({ payload, errors: this.errors });
-            this.$emit('submit', { payload, errors: this.errors });
-            if (Object.entries(payload).length !== 0 && this.resourceName) {
-                this.submitting = true;
-                const formSubmitReq = yield this.connect.commitEvent(this.resourceName, { DETAILS: payload });
-                this.submitting = false;
-                if (formSubmitReq.ERROR) {
-                    this.$emit('submit-failure', { payload, errors: formSubmitReq.ERROR });
-                }
-                else {
-                    this.$emit('submit-success', { payload });
-                }
+            else {
+                this.$emit('submit-success', { payload });
             }
-        });
+        }
     }
     /**
      * @internal

package/dist/esm/jsonforms/json-forms.js

@@ -15,14 +15,16 @@ const template = html `
   </template>
 `;
 const errorTranslator = (error, t, uischema) => {
-    var _a, _b, _c, _d;
-    return ((_d = (_c = (_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.i18n) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c[error.keyword]) !== null && _d !== void 0 ? _d : genesisErrorTranslator(error, t, uischema));
+    return (uischema?.options?.i18n?.error?.[error.keyword] ?? genesisErrorTranslator(error, t, uischema));
 };
 let JSONForms = class JSONForms extends FASTElement {
     constructor() {
         super(...arguments);
         this.dispatch = (action) => {
-            this.jsonforms = Object.assign(Object.assign({}, this.jsonforms), { core: coreReducer(this.jsonforms.core, action) });
+            this.jsonforms = {
+                ...this.jsonforms,
+                core: coreReducer(this.jsonforms.core, action),
+            };
             this.$emit('data-change', {
                 data: this.jsonforms.core.data,
                 errors: this.jsonforms.core.errors,
@@ -34,19 +36,17 @@ let JSONForms = class JSONForms extends FASTElement {
          * @returns ErrorObject[] that will be passed to JsonFormsCore as additionalErrors
          */
         this.validate = (uischema) => {
-            var _a, _b, _c;
-            const data = (_b = (_a = this.jsonforms) === null || _a === void 0 ? void 0 : _a.core) === null || _b === void 0 ? void 0 : _b.data;
+            const data = this.jsonforms?.core?.data;
             if (!data)
                 return [];
             const errors = [];
-            (_c = uischema === null || uischema === void 0 ? void 0 : uischema.elements) === null || _c === void 0 ? void 0 : _c.forEach((e) => {
-                var _a, _b, _c, _d;
-                const validator = (_a = e === null || e === void 0 ? void 0 : e.options) === null || _a === void 0 ? void 0 : _a.validateFn;
+            uischema?.elements?.forEach((e) => {
+                const validator = e?.options?.validateFn;
                 if (typeof validator !== 'function')
                     return;
-                const path = (_c = (_b = e === null || e === void 0 ? void 0 : e.scope) === null || _b === void 0 ? void 0 : _b.split('/')) === null || _c === void 0 ? void 0 : _c.pop();
-                const label = e === null || e === void 0 ? void 0 : e.label;
-                let newErrors = (_d = validator(data, path, label)) !== null && _d !== void 0 ? _d : [];
+                const path = e?.scope?.split('/')?.pop();
+                const label = e?.label;
+                let newErrors = validator(data, path, label) ?? [];
                 // the validator function is supposed to return an array of errors but let's not explode if it returns a single one
                 if (!Array.isArray(newErrors)) {
                     newErrors = [newErrors];
@@ -57,11 +57,10 @@ let JSONForms = class JSONForms extends FASTElement {
         };
     }
     schemaChanged() {
-        var _a, _b, _c, _d;
         if (!this.schema) {
             return;
         }
-        const uischemaToUse = (_a = this.uischema) !== null && _a !== void 0 ? _a : Generate.uiSchema(this.schema);
+        const uischemaToUse = this.uischema ?? Generate.uiSchema(this.schema);
         if (!this.uischema) {
             console.log('UI schema not provided. Auto generated schema:', uischemaToUse);
         }
@@ -82,7 +81,7 @@ let JSONForms = class JSONForms extends FASTElement {
         this.jsonforms = {
             core: initCore(),
             config: configReducer(undefined, Actions.setConfig(this.config)),
-            i18n: i18nReducer(this.i18n, Actions.updateI18n((_b = this.i18n) === null || _b === void 0 ? void 0 : _b.locale, (_c = this.i18n) === null || _c === void 0 ? void 0 : _c.translate, ((_d = this.i18n) === null || _d === void 0 ? void 0 : _d.translateError) || errorTranslator)),
+            i18n: i18nReducer(this.i18n, Actions.updateI18n(this.i18n?.locale, this.i18n?.translate, this.i18n?.translateError || errorTranslator)),
             renderers: this.renderers,
             readonly: this.readonly,
         };
@@ -113,11 +112,10 @@ let JSONForms = class JSONForms extends FASTElement {
         this.schemaChanged();
     }
     get props() {
-        var _a;
         if (!this.schema && !this.uischema) {
             return undefined;
         }
-        const uischema = (_a = this.uischema) !== null && _a !== void 0 ? _a : Generate.uiSchema(this.schema);
+        const uischema = this.uischema ?? Generate.uiSchema(this.schema);
         return {
             uischema,
             schema: this.schema,

package/dist/esm/jsonforms/renderers/ArrayListWrapperRenderer.js

@@ -62,14 +62,14 @@ let ArrayListWrapper = class ArrayListWrapper extends FASTElement {
         }
         this.schema = this.control.schema.properties[this.pathName].items;
         const arrayUiSchema = Generate.uiSchema(this.schema);
-        this.uiSchema = Object.assign(Object.assign({}, arrayUiSchema), { type: 'HorizontalLayout' });
+        this.uiSchema = { ...arrayUiSchema, type: 'HorizontalLayout' };
         console.log('Auto generated uiSchema for layout array:', this.uiSchema);
     }
     addItem() {
         const items = this.control.data[this.pathName] && Object.keys(this.control.data[this.pathName]).length !== 0
             ? [...this.control.data[this.pathName], {}]
             : [{}];
-        const data = Object.assign(Object.assign({}, this.control.data), { [this.pathName]: items });
+        const data = { ...this.control.data, [this.pathName]: items };
         this.$emit('data-change', {
             data,
         });
@@ -78,7 +78,7 @@ let ArrayListWrapper = class ArrayListWrapper extends FASTElement {
         const allItems = this.control.data[this.pathName];
         const valueToRemove = [allItems[index]];
         const items = allItems.filter((element) => !valueToRemove.includes(element));
-        const data = Object.assign(Object.assign({}, this.control.data), { [this.pathName]: items });
+        const data = { ...this.control.data, [this.pathName]: items };
         this.$emit('data-change', {
             data,
         });

package/dist/esm/jsonforms/renderers/CategorizationWrapperRenderer.js

@@ -4,7 +4,7 @@ export const CategorizationWrapperRendererTemplate = (prefix = 'zero') => html `
   <template>
     <${prefix}-tabs class="tabs-container">
       ${repeat((x) => x.control.uischema.elements, html `
-          <${prefix}-tab class="tab-control">${(x, ctx) => { var _a; return (_a = x.label) !== null && _a !== void 0 ? _a : `Category ${ctx.index + 1}`; }}</${prefix}-tab>
+          <${prefix}-tab class="tab-control">${(x, ctx) => x.label ?? `Category ${ctx.index + 1}`}</${prefix}-tab>
         `, { positioning: true })}
       ${repeat((x) => x.control.uischema.elements, html `
           <${prefix}-tab-panel class="tab-panel-control">

package/dist/esm/jsonforms/renderers/ConnectedMultiselectControlRenderer.js

@@ -22,10 +22,10 @@ export const ConnectedMultiselectControlRendererTemplate = (prefix = 'zero') =>
         data-test-id=${(x) => x.control.path}
       >
         <multiselect-datasource
-          resourceName=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.allOptionsResourceName; }}
-          value-field=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.valueField; }}
-          label-field=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.labelField; }}
-          :datasourceConfig=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.datasourceConfig; }}
+          resourceName=${(x) => x.control.uischema.options?.allOptionsResourceName}
+          value-field=${(x) => x.control.uischema.options?.valueField}
+          label-field=${(x) => x.control.uischema.options?.labelField}
+          :datasourceConfig=${(x) => x.control.uischema.options?.datasourceConfig}
         ></multiselect-datasource>
       </${prefix}-multiselect>
     </control-wrapper>

package/dist/esm/jsonforms/renderers/ConnectedSelectControlRenderer.js

@@ -16,8 +16,7 @@ export const ConnectedSelectControlRendererTemplate = (prefix = 'zero') => html
         placeholder=${(x) => x.control.uischema.placeholder || x.control.label}
         ?disabled=${(x) => !x.control.enabled}
         @value-change=${(x, c) => {
-    var _a;
-    const value = (_a = c.event.detail) === null || _a === void 0 ? void 0 : _a.value;
+    const value = c.event.detail?.value;
     x.control.handleChange(x.control.path, value);
     x.onBlur();
 }}
@@ -25,11 +24,11 @@ export const ConnectedSelectControlRendererTemplate = (prefix = 'zero') => html
         data-test-id=${(x) => x.control.path}
       >
         <options-datasource
-          resourceName=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.allOptionsResourceName; }}
-          value-field=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.valueField; }}
-          label-field=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.labelField; }}
-          :datasourceConfig=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.datasourceConfig; }}
-          :data=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.data; }}
+          resourceName=${(x) => x.control.uischema.options?.allOptionsResourceName}
+          value-field=${(x) => x.control.uischema.options?.valueField}
+          label-field=${(x) => x.control.uischema.options?.labelField}
+          :datasourceConfig=${(x) => x.control.uischema.options?.datasourceConfig}
+          :data=${(x) => x.control.uischema.options?.data}
           :initialSelectedValue=${(x) => x.control.data}
         ></options-datasource>
       </${prefix}-combobox>

package/dist/esm/jsonforms/renderers/ControlWrapperRenderer.js

@@ -3,7 +3,7 @@ import { computeLabel, isDescriptionHidden } from '@jsonforms/core';
 import { html, css, when, observable, customElement, FASTElement, volatile, } from '@microsoft/fast-element';
 export const ControlWrapperRendererTemplate = html `
   <template>
-    ${when((x) => { var _a; return (_a = x.control) === null || _a === void 0 ? void 0 : _a.visible; }, html `
+    ${when((x) => x.control?.visible, html `
         <div
           class="wrapperRoot"
           id=${(x) => x.control.path + '-wrapper'}

package/dist/esm/jsonforms/renderers/EnumControlRenderer.js

@@ -11,7 +11,10 @@ export const mapStateToEnumControlProps = (state, ownProps) => {
         (props.schema.const && [
             enumToEnumOptionMapper(props.schema.const, getTranslator()(state), getI18nKeyPrefix(props.schema, props.uischema, props.path)),
         ]);
-    return Object.assign(Object.assign({}, props), { options });
+    return {
+        ...props,
+        options,
+    };
 };
 export const EnumControlRendererTemplate = (prefix = 'zero') => html `
   <template>
@@ -23,10 +26,10 @@ export const EnumControlRendererTemplate = (prefix = 'zero') => html `
       <${prefix}-combobox
         style="width: 100%"
         ?disabled=${(x) => !x.control.enabled}
-        :value=${(x) => { var _a; return ((_a = x.control.options.find((option) => option.value === x.control.data)) === null || _a === void 0 ? void 0 : _a.label) || ''; }}
+        :value=${(x) => x.control.options.find((option) => option.value === x.control.data)?.label || ''}
         @change=${(x, c) => {
-    var _a;
-    x.control.handleChange(x.control.path, (_a = x.control.options.find((option) => option.label === c.event.target.value)) === null || _a === void 0 ? void 0 : _a.value);
+    x.control.handleChange(x.control.path, x.control.options.find((option) => option.label === c.event.target.value)
+        ?.value);
     x.onBlur();
 }}
         id=${(x) => x.control.path}

package/dist/esm/jsonforms/renderers/FilterDateControlRenderer.js

@@ -6,25 +6,21 @@ export const DateControlRendererTemplate = (prefix = 'zero') => html `
   <template>
     <control-wrapper :control=${(x) => x.control} ?submitted=${(x) => x.submitted}>
       <${prefix}-text-field
-        :value=${(x) => {
-    var _a, _b;
-    return ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min) === undefined || ((_b = x.control.data) === null || _b === void 0 ? void 0 : _b.min) === null
-        ? ''
-        : new Intl.DateTimeFormat('fr-CA', {
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-        }).format(x.control.data.min);
-}}
+        :value=${(x) => x.control.data?.min === undefined || x.control.data?.min === null
+    ? ''
+    : new Intl.DateTimeFormat('fr-CA', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+    }).format(x.control.data.min)}
         id=${(x) => `min-${x.control.path}`}
         type="date"
         data-test-id=${(x) => `min-${x.control.path}`}
         @blur=${(x, c) => {
-    var _a, _b;
     const value = c.event.target.control.valueAsNumber;
     x.control.handleChange(x.control.path, {
         min: value ? value : undefined,
-        max: ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max) < value ? undefined : (_b = x.control.data) === null || _b === void 0 ? void 0 : _b.max,
+        max: x.control.data?.max < value ? undefined : x.control.data?.max,
         type: 'date',
     });
     x.onBlur();
@@ -32,24 +28,20 @@ export const DateControlRendererTemplate = (prefix = 'zero') => html `
         style="width: 100%"
       ></${prefix}-text-field>
       <${prefix}-text-field
-        :value=${(x) => {
-    var _a, _b;
-    return ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max) === undefined || ((_b = x.control.data) === null || _b === void 0 ? void 0 : _b.max) === null
-        ? ''
-        : new Intl.DateTimeFormat('fr-CA', {
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-        }).format(x.control.data.max);
-}}
+        :value=${(x) => x.control.data?.max === undefined || x.control.data?.max === null
+    ? ''
+    : new Intl.DateTimeFormat('fr-CA', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+    }).format(x.control.data.max)}
         id=${(x) => `max-${x.control.path}`}
         type="date"
         data-test-id=${(x) => `max-${x.control.path}`}
         @blur=${(x, c) => {
-    var _a, _b;
     const value = c.event.target.control.valueAsNumber;
     x.control.handleChange(x.control.path, {
-        min: ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min) > value ? undefined : (_b = x.control.data) === null || _b === void 0 ? void 0 : _b.min,
+        min: x.control.data?.min > value ? undefined : x.control.data?.min,
         max: value ? value : undefined,
         type: 'date',
     });

package/dist/esm/jsonforms/renderers/FilterNumberControlRenderer.js

@@ -6,17 +6,16 @@ export const FilterNumberControlRendererTemplate = (prefix = 'zero') => html `
   <template>
     <control-wrapper :control=${(x) => x.control} ?submitted=${(x) => x.submitted}>
       <${prefix}-text-field
-        :value=${(x) => { var _a; return (((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min) === undefined ? '' : x.control.data.min); }}
+        :value=${(x) => (x.control.data?.min === undefined ? '' : x.control.data.min)}
         @change=${(x, c) => {
-    var _a, _b;
     const value = parseFloat(c.event.target.value);
     return x.control.handleChange(x.control.path, !isNaN(value)
         ? {
             min: value,
-            max: ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max) < value ? undefined : (_b = x.control.data) === null || _b === void 0 ? void 0 : _b.max,
+            max: x.control.data?.max < value ? undefined : x.control.data?.max,
             type: 'number',
         }
-        : Object.assign(Object.assign({}, x.control.data), { min: undefined }));
+        : { ...x.control.data, min: undefined });
 }}
         placeholder="Min"
         id=${(x) => `min-${x.control.path}`}
@@ -32,17 +31,16 @@ export const FilterNumberControlRendererTemplate = (prefix = 'zero') => html `
         -
       </span>
       <${prefix}-text-field
-        :value=${(x) => { var _a; return (((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max) === undefined ? '' : x.control.data.max); }}
+        :value=${(x) => (x.control.data?.max === undefined ? '' : x.control.data.max)}
         @change=${(x, c) => {
-    var _a, _b;
     const value = parseFloat(c.event.target.value);
     return x.control.handleChange(x.control.path, !isNaN(value)
         ? {
-            min: ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min) > value ? undefined : (_b = x.control.data) === null || _b === void 0 ? void 0 : _b.min,
+            min: x.control.data?.min > value ? undefined : x.control.data?.min,
             max: value,
             type: 'number',
         }
-        : Object.assign(Object.assign({}, x.control.data), { max: undefined }));
+        : { ...x.control.data, max: undefined });
 }}
         placeholder="Max"
         id=${(x) => `max-${x.control.path}`}

package/dist/esm/jsonforms/renderers/NumberControlRenderer.js

@@ -10,8 +10,8 @@ export const NumberControlRendererTemplate = (prefix = 'zero') => html `
       ?submitted=${(x) => x.submitted}
     >
       <${prefix}-number-field
-      withFormatting=${(x) => { var _a; return (((_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.withoutFormatting) ? false : true); }}
-        :options=${(x) => { var _a; return (_a = x.control.uischema.options) === null || _a === void 0 ? void 0 : _a.formatOptions; }}
+      withFormatting=${(x) => (x.control.uischema.options?.withoutFormatting ? false : true)}
+        :options=${(x) => x.control.uischema.options?.formatOptions}
         :value=${(x) => (x.control.data === undefined ? '' : String(x.control.data))}
         @change=${(x, c) => {
     const value = parseFloat(c.event.target.value);

package/dist/esm/jsonforms/renderers/StringControlRenderer.js

@@ -8,7 +8,7 @@ export const getStringControlRendererTemplate = (prefix = 'zero') => html `
       ?submitted=${(x) => x.submitted}
     >
       <${prefix}-text-field
-        type=${(x) => { var _a, _b; return (((_b = (_a = x.control.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.isPassword) ? 'password' : 'text'); }}
+        type=${(x) => (x.control.uischema?.options?.isPassword ? 'password' : 'text')}
         :value=${(x) => x.control.data || ''}
         @change=${(x, c) => {
     const inputValue = c.event.target.value;

package/dist/esm/jsonforms/renderers/dispatch-renderer.js

@@ -1,4 +1,4 @@
-import { __decorate, __rest } from "tslib";
+import { __decorate } from "tslib";
 import { mapDispatchToControlProps, mapStateToJsonFormsRendererProps } from '@jsonforms/core';
 import { FASTElement, html, css, observable, attr, customElement } from '@microsoft/fast-element';
 import maxBy from 'lodash/maxBy';
@@ -7,9 +7,14 @@ const template = html `
 `;
 const styles = css ``;
 const useControl = (props, jsonforms, dispatch, stateMapper) => {
-    const control = Object.assign({}, stateMapper({ jsonforms }, props));
-    const dispatchMethods = mapDispatchToControlProps === null || mapDispatchToControlProps === void 0 ? void 0 : mapDispatchToControlProps(dispatch);
-    return Object.assign(Object.assign({}, control), dispatchMethods);
+    const control = {
+        ...stateMapper({ jsonforms }, props),
+    };
+    const dispatchMethods = mapDispatchToControlProps?.(dispatch);
+    return {
+        ...control,
+        ...dispatchMethods,
+    };
 };
 let DispatchRenderer = class DispatchRenderer extends FASTElement {
     constructor() {
@@ -19,7 +24,7 @@ let DispatchRenderer = class DispatchRenderer extends FASTElement {
                 return;
             }
             const rawProps = mapStateToJsonFormsRendererProps({ jsonforms: this.jsonforms }, this.props);
-            const { rootSchema } = rawProps, renderer = __rest(rawProps, ["rootSchema"]);
+            const { rootSchema, ...renderer } = rawProps;
             this.renderer = renderer;
             this.control = useControl(this.props, this.jsonforms, this.dispatch, 
             // @ts-ignore

package/dist/esm/jsonforms/testers/isInvisible.js

@@ -1,4 +1,3 @@
 export const isInvisible = (uischema, schema, context) => {
-    var _a, _b;
-    return (_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.hidden) !== null && _b !== void 0 ? _b : false;
+    return uischema?.options?.hidden ?? false;
 };

package/dist/esm/utils/filters.js

@@ -61,14 +61,14 @@ const dateNumberExpressions = (key, value, type) => {
     const startExpression = value.min
         ? new ExpressionBuilder()
             .withField(key)
-            .withValue(startDay !== null && startDay !== void 0 ? startDay : value.min)
+            .withValue(startDay ?? value.min)
             .withSerialiser(startDay ? Serialisers.dateIsGreaterEqual : Serialisers.GE)
             .build()
         : undefined;
     const endExpression = value.max
         ? new ExpressionBuilder()
             .withField(key)
-            .withValue(endDay !== null && endDay !== void 0 ? endDay : value.max)
+            .withValue(endDay ?? value.max)
             .withSerialiser(endDay ? Serialisers.dateIsLessEqual : Serialisers.LE)
             .build()
         : undefined;

package/dist/esm/utils/translation.js

@@ -10,9 +10,8 @@ const MAP = {
 };
 /** @public */
 export const genesisErrorTranslator = (error, t, uischema) => {
-    var _a;
-    if ((error === null || error === void 0 ? void 0 : error.keyword) === 'pattern') {
-        return (_a = MAP[error.params.pattern]) !== null && _a !== void 0 ? _a : 'Invalid pattern.';
+    if (error?.keyword === 'pattern') {
+        return MAP[error.params.pattern] ?? 'Invalid pattern.';
     }
     return defaultErrorTranslator(error, t, uischema);
 };

package/dist/esm/utils/validation.js

@@ -6,11 +6,11 @@
  */
 export const mustMatch = (target) => {
     return (data, path, label) => {
-        if (!(path === null || path === void 0 ? void 0 : path.length) || !(target === null || target === void 0 ? void 0 : target.length) || !data)
+        if (!path?.length || !target?.length || !data)
             return [];
-        const value1 = data === null || data === void 0 ? void 0 : data[target];
-        const value2 = data === null || data === void 0 ? void 0 : data[path];
-        if (!(value1 === null || value1 === void 0 ? void 0 : value1.length) || !(value2 === null || value2 === void 0 ? void 0 : value2.length) || value1 === value2)
+        const value1 = data?.[target];
+        const value2 = data?.[path];
+        if (!value1?.length || !value2?.length || value1 === value2)
             return [];
         return [
             {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-forms",
   "description": "Genesis Foundation Forms",
-  "version": "14.70.3",
+  "version": "14.70.4-es2021.1",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -40,18 +40,18 @@
     "test:debug": "genx test --debug"
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.70.3",
-    "@genesislcap/genx": "14.70.3",
+    "@genesislcap/foundation-testing": "14.70.4-es2021.1",
+    "@genesislcap/genx": "14.70.4-es2021.1",
     "@types/json-schema": "^7.0.11",
     "@types/ua-parser-js": "^0.7.36",
     "analytics": "^0.8.0",
     "rimraf": "^3.0.2"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.70.3",
-    "@genesislcap/foundation-criteria": "14.70.3",
-    "@genesislcap/foundation-ui": "14.70.3",
-    "@genesislcap/foundation-utils": "14.70.3",
+    "@genesislcap/foundation-comms": "14.70.4-es2021.1",
+    "@genesislcap/foundation-criteria": "14.70.4-es2021.1",
+    "@genesislcap/foundation-ui": "14.70.4-es2021.1",
+    "@genesislcap/foundation-utils": "14.70.4-es2021.1",
     "@jsonforms/core": "^3.0.0",
     "@microsoft/fast-components": "^2.21.3",
     "@microsoft/fast-element": "^1.7.0",
@@ -72,5 +72,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "2bd15e0c3928fa0fbfa60ccb7e4f89e956afda73"
+  "gitHead": "5d0d8ee36cfd068cfc6211033b326d0a978cfc05"
 }