tldts-icann 7.3.0 → 7.4.0

package/README.md

@@ -50,6 +50,7 @@ Alternatively, you can try it _directly in your browser_ here: https://npm.runki
 - `tldts.parse(url | hostname, options)`
 - `tldts.getHostname(url | hostname, options)`
 - `tldts.getDomain(url | hostname, options)`
+- `tldts.getFullDomain(url | hostname, options)`
 - `tldts.getPublicSuffix(url | hostname, options)`
 - `tldts.getSubdomain(url, | hostname, options)`
 - `tldts.getDomainWithoutSuffix(url | hostname, options)`
@@ -190,6 +191,27 @@ getDomain('fr.t.co'); // returns `t.co`
 getDomain('https://user:password@example.co.uk:8080/some/path?and&query#hash'); // returns `example.co.uk`
 ```
 
+### getFullDomain(url | hostname, options?)
+
+Returns the full domain — the subdomain together with the registrable domain (as
+returned by `getDomain(...)`), i.e. the whole hostname _including_ any subdomain —
+or `null` when the input has no registrable domain (IP address, single label,
+bare public suffix, …). The result is the normalized hostname (lower-cased,
+trailing dot stripped); it is not a DNS-absolute name (no trailing root dot) and
+no IDNA/punycode conversion is performed.
+
+```javascript
+const { getFullDomain } = require('tldts-icann');
+
+getFullDomain('google.com'); // returns `google.com`
+getFullDomain('fr.google.com'); // returns `fr.google.com`
+getFullDomain('foo.google.co.uk'); // returns `foo.google.co.uk`
+getFullDomain('t.co'); // returns `t.co`
+getFullDomain('fr.t.co'); // returns `fr.t.co`
+getFullDomain('1.2.3.4'); // returns null (no registrable domain)
+getFullDomain('localhost'); // returns null
+```
+
 ### getDomainWithoutSuffix(url | hostname, options?)
 
 Returns the domain (as returned by `getDomain(...)`) without the public suffix part.

package/dist/cjs/index.js

@@ -431,7 +431,10 @@ function extractHostname(url, urlIsValidHostname, validate = false) {
                     else if (code < 48 || code > 57) {
                         // < 64 and not a delimiter/dot/digit => only '-' (45) is a valid
                         // host char here; everything else (space, %, !, etc.) is invalid.
-                        if (code !== 45) {
+                        // A '-' must also not START a label (the byte right after a '.') —
+                        // mirrors is-valid.ts; the first label is covered by the first-char
+                        // rule above. (RFC 1034 §3.5 / RFC 1035 §2.3.1 LDH.)
+                        if (code !== 45 || vLastCode === 46 /* label-leading '-' */) {
                             vValid = false;
                         }
                     }
@@ -711,8 +714,14 @@ function isValidHostname (hostname) {
             }
             lastDotIndex = i;
         }
-        else if (!( /*@__INLINE__*/(isValidAscii(code) || code === 45 || code === 95))) {
-            // Check if there is a forbidden character in the label
+        else if (
+        // A forbidden character in the label...
+        !( /*@__INLINE__*/(isValidAscii(code) || code === 45 || code === 95)) ||
+            // ...or a '-' starting a label (the byte right after a '.'). A label must
+            // not begin with a hyphen (RFC 1034 §3.5 / RFC 1035 §2.3.1 LDH, as amended
+            // by RFC 1123 §2.1; cf. UTS #46 CheckHyphens). The first label is covered by
+            // the leading-character guard above; mirrors the trailing-'-' rule below.
+            (code === 45 && lastCharCode === 46)) {
             return false;
         }
         lastCharCode = code;
@@ -1125,6 +1134,14 @@ function getDomain(url, options) {
     /*@__INLINE__*/ resetResult(RESULT);
     return parseImpl(url, 3 /* FLAG.DOMAIN */, suffixLookup, options, RESULT).domain;
 }
+function getFullDomain(url, options) {
+    /*@__INLINE__*/ resetResult(RESULT);
+    const result = parseImpl(url, 3 /* FLAG.DOMAIN */, suffixLookup, options, RESULT);
+    // The hostname *is* the full domain (subdomain + domain) whenever a
+    // registrable domain exists; gate on `domain` so non-registrable inputs
+    // (IPs, suffix-less or invalid hostnames) return `null` like `getDomain`.
+    return result.domain === null ? null : result.hostname;
+}
 function getSubdomain(url, options) {
     /*@__INLINE__*/ resetResult(RESULT);
     return parseImpl(url, 4 /* FLAG.SUB_DOMAIN */, suffixLookup, options, RESULT)
@@ -1138,6 +1155,7 @@ function getDomainWithoutSuffix(url, options) {
 
 exports.getDomain = getDomain;
 exports.getDomainWithoutSuffix = getDomainWithoutSuffix;
+exports.getFullDomain = getFullDomain;
 exports.getHostname = getHostname;
 exports.getPublicSuffix = getPublicSuffix;
 exports.getSubdomain = getSubdomain;