fix: stricter type checking on Body and URLSearchParams

Author: battis

packages/requestish/src/Body.ts

@@ -1,9 +1,9 @@
+import { isIterable, isRecord } from '@battis/typescript-tricks';
 import type { FetchBody } from 'openid-client';
 import {
   from as URLSearchParams_from,
   ish as URLSearchParams_ish
 } from './URLSearchParams.js';
-import { isJSONEntries, isJSONRecord } from './is.js';
 
 export type ish =
   | FetchBody
@@ -22,9 +22,21 @@ export async function from(body: ish): Promise<FetchBody | undefined> {
     body instanceof URLSearchParams
   ) {
     return body;
-  } else if (isJSONRecord(body)) {
-    return URLSearchParams_from(body);
-  } else if (isJSONEntries(body)) {
+  } else if (
+    isRecord(body) ||
+    Array.isArray(body) ||
+    isIterable<[string, string]>(
+      body,
+      (elt: unknown): elt is [string, string] => {
+        return (
+          Array.isArray(elt) &&
+          elt.length == 2 &&
+          typeof elt[0] === 'string' &&
+          typeof elt[1] === 'string'
+        );
+      }
+    )
+  ) {
     return URLSearchParams_from(body);
   }
   return new Response(body).arrayBuffer();

packages/requestish/src/URLSearchParams.ts

@@ -43,7 +43,7 @@ export function from(search?: ish): URLSearchParams {
     );
   } else if (isJSONEntries(search)) {
     return new URLSearchParams(
-      search.map(([key, value]) => [key, String.from(value)])
+      search.map(([key, value]): [string, string] => [key, String.from(value)])
     );
   }
   return new URLSearchParams(search);

packages/requestish/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "@tsconfig/recommended/tsconfig.json",
   "compilerOptions": {
     "declaration": true,
+    "lib": ["ES2019"],
     "module": "nodenext",
     "moduleResolution": "nodenext",
     "outDir": "./dist"