@effect/tsgo 0.36.0 → 0.36.2

package/dist/effect-tsgo.cjs

@@ -197939,7 +197939,7 @@ var FileReadError = class extends TaggedError$1("FileReadError") {
 //#endregion
 //#region package.json
 var name = "@effect/tsgo";
-var version = "0.36.0";
+var version = "0.36.2";
 
 //#endregion
 //#region src/cli/setup/consts.ts
@@ -198521,16 +198521,54 @@ function deleteNodeFromList(tracker, sourceFile, nodeArray, nodeToDelete) {
 		});
 	} else tracker.delete(sourceFile, nodeToDelete);
 }
+const emptyListInsertions = /* @__PURE__ */ new WeakMap();
 /**
 * Insert a node at the end of a list (array or object properties), handling commas properly
 */
 function insertNodeAtEndOfList(tracker, sourceFile, nodeArray, newNode) {
-	if (nodeArray.length === 0) tracker.insertNodeAt(sourceFile, nodeArray.pos + 1, newNode, { suffix: "\n" });
-	else {
+	const formatOptions = getFormatOptions(sourceFile);
+	if (nodeArray.length === 0) {
+		const insertedLists = emptyListInsertions.get(tracker) ?? /* @__PURE__ */ new WeakSet();
+		const hasPreviousInsertion = insertedLists.has(nodeArray);
+		insertedLists.add(nodeArray);
+		emptyListInsertions.set(tracker, insertedLists);
+		const closingIndentation = getIndentationAtPosition(sourceFile, nodeArray.pos, formatOptions.tabSize);
+		const hasFollowingLineBreak = /^[ \t]*\r?\n/.test(sourceFile.text.slice(nodeArray.pos));
+		tracker.insertNodeAt(sourceFile, nodeArray.pos, newNode, {
+			indentation: closingIndentation.column + formatOptions.indentSize,
+			prefix: formatOptions.newLineCharacter,
+			suffix: hasPreviousInsertion ? "," : hasFollowingLineBreak ? "" : `${formatOptions.newLineCharacter}${closingIndentation.text}`
+		});
+	} else {
 		const lastElement = nodeArray[nodeArray.length - 1];
-		tracker.insertNodeAt(sourceFile, lastElement.end, newNode, { prefix: ",\n" });
+		const indentation = getIndentationAtPosition(sourceFile, lastElement.getStart(sourceFile), formatOptions.tabSize);
+		tracker.insertNodeAt(sourceFile, lastElement.end, newNode, {
+			indentation: indentation.column,
+			prefix: `,${formatOptions.newLineCharacter}`
+		});
 	}
 }
+function getFormatOptions(sourceFile) {
+	const indentation = sourceFile.text.match(/^([ \t]+)\S/m)?.[1];
+	const indentSize = indentation?.includes("	") ? 2 : indentation?.length ?? 2;
+	const newLineCharacter = sourceFile.text.includes("\r\n") ? "\r\n" : "\n";
+	return {
+		...import_typescript.getDefaultFormatCodeSettings(newLineCharacter),
+		indentSize,
+		tabSize: indentSize,
+		convertTabsToSpaces: !indentation?.includes("	"),
+		newLineCharacter
+	};
+}
+function getIndentationAtPosition(sourceFile, position, tabSize) {
+	const { line } = sourceFile.getLineAndCharacterOfPosition(position);
+	const lineStart = sourceFile.getPositionOfLineAndCharacter(line, 0);
+	const text = sourceFile.text.slice(lineStart, position).match(/^[ \t]*/)?.[0] ?? "";
+	return {
+		column: [...text].reduce((column, character) => character === "	" ? column + tabSize - column % tabSize : column + 1, 0),
+		text
+	};
+}
 function findDependencyCollectionProperty(rootObj, dependencyType) {
 	return findPropertyInObject(rootObj, dependencyType);
 }
@@ -198578,14 +198616,12 @@ const tsInternal = import_typescript;
 /**
 * Create a ChangeTracker context
 */
-function createTrackerContext() {
+function createTrackerContext(sourceFile) {
 	const host = createMinimalHost();
+	const formatOptions = getFormatOptions(sourceFile);
 	return {
 		host,
-		formatContext: tsInternal.formatting.getFormatContext({
-			indentSize: 2,
-			tabSize: 2
-		}, host),
+		formatContext: tsInternal.formatting.getFormatContext(formatOptions, host),
 		preferences: {}
 	};
 }
@@ -198597,7 +198633,7 @@ const computePackageJsonChanges = (current, target) => {
 	const messages = [];
 	const rootObj = getRootObject(current.sourceFile);
 	if (!rootObj) return emptyFileChangesResult();
-	const ctx = createTrackerContext();
+	const ctx = createTrackerContext(current.sourceFile);
 	const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
 		const shouldAddTypescriptWithDependencyType = (dependencyType) => isSome(target.typescriptVersion) && isNone(current.typescriptVersion) && target.typescriptVersion.value.dependencyType === dependencyType;
 		const getTypescriptPackageName = (dependency) => dependency.packageName ?? defaultTypescriptPackageNames[0];
@@ -198767,7 +198803,7 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 			if (!target.manageIntegration) return emptyFileChangesResult();
 			const schemaProperty = findPropertyInObject(rootObj, "$schema");
 			if (!isEffectSchemaProperty(schemaProperty)) return emptyFileChangesResult();
-			const ctx = createTrackerContext();
+			const ctx = createTrackerContext(current.sourceFile);
 			const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
 				descriptions.push("Remove $schema from tsconfig");
 				deleteNodeFromList(tracker, current.sourceFile, rootObj.properties, schemaProperty);
@@ -198784,7 +198820,7 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 				messages
 			};
 		}
-		const ctx = createTrackerContext();
+		const ctx = createTrackerContext(current.sourceFile);
 		const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
 			const schemaProperty = findPropertyInObject(rootObj, "$schema");
 			const shouldAddSchema = isSome(target.schemaPath) && !schemaProperty;
@@ -198820,7 +198856,7 @@ const computeTsConfigChanges = (current, target, lspVersion) => {
 		};
 	}
 	const compilerOptions = compilerOptionsProperty.initializer;
-	const ctx = createTrackerContext();
+	const ctx = createTrackerContext(current.sourceFile);
 	const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
 		const schemaProperty = findPropertyInObject(rootObj, "$schema");
 		const pluginsProperty = findPropertyInObject(compilerOptions, "plugins");
@@ -198917,7 +198953,7 @@ const computeOxlintConfigChanges = (current, schemaPath) => {
 	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 ctx = createTrackerContext(current.sourceFile);
 	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);
@@ -198943,7 +198979,7 @@ const computeVSCodeSettingsChanges = (current, target) => {
 	const messages = [];
 	const rootObj = getRootObject(current.sourceFile);
 	if (!rootObj) return emptyFileChangesResult();
-	const ctx = createTrackerContext();
+	const ctx = createTrackerContext(current.sourceFile);
 	const createSettingValue = (value) => typeof value === "string" ? import_typescript.factory.createStringLiteral(value) : typeof value === "boolean" ? value ? import_typescript.factory.createTrue() : import_typescript.factory.createFalse() : Array.isArray(value) && value.every((item) => typeof item === "string") ? import_typescript.factory.createArrayLiteralExpression(value.map((item) => import_typescript.factory.createStringLiteral(item))) : import_typescript.factory.createNull();
 	const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
 		if (rootObj.properties.length === 0) {
@@ -199940,7 +199976,7 @@ const gatherTargetOptions = (assessment) => gen(function* () {
 var tags = {
 	"typescript": {
 		"latest": "7.0.2",
-		"next": "7.1.0-dev.20260806.1"
+		"next": "7.1.0-dev.20260808.1"
 	},
 	"oxlint": { "latest": "1.77.0" },
 	"oxlint-tsgolint": { "latest": "7.0.2001" }

package/package.json

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