@h-rig/core 0.0.6-alpha.60 → 0.0.6-alpha.61

package/dist/src/load-config.js

@@ -31,7 +31,17 @@ function isModuleResolutionError(error) {
 function runningFromCompiledBinary() {
   return import.meta.url.includes("$bunfs");
 }
-async function importConfigViaRuntimeBundle(configPath) {
+var runtimeBundleQueue = Promise.resolve();
+function enqueueRuntimeBundle(operation) {
+  const next = runtimeBundleQueue.then(operation, operation);
+  runtimeBundleQueue = next.then(() => {
+    return;
+  }, () => {
+    return;
+  });
+  return next;
+}
+async function importConfigViaRuntimeBundleUnserialized(configPath) {
   const bun = globalThis.Bun;
   if (!bun?.build) {
     throw new Error(`Failed to import ${configPath}: bare imports could not be resolved and no Bun.build runtime bundler is available.`);
@@ -44,6 +54,7 @@ async function importConfigViaRuntimeBundle(configPath) {
     }
   })();
   const configDir = dirname(configPath);
+  const UNRESOLVED_NAMESPACE = "rig-config-unresolved";
   const hostResolverPlugin = {
     name: "rig-host-package-resolver",
     setup(build) {
@@ -62,6 +73,25 @@ async function importConfigViaRuntimeBundle(configPath) {
         }
         return;
       });
+      build.onResolve({ filter: /.*/ }, (args) => {
+        if (/^(?:node|bun):/.test(args.path))
+          return;
+        const parent = args.importer ? dirname(args.importer) : configDir;
+        try {
+          const resolved = bun.resolveSync?.(args.path, parent);
+          if (resolved)
+            return { path: resolved };
+        } catch {
+          return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
+        }
+        return;
+      });
+      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"?`)});
+`
+      }));
     }
   };
   const result = await bun.build({
@@ -91,18 +121,18 @@ async function loadConfig(cwd) {
   for (const name of TS_NAMES) {
     const p = join(cwd, name);
     if (existsSync(p)) {
-      let mod;
-      if (runningFromCompiledBinary()) {
-        mod = await importConfigViaRuntimeBundle(p);
-      } else {
+      const mod = await enqueueRuntimeBundle(async () => {
+        if (runningFromCompiledBinary()) {
+          return importConfigViaRuntimeBundleUnserialized(p);
+        }
         try {
-          mod = await import(pathToFileURL(p).href);
+          return await import(pathToFileURL(p).href);
         } catch (error) {
           if (!isModuleResolutionError(error))
             throw error;
-          mod = await importConfigViaRuntimeBundle(p);
+          return importConfigViaRuntimeBundleUnserialized(p);
         }
-      }
+      });
       const raw = mod.default ?? mod.config;
       return decodePreservingRuntime(raw);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/core",
-  "version": "0.0.6-alpha.60",
+  "version": "0.0.6-alpha.61",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -31,7 +31,7 @@
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.60",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.61",
     "effect": "4.0.0-beta.78"
   }
 }