tstyche 6.0.0 → 6.0.2

package/README.md

@@ -100,4 +100,4 @@ Visit [tstyche.org](https://tstyche.org) to view the full documentation.
 [coverage-badge]: https://badgen.net/codacy/coverage/a581ca5c323a455886b7bdd9623c4ec8
 [coverage-url]: https://app.codacy.com/gh/tstyche/tstyche/coverage/dashboard
 [starter-badge]: https://developer.stackblitz.com/img/open_in_stackblitz.svg
-[starter-url]: https://stackblitz.com/fork/github/tstyche/tstyche-starter?file=README.md&title=TSTyche%20Starter%20Project&view=editor
+[starter-url]: https://tstyche.org/new

package/dist/tstyche.js

@@ -4587,9 +4587,6 @@ function getTargetSymbol(symbol, compiler) {
 function isCheckFlagSet(symbol, flag, compiler) {
     return !!(symbol.flags & compiler.SymbolFlags.Transient && symbol.links.checkFlags & flag);
 }
-function isSymbolFromDefaultLibrary(symbol, program) {
-    return !!symbol.declarations?.every((declaration) => program.isSourceFileDefaultLibrary(declaration.getSourceFile()));
-}
 
 function getParameterFactsFromTuple(type, position, compiler) {
     return {
@@ -4659,31 +4656,15 @@ function isReadonlyProperty(symbol, compiler) {
         (symbol.flags & compiler.SymbolFlags.Accessor && !(symbol.flags & compiler.SymbolFlags.SetAccessor)));
 }
 
-class SeenService {
-    #cache = new Map();
-    memoized(a, b, compare) {
-        const key = [a.id, b.id].sort().join(":");
-        const result = this.#cache.get(key);
-        if (result !== undefined) {
-            return result !== 2;
-        }
-        this.#cache.set(key, 0);
-        const isSame = compare();
-        this.#cache.set(key, isSame ? 1 : 2);
-        return isSame;
-    }
-}
-
 class Structure {
     #compiler;
     #compilerOptions;
-    #program;
-    #seen = new SeenService();
     #typeChecker;
+    #deduplicateCache = new WeakMap();
+    #memoizeCache = new Map();
     constructor(compiler, program) {
         this.#compiler = compiler;
         this.#compilerOptions = program.getCompilerOptions();
-        this.#program = program;
         this.#typeChecker = program.getTypeChecker();
     }
     #compareMaybeNullish(a, b) {
@@ -4717,7 +4698,7 @@ class Structure {
                 return false;
             }
             if ((a.flags & b.flags) | this.#compiler.TypeFlags.StructuredType) {
-                return this.#seen.memoized(a, b, () => this.compareStructuredTypes(a, b));
+                return this.#memoize(a, b, () => this.compareStructuredTypes(a, b));
             }
             return false;
         }
@@ -4729,7 +4710,7 @@ class Structure {
         }
         if ((a.flags | b.flags) & this.#compiler.TypeFlags.Object) {
             if (a.flags & b.flags & this.#compiler.TypeFlags.Object) {
-                return this.#seen.memoized(a, b, () => this.compareObjects(a, b));
+                return this.#memoize(a, b, () => this.compareObjects(a, b));
             }
             return false;
         }
@@ -4778,22 +4759,25 @@ class Structure {
         return false;
     }
     compareIntersections(a, b) {
-        if (a.types.length !== b.types.length) {
+        const aTypes = this.#deduplicate(a);
+        const bTypes = this.#deduplicate(b);
+        if (aTypes.length !== bTypes.length) {
             return false;
         }
-        return a.types.every((aType, i) => this.compare(aType, b.types[i]));
+        return aTypes.every((aType, i) => this.compare(aType, bTypes[i]));
     }
     compareUnions(a, b) {
-        if (a.types.length !== b.types.length) {
+        const aTypes = this.#deduplicate(a);
+        const bTypes = this.#deduplicate(b);
+        if (aTypes.length !== bTypes.length) {
             return false;
         }
-        return a.types.every((aType) => b.types.some((bType) => this.compare(aType, bType)));
+        return aTypes.every((aType) => bTypes.some((bType) => this.compare(aType, bType)));
     }
     compareObjects(a, b) {
         if (a.objectFlags & b.objectFlags & this.#compiler.ObjectFlags.Reference) {
-            const isSame = this.compareTypeReferences(a, b);
-            if (isSame != null) {
-                return isSame;
+            if (!((a.objectFlags | b.objectFlags) & this.#compiler.ObjectFlags.ClassOrInterface)) {
+                return this.compareTypeReferences(a, b);
             }
         }
         return this.compareStructuredTypes(a, b);
@@ -4805,21 +4789,20 @@ class Structure {
             }
             return false;
         }
-        if ((a.objectFlags | b.objectFlags) & this.#compiler.ObjectFlags.Class) {
+        if (!this.compare(a.target, b.target)) {
             return this.compareStructuredTypes(a, b);
         }
-        if (a.symbol !== b.symbol) {
-            if (isSymbolFromDefaultLibrary(a.symbol, this.#program) || isSymbolFromDefaultLibrary(b.symbol, this.#program)) {
-                return false;
-            }
-            return;
-        }
         const aTypeArguments = this.#typeChecker.getTypeArguments(a);
         const bTypeArguments = this.#typeChecker.getTypeArguments(b);
         if (aTypeArguments.length !== bTypeArguments.length) {
             return false;
         }
-        return aTypeArguments.every((type, i) => this.compare(type, bTypeArguments[i]));
+        for (let i = 0; i < aTypeArguments.length; i++) {
+            if (!this.compare(aTypeArguments[i], bTypeArguments[i])) {
+                return false;
+            }
+        }
+        return true;
     }
     compareTuples(a, b) {
         if (a.target.readonly !== b.target.readonly) {
@@ -5044,14 +5027,39 @@ class Structure {
         }
         return true;
     }
+    #deduplicate(target) {
+        let result = this.#deduplicateCache.get(target);
+        if (result) {
+            return result;
+        }
+        result = target.types.slice(0, 1);
+        for (let i = 1; i < target.types.length; i++) {
+            if (!result.some((existing) => this.compare(existing, target.types[i]))) {
+                result.push(target.types[i]);
+            }
+        }
+        this.#deduplicateCache.set(target, result);
+        return result;
+    }
+    #memoize(a, b, compare) {
+        const key = [a.id, b.id].sort().join(":");
+        const result = this.#memoizeCache.get(key);
+        if (result !== undefined) {
+            return result !== 2;
+        }
+        this.#memoizeCache.set(key, 0);
+        const isSame = compare();
+        this.#memoizeCache.set(key, isSame ? 1 : 2);
+        return isSame;
+    }
     #normalize(type) {
         if (type.flags & this.#compiler.TypeFlags.Freshable && type.freshType === type) {
             return type.regularType;
         }
         if (type.flags & this.#compiler.TypeFlags.UnionOrIntersection) {
-            const candidateType = type.types[0];
-            if (type.types.every((t) => this.compare(t, candidateType))) {
-                return candidateType;
+            const parts = this.#deduplicate(type);
+            if (parts.length === 1) {
+                return parts.at(0);
             }
         }
         return type;
@@ -5912,7 +5920,7 @@ class FileRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "6.0.0";
+    static version = "6.0.2";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "Everything You Need for Type Testing.",
   "keywords": [
     "typescript",