Fix name mangling issues in optimized build

Author: justjake

c/interface.c

@@ -520,16 +520,19 @@ int QTS_BuildIsAsyncify() {
 
 // ----------------------------------------------------------------------------
 // C -> Host Callbacks
+// Note: inside EM_JS, we need to use ['...'] subscript syntax for accessing JS
+// objects, because in optimized builds, Closure compiler will mangle all the
+// names.
 
 // -------------------
 // function: C -> Host
 EM_JS(MaybeAsync(JSValue *), qts_host_call_function, (JSContext * ctx, JSValueConst *this_ptr, int argc, JSValueConst *argv, int magic_func_id), {
 #ifdef QTS_ASYNCIFY
-  const asyncify = Asyncify;
+  const asyncify = {['handleSleep'] : Asyncify.handleSleep};
 #else
   const asyncify = undefined;
 #endif
-  return Module.callbacks.callFunction(asyncify, ctx, this_ptr, argc, argv, magic_func_id);
+  return Module['callbacks']['callFunction'](asyncify, ctx, this_ptr, argc, argv, magic_func_id);
 });
 
 // Function: QuickJS -> C
@@ -573,7 +576,7 @@ EM_JS(int, qts_host_interrupt_handler, (JSRuntime * rt), {
   // #else
   const asyncify = undefined;
   // #endif
-  return Module.callbacks.shouldInterrupt(asyncify, rt);
+  return Module['callbacks']['shouldInterrupt'](asyncify, rt);
 });
 
 // interrupt: QuickJS -> C
@@ -594,11 +597,11 @@ void QTS_RuntimeDisableInterruptHandler(JSRuntime *rt) {
 // load module: C -> Host
 EM_JS(MaybeAsync(JSModuleDef *), qts_host_load_module, (JSRuntime * rt, JSContext *ctx, const char *module_name), {
 #ifdef QTS_ASYNCIFY
-  const asyncify = Asyncify;
+  const asyncify = {['handleSleep'] : Asyncify.handleSleep};
 #else
   const asyncify = undefined;
 #endif
-  return Module.callbacks.loadModule(asyncify, rt, ctx, module_name);
+  return Module['callbacks']['loadModule'](asyncify, rt, ctx, module_name);
 });
 
 // load module: QuickJS -> C

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickjs-emscripten",
-  "version": "0.15.0",
+  "version": "0.50.0",
   "main": "dist/quickjs.js",
   "license": "MIT",
   "keywords": [

ts/ffi-asyncify.ts

@@ -12,7 +12,7 @@ import { JSRuntimePointer, JSContextPointer, JSContextPointerPointer, JSModuleDe
 export class QuickJSAsyncFFI {
   constructor(private module: QuickJSAsyncEmscriptenModule) {}
   /** Set at compile time. */
-  readonly DEBUG = true
+  readonly DEBUG = false
 
   QTS_Throw: (ctx: JSContextPointer, error: JSValuePointer | JSValueConstPointer) => JSValuePointer =
     this.module.cwrap("QTS_Throw", "number", ["number","number"])
@@ -96,19 +96,19 @@ export class QuickJSAsyncFFI {
     assertSync(this.module.cwrap("QTS_ExecutePendingJob", "number", ["number","number","number"]))
 
   QTS_ExecutePendingJob_MaybeAsync: (rt: JSRuntimePointer, maxJobsToExecute: number, lastJobContext: JSContextPointerPointer) => JSValuePointer | Promise<JSValuePointer> =
-    this.module.cwrap("QTS_ExecutePendingJob", "number", ["number","number","number"], { async: true })
+    this.module.cwrap("QTS_ExecutePendingJob", "number", ["number","number","number"])
 
   QTS_GetProp: (ctx: JSContextPointer, this_val: JSValuePointer | JSValueConstPointer, prop_name: JSValuePointer | JSValueConstPointer) => JSValuePointer =
     assertSync(this.module.cwrap("QTS_GetProp", "number", ["number","number","number"]))
 
   QTS_GetProp_MaybeAsync: (ctx: JSContextPointer, this_val: JSValuePointer | JSValueConstPointer, prop_name: JSValuePointer | JSValueConstPointer) => JSValuePointer | Promise<JSValuePointer> =
-    this.module.cwrap("QTS_GetProp", "number", ["number","number","number"], { async: true })
+    this.module.cwrap("QTS_GetProp", "number", ["number","number","number"])
 
   QTS_SetProp: (ctx: JSContextPointer, this_val: JSValuePointer | JSValueConstPointer, prop_name: JSValuePointer | JSValueConstPointer, prop_value: JSValuePointer | JSValueConstPointer) => void =
     assertSync(this.module.cwrap("QTS_SetProp", null, ["number","number","number","number"]))
 
   QTS_SetProp_MaybeAsync: (ctx: JSContextPointer, this_val: JSValuePointer | JSValueConstPointer, prop_name: JSValuePointer | JSValueConstPointer, prop_value: JSValuePointer | JSValueConstPointer) => void | Promise<void> =
-    this.module.cwrap("QTS_SetProp", null, ["number","number","number","number"], { async: true })
+    this.module.cwrap("QTS_SetProp", null, ["number","number","number","number"])
 
   QTS_DefineProp: (ctx: JSContextPointer, this_val: JSValuePointer | JSValueConstPointer, prop_name: JSValuePointer | JSValueConstPointer, prop_value: JSValuePointer | JSValueConstPointer, get: JSValuePointer | JSValueConstPointer, set: JSValuePointer | JSValueConstPointer, configurable: boolean, enumerable: boolean, has_value: boolean) => void =
     this.module.cwrap("QTS_DefineProp", null, ["number","number","number","number","number","number","boolean","boolean","boolean"])
@@ -117,7 +117,7 @@ export class QuickJSAsyncFFI {
     assertSync(this.module.cwrap("QTS_Call", "number", ["number","number","number","number","number"]))
 
   QTS_Call_MaybeAsync: (ctx: JSContextPointer, func_obj: JSValuePointer | JSValueConstPointer, this_obj: JSValuePointer | JSValueConstPointer, argc: number, argv_ptrs: JSValueConstPointerPointer) => JSValuePointer | Promise<JSValuePointer> =
-    this.module.cwrap("QTS_Call", "number", ["number","number","number","number","number"], { async: true })
+    this.module.cwrap("QTS_Call", "number", ["number","number","number","number","number"])
 
   QTS_ResolveException: (ctx: JSContextPointer, maybe_exception: JSValuePointer) => JSValuePointer =
     this.module.cwrap("QTS_ResolveException", "number", ["number","number"])
@@ -126,13 +126,13 @@ export class QuickJSAsyncFFI {
     assertSync(this.module.cwrap("QTS_Dump", "string", ["number","number"]))
 
   QTS_Dump_MaybeAsync: (ctx: JSContextPointer, obj: JSValuePointer | JSValueConstPointer) => string | Promise<string> =
-    this.module.cwrap("QTS_Dump", "string", ["number","number"], { async: true })
+    this.module.cwrap("QTS_Dump", "string", ["number","number"])
 
   QTS_Eval: (ctx: JSContextPointer, js_code: HeapCharPointer, filename: string, detectModule: EvalDetectModule, evalFlags: EvalFlags) => JSValuePointer =
     assertSync(this.module.cwrap("QTS_Eval", "number", ["number","number","string","number","number"]))
 
   QTS_Eval_MaybeAsync: (ctx: JSContextPointer, js_code: HeapCharPointer, filename: string, detectModule: EvalDetectModule, evalFlags: EvalFlags) => JSValuePointer | Promise<JSValuePointer> =
-    this.module.cwrap("QTS_Eval", "number", ["number","number","string","number","number"], { async: true })
+    this.module.cwrap("QTS_Eval", "number", ["number","number","string","number","number"])
 
   QTS_Typeof: (ctx: JSContextPointer, value: JSValuePointer | JSValueConstPointer) => string =
     this.module.cwrap("QTS_Typeof", "string", ["number","number"])

ts/ffi.ts

@@ -12,7 +12,7 @@ import { JSRuntimePointer, JSContextPointer, JSContextPointerPointer, JSModuleDe
 export class QuickJSFFI {
   constructor(private module: QuickJSEmscriptenModule) {}
   /** Set at compile time. */
-  readonly DEBUG = true
+  readonly DEBUG = false
 
   QTS_Throw: (ctx: JSContextPointer, error: JSValuePointer | JSValueConstPointer) => JSValuePointer =
     this.module.cwrap("QTS_Throw", "number", ["number","number"])