@thi.ng/wasm-api 0.7.0 → 0.10.0

package/include/wasmapi.zig

@@ -3,28 +3,26 @@
 const std = @import("std");
 const root = @import("root");
 
-/// Initialize the allocator to be exposed to the WASM host env
+/// Obtains the allocator to be exposed to the WASM host env
 /// (via `_wasm_allocate()` and `_wasm_free()`).
 /// If the user defines a public `WASM_ALLOCATOR` in their root file
-/// then this allocator will be used, otherwise the implementation
-/// falls back to using GPA.
+/// then this allocator will be used, otherwise the implementations
+/// of the two mentioned functions are no-ops.
+/// The `WASM_ALLOCATOR` can be changed and/or enabled/disabled dynamically
+/// This helper function here is used to always lookup the current value/impl.
+///
 /// Note: The type for this var is purposefully chosen as an optional,
-/// effectively disabling allocations from the WASM host side if
-/// `WASM_ALLOCATOR` is set to null.
-pub const allocator: ?std.mem.Allocator = alloc: {
-    if (@hasDecl(root, "WASM_ALLOCATOR")) {
-        break :alloc root.WASM_ALLOCATOR;
-    } else {
-        var gpa = std.heap.GeneralPurposeAllocator(.{}){};
-        break :alloc gpa.allocator();
-    }
-};
+/// effectively disabling allocations from the WASM host side if no
+/// `WASM_ALLOCATOR` is set (or set to null).
+pub fn allocator() ?std.mem.Allocator {
+    return if (@hasDecl(root, "WASM_ALLOCATOR")) root.WASM_ALLOCATOR else null;
+}
 
-/// Attempts to allocate memory using configured `allocator` and if
+/// Attempts to allocate memory using configured `allocator()` and if
 /// successful returns address of new chunk or zero if failed
 /// Note: For SIMD compatibility all allocations are aligned to 16 bytes
 pub export fn _wasm_allocate(numBytes: usize) usize {
-    if (allocator) |alloc| {
+    if (allocator()) |alloc| {
         var mem = alloc.alignedAlloc(u8, 16, numBytes) catch return 0;
         return @ptrToInt(mem.ptr);
     }
@@ -33,11 +31,10 @@ pub export fn _wasm_allocate(numBytes: usize) usize {
 
 /// Frees chunk of heap memory (previously allocated using `_wasm_allocate()`)
 /// starting at given address and of given byte length.
-/// Note: This is a no-op if the allocator is explicitly disabled (see `setAllocator()`),
+/// Note: This is a no-op if no allocator is configured (see `allocator()`)
 pub export fn _wasm_free(addr: usize, numBytes: usize) void {
-    if (allocator) |alloc| {
+    if (allocator()) |alloc| {
         var mem = [2]usize{ addr, numBytes };
-        printFmt("{d}", .{@ptrCast(*[]u8, &mem).*});
         alloc.free(@ptrCast(*[]u8, &mem).*);
     }
 }
@@ -165,10 +162,16 @@ pub fn printStr(msg: []const u8) void {
     _printStr(@ptrToInt(msg.ptr), msg.len);
 }
 
+/// Calls std.fmt.allocPrint to format given string, then calls `printStr()`
+/// to output it via JS, then frees string's memory again
+/// (Only available if the allocator used by `_wasm_allocate()` hasn't been disabled.)
 pub fn printFmt(comptime fmt: []const u8, args: anytype) void {
-    if (allocator) |alloc| {
+    if (allocator()) |alloc| {
         const res = std.fmt.allocPrint(alloc, fmt, args) catch return;
         defer alloc.free(res);
         printStr(res);
     }
 }
+
+/// Triggers the JS/browser debugger
+pub extern "wasmapi" fn debug() void;

package/index.d.ts

@@ -1,8 +1,8 @@
 export * from "./api.js";
 export * from "./bridge.js";
 export * from "./codegen.js";
-export * from "./object-index.js";
 export * from "./codegen/typescript.js";
-export * from "./codegen/zig.js";
 export * from "./codegen/utils.js";
+export * from "./codegen/zig.js";
+export * from "./object-index.js";
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -1,7 +1,7 @@
 export * from "./api.js";
 export * from "./bridge.js";
 export * from "./codegen.js";
-export * from "./object-index.js";
 export * from "./codegen/typescript.js";
-export * from "./codegen/zig.js";
 export * from "./codegen/utils.js";
+export * from "./codegen/zig.js";
+export * from "./object-index.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/wasm-api",
-  "version": "0.7.0",
+  "version": "0.10.0",
   "description": "Generic, modular, extensible API bridge, glue code and bindings code generator for hybrid JS & WebAssembly projects",
   "type": "module",
   "module": "./index.js",
@@ -36,35 +36,41 @@
     "test:build-zig": "zig build-lib -O ReleaseSmall -target wasm32-freestanding -dynamic --strip --pkg-begin wasmapi include/wasmapi.zig --pkg-end test/custom.zig && wasm-dis -o custom.wast custom.wasm && cp custom.wasm test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.4.0",
-    "@thi.ng/args": "^2.2.0",
-    "@thi.ng/binary": "^3.3.3",
+    "@thi.ng/api": "^8.4.1",
+    "@thi.ng/args": "^2.2.1",
+    "@thi.ng/binary": "^3.3.4",
     "@thi.ng/checks": "^3.2.4",
-    "@thi.ng/compare": "^2.1.10",
-    "@thi.ng/defmulti": "^2.1.12",
+    "@thi.ng/compare": "^2.1.11",
+    "@thi.ng/defmulti": "^2.1.13",
     "@thi.ng/errors": "^2.1.10",
-    "@thi.ng/file-io": "^0.3.9",
+    "@thi.ng/file-io": "^0.3.10",
     "@thi.ng/hex": "^2.1.9",
-    "@thi.ng/idgen": "^2.1.11",
-    "@thi.ng/logger": "^1.2.0"
+    "@thi.ng/idgen": "^2.1.12",
+    "@thi.ng/logger": "^1.2.1"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.25.0",
-    "@thi.ng/testament": "^0.2.11",
+    "@thi.ng/testament": "^0.2.12",
     "rimraf": "^3.0.2",
     "tools": "^0.0.1",
     "typedoc": "^0.22.17",
     "typescript": "^4.7.4"
   },
   "keywords": [
+    "allocator",
     "api",
     "bindings",
     "c",
     "codegen",
+    "event",
     "id",
     "logger",
     "memory",
+    "string",
+    "struct",
+    "typedarray",
     "typescript",
+    "utf8",
     "wasm",
     "webassembly",
     "wrapper",
@@ -117,5 +123,5 @@
     "status": "alpha",
     "year": 2022
   },
-  "gitHead": "78193cdd838d9d09114352b117b6c5e92631e3cd\n"
+  "gitHead": "4264b91052b8c1f74db9fd51dc48c830dc0d5829\n"
 }