@alwatr/fetch 5.6.6 → 6.0.0

package/src/main.test.js

@@ -1,60 +1,60 @@
-import {fetch, fetchJson} from '@alwatr/fetch';
+import {fetch} from '@alwatr/fetch';
 
 describe('fetch with search params', () => {
   it('should make a GET request to the specified URL', async () => {
-    /**
-     * @type {import('@alwatr/fetch').FetchOptions}
-     */
-    const options = {
-      url: 'http://httpbin.org/get',
+    const response = await fetch('http://httpbin.org/get', {
       queryParams: {
-        a: 2,
+        a: 'b&c=2',
       },
-      cacheStrategy: 'network_only',
-      removeDuplicate: 'auto',
-    };
-
-    fetch(options);
-    const response = await fetch(options);
+    });
     const responseJson = await response.json();
 
     expect(response.status).toBe(200);
-    expect(responseJson.args.a).toBe('2');
+    expect(responseJson.args.a).toBe('b&c=2');
   });
 });
 
-describe('fetch json', () => {
-  it('should make a GET request to the specified URL with json body and parse valid json', async () => {
-    /**
-     * @type {import('@alwatr/fetch').FetchOptions}}
-     */
-    const options = {
-      url: 'http://httpbin.org/post',
+describe('fetch with bodyJson', () => {
+  it('should send JSON body and receive it back', async () => {
+    const response = await fetch('http://httpbin.org/post', {
       method: 'POST',
-      bodyJson: {
-        a: 2,
-      },
-      cacheStrategy: 'network_only',
-    };
-
-    const responseJson = await fetchJson(options);
+      bodyJson: {foo: 'bar', baz: 42},
+    });
+    const responseJson = await response.json();
 
-    expect(responseJson.ok).toBe(undefined);
-    expect(responseJson.json.a).toBe(2);
+    expect(response.status).toBe(200);
+    expect(responseJson.json).toEqual({foo: 'bar', baz: 42});
+    expect(responseJson.headers['Content-Type']).toMatch(/application\/json/);
   });
+});
 
-  it('should make a GET request to the specified URL and parse json and handle 404 status code', async () => {
-    /**
-     * @type {import('@alwatr/fetch').FetchOptions}}
-     */
-    const options = {
-      url: 'https://httpbin.org/status/404',
-      cacheStrategy: 'network_only',
-    };
 
-    const responseJson = await fetchJson(options);
+describe('fetch with timeout', () => {
+  it('should throw on timeout', async () => {
+    await expect(fetch('http://httpbin.org/delay/1', {timeout: 500, retry: 0})).rejects.toThrow('fetch_timeout');
+  });
+});
 
-    expect(responseJson.ok).toBe(false);
-    expect(responseJson.statusCode).toBe(404);
+describe('fetch with removeDuplicate', () => {
+  it('should deduplicate parallel requests', async () => {
+    const url = 'http://httpbin.org/get?dedup=1';
+    const [res1, res2] = await Promise.all([
+      fetch(url, {
+        removeDuplicate: 'always',
+        headers: {'Req': '1'},
+      }),
+      fetch(url, {
+        removeDuplicate: 'always',
+        headers: {'Req': '2'},
+      }),
+    ]);
+    expect(res1.status).toBe(200);
+    expect(res2.status).toBe(200);
+    const json1 = await res1.json();
+    const json2 = await res2.json();
+    expect(json1.args.dedup).toBe('1');
+    expect(json2.args.dedup).toBe('1');
+    expect(json1.headers['Req']).toBe('1');
+    expect(json2.headers['Req']).toBe('1'); // both should be '1' due to deduplication
   });
 });

package/dist/core.d.ts

@@ -1,28 +0,0 @@
-import type { FetchOptions } from './type.js';
-export declare const logger_: import("@alwatr/logger").AlwatrLogger;
-export declare const cacheSupported: boolean;
-/**
- * Process fetch options and set defaults, etc.
- *
- * @param options Fetch options.
- *
- * @returns Required fetch options.
- */
-export declare function processOptions_(options: FetchOptions): Required<FetchOptions>;
-/**
- * Handle Cache Strategy over `handleRemoveDuplicate_`.
- */
-export declare function handleCacheStrategy_(options: Required<FetchOptions>): Promise<Response>;
-/**
- * Handle Remove Duplicates over `_handleRetryPattern`.
- */
-export declare function handleRemoveDuplicate_(options: Required<FetchOptions>): Promise<Response>;
-/**
- * Handle retry pattern over `handleTimeout_`.
- */
-export declare function handleRetryPattern_(options: Required<FetchOptions>): Promise<Response>;
-/**
- * It's a wrapper around the browser's `fetch` with timeout.
- */
-export declare function handleTimeout_(options: FetchOptions): Promise<Response>;
-//# sourceMappingURL=core.d.ts.map

package/dist/core.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AAI5C,eAAO,MAAM,OAAO,uCAAgD,CAAC;AAKrE,eAAO,MAAM,cAAc,SAAuD,CAAC;AAInF;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,CA+C7E;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAoF7F;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CA2B/F;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CA8B5F;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CAoCvE"}