@effect/tsgo 0.27.1 → 0.29.0

package/dist/effect-tsgo.cjs

@@ -206981,14 +206981,15 @@ var FileReadError = class extends TaggedError("FileReadError") {
 //#endregion
 //#region package.json
 var name = "@effect/tsgo";
-var version = "0.27.1";
+var version = "0.29.0";
 
 //#endregion
 //#region src/cli/setup/consts.ts
 const LSP_PACKAGE_NAME = name;
 const LSP_PLUGIN_NAME = "@effect/language-service";
 const defaultTypescriptPackageNames = ["typescript", "@typescript/native"];
-const PATCH_COMMAND = "effect-tsgo patch";
+const OXLINT_PACKAGE_NAME = "oxlint";
+const OXLINT_TSGOLINT_PACKAGE_NAME = "oxlint-tsgolint";
 /**
 * `typescript` package versions >= 7 ship the native Go-ported binary that this
 * tool patches. Older `typescript` releases (<= 6) are the JS compiler and must
@@ -206999,6 +207000,196 @@ const isNativeTypescriptVersion = (version) => {
 	return match !== null && Number(match[0]) >= 7;
 };
 
+//#endregion
+//#region src/cli/setup/patch-command.ts
+const integrationFlagNames = new Set([
+	"--typescript",
+	"--no-typescript",
+	"--oxlint",
+	"--no-oxlint"
+]);
+const getPatchCommand = (integrations) => {
+	const typescript = integrations.includes("typescript");
+	const oxlint = integrations.includes("oxlint");
+	if (!typescript && !oxlint) return void 0;
+	return `effect-tsgo patch ${typescript ? "--typescript" : "--no-typescript"} ${oxlint ? "--oxlint" : "--no-oxlint"}`;
+};
+const splitCommands = (script) => {
+	const ranges = [];
+	let start = 0;
+	let quote;
+	let escaped = false;
+	let nesting = 0;
+	for (let index = 0; index < script.length; index++) {
+		const char = script[index];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\" && quote !== "'") {
+			escaped = true;
+			continue;
+		}
+		if (quote !== void 0) {
+			if (char === quote) quote = void 0;
+			continue;
+		}
+		if (char === "'" || char === "\"") {
+			quote = char;
+			continue;
+		}
+		if (char === "(") {
+			nesting++;
+			continue;
+		}
+		if (char === ")" && nesting > 0) {
+			nesting--;
+			continue;
+		}
+		if (nesting > 0) continue;
+		const operatorLength = char === ";" ? 1 : (char === "&" || char === "|") && script[index + 1] === char ? 2 : char === "|" || char === "&" ? 1 : 0;
+		if (operatorLength === 0) continue;
+		ranges.push({
+			start,
+			end: index,
+			operator: script.slice(index, index + operatorLength)
+		});
+		start = index + operatorLength;
+		index += operatorLength - 1;
+	}
+	ranges.push({
+		start,
+		end: script.length
+	});
+	return ranges;
+};
+const tokenize = (script, range) => {
+	const tokens = [];
+	let index = range.start;
+	while (index < range.end) {
+		while (index < range.end && /\s/.test(script[index])) index++;
+		if (index >= range.end) break;
+		const start = index;
+		let value = "";
+		let quote;
+		let escaped = false;
+		for (; index < range.end; index++) {
+			const char = script[index];
+			if (escaped) {
+				value += char;
+				escaped = false;
+				continue;
+			}
+			if (char === "\\" && quote !== "'") {
+				escaped = true;
+				continue;
+			}
+			if (quote !== void 0) {
+				if (char === quote) quote = void 0;
+				else value += char;
+				continue;
+			}
+			if (char === "'" || char === "\"") {
+				quote = char;
+				continue;
+			}
+			if (/\s/.test(char)) break;
+			if ("<>`".includes(char) || char === "$" && script[index + 1] === "(") return void 0;
+			value += char;
+		}
+		if (quote !== void 0 || escaped) return void 0;
+		tokens.push({
+			value,
+			start,
+			end: index
+		});
+	}
+	return tokens;
+};
+const findPatchCommand = (script, range) => {
+	const tokens = tokenize(script, range);
+	if (tokens === void 0 || tokens.length < 2) return void 0;
+	let commandIndex = 0;
+	while (/^[A-Za-z_][A-Za-z0-9_]*=/.test(tokens[commandIndex]?.value ?? "")) commandIndex++;
+	if (tokens[commandIndex]?.value === "pnpm" && tokens[commandIndex + 1]?.value === "exec") commandIndex += 2;
+	else if (tokens[commandIndex]?.value === "npm" && tokens[commandIndex + 1]?.value === "exec") commandIndex += tokens[commandIndex + 2]?.value === "--" ? 3 : 2;
+	else if (tokens[commandIndex]?.value === "npx") commandIndex++;
+	if (tokens[commandIndex]?.value !== "effect-tsgo" || tokens[commandIndex + 1]?.value !== "patch") return;
+	return {
+		start: range.start,
+		end: range.end,
+		patchEnd: tokens[commandIndex + 1].end,
+		integrationFlags: tokens.slice(commandIndex + 2).filter((token) => integrationFlagNames.has(token.value)).map(({ value, start, end }) => ({
+			value,
+			start,
+			end
+		}))
+	};
+};
+const hasPatchCommand = (script) => splitCommands(script).some((range) => findPatchCommand(script, range) !== void 0);
+const getPatchIntegrations = (script) => {
+	const match = splitCommands(script).flatMap((range) => {
+		const command = findPatchCommand(script, range);
+		return command === void 0 ? [] : [command];
+	})[0];
+	if (match === void 0) return [];
+	let typescript = true;
+	let oxlint = false;
+	for (const flag of match.integrationFlags) if (flag.value === "--typescript") typescript = true;
+	else if (flag.value === "--no-typescript") typescript = false;
+	else if (flag.value === "--oxlint") oxlint = true;
+	else if (flag.value === "--no-oxlint") oxlint = false;
+	return [...typescript ? ["typescript"] : [], ...oxlint ? ["oxlint"] : []];
+};
+const updatePatchCommand = (script, integrations) => {
+	const command = getPatchCommand(integrations);
+	const ranges = splitCommands(script);
+	const matches = ranges.flatMap((range) => {
+		const match = findPatchCommand(script, range);
+		return match === void 0 ? [] : [match];
+	});
+	if (matches.length === 0) return {
+		script,
+		found: false
+	};
+	if (command !== void 0) {
+		const flags = command.slice(17);
+		let updated = script;
+		for (const match of [...matches].reverse()) {
+			let suffix = updated.slice(match.patchEnd, match.end);
+			for (const flag of [...match.integrationFlags].reverse()) {
+				const relativeStart = flag.start - match.patchEnd;
+				const relativeEnd = flag.end - match.patchEnd;
+				const whitespaceStart = suffix.slice(0, relativeStart).search(/\s+$/);
+				suffix = suffix.slice(0, whitespaceStart < 0 ? relativeStart : whitespaceStart) + suffix.slice(relativeEnd);
+			}
+			updated = updated.slice(0, match.patchEnd) + flags + suffix + updated.slice(match.end);
+		}
+		return {
+			script: updated,
+			found: true
+		};
+	}
+	if (ranges.some((range) => range.operator === "||" || range.operator === "|" || range.operator === "&")) return {
+		script,
+		found: false
+	};
+	let updated = script;
+	for (const match of [...matches].reverse()) {
+		const before = updated.slice(0, match.start);
+		const after = updated.slice(match.end);
+		const previousOperator = /\s*(?:&&|\|\||[;|&])\s*$/.exec(before);
+		const nextOperator = /^\s*(?:&&|\|\||[;|&])\s*/.exec(after);
+		if (previousOperator !== null && nextOperator?.[0].trim() !== "&&") updated = before.slice(0, previousOperator.index) + after;
+		else if (nextOperator !== null) updated = before + (/^\s*/.exec(updated.slice(match.start, match.end))?.[0] ?? "") + after.slice(nextOperator[0].length);
+		else updated = before + after;
+	}
+	return {
+		script: updated.trim(),
+		found: true
+	};
+};
+
 //#endregion
 //#region src/cli/setup/assessment.ts
 /**
@@ -207053,6 +207244,8 @@ const assessPackageJson = (input) => {
 		return none$3();
 	};
 	const lspVersion = assessDependency(LSP_PACKAGE_NAME);
+	const oxlintVersion = assessDependency(OXLINT_PACKAGE_NAME);
+	const oxlintTsgolintVersion = assessDependency(OXLINT_TSGOLINT_PACKAGE_NAME);
 	let typescriptVersion = none$3();
 	for (const packageName of defaultTypescriptPackageNames) {
 		const typescriptDep = assessDependency(packageName);
@@ -207066,7 +207259,8 @@ const assessPackageJson = (input) => {
 	}
 	const prepareScript = "prepare" in (parsed.scripts ?? {}) ? some({
 		script: parsed.scripts.prepare,
-		hasPatch: parsed.scripts.prepare.toLowerCase().includes(PATCH_COMMAND)
+		hasPatch: hasPatchCommand(parsed.scripts.prepare),
+		integrations: getPatchIntegrations(parsed.scripts.prepare)
 	}) : none$3();
 	return {
 		path: input.fileName,
@@ -207075,6 +207269,8 @@ const assessPackageJson = (input) => {
 		text: input.text,
 		lspVersion,
 		typescriptVersion,
+		oxlintVersion,
+		oxlintTsgolintVersion,
 		prepareScript
 	};
 };
@@ -207422,6 +207618,20 @@ const computePackageJsonChanges = (current, target) => {
 			if (!targetTypescript) return;
 			dependencyProperties.push(import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(getTypescriptPackageName(targetTypescript)), import_typescript.factory.createStringLiteral(targetTypescript.version)));
 		};
+		const appendNewOxlintDependencies = (dependencyProperties, dependencyType) => {
+			for (const [packageName, currentDependency, targetDependency] of [[
+				OXLINT_PACKAGE_NAME,
+				current.oxlintVersion,
+				target.oxlintVersion
+			], [
+				OXLINT_TSGOLINT_PACKAGE_NAME,
+				current.oxlintTsgolintVersion,
+				target.oxlintTsgolintVersion
+			]]) if (target.integrations.includes("oxlint") && isNone(currentDependency) && isSome(targetDependency) && targetDependency.value.dependencyType === dependencyType) {
+				descriptions.push(`Add ${packageName}@${targetDependency.value.version} in ${dependencyType}`);
+				dependencyProperties.push(import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(packageName), import_typescript.factory.createStringLiteral(targetDependency.value.version)));
+			}
+		};
 		const ensureTypescriptDependency = () => {
 			if (isNone(target.typescriptVersion) || isSome(current.typescriptVersion)) return;
 			const targetTypescript = target.typescriptVersion.value;
@@ -207430,6 +207640,13 @@ const computePackageJsonChanges = (current, target) => {
 			descriptions.push(`Add ${targetTypescriptPackageName}@${targetTypescript.version} to ${targetTypescript.dependencyType}`);
 			upsertDependency(tracker, current.sourceFile, rootObj, targetTypescriptPackageName, targetTypescript);
 		};
+		const ensurePinnedDependency = (packageName, currentDependency, targetDependency) => {
+			if (isNone(targetDependency)) return;
+			if (isSome(currentDependency) && currentDependency.value.version === targetDependency.value.version && currentDependency.value.dependencyType === targetDependency.value.dependencyType) return;
+			if (isNone(currentDependency) && !findDependencyCollectionProperty(rootObj, targetDependency.value.dependencyType) && isSome(target.lspVersion) && target.lspVersion.value.dependencyType === targetDependency.value.dependencyType) return;
+			descriptions.push(`${isSome(currentDependency) ? "Update" : "Add"} ${packageName}@${targetDependency.value.version} in ${targetDependency.value.dependencyType}`);
+			upsertDependency(tracker, current.sourceFile, rootObj, packageName, targetDependency.value);
+		};
 		if (isSome(target.lspVersion)) {
 			const targetDepType = target.lspVersion.value.dependencyType;
 			const targetVersion = target.lspVersion.value.version;
@@ -207447,6 +207664,7 @@ const computePackageJsonChanges = (current, target) => {
 					if (!newDepsProperty) {
 						const dependencyProperties = [import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion))];
 						if (shouldAddTypescriptWithDependencyType(targetDepType)) appendTypescriptDependencyProperty(dependencyProperties);
+						appendNewOxlintDependencies(dependencyProperties, targetDepType);
 						const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(targetDepType), import_typescript.factory.createObjectLiteralExpression(dependencyProperties, false));
 						insertNodeAtEndOfList(tracker, current.sourceFile, rootObj.properties, newDepsProp);
 					} else if (import_typescript.isObjectLiteralExpression(newDepsProperty.initializer)) insertNodeAtEndOfList(tracker, current.sourceFile, newDepsProperty.initializer.properties, import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion)));
@@ -207464,11 +207682,16 @@ const computePackageJsonChanges = (current, target) => {
 				if (!depsProperty) {
 					const dependencyProperties = [import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion))];
 					if (shouldAddTypescriptWithDependencyType(targetDepType)) appendTypescriptDependencyProperty(dependencyProperties);
+					appendNewOxlintDependencies(dependencyProperties, targetDepType);
 					const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(targetDepType), import_typescript.factory.createObjectLiteralExpression(dependencyProperties, false));
 					insertNodeAtEndOfList(tracker, current.sourceFile, rootObj.properties, newDepsProp);
 				} else if (import_typescript.isObjectLiteralExpression(depsProperty.initializer)) insertNodeAtEndOfList(tracker, current.sourceFile, depsProperty.initializer.properties, import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion)));
 			}
 			ensureTypescriptDependency();
+			if (target.integrations.includes("oxlint")) {
+				ensurePinnedDependency(OXLINT_PACKAGE_NAME, current.oxlintVersion, target.oxlintVersion);
+				ensurePinnedDependency(OXLINT_TSGOLINT_PACKAGE_NAME, current.oxlintTsgolintVersion, target.oxlintTsgolintVersion);
+			}
 		} else if (isSome(current.lspVersion)) {
 			descriptions.push(`Remove ${LSP_PACKAGE_NAME} from dependencies`);
 			const currentDepType = current.lspVersion.value.dependencyType;
@@ -207478,39 +207701,47 @@ const computePackageJsonChanges = (current, target) => {
 				if (lspProperty) deleteNodeFromList(tracker, current.sourceFile, depsProperty.initializer.properties, lspProperty);
 			}
 		}
-		if (target.prepareScript && isSome(target.lspVersion)) {
+		const patchCommand = target.prepareScript && isSome(target.lspVersion) ? getPatchCommand(target.integrations) : void 0;
+		if (!target.managePrepareScript) return;
+		else if (patchCommand !== void 0) {
 			const scriptsProperty = findPropertyInObject(rootObj, "scripts");
 			if (!scriptsProperty) {
 				descriptions.push("Add scripts section with prepare script");
-				const newScriptsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("scripts"), import_typescript.factory.createObjectLiteralExpression([import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("prepare"), import_typescript.factory.createStringLiteral(PATCH_COMMAND))], false));
+				const newScriptsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("scripts"), import_typescript.factory.createObjectLiteralExpression([import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("prepare"), import_typescript.factory.createStringLiteral(patchCommand))], false));
 				insertNodeAtEndOfList(tracker, current.sourceFile, rootObj.properties, newScriptsProp);
 			} else if (import_typescript.isObjectLiteralExpression(scriptsProperty.initializer)) {
 				const prepareProperty = findPropertyInObject(scriptsProperty.initializer, "prepare");
 				if (!prepareProperty) {
 					descriptions.push("Add prepare script");
-					const newPrepareProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("prepare"), import_typescript.factory.createStringLiteral(PATCH_COMMAND));
+					const newPrepareProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("prepare"), import_typescript.factory.createStringLiteral(patchCommand));
 					insertNodeAtEndOfList(tracker, current.sourceFile, scriptsProperty.initializer.properties, newPrepareProp);
 				} else if (isSome(current.prepareScript) && !current.prepareScript.value.hasPatch) {
 					descriptions.push("Update prepare script to include patch command");
-					const newScript = `${current.prepareScript.value.script} && ${PATCH_COMMAND}`;
+					const newScript = `${current.prepareScript.value.script} && ${patchCommand}`;
 					tracker.replaceNode(current.sourceFile, prepareProperty.initializer, import_typescript.factory.createStringLiteral(newScript));
+				} else if (isSome(current.prepareScript)) {
+					const currentScript = current.prepareScript.value.script;
+					const updated = updatePatchCommand(currentScript, target.integrations);
+					if (updated.found && updated.script !== currentScript) {
+						descriptions.push("Update effect-tsgo patch integrations in prepare script");
+						tracker.replaceNode(current.sourceFile, prepareProperty.initializer, import_typescript.factory.createStringLiteral(updated.script));
+					}
 				}
 			}
-		} else if (isNone(target.lspVersion) && isSome(current.prepareScript) && current.prepareScript.value.hasPatch) {
+		} else if (isSome(current.prepareScript) && current.prepareScript.value.hasPatch) {
 			const scriptsProperty = findPropertyInObject(rootObj, "scripts");
 			if (scriptsProperty && import_typescript.isObjectLiteralExpression(scriptsProperty.initializer)) {
 				const prepareProperty = findPropertyInObject(scriptsProperty.initializer, "prepare");
 				if (prepareProperty && import_typescript.isStringLiteral(prepareProperty.initializer)) {
 					const currentScript = current.prepareScript.value.script;
-					if (currentScript.includes("&&") || currentScript.includes(";")) {
+					const updated = updatePatchCommand(currentScript, []);
+					if (updated.found && updated.script.length > 0) {
 						descriptions.push("Remove effect-tsgo patch command from prepare script");
-						messages.push("WARNING: Your prepare script contained multiple commands. I attempted to automatically remove only the 'effect-tsgo patch' command. Please verify that the prepare script is correct after this change.");
-						const newScript = currentScript.replace(/\s*&&\s*effect-tsgo\s+patch/g, "").replace(/effect-tsgo\s+patch\s*&&\s*/g, "").replace(/\s*;\s*effect-tsgo\s+patch/g, "").replace(/effect-tsgo\s+patch\s*;\s*/g, "").trim();
-						tracker.replaceNode(current.sourceFile, prepareProperty.initializer, import_typescript.factory.createStringLiteral(newScript));
-					} else {
+						tracker.replaceNode(current.sourceFile, prepareProperty.initializer, import_typescript.factory.createStringLiteral(updated.script));
+					} else if (updated.found) {
 						descriptions.push("Remove prepare script with patch command");
 						deleteNodeFromList(tracker, current.sourceFile, scriptsProperty.initializer.properties, prepareProperty);
-					}
+					} else messages.push("WARNING: The prepare script uses shell control flow that cannot be safely rewritten. Remove the effect-tsgo patch command manually.");
 				}
 			}
 		}
@@ -207540,9 +207771,30 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 	const messages = [];
 	const rootObj = getRootObject(current.sourceFile);
 	if (!rootObj) return emptyFileChangesResult();
+	const isEffectSchemaProperty = (property) => property !== void 0 && import_typescript.isStringLiteral(property.initializer) && property.initializer.text.replaceAll("\\", "/").endsWith("node_modules/@effect/tsgo/schema.json");
 	const compilerOptionsProperty = findPropertyInObject(rootObj, "compilerOptions");
 	if (!compilerOptionsProperty || !import_typescript.isObjectLiteralExpression(compilerOptionsProperty.initializer)) {
-		if (isNone(lspVersion)) return emptyFileChangesResult();
+		if (isNone(lspVersion)) {
+			if (!target.manageIntegration) return emptyFileChangesResult();
+			const schemaProperty = findPropertyInObject(rootObj, "$schema");
+			if (!isEffectSchemaProperty(schemaProperty)) return emptyFileChangesResult();
+			const ctx = createTrackerContext();
+			const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
+				descriptions.push("Remove $schema from tsconfig");
+				deleteNodeFromList(tracker, current.sourceFile, rootObj.properties, schemaProperty);
+			}).find((fc) => fc.fileName === current.sourceFile.fileName);
+			return {
+				codeActions: fileChange ? [{
+					description: descriptions.join("; "),
+					changes: [{
+						fileName: current.sourceFile.fileName,
+						textChanges: fileChange.textChanges,
+						isNewFile: false
+					}]
+				}] : [],
+				messages
+			};
+		}
 		const ctx = createTrackerContext();
 		const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
 			const schemaProperty = findPropertyInObject(rootObj, "$schema");
@@ -207557,7 +207809,7 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 				if (schemaProperty && property === schemaProperty && isSome(schemaPropertyAssignment)) return schemaPropertyAssignment.value;
 				return property;
 			});
-			if (shouldAddSchema && isSome(schemaPropertyAssignment)) nextProperties.push(schemaPropertyAssignment.value);
+			if (shouldAddSchema && isSome(schemaPropertyAssignment)) nextProperties.unshift(schemaPropertyAssignment.value);
 			nextProperties.push(compilerOptionsAssignment);
 			tracker.replaceNode(current.sourceFile, rootObj, import_typescript.factory.createObjectLiteralExpression(nextProperties, true));
 		}).find((fc) => fc.fileName === current.sourceFile.fileName);
@@ -207584,20 +207836,46 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 		const schemaProperty = findPropertyInObject(rootObj, "$schema");
 		const pluginsProperty = findPropertyInObject(compilerOptions, "plugins");
 		const schemaPropertyAssignment = map$11(target.schemaPath, (schemaPath) => import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("$schema"), import_typescript.factory.createStringLiteral(schemaPath)));
+		const updateDiagnosticSeverity = (lspPluginElement) => {
+			const diagnosticSeverityProperty = findPropertyInObject(lspPluginElement, "diagnosticSeverity");
+			if (isSome(target.diagnosticSeverities)) {
+				const newDiagnosticSeverityValue = createDiagnosticSeverityObject(target.diagnosticSeverities.value);
+				if (!diagnosticSeverityProperty) {
+					descriptions.push(`Add diagnosticSeverity to ${LSP_PLUGIN_NAME} plugin`);
+					insertNodeAtEndOfList(tracker, current.sourceFile, lspPluginElement.properties, import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("diagnosticSeverity"), newDiagnosticSeverityValue));
+				} else {
+					descriptions.push(`Update diagnosticSeverity in ${LSP_PLUGIN_NAME} plugin`);
+					tracker.replaceNode(current.sourceFile, diagnosticSeverityProperty.initializer, newDiagnosticSeverityValue);
+				}
+			} else if (diagnosticSeverityProperty) {
+				descriptions.push(`Remove diagnosticSeverity from ${LSP_PLUGIN_NAME} plugin`);
+				deleteNodeFromList(tracker, current.sourceFile, lspPluginElement.properties, diagnosticSeverityProperty);
+			}
+		};
+		const findLspPlugin = () => {
+			if (!pluginsProperty || !import_typescript.isArrayLiteralExpression(pluginsProperty.initializer)) return void 0;
+			return pluginsProperty.initializer.elements.find((element) => {
+				if (!import_typescript.isObjectLiteralExpression(element)) return false;
+				const nameProperty = findPropertyInObject(element, "name");
+				return nameProperty !== void 0 && import_typescript.isStringLiteral(nameProperty.initializer) && nameProperty.initializer.text === LSP_PLUGIN_NAME;
+			});
+		};
+		if (!target.manageIntegration) {
+			const lspPluginElement = findLspPlugin();
+			if (lspPluginElement) {
+				updateDiagnosticSeverity(lspPluginElement);
+				return;
+			}
+			if (isNone(lspVersion)) return;
+		}
 		if (isNone(lspVersion)) {
-			if (schemaProperty) {
+			if (isEffectSchemaProperty(schemaProperty)) {
 				descriptions.push("Remove $schema from tsconfig");
 				deleteNodeFromList(tracker, current.sourceFile, rootObj.properties, schemaProperty);
 			}
 			if (pluginsProperty && import_typescript.isArrayLiteralExpression(pluginsProperty.initializer)) {
 				const pluginsArray = pluginsProperty.initializer;
-				const lspPluginElement = pluginsArray.elements.find((element) => {
-					if (import_typescript.isObjectLiteralExpression(element)) {
-						const nameProperty = findPropertyInObject(element, "name");
-						if (nameProperty && import_typescript.isStringLiteral(nameProperty.initializer)) return nameProperty.initializer.text === LSP_PLUGIN_NAME;
-					}
-					return false;
-				});
+				const lspPluginElement = findLspPlugin();
 				if (lspPluginElement) {
 					descriptions.push(`Remove ${LSP_PLUGIN_NAME} plugin from tsconfig`);
 					deleteNodeFromList(tracker, current.sourceFile, pluginsArray.elements, lspPluginElement);
@@ -207606,7 +207884,7 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 		} else {
 			if (!schemaProperty && isSome(schemaPropertyAssignment)) {
 				descriptions.push("Add $schema to tsconfig");
-				insertNodeAtEndOfList(tracker, current.sourceFile, rootObj.properties, schemaPropertyAssignment.value);
+				tracker.insertNodeAtObjectStart(current.sourceFile, rootObj, schemaPropertyAssignment.value);
 			} else if (schemaProperty && isSome(target.schemaPath) && (!import_typescript.isStringLiteral(schemaProperty.initializer) || schemaProperty.initializer.text !== target.schemaPath.value)) {
 				descriptions.push("Update $schema in tsconfig");
 				tracker.replaceNode(current.sourceFile, schemaProperty.initializer, getOrThrow(schemaPropertyAssignment).initializer);
@@ -207618,32 +207896,11 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 				insertNodeAtEndOfList(tracker, current.sourceFile, compilerOptions.properties, newPluginsProp);
 			} else if (import_typescript.isArrayLiteralExpression(pluginsProperty.initializer)) {
 				const pluginsArray = pluginsProperty.initializer;
-				const lspPluginElement = pluginsArray.elements.find((element) => {
-					if (import_typescript.isObjectLiteralExpression(element)) {
-						const nameProperty = findPropertyInObject(element, "name");
-						if (nameProperty && import_typescript.isStringLiteral(nameProperty.initializer)) return nameProperty.initializer.text === LSP_PLUGIN_NAME;
-					}
-					return false;
-				});
+				const lspPluginElement = findLspPlugin();
 				if (!lspPluginElement) {
 					descriptions.push(`Add ${LSP_PLUGIN_NAME} plugin to existing plugins array`);
 					insertNodeAtEndOfList(tracker, current.sourceFile, pluginsArray.elements, pluginObject);
-				} else if (import_typescript.isObjectLiteralExpression(lspPluginElement)) {
-					const diagnosticSeverityProperty = findPropertyInObject(lspPluginElement, "diagnosticSeverity");
-					if (isSome(target.diagnosticSeverities)) {
-						const newDiagnosticSeverityValue = createDiagnosticSeverityObject(target.diagnosticSeverities.value);
-						if (!diagnosticSeverityProperty) {
-							descriptions.push(`Add diagnosticSeverity to ${LSP_PLUGIN_NAME} plugin`);
-							insertNodeAtEndOfList(tracker, current.sourceFile, lspPluginElement.properties, import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("diagnosticSeverity"), newDiagnosticSeverityValue));
-						} else if (import_typescript.isPropertyAssignment(diagnosticSeverityProperty)) {
-							descriptions.push(`Update diagnosticSeverity in ${LSP_PLUGIN_NAME} plugin`);
-							tracker.replaceNode(current.sourceFile, diagnosticSeverityProperty.initializer, newDiagnosticSeverityValue);
-						}
-					} else if (diagnosticSeverityProperty) {
-						descriptions.push(`Remove diagnosticSeverity from ${LSP_PLUGIN_NAME} plugin`);
-						deleteNodeFromList(tracker, current.sourceFile, lspPluginElement.properties, diagnosticSeverityProperty);
-					}
-				}
+				} else if (import_typescript.isObjectLiteralExpression(lspPluginElement)) updateDiagnosticSeverity(lspPluginElement);
 			}
 		}
 	}).find((fc) => fc.fileName === current.path);
@@ -207715,7 +207972,7 @@ const computeChanges = (assessment, target) => {
 	const packageJsonResult = computePackageJsonChanges(assessment.packageJson, target.packageJson);
 	codeActions = [...codeActions, ...packageJsonResult.codeActions];
 	messages = [...messages, ...packageJsonResult.messages];
-	const tsconfigResult = computeTsConfigChanges(assessment.tsconfig, target.tsconfig, target.packageJson.lspVersion);
+	const tsconfigResult = computeTsConfigChanges(assessment.tsconfig, target.tsconfig, target.packageJson.integrations.includes("typescript") ? target.packageJson.lspVersion : none$3());
 	codeActions = [...codeActions, ...tsconfigResult.codeActions];
 	messages = [...messages, ...tsconfigResult.messages];
 	if (target.editors.includes("vscode")) {
@@ -207746,8 +208003,16 @@ const computeChanges = (assessment, target) => {
 			}
 		}
 	}
-	if (isSome(target.packageJson.lspVersion) && codeActions.length > 0) messages = [...messages, "Run `effect-tsgo patch` to complete the installation."];
-	else if (isNone(target.packageJson.lspVersion) && isSome(assessment.packageJson.lspVersion)) messages = [...messages, "Run `effect-tsgo unpatch` to restore the original TypeScript-Go binary."];
+	if (isSome(target.packageJson.lspVersion) && codeActions.length > 0) {
+		const patchCommand = getPatchCommand(target.packageJson.integrations);
+		messages = [...messages, `Run \`${patchCommand ?? "effect-tsgo patch"}\` to complete the installation.`];
+	} else if (isNone(target.packageJson.lspVersion) && isSome(assessment.packageJson.lspVersion)) {
+		const unpatchCommand = getPatchCommand(match$8(assessment.packageJson.prepareScript, {
+			onNone: () => ["typescript"],
+			onSome: (_) => _.integrations
+		}))?.replace(" patch ", " unpatch ") ?? "effect-tsgo unpatch";
+		messages = [...messages, `Run \`${unpatchCommand}\` to restore the original integrations.`];
+	}
 	if (isSome(target.packageJson.lspVersion) && target.editors.length > 0) {
 		messages = [...messages, ""];
 		if (target.editors.includes("vscode")) messages = [
@@ -209892,11 +210157,19 @@ const fromAssessment = (inputState) => ({
 	packageJson: {
 		lspVersion: inputState.packageJson.lspVersion,
 		typescriptVersion: inputState.packageJson.typescriptVersion,
-		prepareScript: map$11(inputState.packageJson.prepareScript, (_) => _.hasPatch).pipe(getOrElse(() => false))
+		oxlintVersion: inputState.packageJson.oxlintVersion,
+		oxlintTsgolintVersion: inputState.packageJson.oxlintTsgolintVersion,
+		prepareScript: map$11(inputState.packageJson.prepareScript, (_) => _.hasPatch).pipe(getOrElse(() => false)),
+		managePrepareScript: false,
+		integrations: match$8(inputState.packageJson.prepareScript, {
+			onNone: () => isSome(inputState.packageJson.lspVersion) ? ["typescript"] : [],
+			onSome: (_) => _.integrations
+		})
 	},
 	tsconfig: {
 		schemaPath: inputState.tsconfig.currentSchemaPath,
-		diagnosticSeverities: inputState.tsconfig.currentDiagnosticSeverities
+		diagnosticSeverities: inputState.tsconfig.currentDiagnosticSeverities,
+		manageIntegration: false
 	},
 	vscodeSettings: map$11(inputState.vscodeSettings, (settings) => ({ settings: settings.parsed })),
 	editors: []
@@ -210040,10 +210313,10 @@ var ExperimentalOxlintPatchError = class extends TaggedError("ExperimentalOxlint
 		return `Unable to manage the experimental Oxlint integration: ${this.reason}`;
 	}
 };
-const oxlintProfile = profiles.find((profile) => profile.kind === "oxlint");
-if (oxlintProfile === void 0 || oxlintProfile.kind !== "oxlint") throw new Error("Missing Oxlint profile in upstream.json");
-const supportedOxlintVersion = oxlintProfile.oxlint.npmVersion;
-const supportedTsgolintVersion = oxlintProfile.tsgolint.npmVersion;
+const oxlintProfile$1 = profiles.find((profile) => profile.kind === "oxlint");
+if (oxlintProfile$1 === void 0 || oxlintProfile$1.kind !== "oxlint") throw new Error("Missing Oxlint profile in upstream.json");
+const supportedOxlintVersion = oxlintProfile$1.oxlint.npmVersion;
+const supportedTsgolintVersion = oxlintProfile$1.tsgolint.npmVersion;
 const readPackageMetadataFromRequire = (require, packageName) => gen(function* () {
 	const fs = yield* FileSystem;
 	const packageJsonPath = yield* try_({
@@ -210276,50 +210549,61 @@ function isPresetEnabled(presetName, severities) {
 */
 const gatherTargetState = (assessment, context) => gen(function* () {
 	const path = yield* Path;
-	const currentLspState = match$8(assessment.packageJson.lspVersion, {
-		onNone: () => "no",
-		onSome: (lsp) => lsp.dependencyType
-	});
-	const lspDependencyType = yield* select({
-		message: "Language service installation:",
-		choices: [
-			{
-				title: "Install in devDependencies",
-				description: "This is the recommended default option",
-				value: "devDependencies",
-				selected: currentLspState === "no" || currentLspState === "devDependencies"
-			},
-			{
-				title: "Install in dependencies",
-				description: "We usually don't recommend this, but if you need it for any reason",
-				value: "dependencies",
-				selected: currentLspState === "dependencies"
-			},
-			{
-				title: "Uninstall",
-				description: "Language service won't be installed or will be removed if already present",
-				value: "no"
-			}
-		]
+	const integrations = yield* multiSelect({
+		message: "Which integrations would you like to configure?",
+		choices: [{
+			title: "TypeScript language service",
+			value: "typescript",
+			selected: true
+		}, {
+			title: "Oxlint type-aware rules",
+			value: "oxlint",
+			selected: isSome(assessment.packageJson.oxlintVersion) || isSome(assessment.packageJson.oxlintTsgolintVersion)
+		}]
 	});
-	if (lspDependencyType === "no") return {
+	const useTypescript = integrations.includes("typescript");
+	const useOxlint = integrations.includes("oxlint");
+	if (integrations.length === 0) return {
 		packageJson: {
 			lspVersion: none$3(),
 			typescriptVersion: assessment.packageJson.typescriptVersion,
-			prepareScript: false
+			oxlintVersion: assessment.packageJson.oxlintVersion,
+			oxlintTsgolintVersion: assessment.packageJson.oxlintTsgolintVersion,
+			prepareScript: false,
+			managePrepareScript: true,
+			integrations
 		},
 		tsconfig: {
 			schemaPath: none$3(),
-			diagnosticSeverities: none$3()
+			diagnosticSeverities: none$3(),
+			manageIntegration: true
 		},
 		vscodeSettings: none$3(),
 		editors: []
 	};
+	const currentLspState = match$8(assessment.packageJson.lspVersion, {
+		onNone: () => "no",
+		onSome: (lsp) => lsp.dependencyType
+	});
+	const lspDependencyType = yield* select({
+		message: "@effect/tsgo installation:",
+		choices: [{
+			title: "Install in devDependencies",
+			description: "This is the recommended default option",
+			value: "devDependencies",
+			selected: currentLspState === "no" || currentLspState === "devDependencies"
+		}, {
+			title: "Install in dependencies",
+			description: "We usually don't recommend this, but if you need it for any reason",
+			value: "dependencies",
+			selected: currentLspState === "dependencies"
+		}]
+	});
 	const currentDiagnosticSeverities = match$8(assessment.tsconfig.currentDiagnosticSeverities, {
 		onNone: () => ({}),
 		onSome: (diagnosticSeverities) => diagnosticSeverities
 	});
-	const selectedDiagnosticModes = yield* multiSelect({
+	const selectedDiagnosticModes = useTypescript ? yield* multiSelect({
 		message: "Which diagnostic presets would you like to use?",
 		choices: [{
 			title: "Custom",
@@ -210331,13 +210615,13 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 			value: preset.name,
 			selected: isPresetEnabled(preset.name, currentDiagnosticSeverities)
 		}))]
-	});
+	}) : [];
 	const shouldCustomizeDiagnostics = selectedDiagnosticModes.includes("custom");
 	const initialSeverities = applyPresetDiagnosticSeverities(currentDiagnosticSeverities, selectedDiagnosticModes.filter((value) => value !== "custom"));
 	const diagnosticSeveritiesRecord = shouldCustomizeDiagnostics ? yield* createRulePrompt(getAllRules(), initialSeverities) : initialSeverities;
 	const diagnosticSeverities = Object.keys(diagnosticSeveritiesRecord).length > 0 ? some(diagnosticSeveritiesRecord) : none$3();
 	const hasVscodeSettings = isSome(assessment.vscodeSettings);
-	const editors = yield* multiSelect({
+	const editors = useTypescript ? yield* multiSelect({
 		message: "Which editors do you use?",
 		choices: [
 			{
@@ -210354,7 +210638,7 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 				value: "emacs"
 			}
 		]
-	});
+	}) : [];
 	const defaultTypescriptPackageName = defaultTypescriptPackageNames[0];
 	const relativeSchemaPath = path.relative(path.dirname(assessment.tsconfig.path), context.defaultSchemaPath).replaceAll("\\", "/");
 	const vscodeSettings = editors.includes("vscode") ? some({ settings: {
@@ -210369,16 +210653,33 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 				dependencyType: lspDependencyType,
 				version: context.defaultLspVersion
 			}),
-			typescriptVersion: orElse(assessment.packageJson.typescriptVersion, () => some({
+			typescriptVersion: useTypescript ? orElse(assessment.packageJson.typescriptVersion, () => some({
 				dependencyType: lspDependencyType,
 				version: context.defaultTypescriptVersion,
 				packageName: defaultTypescriptPackageName
-			})),
-			prepareScript: true
+			})) : assessment.packageJson.typescriptVersion,
+			oxlintVersion: useOxlint ? some({
+				dependencyType: match$8(assessment.packageJson.oxlintVersion, {
+					onNone: () => lspDependencyType,
+					onSome: (dependency) => dependency.dependencyType
+				}),
+				version: context.defaultOxlintVersion
+			}) : assessment.packageJson.oxlintVersion,
+			oxlintTsgolintVersion: useOxlint ? some({
+				dependencyType: match$8(assessment.packageJson.oxlintTsgolintVersion, {
+					onNone: () => lspDependencyType,
+					onSome: (dependency) => dependency.dependencyType
+				}),
+				version: context.defaultOxlintTsgolintVersion
+			}) : assessment.packageJson.oxlintTsgolintVersion,
+			prepareScript: true,
+			managePrepareScript: true,
+			integrations
 		},
 		tsconfig: {
-			schemaPath: some(relativeSchemaPath.startsWith(".") ? relativeSchemaPath : `./${relativeSchemaPath}`),
-			diagnosticSeverities
+			schemaPath: useTypescript ? some(relativeSchemaPath.startsWith(".") ? relativeSchemaPath : `./${relativeSchemaPath}`) : none$3(),
+			diagnosticSeverities,
+			manageIntegration: true
 		},
 		vscodeSettings,
 		editors
@@ -210389,6 +210690,8 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 //#region src/cli/setup/index.ts
 const latestProfile = profiles.find((profile) => profile.name === "latest");
 if (latestProfile === void 0) throw new Error("Missing latest profile in upstream.json");
+const oxlintProfile = profiles.find((profile) => profile.kind === "oxlint");
+if (oxlintProfile?.oxlint === void 0 || oxlintProfile.tsgolint === void 0) throw new Error("Missing oxlint profile in upstream.json");
 const setupCommand = make("setup").pipe(withDescription("Setup @effect/tsgo for the given project using an interactive CLI."), withHandler(() => gen(function* () {
 	const path = yield* Path;
 	const currentDir = path.resolve(process.cwd());
@@ -210398,6 +210701,8 @@ const setupCommand = make("setup").pipe(withDescription("Setup @effect/tsgo for
 	const targetState = yield* gatherTargetState(assessmentState, {
 		defaultLspVersion: version,
 		defaultTypescriptVersion: latestProfile.ts.npmVersion,
+		defaultOxlintVersion: oxlintProfile.oxlint.npmVersion,
+		defaultOxlintTsgolintVersion: oxlintProfile.tsgolint.npmVersion,
 		defaultSchemaPath: path.resolve(currentDir, "node_modules", name, "schema.json")
 	});
 	const result = computeChanges(assessmentState, targetState);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/tsgo",
-  "version": "0.27.1",
+  "version": "0.29.0",
   "type": "module",
   "description": "Effect Language Service for TypeScript-Go — Effect-specific diagnostics and hover features.",
   "license": "MIT",
@@ -32,13 +32,13 @@
     "schema.json"
   ],
   "optionalDependencies": {
-    "@effect/tsgo-win32-x64": "0.27.1",
-    "@effect/tsgo-win32-arm64": "0.27.1",
-    "@effect/tsgo-linux-x64": "0.27.1",
-    "@effect/tsgo-linux-arm64": "0.27.1",
-    "@effect/tsgo-linux-arm": "0.27.1",
-    "@effect/tsgo-darwin-x64": "0.27.1",
-    "@effect/tsgo-darwin-arm64": "0.27.1"
+    "@effect/tsgo-win32-x64": "0.29.0",
+    "@effect/tsgo-win32-arm64": "0.29.0",
+    "@effect/tsgo-linux-x64": "0.29.0",
+    "@effect/tsgo-linux-arm64": "0.29.0",
+    "@effect/tsgo-linux-arm": "0.29.0",
+    "@effect/tsgo-darwin-x64": "0.29.0",
+    "@effect/tsgo-darwin-arm64": "0.29.0"
   },
   "devDependencies": {
     "@effect/platform-node": "^4.0.0-beta.101",