@brianbuie/node-kit 0.2.0 → 0.2.2

package/.dist/Fetcher.d.ts

@@ -1,5 +1,6 @@
 export type Route = string | URL;
-export type Query = Record<string, string | number | boolean | null | undefined>;
+type QueryVal = string | number | boolean | null | undefined;
+export type Query = Record<string, QueryVal | QueryVal[]>;
 export type FetchOptions = RequestInit & {
     base?: string;
     query?: Query;
@@ -48,3 +49,4 @@ export declare class Fetcher {
     fetchText(route: Route, opts?: FetchOptions): Promise<[string, Response, Request]>;
     fetchJson<T>(route: Route, opts?: FetchOptions): Promise<[T, Response, Request]>;
 }
+export {};

package/.dist/Fetcher.js

@@ -21,9 +21,19 @@ export class Fetcher {
      */
     buildUrl(route, opts = {}) {
         const mergedOptions = merge({}, this.defaultOptions, opts);
-        const params = Object.entries(mergedOptions.query || {})
-            .filter(([_k, val]) => val !== undefined)
-            .map(([key, val]) => [key, `${val}`]);
+        const params = [];
+        Object.entries(mergedOptions.query || {}).forEach(([key, val]) => {
+            if (val === undefined)
+                return;
+            if (Array.isArray(val)) {
+                val.forEach((v) => {
+                    params.push([key, `${v}`]);
+                });
+            }
+            else {
+                params.push([key, `${val}`]);
+            }
+        });
         const search = params.length > 0 ? '?' + new URLSearchParams(params).toString() : '';
         const url = new URL(route + search, this.defaultOptions.base);
         const domain = extractDomain(url.href);
@@ -63,7 +73,7 @@ export class Fetcher {
             // Rebuild request on every attempt to reset AbortSignal.timeout
             const [req] = this.buildRequest(route, opts);
             const res = await fetch(req)
-                .then(r => {
+                .then((r) => {
                 if (!r.ok)
                     throw new Error(r.statusText);
                 return r;
@@ -72,7 +82,10 @@ export class Fetcher {
                 if (attempt < maxAttempts) {
                     const wait = attempt * 3000;
                     console.warn(`${req.method} ${req.url} (attempt ${attempt} of ${maxAttempts})`, error);
-                    await new Promise(resolve => setTimeout(resolve, wait));
+                    await new Promise((resolve) => setTimeout(resolve, wait));
+                }
+                else {
+                    throw new Error(error);
                 }
             });
             if (res)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brianbuie/node-kit",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "license": "ISC",
   "repository": {
     "type": "git",

package/src/Fetcher.test.ts

@@ -50,6 +50,12 @@ describe('Fetcher', () => {
     assert(url.href === statusApi.defaultOptions.base + route);
   });
 
+  it('should handle array query param', () => {
+    const [url] = statusApi.buildUrl('/', { query: { multiple: [1, 2] } });
+    assert(url.href.includes('multiple=1'));
+    assert(url.href.includes('multiple=2'));
+  });
+
   it('should throw on bad request', async () => {
     try {
       await statusApi.fetch('/404', { retries: 0 });

package/src/Fetcher.ts

@@ -3,7 +3,8 @@ import extractDomain from 'extract-domain';
 
 export type Route = string | URL;
 
-export type Query = Record<string, string | number | boolean | null | undefined>;
+type QueryVal = string | number | boolean | null | undefined;
+export type Query = Record<string, QueryVal | QueryVal[]>;
 
 export type FetchOptions = RequestInit & {
   base?: string;
@@ -38,9 +39,17 @@ export class Fetcher {
    */
   buildUrl(route: Route, opts: FetchOptions = {}): [URL, string] {
     const mergedOptions = merge({}, this.defaultOptions, opts);
-    const params = Object.entries(mergedOptions.query || {})
-      .filter(([_k, val]) => val !== undefined)
-      .map(([key, val]) => [key, `${val}`]);
+    const params: [string, string][] = [];
+    Object.entries(mergedOptions.query || {}).forEach(([key, val]) => {
+      if (val === undefined) return;
+      if (Array.isArray(val)) {
+        val.forEach((v) => {
+          params.push([key, `${v}`]);
+        });
+      } else {
+        params.push([key, `${val}`]);
+      }
+    });
     const search = params.length > 0 ? '?' + new URLSearchParams(params).toString() : '';
     const url = new URL(route + search, this.defaultOptions.base);
     const domain = extractDomain(url.href) as string;
@@ -82,15 +91,17 @@ export class Fetcher {
       // Rebuild request on every attempt to reset AbortSignal.timeout
       const [req] = this.buildRequest(route, opts);
       const res = await fetch(req)
-        .then(r => {
+        .then((r) => {
           if (!r.ok) throw new Error(r.statusText);
           return r;
         })
-        .catch(async error => {
+        .catch(async (error) => {
           if (attempt < maxAttempts) {
             const wait = attempt * 3000;
             console.warn(`${req.method} ${req.url} (attempt ${attempt} of ${maxAttempts})`, error);
-            await new Promise(resolve => setTimeout(resolve, wait));
+            await new Promise((resolve) => setTimeout(resolve, wait));
+          } else {
+            throw new Error(error);
           }
         });
       if (res) return [res, req];