msw 2.13.0 → 2.13.2

package/lib/mockServiceWorker.js

@@ -7,7 +7,7 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.13.0'
+const PACKAGE_VERSION = '2.13.2'
 const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

package/lib/native/index.d.mts

@@ -51,7 +51,7 @@ interface SetupServerCommon {
      *
      * @see {@link https://mswjs.io/docs/api/life-cycle-events Life-cycle Events API reference}
      */
-    events: LifeCycleEventEmitter<HttpNetworkFrameEventMap | WebSocketNetworkFrameEventMap>;
+    events: LifeCycleEventEmitter<HttpNetworkFrameEventMap & WebSocketNetworkFrameEventMap>;
 }
 
 declare const defaultNetworkOptions: DefineNetworkOptions<[InterceptorSource]>;

package/lib/native/index.d.ts

@@ -51,7 +51,7 @@ interface SetupServerCommon {
      *
      * @see {@link https://mswjs.io/docs/api/life-cycle-events Life-cycle Events API reference}
      */
-    events: LifeCycleEventEmitter<HttpNetworkFrameEventMap | WebSocketNetworkFrameEventMap>;
+    events: LifeCycleEventEmitter<HttpNetworkFrameEventMap & WebSocketNetworkFrameEventMap>;
 }
 
 declare const defaultNetworkOptions: DefineNetworkOptions<[InterceptorSource]>;

package/lib/node/index.d.mts

@@ -53,7 +53,7 @@ interface SetupServerCommon {
      *
      * @see {@link https://mswjs.io/docs/api/life-cycle-events Life-cycle Events API reference}
      */
-    events: LifeCycleEventEmitter<HttpNetworkFrameEventMap | WebSocketNetworkFrameEventMap>;
+    events: LifeCycleEventEmitter<HttpNetworkFrameEventMap & WebSocketNetworkFrameEventMap>;
 }
 interface SetupServer extends SetupServerCommon {
     /**

package/lib/node/index.d.ts

@@ -53,7 +53,7 @@ interface SetupServerCommon {
      *
      * @see {@link https://mswjs.io/docs/api/life-cycle-events Life-cycle Events API reference}
      */
-    events: LifeCycleEventEmitter<HttpNetworkFrameEventMap | WebSocketNetworkFrameEventMap>;
+    events: LifeCycleEventEmitter<HttpNetworkFrameEventMap & WebSocketNetworkFrameEventMap>;
 }
 interface SetupServer extends SetupServerCommon {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.13.0",
+  "version": "2.13.2",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "type": "commonjs",
   "main": "./lib/core/index.js",
@@ -293,7 +293,7 @@
     "vitest-environment-miniflare": "^2.14.4",
     "webpack": "^5.95.0",
     "webpack-http-server": "^0.5.0",
-    "msw": "2.13.0"
+    "msw": "2.13.2"
   },
   "peerDependencies": {
     "typescript": ">= 4.8.x"

package/src/browser/glossary.ts

@@ -116,6 +116,6 @@ export interface SetupWorker {
    * @see {@link https://mswjs.io/docs/api/life-cycle-events Life-cycle Events API reference}
    */
   events: LifeCycleEventEmitter<
-    HttpNetworkFrameEventMap | WebSocketNetworkFrameEventMap
+    HttpNetworkFrameEventMap & WebSocketNetworkFrameEventMap
   >
 }

package/src/browser/setup-worker.ts

@@ -131,7 +131,7 @@ export class SetupWorkerApi implements SetupWorker {
   restoreHandlers: () => void
   listHandlers: () => ReadonlyArray<AnyHandler>
   events: LifeCycleEventEmitter<
-    HttpNetworkFrameEventMap | WebSocketNetworkFrameEventMap
+    HttpNetworkFrameEventMap & WebSocketNetworkFrameEventMap
   >
 
   constructor() {

package/src/core/utils/internal/hasRefCounted.test.ts

@@ -14,3 +14,24 @@ it('returns false for a non-refcounted object', () => {
   expect(hasRefCounted({ ref() {} })).toBe(false)
   expect(hasRefCounted({ unref() {} })).toBe(false)
 })
+
+it('returns false for non-object values', () => {
+  expect(
+    hasRefCounted(
+      // @ts-expect-error Runtime value.
+      null,
+    ),
+  ).toBe(false)
+  expect(
+    hasRefCounted(
+      // @ts-expect-error Runtime value.
+      123,
+    ),
+  ).toBe(false)
+  expect(
+    hasRefCounted(
+      // @ts-expect-error Runtime value.
+      'invalid',
+    ),
+  ).toBe(false)
+})

package/src/core/utils/internal/hasRefCounted.ts

@@ -1,7 +1,14 @@
+import { isObject } from './isObject'
+
 export function hasRefCounted<T extends object>(
   value: T,
 ): value is T & NodeJS.RefCounted {
   return (
+    /**
+     * @note Guard against non-object values.
+     * E.g. `setTimeout` returns an object in Node.js but a number in the browser.
+     */
+    isObject(value) &&
     typeof Reflect.get(value, 'ref') === 'function' &&
     typeof Reflect.get(value, 'unref') === 'function'
   )

package/src/node/glossary.ts

@@ -56,7 +56,7 @@ export interface SetupServerCommon {
    * @see {@link https://mswjs.io/docs/api/life-cycle-events Life-cycle Events API reference}
    */
   events: LifeCycleEventEmitter<
-    HttpNetworkFrameEventMap | WebSocketNetworkFrameEventMap
+    HttpNetworkFrameEventMap & WebSocketNetworkFrameEventMap
   >
 }