fastapi-rtk 2.4.2 → 2.5.1

package/dist/contexts/lib/ApiContext/types.d.ts

@@ -1,8 +1,8 @@
 import { BaseResponseMany, BaseResponseSingle, ColumnFilterOperator, ColumnInfo, ColumnRelationInfo, ConvertedInfo, FilterInfo, InfoResponse, JsonSchema, Layout, PrimaryKey, QueryFilter, QueryParams } from 'fastapi-rtk/api-types';
 import { InfiniteData, UseInfiniteQueryResult, UseQueryResult } from '@tanstack/react-query';
 import { Schema as ValidationSchema } from '../../../.external/lib/yup';
-/** A non-null CRUD result row, mirroring the unwrapped `BaseResponseSingle.result`. */
-type EntryRow = NonNullable<BaseResponseSingle['result']>;
+/** A non-null CRUD result row, mirroring the unwrapped `BaseResponseSingle.result`. Default row type for the API generics. */
+export type EntryRow = NonNullable<BaseResponseSingle['result']>;
 export type APIColumnInfo = ColumnInfo;
 export type APIColumnRelationInfo = ColumnRelationInfo;
 export type APIColumnFilter = ColumnFilterOperator;
@@ -40,11 +40,11 @@ export type APIQueryParams = Required<Pick<QueryParams, 'page' | 'page_size' | '
  * `BaseResponseMany`: `count` / `result` are guaranteed non-null after a successful fetch, and
  * `path` / `queryParams` (the resolved `APIQueryParams`) are always present.
  */
-export interface APIData extends Omit<BaseResponseMany, 'count' | 'result'> {
+export interface APIData<TData = EntryRow> extends Omit<BaseResponseMany, 'count' | 'result'> {
     /** The total count of items existing in the database for the given query parameters. */
     count: number;
     /** An array of objects representing the API response data. */
-    result: EntryRow[];
+    result: TData[];
     /** The API path. */
     path: string;
     /** The query parameters used in the API request. */
@@ -56,10 +56,10 @@ export interface APISpecialKey {
     /** The key to be used when retrieving actions for `NextGenDataGrid`. Typically `actions`, but can be `_actions` if `actions` is in the list of columns. */
     actions: string;
 }
-export interface APIStreaming {
+export interface APIStreaming<TData = EntryRow> {
     /** The streaming data, organized by the page number. */
     data: {
-        [pageNumber: string]: EntryRow[];
+        [pageNumber: string]: TData[];
     };
     /** Indicates whether the streaming has ended. */
     isEnd: boolean;
@@ -86,10 +86,10 @@ export interface APIError {
     message: string;
     originalError: Error;
 }
-export interface APISetErrorPayload {
+export interface APISetErrorPayload<TData = EntryRow> {
     message: string;
     originalError: Error;
-    data?: EntryRow;
+    data?: TData;
 }
 /**
  * `APIInfo` augmented with the normalized add/edit form blocks produced by
@@ -101,13 +101,34 @@ export interface APISetErrorPayload {
 export type APIInfoCanonical = ConvertedInfo<ValidationSchema> & {
     path?: string;
 };
-export interface ApiContextValue {
+/**
+ * Per-operation type overrides for `useApi`. Each key maps to a backend column projection and,
+ * when set, replaces the uniform default for that operation only: `list` (list response rows,
+ * `list_columns`), `get` (a single fetched entry and the record returned by `addEntry` / `updateEntry`,
+ * `show_columns`), `add` (the `addEntry` payload, `add_columns`), `edit` (the `updateEntry` payload,
+ * `edit_columns`). `upload` (`EntryRow[]`, loosely-typed import rows) and `deleteEntry` (`null`, the 204 no-content response) are not parameterized.
+ */
+export interface ApiTypeOverrides {
+    list?: unknown;
+    get?: unknown;
+    add?: unknown;
+    edit?: unknown;
+}
+/** Resolve one operation's type from the override map, falling back to `TDefault`. */
+export type OpType<TOverrides extends ApiTypeOverrides, K extends keyof ApiTypeOverrides, TDefault> = TOverrides extends Record<K, infer T> ? T : TDefault;
+/**
+ * @typeParam TList - Row shape of the list response (`data.result`).
+ * @typeParam TGet - Shape of a single fetched/affected record (`getEntry`, and the record returned by `addEntry` / `updateEntry`).
+ * @typeParam TAdd - Payload accepted by `addEntry`.
+ * @typeParam TEdit - Payload accepted by `updateEntry`.
+ */
+export interface ApiContextValue<TList = EntryRow, TGet = EntryRow, TAdd = EntryRow, TEdit = EntryRow> {
     /** The API path. */
     path: string;
     /** Information about the API, including schemas, UI schemas, and the normalized add/edit form blocks. */
     info?: APIInfoCanonical;
     /** The data returned by the API. */
-    data?: APIData;
+    data?: APIData<TList>;
     /** The query parameters used in the API request. */
     queryParams?: APIQueryParams;
     /** Indicates whether the API request is currently loading. */
@@ -125,11 +146,11 @@ export interface ApiContextValue {
     /** The raw React Query object for the info request. */
     infoQuery: UseQueryResult<APIInfoCanonical | undefined>;
     /** The raw React Query object for the data request. */
-    dataQuery: UseQueryResult<APIData | null>;
+    dataQuery: UseQueryResult<APIData<TList> | null>;
     /** The raw React Query infinite query object for streaming requests. */
-    streamingQuery: UseInfiniteQueryResult<InfiniteData<APIData | null>>;
+    streamingQuery: UseInfiniteQueryResult<InfiniteData<APIData<TList> | null>>;
     /** Streaming (infinite-scroll) controller. Present only when the `ApiProvider` is configured for streaming; its presence is the streaming-mode signal. When set, `data.result` carries every row fetched so far (all pages) and `streaming.data` is the page-number-keyed breakdown. */
-    streaming?: APIStreaming;
+    streaming?: APIStreaming<TList>;
     /** An object containing special keys for the API query, such as 'all' and 'actions'. */
     specialKey: APISpecialKey;
     /** A function to update the query parameters. */
@@ -142,25 +163,29 @@ export interface ApiContextValue {
     refetchInfo: (options?: {
         force?: boolean;
     }) => Promise<void>;
-    /** A function to retrieve a specific entry by ID. */
-    getEntry: (id: PrimaryKey) => Promise<EntryRow>;
-    /** A function to add a new entry to the API. */
-    addEntry: (item: EntryRow) => Promise<EntryRow>;
-    /** A function to edit an existing entry in the API. */
-    updateEntry: (id: PrimaryKey, item: EntryRow) => Promise<EntryRow>;
-    /** A function to delete an entry from the API. */
-    deleteEntry: (id: PrimaryKey) => Promise<EntryRow>;
+    /** Retrieve a specific entry by ID. Return defaults to the resolved `get` type; override per call (e.g. `getEntry<Custom>(id)`) when the route is customized. */
+    getEntry: <R = TGet>(id: PrimaryKey) => Promise<R>;
+    /** Add a new entry. Return defaults to the resolved `get` type; override per call for custom routes. */
+    addEntry: <R = TGet>(item: TAdd) => Promise<R>;
+    /** Edit an existing entry. Return defaults to the resolved `get` type; override per call for custom routes. */
+    updateEntry: <R = TGet>(id: PrimaryKey, item: TEdit) => Promise<R>;
+    /** Delete an entry. The stock endpoint responds 204 (no body), parsed to `null`, so the return defaults to `null`; override per call for custom `post_delete` payloads. */
+    deleteEntry: <R = null>(id: PrimaryKey) => Promise<R>;
     /** A function to download data from the API. */
     download: (label?: string, options?: APIDownloadOptions) => Promise<void>;
-    /** A function to upload a file to the API. */
-    upload: (file: File, options?: APIUploadOptions) => Promise<EntryRow>;
+    /** Upload a CSV. The importer returns `list[dict[str, Any]]` (no response_model), so the default is `EntryRow[]` (loosely-typed rows), NOT the model/`TGet` shape; override per call if your route is typed. */
+    upload: <R = EntryRow[]>(file: File, options?: APIUploadOptions) => Promise<R>;
     /** A function to get the URL for a file item (file name or File object). */
     getFileURL: (item: string | File) => string;
     /** A function to get the URL for an image item (image name or File object). */
     getImageURL: (item: string | File) => string;
     /** A function to set the error state, surfacing errors thrown by the action functions (`addEntry`, `updateEntry`, ...) through the shared `ErrorDialog`. */
-    setError: (error: APISetErrorPayload | undefined) => void;
+    setError: (error: APISetErrorPayload<TGet> | undefined) => void;
     /** A function to reset the error state. */
     resetError: () => void;
 }
-export {};
+/**
+ * The `ApiContextValue` returned by `useApi<TDefault, TOverrides>`: the uniform `TDefault` applied to
+ * every operation, with any `TOverrides` keys replacing it per operation.
+ */
+export type UseApiResult<TDefault = EntryRow, TOverrides extends ApiTypeOverrides = ApiTypeOverrides> = ApiContextValue<OpType<TOverrides, 'list', TDefault>, OpType<TOverrides, 'get', TDefault>, OpType<TOverrides, 'add', TDefault>, OpType<TOverrides, 'edit', TDefault>>;

package/dist/core/cjs/Wrappers/ApiProvider/hooks/useProvideApi.cjs

@@ -298,7 +298,7 @@ function useProvideApi(params, api = defaultApi) {
     getImageURL: (item) => getItemURL("image", item),
     setError,
     resetError
-    // #MUSTASSERT useProvideApi holds raw react-query state (DataPage/StreamingPage data, raw QueryParams, null errors); this is the resolved ApiContextValue surface consumers read, normalized at runtime
+    // #MUSTASSERT #MUSTUNKNOWN useProvideApi holds raw react-query state (DataPage/StreamingPage data, raw QueryParams, null errors) and concrete (non-generic) action fns; this is the resolved ApiContextValue surface consumers read, normalized at runtime
   };
 }
 exports.useProvideApi = useProvideApi;

package/dist/core/esm/Wrappers/ApiProvider/hooks/useProvideApi.mjs

@@ -296,7 +296,7 @@ function useProvideApi(params, api = defaultApi) {
     getImageURL: (item) => getItemURL("image", item),
     setError,
     resetError
-    // #MUSTASSERT useProvideApi holds raw react-query state (DataPage/StreamingPage data, raw QueryParams, null errors); this is the resolved ApiContextValue surface consumers read, normalized at runtime
+    // #MUSTASSERT #MUSTUNKNOWN useProvideApi holds raw react-query state (DataPage/StreamingPage data, raw QueryParams, null errors) and concrete (non-generic) action fns; this is the resolved ApiContextValue surface consumers read, normalized at runtime
   };
 }
 export {

package/dist/core/lib/Dialogs/types.d.ts

@@ -31,8 +31,8 @@ export type EditDialogProps = AddDialogOwnProps & DialogModalProps;
 export interface DeleteDialogOwnProps {
     /** Custom text or component to display in the delete confirmation dialog. */
     deleteText?: ReactNode;
-    /** Callback function triggered on successful form submission. */
-    onSuccess?: (result: MRT_RowData | null) => void;
+    /** Callback function triggered on successful deletion. Delete responds 204 (no body), parsed to `null`. */
+    onSuccess?: (result: null) => void;
     /** Callback function triggered on form submission error. */
     onError?: (error: unknown) => void;
 }

package/dist/core/lib/Wrappers/ApiProvider/hooks/utils/useApiActions.d.ts

@@ -4,8 +4,8 @@ export declare const useApiActions: (params: UseApiActionsParams) => {
     getEntry: (id: EntryId) => Promise<MRT_RowData>;
     addEntry: (item: MRT_RowData) => Promise<MRT_RowData>;
     updateEntry: (id: EntryId, item: MRT_RowData) => Promise<MRT_RowData>;
-    deleteEntry: (id: EntryId) => Promise<MRT_RowData>;
+    deleteEntry: (id: EntryId) => Promise<MRT_RowData | null>;
     download: (label?: string, { export_mode, delimiter, quotechar }?: DownloadActionOptions) => Promise<void>;
-    upload: (file: File, { delimiter, quotechar }?: UploadActionOptions) => Promise<MRT_RowData>;
+    upload: (file: File, { delimiter, quotechar }?: UploadActionOptions) => Promise<import('../../utils/api/types').UploadResponse>;
     getItemURL: (type: string, item: string | File) => string;
 };

package/dist/core/lib/Wrappers/ApiProvider/utils/api/deleteItem.d.ts

@@ -1,3 +1,3 @@
 import { MRT_RowData } from '../../../../../../.external/lib/mantine-react-table';
 import { FetchOptions, ItemId } from './types';
-export declare const deleteItem: (path: string, id: ItemId, options?: FetchOptions) => Promise<MRT_RowData>;
+export declare const deleteItem: (path: string, id: ItemId, options?: FetchOptions) => Promise<MRT_RowData | null>;

package/dist/core/lib/Wrappers/ApiProvider/utils/api/getInfo.d.ts

@@ -7,4 +7,4 @@ import { FetchOptions } from './types';
  * @returns The data fetched from the given path.
  * @throws {Error} If the response is not ok, throws an error with the response detail.
  */
-export declare const getInfo: (path: string, options?: FetchOptions) => Promise<string | object>;
+export declare const getInfo: (path: string, options?: FetchOptions) => Promise<string | object | null>;

package/dist/core/lib/Wrappers/ApiProvider/utils/api/getItems.d.ts

@@ -9,4 +9,4 @@ import { FetchOptions } from './types';
  * @returns A promise that resolves to the fetched data, either as a JSON object or a text string.
  * @throws {Error} - Throws an error if the response is not ok or if there is an issue with the fetch request.
  */
-export declare const getItems: (path: string, queryParams?: QueryParams, options?: FetchOptions) => Promise<string | object>;
+export declare const getItems: (path: string, queryParams?: QueryParams, options?: FetchOptions) => Promise<string | object | null>;

package/dist/core/lib/Wrappers/ApiProvider/utils/api/types.d.ts

@@ -19,5 +19,5 @@ export interface UploadOptions {
     delimiter?: string;
     quotechar?: string;
 }
-/** The CRUD row returned by the upload endpoint; model-driven at runtime. */
-export type UploadResponse = MRT_RowData;
+/** The rows returned by the upload (CSV import) endpoint; a list of model-driven rows at runtime. */
+export type UploadResponse = MRT_RowData[];

package/dist/core/lib/fab-react-toolkit-patch/api/utils/api/getItems.d.ts

@@ -9,4 +9,4 @@ import { FetchOptions } from '../../../../Wrappers/ApiProvider/utils/api/types';
  * @returns A promise that resolves to the fetched data, either as a JSON object or a text string.
  * @throws {Error} - Throws an error if the response is not ok or if there is an issue with the fetch request.
  */
-export declare const getItems: (path: string, queryParams?: QueryParams, options?: FetchOptions) => Promise<string | object>;
+export declare const getItems: (path: string, queryParams?: QueryParams, options?: FetchOptions) => Promise<string | object | null>;

package/dist/jsonforms/cjs/complex/MantineTableControl/MantineTableControl.cjs

@@ -11,6 +11,7 @@ const range = require("../../_virtual/range.cjs");
 const startCase = require("../../_virtual/startCase.cjs");
 const union = require("../../_virtual/union.cjs");
 const React = require("react");
+const useArrayHeaderErrors = require("../../hooks/useArrayHeaderErrors.cjs");
 const useContextProps = require("../../hooks/useContextProps.cjs");
 const useNavigationComponent = require("../../hooks/useNavigationComponent.cjs");
 const useThemeCustomizer = require("../../hooks/useThemeCustomizer.cjs");
@@ -239,7 +240,6 @@ const MantineTableControl = React.memo(function MantineTableControl2(props) {
     schema,
     rootSchema,
     uischema,
-    errors,
     visible,
     enabled,
     cells,
@@ -255,6 +255,7 @@ const MantineTableControl = React.memo(function MantineTableControl2(props) {
   const isObjectSchema = isValidObjectSchema(schema);
   const headerCells = isObjectSchema ? generateCells(TableHeaderCell, schema, path, enabled, cells) : void 0;
   const isEnabled = enabled && !doDisableAdd;
+  const headerErrors = useArrayHeaderErrors.useArrayHeaderErrors(path, schema);
   const [Component, _props] = useContextProps.useContextProps("Table", `${path}.Table`, {}, props, { withAllProps: false });
   if (!visible) {
     return null;
@@ -265,7 +266,7 @@ const MantineTableControl = React.memo(function MantineTableControl2(props) {
         /* @__PURE__ */ jsxRuntime.jsx(
           TableToolbar.TableToolbar,
           {
-            errors,
+            errors: headerErrors,
             label,
             description,
             addItem,

package/dist/jsonforms/cjs/hooks/useArrayHeaderErrors.cjs

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const core = require("@jsonforms/core");
+const react = require("@jsonforms/react");
+const React = require("react");
+const nullOptionErrors = require("../utils/nullOptionErrors.cjs");
+const useArrayHeaderErrors = (path, schema) => {
+  const { core: core$1 } = react.useJsonForms();
+  const errors = core$1 == null ? void 0 : core$1.errors;
+  return React.useMemo(() => {
+    var _a;
+    if (!(errors == null ? void 0 : errors.length)) {
+      return "";
+    }
+    const scoped = core.errorsAt(
+      path,
+      schema,
+      (controlPath) => controlPath === path || controlPath.startsWith(`${path}.`)
+    )(errors);
+    const byField = /* @__PURE__ */ new Map();
+    for (const error of scoped) {
+      const group = byField.get(error.instancePath);
+      if (group) {
+        group.push(error);
+      } else {
+        byField.set(error.instancePath, [error]);
+      }
+    }
+    const messages = [];
+    for (const group of byField.values()) {
+      const [representative] = group;
+      const fieldMessages = group.map((error) => error.message).filter((message) => !!message);
+      messages.push(
+        ...nullOptionErrors.resolveNullableErrorMessages(
+          representative.data,
+          nullOptionErrors.isNullableSchemaType((_a = representative.parentSchema) == null ? void 0 : _a.type),
+          fieldMessages
+        )
+      );
+    }
+    return core.formatErrorMessage(messages);
+  }, [errors, path, schema]);
+};
+exports.useArrayHeaderErrors = useArrayHeaderErrors;

package/dist/jsonforms/cjs/hooks/useNullableErrorProps.cjs

@@ -1,23 +1,19 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
-const isSchemaTypeInclude = require("../utils/isSchemaTypeInclude.cjs");
-const NULL_OPTION_ERRORS = /* @__PURE__ */ new Set([
-  "must be equal to one of the allowed values",
-  "must be equal to constant",
-  "must match exactly one schema in oneOf"
-]);
-const REQUIRED_ERROR = "is a required property";
+const nullOptionErrors = require("../utils/nullOptionErrors.cjs");
 function useNullableErrorProps(value, error, schema) {
   return React.useMemo(() => {
-    if (value !== null && value !== "") {
-      return { error };
+    switch (nullOptionErrors.nullableErrorAction(value, nullOptionErrors.isNullableSchemaType(schema.type))) {
+      case "keep":
+        return { error };
+      case "drop-options": {
+        const kept = error == null ? void 0 : error.filter((e) => !nullOptionErrors.NULL_OPTION_ERRORS.has(e.key ?? ""));
+        return { error: (kept == null ? void 0 : kept.length) ? kept : void 0 };
+      }
+      case "required":
+        return { error: nullOptionErrors.REQUIRED_ERROR };
     }
-    if (isSchemaTypeInclude.isSchemaTypeInclude(schema.type ?? "", "null")) {
-      const kept = error == null ? void 0 : error.filter((e) => !NULL_OPTION_ERRORS.has(e.key ?? ""));
-      return { error: (kept == null ? void 0 : kept.length) ? kept : void 0 };
-    }
-    return { error: REQUIRED_ERROR };
   }, [error, schema.type, value]);
 }
 exports.useNullableErrorProps = useNullableErrorProps;

package/dist/jsonforms/cjs/layouts/Array/MantineArrayLayout.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
+const useArrayHeaderErrors = require("../../hooks/useArrayHeaderErrors.cjs");
 const useContextProps = require("../../hooks/useContextProps.cjs");
 const core = require("@jsonforms/core");
 const core$1 = require("@mantine/core");
@@ -17,7 +18,6 @@ const Component = (props) => {
     path,
     schema,
     uischema,
-    errors,
     addItem,
     renderers,
     cells,
@@ -38,6 +38,7 @@ const Component = (props) => {
   const [Component2, _props] = useContextProps.useContextProps("Array.Accordion", `${path}.Accordion`, {}, props, {
     withAllProps: false
   });
+  const headerErrors = useArrayHeaderErrors.useArrayHeaderErrors(path, schema);
   return /* @__PURE__ */ jsxRuntime.jsxs(core$1.Stack, { children: [
     /* @__PURE__ */ jsxRuntime.jsx(
       ArrayToolbar.ArrayLayoutToolbar,
@@ -45,7 +46,7 @@ const Component = (props) => {
         translations,
         label: core.computeLabel(label, required ?? false, appliedUiSchemaOptions.hideRequiredAsterisk),
         description,
-        errors,
+        errors: headerErrors,
         path,
         enabled,
         addItem,

package/dist/jsonforms/cjs/utils/nullOptionErrors.cjs

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const isSchemaTypeInclude = require("./isSchemaTypeInclude.cjs");
+const NULL_OPTION_ERRORS = /* @__PURE__ */ new Set([
+  "must be equal to one of the allowed values",
+  "must be equal to constant",
+  "must match exactly one schema in oneOf"
+]);
+const REQUIRED_ERROR = "is a required property";
+const nullableErrorAction = (value, nullable) => {
+  if (value !== null && value !== "") {
+    return "keep";
+  }
+  return nullable ? "drop-options" : "required";
+};
+const resolveNullableErrorMessages = (value, nullable, messages) => {
+  switch (nullableErrorAction(value, nullable)) {
+    case "keep":
+      return messages;
+    case "drop-options":
+      return messages.filter((message) => !NULL_OPTION_ERRORS.has(message));
+    case "required":
+      return [REQUIRED_ERROR];
+  }
+};
+const isNullableSchemaType = (type) => isSchemaTypeInclude.isSchemaTypeInclude(type ?? "", "null");
+exports.NULL_OPTION_ERRORS = NULL_OPTION_ERRORS;
+exports.REQUIRED_ERROR = REQUIRED_ERROR;
+exports.isNullableSchemaType = isNullableSchemaType;
+exports.nullableErrorAction = nullableErrorAction;
+exports.resolveNullableErrorMessages = resolveNullableErrorMessages;

package/dist/jsonforms/esm/complex/MantineTableControl/MantineTableControl.mjs

@@ -9,6 +9,7 @@ import range from "../../_virtual/range.mjs";
 import startCase from "../../_virtual/startCase.mjs";
 import union from "../../_virtual/union.mjs";
 import React, { useMemo, memo } from "react";
+import { useArrayHeaderErrors } from "../../hooks/useArrayHeaderErrors.mjs";
 import { useContextProps } from "../../hooks/useContextProps.mjs";
 import { useNavigationComponent } from "../../hooks/useNavigationComponent.mjs";
 import { useThemeCustomizer } from "../../hooks/useThemeCustomizer.mjs";
@@ -237,7 +238,6 @@ const MantineTableControl = memo(function MantineTableControl2(props) {
     schema,
     rootSchema,
     uischema,
-    errors,
     visible,
     enabled,
     cells,
@@ -253,6 +253,7 @@ const MantineTableControl = memo(function MantineTableControl2(props) {
   const isObjectSchema = isValidObjectSchema(schema);
   const headerCells = isObjectSchema ? generateCells(TableHeaderCell, schema, path, enabled, cells) : void 0;
   const isEnabled = enabled && !doDisableAdd;
+  const headerErrors = useArrayHeaderErrors(path, schema);
   const [Component, _props] = useContextProps("Table", `${path}.Table`, {}, props, { withAllProps: false });
   if (!visible) {
     return null;
@@ -263,7 +264,7 @@ const MantineTableControl = memo(function MantineTableControl2(props) {
         /* @__PURE__ */ jsx(
           TableToolbar,
           {
-            errors,
+            errors: headerErrors,
             label,
             description,
             addItem,

package/dist/jsonforms/esm/hooks/useArrayHeaderErrors.mjs

@@ -0,0 +1,44 @@
+import { errorsAt, formatErrorMessage } from "@jsonforms/core";
+import { useJsonForms } from "@jsonforms/react";
+import { useMemo } from "react";
+import { resolveNullableErrorMessages, isNullableSchemaType } from "../utils/nullOptionErrors.mjs";
+const useArrayHeaderErrors = (path, schema) => {
+  const { core } = useJsonForms();
+  const errors = core == null ? void 0 : core.errors;
+  return useMemo(() => {
+    var _a;
+    if (!(errors == null ? void 0 : errors.length)) {
+      return "";
+    }
+    const scoped = errorsAt(
+      path,
+      schema,
+      (controlPath) => controlPath === path || controlPath.startsWith(`${path}.`)
+    )(errors);
+    const byField = /* @__PURE__ */ new Map();
+    for (const error of scoped) {
+      const group = byField.get(error.instancePath);
+      if (group) {
+        group.push(error);
+      } else {
+        byField.set(error.instancePath, [error]);
+      }
+    }
+    const messages = [];
+    for (const group of byField.values()) {
+      const [representative] = group;
+      const fieldMessages = group.map((error) => error.message).filter((message) => !!message);
+      messages.push(
+        ...resolveNullableErrorMessages(
+          representative.data,
+          isNullableSchemaType((_a = representative.parentSchema) == null ? void 0 : _a.type),
+          fieldMessages
+        )
+      );
+    }
+    return formatErrorMessage(messages);
+  }, [errors, path, schema]);
+};
+export {
+  useArrayHeaderErrors
+};

package/dist/jsonforms/esm/hooks/useNullableErrorProps.mjs

@@ -1,21 +1,17 @@
 import { useMemo } from "react";
-import { isSchemaTypeInclude } from "../utils/isSchemaTypeInclude.mjs";
-const NULL_OPTION_ERRORS = /* @__PURE__ */ new Set([
-  "must be equal to one of the allowed values",
-  "must be equal to constant",
-  "must match exactly one schema in oneOf"
-]);
-const REQUIRED_ERROR = "is a required property";
+import { nullableErrorAction, isNullableSchemaType, REQUIRED_ERROR, NULL_OPTION_ERRORS } from "../utils/nullOptionErrors.mjs";
 function useNullableErrorProps(value, error, schema) {
   return useMemo(() => {
-    if (value !== null && value !== "") {
-      return { error };
+    switch (nullableErrorAction(value, isNullableSchemaType(schema.type))) {
+      case "keep":
+        return { error };
+      case "drop-options": {
+        const kept = error == null ? void 0 : error.filter((e) => !NULL_OPTION_ERRORS.has(e.key ?? ""));
+        return { error: (kept == null ? void 0 : kept.length) ? kept : void 0 };
+      }
+      case "required":
+        return { error: REQUIRED_ERROR };
     }
-    if (isSchemaTypeInclude(schema.type ?? "", "null")) {
-      const kept = error == null ? void 0 : error.filter((e) => !NULL_OPTION_ERRORS.has(e.key ?? ""));
-      return { error: (kept == null ? void 0 : kept.length) ? kept : void 0 };
-    }
-    return { error: REQUIRED_ERROR };
   }, [error, schema.type, value]);
 }
 export {

package/dist/jsonforms/esm/layouts/Array/MantineArrayLayout.mjs

@@ -1,4 +1,5 @@
 import { jsxs, jsx } from "react/jsx-runtime";
+import { useArrayHeaderErrors } from "../../hooks/useArrayHeaderErrors.mjs";
 import { useContextProps } from "../../hooks/useContextProps.mjs";
 import { createDefaultValue, computeLabel, Paths } from "@jsonforms/core";
 import { Stack, Accordion, Text } from "@mantine/core";
@@ -15,7 +16,6 @@ const Component = (props) => {
     path,
     schema,
     uischema,
-    errors,
     addItem,
     renderers,
     cells,
@@ -36,6 +36,7 @@ const Component = (props) => {
   const [Component2, _props] = useContextProps("Array.Accordion", `${path}.Accordion`, {}, props, {
     withAllProps: false
   });
+  const headerErrors = useArrayHeaderErrors(path, schema);
   return /* @__PURE__ */ jsxs(Stack, { children: [
     /* @__PURE__ */ jsx(
       ArrayLayoutToolbar,
@@ -43,7 +44,7 @@ const Component = (props) => {
         translations,
         label: computeLabel(label, required ?? false, appliedUiSchemaOptions.hideRequiredAsterisk),
         description,
-        errors,
+        errors: headerErrors,
         path,
         enabled,
         addItem,

package/dist/jsonforms/esm/utils/nullOptionErrors.mjs

@@ -0,0 +1,31 @@
+import { isSchemaTypeInclude } from "./isSchemaTypeInclude.mjs";
+const NULL_OPTION_ERRORS = /* @__PURE__ */ new Set([
+  "must be equal to one of the allowed values",
+  "must be equal to constant",
+  "must match exactly one schema in oneOf"
+]);
+const REQUIRED_ERROR = "is a required property";
+const nullableErrorAction = (value, nullable) => {
+  if (value !== null && value !== "") {
+    return "keep";
+  }
+  return nullable ? "drop-options" : "required";
+};
+const resolveNullableErrorMessages = (value, nullable, messages) => {
+  switch (nullableErrorAction(value, nullable)) {
+    case "keep":
+      return messages;
+    case "drop-options":
+      return messages.filter((message) => !NULL_OPTION_ERRORS.has(message));
+    case "required":
+      return [REQUIRED_ERROR];
+  }
+};
+const isNullableSchemaType = (type) => isSchemaTypeInclude(type ?? "", "null");
+export {
+  NULL_OPTION_ERRORS,
+  REQUIRED_ERROR,
+  isNullableSchemaType,
+  nullableErrorAction,
+  resolveNullableErrorMessages
+};

package/dist/jsonforms/lib/hooks/useArrayHeaderErrors.d.ts

@@ -0,0 +1,14 @@
+import { JsonSchema } from '@jsonforms/core';
+/**
+ * Builds the aggregated validation error string shown on an array control's header. JsonForms'
+ * `mapStateToArrayLayoutProps` aggregates every descendant error unconditionally, so without this the
+ * header reports errors its own fields hide (an empty value on a nullable enum / oneOf / const field,
+ * or the raw type+option errors on a non-nullable empty field).
+ *
+ * Reconstructs that aggregation (the array's own path plus every sub-path), groups the errors by the
+ * field that owns them, then applies the same per-field rule the inputs use ({@link
+ * resolveNullableErrorMessages}) so the header and its fields hide/show identical errors. `path` is
+ * the array's data path, `schema` its resolved item schema. Returns a newline-joined error string
+ * (empty when there is nothing to show).
+ */
+export declare const useArrayHeaderErrors: (path: string, schema: JsonSchema) => string;

package/dist/jsonforms/lib/hooks/useArrayHeaderErrors.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/jsonforms/lib/hooks/useNullableErrorProps.d.ts

@@ -7,6 +7,9 @@ import { JsonFormsDataValue } from './types';
  * is valid, so the option-mismatch errors are hidden; a non-nullable field is missing, so a single
  * "is a required property" error is shown. A non-empty value passes its errors through unchanged.
  *
+ * Shares its branching with the array-header aggregation via {@link nullableErrorAction} so the field
+ * and its array header always hide/show the same errors.
+ *
  * @param value the current value; `null` or `''` counts as empty
  * @param error the rendered error nodes from `useCommonProps`
  * @param schema the control schema; a `type` that includes `'null'` marks the field nullable

package/dist/jsonforms/lib/utils/nullOptionErrors.d.ts

@@ -0,0 +1,27 @@
+export declare const NULL_OPTION_ERRORS: Set<string>;
+export declare const REQUIRED_ERROR = "is a required property";
+/**
+ * The single source of truth for how an empty-capable single-value field treats its validation
+ * errors, shared by `useNullableErrorProps` (per field) and `useArrayHeaderErrors` (array header) so
+ * the two never drift:
+ *
+ * - `keep`: a non-empty value passes its errors through unchanged.
+ * - `drop-options`: an empty (`null` / `''`) value of a nullable field is valid, so the
+ *   option-mismatch errors ({@link NULL_OPTION_ERRORS}) are hidden.
+ * - `required`: an empty value of a non-nullable field is missing, so a single
+ *   {@link REQUIRED_ERROR} replaces whatever AJV reported.
+ *
+ * `value` is the current field value (`null` / `''` counts as empty), `nullable` whether the field
+ * schema permits `null`.
+ */
+export declare const nullableErrorAction: (value: unknown, nullable: boolean) => "keep" | "drop-options" | "required";
+/**
+ * Applies {@link nullableErrorAction} to a list of AJV error messages. Used by the array header,
+ * which works with the raw message strings of one field's errors (grouped by data path).
+ *
+ * `value` / `nullable` describe that field; `messages` are its error messages. Returns the messages
+ * to surface.
+ */
+export declare const resolveNullableErrorMessages: (value: unknown, nullable: boolean, messages: string[]) => string[];
+/** Whether a schema permits a `null` value (i.e. is nullable / optional). */
+export declare const isNullableSchemaType: (type: unknown) => boolean;

package/dist/jsonforms/lib/utils/nullOptionErrors.test.d.ts

@@ -0,0 +1 @@
+export {};