@schmock/angular 1.0.4 → 1.0.5

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,eAAe,EACf,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAO9B,OAAO,KAAK,EACV,oBAAoB,EAEpB,cAAc,EACf,MAAM,eAAe,CAAC;AAwBvB;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC;IAElE;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,KAAK;QAChD,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAChC,CAAC;IAEF;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,CAClB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,KACtB,cAAc,CAAC;CACrB;AA2CD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,oBAAoB,EAC1B,OAAO,GAAE,qBAA0B,GAClC,UAAU,eAAe,CAsH3B;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,oBAAoB,EAC1B,OAAO,CAAC,EAAE,qBAAqB;;wBA7HpB,eAAe;;EAoI3B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,eAAe,EACf,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAO9B,OAAO,KAAK,EACV,oBAAoB,EAEpB,cAAc,EACf,MAAM,eAAe,CAAC;AAwBvB;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC;IAElE;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,KAAK;QAChD,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAChC,CAAC;IAEF;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,CAClB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,KACtB,cAAc,CAAC;CACrB;AA8ED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,oBAAoB,EAC1B,OAAO,GAAE,qBAA0B,GAClC,UAAU,eAAe,CAwH3B;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,oBAAoB,EAC1B,OAAO,CAAC,EAAE,qBAAqB;;wBA/HpB,eAAe;;EAsI3B"}

package/dist/index.js

@@ -35,20 +35,39 @@ function toHttpMethod(method) {
   }
   return "GET";
 }
-function extractQueryParams(url) {
-  const queryStart = url.indexOf("?");
-  if (queryStart === -1)
-    return {};
-  const params = new URLSearchParams(url.slice(queryStart + 1));
+function extractQueryParams(request) {
   const result = {};
-  params.forEach((value, key) => {
-    result[key] = value;
+  request.params.keys().forEach((key) => {
+    const value = request.params.get(key);
+    if (value !== null) {
+      result[key] = value;
+    }
   });
+  const url = request.url;
+  const queryStart = url.indexOf("?");
+  if (queryStart !== -1) {
+    const urlParams = new URLSearchParams(url.slice(queryStart + 1));
+    urlParams.forEach((value, key) => {
+      if (!(key in result)) {
+        result[key] = value;
+      }
+    });
+  }
   return result;
 }
-function extractPath(url) {
+function extractPathname(url) {
   const queryStart = url.indexOf("?");
-  return queryStart === -1 ? url : url.slice(0, queryStart);
+  const urlWithoutQuery = queryStart === -1 ? url : url.slice(0, queryStart);
+  if (urlWithoutQuery.includes("://")) {
+    try {
+      const parsed = new URL(urlWithoutQuery);
+      return parsed.pathname;
+    } catch {}
+  }
+  if (!urlWithoutQuery.startsWith("/")) {
+    return `/${urlWithoutQuery}`;
+  }
+  return urlWithoutQuery;
 }
 function headersToObject(request) {
   const headers = {};
@@ -71,11 +90,11 @@ function createSchmockInterceptor(mock, options = {}) {
 
   class SchmockInterceptor {
     intercept(req, next) {
-      if (baseUrl && !req.url.startsWith(baseUrl)) {
+      const path = extractPathname(req.url);
+      if (baseUrl && !path.startsWith(baseUrl)) {
         return next.handle(req);
       }
-      const path = extractPath(req.url);
-      const query = extractQueryParams(req.url);
+      const query = extractQueryParams(req);
       let requestData = {
         method: toHttpMethod(req.method),
         path,

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "@schmock/angular",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Angular HTTP interceptor adapter for Schmock",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
@@ -17,7 +23,8 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "lint": "biome check src",
-    "lint:fix": "biome check --write src"
+    "lint:fix": "biome check --write src",
+    "check:publish": "publint && attw --pack --ignore-rules cjs-resolves-to-esm"
   },
   "peerDependencies": {
     "@angular/common": ">=15.0.0",