@refinedev/core 4.44.3 → 4.44.5

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.3",
+  "version": "4.44.5",
   "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

@@ -1,41 +1,41 @@
-import {
-    useMutation,
-    UseMutationOptions,
-    UseMutationResult,
-} from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 import {
     pickDataProvider,
     pickNotDeprecated,
     useActiveAuthProvider,
 } from "@definitions/helpers";
-
+import { getXRay } from "@refinedev/devtools-internal";
 import {
-    CreateResponse,
-    BaseRecord,
-    HttpError,
-    SuccessErrorNotification,
-    MetaQuery,
-    IQueryKeys,
-} from "../../interfaces";
+    useMutation,
+    UseMutationOptions,
+    UseMutationResult,
+} from "@tanstack/react-query";
+
 import {
-    useResource,
-    useTranslate,
-    usePublish,
-    useHandleNotification,
     useDataProvider,
-    useLog,
+    useHandleNotification,
     useInvalidate,
-    useOnError,
+    useLog,
     useMeta,
+    useOnError,
+    usePublish,
     useRefineContext,
+    useResource,
+    useTranslate,
 } from "@hooks";
+import { useKeys } from "@hooks/useKeys";
+import {
+    BaseRecord,
+    CreateResponse,
+    HttpError,
+    IQueryKeys,
+    MetaQuery,
+    SuccessErrorNotification,
+} from "../../interfaces";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 type useCreateParams<TData, TError, TVariables> = {
     /**
@@ -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

@@ -1,40 +1,40 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
     useMutation,
     UseMutationOptions,
     UseMutationResult,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
 import {
-    BaseRecord,
-    CreateManyResponse,
-    HttpError,
-    SuccessErrorNotification,
-    MetaQuery,
-    IQueryKeys,
-} from "../../interfaces";
+    handleMultiple,
+    pickDataProvider,
+    pickNotDeprecated,
+} from "@definitions";
 import {
-    useResource,
-    useTranslate,
-    usePublish,
-    useHandleNotification,
     useDataProvider,
+    useHandleNotification,
     useInvalidate,
     useLog,
     useMeta,
+    usePublish,
     useRefineContext,
+    useResource,
+    useTranslate,
 } from "@hooks";
+import { useKeys } from "@hooks/useKeys";
 import {
-    handleMultiple,
-    pickDataProvider,
-    pickNotDeprecated,
-} from "@definitions";
+    BaseRecord,
+    CreateManyResponse,
+    HttpError,
+    IQueryKeys,
+    MetaQuery,
+    SuccessErrorNotification,
+} from "../../interfaces";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 type useCreateManyParams<TData, TError, TVariables> = {
     resource: string;
@@ -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

@@ -1,51 +1,51 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
-    useQueryClient,
     useMutation,
-    UseMutationResult,
     UseMutationOptions,
+    UseMutationResult,
+    useQueryClient,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
+import { ActionTypes } from "@contexts/undoableQueue";
+import {
+    pickDataProvider,
+    pickNotDeprecated,
+    queryKeysReplacement,
+    useActiveAuthProvider,
+} from "@definitions/helpers";
 import {
-    useResource,
-    useMutationMode,
     useCancelNotification,
-    useTranslate,
-    usePublish,
-    useHandleNotification,
     useDataProvider,
-    useLog,
+    useHandleNotification,
     useInvalidate,
-    useOnError,
+    useLog,
     useMeta,
+    useMutationMode,
+    useOnError,
+    usePublish,
     useRefineContext,
+    useResource,
+    useTranslate,
 } from "@hooks";
-import { ActionTypes } from "@contexts/undoableQueue";
+import { useKeys } from "@hooks/useKeys";
 import {
-    DeleteOneResponse,
-    MutationMode,
-    PrevContext as DeleteContext,
-    BaseRecord,
     BaseKey,
-    HttpError,
+    BaseRecord,
+    DeleteOneResponse,
     GetListResponse,
-    SuccessErrorNotification,
-    PreviousQuery,
+    HttpError,
     IQueryKeys,
     MetaQuery,
+    MutationMode,
+    PrevContext as DeleteContext,
+    PreviousQuery,
+    SuccessErrorNotification,
 } from "../../interfaces";
-import {
-    queryKeysReplacement,
-    pickDataProvider,
-    pickNotDeprecated,
-    useActiveAuthProvider,
-} from "@definitions/helpers";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 export type DeleteParams<TData, TError, TVariables> = {
     /**
@@ -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

@@ -1,52 +1,52 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
-    useQueryClient,
     useMutation,
-    UseMutationResult,
     UseMutationOptions,
+    UseMutationResult,
+    useQueryClient,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
+import { ActionTypes } from "@contexts/undoableQueue";
 import {
-    DeleteManyResponse,
-    HttpError,
-    BaseRecord,
-    BaseKey,
-    MutationMode,
-    PreviousQuery,
-    GetListResponse,
-    PrevContext as DeleteContext,
-    SuccessErrorNotification,
-    MetaQuery,
-    IQueryKeys,
-} from "../../interfaces";
+    handleMultiple,
+    pickDataProvider,
+    pickNotDeprecated,
+    queryKeysReplacement,
+    useActiveAuthProvider,
+} from "@definitions";
 import {
-    useResource,
-    useTranslate,
-    useMutationMode,
     useCancelNotification,
-    usePublish,
-    useHandleNotification,
     useDataProvider,
+    useHandleNotification,
     useInvalidate,
     useLog,
-    useOnError,
     useMeta,
+    useMutationMode,
+    useOnError,
+    usePublish,
     useRefineContext,
+    useResource,
+    useTranslate,
 } from "@hooks";
-import { ActionTypes } from "@contexts/undoableQueue";
+import { useKeys } from "@hooks/useKeys";
 import {
-    queryKeysReplacement,
-    pickDataProvider,
-    handleMultiple,
-    pickNotDeprecated,
-    useActiveAuthProvider,
-} from "@definitions";
+    BaseKey,
+    BaseRecord,
+    DeleteManyResponse,
+    GetListResponse,
+    HttpError,
+    IQueryKeys,
+    MetaQuery,
+    MutationMode,
+    PrevContext as DeleteContext,
+    PreviousQuery,
+    SuccessErrorNotification,
+} from "../../interfaces";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 export type DeleteManyParams<TData, TError, TVariables> = {
     /**
@@ -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,
                     },
                 });