Change location of exports

Author: brendandahl

src/lib/libembind.js

@@ -34,10 +34,10 @@ var LibraryEmbind = {
 #if EMBIND_AOT
   $InvokerFunctions: '<<< EMBIND_AOT_INVOKERS >>>',
 #if MODULARIZE == 'instance'
-  // embindUpdateExports is called in the generated code after embind is
+  // embindAssignExports is called in the generated code after embind is
   // initialized. It will link the bindings to the ES module exports.
-  $embindUpdateExports: '<<< EMBIND_AOT_UPDATE_EXPORTS >>>',
-  $embindUpdateExports__postset: 'addOnInit(embindUpdateExports);',
+  $embindAssignExports: '<<< EMBIND_AOT_ASSIGN_EXPORTS >>>',
+  $embindAssignExports__postset: () => { addAtPostCtor('embindAssignExports();'); },
 #endif
 #endif
   // If register_type is used, emval will be registered multiple times for
@@ -2320,7 +2320,7 @@ var LibraryEmbind = {
 };
 
 #if MODULARIZE == 'instance'
-extraLibraryFuncs.push('$embindUpdateExports');
+extraLibraryFuncs.push('$embindAssignExports');
 #endif
 
 addToLibrary(LibraryEmbind);

src/lib/libembind_gen.js

@@ -466,15 +466,9 @@ var LibraryEmbind = {
         def.printJs(out);
       }
       out.push('}\n');
-      let updateExports = '() => {\n';
-      for (const publicSymbol of publicSymbols) {
-        updateExports += `__exp_${publicSymbol} = Module['${publicSymbol}'];\n`
-      }
-      updateExports += '}\n';
       console.log(JSON.stringify({
         'invokers': out.join(''),
         publicSymbols,
-        updateExports
       }));
     }
   },

tools/link.py

@@ -2052,14 +2052,23 @@ def phase_emit_tsd(options, wasm_target, js_target, js_syms, metadata):
 @ToolchainProfiler.profile_block('embind aot js')
 def phase_embind_aot(options, wasm_target, js_syms):
   out = run_embind_gen(options, wasm_target, js_syms, {})
+
   if DEBUG:
     write_file(in_temp('embind_aot.json'), out)
   out = json.loads(out)
   src = read_file(final_js)
   src = do_replace(src, '<<< EMBIND_AOT_INVOKERS >>>', out['invokers'])
   if settings.MODULARIZE == 'instance':
-    settings.EMBIND_EXPORTS = out['publicSymbols']
-    src = do_replace(src, '<<< EMBIND_AOT_UPDATE_EXPORTS >>>', out['updateExports'])
+    # Add ES module exports for the embind exports.
+    decls = [f'export var {name};' for name in out['publicSymbols']]
+    # Assign the runtime exports from Module to the ES export.
+    assigns = [f'{name} = Module[\'{name}\'];' for name in out['publicSymbols']]
+    exports = f'''
+// start embind exports
+() => {{ {'\n'.join(assigns)} }};
+{'\n'.join(decls)}
+// end embind exports'''
+    src = do_replace(src, '<<< EMBIND_AOT_ASSIGN_EXPORTS >>>',  exports)
   write_file(final_js, src)