msw 2.1.2 → 2.1.4

package/src/core/utils/request/onUnhandledRequest.ts

@@ -1,20 +1,6 @@
-import jsLevenshtein from '@bundled-es-modules/js-levenshtein'
-import { RequestHandler, HttpHandler, GraphQLHandler } from '../..'
-import {
-  ParsedGraphQLQuery,
-  ParsedGraphQLRequest,
-  parseGraphQLRequest,
-} from '../internal/parseGraphQLRequest'
 import { getPublicUrlFromRequest } from './getPublicUrlFromRequest'
-import { isStringEqual } from '../internal/isStringEqual'
 import { devUtils } from '../internal/devUtils'
 
-const getStringMatchScore = jsLevenshtein
-
-const MAX_MATCH_SCORE = 3
-const MAX_SUGGESTION_COUNT = 4
-const TYPE_MATCH_DELTA = 0.5
-
 export interface UnhandledRequestPrint {
   warning(): void
   error(): void
@@ -31,183 +17,18 @@ export type UnhandledRequestStrategy =
   | 'error'
   | UnhandledRequestCallback
 
-interface RequestHandlerGroups {
-  http: Array<HttpHandler>
-  graphql: Array<GraphQLHandler>
-}
-
-function groupHandlersByType(
-  handlers: Array<RequestHandler>,
-): RequestHandlerGroups {
-  return handlers.reduce<RequestHandlerGroups>(
-    (groups, handler) => {
-      if (handler instanceof HttpHandler) {
-        groups.http.push(handler)
-      }
-
-      if (handler instanceof GraphQLHandler) {
-        groups.graphql.push(handler)
-      }
-
-      return groups
-    },
-    {
-      http: [],
-      graphql: [],
-    },
-  )
-}
-
-type RequestHandlerSuggestion = [number, RequestHandler]
-
-type ScoreGetterFn<RequestHandlerType extends RequestHandler> = (
-  request: Request,
-  handler: RequestHandlerType,
-) => number
-
-function getHttpHandlerScore(): ScoreGetterFn<HttpHandler> {
-  return (request, handler) => {
-    const { path, method } = handler.info
-
-    if (path instanceof RegExp || method instanceof RegExp) {
-      return Infinity
-    }
-
-    const hasSameMethod = isStringEqual(request.method, method)
-
-    // Always treat a handler with the same method as a more similar one.
-    const methodScoreDelta = hasSameMethod ? TYPE_MATCH_DELTA : 0
-    const requestPublicUrl = getPublicUrlFromRequest(request)
-    const score = getStringMatchScore(requestPublicUrl, path)
-
-    return score - methodScoreDelta
-  }
-}
-
-function getGraphQLHandlerScore(
-  parsedQuery: ParsedGraphQLQuery,
-): ScoreGetterFn<GraphQLHandler> {
-  return (_, handler) => {
-    if (typeof parsedQuery.operationName === 'undefined') {
-      return Infinity
-    }
-
-    const { operationType, operationName } = handler.info
-
-    if (typeof operationName !== 'string') {
-      return Infinity
-    }
-
-    const hasSameOperationType = parsedQuery.operationType === operationType
-    // Always treat a handler with the same operation type as a more similar one.
-    const operationTypeScoreDelta = hasSameOperationType ? TYPE_MATCH_DELTA : 0
-    const score = getStringMatchScore(parsedQuery.operationName, operationName)
-
-    return score - operationTypeScoreDelta
-  }
-}
-
-function getSuggestedHandler(
-  request: Request,
-  handlers: Array<HttpHandler> | Array<GraphQLHandler>,
-  getScore: ScoreGetterFn<HttpHandler> | ScoreGetterFn<GraphQLHandler>,
-): Array<RequestHandler> {
-  const suggestedHandlers = (handlers as Array<RequestHandler>)
-    .reduce<Array<RequestHandlerSuggestion>>((suggestions, handler) => {
-      const score = getScore(request, handler as any)
-      return suggestions.concat([[score, handler]])
-    }, [])
-    .sort(([leftScore], [rightScore]) => leftScore - rightScore)
-    .filter(([score]) => score <= MAX_MATCH_SCORE)
-    .slice(0, MAX_SUGGESTION_COUNT)
-    .map(([, handler]) => handler)
-
-  return suggestedHandlers
-}
-
-function getSuggestedHandlersMessage(handlers: RequestHandler[]) {
-  if (handlers.length > 1) {
-    return `\
-Did you mean to request one of the following resources instead?
-
-${handlers.map((handler) => `  • ${handler.info.header}`).join('\n')}`
-  }
-
-  return `Did you mean to request "${handlers[0].info.header}" instead?`
-}
-
 export async function onUnhandledRequest(
   request: Request,
-  handlers: Array<RequestHandler>,
   strategy: UnhandledRequestStrategy = 'warn',
 ): Promise<void> {
-  const parsedGraphQLQuery = await parseGraphQLRequest(request).catch(
-    () => null,
-  )
   const publicUrl = getPublicUrlFromRequest(request)
-
-  function generateHandlerSuggestion(): string {
-    /**
-     * @note Ignore exceptions during GraphQL request parsing because at this point
-     * we cannot assume the unhandled request is a valid GraphQL request.
-     * If the GraphQL parsing fails, just don't treat it as a GraphQL request.
-     */
-    const handlerGroups = groupHandlersByType(handlers)
-    const relevantHandlers = parsedGraphQLQuery
-      ? handlerGroups.graphql
-      : handlerGroups.http
-
-    const suggestedHandlers = getSuggestedHandler(
-      request,
-      relevantHandlers,
-      parsedGraphQLQuery
-        ? getGraphQLHandlerScore(parsedGraphQLQuery)
-        : getHttpHandlerScore(),
-    )
-
-    return suggestedHandlers.length > 0
-      ? getSuggestedHandlersMessage(suggestedHandlers)
-      : ''
-  }
-
-  function getGraphQLRequestHeader(
-    parsedGraphQLRequest: ParsedGraphQLRequest<any>,
-  ): string {
-    if (!parsedGraphQLRequest?.operationName) {
-      return `anonymous ${parsedGraphQLRequest?.operationType} (${request.method} ${publicUrl})`
-    }
-
-    return `${parsedGraphQLRequest.operationType} ${parsedGraphQLRequest.operationName} (${request.method} ${publicUrl})`
-  }
-
-  function generateUnhandledRequestMessage(): string {
-    const requestHeader = parsedGraphQLQuery
-      ? getGraphQLRequestHeader(parsedGraphQLQuery)
-      : `${request.method} ${publicUrl}`
-    const handlerSuggestion = generateHandlerSuggestion()
-
-    const messageTemplate = [
-      `intercepted a request without a matching request handler:`,
-      `  \u2022 ${requestHeader}`,
-      handlerSuggestion,
-      `\
-If you still wish to intercept this unhandled request, please create a request handler for it.
-Read more: https://mswjs.io/docs/getting-started/mocks\
-`,
-    ].filter(Boolean)
-    return messageTemplate.join('\n\n')
-  }
+  const unhandledRequestMessage = `intercepted a request without a matching request handler:\n\n  \u2022 ${request.method} ${publicUrl}\n\nIf you still wish to intercept this unhandled request, please create a request handler for it.\nRead more: https://mswjs.io/docs/getting-started/mocks`
 
   function applyStrategy(strategy: UnhandledRequestStrategy) {
-    // Generate handler suggestions only when applying the strategy.
-    // This saves bandwidth for scenarios when developers opt-out
-    // from the default unhandled request handling strategy.
-    const message = generateUnhandledRequestMessage()
-
     switch (strategy) {
       case 'error': {
         // Print a developer-friendly error.
-        devUtils.error('Error: %s', message)
+        devUtils.error('Error: %s', unhandledRequestMessage)
 
         // Throw an exception to halt request processing and not perform the original request.
         throw new Error(
@@ -218,7 +39,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks\
       }
 
       case 'warn': {
-        devUtils.warn('Warning: %s', message)
+        devUtils.warn('Warning: %s', unhandledRequestMessage)
         break
       }
 

package/lib/core/utils/getResponse.d.mts

@@ -1,2 +0,0 @@
-export { h as ResponseLookupResult, i as ResponseResolutionContext, j as getResponse } from '../RequestHandler-nfjVJ8Tp.mjs';
-import '../typeUtils.mjs';

package/lib/core/utils/getResponse.d.ts

@@ -1,2 +0,0 @@
-export { h as ResponseLookupResult, i as ResponseResolutionContext, j as getResponse } from '../RequestHandler-TRh8Eh4H.js';
-import '../typeUtils.js';

package/lib/core/utils/getResponse.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/core/utils/getResponse.ts"],"sourcesContent":["import {\n  RequestHandler,\n  RequestHandlerExecutionResult,\n} from '../handlers/RequestHandler'\n\nexport interface ResponseLookupResult {\n  handler: RequestHandler\n  parsedResult?: any\n  response?: Response\n}\n\nexport interface ResponseResolutionContext {\n  baseUrl?: string\n}\n\n/**\n * Returns a mocked response for a given request using following request handlers.\n */\nexport const getResponse = async <Handler extends Array<RequestHandler>>({\n  request,\n  requestId,\n  handlers,\n  resolutionContext,\n}: {\n  request: Request\n  requestId: string\n  handlers: Handler\n  resolutionContext?: ResponseResolutionContext\n}): Promise<ResponseLookupResult | null> => {\n  let matchingHandler: RequestHandler | null = null\n  let result: RequestHandlerExecutionResult<any> | null = null\n\n  for (const handler of handlers) {\n    result = await handler.run({ request, requestId, resolutionContext })\n\n    // If the handler produces some result for this request,\n    // it automatically becomes matching.\n    if (result !== null) {\n      matchingHandler = handler\n    }\n\n    // Stop the lookup if this handler returns a mocked response.\n    // If it doesn't, it will still be considered the last matching\n    // handler until any of them returns a response. This way we can\n    // distinguish between fallthrough handlers without responses\n    // and the lack of a matching handler.\n    if (result?.response) {\n      break\n    }\n  }\n\n  if (matchingHandler) {\n    return {\n      handler: matchingHandler,\n      parsedResult: result?.parsedResult,\n      response: result?.response,\n    }\n  }\n\n  return null\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAkBO,MAAM,cAAc,OAA8C;AAAA,EACvE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAK4C;AAC1C,MAAI,kBAAyC;AAC7C,MAAI,SAAoD;AAExD,aAAW,WAAW,UAAU;AAC9B,aAAS,MAAM,QAAQ,IAAI,EAAE,SAAS,WAAW,kBAAkB,CAAC;AAIpE,QAAI,WAAW,MAAM;AACnB,wBAAkB;AAAA,IACpB;AAOA,QAAI,QAAQ,UAAU;AACpB;AAAA,IACF;AAAA,EACF;AAEA,MAAI,iBAAiB;AACnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT,cAAc,QAAQ;AAAA,MACtB,UAAU,QAAQ;AAAA,IACpB;AAAA,EACF;AAEA,SAAO;AACT;","names":[]}

package/lib/core/utils/getResponse.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/core/utils/getResponse.ts"],"sourcesContent":["import {\n  RequestHandler,\n  RequestHandlerExecutionResult,\n} from '../handlers/RequestHandler'\n\nexport interface ResponseLookupResult {\n  handler: RequestHandler\n  parsedResult?: any\n  response?: Response\n}\n\nexport interface ResponseResolutionContext {\n  baseUrl?: string\n}\n\n/**\n * Returns a mocked response for a given request using following request handlers.\n */\nexport const getResponse = async <Handler extends Array<RequestHandler>>({\n  request,\n  requestId,\n  handlers,\n  resolutionContext,\n}: {\n  request: Request\n  requestId: string\n  handlers: Handler\n  resolutionContext?: ResponseResolutionContext\n}): Promise<ResponseLookupResult | null> => {\n  let matchingHandler: RequestHandler | null = null\n  let result: RequestHandlerExecutionResult<any> | null = null\n\n  for (const handler of handlers) {\n    result = await handler.run({ request, requestId, resolutionContext })\n\n    // If the handler produces some result for this request,\n    // it automatically becomes matching.\n    if (result !== null) {\n      matchingHandler = handler\n    }\n\n    // Stop the lookup if this handler returns a mocked response.\n    // If it doesn't, it will still be considered the last matching\n    // handler until any of them returns a response. This way we can\n    // distinguish between fallthrough handlers without responses\n    // and the lack of a matching handler.\n    if (result?.response) {\n      break\n    }\n  }\n\n  if (matchingHandler) {\n    return {\n      handler: matchingHandler,\n      parsedResult: result?.parsedResult,\n      response: result?.response,\n    }\n  }\n\n  return null\n}\n"],"mappings":"AAkBO,MAAM,cAAc,OAA8C;AAAA,EACvE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAK4C;AAC1C,MAAI,kBAAyC;AAC7C,MAAI,SAAoD;AAExD,aAAW,WAAW,UAAU;AAC9B,aAAS,MAAM,QAAQ,IAAI,EAAE,SAAS,WAAW,kBAAkB,CAAC;AAIpE,QAAI,WAAW,MAAM;AACnB,wBAAkB;AAAA,IACpB;AAOA,QAAI,QAAQ,UAAU;AACpB;AAAA,IACF;AAAA,EACF;AAEA,MAAI,iBAAiB;AACnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT,cAAc,QAAQ;AAAA,MACtB,UAAU,QAAQ;AAAA,IACpB;AAAA,EACF;AAEA,SAAO;AACT;","names":[]}

package/lib/core/utils/internal/uuidv4.d.mts

@@ -1,3 +0,0 @@
-declare function uuidv4(): string;
-
-export { uuidv4 };

package/lib/core/utils/internal/uuidv4.d.ts

@@ -1,3 +0,0 @@
-declare function uuidv4(): string;
-
-export { uuidv4 };

package/lib/core/utils/internal/uuidv4.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/core/utils/internal/uuidv4.ts"],"sourcesContent":["export function uuidv4(): string {\n  return Math.random().toString(16).slice(2)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,SAAS,SAAiB;AAC/B,SAAO,KAAK,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC;AAC3C;","names":[]}

package/lib/core/utils/internal/uuidv4.mjs

@@ -1,7 +0,0 @@
-function uuidv4() {
-  return Math.random().toString(16).slice(2);
-}
-export {
-  uuidv4
-};
-//# sourceMappingURL=uuidv4.mjs.map

package/lib/core/utils/internal/uuidv4.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/core/utils/internal/uuidv4.ts"],"sourcesContent":["export function uuidv4(): string {\n  return Math.random().toString(16).slice(2)\n}\n"],"mappings":"AAAO,SAAS,SAAiB;AAC/B,SAAO,KAAK,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC;AAC3C;","names":[]}