tldts-experimental 7.0.32 → 7.1.0

package/dist/cjs/index.js

@@ -440,11 +440,16 @@ function parseImpl(url, step, suffixLookup, partialOptions, result) {
     // set to `false` to speed-up parsing. If only URLs are expected then
     // `mixedInputs` can be set to `false`. The `mixedInputs` is only a hint
     // and will not change the behavior of the library.
+    // Whether `url` itself was already a valid hostname (only computed on the
+    // mixedInputs path). Lets us skip the post-extraction validation below when
+    // extractHostname returned `url` unchanged (same reference).
+    let urlIsValid = false;
     if (!options.extractHostname) {
         result.hostname = url;
     }
     else if (options.mixedInputs) {
-        result.hostname = extractHostname(url, isValidHostname(url));
+        urlIsValid = isValidHostname(url);
+        result.hostname = extractHostname(url, urlIsValid);
     }
     else {
         result.hostname = extractHostname(url, false);
@@ -463,6 +468,9 @@ function parseImpl(url, step, suffixLookup, partialOptions, result) {
     if (options.validateHostname &&
         options.extractHostname &&
         result.hostname !== null &&
+        // Skip the re-scan when `url` was already validated and extractHostname
+        // returned it unchanged (same reference => identical string, still valid).
+        !(urlIsValid && result.hostname === url) &&
         !isValidHostname(result.hostname)) {
         result.hostname = null;
         return result;
@@ -759,11 +767,22 @@ function suffixLookup(hostname, options, out) {
             out.publicSuffix = hostname.slice(BUFFER[((matchLabels - 1) << 1) + 1]);
             return;
         }
-        const parts = hostname.split('.');
-        while (parts.length > matchLabels) {
-            parts.shift();
+        // matchLabels >= numberOfHashes: the suffix may extend past the labels we
+        // tracked in BUFFER, so locate its start by scanning backward for the
+        // matchLabels-th dot from the end (no array alloc, no O(n^2) shift). Fewer
+        // dots than matchLabels means the whole hostname is the suffix.
+        let suffixStart = 0;
+        let seenDots = 0;
+        for (let i = hostname.length - 1; i >= 0; i -= 1) {
+            if (hostname.charCodeAt(i) === 46 /* '.' */) {
+                seenDots += 1;
+                if (seenDots === matchLabels) {
+                    suffixStart = i + 1;
+                    break;
+                }
+            }
         }
-        out.publicSuffix = parts.join('.');
+        out.publicSuffix = hostname.slice(suffixStart);
         return;
     }
     // if ((matchKind & Result.NORMAL_MATCH) !== 0)
@@ -775,28 +794,28 @@ function suffixLookup(hostname, options, out) {
 // every single time to only return the value of a specific attribute. To avoid
 // this un-necessary allocation, we use a global object which is re-used.
 const RESULT = getEmptyResult();
-function parse(url, options = {}) {
+function parse(url, options) {
     return parseImpl(url, 5 /* FLAG.ALL */, suffixLookup, options, getEmptyResult());
 }
-function getHostname(url, options = {}) {
+function getHostname(url, options) {
     /*@__INLINE__*/ resetResult(RESULT);
     return parseImpl(url, 0 /* FLAG.HOSTNAME */, suffixLookup, options, RESULT).hostname;
 }
-function getPublicSuffix(url, options = {}) {
+function getPublicSuffix(url, options) {
     /*@__INLINE__*/ resetResult(RESULT);
     return parseImpl(url, 2 /* FLAG.PUBLIC_SUFFIX */, suffixLookup, options, RESULT)
         .publicSuffix;
 }
-function getDomain(url, options = {}) {
+function getDomain(url, options) {
     /*@__INLINE__*/ resetResult(RESULT);
     return parseImpl(url, 3 /* FLAG.DOMAIN */, suffixLookup, options, RESULT).domain;
 }
-function getSubdomain(url, options = {}) {
+function getSubdomain(url, options) {
     /*@__INLINE__*/ resetResult(RESULT);
     return parseImpl(url, 4 /* FLAG.SUB_DOMAIN */, suffixLookup, options, RESULT)
         .subdomain;
 }
-function getDomainWithoutSuffix(url, options = {}) {
+function getDomainWithoutSuffix(url, options) {
     /*@__INLINE__*/ resetResult(RESULT);
     return parseImpl(url, 5 /* FLAG.ALL */, suffixLookup, options, RESULT)
         .domainWithoutSuffix;