feat(DataSource): add the transformError data-source function #24

ArturAbdullin · 2025-02-26T09:27:19Z

When the transformError is set, the fetch errors will be transformed into data without changing the state to error.

DakEnviy · 2025-02-27T12:59:25Z

src/core/types/DataSource.ts

@@ -6,11 +6,14 @@ export type DataSourceTag = string;
 declare const errorHintSymbol: unique symbol;
 declare const stateHintSymbol: unique symbol;

+export type NonNullableUnknown = NonNullable<unknown>;


suggestion(blocking): Let's move it to utils.ts

DakEnviy · 2025-02-27T13:00:44Z

src/core/types/DataSource.ts

+     * When set, the `fetch` errors will be transformed into data without changing the state to error.
+     * @returns NonNullable
+     */
+    transformError?: (reason: unknown) => TResponseErrorTransform;


suggestion(non-blocking): reason -> error

DakEnviy · 2025-02-27T13:04:43Z

src/core/types/DataSource.ts

 export interface DataSource<
    TContext,
    TParams,
    TRequest,
    TResponse,
+    TResponseErrorTransform extends NonNullableUnknown,


issue(blocking): Move it after TError and add default like TResponseErrorTransform extends NonNullableUnknown = NonNullableUnknown to avoid breaking changes

Required type parameters may not follow optional type parameters, so I will move it to the end.

I resolved an undefined and null return values of the transformError, so the TErrorResponse does not extend NonNullableUnknown and can be anything at this point.

DakEnviy · 2025-02-27T13:05:15Z

src/core/types/DataSource.ts

 export interface DataSource<
    TContext,
    TParams,
    TRequest,
    TResponse,
+    TResponseErrorTransform extends NonNullableUnknown,


suggestion(non-blocking): TResponseErrorTransform -> TErrorResponse

DakEnviy · 2025-02-27T13:05:49Z

src/core/types/DataSource.ts

+     * When set, the `fetch` errors will be transformed into data without changing the state to error.
+     * @returns NonNullable
+     */
+    transformError?: (reason: unknown) => TResponseErrorTransform;


question(blocking): Can we use TError here instead of unknown?

DakEnviy · 2025-02-27T13:06:29Z

src/core/types/DataSource.ts

        infer TData,
        infer _TError,
        infer _TOptions,
        infer _TState,
        infer _TFetchContext
    >
-        ? ActualData<TData, TResponse>
+        ? ActualData<TResponse, TResponseErrorTransform, TData>
        : never;

 export type DataSourceError<TDataSource> =


suggestion(blocking): Add DataSourceErrorResponse for inferring like DataSourceError

DakEnviy · 2025-02-27T13:07:56Z

src/core/types/DataSource.ts

+    unknown extends TResponseErrorTransform ? TResponse : TResponse | TResponseErrorTransform;
+
+export type ActualData<TResponse, TResponseErrorTransform, TData> = unknown extends TData
+    ? unknown extends TResponseErrorTransform


suggestion(blocking): Looks like you can use ActualResponse here

DakEnviy · 2025-02-27T13:11:06Z

src/react-query/impl/infinite/types.ts

    QueryDataSourceContext,
    TParams,
    TRequest,
    TResponse,
+    TResponseErrorTransform,
    TData,
    TError,
    InfiniteQueryObserverExtendedOptions<
        TResponse,


issue(blocking): You have to wrap TResponse using ActualResponse in the TOptions and TState types

DakEnviy · 2025-03-11T11:08:57Z

src/react-query/impl/plain/types.ts

+        TError,
+        TErrorResponse,
+        QueryObserverExtendedOptions<
+            TResponse,


issue(blocking): Wrap it using ActualResponse

DakEnviy · 2025-03-11T11:09:45Z

src/react-query/impl/infinite/types.ts

+        TError,
+        TErrorResponse,
+        InfiniteQueryObserverExtendedOptions<
+            TResponse,


issue(blocking): Wrap it using ActualResponse

DakEnviy · 2025-03-11T11:10:36Z

src/react-query/impl/infinite/utils.ts

+        } catch (error) {
+            if (!transformError) throw error;
+
+            return formatNullableValue(transformError(error));


suggestion(blocking): Use formatNullableValue for fetch result too

DakEnviy · 2025-03-11T11:12:37Z

src/react-query/impl/infinite/utils.ts

-            ? (data) => ({...data, pages: data.pages.map(transformResponse)})
-            : undefined,
+        select:
+            transformResponse || transformError


suggestion(blocking): Use innertTransform without condition

Oh, missed it =\ Thanks!

DakEnviy

❤️

refactor: review issues feat: resolve an undefined and null error response values docs(skipContext): add the JSDoc fix(react-query/impl): review issues

ArturAbdullin requested a review from DakEnviy as a code owner February 26, 2025 09:27

ArturAbdullin requested a review from vladimirfilosof February 26, 2025 09:28

DakEnviy requested changes Feb 27, 2025

View reviewed changes

DakEnviy requested changes Mar 11, 2025

View reviewed changes

DakEnviy previously approved these changes Mar 11, 2025

View reviewed changes

feat(DataSource): add the transformError data-source function

834c3d7

refactor: review issues feat: resolve an undefined and null error response values docs(skipContext): add the JSDoc fix(react-query/impl): review issues

ArturAbdullin dismissed DakEnviy’s stale review via 834c3d7 March 25, 2025 15:25

ArturAbdullin force-pushed the transform-error branch from a286b3f to 834c3d7 Compare March 25, 2025 15:25

DakEnviy approved these changes Mar 25, 2025

View reviewed changes

ArturAbdullin merged commit 16c1775 into main Mar 25, 2025
3 checks passed

ArturAbdullin deleted the transform-error branch March 25, 2025 15:27

gravity-ui-bot mentioned this pull request Mar 25, 2025

chore(main): release 0.6.0 #27

Merged

feat(DataSource): add the transformError data-source function #24

feat(DataSource): add the transformError data-source function #24

Uh oh!

Conversation

ArturAbdullin commented Feb 26, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ArturAbdullin Mar 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DakEnviy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ArturAbdullin Mar 6, 2025 •

edited

Loading