@pkmn/engine 0.1.0-dev.b3197aa3 → 0.1.0-dev.b396399c

package/src/lib/common/js.zig

@@ -1,10 +1,8 @@
 const std = @import("std");
-const c = @import("napi.zig");
+const c = @import("napi");
 
 const assert = std.debug.assert;
 
-const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
-
 pub const Array = struct {
     pub fn init(env: c.napi_env, o: struct { length: ?usize }) c.napi_value {
         var result: c.napi_value = undefined;
@@ -33,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),
@@ -48,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 {