fix lint

emberjs · Sep 25, 2023 · 207f4b8 · 207f4b8
1 parent f4bc910
commit 207f4b8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/packages/legacy-compat/src/legacy-network-handler/legacy-network-handler.ts b/packages/legacy-compat/src/legacy-network-handler/legacy-network-handler.ts
@@ -4,7 +4,7 @@ import { importSync } from '@embroider/macros';
 
 import { LOG_PAYLOADS } from '@ember-data/debugging';
 import { DEBUG, TESTING } from '@ember-data/env';
-import type { Handler, NextFn } from '@ember-data/request/-private/types';
+import type { Future, Handler, NextFn, StructuredDataDocument } from '@ember-data/request';
 import type Store from '@ember-data/store';
 import type { StoreRequestContext, StoreRequestInfo } from '@ember-data/store/-private/cache-handler';
 import type { Collection } from '@ember-data/store/-private/record-arrays/identifier-array';
@@ -49,10 +49,10 @@ const PotentialLegacyOperations = new Set([
 ]);
 
 export const LegacyNetworkHandler: Handler = {
-  request<T>(context: StoreRequestContext, next: NextFn<T>): Promise<T> {
+  request<T>(context: StoreRequestContext, next: NextFn<T>): Future<T> | Promise<StructuredDataDocument<T>> {
     // if we are not a legacy request, move on
     if (context.request.url || !context.request.op || !PotentialLegacyOperations.has(context.request.op)) {
-      return next(context.request) as unknown as Promise<T>;
+      return next(context.request);
     }
 
     const { store } = context.request;
@@ -80,7 +80,7 @@ export const LegacyNetworkHandler: Handler = {
       case 'deleteRecord':
         return saveRecord(context);
       default:
-        return next(context.request) as unknown as Promise<T>;
+        return next(context.request);
     }
   },
 };

diff --git a/packages/request/src/-private/types.ts b/packages/request/src/-private/types.ts
@@ -340,7 +340,7 @@ export interface Handler {
    * @param context
    * @param next
    */
-  request<T = unknown>(context: RequestContext, next: NextFn<T>): Promise<StructuredDataDocument<T>> | Future<T>;
+  request<T = unknown>(context: RequestContext, next: NextFn<T>): Promise<T | StructuredDataDocument<T>> | Future<T>;
 }
 
 export interface RequestResponse<T> {

diff --git a/packages/store/src/-private/cache-handler.ts b/packages/store/src/-private/cache-handler.ts
@@ -6,6 +6,7 @@ import type {
   ImmutableRequestInfo,
   NextFn,
   RequestContext,
+  StructuredDataDocument,
   StructuredErrorDocument,
 } from '@ember-data/request/-private/types';
 import type Store from '@ember-data/store';
@@ -309,7 +310,7 @@ export const SkipCache = Symbol.for('ember-data:skip-cache');
 export const EnableHydration = Symbol.for('ember-data:enable-hydration');
 
 export const CacheHandler: Handler = {
-  request<T>(context: StoreRequestContext, next: NextFn<T>): Promise<T> | Future<T> {
+  request<T>(context: StoreRequestContext, next: NextFn<T>): Promise<T | StructuredDataDocument<T>> | Future<T> {
     // if we have no cache or no cache-key skip cache handling
     if (!context.request.store || context.request.cacheOptions?.[SkipCache]) {
       return next(context.request);

diff --git a/tests/builders/tests/integration/create-record-test.ts b/tests/builders/tests/integration/create-record-test.ts
@@ -85,7 +85,7 @@ module('Integration - createRecord', function (hooks) {
     // intercept Handler APIs to ensure they are called as expected
     let response: unknown;
     const TestHandler: Handler = {
-      request<T>(context: RequestContext): Promise<T> | Future<T> {
+      request<T>(context: RequestContext): Promise<T | StructuredDataDocument<T>> | Future<T> {
         assert.step(`handle ${context.request.op} request`);
         assert.ok(response, 'response is set');
 
@@ -165,7 +165,7 @@ module('Integration - createRecord', function (hooks) {
     // intercept Handler APIs to ensure they are called as expected
     let response: unknown;
     const TestHandler: Handler = {
-      request<T>(context: RequestContext): Promise<T> | Future<T> {
+      request<T>(context: RequestContext): Promise<T | StructuredDataDocument<T>> | Future<T> {
         assert.step(`handle ${context.request.op} request`);
         assert.ok(response, 'response is set');
 

diff --git a/tests/builders/tests/integration/delete-record-test.ts b/tests/builders/tests/integration/delete-record-test.ts
@@ -85,7 +85,7 @@ module('Integration - deleteRecord', function (hooks) {
     // intercept Handler APIs to ensure they are called as expected
     let response: unknown;
     const TestHandler: Handler = {
-      request<T>(context: RequestContext): Promise<T> | Future<T> {
+      request<T>(context: RequestContext): Promise<T | StructuredDataDocument<T>> | Future<T> {
         assert.step(`handle ${context.request.op} request`);
         assert.ok(response, 'response is set');
 
@@ -181,7 +181,7 @@ module('Integration - deleteRecord', function (hooks) {
     // intercept Handler APIs to ensure they are called as expected
     let response: unknown;
     const TestHandler: Handler = {
-      request<T>(context: RequestContext): Promise<T> | Future<T> {
+      request<T>(context: RequestContext): Promise<T | StructuredDataDocument<T>> | Future<T> {
         assert.step(`handle ${context.request.op} request`);
         assert.ok(response, 'response is set');
 

diff --git a/tests/builders/tests/integration/update-record-test.ts b/tests/builders/tests/integration/update-record-test.ts
@@ -85,7 +85,7 @@ module('Integration - updateRecord', function (hooks) {
     // intercept Handler APIs to ensure they are called as expected
     let response: unknown;
     const TestHandler: Handler = {
-      request<T>(context: RequestContext): Promise<T> | Future<T> {
+      request<T>(context: RequestContext): Promise<T | StructuredDataDocument<T>> | Future<T> {
         assert.step(`handle ${context.request.op} request`);
         assert.ok(response, 'response is set');
 
@@ -166,7 +166,7 @@ module('Integration - updateRecord', function (hooks) {
     // intercept Handler APIs to ensure they are called as expected
     let response: unknown;
     const TestHandler: Handler = {
-      request<T>(context: RequestContext): Promise<T> | Future<T> {
+      request<T>(context: RequestContext): Promise<T | StructuredDataDocument<T>> | Future<T> {
         assert.step(`handle ${context.request.op} request`);
         assert.ok(response, 'response is set');
 

diff --git a/tests/request/tests/integration/graceful-dev-errors-test.ts b/tests/request/tests/integration/graceful-dev-errors-test.ts
@@ -36,7 +36,6 @@ module('RequestManager | Graceful Errors', function () {
         return Promise.resolve('hello' as T);
       },
     };
-    // @ts-expect-error
     manager.use([handler]);
     await manager.request({ url: '/wat' });