fix: Convert intersection type to union type for UseQueryReturnValue

cozy · Mar 1, 2021 · b1a3827 · b1a3827
1 parent 4b91ab4
commit b1a3827
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/cozy-client/src/types.js b/packages/cozy-client/src/types.js
@@ -36,7 +36,7 @@ import { QueryDefinition } from './queries/dsl'
  */
 
 /**
- * @typedef {QueryState & FetchMoreAble} UseQueryReturnValue
+ * @typedef {QueryState|FetchMoreAble} UseQueryReturnValue
  */
 
 /**

diff --git a/packages/cozy-client/types/types.d.ts b/packages/cozy-client/types/types.d.ts
@@ -9,7 +9,7 @@ export type ReduxStore = any;
 export type Token = any;
 export type ClientResponse = any;
 export type Manifest = any;
-export type QueryFetchStatus = "loading" | "loaded" | "pending" | "failed";
+export type QueryFetchStatus = "failed" | "loading" | "pending" | "loaded";
 export type QueryState = {
     id: string;
     definition: QueryDefinition;
@@ -25,7 +25,7 @@ export type QueryState = {
 export type FetchMoreAble = {
     fetchMore: Function;
 };
-export type UseQueryReturnValue = QueryState & FetchMoreAble;
+export type UseQueryReturnValue = QueryState | FetchMoreAble;
 /**
  * A reference to a document (special case of a relationship used between photos and albums)
  * https://docs.cozy.io/en/cozy-doctypes/docs/io.cozy.files/#references
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ import { QueryDefinition } from './queries/dsl' @@
      */
     /**
-     * @typedef {QueryState & FetchMoreAble} UseQueryReturnValue
+     * @typedef {QueryState|FetchMoreAble} UseQueryReturnValue
      */
     /**
@@ Expand Down @@