quasiurl 1.1.0 → 1.1.2

package/dist/index.js

@@ -13,14 +13,12 @@ var QuasiURL = class {
     return `${this.origin}${this.pathname}${this.search}${this.hash}`;
   }
   set href(value) {
-    let head = value.match(/^((\w+:)?\/\/([^/:]+)(:(\d+))?)(\/.*|$)/);
-    let tail = value.match(/(\?[^#]+)?(#.+)?$/);
-    this.protocol = head?.[2] ?? "";
-    this.hostname = head?.[3] ?? "";
-    this.port = head?.[5] ?? "";
-    this.pathname = value.replace(/^(\w+:)?\/\/[^/:]+(:\d+)?/, "").replace(/\?.*$/, "").replace(/#.*$/, "");
-    this.search = tail?.[1] ?? "";
-    this.hash = tail?.[2] ?? "";
+    let origin = value.match(/^(\w+:)?\/\/[^/:]+(:\d+)?/)?.[0] ?? "";
+    let tail = value.slice(origin.length).match(/^([^?#]+)?(\?[^#]+)?(#.+)?$/) ?? [];
+    this.origin = origin;
+    this.pathname = tail[1] ?? "";
+    this.search = tail[2] ?? "";
+    this.hash = tail[3] ?? "";
   }
   get protocol() {
     return this._protocol;

package/index.ts

@@ -17,18 +17,14 @@ export class QuasiURL {
     return `${this.origin}${this.pathname}${this.search}${this.hash}`;
   }
   set href(value: string) {
-    let head = value.match(/^((\w+:)?\/\/([^/:]+)(:(\d+))?)(\/.*|$)/);
-    let tail = value.match(/(\?[^#]+)?(#.+)?$/);
+    let origin = value.match(/^(\w+:)?\/\/[^/:]+(:\d+)?/)?.[0] ?? "";
+    let tail =
+      value.slice(origin.length).match(/^([^?#]+)?(\?[^#]+)?(#.+)?$/) ?? [];
 
-    this.protocol = head?.[2] ?? "";
-    this.hostname = head?.[3] ?? "";
-    this.port = head?.[5] ?? "";
-    this.pathname = value
-      .replace(/^(\w+:)?\/\/[^/:]+(:\d+)?/, "")
-      .replace(/\?.*$/, "")
-      .replace(/#.*$/, "");
-    this.search = tail?.[1] ?? "";
-    this.hash = tail?.[2] ?? "";
+    this.origin = origin;
+    this.pathname = tail[1] ?? "";
+    this.search = tail[2] ?? "";
+    this.hash = tail[3] ?? "";
   }
   get protocol() {
     return this._protocol;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasiurl",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "URL for templating",
   "type": "module",
   "main": "dist/index.js",

package/dist/tests.js

@@ -1,279 +0,0 @@
-// index.ts
-var QuasiURL = class {
-  _protocol = "";
-  _hostname = "";
-  _port = "";
-  _pathname = "";
-  _search = "";
-  _hash = "";
-  constructor(url2) {
-    this.href = url2;
-  }
-  get href() {
-    return `${this.origin}${this.pathname}${this.search}${this.hash}`;
-  }
-  set href(value) {
-    let head = value.match(/^((\w+:)?\/\/([^/:]+)(:(\d+))?)(\/.*|$)/);
-    let tail = value.match(/(\?[^#]+)?(#.+)?$/);
-    this.protocol = head?.[2] ?? "";
-    this.hostname = head?.[3] ?? "";
-    this.port = head?.[5] ?? "";
-    this.pathname = value.replace(/^(\w+:)?\/\/[^/:]+(:\d+)?/, "").replace(/\?.*$/, "").replace(/#.*$/, "");
-    this.search = tail?.[1] ?? "";
-    this.hash = tail?.[2] ?? "";
-  }
-  get protocol() {
-    return this._protocol;
-  }
-  set protocol(value) {
-    if (!value || /^\w+:$/.test(value)) this._protocol = value;
-  }
-  get hostname() {
-    return this._hostname;
-  }
-  set hostname(value) {
-    if (!value.includes("/")) this._hostname = value;
-  }
-  get port() {
-    return this._port;
-  }
-  set port(value) {
-    let s = String(value);
-    if (!s || /^\d+$/.test(s)) this._port = s;
-  }
-  get host() {
-    return `${this.hostname}${this.port ? `:${this.port}` : ""}`;
-  }
-  set host(value) {
-    let [hostname, port = ""] = value.split(":");
-    this.hostname = hostname;
-    this.port = port;
-  }
-  get origin() {
-    if (!this.protocol && !this.host) return "";
-    return `${this.protocol}//${this.host}`;
-  }
-  set origin(value) {
-    let [protocol, host = ""] = value.split("//");
-    this.protocol = protocol;
-    this.host = host;
-  }
-  get pathname() {
-    let p = this._pathname;
-    return `${p.startsWith("/") || p.startsWith("{/") ? "" : "/"}${p}`;
-  }
-  set pathname(value) {
-    this._pathname = value;
-  }
-  get search() {
-    return this._search && `?${this._search}`;
-  }
-  set search(value) {
-    let s = String(value);
-    this._search = s.startsWith("?") ? s.slice(1) : s;
-  }
-  get hash() {
-    return this._hash && `#${this._hash}`;
-  }
-  set hash(value) {
-    this._hash = value.startsWith("#") ? value.slice(1) : value;
-  }
-  toString() {
-    return this.href;
-  }
-};
-
-// tests.ts
-var k = 0;
-function assert(predicate) {
-  let n = `00${++k}`.slice(-3);
-  if (predicate) console.log(n, "passed");
-  else {
-    console.error(n, "failed");
-    console.error();
-    console.error("[!] failed");
-    process.exit(1);
-  }
-}
-function createQuasiURL(url2) {
-  console.log(`
-${JSON.stringify(url2)}`);
-  return new QuasiURL(url2);
-}
-var url = createQuasiURL("/x");
-assert(url.origin === "");
-assert(url.pathname === "/x");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/x");
-assert(url.hostname === "");
-assert(url.protocol === "");
-console.log("\nset pathname");
-url.pathname = "a/b";
-assert(url.origin === "");
-assert(url.pathname === "/a/b");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/a/b");
-assert(url.hostname === "");
-assert(url.protocol === "");
-console.log("\nset origin");
-url.origin = "https://a.aa";
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "/a/b");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa/a/b");
-assert(url.hostname === "a.aa");
-assert(url.protocol === "https:");
-console.log("\nreset origin, set search");
-url.origin = "";
-url.search = "x=1";
-assert(url.origin === "");
-assert(url.pathname === "/a/b");
-assert(url.search === "?x=1");
-assert(url.hash === "");
-assert(url.href === "/a/b?x=1");
-assert(url.hostname === "");
-assert(url.protocol === "");
-console.log("\nset href");
-url.href = "/x#intro";
-assert(url.origin === "");
-assert(url.pathname === "/x");
-assert(url.search === "");
-assert(url.hash === "#intro");
-assert(url.href === "/x#intro");
-assert(url.hostname === "");
-assert(url.protocol === "");
-url = createQuasiURL("/sections/:id");
-assert(url.origin === "");
-assert(url.pathname === "/sections/:id");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/sections/:id");
-assert(url.hostname === "");
-assert(url.protocol === "");
-url = createQuasiURL("/x{/:name}");
-assert(url.origin === "");
-assert(url.pathname === "/x{/:name}");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/x{/:name}");
-assert(url.hostname === "");
-assert(url.protocol === "");
-console.log("\nupdate path template");
-url.pathname = "{/:name}";
-assert(url.origin === "");
-assert(url.pathname === "{/:name}");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "{/:name}");
-assert(url.hostname === "");
-assert(url.protocol === "");
-console.log("\nset origin to path template");
-url.origin = "https://a.aa";
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "{/:name}");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa{/:name}");
-assert(url.hostname === "a.aa");
-assert(url.protocol === "https:");
-url = createQuasiURL("https://a.aa/x{/:name}");
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "/x{/:name}");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa/x{/:name}");
-assert(url.hostname === "a.aa");
-assert(url.protocol === "https:");
-url = createQuasiURL("/x?a=1&b=nnn#start");
-assert(url.origin === "");
-assert(url.pathname === "/x");
-assert(url.search === "?a=1&b=nnn");
-assert(url.hash === "#start");
-assert(url.href === "/x?a=1&b=nnn#start");
-assert(url.hostname === "");
-assert(url.protocol === "");
-url = createQuasiURL("https://a.aa/chapter/1");
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "/chapter/1");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa/chapter/1");
-assert(url.hostname === "a.aa");
-assert(url.host === "a.aa");
-assert(url.port === "");
-assert(url.protocol === "https:");
-console.log("\nset port");
-url.port = 123;
-assert(url.origin === "https://a.aa:123");
-assert(url.pathname === "/chapter/1");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa:123/chapter/1");
-assert(url.hostname === "a.aa");
-assert(url.host === "a.aa:123");
-assert(url.port === "123");
-assert(url.protocol === "https:");
-url = createQuasiURL("https://a.aa:42/chapter/1");
-assert(url.origin === "https://a.aa:42");
-assert(url.pathname === "/chapter/1");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa:42/chapter/1");
-assert(url.hostname === "a.aa");
-assert(url.host === "a.aa:42");
-assert(url.port === "42");
-assert(url.protocol === "https:");
-url = createQuasiURL("https://a.aa");
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "/");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa/");
-assert(url.hostname === "a.aa");
-assert(url.protocol === "https:");
-url = createQuasiURL("");
-assert(url.origin === "");
-assert(url.pathname === "/");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/");
-assert(url.hostname === "");
-assert(url.protocol === "");
-url = createQuasiURL("?x=321&y=567#start");
-assert(url.origin === "");
-assert(url.pathname === "/");
-assert(url.search === "?x=321&y=567");
-assert(url.hash === "#start");
-assert(url.href === "/?x=321&y=567#start");
-assert(url.hostname === "");
-assert(url.protocol === "");
-url = createQuasiURL("x/y?a=1");
-assert(url.origin === "");
-assert(url.pathname === "/x/y");
-assert(url.search === "?a=1");
-assert(url.hash === "");
-assert(url.href === "/x/y?a=1");
-assert(url.hostname === "");
-assert(url.protocol === "");
-console.log("\nURLSearchParams");
-url.search = new URLSearchParams({ n: "m" });
-assert(url.origin === "");
-assert(url.pathname === "/x/y");
-assert(url.search === "?n=m");
-assert(url.hash === "");
-assert(url.href === "/x/y?n=m");
-assert(url.hostname === "");
-assert(url.protocol === "");
-console.log('\n"?" as search');
-url.search = "?";
-assert(url.origin === "");
-assert(url.pathname === "/x/y");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/x/y");
-assert(url.hostname === "");
-assert(url.protocol === "");
-console.log("\npassed");

package/tests.ts

@@ -1,238 +0,0 @@
-import { QuasiURL } from ".";
-
-let k = 0;
-
-function assert(predicate: boolean) {
-  let n = `00${++k}`.slice(-3);
-
-  if (predicate) console.log(n, "passed");
-  else {
-    console.error(n, "failed");
-    console.error();
-    console.error("[!] failed");
-    process.exit(1);
-  }
-}
-
-function createQuasiURL(url: string) {
-  console.log(`\n${JSON.stringify(url)}`);
-  return new QuasiURL(url);
-}
-
-let url = createQuasiURL("/x");
-
-assert(url.origin === "");
-assert(url.pathname === "/x");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/x");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-console.log("\nset pathname");
-url.pathname = "a/b";
-
-assert(url.origin === "");
-assert(url.pathname === "/a/b");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/a/b");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-console.log("\nset origin");
-url.origin = "https://a.aa";
-
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "/a/b");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa/a/b");
-assert(url.hostname === "a.aa");
-assert(url.protocol === "https:");
-
-console.log("\nreset origin, set search");
-url.origin = "";
-url.search = "x=1";
-
-assert(url.origin === "");
-assert(url.pathname === "/a/b");
-assert(url.search === "?x=1");
-assert(url.hash === "");
-assert(url.href === "/a/b?x=1");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-console.log("\nset href");
-url.href = "/x#intro";
-
-assert(url.origin === "");
-assert(url.pathname === "/x");
-assert(url.search === "");
-assert(url.hash === "#intro");
-assert(url.href === "/x#intro");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-url = createQuasiURL("/sections/:id");
-
-assert(url.origin === "");
-assert(url.pathname === "/sections/:id");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/sections/:id");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-url = createQuasiURL("/x{/:name}");
-
-assert(url.origin === "");
-assert(url.pathname === "/x{/:name}");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/x{/:name}");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-console.log("\nupdate path template");
-url.pathname = "{/:name}";
-
-assert(url.origin === "");
-assert(url.pathname === "{/:name}");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "{/:name}");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-console.log("\nset origin to path template");
-url.origin = "https://a.aa";
-
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "{/:name}");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa{/:name}");
-assert(url.hostname === "a.aa");
-assert(url.protocol === "https:");
-
-url = createQuasiURL("https://a.aa/x{/:name}");
-
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "/x{/:name}");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa/x{/:name}");
-assert(url.hostname === "a.aa");
-assert(url.protocol === "https:");
-
-url = createQuasiURL("/x?a=1&b=nnn#start");
-
-assert(url.origin === "");
-assert(url.pathname === "/x");
-assert(url.search === "?a=1&b=nnn");
-assert(url.hash === "#start");
-assert(url.href === "/x?a=1&b=nnn#start");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-url = createQuasiURL("https://a.aa/chapter/1");
-
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "/chapter/1");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa/chapter/1");
-assert(url.hostname === "a.aa");
-assert(url.host === "a.aa");
-assert(url.port === "");
-assert(url.protocol === "https:");
-
-console.log("\nset port");
-url.port = 123;
-
-assert(url.origin === "https://a.aa:123");
-assert(url.pathname === "/chapter/1");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa:123/chapter/1");
-assert(url.hostname === "a.aa");
-assert(url.host === "a.aa:123");
-assert(url.port === "123");
-assert(url.protocol === "https:");
-
-url = createQuasiURL("https://a.aa:42/chapter/1");
-
-assert(url.origin === "https://a.aa:42");
-assert(url.pathname === "/chapter/1");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa:42/chapter/1");
-assert(url.hostname === "a.aa");
-assert(url.host === "a.aa:42");
-assert(url.port === "42");
-assert(url.protocol === "https:");
-
-url = createQuasiURL("https://a.aa");
-
-assert(url.origin === "https://a.aa");
-assert(url.pathname === "/");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "https://a.aa/");
-assert(url.hostname === "a.aa");
-assert(url.protocol === "https:");
-
-url = createQuasiURL("");
-
-assert(url.origin === "");
-assert(url.pathname === "/");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-url = createQuasiURL("?x=321&y=567#start");
-
-assert(url.origin === "");
-assert(url.pathname === "/");
-assert(url.search === "?x=321&y=567");
-assert(url.hash === "#start");
-assert(url.href === "/?x=321&y=567#start");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-url = createQuasiURL("x/y?a=1");
-
-assert(url.origin === "");
-assert(url.pathname === "/x/y");
-assert(url.search === "?a=1");
-assert(url.hash === "");
-assert(url.href === "/x/y?a=1");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-console.log("\nURLSearchParams");
-url.search = new URLSearchParams({ n: "m" });
-
-assert(url.origin === "");
-assert(url.pathname === "/x/y");
-assert(url.search === "?n=m");
-assert(url.hash === "");
-assert(url.href === "/x/y?n=m");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-console.log('\n"?" as search');
-url.search = "?";
-
-assert(url.origin === "");
-assert(url.pathname === "/x/y");
-assert(url.search === "");
-assert(url.hash === "");
-assert(url.href === "/x/y");
-assert(url.hostname === "");
-assert(url.protocol === "");
-
-console.log("\npassed");