@wasmgroundup/emit 0.2.1 → 0.2.3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export type BytecodeFragment = (number | BytecodeFragment)[];
+type BytecodeFragment = (number | BytecodeFragment)[];
 declare enum valtype {
     i32 = 127,
     i64 = 126,
@@ -25,6 +25,7 @@ declare function module(sections: any): BytecodeFragment;
 declare const instr: {
     nop: number;
     end: number;
+    call: number;
     local: {
         get: number;
         set: number;
@@ -47,15 +48,22 @@ declare const instr: {
         add: number;
         sub: number;
         mul: number;
+        div: number;
     };
     f64: {
         const: number;
         add: number;
         sub: number;
         mul: number;
+        div: number;
     };
 };
 declare function u32(v: number | bigint): number[];
 declare function i32(v: number | bigint): number[];
 declare function locals(n: number, type: valtype): BytecodeFragment;
-export { code, codesec, export_, exportdesc, exportsec, func, funcidx, funcsec, functype, i32, instr, locals, module, name, section, typeidx, typesec, valtype, vec, };
+declare function import_(mod: string, nm: string, d: BytecodeFragment): BytecodeFragment;
+declare function importsec(ims: BytecodeFragment): BytecodeFragment;
+declare const importdesc: {
+    func(x: number): BytecodeFragment;
+};
+export { BytecodeFragment, code, codesec, export_, exportdesc, exportsec, func, funcidx, funcsec, functype, i32, import_, importdesc, importsec, instr, locals, module, name, section, typeidx, typesec, valtype, vec, };

package/dist/index.js

@@ -1,4 +1,5 @@
 const SECTION_ID_TYPE = 1;
+const SECTION_ID_IMPORT = 2;
 const SECTION_ID_FUNCTION = 3;
 const SECTION_ID_EXPORT = 7;
 const SECTION_ID_CODE = 10;
@@ -83,6 +84,7 @@ var numtype;
 const instr = {
     nop: 0x01,
     end: 0x0b,
+    call: 0x10,
     local: {
         get: 0x20,
         set: 0x21,
@@ -105,12 +107,14 @@ const instr = {
         add: 0x92,
         sub: 0x93,
         mul: 0x94,
+        div: 0x95,
     },
     f64: {
         const: 0x44,
         add: 0xa0,
         sub: 0xa1,
         mul: 0xa2,
+        div: 0xa3,
     },
 };
 const SEVEN_BIT_MASK_BIG_INT = 127n;
@@ -154,4 +158,18 @@ function i32(v) {
 function locals(n, type) {
     return [u32(n), type];
 }
-export { code, codesec, export_, exportdesc, exportsec, func, funcidx, funcsec, functype, i32, instr, locals, module, name, section, typeidx, typesec, valtype, vec, };
+// mod:name  nm:name  d:importdesc
+function import_(mod, nm, d) {
+    return [name(mod), name(nm), d];
+}
+// im*:vec(import)
+function importsec(ims) {
+    return section(SECTION_ID_IMPORT, vec(ims));
+}
+const importdesc = {
+    // x:typeidx
+    func(x) {
+        return [0x00, funcidx(x)];
+    },
+};
+export { code, codesec, export_, exportdesc, exportsec, func, funcidx, funcsec, functype, i32, import_, importdesc, importsec, instr, locals, module, name, section, typeidx, typesec, valtype, vec, };

package/index.test.ts

@@ -1,20 +1,24 @@
 import { expect, test } from "bun:test";
 
 import {
-  module,
-  typesec,
-  functype,
-  valtype,
-  funcsec,
-  typeidx,
-  exportsec,
+  BytecodeFragment,
+  code,
+  codesec,
   export_,
   exportdesc,
-  codesec,
-  code,
+  exportsec,
   func,
-  locals,
+  funcidx,
+  funcsec,
+  functype,
+  import_,
+  importdesc,
+  importsec,
   instr,
+  module,
+  typeidx,
+  typesec,
+  valtype,
 } from "./index";
 
 test("simple modules", async () => {
@@ -57,3 +61,29 @@ test("simple modules", async () => {
     ),
   ).toBe(99);
 });
+
+test("imports", async () => {
+  const makeModule = () => {
+    const mod = module([
+      typesec([functype([valtype.i32], [valtype.i32])]),
+      importsec([import_("builtins", "addOne", importdesc.func(0))]),
+      funcsec([typeidx(0)]),
+      exportsec([export_("main", exportdesc.func(1))]),
+      codesec([
+        code(func([], [instr.local.get, 0, instr.call, funcidx(0), instr.end])),
+      ]),
+    ]);
+    return Uint8Array.from(mod.flat(Infinity));
+  };
+
+  const { instance } = await WebAssembly.instantiate(makeModule(), {
+    builtins: {
+      addOne(x) {
+        return x + 1;
+      },
+    },
+  });
+
+  expect(instance.exports.main(1)).toBe(2);
+  expect(instance.exports.main(2)).toBe(3);
+});

package/index.ts

@@ -1,11 +1,12 @@
 const SECTION_ID_TYPE = 1;
+const SECTION_ID_IMPORT = 2;
 const SECTION_ID_FUNCTION = 3;
 const SECTION_ID_EXPORT = 7;
 const SECTION_ID_CODE = 10;
 
 const TYPE_FUNCTION = 0x60;
 
-export type BytecodeFragment = (number | BytecodeFragment)[];
+type BytecodeFragment = (number | BytecodeFragment)[];
 
 function stringToBytes(s: string): number[] {
   const bytes = new TextEncoder().encode(s);
@@ -112,6 +113,7 @@ enum numtype {
 const instr = {
   nop: 0x01,
   end: 0x0b,
+  call: 0x10,
 
   local: {
     get: 0x20,
@@ -135,12 +137,14 @@ const instr = {
     add: 0x92,
     sub: 0x93,
     mul: 0x94,
+    div: 0x95,
   },
   f64: {
     const: 0x44,
     add: 0xa0,
     sub: 0xa1,
     mul: 0xa2,
+    div: 0xa3,
   },
 };
 
@@ -192,7 +196,29 @@ function locals(n: number, type: valtype): BytecodeFragment {
   return [u32(n), type];
 }
 
+// mod:name  nm:name  d:importdesc
+function import_(
+  mod: string,
+  nm: string,
+  d: BytecodeFragment,
+): BytecodeFragment {
+  return [name(mod), name(nm), d];
+}
+
+// im*:vec(import)
+function importsec(ims: BytecodeFragment): BytecodeFragment {
+  return section(SECTION_ID_IMPORT, vec(ims));
+}
+
+const importdesc = {
+  // x:typeidx
+  func(x: number): BytecodeFragment {
+    return [0x00, funcidx(x)];
+  },
+};
+
 export {
+  BytecodeFragment,
   code,
   codesec,
   export_,
@@ -203,6 +229,9 @@ export {
   funcsec,
   functype,
   i32,
+  import_,
+  importdesc,
+  importsec,
   instr,
   locals,
   module,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wasmgroundup/emit",
   "description": "A library for creating binary-encoded WebAssembly modules",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {