🚧 fail if matchOrigin is given an valid match expression

libs/http-ext/src/lib/matchers/match-origin/find-matcher-or-throw.ts

@@ -0,0 +1,26 @@
+import { OriginMatchExpression } from './origin-match-expression';
+import { OriginMatcher } from './origin-matcher';
+
+export function invalidOriginMatchExpression(matchExpression) {
+  return new Error(
+    `InvalidOriginMatchExpression: ${JSON.stringify(
+      matchExpression
+    )} is an invalid origin match expression.`
+  );
+}
+
+export function findMatcherOrThrow({
+  matchExpression,
+  matcherList
+}: {
+  matchExpression: OriginMatchExpression;
+  matcherList: OriginMatcher[];
+}) {
+  const matcher = matcherList.find(_matcher =>
+    _matcher.canHandle(matchExpression)
+  );
+  if (matcher == null) {
+    throw invalidOriginMatchExpression(matchExpression);
+  }
+  return matcher;
+}

libs/http-ext/src/lib/matchers/match-origin/match-origin.spec.ts

@@ -48,10 +48,14 @@ describe('matchOrigin', () => {
   beforeEach(() => (request = createRequest({ url: 'https://test.com' })));
 
   it('🚧 should throw when given an object', () => {
-    expect(() => matchOrigin({} as any)({ request })).toThrow();
+    expect(() => matchOrigin({} as any)({ request })).toThrow(
+      'InvalidOriginMatchExpression: {} is an invalid origin match expression.'
+    );
   });
 
   it('🚧 should throw when given an number', () => {
-    expect(() => matchOrigin(123 as any)({ request })).toThrow();
+    expect(() => matchOrigin(123 as any)({ request })).toThrow(
+      'InvalidOriginMatchExpression: 123 is an invalid origin match expression.'
+    );
   });
 });

libs/http-ext/src/lib/matchers/match-origin/match-origin.ts

@@ -1,5 +1,5 @@
 import { RequestCondition } from '../../plugin';
-import { findMatcher } from './find-matcher';
+import { findMatcherOrThrow } from './find-matcher-or-throw';
 import { getOrigin } from './get-origin';
 import { originArrayMatcher } from './origin-array-matcher';
 import { OriginMatchExpression } from './origin-match-expression';
@@ -14,7 +14,7 @@ export const matchOrigin = (
   const origin = getOrigin(request.url);
 
   /* Find the right matcher. */
-  const matcher = findMatcher({
+  const matcher = findMatcherOrThrow({
     matchExpression: matchExpression,
     matcherList: [
       originStringMatcher,

libs/http-ext/src/lib/matchers/match-origin/origin-array-matcher.ts

@@ -1,5 +1,5 @@
 import { isArray } from '../../utils/is-array';
-import { findMatcher } from './find-matcher';
+import { findMatcherOrThrow } from './find-matcher-or-throw';
 import { originStringMatcher } from './origin-string-matcher';
 
 export const originArrayMatcher = {
@@ -10,7 +10,7 @@ export const originArrayMatcher = {
     /* Loop through expressions... */
     return matchExpression.some(childExpression => {
       /* ... find the right matcher for each expression... */
-      const matcher = findMatcher({
+      const matcher = findMatcherOrThrow({
         matchExpression: childExpression,
         matcherList: [originStringMatcher]
       });