@genesislcap/foundation-forms 14.152.3-alpha-2e97897.0 → 14.154.0

package/dist/custom-elements.json

@@ -1080,10 +1080,6 @@
               "kind": "field",
               "name": "control"
             },
-            {
-              "kind": "field",
-              "name": "pathName"
-            },
             {
               "kind": "field",
               "name": "schema"
@@ -1669,7 +1665,7 @@
         {
           "kind": "variable",
           "name": "LayoutArrayRendererTemplate",
-          "default": "html`\n  <template>\n    <array-list-wrapper :form=${(x) => x} :control=${(x) => x.control}></array-list-wrapper>\n  </template>\n`"
+          "default": "html`\n  <template>\n    <control-wrapper\n      :control=${(x) => x.control}\n      :touched=${(x) => x.touched}\n      ?submitted=${(x) => x.submitted}\n    >\n      <array-list-wrapper :form=${(x) => x} :control=${(x) => x.control}></array-list-wrapper>\n    </control-wrapper>\n  </template>\n`"
         },
         {
           "kind": "variable",
@@ -1677,7 +1673,7 @@
           "type": {
             "text": "any"
           },
-          "default": "{\n  renderer: LayoutArrayRendererTemplate,\n  tester: rankWith(LAYOUT_ARRAY_RANK, isLayoutArray),\n  mapper: mapStateToLayoutProps,\n}"
+          "default": "{\n  renderer: LayoutArrayRendererTemplate,\n  tester: rankWith(LAYOUT_ARRAY_RANK, isLayoutArray),\n  mapper: mapStateToArrayLayoutProps,\n  dispatchMapper: mapDispatchToArrayControlProps,\n}"
         }
       ],
       "exports": [

package/dist/dts/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/form.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAmB1C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAexC,cAAc;AACd,eAAO,MAAM,SAAS,OAiBrB,CAAC;AACF;;;;;GAKG;AAEH,qBAKa,IAAK,SAAQ,iBAAiB;IACzC;;;OAGG;IAC0C,MAAM,EAAE,MAAM,CAAU;IACrE;;;;OAIG;IACG,YAAY,EAAE,MAAM,CAAC;YACb,mBAAmB;IAQjC,OAAO,CAAC,oBAAoB;IA0B5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACS,QAAQ,EAAE,eAAe,CAAC;IACtC;;;OAGG;IACS,SAAS,EAAE,aAAa,EAAE,CAAa;IACnD;;;;;;OAMG;IACS,UAAU,EAAE,WAAW,CAAC;IAEpC,OAAO,CAAC,MAAM,CAAqB;IAC1B,OAAO,CAAC,OAAO,CAAW;IACnC;;;OAGG;IACS,IAAI,EAAE,GAAG,CAAM;IAE3B;;OAEG;IACS,UAAU,EAAE,OAAO,CAAC;IAChC;;OAEG;IACS,SAAS,EAAE,OAAO,CAAC;IAEJ,QAAQ,EAAE,OAAO,CAAC;IACe,UAAU,EAAE,OAAO,CAAC;IAEhF;;OAEG;IACG,OAAO;IA2Bb,IAAc,cAAc,YAM3B;IAED;;OAEG;IACH,UAAU,CAAC,KAAK,EAAE,WAAW;IAI7B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW;IAQ3B,oBAAoB;IAKpB;;;OAGG;IACH,KAAK,CAAC,SAAS,UAAO;CAMvB"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/form.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAmB1C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAexC,cAAc;AACd,eAAO,MAAM,SAAS,OAiBrB,CAAC;AACF;;;;;GAKG;AAEH,qBAKa,IAAK,SAAQ,iBAAiB;IACzC;;;OAGG;IAC0C,MAAM,EAAE,MAAM,CAAU;IACrE;;;;OAIG;IACG,YAAY,EAAE,MAAM,CAAC;YACb,mBAAmB;IAcjC,OAAO,CAAC,oBAAoB;IA0B5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACS,QAAQ,EAAE,eAAe,CAAC;IACtC;;;OAGG;IACS,SAAS,EAAE,aAAa,EAAE,CAAa;IACnD;;;;;;OAMG;IACS,UAAU,EAAE,WAAW,CAAC;IAEpC,OAAO,CAAC,MAAM,CAAqB;IAC1B,OAAO,CAAC,OAAO,CAAW;IACnC;;;OAGG;IACS,IAAI,EAAE,GAAG,CAAM;IAE3B;;OAEG;IACS,UAAU,EAAE,OAAO,CAAC;IAChC;;OAEG;IACS,SAAS,EAAE,OAAO,CAAC;IAEJ,QAAQ,EAAE,OAAO,CAAC;IACe,UAAU,EAAE,OAAO,CAAC;IAEhF;;OAEG;IACG,OAAO;IA2Bb,IAAc,cAAc,YAM3B;IAED;;OAEG;IACH,UAAU,CAAC,KAAK,EAAE,WAAW;IAI7B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW;IAQ3B,oBAAoB;IAKpB;;;OAGG;IACH,KAAK,CAAC,SAAS,UAAO;CAMvB"}

package/dist/dts/jsonforms/renderers/ArrayListWrapperRenderer.d.ts

@@ -3,7 +3,6 @@ export declare const ArrayListWrapperRendererTemplate: (prefix?: string) => impo
 export declare class ArrayListWrapper extends FASTElement {
     form: any;
     control: any;
-    pathName: any;
     schema: any;
     uiSchema: any;
     controlChanged(): void;

package/dist/dts/jsonforms/renderers/ArrayListWrapperRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArrayListWrapperRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/ArrayListWrapperRenderer.ts"],"names":[],"mappings":"AACA,OAAO,EAAwC,WAAW,EAAU,MAAM,yBAAyB,CAAC;AAGpG,eAAO,MAAM,gCAAgC,YAAY,MAAM,6DAyC9D,CAAC;AAiBF,qBAOa,gBAAiB,SAAQ,WAAW;IACnC,IAAI,MAAC;IACL,OAAO,MAAC;IACR,QAAQ,MAAC;IACT,MAAM,MAAC;IACP,QAAQ,MAAC;IAErB,cAAc;IAed,OAAO;IAaP,UAAU,CAAC,KAAK,EAAE,MAAM;CAWzB"}
+{"version":3,"file":"ArrayListWrapperRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/ArrayListWrapperRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwC,WAAW,EAAU,MAAM,yBAAyB,CAAC;AAGpG,eAAO,MAAM,gCAAgC,YAAY,MAAM,6DAyC9D,CAAC;AAqBF,qBAOa,gBAAiB,SAAQ,WAAW;IACnC,IAAI,MAAC;IACL,OAAO,MAAC;IACR,MAAM,MAAC;IACP,QAAQ,MAAC;IAErB,cAAc;IAad,OAAO;IAOP,UAAU,CAAC,KAAK,EAAE,MAAM;CAGzB"}

package/dist/dts/jsonforms/renderers/LayoutArrayRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LayoutArrayRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/LayoutArrayRenderer.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,2BAA2B,0DAIvC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,GAItC,CAAC"}
+{"version":3,"file":"LayoutArrayRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/LayoutArrayRenderer.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,2BAA2B,0DAUvC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,GAKtC,CAAC"}

package/dist/dts/jsonforms/renderers/dispatch-renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch-renderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/dispatch-renderer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA8C,MAAM,yBAAyB,CAAC;AAsBlG,qBAKa,gBAAiB,SAAQ,WAAW;IACnC,SAAS,MAAC;IACtB,gBAAgB;IAIJ,KAAK,MAAC;IAClB,YAAY;IAGA,OAAO,MAAC;IACO,SAAS,EAAE,OAAO,CAAC;IAC9C,gBAAgB;IAGJ,QAAQ,MAAC;IACT,OAAO,MAAC;IACR,QAAQ,MAAC;IACT,MAAM,MAAC;IACnB,aAAa;IAIb,cAAc,aAiBZ;IAEF,MAAM;IAIN,IAAI,kBAAkB,YAgBrB;IAED,oBAAoB;CAMrB"}
+{"version":3,"file":"dispatch-renderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/dispatch-renderer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA8C,MAAM,yBAAyB,CAAC;AAsBlG,qBAKa,gBAAiB,SAAQ,WAAW;IACnC,SAAS,MAAC;IACtB,gBAAgB;IAIJ,KAAK,MAAC;IAClB,YAAY;IAGA,OAAO,MAAC;IACO,SAAS,EAAE,OAAO,CAAC;IAC9C,gBAAgB;IAGJ,QAAQ,MAAC;IACT,OAAO,MAAC;IACR,QAAQ,MAAC;IACT,MAAM,MAAC;IACnB,aAAa;IAIb,cAAc,aAmBZ;IAEF,MAAM;IAIN,IAAI,kBAAkB,YAgBrB;IAED,oBAAoB;CAMrB"}

package/dist/dts/jsonforms/testers/isLayoutArray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isLayoutArray.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/testers/isLayoutArray.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,kCAGzB,CAAC"}
+{"version":3,"file":"isLayoutArray.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/testers/isLayoutArray.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa,kCAIzB,CAAC"}

package/dist/esm/form.js

@@ -1,5 +1,6 @@
 import { __awaiter, __decorate } from "tslib";
 import { Connect } from '@genesislcap/foundation-comms';
+import JsonSchemaDereferencer from '@json-schema-tools/dereferencer';
 import { isControl, isStringControl, mapStateToControlProps, rankWith, } from '@jsonforms/core';
 import { attr, customElement, DOM, observable, volatile } from '@microsoft/fast-element';
 import { FoundationElement } from '@microsoft/fast-foundation';
@@ -77,12 +78,16 @@ let Form = class Form extends FoundationElement {
         this.data = {};
     }
     resourceNameChanged() {
-        var _a, _b;
+        var _a;
         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;
+                if (!jsonSchemaResponse) {
+                    return;
+                }
+                const refResolver = new JsonSchemaDereferencer(jsonSchemaResponse.INBOUND);
+                this.jsonSchema = (_a = (yield refResolver.resolve()).properties) === null || _a === void 0 ? void 0 : _a.DETAILS;
             }
         });
     }

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

@@ -1,10 +1,11 @@
 import { __decorate } from "tslib";
-import { Generate, composePaths } from '@jsonforms/core';
+import { Generate, composePaths, createDefaultValue } from '@jsonforms/core';
+import { designUnit } from '@microsoft/fast-components';
 import { html, css, observable, customElement, FASTElement, repeat } from '@microsoft/fast-element';
 import { logger } from '../../utils';
 export const ArrayListWrapperRendererTemplate = (prefix = 'zero') => html `
   <template>
-    ${repeat((x) => x.control.data[x.pathName], html `
+    ${repeat((x) => Array(x.control.data), html `
         <div class="array-list">
           <dispatch-renderer
             ?submitted=${(x, ctx) => ctx.parent.form.submitted}
@@ -15,14 +16,14 @@ export const ArrayListWrapperRendererTemplate = (prefix = 'zero') => html `
     uischema: ctx.parent.uiSchema,
     schema: ctx.parent.schema,
     renderers: ctx.parent.control.renderers,
-    path: composePaths(ctx.parent.pathName, `${ctx.index}`),
+    path: composePaths(ctx.parent.control.path, `${ctx.index}`),
     enabled: ctx.parent.control.enabled,
 })}
           ></dispatch-renderer>
           <${prefix}-button
             appearance="lightweight"
             class="item-control-btn"
-            data-test-id=${(x, ctx) => `${ctx.parent.pathName}-${ctx.index}-delete-item`}
+            data-test-id=${(x, ctx) => `${ctx.parent.control.path}-${ctx.index}-delete-item`}
             @click=${(x, ctx) => ctx.parent.deleteItem(ctx.index)}
           >
             <${prefix}-icon name="trash"></${prefix}-icon>
@@ -32,7 +33,7 @@ export const ArrayListWrapperRendererTemplate = (prefix = 'zero') => html `
     <${prefix}-button
       appearance="lightweight"
       class="item-control-btn"
-      data-test-id=${(x) => `${x.pathName}-add-item`}
+      data-test-id=${(x) => `${x.control.path}-add-item`}
       @click=${(x) => x.addItem()}
     >
       <${prefix}-icon name="plus"></${prefix}-icon>
@@ -41,6 +42,10 @@ export const ArrayListWrapperRendererTemplate = (prefix = 'zero') => html `
   </template>
 `;
 const styles = css `
+  :host {
+    padding-left: calc(${designUnit} * 1px);
+  }
+
   .array-list {
     display: flex;
     align-items: center;
@@ -56,33 +61,20 @@ const styles = css `
 `;
 let ArrayListWrapper = class ArrayListWrapper extends FASTElement {
     controlChanged() {
-        this.pathName = Object.keys(this.control.schema.properties)[0];
         if (this.control.uischema.options) {
             this.uiSchema = this.control.uischema.options.childUiSchema;
             return;
         }
-        this.schema = this.control.schema.properties[this.pathName].items;
+        this.schema = this.control.schema;
         const arrayUiSchema = Generate.uiSchema(this.schema);
         this.uiSchema = Object.assign(Object.assign({}, arrayUiSchema), { type: 'HorizontalLayout' });
         logger.debug('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 });
-        this.$emit('data-change', {
-            data,
-        });
+        this.control.addItem(this.control.path, createDefaultValue(this.control.schema, this.control.rootSchema))();
     }
     deleteItem(index) {
-        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 });
-        this.$emit('data-change', {
-            data,
-        });
+        this.control.removeItems(this.control.path, [index])();
     }
 };
 __decorate([
@@ -91,9 +83,6 @@ __decorate([
 __decorate([
     observable
 ], ArrayListWrapper.prototype, "control", void 0);
-__decorate([
-    observable
-], ArrayListWrapper.prototype, "pathName", void 0);
 __decorate([
     observable
 ], ArrayListWrapper.prototype, "schema", void 0);

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

@@ -28,12 +28,12 @@ export const ControlWrapperRendererTemplate = html `
 `;
 const styles = css `
   .wrapperRoot {
-    margin-bottom: 20px;
+    margin-bottom: calc(var(--design-unit) * 4px);
   }
 
   .label {
     color: rgb(135, 155, 166);
-    margin-bottom: 4px;
+    margin-bottom: calc(var(--design-unit) * 1px);
     display: flex;
     justify-content: space-between;
   }

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

@@ -1,14 +1,21 @@
-import { mapStateToLayoutProps, rankWith } from '@jsonforms/core';
+import { mapDispatchToArrayControlProps, mapStateToArrayLayoutProps, rankWith, } from '@jsonforms/core';
 import { html } from '@microsoft/fast-element';
 import { isLayoutArray } from '../testers/isLayoutArray';
 import { LAYOUT_ARRAY_RANK } from './RenderersRanks';
 export const LayoutArrayRendererTemplate = html `
   <template>
-    <array-list-wrapper :form=${(x) => x} :control=${(x) => x.control}></array-list-wrapper>
+    <control-wrapper
+      :control=${(x) => x.control}
+      :touched=${(x) => x.touched}
+      ?submitted=${(x) => x.submitted}
+    >
+      <array-list-wrapper :form=${(x) => x} :control=${(x) => x.control}></array-list-wrapper>
+    </control-wrapper>
   </template>
 `;
 export const LayoutArrayRendererEntry = {
     renderer: LayoutArrayRendererTemplate,
     tester: rankWith(LAYOUT_ARRAY_RANK, isLayoutArray),
-    mapper: mapStateToLayoutProps,
+    mapper: mapStateToArrayLayoutProps,
+    dispatchMapper: mapDispatchToArrayControlProps,
 };

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

@@ -7,9 +7,10 @@ const template = html `
   <template>${(x) => x.determinedRenderer.renderer}</template>
 `;
 const styles = css ``;
-const useControl = (props, jsonforms, dispatch, stateMapper) => {
+const useControl = (props, jsonforms, dispatch, stateMapper, dispatchMapper) => {
+    var _a;
     const control = Object.assign({}, stateMapper({ jsonforms }, props));
-    const dispatchMethods = mapDispatchToControlProps === null || mapDispatchToControlProps === void 0 ? void 0 : mapDispatchToControlProps(dispatch);
+    const dispatchMethods = (_a = (dispatchMapper || mapDispatchToControlProps)) === null || _a === void 0 ? void 0 : _a(dispatch);
     return Object.assign(Object.assign({}, control), dispatchMethods);
 };
 let DispatchRenderer = class DispatchRenderer extends FASTElement {
@@ -24,7 +25,9 @@ let DispatchRenderer = class DispatchRenderer extends FASTElement {
             this.renderer = renderer;
             this.control = useControl(this.props, this.jsonforms, this.dispatch, 
             // @ts-ignore
-            this.determinedRenderer.mapper);
+            this.determinedRenderer.mapper, 
+            // @ts-ignore
+            this.determinedRenderer.dispatchMapper);
         };
     }
     jsonformsChanged() {

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

@@ -1,2 +1,4 @@
 import { hasType, schemaMatches } from '@jsonforms/core';
-export const isLayoutArray = schemaMatches((schema) => hasType(schema, 'array') && schema.hasOwnProperty('items') && schema.items['type'] == 'object');
+const isArrayWithItems = (s) => hasType(s, 'array') && s.hasOwnProperty('items') && s.items['type'] == 'object';
+export const isLayoutArray = schemaMatches((schema) => (schema.hasOwnProperty('oneOf') && schema.oneOf.some(isArrayWithItems)) ||
+    isArrayWithItems(schema));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-forms",
   "description": "Genesis Foundation Forms",
-  "version": "14.152.3-alpha-2e97897.0",
+  "version": "14.154.0",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -40,23 +40,24 @@
     "test:debug": "genx test --debug"
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/genx": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/rollup-builder": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/ts-builder": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/uvu-playwright-builder": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/vite-builder": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/webpack-builder": "14.152.3-alpha-2e97897.0",
+    "@genesislcap/foundation-testing": "14.154.0",
+    "@genesislcap/genx": "14.154.0",
+    "@genesislcap/rollup-builder": "14.154.0",
+    "@genesislcap/ts-builder": "14.154.0",
+    "@genesislcap/uvu-playwright-builder": "14.154.0",
+    "@genesislcap/vite-builder": "14.154.0",
+    "@genesislcap/webpack-builder": "14.154.0",
     "@types/json-schema": "^7.0.11",
     "rimraf": "^3.0.2"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/foundation-criteria": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/foundation-logger": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/foundation-ui": "14.152.3-alpha-2e97897.0",
-    "@genesislcap/foundation-utils": "14.152.3-alpha-2e97897.0",
-    "@jsonforms/core": "^3.0.0",
+    "@genesislcap/foundation-comms": "14.154.0",
+    "@genesislcap/foundation-criteria": "14.154.0",
+    "@genesislcap/foundation-logger": "14.154.0",
+    "@genesislcap/foundation-ui": "14.154.0",
+    "@genesislcap/foundation-utils": "14.154.0",
+    "@json-schema-tools/dereferencer": "^1.6.1",
+    "@jsonforms/core": "^3.2.1",
     "@microsoft/fast-components": "^2.30.6",
     "@microsoft/fast-element": "^1.12.0",
     "@microsoft/fast-foundation": "^2.49.4",
@@ -75,5 +76,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "b71cf7c5bd97df7c4ca62f7782447063a7364834"
+  "gitHead": "e0626ec8ee97fd0d9a93f6d32bac4806de036f46"
 }