From 207f4b86f818cfd149fdec86f86973cf0d54a5ce Mon Sep 17 00:00:00 2001 From: Chris Thoburn Date: Mon, 25 Sep 2023 02:18:03 -0700 Subject: [PATCH] fix lint --- .../src/legacy-network-handler/legacy-network-handler.ts | 8 ++++---- packages/request/src/-private/types.ts | 2 +- packages/store/src/-private/cache-handler.ts | 3 ++- tests/builders/tests/integration/create-record-test.ts | 4 ++-- tests/builders/tests/integration/delete-record-test.ts | 4 ++-- tests/builders/tests/integration/update-record-test.ts | 4 ++-- .../request/tests/integration/graceful-dev-errors-test.ts | 1 - 7 files changed, 13 insertions(+), 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 index 5b11de0d404..6f5ce631894 100644 --- 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(context: StoreRequestContext, next: NextFn): Promise { + request(context: StoreRequestContext, next: NextFn): Future | Promise> { // 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; + 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; + return next(context.request); } }, }; diff --git a/packages/request/src/-private/types.ts b/packages/request/src/-private/types.ts index 51f5a60a2c8..2dc53603977 100644 --- 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(context: RequestContext, next: NextFn): Promise> | Future; + request(context: RequestContext, next: NextFn): Promise> | Future; } export interface RequestResponse { diff --git a/packages/store/src/-private/cache-handler.ts b/packages/store/src/-private/cache-handler.ts index 2fe4fb4b510..f07d6983d00 100644 --- 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(context: StoreRequestContext, next: NextFn): Promise | Future { + request(context: StoreRequestContext, next: NextFn): Promise> | Future { // 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 index 49262d0c6fa..ecb1ee4a378 100644 --- 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(context: RequestContext): Promise | Future { + request(context: RequestContext): Promise> | Future { 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(context: RequestContext): Promise | Future { + request(context: RequestContext): Promise> | Future { 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 index e746f2cafa3..5da75d6cf8e 100644 --- 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(context: RequestContext): Promise | Future { + request(context: RequestContext): Promise> | Future { 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(context: RequestContext): Promise | Future { + request(context: RequestContext): Promise> | Future { 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 index 24b57f79f9d..d680ff38574 100644 --- 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(context: RequestContext): Promise | Future { + request(context: RequestContext): Promise> | Future { 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(context: RequestContext): Promise | Future { + request(context: RequestContext): Promise> | Future { 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 index 6f01aca92a3..3530ca102b4 100644 --- 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' });