@genesislcap/foundation-forms 15.46.3 → 15.46.5

package/dist/custom-elements.json

@@ -2391,7 +2391,7 @@
               }
             }
           ],
-          "description": "Returns true when `uiSchema` (or any of its descendants) has a scope that appears\nin `errorScopes`. Walks both `elements` and `options.childElements`."
+          "description": "Returns true when `uiSchema` (or any of its descendants) has a scope that appears\nin `errorScopes`. Walks both `elements` and `options.childElements`.\n\nA node's own scope is matched too, except when it has children and a more specific\nerror scope under the same path is present. That case is AJV's cascade (e.g. `/FOO`\n`oneOf`/`type` errors emitted on top of a leaf error at `/FOO/BAR`), and matching the\nshared container scope would badge every sibling that merely shares it. A container\nerror with no specific error beneath it still matches, since it cannot be pinned to\none field."
         }
       ],
       "exports": [

package/dist/dts/utils/schema-utils.d.ts

@@ -46,6 +46,13 @@ export declare function extractErrorScopes(errors: ErrorObject[]): string[];
 /**
  * Returns true when `uiSchema` (or any of its descendants) has a scope that appears
  * in `errorScopes`. Walks both `elements` and `options.childElements`.
+ *
+ * A node's own scope is matched too, except when it has children and a more specific
+ * error scope under the same path is present. That case is AJV's cascade (e.g. `/FOO`
+ * `oneOf`/`type` errors emitted on top of a leaf error at `/FOO/BAR`), and matching the
+ * shared container scope would badge every sibling that merely shares it. A container
+ * error with no specific error beneath it still matches, since it cannot be pinned to
+ * one field.
  */
 export declare function uiSchemaHasAnyError(uiSchema: UiSchemaElement | UiSchema, errorScopes: string[]): boolean;
 /**

package/dist/dts/utils/schema-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/schema-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,KAAK,EAAiC,QAAQ,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEzF;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iDAAiD;IACjD,QAAQ,EAAE,eAAe,CAAC;IAC1B,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,2FAA2F;IAC3F,SAAS,EAAE,MAAM,CAAC;CACnB;AAaD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,GAAG,gBAAgB,EAAE,CA6ClF;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAiBzD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAK1D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAelE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,GAAG,QAAQ,EACpC,WAAW,EAAE,MAAM,EAAE,GACpB,OAAO,CAmBT;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,oBAAoB,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,QAAQ,CAoBrF"}
+{"version":3,"file":"schema-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/schema-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,KAAK,EAAiC,QAAQ,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEzF;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iDAAiD;IACjD,QAAQ,EAAE,eAAe,CAAC;IAC1B,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,2FAA2F;IAC3F,SAAS,EAAE,MAAM,CAAC;CACnB;AAaD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,GAAG,gBAAgB,EAAE,CA6ClF;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAiBzD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAK1D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAelE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,GAAG,QAAQ,EACpC,WAAW,EAAE,MAAM,EAAE,GACpB,OAAO,CA0BT;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,oBAAoB,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,QAAQ,CAoBrF"}

package/dist/esm/utils/schema-utils.js

@@ -103,9 +103,9 @@ export function extractErrorScopes(errors) {
     const scopes = new Set();
     for (const error of errors) {
         if (error.keyword === 'required' && ((_a = error.params) === null || _a === void 0 ? void 0 : _a.missingProperty)) {
-            const basePath = error.instancePath || '';
+            const basePath = error.instancePath ? error.instancePath.replace(/\//g, '/properties/') : '';
             const prop = error.params.missingProperty;
-            const fullPath = basePath === '' ? `#/properties/${prop}` : `#${basePath}/properties/${prop}`;
+            const fullPath = `#${basePath}/properties/${prop}`;
             scopes.add(fullPath);
         }
         else if (error.instancePath) {
@@ -119,27 +119,41 @@ export function extractErrorScopes(errors) {
 /**
  * Returns true when `uiSchema` (or any of its descendants) has a scope that appears
  * in `errorScopes`. Walks both `elements` and `options.childElements`.
+ *
+ * A node's own scope is matched too, except when it has children and a more specific
+ * error scope under the same path is present. That case is AJV's cascade (e.g. `/FOO`
+ * `oneOf`/`type` errors emitted on top of a leaf error at `/FOO/BAR`), and matching the
+ * shared container scope would badge every sibling that merely shares it. A container
+ * error with no specific error beneath it still matches, since it cannot be pinned to
+ * one field.
  */
 export function uiSchemaHasAnyError(uiSchema, errorScopes) {
     var _a;
-    if (typeof uiSchema.scope === 'string' &&
-        errorScopes.includes(uiSchema.scope)) {
-        return true;
+    if (!uiSchema) {
+        return false;
     }
     const childElements = (_a = uiSchema.options) === null || _a === void 0 ? void 0 : _a.childElements;
-    if (Array.isArray(childElements)) {
+    const elements = uiSchema.elements;
+    const hasChildElements = Array.isArray(childElements) && childElements.length > 0;
+    const hasElements = Array.isArray(elements) && elements.length > 0;
+    if (hasChildElements) {
         for (const child of childElements) {
             if (uiSchemaHasAnyError(child, errorScopes))
                 return true;
         }
     }
-    if (Array.isArray(uiSchema.elements)) {
-        for (const el of uiSchema.elements) {
+    if (hasElements) {
+        for (const el of elements) {
             if (uiSchemaHasAnyError(el, errorScopes))
                 return true;
         }
     }
-    return false;
+    const ownScope = uiSchema.scope;
+    if (typeof ownScope !== 'string' || !errorScopes.includes(ownScope)) {
+        return false;
+    }
+    const hasSpecificErrorBeneath = errorScopes.some((scope) => scope.startsWith(`${ownScope}/`));
+    return !((hasChildElements || hasElements) && hasSpecificErrorBeneath);
 }
 /**
  * Generates a UI schema suitable for bulk insert mode with array control.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-forms",
   "description": "Genesis Foundation Forms",
-  "version": "15.46.3",
+  "version": "15.46.5",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -56,12 +56,12 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "15.46.3",
-    "@genesislcap/genx": "15.46.3",
-    "@genesislcap/ts-builder": "15.46.3",
-    "@genesislcap/uvu-playwright-builder": "15.46.3",
-    "@genesislcap/vite-builder": "15.46.3",
-    "@genesislcap/webpack-builder": "15.46.3",
+    "@genesislcap/foundation-testing": "15.46.5",
+    "@genesislcap/genx": "15.46.5",
+    "@genesislcap/ts-builder": "15.46.5",
+    "@genesislcap/uvu-playwright-builder": "15.46.5",
+    "@genesislcap/vite-builder": "15.46.5",
+    "@genesislcap/webpack-builder": "15.46.5",
     "@types/json-schema": "^7.0.11",
     "@types/papaparse": "^5.3.14"
   },
@@ -78,12 +78,12 @@
     }
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "15.46.3",
-    "@genesislcap/foundation-criteria": "15.46.3",
-    "@genesislcap/foundation-logger": "15.46.3",
-    "@genesislcap/foundation-notifications": "15.46.3",
-    "@genesislcap/foundation-ui": "15.46.3",
-    "@genesislcap/foundation-utils": "15.46.3",
+    "@genesislcap/foundation-comms": "15.46.5",
+    "@genesislcap/foundation-criteria": "15.46.5",
+    "@genesislcap/foundation-logger": "15.46.5",
+    "@genesislcap/foundation-notifications": "15.46.5",
+    "@genesislcap/foundation-ui": "15.46.5",
+    "@genesislcap/foundation-utils": "15.46.5",
     "@json-schema-tools/dereferencer": "^1.6.1",
     "@jsonforms/core": "^3.2.1",
     "@microsoft/fast-components": "2.30.6",