refactor: move fail to outer scope, rename to failOriginParam

Lordfirespeed · Lordfirespeed · commit 78645fcdf714 · 2024-07-12T14:22:30.000+01:00
diff --git a/src/index.ts b/src/index.ts
@@ -14,11 +14,11 @@ export interface AccessControlOptions {
 
 const isIterable = (obj: unknown): obj is Iterable<unknown> => typeof obj[Symbol.iterator] === 'function'
 
-const getOriginHeaderHandler = (origin: unknown): ((req: Request, res: Response) => void) => {
-  const fail = () => {
-    throw new TypeError('No other objects allowed. Allowed types is array of strings or RegExp')
-  }
+const failOriginParam = () => {
+  throw new TypeError('No other objects allowed. Allowed types is array of strings or RegExp')
+}
 
+const getOriginHeaderHandler = (origin: unknown): ((req: Request, res: Response) => void) => {
   if (typeof origin === 'boolean') {
     return origin
       ? (_, res) => {
@@ -40,11 +40,11 @@ const getOriginHeaderHandler = (origin: unknown): ((req: Request, res: Response)
     }
   }
 
-  if (typeof origin !== 'object') fail()
+  if (typeof origin !== 'object') failOriginParam()
 
   if (isIterable(origin)) {
     const originArray = Array.from(origin)
-    if (originArray.some((element) => typeof element !== 'string')) fail()
+    if (originArray.some((element) => typeof element !== 'string')) failOriginParam()
 
     const originSet = new Set(origin)
 
@@ -71,7 +71,7 @@ const getOriginHeaderHandler = (origin: unknown): ((req: Request, res: Response)
     }
   }
 
-  fail()
+  failOriginParam()
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ export interface AccessControlOptions {`
`14`	`14`
`15`	`15`	`const isIterable = (obj: unknown): obj is Iterable<unknown> => typeof obj[Symbol.iterator] === 'function'`
`16`	`16`
`17`		`-const getOriginHeaderHandler = (origin: unknown): ((req: Request, res: Response) => void) => {`
`18`		`- const fail = () => {`
`19`		`- throw new TypeError('No other objects allowed. Allowed types is array of strings or RegExp')`
`20`		`- }`
	`17`	`+const failOriginParam = () => {`
	`18`	`+ throw new TypeError('No other objects allowed. Allowed types is array of strings or RegExp')`
	`19`	`+}`
`21`	`20`
	`21`	`+const getOriginHeaderHandler = (origin: unknown): ((req: Request, res: Response) => void) => {`
`22`	`22`	`if (typeof origin === 'boolean') {`
`23`	`23`	`return origin`
`24`	`24`	`? (_, res) => {`
`@@ -40,11 +40,11 @@ const getOriginHeaderHandler = (origin: unknown): ((req: Request, res: Response)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (typeof origin !== 'object') fail()`
	`43`	`+ if (typeof origin !== 'object') failOriginParam()`
`44`	`44`
`45`	`45`	`if (isIterable(origin)) {`
`46`	`46`	`const originArray = Array.from(origin)`
`47`		`- if (originArray.some((element) => typeof element !== 'string')) fail()`
	`47`	`+ if (originArray.some((element) => typeof element !== 'string')) failOriginParam()`
`48`	`48`
`49`	`49`	`const originSet = new Set(origin)`
`50`	`50`
`@@ -71,7 +71,7 @@ const getOriginHeaderHandler = (origin: unknown): ((req: Request, res: Response)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- fail()`
	`74`	`+ failOriginParam()`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`