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

package/dist/src/load-config.js

@@ -1,10 +1,9 @@
 // @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 { pathToFileURL } from "url";
 import { Schema as Schema2 } from "effect";
 import { RigConfig as RigConfig2 } from "@rig/contracts";
 
@@ -89,24 +88,6 @@ function exportTargetFromPackageJson(pkg, subpath) {
     return target;
   return subpath === "." && typeof pkg.module === "string" ? pkg.module : subpath === "." && typeof pkg.main === "string" ? pkg.main : null;
 }
-function resolvePackageDirFromBunStore(packageName, nodeModulesDir) {
-  const storeDir = join(nodeModulesDir, ".bun");
-  if (!existsSync(storeDir))
-    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;
-    }
-  } catch {
-    return null;
-  }
-  return null;
-}
 function resolveDirectoryModulePath(directoryPath) {
   const packageJsonPath = join(directoryPath, "package.json");
   if (existsSync(packageJsonPath)) {
@@ -141,68 +122,6 @@ function resolveModulePath(candidatePath) {
   }
   return null;
 }
-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];
-  const ceiling = ceilingDir ? resolve(ceilingDir) : null;
-  let current = resolve(parentDir);
-  while (true) {
-    const nodeModulesDir = join(current, "node_modules");
-    for (const packageName of packageNames) {
-      const directPackageDir = join(nodeModulesDir, packageName);
-      const resolvedDirect = resolvePackageExportFromDir(directPackageDir, parsed.subpath);
-      if (resolvedDirect)
-        return resolvedDirect;
-      const bunStorePackageDir = resolvePackageDirFromBunStore(packageName, nodeModulesDir);
-      if (bunStorePackageDir) {
-        const resolvedFromStore = resolvePackageExportFromDir(bunStorePackageDir, parsed.subpath);
-        if (resolvedFromStore)
-          return resolvedFromStore;
-      }
-    }
-    if (ceiling && current === ceiling)
-      break;
-    const next = dirname(current);
-    if (next === current)
-      break;
-    current = next;
-  }
-  return null;
-}
 var runtimeBundleQueue = Promise.resolve();
 function enqueueRuntimeBundle(operation) {
   const next = runtimeBundleQueue.then(operation, operation);
@@ -230,61 +149,31 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
   if (!bun?.build) {
     throw new Error(`Failed to import ${configPath}: bare imports could not be resolved and no Bun.build runtime bundler is available.`);
   }
-  const hostDir = (() => {
-    try {
-      return dirname(fileURLToPath(import.meta.url));
-    } catch {
-      return process.cwd();
-    }
-  })();
   const configDir = dirname(configPath);
   const UNRESOLVED_NAMESPACE = "rig-config-unresolved";
-  const hostResolverPlugin = {
-    name: "rig-host-package-resolver",
+  const unresolvedLocalPlugin = {
+    name: "rig-config-unresolved-local",
     setup(build) {
-      build.onResolve({ filter: /^@rig\// }, (args) => {
-        const candidates = [
-          { specifier: args.path, parent: hostDir },
-          { specifier: args.path.replace(/^@rig\//, "@h-rig/"), parent: hostDir },
-          { specifier: args.path, parent: configDir, root: configDir }
-        ];
-        for (const candidate of candidates) {
-          try {
-            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(candidate.specifier, candidate.parent, candidate.root), candidate.root);
-            if (resolved)
-              return { path: resolved };
-          }
-        }
-        return;
-      });
       build.onResolve({ filter: /.*/ }, (args) => {
-        if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path))
+        if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path) || packageNameAndSubpath(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, projectScoped ? configDir : undefined);
-          const filePath = resolvedFilePath(resolved, projectScoped ? configDir : undefined);
+          const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
+          const filePath = resolvedFilePath(resolved, configDir);
           if (filePath)
             return { path: filePath };
-          if (resolved)
-            return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
         } catch {
-          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 };
+          const filePath = resolvedFilePath(resolve(parent, args.path), configDir);
+          if (filePath)
+            return { path: filePath };
         }
-        return;
+        return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
       });
       build.onLoad({ filter: /.*/, namespace: UNRESOLVED_NAMESPACE }, (args) => ({
         loader: "js",
         contents: `module.exports = {};
-throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not resolve: "${args.path}". Maybe you need to "bun install"?`)});
+throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not resolve local import "${args.path}". Maybe you need to fix a relative import in rig.config.ts or install project deps.`)});
 `
       }));
     }
@@ -294,15 +183,17 @@ 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]
+    packages: "external",
+    plugins: [unresolvedLocalPlugin]
   });
   if (!result.success || !result.outputs[0]) {
     const detail = result.logs.map((log) => String(log)).join(`
 `);
     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.142",
   "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.142",
     "effect": "4.0.0-beta.90"
   }
 }