[BC Break] Rename duplicate types to allow type emission from react-admin

packages/ra-core/src/actions/accumulateActions.ts

@@ -1,5 +1,5 @@
 import { crudGetMany, crudGetMatching } from './dataActions';
-import { Pagination, Sort, Identifier } from '../types';
+import { PaginationPayload, SortPayload, Identifier } from '../types';
 
 export const CRUD_GET_MANY_ACCUMULATE = 'RA/CRUD_GET_MANY_ACCUMULATE';
 
@@ -37,8 +37,8 @@ export interface CrudGetMatchingAccumulateAction {
 export const crudGetMatchingAccumulate = (
     reference: string,
     relatedTo: string,
-    pagination: Pagination,
-    sort: Sort,
+    pagination: PaginationPayload,
+    sort: SortPayload,
     filter: object
 ): CrudGetMatchingAccumulateAction => {
     const action = crudGetMatching(

packages/ra-core/src/actions/dataActions/crudGetAll.ts

@@ -1,11 +1,11 @@
-import { Record, Pagination, Sort } from '../../types';
+import { Record, PaginationPayload, SortPayload } from '../../types';
 import { GET_LIST } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
 import { NotificationSideEffect, CallbackSideEffect } from '../../sideEffect';
 
 export const crudGetAll = (
     resource: string,
-    sort: Sort,
+    sort: SortPayload,
     filter: object,
     maxResults: number,
     callback?: CallbackSideEffect
@@ -28,8 +28,8 @@ export const crudGetAll = (
 });
 
 interface RequestPayload {
-    pagination: Pagination;
-    sort: Sort;
+    pagination: PaginationPayload;
+    sort: SortPayload;
     filter: object;
 }
 

packages/ra-core/src/actions/dataActions/crudGetList.ts

@@ -1,12 +1,12 @@
-import { Record, Pagination, Sort } from '../../types';
+import { Record, PaginationPayload, SortPayload } from '../../types';
 import { GET_LIST } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
 import { NotificationSideEffect } from '../../sideEffect';
 
 export const crudGetList = (
     resource: string,
-    pagination: Pagination,
-    sort: Sort,
+    pagination: PaginationPayload,
+    sort: SortPayload,
     filter: object
 ): CrudGetListAction => ({
     type: CRUD_GET_LIST,
@@ -24,8 +24,8 @@ export const crudGetList = (
 });
 
 interface RequestPayload {
-    pagination: Pagination;
-    sort: Sort;
+    pagination: PaginationPayload;
+    sort: SortPayload;
     filter: object;
 }
 

packages/ra-core/src/actions/dataActions/crudGetManyReference.ts

@@ -1,4 +1,9 @@
-import { Identifier, Record, Pagination, Sort } from '../../types';
+import {
+    Identifier,
+    Record,
+    PaginationPayload,
+    SortPayload,
+} from '../../types';
 import { GET_MANY_REFERENCE } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
 import { NotificationSideEffect } from '../../sideEffect';
@@ -8,8 +13,8 @@ export const crudGetManyReference = (
     target: string,
     id: Identifier,
     relatedTo: string,
-    pagination: Pagination,
-    sort: Sort,
+    pagination: PaginationPayload,
+    sort: SortPayload,
     filter: object,
     source: string
 ): CrudGetManyReferenceAction => ({
@@ -32,8 +37,8 @@ interface RequestPayload {
     source: string;
     target: string;
     id: Identifier;
-    pagination: Pagination;
-    sort: Sort;
+    pagination: PaginationPayload;
+    sort: SortPayload;
     filter: object;
 }
 

packages/ra-core/src/actions/dataActions/crudGetMatching.ts

@@ -1,13 +1,13 @@
-import { Record, Pagination, Sort } from '../../types';
+import { Record, PaginationPayload, SortPayload } from '../../types';
 import { GET_LIST } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
 import { NotificationSideEffect } from '../../sideEffect';
 
 export const crudGetMatching = (
     reference: string,
     relatedTo: string,
-    pagination: Pagination,
-    sort: Sort,
+    pagination: PaginationPayload,
+    sort: SortPayload,
     filter: object
 ): CrudGetMatchingAction => ({
     type: CRUD_GET_MATCHING,
@@ -26,8 +26,8 @@ export const crudGetMatching = (
 });
 
 interface RequestPayload {
-    pagination: Pagination;
-    sort: Sort;
+    pagination: PaginationPayload;
+    sort: SortPayload;
     filter: object;
 }
 

packages/ra-core/src/actions/notificationActions.ts

@@ -11,15 +11,15 @@ interface NotificationOptions {
     undoable?: boolean;
 }
 
-export interface Notification {
+export interface NotificationPayload {
     readonly message: string;
     readonly type: NotificationType;
     readonly notificationOptions?: NotificationOptions;
 }
 
 export interface ShowNotificationAction {
     readonly type: typeof SHOW_NOTIFICATION;
-    readonly payload: Notification;
+    readonly payload: NotificationPayload;
 }
 
 /**

packages/ra-core/src/controller/field/ReferenceArrayFieldController.tsx

@@ -2,7 +2,7 @@ import { FunctionComponent, ReactElement } from 'react';
 
 import useReferenceArrayFieldController from './useReferenceArrayFieldController';
 import { ListControllerProps } from '../useListController';
-import { Record, Sort } from '../../types';
+import { Record, SortPayload } from '../../types';
 
 interface Props {
     basePath: string;
@@ -12,7 +12,7 @@ interface Props {
     record?: Record;
     reference: string;
     resource: string;
-    sort?: Sort;
+    sort?: SortPayload;
     source: string;
     children: (params: ListControllerProps) => ReactElement<any>;
 }

packages/ra-core/src/controller/field/ReferenceManyFieldController.tsx

@@ -1,6 +1,6 @@
 import { ReactElement, FunctionComponent } from 'react';
 
-import { Record, Sort } from '../../types';
+import { Record, SortPayload } from '../../types';
 import useReferenceManyFieldController from './useReferenceManyFieldController';
 import { ListControllerProps } from '../useListController';
 
@@ -13,7 +13,7 @@ interface Props {
     record?: Record;
     reference: string;
     resource: string;
-    sort?: Sort;
+    sort?: SortPayload;
     source: string;
     target: string;
     total?: number;

packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts

@@ -3,7 +3,7 @@ import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 
 import { useSafeSetState, removeEmpty } from '../../util';
-import { Record, RecordMap, Identifier, Sort } from '../../types';
+import { Record, RecordMap, Identifier, SortPayload } from '../../types';
 import { useGetMany } from '../../dataProvider';
 import { ListControllerProps } from '../useListController';
 import { useNotify } from '../../sideEffect';
@@ -19,7 +19,7 @@ interface Option {
     record?: Record;
     reference: string;
     resource: string;
-    sort?: Sort;
+    sort?: SortPayload;
     source: string;
 }
 

packages/ra-core/src/controller/field/useReferenceManyFieldController.ts

@@ -5,7 +5,7 @@ import isEqual from 'lodash/isEqual';
 import { useSafeSetState, removeEmpty } from '../../util';
 import { useGetManyReference } from '../../dataProvider';
 import { useNotify } from '../../sideEffect';
-import { Record, Sort, RecordMap } from '../../types';
+import { Record, SortPayload, RecordMap } from '../../types';
 import { ListControllerProps } from '../useListController';
 import usePaginationState from '../usePaginationState';
 import useSelectionState from '../useSelectionState';
@@ -22,7 +22,7 @@ interface Options {
     record?: Record;
     reference: string;
     resource: string;
-    sort?: Sort;
+    sort?: SortPayload;
     source?: string;
     target: string;
     total?: number;

packages/ra-core/src/controller/input/ReferenceArrayInputController.tsx

@@ -6,7 +6,7 @@ import {
 } from 'react';
 import debounce from 'lodash/debounce';
 
-import { Record, Sort, Pagination } from '../../types';
+import { Record, SortPayload, PaginationPayload } from '../../types';
 import useReferenceArrayInputController from './useReferenceArrayInputController';
 
 interface ChildrenFuncParams {
@@ -15,8 +15,8 @@ interface ChildrenFuncParams {
     loaded: boolean;
     loading: boolean;
     setFilter: (filter: any) => void;
-    setPagination: (pagination: Pagination) => void;
-    setSort: (sort: Sort) => void;
+    setPagination: (pagination: PaginationPayload) => void;
+    setSort: (sort: SortPayload) => void;
     warning?: string;
 }
 
@@ -32,7 +32,7 @@ interface Props {
     record?: Record;
     reference: string;
     resource: string;
-    sort?: Sort;
+    sort?: SortPayload;
     source: string;
 }
 

packages/ra-core/src/controller/input/ReferenceInputController.tsx

@@ -5,7 +5,7 @@ import {
     ReactElement,
 } from 'react';
 
-import { Sort, Record } from '../../types';
+import { SortPayload, Record } from '../../types';
 import useReferenceInputController, {
     ReferenceInputValue,
 } from './useReferenceInputController';
@@ -22,7 +22,7 @@ interface Props {
     reference: string;
     referenceSource?: (resource: string, source: string) => string;
     resource: string;
-    sort?: Sort;
+    sort?: SortPayload;
     source: string;
     onChange: () => void;
 }

packages/ra-core/src/controller/input/useGetMatchingReferences.ts

@@ -7,17 +7,22 @@ import {
     getPossibleReferenceValues,
     getReferenceResource,
 } from '../../reducer';
-import { Pagination, Sort, Record, Filter } from '../../types';
+import {
+    PaginationPayload,
+    SortPayload,
+    Record,
+    FilterPayload,
+} from '../../types';
 import { useDeepCompareEffect } from '../../util/hooks';
 
 interface UseMatchingReferencesOption {
     reference: string;
     referenceSource: (resource: string, source: string) => string;
     resource: string;
     source: string;
-    filter: Filter;
-    pagination: Pagination;
-    sort: Sort;
+    filter: FilterPayload;
+    pagination: PaginationPayload;
+    sort: SortPayload;
     id: string;
 }
 

packages/ra-core/src/controller/input/useReferenceArrayInputController.ts

@@ -2,7 +2,12 @@ import { useMemo, useState, useEffect, useRef } from 'react';
 import { useSelector } from 'react-redux';
 import isEqual from 'lodash/isEqual';
 import difference from 'lodash/difference';
-import { Pagination, Record, Sort, ReduxState } from '../../types';
+import {
+    PaginationPayload,
+    Record,
+    SortPayload,
+    ReduxState,
+} from '../../types';
 import { useGetMany } from '../../dataProvider';
 import { FieldInputProps } from 'react-final-form';
 import useGetMatching from '../../dataProvider/useGetMatching';
@@ -206,8 +211,8 @@ interface ReferenceArrayInputProps {
     loading: boolean;
     loaded: boolean;
     setFilter: (filter: any) => void;
-    setPagination: (pagination: Pagination) => void;
-    setSort: (sort: Sort) => void;
+    setPagination: (pagination: PaginationPayload) => void;
+    setSort: (sort: SortPayload) => void;
 }
 
 interface Option {
@@ -220,7 +225,7 @@ interface Option {
     record?: Record;
     reference: string;
     resource: string;
-    sort?: Sort;
+    sort?: SortPayload;
     source: string;
 }
 

packages/ra-core/src/controller/input/useReferenceInputController.ts

@@ -1,6 +1,6 @@
 import { getStatusForInput as getDataStatus } from './referenceDataStatus';
 import useTranslate from '../../i18n/useTranslate';
-import { Sort, Record, Pagination } from '../../types';
+import { SortPayload, Record, PaginationPayload } from '../../types';
 import useReference from '../useReference';
 import useGetMatchingReferences from './useGetMatchingReferences';
 import usePaginationState from '../usePaginationState';
@@ -15,12 +15,12 @@ export interface ReferenceInputValue {
     choices: Record[];
     error?: string;
     loading: boolean;
-    pagination: Pagination;
+    pagination: PaginationPayload;
     setFilter: (filter: string) => void;
     filter: any;
-    setPagination: (pagination: Pagination) => void;
-    setSort: (sort: Sort) => void;
-    sort: Sort;
+    setPagination: (pagination: PaginationPayload) => void;
+    setSort: (sort: SortPayload) => void;
+    sort: SortPayload;
     warning?: string;
 }
 
@@ -34,7 +34,7 @@ interface Option {
     reference: string;
     referenceSource?: typeof defaultReferenceSource;
     resource: string;
-    sort?: Sort;
+    sort?: SortPayload;
     source: string;
 }
 

packages/ra-core/src/controller/useFilterState.ts

@@ -1,11 +1,11 @@
 import { useEffect, useRef, useState, useCallback } from 'react';
 import debounce from 'lodash/debounce';
 import isEqual from 'lodash/isEqual';
-import { Filter } from '../types';
+import { FilterPayload } from '../types';
 
 interface UseFilterStateOptions {
-    filterToQuery?: (v: string) => Filter;
-    permanentFilter?: Filter;
+    filterToQuery?: (v: string) => FilterPayload;
+    permanentFilter?: FilterPayload;
     debounceTime?: number;
 }
 
@@ -15,7 +15,7 @@ interface UseFilterStateOptions {
  * @property {setFilter} setFilter: Update the filter with the given string
  */
 interface UseFilterStateProps {
-    filter: Filter;
+    filter: FilterPayload;
     setFilter: (v: string) => void;
 }