Pass along result pointer in bare_load()

holepunchto · Jun 21, 2024 · c690b2a · c690b2a
1 parent 411b113
commit c690b2a
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/bin/bare.c b/bin/bare.c
@@ -20,7 +20,7 @@ main (int argc, char *argv[]) {
 
   uv_buf_t source = uv_buf_init((char *) bare_bundle, bare_bundle_len);
 
-  bare_load(bare, "/bare.bundle", &source);
+  bare_load(bare, "/bare.bundle", &source, NULL);
 
   err = bare_run(bare);
   assert(err == 0);

diff --git a/include/bare.h b/include/bare.h
@@ -63,7 +63,7 @@ bare_teardown (bare_t *bare, int *exit_code);
  * supported module formats.
  */
 int
-bare_load (bare_t *bare, const char *filename, const uv_buf_t *source);
+bare_load (bare_t *bare, const char *filename, const uv_buf_t *source, js_value_t **result);
 
 /**
  * Run the I/O event loop.

diff --git a/src/bare.c b/src/bare.c
@@ -76,7 +76,7 @@ bare_teardown (bare_t *bare, int *exit_code) {
 }
 
 int
-bare_load (bare_t *bare, const char *filename, const uv_buf_t *source) {
+bare_load (bare_t *bare, const char *filename, const uv_buf_t *source, js_value_t **result) {
   int err;
 
   bare_runtime_t *runtime = bare->process.runtime;
@@ -90,7 +90,8 @@ bare_load (bare_t *bare, const char *filename, const uv_buf_t *source) {
         source ? source->base : NULL,
         source ? source->len : 0
       ),
-    }
+    },
+    result
   );
 
   return err;

diff --git a/src/bare.js b/src/bare.js
@@ -266,5 +266,5 @@ const Module = require('bare-module')
 const url = require('bare-url')
 
 bare.load = function load (filename, source) {
-  Module.load(url.pathToFileURL(filename), source ? Buffer.from(source) : null)
+  return Module.load(url.pathToFileURL(filename), source ? Buffer.from(source) : null)
 }
diff --git a/src/runtime.c b/src/runtime.c
@@ -1086,7 +1086,7 @@ bare_runtime_teardown (bare_runtime_t *runtime, int *exit_code) {
 }
 
 int
-bare_runtime_load (bare_runtime_t *runtime, const char *filename, bare_source_t source) {
+bare_runtime_load (bare_runtime_t *runtime, const char *filename, bare_source_t source, js_value_t **result) {
   int err;
 
   js_env_t *env = runtime->env;
@@ -1133,7 +1133,7 @@ bare_runtime_load (bare_runtime_t *runtime, const char *filename, bare_source_t
   err = js_get_global(env, &global);
   assert(err == 0);
 
-  js_call_function(env, global, load, 2, args, NULL);
+  js_call_function(env, global, load, 2, args, result);
 
   err = js_close_handle_scope(env, scope);
   assert(err == 0);

diff --git a/src/runtime.h b/src/runtime.h
@@ -12,7 +12,7 @@ int
 bare_runtime_teardown (bare_runtime_t *runtime, int *exit_code);
 
 int
-bare_runtime_load (bare_runtime_t *runtime, const char *filename, bare_source_t source);
+bare_runtime_load (bare_runtime_t *runtime, const char *filename, bare_source_t source, js_value_t **result);
 
 int
 bare_runtime_run (bare_runtime_t *runtime);

diff --git a/src/thread.c b/src/thread.c
@@ -102,7 +102,7 @@ bare_thread_entry (void *opaque) {
     runtime->process->on_thread((bare_t *) runtime->process, env);
   }
 
-  bare_runtime_load(runtime, thread->filename, source);
+  bare_runtime_load(runtime, thread->filename, source, NULL);
 
   err = bare_runtime_run(runtime);
   assert(err == 0);

diff --git a/test/argv-empty.c b/test/argv-empty.c
@@ -22,7 +22,7 @@ main (int argc, char *argv[]) {
 
   uv_buf_t source = uv_buf_init("", 0);
 
-  bare_load(bare, "/test.js", &source);
+  bare_load(bare, "/test.js", &source, NULL);
 
   e = bare_run(bare);
   assert(e == 0);

diff --git a/test/restart.c b/test/restart.c
@@ -34,7 +34,7 @@ main (int argc, char *argv[]) {
 
     uv_buf_t source = uv_buf_init(code, strlen(code));
 
-    bare_load(bare, "/test.js", &source);
+    bare_load(bare, "/test.js", &source, NULL);
 
     e = bare_run(bare);
     assert(e == 0);