@pkmn/engine 0.1.0-dev.645b4750 → 0.1.0-dev.6b383c80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/engine",
-  "version": "0.1.0-dev.645b4750",
+  "version": "0.1.0-dev.6b383c80",
   "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
   "repository": "github:pkmn/engine",
   "license": "MIT",
@@ -81,6 +81,7 @@
     "src/lib/gen2/generated.zig",
     "src/lib/gen2/helpers.zig",
     "src/lib/gen2/mechanics.zig",
+    "src/lib/napi.h",
     "src/lib/node.zig",
     "src/lib/pkmn.zig",
     "src/lib/wasm.zig",
@@ -98,38 +99,37 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.9.31",
-    "@pkmn/protocol": "^0.6.31"
+    "@pkmn/data": "0.9.35",
+    "@pkmn/protocol": "^0.7.3"
   },
   "devDependencies": {
-    "@pkmn/eslint-config": "^9.7.0",
-    "@pkmn/img": "^0.2.36",
-    "@pkmn/sets": "^5.1.2",
+    "@pkmn/dex-types": "0.9.35",
+    "@pkmn/eslint-config": "^10.0.0",
+    "@pkmn/img": "^0.3.4",
+    "@pkmn/sets": "^5.2.0",
     "@pkmn/sim": "0.9.31",
-    "@pkmn/smogon": "^0.5.19",
-    "@types/html-minifier": "^4.0.5",
-    "@types/jest": "^29.5.14",
+    "@pkmn/smogon": "0.5.21",
+    "@types/html-minifier": "^4.0.6",
+    "@types/jest": "^30.0.0",
     "@types/minimist": "^1.2.5",
-    "@types/mustache": "^4.2.5",
-    "@types/node": "^22.13.9",
-    "@types/react": "<=18",
-    "@types/semver": "^7.5.8",
-    "@types/vscode": "^1.97.0",
-    "@vitest/coverage-v8": "^3.0.7",
-    "@vscode/vsce": "^3.2.2",
-    "binaryen": "^122.0.0",
-    "esbuild": "^0.25.0",
-    "eslint": "^9.21.0",
+    "@types/mustache": "^4.2.6",
+    "@types/node": "^26.6.3",
+    "@types/react": "^19.3.0",
+    "@types/vscode": "^1.140.0",
+    "@vitest/coverage-v8": "^5.0.3",
+    "@vscode/vsce": "^4.0.0",
+    "binaryen": "^132.0.0",
+    "esbuild": "^0.28.2",
+    "eslint": "^10.11.0",
     "html-minifier": "^4.0.0",
     "json-stringify-pretty-compact": "3.0.0",
     "minimist": "^1.2.8",
     "mustache": "^4.2.0",
-    "semver": "^7.7.1",
     "source-map-support": "^0.5.21",
     "table": "^6.9.0",
     "trakr": "^0.2.0",
-    "typescript": "^5.8.2",
-    "vitest": "^3.0.7"
+    "typescript": "^6.0.3",
+    "vitest": "^5.0.3"
   },
   "scripts": {
     "lint": "eslint --cache src",

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: 11, patch: 0};
+const ZIG_VERSION = {major: 0, minor: 16, 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';
@@ -111,15 +111,31 @@ const unpack = async (input, output) => {
   }
 };
 
+const parse = s => {
+  try {
+    return JSON.parse(s);
+  } catch (e) {
+    if (!(e instanceof SyntaxError)) throw e;
+    const json = s
+      // "key": -> "key": (ensures keys are quoted)
+      .replace(/\.([a-zA-Z_][a-zA-Z0-9_]*)\s*=/g, '"$1":')
+      // .{ -> { (converts ZON struct to JSON object)
+      .replace(/\.\{/g, '{')
+      // Remove trailing commas, which are invalid in JSON
+      .replace(/,\s*([}\]])/g, '$1');
+    return JSON.parse(json);
+  }
+};
+
 const find = zig => {
   try {
-    const {zig_exe, version} = JSON.parse(sh(zig, ['env']));
-    const [major, minor, patch, dev] = version.split('.').map(n => parseInt(n));
+    const {zig_exe, version} = parse(sh(zig, ['env']));
+    const [major, minor, patch, dev] = version.split('.').map(n => parseInt(n, 10));
 
     const compatible = major > ZIG_VERSION.major ||
       (major >= ZIG_VERSION.major && minor > ZIG_VERSION.minor) ||
       (major >= ZIG_VERSION.major && minor >= ZIG_VERSION.minor && patch >= ZIG_VERSION.patch &&
-        (!ZIG_VERSION.dev || (dev && dev >= ZIG_VERSION.dev)));
+        (!ZIG_VERSION.dev || (dev && dev >= parseInt(ZIG_VERSION.dev, 10))));
 
     if (compatible) {
       log('Found existing compatible Zig executable:', zig_exe);
@@ -163,10 +179,9 @@ const install = async () => {
   }
 
   const index = JSON.parse(await fetch(INDEX));
-  // TODO: ziglang/zig#17768
-  // const version = Object.keys(index)[+!ZIG_VERSION.dev];
-  const version = VERSION;
-  const release = index[VERSION][`${arch}-${platform}`];
+  const version = Object.keys(index)[+!ZIG_VERSION.dev];
+  // const version = VERSION; // TODO
+  const release = index[version][`${arch}-${platform}`];
   const url = release.tarball;
 
   let base = path.basename(url);
@@ -386,20 +401,6 @@ const downloadImportLib = async () => {
     const artifact = path.join('build', 'lib', `pkmn${suffix}.${config.type}`);
     log(`Building ${artifact}${flags}`);
     sh(zig, args);
-    // TODO: ziglang/zig#14647 broke emit_to so we get to rename the file ourselves...
-    if (config.type === 'node') {
-      const prefix = process.platform === 'win32' ? '' : 'lib';
-      const ext = process.platform === 'darwin'
-        ? 'dylib' : process.platform === 'win32' ? 'dll' : 'so';
-      try {
-        const actual = path.join(ROOT, 'build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
-        fs.renameSync(actual, artifact);
-      } catch {
-        // ziglang/zig#19743 changed this path
-        const actual = path.join(ROOT, 'build', 'bin', `${prefix}pkmn${suffix}.node.${ext}`);
-        fs.renameSync(actual, artifact);
-      }
-    }
   }
 })().catch(e => {
   console.error(e);

package/src/lib/bindings/c.zig

@@ -1,13 +1,11 @@
 const pkmn = @import("../pkmn.zig");
 const std = @import("std");
+const util = @import("../common/util.zig");
 
 const assert = std.debug.assert;
 
 const ERROR: u8 = 0b1100;
 
-const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
-const Strong = if (@hasField(std.builtin.GlobalLinkage, "strong")) .strong else .Strong;
-
 pub const OPTIONS: extern struct {
     showdown: bool,
     log: bool,
@@ -25,59 +23,59 @@ pub const CHOICES_SIZE = pkmn.CHOICES_SIZE;
 pub const MAX_LOGS = pkmn.MAX_LOGS;
 pub const LOGS_SIZE = pkmn.LOGS_SIZE;
 
-pub fn choice_init(choice: u8, data: u8) callconv(.C) u8 {
-    assert(choice <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
+pub fn choice_init(choice: u8, data: u8) callconv(.c) u8 {
+    assert(choice <= util.EnumFieldsLen(pkmn.Choice.Type));
     assert(data <= 6);
     return @bitCast(pkmn.Choice{ .type = @enumFromInt(choice), .data = @intCast(data) });
 }
 
-pub fn choice_type(choice: u8) callconv(.C) u8 {
+pub fn choice_type(choice: u8) callconv(.c) u8 {
     return @intFromEnum(@as(pkmn.Choice, @bitCast(choice)).type);
 }
 
-pub fn choice_data(choice: u8) callconv(.C) u8 {
+pub fn choice_data(choice: u8) callconv(.c) u8 {
     return @as(u8, @as(pkmn.Choice, @bitCast(choice)).data);
 }
 
-pub fn result_type(result: u8) callconv(.C) u8 {
+pub fn result_type(result: u8) callconv(.c) u8 {
     return @intFromEnum(@as(pkmn.Result, @bitCast(result)).type);
 }
 
-pub fn result_p1(result: u8) callconv(.C) u8 {
+pub fn result_p1(result: u8) callconv(.c) u8 {
     assert(!err(result));
     return @intFromEnum(@as(pkmn.Result, @bitCast(result)).p1);
 }
 
-pub fn result_p2(result: u8) callconv(.C) u8 {
+pub fn result_p2(result: u8) callconv(.c) u8 {
     assert(!err(result));
     return @intFromEnum(@as(pkmn.Result, @bitCast(result)).p2);
 }
 
-pub fn err(result: u8) callconv(.C) bool {
+pub fn err(result: u8) callconv(.c) bool {
     return result == ERROR;
 }
 
-pub fn psrng_init(prng: *pkmn.PSRNG, seed: u64) callconv(.C) void {
+pub fn psrng_init(prng: *pkmn.PSRNG, seed: u64) callconv(.c) void {
     prng.src = .{ .seed = seed };
 }
 
-pub fn psrng_next(prng: *pkmn.PSRNG) callconv(.C) u32 {
+pub fn psrng_next(prng: *pkmn.PSRNG) callconv(.c) u32 {
     return prng.next();
 }
 
-pub fn rational_init(rational: *pkmn.Rational(f64)) callconv(.C) void {
+pub fn rational_init(rational: *pkmn.Rational(f64)) callconv(.c) void {
     rational.reset();
 }
 
-pub fn rational_reduce(rational: *pkmn.Rational(f64)) callconv(.C) void {
+pub fn rational_reduce(rational: *pkmn.Rational(f64)) callconv(.c) void {
     rational.reduce();
 }
 
-pub fn rational_numerator(rational: *const pkmn.Rational(f64)) callconv(.C) f64 {
+pub fn rational_numerator(rational: *const pkmn.Rational(f64)) callconv(.c) f64 {
     return rational.p;
 }
 
-pub fn rational_denominator(rational: *const pkmn.Rational(f64)) callconv(.C) f64 {
+pub fn rational_denominator(rational: *const pkmn.Rational(f64)) callconv(.c) f64 {
     return rational.q;
 }
 
@@ -106,7 +104,7 @@ pub fn gen(comptime num: comptime_int) type {
         };
 
         const battle_options = struct {
-            stream: pkmn.protocol.ByteStream,
+            writer: pkmn.protocol.Writer,
             log: pkmn.protocol.FixedLog,
             chance: g.Chance(pkmn.Rational(f64)),
             calc: g.Calc,
@@ -121,13 +119,13 @@ pub fn gen(comptime num: comptime_int) type {
             log: ?*const log_options,
             chance: ?*const chance_options,
             calc: ?*const calc_options,
-        ) callconv(.C) void {
+        ) callconv(.c) void {
             if (pkmn.options.log) {
                 if (log) |l| {
-                    options.stream = .{ .buffer = l.buf[0..l.len] };
-                    options.log = .{ .writer = options.stream.writer() };
+                    options.writer = .{ .buffer = l.buf[0..l.len] };
+                    options.log = .{ .writer = &options.writer };
                 } else {
-                    options.stream.reset();
+                    options.writer.reset();
                 }
             }
             if (pkmn.options.chance) {
@@ -152,25 +150,25 @@ pub fn gen(comptime num: comptime_int) type {
 
         pub fn battle_options_chance_probability(
             options: *battle_options,
-        ) callconv(.C) *pkmn.Rational(f64) {
+        ) callconv(.c) *pkmn.Rational(f64) {
             return &options.chance.probability;
         }
 
         pub fn battle_options_chance_actions(
             options: *battle_options,
-        ) callconv(.C) *g.chance.Actions {
+        ) callconv(.c) *g.chance.Actions {
             return &options.chance.actions;
         }
 
         pub fn battle_options_chance_durations(
             options: *battle_options,
-        ) callconv(.C) *g.chance.Durations {
+        ) callconv(.c) *g.chance.Durations {
             return &options.chance.durations;
         }
 
         pub fn battle_options_calc_summaries(
             options: *battle_options,
-        ) callconv(.C) *g.calc.Summaries {
+        ) callconv(.c) *g.calc.Summaries {
             return &options.calc.summaries;
         }
 
@@ -179,7 +177,7 @@ pub fn gen(comptime num: comptime_int) type {
             c1: pkmn.Choice,
             c2: pkmn.Choice,
             opts: ?*battle_options,
-        ) callconv(.C) pkmn.Result {
+        ) callconv(.c) pkmn.Result {
             if ((pkmn.options.log or pkmn.options.chance or pkmn.options.calc) and opts != null) {
                 return battle.update(c1, c2, opts.?) catch return @bitCast(ERROR);
             }
@@ -192,64 +190,12 @@ pub fn gen(comptime num: comptime_int) type {
             request: u8,
             out: [*]u8,
             n: usize,
-        ) callconv(.C) u8 {
-            assert(player <= @field(@typeInfo(pkmn.Player), @tagName(Enum)).fields.len);
-            assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
+        ) callconv(.c) u8 {
+            assert(player <= util.EnumFieldsLen(pkmn.Player));
+            assert(request <= util.EnumFieldsLen(pkmn.Choice.Type));
 
             assert(!pkmn.options.showdown or n > 0);
             return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(out[0..n]));
         }
     };
 }
-
-pub fn exports() type {
-    @export(choice_init, .{ .name = "pkmn_choice_init", .linkage = Strong });
-    @export(choice_type, .{ .name = "pkmn_choice_type", .linkage = Strong });
-    @export(choice_data, .{ .name = "pkmn_choice_data", .linkage = Strong });
-
-    @export(result_type, .{ .name = "pkmn_result_type", .linkage = Strong });
-    @export(result_p1, .{ .name = "pkmn_result_p1", .linkage = Strong });
-    @export(result_p2, .{ .name = "pkmn_result_p2", .linkage = Strong });
-
-    @export(err, .{ .name = "pkmn_error", .linkage = Strong });
-
-    @export(psrng_init, .{ .name = "pkmn_psrng_init", .linkage = Strong });
-    @export(psrng_next, .{ .name = "pkmn_psrng_next", .linkage = Strong });
-
-    @export(rational_init, .{ .name = "pkmn_rational_init", .linkage = Strong });
-    @export(rational_reduce, .{ .name = "pkmn_rational_reduce", .linkage = Strong });
-    @export(rational_numerator, .{ .name = "pkmn_rational_numerator", .linkage = Strong });
-    @export(rational_denominator, .{ .name = "pkmn_rational_denominator", .linkage = Strong });
-
-    @export(
-        gen(1).battle_options_set,
-        .{ .name = "pkmn_gen1_battle_options_set", .linkage = Strong },
-    );
-    @export(
-        gen(1).battle_options_chance_probability,
-        .{ .name = "pkmn_gen1_battle_options_chance_probability", .linkage = Strong },
-    );
-    @export(
-        gen(1).battle_options_chance_actions,
-        .{ .name = "pkmn_gen1_battle_options_chance_actions", .linkage = Strong },
-    );
-    @export(
-        gen(1).battle_options_chance_durations,
-        .{ .name = "pkmn_gen1_battle_options_chance_durations", .linkage = Strong },
-    );
-    @export(
-        gen(1).battle_options_calc_summaries,
-        .{ .name = "pkmn_gen1_battle_options_calc_summaries", .linkage = Strong },
-    );
-
-    @export(
-        gen(1).battle_update,
-        .{ .name = "pkmn_gen1_battle_update", .linkage = Strong },
-    );
-    @export(
-        gen(1).battle_choices,
-        .{ .name = "pkmn_gen1_battle_choices", .linkage = Strong },
-    );
-
-    return struct {};
-}

package/src/lib/bindings/node.zig

@@ -1,14 +1,10 @@
+const c = @import("napi");
 const js = @import("../common/js.zig");
 const pkmn = @import("../pkmn.zig");
 const std = @import("std");
 
 const assert = std.debug.assert;
 
-const c = @cImport({
-    @cDefine("NAPI_VERSION", "8");
-    @cInclude("node_api.h");
-});
-
 pub fn register(env: c.napi_env) c.napi_value {
     const object = js.Object.init(env);
     const properties = [_]c.napi_property_descriptor{
@@ -53,7 +49,7 @@ fn bind(env: c.napi_env, gen: anytype) c.napi_value {
 
 fn update(gen: anytype) c.napi_callback {
     return struct {
-        fn call(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
+        fn call(env: c.napi_env, info: c.napi_callback_info) callconv(.c) c.napi_value {
             var argc: usize = 4;
             var argv: [4]c.napi_value = undefined;
             assert(c.napi_get_cb_info(env, info, &argc, &argv, null, null) == c.napi_ok);
@@ -64,7 +60,7 @@ fn update(gen: anytype) c.napi_callback {
             assert(c.napi_get_arraybuffer_info(env, argv[0], &data, &len) == c.napi_ok);
             assert(len == @sizeOf(gen.Battle(gen.PRNG)));
 
-            var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
+            var battle: *gen.Battle(gen.PRNG) = @ptrCast(@alignCast(data.?));
             const c1: pkmn.Choice = @bitCast(js.Number.get(env, argv[1], u8));
             const c2: pkmn.Choice = @bitCast(js.Number.get(env, argv[2], u8));
 
@@ -77,10 +73,10 @@ fn update(gen: anytype) c.napi_callback {
                     assert(len == gen.LOGS_SIZE);
 
                     const buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
-                    var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
+                    var writer: pkmn.protocol.Writer = .{ .buffer = buf };
                     // TODO: extract out
                     var opts = pkmn.battle.options(
-                        pkmn.protocol.FixedLog{ .writer = stream.writer() },
+                        pkmn.protocol.FixedLog{ .writer = &writer },
                         gen.chance.NULL,
                         gen.calc.NULL,
                     );
@@ -95,7 +91,7 @@ fn update(gen: anytype) c.napi_callback {
 
 fn choices(gen: anytype) c.napi_callback {
     return struct {
-        fn call(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
+        fn call(env: c.napi_env, info: c.napi_callback_info) callconv(.c) c.napi_value {
             var argc: usize = 4;
             var argv: [4]c.napi_value = undefined;
             assert(c.napi_get_cb_info(env, info, &argc, &argv, null, null) == c.napi_ok);
@@ -106,7 +102,7 @@ fn choices(gen: anytype) c.napi_callback {
             assert(c.napi_get_arraybuffer_info(env, argv[0], &data, &len) == c.napi_ok);
             assert(len == @sizeOf(gen.Battle(gen.PRNG)));
 
-            var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
+            var battle: *gen.Battle(gen.PRNG) = @ptrCast(@alignCast(data.?));
             const player: pkmn.Player = @enumFromInt(js.Number.get(env, argv[1], u8));
             const request: pkmn.Choice.Type = @enumFromInt(js.Number.get(env, argv[2], u8));
 

package/src/lib/bindings/wasm.zig

@@ -1,11 +1,9 @@
 const pkmn = @import("../pkmn.zig");
 const std = @import("std");
+const util = @import("../common/util.zig");
 
 const assert = std.debug.assert;
 
-const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
-const Strong = if (@hasField(std.builtin.GlobalLinkage, "strong")) .strong else .Strong;
-
 pub const options = pkmn.options;
 
 pub fn gen(comptime num: comptime_int) type {
@@ -19,13 +17,13 @@ pub fn gen(comptime num: comptime_int) type {
             c1: pkmn.Choice,
             c2: pkmn.Choice,
             options_: ?[*]u8,
-        ) callconv(.C) pkmn.Result {
+        ) callconv(.c) pkmn.Result {
             return (if (options_) |o| result: {
                 const buf = @as([*]u8, @ptrCast(o))[0..g.LOGS_SIZE];
-                var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
+                var writer: pkmn.protocol.Writer = .{ .buffer = buf };
                 // TODO: extract out
                 var opts = pkmn.battle.options(
-                    pkmn.protocol.FixedLog{ .writer = stream.writer() },
+                    pkmn.protocol.FixedLog{ .writer = &writer },
                     g.chance.NULL,
                     g.calc.NULL,
                 );
@@ -38,9 +36,9 @@ pub fn gen(comptime num: comptime_int) type {
             player: u8,
             request: u8,
             buf: [*]u8,
-        ) callconv(.C) u8 {
-            assert(player <= @field(@typeInfo(pkmn.Player), @tagName(Enum)).fields.len);
-            assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
+        ) callconv(.c) u8 {
+            assert(player <= util.EnumFieldsLen(pkmn.Player));
+            assert(request <= util.EnumFieldsLen(pkmn.Choice.Type));
 
             const n = CHOICES_SIZE;
             return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(buf[0..n]));
@@ -48,12 +46,6 @@ pub fn gen(comptime num: comptime_int) type {
     };
 }
 
-pub fn exports() type {
-    @export(gen(1).update, .{ .name = "GEN1_update", .linkage = Strong });
-    @export(gen(1).choices, .{ .name = "GEN1_choices", .linkage = Strong });
-    return struct {};
-}
-
 fn size(n: usize) u32 {
     return std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(n))) catch unreachable;
 }

package/src/lib/common/array.zig

@@ -3,19 +3,12 @@ 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: std.builtin.Type.Int = .{ .signedness = .unsigned, .bits = size * n };
-        pub const T = @Type(if (@hasField(std.builtin.Type, "int"))
-            .{ .int = options }
-        else
-            .{ .Int = options });
+        pub const T = @Int(.unsigned, size * n);
 
         /// Returns the value stored at index `i` in the array `a`.
         pub fn get(a: T, i: usize) U {
@@ -24,8 +17,8 @@ pub fn Array(comptime n: comptime_int, comptime U: type) type {
             const mask: T = (1 << size) - 1;
             const result = (a >> @intCast(shift)) & mask;
             return switch (@typeInfo(U)) {
-                Enum => @enumFromInt(result),
-                Int => @intCast(result),
+                .@"enum" => @enumFromInt(result),
+                .int => @intCast(result),
                 else => unreachable,
             };
         }
@@ -34,8 +27,8 @@ pub fn Array(comptime n: comptime_int, comptime U: type) type {
         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),
+                .@"enum" => @intFromEnum(val),
+                .int => @intCast(val),
                 else => unreachable,
             };
             const shift = i * size;
@@ -52,9 +45,9 @@ test Array {
     try expectEqual(u40, @TypeOf(a));
 
     a = A.set(a, 4, 241);
-    try expectEqual(@as(u8, 241), A.get(a, 4));
+    try expectEqual(241, A.get(a, 4));
     a = A.set(a, 4, 1);
-    try expectEqual(@as(u8, 1), A.get(a, 4));
+    try expectEqual(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));
@@ -68,10 +61,10 @@ test Array {
     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);
+    try expectEqual(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);
+    try expectEqual(0b0000001, b);
 }

package/src/lib/common/data.zig

@@ -22,8 +22,8 @@ pub const Player = enum(u1) {
 
 test Player {
     try expectEqual(Player.P2, Player.P1.foe());
-    try expectEqual(@as(u8, 0b0001), @as(u8, @bitCast(Player.P1.ident(1))));
-    try expectEqual(@as(u8, 0b1101), @as(u8, @bitCast(Player.P2.ident(5))));
+    try expectEqual(0b0001, @as(u8, @bitCast(Player.P1.ident(1))));
+    try expectEqual(0b1101, @as(u8, @bitCast(Player.P2.ident(5))));
 }
 
 /// An identifier for a specific Pokémon in battle.
@@ -46,8 +46,8 @@ pub const ID = packed struct(u8) {
 };
 
 test ID {
-    try expectEqual(@as(u8, 0b0001), @as(u8, @bitCast(ID{ .player = .P1, .id = 1 })));
-    try expectEqual(@as(u8, 0b1101), @as(u8, @bitCast(ID{ .player = .P2, .id = 5 })));
+    try expectEqual(0b0001, @as(u8, @bitCast(ID{ .player = .P1, .id = 1 })));
+    try expectEqual(0b1101, @as(u8, @bitCast(ID{ .player = .P2, .id = 5 })));
     const id: ID = .{ .player = .P2, .id = 4 };
     try expectEqual(id, ID.from(id.int()));
 }
@@ -76,8 +76,8 @@ test Choice {
     const p2: Choice = .{ .type = .Switch, .data = 5 };
     try expectEqual(5, p2.data);
     try expectEqual(Choice.Type.Move, p1.type);
-    try expectEqual(@as(u8, 0b0001_0001), @as(u8, @bitCast(p1)));
-    try expectEqual(@as(u8, 0b0001_0110), @as(u8, @bitCast(p2)));
+    try expectEqual(0b0001_0001, @as(u8, @bitCast(p1)));
+    try expectEqual(0b0001_0110, @as(u8, @bitCast(p2)));
 }
 
 /// The result of the battle - all results other than 'None' should be considered terminal.
@@ -112,6 +112,6 @@ pub const Result = packed struct(u8) {
 };
 
 test Result {
-    try expectEqual(@as(u8, 0b0101_0000), @as(u8, @bitCast(Result.Default)));
-    try expectEqual(@as(u8, 0b1000_0000), @as(u8, @bitCast(Result{ .p2 = .Switch })));
+    try expectEqual(0b0101_0000, @as(u8, @bitCast(Result.Default)));
+    try expectEqual(0b1000_0000, @as(u8, @bitCast(Result{ .p2 = .Switch })));
 }