Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add "compile_module" and "eval_module" flags to std.evalScript #732

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Add "compile_module" and "eval_module" flags to std.evalScript #732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion quickjs-libc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,9 @@ static JSValue js_evalScript(JSContext *ctx, JSValue this_val,
JSValue options_obj;
BOOL backtrace_barrier = FALSE;
BOOL eval_function = FALSE;
BOOL eval_module = FALSE;
BOOL compile_only = FALSE;
BOOL compile_module = FALSE;
BOOL is_async = FALSE;
int flags;

Expand All @@ -860,14 +862,33 @@ static JSValue js_evalScript(JSContext *ctx, JSValue this_val,
if (get_bool_option(ctx, &eval_function, options_obj,
"eval_function"))
return JS_EXCEPTION;
if (get_bool_option(ctx, &eval_module, options_obj,
"eval_module"))
return JS_EXCEPTION;
if (get_bool_option(ctx, &compile_only, options_obj,
"compile_only"))
return JS_EXCEPTION;
if (get_bool_option(ctx, &compile_module, options_obj,
"compile_module"))
return JS_EXCEPTION;
if (get_bool_option(ctx, &is_async, options_obj,
"async"))
return JS_EXCEPTION;
}

if (eval_module) {
obj = argv[0];
if (JS_VALUE_GET_TAG(obj) != JS_TAG_MODULE)
return JS_ThrowTypeError(ctx, "not a module");

if (JS_ResolveModule(ctx, obj) < 0)
return JS_EXCEPTION;

js_module_set_import_meta(ctx, obj, FALSE, FALSE);

return JS_EvalFunction(ctx, obj);
}

if (!eval_function) {
str = JS_ToCStringLen(ctx, &len, argv[0]);
if (!str)
Expand All @@ -877,7 +898,7 @@ static JSValue js_evalScript(JSContext *ctx, JSValue this_val,
/* install the interrupt handler */
JS_SetInterruptHandler(JS_GetRuntime(ctx), interrupt_handler, NULL);
}
flags = JS_EVAL_TYPE_GLOBAL;
flags = compile_module ? JS_EVAL_TYPE_MODULE : JS_EVAL_TYPE_GLOBAL;
if (backtrace_barrier)
flags |= JS_EVAL_FLAG_BACKTRACE_BARRIER;
if (compile_only)
Expand Down