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

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, dev: '2193+fc517bd01'};
 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 {zig_exe, version} = parse(sh(zig, ['env']));
     const [major, minor, patch, dev] = version.split('.').map(n => parseInt(n));
 
     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))));
 
     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);

package/src/lib/bindings/c.zig

@@ -5,9 +5,6 @@ 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 +22,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 <= @typeInfo(pkmn.Choice.Type).@"enum".fields.len);
     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 +103,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 +118,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 +149,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 +176,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 +189,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 <= @typeInfo(pkmn.Player).@"enum".fields.len);
+            assert(request <= @typeInfo(pkmn.Choice.Type).@"enum".fields.len);
 
             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

@@ -3,9 +3,6 @@ const std = @import("std");
 
 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 +16,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 +35,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 <= @typeInfo(pkmn.Player).@"enum".fields.len);
+            assert(request <= @typeInfo(pkmn.Choice.Type).@"enum".fields.len);
 
             const n = CHOICES_SIZE;
             return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(buf[0..n]));
@@ -48,12 +45,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;

package/src/lib/common/debug.zig

@@ -3,19 +3,9 @@ const std = @import("std");
 const debug = std.debug;
 const io = std.io;
 
-const Array = if (@hasField(std.builtin.Type, "array")) .array else .Array;
-const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
-const Optional = if (@hasField(std.builtin.Type, "optional")) .optional else .Optional;
-const Pointer = if (@hasField(std.builtin.Type, "pointer")) .pointer else .Pointer;
-const Struct = if (@hasField(std.builtin.Type, "struct")) .@"struct" else .Struct;
-const Union = if (@hasField(std.builtin.Type, "union")) .@"union" else .Union;
-
 pub fn print(value: anytype) void {
-    if (@hasDecl(debug, "lockStdErr")) debug.lockStdErr() else debug.getStderrMutex().lock();
-    defer if (@hasDecl(debug, "unlockStdErr"))
-        debug.unlockStdErr()
-    else
-        debug.getStderrMutex().unlock();
+    debug.lockStdErr();
+    defer debug.unlockStdErr();
     const stderr = io.getStdErr().writer();
 
     nosuspend {
@@ -29,7 +19,7 @@ pub fn print(value: anytype) void {
             }) catch return;
         } else {
             switch (@typeInfo(@TypeOf(value))) {
-                Struct => |info| {
+                .@"struct" => |info| {
                     if (info.is_tuple) {
                         inline for (info.fields, 0..) |f, i| {
                             inspect(@field(value, f.name));
@@ -52,32 +42,32 @@ fn inspect(value: anytype) void {
     nosuspend {
         const err = "Unable to format type '" ++ @typeName(@TypeOf(value)) ++ "'";
         switch (@typeInfo(@TypeOf(value))) {
-            Array => |info| {
+            .array => |info| {
                 if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
                 @compileError(err);
             },
-            Pointer => |ptr_info| switch (ptr_info.size) {
-                .One => switch (@typeInfo(ptr_info.child)) {
-                    Array => |info| {
+            .pointer => |ptr_info| switch (ptr_info.size) {
+                .one => switch (@typeInfo(ptr_info.child)) {
+                    .array => |info| {
                         if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
                         @compileError(err);
                     },
-                    Enum, Union, Struct => return inspect(value.*),
+                    .@"enum", .@"union", .@"struct" => return inspect(value.*),
                     else => @compileError(err),
                 },
-                .Many, .C => {
+                .many, .c => {
                     if (ptr_info.sentinel) |_| return inspect(std.mem.span(value));
                     if (ptr_info.child == u8) {
                         return stderr.print("{s}", .{std.mem.span(value)}) catch return;
                     }
                     @compileError(err);
                 },
-                .Slice => {
+                .slice => {
                     if (ptr_info.child == u8) return stderr.print("{s}", .{value}) catch return;
                     @compileError(err);
                 },
             },
-            Optional => stderr.print("{?}", .{value}) catch return,
+            .optional => stderr.print("{?}", .{value}) catch return,
             else => stderr.print("{}", .{value}) catch return,
         }
     }

package/src/lib/common/js.zig

@@ -1,14 +1,8 @@
 const std = @import("std");
+const c = @import("napi");
 
 const assert = std.debug.assert;
 
-const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
-
-const c = @cImport({
-    @cDefine("NAPI_VERSION", "8");
-    @cInclude("node_api.h");
-});
-
 pub const Array = struct {
     pub fn init(env: c.napi_env, o: struct { length: ?usize }) c.napi_value {
         var result: c.napi_value = undefined;
@@ -37,7 +31,7 @@ pub const Number = struct {
         const T = @TypeOf(value);
         var result: c.napi_value = undefined;
         assert(c.napi_ok == switch (@typeInfo(T)) {
-            Int => |info| switch (info.bits) {
+            .int => |info| switch (info.bits) {
                 0...32 => switch (info.signedness) {
                     .signed => c.napi_create_int32(env, @as(i32, value), &result),
                     .unsigned => c.napi_create_uint32(env, @as(u32, value), &result),
@@ -52,7 +46,7 @@ pub const Number = struct {
 
     pub fn get(env: c.napi_env, value: c.napi_value, comptime T: type) T {
         switch (@typeInfo(T)) {
-            Int => |info| switch (info.bits) {
+            .int => |info| switch (info.bits) {
                 0...32 => switch (info.signedness) {
                     .signed => {
                         var result: i32 = undefined;

package/src/lib/common/optional.zig

@@ -3,38 +3,28 @@ const std = @import("std");
 const expect = std.testing.expect;
 const assert = std.debug.assert;
 
-const Bool = if (@hasField(std.builtin.Type, "bool")) .bool else .Bool;
-
-// TODO: ziglang/zig#104
+/// Optimized optional representation which stores the empty None value as a sentinel.
+/// NOTE: ziglang/zig#104
 pub fn Optional(comptime T: type) type {
     const fields = std.meta.fields(switch (@typeInfo(T)) {
-        Bool => enum { false, true },
+        .bool => enum { false, true },
         else => T,
     });
 
-    var enumFields: [fields.len + 1]std.builtin.Type.EnumField = undefined;
-    var decls = [_]std.builtin.Type.Declaration{};
+    const tagType = std.math.IntFittingRange(0, fields.len);
+    var fieldNames: [fields.len + 1][]const u8 = undefined;
+    var fieldValues: [fields.len + 1]tagType = undefined;
 
-    enumFields[0] = .{ .name = "None", .value = 0 };
+    fieldNames[0] = "None";
+    fieldValues[0] = 0;
 
     inline for (fields, 1..) |field, i| {
         assert(!std.mem.eql(u8, field.name, "None"));
-        enumFields[i] = .{
-            .name = field.name,
-            .value = i,
-        };
+        fieldNames[i] = field.name;
+        fieldValues[i] = i;
     }
 
-    const options: std.builtin.Type.Enum = .{
-        .tag_type = std.math.IntFittingRange(0, fields.len),
-        .fields = &enumFields,
-        .decls = &decls,
-        .is_exhaustive = true,
-    };
-    return @Type(if (@hasField(std.builtin.Type, "enum"))
-        .{ .@"enum" = options }
-    else
-        .{ .Enum = options });
+    return @Enum(tagType, .exhaustive, &fieldNames, &fieldValues);
 }
 
 test Optional {