mleku/wazero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removes api.ImportRenamer for a different approach to "env" (#680)

Browse Source 
Before, we introduced a type `api.ImportRenamer` to resolve conflicts
where the "env" module was shared between AssemblyScript and
user-defined functions. This API was never used in GitHub, and is
complicated.

AssemblyScript also isn't the only ABI to share the "env" module, as
other web APIs like Emscripten do also. The less complicated approach is
to have packages that need to share "env" use
`ModuleBuilder.ExportFunctions` instead, and use namespaces as needed if
there is overlap.

Signed-off-by: Adrian Cole <adrian@tetrate.io>
This commit is contained in:
Crypt Keeper
2022-07-11 14:57:26 +08:00
committed by GitHub
parent 09a8aa6030
commit 14d892d310
14 changed files with 322 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
runtime_test.go
View File

@@ -78,56 +78,6 @@ func TestRuntime_CompileModule(t *testing.T) {
Max: 3,
}, code.module.MemorySection)
})
t.Run("WithImportReplacements", func(t *testing.T) {
testBin, err := watzero.Wat2Wasm(`(module
(import "js" "increment" (func $increment (result i32)))
(import "js" "decrement" (func $decrement (result i32)))
(import "js" "wasm_increment" (func $wasm_increment (result i32)))
(import "js" "wasm_decrement" (func $wasm_decrement (result i32)))
)`)
require.NoError(t, err)
m, err := r.CompileModule(testCtx, testBin, NewCompileConfig().
WithImportRenamer(func(externType api.ExternType, oldModule, oldName string) (string, string) {
if externType != api.ExternTypeFunc {
return oldModule, oldName
}
switch oldName {
case "increment", "decrement":
return "go", oldName
case "wasm_increment", "wasm_decrement":
return "wasm", oldName
default:
return oldModule, oldName
}
}))
require.NoError(t, err)
code := m.(*compiledModule)
require.Equal(t, []*wasm.Import{
{
Module: "go", Name: "increment",
Type: wasm.ExternTypeFunc,
DescFunc: 0,
},
{
Module: "go", Name: "decrement",
Type: wasm.ExternTypeFunc,
DescFunc: 0,
},
{
Module: "wasm", Name: "wasm_increment",
Type: wasm.ExternTypeFunc,
DescFunc: 0,
},
{
Module: "wasm", Name: "wasm_decrement",
Type: wasm.ExternTypeFunc,
DescFunc: 0,
},
}, code.module.ImportSection)
})
}
func TestRuntime_CompileModule_Errors(t *testing.T) {