Extended tests and fix in wildcard matching from tldts-experimental (#…

…1593)
remusao · Apr 1, 2023 · 5aab0ba · 5aab0ba
1 parent bc3d527
commit 5aab0ba
Show file tree

Hide file tree

Showing 4 changed files with 20,120 additions and 6 deletions.
diff --git a/packages/tldts-experimental/src/packed-hashes.ts b/packages/tldts-experimental/src/packed-hashes.ts
@@ -259,10 +259,16 @@ export default function suffixLookup(
   // was *.com, we would have stored only 'com' in the packed structure and we
   // need to take one extra label on the left.
   if ((matchKind & Result.WILDCARD_MATCH) !== 0) {
-    out.publicSuffix =
-      matchLabels >= numberOfHashes
-        ? hostname
-        : hostname.slice(BUFFER[((matchLabels - 1) << 1) + 1]);
+    if (matchLabels < numberOfHashes) {
+      out.publicSuffix = hostname.slice(BUFFER[((matchLabels - 1) << 1) + 1]);
+      return;
+    }
+
+    const parts = hostname.split('.');
+    while (parts.length > matchLabels) {
+      parts.shift();
+    }
+    out.publicSuffix = parts.join('.');
     return;
   }
 

diff --git a/packages/tldts-experimental/test/publicsuffix.test.ts b/packages/tldts-experimental/test/publicsuffix.test.ts
@@ -4,6 +4,6 @@ import { publicSuffixListTests } from 'tldts-tests';
 
 import * as tld from '../index';
 
-describe('tldts classic', () => {
+describe('tldts experimental', () => {
   publicSuffixListTests(tld.getDomain);
 });
diff --git a/packages/tldts-experimental/test/tld.test.ts b/packages/tldts-experimental/test/tld.test.ts
@@ -4,6 +4,6 @@ import { tldtsTests } from 'tldts-tests';
 
 import * as tld from '../index';
 
-describe('tldts classic', () => {
+describe('tldts experimental', () => {
   tldtsTests(tld);
 });