@tsrx/oxc 0.8.0 → 0.10.0

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="https://compiled.run/oxc-tsrx">
+  <a href="https://oxc.tsrx.dev">
     <img alt="OXC for TSRX" width="600" src="https://raw.githubusercontent.com/tsrx-org/oxc/HEAD/.github/assets/readme-hero.png">
   </a>
 </p>
@@ -26,7 +26,7 @@ written in Rust. This package teaches them to read `.tsrx` too.
 
 _OXC for TSRX is the official OXC integration maintained by the TSRX project._
 
-[**Docs**](https://compiled.run/oxc-tsrx) &nbsp;·&nbsp; [**Getting started**](https://compiled.run/oxc-tsrx/guide/getting-started) &nbsp;·&nbsp; [**Playground**](https://compiled.run/oxc-tsrx/playground)
+[**Docs**](https://oxc.tsrx.dev) &nbsp;·&nbsp; [**Getting started**](https://oxc.tsrx.dev/guide/getting-started) &nbsp;·&nbsp; [**Playground**](https://oxc.tsrx.dev/playground)
 
 ## Install
 
@@ -37,11 +37,11 @@ npm install --save-dev @tsrx/oxc
 That is the whole setup, for the command line and for your editor. You get
 `oxlint` and `oxfmt`, the real [OXC](https://oxc.rs) commands, now able to read
 `.tsrx`, with no config file, no ignore file, and no install script. [Vite+ needs
-one more command](https://compiled.run/oxc-tsrx/guide/getting-started#try-it-with-vite).
+one more command](https://oxc.tsrx.dev/guide/getting-started#try-it-with-vite).
 
 You do not need Rust installed: the install downloads a ready-built program for
 your machine, one of eight published for macOS, Linux, and Windows. See
-[Platform support](https://compiled.run/oxc-tsrx/reference/platform-support).
+[Platform support](https://oxc.tsrx.dev/reference/platform-support).
 
 ## Usage
 
@@ -64,7 +64,7 @@ These are the TSRX blocks the linter and formatter understand: `@{` blocks,
 `@if` / `@else if` / `@else`, `@for` / `@empty`, `@switch` / `@case` /
 `@default`, `@try` / `@pending` / `@catch`, tags whose name is an expression,
 `<{expression}>`, and plain `<style>` blocks
-([TSRX syntax](https://compiled.run/oxc-tsrx/guide/tsrx-syntax) shows each one). Anything
+([TSRX syntax](https://oxc.tsrx.dev/guide/tsrx-syntax) shows each one). Anything
 outside that list **fails closed**: the command stops and says what it found and
 where, rather than guessing and maybe producing wrong output.
 
@@ -82,7 +82,7 @@ underlines the same problems the terminal reports. One catch: the TSRX
 toolchain's own extension owns `.tsrx`, and the OXC extension lists no
 activation event for it, so it does not start on its own. Open any JavaScript,
 TypeScript, or JSON file in the project once, and `.tsrx` works for the rest of
-the session. See the [editor guide](https://compiled.run/oxc-tsrx/integrations/editor).
+the session. See the [editor guide](https://oxc.tsrx.dev/integrations/editor).
 
 ## Using it from your own code
 
@@ -94,7 +94,7 @@ import { format } from "@tsrx/oxc/format";
 
 The parser hands back the structure of your file and the formatter hands back
 tidied text, so you can build your own tools on the same reader the commands
-use. [Parsing](https://compiled.run/oxc-tsrx/guide/parsing) has the shape it returns.
+use. [Parsing](https://oxc.tsrx.dev/guide/parsing) has the shape it returns.
 None of these compiles `.tsrx` either; that stays your framework's TSRX
 plugin's job.
 
@@ -121,16 +121,16 @@ editor both say when they have done that, and
 so it refuses `jsPlugins` and names `oxlint` as the command that can.
 `@tsrx/oxc/lint/plugins-dev` is for *writing* a plugin, since it re-exports the
 `RuleTester` from `oxlint`. See [Custom JavaScript
-plugins](https://compiled.run/oxc-tsrx/integrations/custom-js-plugins).
+plugins](https://oxc.tsrx.dev/integrations/custom-js-plugins).
 
 ## Documentation
 
-- [Getting started](https://compiled.run/oxc-tsrx/guide/getting-started): install, first file, first run.
-- [Configuration](https://compiled.run/oxc-tsrx/integrations/configuration): every supported setting.
-- [CLI reference](https://compiled.run/oxc-tsrx/reference/cli): commands, flags, and exit codes.
-- [Platform support](https://compiled.run/oxc-tsrx/reference/platform-support): which of the eight published platforms are tested on every change.
-- [Limitations](https://compiled.run/oxc-tsrx/reference/limitations): what is not claimed yet.
-- [Provider protocol](https://compiled.run/oxc-tsrx/architecture/provider-protocol): the `oxc.provider` block, what reads it today, and how a plain install reaches released hosts.
+- [Getting started](https://oxc.tsrx.dev/guide/getting-started): install, first file, first run.
+- [Configuration](https://oxc.tsrx.dev/integrations/configuration): every supported setting.
+- [CLI reference](https://oxc.tsrx.dev/reference/cli): commands, flags, and exit codes.
+- [Platform support](https://oxc.tsrx.dev/reference/platform-support): which of the eight published platforms are tested on every change.
+- [Limitations](https://oxc.tsrx.dev/reference/limitations): what is not claimed yet.
+- [Provider protocol](https://oxc.tsrx.dev/architecture/provider-protocol): the `oxc.provider` block, what reads it today, and how a plain install reaches released hosts.
 
 `@tsrx/oxc` is the only package to depend on. The eight `@tsrx/oxc-*`
 packages are platform binaries in `optionalDependencies`, and you never name one

package/dist/bin/oxc-tsrx.js

@@ -20,7 +20,10 @@ setup, status, and remove are the temporary compatibility bridge for consumers
 whose resolver is not provider-aware yet. The bridge creates the exact
 oxc-parser, oxlint, and oxfmt package-name facades those consumers need, and one
 fourth slot for the editor. Transitive official packages in those exact slots are
-preserved and restored; direct or unrecognized packages are never replaced.
+preserved and restored; direct or unrecognized packages are never replaced. An
+official oxlint or oxfmt you declare yourself keeps its slot and its command
+name (reported as a collision, with what that means); setup still writes the
+editor slot so the official OXC extension serves .tsrx through this package.
 
 The editor slot is the one thing setup writes outside node_modules. When
 node_modules/.bin/oxlint belongs to another tool, the official OXC extension

package/dist/bin/oxlint.js

@@ -8,13 +8,16 @@ try {
 	const { decideCanonicalCommand, deferralNotice, runOfficialCommand } = await import("../canonical-command.js");
 	const args = process.argv.slice(2);
 	const decision = await decideCanonicalCommand("oxlint");
-	if (decision.owner === "project") {
+	if (args.some((argument) => argument.split("=", 1)[0] === "--lsp")) {
+		const { runOxlintLspMultiplexer } = await import("../oxlint-lsp-multiplexer.js");
+		process.exitCode = await runOxlintLspMultiplexer(args, decision.owner === "project" ? { canonical: {
+			binPath: decision.binPath,
+			version: decision.officialVersion
+		} } : {});
+	} else if (decision.owner === "project") {
 		const notice = deferralNotice(decision, args);
 		if (notice !== null) console.error(notice);
 		await runOfficialCommand(decision);
-	} else if (args.some((argument) => argument.split("=", 1)[0] === "--lsp")) {
-		const { runOxlintLspMultiplexer } = await import("../oxlint-lsp-multiplexer.js");
-		process.exitCode = await runOxlintLspMultiplexer(args);
 	} else {
 		const { canRunCanonicalOxlint, importDeclaredPackageBinary, planCanonicalOxlintComposition } = await import("../lint-invocation.js");
 		if (canRunCanonicalOxlint(args)) await importDeclaredPackageBinary("oxlint-current", "oxlint", import.meta.url);

package/dist/compat.d.ts

@@ -8,8 +8,22 @@ export type OxcTsrxCompatibilityState =
 export interface OxcTsrxCompatibilitySlot {
   readonly name: "oxc-parser" | "oxlint" | "oxfmt";
   readonly capability: "parser" | "lint" | "format";
+  /** The command name the slot's package publishes, or null for the parser slot. */
+  readonly binary: "oxlint" | "oxfmt" | null;
   readonly path: string;
   readonly state: OxcTsrxCompatibilityState;
+  /**
+   * Why a `collision` slot is left alone. `direct-dependency` is the project's
+   * own official package; `setup` works around it and the report explains it.
+   * The other kinds are trees the bridge no longer owns and `setup` refuses.
+   */
+  readonly collision?:
+    | "direct-dependency"
+    | "foreign-package"
+    | "reinstalled-over-facade"
+    | "facade-without-backup";
+  /** What occupies a `collision` slot, as its own package.json names it. */
+  readonly occupant?: { readonly name: string | null; readonly version: string | null };
   readonly replacedPackage?: {
     readonly name: string;
     readonly version: string;

package/dist/compat.js

@@ -561,14 +561,22 @@ async function inspectSlot(modules, slot, providerVersion, projectManifest) {
 	};
 	const manifest = await readJson(join(destination, "package.json")).catch(() => null);
 	const metadata = compatibilityMetadata(manifest);
+	const occupant = {
+		name: typeof manifest?.name === "string" ? manifest.name : null,
+		version: typeof manifest?.version === "string" ? manifest.version : null
+	};
+	const collision = (kind) => ({
+		slot,
+		destination,
+		state: "collision",
+		metadata: null,
+		collision: kind,
+		occupant
+	});
 	if (!metadata || metadata.capability !== slot.capability) {
-		if (manifest?.name === slot.name && typeof manifest.version === "string" && !directlySelected(projectManifest, slot.name)) {
-			if (await exists(backupPath(modules, slot))) return {
-				slot,
-				destination,
-				state: "collision",
-				metadata: null
-			};
+		if (manifest?.name === slot.name && typeof manifest.version === "string") {
+			if (directlySelected(projectManifest, slot.name)) return collision("direct-dependency");
+			if (await exists(backupPath(modules, slot))) return collision("reinstalled-over-facade");
 			return {
 				slot,
 				destination,
@@ -580,19 +588,9 @@ async function inspectSlot(modules, slot, providerVersion, projectManifest) {
 				}
 			};
 		}
-		return {
-			slot,
-			destination,
-			state: "collision",
-			metadata: null
-		};
+		return collision("foreign-package");
 	}
-	if (metadata.replacedPackage && !await exists(backupPath(modules, slot))) return {
-		slot,
-		destination,
-		state: "collision",
-		metadata: null
-	};
+	if (metadata.replacedPackage && !await exists(backupPath(modules, slot))) return collision("facade-without-backup");
 	return {
 		slot,
 		destination,
@@ -1345,12 +1343,17 @@ async function compatibilityStatus(options = {}) {
 		packageManager: await detectPackageManager(projectRoot, options.userAgent),
 		providerVersion: provider.manifest.version,
 		selectedFrom: provider.selectedFrom,
-		slots: slots.map(({ slot, destination, state, replacedPackage }) => ({
+		slots: slots.map(({ slot, destination, state, replacedPackage, collision, occupant }) => ({
 			name: slot.name,
 			capability: slot.capability,
+			binary: slot.binary,
 			path: destination,
 			state,
-			...replacedPackage ? { replacedPackage } : {}
+			...replacedPackage ? { replacedPackage } : {},
+			...collision ? {
+				collision,
+				occupant
+			} : {}
 		})),
 		editorSlot: await inspectEditorSlot(projectRoot, provider.root, modules, options),
 		languageSupport: await inspectLanguageSupport(projectRoot, modules)
@@ -1358,8 +1361,8 @@ async function compatibilityStatus(options = {}) {
 }
 async function setupCompatibility(options = {}) {
 	const status = await compatibilityStatus(options);
-	const collisions = status.slots.filter((slot) => slot.state === "collision");
-	if (collisions.length > 0) throw new Error(`refusing to replace unowned package slot(s): ${collisions.map((slot) => slot.name).join(", ")}. Installing on top of the existing node_modules does not free the slot, so run rm -rf node_modules, install again, and run ${PROVIDER} setup again`);
+	const refused = status.slots.filter((slot) => slot.state === "collision" && slot.collision !== "direct-dependency");
+	if (refused.length > 0) throw new Error(`refusing to replace unowned package slot(s): ${refused.map((slot) => slot.name).join(", ")}. Installing on top of the existing node_modules does not free the slot, so run rm -rf node_modules, install again, and run ${PROVIDER} setup again`);
 	const modules = join(status.projectRoot, "node_modules");
 	if (!await exists(modules)) throw new Error(`node_modules is missing under ${status.projectRoot}; install dependencies first`);
 	let tsconfigWrite = null;
@@ -1407,7 +1410,7 @@ async function setupCompatibility(options = {}) {
 		languageSupport,
 		...tsconfigWrite ? { tsconfigWrite } : {},
 		changed,
-		unchanged: [...status.slots.filter((slot) => slot.state === "active").map((slot) => slot.name), ...editorWritten ? [] : [status.editorSlot.name]]
+		unchanged: [...status.slots.filter((slot) => slot.state === "active" || slot.state === "collision").map((slot) => slot.name), ...editorWritten ? [] : [status.editorSlot.name]]
 	};
 }
 async function removeCompatibility(options = {}) {
@@ -1466,6 +1469,20 @@ async function removeCompatibility(options = {}) {
 		removed
 	};
 }
+/**
+* What a package-slot collision means for the reader, by kind. Only the direct
+* dependency gets prose in the report, because it is the one a reader can act on
+* two different ways and the one that used to be a silent failure: the command
+* names stay with their package, so the drop-in `oxlint`/`oxfmt` skip `.tsrx`
+* with nothing on the command line saying so under pnpm.
+*/
+const SLOT_COLLISION_EXPLANATION = Object.freeze({ "direct-dependency": (slot) => {
+	const version = slot.occupant?.version ? ` ${slot.occupant.version}` : "";
+	if (!slot.binary) return `${slot.name}${version} is declared in your package.json, so that slot is yours and was left alone. Import @tsrx/oxc/parser for .tsrx.`;
+	const leaf = slot.name === "oxlint" ? "oxc-tsrx-lint" : "oxc-tsrx-fmt";
+	const editor = slot.name === "oxlint" ? ` The editor is wired separately: with "${EDITOR_SLOT.key}" written, the official OXC extension serves .tsrx through this package and keeps ordinary files on your own oxlint.` : " The editor is unaffected: .tsrx formatting rides on the oxlint --lsp connection.";
+	return `${slot.name}${version} is declared in your package.json, so the ${slot.binary} command belongs to it: on the command line it runs exactly as it did before ${PROVIDER} was installed, and it does not read .tsrx files. Run ${leaf} for .tsrx, or remove the direct ${slot.name} dependency and let this package serve both, at the ${slot.name} version this package bundles rather than the one you pinned.${editor}`;
+} });
 const EDITOR_SLOT_EXPLANATION = Object.freeze({
 	active: (slot, projectRoot) => `${toPosix(relative(projectRoot, slot.path))} carries "${slot.key}": "${slot.value}". This is the one file setup writes outside node_modules; it merges that single key and never edits package.json or tsconfig.json.`,
 	stale: (slot, projectRoot) => `${toPosix(relative(projectRoot, slot.path))} carries a "${slot.key}" this package wrote that no longer resolves here; setup refreshes it to "${slot.value}".`,
@@ -1585,6 +1602,12 @@ function formatCompatibilityReport(result) {
 		const gutter = `  ${`${name}:`.padEnd(nameWidth + 1)}  `;
 		lines.push(`${gutter}${paint(label, SLOT_STATE_STYLE[state] ?? "cyan", color)}`);
 	}
+	for (const slot of result.slots) {
+		const explain = slot.state === "collision" ? SLOT_COLLISION_EXPLANATION[slot.collision] : null;
+		if (!explain) continue;
+		lines.push("");
+		for (const line of wrapReportText(explain(slot), "      ", "      ", width)) lines.push(paint(line, "dim", color));
+	}
 	if (editor) {
 		const explain = EDITOR_SLOT_EXPLANATION[editor.state];
 		if (explain) {

package/dist/oxlint-lsp-multiplexer.js

@@ -566,6 +566,11 @@ async function runOxlintLspMultiplexer(args, options = {}) {
 	const spawnProcess = options.spawn ?? spawn;
 	const clientError = options.clientError ?? process.stderr;
 	const cwd = options.cwd ?? process.cwd();
+	const canonicalBinary = options.canonical?.binPath ?? resolveCanonicalOxlintBinary();
+	if (options.canonical?.binPath) {
+		const version = options.canonical.version ? ` ${options.canonical.version}` : "";
+		clientError.write(`oxlint (oxc-tsrx): ordinary documents are served by the official oxlint${version} this project declares (${options.canonical.binPath}); .tsrx documents by the native server\n`);
+	}
 	const childOptions = {
 		cwd,
 		env: {
@@ -584,7 +589,7 @@ async function runOxlintLspMultiplexer(args, options = {}) {
 		cwd: index.root
 	} : childOptions;
 	const providers = providerLspSessions(index, spawnProcess, providerOptions);
-	const canonical = spawnProcess(process.execPath, [resolveCanonicalOxlintBinary(), ...args], childOptions);
+	const canonical = spawnProcess(process.execPath, [canonicalBinary, ...args], childOptions);
 	const multiplexer = createOxlintLspMultiplexer({
 		providerRoot: providerOptions === childOptions ? null : index.root,
 		clientInput: options.clientInput ?? process.stdin,

package/dist/parser.js

@@ -3,7 +3,7 @@ import { isTsrxBinaryProgram, parseTrustedTsrxProgram, parseTsrxProgram } from "
 import { createRequire } from "node:module";
 //#region src/parser.ts
 const require = createRequire(import.meta.url);
-const PACKAGE_VERSION = "0.8.0";
+const PACKAGE_VERSION = "0.10.0";
 const parserManifest = Object.freeze({
 	name: "@tsrx/oxc",
 	version: PACKAGE_VERSION,
@@ -107,7 +107,7 @@ const capabilities = Object.freeze({
 	oxcRevision: OXC_REVISION,
 	lazy: true,
 	async: true,
-	editorRecovery: false,
+	editorRecovery: true,
 	cssMaterialization: false,
 	rawTransfer: false
 });
@@ -239,7 +239,7 @@ function expectedCapabilities() {
 	return {
 		lazy: true,
 		async: true,
-		editorRecovery: false,
+		editorRecovery: true,
 		cssMaterialization: false,
 		rawTransfer: false
 	};

package/dist/tsrx-core-compat/facade.js

@@ -949,7 +949,7 @@ function materializeCompatibilityProgram(program, source, filename, loose, posit
 			if (value.pending != null && value.pendingKeyword == null) value.pendingKeyword = keywordSpan(source, "@pending", value.block?.end ?? value.start, value.pending?.end ?? value.end, positionAt);
 			if (value.handler != null && value.handlerKeyword == null) value.handlerKeyword = keywordSpan(source, "@catch", value.pending?.end ?? value.block?.end ?? value.start, value.handler?.end ?? value.end, positionAt);
 		}
-		if (value.type === "JSXStyleElement" && typeof value.css === "string") {
+		if (value.type === "JSXStyleElement" && typeof value.css === "string" && value.openingElement?.selfClosing !== true) {
 			const style = parse_style(value.css, {
 				filename,
 				line: value.openingElement?.loc?.start?.line ?? value.loc?.start?.line ?? 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsrx/oxc",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "The official OXC integration for TSRX — Rust-native Oxlint and Oxfmt for .tsrx, JavaScript, TypeScript, and JSX",
   "keywords": [
     "formatter",
@@ -14,7 +14,7 @@
     "tsrx",
     "typescript"
   ],
-  "homepage": "https://compiled.run/oxc-tsrx",
+  "homepage": "https://oxc.tsrx.dev",
   "bugs": {
     "url": "https://github.com/tsrx-org/oxc/issues"
   },
@@ -128,14 +128,14 @@
     "tinyglobby": "0.2.17"
   },
   "optionalDependencies": {
-    "@tsrx/oxc-darwin-arm64": "0.8.0",
-    "@tsrx/oxc-darwin-x64": "0.8.0",
-    "@tsrx/oxc-linux-arm64-gnu": "0.8.0",
-    "@tsrx/oxc-linux-arm64-musl": "0.8.0",
-    "@tsrx/oxc-linux-x64-gnu": "0.8.0",
-    "@tsrx/oxc-linux-x64-musl": "0.8.0",
-    "@tsrx/oxc-win32-arm64-msvc": "0.8.0",
-    "@tsrx/oxc-win32-x64-msvc": "0.8.0"
+    "@tsrx/oxc-darwin-arm64": "0.10.0",
+    "@tsrx/oxc-darwin-x64": "0.10.0",
+    "@tsrx/oxc-linux-arm64-gnu": "0.10.0",
+    "@tsrx/oxc-linux-arm64-musl": "0.10.0",
+    "@tsrx/oxc-linux-x64-gnu": "0.10.0",
+    "@tsrx/oxc-linux-x64-musl": "0.10.0",
+    "@tsrx/oxc-win32-arm64-msvc": "0.10.0",
+    "@tsrx/oxc-win32-x64-msvc": "0.10.0"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"