tstyche 6.0.0-beta.4 → 6.0.0-beta.6

package/dist/tstyche.js

@@ -4550,8 +4550,9 @@ class ToAcceptProps {
     }
 }
 
-function ensureArray(input) {
-    return input ?? [];
+function containsInstantiableType(target, compiler) {
+    return ("types" in target &&
+        target.types.some((type) => type.flags & compiler.TypeFlags.InstantiableNonPrimitive));
 }
 function getIndexSignatures(type, compiler, typeChecker) {
     if (type.flags & compiler.TypeFlags.Intersection) {
@@ -4565,6 +4566,12 @@ function getSignatures(type, kind, compiler, typeChecker) {
     }
     return typeChecker.getSignaturesOfType(type, kind);
 }
+function getThisTypeOfSignature(signature, typeChecker) {
+    return signature.thisParameter && typeChecker.getTypeOfSymbol(signature.thisParameter);
+}
+function getTypeParametersOfSignature(signature) {
+    return signature.typeParameters ?? [];
+}
 function getTypeParameterModifiers(typeParameter, compiler) {
     if (!typeParameter.symbol.declarations) {
         return compiler.ModifierFlags.None;
@@ -4583,9 +4590,6 @@ function isCheckFlagSet(symbol, flag, compiler) {
 function isSymbolFromDefaultLibrary(symbol, program) {
     return !!symbol.declarations?.every((declaration) => program.isSourceFileDefaultLibrary(declaration.getSourceFile()));
 }
-function length(array) {
-    return array?.length ?? 0;
-}
 
 function getParameterFactsFromTuple(type, position, compiler) {
     return {
@@ -4688,11 +4692,6 @@ class Structure {
         }
         return !a && !b;
     }
-    #compareTypeOfSymbol(a, b) {
-        const aTypeOfSymbol = a && this.#typeChecker.getTypeOfSymbol(a);
-        const bTypeOfSymbol = b && this.#typeChecker.getTypeOfSymbol(b);
-        return this.#compareMaybeNullish(aTypeOfSymbol, bTypeOfSymbol);
-    }
     compare(a, b) {
         a = this.#normalize(a);
         b = this.#normalize(b);
@@ -4709,10 +4708,18 @@ class Structure {
             return !!(b.flags & this.#compiler.TypeFlags.Undefined);
         }
         if ((a.flags | b.flags) & this.#compiler.TypeFlags.Intersection) {
-            return (((a.flags & b.flags & this.#compiler.TypeFlags.Intersection) !== 0 &&
-                this.compareIntersections(a, b)) ||
-                (((a.flags & b.flags) | this.#compiler.TypeFlags.StructuredType) !== 0 &&
-                    this.#seen.memoized(a, b, () => this.compareStructuredTypes(a, b))));
+            if (a.flags & b.flags & this.#compiler.TypeFlags.Intersection) {
+                if (this.compareIntersections(a, b)) {
+                    return true;
+                }
+            }
+            if (containsInstantiableType(a, this.#compiler) || containsInstantiableType(b, this.#compiler)) {
+                return false;
+            }
+            if ((a.flags & b.flags) | this.#compiler.TypeFlags.StructuredType) {
+                return this.#seen.memoized(a, b, () => this.compareStructuredTypes(a, b));
+            }
+            return false;
         }
         if ((a.flags | b.flags) & this.#compiler.TypeFlags.Union) {
             if (a.flags & b.flags & this.#compiler.TypeFlags.Union) {
@@ -4762,6 +4769,12 @@ class Structure {
             }
             return false;
         }
+        if ((a.flags | b.flags) & this.#compiler.TypeFlags.StringMapping) {
+            if (a.flags & b.flags & this.#compiler.TypeFlags.StringMapping) {
+                return this.compareStringMappingTypes(a, b);
+            }
+            return false;
+        }
         return false;
     }
     compareIntersections(a, b) {
@@ -4795,16 +4808,18 @@ class Structure {
         if ((a.objectFlags | b.objectFlags) & this.#compiler.ObjectFlags.Class) {
             return this.compareStructuredTypes(a, b);
         }
-        if (!this.#compareTypeOfSymbol(a.symbol, b.symbol)) {
+        if (a.symbol !== b.symbol) {
             if (isSymbolFromDefaultLibrary(a.symbol, this.#program) || isSymbolFromDefaultLibrary(b.symbol, this.#program)) {
                 return false;
             }
             return;
         }
-        if (length(a.typeArguments) !== length(b.typeArguments)) {
+        const aTypeArguments = this.#typeChecker.getTypeArguments(a);
+        const bTypeArguments = this.#typeChecker.getTypeArguments(b);
+        if (aTypeArguments.length !== bTypeArguments.length) {
             return false;
         }
-        return ensureArray(a.typeArguments).every((type, i) => this.compare(type, ensureArray(b.typeArguments)[i]));
+        return aTypeArguments.every((type, i) => this.compare(type, bTypeArguments[i]));
     }
     compareTuples(a, b) {
         if (a.target.readonly !== b.target.readonly) {
@@ -4812,7 +4827,7 @@ class Structure {
         }
         const aTypeArguments = this.#typeChecker.getTypeArguments(a);
         const bTypeArguments = this.#typeChecker.getTypeArguments(b);
-        if (length(aTypeArguments) !== length(bTypeArguments)) {
+        if (aTypeArguments.length !== bTypeArguments.length) {
             return false;
         }
         for (let i = 0; i < aTypeArguments.length; i++) {
@@ -4894,17 +4909,17 @@ class Structure {
         return true;
     }
     #compareSignature(a, b) {
-        if (length(a.typeParameters) !== length(b.typeParameters)) {
+        const aTypeParameters = getTypeParametersOfSignature(a);
+        const bTypeParameters = getTypeParametersOfSignature(b);
+        if (aTypeParameters.length !== bTypeParameters.length) {
             return false;
         }
-        if (a.typeParameters != null && b.typeParameters != null) {
-            for (let i = 0; i < a.typeParameters.length; i++) {
-                if (!this.compareTypeParameters(a.typeParameters[i], b.typeParameters[i])) {
-                    return false;
-                }
+        for (let i = 0; i < aTypeParameters.length; i++) {
+            if (!this.compareTypeParameters(aTypeParameters[i], bTypeParameters[i])) {
+                return false;
             }
         }
-        if (!this.#compareTypeOfSymbol(a.thisParameter, b.thisParameter)) {
+        if (!this.#compareMaybeNullish(getThisTypeOfSignature(a, this.#typeChecker), getThisTypeOfSignature(b, this.#typeChecker))) {
             return false;
         }
         if (!this.compareParameters(a, b)) {
@@ -5020,6 +5035,15 @@ class Structure {
         }
         return true;
     }
+    compareStringMappingTypes(a, b) {
+        if (a.symbol !== b.symbol) {
+            return false;
+        }
+        if (!this.compare(a.type, b.type)) {
+            return false;
+        }
+        return true;
+    }
     #normalize(type) {
         if (type.flags & this.#compiler.TypeFlags.Freshable && type.freshType === type) {
             return type.regularType;
@@ -5888,7 +5912,7 @@ class FileRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "6.0.0-beta.4";
+    static version = "6.0.0-beta.6";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }

package/package.json

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