@oh-my-pi/pi-natives 9.6.1 → 9.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-natives",
-	"version": "9.6.1",
+	"version": "9.6.4",
 	"description": "Native Rust functionality via N-API",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -30,7 +30,7 @@
 		"directory": "packages/natives"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-utils": "9.6.1"
+		"@oh-my-pi/pi-utils": "9.6.4"
 	},
 	"devDependencies": {
 		"@types/node": "^25.0.10"

package/src/grep/index.ts

@@ -34,7 +34,9 @@ export type {
  * Search files for a regex pattern with optional streaming callback.
  */
 export async function grep(options: GrepOptions, onMatch?: (match: GrepMatch) => void): Promise<GrepResult> {
-	return wrapRequestOptions(() => native.grep(options, onMatch), options);
+	// napi-rs ThreadsafeFunction passes (error, value) - skip callback on error
+	const cb = onMatch ? (err: Error | null, m: GrepMatch) => !err && onMatch(m) : undefined;
+	return wrapRequestOptions(() => native.grep(options, cb), options);
 }
 
 /**

package/src/index.ts

@@ -42,6 +42,9 @@ export async function find(options: FindOptions, onMatch?: (match: FindMatch) =>
 	// Convert simple patterns to recursive globs if needed
 	const globPattern = pattern.includes("/") || pattern.startsWith("**") ? pattern : `**/${pattern}`;
 
+	// napi-rs ThreadsafeFunction passes (error, value) - skip callback on error
+	const cb = onMatch ? (err: Error | null, m: FindMatch) => !err && onMatch(m) : undefined;
+
 	return native.find(
 		{
 			...options,
@@ -50,7 +53,7 @@ export async function find(options: FindOptions, onMatch?: (match: FindMatch) =>
 			hidden: options.hidden ?? false,
 			gitignore: options.gitignore ?? true,
 		},
-		onMatch,
+		cb,
 	);
 }
 
@@ -70,11 +73,13 @@ export {
 // =============================================================================
 
 export {
+	Ellipsis,
 	type ExtractSegmentsResult,
 	extractSegments,
 	type SliceWithWidthResult,
 	sliceWithWidth,
 	truncateToWidth,
+	visibleWidth,
 } from "./text/index";
 
 // =============================================================================

package/src/native.ts

@@ -11,7 +11,7 @@ import type {
 } from "./grep/types";
 import type { HighlightColors } from "./highlight/index";
 import type { HtmlToMarkdownOptions } from "./html/types";
-import type { ExtractSegmentsResult, SliceWithWidthResult, TextInput } from "./text/index";
+import type { ExtractSegmentsResult, SliceWithWidthResult } from "./text/index";
 
 export interface NativePhotonImage {
 	getWidth(): number;
@@ -39,9 +39,9 @@ export interface NativeSamplingFilter {
 import type { GrepMatch } from "./grep/types";
 
 export interface NativeBindings {
-	find(options: FindOptions, onMatch?: (match: FindMatch) => void): Promise<FindResult>;
+	find(options: FindOptions, onMatch?: (error: Error | null, match: FindMatch) => void): Promise<FindResult>;
 	fuzzyFind(options: FuzzyFindOptions): Promise<FuzzyFindResult>;
-	grep(options: GrepOptions, onMatch?: (match: GrepMatch) => void): Promise<GrepResult>;
+	grep(options: GrepOptions, onMatch?: (error: Error | null, match: GrepMatch) => void): Promise<GrepResult>;
 	search(content: string | Uint8Array, options: SearchOptions): SearchResult;
 	hasMatch(
 		content: string | Uint8Array,
@@ -55,10 +55,11 @@ export interface NativeBindings {
 	getSupportedLanguages(): string[];
 	SamplingFilter: NativeSamplingFilter;
 	PhotonImage: NativePhotonImageConstructor;
-	truncateToWidth(text: TextInput, maxWidth: number, ellipsis: TextInput, pad: boolean): string;
-	sliceWithWidth(line: TextInput, startCol: number, length: number, strict: boolean): SliceWithWidthResult;
+	truncateToWidth(text: string, maxWidth: number, ellipsisKind: number, pad: boolean): string;
+	sliceWithWidth(line: string, startCol: number, length: number, strict: boolean): SliceWithWidthResult;
+	visibleWidth(text: string): number;
 	extractSegments(
-		line: TextInput,
+		line: string,
 		beforeEnd: number,
 		afterStart: number,
 		afterLen: number,
@@ -76,12 +77,12 @@ const execDir = path.dirname(process.execPath);
 const SUPPORTED_PLATFORMS = ["linux-x64", "linux-arm64", "darwin-x64", "darwin-arm64", "win32-x64"];
 
 const candidates = [
+	path.join(repoRoot, "target", "release", "pi_natives.node"),
+	path.join(repoRoot, "crates", "pi-natives", "target", "release", "pi_natives.node"),
 	path.join(nativeDir, `pi_natives.${platformTag}.node`),
 	path.join(nativeDir, "pi_natives.node"),
 	path.join(execDir, `pi_natives.${platformTag}.node`),
 	path.join(execDir, "pi_natives.node"),
-	path.join(repoRoot, "target", "release", "pi_natives.node"),
-	path.join(repoRoot, "crates", "pi-natives", "target", "release", "pi_natives.node"),
 ];
 
 function loadNative(): NativeBindings {
@@ -138,16 +139,6 @@ function validateNative(bindings: NativeBindings, source: string): void {
 	checkFn("extractSegments");
 	checkFn("matchesKittySequence");
 
-	if (!bindings.PhotonImage?.newFromByteslice) {
-		missing.push("PhotonImage.newFromByteslice");
-	}
-	if (!bindings.PhotonImage?.prototype?.resize) {
-		missing.push("PhotonImage.resize");
-	}
-	if (!bindings.SamplingFilter || typeof bindings.SamplingFilter.Lanczos3 !== "number") {
-		missing.push("SamplingFilter");
-	}
-
 	if (missing.length) {
 		throw new Error(
 			`Native addon missing exports (${source}). Missing: ${missing.join(", ")}. ` +

package/src/text/index.ts

@@ -16,24 +16,44 @@ export interface ExtractSegmentsResult {
 	afterWidth: number;
 }
 
-export type TextInput = string | Uint8Array;
+export const enum Ellipsis {
+	Unicode = 0, // "…"
+	Ascii = 1, // "..."
+	Omit = 2, // ""
+}
 
 /**
- * Truncate a string to a visible width, preserving ANSI codes.
+ * Truncate text to fit within a maximum visible width, adding ellipsis if needed.
+ * Optionally pad with spaces to reach exactly maxWidth.
+ * Properly handles ANSI escape codes (they don't count toward width).
+ *
+ * @param text - Text to truncate (may contain ANSI codes)
+ * @param maxWidth - Maximum visible width
+ * @param ellipsis - Ellipsis kind to append when truncating (default: Unicode "…")
+ * @param pad - If true, pad result with spaces to exactly maxWidth (default: false)
+ * @returns Truncated text, optionally padded to exactly maxWidth
  */
-export function truncateToWidth(text: TextInput, maxWidth: number, ellipsis: TextInput = "…", pad = false): string {
+export function truncateToWidth(
+	text: string,
+	maxWidth: number,
+	ellipsis: Ellipsis = Ellipsis.Unicode,
+	pad = false,
+): string {
 	return native.truncateToWidth(text, maxWidth, ellipsis, pad);
 }
 
+/**
+ * Measure the visible width of text (excluding ANSI codes).
+ */
+export function visibleWidth(text: string): number {
+	return native.visibleWidth(text);
+}
+
 /**
  * Slice a range of visible columns from a line.
  */
-export function sliceWithWidth(
-	line: TextInput,
-	startCol: number,
-	length: number,
-	strict = false,
-): SliceWithWidthResult {
+export function sliceWithWidth(line: string, startCol: number, length: number, strict = false): SliceWithWidthResult {
+	if (length <= 0) return { text: "", width: 0 };
 	return native.sliceWithWidth(line, startCol, length, strict);
 }
 
@@ -41,7 +61,7 @@ export function sliceWithWidth(
  * Extract before/after segments around an overlay region.
  */
 export function extractSegments(
-	line: TextInput,
+	line: string,
 	beforeEnd: number,
 	afterStart: number,
 	afterLen: number,