@scenarist/msw-adapter 0.3.2 → 0.3.3

package/dist/handlers/dynamic-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-handler.d.ts","sourceRoot":"","sources":["../../src/handlers/dynamic-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,iBAAiB,EAIjB,gBAAgB,EAChB,cAAc,EACd,MAAM,EACP,MAAM,iBAAiB,CAAC;AAKzB,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;IACjD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;IAC3E,QAAQ,CAAC,qBAAqB,EAAE,CAC9B,UAAU,EAAE,MAAM,KACf,iBAAiB,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAqGF,eAAO,MAAM,oBAAoB,GAC/B,SAAS,qBAAqB,KAC7B,WAiIF,CAAC"}
+{"version":3,"file":"dynamic-handler.d.ts","sourceRoot":"","sources":["../../src/handlers/dynamic-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,iBAAiB,EAIjB,gBAAgB,EAChB,cAAc,EACd,MAAM,EACP,MAAM,iBAAiB,CAAC;AAKzB,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;IACjD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;IAC3E,QAAQ,CAAC,qBAAqB,EAAE,CAC9B,UAAU,EAAE,MAAM,KACf,iBAAiB,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAoIF,eAAO,MAAM,oBAAoB,GAC/B,SAAS,qBAAqB,KAC7B,WAiIF,CAAC"}

package/dist/handlers/dynamic-handler.js

@@ -44,41 +44,65 @@ const extractHttpRequestContext = async (request) => {
         query,
     };
 };
+/**
+ * Check if a mock matches the request's method and URL.
+ * Returns match result with extracted URL params if matching.
+ */
+const mockMatchesRequest = (mock, method, url) => {
+    const methodMatches = mock.method.toUpperCase() === method.toUpperCase();
+    if (!methodMatches) {
+        return { matches: false, params: {} };
+    }
+    const urlMatch = matchesUrl(mock.url, url);
+    return { matches: urlMatch.matches, params: urlMatch.params ?? {} };
+};
 /**
  * Get mocks from active scenario, with default scenario mocks as fallback.
  * Returns URL-matching mocks with their extracted params for ResponseSelector to evaluate.
  *
- * Default mocks are ALWAYS included (if they match URL+method).
- * Active scenario mocks are added after defaults, allowing them to override
- * based on specificity (mocks with match criteria have higher specificity).
+ * Mock selection priority (Issue #335):
+ * 1. If no active scenario → use default scenario mocks
+ * 2. If active scenario has a fallback mock (no match criteria) → use ONLY active mocks
+ * 3. If active scenario has only conditional mocks → include default as backup
+ *
+ * A "fallback mock" is one without match criteria - it always matches if URL+method match.
+ * When active scenario explicitly covers an endpoint with a fallback mock, we don't
+ * include default's mock for that endpoint, preventing specificity-based conflicts.
  *
  * Each mock is paired with params extracted from its URL pattern.
  * After ResponseSelector chooses a mock, we use THAT mock's params.
  */
 const getMocksFromScenarios = (activeScenario, getScenarioDefinition, method, url) => {
     const mocksWithParams = [];
-    // Step 1: ALWAYS include default scenario mocks first
-    // These act as fallback when active scenario mocks don't match
-    const defaultScenario = getScenarioDefinition("default");
-    if (defaultScenario) {
-        defaultScenario.mocks.forEach((mock) => {
-            const methodMatches = mock.method.toUpperCase() === method.toUpperCase();
-            const urlMatch = matchesUrl(mock.url, url);
-            if (methodMatches && urlMatch.matches) {
-                mocksWithParams.push({ mock, params: urlMatch.params });
-            }
-        });
-    }
-    // Step 2: Add active scenario mocks (if any)
-    // These override defaults based on specificity (via ResponseSelector)
+    // Step 1: Check active scenario first
+    // Track if active has a fallback mock (no match criteria) for this URL+method
+    let activeHasFallbackMock = false;
     if (activeScenario) {
         const scenarioDefinition = getScenarioDefinition(activeScenario.scenarioId);
         if (scenarioDefinition) {
             scenarioDefinition.mocks.forEach((mock) => {
-                const methodMatches = mock.method.toUpperCase() === method.toUpperCase();
-                const urlMatch = matchesUrl(mock.url, url);
-                if (methodMatches && urlMatch.matches) {
-                    mocksWithParams.push({ mock, params: urlMatch.params });
+                const match = mockMatchesRequest(mock, method, url);
+                if (match.matches) {
+                    mocksWithParams.push({ mock, params: match.params });
+                    // A mock without match criteria is a "fallback" - it always matches
+                    if (!mock.match) {
+                        activeHasFallbackMock = true;
+                    }
+                }
+            });
+        }
+    }
+    // Step 2: Include default scenario mocks only if:
+    // - No active scenario is set, OR
+    // - Active scenario doesn't have a fallback mock for this URL+method
+    //   (i.e., active only has conditional mocks, so default is needed as backup)
+    if (!activeScenario || !activeHasFallbackMock) {
+        const defaultScenario = getScenarioDefinition("default");
+        if (defaultScenario) {
+            defaultScenario.mocks.forEach((mock) => {
+                const match = mockMatchesRequest(mock, method, url);
+                if (match.matches) {
+                    mocksWithParams.push({ mock, params: match.params });
                 }
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scenarist/msw-adapter",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Internal: MSW integration layer for Scenarist framework adapters",
   "author": "Paul Hammond (citypaul) <paul@packsoftware.co.uk>",
   "license": "MIT",
@@ -42,7 +42,7 @@
   ],
   "dependencies": {
     "path-to-regexp": "^6.3.0",
-    "@scenarist/core": "0.3.2"
+    "@scenarist/core": "0.3.3"
   },
   "peerDependencies": {
     "msw": "^2.0.0"