@oh-my-pi/pi-natives 12.17.0 → 12.18.0

package/package.json

@@ -1,21 +1,33 @@
 {
-	"name": "@oh-my-pi/pi-natives",
-	"version": "12.17.0",
-	"description": "Native Rust functionality via N-API",
-	"keywords": ["napi", "rust", "native", "grep", "text-processing"],
 	"type": "module",
-	"main": "./src/index.ts",
-	"types": "./src/index.ts",
-	"exports": {
-		".": {
-			"types": "./src/index.ts",
-			"import": "./src/index.ts"
-		}
+	"name": "@oh-my-pi/pi-natives",
+	"version": "12.18.0",
+	"description": "Native Rust bindings for grep, clipboard, image processing, syntax highlighting, PTY, and shell operations via N-API",
+	"homepage": "https://github.com/can1357/oh-my-pi",
+	"author": "Can Bölük",
+	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/can1357/oh-my-pi.git",
+		"directory": "packages/natives"
 	},
-	"files": [
-		"src",
-		"native"
+	"bugs": {
+		"url": "https://github.com/can1357/oh-my-pi/issues"
+	},
+	"keywords": [
+		"napi",
+		"rust",
+		"native",
+		"grep",
+		"text-processing",
+		"clipboard",
+		"image",
+		"pty",
+		"shell",
+		"syntax-highlighting"
 	],
+	"main": "./src/index.ts",
+	"types": "./src/index.ts",
 	"scripts": {
 		"build:native": "bun scripts/build-native.ts",
 		"dev:native": "bun scripts/build-native.ts --dev",
@@ -25,24 +37,124 @@
 		"test": "bun run build:native && bun test",
 		"bench": "bun bench/grep.ts"
 	},
-	"author": "Can Bölük",
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/can1357/oh-my-pi.git",
-		"directory": "packages/natives"
+	"dependencies": {
+		"@oh-my-pi/pi-utils": "12.18.0"
 	},
-	"homepage": "https://github.com/can1357/oh-my-pi",
-	"bugs": {
-	"url": "https://github.com/can1357/oh-my-pi/issues"
-},
-"dependencies": {
-	"@oh-my-pi/pi-utils": "12.17.0"
-},
-"devDependencies": {
-	"@types/bun": "^1.3.9"
-},
-"engines": {
-	"bun": ">=1.3.7"
-}
+	"devDependencies": {
+		"@types/bun": "^1.3.9"
+	},
+	"engines": {
+		"bun": ">=1.3.7"
+	},
+	"files": [
+		"src",
+		"native",
+		"README.md"
+	],
+	"exports": {
+		".": {
+			"types": "./src/index.ts",
+			"import": "./src/index.ts"
+		},
+		"./*": {
+			"types": "./src/*.ts",
+			"import": "./src/*.ts"
+		},
+		"./clipboard": {
+			"types": "./src/clipboard/index.ts",
+			"import": "./src/clipboard/index.ts"
+		},
+		"./clipboard/*": {
+			"types": "./src/clipboard/*.ts",
+			"import": "./src/clipboard/*.ts"
+		},
+		"./glob": {
+			"types": "./src/glob/index.ts",
+			"import": "./src/glob/index.ts"
+		},
+		"./glob/*": {
+			"types": "./src/glob/*.ts",
+			"import": "./src/glob/*.ts"
+		},
+		"./grep": {
+			"types": "./src/grep/index.ts",
+			"import": "./src/grep/index.ts"
+		},
+		"./grep/*": {
+			"types": "./src/grep/*.ts",
+			"import": "./src/grep/*.ts"
+		},
+		"./highlight": {
+			"types": "./src/highlight/index.ts",
+			"import": "./src/highlight/index.ts"
+		},
+		"./highlight/*": {
+			"types": "./src/highlight/*.ts",
+			"import": "./src/highlight/*.ts"
+		},
+		"./html": {
+			"types": "./src/html/index.ts",
+			"import": "./src/html/index.ts"
+		},
+		"./html/*": {
+			"types": "./src/html/*.ts",
+			"import": "./src/html/*.ts"
+		},
+		"./image": {
+			"types": "./src/image/index.ts",
+			"import": "./src/image/index.ts"
+		},
+		"./image/*": {
+			"types": "./src/image/*.ts",
+			"import": "./src/image/*.ts"
+		},
+		"./keys": {
+			"types": "./src/keys/index.ts",
+			"import": "./src/keys/index.ts"
+		},
+		"./keys/*": {
+			"types": "./src/keys/*.ts",
+			"import": "./src/keys/*.ts"
+		},
+		"./ps": {
+			"types": "./src/ps/index.ts",
+			"import": "./src/ps/index.ts"
+		},
+		"./ps/*": {
+			"types": "./src/ps/*.ts",
+			"import": "./src/ps/*.ts"
+		},
+		"./pty": {
+			"types": "./src/pty/index.ts",
+			"import": "./src/pty/index.ts"
+		},
+		"./pty/*": {
+			"types": "./src/pty/*.ts",
+			"import": "./src/pty/*.ts"
+		},
+		"./shell": {
+			"types": "./src/shell/index.ts",
+			"import": "./src/shell/index.ts"
+		},
+		"./shell/*": {
+			"types": "./src/shell/*.ts",
+			"import": "./src/shell/*.ts"
+		},
+		"./text": {
+			"types": "./src/text/index.ts",
+			"import": "./src/text/index.ts"
+		},
+		"./text/*": {
+			"types": "./src/text/*.ts",
+			"import": "./src/text/*.ts"
+		},
+		"./work": {
+			"types": "./src/work/index.ts",
+			"import": "./src/work/index.ts"
+		},
+		"./work/*": {
+			"types": "./src/work/*.ts",
+			"import": "./src/work/*.ts"
+		}
+	}
 }

package/src/native.ts

@@ -7,7 +7,7 @@ import * as fs from "node:fs";
 import { createRequire } from "node:module";
 import * as os from "node:os";
 import * as path from "node:path";
-import { $env } from "@oh-my-pi/pi-utils";
+import { $env, logger } from "@oh-my-pi/pi-utils";
 import { getNativesDir } from "@oh-my-pi/pi-utils/dirs";
 import packageJson from "../package.json";
 import type { NativeBindings } from "./bindings";
@@ -27,11 +27,8 @@ import "./work/types";
 
 export type { NativeBindings, TsFunc } from "./bindings";
 
-const debugStartup = $env.PI_DEBUG_STARTUP ? (stage: string) => process.stderr.write(`[startup] ${stage}\n`) : () => {};
-
 type CpuVariant = "modern" | "baseline";
 const require = createRequire(import.meta.url);
-const textDecoder = new TextDecoder();
 const platformTag = `${process.platform}-${process.arch}`;
 const packageVersion = (packageJson as { version: string }).version;
 const nativeDir = path.join(import.meta.dir, "..", "native");
@@ -66,22 +63,17 @@ const releaseCandidates = isCompiledBinary ? [...compiledCandidates, ...baseRele
 const candidates = $env.PI_DEV ? [...debugCandidates, ...releaseCandidates] : releaseCandidates;
 const dedupedCandidates = [...new Set(candidates)];
 
-function decodeOutput(output: string | ArrayBufferView | ArrayBuffer | null | undefined): string {
-	if (!output) return "";
-	if (typeof output === "string") return output;
-	if (ArrayBuffer.isView(output))
-		return textDecoder.decode(new Uint8Array(output.buffer, output.byteOffset, output.byteLength));
-	return textDecoder.decode(new Uint8Array(output));
-}
-
 function runCommand(command: string, args: string[]): string | null {
-	try {
-		const result = Bun.spawnSync([command, ...args], { stdout: "pipe", stderr: "pipe" });
-		if (result.exitCode !== 0) return null;
-		return decodeOutput(result.stdout).trim();
-	} catch {
-		return null;
-	}
+	const cmdLine = `${command} '${args.join(" ")}'`;
+	return logger.time(`runCommand:${cmdLine}`, () => {
+		try {
+			const result = Bun.spawnSync([command, ...args], { stdout: "pipe", stderr: "pipe" });
+			if (result.exitCode !== 0) return null;
+			return result.stdout.toString("utf-8").trim();
+		} catch {
+			return null;
+		}
+	});
 }
 
 function getVariantOverride(): CpuVariant | null {
@@ -92,56 +84,45 @@ function getVariantOverride(): CpuVariant | null {
 }
 
 function detectAvx2Support(): boolean {
-	debugStartup("native:detectAvx2Support:start");
 	if (process.arch !== "x64") {
-		debugStartup("native:detectAvx2Support:done");
 		return false;
 	}
 
 	if (process.platform === "linux") {
 		try {
-			debugStartup("native:detectAvx2Support:readCpuinfo");
 			const cpuInfo = fs.readFileSync("/proc/cpuinfo", "utf8");
-			debugStartup("native:detectAvx2Support:done");
 			return /\bavx2\b/i.test(cpuInfo);
 		} catch {
-			debugStartup("native:detectAvx2Support:done");
 			return false;
 		}
 	}
 
 	if (process.platform === "darwin") {
-		debugStartup("native:detectAvx2Support:sysctl");
 		const leaf7 = runCommand("sysctl", ["-n", "machdep.cpu.leaf7_features"]);
 		if (leaf7 && /\bAVX2\b/i.test(leaf7)) {
-			debugStartup("native:detectAvx2Support:done");
 			return true;
 		}
 		const features = runCommand("sysctl", ["-n", "machdep.cpu.features"]);
-		debugStartup("native:detectAvx2Support:done");
 		return Boolean(features && /\bAVX2\b/i.test(features));
 	}
 
 	if (process.platform === "win32") {
-		debugStartup("native:detectAvx2Support:powershell");
 		const output = runCommand("powershell.exe", [
 			"-NoProfile",
 			"-NonInteractive",
 			"-Command",
 			"[System.Runtime.Intrinsics.X86.Avx2]::IsSupported",
 		]);
-		debugStartup("native:detectAvx2Support:done");
 		return output?.toLowerCase() === "true";
 	}
 
-	debugStartup("native:detectAvx2Support:done");
 	return false;
 }
 
 function resolveCpuVariant(override: CpuVariant | null): CpuVariant | null {
 	if (process.arch !== "x64") return null;
 	if (override) return override;
-	return detectAvx2Support() ? "modern" : "baseline";
+	return logger.time("native:detectAvx2Support", () => detectAvx2Support()) ? "modern" : "baseline";
 }
 
 function getAddonFilenames(tag: string, variant: CpuVariant | null): string[] {
@@ -169,7 +150,6 @@ function selectEmbeddedAddonFile(): { filename: string; filePath: string } | nul
 	return embeddedAddon.files.find(file => file.variant === "baseline") ?? null;
 }
 function maybeExtractEmbeddedAddon(errors: string[]): string | null {
-	debugStartup("native:maybeExtractEmbeddedAddon:start");
 	if (!isCompiledBinary || !embeddedAddon) return null;
 	if (embeddedAddon.platformTag !== platformTag || embeddedAddon.version !== packageVersion) return null;
 
@@ -178,7 +158,6 @@ function maybeExtractEmbeddedAddon(errors: string[]): string | null {
 	const targetPath = path.join(versionedDir, selectedEmbeddedFile.filename);
 
 	try {
-		debugStartup("native:maybeExtractEmbeddedAddon:mkdir");
 		fs.mkdirSync(versionedDir, { recursive: true });
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
@@ -186,18 +165,13 @@ function maybeExtractEmbeddedAddon(errors: string[]): string | null {
 		return null;
 	}
 
-	debugStartup("native:maybeExtractEmbeddedAddon:exists");
 	if (fs.existsSync(targetPath)) {
-		debugStartup("native:maybeExtractEmbeddedAddon:done");
 		return targetPath;
 	}
 
 	try {
-		debugStartup("native:maybeExtractEmbeddedAddon:read");
 		const buffer = fs.readFileSync(selectedEmbeddedFile.filePath);
-		debugStartup("native:maybeExtractEmbeddedAddon:write");
 		fs.writeFileSync(targetPath, buffer);
-		debugStartup("native:maybeExtractEmbeddedAddon:done");
 		return targetPath;
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
@@ -206,19 +180,18 @@ function maybeExtractEmbeddedAddon(errors: string[]): string | null {
 	}
 }
 function loadNative(): NativeBindings {
-	debugStartup("native:loadNative:start");
 	const errors: string[] = [];
-	const embeddedCandidate = maybeExtractEmbeddedAddon(errors);
+	const embeddedCandidate = logger.time("native:maybeExtractEmbeddedAddon", () => maybeExtractEmbeddedAddon(errors));
 	const runtimeCandidates = embeddedCandidate ? [embeddedCandidate, ...dedupedCandidates] : dedupedCandidates;
 	for (const candidate of runtimeCandidates) {
 		try {
-			debugStartup(`native:loadNative:require:${path.basename(candidate)}`);
-			const bindings = require(candidate) as NativeBindings;
+			const bindings = logger.time(`native:loadNative:require:${path.basename(candidate)}`, () =>
+				require(candidate),
+			) as NativeBindings;
 			validateNative(bindings, candidate);
 			if ($env.PI_DEV) {
 				console.log(`Loaded native addon from ${candidate}`);
 			}
-			debugStartup("native:loadNative:done");
 			return bindings;
 		} catch (err) {
 			if ($env.PI_DEV) {
@@ -302,4 +275,4 @@ function validateNative(bindings: NativeBindings, source: string): void {
 		);
 	}
 }
-export const native = loadNative();
+export const native = logger.time("native:loadNative", () => loadNative());