fixup!

Author: vicb

packages/open-next/src/types/open-next.ts

@@ -1,10 +1,16 @@
-import type { Readable } from "node:stream";
 import type { ReadableStream } from "node:stream/web";
 
-import type { StreamCreator } from "http/index.js";
-
 import type { WarmerEvent, WarmerResponse } from "../adapters/warmer-function";
-import type { IncrementalCache, Queue, TagCache } from "./overrides";
+import type {
+  Converter,
+  ImageLoader,
+  IncrementalCache,
+  OriginResolver,
+  Queue,
+  TagCache,
+  Warmer,
+  Wrapper,
+} from "./overrides";
 
 export type BaseEventOrResult<T extends string = string> = {
   type: T;
@@ -62,57 +68,12 @@ export type BaseOverride = {
 };
 export type LazyLoadedOverride<T extends BaseOverride> = () => Promise<T>;
 
-export type OpenNextHandler<
-  E extends BaseEventOrResult = InternalEvent,
-  R extends BaseEventOrResult = InternalResult,
-> = (event: E, responseStream?: StreamCreator) => Promise<R>;
-
-export type Converter<
-  E extends BaseEventOrResult = InternalEvent,
-  R extends BaseEventOrResult = InternalResult,
-> = BaseOverride & {
-  convertFrom: (event: any) => Promise<E>;
-  convertTo: (result: R, originalRequest?: any) => Promise<any>;
-};
-
-export type WrapperHandler<
-  E extends BaseEventOrResult = InternalEvent,
-  R extends BaseEventOrResult = InternalResult,
-> = (
-  handler: OpenNextHandler<E, R>,
-  converter: Converter<E, R>,
-) => Promise<(...args: any[]) => any>;
-
-export type Wrapper<
-  E extends BaseEventOrResult = InternalEvent,
-  R extends BaseEventOrResult = InternalResult,
-> = BaseOverride & {
-  wrapper: WrapperHandler<E, R>;
-  supportStreaming: boolean;
-  edgeRuntime?: boolean;
-};
-
-export type Warmer = BaseOverride & {
-  invoke: (warmerId: string) => Promise<void>;
-};
-
-export type ImageLoader = BaseOverride & {
-  load: (url: string) => Promise<{
-    body?: Readable;
-    contentType?: string;
-    cacheControl?: string;
-  }>;
-};
-
 export interface Origin {
   host: string;
   protocol: "http" | "https";
   port?: number;
   customHeaders?: Record<string, string>;
 }
-export type OriginResolver = BaseOverride & {
-  resolve: (path: string) => Promise<Origin | false>;
-};
 
 export type IncludedWrapper =
   | "aws-lambda"

packages/open-next/src/types/overrides.ts

@@ -1,5 +1,16 @@
+import type { Readable } from "node:stream";
+
+import type { StreamCreator } from "http/index";
 import type { Meta } from "types/cache";
 
+import type {
+  BaseEventOrResult,
+  BaseOverride,
+  InternalEvent,
+  InternalResult,
+  Origin,
+} from "./open-next";
+
 // Queue
 
 export interface QueueMessage {
@@ -78,3 +89,49 @@ export type TagCache = {
   ): Promise<void>;
   name: string;
 };
+
+export type WrapperHandler<
+  E extends BaseEventOrResult = InternalEvent,
+  R extends BaseEventOrResult = InternalResult,
+> = (
+  handler: OpenNextHandler<E, R>,
+  converter: Converter<E, R>,
+) => Promise<(...args: any[]) => any>;
+
+export type Wrapper<
+  E extends BaseEventOrResult = InternalEvent,
+  R extends BaseEventOrResult = InternalResult,
+> = BaseOverride & {
+  wrapper: WrapperHandler<E, R>;
+  supportStreaming: boolean;
+  edgeRuntime?: boolean;
+};
+
+export type OpenNextHandler<
+  E extends BaseEventOrResult = InternalEvent,
+  R extends BaseEventOrResult = InternalResult,
+> = (event: E, responseStream?: StreamCreator) => Promise<R>;
+
+export type Converter<
+  E extends BaseEventOrResult = InternalEvent,
+  R extends BaseEventOrResult = InternalResult,
+> = BaseOverride & {
+  convertFrom: (event: any) => Promise<E>;
+  convertTo: (result: R, originalRequest?: any) => Promise<any>;
+};
+
+export type Warmer = BaseOverride & {
+  invoke: (warmerId: string) => Promise<void>;
+};
+
+export type ImageLoader = BaseOverride & {
+  load: (url: string) => Promise<{
+    body?: Readable;
+    contentType?: string;
+    cacheControl?: string;
+  }>;
+};
+
+export type OriginResolver = BaseOverride & {
+  resolve: (path: string) => Promise<Origin | false>;
+};

packages/tests-unit/tests/core/routing/cacheInterceptor.test.ts

@@ -1,8 +1,8 @@
 /* eslint-disable sonarjs/no-duplicate-string */
 import { cacheInterceptor } from "@opennextjs/aws/core/routing/cacheInterceptor.js";
 import { convertFromQueryString } from "@opennextjs/aws/core/routing/util.js";
-import type { Queue } from "@opennextjs/aws/queue/types.js";
 import type { InternalEvent } from "@opennextjs/aws/types/open-next.js";
+import type { Queue } from "@opennextjs/aws/types/overrides.js";
 import { fromReadableStream } from "@opennextjs/aws/utils/stream.js";
 import { vi } from "vitest";