tstyche 6.0.0-beta.1 → 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");
+        return this.#checkIsRelatedTo(targetNode, sourceNode);
     }
-    checkIsIdenticalTo(sourceNode, targetNode) {
-        return (this.#checkIsRelatedTo(sourceNode, targetNode, "identical") &&
-            this.checkIsAssignableTo(sourceNode, targetNode) &&
-            this.checkIsAssignableWith(sourceNode, targetNode));
-    }
-    #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,15 +4386,6 @@ 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) {
@@ -5131,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) {
@@ -5482,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();
@@ -5732,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) {
@@ -5977,7 +5908,7 @@ class FileRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "6.0.0-beta.1";
+    static version = "6.0.0-beta.2";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }
@@ -6034,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.1",
+  "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": {