@pkmn/engine 0.1.0-dev.683fba11 → 0.1.0-dev.6ba42cd5

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 = .{
-        .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 {