Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/browser/glossary.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { LifeCycleEventEmitter, SharedOptions } from '#core/sharedOptions'
import type { RequiredDeep } from '#core/typeUtils'
import type { HttpNetworkFrameEventMap } from '#core/experimental/frames/http-frame'
import type { WebSocketNetworkFrameEventMap } from '#core/experimental/frames/websocket-frame'
import { AnyHandler } from '#core/experimental/handlers-controller'
import type { AnyHandler } from '#core/experimental/handlers-controller'

export interface StringifiedResponse extends ResponseInit {
body: string | ArrayBuffer | ReadableStream<Uint8Array> | null
Expand Down
2 changes: 1 addition & 1 deletion src/browser/setup-worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
defineNetwork,
NetworkReadyState,
} from '#core/experimental/define-network'
import { type AnyHandler } from '#core/experimental/handlers-controller'
import type { AnyHandler } from '#core/experimental/handlers-controller'
import { InterceptorSource } from '#core/experimental/sources/interceptor-source'
import { fromLegacyOnUnhandledRequest } from '#core/experimental/compat'
import type { LifeCycleEventEmitter } from '#core/sharedOptions'
Expand Down
7 changes: 4 additions & 3 deletions src/browser/sources/service-worker-source.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { invariant } from 'outvariant'
import { Emitter } from 'rettime'
import type { Emitter } from 'rettime'
import { DeferredPromise } from '@open-draft/deferred-promise'
import { FetchResponse } from '@mswjs/interceptors'
import { NetworkSource } from '#core/experimental/sources/network-source'
Expand All @@ -16,8 +16,9 @@ import {
supportsServiceWorker,
} from '../utils/supports'
import { getWorkerInstance } from '../utils/get-worker-instance'
import { WorkerChannel, WorkerChannelEventMap } from '../utils/workerChannel'
import { FindWorker } from '../glossary'
import type { WorkerChannelEventMap } from '../utils/workerChannel'
import { WorkerChannel } from '../utils/workerChannel'
import type { FindWorker } from '../glossary'
import { deserializeRequest } from '../utils/deserializeRequest'
import { validateWorkerScope } from '../utils/validate-worker-scope'

Expand Down
1 change: 0 additions & 1 deletion src/browser/utils/deserializeRequest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { pruneGetRequestBody } from './pruneGetRequestBody'
import type { ServiceWorkerIncomingRequest } from '../glossary'

/**
* Converts a given request received from the Service Worker
Expand Down
2 changes: 1 addition & 1 deletion src/core/experimental/define-network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
import { type NetworkFrameResolutionContext } from './frames/network-frame'
import { type UnhandledFrameHandle } from './on-unhandled-frame'
import {
AnyHandler,
HandlersController,
InMemoryHandlersController,
type AnyHandler,
} from './handlers-controller'
import { toReadonlyArray } from '../utils/internal/toReadonlyArray'

Expand Down
3 changes: 2 additions & 1 deletion src/core/experimental/frames/http-frame.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { http } from '../../http'
import { graphql } from '../../graphql'
import { ws } from '../../ws'
import { bypass } from '../../bypass'
import { HttpNetworkFrame, HttpNetworkFrameEventMap } from './http-frame'
import type { HttpNetworkFrameEventMap } from './http-frame'
import { HttpNetworkFrame } from './http-frame'
import { InMemoryHandlersController } from '#core/experimental/handlers-controller'

beforeAll(() => {
Expand Down
8 changes: 6 additions & 2 deletions src/core/experimental/frames/http-frame.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { TypedEvent } from 'rettime'
import { until } from 'until-async'
import { createRequestId } from '@mswjs/interceptors'
import { NetworkFrame, NetworkFrameResolutionContext } from './network-frame'
import {
NetworkFrame,
type NetworkFrameResolutionContext,
} from './network-frame'
import { toPublicUrl } from '../../utils/request/toPublicUrl'
import { executeHandlers } from '../../utils/executeHandlers'
import { storeResponseCookies } from '../../utils/request/storeResponseCookies'
Expand All @@ -11,7 +14,8 @@ import {
executeUnhandledFrameHandle,
type UnhandledFrameHandle,
} from '../on-unhandled-frame'
import { HandlersController, AnyHandler } from '../handlers-controller'
import type { HandlersController } from '../handlers-controller'
import { type AnyHandler } from '../handlers-controller'
import { type RequestHandler } from '../../handlers/RequestHandler'

interface HttpNetworkFrameOptions {
Expand Down
6 changes: 2 additions & 4 deletions src/core/experimental/frames/websocket-frame.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { http } from '../../http'
import { graphql } from '../../graphql'
import { ws } from '../../ws'
import {
WebSocketNetworkFrame,
WebSocketNetworkFrameEventMap,
} from './websocket-frame'
import type { WebSocketNetworkFrameEventMap } from './websocket-frame'
import { WebSocketNetworkFrame } from './websocket-frame'
import { createTestWebSocketConnection } from '../../../../test/support/ws-test-utils'
import { InMemoryHandlersController } from '#core/experimental/handlers-controller'

Expand Down
5 changes: 3 additions & 2 deletions src/core/experimental/frames/websocket-frame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import {
} from './network-frame'
import {
executeUnhandledFrameHandle,
UnhandledFrameHandle,
type UnhandledFrameHandle,
} from '../on-unhandled-frame'
import { devUtils } from '../../utils/internal/devUtils'
import { HandlersController, AnyHandler } from '../handlers-controller'
import type { HandlersController } from '../handlers-controller'
import { type AnyHandler } from '../handlers-controller'

export interface WebSocketNetworkFrameOptions {
connection: WebSocketConnectionData
Expand Down
2 changes: 1 addition & 1 deletion src/core/experimental/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export { defineNetwork, DefineNetworkOptions } from './define-network'
export { defineNetwork, type DefineNetworkOptions } from './define-network'

/* Network sources */
export { NetworkSource } from './sources/network-source'
Expand Down
6 changes: 2 additions & 4 deletions src/core/experimental/on-unhandled-frame.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ import type {
} from '@mswjs/interceptors/WebSocket'
import { HttpNetworkFrame } from './frames/http-frame'
import { WebSocketNetworkFrame } from './frames/websocket-frame'
import {
executeUnhandledFrameHandle,
UnhandledFrameCallback,
} from './on-unhandled-frame'
import type { UnhandledFrameCallback } from './on-unhandled-frame'
import { executeUnhandledFrameHandle } from './on-unhandled-frame'

beforeAll(() => {
vi.spyOn(console, 'warn').mockImplementation(() => void 0)
Expand Down
6 changes: 3 additions & 3 deletions src/core/experimental/setup-api.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { type DefaultEventMap, Emitter } from 'rettime'
import { LifeCycleEventEmitter } from '../sharedOptions'
import { type LifeCycleEventEmitter } from '../sharedOptions'
import type { HandlersController } from './handlers-controller'
import {
AnyHandler,
HandlersController,
InMemoryHandlersController,
type AnyHandler,
} from './handlers-controller'
import { Disposable } from '../utils/internal/Disposable'
import { toReadonlyArray } from '../utils/internal/toReadonlyArray'
Expand Down
8 changes: 2 additions & 6 deletions src/core/experimental/sources/interceptor-source.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import {
BatchInterceptor,
Interceptor,
RequestController,
type HttpRequestEventMap,
} from '@mswjs/interceptors'
import type { Interceptor, RequestController } from '@mswjs/interceptors'
import { BatchInterceptor, type HttpRequestEventMap } from '@mswjs/interceptors'
import type {
WebSocketConnectionData,
WebSocketEventMap,
Expand Down
16 changes: 8 additions & 8 deletions src/core/graphql.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import type { OperationTypeNode } from 'graphql'
import {
ResponseResolver,
RequestHandlerOptions,
type ResponseResolver,
type RequestHandlerOptions,
} from './handlers/RequestHandler'
import {
GraphQLHandler,
GraphQLVariables,
GraphQLOperationType,
GraphQLResolverExtras,
GraphQLResponseBody,
GraphQLQuery,
GraphQLPredicate,
type GraphQLVariables,
type GraphQLOperationType,
type GraphQLResolverExtras,
type GraphQLResponseBody,
type GraphQLQuery,
type GraphQLPredicate,
} from './handlers/GraphQLHandler'
import type { Path } from './utils/matching/matchRequestUrl'

Expand Down
7 changes: 3 additions & 4 deletions src/core/handlers/GraphQLHandler.test.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// @vitest-environment jsdom
import { createRequestId, encodeBuffer } from '@mswjs/interceptors'
import { OperationTypeNode, parse } from 'graphql'
import {
GraphQLHandler,
import type {
GraphQLRequestBody,
GraphQLResolverExtras,
isDocumentNode,
} from './GraphQLHandler'
import { GraphQLHandler, isDocumentNode } from './GraphQLHandler'
import { HttpResponse } from '../HttpResponse'
import { ResponseResolver } from './RequestHandler'
import type { ResponseResolver } from './RequestHandler'

const resolver: ResponseResolver<GraphQLResolverExtras<{ userId: string }>> = ({
variables,
Expand Down
26 changes: 15 additions & 11 deletions src/core/handlers/GraphQLHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,34 @@ import {
type OperationTypeNode,
} from 'graphql'
import {
DefaultBodyType,
RequestHandler,
RequestHandlerDefaultInfo,
RequestHandlerExecutionResult,
RequestHandlerOptions,
ResponseResolver,
type DefaultBodyType,
type RequestHandlerDefaultInfo,
type RequestHandlerExecutionResult,
type RequestHandlerOptions,
type ResponseResolver,
} from './RequestHandler'
import { getTimestamp } from '../utils/logging/getTimestamp'
import { getStatusCodeColor } from '../utils/logging/getStatusCodeColor'
import { serializeRequest } from '../utils/logging/serializeRequest'
import { serializeResponse } from '../utils/logging/serializeResponse'
import { Match, matchRequestUrl, Path } from '../utils/matching/matchRequestUrl'
import {
ParsedGraphQLRequest,
GraphQLMultipartRequestBody,
type Match,
matchRequestUrl,
type Path,
} from '../utils/matching/matchRequestUrl'
import {
type ParsedGraphQLRequest,
type GraphQLMultipartRequestBody,
parseGraphQLRequest,
parseDocumentNode,
ParsedGraphQLQuery,
type ParsedGraphQLQuery,
} from '../utils/internal/parseGraphQLRequest'
import { toPublicUrl } from '../utils/request/toPublicUrl'
import { devUtils } from '../utils/internal/devUtils'
import { getAllRequestCookies } from '../utils/request/getRequestCookies'
import { ResponseResolutionContext } from 'src/iife'
import { kDefaultContentType, StrictRequest } from '../HttpResponse'
import { type ResponseResolutionContext } from '../utils/executeHandlers'
import { kDefaultContentType, type StrictRequest } from '../HttpResponse'
import { getAllAcceptedMimeTypes } from '../utils/request/getAllAcceptedMimeTypes'

export interface DocumentTypeDecoration<
Expand Down
5 changes: 3 additions & 2 deletions src/core/handlers/HttpHandler.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// @vitest-environment jsdom
import { createRequestId } from '@mswjs/interceptors'
import { HttpHandler, HttpRequestResolverExtras } from './HttpHandler'
import type { HttpRequestResolverExtras } from './HttpHandler'
import { HttpHandler } from './HttpHandler'
import { HttpResponse } from '..'
import { ResponseResolver } from './RequestHandler'
import type { ResponseResolver } from './RequestHandler'

const resolver: ResponseResolver<
HttpRequestResolverExtras<{ userId: string }>
Expand Down
14 changes: 7 additions & 7 deletions src/core/handlers/HttpHandler.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ResponseResolutionContext } from '../utils/executeHandlers'
import { type ResponseResolutionContext } from '../utils/executeHandlers'
import { devUtils } from '../utils/internal/devUtils'
import { isStringEqual } from '../utils/internal/isStringEqual'
import { getStatusCodeColor } from '../utils/logging/getStatusCodeColor'
Expand All @@ -7,18 +7,18 @@ import { serializeRequest } from '../utils/logging/serializeRequest'
import { serializeResponse } from '../utils/logging/serializeResponse'
import {
matchRequestUrl,
Match,
Path,
PathParams,
type Match,
type Path,
type PathParams,
} from '../utils/matching/matchRequestUrl'
import { toPublicUrl } from '../utils/request/toPublicUrl'
import { getAllRequestCookies } from '../utils/request/getRequestCookies'
import { cleanUrl } from '../utils/url/cleanUrl'
import {
RequestHandler,
RequestHandlerDefaultInfo,
RequestHandlerOptions,
ResponseResolver,
type RequestHandlerDefaultInfo,
type RequestHandlerOptions,
type ResponseResolver,
} from './RequestHandler'

export type HttpHandlerMethod = string | RegExp
Expand Down
10 changes: 5 additions & 5 deletions src/core/handlers/RequestHandler.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { getCallFrame } from '../utils/internal/getCallFrame'
import {
AsyncIterable,
Iterable,
isIterable,
type AsyncIterable,
type Iterable,
} from '../utils/internal/isIterable'
import type { ResponseResolutionContext } from '../utils/executeHandlers'
import type { MaybePromise } from '../typeUtils'
import type { HttpResponse } from '../HttpResponse'
import {
StrictRequest,
HttpResponse,
DefaultUnsafeFetchResponse,
type StrictRequest,
type DefaultUnsafeFetchResponse,
} from '../HttpResponse'
import type { GraphQLRequestBody } from './GraphQLHandler'

Expand Down
10 changes: 5 additions & 5 deletions src/core/http.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import {
DefaultBodyType,
RequestHandlerOptions,
ResponseResolver,
type DefaultBodyType,
type RequestHandlerOptions,
type ResponseResolver,
} from './handlers/RequestHandler'
import {
HttpMethods,
HttpHandler,
HttpRequestResolverExtras,
HttpRequestPredicate,
type HttpRequestResolverExtras,
type HttpRequestPredicate,
} from './handlers/HttpHandler'
import type { PathParams } from './utils/matching/matchRequestUrl'

Expand Down
2 changes: 1 addition & 1 deletion src/core/utils/cookieStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
Cookie,
CookieJar,
MemoryCookieStore,
SerializedCookie,
type SerializedCookie,
type MemoryCookieStoreIndex,
} from 'tough-cookie'
import { jsonParse } from './internal/jsonParse'
Expand Down
6 changes: 2 additions & 4 deletions src/core/utils/executeHandlers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {
RequestHandler,
type RequestHandlerExecutionResult,
} from '../handlers/RequestHandler'
import type { RequestHandler } from '../handlers/RequestHandler'
import { type RequestHandlerExecutionResult } from '../handlers/RequestHandler'

export interface HandlersExecutionResult {
handler: RequestHandler
Expand Down
9 changes: 5 additions & 4 deletions src/core/utils/handleRequest.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// @vitest-environment jsdom
import { Emitter } from 'strict-event-emitter'
import { createRequestId } from '@mswjs/interceptors'
import { LifeCycleEventsMap, SharedOptions } from '../sharedOptions'
import { RequestHandler } from '../handlers/RequestHandler'
import type { LifeCycleEventsMap, SharedOptions } from '../sharedOptions'
import type { RequestHandler } from '../handlers/RequestHandler'
import { http } from '../http'
import { handleRequest, HandleRequestOptions } from './handleRequest'
import { RequiredDeep } from '../typeUtils'
import type { HandleRequestOptions } from './handleRequest'
import { handleRequest } from './handleRequest'
import type { RequiredDeep } from '../typeUtils'
import { HttpResponse } from '../HttpResponse'
import { passthrough } from '../passthrough'

Expand Down
6 changes: 3 additions & 3 deletions src/core/utils/handleRequest.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { until } from 'until-async'
import { Emitter } from 'strict-event-emitter'
import { LifeCycleEventsMap, SharedOptions } from '../sharedOptions'
import { RequiredDeep } from '../typeUtils'
import type { Emitter } from 'strict-event-emitter'
import type { LifeCycleEventsMap, SharedOptions } from '../sharedOptions'
import type { RequiredDeep } from '../typeUtils'
import type { RequestHandler } from '../handlers/RequestHandler'
import {
type HandlersExecutionResult,
Expand Down
6 changes: 2 additions & 4 deletions src/core/utils/internal/parseGraphQLRequest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
*/
import { encodeBuffer } from '@mswjs/interceptors'
import { OperationTypeNode } from 'graphql'
import {
ParsedGraphQLRequest,
parseGraphQLRequest,
} from './parseGraphQLRequest'
import type { ParsedGraphQLRequest } from './parseGraphQLRequest'
import { parseGraphQLRequest } from './parseGraphQLRequest'

test('returns true given a GraphQL-compatible request', async () => {
const getRequest = new Request(
Expand Down
2 changes: 1 addition & 1 deletion src/core/utils/internal/parseMultipartData.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { stringToHeaders } from 'headers-polyfill'
import { DefaultRequestMultipartBody } from '../../handlers/RequestHandler'
import { type DefaultRequestMultipartBody } from '../../handlers/RequestHandler'

interface ParsedContentHeaders {
name: string
Expand Down
Loading
Loading