@pkmn/engine 0.1.0-dev.eaae4aa6 → 0.1.0-dev.f3aab252

package/build.zig

@@ -8,6 +8,17 @@ 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 ".";
     const build_options = b.addOptions();
@@ -15,16 +26,20 @@ pub fn module(b: *std.Build, options: Options) *std.Build.Module {
     build_options.addOption(?bool, "log", options.log);
     build_options.addOption(?bool, "chance", options.chance);
     build_options.addOption(?bool, "calc", options.calc);
-    return b.createModule(.{
-        .root_source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
-        .imports = &.{.{ .name = "build_options", .module = build_options.createModule() }},
-    });
+
+    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 });
 }
 
 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)");
@@ -32,8 +47,8 @@ pub fn build(b: *std.Build) !void {
     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");
-    const pic = b.option(bool, "pic", "Force position independent code");
+    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 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;
 
@@ -44,9 +59,15 @@ pub fn build(b: *std.Build) !void {
     defer parsed.deinit();
     const version = parsed.value.object.get("version").?.string;
     const description = parsed.value.object.get("description").?.string;
-    var repository = std.mem.split(u8, parsed.value.object.get("repository").?.string, ":");
+    var repository = std.mem.splitSequence(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;
@@ -61,30 +82,47 @@ pub fn build(b: *std.Build) !void {
 
     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"),
+        .optimize = optimize,
+        .target = target,
+        .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
+    });
+
     var c = false;
     if (node_headers) |headers| {
         const addon = b.fmt("{s}.node", .{name});
-        const lib = b.addSharedLibrary(.{
+        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 = "src/lib/node.zig" },
+            .root_source_file = path,
+            .optimize = optimize,
+            .target = target,
+        } else .{
+            .name = addon,
+            .root_source_file = path,
             .optimize = optimize,
             .target = target,
             .strip = strip,
             .pic = pic,
         });
-        lib.root_module.addOptions("build_options", options);
-        lib.addSystemIncludePath(.{ .path = headers });
+        (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();
         if (node_import_lib) |il| {
-            lib.addObjectFile(.{ .path = il });
-        } else if (target.result.os.tag == .windows) {
+            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");
             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):
+        // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
         //
         //    lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
         //    b.getInstallStep().dependOn(&lib.step);
@@ -93,69 +131,116 @@ pub fn build(b: *std.Build) !void {
         // rename the file ourself in install-pkmn-engine
         b.installArtifact(lib);
     } else if (wasm) {
-        const exe = b.addExecutable(.{
-            .name = name,
-            .root_source_file = .{ .path = "src/lib/wasm.zig" },
-            .optimize = switch (optimize) {
-                .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
-                else => optimize,
-            },
-            .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
-            .strip = strip,
-            .pic = pic,
-        });
-        exe.root_module.addOptions("build_options", options);
-        exe.root_module.export_symbol_names = &[_][]const u8{
-            "SHOWDOWN",
-            "LOG",
-            "CHANCE",
-            "CALC",
-            "GEN1_CHOICES_SIZE",
-            "GEN1_LOGS_SIZE",
+        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 = "src/lib/wasm.zig" } else b.path("src/lib/wasm.zig");
+        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,
+                .root_source_file = path,
+                .optimize = mode,
+                .target = freestanding,
+                .strip = strip,
+                .pic = pic,
+            });
+            (if (root_module) exe.root_module else exe).export_symbol_names = &[_][]const u8{
+                "SHOWDOWN",
+                "LOG",
+                "CHANCE",
+                "CALC",
+                "GEN1_CHOICES_SIZE",
+                "GEN1_LOGS_SIZE",
+            };
+            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;
         };
-        exe.entry = .disabled;
-        exe.stack_size = wasm_stack_size;
+        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;
         if (optimize != .Debug and opt != null) {
             const out = b.fmt("build/lib/{s}.wasm", .{name});
             const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
-            sh.addArtifactArg(exe);
+            sh.addArtifactArg(bin);
             sh.addArg("-o");
-            sh.addFileArg(.{ .path = out });
+            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));
+            }
             b.getInstallStep().dependOn(&sh.step);
-        } else {
-            b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
+            if (!entry) b.installArtifact(bin);
+        } else if (entry) {
+            b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
                 .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
             }).step);
         }
     } else if (dynamic) {
-        const lib = b.addSharedLibrary(.{
+        const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
+        const lib = b.addSharedLibrary(if (force_pic) .{
+            .name = name,
+            .root_source_file = path,
+            .version = try std.SemanticVersion.parse(version),
+            .optimize = optimize,
+            .target = target,
+        } else .{
             .name = name,
-            .root_source_file = .{ .path = "src/lib/c.zig" },
+            .root_source_file = path,
             .version = try std.SemanticVersion.parse(version),
             .optimize = optimize,
             .target = target,
             .strip = strip,
             .pic = pic,
         });
-        lib.root_module.addOptions("build_options", options);
-        lib.addIncludePath(.{ .path = "src/include" });
+        (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"));
         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 lib = b.addStaticLibrary(.{
+        const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
+        const lib = b.addStaticLibrary(if (force_pic) .{
+            .name = name,
+            .root_source_file = path,
+            .optimize = optimize,
+            .target = target,
+        } else .{
             .name = name,
-            .root_source_file = .{ .path = "src/lib/c.zig" },
+            .root_source_file = path,
             .optimize = optimize,
             .target = target,
             .strip = strip,
             .pic = pic,
         });
-        lib.root_module.addOptions("build_options", options);
-        lib.addIncludePath(.{ .path = "src/include" });
+        (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;
         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(),
@@ -175,15 +260,17 @@ pub fn build(b: *std.Build) !void {
     }
 
     if (c) {
-        const header = b.addInstallFileWithDir(
-            .{ .path = "src/include/pkmn.h" },
-            .header,
-            "pkmn.h",
-        );
+        const path =
+            if (has_path) .{ .path = "src/include/pkmn.h" } else 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 b.cache_root.join(b.allocator, &.{pc});
+        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 ".";
@@ -216,7 +303,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(*std.Build.Step.Compile).init(b.allocator);
+    var exes = std.ArrayList(*Step.Compile).init(b.allocator);
     const tools: ToolConfig = .{
         .options = .{
             .showdown = showdown,
@@ -224,6 +311,7 @@ pub fn build(b: *std.Build) !void {
             .chance = chance,
             .calc = calc,
         },
+        .module = pkmn,
         .general = config,
         .tool = .{
             .tests = if (tests.build) tests else null,
@@ -264,11 +352,12 @@ pub fn build(b: *std.Build) !void {
 
 fn maybeStrip(
     b: *std.Build,
-    artifact: *std.Build.Step.Compile,
+    artifact: *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;
@@ -281,7 +370,7 @@ fn maybeStrip(
 }
 
 const Config = struct {
-    target: std.Build.ResolvedTarget,
+    target: ResolvedTarget,
     optimize: std.builtin.OptimizeMode,
     pic: ?bool,
     strip: ?bool,
@@ -292,9 +381,8 @@ const TestStep = struct {
     step: std.Build.Step,
     build: bool,
 
-    pub fn create(b: *std.Build, options: *std.Build.Step.Options, config: Config) *TestStep {
+    pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
         const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
-        const test_file = b.option([]const u8, "test-file", "Input file for test");
         const test_filter =
             b.option([]const u8, "test-filter", "Skip tests that do not match filter");
 
@@ -302,13 +390,14 @@ const TestStep = struct {
         const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
         self.* = .{ .step = step, .build = test_filter == null };
 
-        const path = test_file orelse "src/lib/test.zig";
-        const tests = b.addTest(.{
-            .name = b.fmt("{s}-{s}", .{
-                std.fs.path.basename(std.fs.path.dirname(path).?),
-                std.fs.path.stem(std.fs.path.basename(path)),
-            }),
-            .root_source_file = .{ .path = path },
+        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,
@@ -316,8 +405,13 @@ const TestStep = struct {
             .strip = config.strip,
             .pic = config.pic,
         });
-        tests.root_module.addOptions("build_options", options);
+        (if (root_module) tests.root_module else tests).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 });
         }
@@ -329,15 +423,16 @@ 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(*std.Build.Step.Compile),
+        exes: *std.ArrayList(*Step.Compile),
     },
 };
 
-fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
+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,
@@ -347,17 +442,32 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.R
     if (index) |i| name = name[0..i];
     if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
 
-    const exe = b.addExecutable(.{
+    const exe = b.addExecutable(if (force_pic) .{
         .name = name,
-        .root_source_file = .{ .path = path },
+        .root_source_file = if (has_path) .{ .path = path } else b.path(path),
+        .target = config.general.target,
+        .optimize = config.general.optimize,
+    } else .{
+        .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,
     });
-    exe.root_module.addImport("pkmn", module(b, config.options));
 
+    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));
+    }
+
+    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");
 
@@ -371,7 +481,7 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.R
 const ToolsStep = struct {
     step: std.Build.Step,
 
-    pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.Step.Compile)) *ToolsStep {
+    pub fn create(b: *std.Build, exes: *std.ArrayList(*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 };
@@ -379,3 +489,8 @@ const ToolsStep = struct {
         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;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/engine",
-  "version": "0.1.0-dev.eaae4aa6",
+  "version": "0.1.0-dev.f3aab252",
   "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
   "repository": "github:pkmn/engine",
   "license": "MIT",
@@ -31,11 +31,11 @@
     "build/test/display.js",
     "build/tools/debug.js.map",
     "build/tools/debug.js",
-    "src/bin/install-pkmn-engine",
     "src/lib/common/battle.zig",
     "src/lib/common/data.zig",
     "src/lib/common/debug.zig",
     "src/lib/common/js.zig",
+    "src/lib/common/array.zig",
     "src/lib/common/optional.zig",
     "src/lib/common/options.zig",
     "src/lib/common/protocol.zig",
@@ -76,31 +76,33 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.8.6",
-    "@pkmn/protocol": "^0.6.19"
+    "@pkmn/data": "^0.9.11",
+    "@pkmn/protocol": "^0.6.25"
   },
   "devDependencies": {
-    "@pkmn/eslint-config": "^6.5.0",
-    "@pkmn/img": "^0.2.23",
-    "@pkmn/sets": "^5.1.0",
-    "@pkmn/sim": "0.8.6",
+    "@pkmn/eslint-config": "^8.1.0",
+    "@pkmn/img": "^0.2.31",
+    "@pkmn/sets": "^5.1.2",
+    "@pkmn/sim": "0.9.11",
     "@types/html-minifier": "^4.0.5",
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.12",
     "@types/minimist": "^1.2.5",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^20.11.5",
-    "@vitest/coverage-v8": "^1.2.1",
-    "binaryen": "^116.0.0",
-    "eslint": "^8.56.0",
+    "@types/node": "^22.0.2",
+    "@types/semver": "^7.5.8",
+    "@vitest/coverage-v8": "^2.0.5",
+    "binaryen": "^118.0.0",
+    "eslint": "<=8",
     "html-minifier": "^4.0.0",
     "json-stringify-pretty-compact": "4.0.0",
     "minimist": "^1.2.8",
     "mustache": "^4.2.0",
+    "semver": "^7.6.3",
     "source-map-support": "^0.5.21",
-    "table": "^6.8.1",
+    "table": "^6.8.2",
     "trakr": "^0.2.0",
-    "typescript": "^5.3.3",
-    "vitest": "^1.2.1"
+    "typescript": "^5.5.4",
+    "vitest": "^2.0.5"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",

package/src/bin/install-pkmn-engine

@@ -10,7 +10,7 @@ const path = require('path');
 const {pipeline} = require('stream/promises');
 const tty = require('tty');
 
-const ZIG_VERSION = {major: 0, minor: 12, patch: 0, dev: 2036};
+const ZIG_VERSION = {major: 0, minor: 11, patch: 0};
 const DEV = ZIG_VERSION.dev ? `-dev.${ZIG_VERSION.dev}` : '';
 const VERSION = `${ZIG_VERSION.major}.${ZIG_VERSION.minor}.${ZIG_VERSION.patch}${DEV}`;
 const INDEX = 'https://ziglang.org/download/index.json';
@@ -163,8 +163,10 @@ const install = async () => {
   }
 
   const index = JSON.parse(await fetch(INDEX));
-  const version = Object.keys(index)[+!ZIG_VERSION.dev];
-  const release = index[version][`${arch}-${platform}`];
+  // TODO: ziglang/zig#17768
+  // const version = Object.keys(index)[+!ZIG_VERSION.dev];
+  const version = VERSION;
+  const release = index[VERSION][`${arch}-${platform}`];
   const url = release.tarball;
 
   let base = path.basename(url);
@@ -370,8 +372,10 @@ const downloadImportLib = async () => {
     const args = ['build', '-p', 'build', ...opts];
     if (!process.env.DEBUG_PKMN_ENGINE) args.push('-Doptimize=ReleaseFast', '-Dstrip');
     if (config.type === 'node') {
-      args.push(`-Dnode-headers=${headers}`);
-      if (process.platform === 'win32') args.push(`-Dnode-import-library=${lib}`);
+      args.push(`-Dnode-headers=${path.relative(ROOT, headers)}`);
+      if (process.platform === 'win32') {
+        args.push(`-Dnode-import-library=${path.relative(ROOT, lib)}`);
+      }
     } else {
       args.push('-Dwasm');
     }
@@ -386,8 +390,14 @@ const downloadImportLib = async () => {
       const prefix = process.platform === 'win32' ? '' : 'lib';
       const ext = process.platform === 'darwin'
         ? 'dylib' : process.platform === 'win32' ? 'dll' : 'so';
-      const actual = path.join('build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
-      fs.renameSync(path.join(ROOT, actual), path.join(ROOT, artifact));
+      try {
+        const actual = path.join(ROOT, 'build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
+        fs.renameSync(actual, artifact);
+      } catch (err) {
+        // ziglang/zig#19743 changed this path
+        const actual = path.join(ROOT, 'build', 'bin', `${prefix}pkmn${suffix}.node.${ext}`);
+        fs.renameSync(actual, artifact);
+      }
     }
   }
 })().catch(e => {

package/src/lib/common/array.zig

@@ -0,0 +1,77 @@
+const std = @import("std");
+
+const expectEqual = std.testing.expectEqual;
+const assert = std.debug.assert;
+
+const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
+const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
+
+/// Helpers for working with bit-packed arrays of non-powers-of-2 types.
+/// NOTE: ziglang/zig#12547
+pub fn Array(comptime n: comptime_int, comptime U: type) type {
+    return struct {
+        const size = @bitSizeOf(U);
+        const options = .{ .signedness = .unsigned, .bits = size * n };
+        pub const T = @Type(if (@hasField(std.builtin.Type, "int"))
+            .{ .int = options }
+        else
+            .{ .Int = options });
+
+        /// Returns the value stored at index `i` in the array `a`.
+        pub fn get(a: T, i: usize) U {
+            assert(i < n);
+            const shift = i * size;
+            const mask: T = (1 << size) - 1;
+            const result = (a >> @intCast(shift)) & mask;
+            return switch (@typeInfo(U)) {
+                Enum => @enumFromInt(result),
+                Int => @intCast(result),
+                else => unreachable,
+            };
+        }
+
+        /// Sets the value at index `i` to `val` in the array `a`.
+        pub fn set(a: T, i: usize, val: U) T {
+            assert(i < n);
+            const v: T = switch (@typeInfo(U)) {
+                Enum => @intFromEnum(val),
+                Int => @intCast(val),
+                else => unreachable,
+            };
+            const shift = i * size;
+            const mask: T = @as(T, @intCast((1 << size) - 1)) << @intCast(shift);
+            const result: T = a & ~mask;
+            return result | (v << @intCast(shift));
+        }
+    };
+}
+
+test Array {
+    const A = Array(5, u8);
+    var a: A.T = 0;
+    try expectEqual(u40, @TypeOf(a));
+
+    a = A.set(a, 4, 241);
+    try expectEqual(@as(u8, 241), A.get(a, 4));
+    a = A.set(a, 4, 1);
+    try expectEqual(@as(u8, 1), A.get(a, 4));
+
+    for (0..5) |i| a = A.set(a, i, @intCast(i));
+    for (0..5) |i| try expectEqual(@as(u8, @intCast(i)), A.get(a, i));
+
+    const Optional = @import("optional.zig").Optional;
+
+    const B = Array(4, Optional(bool));
+    var b: B.T = 0;
+    try expectEqual(u8, @TypeOf(b));
+
+    b = B.set(b, 2, .true);
+    try expectEqual(Optional(bool).None, B.get(b, 1));
+    try expectEqual(Optional(bool).true, B.get(b, 2));
+    try expectEqual(@as(u8, 0b00100000), b);
+    b = B.set(b, 2, .None);
+    b = B.set(b, 0, .false);
+    try expectEqual(Optional(bool).None, B.get(b, 2));
+    try expectEqual(Optional(bool).false, B.get(b, 0));
+    try expectEqual(@as(u8, 0b0000001), b);
+}