@effect/tsgo 0.14.6 → 0.15.0

package/README.md

@@ -22,7 +22,7 @@ This will guide you through the installation process, which includes:
 4. Hinting at any additional editor configuration needed to ensure the LSP is active.
 
 > [!NOTE]
-> At the moment, you still need the standard native TypeScript install (`@typescript/native-preview`) alongside `@effect/tsgo`.
+> At the moment, you still need a native TypeScript install alongside `@effect/tsgo` — either `@typescript/native-preview` (nightlies) or `typescript` >= 7 (e.g. the 7.0 RC, `typescript@rc`). `effect-tsgo patch` and `effect-tsgo setup` detect and use whichever one is installed.
 
 ## Diagnostic Status
 

package/dist/effect-tsgo.js

@@ -204437,17 +204437,47 @@ var FileReadError = class extends TaggedError("FileReadError") {
 //#endregion
 //#region package.json
 var name = "@effect/tsgo";
-var version = "0.14.6";
+var version = "0.15.0";
 
 //#endregion
 //#region src/setup/consts.ts
 const LSP_PACKAGE_NAME = name;
 const LSP_PLUGIN_NAME = "@effect/language-service";
 const NATIVE_PREVIEW_PACKAGE_NAME = "@typescript/native-preview";
+const TYPESCRIPT_PACKAGE_NAME = "typescript";
 const PATCH_COMMAND = "effect-tsgo patch";
 const DEFAULT_LSP_VERSION = version;
 const DEFAULT_NATIVE_PREVIEW_VERSION = "latest";
 const TSCONFIG_SCHEMA_URL = "https://raw.githubusercontent.com/Effect-TS/tsgo/refs/heads/main/schema.json";
+/**
+* `typescript` package versions >= 7 ship the native Go-ported binary that this
+* tool patches. Older `typescript` releases (<= 6) are the JS compiler and must
+* not be treated as a native backend.
+*/
+const isNativeTypescriptVersion = (version) => {
+	const match = /\d+/.exec(version.trim());
+	return match !== null && Number(match[0]) >= 7;
+};
+/** The `@typescript/native-preview` nightly backend (back-compat default). */
+const nativePreviewBackend = {
+	packageName: NATIVE_PREVIEW_PACKAGE_NAME,
+	platformPackagePrefix: "@typescript/native-preview",
+	binaryName: "tsgo"
+};
+/** The `typescript` >= 7 backend (stable/RC releases). */
+const typescriptBackend = {
+	packageName: TYPESCRIPT_PACKAGE_NAME,
+	platformPackagePrefix: "@typescript/typescript",
+	binaryName: "tsc",
+	versionCheck: (pkg) => isNativeTypescriptVersion(pkg.version ?? "0")
+};
+/**
+* Resolve the VS Code `typescript.native-preview.tsdk` folder for a backend.
+* The "TypeScript (Native Preview)" extension reads the native install from
+* this path; for `@typescript/native-preview` it is `node_modules/<pkg>`, and
+* for `typescript` >= 7 it is `node_modules/typescript`.
+*/
+const nativeBackendTsdkPath = (packageName) => "node_modules/" + packageName;
 
 //#endregion
 //#region src/setup/assessment.ts
@@ -204503,7 +204533,14 @@ const assessPackageJson = (input) => {
 		return none$3();
 	};
 	const lspVersion = assessDependency(LSP_PACKAGE_NAME);
-	const nativePreviewVersion = assessDependency(NATIVE_PREVIEW_PACKAGE_NAME);
+	const nativePreviewVersion = orElse(assessDependency(NATIVE_PREVIEW_PACKAGE_NAME), () => {
+		const typescriptDep = assessDependency(TYPESCRIPT_PACKAGE_NAME);
+		if (isSome(typescriptDep) && isNativeTypescriptVersion(typescriptDep.value.version)) return some({
+			...typescriptDep.value,
+			packageName: TYPESCRIPT_PACKAGE_NAME
+		});
+		return none$3();
+	});
 	const prepareScript = "prepare" in (parsed.scripts ?? {}) ? some({
 		script: parsed.scripts.prepare,
 		hasPatch: parsed.scripts.prepare.toLowerCase().includes(PATCH_COMMAND)
@@ -204853,13 +204890,17 @@ const computePackageJsonChanges = (current, target) => {
 	if (!rootObj) return emptyFileChangesResult();
 	const ctx = createTrackerContext();
 	const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
+		const nativeBackendPackageName = match$8(target.nativePreviewVersion, {
+			onNone: () => NATIVE_PREVIEW_PACKAGE_NAME,
+			onSome: (dep) => dep.packageName ?? NATIVE_PREVIEW_PACKAGE_NAME
+		});
 		const shouldAddNativePreviewWithDependencyType = (dependencyType) => isSome(target.nativePreviewVersion) && isNone(current.nativePreviewVersion) && target.nativePreviewVersion.value.dependencyType === dependencyType;
 		const ensureNativePreviewDependency = () => {
 			if (isNone(target.nativePreviewVersion) || isSome(current.nativePreviewVersion)) return;
 			const targetNativePreview = target.nativePreviewVersion.value;
 			if (!findDependencyCollectionProperty(rootObj, targetNativePreview.dependencyType) && isSome(target.lspVersion) && target.lspVersion.value.dependencyType === targetNativePreview.dependencyType) return;
-			descriptions.push(`Add ${NATIVE_PREVIEW_PACKAGE_NAME}@${targetNativePreview.version} to ${targetNativePreview.dependencyType}`);
-			upsertDependency(tracker, current.sourceFile, rootObj, NATIVE_PREVIEW_PACKAGE_NAME, targetNativePreview);
+			descriptions.push(`Add ${nativeBackendPackageName}@${targetNativePreview.version} to ${targetNativePreview.dependencyType}`);
+			upsertDependency(tracker, current.sourceFile, rootObj, nativeBackendPackageName, targetNativePreview);
 		};
 		if (isSome(target.lspVersion)) {
 			const targetDepType = target.lspVersion.value.dependencyType;
@@ -204879,7 +204920,7 @@ const computePackageJsonChanges = (current, target) => {
 						const dependencyProperties = [import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion))];
 						if (shouldAddNativePreviewWithDependencyType(targetDepType)) {
 							const targetNativePreview = target.nativePreviewVersion.pipe(getOrUndefined);
-							if (targetNativePreview) dependencyProperties.push(import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(NATIVE_PREVIEW_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetNativePreview.version)));
+							if (targetNativePreview) dependencyProperties.push(import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(nativeBackendPackageName), import_typescript.factory.createStringLiteral(targetNativePreview.version)));
 						}
 						const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(targetDepType), import_typescript.factory.createObjectLiteralExpression(dependencyProperties, false));
 						insertNodeAtEndOfList(tracker, current.sourceFile, rootObj.properties, newDepsProp);
@@ -204899,7 +204940,7 @@ const computePackageJsonChanges = (current, target) => {
 					const dependencyProperties = [import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion))];
 					if (shouldAddNativePreviewWithDependencyType(targetDepType)) {
 						const targetNativePreview = target.nativePreviewVersion.pipe(getOrUndefined);
-						if (targetNativePreview) dependencyProperties.push(import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(NATIVE_PREVIEW_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetNativePreview.version)));
+						if (targetNativePreview) dependencyProperties.push(import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(nativeBackendPackageName), import_typescript.factory.createStringLiteral(targetNativePreview.version)));
 					}
 					const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(targetDepType), import_typescript.factory.createObjectLiteralExpression(dependencyProperties, false));
 					insertNodeAtEndOfList(tracker, current.sourceFile, rootObj.properties, newDepsProp);
@@ -207320,8 +207361,12 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 			}
 		]
 	});
+	const nativeBackendPackage = match$8(assessment.packageJson.nativePreviewVersion, {
+		onNone: () => NATIVE_PREVIEW_PACKAGE_NAME,
+		onSome: (dep) => dep.packageName ?? NATIVE_PREVIEW_PACKAGE_NAME
+	});
 	const vscodeSettings = editors.includes("vscode") ? some({ settings: {
-		"typescript.native-preview.tsdk": "node_modules/@typescript/native-preview",
+		"typescript.native-preview.tsdk": nativeBackendTsdkPath(nativeBackendPackage),
 		"typescript.experimental.useTsgo": true,
 		"js/ts.experimental.useTsgo": true
 	} }) : none$3();
@@ -207357,19 +207402,19 @@ const setupCommand = make("setup").pipe(withDescription("Setup @effect/tsgo for
 
 //#endregion
 //#region src/cli.ts
-var NativePreviewNotInstalledError = class extends TaggedError("NativePreviewNotInstalledError") {
+var NativeBackendNotInstalledError = class extends TaggedError("NativeBackendNotInstalledError") {
 	get message() {
-		return "@typescript/native-preview is not installed. Please install it first: npm install @typescript/native-preview";
+		return "No native TypeScript backend is installed. Install one of the following first: `@typescript/native-preview` or `typescript` (>= 7, e.g. `typescript@rc`).";
 	}
 };
 var UnsupportedPlatformPackageError = class extends TaggedError("UnsupportedPlatformPackageError") {
 	get message() {
-		return `Unable to resolve ${this.packageName}. Your platform may not be supported by @typescript/native-preview.`;
+		return `Unable to resolve ${this.packageName}. Your platform may not be supported by the installed native TypeScript backend.`;
 	}
 };
 var MissingTargetBinaryError = class extends TaggedError("MissingTargetBinaryError") {
 	get message() {
-		return "TypeScript-Go binary not found at " + this.targetPath + ". Is @typescript/native-preview installed correctly?";
+		return "Native TypeScript binary not found at " + this.targetPath + ". Is the native TypeScript backend installed correctly?";
 	}
 };
 var ResolvePackagedBinaryError = class extends TaggedError("ResolvePackagedBinaryError") {
@@ -207397,24 +207442,74 @@ var VerificationFailedError = class extends TaggedError("VerificationFailedError
 		return "Warning: verification failed for " + this.targetPath + ", but binary was patched. The binary may still work correctly.";
 	}
 };
-const getNativePreviewBinaryPath = gen(function* () {
+const probeBackend = (backend, cwdRequire, path) => {
+	const isWin = process.platform === "win32";
+	let mainPkg;
+	try {
+		mainPkg = cwdRequire(backend.packageName + "/package.json");
+	} catch {
+		return { _tag: "notInstalled" };
+	}
+	if (backend.versionCheck !== void 0 && !backend.versionCheck(mainPkg)) return { _tag: "notInstalled" };
+	let mainPackageJsonPath;
+	try {
+		mainPackageJsonPath = cwdRequire.resolve(backend.packageName + "/package.json");
+	} catch {
+		return { _tag: "notInstalled" };
+	}
+	const backendRequire = node_module.createRequire(mainPackageJsonPath);
+	const platformPackageName = backend.platformPackagePrefix + "-" + process.platform + "-" + process.arch;
+	let platformPackageJsonPath;
+	try {
+		platformPackageJsonPath = backendRequire.resolve(platformPackageName + "/package.json");
+	} catch {
+		return {
+			_tag: "unsupportedPlatform",
+			packageName: platformPackageName
+		};
+	}
+	const platformDir = path.dirname(platformPackageJsonPath);
+	const binaryName = backend.binaryName + (isWin ? ".exe" : "");
+	return {
+		_tag: "resolved",
+		path: path.join(platformDir, "lib", binaryName),
+		binaryName: backend.binaryName
+	};
+};
+/**
+* Resolve the native TypeScript binary to patch. The `@typescript/native-preview`
+* backend is tried first (back-compat), then the `typescript` >= 7 package so
+* that the TypeScript 7 RC/stable release is supported out of the box.
+*
+* Returns the target binary path plus the backend's base binary name (`tsgo` or
+* `tsc`); the latter selects the matching Effect-patched artifact from
+* `@effect/tsgo-*` (which ships separate `lib/tsgo` and `lib/tsc` builds).
+*/
+const getNativeBackendBinaryPath = gen(function* () {
 	const path = yield* Path;
 	const cwdRequire = node_module.createRequire(path.join(process.cwd(), "noop.js"));
-	const nativePreviewPackageJsonPath = yield* try_({
-		try: () => cwdRequire.resolve("@typescript/native-preview/package.json"),
-		catch: () => new NativePreviewNotInstalledError({ details: "missing package" })
-	});
-	const nativePreviewRequire = node_module.createRequire(nativePreviewPackageJsonPath);
-	const platformPackageName = "@typescript/" + ("native-preview-" + process.platform + "-" + process.arch);
-	const platformPackageJsonPath = yield* try_({
-		try: () => nativePreviewRequire.resolve(platformPackageName + "/package.json"),
-		catch: () => new UnsupportedPlatformPackageError({ packageName: platformPackageName })
-	});
-	const platformDir = path.dirname(platformPackageJsonPath);
-	const binaryName = process.platform === "win32" ? "tsgo.exe" : "tsgo";
-	return path.join(platformDir, "lib", binaryName);
+	const nativePreviewResult = probeBackend(nativePreviewBackend, cwdRequire, path);
+	if (nativePreviewResult._tag === "resolved") return {
+		targetPath: nativePreviewResult.path,
+		binaryName: nativePreviewResult.binaryName
+	};
+	if (nativePreviewResult._tag === "unsupportedPlatform") return yield* fail(new UnsupportedPlatformPackageError({ packageName: nativePreviewResult.packageName }));
+	const typescriptResult = probeBackend(typescriptBackend, cwdRequire, path);
+	if (typescriptResult._tag === "resolved") return {
+		targetPath: typescriptResult.path,
+		binaryName: typescriptResult.binaryName
+	};
+	if (typescriptResult._tag === "unsupportedPlatform") return yield* fail(new UnsupportedPlatformPackageError({ packageName: typescriptResult.packageName }));
+	return yield* fail(new NativeBackendNotInstalledError({ details: "no native backend found" }));
 });
-const getPackagedBinaryPath = gen(function* () {
+/**
+* Resolve the Effect-patched binary to copy over the native target. The
+* `@effect/tsgo-*` platform package ships separate `lib/tsgo` (built from
+* `main`) and `lib/tsc` (built from `generated/stable`) artifacts; `binaryName`
+* selects the one matching the detected native backend so the correct build is
+* installed. Defaults to `tsgo` for the `get-exe-path` command.
+*/
+const getPackagedBinaryPath = (binaryName = "tsgo") => gen(function* () {
 	const fs = yield* FileSystem;
 	const path = yield* Path;
 	const packageName = "@effect/tsgo-" + process.platform + "-" + process.arch;
@@ -207424,17 +207519,17 @@ const getPackagedBinaryPath = gen(function* () {
 		catch: () => new ResolvePackagedBinaryError({ reason: `Unable to resolve ${packageName}. Either your platform is unsupported, or the platform package is not installed.` })
 	});
 	const packageDir = path.dirname(packageJsonPath);
-	const binaryName = process.platform === "win32" ? "tsgo.exe" : "tsgo";
-	const exePath = path.join(packageDir, "lib", binaryName);
+	const exeName = binaryName + (process.platform === "win32" ? ".exe" : "");
+	const exePath = path.join(packageDir, "lib", exeName);
 	if (!(yield* fs.exists(exePath))) return yield* fail(new ResolvePackagedBinaryError({ reason: "Executable not found: " + exePath }));
 	return exePath;
 });
 const patch = gen(function* () {
 	const fs = yield* FileSystem;
 	const path = yield* Path;
-	const targetPath = yield* getNativePreviewBinaryPath;
+	const { targetPath, binaryName } = yield* getNativeBackendBinaryPath;
 	const backupPath = path.join(path.dirname(targetPath), path.basename(targetPath) + ".original");
-	const ourBinaryPath = yield* getPackagedBinaryPath;
+	const ourBinaryPath = yield* getPackagedBinaryPath(binaryName);
 	if (!(yield* fs.exists(targetPath))) return yield* fail(new MissingTargetBinaryError({ targetPath }));
 	let actualBackupPath = backupPath;
 	let counter = 1;
@@ -207464,7 +207559,7 @@ const patch = gen(function* () {
 const unpatch = gen(function* () {
 	const fs = yield* FileSystem;
 	const path = yield* Path;
-	const targetPath = yield* getNativePreviewBinaryPath;
+	const { targetPath } = yield* getNativeBackendBinaryPath;
 	const backupPath = path.join(path.dirname(targetPath), path.basename(targetPath) + ".original");
 	if (!(yield* fs.exists(backupPath))) {
 		yield* error("No backup found at " + backupPath + ". Nothing to restore.");
@@ -207483,7 +207578,7 @@ const unpatch = gen(function* () {
 });
 const patchCommand = make("patch").pipe(withDescription("Patch the Effect Language Service binary"), withHandler(() => patch));
 const unpatchCommand = make("unpatch").pipe(withDescription("Unpatch and restore the original TypeScript-Go binary"), withHandler(() => unpatch));
-const getExePathCommand = make("get-exe-path").pipe(withDescription("Print the Effect Language Service executable path"), withHandler(() => getPackagedBinaryPath.pipe(flatMap((exePath) => log(exePath)))));
+const getExePathCommand = make("get-exe-path").pipe(withDescription("Print the Effect Language Service executable path"), withHandler(() => getPackagedBinaryPath().pipe(flatMap((exePath) => log(exePath)))));
 make("tsgo").pipe(withSubcommands([
 	patchCommand,
 	unpatchCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/tsgo",
-  "version": "0.14.6",
+  "version": "0.15.0",
   "description": "Effect Language Service for TypeScript-Go — Effect-specific diagnostics and hover features.",
   "license": "MIT",
   "repository": {
@@ -22,13 +22,13 @@
     "README.md"
   ],
   "optionalDependencies": {
-    "@effect/tsgo-win32-x64": "0.14.6",
-    "@effect/tsgo-win32-arm64": "0.14.6",
-    "@effect/tsgo-linux-x64": "0.14.6",
-    "@effect/tsgo-linux-arm64": "0.14.6",
-    "@effect/tsgo-linux-arm": "0.14.6",
-    "@effect/tsgo-darwin-x64": "0.14.6",
-    "@effect/tsgo-darwin-arm64": "0.14.6"
+    "@effect/tsgo-win32-x64": "0.15.0",
+    "@effect/tsgo-win32-arm64": "0.15.0",
+    "@effect/tsgo-linux-x64": "0.15.0",
+    "@effect/tsgo-linux-arm64": "0.15.0",
+    "@effect/tsgo-linux-arm": "0.15.0",
+    "@effect/tsgo-darwin-x64": "0.15.0",
+    "@effect/tsgo-darwin-arm64": "0.15.0"
   },
   "devDependencies": {
     "@effect/platform-node": "^4.0.0-beta.83",