Skip to content

Fix WASM binding resolution across module scopes #154

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
Arnold-Seb wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −2
Open

Fix WASM binding resolution across module scopes #154

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
26 changes: 24 additions & 2 deletions CSharpWasmExpo/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,31 @@ const parseMethods = (methods) => {

const bindingsFunctions = {};

const frame = document.querySelector("iframe");
const wasmScope = frame?.contentWindow;

for (const name of methodList) {
try {
bindingsFunctions[name] = eval(name);
let fn =
globalThis[name] ??
wasmScope?.[name] ??
wasmScope?.[`_CPP_${name}`];

if (typeof fn !== "function") {
const sklibMatch = Object.keys(wasmScope || {}).find(
(key) => key === `__sklib__${name}` || key.startsWith(`__sklib__${name}__`)
);

if (sklibMatch && typeof wasmScope[sklibMatch] === "function") {
fn = wasmScope[sklibMatch];
}
}

if (typeof fn === "function") {
bindingsFunctions[name] = fn;
} else {
console.warn(`Missing binding: ${name}`);
}
} catch (e) {
console.warn(e);
}
Expand Down Expand Up @@ -68,4 +90,4 @@ const CompileAndRun = async (code, reportError) => {
// This event will be trigger by the csharp compiler
document.addEventListener("compileAndRun", (ev) => {
CompileAndRun(ev.detail.program[0].source, ev.detail.reportError);
});
});
Loading