Merge pull request #5318 from marmelab/typescript

More TypeScript Fixes

Author: fzaninotto

packages/ra-core/src/dataProvider/useDataProviderWithDeclarativeSideEffects.ts

@@ -1,6 +1,10 @@
 import useDataProvider from './useDataProvider';
 import { useMemo } from 'react';
-import { DataProvider, UseDataProviderOptions } from '../types';
+import {
+    DataProvider,
+    DataProviderProxy,
+    UseDataProviderOptions,
+} from '../types';
 import useDeclarativeSideEffects from './useDeclarativeSideEffects';
 
 /**
@@ -9,10 +13,11 @@ import useDeclarativeSideEffects from './useDeclarativeSideEffects';
  *
  * @deprecated This is for backward compatibility only and will be removed in next major version.
  */
-const useDataProviderWithDeclarativeSideEffects = (): DataProvider => {
+const useDataProviderWithDeclarativeSideEffects = (): DataProviderProxy => {
     const dataProvider = useDataProvider();
     const getSideEffects = useDeclarativeSideEffects();
 
+    // @ts-ignore
     const dataProviderProxy = useMemo(() => {
         return new Proxy(dataProvider, {
             get: (target, name) => {

packages/ra-core/src/export/fetchRelatedRecords.ts

@@ -1,4 +1,4 @@
-import { DataProvider, Record, Identifier } from '../types';
+import { Record, Identifier, DataProviderProxy } from '../types';
 
 /**
  * Helper function for calling the dataProvider.getMany() method,
@@ -11,7 +11,7 @@ import { DataProvider, Record, Identifier } from '../types';
  *              post_title: posts[record.post_id].title,
  *          }));
  */
-const fetchRelatedRecords = (dataProvider: DataProvider) => (
+const fetchRelatedRecords = (dataProvider: DataProviderProxy) => (
     data,
     field,
     resource

packages/ra-core/src/types.ts

@@ -85,27 +85,27 @@ export type LegacyAuthProvider = (
  */
 
 export type DataProvider = {
-    getList: <RecordType = Record>(
+    getList: <RecordType extends Record = Record>(
         resource: string,
         params: GetListParams
     ) => Promise<GetListResult<RecordType>>;
 
-    getOne: <RecordType = Record>(
+    getOne: <RecordType extends Record = Record>(
         resource: string,
         params: GetOneParams
     ) => Promise<GetOneResult<RecordType>>;
 
-    getMany: <RecordType = Record>(
+    getMany: <RecordType extends Record = Record>(
         resource: string,
         params: GetManyParams
     ) => Promise<GetManyResult<RecordType>>;
 
-    getManyReference: <RecordType = Record>(
+    getManyReference: <RecordType extends Record = Record>(
         resource: string,
         params: GetManyReferenceParams
     ) => Promise<GetManyReferenceResult<RecordType>>;
 
-    update: <RecordType = Record>(
+    update: <RecordType extends Record = Record>(
         resource: string,
         params: UpdateParams
     ) => Promise<UpdateResult<RecordType>>;
@@ -115,12 +115,12 @@ export type DataProvider = {
         params: UpdateManyParams
     ) => Promise<UpdateManyResult>;
 
-    create: <RecordType = Record>(
+    create: <RecordType extends Record = Record>(
         resource: string,
         params: CreateParams
     ) => Promise<CreateResult<RecordType>>;
 
-    delete: <RecordType = Record>(
+    delete: <RecordType extends Record = Record>(
         resource: string,
         params: DeleteParams
     ) => Promise<DeleteResult<RecordType>>;
@@ -227,31 +227,31 @@ export type DataProviderResult<RecordType = Record> =
     | UpdateManyResult;
 
 export type DataProviderProxy = {
-    getList: <RecordType = Record>(
+    getList: <RecordType extends Record = Record>(
         resource: string,
         params: GetListParams,
         options?: UseDataProviderOptions
     ) => Promise<GetListResult<RecordType>>;
 
-    getOne: <RecordType = Record>(
+    getOne: <RecordType extends Record = Record>(
         resource: string,
         params: GetOneParams,
         options?: UseDataProviderOptions
     ) => Promise<GetOneResult<RecordType>>;
 
-    getMany: <RecordType = Record>(
+    getMany: <RecordType extends Record = Record>(
         resource: string,
         params: GetManyParams,
         options?: UseDataProviderOptions
     ) => Promise<GetManyResult<RecordType>>;
 
-    getManyReference: <RecordType = Record>(
+    getManyReference: <RecordType extends Record = Record>(
         resource: string,
         params: GetManyReferenceParams,
         options?: UseDataProviderOptions
     ) => Promise<GetManyReferenceResult<RecordType>>;
 
-    update: <RecordType = Record>(
+    update: <RecordType extends Record = Record>(
         resource: string,
         params: UpdateParams,
         options?: UseDataProviderOptions
@@ -263,13 +263,13 @@ export type DataProviderProxy = {
         options?: UseDataProviderOptions
     ) => Promise<UpdateManyResult>;
 
-    create: <RecordType = Record>(
+    create: <RecordType extends Record = Record>(
         resource: string,
         params: CreateParams,
         options?: UseDataProviderOptions
     ) => Promise<CreateResult<RecordType>>;
 
-    delete: <RecordType = Record>(
+    delete: <RecordType extends Record = Record>(
         resource: string,
         params: DeleteParams,
         options?: UseDataProviderOptions

packages/ra-ui-materialui/src/list/ListActions.tsx

@@ -73,7 +73,7 @@ ListActions.defaultProps = {
     onUnselectItems: () => null,
 };
 
-interface ListActionsProps extends ToolbarProps {
+export interface ListActionsProps extends ToolbarProps {
     currentSort?: SortPayload;
     className?: string;
     resource?: string;

packages/ra-ui-materialui/src/list/index.ts

@@ -1,19 +1,28 @@
-import BulkActionsToolbar from './BulkActionsToolbar';
+import BulkActionsToolbar, {
+    BulkActionsToolbarProps,
+} from './BulkActionsToolbar';
 import BulkDeleteAction from './BulkDeleteAction';
 import List from './List';
-import ListActions from './ListActions';
+import ListActions, { ListActionsProps } from './ListActions';
 import ListGuesser from './ListGuesser';
-import ListToolbar from './ListToolbar';
+import ListToolbar, { ListToolbarProps } from './ListToolbar';
 import ListView from './ListView';
 import Placeholder from './Placeholder';
-import SimpleList from './SimpleList';
+import SimpleList, { SimpleListProps } from './SimpleList';
 import SimpleListLoading from './SimpleListLoading';
 import SingleFieldList from './SingleFieldList';
 
 export * from './filter';
 export * from './datagrid';
 export * from './pagination';
 
+export type {
+    BulkActionsToolbarProps,
+    ListActionsProps,
+    ListToolbarProps,
+    SimpleListProps,
+};
+
 export {
     BulkActionsToolbar,
     BulkDeleteAction,