@oh-my-pi/pi-utils 15.11.2 → 15.11.4

package/dist/types/tab-spacing.d.ts

@@ -7,3 +7,24 @@ export declare function setDefaultTabWidth(width: number): void;
  * Visible tab width in columns for `file` (from `.editorconfig` + default), or the default when `file` is omitted.
  */
 export declare function getIndentation(file?: string | null, projectDir?: string | null): number;
+/**
+ * `.editorconfig`-derived formatting options for an LSP `textDocument/formatting` request.
+ *
+ * Both fields are absent when the resolved `.editorconfig` chain does not pin them, so callers
+ * can layer their own fallbacks (content sniffing, project defaults) underneath. Returned values
+ * are clamped to {@link MIN_TAB_WIDTH}..{@link MAX_TAB_WIDTH} for parity with {@link getIndentation}.
+ */
+export interface EditorConfigFormatting {
+    /** Effective indent width in columns, from `indent_size` or `tab_width`. */
+    tabSize?: number;
+    /** `true` for `indent_style = space`, `false` for `indent_style = tab` (or `indent_size = tab`). */
+    insertSpaces?: boolean;
+}
+/**
+ * Resolve `.editorconfig` formatting hints for `file` without falling back to any default.
+ *
+ * Used by the LSP format-on-write path so a missing `.editorconfig` declaration falls through
+ * to caller-provided defaults instead of clobbering the file with the renderer's display
+ * `defaultTabWidth` (issue #2329).
+ */
+export declare function getEditorConfigFormatting(file?: string | null, projectDir?: string | null): EditorConfigFormatting;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-utils",
-	"version": "15.11.2",
+	"version": "15.11.4",
 	"description": "Shared utilities for pi packages",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -31,7 +31,7 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-natives": "15.11.2",
+		"@oh-my-pi/pi-natives": "15.11.4",
 		"beautiful-mermaid": "^1.1.3",
 		"handlebars": "^4.7.9",
 		"winston": "^3.19.0",

package/src/tab-spacing.ts

@@ -340,3 +340,66 @@ export function getIndentation(file?: string | null, projectDir?: string | null)
 	indentationCache.set(absKey, clamped);
 	return clamped;
 }
+
+/**
+ * `.editorconfig`-derived formatting options for an LSP `textDocument/formatting` request.
+ *
+ * Both fields are absent when the resolved `.editorconfig` chain does not pin them, so callers
+ * can layer their own fallbacks (content sniffing, project defaults) underneath. Returned values
+ * are clamped to {@link MIN_TAB_WIDTH}..{@link MAX_TAB_WIDTH} for parity with {@link getIndentation}.
+ */
+export interface EditorConfigFormatting {
+	/** Effective indent width in columns, from `indent_size` or `tab_width`. */
+	tabSize?: number;
+	/** `true` for `indent_style = space`, `false` for `indent_style = tab` (or `indent_size = tab`). */
+	insertSpaces?: boolean;
+}
+
+/**
+ * Resolve `.editorconfig` formatting hints for `file` without falling back to any default.
+ *
+ * Used by the LSP format-on-write path so a missing `.editorconfig` declaration falls through
+ * to caller-provided defaults instead of clobbering the file with the renderer's display
+ * `defaultTabWidth` (issue #2329).
+ */
+export function getEditorConfigFormatting(file?: string | null, projectDir?: string | null): EditorConfigFormatting {
+	if (file === undefined || file === null || file === "") {
+		return {};
+	}
+
+	const cwd = projectDir ?? process.cwd();
+	const absoluteFile = resolveFilePath(cwd, file);
+
+	// Same NAME_MAX guard as `getIndentation`: editorconfig discovery is
+	// best-effort and must never escape as `ENAMETOOLONG` from a renderer's
+	// stray gibberish path.
+	if (hasOverlongPathComponent(absoluteFile)) {
+		return {};
+	}
+
+	const match = resolveEditorConfigMatch(absoluteFile);
+	if (match === undefined) {
+		return {};
+	}
+
+	const result: EditorConfigFormatting = {};
+
+	if (match.indentSize?.kind === "spaces") {
+		result.tabSize = clampTabWidth(match.indentSize.n);
+	} else if (match.tabWidth !== undefined) {
+		result.tabSize = clampTabWidth(match.tabWidth);
+	}
+
+	if (match.indentStyle === IndentStyle.Space) {
+		result.insertSpaces = true;
+	} else if (match.indentStyle === IndentStyle.Tab || match.indentSize?.kind === "tab") {
+		result.insertSpaces = false;
+	} else if (match.indentSize?.kind === "spaces") {
+		// `indent_size = <n>` without an explicit `indent_style` is universally
+		// read as "indent with N spaces" — both VSCode and Sublime infer
+		// `indent_style = space` in that case.
+		result.insertSpaces = true;
+	}
+
+	return result;
+}