@firecms/core 3.3.0 → 3.4.0-canary.2575a08

package/src/hooks/data/useEntityFetch.tsx

@@ -3,12 +3,21 @@ import { Entity, EntityCollection, FireCMSContext, User } from "../../types";
 import { useDataSource } from "./useDataSource";
 import { useNavigationController } from "../useNavigationController";
 import { useFireCMSContext } from "../useFireCMSContext";
+import { entityCacheKey } from "../../util/entity_cache";
 
 /**
  * @group Hooks and utilities
  */
 export interface EntityFetchProps<M extends Record<string, any>, USER extends User = User> {
     path: string;
+    /**
+     * `path` split at its real segment boundaries. Forwarded to the datasource so a parent
+     * entity id containing "/" stays unambiguous.
+     *
+     * Optional, and never derived by splitting `path` — a guess would be wrong in exactly
+     * the case the field exists for. Absent means "not known here", not "no slashes".
+     */
+    pathSegments?: string[];
     entityId?: string;
     databaseId?: string;
     collection: EntityCollection<M, USER>;
@@ -39,6 +48,7 @@ const CACHE: Record<string, Entity<any> | undefined> = {};
 export function useEntityFetch<M extends Record<string, any>, USER extends User>(
     {
         path: inputPath,
+        pathSegments: inputPathSegments,
         entityId,
         collection,
         databaseId,
@@ -48,7 +58,19 @@ export function useEntityFetch<M extends Record<string, any>, USER extends User>
     const dataSource = useDataSource(collection);
     const navigationController = useNavigationController();
 
-    const path = navigationController.resolveIdsFrom(inputPath);
+    // Never fabricate segments. If the caller did not thread them, pass undefined so a
+    // delegate can tell "not provided" from a real answer — splitting `path` here would
+    // produce a confidently wrong array for any id containing "/".
+    //
+    // When they were threaded, both representations are resolved from them together, so
+    // `path` cannot end up describing a different chain than `pathSegments`.
+    // `resolveSegmentsFrom` is optional on the controller: a host app may be supplying one
+    // built against an earlier version. Falling back to the segments as given is what
+    // happened before it existed — they are used unresolved, never invented.
+    const pathSegments = inputPathSegments
+        ? (navigationController.resolveSegmentsFrom?.(inputPathSegments) ?? inputPathSegments)
+        : undefined;
+    const path = navigationController.resolveIdsFrom(inputPath, inputPathSegments);
 
     const context: FireCMSContext<USER> = useFireCMSContext();
 
@@ -61,11 +83,18 @@ export function useEntityFetch<M extends Record<string, any>, USER extends User>
         setDataLoading(true);
 
         const onEntityUpdate = async (updatedEntity: Entity<M> | undefined) => {
+            // Attach the segments this entity was loaded with, so anything derived from it
+            // later — a reference, a delete — stays resolvable without re-deriving them
+            // from the flattened path. Delegates are not required to set this themselves.
+            if (updatedEntity && pathSegments && !updatedEntity.pathSegments) {
+                updatedEntity = { ...updatedEntity, pathSegments };
+            }
             if (collection.callbacks?.onFetch && updatedEntity) {
                 try {
                     updatedEntity = await collection.callbacks.onFetch({
                         collection,
                         path,
+                        pathSegments,
                         entity: updatedEntity,
                         context
                     });
@@ -73,7 +102,7 @@ export function useEntityFetch<M extends Record<string, any>, USER extends User>
                     console.error(e);
                 }
             }
-            CACHE[`${path}/${entityId}`] = updatedEntity;
+            CACHE[entityCacheKey(path, entityId)] = updatedEntity;
             setEntity(updatedEntity);
             setDataLoading(false);
             setDataLoadingError(undefined);
@@ -86,8 +115,8 @@ export function useEntityFetch<M extends Record<string, any>, USER extends User>
             setDataLoadingError(error);
         };
 
-        if (entityId && useCache && CACHE[`${path}/${entityId}`]) {
-            setEntity(CACHE[`${path}/${entityId}`]);
+        if (entityId && useCache && CACHE[entityCacheKey(path, entityId)]) {
+            setEntity(CACHE[entityCacheKey(path, entityId)]);
             setDataLoading(false);
             setDataLoadingError(undefined);
             // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -97,6 +126,7 @@ export function useEntityFetch<M extends Record<string, any>, USER extends User>
             if (dataSource.listenEntity) {
                 return dataSource.listenEntity<M>({
                     path,
+                    pathSegments,
                     entityId,
                     databaseId,
                     collection,
@@ -106,6 +136,7 @@ export function useEntityFetch<M extends Record<string, any>, USER extends User>
             } else {
                 dataSource.fetchEntity<M>({
                     path,
+                    pathSegments,
                     entityId,
                     databaseId,
                     collection

package/src/hooks/useBuildNavigationController.tsx

@@ -22,11 +22,14 @@ import {
 } from "../types";
 import {
     applyPermissionsFunctionIfEmpty,
+    collectionSegmentsFrom,
+    fullPathToCollectionSegments,
     getCollectionByPathOrId,
     mergeDeep,
     removeFunctions,
     removeInitialAndTrailingSlashes,
     resolveCollectionPathIds,
+    resolveCollectionPathSegments,
     resolvePermissions
 } from "../util";
 import { getParentReferencesFromPath } from "../util/parent_references_from_path";
@@ -405,13 +408,14 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
 
     const getCollection = useCallback((
         idOrPath: string,
-        includeUserOverride = false
+        includeUserOverride = false,
+        pathSegments?: string[]
     ): EC | undefined => {
         const collections = collectionsRef.current;
         if (!collections)
             return undefined;
 
-        const baseCollection = getCollectionByPathOrId(removeInitialAndTrailingSlashes(idOrPath), collections);
+        const baseCollection = getCollectionByPathOrId(removeInitialAndTrailingSlashes(idOrPath), collections, pathSegments);
 
         const userOverride = includeUserOverride ? userConfigPersistence?.getCollectionConfig(idOrPath) : undefined;
         let overriddenCollection = baseCollection;
@@ -505,23 +509,33 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
         throw Error("Expected path starting with " + fullCollectionPath);
     }, [fullCollectionPath]);
 
-    const resolveIdsFrom = useCallback((path: string): string => {
+    const resolveIdsFrom = useCallback((path: string, pathSegments?: string[]): string => {
         const collections = collectionsRef.current ?? [];
-        return resolveCollectionPathIds(path, collections);
+        return resolveCollectionPathIds(path, collections, pathSegments);
     }, []);
 
-    const getAllParentReferencesForPath = useCallback((path: string): EntityReference[] => {
+    const resolveSegmentsFrom = useCallback((pathSegments: string[]): string[] => {
+        const collections = collectionsRef.current ?? [];
+        return resolveCollectionPathSegments(pathSegments, collections);
+    }, []);
+
+    const getAllParentReferencesForPath = useCallback((path: string, pathSegments?: string[]): EntityReference[] => {
         const collections = collectionsRef.current ?? [];
         return getParentReferencesFromPath({
             path,
+            pathSegments,
             collections
         });
     }, []);
 
-    const getParentCollectionIds = useCallback((path: string): string[] => {
+    const getParentCollectionIds = useCallback((path: string, pathSegments?: string[]): string[] => {
 
-        const strings = path.split("/");
-        const oddPathSegments = strings.filter((_, i) => i % 2 === 0);
+        // Positional filtering only picks out the collection segments while no entity id
+        // contains "/"; with one, every following segment shifts. Given the real boundaries
+        // the same rule applies correctly; without them this is the historical reading.
+        const oddPathSegments = pathSegments
+            ? collectionSegmentsFrom(pathSegments)
+            : fullPathToCollectionSegments(path);
         oddPathSegments.pop();
 
         const result: string[][] = [];
@@ -567,6 +581,7 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
         urlPathToDataPath,
         buildUrlCollectionPath,
         resolveIdsFrom,
+        resolveSegmentsFrom,
         topLevelNavigation,
         refreshNavigation,
         getParentReferencesFromPath: getAllParentReferencesForPath,

package/src/hooks/useResolvedNavigationFrom.tsx

@@ -80,12 +80,14 @@ export function resolveNavigationFrom<M extends Record<string, any>, USER extend
             if (entry.type === "collection") {
                 return Promise.resolve(entry);
             } else if (entry.type === "entity") {
-                const collection = navigation.getCollection(entry.path);
+                const collection = navigation.getCollection(entry.path, false, entry.pathSegments);
                 if (!collection) {
                     throw Error(`No collection defined in the navigation for the entity with path ${entry.path}`);
                 }
                 return dataSource.fetchEntity({
                     path: entry.path,
+                    // The navigation entry already knows the real segment boundaries.
+                    pathSegments: entry.pathSegments,
                     entityId: entry.entityId,
                     collection
                 })

package/src/hooks/useValidateAuthenticator.tsx

@@ -74,6 +74,10 @@ export function useValidateAuthenticator<USER extends User = any>
 
         if (authenticator instanceof Function && delegateUser && !equal(checkedUserRef.current?.uid, delegateUser.uid)) {
             setAuthLoading(true);
+            // Reset the error of any previous authentication attempt. Otherwise, a
+            // rejected user would keep `canAccessMainView` to false for every user
+            // logging in afterwards, locking them out of the CMS until a page reload.
+            setNotAllowedError(false);
             try {
                 const allowed = await authenticator({
                     user: delegateUser,

package/src/i18n/FireCMSi18nProvider.tsx

@@ -1,6 +1,6 @@
-import React, { PropsWithChildren, useEffect, useRef } from "react";
+import React, { PropsWithChildren, useContext, useEffect, useMemo, useRef } from "react";
 import i18next, { i18n } from "i18next";
-import { I18nextProvider, initReactI18next } from "react-i18next";
+import { I18nContext, I18nextProvider, initReactI18next } from "react-i18next";
 import { en } from "../locales/en";
 import { es } from "../locales/es";
 import { de } from "../locales/de";
@@ -8,6 +8,7 @@ import { fr } from "../locales/fr";
 import { it } from "../locales/it";
 import { hi } from "../locales/hi";
 import { pt } from "../locales/pt";
+import { pl } from "../locales/pl";
 import { FireCMSTranslations } from "../types/translations";
 
 const FIRECMS_NS = "firecms_core";
@@ -49,16 +50,48 @@ export function FireCMSi18nProvider({
     translations,
     children
 }: PropsWithChildren<FireCMSi18nProviderProps>) {
+
+    // A FireCMS i18next instance already in context means this provider is nested —
+    // e.g. FireCMSCloudApp mounts one inside the one the host app already mounted.
+    // A second instance built only from the defaults would shadow the parent's and
+    // silently drop every translation the host registered, leaving the host's own
+    // strings to render as raw keys.
+    //
+    // So the nested instance is *seeded* from the parent's resources rather than
+    // sharing them. Sharing one mutable instance was the obvious alternative and is
+    // wrong: bundles added by one provider outlive it, so opening one project's app
+    // and then switching to another left the first project's translations answering
+    // for keys the second never defined. Copying keeps each provider's strings to
+    // itself, which is also how this behaved before nesting was handled at all.
+    const parentI18n = useContext(I18nContext)?.i18n;
+    const parentInstance = parentI18n?.hasResourceBundle?.("en", FIRECMS_NS)
+        ? parentI18n
+        : undefined;
+
     const i18nRef = useRef<i18n | null>(null);
     const [ready, setReady] = React.useState(false);
 
     if (!i18nRef.current) {
         const instance = i18next.createInstance();
 
-        // Build the initial resources: English baseline + any consumer overrides
+        // English baseline + this provider's overrides, with anything the parent
+        // already resolved layered in underneath the overrides.
         const resources = buildResources(translations);
+        if (parentInstance) {
+            const inherited: Record<string, any> = parentInstance.services?.resourceStore?.data ?? {};
+            for (const [lang, namespaces] of Object.entries(inherited)) {
+                const bundle = (namespaces as any)?.[FIRECMS_NS];
+                if (!bundle) continue;
+                resources[lang] = {
+                    [FIRECMS_NS]: {
+                        ...bundle,
+                        ...(translations?.[lang] ?? {})
+                    }
+                };
+            }
+        }
 
-        let initialLocale = locale;
+        let initialLocale = parentInstance?.language ?? locale;
         if (typeof window !== "undefined") {
             const stored = localStorage.getItem(FIRECMS_LOCALE_STORAGE_KEY);
             if (stored) initialLocale = stored;
@@ -89,6 +122,18 @@ export function FireCMSi18nProvider({
         i18nRef.current = instance;
     }
 
+    // Follow the parent's language, so a switch made outside this provider is not
+    // stranded on the other side of the boundary.
+    useEffect(() => {
+        if (!parentInstance || !i18nRef.current) return;
+        const instance = i18nRef.current;
+        const follow = (lng: string) => {
+            if (instance.language !== lng) instance.changeLanguage(lng);
+        };
+        parentInstance.on("languageChanged", follow);
+        return () => { parentInstance.off("languageChanged", follow); };
+    }, [parentInstance]);
+
     // When `locale` prop changes, switch language on the existing instance
     // ONLY if the user hasn't explicitly set a preference
     useEffect(() => {
@@ -139,6 +184,7 @@ function buildResources(
         it: { [FIRECMS_NS]: { ...it } },
         hi: { [FIRECMS_NS]: { ...hi } },
         pt: { [FIRECMS_NS]: { ...pt } },
+        pl: { [FIRECMS_NS]: { ...pl } },
     };
 
     if (!translations) return resources;

package/src/i18n/__tests__/FireCMSi18nProvider.test.tsx

@@ -0,0 +1,91 @@
+/**
+ * @jest-environment jsdom
+ */
+import React from "react";
+import { render, screen } from "@testing-library/react";
+import { useTranslation } from "react-i18next";
+import { FireCMSi18nProvider } from "../FireCMSi18nProvider";
+
+/** Reads a key through the same channel application code uses. */
+function Str({ k }: { k: string }) {
+    const { t } = useTranslation("firecms_core");
+    return <span data-testid={k}>{t(k)}</span>;
+}
+
+const HOST_TRANSLATIONS = {
+    en: {
+        host_only_key: "Explore your Firestore data",
+        save: "Publish"      // an override of a real core key
+    }
+} as any;
+
+describe("FireCMSi18nProvider", () => {
+
+    beforeEach(() => {
+        window.localStorage.clear();
+    });
+
+    it("resolves its own translations", () => {
+        render(
+            <FireCMSi18nProvider translations={HOST_TRANSLATIONS}>
+                <Str k={"host_only_key"}/>
+            </FireCMSi18nProvider>
+        );
+        expect(screen.getByTestId("host_only_key").textContent).toBe("Explore your Firestore data");
+    });
+
+    it("keeps the host's translations when a nested provider is mounted without any", () => {
+        // This is the FireCMSCloudApp case: it mounts its own provider with
+        // `translations={appConfig?.translations}`, which is undefined for every
+        // project that has not deployed custom code. A nested provider that built its
+        // own isolated instance would shadow the host's and render the raw key.
+        render(
+            <FireCMSi18nProvider translations={HOST_TRANSLATIONS}>
+                <FireCMSi18nProvider translations={undefined}>
+                    <Str k={"host_only_key"}/>
+                </FireCMSi18nProvider>
+            </FireCMSi18nProvider>
+        );
+        expect(screen.getByTestId("host_only_key").textContent).toBe("Explore your Firestore data");
+        expect(screen.getByTestId("host_only_key").textContent).not.toBe("host_only_key");
+    });
+
+    it("does not let a nested provider clobber a host override", () => {
+        render(
+            <FireCMSi18nProvider translations={HOST_TRANSLATIONS}>
+                <FireCMSi18nProvider translations={undefined}>
+                    <Str k={"save"}/>
+                </FireCMSi18nProvider>
+            </FireCMSi18nProvider>
+        );
+        expect(screen.getByTestId("save").textContent).toBe("Publish");
+    });
+
+    it("lets a nested provider add its own translations on top of the host's", () => {
+        render(
+            <FireCMSi18nProvider translations={HOST_TRANSLATIONS}>
+                <FireCMSi18nProvider translations={{ en: { nested_key: "From the nested provider" } } as any}>
+                    <>
+                        <Str k={"host_only_key"}/>
+                        <Str k={"nested_key"}/>
+                    </>
+                </FireCMSi18nProvider>
+            </FireCMSi18nProvider>
+        );
+        expect(screen.getByTestId("host_only_key").textContent).toBe("Explore your Firestore data");
+        expect(screen.getByTestId("nested_key").textContent).toBe("From the nested provider");
+    });
+
+    it("still serves the built-in core strings through a nested provider", () => {
+        render(
+            <FireCMSi18nProvider>
+                <FireCMSi18nProvider translations={undefined}>
+                    <Str k={"discard"}/>
+                </FireCMSi18nProvider>
+            </FireCMSi18nProvider>
+        );
+        const el = screen.getByTestId("discard");
+        expect(el.textContent).not.toBe("discard");
+        expect(el.textContent?.length).toBeGreaterThan(0);
+    });
+});

package/src/i18n/__tests__/nested_provider_lifecycle.test.tsx

@@ -0,0 +1,67 @@
+/**
+ * @jest-environment jsdom
+ */
+import React from "react";
+import { render, screen } from "@testing-library/react";
+import { useTranslation } from "react-i18next";
+import { FireCMSi18nProvider } from "../FireCMSi18nProvider";
+
+function Str({ k }: { k: string }) {
+    const { t } = useTranslation("firecms_core");
+    return <span data-testid={k}>{t(k)}</span>;
+}
+
+const host = { en: { host_key: "Host" } } as any;
+const projectA = { en: { only_in_a: "From project A" } } as any;
+const projectB = { en: { only_in_b: "From project B" } } as any;
+
+describe("nested provider lifecycle", () => {
+    beforeEach(() => window.localStorage.clear());
+
+    it("does not carry one project's translations into the next", () => {
+        // The real shape of a project switch: App.tsx's provider stays mounted while
+        // FireCMSCloudApp's inner one is torn down and rebuilt with another project's
+        // translations. Both share the outer i18next instance now, so anything the
+        // first project added could outlive it.
+        const { rerender } = render(
+            <FireCMSi18nProvider translations={host}>
+                <FireCMSi18nProvider key={"a"} translations={projectA}>
+                    <Str k={"only_in_a"}/>
+                </FireCMSi18nProvider>
+            </FireCMSi18nProvider>
+        );
+        expect(screen.getByTestId("only_in_a").textContent).toBe("From project A");
+
+        rerender(
+            <FireCMSi18nProvider translations={host}>
+                <FireCMSi18nProvider key={"b"} translations={projectB}>
+                    <>
+                        <Str k={"only_in_b"}/>
+                        <Str k={"only_in_a"}/>
+                    </>
+                </FireCMSi18nProvider>
+            </FireCMSi18nProvider>
+        );
+
+        expect(screen.getByTestId("only_in_b").textContent).toBe("From project B");
+        expect(screen.getByTestId("only_in_a").textContent).toBe("only_in_a");
+    });
+
+    it("keeps the host's own translations across the switch", () => {
+        const { rerender } = render(
+            <FireCMSi18nProvider translations={host}>
+                <FireCMSi18nProvider key={"a"} translations={projectA}>
+                    <Str k={"host_key"}/>
+                </FireCMSi18nProvider>
+            </FireCMSi18nProvider>
+        );
+        rerender(
+            <FireCMSi18nProvider translations={host}>
+                <FireCMSi18nProvider key={"b"} translations={projectB}>
+                    <Str k={"host_key"}/>
+                </FireCMSi18nProvider>
+            </FireCMSi18nProvider>
+        );
+        expect(screen.getByTestId("host_key").textContent).toBe("Host");
+    });
+});

package/src/internal/useBuildDataSource.ts

@@ -55,6 +55,7 @@ export function useBuildDataSource({
          */
         fetchCollection: useCallback(<M extends Record<string, any>>({
             path,
+            pathSegments,
             collection,
             filter,
             limit,
@@ -67,6 +68,7 @@ export function useBuildDataSource({
             const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
             return usedDelegate.fetchCollection<M>({
                 path,
+                pathSegments,
                 filter,
                 limit,
                 startAfter,
@@ -97,6 +99,7 @@ export function useBuildDataSource({
             ? useCallback(<M extends Record<string, any>>(
                 {
                     path,
+                    pathSegments,
                     collection: collectionProp,
                     filter,
                     limit,
@@ -109,7 +112,7 @@ export function useBuildDataSource({
                 }: ListenCollectionProps<M>
             ): () => void => {
 
-                const collection = collectionProp ?? navigationController.getCollection(path);
+                const collection = collectionProp ?? navigationController.getCollection(path, false, pathSegments);
                 const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
 
                 if (!usedDelegate.listenCollection)
@@ -117,6 +120,7 @@ export function useBuildDataSource({
 
                 return usedDelegate.listenCollection<M>({
                     path,
+                    pathSegments,
                     filter,
                     limit,
                     startAfter,
@@ -139,6 +143,7 @@ export function useBuildDataSource({
          */
         fetchEntity: useCallback(<M extends Record<string, any>>({
             path,
+            pathSegments,
             entityId,
             collection
         }: FetchEntityProps<M>
@@ -146,6 +151,7 @@ export function useBuildDataSource({
             const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
             return usedDelegate.fetchEntity({
                 path,
+                pathSegments,
                 entityId,
                 collection
             });
@@ -165,6 +171,7 @@ export function useBuildDataSource({
             ? useCallback(<M extends Record<string, any>>(
                 {
                     path,
+                    pathSegments,
                     entityId,
                     collection,
                     onUpdate,
@@ -177,6 +184,7 @@ export function useBuildDataSource({
 
                 return usedDelegate.listenEntity<M>({
                     path,
+                    pathSegments,
                     entityId,
                     onUpdate,
                     onError,
@@ -198,13 +206,14 @@ export function useBuildDataSource({
         saveEntity: useCallback(async <M extends Record<string, any>>(
             {
                 path,
+                pathSegments,
                 entityId,
                 values,
                 collection: collectionProp,
                 status
             }: SaveEntityProps<M>): Promise<Entity<M>> => {
 
-            const collection = collectionProp ?? navigationController.getCollection(path);
+            const collection = collectionProp ?? navigationController.getCollection(path, false, pathSegments);
             const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
 
             const resolvedCollection = collection
@@ -244,6 +253,7 @@ export function useBuildDataSource({
                         try {
                             const entities = await usedDelegate.fetchCollection({
                                 path,
+                                pathSegments,
                                 orderBy: orderProperty,
                                 order: "asc",
                                 limit: 1,
@@ -270,14 +280,21 @@ export function useBuildDataSource({
 
             return usedDelegate.saveEntity({
                 path,
+                pathSegments,
                 collection,
                 entityId,
                 values: finalValues,
                 status
             }).then((res) => {
+                // Keep everything the delegate resolved — `databaseId`, and `pathSegments` in
+                // particular — so a just-saved entity is as resolvable as a fetched one.
+                // Only the values are re-mapped back to the CMS model.
                 return {
-                    id: res.id,
-                    path: res.path,
+                    ...res,
+                    // A delegate that predates `pathSegments` returns none; the segments we
+                    // just saved with describe exactly this entity's collection, so they are
+                    // the authoritative answer rather than a guess.
+                    pathSegments: res.pathSegments ?? pathSegments,
                     values: usedDelegate.delegateToCMSModel(finalValues)
                 } as Entity<M>;
             });
@@ -292,12 +309,15 @@ export function useBuildDataSource({
         deleteEntity: useCallback(<M extends Record<string, any>>(
             {
                 entity,
+                pathSegments,
                 collection
             }: DeleteEntityProps<M>
         ): Promise<void> => {
             const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
             return usedDelegate.deleteEntity({
                 entity,
+                // Falls back to what the entity carries from the fetch that produced it.
+                pathSegments: pathSegments ?? entity.pathSegments,
                 collection
             });
         }, [delegate.deleteEntity]),
@@ -317,33 +337,32 @@ export function useBuildDataSource({
             name: string,
             value: any,
             entityId?: string,
-            collection?: EntityCollection
+            collection?: EntityCollection,
+            pathSegments?: string[]
         ): Promise<boolean> => {
             const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
-            return usedDelegate.checkUniqueField(path, name, value, entityId, collection);
+            return usedDelegate.checkUniqueField(path, name, value, entityId, collection, pathSegments);
         }, [delegate.checkUniqueField]),
 
-        generateEntityId: useCallback((path: string, collection: EntityCollection): string => {
+        generateEntityId: useCallback((path: string, collection: EntityCollection, pathSegments?: string[]): string => {
             const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
-            return usedDelegate.generateEntityId(path, collection);
+            return usedDelegate.generateEntityId(path, collection, pathSegments);
         }, [delegate.generateEntityId]),
 
+        // Typed with the declared props rather than an inline duplicate: the duplicate is
+        // free to drift from the interface, and a field it forgets is dropped in silence.
         countEntities: delegate.countEntities ? async ({
             path,
+            pathSegments,
             collection,
             filter,
             order,
             orderBy
-        }: {
-            path: string,
-            collection: EntityCollection<any>,
-            filter?: FilterValues<Extract<keyof any, string>>,
-            orderBy?: string,
-            order?: "desc" | "asc",
-        }): Promise<number> => {
+        }: FetchCollectionProps<any>): Promise<number> => {
             const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
             return usedDelegate.countEntities!({
                 path,
+                pathSegments,
                 filter,
                 orderBy,
                 order,
@@ -353,11 +372,13 @@ export function useBuildDataSource({
 
         isFilterCombinationValid: useCallback(({
             path,
+            pathSegments,
             databaseId,
             filterValues,
             sortBy
         }: {
             path: string,
+            pathSegments?: string[],
             databaseId?: string,
             filterValues: FilterValues<any>,
             sortBy?: [string, "asc" | "desc"]
@@ -367,6 +388,7 @@ export function useBuildDataSource({
             return delegate.isFilterCombinationValid(
                 {
                     path,
+                    pathSegments,
                     databaseId,
                     filterValues,
                     sortBy