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

package/dist/src/load-config.js

@@ -1,9 +1,9 @@
 // @bun
 // packages/core/src/load-config.ts
-import { existsSync, mkdtempSync, readFileSync, readdirSync, rmSync } from "fs";
+import { existsSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync } from "fs";
 import { isBuiltin } from "module";
 import { tmpdir } from "os";
-import { dirname, isAbsolute, join } from "path";
+import { dirname, isAbsolute, join, relative, resolve } from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 import { Schema as Schema2 } from "effect";
 import { RigConfig as RigConfig2 } from "@rig/contracts";
@@ -107,29 +107,79 @@ function resolvePackageDirFromBunStore(packageName, nodeModulesDir) {
   }
   return null;
 }
-function resolvePackageExportFromDir(packageDir, subpath) {
-  const packageJsonPath = join(packageDir, "package.json");
-  if (!existsSync(packageJsonPath))
+function resolveDirectoryModulePath(directoryPath) {
+  const packageJsonPath = join(directoryPath, "package.json");
+  if (existsSync(packageJsonPath)) {
+    try {
+      const pkg = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+      const target = exportTargetFromPackageJson(pkg, ".");
+      if (target) {
+        const resolved = resolveModulePath(join(directoryPath, target));
+        if (resolved)
+          return resolved;
+      }
+    } catch {}
+  }
+  for (const candidate of ["index.js", "index.mjs", "index.cjs", "index.ts", "index.json"]) {
+    const resolved = resolveModulePath(join(directoryPath, candidate));
+    if (resolved)
+      return resolved;
+  }
+  return null;
+}
+function resolveModulePath(candidatePath) {
+  if (!existsSync(candidatePath))
     return null;
   try {
-    const pkg = JSON.parse(readFileSync(packageJsonPath, "utf8"));
-    const target = exportTargetFromPackageJson(pkg, subpath);
-    if (target) {
-      const resolved = join(packageDir, target);
-      if (existsSync(resolved))
-        return resolved;
-    }
+    const stat = statSync(candidatePath);
+    if (stat.isFile())
+      return candidatePath;
+    if (stat.isDirectory())
+      return resolveDirectoryModulePath(candidatePath);
   } catch {
     return null;
   }
   return null;
 }
-function resolveBarePackageExport(specifier, parentDir) {
+function resolvePackageExportFromDir(packageDir, subpath) {
+  const packageJsonPath = join(packageDir, "package.json");
+  if (existsSync(packageJsonPath)) {
+    try {
+      const pkg = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+      const target = exportTargetFromPackageJson(pkg, subpath);
+      if (target) {
+        const resolved = resolveModulePath(join(packageDir, target));
+        if (resolved)
+          return resolved;
+      }
+    } catch {
+      return null;
+    }
+  }
+  if (subpath !== ".") {
+    const legacySubpath = subpath.replace(/^\.\//, "");
+    for (const candidate of [
+      join(packageDir, legacySubpath),
+      join(packageDir, `${legacySubpath}.js`),
+      join(packageDir, `${legacySubpath}.mjs`),
+      join(packageDir, `${legacySubpath}.cjs`),
+      join(packageDir, `${legacySubpath}.ts`),
+      join(packageDir, `${legacySubpath}.json`)
+    ]) {
+      const resolved = resolveModulePath(candidate);
+      if (resolved)
+        return resolved;
+    }
+  }
+  return subpath === "." ? resolveDirectoryModulePath(packageDir) : null;
+}
+function resolveBarePackageExport(specifier, parentDir, ceilingDir) {
   const parsed = packageNameAndSubpath(specifier);
   if (!parsed)
     return null;
   const packageNames = parsed.packageName.startsWith("@rig/") ? [parsed.packageName, parsed.packageName.replace(/^@rig\//, "@h-rig/")] : [parsed.packageName];
-  let current = parentDir;
+  const ceiling = ceilingDir ? resolve(ceilingDir) : null;
+  let current = resolve(parentDir);
   while (true) {
     const nodeModulesDir = join(current, "node_modules");
     for (const packageName of packageNames) {
@@ -144,6 +194,8 @@ function resolveBarePackageExport(specifier, parentDir) {
           return resolvedFromStore;
       }
     }
+    if (ceiling && current === ceiling)
+      break;
     const next = dirname(current);
     if (next === current)
       break;
@@ -161,8 +213,17 @@ function enqueueRuntimeBundle(operation) {
   });
   return next;
 }
-function resolvedFilePath(path) {
-  return path && isAbsolute(path) ? path : null;
+function isWithinDir(candidatePath, rootPath) {
+  const rel = relative(resolve(rootPath), resolve(candidatePath));
+  return rel === "" || !rel.startsWith("..") && !isAbsolute(rel);
+}
+function resolvedFilePath(path, rootPath) {
+  if (!path || !isAbsolute(path))
+    return null;
+  const resolved = resolveModulePath(path);
+  if (!resolved)
+    return null;
+  return rootPath && !isWithinDir(resolved, rootPath) ? null : resolved;
 }
 async function importConfigViaRuntimeBundleUnserialized(configPath) {
   const bun = globalThis.Bun;
@@ -183,17 +244,17 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
     setup(build) {
       build.onResolve({ filter: /^@rig\// }, (args) => {
         const candidates = [
-          [args.path, hostDir],
-          [args.path.replace(/^@rig\//, "@h-rig/"), hostDir],
-          [args.path, configDir]
+          { specifier: args.path, parent: hostDir },
+          { specifier: args.path.replace(/^@rig\//, "@h-rig/"), parent: hostDir },
+          { specifier: args.path, parent: configDir, root: configDir }
         ];
-        for (const [specifier, parent] of candidates) {
+        for (const candidate of candidates) {
           try {
-            const resolved = resolvedFilePath(bun.resolveSync?.(specifier, parent) ?? resolveBarePackageExport(specifier, parent));
+            const resolved = resolvedFilePath(bun.resolveSync?.(candidate.specifier, candidate.parent) ?? resolveBarePackageExport(candidate.specifier, candidate.parent, candidate.root), candidate.root);
             if (resolved)
               return { path: resolved };
           } catch {
-            const resolved = resolvedFilePath(resolveBarePackageExport(specifier, parent));
+            const resolved = resolvedFilePath(resolveBarePackageExport(candidate.specifier, candidate.parent, candidate.root), candidate.root);
             if (resolved)
               return { path: resolved };
           }
@@ -204,15 +265,16 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
         if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path))
           return;
         const parent = args.importer ? dirname(args.importer) : configDir;
+        const projectScoped = isWithinDir(parent, configDir);
         try {
-          const resolved = bun.resolveSync?.(args.path, parent) ?? resolveBarePackageExport(args.path, parent);
-          const filePath = resolvedFilePath(resolved);
+          const resolved = bun.resolveSync?.(args.path, parent) ?? resolveBarePackageExport(args.path, parent, projectScoped ? configDir : undefined);
+          const filePath = resolvedFilePath(resolved, projectScoped ? configDir : undefined);
           if (filePath)
             return { path: filePath };
           if (resolved)
             return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
         } catch {
-          const resolved = resolvedFilePath(resolveBarePackageExport(args.path, parent));
+          const resolved = resolvedFilePath(resolveBarePackageExport(args.path, parent, projectScoped ? configDir : undefined), projectScoped ? configDir : undefined);
           if (resolved)
             return { path: resolved };
           return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
@@ -232,6 +294,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"],
     plugins: [hostResolverPlugin]
   });
   if (!result.success || !result.outputs[0]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/core",
-  "version": "0.0.6-alpha.139",
+  "version": "0.0.6-alpha.140",
   "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.139",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.140",
     "effect": "4.0.0-beta.90"
   }
 }