valyrian.js 7.2.11 → 8.0.0

package/dist/request/index.js

@@ -24,34 +24,44 @@ __export(request_exports, {
 });
 module.exports = __toCommonJS(request_exports);
 var import_valyrian = require("valyrian.js");
+var import_utils = require("valyrian.js/utils");
 function serialize(obj, prefix = "") {
-  return Object.keys(obj).map((prop) => {
-    let k = prefix ? `${prefix}[${prop}]` : prop;
-    return typeof obj[prop] === "object" ? serialize(obj[prop], k) : `${encodeURIComponent(k)}=${encodeURIComponent(obj[prop])}`;
-  }).join("&");
+  const params = new URLSearchParams();
+  Object.keys(obj).forEach((prop) => {
+    const key = prefix ? `${prefix}[${prop}]` : prop;
+    if (typeof obj[prop] === "object") {
+      params.append(key, serialize(obj[prop], key).toString());
+    } else {
+      params.append(key, obj[prop]);
+    }
+  });
+  return params;
+}
+function serializeFormData(data) {
+  return Object.entries(data).reduce((fd, [key, value]) => {
+    fd.append(key, value);
+    return fd;
+  }, new FormData());
 }
 function parseUrl(url, options) {
-  let u = /^https?/gi.test(url) ? url : options.urls.base + url;
-  let parts = u.split("?");
-  u = parts[0].trim().replace(/^\/\//, "/").replace(/\/$/, "").trim();
-  if (parts[1]) {
-    u += `?${parts[1]}`;
-  }
+  const urlWithoutSlash = url.replace(/\/+$/, "").trim();
+  const u = /^https?/gi.test(urlWithoutSlash) ? urlWithoutSlash : `${options.urls.base}${urlWithoutSlash}`;
   if (import_valyrian.isNodeJs && typeof options.urls.node === "string") {
-    options.urls.node = options.urls.node;
     if (typeof options.urls.api === "string") {
-      options.urls.api = options.urls.api.replace(/\/$/gi, "").trim();
-      u = u.replace(options.urls.api, options.urls.node);
+      return new URL(u.replace(options.urls.api, options.urls.node));
     }
     if (!/^https?/gi.test(u)) {
-      u = options.urls.node + u;
+      return new URL(u, options.urls.node);
     }
   }
-  return u;
+  if (/^https?/gi.test(u)) {
+    return new URL(u);
+  }
+  return new URL(u, options.urls.base);
 }
 var defaultOptions = { allowedMethods: ["get", "post", "put", "patch", "delete", "head", "options"] };
 function Requester(baseUrl = "", options = defaultOptions) {
-  let url = baseUrl.replace(/\/$/gi, "").trim();
+  const url = baseUrl.replace(/\/$/gi, "").trim();
   if (!options.urls) {
     options.urls = {
       base: "",
@@ -62,7 +72,7 @@ function Requester(baseUrl = "", options = defaultOptions) {
   if (!options.allowedMethods) {
     options.allowedMethods = defaultOptions.allowedMethods;
   }
-  let opts = {
+  const opts = {
     ...options,
     urls: {
       node: options.urls.node || null,
@@ -71,46 +81,40 @@ function Requester(baseUrl = "", options = defaultOptions) {
     }
   };
   const request2 = async function request3(method, url2, data, options2 = {}) {
-    let innerOptions = {
+    const innerOptions = {
       method: method.toUpperCase(),
       headers: {},
       resolveWithFullResponse: false,
       ...opts,
       ...options2
     };
+    innerOptions.headers = { ...innerOptions.headers, ...opts.headers, ...options2.headers };
     if (!innerOptions.headers.Accept) {
       innerOptions.headers.Accept = "application/json";
     }
-    let acceptType = innerOptions.headers.Accept;
-    let contentType = innerOptions.headers["Content-Type"] || innerOptions.headers["content-type"] || "";
-    if (innerOptions.allowedMethods.indexOf(method) === -1) {
-      throw new Error("Method not allowed");
+    const acceptType = innerOptions.headers.Accept;
+    const contentType = innerOptions.headers["Content-Type"] || innerOptions.headers["content-type"] || "";
+    if (!innerOptions.allowedMethods.includes(method)) {
+      throw new Error(`Method ${method} not allowed. Allowed methods: ${innerOptions.allowedMethods.join(", ")}`);
+    }
+    let finalUrl;
+    try {
+      finalUrl = parseUrl(url2, opts);
+    } catch (error) {
+      throw new Error(`Failed to parse URL: ${url2}`);
     }
     if (data) {
+      const isJson = /json/gi.test(contentType);
       if (innerOptions.method === "GET" && typeof data === "object") {
-        url2 += `?${serialize(data)}`;
-      }
-      if (innerOptions.method !== "GET") {
-        if (/json/gi.test(contentType)) {
-          innerOptions.body = JSON.stringify(data);
-        } else {
-          let formData;
-          if (data instanceof FormData) {
-            formData = data;
-          } else {
-            formData = new FormData();
-            for (let i in data) {
-              formData.append(i, data[i]);
-            }
-          }
-          innerOptions.body = formData;
-        }
+        finalUrl.search = serialize(data).toString();
+      } else if (innerOptions.method !== "GET") {
+        innerOptions.body = isJson ? JSON.stringify(data) : serializeFormData(data);
       }
     }
-    let response = await fetch(parseUrl(url2, opts), innerOptions);
+    const response = await fetch(finalUrl.toString(), innerOptions);
     let body = null;
     if (!response.ok) {
-      let err = new Error(response.statusText);
+      const err = new Error(`${response.status}: ${response.statusText}`);
       err.response = response;
       if (/text/gi.test(acceptType)) {
         err.body = await response.text();
@@ -119,6 +123,8 @@ function Requester(baseUrl = "", options = defaultOptions) {
         try {
           err.body = await response.json();
         } catch (error) {
+          err.body = null;
+          console.warn("Failed to parse JSON response:", error);
         }
       }
       throw err;
@@ -128,66 +134,39 @@ function Requester(baseUrl = "", options = defaultOptions) {
     }
     if (/text/gi.test(acceptType)) {
       body = await response.text();
-      return body;
-    }
-    if (/json/gi.test(acceptType)) {
+    } else if (/json/gi.test(acceptType)) {
       try {
         body = await response.json();
-        return body;
       } catch (error) {
+        console.warn("Failed to parse JSON response:", error);
+        body = null;
       }
+    } else if (/blob/gi.test(acceptType)) {
+      body = await response.blob();
+    } else if (/arraybuffer/gi.test(acceptType)) {
+      body = await response.arrayBuffer();
+    } else {
+      body = response;
     }
-    return response;
+    return body || response;
   };
   request2.new = (baseUrl2, options2) => Requester(baseUrl2, { ...opts, ...options2 || {} });
   request2.setOption = (key, value) => {
-    let result = opts;
-    let parsed = key.split(".");
-    let next;
-    while (parsed.length) {
-      next = parsed.shift();
-      let nextIsArray = next.indexOf("[") > -1;
-      if (nextIsArray) {
-        let idx = next.replace(/\D/gi, "");
-        next = next.split("[")[0];
-        parsed.unshift(idx);
-      }
-      if (parsed.length > 0 && typeof result[next] !== "object") {
-        result[next] = nextIsArray ? [] : {};
-      }
-      if (parsed.length === 0 && typeof value !== "undefined") {
-        result[next] = value;
-      }
-      result = result[next];
-    }
-    return result;
+    (0, import_utils.set)(opts, key, value);
+    return opts;
   };
   request2.getOptions = (key) => {
-    if (!key) {
-      return opts;
-    }
-    let result = opts;
-    let parsed = key.split(".");
-    let next;
-    while (parsed.length) {
-      next = parsed.shift();
-      let nextIsArray = next.indexOf("[") > -1;
-      if (nextIsArray) {
-        let idx = next.replace(/\D/gi, "");
-        next = next.split("[")[0];
-        parsed.unshift(idx);
-      }
-      if (parsed.length > 0 && typeof result[next] !== "object") {
-        return null;
-      }
-      if (parsed.length === 0) {
-        return result[next];
-      }
-      result = result[next];
+    if (key) {
+      return (0, import_utils.get)(opts, key);
     }
+    return opts;
   };
-  opts.allowedMethods.forEach(
-    (method) => request2[method] = (url2, data, options2) => request2(method, url2, data, options2)
+  Object.assign(
+    request2,
+    opts.allowedMethods.reduce((acc, method) => {
+      acc[method] = (url2, data, options2) => request2(method, url2, data, options2);
+      return acc;
+    }, {})
   );
   return request2;
 }

package/dist/request/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../lib/request/index.ts"],
-  "sourcesContent": ["import { isNodeJs } from \"valyrian.js\";\n\ninterface UrlOptions {\n  base: string; // Used to prefix the url for scoped requests.\n  node: string | null; // Used to redirect local requests to node server for server side rendering.\n  api: string | null; // Used to redirect api requests to node server for server side rendering.\n}\n\ninterface RequestOptions {\n  allowedMethods?: string[];\n  urls?: UrlOptions;\n  [key: string | number | symbol]: any;\n}\n\ninterface RequestOptionsWithUrls extends RequestOptions {\n  urls: UrlOptions;\n  allowedMethods: string[];\n}\n\ninterface SendOptions extends RequestOptionsWithUrls, RequestInit {\n  allowedMethods: string[];\n  method: string;\n  headers: Record<string, string>;\n  resolveWithFullResponse?: boolean;\n}\n\nexport interface RequestInterface {\n  // eslint-disable-next-line no-unused-vars\n  (method: string, url: string, data?: Record<string, any>, options?: Partial<SendOptions>): any | Response;\n  // eslint-disable-next-line no-unused-vars\n  new: (baseUrl: string, options?: RequestOptions) => RequestInterface;\n  // eslint-disable-next-line no-unused-vars\n  setOptions: (key: string, value: any) => void;\n  // eslint-disable-next-line no-unused-vars\n  getOptions: (key?: string) => RequestOptions | void;\n  // eslint-disable-next-line no-unused-vars\n  get: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  post: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  put: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  patch: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  delete: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  head: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  options: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  [key: string | number | symbol]: any;\n}\n\n// This method is used to serialize an object into a query string.\nfunction serialize(obj: Record<string, any>, prefix: string = \"\"): string {\n  return Object.keys(obj)\n    .map((prop: string) => {\n      let k = prefix ? `${prefix}[${prop}]` : prop;\n      return typeof obj[prop] === \"object\"\n        ? serialize(obj[prop], k)\n        : `${encodeURIComponent(k)}=${encodeURIComponent(obj[prop])}`;\n    })\n    .join(\"&\");\n}\n\nfunction parseUrl(url: string, options: RequestOptionsWithUrls) {\n  let u = /^https?/gi.test(url) ? url : options.urls.base + url;\n\n  let parts = u.split(\"?\");\n  u = parts[0].trim().replace(/^\\/\\//, \"/\").replace(/\\/$/, \"\").trim();\n\n  if (parts[1]) {\n    u += `?${parts[1]}`;\n  }\n\n  if (isNodeJs && typeof options.urls.node === \"string\") {\n    options.urls.node = options.urls.node;\n\n    if (typeof options.urls.api === \"string\") {\n      options.urls.api = options.urls.api.replace(/\\/$/gi, \"\").trim();\n      u = u.replace(options.urls.api, options.urls.node);\n    }\n\n    if (!/^https?/gi.test(u)) {\n      u = options.urls.node + u;\n    }\n  }\n\n  return u;\n}\n\nconst defaultOptions: RequestOptions = { allowedMethods: [\"get\", \"post\", \"put\", \"patch\", \"delete\", \"head\", \"options\"] };\n\n// eslint-disable-next-line sonarjs/cognitive-complexity\nfunction Requester(baseUrl = \"\", options: RequestOptions = defaultOptions) {\n  let url = baseUrl.replace(/\\/$/gi, \"\").trim();\n  if (!options.urls) {\n    options.urls = {\n      base: \"\",\n      node: null,\n      api: null\n    };\n  }\n\n  if (!options.allowedMethods) {\n    options.allowedMethods = defaultOptions.allowedMethods;\n  }\n\n  let opts: RequestOptionsWithUrls = {\n    ...(options as RequestOptionsWithUrls),\n    urls: {\n      node: options.urls.node || null,\n      api: options.urls.api || null,\n      base: options.urls.base ? options.urls.base + url : url\n    }\n  };\n\n  const request = async function request(method: string, url: string, data?: Record<string, any>, options = {}) {\n    let innerOptions: SendOptions = {\n      method: method.toUpperCase(),\n      headers: {},\n      resolveWithFullResponse: false,\n      ...opts,\n      ...options\n    } as SendOptions;\n\n    if (!innerOptions.headers.Accept) {\n      innerOptions.headers.Accept = \"application/json\";\n    }\n\n    let acceptType = innerOptions.headers.Accept;\n    let contentType = innerOptions.headers[\"Content-Type\"] || innerOptions.headers[\"content-type\"] || \"\";\n\n    if (innerOptions.allowedMethods.indexOf(method) === -1) {\n      throw new Error(\"Method not allowed\");\n    }\n\n    if (data) {\n      if (innerOptions.method === \"GET\" && typeof data === \"object\") {\n        url += `?${serialize(data)}`;\n      }\n\n      if (innerOptions.method !== \"GET\") {\n        if (/json/gi.test(contentType)) {\n          innerOptions.body = JSON.stringify(data);\n        } else {\n          let formData;\n          if (data instanceof FormData) {\n            formData = data;\n          } else {\n            formData = new FormData();\n            for (let i in data) {\n              formData.append(i, data[i]);\n            }\n          }\n          innerOptions.body = formData;\n        }\n      }\n    }\n\n    let response = await fetch(parseUrl(url, opts), innerOptions);\n    let body = null;\n    if (!response.ok) {\n      let err = new Error(response.statusText) as Error & { response?: any; body?: any };\n      err.response = response;\n      if (/text/gi.test(acceptType)) {\n        err.body = await response.text();\n      }\n\n      if (/json/gi.test(acceptType)) {\n        try {\n          err.body = await response.json();\n        } catch (error) {\n          // ignore\n        }\n      }\n\n      throw err;\n    }\n\n    if (innerOptions.resolveWithFullResponse) {\n      return response;\n    }\n\n    if (/text/gi.test(acceptType)) {\n      body = await response.text();\n      return body;\n    }\n\n    if (/json/gi.test(acceptType)) {\n      try {\n        body = await response.json();\n        return body;\n      } catch (error) {\n        // ignore\n      }\n    }\n\n    return response;\n  } as unknown as RequestInterface;\n\n  request.new = (baseUrl: string, options?: RequestOptions) => Requester(baseUrl, { ...opts, ...(options || {}) });\n\n  request.setOption = (key: string, value: any) => {\n    let result = opts;\n\n    let parsed = key.split(\".\");\n    let next;\n\n    while (parsed.length) {\n      next = parsed.shift() as string;\n\n      let nextIsArray = next.indexOf(\"[\") > -1;\n      if (nextIsArray) {\n        let idx = next.replace(/\\D/gi, \"\");\n        next = next.split(\"[\")[0];\n        parsed.unshift(idx);\n      }\n\n      if (parsed.length > 0 && typeof result[next] !== \"object\") {\n        result[next] = nextIsArray ? [] : {};\n      }\n\n      if (parsed.length === 0 && typeof value !== \"undefined\") {\n        result[next] = value;\n      }\n\n      result = result[next];\n    }\n\n    return result;\n  };\n\n  request.getOptions = (key?: string) => {\n    if (!key) {\n      return opts;\n    }\n\n    let result = opts;\n    let parsed = key.split(\".\");\n    let next;\n\n    while (parsed.length) {\n      next = parsed.shift() as string;\n\n      let nextIsArray = next.indexOf(\"[\") > -1;\n      if (nextIsArray) {\n        let idx = next.replace(/\\D/gi, \"\");\n        next = next.split(\"[\")[0];\n        parsed.unshift(idx);\n      }\n\n      if (parsed.length > 0 && typeof result[next] !== \"object\") {\n        return null;\n      }\n\n      if (parsed.length === 0) {\n        return result[next];\n      }\n\n      result = result[next];\n    }\n  };\n\n  opts.allowedMethods.forEach(\n    (method) =>\n      (request[method] = (url: string, data?: Record<string, any>, options?: Record<string, any>) =>\n        request(method, url, data, options))\n  );\n\n  return request;\n}\n\nexport const request = Requester();\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { isNodeJs } from \"valyrian.js\";\nimport { get, set } from \"valyrian.js/utils\";\n\ninterface UrlOptions {\n  base: string; // Used to prefix the url for scoped requests.\n  node: string | null; // Used to redirect local requests to node server for server side rendering.\n  api: string | null; // Used to redirect api requests to node server for server side rendering.\n}\n\ninterface RequestOptions {\n  allowedMethods?: string[];\n  urls?: UrlOptions;\n  [key: string | number | symbol]: any;\n}\n\ninterface RequestOptionsWithUrls extends RequestOptions {\n  urls: UrlOptions;\n  allowedMethods: string[];\n}\n\ninterface SendOptions extends RequestOptionsWithUrls, RequestInit {\n  allowedMethods: string[];\n  method: string;\n  headers: Record<string, string>;\n  resolveWithFullResponse?: boolean;\n}\n\nexport interface RequestInterface {\n  // eslint-disable-next-line no-unused-vars\n  (method: string, url: string, data?: Record<string, any>, options?: Partial<SendOptions>): any | Response;\n  // eslint-disable-next-line no-unused-vars\n  new: (baseUrl: string, options?: RequestOptions) => RequestInterface;\n  // eslint-disable-next-line no-unused-vars\n  setOptions: (key: string, value: any) => void;\n  // eslint-disable-next-line no-unused-vars\n  getOptions: (key?: string) => RequestOptions | void;\n  // eslint-disable-next-line no-unused-vars\n  get: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  post: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  put: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  patch: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  delete: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  head: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  options: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  [key: string | number | symbol]: any;\n}\n\n// This method is used to serialize an object into a query string.\nfunction serialize(obj: Record<string, any>, prefix: string = \"\"): URLSearchParams {\n  const params = new URLSearchParams();\n\n  Object.keys(obj).forEach((prop: string) => {\n    const key = prefix ? `${prefix}[${prop}]` : prop;\n    if (typeof obj[prop] === \"object\") {\n      params.append(key, serialize(obj[prop], key).toString());\n    } else {\n      params.append(key, obj[prop]);\n    }\n  });\n\n  return params;\n}\n\nfunction serializeFormData(data: Record<string, any>): FormData {\n  return Object.entries(data).reduce((fd, [key, value]) => {\n    fd.append(key, value);\n    return fd;\n  }, new FormData());\n}\n\nfunction parseUrl(url: string, options: RequestOptionsWithUrls) {\n  const urlWithoutSlash = url.replace(/\\/+$/, \"\").trim();\n  const u = /^https?/gi.test(urlWithoutSlash) ? urlWithoutSlash : `${options.urls.base}${urlWithoutSlash}`;\n\n  if (isNodeJs && typeof options.urls.node === \"string\") {\n    if (typeof options.urls.api === \"string\") {\n      return new URL(u.replace(options.urls.api, options.urls.node));\n    }\n\n    if (!/^https?/gi.test(u)) {\n      return new URL(u, options.urls.node);\n    }\n  }\n\n  if (/^https?/gi.test(u)) {\n    return new URL(u);\n  }\n\n  return new URL(u, options.urls.base);\n}\n\nconst defaultOptions: RequestOptions = { allowedMethods: [\"get\", \"post\", \"put\", \"patch\", \"delete\", \"head\", \"options\"] };\n\n// eslint-disable-next-line sonarjs/cognitive-complexity\nfunction Requester(baseUrl = \"\", options: RequestOptions = defaultOptions) {\n  const url = baseUrl.replace(/\\/$/gi, \"\").trim();\n  if (!options.urls) {\n    options.urls = {\n      base: \"\",\n      node: null,\n      api: null\n    };\n  }\n\n  if (!options.allowedMethods) {\n    options.allowedMethods = defaultOptions.allowedMethods;\n  }\n\n  const opts: RequestOptionsWithUrls = {\n    ...(options as RequestOptionsWithUrls),\n    urls: {\n      node: options.urls.node || null,\n      api: options.urls.api || null,\n      base: options.urls.base ? options.urls.base + url : url\n    }\n  };\n\n  // eslint-disable-next-line complexity\n  const request = async function request(\n    method: string,\n    url: string,\n    data?: Record<string, any>,\n    options: Record<string, any> = {}\n  ) {\n    const innerOptions: SendOptions = {\n      method: method.toUpperCase(),\n      headers: {},\n      resolveWithFullResponse: false,\n      ...opts,\n      ...options\n    } as SendOptions;\n\n    innerOptions.headers = { ...innerOptions.headers, ...opts.headers, ...options.headers };\n\n    if (!innerOptions.headers.Accept) {\n      innerOptions.headers.Accept = \"application/json\";\n    }\n\n    const acceptType = innerOptions.headers.Accept;\n    const contentType = innerOptions.headers[\"Content-Type\"] || innerOptions.headers[\"content-type\"] || \"\";\n\n    if (!innerOptions.allowedMethods.includes(method)) {\n      throw new Error(`Method ${method} not allowed. Allowed methods: ${innerOptions.allowedMethods.join(\", \")}`);\n    }\n\n    let finalUrl: URL;\n    try {\n      finalUrl = parseUrl(url, opts);\n    } catch (error) {\n      throw new Error(`Failed to parse URL: ${url}`);\n    }\n\n    if (data) {\n      const isJson = /json/gi.test(contentType);\n\n      if (innerOptions.method === \"GET\" && typeof data === \"object\") {\n        finalUrl.search = serialize(data).toString();\n      } else if (innerOptions.method !== \"GET\") {\n        innerOptions.body = isJson ? JSON.stringify(data) : serializeFormData(data);\n      }\n    }\n\n    const response = await fetch(finalUrl.toString(), innerOptions);\n    let body = null;\n    if (!response.ok) {\n      const err = new Error(`${response.status}: ${response.statusText}`) as Error & { response?: any; body?: any };\n      err.response = response;\n      if (/text/gi.test(acceptType)) {\n        err.body = await response.text();\n      }\n\n      if (/json/gi.test(acceptType)) {\n        try {\n          err.body = await response.json();\n        } catch (error) {\n          err.body = null;\n          // eslint-disable-next-line no-console\n          console.warn(\"Failed to parse JSON response:\", error);\n        }\n      }\n\n      throw err;\n    }\n\n    if (innerOptions.resolveWithFullResponse) {\n      return response;\n    }\n\n    if (/text/gi.test(acceptType)) {\n      body = await response.text();\n    } else if (/json/gi.test(acceptType)) {\n      try {\n        body = await response.json();\n      } catch (error) {\n        // eslint-disable-next-line no-console\n        console.warn(\"Failed to parse JSON response:\", error);\n        body = null;\n      }\n    } else if (/blob/gi.test(acceptType)) {\n      body = await response.blob();\n    } else if (/arraybuffer/gi.test(acceptType)) {\n      body = await response.arrayBuffer();\n    } else {\n      body = response;\n    }\n\n    return body || response;\n  } as unknown as RequestInterface;\n\n  request.new = (baseUrl: string, options?: RequestOptions) => Requester(baseUrl, { ...opts, ...(options || {}) });\n\n  request.setOption = (key: string, value: any) => {\n    set(opts, key, value);\n    return opts;\n  };\n\n  request.getOptions = (key?: string) => {\n    if (key) {\n      return get(opts, key);\n    }\n\n    return opts;\n  };\n\n  Object.assign(\n    request,\n    opts.allowedMethods.reduce((acc: Record<string, any>, method) => {\n      acc[method] = (url: string, data?: Record<string, any>, options?: Record<string, any>) =>\n        request(method, url, data, options);\n      return acc;\n    }, {})\n  );\n\n  return request;\n}\n\nexport const request = Requester();\n"],
+  "mappings": "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",
   "names": ["request", "url", "options", "baseUrl"]
 }

package/dist/request/index.min.js

@@ -0,0 +1 @@
+(()=>{"use strict";var e=Object.defineProperty,t=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,s=Object.prototype.hasOwnProperty,o={};((t,r)=>{for(var s in r)e(t,s,{get:r[s],enumerable:!0})})(o,{request:()=>c});var n,a=(n=o,((o,n,a,l)=>{if(n&&"object"==typeof n||"function"==typeof n)for(let i of r(n))s.call(o,i)||i===a||e(o,i,{get:()=>n[i],enumerable:!(l=t(n,i))||l.enumerable});return o})(e({},"__esModule",{value:!0}),n)),l=require("valyrian.js"),i=require("valyrian.js/utils");function u(e,t=""){const r=new URLSearchParams;return Object.keys(e).forEach(s=>{const o=t?`${t}[${s}]`:s;"object"==typeof e[s]?r.append(o,u(e[s],o).toString()):r.append(o,e[s])}),r}var d={allowedMethods:["get","post","put","patch","delete","head","options"]};var c=function e(t="",r=d){const s=t.replace(/\/$/gi,"").trim();r.urls||(r.urls={base:"",node:null,api:null}),r.allowedMethods||(r.allowedMethods=d.allowedMethods);const o={...r,urls:{node:r.urls.node||null,api:r.urls.api||null,base:r.urls.base?r.urls.base+s:s}},n=async function(e,t,r,s={}){const n={method:e.toUpperCase(),headers:{},resolveWithFullResponse:!1,...o,...s};n.headers={...n.headers,...o.headers,...s.headers},n.headers.Accept||(n.headers.Accept="application/json");const a=n.headers.Accept,i=n.headers["Content-Type"]||n.headers["content-type"]||"";if(!n.allowedMethods.includes(e))throw new Error(`Method ${e} not allowed. Allowed methods: ${n.allowedMethods.join(", ")}`);let d;try{d=function(e,t){const r=e.replace(/\/+$/,"").trim(),s=/^https?/gi.test(r)?r:`${t.urls.base}${r}`;if(l.isNodeJs&&"string"==typeof t.urls.node){if("string"==typeof t.urls.api)return new URL(s.replace(t.urls.api,t.urls.node));if(!/^https?/gi.test(s))return new URL(s,t.urls.node)}return/^https?/gi.test(s)?new URL(s):new URL(s,t.urls.base)}(t,o)}catch(e){throw new Error(`Failed to parse URL: ${t}`)}if(r){const e=/json/gi.test(i);"GET"===n.method&&"object"==typeof r?d.search=u(r).toString():"GET"!==n.method&&(n.body=e?JSON.stringify(r):function(e){return Object.entries(e).reduce((e,[t,r])=>(e.append(t,r),e),new FormData)}(r))}const c=await fetch(d.toString(),n);let p=null;if(!c.ok){const e=new Error(`${c.status}: ${c.statusText}`);if(e.response=c,/text/gi.test(a)&&(e.body=await c.text()),/json/gi.test(a))try{e.body=await c.json()}catch(t){e.body=null,console.warn("Failed to parse JSON response:",t)}throw e}if(n.resolveWithFullResponse)return c;if(/text/gi.test(a))p=await c.text();else if(/json/gi.test(a))try{p=await c.json()}catch(e){console.warn("Failed to parse JSON response:",e),p=null}else p=/blob/gi.test(a)?await c.blob():/arraybuffer/gi.test(a)?await c.arrayBuffer():c;return p||c};return n.new=(t,r)=>e(t,{...o,...r||{}}),n.setOption=(e,t)=>((0,i.set)(o,e,t),o),n.getOptions=e=>e?(0,i.get)(o,e):o,Object.assign(n,o.allowedMethods.reduce((e,t)=>(e[t]=(e,r,s)=>n(t,e,r,s),e),{})),n}();"undefined"!=typeof module?module.exports=a:self.ValyrianRequest=a})();//# sourceMappingURL=index.min.js.map

package/dist/request/index.min.js.map

@@ -0,0 +1 @@
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["request_exports","__export","request","__EXPORTS__","import_valyrian","require","import_utils","serialize","obj","prefix","params","URLSearchParams","Object","keys","forEach","prop","key","append","toString","defaultOptions","allowedMethods","Requester","baseUrl","options","url","replace","trim","urls","base","node","api","opts","async","method","data","innerOptions","toUpperCase","headers","resolveWithFullResponse","Accept","acceptType","contentType","includes","Error","join","finalUrl","urlWithoutSlash","u","test","isNodeJs","URL","parseUrl","error","isJson","search","body","JSON","stringify","entries","reduce","fd","value","FormData","serializeFormData","response","fetch","ok","err","status","statusText","text","json","console","warn","blob","arrayBuffer","new","setOption","set","getOptions","get","assign","acc"],"sources":["../../lib/request/index.ts"],"sourcesContent":["import { isNodeJs } from \"valyrian.js\";\nimport { get, set } from \"valyrian.js/utils\";\n\ninterface UrlOptions {\n  base: string; // Used to prefix the url for scoped requests.\n  node: string | null; // Used to redirect local requests to node server for server side rendering.\n  api: string | null; // Used to redirect api requests to node server for server side rendering.\n}\n\ninterface RequestOptions {\n  allowedMethods?: string[];\n  urls?: UrlOptions;\n  [key: string | number | symbol]: any;\n}\n\ninterface RequestOptionsWithUrls extends RequestOptions {\n  urls: UrlOptions;\n  allowedMethods: string[];\n}\n\ninterface SendOptions extends RequestOptionsWithUrls, RequestInit {\n  allowedMethods: string[];\n  method: string;\n  headers: Record<string, string>;\n  resolveWithFullResponse?: boolean;\n}\n\nexport interface RequestInterface {\n  // eslint-disable-next-line no-unused-vars\n  (method: string, url: string, data?: Record<string, any>, options?: Partial<SendOptions>): any | Response;\n  // eslint-disable-next-line no-unused-vars\n  new: (baseUrl: string, options?: RequestOptions) => RequestInterface;\n  // eslint-disable-next-line no-unused-vars\n  setOptions: (key: string, value: any) => void;\n  // eslint-disable-next-line no-unused-vars\n  getOptions: (key?: string) => RequestOptions | void;\n  // eslint-disable-next-line no-unused-vars\n  get: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  post: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  put: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  patch: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  delete: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  head: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  options: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  [key: string | number | symbol]: any;\n}\n\n// This method is used to serialize an object into a query string.\nfunction serialize(obj: Record<string, any>, prefix: string = \"\"): URLSearchParams {\n  const params = new URLSearchParams();\n\n  Object.keys(obj).forEach((prop: string) => {\n    const key = prefix ? `${prefix}[${prop}]` : prop;\n    if (typeof obj[prop] === \"object\") {\n      params.append(key, serialize(obj[prop], key).toString());\n    } else {\n      params.append(key, obj[prop]);\n    }\n  });\n\n  return params;\n}\n\nfunction serializeFormData(data: Record<string, any>): FormData {\n  return Object.entries(data).reduce((fd, [key, value]) => {\n    fd.append(key, value);\n    return fd;\n  }, new FormData());\n}\n\nfunction parseUrl(url: string, options: RequestOptionsWithUrls) {\n  const urlWithoutSlash = url.replace(/\\/+$/, \"\").trim();\n  const u = /^https?/gi.test(urlWithoutSlash) ? urlWithoutSlash : `${options.urls.base}${urlWithoutSlash}`;\n\n  if (isNodeJs && typeof options.urls.node === \"string\") {\n    if (typeof options.urls.api === \"string\") {\n      return new URL(u.replace(options.urls.api, options.urls.node));\n    }\n\n    if (!/^https?/gi.test(u)) {\n      return new URL(u, options.urls.node);\n    }\n  }\n\n  if (/^https?/gi.test(u)) {\n    return new URL(u);\n  }\n\n  return new URL(u, options.urls.base);\n}\n\nconst defaultOptions: RequestOptions = { allowedMethods: [\"get\", \"post\", \"put\", \"patch\", \"delete\", \"head\", \"options\"] };\n\n// eslint-disable-next-line sonarjs/cognitive-complexity\nfunction Requester(baseUrl = \"\", options: RequestOptions = defaultOptions) {\n  const url = baseUrl.replace(/\\/$/gi, \"\").trim();\n  if (!options.urls) {\n    options.urls = {\n      base: \"\",\n      node: null,\n      api: null\n    };\n  }\n\n  if (!options.allowedMethods) {\n    options.allowedMethods = defaultOptions.allowedMethods;\n  }\n\n  const opts: RequestOptionsWithUrls = {\n    ...(options as RequestOptionsWithUrls),\n    urls: {\n      node: options.urls.node || null,\n      api: options.urls.api || null,\n      base: options.urls.base ? options.urls.base + url : url\n    }\n  };\n\n  // eslint-disable-next-line complexity\n  const request = async function request(\n    method: string,\n    url: string,\n    data?: Record<string, any>,\n    options: Record<string, any> = {}\n  ) {\n    const innerOptions: SendOptions = {\n      method: method.toUpperCase(),\n      headers: {},\n      resolveWithFullResponse: false,\n      ...opts,\n      ...options\n    } as SendOptions;\n\n    innerOptions.headers = { ...innerOptions.headers, ...opts.headers, ...options.headers };\n\n    if (!innerOptions.headers.Accept) {\n      innerOptions.headers.Accept = \"application/json\";\n    }\n\n    const acceptType = innerOptions.headers.Accept;\n    const contentType = innerOptions.headers[\"Content-Type\"] || innerOptions.headers[\"content-type\"] || \"\";\n\n    if (!innerOptions.allowedMethods.includes(method)) {\n      throw new Error(`Method ${method} not allowed. Allowed methods: ${innerOptions.allowedMethods.join(\", \")}`);\n    }\n\n    let finalUrl: URL;\n    try {\n      finalUrl = parseUrl(url, opts);\n    } catch (error) {\n      throw new Error(`Failed to parse URL: ${url}`);\n    }\n\n    if (data) {\n      const isJson = /json/gi.test(contentType);\n\n      if (innerOptions.method === \"GET\" && typeof data === \"object\") {\n        finalUrl.search = serialize(data).toString();\n      } else if (innerOptions.method !== \"GET\") {\n        innerOptions.body = isJson ? JSON.stringify(data) : serializeFormData(data);\n      }\n    }\n\n    const response = await fetch(finalUrl.toString(), innerOptions);\n    let body = null;\n    if (!response.ok) {\n      const err = new Error(`${response.status}: ${response.statusText}`) as Error & { response?: any; body?: any };\n      err.response = response;\n      if (/text/gi.test(acceptType)) {\n        err.body = await response.text();\n      }\n\n      if (/json/gi.test(acceptType)) {\n        try {\n          err.body = await response.json();\n        } catch (error) {\n          err.body = null;\n          // eslint-disable-next-line no-console\n          console.warn(\"Failed to parse JSON response:\", error);\n        }\n      }\n\n      throw err;\n    }\n\n    if (innerOptions.resolveWithFullResponse) {\n      return response;\n    }\n\n    if (/text/gi.test(acceptType)) {\n      body = await response.text();\n    } else if (/json/gi.test(acceptType)) {\n      try {\n        body = await response.json();\n      } catch (error) {\n        // eslint-disable-next-line no-console\n        console.warn(\"Failed to parse JSON response:\", error);\n        body = null;\n      }\n    } else if (/blob/gi.test(acceptType)) {\n      body = await response.blob();\n    } else if (/arraybuffer/gi.test(acceptType)) {\n      body = await response.arrayBuffer();\n    } else {\n      body = response;\n    }\n\n    return body || response;\n  } as unknown as RequestInterface;\n\n  request.new = (baseUrl: string, options?: RequestOptions) => Requester(baseUrl, { ...opts, ...(options || {}) });\n\n  request.setOption = (key: string, value: any) => {\n    set(opts, key, value);\n    return opts;\n  };\n\n  request.getOptions = (key?: string) => {\n    if (key) {\n      return get(opts, key);\n    }\n\n    return opts;\n  };\n\n  Object.assign(\n    request,\n    opts.allowedMethods.reduce((acc: Record<string, any>, method) => {\n      acc[method] = (url: string, data?: Record<string, any>, options?: Record<string, any>) =>\n        request(method, url, data, options);\n      return acc;\n    }, {})\n  );\n\n  return request;\n}\n\nexport const request = Requester();\n"],"mappings":"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"}

package/dist/request/index.mjs

@@ -1,33 +1,43 @@
 // lib/request/index.ts
 import { isNodeJs } from "valyrian.js";
+import { get, set } from "valyrian.js/utils";
 function serialize(obj, prefix = "") {
-  return Object.keys(obj).map((prop) => {
-    let k = prefix ? `${prefix}[${prop}]` : prop;
-    return typeof obj[prop] === "object" ? serialize(obj[prop], k) : `${encodeURIComponent(k)}=${encodeURIComponent(obj[prop])}`;
-  }).join("&");
+  const params = new URLSearchParams();
+  Object.keys(obj).forEach((prop) => {
+    const key = prefix ? `${prefix}[${prop}]` : prop;
+    if (typeof obj[prop] === "object") {
+      params.append(key, serialize(obj[prop], key).toString());
+    } else {
+      params.append(key, obj[prop]);
+    }
+  });
+  return params;
+}
+function serializeFormData(data) {
+  return Object.entries(data).reduce((fd, [key, value]) => {
+    fd.append(key, value);
+    return fd;
+  }, new FormData());
 }
 function parseUrl(url, options) {
-  let u = /^https?/gi.test(url) ? url : options.urls.base + url;
-  let parts = u.split("?");
-  u = parts[0].trim().replace(/^\/\//, "/").replace(/\/$/, "").trim();
-  if (parts[1]) {
-    u += `?${parts[1]}`;
-  }
+  const urlWithoutSlash = url.replace(/\/+$/, "").trim();
+  const u = /^https?/gi.test(urlWithoutSlash) ? urlWithoutSlash : `${options.urls.base}${urlWithoutSlash}`;
   if (isNodeJs && typeof options.urls.node === "string") {
-    options.urls.node = options.urls.node;
     if (typeof options.urls.api === "string") {
-      options.urls.api = options.urls.api.replace(/\/$/gi, "").trim();
-      u = u.replace(options.urls.api, options.urls.node);
+      return new URL(u.replace(options.urls.api, options.urls.node));
     }
     if (!/^https?/gi.test(u)) {
-      u = options.urls.node + u;
+      return new URL(u, options.urls.node);
     }
   }
-  return u;
+  if (/^https?/gi.test(u)) {
+    return new URL(u);
+  }
+  return new URL(u, options.urls.base);
 }
 var defaultOptions = { allowedMethods: ["get", "post", "put", "patch", "delete", "head", "options"] };
 function Requester(baseUrl = "", options = defaultOptions) {
-  let url = baseUrl.replace(/\/$/gi, "").trim();
+  const url = baseUrl.replace(/\/$/gi, "").trim();
   if (!options.urls) {
     options.urls = {
       base: "",
@@ -38,7 +48,7 @@ function Requester(baseUrl = "", options = defaultOptions) {
   if (!options.allowedMethods) {
     options.allowedMethods = defaultOptions.allowedMethods;
   }
-  let opts = {
+  const opts = {
     ...options,
     urls: {
       node: options.urls.node || null,
@@ -47,46 +57,40 @@ function Requester(baseUrl = "", options = defaultOptions) {
     }
   };
   const request2 = async function request3(method, url2, data, options2 = {}) {
-    let innerOptions = {
+    const innerOptions = {
       method: method.toUpperCase(),
       headers: {},
       resolveWithFullResponse: false,
       ...opts,
       ...options2
     };
+    innerOptions.headers = { ...innerOptions.headers, ...opts.headers, ...options2.headers };
     if (!innerOptions.headers.Accept) {
       innerOptions.headers.Accept = "application/json";
     }
-    let acceptType = innerOptions.headers.Accept;
-    let contentType = innerOptions.headers["Content-Type"] || innerOptions.headers["content-type"] || "";
-    if (innerOptions.allowedMethods.indexOf(method) === -1) {
-      throw new Error("Method not allowed");
+    const acceptType = innerOptions.headers.Accept;
+    const contentType = innerOptions.headers["Content-Type"] || innerOptions.headers["content-type"] || "";
+    if (!innerOptions.allowedMethods.includes(method)) {
+      throw new Error(`Method ${method} not allowed. Allowed methods: ${innerOptions.allowedMethods.join(", ")}`);
+    }
+    let finalUrl;
+    try {
+      finalUrl = parseUrl(url2, opts);
+    } catch (error) {
+      throw new Error(`Failed to parse URL: ${url2}`);
     }
     if (data) {
+      const isJson = /json/gi.test(contentType);
       if (innerOptions.method === "GET" && typeof data === "object") {
-        url2 += `?${serialize(data)}`;
-      }
-      if (innerOptions.method !== "GET") {
-        if (/json/gi.test(contentType)) {
-          innerOptions.body = JSON.stringify(data);
-        } else {
-          let formData;
-          if (data instanceof FormData) {
-            formData = data;
-          } else {
-            formData = new FormData();
-            for (let i in data) {
-              formData.append(i, data[i]);
-            }
-          }
-          innerOptions.body = formData;
-        }
+        finalUrl.search = serialize(data).toString();
+      } else if (innerOptions.method !== "GET") {
+        innerOptions.body = isJson ? JSON.stringify(data) : serializeFormData(data);
       }
     }
-    let response = await fetch(parseUrl(url2, opts), innerOptions);
+    const response = await fetch(finalUrl.toString(), innerOptions);
     let body = null;
     if (!response.ok) {
-      let err = new Error(response.statusText);
+      const err = new Error(`${response.status}: ${response.statusText}`);
       err.response = response;
       if (/text/gi.test(acceptType)) {
         err.body = await response.text();
@@ -95,6 +99,8 @@ function Requester(baseUrl = "", options = defaultOptions) {
         try {
           err.body = await response.json();
         } catch (error) {
+          err.body = null;
+          console.warn("Failed to parse JSON response:", error);
         }
       }
       throw err;
@@ -104,66 +110,39 @@ function Requester(baseUrl = "", options = defaultOptions) {
     }
     if (/text/gi.test(acceptType)) {
       body = await response.text();
-      return body;
-    }
-    if (/json/gi.test(acceptType)) {
+    } else if (/json/gi.test(acceptType)) {
       try {
         body = await response.json();
-        return body;
       } catch (error) {
+        console.warn("Failed to parse JSON response:", error);
+        body = null;
       }
+    } else if (/blob/gi.test(acceptType)) {
+      body = await response.blob();
+    } else if (/arraybuffer/gi.test(acceptType)) {
+      body = await response.arrayBuffer();
+    } else {
+      body = response;
     }
-    return response;
+    return body || response;
   };
   request2.new = (baseUrl2, options2) => Requester(baseUrl2, { ...opts, ...options2 || {} });
   request2.setOption = (key, value) => {
-    let result = opts;
-    let parsed = key.split(".");
-    let next;
-    while (parsed.length) {
-      next = parsed.shift();
-      let nextIsArray = next.indexOf("[") > -1;
-      if (nextIsArray) {
-        let idx = next.replace(/\D/gi, "");
-        next = next.split("[")[0];
-        parsed.unshift(idx);
-      }
-      if (parsed.length > 0 && typeof result[next] !== "object") {
-        result[next] = nextIsArray ? [] : {};
-      }
-      if (parsed.length === 0 && typeof value !== "undefined") {
-        result[next] = value;
-      }
-      result = result[next];
-    }
-    return result;
+    set(opts, key, value);
+    return opts;
   };
   request2.getOptions = (key) => {
-    if (!key) {
-      return opts;
-    }
-    let result = opts;
-    let parsed = key.split(".");
-    let next;
-    while (parsed.length) {
-      next = parsed.shift();
-      let nextIsArray = next.indexOf("[") > -1;
-      if (nextIsArray) {
-        let idx = next.replace(/\D/gi, "");
-        next = next.split("[")[0];
-        parsed.unshift(idx);
-      }
-      if (parsed.length > 0 && typeof result[next] !== "object") {
-        return null;
-      }
-      if (parsed.length === 0) {
-        return result[next];
-      }
-      result = result[next];
+    if (key) {
+      return get(opts, key);
     }
+    return opts;
   };
-  opts.allowedMethods.forEach(
-    (method) => request2[method] = (url2, data, options2) => request2(method, url2, data, options2)
+  Object.assign(
+    request2,
+    opts.allowedMethods.reduce((acc, method) => {
+      acc[method] = (url2, data, options2) => request2(method, url2, data, options2);
+      return acc;
+    }, {})
   );
   return request2;
 }