@pkmn/engine 0.1.0-dev.46307385 → 0.1.0-dev.49f6bf26

package/build.zig

@@ -16,8 +16,8 @@ pub fn module(b: *std.Build, options: Options) *std.Build.Module {
     build_options.addOption(?bool, "chance", options.chance);
     build_options.addOption(?bool, "calc", options.calc);
     return b.createModule(.{
-        .source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
-        .dependencies = &.{.{ .name = "build_options", .module = build_options.createModule() }},
+        .root_source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
+        .imports = &.{.{ .name = "build_options", .module = build_options.createModule() }},
     });
 }
 
@@ -32,8 +32,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") orelse false;
-    const pic = b.option(bool, "pic", "Force position independent code") orelse false;
+    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;
 
@@ -66,23 +66,23 @@ pub fn build(b: *std.Build) !void {
         const addon = b.fmt("{s}.node", .{name});
         const lib = b.addSharedLibrary(.{
             .name = addon,
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = "src/lib/binding/node.zig" },
+            .root_source_file = .{ .path = "src/lib/node.zig" },
             .optimize = optimize,
             .target = target,
+            .strip = strip,
+            .pic = pic,
         });
-        lib.addOptions("build_options", options);
+        lib.root_module.addOptions("build_options", options);
         lib.addSystemIncludePath(.{ .path = headers });
         lib.linkLibC();
         if (node_import_lib) |il| {
             lib.addObjectFile(.{ .path = il });
-        } else if ((try std.zig.system.NativeTargetInfo.detect(target)).target.os.tag == .windows) {
+        } else if (target.result.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 (pic) 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):
         //
@@ -93,59 +93,69 @@ pub fn build(b: *std.Build) !void {
         // rename the file ourself in install-pkmn-engine
         b.installArtifact(lib);
     } else if (wasm) {
-        const lib = b.addSharedLibrary(.{
+        const exe = b.addExecutable(.{
             .name = name,
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = "src/lib/binding/wasm.zig" },
+            .root_source_file = .{ .path = "src/lib/wasm.zig" },
             .optimize = switch (optimize) {
                 .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
                 else => optimize,
             },
-            .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
+            .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
+            .strip = strip,
+            .pic = pic,
         });
-        lib.addOptions("build_options", options);
-        lib.stack_size = wasm_stack_size;
-        lib.rdynamic = true;
-        lib.strip = strip;
-        if (pic) lib.force_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",
+        };
+        exe.entry = .disabled;
+        exe.stack_size = wasm_stack_size;
         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(lib);
+            sh.addArtifactArg(exe);
             sh.addArg("-o");
-            sh.addFileSourceArg(.{ .path = out });
+            sh.addFileArg(.{ .path = out });
             b.getInstallStep().dependOn(&sh.step);
+        } else {
+            b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
+                .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
+            }).step);
         }
-        b.installArtifact(lib);
     } else if (dynamic) {
         const lib = b.addSharedLibrary(.{
             .name = name,
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = "src/lib/binding/c.zig" },
+            .root_source_file = .{ .path = "src/lib/c.zig" },
             .version = try std.SemanticVersion.parse(version),
             .optimize = optimize,
             .target = target,
+            .strip = strip,
+            .pic = pic,
         });
-        lib.addOptions("build_options", options);
+        lib.root_module.addOptions("build_options", options);
         lib.addIncludePath(.{ .path = "src/include" });
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
-        if (pic) lib.force_pic = pic;
         b.installArtifact(lib);
         c = true;
     } else {
         const lib = b.addStaticLibrary(.{
             .name = name,
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = "src/lib/binding/c.zig" },
+            .root_source_file = .{ .path = "src/lib/c.zig" },
             .optimize = optimize,
             .target = target,
+            .strip = strip,
+            .pic = pic,
         });
-        lib.addOptions("build_options", options);
+        lib.root_module.addOptions("build_options", options);
         lib.addIncludePath(.{ .path = "src/include" });
         lib.bundle_compiler_rt = true;
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
-        if (pic) lib.force_pic = pic;
         if (emit_asm) {
             b.getInstallStep().dependOn(&b.addInstallFileWithDir(
                 lib.getEmittedAsm(),
@@ -206,7 +216,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.CompileStep).init(b.allocator);
+    var exes = std.ArrayList(*std.Build.Step.Compile).init(b.allocator);
     const tools: ToolConfig = .{
         .options = .{
             .showdown = showdown,
@@ -224,37 +234,42 @@ pub fn build(b: *std.Build) !void {
     var benchmark_config = tools;
     benchmark_config.general.optimize = .ReleaseFast;
     benchmark_config.general.strip = true;
-    const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
+    const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
 
     var fuzz_config = tools;
     fuzz_config.general.strip = false;
     fuzz_config.tool.name = "fuzz";
-    const fuzz = tool(b, "src/test/fuzz.zig", fuzz_config);
-
-    const analyze = tool(b, "src/tools/analyze.zig", tools);
-    const dump = tool(b, "src/tools/dump.zig", tools);
-    const serde = tool(b, "src/tools/serde.zig", tools);
-    const transitions = tool(b, "src/tools/transitions.zig", tools);
-
-    b.step("analyze", "Run LLVM analysis tool").dependOn(&analyze.step);
-    b.step("benchmark", "Run benchmark code").dependOn(&benchmark.step);
-    b.step("dump", "Run protocol dump tool").dependOn(&dump.step);
-    b.step("fuzz", "Run fuzz tester").dependOn(&fuzz.step);
-    b.step("serde", "Run serialization/deserialization tool").dependOn(&serde.step);
+    const fuzz = try tool(b, "src/test/fuzz.zig", fuzz_config);
+
+    const analyze = try tool(b, "src/tools/analyze.zig", tools);
+    const dump = try tool(b, "src/tools/dump.zig", tools);
+    const transitions = try tool(b, "src/tools/transitions.zig", tools);
+
+    // FIXME: serde randomly fails to build in some release configurations
+    var hack = tools;
+    if (optimize != .Debug) hack.tool.tests = null;
+    const serde = try tool(b, "src/tools/serde.zig", hack);
+
+    if (analyze) |t| b.step("analyze", "Run LLVM analysis tool").dependOn(&t.step);
+    if (benchmark) |t| b.step("benchmark", "Run benchmark code").dependOn(&t.step);
+    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("transitions", "Visualize transitions algorithm search").dependOn(&transitions.step);
+    if (transitions) |t| {
+        b.step("transitions", "Visualize transitions algorithm search").dependOn(&t.step);
+    }
 }
 
 fn maybeStrip(
     b: *std.Build,
-    artifact: *std.Build.CompileStep,
+    artifact: *std.Build.Step.Compile,
     step: *std.Build.Step,
-    strip: bool,
+    strip: ?bool,
     cmd: ?[]const u8,
 ) void {
-    artifact.strip = strip;
-    if (!strip or cmd == null) return;
+    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;
     if (mac and artifact.isDynamicLibrary()) return;
@@ -266,10 +281,10 @@ fn maybeStrip(
 }
 
 const Config = struct {
-    target: std.zig.CrossTarget,
+    target: std.Build.ResolvedTarget,
     optimize: std.builtin.OptimizeMode,
-    pic: bool,
-    strip: bool,
+    pic: ?bool,
+    strip: ?bool,
     cmd: ?[]const u8,
 };
 
@@ -277,7 +292,7 @@ const TestStep = struct {
     step: std.Build.Step,
     build: bool,
 
-    pub fn create(b: *std.Build, options: *std.Build.OptionsStep, 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_file = b.option([]const u8, "test-file", "Input file for test");
         const test_filter =
@@ -285,7 +300,7 @@ const TestStep = struct {
 
         const self = b.allocator.create(TestStep) catch @panic("OOM");
         const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
-        self.* = TestStep{ .step = step, .build = test_filter == null };
+        self.* = .{ .step = step, .build = test_filter == null };
 
         const path = test_file orelse "src/lib/test.zig";
         const tests = b.addTest(.{
@@ -293,16 +308,16 @@ const TestStep = struct {
                 std.fs.path.basename(std.fs.path.dirname(path).?),
                 std.fs.path.stem(std.fs.path.basename(path)),
             }),
-            .main_pkg_path = .{ .path = "." },
             .root_source_file = .{ .path = path },
             .optimize = config.optimize,
             .target = config.target,
             .filter = test_filter,
+            .single_threaded = true,
+            .strip = config.strip,
+            .pic = config.pic,
         });
-        tests.addOptions("build_options", options);
-        tests.single_threaded = true;
+        tests.root_module.addOptions("build_options", options);
         maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
-        if (config.pic) tests.force_pic = config.pic;
         if (coverage) |c| {
             tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
         }
@@ -318,11 +333,15 @@ const ToolConfig = struct {
     tool: struct {
         tests: ?*TestStep,
         name: ?[]const u8 = null,
-        exes: *std.ArrayList(*std.Build.CompileStep),
+        exes: *std.ArrayList(*std.Build.Step.Compile),
     },
 };
 
-fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep {
+fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
+    std.fs.cwd().access(path, .{}) catch |err| switch (err) {
+        error.FileNotFound => return null,
+        else => |e| return e,
+    };
     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];
@@ -333,11 +352,12 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
         .root_source_file = .{ .path = path },
         .target = config.general.target,
         .optimize = config.general.optimize,
+        .single_threaded = true,
+        .strip = config.general.strip,
+        .pic = config.general.pic,
     });
-    exe.addModule("pkmn", module(b, config.options));
+    exe.root_module.addImport("pkmn", module(b, config.options));
 
-    exe.single_threaded = true;
-    if (config.general.pic) exe.force_pic = config.general.pic;
     if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
     config.tool.exes.append(exe) catch @panic("OOM");
 
@@ -351,10 +371,10 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
 const ToolsStep = struct {
     step: std.Build.Step,
 
-    pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.CompileStep)) *ToolsStep {
+    pub fn create(b: *std.Build, exes: *std.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.* = ToolsStep{ .step = step };
+        self.* = .{ .step = step };
         for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
         return self;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/engine",
-  "version": "0.1.0-dev.46307385",
+  "version": "0.1.0-dev.49f6bf26",
   "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
   "repository": "github:pkmn/engine",
   "license": "MIT",
@@ -32,8 +32,6 @@
     "build/tools/debug.js.map",
     "build/tools/debug.js",
     "src/bin/install-pkmn-engine",
-    "src/lib/binding/node.zig",
-    "src/lib/binding/wasm.zig",
     "src/lib/common/battle.zig",
     "src/lib/common/data.zig",
     "src/lib/common/debug.zig",
@@ -52,14 +50,19 @@
     "src/lib/gen1/data/types.zig",
     "src/lib/gen1/helpers.zig",
     "src/lib/gen1/mechanics.zig",
+    "src/lib/gen2/calc.zig",
+    "src/lib/gen2/chance.zig",
     "src/lib/gen2/data.zig",
     "src/lib/gen2/data/items.zig",
     "src/lib/gen2/data/moves.zig",
     "src/lib/gen2/data/species.zig",
     "src/lib/gen2/data/types.zig",
+    "src/lib/gen2/generated.zig",
     "src/lib/gen2/helpers.zig",
     "src/lib/gen2/mechanics.zig",
+    "src/lib/node.zig",
     "src/lib/pkmn.zig",
+    "src/lib/wasm.zig",
     "src/test/display/pkmn.html.tmpl"
   ],
   "engines": {
@@ -73,30 +76,31 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.7.46",
-    "@pkmn/protocol": "^0.6.12"
+    "@pkmn/data": "^0.8.6",
+    "@pkmn/protocol": "^0.6.19"
   },
   "devDependencies": {
-    "@pkmn/eslint-config": "^5.0.0",
-    "@pkmn/img": "^0.2.13",
-    "@pkmn/sets": "^5.0.4",
-    "@pkmn/sim": "0.7.46",
-    "@types/html-minifier": "^4.0.2",
-    "@types/jest": "^29.5.3",
-    "@types/minimist": "^1.2.2",
-    "@types/mustache": "^4.2.2",
-    "@types/node": "^20.4.2",
-    "@vitest/coverage-c8": "^0.33.0",
-    "binaryen": "^114.0.0",
-    "eslint": "^8.44.0",
+    "@pkmn/eslint-config": "^6.5.0",
+    "@pkmn/img": "^0.2.23",
+    "@pkmn/sets": "^5.1.0",
+    "@pkmn/sim": "0.8.6",
+    "@types/html-minifier": "^4.0.5",
+    "@types/jest": "^29.5.11",
+    "@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",
     "html-minifier": "^4.0.0",
-    "json-stringify-pretty-compact": "3.0.0",
+    "json-stringify-pretty-compact": "4.0.0",
     "minimist": "^1.2.8",
     "mustache": "^4.2.0",
     "source-map-support": "^0.5.21",
+    "table": "^6.8.1",
     "trakr": "^0.2.0",
-    "typescript": "^5.1.6",
-    "vitest": "^0.33.0"
+    "typescript": "^5.3.3",
+    "vitest": "^1.2.1"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
@@ -118,7 +122,7 @@
     "ignorePatterns": [
       "dist/",
       "node_modules/",
-      "src/examples/zig",
+      "examples/zig",
       "build/"
     ],
     "env": {
@@ -134,10 +138,18 @@
         "parserOptions": {
           "project": [
             "./tsconfig.json",
-            "./src/examples/js/tsconfig.json"
+            "./examples/js/tsconfig.json"
           ]
         }
       },
+      {
+        "files": [
+          "src/test/display.ts"
+        ],
+        "rules": {
+          "@typescript-eslint/no-unnecessary-type-assertion": "off"
+        }
+      },
       {
         "files": [
           "src/pkg/index.ts",
@@ -168,6 +180,15 @@
           "@typescript-eslint/no-redundant-type-constituents": "off"
         }
       },
+      {
+        "files": [
+          "src/pkg/protocol.test.ts"
+        ],
+        "rules": {
+          "jest/no-standalone-expect": "off",
+          "jest/no-conditional-expect": "off"
+        }
+      },
       {
         "files": [
           "src/test/*.test.ts",

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: 12, patch: 0, dev: 2036};
 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';
@@ -283,19 +283,19 @@ const downloadImportLib = async () => {
   let error = false;
   for (let i = 2; i < process.argv.length; i++) {
     switch (process.argv[i]) {
-    case "--silent": {
-      SILENT = true;
-      break;
-    }
-    case "--zig": {
-      if (options || only) error = true;
-      only = true;
-      break;
-    }
-    default: {
-      if (options || only || !process.argv[i].startsWith('--options=')) error = true;
-      options = process.argv[i].slice(10).split(' ');
-    }
+      case "--silent": {
+        SILENT = true;
+        break;
+      }
+      case "--zig": {
+        if (options || only) error = true;
+        only = true;
+        break;
+      }
+      default: {
+        if (options || only || !process.argv[i].startsWith('--options=')) error = true;
+        options = process.argv[i].slice(10).split(' ');
+      }
     }
   }
   if (error) {

package/src/lib/common/data.zig

@@ -9,12 +9,12 @@ pub const Player = enum(u1) {
     P2,
 
     /// Returns a player's opponent.
-    pub inline fn foe(self: Player) Player {
+    pub fn foe(self: Player) Player {
         return @enumFromInt(~@intFromEnum(self));
     }
 
     /// Return's an identifier for the player's Pokémon at the one-indexed `id`.
-    pub inline fn ident(self: Player, id: u3) ID {
+    pub fn ident(self: Player, id: u3) ID {
         assert(id > 0 and id <= 6);
         return .{ .id = id, .player = self };
     }
@@ -22,42 +22,38 @@ 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.
-pub const ID = packed struct {
+pub const ID = packed struct(u8) {
     /// The one-indexed team slot of the Pokémon
     id: u3 = 0,
     /// The Pokémon's trainer.
     player: Player = .P1,
     _: u4 = 0,
 
-    comptime {
-        assert(@sizeOf(ID) == 1);
-    }
-
     /// Converts the identifier into a number.
-    pub inline fn int(self: ID) u4 {
+    pub fn int(self: ID) u4 {
         return @intCast(@as(u8, @bitCast(self)));
     }
 
     /// Decodes the identifier from a number.
-    pub inline fn from(id: u4) ID {
+    pub fn from(id: u4) ID {
         return @bitCast(@as(u8, id));
     }
 };
 
 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 })));
-    const id = ID{ .player = .P2, .id = 4 };
+    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()));
 }
 
 /// A choice made by a player during battle.
-pub const Choice = packed struct {
+pub const Choice = packed struct(u8) {
     /// The choice type.
     type: Choice.Type = .Pass,
     /// The choice data:
@@ -73,10 +69,6 @@ pub const Choice = packed struct {
         Move,
         Switch,
     };
-
-    comptime {
-        assert(@sizeOf(Choice) == 1);
-    }
 };
 
 test Choice {
@@ -89,7 +81,7 @@ test Choice {
 }
 
 /// The result of the battle - all results other than 'None' should be considered terminal.
-pub const Result = packed struct {
+pub const Result = packed struct(u8) {
     /// The type of result from the perspective of Player 1.
     /// `Error` is not possible when in Pokémon Showdown compatibility mode.
     type: Result.Type = .None,
@@ -117,10 +109,6 @@ pub const Result = packed struct {
     pub const Error: Result = .{ .type = .Error };
     /// The default result.
     pub const Default: Result = .{ .p1 = .Move, .p2 = .Move };
-
-    comptime {
-        assert(@sizeOf(Result) == 1);
-    }
 };
 
 test Result {

package/src/lib/common/optional.zig

@@ -14,6 +14,7 @@ pub fn Optional(comptime T: type) type {
     var decls = [_]std.builtin.Type.Declaration{};
 
     enumFields[0] = .{ .name = "None", .value = 0 };
+
     inline for (fields, 1..) |field, i| {
         assert(!std.mem.eql(u8, field.name, "None"));
         enumFields[i] = .{
@@ -24,7 +25,7 @@ pub fn Optional(comptime T: type) type {
 
     return @Type(.{
         .Enum = .{
-            .tag_type = std.math.IntFittingRange(0, fields.len + 1),
+            .tag_type = std.math.IntFittingRange(0, fields.len),
             .fields = &enumFields,
             .decls = &decls,
             .is_exhaustive = true,
@@ -45,7 +46,7 @@ test Optional {
     try expect(b != .true);
     try expect(b != .false);
 
-    const Player = @import("./data.zig").Player;
+    const Player = @import("data.zig").Player;
     try expect(@bitSizeOf(Optional(Player)) == 2);
 
     const p: Optional(Player) = .P2;
@@ -57,4 +58,10 @@ test Optional {
     try expect(q == .None);
     try expect(q != .P1);
     try expect(q != .P2);
+
+    const Three = enum(u2) { A, B, C };
+    try expect(@bitSizeOf(Optional(Three)) == 2);
+
+    const Four = enum(u2) { A, B, C, D };
+    try expect(@bitSizeOf(Optional(Four)) == 3);
 }