@pkmn/engine 0.1.0-dev.a1fcc5d9 → 0.1.0-dev.a27b3ff3

package/src/lib/gen2/mechanics.zig

@@ -1,44 +1,37 @@
-const std = @import("std");
-
-const pkmn = @import("../pkmn.zig");
-
-const common = @import("../common/data.zig");
 const DEBUG = @import("../common/debug.zig").print;
-const protocol = @import("../common/protocol.zig");
-const rng = @import("../common/rng.zig");
 
+const builtin = @import("builtin");
+const common = @import("../common/data.zig");
 const data = @import("data.zig");
 const generated = @import("generated.zig");
-
-const assert = std.debug.assert;
-
-const expectEqual = std.testing.expectEqual;
-const expectEqualSlices = std.testing.expectEqualSlices;
-const expectEqualStrings = std.testing.expectEqualStrings;
-
-const showdown = pkmn.options.showdown;
-
-const Choice = common.Choice;
-const ID = common.ID;
-const Player = common.Player;
-const Result = common.Result;
+const pkmn = @import("../pkmn.zig");
+const protocol = @import("../common/protocol.zig");
+const rng = @import("../common/rng.zig");
+const std = @import("std");
 
 const Activate = protocol.Activate;
+const ActivePokemon = data.ActivePokemon;
+const assert = std.debug.assert;
 const Boost = protocol.Boost;
+const Boosts = data.Boosts;
+const Choice = common.Choice;
 const Damage = protocol.Damage;
+const Effectiveness = data.Effectiveness;
 const End = protocol.End;
+const expectEqual = std.testing.expectEqual;
+const expectEqualSlices = std.testing.expectEqualSlices;
+const expectEqualStrings = std.testing.expectEqualStrings;
 const Fail = protocol.Fail;
-const Heal = protocol.Heal;
-const Start = protocol.Start;
-
 const Gen12 = rng.Gen12;
-
-const ActivePokemon = data.ActivePokemon;
-const Boosts = data.Boosts;
-const Effectiveness = data.Effectiveness;
+const Heal = protocol.Heal;
+const ID = common.ID;
 const Item = data.Item;
 const Move = data.Move;
+const Player = common.Player;
+const Result = common.Result;
+const showdown = pkmn.options.showdown;
 const Side = data.Side;
+const Start = protocol.Start;
 const Stats = data.Stats;
 const Status = data.Status;
 const TriAttack = data.TriAttack;
@@ -689,7 +682,7 @@ pub fn adjustDamage(battle: anytype, player: Player, state: *State, _: anytype)
 
     // Type effectiveness matchup precedence only matters with (NVE, SE)
     if (!showdown and (eff1 + eff2) == Effectiveness.mismatch and
-        types.type1.precedence() > types.type2.precedence())
+        Type.precedence(state.type, types.type1) > Type.precedence(state.type, types.type2))
     {
         assert(eff2 != neutral);
         d = d *% eff2 / 10;
@@ -1200,7 +1193,7 @@ fn updateSideCondition(
 fn endTurn(battle: anytype, options: anytype) @TypeOf(options.log).Error!Result {
     battle.turn += 1;
 
-    if (showdown and battle.turn >= 1000) {
+    if (pkmn.options.mod and battle.turn >= 1000) {
         try options.log.tie(.{});
         return Result.Tie;
     } else if (battle.turn >= 65535) {
@@ -1434,7 +1427,8 @@ pub const Effects = struct {
         if (move.type.special() != (last == .MirrorCoat)) return;
         if (state.damage == 0) return;
 
-        state.damage *|= 2;
+        // NOTE: llvm/llvm-project#58557
+        state.damage = smul(state.damage, 2);
         state.miss = false;
     }
 
@@ -1529,15 +1523,18 @@ pub const Effects = struct {
 
     pub const double = struct {
         pub fn flying(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.Flying) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.Flying) return;
+            state.damage = smul(state.damage, 2);
         }
 
         pub fn underground(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.Underground) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.Underground) return;
+            state.damage = smul(state.damage, 2);
         }
 
         pub fn minimize(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.minimized) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.minimized) return;
+            state.damage = smul(state.damage, 2);
         }
     };
 
@@ -1706,7 +1703,7 @@ pub const Effects = struct {
         if (!state.proc) return;
         if (foe.conditions.Safeguard) return;
         // Freeze Clause Mod
-        if (showdown) for (foe.pokemon) |p| if (Status.is(p.status, .FRZ)) return;
+        if (pkmn.options.mod) for (foe.pokemon) |p| if (Status.is(p.status, .FRZ)) return;
 
         foe_stored.status = Status.init(.FRZ);
         try options.log.status(.{ foe_ident, foe_stored.status, .None });
@@ -1735,7 +1732,7 @@ pub const Effects = struct {
             state.bp *= 2;
             assert(state.bp <= 160);
         } else {
-            state.damage *|= 2;
+            state.damage = smul(state.damage, 2);
         }
     }
 
@@ -2206,7 +2203,7 @@ pub const Effects = struct {
 
     pub fn pursuit(battle: anytype, player: Player, state: *State, _: anytype) !void {
         // TODO: remove switching variable and just look at Choice saved in Battle struct?
-        if (battle.foe(player).active.volatiles.switching) state.damage *|= 2;
+        if (battle.foe(player).active.volatiles.switching) state.damage = smul(state.damage, 2);
     }
 
     pub const rage = struct {
@@ -2219,7 +2216,7 @@ pub const Effects = struct {
             const side = battle.side(player);
 
             assert(side.active.volatiles.Rage);
-            state.damage *|= (side.active.volatiles.rage +| 1);
+            state.damage = smul(state.damage, (side.active.volatiles.rage +| 1)); // TODO: |+
         }
     };
 
@@ -2314,7 +2311,7 @@ pub const Effects = struct {
             side.active.volatiles.attacks += 1;
             side.active.volatiles.Rollout = side.active.volatiles.attacks != 5;
 
-            if (side.active.volatiles.DefenseCurl) state.damage *|= 2;
+            if (side.active.volatiles.DefenseCurl) state.damage = smul(state.damage, 2);
         }
     };
 
@@ -2384,7 +2381,7 @@ pub const Effects = struct {
         }
 
         // Sleep Clause Mod
-        if (showdown) {
+        if (pkmn.options.mod) {
             for (foe.pokemon) |p| {
                 if (Status.is(p.status, .SLP) and !Status.is(p.status, .EXT)) return;
             }
@@ -2842,6 +2839,12 @@ fn convertible(active: ActivePokemon, m: Move) bool {
     return t != .@"???" and !active.types.includes(t);
 }
 
+// NOTE: llvm/llvm-project#58557
+fn smul(a: anytype, b: @TypeOf(a)) @TypeOf(a) {
+    if (!comptime builtin.target.cpu.arch.isWasm()) return a *| b;
+    return @max(a *% b, std.math.maxInt(@TypeOf(a)));
+}
+
 pub const Rolls = struct {
     fn speedTie(battle: anytype, options: anytype) !bool {
         const p1 = if (options.calc.overridden(.P1, 0, .speed_tie)) |player|

package/src/lib/node.zig

@@ -1,131 +1,14 @@
-const std = @import("std");
-
-const pkmn = @import("pkmn.zig");
-
+const c = @import("common/napi.zig");
 const js = @import("common/js.zig");
+const node = @import("bindings/node.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
 
-const c = @cImport({
-    @cDefine("NAPI_VERSION", "8");
-    @cInclude("node_api.h");
-});
-
 export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi_value {
     const properties = [_]c.napi_property_descriptor{
-        js.Property.init("engine", .{ .value = register(env) }),
+        js.Property.init("engine", .{ .value = node.register(env) }),
     };
     assert(c.napi_define_properties(env, exports, properties.len, &properties) == c.napi_ok);
     return exports;
 }
-
-pub fn register(env: c.napi_env) c.napi_value {
-    const object = js.Object.init(env);
-    const properties = [_]c.napi_property_descriptor{
-        js.Property.init("options", .{ .value = options(env) }),
-        js.Property.init("bindings", .{ .value = bindings(env) }),
-    };
-    assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
-    return object;
-}
-
-fn options(env: c.napi_env) c.napi_value {
-    const object = js.Object.init(env);
-    const properties = [_]c.napi_property_descriptor{
-        js.Property.init("showdown", .{ .value = js.Boolean.init(env, pkmn.options.showdown) }),
-        js.Property.init("log", .{ .value = js.Boolean.init(env, pkmn.options.log) }),
-        js.Property.init("chance", .{ .value = js.Boolean.init(env, pkmn.options.chance) }),
-        js.Property.init("calc", .{ .value = js.Boolean.init(env, pkmn.options.calc) }),
-    };
-    assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
-    return object;
-}
-
-fn bindings(env: c.napi_env) c.napi_value {
-    const array = js.Array.init(env, .{ .length = 1 });
-    js.Array.set(env, array, 0, bind(env, pkmn.gen1));
-    return array;
-}
-
-fn bind(env: c.napi_env, gen: anytype) c.napi_value {
-    const choices_size: u32 = @intCast(gen.CHOICES_SIZE);
-    const logs_size: u32 = @intCast(gen.LOGS_SIZE);
-    const object = js.Object.init(env);
-    const properties = [_]c.napi_property_descriptor{
-        js.Property.init("CHOICES_SIZE", .{ .value = js.Number.init(env, choices_size) }),
-        js.Property.init("LOGS_SIZE", .{ .value = js.Number.init(env, logs_size) }),
-        js.Property.init("update", .{ .method = update(gen) }),
-        js.Property.init("choices", .{ .method = choices(gen) }),
-    };
-    assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
-    return object;
-}
-
-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 {
-            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);
-            assert(argc == 4);
-
-            var data: ?*anyopaque = undefined;
-            var len: usize = 0;
-            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.?));
-            const c1: pkmn.Choice = @bitCast(js.Number.get(env, argv[1], u8));
-            const c2: pkmn.Choice = @bitCast(js.Number.get(env, argv[2], u8));
-
-            var vtype: c.napi_valuetype = undefined;
-            assert(c.napi_typeof(env, argv[3], &vtype) == c.napi_ok);
-            const result = switch (vtype) {
-                c.napi_undefined, c.napi_null => battle.update(c1, c2, &gen.NULL),
-                else => result: {
-                    assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
-                    assert(len == gen.LOGS_SIZE);
-
-                    const buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
-                    var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
-                    // TODO: extract out
-                    var opts = pkmn.battle.options(
-                        pkmn.protocol.FixedLog{ .writer = stream.writer() },
-                        gen.chance.NULL,
-                        gen.calc.NULL,
-                    );
-                    break :result battle.update(c1, c2, &opts);
-                },
-            } catch unreachable;
-
-            return js.Number.init(env, @as(u8, @bitCast(result)));
-        }
-    }.call;
-}
-
-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 {
-            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);
-            assert(argc == 4);
-
-            var data: ?*anyopaque = undefined;
-            var len: usize = 0;
-            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.?));
-            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));
-
-            assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
-            assert(len == gen.CHOICES_SIZE);
-
-            const out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
-            const n = battle.choices(player, request, out);
-            return js.Number.init(env, @as(u8, @bitCast(n)));
-        }
-    }.call;
-}

package/src/lib/pkmn.zig

@@ -96,6 +96,10 @@ pub const gen1 = struct {
         /// though damage calculator support should additionally be turned off
         /// entirely via `options.calc`.
         pub const NULL = @import("gen1/calc.zig").NULL;
+        /// TODO
+        pub const MAX_FRONTIER = @import("gen1/calc.zig").MAX_FRONTIER;
+        /// TODO
+        pub const Rolls = @import("gen1/calc.zig").Rolls;
     };
     /// Provides helpers for initializing Generation I Pokémon battles.
     pub const helpers = @import("gen1/helpers.zig");
@@ -125,6 +129,7 @@ pub const gen2 = struct {
 // NOTE: `pub usingnamespace struct { ... }` here results in a (false?) dependency loop
 pub const js = if (options.internal) @import("common/js.zig") else {};
 pub const bindings = if (options.internal) struct {
-    pub const node = @import("node.zig");
-    pub const wasm = @import("wasm.zig");
+    pub const c = @import("bindings/c.zig");
+    pub const node = @import("bindings/node.zig");
+    pub const wasm = @import("bindings/wasm.zig");
 } else {};

package/src/lib/wasm.zig

@@ -1,13 +1,17 @@
 const std = @import("std");
+const wasm = @import("bindings/wasm.zig");
 
-const pkmn = @import("pkmn.zig");
+export const SHOWDOWN = wasm.options.showdown;
+export const LOG = wasm.options.log;
+export const CHANCE = wasm.options.chance;
+export const CALC = wasm.options.calc;
 
-export const SHOWDOWN = pkmn.options.showdown;
-export const LOG = pkmn.options.log;
-export const CHANCE = pkmn.options.chance;
-export const CALC = pkmn.options.calc;
+export const GEN1_CHOICES_SIZE = wasm.gen(1).CHOICES_SIZE;
+export const GEN1_LOGS_SIZE = wasm.gen(1).LOGS_SIZE;
 
-export const GEN1_CHOICES_SIZE =
-    std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.CHOICES_SIZE))) catch unreachable;
-export const GEN1_LOGS_SIZE =
-    std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.LOGS_SIZE))) catch unreachable;
+const exportable = @hasDecl(std.zig, "Zir") and !@hasField(std.zig.Zir.Inst.Tag, "export_value");
+
+usingnamespace if (exportable) struct {
+    export const GEN1_update = wasm.gen(1).update;
+    export const GEN1_choices = wasm.gen(1).choices;
+} else wasm.exports();

package/src/tools/display/dom.ts

@@ -1,6 +1,6 @@
 /** @license MIT modified from Vadim Demedes's https://github.com/vadimdemedes/dom-chef */
 type Attributes = JSX.IntrinsicElements['div'];
-type DocumentFragmentConstructor = typeof DocumentFragment;
+type DocumentFragmentFunction = (props?: any) => DocumentFragment;
 type ElementFunction = (props?: any) => HTMLElement;
 
 declare global {
@@ -22,9 +22,6 @@ interface Fragment {
 // https://github.com/preactjs/preact/blob/1bbd687c/src/constants.js#L3
 const IS_NON_DIMENSIONAL = /acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i;
 
-const isFragment = (type: DocumentFragmentConstructor | ElementFunction):
-  type is DocumentFragmentConstructor => type === DocumentFragment;
-
 const setCSSProps = (element: HTMLElement, style: CSSStyleDeclaration) => {
   for (const [name, value] of Object.entries(style)) {
     if (name.startsWith('-')) {
@@ -57,12 +54,12 @@ const addChildren = (parent: Element | DocumentFragment, children: Node[]) => {
 const FALSIFIABLE_ATTRIBUTES = ['contentEditable', 'draggable', 'spellCheck', 'value'];
 
 export const h = (
-  type: DocumentFragmentConstructor | ElementFunction | string,
+  type: DocumentFragmentFunction | ElementFunction | string,
   attributes?: Attributes,
   ...children: Node[]
 ) => {
   if (typeof type !== 'string') {
-    const element = isFragment(type) ? document.createDocumentFragment() : type(attributes);
+    const element = type(attributes);
     addChildren(element, children);
     return element;
   }
@@ -92,5 +89,5 @@ export const h = (
   return element;
 };
 
-export const Fragment =
-  (typeof DocumentFragment === 'function' ? DocumentFragment : () => {}) as Fragment;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const Fragment = (unused: any) => document.createDocumentFragment();

package/src/tools/display/ui.css

@@ -250,11 +250,6 @@ th, td {
 .disabled {
   color: #AAAAAA;
 }
-.log {
-  display: flex;
-  justify-content: center;
-  padding-bottom: 2em;
-}
 .position {
   position: absolute;
   right: 10px;