@oh-my-pi/pi-natives 17.2.1 → 17.2.2

package/native/index.d.ts

@@ -246,7 +246,7 @@ export declare function __ompInstallTokioRuntime(): void
  * `packages/natives/native/index.js` (which derives the name from
  * `package.json#version`).
  */
-export declare function __piNativesV17_2_1(): void
+export declare function __piNativesV17_2_2(): void
 
 /**
  * Apply ast-grep rewrite rules to matching files; honors `dryRun` and returns

package/native/index.js

@@ -28,7 +28,7 @@ export const Shell = nativeBindings.Shell;
 
 // functions
 export const __ompInstallTokioRuntime = nativeBindings.__ompInstallTokioRuntime;
-export const __piNativesV17_2_1 = nativeBindings.__piNativesV17_2_1;
+export const __piNativesV17_2_2 = nativeBindings.__piNativesV17_2_2;
 export const astEdit = nativeBindings.astEdit;
 export const astGrep = nativeBindings.astGrep;
 export const astMatch = nativeBindings.astMatch;

package/native/loader-state.d.ts

@@ -55,6 +55,32 @@ export interface ResolveLoaderCandidatesInput {
 
 export function resolveLoaderCandidates(input: ResolveLoaderCandidatesInput): string[];
 
+export interface InitLoaderContextOverrides {
+	nativeDir?: string;
+	platform?: NodeJS.Platform | string;
+	isCompiledBinary?: boolean;
+	leafPackageDir?: string | null;
+}
+
+export interface NativeLoaderContext {
+	platformTag: string;
+	packageVersion: string;
+	nativeDir: string;
+	leafPackageDir: string | null;
+	versionedDir: string;
+	isCompiledBinary: boolean;
+	stageFromNodeModules: boolean;
+	selectedVariant: "modern" | "baseline" | null;
+	addonFilenames: string[];
+	addonLabel: string;
+	candidates: string[];
+	versionSentinelExport: string;
+	isWorkspaceLoad: boolean;
+	nativesDir: string;
+}
+
+export function initLoaderContext(overrides?: InitLoaderContextOverrides): NativeLoaderContext;
+
 export interface CleanupStaleNativeVersionsInput {
 	nativesDir: string;
 	currentVersion: string;

package/native/loader-state.js

@@ -129,7 +129,8 @@ export function shouldStageNodeModulesAddon({ platform, isCompiledBinary, native
 	// Check both separators independently of the host's `path.sep`: this helper
 	// is shared by the loader (running on Windows with `\`) and the test suite
 	// (typically running on POSIX hosts when CI executes the regression test).
-	return nativeDir.includes("\\node_modules\\") || nativeDir.includes("/node_modules/");
+	const normalizedNativeDir = nativeDir.toLowerCase();
+	return normalizedNativeDir.includes("\\node_modules\\") || normalizedNativeDir.includes("/node_modules/");
 }
 
 /**
@@ -698,28 +699,44 @@ function buildHelpMessage(ctx) {
  * Called from `loadNative()` rather than at module scope so importing pure
  * helpers from this file doesn't trigger AVX2 detection or filesystem probes.
  */
-function initLoaderContext() {
-	const platformTag = `${process.platform}-${process.arch}`;
+/**
+ * @param {{ nativeDir?: string; platform?: NodeJS.Platform | string; isCompiledBinary?: boolean; leafPackageDir?: string | null }} [overrides]
+ */
+export function initLoaderContext(overrides = {}) {
+	const platform = overrides.platform ?? process.platform;
+	const platformTag = `${platform}-${process.arch}`;
 	const packageVersion = packageJson.version;
-	const nativeDir = path.join(import.meta.dir, "..", "native");
+	const nativeDir = overrides.nativeDir ?? path.join(import.meta.dir, "..", "native");
 	const execDir = path.dirname(process.execPath);
 	const nativesDir = getNativesDir();
 	const versionedDir = path.join(nativesDir, packageVersion);
 	const userDataDir =
-		process.platform === "win32"
+		platform === "win32"
 			? path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local"), "omp")
 			: path.join(os.homedir(), ".local", "bin");
 
-	const isCompiledBinary = detectCompiledBinary({
-		embeddedAddon,
-		env: process.env,
-		importMetaUrl: import.meta.url,
-	});
-	const leafPackageDir = isCompiledBinary ? null : resolveLeafPackageDir(platformTag);
+	const isCompiledBinary =
+		overrides.isCompiledBinary ??
+		detectCompiledBinary({
+			embeddedAddon,
+			env: process.env,
+			importMetaUrl: import.meta.url,
+		});
+	const normalizedNativeDir = platform === "win32" ? nativeDir.toLowerCase() : nativeDir;
+	const isWorkspaceLoad =
+		!isCompiledBinary &&
+		!normalizedNativeDir.includes("\\node_modules\\") &&
+		!normalizedNativeDir.includes("/node_modules/");
+	const leafPackageDir =
+		isCompiledBinary || isWorkspaceLoad
+			? null
+			: overrides.leafPackageDir === undefined
+				? resolveLeafPackageDir(platformTag)
+				: overrides.leafPackageDir;
 	const stageFromNodeModules = shouldStageNodeModulesAddon({
-		platform: process.platform,
+		platform,
 		isCompiledBinary,
-		nativeDir,
+		nativeDir: normalizedNativeDir,
 	});
 
 	const selectedVariant = resolveCpuVariant(getVariantOverride());
@@ -745,8 +762,6 @@ function initLoaderContext() {
 	// turns the silent `<sym> is not a function` crash from a Windows
 	// locked-file update into an actionable load-time error.
 	const versionSentinelExport = `__piNativesV${packageVersion.replace(/[^A-Za-z0-9]/g, "_")}`;
-	const isWorkspaceLoad =
-		!isCompiledBinary && !nativeDir.includes("\\node_modules\\") && !nativeDir.includes("/node_modules/");
 
 	return {
 		platformTag,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-natives",
-	"version": "17.2.1",
+	"version": "17.2.2",
 	"description": "Native Rust bindings for audio, WebRTC, grep, clipboard, image processing, syntax highlighting, PTY, and shell operations via N-API",
 	"type": "module",
 	"homepage": "https://omp.sh",
@@ -74,10 +74,10 @@
 		}
 	},
 	"optionalDependencies": {
-		"@oh-my-pi/pi-natives-linux-x64": "17.2.1",
-		"@oh-my-pi/pi-natives-linux-arm64": "17.2.1",
-		"@oh-my-pi/pi-natives-darwin-x64": "17.2.1",
-		"@oh-my-pi/pi-natives-darwin-arm64": "17.2.1",
-		"@oh-my-pi/pi-natives-win32-x64": "17.2.1"
+		"@oh-my-pi/pi-natives-linux-x64": "17.2.2",
+		"@oh-my-pi/pi-natives-linux-arm64": "17.2.2",
+		"@oh-my-pi/pi-natives-darwin-x64": "17.2.2",
+		"@oh-my-pi/pi-natives-darwin-arm64": "17.2.2",
+		"@oh-my-pi/pi-natives-win32-x64": "17.2.2"
 	}
 }