@refinedev/core 4.44.2 → 4.44.4

package/dist/interfaces/live/LiveEvent.d.ts

@@ -1,4 +1,4 @@
-import { BaseKey } from "..";
+import { BaseKey, MetaQuery } from "..";
 export declare type LiveEvent = {
     channel: string;
     type: "deleted" | "updated" | "created" | "*" | string;
@@ -7,5 +7,8 @@ export declare type LiveEvent = {
         [x: string]: any;
     };
     date: Date;
+    meta?: MetaQuery & {
+        dataProviderName?: string;
+    };
 };
 //# sourceMappingURL=LiveEvent.d.ts.map

package/dist/interfaces/live/LiveEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LiveEvent.d.ts","sourceRoot":"","sources":["../../../src/interfaces/live/LiveEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,oBAAY,SAAS,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC;IACvD,OAAO,EAAE;QACL,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,IAAI,CAAC;CACd,CAAC"}
+{"version":3,"file":"LiveEvent.d.ts","sourceRoot":"","sources":["../../../src/interfaces/live/LiveEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAExC,oBAAY,SAAS,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC;IACvD,OAAO,EAAE;QACL,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,SAAS,GAAG;QACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;CACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@refinedev/core",
-  "version": "4.44.2",
+  "version": "4.44.4",
   "description": "refine is a React-based framework for building internal tools, rapidly. It ships with Ant Design System, an enterprise-level UI toolkit.",
   "private": false,
   "sideEffects": false,

package/src/contexts/live/ILiveContext.ts

@@ -15,6 +15,9 @@ export type ILiveContext =
               params?: {
                   ids?: BaseKey[];
                   id?: BaseKey;
+                  /**
+                   * @deprecated `params.meta` is depcerated. Use `meta` directly from the root level instead.
+                   */
                   meta?: MetaQuery;
                   /**
                    * @deprecated `metaData` is deprecated with refine@4, refine will pass `meta` instead, however, we still support `metaData` for backward compatibility.
@@ -36,7 +39,11 @@ export type ILiveContext =
                   [key: string]: any;
               };
               types: LiveEvent["type"][];
+              /**
+               * @deprecated use `meta.dataProviderName` instead.
+               */
               dataProviderName?: string;
+              meta?: MetaQuery & { dataProviderName?: string };
               callback: (event: LiveEvent) => void;
           }) => any;
           unsubscribe: (subscription: any) => void;

package/src/hooks/data/useCreate.ts

@@ -170,7 +170,7 @@ export const useCreate = <
                 {
                     resource: resourceName,
                     successNotification: successNotificationFromProp,
-                    dataProviderName,
+                    dataProviderName: dataProviderNameFromProp,
                     invalidates = ["list", "many"],
                     values,
                     meta,
@@ -178,9 +178,19 @@ export const useCreate = <
                 },
             ) => {
                 const { resource, identifier } = select(resourceName);
-
                 const resourceSingular = textTransformers.singular(identifier);
 
+                const dataProviderName = pickDataProvider(
+                    identifier,
+                    dataProviderNameFromProp,
+                    resources,
+                );
+
+                const combinedMeta = getMeta({
+                    resource,
+                    meta: pickNotDeprecated(meta, metaData),
+                });
+
                 const notificationConfig =
                     typeof successNotificationFromProp === "function"
                         ? successNotificationFromProp(data, values, identifier)
@@ -204,11 +214,7 @@ export const useCreate = <
 
                 invalidateStore({
                     resource: identifier,
-                    dataProviderName: pickDataProvider(
-                        identifier,
-                        dataProviderName,
-                        resources,
-                    ),
+                    dataProviderName,
                     invalidates,
                 });
 
@@ -219,26 +225,24 @@ export const useCreate = <
                         ids: data?.data?.id ? [data.data.id] : undefined,
                     },
                     date: new Date(),
+                    meta: {
+                        ...combinedMeta,
+                        dataProviderName,
+                    },
                 });
 
-                const combinedMeta = getMeta({
-                    resource,
-                    meta: pickNotDeprecated(meta, metaData),
-                });
-
-                const { fields, operation, variables, ...rest } =
-                    combinedMeta || {};
-
+                const {
+                    fields: _fields,
+                    operation: _operation,
+                    variables: _variables,
+                    ...rest
+                } = combinedMeta || {};
                 log?.mutate({
                     action: "create",
                     resource: resource.name,
                     data: values,
                     meta: {
-                        dataProviderName: pickDataProvider(
-                            identifier,
-                            dataProviderName,
-                            resources,
-                        ),
+                        dataProviderName,
                         id: data?.data?.id ?? undefined,
                         ...rest,
                     },

package/src/hooks/data/useCreateMany.ts

@@ -158,7 +158,7 @@ export const useCreateMany = <
                 {
                     resource: resourceName,
                     successNotification,
-                    dataProviderName,
+                    dataProviderName: dataProviderNameFromProp,
                     invalidates = ["list", "many"],
                     values,
                     meta,
@@ -166,9 +166,19 @@ export const useCreateMany = <
                 },
             ) => {
                 const { resource, identifier } = select(resourceName);
-
                 const resourcePlural = textTransformers.plural(identifier);
 
+                const dataProviderName = pickDataProvider(
+                    identifier,
+                    dataProviderNameFromProp,
+                    resources,
+                );
+
+                const combinedMeta = getMeta({
+                    resource,
+                    meta: pickNotDeprecated(meta, metaData),
+                });
+
                 const notificationConfig =
                     typeof successNotification === "function"
                         ? successNotification(response, values, identifier)
@@ -192,18 +202,13 @@ export const useCreateMany = <
 
                 invalidateStore({
                     resource: identifier,
-                    dataProviderName: pickDataProvider(
-                        identifier,
-                        dataProviderName,
-                        resources,
-                    ),
+                    dataProviderName,
                     invalidates,
                 });
 
                 const ids = response?.data
                     .filter((item) => item?.id !== undefined)
                     .map((item) => item.id!);
-
                 publish?.({
                     channel: `resources/${resource.name}`,
                     type: "created",
@@ -211,26 +216,24 @@ export const useCreateMany = <
                         ids,
                     },
                     date: new Date(),
+                    meta: {
+                        ...combinedMeta,
+                        dataProviderName,
+                    },
                 });
 
-                const combinedMeta = getMeta({
-                    resource,
-                    meta: pickNotDeprecated(meta, metaData),
-                });
-
-                const { fields, operation, variables, ...rest } =
-                    combinedMeta || {};
-
+                const {
+                    fields: _fields,
+                    operation: _operation,
+                    variables: _variables,
+                    ...rest
+                } = combinedMeta || {};
                 log?.mutate({
                     action: "createMany",
                     resource: resource.name,
                     data: values,
                     meta: {
-                        dataProviderName: pickDataProvider(
-                            identifier,
-                            dataProviderName,
-                            resources,
-                        ),
+                        dataProviderName,
                         ids,
                         ...rest,
                     },

package/src/hooks/data/useDelete.ts

@@ -384,16 +384,26 @@ export const useDelete = <
                     id,
                     resource: resourceName,
                     successNotification,
-                    dataProviderName,
+                    dataProviderName: dataProviderNameFromProp,
                     meta,
                     metaData,
                 },
                 context,
             ) => {
                 const { resource, identifier } = select(resourceName);
-
                 const resourceSingular = textTransformers.singular(identifier);
 
+                const dataProviderName = pickDataProvider(
+                    identifier,
+                    dataProviderNameFromProp,
+                    resources,
+                );
+
+                const combinedMeta = getMeta({
+                    resource,
+                    meta: pickNotDeprecated(meta, metaData),
+                });
+
                 // Remove the queries from the cache:
                 queryClient.removeQueries(context?.queryKey.detail(id));
 
@@ -425,26 +435,24 @@ export const useDelete = <
                         ids: [id],
                     },
                     date: new Date(),
+                    meta: {
+                        ...combinedMeta,
+                        dataProviderName,
+                    },
                 });
 
-                const combinedMeta = getMeta({
-                    resource,
-                    meta: pickNotDeprecated(meta, metaData),
-                });
-
-                const { fields, operation, variables, ...rest } =
-                    combinedMeta || {};
-
+                const {
+                    fields: _fields,
+                    operation: _operation,
+                    variables: _variables,
+                    ...rest
+                } = combinedMeta || {};
                 log?.mutate({
                     action: "delete",
                     resource: resource.name,
                     meta: {
                         id,
-                        dataProviderName: pickDataProvider(
-                            identifier,
-                            dataProviderName,
-                            resources,
-                        ),
+                        dataProviderName,
                         ...rest,
                     },
                 });

package/src/hooks/data/useDeleteMany.ts

@@ -418,13 +418,24 @@ export const useDeleteMany = <
                     resource: resourceName,
                     meta,
                     metaData,
-                    dataProviderName,
+                    dataProviderName: dataProviderNameFromProp,
                     successNotification,
                 },
                 context,
             ) => {
                 const { resource, identifier } = select(resourceName);
 
+                const dataProviderName = pickDataProvider(
+                    identifier,
+                    dataProviderNameFromProp,
+                    resources,
+                );
+
+                const combinedMeta = getMeta({
+                    resource,
+                    meta: pickNotDeprecated(meta, metaData),
+                });
+
                 // Remove the queries from the cache:
                 ids.forEach((id) =>
                     queryClient.removeQueries(context?.queryKey.detail(id)),
@@ -456,26 +467,24 @@ export const useDeleteMany = <
                     type: "deleted",
                     payload: { ids },
                     date: new Date(),
+                    meta: {
+                        ...combinedMeta,
+                        dataProviderName,
+                    },
                 });
 
-                const combinedMeta = getMeta({
-                    resource,
-                    meta: pickNotDeprecated(meta, metaData),
-                });
-
-                const { fields, operation, variables, ...rest } =
-                    combinedMeta || {};
-
+                const {
+                    fields: _fields,
+                    operation: _operation,
+                    variables: _variables,
+                    ...rest
+                } = combinedMeta || {};
                 log?.mutate({
                     action: "deleteMany",
                     resource: resource.name,
                     meta: {
                         ids,
-                        dataProviderName: pickDataProvider(
-                            identifier,
-                            dataProviderName,
-                            resources,
-                        ),
+                        dataProviderName,
                         ...rest,
                     },
                 });

package/src/hooks/data/useInfiniteList.ts

@@ -221,6 +221,10 @@ export const useInfiniteList = <
         liveMode,
         onLiveEvent,
         dataProviderName: pickedDataProvider,
+        meta: {
+            ...combinedMeta,
+            dataProviderName,
+        },
     });
 
     const queryResponse = useInfiniteQuery<

package/src/hooks/data/useList.ts

@@ -218,6 +218,10 @@ export const useList = <
         liveMode,
         onLiveEvent,
         dataProviderName: pickedDataProvider,
+        meta: {
+            ...meta,
+            dataProviderName,
+        },
     });
 
     const queryResponse = useQuery<

package/src/hooks/data/useMany.ts

@@ -146,6 +146,10 @@ export const useMany = <
         liveMode,
         onLiveEvent,
         dataProviderName: pickedDataProvider,
+        meta: {
+            ...meta,
+            dataProviderName,
+        },
     });
 
     const queryResponse = useQuery<

package/src/hooks/data/useOne.ts

@@ -154,6 +154,10 @@ export const useOne = <
         liveMode,
         onLiveEvent,
         dataProviderName: pickedDataProvider,
+        meta: {
+            ...meta,
+            dataProviderName,
+        },
     });
 
     const queryResponse = useQuery<

package/src/hooks/data/useUpdate.ts

@@ -480,7 +480,7 @@ export const useUpdate = <
                     id,
                     resource: resourceName,
                     successNotification,
-                    dataProviderName,
+                    dataProviderName: dataProviderNameFromProp,
                     values,
                     meta,
                     metaData,
@@ -488,9 +488,19 @@ export const useUpdate = <
                 context,
             ) => {
                 const { resource, identifier } = select(resourceName);
-
                 const resourceSingular = textTransformers.singular(identifier);
 
+                const dataProviderName = pickDataProvider(
+                    identifier,
+                    dataProviderNameFromProp,
+                    resources,
+                );
+
+                const combinedMeta = getMeta({
+                    resource,
+                    meta: pickNotDeprecated(meta, metaData),
+                });
+
                 const notificationConfig =
                     typeof successNotification === "function"
                         ? successNotification(data, { id, values }, identifier)
@@ -522,6 +532,10 @@ export const useUpdate = <
                         ids: data.data?.id ? [data.data.id] : undefined,
                     },
                     date: new Date(),
+                    meta: {
+                        ...combinedMeta,
+                        dataProviderName,
+                    },
                 });
 
                 let previousData: any;
@@ -539,9 +553,12 @@ export const useUpdate = <
                     );
                 }
 
-                const { fields, operation, variables, ...rest } =
-                    pickNotDeprecated(meta, metaData) || {};
-
+                const {
+                    fields: _fields,
+                    operation: _operation,
+                    variables: _variables,
+                    ...rest
+                } = combinedMeta || {};
                 log?.mutate({
                     action: "update",
                     resource: resource.name,
@@ -549,11 +566,7 @@ export const useUpdate = <
                     previousData,
                     meta: {
                         id,
-                        dataProviderName: pickDataProvider(
-                            identifier,
-                            dataProviderName,
-                            resources,
-                        ),
+                        dataProviderName,
                         ...rest,
                     },
                 });

package/src/hooks/data/useUpdateMany.ts

@@ -508,16 +508,26 @@ export const useUpdateMany = <
                     resource: resourceName,
                     meta,
                     metaData,
-                    dataProviderName,
+                    dataProviderName: dataProviderNameFromProp,
                     successNotification,
                     values,
                 },
                 context,
             ) => {
                 const { resource, identifier } = select(resourceName);
-
                 const resourceSingular = textTransformers.singular(identifier);
 
+                const dataProviderName = pickDataProvider(
+                    identifier,
+                    dataProviderNameFromProp,
+                    resources,
+                );
+
+                const combinedMeta = getMeta({
+                    resource,
+                    meta: pickNotDeprecated(meta, metaData),
+                });
+
                 const notificationConfig =
                     typeof successNotification === "function"
                         ? successNotification(data, { ids, values }, identifier)
@@ -549,6 +559,10 @@ export const useUpdateMany = <
                         ids: ids.map(String),
                     },
                     date: new Date(),
+                    meta: {
+                        ...combinedMeta,
+                        dataProviderName,
+                    },
                 });
 
                 const previousData: any[] = [];
@@ -570,14 +584,12 @@ export const useUpdateMany = <
                     });
                 }
 
-                const combinedMeta = getMeta({
-                    resource,
-                    meta: pickNotDeprecated(meta, metaData),
-                });
-
-                const { fields, operation, variables, ...rest } =
-                    combinedMeta || {};
-
+                const {
+                    fields: _fields,
+                    operation: _operation,
+                    variables: _variables,
+                    ...rest
+                } = combinedMeta || {};
                 log?.mutate({
                     action: "updateMany",
                     resource: resource.name,
@@ -585,11 +597,7 @@ export const useUpdateMany = <
                     previousData,
                     meta: {
                         ids,
-                        dataProviderName: pickDataProvider(
-                            identifier,
-                            dataProviderName,
-                            resources,
-                        ),
+                        dataProviderName,
                         ...rest,
                     },
                 });

package/src/hooks/live/useResourceSubscription/index.ts

@@ -20,6 +20,9 @@ export type UseResourceSubscriptionProps = {
     params?: {
         ids?: BaseKey[];
         id?: BaseKey;
+        /**
+         * @deprecated `params.meta` is depcerated. Use `meta` directly from the root level instead.
+         */
         meta?: MetaQuery;
         /**
          * @deprecated `metaData` is deprecated with refine@4, refine will pass `meta` instead, however, we still support `metaData` for backward compatibility.
@@ -42,7 +45,11 @@ export type UseResourceSubscriptionProps = {
     types: LiveEvent["type"][];
     resource?: string;
     enabled?: boolean;
+    /**
+     * @deprecated use `meta.dataProviderName` instead.
+     */
     dataProviderName?: string;
+    meta?: MetaQuery & { dataProviderName?: string };
 } & LiveModeProps;
 
 export type PublishType = {
@@ -57,7 +64,8 @@ export const useResourceSubscription = ({
     enabled = true,
     liveMode: liveModeFromProp,
     onLiveEvent,
-    dataProviderName,
+    dataProviderName: dataProviderNameFromProps,
+    meta,
 }: UseResourceSubscriptionProps): void => {
     const { resource, identifier } = useResource(resourceFromProp);
 
@@ -71,6 +79,11 @@ export const useResourceSubscription = ({
 
     const invalidate = useInvalidate();
 
+    const dataProviderName =
+        dataProviderNameFromProps ??
+        meta?.dataProviderName ??
+        resource?.meta?.dataProviderName;
+
     useEffect(() => {
         let subscription: any;
 
@@ -78,7 +91,7 @@ export const useResourceSubscription = ({
             if (liveMode === "auto") {
                 invalidate({
                     resource: identifier,
-                    dataProviderName: resource?.meta?.dataProviderName,
+                    dataProviderName,
                     invalidates: ["resourceAll"],
                     invalidationFilters: {
                         type: "active",
@@ -102,6 +115,10 @@ export const useResourceSubscription = ({
                 types,
                 callback,
                 dataProviderName,
+                meta: {
+                    ...meta,
+                    dataProviderName,
+                },
             });
         }
 

package/src/hooks/live/useSubscription/index.ts

@@ -33,6 +33,9 @@ export type UseSubscriptionProps = {
     params?: {
         ids?: BaseKey[];
         id?: BaseKey;
+        /**
+         * @deprecated `params.meta` is depcerated. Use `meta` directly from the root level instead.
+         */
         meta?: MetaQuery;
         /**
          * @deprecated `metaData` is deprecated with refine@4, refine will pass `meta` instead, however, we still support `metaData` for backward compatibility.
@@ -54,10 +57,10 @@ export type UseSubscriptionProps = {
         [key: string]: any;
     };
     /**
-     * Name of the data provider to subscribe.
-     * @default "default"
+     * @deprecated use `meta.dataProviderName` instead.
      */
     dataProviderName?: string;
+    meta?: MetaQuery & { dataProviderName?: string };
 };
 
 export const useSubscription = ({
@@ -67,6 +70,7 @@ export const useSubscription = ({
     enabled = true,
     onLiveEvent,
     dataProviderName = "default",
+    meta,
 }: UseSubscriptionProps): void => {
     const liveDataContext = useContext<ILiveContext>(LiveContext);
 
@@ -80,6 +84,10 @@ export const useSubscription = ({
                 types,
                 callback: onLiveEvent,
                 dataProviderName,
+                meta: {
+                    ...meta,
+                    dataProviderName,
+                },
             });
         }
 

package/src/interfaces/live/LiveEvent.ts

@@ -1,4 +1,4 @@
-import { BaseKey } from "..";
+import { BaseKey, MetaQuery } from "..";
 
 export type LiveEvent = {
     channel: string;
@@ -8,4 +8,7 @@ export type LiveEvent = {
         [x: string]: any;
     };
     date: Date;
+    meta?: MetaQuery & {
+        dataProviderName?: string;
+    };
 };