@h-rig/core 0.0.6-alpha.140 → 0.0.6-alpha.141

package/dist/src/load-config.js

@@ -1,8 +1,7 @@
 // @bun
 // packages/core/src/load-config.ts
-import { existsSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync } from "fs";
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync } from "fs";
 import { isBuiltin } from "module";
-import { tmpdir } from "os";
 import { dirname, isAbsolute, join, relative, resolve } from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 import { Schema as Schema2 } from "effect";
@@ -95,17 +94,28 @@ function resolvePackageDirFromBunStore(packageName, nodeModulesDir) {
     return null;
   const encoded = packageName.replace("/", "+");
   try {
-    for (const entry of readdirSync(storeDir).sort()) {
-      if (!entry.startsWith(`${encoded}@`))
-        continue;
-      const candidate = join(storeDir, entry, "node_modules", packageName);
-      if (existsSync(join(candidate, "package.json")))
-        return candidate;
-    }
+    const candidates = readdirSync(storeDir).filter((entry) => entry.startsWith(`${encoded}@`)).map((entry) => {
+      const candidateDir = join(storeDir, entry, "node_modules", packageName);
+      const packageJsonPath = join(candidateDir, "package.json");
+      if (!existsSync(packageJsonPath))
+        return null;
+      try {
+        const pkg = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+        return {
+          dir: candidateDir,
+          sortKey: pkg.version?.trim() || entry
+        };
+      } catch {
+        return {
+          dir: candidateDir,
+          sortKey: entry
+        };
+      }
+    }).filter((candidate) => candidate !== null).sort((a, b) => b.sortKey.localeCompare(a.sortKey, undefined, { numeric: true, sensitivity: "base" }));
+    return candidates[0]?.dir ?? null;
   } catch {
     return null;
   }
-  return null;
 }
 function resolveDirectoryModulePath(directoryPath) {
   const packageJsonPath = join(directoryPath, "package.json");
@@ -225,6 +235,10 @@ function resolvedFilePath(path, rootPath) {
     return null;
   return rootPath && !isWithinDir(resolved, rootPath) ? null : resolved;
 }
+var RUNTIME_BUNDLE_EXTERNALS = [];
+function shouldDeferToRuntimeExternal(specifier) {
+  return RUNTIME_BUNDLE_EXTERNALS.includes(specifier);
+}
 async function importConfigViaRuntimeBundleUnserialized(configPath) {
   const bun = globalThis.Bun;
   if (!bun?.build) {
@@ -262,9 +276,9 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
         return;
       });
       build.onResolve({ filter: /.*/ }, (args) => {
-        if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path))
-          return;
         const parent = args.importer ? dirname(args.importer) : configDir;
+        if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path) || shouldDeferToRuntimeExternal(args.path))
+          return;
         const projectScoped = isWithinDir(parent, configDir);
         try {
           const resolved = bun.resolveSync?.(args.path, parent) ?? resolveBarePackageExport(args.path, parent, projectScoped ? configDir : undefined);
@@ -294,7 +308,7 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
     target: "bun",
     format: "esm",
     throw: false,
-    external: ["fastembed", "onnxruntime-node", "mupdf", "markit-ai"],
+    external: [...RUNTIME_BUNDLE_EXTERNALS],
     plugins: [hostResolverPlugin]
   });
   if (!result.success || !result.outputs[0]) {
@@ -302,7 +316,9 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
 `);
     throw new Error(`Failed to bundle ${configPath}: ${detail || "unknown bundler error"}`);
   }
-  const dir = mkdtempSync(join(tmpdir(), "rig-config-bundle-"));
+  const bundleParentDir = join(configDir, ".rig", "tmp");
+  mkdirSync(bundleParentDir, { recursive: true });
+  const dir = mkdtempSync(join(bundleParentDir, "rig-config-bundle-"));
   try {
     const bundledPath = join(dir, "rig.config.bundled.js");
     await bun.write(bundledPath, await result.outputs[0].text());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/core",
-  "version": "0.0.6-alpha.140",
+  "version": "0.0.6-alpha.141",
   "type": "module",
   "description": "Config and plugin composition library for Rig's OMP extension ecosystem; not a product host/runtime.",
   "license": "UNLICENSED",
@@ -45,7 +45,7 @@
   "module": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.140",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.141",
     "effect": "4.0.0-beta.90"
   }
 }