@effect/tsgo 0.29.0 → 0.30.0

package/dist/effect-tsgo.cjs

@@ -206981,7 +206981,7 @@ var FileReadError = class extends TaggedError("FileReadError") {
 //#endregion
 //#region package.json
 var name = "@effect/tsgo";
-var version = "0.29.0";
+var version = "0.30.0";
 
 //#endregion
 //#region src/cli/setup/consts.ts
@@ -207207,6 +207207,19 @@ const createAssessmentInput = (currentDir, tsconfigInput) => gen(function* () {
 			cause
 		})))
 	};
+	const oxlintConfigPath = path.join(currentDir, ".oxlintrc.json");
+	const oxlintConfigExists = yield* fs.exists(oxlintConfigPath);
+	let oxlintConfigInput = none$3();
+	if (oxlintConfigExists) {
+		const oxlintConfigText = yield* fs.readFileString(oxlintConfigPath).pipe(mapError((cause) => new FileReadError({
+			path: oxlintConfigPath,
+			cause
+		})));
+		oxlintConfigInput = some({
+			fileName: oxlintConfigPath,
+			text: oxlintConfigText
+		});
+	}
 	const vscodeSettingsPath = path.join(currentDir, ".vscode", "settings.json");
 	const vscodeSettingsExists = yield* fs.exists(vscodeSettingsPath);
 	let vscodeSettingsInput = none$3();
@@ -207223,6 +207236,7 @@ const createAssessmentInput = (currentDir, tsconfigInput) => gen(function* () {
 	return {
 		packageJson: packageJsonInput,
 		tsconfig: tsconfigInput,
+		oxlintConfig: oxlintConfigInput,
 		vscodeSettings: vscodeSettingsInput
 	};
 });
@@ -207318,6 +207332,17 @@ const assessVSCodeSettings = (input) => {
 		text: input.text
 	};
 };
+const assessOxlintConfig = (input) => {
+	const sourceFile = import_typescript.parseJsonText(input.fileName, input.text);
+	const parsed = import_typescript.convertToObject(sourceFile, []);
+	return {
+		path: input.fileName,
+		sourceFile,
+		parsed,
+		text: input.text,
+		currentSchemaPath: typeof parsed.$schema === "string" ? some(parsed.$schema) : none$3()
+	};
+};
 /**
 * Perform assessment from input data
 */
@@ -207325,6 +207350,7 @@ const assess = (input) => {
 	return {
 		packageJson: assessPackageJson(input.packageJson),
 		tsconfig: assessTsConfig(input.tsconfig),
+		oxlintConfig: isSome(input.oxlintConfig) ? some(assessOxlintConfig(input.oxlintConfig.value)) : none$3(),
 		vscodeSettings: isSome(input.vscodeSettings) ? some(assessVSCodeSettings(input.vscodeSettings.value)) : none$3()
 	};
 };
@@ -207456,6 +207482,7 @@ const renderCodeActions = (result, assessmentState) => gen(function* () {
 		return;
 	}
 	const sourceFiles = [assessmentState.packageJson.sourceFile, assessmentState.tsconfig.sourceFile];
+	if (isSome(assessmentState.oxlintConfig)) sourceFiles.push(assessmentState.oxlintConfig.value.sourceFile);
 	if (isSome(assessmentState.vscodeSettings)) sourceFiles.push(assessmentState.vscodeSettings.value.sourceFile);
 	for (const codeAction of result.codeActions) for (const fileChange of codeAction.changes) {
 		yield* log("");
@@ -207921,6 +207948,31 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 		messages
 	};
 };
+const computeOxlintConfigChanges = (current, schemaPath) => {
+	if (isNone(schemaPath)) return emptyFileChangesResult();
+	const rootObj = getRootObject(current.sourceFile);
+	if (!rootObj) return emptyFileChangesResult();
+	const schemaProperty = findPropertyInObject(rootObj, "$schema");
+	if (schemaProperty && import_typescript.isStringLiteral(schemaProperty.initializer) && schemaProperty.initializer.text === schemaPath.value) return emptyFileChangesResult();
+	const schemaPropertyAssignment = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral("$schema"), import_typescript.factory.createStringLiteral(schemaPath.value));
+	const ctx = createTrackerContext();
+	const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
+		if (schemaProperty) tracker.replaceNode(current.sourceFile, schemaProperty.initializer, schemaPropertyAssignment.initializer);
+		else tracker.insertNodeAtObjectStart(current.sourceFile, rootObj, schemaPropertyAssignment);
+	}).find((change) => change.fileName === current.sourceFile.fileName);
+	if (!fileChange) return emptyFileChangesResult();
+	return {
+		codeActions: [{
+			description: schemaProperty ? "Update $schema in .oxlintrc.json" : "Add $schema to .oxlintrc.json",
+			changes: [{
+				fileName: current.path,
+				textChanges: fileChange.textChanges,
+				isNewFile: false
+			}]
+		}],
+		messages: []
+	};
+};
 /**
 * Compute .vscode/settings.json changes using ChangeTracker
 */
@@ -207975,6 +208027,11 @@ const computeChanges = (assessment, target) => {
 	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 (isSome(assessment.oxlintConfig)) {
+		const oxlintConfigResult = computeOxlintConfigChanges(assessment.oxlintConfig.value, target.oxlintrcSchemaPath);
+		codeActions = [...codeActions, ...oxlintConfigResult.codeActions];
+		messages = [...messages, ...oxlintConfigResult.messages];
+	}
 	if (target.editors.includes("vscode")) {
 		if (isSome(target.packageJson.lspVersion) && isSome(target.vscodeSettings)) {
 			const vscodeTarget = target.vscodeSettings.value;
@@ -210171,6 +210228,7 @@ const fromAssessment = (inputState) => ({
 		diagnosticSeverities: inputState.tsconfig.currentDiagnosticSeverities,
 		manageIntegration: false
 	},
+	oxlintrcSchemaPath: flatMap$3(inputState.oxlintConfig, (config) => config.currentSchemaPath),
 	vscodeSettings: map$11(inputState.vscodeSettings, (settings) => ({ settings: settings.parsed })),
 	editors: []
 });
@@ -210578,6 +210636,7 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 			diagnosticSeverities: none$3(),
 			manageIntegration: true
 		},
+		oxlintrcSchemaPath: none$3(),
 		vscodeSettings: none$3(),
 		editors: []
 	};
@@ -210641,6 +210700,10 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 	}) : [];
 	const defaultTypescriptPackageName = defaultTypescriptPackageNames[0];
 	const relativeSchemaPath = path.relative(path.dirname(assessment.tsconfig.path), context.defaultSchemaPath).replaceAll("\\", "/");
+	const oxlintrcSchemaPath = useOxlint ? map$11(assessment.oxlintConfig, (config) => {
+		const relativePath = path.relative(path.dirname(config.path), context.defaultOxlintrcSchemaPath).replaceAll("\\", "/");
+		return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
+	}) : none$3();
 	const vscodeSettings = editors.includes("vscode") ? some({ settings: {
 		"js/ts.experimental.useTsgo": true,
 		"js/ts.tsdk.path": "./node_modules/typescript/bin",
@@ -210681,6 +210744,7 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 			diagnosticSeverities,
 			manageIntegration: true
 		},
+		oxlintrcSchemaPath,
 		vscodeSettings,
 		editors
 	};
@@ -210703,7 +210767,8 @@ const setupCommand = make("setup").pipe(withDescription("Setup @effect/tsgo for
 		defaultTypescriptVersion: latestProfile.ts.npmVersion,
 		defaultOxlintVersion: oxlintProfile.oxlint.npmVersion,
 		defaultOxlintTsgolintVersion: oxlintProfile.tsgolint.npmVersion,
-		defaultSchemaPath: path.resolve(currentDir, "node_modules", name, "schema.json")
+		defaultSchemaPath: path.resolve(currentDir, "node_modules", name, "schema.json"),
+		defaultOxlintrcSchemaPath: path.resolve(currentDir, "node_modules", name, "oxlint-schema.json")
 	});
 	const result = computeChanges(assessmentState, targetState);
 	yield* reviewAndApplyChanges(result, assessmentState, { cancelMessage: "Setup cancelled. No changes were made." });