@zap-studio/fetch 0.5.4 → 0.5.5

package/dist/url.d.mts

@@ -1,27 +1,26 @@
 import { ExtendedRequestInit, FetchDefaults } from "./types.mjs";
-
 //#region src/url.d.ts
 /**
-* Resolves final request URL by applying baseURL and layered search params.
-*
-* Search param precedence:
-* 1. `defaults.searchParams`
-* 2. search params already present in `resourceUrl`
-* 3. per-request `searchParams`
-*
-* @example
-* const finalUrl = resolveRequestUrl(
-*   "/users?page=2",
-*   { ...defaults, baseURL: "https://api.example.com", searchParams: { locale: "en" } },
-*   { page: "3" },
-* );
-* // https://api.example.com/users?locale=en&page=3
-*
-* @throws {TypeError} When `baseURL` and `resourceUrl` cannot be resolved by
-*   `URL`, or when default/per-request search params cannot be converted by
-*   `URLSearchParams`.
-*/
-declare function resolveRequestUrl(resourceUrl: string, defaults: FetchDefaults, searchParams: ExtendedRequestInit["searchParams"] | undefined): string;
+ * Resolves final request URL by applying baseURL and layered search params.
+ *
+ * Search param precedence:
+ * 1. `defaults.searchParams`
+ * 2. search params already present in `resourceUrl`
+ * 3. per-request `searchParams`
+ *
+ * @example
+ * const finalUrl = resolveRequestUrl(
+ *   "/users?page=2",
+ *   { ...defaults, baseURL: "https://api.example.com", searchParams: { locale: "en" } },
+ *   { page: "3" },
+ * );
+ * // https://api.example.com/users?locale=en&page=3
+ *
+ * @throws {TypeError} When `baseURL` and `resourceUrl` cannot be resolved by
+ *   `URL`, or when default/per-request search params cannot be converted by
+ *   `URLSearchParams`.
+ */
+declare const resolveRequestUrl: (resourceUrl: string, defaults: FetchDefaults, searchParams?: ExtendedRequestInit["searchParams"]) => string;
 //#endregion
 export { resolveRequestUrl };
 //# sourceMappingURL=url.d.mts.map

package/dist/url.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"url.d.mts","names":[],"sources":["../src/url.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;iBA4BgB,iBAAA,CACd,WAAA,UACA,QAAA,EAAU,aAAA,EACV,YAAA,EAAc,mBAAA"}
+{"version":3,"file":"url.d.mts","names":[],"sources":["../src/url.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;cAmFa,oBACX,qBACA,UAAU,eACV,eAAe"}

package/dist/url.mjs

@@ -1,5 +1,36 @@
 //#region src/url.ts
 /**
+* Copies search params into target, overriding duplicate keys.
+*/
+const mergeSearchParams = (target, source) => {
+	for (const [key, value] of new URLSearchParams(source)) target.set(key, value);
+};
+/**
+* Ensures a URL has a trailing slash for relative URL resolution.
+*/
+const ensureTrailingSlash = (url) => url.endsWith("/") ? url : `${url}/`;
+/**
+* Resolves search params by applying default params, URL params, then request params.
+*/
+const resolveSearchParams = (url, defaultSearchParams, searchParams) => {
+	if (defaultSearchParams === void 0 && searchParams === void 0) return url;
+	const hashIndex = url.indexOf("#");
+	const hasFragment = hashIndex !== -1;
+	const urlWithoutHash = hasFragment ? url.slice(0, hashIndex) : url;
+	const hash = hasFragment ? url.slice(hashIndex + 1) : "";
+	const queryIndex = urlWithoutHash.indexOf("?");
+	const pathname = queryIndex === -1 ? urlWithoutHash : urlWithoutHash.slice(0, queryIndex);
+	const urlSearchParams = queryIndex === -1 ? void 0 : urlWithoutHash.slice(queryIndex + 1);
+	const resolvedSearchParams = new URLSearchParams();
+	mergeSearchParams(resolvedSearchParams, defaultSearchParams);
+	mergeSearchParams(resolvedSearchParams, urlSearchParams);
+	mergeSearchParams(resolvedSearchParams, searchParams);
+	const resolvedSearch = resolvedSearchParams.toString();
+	const fragmentSuffix = hasFragment ? `#${hash}` : "";
+	if (resolvedSearch.length === 0) return `${pathname}${fragmentSuffix}`;
+	return `${pathname}?${resolvedSearch}${fragmentSuffix}`;
+};
+/**
 * Resolves final request URL by applying baseURL and layered search params.
 *
 * Search param precedence:
@@ -19,42 +50,10 @@
 *   `URL`, or when default/per-request search params cannot be converted by
 *   `URLSearchParams`.
 */
-function resolveRequestUrl(resourceUrl, defaults, searchParams) {
-	return resolveSearchParams(defaults.baseURL ? new URL(resourceUrl, ensureTrailingSlash(defaults.baseURL)).toString() : resourceUrl, defaults.searchParams, searchParams);
-}
-/**
-* Resolves search params by applying default params, URL params, then request params.
-*/
-function resolveSearchParams(url, defaultSearchParams, searchParams) {
-	if (!defaultSearchParams && searchParams === void 0) return url;
-	const hashIndex = url.indexOf("#");
-	const hasFragment = hashIndex >= 0;
-	const urlWithoutHash = hasFragment ? url.slice(0, hashIndex) : url;
-	const hash = hasFragment ? url.slice(hashIndex + 1) : "";
-	const queryIndex = urlWithoutHash.indexOf("?");
-	const pathname = queryIndex >= 0 ? urlWithoutHash.slice(0, queryIndex) : urlWithoutHash;
-	const urlSearchParams = queryIndex >= 0 ? urlWithoutHash.slice(queryIndex + 1) : void 0;
-	const resolvedSearchParams = new URLSearchParams();
-	mergeSearchParams(resolvedSearchParams, defaultSearchParams);
-	mergeSearchParams(resolvedSearchParams, urlSearchParams);
-	mergeSearchParams(resolvedSearchParams, searchParams);
-	const resolvedSearch = resolvedSearchParams.toString();
-	const fragmentSuffix = hasFragment ? `#${hash}` : "";
-	if (!resolvedSearch) return `${pathname}${fragmentSuffix}`;
-	return `${pathname}?${resolvedSearch}${fragmentSuffix}`;
-}
-/**
-* Ensures a URL has a trailing slash for relative URL resolution.
-*/
-function ensureTrailingSlash(url) {
-	return url.endsWith("/") ? url : `${url}/`;
-}
-/**
-* Copies search params into target, overriding duplicate keys.
-*/
-function mergeSearchParams(target, source) {
-	for (const [key, value] of new URLSearchParams(source)) target.set(key, value);
-}
+const resolveRequestUrl = (resourceUrl, defaults, searchParams) => {
+	const url = defaults.baseURL ? new URL(resourceUrl, ensureTrailingSlash(defaults.baseURL)).toString() : resourceUrl;
+	return resolveSearchParams(url, defaults.searchParams, searchParams);
+};
 //#endregion
 export { resolveRequestUrl };
 

package/dist/url.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"url.mjs","names":[],"sources":["../src/url.ts"],"sourcesContent":["/**\n * URL resolution and query merging utilities.\n *\n * @module @zap-studio/fetch/url\n */\n\nimport type { ExtendedRequestInit, FetchDefaults } from \"./types.js\";\n\n/**\n * Resolves final request URL by applying baseURL and layered search params.\n *\n * Search param precedence:\n * 1. `defaults.searchParams`\n * 2. search params already present in `resourceUrl`\n * 3. per-request `searchParams`\n *\n * @example\n * const finalUrl = resolveRequestUrl(\n *   \"/users?page=2\",\n *   { ...defaults, baseURL: \"https://api.example.com\", searchParams: { locale: \"en\" } },\n *   { page: \"3\" },\n * );\n * // https://api.example.com/users?locale=en&page=3\n *\n * @throws {TypeError} When `baseURL` and `resourceUrl` cannot be resolved by\n *   `URL`, or when default/per-request search params cannot be converted by\n *   `URLSearchParams`.\n */\nexport function resolveRequestUrl(\n  resourceUrl: string,\n  defaults: FetchDefaults,\n  searchParams: ExtendedRequestInit[\"searchParams\"] | undefined,\n): string {\n  const url = defaults.baseURL\n    ? new URL(resourceUrl, ensureTrailingSlash(defaults.baseURL)).toString()\n    : resourceUrl;\n\n  return resolveSearchParams(url, defaults.searchParams, searchParams);\n}\n\n/**\n * Resolves search params by applying default params, URL params, then request params.\n */\nfunction resolveSearchParams(\n  url: string,\n  defaultSearchParams: FetchDefaults[\"searchParams\"] | undefined,\n  searchParams: ExtendedRequestInit[\"searchParams\"] | undefined,\n): string {\n  if (!defaultSearchParams && searchParams === undefined) {\n    return url;\n  }\n\n  const hashIndex = url.indexOf(\"#\");\n  const hasFragment = hashIndex >= 0;\n  const urlWithoutHash = hasFragment ? url.slice(0, hashIndex) : url;\n  const hash = hasFragment ? url.slice(hashIndex + 1) : \"\";\n  const queryIndex = urlWithoutHash.indexOf(\"?\");\n  const pathname = queryIndex >= 0 ? urlWithoutHash.slice(0, queryIndex) : urlWithoutHash;\n  const urlSearchParams = queryIndex >= 0 ? urlWithoutHash.slice(queryIndex + 1) : undefined;\n  const resolvedSearchParams = new URLSearchParams();\n\n  mergeSearchParams(resolvedSearchParams, defaultSearchParams);\n  mergeSearchParams(resolvedSearchParams, urlSearchParams);\n  mergeSearchParams(resolvedSearchParams, searchParams);\n\n  const resolvedSearch = resolvedSearchParams.toString();\n  const fragmentSuffix = hasFragment ? `#${hash}` : \"\";\n\n  if (!resolvedSearch) {\n    return `${pathname}${fragmentSuffix}`;\n  }\n\n  return `${pathname}?${resolvedSearch}${fragmentSuffix}`;\n}\n\n/**\n * Ensures a URL has a trailing slash for relative URL resolution.\n */\nfunction ensureTrailingSlash(url: string): string {\n  return url.endsWith(\"/\") ? url : `${url}/`;\n}\n\n/**\n * Copies search params into target, overriding duplicate keys.\n */\nfunction mergeSearchParams(\n  target: URLSearchParams,\n  source: ExtendedRequestInit[\"searchParams\"] | undefined,\n): void {\n  for (const [key, value] of new URLSearchParams(source)) {\n    target.set(key, value);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AA4BA,SAAgB,kBACd,aACA,UACA,cACQ;AAKR,QAAO,oBAJK,SAAS,UACjB,IAAI,IAAI,aAAa,oBAAoB,SAAS,QAAQ,CAAC,CAAC,UAAU,GACtE,aAE4B,SAAS,cAAc,aAAa;;;;;AAMtE,SAAS,oBACP,KACA,qBACA,cACQ;AACR,KAAI,CAAC,uBAAuB,iBAAiB,KAAA,EAC3C,QAAO;CAGT,MAAM,YAAY,IAAI,QAAQ,IAAI;CAClC,MAAM,cAAc,aAAa;CACjC,MAAM,iBAAiB,cAAc,IAAI,MAAM,GAAG,UAAU,GAAG;CAC/D,MAAM,OAAO,cAAc,IAAI,MAAM,YAAY,EAAE,GAAG;CACtD,MAAM,aAAa,eAAe,QAAQ,IAAI;CAC9C,MAAM,WAAW,cAAc,IAAI,eAAe,MAAM,GAAG,WAAW,GAAG;CACzE,MAAM,kBAAkB,cAAc,IAAI,eAAe,MAAM,aAAa,EAAE,GAAG,KAAA;CACjF,MAAM,uBAAuB,IAAI,iBAAiB;AAElD,mBAAkB,sBAAsB,oBAAoB;AAC5D,mBAAkB,sBAAsB,gBAAgB;AACxD,mBAAkB,sBAAsB,aAAa;CAErD,MAAM,iBAAiB,qBAAqB,UAAU;CACtD,MAAM,iBAAiB,cAAc,IAAI,SAAS;AAElD,KAAI,CAAC,eACH,QAAO,GAAG,WAAW;AAGvB,QAAO,GAAG,SAAS,GAAG,iBAAiB;;;;;AAMzC,SAAS,oBAAoB,KAAqB;AAChD,QAAO,IAAI,SAAS,IAAI,GAAG,MAAM,GAAG,IAAI;;;;;AAM1C,SAAS,kBACP,QACA,QACM;AACN,MAAK,MAAM,CAAC,KAAK,UAAU,IAAI,gBAAgB,OAAO,CACpD,QAAO,IAAI,KAAK,MAAM"}
+{"version":3,"file":"url.mjs","names":[],"sources":["../src/url.ts"],"sourcesContent":["/**\n * URL resolution and query merging utilities.\n *\n * @module @zap-studio/fetch/url\n */\n\nimport type { ExtendedRequestInit, FetchDefaults } from \"./types.js\";\n\n/**\n * Copies search params into target, overriding duplicate keys.\n */\nconst mergeSearchParams = (\n  target: URLSearchParams,\n  source: ExtendedRequestInit[\"searchParams\"] | undefined\n): void => {\n  for (const [key, value] of new URLSearchParams(source)) {\n    target.set(key, value);\n  }\n};\n\n/**\n * Ensures a URL has a trailing slash for relative URL resolution.\n */\nconst ensureTrailingSlash = (url: string): string =>\n  url.endsWith(\"/\") ? url : `${url}/`;\n\n/**\n * Resolves search params by applying default params, URL params, then request params.\n */\nconst resolveSearchParams = (\n  url: string,\n  defaultSearchParams: FetchDefaults[\"searchParams\"] | undefined,\n  searchParams: ExtendedRequestInit[\"searchParams\"] | undefined\n): string => {\n  if (defaultSearchParams === undefined && searchParams === undefined) {\n    return url;\n  }\n\n  const hashIndex = url.indexOf(\"#\");\n  const hasFragment = hashIndex !== -1;\n  const urlWithoutHash = hasFragment ? url.slice(0, hashIndex) : url;\n  const hash = hasFragment ? url.slice(hashIndex + 1) : \"\";\n  const queryIndex = urlWithoutHash.indexOf(\"?\");\n  const pathname =\n    queryIndex === -1 ? urlWithoutHash : urlWithoutHash.slice(0, queryIndex);\n  const urlSearchParams =\n    queryIndex === -1 ? undefined : urlWithoutHash.slice(queryIndex + 1);\n  const resolvedSearchParams = new URLSearchParams();\n\n  mergeSearchParams(resolvedSearchParams, defaultSearchParams);\n  mergeSearchParams(resolvedSearchParams, urlSearchParams);\n  mergeSearchParams(resolvedSearchParams, searchParams);\n\n  const resolvedSearch = resolvedSearchParams.toString();\n  const fragmentSuffix = hasFragment ? `#${hash}` : \"\";\n\n  if (resolvedSearch.length === 0) {\n    return `${pathname}${fragmentSuffix}`;\n  }\n\n  return `${pathname}?${resolvedSearch}${fragmentSuffix}`;\n};\n\n/**\n * Resolves final request URL by applying baseURL and layered search params.\n *\n * Search param precedence:\n * 1. `defaults.searchParams`\n * 2. search params already present in `resourceUrl`\n * 3. per-request `searchParams`\n *\n * @example\n * const finalUrl = resolveRequestUrl(\n *   \"/users?page=2\",\n *   { ...defaults, baseURL: \"https://api.example.com\", searchParams: { locale: \"en\" } },\n *   { page: \"3\" },\n * );\n * // https://api.example.com/users?locale=en&page=3\n *\n * @throws {TypeError} When `baseURL` and `resourceUrl` cannot be resolved by\n *   `URL`, or when default/per-request search params cannot be converted by\n *   `URLSearchParams`.\n */\nexport const resolveRequestUrl = (\n  resourceUrl: string,\n  defaults: FetchDefaults,\n  searchParams?: ExtendedRequestInit[\"searchParams\"]\n): string => {\n  const url = defaults.baseURL\n    ? new URL(resourceUrl, ensureTrailingSlash(defaults.baseURL)).toString()\n    : resourceUrl;\n\n  return resolveSearchParams(url, defaults.searchParams, searchParams);\n};\n"],"mappings":";;;;AAWA,MAAM,qBACJ,QACA,WACS;CACT,KAAK,MAAM,CAAC,KAAK,UAAU,IAAI,gBAAgB,MAAM,GACnD,OAAO,IAAI,KAAK,KAAK;AAEzB;;;;AAKA,MAAM,uBAAuB,QAC3B,IAAI,SAAS,GAAG,IAAI,MAAM,GAAG,IAAI;;;;AAKnC,MAAM,uBACJ,KACA,qBACA,iBACW;CACX,IAAI,wBAAwB,KAAA,KAAa,iBAAiB,KAAA,GACxD,OAAO;CAGT,MAAM,YAAY,IAAI,QAAQ,GAAG;CACjC,MAAM,cAAc,cAAc;CAClC,MAAM,iBAAiB,cAAc,IAAI,MAAM,GAAG,SAAS,IAAI;CAC/D,MAAM,OAAO,cAAc,IAAI,MAAM,YAAY,CAAC,IAAI;CACtD,MAAM,aAAa,eAAe,QAAQ,GAAG;CAC7C,MAAM,WACJ,eAAe,KAAK,iBAAiB,eAAe,MAAM,GAAG,UAAU;CACzE,MAAM,kBACJ,eAAe,KAAK,KAAA,IAAY,eAAe,MAAM,aAAa,CAAC;CACrE,MAAM,uBAAuB,IAAI,gBAAgB;CAEjD,kBAAkB,sBAAsB,mBAAmB;CAC3D,kBAAkB,sBAAsB,eAAe;CACvD,kBAAkB,sBAAsB,YAAY;CAEpD,MAAM,iBAAiB,qBAAqB,SAAS;CACrD,MAAM,iBAAiB,cAAc,IAAI,SAAS;CAElD,IAAI,eAAe,WAAW,GAC5B,OAAO,GAAG,WAAW;CAGvB,OAAO,GAAG,SAAS,GAAG,iBAAiB;AACzC;;;;;;;;;;;;;;;;;;;;;AAsBA,MAAa,qBACX,aACA,UACA,iBACW;CACX,MAAM,MAAM,SAAS,UACjB,IAAI,IAAI,aAAa,oBAAoB,SAAS,OAAO,CAAC,CAAC,CAAC,SAAS,IACrE;CAEJ,OAAO,oBAAoB,KAAK,SAAS,cAAc,YAAY;AACrE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zap-studio/fetch",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "private": false,
   "description": "A type-safe fetch wrapper for HTTP requests with runtime schema validation.",
   "keywords": [
@@ -52,26 +52,25 @@
     "access": "public"
   },
   "dependencies": {
-    "@zap-studio/validation": "0.3.4"
+    "@zap-studio/validation": "0.3.5"
   },
   "devDependencies": {
-    "@better-fetch/fetch": "^1.1.21",
-    "arktype": "^2.2.0",
-    "axios": "^1.15.2",
+    "@better-fetch/fetch": "^1.3.1",
+    "arktype": "^2.2.3",
+    "axios": "^1.18.1",
     "ky": "^2.0.2",
     "ofetch": "^1.5.1",
-    "typescript": "^6.0.3",
-    "valibot": "^1.3.1",
-    "vite-plus": "^0.1.19",
-    "zod": "^4.3.6",
+    "tsdown": "^0.22.4",
+    "typescript": "^7.0.2",
+    "valibot": "^1.4.2",
+    "vitest": "^4.1.10",
+    "zod": "^4.4.3",
     "@zap-studio/typescript": "0.0.0"
   },
   "engines": {
     "node": ">=18.0.0"
   },
   "scripts": {
-    "build": "vp pack",
-    "test": "vp test run",
-    "test:watch": "vp test watch"
+    "build": "tsdown --config ./tsdown.config.ts"
   }
 }