quasiurl 1.0.2 → 1.1.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Alexander Tkačenko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.js

@@ -1,26 +1,82 @@
 // index.ts
 var QuasiURL = class {
-  hash;
-  hostname;
-  href;
-  origin;
-  pathname;
-  protocol;
-  search;
+  _protocol = "";
+  _hostname = "";
+  _port = "";
+  _pathname = "";
+  _search = "";
+  _hash = "";
   constructor(url) {
-    let head = url.match(/^((\w+:)?\/\/([^/]+))(\/.*|$)/);
-    let tail = url.match(/(\?[^#]+)(#.+)?$/);
-    let origin = head?.[1] ?? "";
-    let pathname = url.replace(/^((\w+:)?\/\/[^/]+)/, "").replace(/\?.*$/, "").replace(/#.*$/, "");
-    let search = tail?.[1] ?? "";
-    let hash = tail?.[2] ?? "";
-    this.origin = origin;
-    this.pathname = pathname;
-    this.search = search;
-    this.hash = hash;
-    this.href = `${origin}${pathname}${search}${hash}`;
-    this.hostname = head?.[3] ?? "";
+    this.href = url;
+  }
+  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;

package/dist/tests.js

@@ -1,26 +1,82 @@
 // index.ts
 var QuasiURL = class {
-  hash;
-  hostname;
-  href;
-  origin;
-  pathname;
-  protocol;
-  search;
+  _protocol = "";
+  _hostname = "";
+  _port = "";
+  _pathname = "";
+  _search = "";
+  _hash = "";
   constructor(url2) {
-    let head = url2.match(/^((\w+:)?\/\/([^/]+))(\/.*|$)/);
-    let tail = url2.match(/(\?[^#]+)(#.+)?$/);
-    let origin = head?.[1] ?? "";
-    let pathname = url2.replace(/^((\w+:)?\/\/[^/]+)/, "").replace(/\?.*$/, "").replace(/#.*$/, "");
-    let search = tail?.[1] ?? "";
-    let hash = tail?.[2] ?? "";
-    this.origin = origin;
-    this.pathname = pathname;
-    this.search = search;
-    this.hash = hash;
-    this.href = `${origin}${pathname}${search}${hash}`;
-    this.hostname = head?.[3] ?? "";
+    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;
@@ -52,6 +108,43 @@ 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");
@@ -68,6 +161,24 @@ 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}");
@@ -91,37 +202,78 @@ 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.pathname === "/");
 assert(url.search === "");
 assert(url.hash === "");
-assert(url.href === "https://a.aa");
+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.pathname === "/");
 assert(url.search === "");
 assert(url.hash === "");
-assert(url.href === "");
+assert(url.href === "/");
 assert(url.hostname === "");
 assert(url.protocol === "");
 url = createQuasiURL("?x=321&y=567#start");
 assert(url.origin === "");
-assert(url.pathname === "");
+assert(url.pathname === "/");
 assert(url.search === "?x=321&y=567");
 assert(url.hash === "#start");
-assert(url.href === "?x=321&y=567#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.pathname === "/x/y");
 assert(url.search === "?a=1");
 assert(url.hash === "");
-assert(url.href === "x/y?a=1");
+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/index.ts

@@ -4,34 +4,87 @@
  * - preserves templating characters without URL-encoding them.
  */
 export class QuasiURL {
-  hash: string;
-  hostname: string;
-  href: string;
-  origin: string;
-  pathname: string;
-  protocol: string;
-  search: string;
-
+  _protocol = "";
+  _hostname = "";
+  _port = "";
+  _pathname = "";
+  _search = "";
+  _hash = "";
   constructor(url: string) {
-    let head = url.match(/^((\w+:)?\/\/([^/]+))(\/.*|$)/);
-    let tail = url.match(/(\?[^#]+)(#.+)?$/);
+    this.href = url;
+  }
+  get href() {
+    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 = head?.[1] ?? "";
-    let pathname = url
-      .replace(/^((\w+:)?\/\/[^/]+)/, "")
+    this.protocol = head?.[2] ?? "";
+    this.hostname = head?.[3] ?? "";
+    this.port = head?.[5] ?? "";
+    this.pathname = value
+      .replace(/^(\w+:)?\/\/[^/:]+(:\d+)?/, "")
       .replace(/\?.*$/, "")
       .replace(/#.*$/, "");
-    let search = tail?.[1] ?? "";
-    let hash = tail?.[2] ?? "";
-
-    this.origin = origin;
-    this.pathname = pathname;
-    this.search = search;
-    this.hash = hash;
-
-    this.href = `${origin}${pathname}${search}${hash}`;
-    this.hostname = head?.[3] ?? "";
-    this.protocol = head?.[2] ?? "";
+    this.search = tail?.[1] ?? "";
+    this.hash = tail?.[2] ?? "";
+  }
+  get protocol() {
+    return this._protocol;
+  }
+  set protocol(value: string) {
+    if (!value || /^\w+:$/.test(value)) this._protocol = value;
+  }
+  get hostname() {
+    return this._hostname;
+  }
+  set hostname(value: string) {
+    if (!value.includes("/")) this._hostname = value;
+  }
+  get port(): string {
+    return this._port;
+  }
+  set port(value: string | number) {
+    let s = String(value);
+    if (!s || /^\d+$/.test(s)) this._port = s;
+  }
+  get host() {
+    return `${this.hostname}${this.port ? `:${this.port}` : ""}`;
+  }
+  set host(value: string) {
+    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: string) {
+    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: string) {
+    this._pathname = value;
+  }
+  get search(): string {
+    return this._search && `?${this._search}`;
+  }
+  set search(value: string | URLSearchParams) {
+    let s = String(value);
+    this._search = s.startsWith("?") ? s.slice(1) : s;
+  }
+  get hash() {
+    return this._hash && `#${this._hash}`;
+  }
+  set hash(value: string) {
+    this._hash = value.startsWith("#") ? value.slice(1) : value;
   }
   toString() {
     return this.href;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasiurl",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "URL for templating",
   "type": "module",
   "main": "dist/index.js",
@@ -16,7 +16,7 @@
     "typecheck": "tsc --noEmit"
   },
   "author": "axtk",
-  "license": "ISC",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git://github.com/t8js/quasiurl.git"

package/tests.ts

@@ -29,6 +29,51 @@ 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 === "");
@@ -49,6 +94,28 @@ 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");
@@ -77,45 +144,94 @@ 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.pathname === "/");
 assert(url.search === "");
 assert(url.hash === "");
-assert(url.href === "https://a.aa");
+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.pathname === "/");
 assert(url.search === "");
 assert(url.hash === "");
-assert(url.href === "");
+assert(url.href === "/");
 assert(url.hostname === "");
 assert(url.protocol === "");
 
 url = createQuasiURL("?x=321&y=567#start");
 
 assert(url.origin === "");
-assert(url.pathname === "");
+assert(url.pathname === "/");
 assert(url.search === "?x=321&y=567");
 assert(url.hash === "#start");
-assert(url.href === "?x=321&y=567#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.pathname === "/x/y");
 assert(url.search === "?a=1");
 assert(url.hash === "");
-assert(url.href === "x/y?a=1");
+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 === "");