jsdomain-parser 1.0.6 → 1.0.8

package/dist/jsdomain-parser.esm.js

@@ -1,3 +1,19 @@
+const parseUrl = (url) => {
+  if (!url) throw new Error("Invalid domain name");
+
+  const haveProtocol = /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(url);
+  if (!haveProtocol) url = `http://${url}`;
+  const urlObject = new URL(url);
+
+  // check for hostname validity
+  if (urlObject.hostname.split(".").findIndex((it) => it.trim() == "") >= 0)
+    throw new Error("Invalid domain name");
+
+  return urlObject;
+};
+
+var parseUrl_1 = parseUrl;
+
 var icann = {
 	ac: 1,
 	"com.ac": 2,
@@ -9777,6 +9793,7 @@ var tlds$1 = {
 	"meinforum.net": 2,
 	"affinitylottery.org.uk": 3,
 	"raffleentry.org.uk": 3,
+	localhost: 1,
 	"weeklylottery.org.uk": 3
 }
 };
@@ -9793,7 +9810,7 @@ function getCjsExportFromNamespace (n) {
 
 var tlds = getCjsExportFromNamespace(tlds$2);
 
-const parseTld = (hostname, options = {}) => {
+const parseTld = (url, options = {}) => {
   const {
     allowUnknown = false,
     allowPrivate = true,
@@ -9804,6 +9821,12 @@ const parseTld = (hostname, options = {}) => {
     throw new Error("customTlds must be an array");
   }
 
+  const { hostname } = parseUrl_1(url);
+
+  // handle localhost as a special case
+  if (hostname == "localhost" && allowPrivate)
+    return { name: "localhost", length: 1, parts: ["localhost"] };
+
   const parts = hostname.split(".");
 
   const customTlds = extendedTlds.map((tld) => [tld, tld.split(".").length]);
@@ -9833,7 +9856,10 @@ const parseTld = (hostname, options = {}) => {
     }
   }
 
-  if (detected.length == 0) {
+  // handle case where hostname is an IP address
+  const isIP = /^\d{1,3}(\.\d{1,3}){3}$/.test(hostname);
+
+  if (detected.length == 0 && !isIP) {
     throw new Error(
       "Could not detect TLD. You can set allowUnknown to true for allowing unknown TLDs."
     );
@@ -9850,17 +9876,29 @@ var parseTld_1 = parseTld;
 
 function parse(url, options = {}) {
   try {
-    if (!url.startsWith("http")) url = `http://${url}`;
-    const urlObject = new URL(url);
+    const urlObject = parseUrl_1(url);
 
-    const tldData = parseTld_1(urlObject.hostname, options);
+    if (
+      urlObject.hostname.split(".").filter((i) => i.trim()).length <= 1 &&
+      urlObject.hostname !== "localhost"
+    ) {
+      throw new Error(
+        `Invalid domain name: "${urlObject.hostname}" is not a valid domain.`
+      );
+    }
+
+    const tldData = parseTld_1(url, options);
 
     let domain = urlObject.hostname;
     const hostnameParts = urlObject.hostname.split(".");
     for (let i = hostnameParts.length - 1; i >= 0; i--) {
       const extended = hostnameParts.slice(i);
+
       if (extended.join(".") === tldData.name) {
-        domain = hostnameParts[i - 1] + "." + extended.join(".");
+        if (hostnameParts[i - 1]) {
+          domain = hostnameParts[i - 1] + "." + extended.join(".");
+        }
+
         break;
       }
     }
@@ -9870,29 +9908,36 @@ function parse(url, options = {}) {
       query[key] = value;
     }
 
+    let urlData = {
+      domain: domain,
+      origin: urlObject.origin,
+      protocol: urlObject.protocol,
+      host: urlObject.host,
+      hostname: urlObject.hostname,
+      port: urlObject.port,
+      pathname: urlObject.pathname,
+      search: urlObject.search,
+      hash: urlObject.hash,
+      query,
+    };
+
+    // handle for protocols that aren't supported by URL constructor
+    if (urlObject.origin === "null") {
+      urlData.origin = urlObject.protocol + "//" + urlObject.hostname;
+    }
+
     return {
       tld: tldData,
-      url: {
-        domain: domain,
-        origin: urlObject.origin,
-        protocol: urlObject.protocol,
-        host: urlObject.host,
-        hostname: urlObject.hostname,
-        port: urlObject.port,
-        pathname: urlObject.pathname,
-        search: urlObject.search,
-        hash: urlObject.hash,
-        query,
-      },
+      url: urlData,
     };
   } catch (e) {
-    throw new Error(`Invalid URL: ${e}`);
+    throw new Error(`Invalid URL: ${e.message}`);
   }
 }
 
-console.log(parse("google.co.in"));
-
-var jsdomainParser = { parse, parseTld: parseTld_1 };
+var parse_1 = parse;
+
+var jsdomainParser = { parse: parse_1, parseTld: parseTld_1 };
 var jsdomainParser_1 = jsdomainParser.parse;
 var jsdomainParser_2 = jsdomainParser.parseTld;