@pkmn/engine 0.1.0-dev.36b5d56b → 0.1.0-dev.388b6109

package/build.zig

@@ -1,6 +1,10 @@
 const builtin = @import("builtin");
 const std = @import("std");
 
+fn ArrayList(comptime T: type) type {
+    return std.array_list.Aligned(T, null);
+}
+
 pub const Options = struct {
     showdown: ?bool = null,
     log: ?bool = null,
@@ -8,71 +12,68 @@ pub const Options = struct {
     calc: ?bool = null,
 };
 
-const Step = if (@hasDecl(std.Build, "Step")) std.Build.Step else .{
-    .Compile = std.Build.CompileStep,
-    .Options = std.Build.OptionsStep,
-    .Run = std.Build.RunStep,
-};
-const has_path = @hasField(std.Build.LazyPath, "path");
-const root_module = @hasField(Step.Compile, "root_module");
-const force_pic = !@hasField(std.Build.SharedLibraryOptions, "pic");
-const ResolvedTarget =
-    if (@hasDecl(std.Build, "ResolvedTarget")) std.Build.ResolvedTarget else std.zig.CrossTarget;
-
-pub fn module(b: *std.Build, options: Options) *std.Build.Module {
-    const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
+pub fn module(
+    b: *std.Build,
+    options: Options,
+    target: std.Build.ResolvedTarget,
+    optimize: std.builtin.OptimizeMode,
+) *std.Build.Module {
     const build_options = b.addOptions();
     build_options.addOption(?bool, "showdown", options.showdown);
     build_options.addOption(?bool, "log", options.log);
     build_options.addOption(?bool, "chance", options.chance);
     build_options.addOption(?bool, "calc", options.calc);
 
-    const root_source_file = .{ .cwd_relative = dirname ++ "/src/lib/pkmn.zig" };
-    const imports = &.{.{ .name = "build_options", .module = build_options.createModule() }};
-    return b.createModule(if (@hasDecl(std.Build, "CreateModuleOptions"))
-        .{ .source_file = root_source_file, .dependencies = imports }
-    else
-        .{ .root_source_file = root_source_file, .imports = imports });
+    const root_source_file = b.path("src/lib/pkmn.zig");
+    const imports: []const std.Build.Module.Import =
+        &.{.{ .name = "build_options", .module = build_options.createModule() }};
+    return b.createModule(.{
+        .root_source_file = root_source_file,
+        .target = target,
+        .optimize = optimize,
+        .imports = imports,
+    });
 }
 
 pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    const default: ?bool = if (force_pic) false else null;
     const node_headers = b.option([]const u8, "node-headers", "Path to node-headers");
     const node_import_lib =
         b.option([]const u8, "node-import-library", "Path to node import library (Windows)");
+    const demo = if (try exists(b, "src/tools/demo.zig"))
+        b.option(bool, "demo", "Build the demo library") orelse false
+    else
+        false;
     const wasm = b.option(bool, "wasm", "Build a WASM library") orelse false;
     const wasm_stack_size =
         b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
     const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
-    const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse default;
-    const pic = b.option(bool, "pic", "Force position independent code") orelse default;
+    const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
+    const pic = b.option(bool, "pic", "Force position independent code");
     const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
     const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
 
-    const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
+    const cmd = if (@hasDecl(std.Build, "FindProgramOptions"))
+        b.findProgram(.{ .names = &.{"strip"} })
+    else
+        b.findProgram(&.{"strip"}, &.{}) catch null;
 
     const json = @embedFile("package.json");
     var parsed = try std.json.parseFromSlice(std.json.Value, b.allocator, json, .{});
     defer parsed.deinit();
     const version = parsed.value.object.get("version").?.string;
     const description = parsed.value.object.get("description").?.string;
-    var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
+    var repository = std.mem.splitScalar(u8, parsed.value.object.get("repository").?.string, ':');
     std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
 
-    const fast = try std.SemanticVersion.parse("0.12.0-dev.866+3a47bc715");
-    if (optimize != .Debug and fast.order(builtin.zig_version) == .lt) {
-        std.log.warn("Release builds are ~10-20% slower than before Zig " ++
-            "v0.12.0-dev.866+3a47bc715 due to ziglang/zig#17768", .{});
-    }
-
     const showdown =
         b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
     const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
     const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
     const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
+    const extra = b.option([]const []const u8, "option", "Enable extra option");
 
     const options = b.addOptions();
     options.addOption(?bool, "showdown", showdown);
@@ -80,13 +81,27 @@ pub fn build(b: *std.Build) !void {
     options.addOption(?bool, "chance", chance);
     options.addOption(?bool, "calc", calc);
 
+    if (extra) |opts| {
+        for (opts) |opt| {
+            if (std.mem.indexOfScalar(u8, opt, '=')) |i| {
+                options.addOption(?bool, opt[0..i], if (std.mem.eql(u8, opt[i + 1 ..], "true"))
+                    true
+                else if (std.mem.eql(u8, opt[i + 1 ..], "false"))
+                    false
+                else {
+                    std.log.err("Invalid option: {s}\n", .{opt});
+                    return error.InvalidOption;
+                });
+            } else {
+                options.addOption(?bool, opt, true);
+            }
+        }
+    }
+
     const name = if (showdown) "pkmn-showdown" else "pkmn";
 
-    const pkmn = if (@hasDecl(std.Build, "CreateModuleOptions")) null else b.addModule("pkmn", .{
-        .root_source_file = if (has_path)
-            .{ .path = "src/lib/pkmn.zig" }
-        else
-            b.path("src/lib/pkmn.zig"),
+    const pkmn: *std.Build.Module = b.addModule("pkmn", .{
+        .root_source_file = b.path("src/lib/pkmn.zig"),
         .optimize = optimize,
         .target = target,
         .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
@@ -94,33 +109,38 @@ pub fn build(b: *std.Build) !void {
 
     var c = false;
     if (node_headers) |headers| {
-        const addon = b.fmt("{s}.node", .{name});
-        const path = if (has_path) .{ .path = "src/lib/node.zig" } else b.path("src/lib/node.zig");
-        const lib = b.addSharedLibrary(if (force_pic) .{
-            .name = addon,
-            .root_source_file = path,
-            .optimize = optimize,
+        const translate_c = b.addTranslateC(.{
+            .root_source_file = b.path("src/lib/napi.h"),
             .target = target,
-        } else .{
+            // TODO: workaround for ziglang/zig#35515
+            .optimize = .Debug,
+        });
+        translate_c.addSystemIncludePath(b.path(headers));
+        const addon = b.fmt("{s}.node", .{name});
+        const path = b.path("src/lib/node.zig");
+        const lib = b.addLibrary(.{
+            .linkage = .dynamic,
             .name = addon,
-            .root_source_file = path,
-            .optimize = optimize,
-            .target = target,
-            .strip = strip,
-            .pic = pic,
+            .root_module = b.createModule(.{
+                .root_source_file = path,
+                .optimize = optimize,
+                .target = target,
+                .strip = strip,
+                .pic = pic,
+            }),
         });
-        (if (root_module) lib.root_module else lib).addOptions("build_options", options);
-        lib.addSystemIncludePath(if (has_path) .{ .path = headers } else b.path(headers));
-        lib.linkLibC();
+        lib.root_module.addOptions("build_options", options);
+        lib.root_module.addImport("napi", translate_c.createModule());
+        lib.root_module.link_libc = true;
         if (node_import_lib) |il| {
-            lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
-        } else if (detect(target).os.tag == .windows) {
-            try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
+            lib.root_module.addObjectFile(b.path(il));
+        } else if (target.result.os.tag == .windows) {
+            var err = std.Io.File.stderr().writer(b.graph.io, &.{});
+            try err.interface.writeAll("Must provide --node-import-library path on Windows\n");
             std.process.exit(1);
         }
         lib.linker_allow_shlib_undefined = true;
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
-        if (force_pic and pic orelse false) lib.force_pic = pic;
         // Always emit to build/lib because this is where the driver code expects to find it
         // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
         //
@@ -131,50 +151,50 @@ pub fn build(b: *std.Build) !void {
         // rename the file ourself in install-pkmn-engine
         b.installArtifact(lib);
     } else if (wasm) {
-        try buildWasm(b, name, "src/lib/wasm.zig", optimize, strip, pic, wasm_stack_size, options);
+        const path = "src/lib/wasm.zig";
+        try buildWasm(b, name, path, optimize, strip, pic, wasm_stack_size, null, options);
+    } else if (demo) {
+        const path = "src/tools/demo.zig";
+        const n = if (showdown) "demo-showdown" else "demo";
+        const mod = pkmn;
+        try buildWasm(b, n, path, optimize, strip, pic, wasm_stack_size, mod, options);
     } else if (dynamic) {
-        const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
-        const lib = b.addSharedLibrary(if (force_pic) .{
+        const path = b.path("src/lib/c.zig");
+        const lib = b.addLibrary(.{
+            .linkage = .dynamic,
             .name = name,
-            .root_source_file = path,
-            .version = try std.SemanticVersion.parse(version),
-            .optimize = optimize,
-            .target = target,
-        } else .{
-            .name = name,
-            .root_source_file = path,
-            .version = try std.SemanticVersion.parse(version),
-            .optimize = optimize,
-            .target = target,
-            .strip = strip,
-            .pic = pic,
+            .root_module = b.createModule(.{
+                .root_source_file = path,
+                .optimize = optimize,
+                .target = target,
+                .strip = strip,
+                .pic = pic,
+            }),
         });
-        (if (root_module) lib.root_module else lib).addOptions("build_options", options);
-        lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
+        lib.root_module.addOptions("build_options", options);
+        lib.root_module.addIncludePath(b.path("src/include"));
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
-        if (force_pic and pic orelse false) lib.force_pic = pic;
         b.installArtifact(lib);
         c = true;
     } else {
-        const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
-        const lib = b.addStaticLibrary(if (force_pic) .{
+        const path = b.path("src/lib/c.zig");
+        const lib = b.addLibrary(.{
+            .linkage = .static,
             .name = name,
-            .root_source_file = path,
-            .optimize = optimize,
-            .target = target,
-        } else .{
-            .name = name,
-            .root_source_file = path,
-            .optimize = optimize,
-            .target = target,
-            .strip = strip,
-            .pic = pic,
+            .root_module = b.createModule(.{
+                .root_source_file = path,
+                .optimize = optimize,
+                .target = target,
+                .strip = strip,
+                .pic = pic,
+            }),
         });
-        (if (root_module) lib.root_module else lib).addOptions("build_options", options);
-        lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
-        lib.bundle_compiler_rt = true;
+        lib.root_module.addOptions("build_options", options);
+        lib.root_module.addIncludePath(b.path("src/include"));
+        if (target.result.os.tag != .macos) {
+            lib.bundle_compiler_rt = true;
+        }
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
-        if (force_pic and pic orelse false) lib.force_pic = pic;
         if (emit_asm) {
             b.getInstallStep().dependOn(&b.addInstallFileWithDir(
                 lib.getEmittedAsm(),
@@ -189,44 +209,59 @@ pub fn build(b: *std.Build) !void {
                 b.fmt("{s}.ll", .{name}),
             ).step);
         }
-        b.installArtifact(lib);
+        const install = b.addInstallArtifact(lib, .{});
+        b.getInstallStep().dependOn(&install.step);
+        maybeRanlib(b, lib, &install.step);
         c = true;
     }
 
     if (c) {
-        const path =
-            if (has_path) .{ .path = "src/include/pkmn.h" } else b.path("src/include/pkmn.h");
+        const path = b.path("src/include/pkmn.h");
         const header = b.addInstallFileWithDir(path, .header, "pkmn.h");
         b.getInstallStep().dependOn(&header.step);
 
-        const pc = b.fmt("lib{s}.pc", .{name});
-        const file = try std.fs.path.relative(
-            b.allocator,
-            try std.process.getCwdAlloc(b.allocator),
-            try b.cache_root.join(b.allocator, &.{pc}),
-        );
-        const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
-
-        const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
-        const writer = pkgconfig_file.writer();
-        try writer.print(
-            \\prefix={0s}/{1s}
+        const content = try std.fmt.allocPrint(b.allocator,
+            \\prefix=${{pcfiledir}}/../..
             \\includedir=${{prefix}}/include
             \\libdir=${{prefix}}/lib
             \\
-            \\Name: lib{2s}
-            \\URL: https://github.com/{3s}
-            \\Description: {4s}
-            \\Version: {5s}
+            \\Name: lib{0s}
+            \\URL: https://github.com/{1s}
+            \\Description: {2s}
+            \\Version: {3s}
             \\Cflags: -I${{includedir}}
-            \\Libs: -L${{libdir}} -l{2s}
-        , .{ dirname, b.install_path, name, repository.next().?, description, version });
-        defer pkgconfig_file.close();
+            \\Libs: -L${{libdir}} -l{0s}
+        , .{ name, repository.next().?, description, version });
 
-        b.installFile(file, b.fmt("share/pkgconfig/{s}", .{pc}));
+        const pc = b.fmt("lib{s}.pc", .{name});
+        if (@hasDecl(std.Build, "FindProgramOptions")) {
+            const write_file = b.addWriteFiles();
+            const pkgconfig = write_file.add(pc, content);
+            b.getInstallStep().dependOn(&b.addInstallFileWithDir(
+                pkgconfig,
+                .prefix,
+                b.fmt("share/pkgconfig/{s}", .{pc}),
+            ).step);
+        } else {
+            const cwd = try std.process.currentPathAlloc(b.graph.io, b.allocator);
+            const file = try std.Io.Dir.path.relative(
+                b.allocator,
+                cwd,
+                &b.graph.environ_map,
+                cwd,
+                try b.cache_root.join(b.allocator, &.{pc}),
+            );
+            const pkgconfig = try std.Io.Dir.cwd().createFile(b.graph.io, file, .{});
+            defer pkgconfig.close(b.graph.io);
+
+            var writer = pkgconfig.writer(b.graph.io, &.{});
+            try writer.interface.writeAll(content);
+
+            b.installFile(file, b.fmt("share/pkgconfig/{s}", .{pc}));
+        }
     }
 
-    const config = .{
+    const config: Config = .{
         .target = target,
         .optimize = optimize,
         .pic = pic,
@@ -237,7 +272,7 @@ pub fn build(b: *std.Build) !void {
     // TODO: tests can be run multiple times due to @imports
     const tests = TestStep.create(b, options, config);
 
-    var exes = std.ArrayList(*Step.Compile).init(b.allocator);
+    var exes: ArrayList(*std.Build.Step.Compile) = .empty;
     const tools: ToolConfig = .{
         .options = .{
             .showdown = showdown,
@@ -245,7 +280,6 @@ pub fn build(b: *std.Build) !void {
             .chance = chance,
             .calc = calc,
         },
-        .module = pkmn,
         .general = config,
         .tool = .{
             .tests = if (tests.build) tests else null,
@@ -277,8 +311,8 @@ pub fn build(b: *std.Build) !void {
     if (dump) |t| b.step("dump", "Run protocol dump tool").dependOn(&t.step);
     if (fuzz) |t| b.step("fuzz", "Run fuzz tester").dependOn(&t.step);
     if (serde) |t| b.step("serde", "Run serialization/deserialization tool").dependOn(&t.step);
-    b.step("test", "Run all tests").dependOn(&tests.step);
-    b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
+    b.step("test", "Run all tests").dependOn(tests.step);
+    b.step("tools", "Install tools").dependOn(ToolsStep.create(b, &exes).step);
     if (transitions) |t| {
         b.step("transitions", "Visualize transitions algorithm search").dependOn(&t.step);
     }
@@ -292,65 +326,77 @@ fn buildWasm(
     strip: ?bool,
     pic: ?bool,
     wasm_stack_size: u64,
+    import: ?*std.Build.Module,
     options: anytype,
 ) !void {
-    const entry = @hasDecl(Step.Compile, "Entry");
     const mode = switch (optimize) {
         .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
         else => optimize,
     };
-    const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
-        b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding })
-    else
-        ResolvedTarget{ .cpu_arch = .wasm32, .os_tag = .freestanding };
-    const path = if (has_path) .{ .path = root_src_file } else b.path(root_src_file);
-    const bin = if (entry) bin: {
-        const exe = b.addExecutable(if (force_pic) .{
-            .name = name,
-            .root_source_file = path,
-            .optimize = mode,
-            .target = freestanding,
-        } else .{
-            .name = name,
+    // https://webassembly.org/features/
+    var features = std.Target.wasm.featureSet(&.{
+        .atomics,
+        .bulk_memory,
+        // .exception_handling,
+        .extended_const,
+        // .half_precision,
+        // .multimemory,
+        .mutable_globals,
+        .nontrapping_fptoint,
+        .reference_types,
+        // .relaxed_simd,
+        .sign_ext,
+        .simd128,
+        // .tail_call,
+    });
+    if (builtin.zig_version.order(try std.SemanticVersion.parse("0.12.0")) != .lt) {
+        features.addFeature(@intFromEnum(std.Target.wasm.Feature.multivalue));
+    }
+    const freestanding = b.resolveTargetQuery(.{
+        .cpu_arch = .wasm32,
+        .os_tag = .freestanding,
+        .cpu_features_add = features,
+    });
+    const path = b.path(root_src_file);
+    const exe = b.addExecutable(.{
+        .name = name,
+        .root_module = b.createModule(.{
             .root_source_file = path,
             .optimize = mode,
             .target = freestanding,
             .strip = strip,
             .pic = pic,
-        });
-        (if (root_module) exe.root_module else exe).export_symbol_names = try exports(b);
-        exe.entry = .disabled;
-        break :bin exe;
-    } else bin: {
-        const lib = b.addSharedLibrary(.{
-            .name = name,
-            .root_source_file = path,
-            .optimize = mode,
-            .target = freestanding,
-        });
-        lib.rdynamic = true;
-        break :bin lib;
-    };
-    bin.stack_size = wasm_stack_size;
-    if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
-    if (force_pic and pic orelse false) bin.force_pic = pic;
-    (if (root_module) bin.root_module else bin).addOptions("build_options", options);
+        }),
+    });
 
-    const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
+    var file = try std.Io.Dir.cwd().openFile(b.graph.io, root_src_file, .{});
+    defer file.close(b.graph.io);
+    var reader = file.reader(b.graph.io, &.{});
+    const bytes = try reader.interface.allocRemaining(b.allocator, .unlimited);
+    exe.root_module.export_symbol_names = try exports(b, bytes);
+    exe.entry = .disabled;
+
+    if (import) |i| {
+        exe.root_module.addImport("pkmn", i);
+    }
+    exe.stack_size = wasm_stack_size;
+    exe.root_module.addOptions("build_options", options);
+
+    const opt = if (@hasDecl(std.Build, "FindProgramOptions")) blk: {
+        if (exists(b, "./node_modules/.bin/wasm-opt") catch false) {
+            break :blk "./node_modules/.bin/wasm-opt";
+        }
+        break :blk b.findProgram(.{ .names = &.{"wasm-opt"} });
+    } else b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
     if (optimize != .Debug and opt != null) {
         const out = b.fmt("build/lib/{s}.wasm", .{name});
-        const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
-        sh.addArtifactArg(bin);
+        const sh = b.addSystemCommand(&.{ opt.?, "--enable-bulk-memory", "--enable-simd", "-O4" });
+        sh.addArtifactArg(exe);
         sh.addArg("-o");
-        if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
-            sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
-        } else {
-            sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
-        }
+        sh.addFileArg(b.path(out));
         b.getInstallStep().dependOn(&sh.step);
-        if (!entry) b.installArtifact(bin);
-    } else if (entry) {
-        b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
+    } else {
+        b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
             .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
         }).step);
     }
@@ -358,12 +404,11 @@ fn buildWasm(
 
 fn maybeStrip(
     b: *std.Build,
-    artifact: *Step.Compile,
+    artifact: *std.Build.Step.Compile,
     step: *std.Build.Step,
     strip: ?bool,
     cmd: ?[]const u8,
 ) void {
-    if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
     if (!(strip orelse false) or cmd == null) return;
     // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
     const mac = builtin.os.tag == .macos;
@@ -376,7 +421,7 @@ fn maybeStrip(
 }
 
 const Config = struct {
-    target: ResolvedTarget,
+    target: std.Build.ResolvedTarget,
     optimize: std.builtin.OptimizeMode,
     pic: ?bool,
     strip: ?bool,
@@ -384,44 +429,40 @@ const Config = struct {
 };
 
 const TestStep = struct {
-    step: std.Build.Step,
+    step: *std.Build.Step,
     build: bool,
 
-    pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
+    pub fn create(b: *std.Build, options: *std.Build.Step.Options, config: Config) *TestStep {
         const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
         const test_filter =
             b.option([]const u8, "test-filter", "Skip tests that do not match filter");
 
         const self = b.allocator.create(TestStep) catch @panic("OOM");
-        const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
-        self.* = .{ .step = step, .build = test_filter == null };
 
-        const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
-        const tests = b.addTest(if (force_pic) .{
-            .root_source_file = path,
-            .optimize = config.optimize,
-            .target = config.target,
-            .filter = test_filter,
-        } else .{
-            .root_source_file = path,
-            .optimize = config.optimize,
-            .target = config.target,
-            .filter = test_filter,
-            .single_threaded = true,
-            .strip = config.strip,
-            .pic = config.pic,
+        const path = b.path("src/lib/test.zig");
+        const tests = b.addTest(.{
+            .root_module = b.createModule(.{
+                .root_source_file = path,
+                .optimize = config.optimize,
+                .target = config.target,
+                .single_threaded = true,
+                .strip = config.strip,
+                .pic = config.pic,
+            }),
+            .filters = if (test_filter) |filter| &.{filter} else &.{},
         });
-        (if (root_module) tests.root_module else tests).addOptions("build_options", options);
+        tests.root_module.addOptions("build_options", options);
 
         maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
-        if (force_pic) {
-            tests.single_threaded = true;
-            if (config.pic orelse false) tests.force_pic = config.pic;
-        }
         if (coverage) |c| {
-            tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
+            const kcov_run = b.addSystemCommand(&.{ "kcov", "--include-pattern=src/lib", c });
+            kcov_run.addArtifactArg(tests);
+            kcov_run.enableTestRunnerMode();
+            self.* = .{ .step = &kcov_run.step, .build = test_filter == null };
+        } else {
+            const run_step = b.addRunArtifact(tests);
+            self.* = .{ .step = &run_step.step, .build = test_filter == null };
         }
-        self.step.dependOn(&b.addRunArtifact(tests).step);
 
         return self;
     }
@@ -429,89 +470,124 @@ const TestStep = struct {
 
 const ToolConfig = struct {
     options: Options,
-    module: ?*std.Build.Module,
     general: Config,
     tool: struct {
         tests: ?*TestStep,
         name: ?[]const u8 = null,
-        exes: *std.ArrayList(*Step.Compile),
+        exes: *ArrayList(*std.Build.Step.Compile),
     },
 };
 
-fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
-    std.fs.cwd().access(path, .{}) catch |err| switch (err) {
-        error.FileNotFound => return null,
-        else => |e| return e,
-    };
+fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
+    if (!try exists(b, path)) return null;
     var name = config.tool.name orelse std.fs.path.basename(path);
     const index = std.mem.lastIndexOfScalar(u8, name, '.');
     if (index) |i| name = name[0..i];
     if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
 
-    const exe = b.addExecutable(if (force_pic) .{
-        .name = name,
-        .root_source_file = if (has_path) .{ .path = path } else b.path(path),
-        .target = config.general.target,
-        .optimize = config.general.optimize,
-    } else .{
+    const exe = b.addExecutable(.{
         .name = name,
-        .root_source_file = if (has_path) .{ .path = path } else b.path(path),
-        .target = config.general.target,
-        .optimize = config.general.optimize,
-        .single_threaded = true,
-        .strip = config.general.strip,
-        .pic = config.general.pic,
+        .root_module = b.createModule(.{
+            .root_source_file = b.path(path),
+            .target = config.general.target,
+            .optimize = config.general.optimize,
+            .strip = config.general.strip,
+            .pic = config.general.pic,
+        }),
     });
 
-    if (root_module) {
-        const import = if (config.module) |m| m else module(b, config.options);
-        exe.root_module.addImport("pkmn", import);
-    } else {
-        exe.addModule("pkmn", module(b, config.options));
+    const import = module(b, config.options, config.general.target, config.general.optimize);
+    exe.root_module.addImport("pkmn", import);
+    if (config.general.target.result.os.tag == .windows) {
+        exe.root_module.linkSystemLibrary("advapi32", .{});
     }
 
-    if (force_pic) {
-        exe.single_threaded = true;
-        if (config.general.pic orelse false) exe.force_pic = config.general.pic;
-    }
     if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
-    config.tool.exes.append(exe) catch @panic("OOM");
+    config.tool.exes.append(b.allocator, exe) catch @panic("OOM");
 
     const run = b.addRunArtifact(exe);
     maybeStrip(b, exe, &run.step, config.general.strip, config.general.cmd);
-    if (b.args) |args| run.addArgs(args);
+    if (@hasDecl(std.Build, "FindProgramOptions")) {
+        run.addPassthruArgs();
+    } else {
+        if (b.args) |args| run.addArgs(args);
+    }
 
     return run;
 }
 
+fn exists(b: *std.Build, path: []const u8) !bool {
+    std.Io.Dir.cwd().access(b.graph.io, path, .{}) catch |err| switch (err) {
+        error.FileNotFound => return false,
+        else => |e| return e,
+    };
+    return true;
+}
+
 const ToolsStep = struct {
-    step: std.Build.Step,
+    step: *std.Build.Step,
 
-    pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
+    pub fn create(b: *std.Build, exes: *ArrayList(*std.Build.Step.Compile)) *ToolsStep {
         const self = b.allocator.create(ToolsStep) catch @panic("OOM");
-        const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
-        self.* = .{ .step = step };
+
+        if (@hasDecl(std.Build, "FindProgramOptions")) {
+            const step = b.allocator.create(std.Build.Step.TopLevel) catch @panic("OOM");
+            step.* = .{
+                .step = std.Build.Step.init(.{
+                    .tag = .top_level,
+                    .name = "Install tools",
+                    .owner = b,
+                }),
+                .description = "Install tools",
+            };
+            self.* = .{ .step = &step.step };
+        } else {
+            const step = b.allocator.create(std.Build.Step) catch @panic("OOM");
+            step.* = std.Build.Step.init(.{
+                .id = .custom,
+                .name = "Install tools",
+                .owner = b,
+            });
+            self.* = .{ .step = step };
+        }
         for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
+
         return self;
     }
 };
 
-fn detect(target: anytype) std.Target {
-    if (@hasField(@TypeOf(target), "result")) return target.result;
-    return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
-}
-
-const WASM = @embedFile("src/lib/wasm.zig");
+pub fn exports(b: *std.Build, bytes: []const u8) ![][]const u8 {
+    var symbols: ArrayList([]const u8) = .empty;
 
-fn exports(b: *std.Build) ![][]const u8 {
-    var symbols = std.ArrayList([]const u8).init(b.allocator);
-
-    var it = std.mem.splitSequence(u8, WASM, "export const ");
+    var it = std.mem.splitSequence(u8, bytes, "export ");
     _ = it.next();
     while (it.next()) |s| {
-        const i = std.mem.indexOf(u8, s, " ").?;
-        try symbols.append(s[0..i]);
+        if (std.mem.startsWith(u8, s, "const ")) {
+            const i = std.mem.indexOf(u8, s[6..], " ").?;
+            try symbols.append(b.allocator, s[6 .. 6 + i]);
+        } else { // "fn "
+            const i = std.mem.indexOf(u8, s[3..], "(").?;
+            try symbols.append(b.allocator, s[3 .. 3 + i]);
+        }
     }
 
     return symbols.items;
 }
+
+fn maybeRanlib(
+    b: *std.Build,
+    artifact: *std.Build.Step.Compile,
+    install_step: *std.Build.Step,
+) void {
+    if (builtin.os.tag != .macos) return;
+    if (artifact.linkage != .static) return;
+
+    const ranlib = if (comptime @hasDecl(std.Build, "FindProgramOptions"))
+        b.findProgram(.{ .names = &.{"ranlib"} }) orelse return
+    else
+        b.findProgram(&[_][]const u8{"ranlib"}, &[_][]const u8{}) catch return;
+
+    const sh = b.addSystemCommand(&[_][]const u8{ranlib});
+    sh.addFileArg(artifact.getEmittedBin());
+    install_step.dependOn(&sh.step);
+}