Skip to content

Commit 63b00b1

Browse files
vinibispovmarcosp
authored andcommitted
chore: get rid of deriving decorator
1 parent 8de3ae7 commit 63b00b1

File tree

3 files changed

+53
-56
lines changed

3 files changed

+53
-56
lines changed

docs/api-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Usage:
141141

142142
```rescript
143143
let queryClient = useQueryClient()
144-
queryClient.fetchQuery(fetchQueryOptions(~queryKey=["articles"], ~retryOnMount=true))
144+
queryClient.fetchQuery({queryKey: ["articles"], retryOnMount: true})
145145
```
146146

147147
### `useQuery`

src/ReactQuery_Client.res

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -39,43 +39,41 @@ type getNextPageParamFunction<'data> = {
3939
allPages: array<'data>,
4040
}
4141

42-
@deriving(abstract)
4342
type queryObserverOptions<'error, 'data, 'queryData, 'queryKey, 'pageParam> = {
44-
@optional retry: ReactQuery_Types.retryValue<'error>,
45-
@optional retryDelay: ReactQuery_Types.retryValue<'error>,
46-
@optional cacheTime: int,
47-
@optional isDataEqual: (option<'data>, 'data) => bool,
48-
@optional
43+
retry?: ReactQuery_Types.retryValue<'error>,
44+
retryDelay?: ReactQuery_Types.retryValue<'error>,
45+
cacheTime?: int,
46+
isDataEqual?: (option<'data>, 'data) => bool,
4947
queryFn: ReactQuery_Types.queryFunctionContext<'queryKey, 'pageParam> => Js.Promise.t<'queryData>,
50-
@optional queryHash: string,
51-
@optional queryKey: 'queryKey,
52-
@optional queryKeyHashFn: 'queryKey => string,
53-
@optional initialData: unit => 'data,
54-
@optional initialDataUpdatedAt: unit => option<int>,
55-
@optional behavior: queryBehavior, // Revisar context type
56-
@optional structuralSharing: bool,
57-
@optional getPreviousPageParam: getPreviousPageParamFunction<'data>,
58-
@optional getNextPageParam: getNextPageParamFunction<'data>,
59-
@optional _defaulted: bool,
60-
@optional enabled: bool,
61-
@optional staleTime: int,
62-
@optional refetchInterval: ReactQuery_Types.refetchIntervalValue,
63-
@optional refetchIntervalInBackground: bool,
64-
@optional refetchOnWindowFocus: ReactQuery_Types.boolOrAlwaysValue,
65-
@optional refetchOnReconnect: ReactQuery_Types.boolOrAlwaysValue,
66-
@optional refetchOnMount: ReactQuery_Types.boolOrAlwaysValue,
67-
@optional retryOnMount: bool,
68-
@optional notifyOnChangeProps: array<notifyOnChangePropsKeys>,
69-
@optional notifyOnChangePropsExclusions: array<bool>,
70-
@optional onSuccess: 'data => unit,
71-
@optional onError: 'error => unit,
72-
@optional onSettled: (option<'data>, option<'error>) => unit,
73-
@optional useErrorBoundary: bool,
74-
@optional select: 'queryData => 'data,
75-
@optional suspense: bool,
76-
@optional keepPreviousData: bool,
77-
@optional placeholderData: ReactQuery_Types.placeholderDataValue,
78-
@optional optimisticResults: bool,
48+
queryHash?: string,
49+
queryKey?: 'queryKey,
50+
queryKeyHashFn?: 'queryKey => string,
51+
initialData?: unit => 'data,
52+
initialDataUpdatedAt?: unit => option<int>,
53+
behavior?: queryBehavior, // Revisar context type
54+
structuralSharing?: bool,
55+
getPreviousPageParam?: getPreviousPageParamFunction<'data>,
56+
getNextPageParam?: getNextPageParamFunction<'data>,
57+
_defaulted?: bool,
58+
enabled?: bool,
59+
staleTime?: int,
60+
refetchInterval?: ReactQuery_Types.refetchIntervalValue,
61+
refetchIntervalInBackground?: bool,
62+
refetchOnWindowFocus?: ReactQuery_Types.boolOrAlwaysValue,
63+
refetchOnReconnect?: ReactQuery_Types.boolOrAlwaysValue,
64+
refetchOnMount?: ReactQuery_Types.boolOrAlwaysValue,
65+
retryOnMount?: bool,
66+
notifyOnChangeProps?: array<notifyOnChangePropsKeys>,
67+
notifyOnChangePropsExclusions?: array<bool>,
68+
onSuccess?: 'data => unit,
69+
onError?: 'error => unit,
70+
onSettled?: (option<'data>, option<'error>) => unit,
71+
useErrorBoundary?: bool,
72+
select?: 'queryData => 'data,
73+
suspense?: bool,
74+
keepPreviousData?: bool,
75+
placeholderData?: ReactQuery_Types.placeholderDataValue,
76+
optimisticResults?: bool,
7977
}
8078

8179
type defaultOptions<'error, 'data, 'queryData, 'queryKey, 'pageParam> = {
@@ -118,20 +116,20 @@ type queryState<'queryData, 'queryError> = {
118116
status: ReactQuery_Types.queryStatus,
119117
}
120118

121-
@deriving(abstract)
122119
type fetchQueryOptions<'queryKey, 'queryData, 'queryError, 'pageParam> = {
123-
@optional queryKey: 'queryKey,
124-
@optional
125-
queryFn: ReactQuery_Types.queryFunctionContext<'queryKey, 'pageParam> => Js.Promise.t<'queryData>,
126-
@optional retry: ReactQuery_Types.retryValue<'queryError>,
127-
@optional retryOnMount: bool,
128-
@optional retryDelay: ReactQuery_Types.retryDelayValue<'queryError>,
129-
@optional staleTime: ReactQuery_Types.timeValue,
130-
@optional queryKeyHashFn: 'queryKey => string,
131-
@optional refetchOnMount: ReactQuery_Types.boolOrAlwaysValue,
132-
@optional structuralSharing: bool,
133-
@optional initialData: 'queryData => 'queryData,
134-
@optional initialDataUpdatedAt: unit => int,
120+
queryKey?: 'queryKey,
121+
queryFn?: ReactQuery_Types.queryFunctionContext<'queryKey, 'pageParam> => Js.Promise.t<
122+
'queryData,
123+
>,
124+
retry?: ReactQuery_Types.retryValue<'queryError>,
125+
retryOnMount?: bool,
126+
retryDelay?: ReactQuery_Types.retryDelayValue<'queryError>,
127+
staleTime?: ReactQuery_Types.timeValue,
128+
queryKeyHashFn?: 'queryKey => string,
129+
refetchOnMount?: ReactQuery_Types.boolOrAlwaysValue,
130+
structuralSharing?: bool,
131+
initialData?: 'queryData => 'queryData,
132+
initialDataUpdatedAt?: unit => int,
135133
}
136134

137135
type queryClient<'queryKey, 'queryData, 'queryError, 'pageParams> = {

src/ReactQuery_Types.res

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ type placeholderData<'queryData, 'queryResult> = [
3232
| #function(unit => option<'queryResult>)
3333
]
3434

35-
@deriving(abstract)
3635
type queryFilter<'queryKey> = {
37-
@optional exact: bool,
38-
@optional @as("type") type_: [#active | #inactive | #all],
39-
@optional stale: bool,
40-
@optional fetching: bool,
41-
@optional predicate: query => bool,
42-
@optional queryKey: 'queryKey,
36+
exact?: bool,
37+
@as("type") type_?: [#active | #inactive | #all],
38+
stale?: bool,
39+
fetching?: bool,
40+
predicate?: query => bool,
41+
queryKey?: 'queryKey,
4342
}
4443

4544
type queryDataKeyOrFilter<'queryKey> = [#keys('queryKey) | #filters(queryFilter<'queryKey>)]

0 commit comments

Comments
 (0)