fastapi-rtk 2.5.0 → 2.6.0

package/dist/.bundled/jsonforms/cjs/packages/jsonforms/src/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/.bundled/jsonforms/cjs/packages/jsonforms/src/hooks/useArrayHeaderErrors.cjs

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const jsonformsCore_esm = require("../../../../../../../.external/cjs/@jsonforms_core@3.7.0/@jsonforms/core/lib/jsonforms-core.esm.cjs");
+const jsonformsReact_esm = require("../../../../../../../.external/cjs/@jsonforms_react@3.7.0_@jsonforms_core@3.7.0_react@19.2.3/@jsonforms/react/lib/jsonforms-react.esm.cjs");
+const React = require("react");
+const nullOptionErrors = require("../utils/nullOptionErrors.cjs");
+const useArrayHeaderErrors = (path, schema) => {
+  const { core } = jsonformsReact_esm.useJsonForms();
+  const errors = core == null ? void 0 : core.errors;
+  return React.useMemo(() => {
+    var _a;
+    if (!(errors == null ? void 0 : errors.length)) {
+      return "";
+    }
+    const scoped = jsonformsCore_esm.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 jsonformsCore_esm.formatErrorMessage(messages);
+  }, [errors, path, schema]);
+};
+exports.useArrayHeaderErrors = useArrayHeaderErrors;

package/dist/.bundled/jsonforms/cjs/packages/jsonforms/src/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/.bundled/jsonforms/cjs/packages/jsonforms/src/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 jsonformsCore_esm = require("../../../../../../../../.external/cjs/@jsonforms_core@3.7.0/@jsonforms/core/lib/jsonforms-core.esm.cjs");
 const core = 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.Stack, { children: [
     /* @__PURE__ */ jsxRuntime.jsx(
       ArrayToolbar.ArrayLayoutToolbar,
@@ -45,7 +46,7 @@ const Component = (props) => {
         translations,
         label: jsonformsCore_esm.computeLabel(label, required ?? false, appliedUiSchemaOptions.hideRequiredAsterisk),
         description,
-        errors,
+        errors: headerErrors,
         path,
         enabled,
         addItem,

package/dist/.bundled/jsonforms/cjs/packages/jsonforms/src/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/.bundled/jsonforms/esm/packages/jsonforms/src/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/.bundled/jsonforms/esm/packages/jsonforms/src/hooks/useArrayHeaderErrors.mjs

@@ -0,0 +1,44 @@
+import { errorsAt, formatErrorMessage } from "../../../../../../../.external/esm/@jsonforms_core@3.7.0/@jsonforms/core/lib/jsonforms-core.esm.mjs";
+import { useJsonForms } from "../../../../../../../.external/esm/@jsonforms_react@3.7.0_@jsonforms_core@3.7.0_react@19.2.3/@jsonforms/react/lib/jsonforms-react.esm.mjs";
+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/.bundled/jsonforms/esm/packages/jsonforms/src/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/.bundled/jsonforms/esm/packages/jsonforms/src/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 "../../../../../../../../.external/esm/@jsonforms_core@3.7.0/@jsonforms/core/lib/jsonforms-core.esm.mjs";
 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/.bundled/jsonforms/esm/packages/jsonforms/src/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/contexts/lib/ApiContext/ApiContext.d.ts

@@ -1,12 +1,13 @@
 import { SafeContextOptions } from 'fastapi-rtk/utils';
 import { ApiContextValue, ApiTypeOverrides, EntryRow, UseApiResult } from './types';
-export declare const ApiContextProvider: import('react').Provider<ApiContextValue<import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow> | null>, useApiProvider: (options?: SafeContextOptions<ApiContextValue<import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow>>) => ApiContextValue<import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow>;
+export declare const ApiContextProvider: import('react').Provider<ApiContextValue<import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, object> | null>, useApiProvider: (options?: SafeContextOptions<ApiContextValue<import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, object>>) => ApiContextValue<import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, import('fastapi-rtk/api-types').ResultRow, object>;
 /**
  * Access the API context.
  *
  * @typeParam TDefault - Uniform row/payload type applied to every operation. Defaults to the dynamic `EntryRow`.
  * @typeParam TOverrides - Per-operation overrides (`list` / `get` / `add` / `edit`); each replaces `TDefault` for that operation only.
+ * @typeParam TQuery - Custom query-param keys forwarded to the backend, surfaced typed on `queryParams` / `setQueryParams`.
  * @param options - Options for the context hook.
  * @returns The API context object, with `data`, `getEntry`, `addEntry`, `updateEntry`, etc. typed per operation.
  */
-export declare const useApi: <TDefault = EntryRow, TOverrides extends ApiTypeOverrides = ApiTypeOverrides>(options?: SafeContextOptions<UseApiResult<TDefault, TOverrides>>) => UseApiResult<TDefault, TOverrides>;
+export declare const useApi: <TDefault = EntryRow, TOverrides extends ApiTypeOverrides = ApiTypeOverrides, TQuery extends object = object>(options?: SafeContextOptions<UseApiResult<TDefault, TOverrides, TQuery>>) => UseApiResult<TDefault, TOverrides, TQuery>;

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

@@ -121,8 +121,9 @@ export type OpType<TOverrides extends ApiTypeOverrides, K extends keyof ApiTypeO
  * @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`.
+ * @typeParam TQuery - Custom query-param keys forwarded to the backend, intersected onto `queryParams` and `setQueryParams`.
  */
-export interface ApiContextValue<TList = EntryRow, TGet = EntryRow, TAdd = EntryRow, TEdit = EntryRow> {
+export interface ApiContextValue<TList = EntryRow, TGet = EntryRow, TAdd = EntryRow, TEdit = EntryRow, TQuery extends object = object> {
     /** The API path. */
     path: string;
     /** Information about the API, including schemas, UI schemas, and the normalized add/edit form blocks. */
@@ -130,7 +131,7 @@ export interface ApiContextValue<TList = EntryRow, TGet = EntryRow, TAdd = Entry
     /** The data returned by the API. */
     data?: APIData<TList>;
     /** The query parameters used in the API request. */
-    queryParams?: APIQueryParams;
+    queryParams?: APIQueryParams & TQuery;
     /** Indicates whether the API request is currently loading. */
     loading: boolean;
     /** Indicates whether the API info request is currently loading. */
@@ -154,7 +155,7 @@ export interface ApiContextValue<TList = EntryRow, TGet = EntryRow, TAdd = Entry
     /** An object containing special keys for the API query, such as 'all' and 'actions'. */
     specialKey: APISpecialKey;
     /** A function to update the query parameters. */
-    setQueryParams: (partialQueryParams: Partial<APIQueryParams> | ((prev: APIQueryParams) => Partial<APIQueryParams>)) => void;
+    setQueryParams: (partialQueryParams: Partial<APIQueryParams & TQuery> | ((prev: APIQueryParams & TQuery) => Partial<APIQueryParams & TQuery>)) => void;
     /** A function to refetch the data from the API. */
     refetch: (options?: {
         force?: boolean;
@@ -185,7 +186,7 @@ export interface ApiContextValue<TList = EntryRow, TGet = EntryRow, TAdd = Entry
     resetError: () => void;
 }
 /**
- * The `ApiContextValue` returned by `useApi<TDefault, TOverrides>`: the uniform `TDefault` applied to
- * every operation, with any `TOverrides` keys replacing it per operation.
+ * The `ApiContextValue` returned by `useApi<TDefault, TOverrides, TQuery>`: the uniform `TDefault` applied to
+ * every operation, with any `TOverrides` keys replacing it per operation, and `TQuery` adding custom query-param keys.
  */
-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>>;
+export type UseApiResult<TDefault = EntryRow, TOverrides extends ApiTypeOverrides = ApiTypeOverrides, TQuery extends object = object> = ApiContextValue<OpType<TOverrides, 'list', TDefault>, OpType<TOverrides, 'get', TDefault>, OpType<TOverrides, 'add', TDefault>, OpType<TOverrides, 'edit', TDefault>, TQuery>;

package/dist/core/lib/Wrappers/ApiProvider/ApiProvider.d.ts

@@ -3,7 +3,7 @@ import { ApiProviderProps, WithApiProviderOptions } from './types';
 /**
  * Provides the API context, bulk actions context, and form contexts to its children.
  */
-export declare function ApiProvider(props: ApiProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function ApiProvider<TQuery extends object = object>(props: ApiProviderProps<TQuery>): import("react/jsx-runtime").JSX.Element;
 /**
  * Higher-order component to wrap a component with ApiProvider.
  *

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

@@ -3,12 +3,18 @@ import { InfiniteData, QueryKey, UseInfiniteQueryOptions, UseQueryOptions } from
 import { PropsWithChildren } from 'react';
 import { InfoQueryData, RelationParam } from './hooks/types';
 import { QueryParams } from './utils/types';
-/** Props accepted by the `ApiProvider` component. */
-export type ApiProviderProps = PropsWithChildren<{
+/**
+ * Props accepted by the `ApiProvider` component.
+ *
+ * @typeParam TQuery - Custom query-param keys forwarded to the backend (read off `request.query_params`).
+ *   Surfaced typed on `initialQueryParams`; pass the same shape to `useApi<…, TQuery>()` to type `queryParams` /
+ *   `setQueryParams` (React context cannot carry the Provider's type param to a distant `useApi` call).
+ */
+export type ApiProviderProps<TQuery extends object = object> = PropsWithChildren<{
     /** The name of the resource to be used in the API path. */
     resource_name?: string;
-    /** The initial query parameters to be used in the API requests. */
-    initialQueryParams?: QueryParams;
+    /** The initial query parameters to be used in the API requests. May include custom keys (typed via `TQuery`) forwarded to the backend. */
+    initialQueryParams?: QueryParams & Partial<TQuery>;
     /** The relation to be used in the API requests. */
     relation?: RelationParam;
     /** Whether to fetch the `info` for the API requests when the component mounts. */

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 {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastapi-rtk",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "private": false,
   "description": "A React component library for FastAPI in combination with FastAPI React Toolkit backend, built with Mantine, JsonForms, and Zustand.",
   "license": "MIT",