Fix isPrivate being undefined

remusao · Sep 23, 2018 · 2c33d3b · 2c33d3b
1 parent 9d43b5a
commit 2c33d3b
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 64 deletions.
diff --git a/dist/lib/public-suffix.d.ts b/dist/lib/public-suffix.d.ts
@@ -1,8 +1,3 @@
 import { IOptions } from './options';
-import Trie from './suffix-trie';
-export interface IPublicSuffix {
-    isIcann: boolean;
-    isPrivate: boolean;
-    publicSuffix: string | null;
-}
+import Trie, { IPublicSuffix } from './suffix-trie';
 export default function getPublicSuffix(rules: Trie, hostname: string, options: IOptions): IPublicSuffix;
diff --git a/dist/lib/suffix-trie.d.ts b/dist/lib/suffix-trie.d.ts
@@ -2,6 +2,11 @@ interface IOptions {
     allowIcannDomains: boolean;
     allowPrivateDomains: boolean;
 }
+export interface IPublicSuffix {
+    isIcann: boolean;
+    isPrivate: boolean;
+    publicSuffix: string | null;
+}
 export interface IRule {
     exception: boolean;
     isIcann: boolean;
@@ -16,6 +21,6 @@ export default class SuffixTrie {
     rules: ITrieObject;
     constructor(rules: IRule[]);
     hasTld(value: string): boolean;
-    suffixLookup(hostname: string, options: IOptions): any;
+    suffixLookup(hostname: string, options: IOptions): IPublicSuffix | null;
 }
 export {};
diff --git a/dist/tldts.es.js b/dist/tldts.es.js
diff --git a/dist/tldts.js b/dist/tldts.js
diff --git a/dist/tldts.min.js b/dist/tldts.min.js
diff --git a/lib/public-suffix.ts b/lib/public-suffix.ts
@@ -1,12 +1,6 @@
 import extractTldFromHost from './from-host';
 import { IOptions } from './options';
-import Trie from './suffix-trie';
-
-export interface IPublicSuffix {
-  isIcann: boolean;
-  isPrivate: boolean;
-  publicSuffix: string | null;
-}
+import Trie, { IPublicSuffix } from './suffix-trie';
 
 /**
  * Returns the public suffix (including exact matches)

diff --git a/lib/suffix-trie.ts b/lib/suffix-trie.ts
@@ -6,6 +6,12 @@ interface IOptions {
   allowPrivateDomains: boolean;
 }
 
+export interface IPublicSuffix {
+  isIcann: boolean;
+  isPrivate: boolean;
+  publicSuffix: string | null;
+}
+
 // Flags used to know if a rule is ICANN or Private
 const enum RULE_TYPE {
   ICANN = 1,
@@ -162,7 +168,7 @@ export default class SuffixTrie {
   /**
    * Check if `hostname` has a valid public suffix in `trie`.
    */
-  public suffixLookup(hostname: string, options: IOptions): any {
+  public suffixLookup(hostname: string, options: IOptions): IPublicSuffix | null {
     const allowIcannDomains = options.allowIcannDomains;
     const allowPrivateDomains = options.allowPrivateDomains;
 
@@ -211,12 +217,14 @@ export default class SuffixTrie {
     if (exceptionLookupResult.index !== -1) {
       return {
         isIcann: exceptionLookupResult.isIcann,
+        isPrivate: !exceptionLookupResult.isIcann,
         publicSuffix: hostnameParts.slice(exceptionLookupResult.index + 1).join('.'),
       };
     }
 
     return {
       isIcann: lookupResult.isIcann,
+      isPrivate: !lookupResult.isIcann,
       publicSuffix: hostnameParts.slice(lookupResult.index).join('.'),
     };
   }

diff --git a/tldts.ts b/tldts.ts
@@ -87,8 +87,8 @@ function parseImplFactory(trie: Trie = getRules()) {
     );
 
     result.publicSuffix = publicSuffixResult.publicSuffix;
-    result.isPrivate = publicSuffixResult.isPrivate;
     result.isIcann = publicSuffixResult.isIcann;
+    result.isPrivate = !publicSuffixResult.isIcann;
     if (step === FLAG.PUBLIC_SUFFIX) { return result; }
 
     // Extract domain