tstyche 6.0.0-beta.0 → 6.0.0-beta.2

package/build/tstyche.d.ts

@@ -158,7 +158,6 @@ interface ConfigFileOptions {
     checkSuppressedErrors?: boolean;
     failFast?: boolean;
     fixtureFileMatch?: Array<string>;
-    legacyToBe?: boolean;
     plugins?: Array<string>;
     rejectAnyType?: boolean;
     rejectNeverType?: boolean;
@@ -720,9 +719,7 @@ declare class Store {
     #private;
     static manifest: Manifest | undefined;
     static fetch(tag: string): Promise<void>;
-    static load(tag: string, options?: {
-        notPatched?: boolean;
-    }): Promise<typeof ts | undefined>;
+    static load(tag: string): Promise<typeof ts | undefined>;
     static open(): Promise<void>;
     static prune(): Promise<void>;
     static update(): Promise<void>;

package/build/tstyche.js

@@ -1,11 +1,9 @@
 import { writeFileSync, rmSync, existsSync, watch } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import os from 'node:os';
 import process from 'node:process';
-import { createRequire } from 'node:module';
-import vm from 'node:vm';
 
 class EventEmitter {
     static instanceCount = 0;
@@ -397,9 +395,9 @@ class ConfigDiagnosticText {
     }
     static rangeUsage() {
         return [
-            "A range must be specified using an operator and a minor version: '>=5.5'.",
-            "To set an upper bound, use the intersection of two ranges: '>=5.0 <5.3'.",
-            "Use the '||' operator to join ranges into a union: '>=5.2 <=5.3 || 5.4.2 || >5.5'.",
+            "A range must be specified using an operator and a minor version: '>=5.8'.",
+            "To set an upper bound, use the intersection of two ranges: '>=5.4 <5.6'.",
+            "Use the '||' operator to join ranges into a union: '>=5.4 <5.6 || 5.6.2 || >=5.8'.",
         ];
     }
     static seen(element) {
@@ -731,7 +729,7 @@ class ManifestService {
         const versions = [];
         const packageMetadata = (await response.json());
         for (const [tag, meta] of Object.entries(packageMetadata.versions)) {
-            if (!tag.includes("-") && Version.isSatisfiedWith(tag, "5.0.2")) {
+            if (!tag.includes("-") && Version.isSatisfiedWith(tag, "5.4.2")) {
                 versions.push(tag);
                 packages[tag] = { integrity: meta.dist.integrity, tarball: meta.dist.tarball };
             }
@@ -896,7 +894,6 @@ class PackageService {
 }
 
 class Store {
-    static #compilerInstanceCache = new Map();
     static #fetcher;
     static #lockService;
     static manifest;
@@ -924,14 +921,10 @@ class Store {
         }
         await Store.#packageService.ensure(version, Store.manifest);
     }
-    static async load(tag, options) {
-        let compilerInstance = Store.#compilerInstanceCache.get(tag);
-        if (compilerInstance != null) {
-            return compilerInstance;
-        }
-        let modulePath;
+    static async load(tag) {
+        let resolvedModule;
         if (tag === "*" && environmentOptions.typescriptModule != null) {
-            modulePath = fileURLToPath(environmentOptions.typescriptModule);
+            resolvedModule = environmentOptions.typescriptModule;
         }
         else {
             await Store.open();
@@ -940,40 +933,15 @@ class Store {
                 Store.#onDiagnostics(Diagnostic.error(StoreDiagnosticText.cannotAddTypeScriptPackage(tag)));
                 return;
             }
-            compilerInstance = Store.#compilerInstanceCache.get(version);
-            if (compilerInstance != null) {
-                return compilerInstance;
-            }
             const packagePath = await Store.#packageService.ensure(version, Store.manifest);
             if (packagePath != null) {
-                modulePath = Path.join(packagePath, "lib", "typescript.js");
+                resolvedModule = pathToFileURL(`${packagePath}/lib/typescript.js`).toString();
             }
         }
-        if (modulePath != null) {
-            const packageConfigText = await fs.readFile(Path.resolve(modulePath, "../../package.json"), { encoding: "utf8" });
-            const { version: packageVersion } = JSON.parse(packageConfigText);
-            if (!Version.isSatisfiedWith(packageVersion, "5.3")) {
-                modulePath = Path.resolve(modulePath, "../tsserverlibrary.js");
-            }
-            if (options?.notPatched) {
-                const moduleSpecifier = pathToFileURL(modulePath).toString();
-                compilerInstance = (await import(moduleSpecifier)).default;
-            }
-            else {
-                compilerInstance = await Store.#loadPatchedModule(modulePath);
-            }
-            Store.#compilerInstanceCache.set(tag, compilerInstance);
-            Store.#compilerInstanceCache.set(compilerInstance.version, compilerInstance);
+        if (resolvedModule != null) {
+            return (await import(resolvedModule)).default;
         }
-        return compilerInstance;
-    }
-    static async #loadPatchedModule(modulePath) {
-        const sourceText = await fs.readFile(modulePath, { encoding: "utf8" });
-        const compiledWrapper = vm.compileFunction(sourceText.replace("return checker;", "return { ...checker, isTypeIdenticalTo };"), ["exports", "require", "module", "__filename", "__dirname"], { filename: modulePath });
-        const exports$1 = {};
-        const module = { exports: exports$1 };
-        compiledWrapper(exports$1, createRequire(modulePath), module, modulePath, Path.dirname(modulePath));
-        return module.exports;
+        return;
     }
     static #onDiagnostics(diagnostic) {
         EventEmitter.dispatch(["store:error", { diagnostics: [diagnostic] }]);
@@ -1107,12 +1075,6 @@ class Options {
             group: 2,
             name: "help",
         },
-        {
-            brand: "boolean",
-            description: "Use the patch-based implementation of the '.toBe()' matcher.",
-            group: 4,
-            name: "legacyToBe",
-        },
         {
             brand: "true",
             description: "Print the list of supported versions of the 'typescript' package and exit.",
@@ -1603,7 +1565,6 @@ const defaultOptions = {
     checkSuppressedErrors: true,
     failFast: false,
     fixtureFileMatch: ["**/__fixtures__/*.{ts,tsx}", "**/fixtures/*.{ts,tsx}"],
-    legacyToBe: false,
     plugins: [],
     rejectAnyType: true,
     rejectNeverType: true,
@@ -2432,7 +2393,7 @@ function CommandLineUsageText() {
     const usage = [
         ["tstyche", "Run all tests."],
         ["tstyche query-params", "Only run the matching test file."],
-        ["tstyche --target '5.3 || 5.5.2 || >=5.7'", "Test against specific versions of TypeScript."],
+        ["tstyche --target '5.4 || 5.6.2 || >=5.8'", "Test against specific versions of TypeScript."],
     ];
     const usageText = usage.map(([commandText, descriptionText]) => (jsx(Line, { children: [jsx(CommandText, { text: commandText }), jsx(OptionDescriptionText, { text: descriptionText })] })));
     return jsx(Text, { children: usageText });
@@ -4363,29 +4324,6 @@ class ExpectDiagnosticText {
     }
 }
 
-class RelationMatcherBase {
-    explain(matchWorker, sourceNode, targetNode) {
-        const sourceTypeText = matchWorker.getTypeText(sourceNode);
-        const targetTypeText = matchWorker.getTypeText(targetNode);
-        const text = matchWorker.assertionNode.isNot
-            ? this.explainText(sourceTypeText, targetTypeText)
-            : this.explainNotText(sourceTypeText, targetTypeText);
-        const origin = DiagnosticOrigin.fromNode(targetNode, matchWorker.assertionNode);
-        return [Diagnostic.error(text, origin)];
-    }
-}
-
-class LegacyToBe extends RelationMatcherBase {
-    explainText = ExpectDiagnosticText.isTheSame;
-    explainNotText = ExpectDiagnosticText.isNotTheSame;
-    match(matchWorker, sourceNode, targetNode) {
-        return {
-            explain: () => this.explain(matchWorker, sourceNode, targetNode),
-            isMatch: matchWorker.checkIsIdenticalTo(sourceNode, targetNode),
-        };
-    }
-}
-
 class MatchWorker {
     assertionNode;
     #compiler;
@@ -4397,25 +4335,15 @@ class MatchWorker {
         this.assertionNode = assertionNode;
     }
     checkIsAssignableTo(sourceNode, targetNode) {
-        return this.#checkIsRelatedTo(sourceNode, targetNode, "assignable");
+        return this.#checkIsRelatedTo(sourceNode, targetNode);
     }
     checkIsAssignableWith(sourceNode, targetNode) {
-        return this.#checkIsRelatedTo(targetNode, sourceNode, "assignable");
-    }
-    checkIsIdenticalTo(sourceNode, targetNode) {
-        return (this.#checkIsRelatedTo(sourceNode, targetNode, "identical") &&
-            this.checkIsAssignableTo(sourceNode, targetNode) &&
-            this.checkIsAssignableWith(sourceNode, targetNode));
+        return this.#checkIsRelatedTo(targetNode, sourceNode);
     }
-    #checkIsRelatedTo(sourceNode, targetNode, relation) {
-        const sourceType = relation === "identical" ? this.#simplifyType(this.getType(sourceNode)) : this.getType(sourceNode);
-        const targetType = relation === "identical" ? this.#simplifyType(this.getType(targetNode)) : this.getType(targetNode);
-        switch (relation) {
-            case "assignable":
-                return this.typeChecker.isTypeAssignableTo(sourceType, targetType);
-            case "identical":
-                return this.typeChecker.isTypeIdenticalTo(sourceType, targetType);
-        }
+    #checkIsRelatedTo(sourceNode, targetNode) {
+        const sourceType = this.getType(sourceNode);
+        const targetType = this.getType(targetNode);
+        return this.typeChecker.isTypeAssignableTo(sourceType, targetType);
     }
     extendsObjectType(type) {
         const nonPrimitiveType = "getNonPrimitiveType" in this.typeChecker
@@ -4458,21 +4386,12 @@ class MatchWorker {
         }
         return DiagnosticOrigin.fromNode(enclosingNode, this.assertionNode);
     }
-    #simplifyType(type) {
-        if (type.isUnionOrIntersection()) {
-            const candidateType = this.#simplifyType(type.types[0]);
-            if (type.types.every((type) => this.typeChecker.isTypeIdenticalTo(this.#simplifyType(type), candidateType))) {
-                return candidateType;
-            }
-        }
-        return type;
-    }
 }
 
 function isStringOrNumberLiteralType(compiler, type) {
     return !!(type.flags & compiler.TypeFlags.StringOrNumberLiteral);
 }
-function isUnionType$1(compiler, type) {
+function isUnionType(compiler, type) {
     return !!(type.flags & compiler.TypeFlags.Union);
 }
 function isUniqueSymbolType(compiler, type) {
@@ -4541,7 +4460,7 @@ class ToAcceptProps {
             }
             return true;
         };
-        if (sourceType != null && isUnionType$1(this.#compiler, sourceType)) {
+        if (sourceType != null && isUnionType(this.#compiler, sourceType)) {
             return sourceType.types.some((sourceType) => check(sourceType, targetType));
         }
         return check(sourceType, targetType);
@@ -4609,7 +4528,7 @@ class ToAcceptProps {
             }
             return { diagnostics, isMatch: false };
         };
-        if (sourceType != null && isUnionType$1(this.#compiler, sourceType)) {
+        if (sourceType != null && isUnionType(this.#compiler, sourceType)) {
             let accumulator = [];
             const isMatch = sourceType.types.some((sourceType) => {
                 const text = matchWorker.assertionNode.isNot
@@ -4666,43 +4585,38 @@ class ToAcceptProps {
 function ensureArray(input) {
     return input ?? [];
 }
-function length(array) {
-    return array?.length ?? 0;
-}
-
-function isClass(type, compiler) {
-    return !!(type.objectFlags & compiler.ObjectFlags.Class);
-}
-function isConditionalType(type, compiler) {
-    return !!(type.flags & compiler.TypeFlags.Conditional);
-}
-function isFreshLiteralType(type, compiler) {
-    return !!(type.flags & compiler.TypeFlags.Freshable) && type.freshType === type;
-}
-function isIntersectionType(type, compiler) {
-    return !!(type.flags & compiler.TypeFlags.Intersection);
-}
-function isNoInferType(type, compiler) {
-    return !!(type.flags & compiler.TypeFlags.Substitution &&
-        type.constraint.flags & compiler.TypeFlags.Unknown);
+function getIndexSignatures(type, compiler, typeChecker) {
+    if (type.flags & compiler.TypeFlags.Intersection) {
+        return type.types.flatMap((type) => getIndexSignatures(type, compiler, typeChecker));
+    }
+    return typeChecker.getIndexInfosOfType(type);
 }
-function isObjectType(type, compiler) {
-    return !!(type.flags & compiler.TypeFlags.Object);
+function getSignatures(type, kind, compiler, typeChecker) {
+    if (type.flags & compiler.TypeFlags.Intersection) {
+        return type.types.flatMap((type) => getSignatures(type, kind, compiler, typeChecker));
+    }
+    return typeChecker.getSignaturesOfType(type, kind);
 }
-function isUnionType(type, compiler) {
-    return !!(type.flags & compiler.TypeFlags.Union);
+function getTypeParameterModifiers(typeParameter, compiler) {
+    if (!typeParameter.symbol.declarations) {
+        return compiler.ModifierFlags.None;
+    }
+    return (typeParameter.symbol.declarations.reduce((modifiers, declaration) => modifiers | compiler.getEffectiveModifierFlags(declaration), compiler.ModifierFlags.None) &
+        (compiler.ModifierFlags.In | compiler.ModifierFlags.Out | compiler.ModifierFlags.Const));
 }
-function isTupleType(type, compiler) {
-    return !!(type.objectFlags & compiler.ObjectFlags.Tuple);
+function getTargetSymbol(symbol, compiler) {
+    return isCheckFlagSet(symbol, compiler.CheckFlags.Instantiated, compiler)
+        ? symbol.links.target
+        : symbol;
 }
-function isTupleTypeReference(type, compiler) {
-    return isObjectType(type, compiler) && isTypeReference(type, compiler) && isTupleType(type.target, compiler);
+function isCheckFlagSet(symbol, flag, compiler) {
+    return !!(symbol.flags & compiler.SymbolFlags.Transient && symbol.links.checkFlags & flag);
 }
-function isTypeParameter(type, compiler) {
-    return !!(type.flags & compiler.TypeFlags.TypeParameter);
+function isSymbolFromDefaultLibrary(symbol, program) {
+    return !!symbol.declarations?.every((declaration) => program.isSourceFileDefaultLibrary(declaration.getSourceFile()));
 }
-function isTypeReference(type, compiler) {
-    return !!(type.objectFlags & compiler.ObjectFlags.Reference);
+function length(array) {
+    return array?.length ?? 0;
 }
 
 function getParameterFactsFromTuple(type, position, compiler) {
@@ -4712,41 +4626,30 @@ function getParameterFactsFromTuple(type, position, compiler) {
         getType: (typeChecker) => typeChecker.getTypeArguments(type)[position],
     };
 }
-function getParameterFacts(signature, position, compiler, typeChecker) {
-    if (position >= signature.parameters.length - 1 && compiler.hasRestParameter(signature.getDeclaration())) {
+function getParameterFacts(signature, parameterIndex, compiler, typeChecker) {
+    if (parameterIndex >= signature.parameters.length - 1 && compiler.hasRestParameter(signature.getDeclaration())) {
         const restType = typeChecker.getTypeOfSymbol(signature.parameters.at(-1));
-        if (isTupleTypeReference(restType, compiler)) {
+        if (typeChecker.isTupleType(restType)) {
             const fixedLength = signature.parameters.length - 1;
-            return getParameterFactsFromTuple(restType, position - fixedLength, compiler);
+            return getParameterFactsFromTuple(restType, parameterIndex - fixedLength, compiler);
         }
     }
-    const parameter = signature.parameters[position];
-    const isRest = isRestParameter(parameter, compiler);
+    const parameter = signature.parameters[parameterIndex];
     return {
         isOptional: isOptionalParameter(parameter, compiler),
-        isRest,
-        getType: (typeChecker) => getParameterType(parameter, signature, isRest, compiler, typeChecker),
+        isRest: isRestParameter(parameter, compiler),
+        getType: (typeChecker) => typeChecker.getParameterType(signature, parameterIndex),
     };
 }
-function getParameterType(parameter, signature, isRest, compiler, typeChecker) {
-    const type = typeChecker.getTypeOfSymbolAtLocation(parameter, signature.declaration);
-    if (isRest && isObjectType(type, compiler) && isTypeReference(type, compiler)) {
-        return typeChecker.getTypeArguments(type).at(0);
-    }
-    return type;
-}
 function getParameterCount(signature, compiler, typeChecker) {
-    if (hasRestParameter(signature, compiler)) {
+    if (signature.declaration != null && compiler.hasRestParameter(signature.declaration)) {
         const restType = typeChecker.getTypeOfSymbol(signature.parameters.at(-1));
-        if (isTupleTypeReference(restType, compiler)) {
+        if (typeChecker.isTupleType(restType)) {
             return signature.parameters.length + typeChecker.getTypeArguments(restType).length - 1;
         }
     }
     return signature.parameters.length;
 }
-function hasRestParameter(signature, compiler) {
-    return signature.declaration != null && compiler.hasRestParameter(signature.declaration);
-}
 function isOptionalParameter(symbol, compiler) {
     return (symbol.valueDeclaration != null &&
         compiler.isParameter(symbol.valueDeclaration) &&
@@ -4758,29 +4661,18 @@ function isRestParameter(symbol, compiler) {
         symbol.valueDeclaration.dotDotDotToken != null);
 }
 
-function getTargetSymbol(symbol, compiler) {
-    return isCheckFlagSet(symbol, compiler.CheckFlags.Instantiated, compiler)
-        ? symbol.links.target
-        : symbol;
-}
-function isCheckFlagSet(symbol, flag, compiler) {
-    return !!(symbol.flags & compiler.SymbolFlags.Transient && symbol.links.checkFlags & flag);
-}
-function isSymbolFromDefaultLibrary(symbol, program) {
-    if (!symbol.declarations) {
-        return false;
-    }
-    return symbol.declarations.every((declaration) => program.isSourceFileDefaultLibrary(declaration.getSourceFile()));
-}
-
 function getPropertyType(symbol, compiler, compilerOptions, typeChecker) {
     const type = typeChecker.getTypeOfSymbol(symbol);
     if (compilerOptions.exactOptionalPropertyTypes && isOptionalProperty(symbol, compiler)) {
-        if (isUnionType(type, compiler)) {
-            type.types = type.types.filter((type) => !("debugIntrinsicName" in type && type.debugIntrinsicName === "missing"));
-            if (type.types.length === 1) {
-                return type.types.at(0);
+        if (type.flags & compiler.TypeFlags.Union) {
+            const filteredType = type.types.filter((type) => !("debugIntrinsicName" in type && type.debugIntrinsicName === "missing"));
+            if (filteredType.length === type.types.length) {
+                return type;
             }
+            if (filteredType.length === 1) {
+                return filteredType.at(0);
+            }
+            return { ...type, types: filteredType };
         }
     }
     return type;
@@ -4795,11 +4687,26 @@ 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;
-    #resultCache = new Map();
+    #seen = new SeenService();
     #typeChecker;
     constructor(compiler, program) {
         this.#compiler = compiler;
@@ -4821,7 +4728,7 @@ class Structure {
     compare(a, b) {
         a = this.#normalize(a);
         b = this.#normalize(b);
-        if (a === b) {
+        if (a.id === b.id) {
             return true;
         }
         if (a.flags & this.#compiler.TypeFlags.Any) {
@@ -4833,75 +4740,132 @@ class Structure {
         if (a.flags & this.#compiler.TypeFlags.Undefined) {
             return !!(b.flags & this.#compiler.TypeFlags.Undefined);
         }
-        if (isIntersectionType(a, this.#compiler) || isIntersectionType(b, this.#compiler)) {
-            if (isIntersectionType(a, this.#compiler) &&
-                isIntersectionType(b, this.#compiler) &&
-                a.types.length === b.types.length &&
-                a.types.every((aType, i) => this.compare(aType, b.types[i]))) {
-                return true;
-            }
-            return (this.compareProperties(a, b) &&
-                this.compareSignatures(a, b, this.#compiler.SignatureKind.Call) &&
-                this.compareSignatures(a, b, this.#compiler.SignatureKind.Construct) &&
-                this.compareIndexSignatures(a, b));
+        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 (isUnionType(a, this.#compiler) || isUnionType(b, this.#compiler)) {
-            if (isUnionType(a, this.#compiler) && isUnionType(b, this.#compiler)) {
+        if ((a.flags | b.flags) & this.#compiler.TypeFlags.Union) {
+            if (a.flags & b.flags & this.#compiler.TypeFlags.Union) {
                 return this.compareUnions(a, b);
             }
             return false;
         }
-        if (isTupleTypeReference(a, this.#compiler) || isTupleTypeReference(b, this.#compiler)) {
-            if (isTupleTypeReference(a, this.#compiler) && isTupleTypeReference(b, this.#compiler)) {
-                return this.compareTuples(a, b);
+        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 false;
+        }
+        if ((a.flags | b.flags) & this.#compiler.TypeFlags.TypeParameter) {
+            if (a.flags & b.flags & this.#compiler.TypeFlags.TypeParameter) {
+                return this.compareTypeParameters(a, b);
+            }
+            return false;
+        }
+        if ((a.flags | b.flags) & this.#compiler.TypeFlags.Index) {
+            if (a.flags & b.flags & this.#compiler.TypeFlags.Index) {
+                return this.compare(a.type, b.type);
             }
             return false;
         }
-        if (isTypeParameter(a, this.#compiler) || isTypeParameter(b, this.#compiler)) {
-            if (isTypeParameter(a, this.#compiler) && isTypeParameter(b, this.#compiler)) {
-                return this.compareTypeParameter(a, b);
+        if ((a.flags | b.flags) & this.#compiler.TypeFlags.IndexedAccess) {
+            if (a.flags & b.flags & this.#compiler.TypeFlags.IndexedAccess) {
+                return this.compareIndexedAccessTypes(a, b);
             }
             return false;
         }
-        if (isConditionalType(a, this.#compiler) || isConditionalType(b, this.#compiler)) {
-            if (isConditionalType(a, this.#compiler) && isConditionalType(b, this.#compiler)) {
+        if ((a.flags | b.flags) & this.#compiler.TypeFlags.Conditional) {
+            if (a.flags & b.flags & this.#compiler.TypeFlags.Conditional) {
                 return this.compareConditionalTypes(a, b);
             }
             return false;
         }
-        if (isObjectType(a, this.#compiler) || isObjectType(b, this.#compiler)) {
-            if (isObjectType(a, this.#compiler) && isObjectType(b, this.#compiler)) {
-                return this.compareObjects(a, b);
+        if ((a.flags | b.flags) & this.#compiler.TypeFlags.Substitution) {
+            if (a.flags & b.flags & this.#compiler.TypeFlags.Substitution) {
+                return this.compareSubstitutionTypes(a, b);
             }
             return false;
         }
         return false;
     }
-    compareConditionalTypes(a, b) {
-        return (this.compare(a.checkType, b.checkType) &&
-            this.compare(a.extendsType, b.extendsType) &&
-            this.compare(this.#typeChecker.getTypeAtLocation(a.root.node.trueType), this.#typeChecker.getTypeAtLocation(b.root.node.trueType)) &&
-            this.compare(this.#typeChecker.getTypeAtLocation(a.root.node.falseType), this.#typeChecker.getTypeAtLocation(b.root.node.falseType)));
+    compareIntersections(a, b) {
+        if (a.types.length !== b.types.length) {
+            return false;
+        }
+        return a.types.every((aType, i) => this.compare(aType, b.types[i]));
     }
-    compareIndexSignatures(a, b) {
-        const aSignatures = this.#getIndexSignatures(a);
-        const bSignatures = this.#getIndexSignatures(b);
-        if (aSignatures.length !== bSignatures.length) {
+    compareUnions(a, b) {
+        if (a.types.length !== b.types.length) {
             return false;
         }
-        for (let i = 0; i < aSignatures.length; i++) {
-            if (aSignatures[i].isReadonly !== bSignatures[i].isReadonly) {
+        return a.types.every((aType) => b.types.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;
+            }
+        }
+        return this.compareStructuredTypes(a, b);
+    }
+    compareTypeReferences(a, b) {
+        if ((a.target.objectFlags | b.target.objectFlags) & this.#compiler.ObjectFlags.Tuple) {
+            if (a.target.objectFlags & b.target.objectFlags & this.#compiler.ObjectFlags.Tuple) {
+                return this.compareTuples(a, b);
+            }
+            return false;
+        }
+        if ((a.objectFlags | b.objectFlags) & this.#compiler.ObjectFlags.Class) {
+            return this.compareStructuredTypes(a, b);
+        }
+        if (!this.#compareTypeOfSymbol(a.symbol, b.symbol)) {
+            if (isSymbolFromDefaultLibrary(a.symbol, this.#program) || isSymbolFromDefaultLibrary(b.symbol, this.#program)) {
                 return false;
             }
-            if (!this.compare(aSignatures[i].keyType, bSignatures[i].keyType)) {
+            return;
+        }
+        if (length(a.typeArguments) !== length(b.typeArguments)) {
+            return false;
+        }
+        return ensureArray(a.typeArguments).every((type, i) => this.compare(type, ensureArray(b.typeArguments)[i]));
+    }
+    compareTuples(a, b) {
+        if (a.target.readonly !== b.target.readonly) {
+            return false;
+        }
+        const aTypeArguments = this.#typeChecker.getTypeArguments(a);
+        const bTypeArguments = this.#typeChecker.getTypeArguments(b);
+        if (length(aTypeArguments) !== length(bTypeArguments)) {
+            return false;
+        }
+        for (let i = 0; i < aTypeArguments.length; i++) {
+            if (a.target.elementFlags[i] !== b.target.elementFlags[i]) {
                 return false;
             }
-            if (!this.compare(aSignatures[i].type, bSignatures[i].type)) {
+            if (!this.compare(aTypeArguments[i], bTypeArguments[i])) {
                 return false;
             }
         }
         return true;
     }
+    compareStructuredTypes(a, b) {
+        if (!this.compareProperties(a, b)) {
+            return false;
+        }
+        if (!this.compareSignatures(a, b, this.#compiler.SignatureKind.Call)) {
+            return false;
+        }
+        if (!this.compareSignatures(a, b, this.#compiler.SignatureKind.Construct)) {
+            return false;
+        }
+        if (!this.compareIndexSignatures(a, b)) {
+            return false;
+        }
+        return true;
+    }
     compareProperties(a, b) {
         const aProperties = this.#typeChecker.getPropertiesOfType(a);
         const bProperties = this.#typeChecker.getPropertiesOfType(b);
@@ -4942,50 +4906,26 @@ class Structure {
         }
         return true;
     }
-    compareObjects(a, b) {
-        const key = this.#getCacheKey(a, b);
-        const result = this.#resultCache.get(key);
-        if (result != null) {
-            return result !== 2;
-        }
-        this.#resultCache.set(key, 0);
-        if (isTypeReference(a, this.#compiler) &&
-            !isClass(a, this.#compiler) &&
-            isTypeReference(b, this.#compiler) &&
-            !isClass(b, this.#compiler)) {
-            const isSame = this.compareTypeReferences(a, b);
-            if (isSame != null) {
-                this.#resultCache.set(key, isSame ? 1 : 2);
-                return isSame;
-            }
-        }
-        const isSame = this.compareProperties(a, b) &&
-            this.compareSignatures(a, b, this.#compiler.SignatureKind.Call) &&
-            this.compareSignatures(a, b, this.#compiler.SignatureKind.Construct) &&
-            this.compareIndexSignatures(a, b);
-        this.#resultCache.set(key, isSame ? 1 : 2);
-        return isSame;
-    }
     compareSignatures(a, b, kind) {
-        const aSignatures = this.#getSignatures(a, kind);
-        const bSignatures = this.#getSignatures(b, kind);
-        if (length(aSignatures) !== length(bSignatures)) {
+        const aSignatures = getSignatures(a, kind, this.#compiler, this.#typeChecker);
+        const bSignatures = getSignatures(b, kind, this.#compiler, this.#typeChecker);
+        if (aSignatures.length !== bSignatures.length) {
             return false;
         }
         for (let i = 0; i < aSignatures.length; i++) {
-            if (!this.compareSignature(aSignatures[i], bSignatures[i])) {
+            if (!this.#compareSignature(aSignatures[i], bSignatures[i])) {
                 return false;
             }
         }
         return true;
     }
-    compareSignature(a, b) {
+    #compareSignature(a, b) {
         if (length(a.typeParameters) !== length(b.typeParameters)) {
             return false;
         }
         if (a.typeParameters != null && b.typeParameters != null) {
             for (let i = 0; i < a.typeParameters.length; i++) {
-                if (!this.compareTypeParameter(a.typeParameters[i], b.typeParameters[i])) {
+                if (!this.compareTypeParameters(a.typeParameters[i], b.typeParameters[i])) {
                     return false;
                 }
             }
@@ -5028,76 +4968,81 @@ class Structure {
         }
         return true;
     }
-    compareTuples(a, b) {
-        if (a.target.readonly !== b.target.readonly) {
-            return false;
-        }
-        const aTypeArguments = this.#typeChecker.getTypeArguments(a);
-        const bTypeArguments = this.#typeChecker.getTypeArguments(b);
-        if (length(aTypeArguments) !== length(bTypeArguments)) {
+    compareIndexSignatures(a, b) {
+        const aSignatures = getIndexSignatures(a, this.#compiler, this.#typeChecker);
+        const bSignatures = getIndexSignatures(b, this.#compiler, this.#typeChecker);
+        if (aSignatures.length !== bSignatures.length) {
             return false;
         }
-        for (let i = 0; i < aTypeArguments.length; i++) {
-            if (a.target.elementFlags[i] !== b.target.elementFlags[i]) {
+        for (let i = 0; i < aSignatures.length; i++) {
+            if (aSignatures[i].isReadonly !== bSignatures[i].isReadonly) {
                 return false;
             }
-            if (!this.compare(aTypeArguments[i], bTypeArguments[i])) {
+            if (!this.compare(aSignatures[i].keyType, bSignatures[i].keyType)) {
+                return false;
+            }
+            if (!this.compare(aSignatures[i].type, bSignatures[i].type)) {
                 return false;
             }
         }
         return true;
     }
-    compareTypeParameter(a, b) {
-        if (!this.#compareMaybeNullish(this.#typeChecker.getBaseConstraintOfType(a), this.#typeChecker.getBaseConstraintOfType(b)) ||
-            !this.#compareMaybeNullish(this.#typeChecker.getDefaultFromTypeParameter(a), this.#typeChecker.getDefaultFromTypeParameter(b))) {
+    compareTypeParameters(a, b) {
+        if (getTypeParameterModifiers(a, this.#compiler) !== getTypeParameterModifiers(b, this.#compiler)) {
+            return false;
+        }
+        if (!this.#compareMaybeNullish(this.#typeChecker.getBaseConstraintOfType(a), this.#typeChecker.getBaseConstraintOfType(b))) {
+            return false;
+        }
+        if (!this.#compareMaybeNullish(this.#typeChecker.getDefaultFromTypeParameter(a), this.#typeChecker.getDefaultFromTypeParameter(b))) {
             return false;
         }
         return true;
     }
-    compareTypeReferences(a, b) {
-        if (!this.#compareTypeOfSymbol(a.symbol, b.symbol)) {
-            if (isSymbolFromDefaultLibrary(a.symbol, this.#program) || isSymbolFromDefaultLibrary(b.symbol, this.#program)) {
-                return false;
-            }
-            return;
+    compareIndexedAccessTypes(a, b) {
+        if (!this.compare(a.objectType, b.objectType)) {
+            return false;
         }
-        if (length(a.typeArguments) !== length(b.typeArguments)) {
+        if (!this.compare(a.indexType, b.indexType)) {
             return false;
         }
-        return ensureArray(a.typeArguments).every((type, i) => this.compare(type, ensureArray(b.typeArguments)[i]));
+        return true;
     }
-    compareUnions(a, b) {
-        if (a.types.length !== b.types.length) {
+    compareConditionalTypes(a, b) {
+        if (!this.compare(a.checkType, b.checkType)) {
             return false;
         }
-        return (a.types.every((aType) => b.types.some((bType) => this.compare(aType, bType))) &&
-            b.types.every((bType) => a.types.some((aType) => this.compare(bType, aType))));
-    }
-    #getCacheKey(a, b) {
-        return [a.id, b.id].sort().join(":");
-    }
-    #getSignatures(type, kind) {
-        if (isIntersectionType(type, this.#compiler)) {
-            return type.types.flatMap((type) => this.#getSignatures(type, kind));
+        if (!this.compare(a.extendsType, b.extendsType)) {
+            return false;
+        }
+        if (!this.compare(this.#typeChecker.getTypeAtLocation(a.root.node.trueType), this.#typeChecker.getTypeAtLocation(b.root.node.trueType))) {
+            return false;
+        }
+        if (!this.compare(this.#typeChecker.getTypeAtLocation(a.root.node.falseType), this.#typeChecker.getTypeAtLocation(b.root.node.falseType))) {
+            return false;
         }
-        return this.#typeChecker.getSignaturesOfType(type, kind);
+        return true;
     }
-    #getIndexSignatures(type) {
-        if (isIntersectionType(type, this.#compiler)) {
-            return type.types.flatMap((type) => this.#getIndexSignatures(type));
+    compareSubstitutionTypes(a, b) {
+        if (!this.compare(a.baseType, b.baseType)) {
+            return false;
+        }
+        if (!this.compare(a.constraint, b.constraint)) {
+            return false;
         }
-        return this.#typeChecker.getIndexInfosOfType(type);
+        return true;
     }
     #normalize(type) {
-        if (isFreshLiteralType(type, this.#compiler)) {
+        if (type.flags & this.#compiler.TypeFlags.Freshable && type.freshType === type) {
             return type.regularType;
         }
-        if (isNoInferType(type, this.#compiler)) {
+        if (type.flags & this.#compiler.TypeFlags.Substitution &&
+            type.constraint.flags & this.#compiler.TypeFlags.Unknown) {
             return type.baseType;
         }
-        if (isUnionType(type, this.#compiler) || isIntersectionType(type, this.#compiler)) {
+        if (type.flags & this.#compiler.TypeFlags.UnionOrIntersection) {
             const candidateType = this.#normalize(type.types[0]);
-            if (type.types.every((type) => this.compare(this.#normalize(type), candidateType))) {
+            if (type.types.every((t) => this.compare(this.#normalize(t), candidateType))) {
                 return candidateType;
             }
         }
@@ -5105,6 +5050,18 @@ class Structure {
     }
 }
 
+class RelationMatcherBase {
+    explain(matchWorker, sourceNode, targetNode) {
+        const sourceTypeText = matchWorker.getTypeText(sourceNode);
+        const targetTypeText = matchWorker.getTypeText(targetNode);
+        const text = matchWorker.assertionNode.isNot
+            ? this.explainText(sourceTypeText, targetTypeText)
+            : this.explainNotText(sourceTypeText, targetTypeText);
+        const origin = DiagnosticOrigin.fromNode(targetNode, matchWorker.assertionNode);
+        return [Diagnostic.error(text, origin)];
+    }
+}
+
 class ToBe extends RelationMatcherBase {
     #structure;
     constructor(compiler, program) {
@@ -5456,12 +5413,12 @@ class ExpectService {
     toBeConstructableWith;
     toHaveProperty;
     toRaiseError;
-    constructor(compiler, program, reject, resolvedConfig) {
+    constructor(compiler, program, reject) {
         this.#compiler = compiler;
         this.#program = program;
         this.#reject = reject;
         this.toAcceptProps = new ToAcceptProps(compiler, program);
-        this.toBe = resolvedConfig.legacyToBe ? new LegacyToBe() : new ToBe(compiler, program);
+        this.toBe = new ToBe(compiler, program);
         this.toBeApplicable = new ToBeApplicable(compiler);
         this.toBeAssignableFrom = new ToBeAssignableFrom();
         this.toBeAssignableTo = new ToBeAssignableTo();
@@ -5706,7 +5663,7 @@ class TestTreeWalker {
         this.#hasOnly = options.hasOnly || resolvedConfig.only != null || options.position != null;
         this.#position = options.position;
         const reject = new Reject(compiler, program, resolvedConfig);
-        this.#expectService = new ExpectService(compiler, program, reject, resolvedConfig);
+        this.#expectService = new ExpectService(compiler, program, reject);
         this.#whenService = new WhenService(reject, onFileDiagnostics);
     }
     async #resolveRunMode(flags, node) {
@@ -5951,7 +5908,7 @@ class FileRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "6.0.0-beta.0";
+    static version = "6.0.0-beta.2";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }
@@ -6008,7 +5965,7 @@ class Runner {
         for (const target of this.#resolvedConfig.target) {
             const targetResult = new TargetResult(target, files);
             EventEmitter.dispatch(["target:start", { result: targetResult }]);
-            const compiler = await Store.load(target, { notPatched: !this.#resolvedConfig.legacyToBe });
+            const compiler = await Store.load(target);
             if (compiler) {
                 const fileRunner = new FileRunner(compiler, this.#resolvedConfig);
                 for (const file of files) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "6.0.0-beta.0",
+  "version": "6.0.0-beta.2",
   "description": "Everything You Need for Type Testing.",
   "keywords": [
     "typescript",
@@ -32,7 +32,7 @@
   "types": "./build/index.d.ts",
   "bin": "./build/bin.js",
   "peerDependencies": {
-    "typescript": ">=5.0"
+    "typescript": ">=5.4"
   },
   "peerDependenciesMeta": {
     "typescript": {