integer checks

cooperwfloyd · Apr 6, 2023 · 44da713 · 44da713
1 parent a36f5b7
commit 44da713
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -28,6 +28,7 @@
     "@typescript-eslint/no-unnecessary-condition": "off",
     "@typescript-eslint/no-unsafe-call": "error",
     "@typescript-eslint/prefer-readonly-parameter-types": "off",
+    "@typescript-eslint/strict-boolean-expressions": "off",
     "block-scoped-var": "error",
     "camelcase": "error",
     "eqeqeq": "error",

diff --git a/src/index.ts b/src/index.ts
@@ -55,15 +55,19 @@ const fancyfetch: typeof Fancyfetch = async (resource, options, extras) => {
       )}`
     );
   if (
-    typeof extrasToUse?.maxAttempts === `number` &&
-    (!Number.isInteger(extrasToUse.maxAttempts) || extrasToUse.maxAttempts < 1)
+    extrasToUse?.maxAttempts &&
+    (typeof extrasToUse?.maxAttempts !== `number` ||
+      !Number.isInteger(extrasToUse.maxAttempts) ||
+      extrasToUse.maxAttempts < 1)
   )
     throw new Error(
       `Error in fancyfetch: extras.maxAttempts must be a positive integer.\n\nextras.maxAttempts: ${extrasToUse.maxAttempts}`
     );
   if (
-    typeof extrasToUse?.retryDelay === `number` &&
-    (!Number.isInteger(extrasToUse.maxAttempts) || extrasToUse.maxAttempts < 1)
+    extrasToUse?.retryDelay &&
+    (typeof extrasToUse?.retryDelay !== `number` ||
+      !Number.isInteger(extrasToUse.retryDelay) ||
+      extrasToUse.retryDelay < 1)
   )
     throw new Error(
       `Error in fancyfetch: extras.retryDelay must be a positive integer.\n\nextras.retryDelay: ${String(