@genesislcap/foundation-forms 14.334.0 → 14.336.0

package/dist/custom-elements.json

@@ -1251,6 +1251,43 @@
             }
           },
           "privacy": "public"
+        },
+        {
+          "kind": "function",
+          "name": "getAnyOfErrorMessage",
+          "return": {
+            "type": {
+              "text": "string"
+            }
+          },
+          "parameters": [
+            {
+              "name": "errors",
+              "type": {
+                "text": "Array<any> | undefined"
+              }
+            },
+            {
+              "name": "schema",
+              "type": {
+                "text": "any"
+              }
+            },
+            {
+              "name": "controlPath",
+              "type": {
+                "text": "string | undefined"
+              }
+            },
+            {
+              "name": "uiCustomMsg",
+              "optional": true,
+              "type": {
+                "text": "string"
+              }
+            }
+          ],
+          "description": "Computes a human-friendly anyOf error message for a given control path.\nPrefers UI schema custom message, then JSON schema errorMessage.anyOf, then a constructed fallback."
         }
       ],
       "exports": [
@@ -1261,6 +1298,14 @@
             "name": "mustMatch",
             "module": "src/utils/validation.ts"
           }
+        },
+        {
+          "kind": "js",
+          "name": "getAnyOfErrorMessage",
+          "declaration": {
+            "name": "getAnyOfErrorMessage",
+            "module": "src/utils/validation.ts"
+          }
         }
       ]
     },
@@ -1580,7 +1625,7 @@
         {
           "kind": "variable",
           "name": "ControlWrapperRendererTemplate",
-          "default": "html`\n  <template>\n    ${when(\n      (x) => x.control?.visible,\n      html`\n        <div\n          class=${(x) =>\n            classNames(\n              ['wrapperRoot', true],\n              ['labelLeft', x.jsonForms?.core?.uischema?.options?.labelPlacement === 'left'],\n            )}\n          id=${(x) => x.control.path + '-wrapper'}\n          data-test-id=${(x) => x.control.path + '-wrapper'}\n        >\n          ${when(\n            (x) => !x.hideLabel,\n            html`\n              <div for=\"${(x) => x.control.path + '-wrapper'}\" class=\"label\">\n                <span>\n                  ${(x) => x.computedLabel}${when(\n                    (x) => x.control.uischema?.options?.tooltip,\n                    (x) => x.getPrefixedTooltip,\n                  )}\n                </span>\n              </div>\n            `,\n          )}\n\n          <div class=\"wrapper\">\n            <slot></slot>\n          </div>\n          <div class=\"${(x) => (x.control.errors && x.touched ? 'error' : 'description')}\">\n            ${(x) =>\n              x.control.errors && x.touched\n                ? x.control.errors\n                : x.showDescription\n                  ? x.control.description\n                  : ''}\n          </div>\n        </div>\n      `,\n    )}\n  </template>\n`"
+          "default": "html`\n  <template>\n    ${when(\n      (x) => x.control?.visible,\n      html`\n        <div\n          class=${(x) =>\n            classNames(\n              ['wrapperRoot', true],\n              ['labelLeft', x.jsonForms?.core?.uischema?.options?.labelPlacement === 'left'],\n            )}\n          id=${(x) => x.control.path + '-wrapper'}\n          data-test-id=${(x) => x.control.path + '-wrapper'}\n        >\n          ${when(\n            (x) => !x.hideLabel,\n            html`\n              <div for=\"${(x) => x.control.path + '-wrapper'}\" class=\"label\">\n                <span>\n                  ${(x) => x.computedLabel}${when(\n                    (x) => x.control.uischema?.options?.tooltip,\n                    (x) => x.getPrefixedTooltip,\n                  )}\n                </span>\n              </div>\n            `,\n          )}\n\n          <div class=\"wrapper\">\n            <slot></slot>\n          </div>\n          <div\n            class=\"${(x) =>\n              (x.control.errors || x.anyOfError) && x.touched ? 'error' : 'description'}\"\n          >\n            ${(x) =>\n              x.touched && (x.control.errors || x.anyOfError)\n                ? [x.control.errors, x.anyOfError].filter(Boolean).join(' ')\n                : x.showDescription\n                  ? x.control.description\n                  : ''}\n          </div>\n        </div>\n      `,\n    )}\n  </template>\n`"
         },
         {
           "kind": "class",
@@ -1631,6 +1676,11 @@
               "kind": "field",
               "name": "getPrefixedTooltip",
               "readonly": true
+            },
+            {
+              "kind": "field",
+              "name": "anyOfError",
+              "readonly": true
             }
           ],
           "attributes": [

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

@@ -9,5 +9,6 @@ export declare class ControlWrapper extends FASTElement {
     get showDescription(): boolean;
     get computedLabel(): string;
     get getPrefixedTooltip(): import("@microsoft/fast-element").ViewTemplate<any, any>;
+    get anyOfError(): string;
 }
 //# sourceMappingURL=ControlWrapperRenderer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ControlWrapperRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/ControlWrapperRenderer.ts"],"names":[],"mappings":"AACA,OAAO,EAML,WAAW,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,8BAA8B,0DA2C1C,CAAC;AAqDF,qBAKa,cAAe,SAAQ,WAAW;IACjC,OAAO,MAAC;IACR,SAAS,MAAC;IACV,OAAO,EAAE,OAAO,CAAC;IACuB,SAAS,EAAE,OAAO,CAAS;IACzE,MAAM,EAAE,MAAM,CAAC;IAErB,IACI,eAAe,YAOlB;IAED,IACI,aAAa,WAMhB;IAED,IACI,kBAAkB,6DAGrB;CACF"}
+{"version":3,"file":"ControlWrapperRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/ControlWrapperRenderer.ts"],"names":[],"mappings":"AACA,OAAO,EAML,WAAW,EAGZ,MAAM,yBAAyB,CAAC;AAIjC,eAAO,MAAM,8BAA8B,0DA8C1C,CAAC;AAqDF,qBAKa,cAAe,SAAQ,WAAW;IACjC,OAAO,MAAC;IACR,SAAS,MAAC;IACV,OAAO,EAAE,OAAO,CAAC;IACuB,SAAS,EAAE,OAAO,CAAS;IACzE,MAAM,EAAE,MAAM,CAAC;IAErB,IACI,eAAe,YAOlB;IAED,IACI,aAAa,WAMhB;IAED,IACI,kBAAkB,6DAGrB;IAED,IACI,UAAU,WAOb;CACF"}

package/dist/dts/utils/validation.d.ts

@@ -11,4 +11,9 @@ export declare const mustMatch: (target: string) => (data: any, path: any, label
     keyword: string;
     params: {};
 }[];
+/**
+ * Computes a human-friendly anyOf error message for a given control path.
+ * Prefers UI schema custom message, then JSON schema errorMessage.anyOf, then a constructed fallback.
+ */
+export declare const getAnyOfErrorMessage: (errors: Array<any> | undefined, schema: any, controlPath: string | undefined, uiCustomMsg?: string) => string;
 //# sourceMappingURL=validation.d.ts.map

package/dist/dts/utils/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,MAC9B,SAAI,EAAE,SAAI,EAAE,UAAK;;;;;;GAkB1B,CAAC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,MAC9B,SAAI,EAAE,SAAI,EAAE,UAAK;;;;;;GAkB1B,CAAC;AAmBF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,EAC9B,QAAQ,GAAG,EACX,aAAa,MAAM,GAAG,SAAS,EAC/B,cAAc,MAAM,KACnB,MAoEF,CAAC"}

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

@@ -2,6 +2,7 @@ import { __decorate } from "tslib";
 import { computeLabel, isDescriptionHidden } from '@jsonforms/core';
 import { html, css, when, observable, customElement, FASTElement, volatile, attr, } from '@microsoft/fast-element';
 import { classNames } from '@microsoft/fast-web-utilities';
+import { getAnyOfErrorMessage } from '../../utils/validation';
 export const ControlWrapperRendererTemplate = html `
   <template>
     ${when((x) => { var _a; return (_a = x.control) === null || _a === void 0 ? void 0 : _a.visible; }, html `
@@ -24,9 +25,11 @@ export const ControlWrapperRendererTemplate = html `
           <div class="wrapper">
             <slot></slot>
           </div>
-          <div class="${(x) => (x.control.errors && x.touched ? 'error' : 'description')}">
-            ${(x) => x.control.errors && x.touched
-    ? x.control.errors
+          <div
+            class="${(x) => (x.control.errors || x.anyOfError) && x.touched ? 'error' : 'description'}"
+          >
+            ${(x) => x.touched && (x.control.errors || x.anyOfError)
+    ? [x.control.errors, x.anyOfError].filter(Boolean).join(' ')
     : x.showDescription
         ? x.control.description
         : ''}
@@ -101,6 +104,10 @@ let ControlWrapper = class ControlWrapper extends FASTElement {
         return html `
     <${this.prefix}-icon tooltip="${(_b = (_a = this.control.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.tooltip}" tooltip-id="${this.control.path + '-tooltip'}"></${this.prefix}-icon>`;
     }
+    get anyOfError() {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        return getAnyOfErrorMessage((_b = (_a = this.jsonForms) === null || _a === void 0 ? void 0 : _a.core) === null || _b === void 0 ? void 0 : _b.errors, (_d = (_c = this.jsonForms) === null || _c === void 0 ? void 0 : _c.core) === null || _d === void 0 ? void 0 : _d.schema, (_e = this.control) === null || _e === void 0 ? void 0 : _e.path, (_h = (_g = (_f = this.control) === null || _f === void 0 ? void 0 : _f.uischema) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.anyOfErrorMessage);
+    }
 };
 __decorate([
     observable
@@ -126,6 +133,9 @@ __decorate([
 __decorate([
     volatile
 ], ControlWrapper.prototype, "getPrefixedTooltip", null);
+__decorate([
+    volatile
+], ControlWrapper.prototype, "anyOfError", null);
 ControlWrapper = __decorate([
     customElement({
         name: 'control-wrapper',

package/dist/esm/utils/validation.js

@@ -23,3 +23,88 @@ export const mustMatch = (target) => {
         ];
     };
 };
+const describeError = (prop, parentProps) => {
+    const pSchema = parentProps[prop] || {};
+    const constraints = ['required'];
+    if (typeof pSchema.minLength === 'number')
+        constraints.push('minLength');
+    if (typeof pSchema.maxLength === 'number')
+        constraints.push('maxLength');
+    if (typeof pSchema.minimum === 'number')
+        constraints.push('minimum');
+    if (typeof pSchema.maximum === 'number')
+        constraints.push('maximum');
+    if (typeof pSchema.exclusiveMinimum === 'number' || pSchema.exclusiveMinimum === true)
+        constraints.push('exclusiveMinimum');
+    if (typeof pSchema.exclusiveMaximum === 'number' || pSchema.exclusiveMaximum === true)
+        constraints.push('exclusiveMaximum');
+    if (typeof pSchema.pattern === 'string')
+        constraints.push('pattern');
+    if (pSchema.type)
+        constraints.push(`type:${pSchema.type}`);
+    const suffix = constraints.length > 1 ? ` (${constraints.join(', ')})` : '';
+    return `${prop}${suffix}`;
+};
+/**
+ * Computes a human-friendly anyOf error message for a given control path.
+ * Prefers UI schema custom message, then JSON schema errorMessage.anyOf, then a constructed fallback.
+ */
+export const getAnyOfErrorMessage = (errors, schema, controlPath, uiCustomMsg) => {
+    var _a, _b, _c;
+    if (!errors || !controlPath) {
+        return '';
+    }
+    // Find all anyOf errors
+    const anyOfErrors = errors.filter((e) => e && e.keyword === 'anyOf');
+    if (anyOfErrors.length === 0) {
+        return '';
+    }
+    const schemaCustomMsg = (_a = schema === null || schema === void 0 ? void 0 : schema.errorMessage) === null || _a === void 0 ? void 0 : _a.anyOf;
+    const preferredCustomMsg = uiCustomMsg || schemaCustomMsg;
+    // Convert control path to JSON pointer (e.g., "users.0.email" -> "/users/0/email")
+    const pointer = '/' + controlPath.replace(/\./g, '/');
+    const matchingAnyOfError = anyOfErrors.find((e) => {
+        const instancePath = e.instancePath || '';
+        const errorSchema = e.schema;
+        if (instancePath === pointer)
+            return true;
+        if (Array.isArray(errorSchema)) {
+            const errorPointers = errorSchema.flatMap((g) => instancePath + '/' + Object.keys(g).flatMap((key) => g[key]));
+            return errorPointers.includes(pointer);
+        }
+        else {
+            return false;
+        }
+    });
+    if (matchingAnyOfError) {
+        // Extract anyOf constraints from the error's schema or parentSchema
+        const anyOfSchema = matchingAnyOfError.schema || ((_b = matchingAnyOfError.parentSchema) === null || _b === void 0 ? void 0 : _b.anyOf);
+        if (Array.isArray(anyOfSchema)) {
+            const requiredCandidates = new Set();
+            anyOfSchema.forEach((branch) => {
+                const req = branch && Array.isArray(branch.required) ? branch.required : [];
+                req.forEach((r) => requiredCandidates.add(r));
+            });
+            const currentProp = controlPath.split('.').pop();
+            if (!currentProp || !requiredCandidates.has(currentProp)) {
+                return '';
+            }
+            // Get properties schema for constraint enrichment
+            const parentProps = ((_c = matchingAnyOfError.parentSchema) === null || _c === void 0 ? void 0 : _c.properties) || {};
+            const list = Array.from(requiredCandidates);
+            const described = list.map((prop) => describeError(prop, parentProps));
+            if (described.length === 1) {
+                return preferredCustomMsg || `Field ${described[0]} is required.`;
+            }
+            const humanList = described.length === 2
+                ? `${described[0]} or ${described[1]}`
+                : `${described.slice(0, -1).join(', ')}, or ${described[described.length - 1]}`;
+            return preferredCustomMsg || `One of ${humanList} must be provided.`;
+        }
+        // If no anyOf schema found in error, return custom message or error message
+        return preferredCustomMsg || matchingAnyOfError.message || '';
+    }
+    else {
+        return '';
+    }
+};

package/dist/foundation-forms.api.json

@@ -1332,6 +1332,100 @@
           },
           "implementsTokenRanges": []
         },
+        {
+          "kind": "Function",
+          "canonicalReference": "@genesislcap/foundation-forms!getAnyOfErrorMessage:function(1)",
+          "docComment": "/**\n * Computes a human-friendly anyOf error message for a given control path. Prefers UI schema custom message, then JSON schema errorMessage.anyOf, then a constructed fallback.\n */\n",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "getAnyOfErrorMessage: (errors: "
+            },
+            {
+              "kind": "Reference",
+              "text": "Array",
+              "canonicalReference": "!Array:interface"
+            },
+            {
+              "kind": "Content",
+              "text": "<any> | undefined"
+            },
+            {
+              "kind": "Content",
+              "text": ", schema: "
+            },
+            {
+              "kind": "Content",
+              "text": "any"
+            },
+            {
+              "kind": "Content",
+              "text": ", controlPath: "
+            },
+            {
+              "kind": "Content",
+              "text": "string | undefined"
+            },
+            {
+              "kind": "Content",
+              "text": ", uiCustomMsg?: "
+            },
+            {
+              "kind": "Content",
+              "text": "string"
+            },
+            {
+              "kind": "Content",
+              "text": ") => "
+            },
+            {
+              "kind": "Content",
+              "text": "string"
+            }
+          ],
+          "fileUrlPath": "src/utils/validation.ts",
+          "returnTypeTokenRange": {
+            "startIndex": 10,
+            "endIndex": 11
+          },
+          "releaseTag": "Public",
+          "overloadIndex": 1,
+          "parameters": [
+            {
+              "parameterName": "errors",
+              "parameterTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              },
+              "isOptional": false
+            },
+            {
+              "parameterName": "schema",
+              "parameterTypeTokenRange": {
+                "startIndex": 4,
+                "endIndex": 5
+              },
+              "isOptional": false
+            },
+            {
+              "parameterName": "controlPath",
+              "parameterTypeTokenRange": {
+                "startIndex": 6,
+                "endIndex": 7
+              },
+              "isOptional": false
+            },
+            {
+              "parameterName": "uiCustomMsg",
+              "parameterTypeTokenRange": {
+                "startIndex": 8,
+                "endIndex": 9
+              },
+              "isOptional": true
+            }
+          ],
+          "name": "getAnyOfErrorMessage"
+        },
         {
           "kind": "TypeAlias",
           "canonicalReference": "@genesislcap/foundation-forms!GroupRendererOptions:type",

package/dist/foundation-forms.d.ts

@@ -870,6 +870,12 @@ export declare enum GenesisType {
     RAW = "RAW"
 }
 
+/**
+ * Computes a human-friendly anyOf error message for a given control path.
+ * Prefers UI schema custom message, then JSON schema errorMessage.anyOf, then a constructed fallback.
+ */
+export declare const getAnyOfErrorMessage: (errors: Array<any> | undefined, schema: any, controlPath: string | undefined, uiCustomMsg?: string) => string;
+
 /** @internal */
 export declare const getPrefixedForm: (prefix: any) => ViewTemplate<Form, any>;
 

package/docs/api/foundation-forms.getanyoferrormessage.md

@@ -0,0 +1,96 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@genesislcap/foundation-forms](./foundation-forms.md) &gt; [getAnyOfErrorMessage](./foundation-forms.getanyoferrormessage.md)
+
+## getAnyOfErrorMessage() function
+
+Computes a human-friendly anyOf error message for a given control path. Prefers UI schema custom message, then JSON schema errorMessage.anyOf, then a constructed fallback.
+
+**Signature:**
+
+```typescript
+getAnyOfErrorMessage: (errors: Array<any> | undefined, schema: any, controlPath: string | undefined, uiCustomMsg?: string) => string
+```
+
+## Parameters
+
+<table><thead><tr><th>
+
+Parameter
+
+
+</th><th>
+
+Type
+
+
+</th><th>
+
+Description
+
+
+</th></tr></thead>
+<tbody><tr><td>
+
+errors
+
+
+</td><td>
+
+Array&lt;any&gt; \| undefined
+
+
+</td><td>
+
+
+</td></tr>
+<tr><td>
+
+schema
+
+
+</td><td>
+
+any
+
+
+</td><td>
+
+
+</td></tr>
+<tr><td>
+
+controlPath
+
+
+</td><td>
+
+string \| undefined
+
+
+</td><td>
+
+
+</td></tr>
+<tr><td>
+
+uiCustomMsg
+
+
+</td><td>
+
+string
+
+
+</td><td>
+
+_(Optional)_
+
+
+</td></tr>
+</tbody></table>
+
+**Returns:**
+
+string
+

package/docs/api/foundation-forms.md

@@ -56,6 +56,17 @@ Description
 </th></tr></thead>
 <tbody><tr><td>
 
+[getAnyOfErrorMessage(errors, schema, controlPath, uiCustomMsg)](./foundation-forms.getanyoferrormessage.md)
+
+
+</td><td>
+
+Computes a human-friendly anyOf error message for a given control path. Prefers UI schema custom message, then JSON schema errorMessage.anyOf, then a constructed fallback.
+
+
+</td></tr>
+<tr><td>
+
 [mustMatch(target)](./foundation-forms.mustmatch.md)
 
 

package/docs/api-report.md.api.md

@@ -195,6 +195,9 @@ export enum GenesisType {
     STRING = "STRING"
 }
 
+// @public
+export const getAnyOfErrorMessage: (errors: Array<any> | undefined, schema: any, controlPath: string | undefined, uiCustomMsg?: string) => string;
+
 // Warning: (ae-internal-missing-underscore) The name "getPrefixedForm" should be prefixed with an underscore because the declaration is marked as @internal
 //
 // @internal (undocumented)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-forms",
   "description": "Genesis Foundation Forms",
-  "version": "14.334.0",
+  "version": "14.336.0",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -48,22 +48,22 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.334.0",
-    "@genesislcap/genx": "14.334.0",
-    "@genesislcap/rollup-builder": "14.334.0",
-    "@genesislcap/ts-builder": "14.334.0",
-    "@genesislcap/uvu-playwright-builder": "14.334.0",
-    "@genesislcap/vite-builder": "14.334.0",
-    "@genesislcap/webpack-builder": "14.334.0",
+    "@genesislcap/foundation-testing": "14.336.0",
+    "@genesislcap/genx": "14.336.0",
+    "@genesislcap/rollup-builder": "14.336.0",
+    "@genesislcap/ts-builder": "14.336.0",
+    "@genesislcap/uvu-playwright-builder": "14.336.0",
+    "@genesislcap/vite-builder": "14.336.0",
+    "@genesislcap/webpack-builder": "14.336.0",
     "@types/json-schema": "^7.0.11"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.334.0",
-    "@genesislcap/foundation-criteria": "14.334.0",
-    "@genesislcap/foundation-logger": "14.334.0",
-    "@genesislcap/foundation-notifications": "14.334.0",
-    "@genesislcap/foundation-ui": "14.334.0",
-    "@genesislcap/foundation-utils": "14.334.0",
+    "@genesislcap/foundation-comms": "14.336.0",
+    "@genesislcap/foundation-criteria": "14.336.0",
+    "@genesislcap/foundation-logger": "14.336.0",
+    "@genesislcap/foundation-notifications": "14.336.0",
+    "@genesislcap/foundation-ui": "14.336.0",
+    "@genesislcap/foundation-utils": "14.336.0",
     "@json-schema-tools/dereferencer": "^1.6.1",
     "@jsonforms/core": "^3.2.1",
     "@microsoft/fast-components": "2.30.6",
@@ -84,5 +84,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "0f4d5f5c7133d57cc21d8f582a850100b79d3a02"
+  "gitHead": "09f36f4cc7b33807ee13f6584b59a757d79ec800"
 }