@stryke/http 0.5.3 → 0.7.0

package/dist/cookie.cjs

@@ -9,7 +9,7 @@ exports.serializeCookie = serializeCookie;
 exports.splitSetCookieString = splitSetCookieString;
 var _typeChecks = require("@stryke/type-checks");
 function parseCookie(r, c) {
-  if (!(0, _typeChecks.isString)(r)) throw new TypeError("argument str must be a string");
+  if (!(0, _typeChecks.isString)(r)) throw new Error("argument str must be a string");
   const i = {},
     e = c ?? {},
     o = e.decode ?? (t => t.includes("%") ? decodeURIComponent(t) : t);
@@ -94,10 +94,10 @@ const u = /^[\t\u0020-\u007E\u0080-\u00FF]+$/;
 function serializeCookie(r, c, i) {
   const e = i ?? {},
     o = e.encode ?? encodeURIComponent;
-  if (!(0, _typeChecks.isFunction)(o)) throw new TypeError("option encode is invalid");
-  if (!u.test(r)) throw new TypeError("argument name is invalid");
+  if (!(0, _typeChecks.isFunction)(o)) throw new Error("option encode is invalid");
+  if (!u.test(r)) throw new Error("argument name is invalid");
   const a = o(c);
-  if (a && !u.test(a)) throw new TypeError("argument val is invalid");
+  if (a && !u.test(a)) throw new Error("argument val is invalid");
   let t = `${r}=${a}`;
   if (!(0, _typeChecks.isSet)(e.maxAge)) {
     const n = Number(e.maxAge);
@@ -105,15 +105,15 @@ function serializeCookie(r, c, i) {
     t += `; Max-Age=${Math.floor(n)}`;
   }
   if (e.domain) {
-    if (!u.test(e.domain)) throw new TypeError("option domain is invalid");
+    if (!u.test(e.domain)) throw new Error("option domain is invalid");
     t += `; Domain=${e.domain}`;
   }
   if (e.path) {
-    if (!u.test(e.path)) throw new TypeError("option path is invalid");
+    if (!u.test(e.path)) throw new Error("option path is invalid");
     t += `; Path=${e.path}`;
   }
   if (e.expires) {
-    if (!(0, _typeChecks.isDate)(e.expires) || Number.isNaN(e.expires.valueOf())) throw new TypeError("option expires is invalid");
+    if (!(0, _typeChecks.isDate)(e.expires) || Number.isNaN(e.expires.valueOf())) throw new Error("option expires is invalid");
     t += `; Expires=${e.expires.toUTCString()}`;
   }
   if (e.httpOnly && (t += "; HttpOnly"), e.secure && (t += "; Secure"), e.priority) switch ((0, _typeChecks.isString)(e.priority) ? e.priority.toLowerCase() : e.priority) {
@@ -133,7 +133,7 @@ function serializeCookie(r, c, i) {
         break;
       }
     default:
-      throw new TypeError("option priority is invalid");
+      throw new Error("option priority is invalid");
   }
   if (e.sameSite) switch ((0, _typeChecks.isString)(e.sameSite) ? e.sameSite.toLowerCase() : e.sameSite) {
     case !0:
@@ -157,7 +157,7 @@ function serializeCookie(r, c, i) {
         break;
       }
     default:
-      throw new TypeError("option sameSite is invalid");
+      throw new Error("option sameSite is invalid");
   }
   return e.partitioned && (t += "; Partitioned"), t;
 }

package/dist/cookie.d.ts

@@ -23,8 +23,6 @@ export declare function parseSetCookie(setCookieValue: string, options?: SetCook
  * @param value - value to set the cookie to
  * @param options - object containing serialization options
  * @returns a `Set-Cookie` header string
- *
- * @throws TypeError when `maxAge` options is invalid
  */
 export declare function serializeCookie(name: string, value: string, options?: CookieSerializeOptions): string;
 /**

package/dist/cookie.mjs

@@ -1 +1 @@
-import{isDate as h,isFunction as d,isSet as g,isString as p}from"@stryke/type-checks";export function parseCookie(r,c){if(!p(r))throw new TypeError("argument str must be a string");const i={},e=c??{},o=e.decode??(t=>t.includes("%")?decodeURIComponent(t):t);let a=0;for(;a<r.length;){const t=r.indexOf("=",a);if(t===-1)break;let n=r.indexOf(";",a);if(n===-1)n=r.length;else if(n<t){a=r.lastIndexOf(";",t-1)+1;continue}const s=r.slice(a,t).trim();if(e?.filter&&!e?.filter(s)){a=n+1;continue}if(i[s]===void 0){let l=r.slice(t+1,n).trim();l.codePointAt(0)===34&&(l=l.slice(1,-1));try{i[s]=o(l)}catch{i[s]=l}}a=n+1}return i}export function parseSetCookie(r,c){const i=(r||"").split(";").filter(s=>p(s)&&!!s.trim()),e=i.shift()||"";let o="",a="";const t=e.split("=");t.length>1?(o=t.shift(),a=t.join("=")):a=e;try{a=c?.decode===!1?a:(c?.decode??decodeURIComponent)(a)}catch{}const n={name:o,value:a};for(const s of i){const l=s.split("="),f=(l.shift()||"").trimStart().toLowerCase(),m=l.join("=");switch(f){case"expires":{n.expires=new Date(m);break}case"max-age":{n.maxAge=Number.parseInt(m,10);break}case"secure":{n.secure=!0;break}case"httponly":{n.httpOnly=!0;break}case"samesite":{n.sameSite=m;break}default:n[f]=m}}return n}const u=/^[\t\u0020-\u007E\u0080-\u00FF]+$/;export function serializeCookie(r,c,i){const e=i??{},o=e.encode??encodeURIComponent;if(!d(o))throw new TypeError("option encode is invalid");if(!u.test(r))throw new TypeError("argument name is invalid");const a=o(c);if(a&&!u.test(a))throw new TypeError("argument val is invalid");let t=`${r}=${a}`;if(!g(e.maxAge)){const n=Number(e.maxAge);if(Number.isNaN(n)||!Number.isFinite(n))throw new TypeError("option maxAge is invalid");t+=`; Max-Age=${Math.floor(n)}`}if(e.domain){if(!u.test(e.domain))throw new TypeError("option domain is invalid");t+=`; Domain=${e.domain}`}if(e.path){if(!u.test(e.path))throw new TypeError("option path is invalid");t+=`; Path=${e.path}`}if(e.expires){if(!h(e.expires)||Number.isNaN(e.expires.valueOf()))throw new TypeError("option expires is invalid");t+=`; Expires=${e.expires.toUTCString()}`}if(e.httpOnly&&(t+="; HttpOnly"),e.secure&&(t+="; Secure"),e.priority)switch(p(e.priority)?e.priority.toLowerCase():e.priority){case"low":{t+="; Priority=Low";break}case"medium":{t+="; Priority=Medium";break}case"high":{t+="; Priority=High";break}default:throw new TypeError("option priority is invalid")}if(e.sameSite)switch(p(e.sameSite)?e.sameSite.toLowerCase():e.sameSite){case!0:{t+="; SameSite=Strict";break}case"lax":{t+="; SameSite=Lax";break}case"strict":{t+="; SameSite=Strict";break}case"none":{t+="; SameSite=None";break}default:throw new TypeError("option sameSite is invalid")}return e.partitioned&&(t+="; Partitioned"),t}export function splitSetCookieString(r){if(Array.isArray(r))return r.flatMap(f=>splitSetCookieString(f));if(!p(r))return[];const c=[];let i=0,e,o,a,t,n;const s=()=>{for(;i<r.length&&/\s/.test(r.charAt(i));)i+=1;return i<r.length},l=()=>(o=r.charAt(i),o!=="="&&o!==";"&&o!==",");for(;i<r.length;){for(e=i,n=!1;s();)if(o=r.charAt(i),o===","){for(a=i,i+=1,s(),t=i;i<r.length&&l();)i+=1;i<r.length&&r.charAt(i)==="="?(n=!0,i=t,c.push(r.slice(e,a)),e=i):i=a+1}else i+=1;(!n||i>=r.length)&&c.push(r.slice(e))}return c}
+import{isDate as h,isFunction as d,isSet as g,isString as p}from"@stryke/type-checks";export function parseCookie(r,c){if(!p(r))throw new Error("argument str must be a string");const i={},e=c??{},o=e.decode??(t=>t.includes("%")?decodeURIComponent(t):t);let a=0;for(;a<r.length;){const t=r.indexOf("=",a);if(t===-1)break;let n=r.indexOf(";",a);if(n===-1)n=r.length;else if(n<t){a=r.lastIndexOf(";",t-1)+1;continue}const s=r.slice(a,t).trim();if(e?.filter&&!e?.filter(s)){a=n+1;continue}if(i[s]===void 0){let l=r.slice(t+1,n).trim();l.codePointAt(0)===34&&(l=l.slice(1,-1));try{i[s]=o(l)}catch{i[s]=l}}a=n+1}return i}export function parseSetCookie(r,c){const i=(r||"").split(";").filter(s=>p(s)&&!!s.trim()),e=i.shift()||"";let o="",a="";const t=e.split("=");t.length>1?(o=t.shift(),a=t.join("=")):a=e;try{a=c?.decode===!1?a:(c?.decode??decodeURIComponent)(a)}catch{}const n={name:o,value:a};for(const s of i){const l=s.split("="),f=(l.shift()||"").trimStart().toLowerCase(),m=l.join("=");switch(f){case"expires":{n.expires=new Date(m);break}case"max-age":{n.maxAge=Number.parseInt(m,10);break}case"secure":{n.secure=!0;break}case"httponly":{n.httpOnly=!0;break}case"samesite":{n.sameSite=m;break}default:n[f]=m}}return n}const u=/^[\t\u0020-\u007E\u0080-\u00FF]+$/;export function serializeCookie(r,c,i){const e=i??{},o=e.encode??encodeURIComponent;if(!d(o))throw new Error("option encode is invalid");if(!u.test(r))throw new Error("argument name is invalid");const a=o(c);if(a&&!u.test(a))throw new Error("argument val is invalid");let t=`${r}=${a}`;if(!g(e.maxAge)){const n=Number(e.maxAge);if(Number.isNaN(n)||!Number.isFinite(n))throw new TypeError("option maxAge is invalid");t+=`; Max-Age=${Math.floor(n)}`}if(e.domain){if(!u.test(e.domain))throw new Error("option domain is invalid");t+=`; Domain=${e.domain}`}if(e.path){if(!u.test(e.path))throw new Error("option path is invalid");t+=`; Path=${e.path}`}if(e.expires){if(!h(e.expires)||Number.isNaN(e.expires.valueOf()))throw new Error("option expires is invalid");t+=`; Expires=${e.expires.toUTCString()}`}if(e.httpOnly&&(t+="; HttpOnly"),e.secure&&(t+="; Secure"),e.priority)switch(p(e.priority)?e.priority.toLowerCase():e.priority){case"low":{t+="; Priority=Low";break}case"medium":{t+="; Priority=Medium";break}case"high":{t+="; Priority=High";break}default:throw new Error("option priority is invalid")}if(e.sameSite)switch(p(e.sameSite)?e.sameSite.toLowerCase():e.sameSite){case!0:{t+="; SameSite=Strict";break}case"lax":{t+="; SameSite=Lax";break}case"strict":{t+="; SameSite=Strict";break}case"none":{t+="; SameSite=None";break}default:throw new Error("option sameSite is invalid")}return e.partitioned&&(t+="; Partitioned"),t}export function splitSetCookieString(r){if(Array.isArray(r))return r.flatMap(f=>splitSetCookieString(f));if(!p(r))return[];const c=[];let i=0,e,o,a,t,n;const s=()=>{for(;i<r.length&&/\s/.test(r.charAt(i));)i+=1;return i<r.length},l=()=>(o=r.charAt(i),o!=="="&&o!==";"&&o!==",");for(;i<r.length;){for(e=i,n=!1;s();)if(o=r.charAt(i),o===","){for(a=i,i+=1,s(),t=i;i<r.length&&l();)i+=1;i<r.length&&r.charAt(i)==="="?(n=!0,i=t,c.push(r.slice(e,a)),e=i):i=a+1}else i+=1;(!n||i>=r.length)&&c.push(r.slice(e))}return c}

package/dist/index.cjs

@@ -36,14 +36,14 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
-var _urlBuilder = require("./url-builder.cjs");
-Object.keys(_urlBuilder).forEach(function (key) {
+var _url = require("./url.cjs");
+Object.keys(_url).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _urlBuilder[key]) return;
+  if (key in exports && exports[key] === _url[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _urlBuilder[key];
+      return _url[key];
     }
   });
 });

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./cookie";
 export * from "./format-data-uri";
 export * from "./types";
-export * from "./url-builder";
+export * from "./url";

package/dist/index.mjs

@@ -1 +1 @@
-export*from"./cookie";export*from"./format-data-uri";export*from"./types";export*from"./url-builder";
+export*from"./cookie";export*from"./format-data-uri";export*from"./types";export*from"./url";

package/dist/types.cjs

@@ -1 +1,7 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PROTOCOL_RELATIVE_SYMBOL = void 0;
+const PROTOCOL_RELATIVE_SYMBOL = exports.PROTOCOL_RELATIVE_SYMBOL = Symbol("protocol-relative");

package/dist/types.d.ts

@@ -1,13 +1,93 @@
-import type { ParsedURL } from "ufo";
-export type StormURL = ParsedURL & {
-    __typename: "StormURL";
-    queryParams: Record<string, any>;
-    paths: string[];
+export interface StormURLBuilderOptions {
+    /**
+     * Should the URL be decoded
+     *
+     * @defaultValue `true`
+     */
+    decode?: boolean;
+    /**
+     * Should the URL include a locale path segment
+     */
+    locale?: string | true;
+    /**
+     * The default protocol to use
+     *
+     * @defaultValue "https"
+     */
+    defaultProtocol?: string;
+}
+export declare const PROTOCOL_RELATIVE_SYMBOL: unique symbol;
+export interface IStormURL {
+    /**
+     * A string containing the username and password specified before the domain name.
+     */
+    auth: string;
+    /**
+     * A string containing the username specified before the domain name.
+     */
     username?: string;
+    /**
+     * A string containing the password specified before the domain name.
+     */
     password?: string;
+    /**
+     * A string containing the domain (that is the hostname) followed by (if a port was specified) a `:` and the port of the URL.
+     */
+    host: string;
+    /**
+     * A string containing the domain of the URL.
+     */
     hostname?: string;
+    /**
+     * A string containing the port number of the URL.
+     */
     port?: string;
-};
+    /**
+     * A string containing the protocol scheme of the URL, including the final `:`.
+     */
+    protocol?: string;
+    /**
+     * A stringified value that returns the whole URL.
+     */
+    href: string;
+    /**
+     * A string containing an initial `/` followed by the path of the URL, not including the query string or fragment.
+     */
+    pathname: string;
+    /**
+     * The paths of the URL
+     */
+    paths: any[];
+    /**
+     * A string containing a `#` followed by the fragment identifier of the URL.
+     */
+    hash: string;
+    /**
+     * A string indicating the URL's parameter string; if any parameters are provided, this string includes all of them, beginning with the leading `?` character.
+     */
+    search: string;
+    /**
+     * The search parameters of the URL
+     *
+     * @remarks
+     * This is a `URLSearchParams` object that contains the search parameters of the URL.
+     */
+    searchParams: URLSearchParams;
+    /**
+     * The search parameters of the URL
+     *
+     * @remarks
+     * This is a Record\<string, any\> object that contains the search parameters of the URL.
+     */
+    params: Record<string, any>;
+    /**
+     * An optional symbol to indicate that the URL is protocol-relative
+     *
+     * @remarks
+     * This is used when the URL is protocol-relative (e.g. //example.com)
+     */
+    [PROTOCOL_RELATIVE_SYMBOL]?: boolean;
+}
 /**
  * Additional serialization options
  */

package/dist/types.mjs

@@ -0,0 +1 @@
+export const PROTOCOL_RELATIVE_SYMBOL=Symbol("protocol-relative");

package/dist/url.cjs

@@ -0,0 +1,166 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StormURL = void 0;
+var _stormJson = require("@stryke/json/storm-json");
+var _joinPaths = require("@stryke/path/join-paths");
+var _isInteger = require("@stryke/type-checks/is-integer");
+var _isUndefined = require("@stryke/type-checks/is-undefined");
+var _ufo = require("ufo");
+class StormURL {
+  #h;
+  #i;
+  #r;
+  #t;
+  #s;
+  #a;
+  #o = [];
+  #e;
+  #n;
+  constructor(t, s = {
+    decode: !0
+  }) {
+    this.#h = s;
+    const i = (0, _ufo.parseURL)(this.#h.decode ? (0, _ufo.decode)(t) : t),
+      h = (0, _ufo.parseAuth)(i.auth);
+    this.#i = h.username, this.#r = h.password;
+    const a = (0, _ufo.parseHost)(i.host);
+    this.#t = a.hostname, this.#s = a.port, this.#a = i.protocol, this.#e = i.hash || "", this.#n = (0, _ufo.parseQuery)(i.search), this.#o = i.pathname ? i.pathname.split("/").filter(Boolean) : [];
+  }
+  set params(t) {
+    this.#n = t;
+  }
+  get params() {
+    return this.#n;
+  }
+  get searchParams() {
+    const t = new URLSearchParams();
+    for (const [s, i] of Object.entries(this.params)) t.append(s, i);
+    return t;
+  }
+  set searchParams(t) {
+    this.params = Object.fromEntries(t.entries());
+  }
+  set search(t) {
+    this.params = (0, _ufo.parseQuery)(t);
+  }
+  get search() {
+    const t = (0, _ufo.stringifyQuery)(this.params);
+    return t ? t.startsWith("?") ? t : `?${t}` : "";
+  }
+  set hash(t) {
+    this.#e = t.startsWith("#") ? t : `#${t}`;
+  }
+  get hash() {
+    return this.#e;
+  }
+  set port(t) {
+    this.#s = !(0, _isUndefined.isUndefined)(t) && (0, _isInteger.isInteger)(t) ? `${t}` : void 0;
+  }
+  get port() {
+    return this.#s;
+  }
+  set auth(t) {
+    const s = (0, _ufo.parseAuth)(t);
+    this.#i = s.username, this.#r = s.password;
+  }
+  get auth() {
+    return this.#i && this.#r ? `${this.#i}:${this.#r}` : this.#i ? this.#i : this.#r ? this.#r : "";
+  }
+  set protocol(t) {
+    this.#a = t.endsWith(":") ? t : t.endsWith("://") ? t.slice(0, -2) : `${t}:`;
+  }
+  get protocol() {
+    return this.#a || this.#h.defaultProtocol || "https:";
+  }
+  set hostname(t) {
+    this.#t = t;
+  }
+  get hostname() {
+    return this.#t;
+  }
+  set host(t) {
+    const s = (0, _ufo.parseHost)(t);
+    this.#t = s.hostname, this.#s = s.port;
+  }
+  get host() {
+    return this.#t && this.#s ? `${this.#t}:${this.#s}` : this.#t ? this.#t : this.#s ? this.#s : "";
+  }
+  set paths(t) {
+    this.#o = t.filter(Boolean);
+  }
+  get paths() {
+    return this.#o;
+  }
+  set pathname(t) {
+    this.paths = (0, _ufo.cleanDoubleSlashes)(t).split("/");
+  }
+  get pathname() {
+    return `/${this.paths ? (0, _joinPaths.joinPaths)(...this.paths.map(t => _stormJson.StormJSON.stringify(t))) : ""}`;
+  }
+  set path(t) {
+    const s = (0, _ufo.parsePath)(t);
+    this.pathname = s.pathname, this.search = s.search, this.#e = s.hash;
+  }
+  get path() {
+    return (0, _ufo.stringifyParsedURL)({
+      pathname: this.pathname,
+      search: this.search,
+      hash: this.hash
+    });
+  }
+  get href() {
+    return this.toString();
+  }
+  set href(t) {
+    const s = (0, _ufo.parseURL)(t);
+    this.protocol = s.protocol || this.protocol, this.auth = s.auth || this.auth, this.host = s.host || this.host, this.pathname = s.pathname || this.pathname, this.search = s.search || this.search, this.hash = s.hash || this.hash;
+  }
+  get origin() {
+    return `${this.protocol}//${this.host}`;
+  }
+  get isScriptProtocol() {
+    return (0, _ufo.isScriptProtocol)(this.protocol);
+  }
+  get isRelative() {
+    return (0, _ufo.isRelative)(this.toString());
+  }
+  get isNonEmptyURL() {
+    return (0, _ufo.isNonEmptyURL)(this.toString());
+  }
+  get __typename() {
+    return "StormURL";
+  }
+  isSamePath(t) {
+    return (0, _ufo.isSamePath)(this.path, t);
+  }
+  isEqual(t) {
+    return (0, _ufo.isEqual)(this.toString(), typeof t == "string" ? t : t instanceof StormURL ? t.toString() : (0, _ufo.stringifyParsedURL)(t));
+  }
+  toParsed() {
+    return {
+      protocol: this.protocol,
+      auth: this.auth,
+      host: this.host,
+      pathname: this.pathname,
+      search: this.search,
+      hash: this.hash
+    };
+  }
+  toString() {
+    return (0, _ufo.stringifyParsedURL)(this.toParsed());
+  }
+  toEncoded() {
+    return (0, _ufo.normalizeURL)(this.toString());
+  }
+}
+exports.StormURL = StormURL;
+_stormJson.StormJSON.instance.registerCustom({
+  isApplicable: r => r.__typename === "StormURL",
+  serialize: r => r.toEncoded(),
+  deserialize: r => new StormURL(r, {
+    decode: !0
+  })
+}, "StormURL");

package/dist/url.d.ts

@@ -0,0 +1,50 @@
+import type { ParsedURL } from "ufo";
+import type { IStormURL, StormURLBuilderOptions } from "./types";
+/**
+ * A class used to build URLs
+ *
+ * @remarks
+ * This class is used to build URLs with a fluent API.
+ *
+ * The [UFO](https://github.com/unjs/ufo) library is used under the hood to parse and stringify URLs.
+ */
+export declare class StormURL implements IStormURL, Partial<URL> {
+    #private;
+    constructor(initialURL: string, options?: StormURLBuilderOptions);
+    set params(value: Record<string, any>);
+    get params(): Record<string, any>;
+    get searchParams(): URLSearchParams;
+    set searchParams(value: URLSearchParams);
+    set search(value: string);
+    get search(): string;
+    set hash(value: string);
+    get hash(): string;
+    set port(value: string | number | undefined);
+    get port(): string | undefined;
+    set auth(value: string | undefined);
+    get auth(): string;
+    set protocol(value: string);
+    get protocol(): string;
+    set hostname(value: string);
+    get hostname(): string;
+    set host(value: string | undefined);
+    get host(): string;
+    set paths(value: any[]);
+    get paths(): any[];
+    set pathname(value: string);
+    get pathname(): string;
+    set path(value: string);
+    get path(): string;
+    get href(): string;
+    set href(value: string);
+    get origin(): string;
+    get isScriptProtocol(): boolean;
+    get isRelative(): boolean;
+    get isNonEmptyURL(): boolean;
+    get __typename(): string;
+    isSamePath(path: string): boolean;
+    isEqual(url: string | ParsedURL | StormURL): boolean;
+    toParsed(): ParsedURL;
+    toString(): string;
+    toEncoded(): string;
+}

package/dist/url.mjs

@@ -0,0 +1 @@
+import{StormJSON as o}from"@stryke/json/storm-json";import{joinPaths as m}from"@stryke/path/join-paths";import{isInteger as g}from"@stryke/type-checks/is-integer";import{isUndefined as l}from"@stryke/type-checks/is-undefined";import{cleanDoubleSlashes as d,decode as b,isEqual as R,isNonEmptyURL as S,isRelative as f,isSamePath as U,isScriptProtocol as L,normalizeURL as P,parseAuth as n,parseHost as p,parsePath as y,parseQuery as c,parseURL as u,stringifyParsedURL as e,stringifyQuery as $}from"ufo";export class StormURL{#h;#i;#r;#t;#s;#a;#o=[];#e;#n;constructor(t,s={decode:!0}){this.#h=s;const i=u(this.#h.decode?b(t):t),h=n(i.auth);this.#i=h.username,this.#r=h.password;const a=p(i.host);this.#t=a.hostname,this.#s=a.port,this.#a=i.protocol,this.#e=i.hash||"",this.#n=c(i.search),this.#o=i.pathname?i.pathname.split("/").filter(Boolean):[]}set params(t){this.#n=t}get params(){return this.#n}get searchParams(){const t=new URLSearchParams;for(const[s,i]of Object.entries(this.params))t.append(s,i);return t}set searchParams(t){this.params=Object.fromEntries(t.entries())}set search(t){this.params=c(t)}get search(){const t=$(this.params);return t?t.startsWith("?")?t:`?${t}`:""}set hash(t){this.#e=t.startsWith("#")?t:`#${t}`}get hash(){return this.#e}set port(t){this.#s=!l(t)&&g(t)?`${t}`:void 0}get port(){return this.#s}set auth(t){const s=n(t);this.#i=s.username,this.#r=s.password}get auth(){return this.#i&&this.#r?`${this.#i}:${this.#r}`:this.#i?this.#i:this.#r?this.#r:""}set protocol(t){this.#a=t.endsWith(":")?t:t.endsWith("://")?t.slice(0,-2):`${t}:`}get protocol(){return this.#a||this.#h.defaultProtocol||"https:"}set hostname(t){this.#t=t}get hostname(){return this.#t}set host(t){const s=p(t);this.#t=s.hostname,this.#s=s.port}get host(){return this.#t&&this.#s?`${this.#t}:${this.#s}`:this.#t?this.#t:this.#s?this.#s:""}set paths(t){this.#o=t.filter(Boolean)}get paths(){return this.#o}set pathname(t){this.paths=d(t).split("/")}get pathname(){return`/${this.paths?m(...this.paths.map(t=>o.stringify(t))):""}`}set path(t){const s=y(t);this.pathname=s.pathname,this.search=s.search,this.#e=s.hash}get path(){return e({pathname:this.pathname,search:this.search,hash:this.hash})}get href(){return this.toString()}set href(t){const s=u(t);this.protocol=s.protocol||this.protocol,this.auth=s.auth||this.auth,this.host=s.host||this.host,this.pathname=s.pathname||this.pathname,this.search=s.search||this.search,this.hash=s.hash||this.hash}get origin(){return`${this.protocol}//${this.host}`}get isScriptProtocol(){return L(this.protocol)}get isRelative(){return f(this.toString())}get isNonEmptyURL(){return S(this.toString())}get __typename(){return"StormURL"}isSamePath(t){return U(this.path,t)}isEqual(t){return R(this.toString(),typeof t=="string"?t:t instanceof StormURL?t.toString():e(t))}toParsed(){return{protocol:this.protocol,auth:this.auth,host:this.host,pathname:this.pathname,search:this.search,hash:this.hash}}toString(){return e(this.toParsed())}toEncoded(){return P(this.toString())}}o.instance.registerCustom({isApplicable:r=>r.__typename==="StormURL",serialize:r=>r.toEncoded(),deserialize:r=>new StormURL(r,{decode:!0})},"StormURL");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/http",
-  "version": "0.5.3",
+  "version": "0.7.0",
   "type": "module",
   "description": "A package containing HTTP communication utilities used by Storm Software.",
   "repository": {
@@ -11,8 +11,9 @@
   "private": false,
   "dependencies": {
     "ufo": "1.5.4",
-    "@stryke/json": ">=0.5.4",
-    "@stryke/type-checks": ">=0.1.4"
+    "@stryke/json": "^0.7.0",
+    "@stryke/path": "^0.4.7",
+    "@stryke/type-checks": "^0.2.0"
   },
   "devDependencies": { "@types/node": "^22.13.1" },
   "publishConfig": { "access": "public" },
@@ -59,19 +60,10 @@
     }
   ],
   "exports": {
-    "./url-builder": {
-      "import": {
-        "types": "./dist/url-builder.d.ts",
-        "default": "./dist/url-builder.mjs"
-      },
-      "require": {
-        "types": "./dist/url-builder.d.ts",
-        "default": "./dist/url-builder.cjs"
-      },
-      "default": {
-        "types": "./dist/url-builder.d.ts",
-        "default": "./dist/url-builder.mjs"
-      }
+    "./url": {
+      "import": { "types": "./dist/url.d.ts", "default": "./dist/url.mjs" },
+      "require": { "types": "./dist/url.d.ts", "default": "./dist/url.cjs" },
+      "default": { "types": "./dist/url.d.ts", "default": "./dist/url.mjs" }
     },
     "./types": {
       "import": { "types": "./dist/types.d.ts", "default": "./dist/types.mjs" },

package/dist/url-builder.cjs

@@ -1,98 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.StormURLBuilder = void 0;
-var _stormJson = require("@stryke/json/storm-json");
-var _isString = require("@stryke/type-checks/is-string");
-var _ufo = require("ufo");
-class StormURLBuilder {
-  #t;
-  static create(t, r) {
-    return new StormURLBuilder(t, r);
-  }
-  constructor(t, r) {
-    const s = r?.decode ?? !0,
-      i = (0, _isString.isString)(t) ? s ? (0, _ufo.parseURL)((0, _ufo.decode)(t)) : (0, _ufo.parseURL)(t) : t;
-    this.#t = {
-      __typename: "StormURL",
-      queryParams: {},
-      ...i,
-      paths: i.pathname ? i.pathname.split("/").filter(Boolean) : []
-    }, this.#t.host && this.withHost(this.#t.host), this.#t.auth && this.withAuth(this.#t.auth);
-  }
-  get _url() {
-    return this.#t;
-  }
-  withProtocol(t) {
-    return this.#t.protocol = t, this;
-  }
-  withHostname(t) {
-    return this.#t.hostname = t, this;
-  }
-  withPort(t) {
-    return this.#t.port = String(t), this;
-  }
-  withUsername(t) {
-    return this.#t.username = t, this;
-  }
-  withPassword(t) {
-    return this.#t.password = t, this;
-  }
-  withHost(t) {
-    if ((0, _isString.isString)(t)) {
-      this.#t.host = t;
-      const r = (0, _ufo.parseAuth)(t);
-      this.#t.username = r.username, this.#t.password = r.password;
-    } else this.#t.hostname = t.hostname, this.#t.port = t.port, this.#t.auth = `${t.hostname}${t.port ? `:${t.port}` : ""}`;
-    return this;
-  }
-  withPath(t) {
-    const r = (0, _ufo.parsePath)(t.startsWith("/") ? t : `/${t}`);
-    return this.#t = {
-      ...this.#t,
-      ...r,
-      paths: r.pathname.split("/").filter(Boolean)
-    }, this;
-  }
-  withHash(t) {
-    return this.#t.hash = t, this;
-  }
-  withAuth(t) {
-    if ((0, _isString.isString)(t)) {
-      this.#t.auth = t;
-      const r = (0, _ufo.parseAuth)(t);
-      this.#t.username = r.username, this.#t.password = r.password;
-    } else this.#t.username = t.username, this.#t.password = t.password, this.#t.auth = `${t.username}:${t.password}`;
-    return this;
-  }
-  withQuery(t) {
-    return this.#t.queryParams = {}, this.addQueryParam(t), this;
-  }
-  addQueryParam(t) {
-    if ((0, _isString.isString)(t)) {
-      const r = (0, _ufo.parseQuery)(t);
-      for (const s of Object.entries(r)) s[0] && (this.#t.queryParams[s[0]] = this.parseQueryParamValue(s[1]));
-    } else if (Array.isArray(t) && t.length === 2) this.#t.queryParams[t[0]] = this.parseQueryParamValue(t[1]);else for (const r of Object.entries(t)) r[0] && (this.#t.queryParams[r[0]] = this.parseQueryParamValue(r[1]));
-    return this;
-  }
-  build() {
-    return this.#t;
-  }
-  toString() {
-    return (0, _ufo.cleanDoubleSlashes)((0, _ufo.stringifyParsedURL)(this.#t));
-  }
-  toEncoded() {
-    return (0, _ufo.encode)(this.toString());
-  }
-  parseQueryParamValue(t) {
-    if (Array.isArray(t)) {
-      const r = [];
-      for (const s of t) r.push(this.parseQueryParamValue(s));
-      return r;
-    }
-    return _stormJson.StormJSON.parse(t);
-  }
-}
-exports.StormURLBuilder = StormURLBuilder;

package/dist/url-builder.d.ts

@@ -1,138 +0,0 @@
-import type { ParsedAuth, ParsedHost } from "ufo";
-import type { StormURL } from "./types";
-export interface StormURLBuilderOptions {
-    /**
-     * Should the URL be decoded
-     *
-     * @defaultValue `true`
-     */
-    decode: boolean;
-}
-/**
- * A class used to build URLs
- *
- * @remarks
- * This class is used to build URLs with a fluent API.
- *
- * The [UFO](https://github.com/unjs/ufo) library is used under the hood to parse and stringify URLs.
- *
- * @class StormURLBuilder
- */
-export declare class StormURLBuilder {
-    #private;
-    /**
-     * Create a new URL builder
-     *
-     * @param url - The URL to build
-     * @param options - The options for the URL builder
-     * @returns The URL builder
-     */
-    static create(url: string | StormURL, options?: StormURLBuilderOptions): StormURLBuilder;
-    /**
-     * Create a new URL builder
-     */
-    protected constructor(url: string | StormURL, options?: StormURLBuilderOptions);
-    get _url(): StormURL;
-    /**
-     * Set the protocol of the URL
-     *
-     * @param protocol - The protocol to set
-     * @returns The URL builder
-     */
-    withProtocol(protocol: string): StormURLBuilder;
-    /**
-     * Set the hostname of the URL
-     *
-     * @param hostname - The hostname to set
-     * @returns The URL builder
-     */
-    withHostname(hostname: string): StormURLBuilder;
-    /**
-     * Set the port of the URL
-     *
-     * @param port - The port to set
-     * @returns The URL builder
-     */
-    withPort(port: number): StormURLBuilder;
-    /**
-     * Set the username of the URL
-     *
-     * @param username - The username to set
-     * @returns The URL builder
-     */
-    withUsername(username: string): StormURLBuilder;
-    /**
-     * Set the password of the URL
-     *
-     * @param password - The password to set
-     * @returns The URL builder
-     */
-    withPassword(password: string): StormURLBuilder;
-    /**
-     * Set the pathname of the URL
-     *
-     * @param pathname - The pathname to set
-     * @returns The URL builder
-     */
-    withHost(host: string | ParsedHost): StormURLBuilder;
-    /**
-     * Set the path of the URL
-     *
-     * @param path - The path to set
-     * @returns The URL builder
-     */
-    withPath(path: string): StormURLBuilder;
-    /**
-     * Set the hash of the URL
-     *
-     * @param hash - The hash to set
-     * @returns The URL builder
-     */
-    withHash(hash: string): StormURLBuilder;
-    /**
-     * Set the auth of the URL
-     *
-     * @param auth - The auth to set
-     * @returns The URL builder
-     */
-    withAuth(auth: string | ParsedAuth): StormURLBuilder;
-    /**
-     * Set the query of the URL
-     *
-     * @param query - The query to set
-     * @returns The URL builder
-     */
-    withQuery(query: string | [string, any] | Record<string, any>): StormURLBuilder;
-    /**
-     * Add a query parameter to the URL
-     *
-     * @param queryParam - The query parameter to add
-     * @returns The URL builder
-     */
-    addQueryParam(queryParam: string | [string, any] | Record<string, any>): StormURLBuilder;
-    /**
-     * Returns the built URL
-     *
-     * @returns The built URL
-     */
-    build(): StormURL;
-    /**
-     * Returns the string representation of the URL
-     *
-     * @returns The string representation of the URL
-     */
-    toString(): string;
-    /**
-     * Returns the encoded string representation of the URL
-     *
-     * @returns The encoded string representation of the URL
-     */
-    toEncoded(): string;
-    /**
-     * Parse a query parameter value
-     *
-     * @param value - The value to parse
-     * @returns The parsed value
-     */
-    private parseQueryParamValue;
-}

package/dist/url-builder.mjs

@@ -1 +0,0 @@
-import{StormJSON as a}from"@stryke/json/storm-json";import{isString as e}from"@stryke/type-checks/is-string";import{cleanDoubleSlashes as h,decode as u,encode as p,parseAuth as o,parsePath as m,parseQuery as d,parseURL as n,stringifyParsedURL as l}from"ufo";export class StormURLBuilder{#t;static create(t,r){return new StormURLBuilder(t,r)}constructor(t,r){const s=r?.decode??!0,i=e(t)?s?n(u(t)):n(t):t;this.#t={__typename:"StormURL",queryParams:{},...i,paths:i.pathname?i.pathname.split("/").filter(Boolean):[]},this.#t.host&&this.withHost(this.#t.host),this.#t.auth&&this.withAuth(this.#t.auth)}get _url(){return this.#t}withProtocol(t){return this.#t.protocol=t,this}withHostname(t){return this.#t.hostname=t,this}withPort(t){return this.#t.port=String(t),this}withUsername(t){return this.#t.username=t,this}withPassword(t){return this.#t.password=t,this}withHost(t){if(e(t)){this.#t.host=t;const r=o(t);this.#t.username=r.username,this.#t.password=r.password}else this.#t.hostname=t.hostname,this.#t.port=t.port,this.#t.auth=`${t.hostname}${t.port?`:${t.port}`:""}`;return this}withPath(t){const r=m(t.startsWith("/")?t:`/${t}`);return this.#t={...this.#t,...r,paths:r.pathname.split("/").filter(Boolean)},this}withHash(t){return this.#t.hash=t,this}withAuth(t){if(e(t)){this.#t.auth=t;const r=o(t);this.#t.username=r.username,this.#t.password=r.password}else this.#t.username=t.username,this.#t.password=t.password,this.#t.auth=`${t.username}:${t.password}`;return this}withQuery(t){return this.#t.queryParams={},this.addQueryParam(t),this}addQueryParam(t){if(e(t)){const r=d(t);for(const s of Object.entries(r))s[0]&&(this.#t.queryParams[s[0]]=this.parseQueryParamValue(s[1]))}else if(Array.isArray(t)&&t.length===2)this.#t.queryParams[t[0]]=this.parseQueryParamValue(t[1]);else for(const r of Object.entries(t))r[0]&&(this.#t.queryParams[r[0]]=this.parseQueryParamValue(r[1]));return this}build(){return this.#t}toString(){return h(l(this.#t))}toEncoded(){return p(this.toString())}parseQueryParamValue(t){if(Array.isArray(t)){const r=[];for(const s of t)r.push(this.parseQueryParamValue(s));return r}return a.parse(t)}}