@gershy/util-http 0.0.14 → 0.0.15

package/cmp/cjs/main.d.ts

@@ -22,11 +22,13 @@ export type HttpRes = {
     body: Json | Uint8Array;
 };
 export type HttpArgs<Req extends HttpReq, Res extends HttpRes> = {} & {
+    fetch?: typeof fetch;
+} & {
     $req: Req;
     $res: Res;
 } & {
     netProc: NetProc;
-} & Omit<Req, 'cookies'> & {
+} & Omit<Req, 'cookies' | 'query' | 'body'> & {
     headers?: Obj<string>;
 };
 export type HttpResult<Res extends HttpRes> = {
@@ -42,7 +44,7 @@ export type HttpResult<Res extends HttpRes> = {
 export type HttpRet<Res extends HttpRes> = Promise<HttpResult<Res>> & {
     end: () => void;
 };
-declare const _default: <Args extends HttpArgs<HttpReq, HttpRes>>(args: Args, params: Pick<Args, "query" | "body">) => Promise<{
+declare const _default: <Req extends HttpReq, Res extends HttpRes>(args: HttpArgs<Req, Res>, params: Pick<Req, "query" | "body">) => Promise<{
     reqArgs: ({
         method: "HEAD" | "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "SOKT";
         headers: [string, string][];
@@ -50,8 +52,8 @@ declare const _default: <Args extends HttpArgs<HttpReq, HttpRes>>(args: Args, pa
     } & {
         url: string;
     });
-    code: any;
-    body: Args["$res"]["body"];
+    code: number;
+    body: Res["body"];
 }> & {
     end: () => void;
 };

package/cmp/cjs/main.js

@@ -23,6 +23,7 @@ __export(main_exports, {
 module.exports = __toCommonJS(main_exports);
 var import_clearing = require("@gershy/clearing");
 var main_default = (args, params) => {
+  const { fetch: fetcher = fetch } = args;
   const { netProc, path, headers = {} } = args;
   const { query = {}, body: reqBody = null } = params;
   const defPorts = { http: 80, https: 443 };
@@ -39,7 +40,8 @@ var main_default = (args, params) => {
         if (!cl.isCls(val, Object)) return yield { chain, val };
         for (const [k, v] of val[cl.walk]()) yield* chains(v, [...chain, k]);
       };
-      return [...chains(query)][cl.map](({ chain, val }) => `${encodeURIComponent(chain.join("."))}=${encodeURIComponent(val)}`).join("&");
+      const pcs = [...chains(query)];
+      return pcs.length > 0 ? "?" + pcs[cl.map](({ chain, val }) => `${encodeURIComponent(chain.join("."))}=${encodeURIComponent(val)}`).join("&") : "";
     })()
   ].filter(Boolean).join("");
   const reqArgs = {
@@ -50,7 +52,7 @@ var main_default = (args, params) => {
   };
   const err = new Error("");
   const abort = new AbortController();
-  const prm = fetch(url, { ...reqArgs, signal: abort.signal }).then(
+  const prm = fetcher(url, { ...reqArgs, signal: abort.signal }).then(
     async (res) => {
       const resBody = await (async () => {
         const t = new Uint8Array(await res.arrayBuffer());
@@ -71,8 +73,8 @@ var main_default = (args, params) => {
     },
     (cause) => {
       while (cl.isCls(cause.cause, Error)) cause = cause.cause;
-      if (cause.code === "ENOTFOUND") return err[cl.fire]({ cause, retry: false });
-      return err[cl.fire]({ cause });
+      if (cause.code === "ENOTFOUND") return err[cl.fire]({ cause, reqArgs, retry: false });
+      return err[cl.fire]({ cause, reqArgs });
     }
   );
   return Object.assign(prm, { end: () => abort.abort(Error("fetch aborted")[cl.suppress]()) });

package/cmp/esm/main.d.ts

@@ -22,11 +22,13 @@ export type HttpRes = {
     body: Json | Uint8Array;
 };
 export type HttpArgs<Req extends HttpReq, Res extends HttpRes> = {} & {
+    fetch?: typeof fetch;
+} & {
     $req: Req;
     $res: Res;
 } & {
     netProc: NetProc;
-} & Omit<Req, 'cookies'> & {
+} & Omit<Req, 'cookies' | 'query' | 'body'> & {
     headers?: Obj<string>;
 };
 export type HttpResult<Res extends HttpRes> = {
@@ -42,7 +44,7 @@ export type HttpResult<Res extends HttpRes> = {
 export type HttpRet<Res extends HttpRes> = Promise<HttpResult<Res>> & {
     end: () => void;
 };
-declare const _default: <Args extends HttpArgs<HttpReq, HttpRes>>(args: Args, params: Pick<Args, "query" | "body">) => Promise<{
+declare const _default: <Req extends HttpReq, Res extends HttpRes>(args: HttpArgs<Req, Res>, params: Pick<Req, "query" | "body">) => Promise<{
     reqArgs: ({
         method: "HEAD" | "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "SOKT";
         headers: [string, string][];
@@ -50,8 +52,8 @@ declare const _default: <Args extends HttpArgs<HttpReq, HttpRes>>(args: Args, pa
     } & {
         url: string;
     });
-    code: any;
-    body: Args["$res"]["body"];
+    code: number;
+    body: Res["body"];
 }> & {
     end: () => void;
 };

package/cmp/esm/main.js

@@ -1,5 +1,6 @@
 import "@gershy/clearing";
 var main_default = (args, params) => {
+  const { fetch: fetcher = fetch } = args;
   const { netProc, path, headers = {} } = args;
   const { query = {}, body: reqBody = null } = params;
   const defPorts = { http: 80, https: 443 };
@@ -16,7 +17,8 @@ var main_default = (args, params) => {
         if (!cl.isCls(val, Object)) return yield { chain, val };
         for (const [k, v] of val[cl.walk]()) yield* chains(v, [...chain, k]);
       };
-      return [...chains(query)][cl.map](({ chain, val }) => `${encodeURIComponent(chain.join("."))}=${encodeURIComponent(val)}`).join("&");
+      const pcs = [...chains(query)];
+      return pcs.length > 0 ? "?" + pcs[cl.map](({ chain, val }) => `${encodeURIComponent(chain.join("."))}=${encodeURIComponent(val)}`).join("&") : "";
     })()
   ].filter(Boolean).join("");
   const reqArgs = {
@@ -27,7 +29,7 @@ var main_default = (args, params) => {
   };
   const err = new Error("");
   const abort = new AbortController();
-  const prm = fetch(url, { ...reqArgs, signal: abort.signal }).then(
+  const prm = fetcher(url, { ...reqArgs, signal: abort.signal }).then(
     async (res) => {
       const resBody = await (async () => {
         const t = new Uint8Array(await res.arrayBuffer());
@@ -48,8 +50,8 @@ var main_default = (args, params) => {
     },
     (cause) => {
       while (cl.isCls(cause.cause, Error)) cause = cause.cause;
-      if (cause.code === "ENOTFOUND") return err[cl.fire]({ cause, retry: false });
-      return err[cl.fire]({ cause });
+      if (cause.code === "ENOTFOUND") return err[cl.fire]({ cause, reqArgs, retry: false });
+      return err[cl.fire]({ cause, reqArgs });
     }
   );
   return Object.assign(prm, { end: () => abort.abort(Error("fetch aborted")[cl.suppress]()) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gershy/util-http",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "author": "Gershom Maes",
   "description": "TODO",
   "keywords": [
@@ -20,7 +20,7 @@
   ],
   "license": "ISC",
   "peerDependencies": {
-    "@gershy/clearing": "^0.0.46"
+    "@gershy/clearing": "^0.0.47"
   },
   "devDependencies": {
     "@types/node": "^24.10.1"