Skip to content

Commit 2e09011

Browse files
author
Takashi Kato
committed
update @mswjs/interceptors to 0.25.12, fix module path
1 parent 30f8d6c commit 2e09011

File tree

3 files changed

+28
-17
lines changed

3 files changed

+28
-17
lines changed

config/importmap.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pin "importmap_mocha"
22

33
pin "@mswjs/interceptors", to: "@mswjs--interceptors.js"
4-
pin "@mswjs/presets/browser" , to: "@mswjs--presets--browser.js"
4+
pin "@mswjs/interceptors/presets/browser" , to: "@mswjs--interceptors--presets--browser.js"
55

66
pin "@open-draft/logger", to: "@open-draft--logger.js" # @0.3.0
77
pin "is-node-process", to: "is-node-process.js" # @1.2.0

vendor/javascripts/@mswjs--presets--browser.js renamed to vendor/javascripts/@mswjs--interceptors--presets--browser.js

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ var Interceptor = class {
9191
logger.info("cannot listen to events, already disposed!");
9292
return this;
9393
}
94-
logger.info('adding "%s" event listener:', event, listener == null ? void 0 : listener.name);
94+
logger.info('adding "%s" event listener:', event, listener);
9595
this.emitter.on(event, listener);
9696
return this;
9797
}
@@ -205,8 +205,18 @@ async function emitAsync(emitter, eventName, ...data) {
205205
}
206206
}
207207

208+
// src/utils/isPropertyAccessible.ts
209+
function isPropertyAccessible(obj, key) {
210+
try {
211+
obj[key];
212+
return true;
213+
} catch (e) {
214+
return false;
215+
}
216+
}
217+
208218
// src/interceptors/fetch/index.ts
209-
var _FetchInterceptor = class _FetchInterceptor extends Interceptor {
219+
var _FetchInterceptor = class extends Interceptor {
210220
constructor() {
211221
super(_FetchInterceptor.symbol);
212222
}
@@ -274,7 +284,7 @@ var _FetchInterceptor = class _FetchInterceptor extends Interceptor {
274284
const mockedResponse = resolverResult.data;
275285
if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
276286
this.logger.info("received mocked response:", mockedResponse);
277-
if (mockedResponse.type === "error") {
287+
if (isPropertyAccessible(mockedResponse, "type") && mockedResponse.type === "error") {
278288
this.logger.info(
279289
"received a network error response, rejecting the request promise..."
280290
);
@@ -326,8 +336,8 @@ var _FetchInterceptor = class _FetchInterceptor extends Interceptor {
326336
});
327337
}
328338
};
329-
_FetchInterceptor.symbol = Symbol("fetch");
330339
var FetchInterceptor = _FetchInterceptor;
340+
FetchInterceptor.symbol = Symbol("fetch");
331341
function createNetworkError(cause) {
332342
return Object.assign(new TypeError("Failed to fetch"), {
333343
cause
@@ -473,11 +483,9 @@ function optionsToProxyHandler(options) {
473483
return constructorCall.call(newTarget, args, next);
474484
};
475485
}
476-
handler.set = function(target, propertyName, nextValue, receiver) {
486+
handler.set = function(target, propertyName, nextValue) {
477487
const next = () => {
478-
const propertySource = findPropertySource(target, propertyName);
479-
if (propertySource === null)
480-
return false;
488+
const propertySource = findPropertySource(target, propertyName) || target;
481489
const ownDescriptors = Reflect.getOwnPropertyDescriptor(
482490
propertySource,
483491
propertyName
@@ -616,7 +624,7 @@ var XMLHttpRequestController = class {
616624
case "addEventListener": {
617625
const [eventName, listener] = args;
618626
this.registerEvent(eventName, listener);
619-
this.logger.info("addEventListener", eventName, listener == null ? void 0 : listener.name);
627+
this.logger.info("addEventListener", eventName, listener);
620628
return invoke();
621629
}
622630
case "setRequestHeader": {
@@ -679,7 +687,7 @@ var XMLHttpRequestController = class {
679687
const prevEvents = this.events.get(eventName) || [];
680688
const nextEvents = prevEvents.concat(listener);
681689
this.events.set(eventName, nextEvents);
682-
this.logger.info('registered event "%s"', eventName, listener == null ? void 0 : listener.name);
690+
this.logger.info('registered event "%s"', eventName, listener);
683691
}
684692
/**
685693
* Responds to the current request with the given
@@ -964,6 +972,9 @@ var XMLHttpRequestController = class {
964972
}
965973
};
966974
function toAbsoluteUrl(url) {
975+
if (typeof location === "undefined") {
976+
return new URL(url);
977+
}
967978
return new URL(url.toString(), location.href);
968979
}
969980
function define(target, property, value) {
@@ -1075,7 +1086,7 @@ function createXMLHttpRequestProxy({
10751086
}
10761087

10771088
// src/interceptors/XMLHttpRequest/index.ts
1078-
var _XMLHttpRequestInterceptor = class _XMLHttpRequestInterceptor extends Interceptor {
1089+
var _XMLHttpRequestInterceptor = class extends Interceptor {
10791090
constructor() {
10801091
super(_XMLHttpRequestInterceptor.interceptorSymbol);
10811092
}
@@ -1115,8 +1126,8 @@ var _XMLHttpRequestInterceptor = class _XMLHttpRequestInterceptor extends Interc
11151126
});
11161127
}
11171128
};
1118-
_XMLHttpRequestInterceptor.interceptorSymbol = Symbol("xhr");
11191129
var XMLHttpRequestInterceptor = _XMLHttpRequestInterceptor;
1130+
XMLHttpRequestInterceptor.interceptorSymbol = Symbol("xhr");
11201131

11211132
// src/presets/browser.ts
11221133
var browser_default = [

vendor/javascripts/@mswjs--interceptors.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ var Interceptor = class {
9494
logger.info("cannot listen to events, already disposed!");
9595
return this;
9696
}
97-
logger.info('adding "%s" event listener:', event, listener == null ? void 0 : listener.name);
97+
logger.info('adding "%s" event listener:', event, listener);
9898
this.emitter.on(event, listener);
9999
return this;
100100
}
@@ -156,10 +156,10 @@ var Interceptor = class {
156156
};
157157

158158
// src/BatchInterceptor.ts
159-
var BatchInterceptor = class _BatchInterceptor extends Interceptor {
159+
var BatchInterceptor = class extends Interceptor {
160160
constructor(options) {
161-
_BatchInterceptor.symbol = Symbol(options.name);
162-
super(_BatchInterceptor.symbol);
161+
BatchInterceptor.symbol = Symbol(options.name);
162+
super(BatchInterceptor.symbol);
163163
this.interceptors = options.interceptors;
164164
}
165165
setup() {

0 commit comments

Comments
 (0)