@juit/lib-fetch-mock 1.1.0 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -53,9 +53,9 @@ var FetchMockImpl = class {
53
53
  (0, import_node_assert.default)(this._fetch, "Global `fetch` not available (mock not enabled?)");
54
54
  const realFetch = this._fetch;
55
55
  const fetchWrapper = (info2, init2) => realFetch.call(globalThis, info2, init2);
56
- const request = info instanceof URL || typeof info === "string" ? new Request(new URL(info, this._baseurl), init) : new Request(info, init);
57
56
  let response = void 0;
58
57
  for (const handler of this._handlers) {
58
+ const request = info instanceof URL || typeof info === "string" ? new Request(new URL(info, this._baseurl), init) : new Request(info.url, info);
59
59
  const result = await handler(request, fetchWrapper);
60
60
  if (result === void 0 || result === null) continue;
61
61
  response = typeof result === "number" ? sendStatus(result) : result;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/index.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["assert", "info", "init"]
6
6
  }
package/dist/index.mjs CHANGED
@@ -15,9 +15,9 @@ var FetchMockImpl = class {
15
15
  assert(this._fetch, "Global `fetch` not available (mock not enabled?)");
16
16
  const realFetch = this._fetch;
17
17
  const fetchWrapper = (info2, init2) => realFetch.call(globalThis, info2, init2);
18
- const request = info instanceof URL || typeof info === "string" ? new Request(new URL(info, this._baseurl), init) : new Request(info, init);
19
18
  let response = void 0;
20
19
  for (const handler of this._handlers) {
20
+ const request = info instanceof URL || typeof info === "string" ? new Request(new URL(info, this._baseurl), init) : new Request(info.url, info);
21
21
  const result = await handler(request, fetchWrapper);
22
22
  if (result === void 0 || result === null) continue;
23
23
  response = typeof result === "number" ? sendStatus(result) : result;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/index.ts"],
4
- "mappings": "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",
4
+ "mappings": ";AAAA,OAAO,YAAY;AACnB,SAAS,oBAAoB;AAE7B,IAAM,aAAa,OAAO,IAAI,iBAAiB;AAsB/C,QAAQ,GAAG,QAAQ,MAAM,QAAQ,KAAK,QAAQ,QAAQ,CAAC;AA8BvD,IAAM,gBAAN,MAAyC;AAAA,EAC/B,YAA4B,CAAC;AAAA,EAC7B;AAAA,EACA;AAAA,EAER,YAAY,SAAoC;AAC9C,SAAK,WAAW,IAAI,IAAI,WAAW,cAAc;AAAA,EACnD;AAAA;AAAA,EAIA,MAAc,OACV,MACA,MACiB;AACnB,WAAO,KAAK,QAAQ,kDAAkD;AAMtE,UAAM,YAAY,KAAK;AACvB,UAAM,eAAe,CACjBA,OACAC,UACoB,UAAU,KAAK,YAAYD,OAAMC,KAAI;AAE7D,QAAI,WAAiC;AAErC,eAAW,WAAW,KAAK,WAAW;AAMpC,YAAM,UAAW,gBAAgB,OAAS,OAAO,SAAS,WACxD,IAAI,QAAQ,IAAI,IAAI,MAAM,KAAK,QAAQ,GAAG,IAAI,IAC9C,IAAI,QAAQ,KAAK,KAAK,IAAI;AAE5B,YAAM,SAAS,MAAM,QAAQ,SAAS,YAAY;AAClD,UAAK,WAAW,UAAe,WAAW,KAAO;AAEjD,iBAAY,OAAO,WAAW,WAAY,WAAW,MAAM,IAAI;AAC/D;AAAA,IACF;AAGA,QAAI,SAAU,QAAO;AAGrB,QAAI,KAAK,OAAO,UAAU,GAAG;AAC3B,aAAO,KAAK,OAAO,UAAU,EAAE,OAAO,MAAM,IAAI;AAAA,IAClD;AAGA,WAAO,WAAW,GAAG;AAAA,EACvB;AAAA;AAAA,EAIA,GAAG,QAAgB,MAAuB,SAA6B;AACrE,SAAK,UAAU,KAAK,CAAC,SAAS,UAAU;AACtC,UAAI,QAAQ,WAAW,OAAO,YAAY,EAAG;AAE7C,YAAM,WAAW,IAAI,IAAI,QAAQ,GAAG,EAAE;AACtC,UAAM,OAAO,SAAS,YAAc,SAAS,YACvC,gBAAgB,UAAW,SAAS,MAAM,IAAI,GAAI;AACtD,eAAO,QAAQ,SAAS,KAAK;AAAA,MAC/B;AAAA,IACF,CAAC;AAED,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,SAA6B;AAClC,SAAK,UAAU,KAAK,OAAO;AAC3B,WAAO;AAAA,EACT;AAAA,EAEA,QAAc;AACZ,SAAK,YAAY,CAAC;AAClB,WAAO;AAAA,EACT;AAAA;AAAA,EAIA,YAA4C;AAC1C,UAAM,QAAqC,CAAC;AAC5C,UAAM,KAAK,IAAI,SAA0B,CAAC;AAE1C,UAAM,OAAuC,MAAM;AACjD,aAAO,IAAI,QAAyB,CAAC,SAAS,WAAW;AACvD,cAAM,CAAC,EAAG,QAAQ,KAAK,CAAC,YAAY;AAClC,gBAAM,OAAO,GAAG,CAAC;AACjB,kBAAQ,OAAO;AAAA,QACjB,GAAG,MAAM;AAAA,MACX,CAAC;AAAA,IACH;AAEA,SAAK,UAAU,KAAK,CAAC,SAAkB,UAA4C;AACjF,YAAM,KAAK,IAAI,SAA0B,CAAC;AAE1C,YAAM,mBAAmB,IAAI,SAAmB;AAChD,YAAM,kBAAkB,IAAI,oBAAoB,SAAS,kBAAkB,KAAK;AAChF,YAAM,MAAM,SAAS,CAAC,EAAG,QAAQ,eAAe;AAChD,aAAO,iBAAiB;AAAA,IAC1B,CAAC;AAED,WAAO;AAAA,EACT;AAAA;AAAA,EAIA,UAAgB;AAEd,QAAI,cAAc,WAAW,OAAO;AAClC,UAAK,WAAmB,MAAM,UAAU,MAAM,KAAM,QAAO;AAAA,IAC7D;AAGA,QAAI,KAA2C,WAAW;AAC1D,WAAO,MAAM,GAAG,UAAU,GAAG;AAC3B,UAAI,GAAG,UAAU,MAAM,MAAM;AAC3B,cAAM,IAAI,MAAM,gDAAgD;AAAA,MAClE,OAAO;AACL,aAAK,GAAG,UAAU,EAAE;AAAA,MACtB;AAAA,IACF;AAGA,SAAK,SAAS,WAAW;AAGzB,eAAW,QAAQ,KAAK,OAAO,KAAK,IAAI;AACxC,WAAO,eAAe,WAAW,OAAO,YAAY,EAAE,OAAO,KAAK,CAAC;AACnE,WAAO;AAAA,EACT;AAAA,EAEA,UAAgB;AAEd,QAAI,EAAG,cAAc,WAAW,OAAQ;AAGxC,QAAI,CAAE,KAAK,OAAQ;AAGnB,QAAI,SAAoC;AACxC,QAAI,KAAK,WAAW;AAGpB,WAAO,GAAG,UAAU,GAAG;AACrB,UAAI,GAAG,UAAU,MAAM,MAAM;AAC3B,YAAI,CAAE,OAAQ,YAAW,QAAQ,KAAK;AAAA,YACjC,QAAO,SAAS,KAAK;AAC1B;AAAA,MACF,OAAO;AACL,iBAAS,GAAG,UAAU;AACtB,aAAK,GAAG,UAAU,EAAE;AAAA,MACtB;AAAA,IACF;AAGA,SAAK,SAAS;AAAA,EAChB;AACF;AAEO,IAAM,YAAkC;AA8B/C,IAAM,WAAN,MAAkB;AAAA,EACP;AAAA,EACA;AAAA,EACA;AAAA,EAET,cAAc;AACZ,QAAI;AACJ,QAAI;AAEJ,SAAK,UAAU,IAAI,QAAW,CAAC,UAAU,aAAa;AACpD,gBAAU;AACV,eAAS;AAAA,IACX,CAAC;AAED,SAAK,UAAU;AACf,SAAK,SAAS;AAAA,EAChB;AACF;AAGA,IAAM,sBAAN,cAAkC,QAAmC;AAAA,EACnE,YACI,SACiB,WACA,QACnB;AACA,UAAM,OAAO;AAHM;AACA;AAAA,EAGrB;AAAA,EAEA,KAAK,SAAuB;AAC1B,SAAK,UAAU,OAAO,WAAW,IAAI,MAAM,UAAU,KAAK,GAAG,EAAE,CAAC;AAAA,EAClE;AAAA,EAEA,SAAS,MAA4B;AACnC,SAAK,UAAU,QAAQ,KAAK,OAAO,GAAG,IAAI,CAAC;AAAA,EAC7C;AAAA,EAEA,KAAK,UAAmD;AACtD,SAAK,UAAU,QAAQ,YAAY,IAAI,SAAS,CAAC;AAAA,EACnD;AAAA,EAEA,WAAW,QAAsB;AAC/B,SAAK,UAAU,QAAQ,WAAW,MAAM,CAAC;AAAA,EAC3C;AAAA,EAEA,SAAS,MAAc,SAAiB,KAAW;AACjD,SAAK,UAAU,QAAQ,SAAS,MAAM,MAAM,CAAC;AAAA,EAC/C;AAAA,EAEA,SAAS,MAAW,SAAiB,KAAW;AAC9C,SAAK,UAAU,QAAQ,SAAS,MAAM,MAAM,CAAC;AAAA,EAC/C;AAAA,EAEA,SAAS,MAAkB,SAAS,KAAW;AAC7C,SAAK,UAAU,QAAQ,SAAS,MAAM,MAAM,CAAC;AAAA,EAC/C;AACF;AAOO,SAAS,WACZ,QACA,aAAa,aAAa,MAAM,GACxB;AACV,SAAO,IAAI,SAAS,QAAW,EAAE,QAAQ,WAAW,CAAC;AACvD;AAGO,SAAS,SAAS,MAAc,SAAS,KAAe;AAC7D,SAAO,IAAI,SAAS,MAAM;AAAA,IACxB,SAAS,EAAE,gBAAgB,4BAA4B;AAAA,IACvD,YAAY,aAAa,MAAM;AAAA,IAC/B;AAAA,EACF,CAAC;AACH;AAGO,SAAS,SAAS,MAAe,SAAS,KAAe;AAC9D,SAAO,IAAI,SAAS,KAAK,UAAU,IAAI,GAAG;AAAA,IACxC,SAAS,EAAE,gBAAgB,kCAAkC;AAAA,IAC7D,YAAY,aAAa,MAAM;AAAA,IAC/B;AAAA,EACF,CAAC;AACH;AAGO,SAAS,SAAS,MAAkB,SAAS,KAAe;AACjE,SAAO,IAAI,SAAS,OAAO,KAAK,IAAI,GAAG;AAAA,IACrC,SAAS,EAAE,gBAAgB,2BAA2B;AAAA,IACtD,YAAY,aAAa,MAAM;AAAA,IAC/B;AAAA,EACF,CAAC;AACH;",
5
5
  "names": ["info", "init"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@juit/lib-fetch-mock",
3
- "version": "1.1.0",
3
+ "version": "1.1.2",
4
4
  "description": "Easy Mocking of Node.js' own `fetch`",
5
5
  "main": "./dist/index.cjs",
6
6
  "module": "./dist/index.mjs",
@@ -28,7 +28,7 @@
28
28
  "author": "Juit Developers <developers@juit.com>",
29
29
  "license": "Apache-2.0",
30
30
  "devDependencies": {
31
- "@plugjs/build": "^0.6.65",
31
+ "@plugjs/build": "^0.6.66",
32
32
  "typescript": "^5.9.3"
33
33
  },
34
34
  "files": [
package/src/index.ts CHANGED
@@ -80,13 +80,18 @@ class FetchMockImpl implements FetchMock {
80
80
  init?: RequestInit | undefined,
81
81
  ): Promise<Response> => realFetch.call(globalThis, info, init)
82
82
 
83
- const request = (info instanceof URL) || (typeof info === 'string') ?
84
- new Request(new URL(info, this._baseurl), init) :
85
- new Request(info, init)
86
-
87
83
  let response: Response | undefined = undefined
88
84
 
89
85
  for (const handler of this._handlers) {
86
+ // This is another interesting bug: when using "info.clone()" (before we
87
+ // were doing "new Request(info.clone(), init)", _sometimes_ abort
88
+ // handlers are not properly propagated down the chain... Dunno why, but
89
+ // it seems that creating a new Request using info as init, fixes it.
90
+ // Obviously in this case we drop "init", and that might haunt us later...
91
+ const request = (info instanceof URL) || (typeof info === 'string') ?
92
+ new Request(new URL(info, this._baseurl), init) :
93
+ new Request(info.url, info)
94
+
90
95
  const result = await handler(request, fetchWrapper)
91
96
  if ((result === undefined) || (result === null)) continue
92
97