@pkmn/engine 0.1.0-dev.8b83af6b → 0.1.0-dev.90d6c14c

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pkmn/engine",
3
- "version": "0.1.0-dev.8b83af6b",
3
+ "version": "0.1.0-dev.90d6c14c",
4
4
  "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
5
5
  "repository": "github:pkmn/engine",
6
6
  "license": "MIT",
@@ -34,11 +34,18 @@
34
34
  "src/bin/install-pkmn-engine",
35
35
  "src/lib/binding/node.zig",
36
36
  "src/lib/binding/wasm.zig",
37
+ "src/lib/common/battle.zig",
37
38
  "src/lib/common/data.zig",
38
39
  "src/lib/common/debug.zig",
40
+ "src/lib/common/js.zig",
41
+ "src/lib/common/optional.zig",
39
42
  "src/lib/common/options.zig",
40
43
  "src/lib/common/protocol.zig",
44
+ "src/lib/common/rational.zig",
41
45
  "src/lib/common/rng.zig",
46
+ "src/lib/common/util.zig",
47
+ "src/lib/gen1/calc.zig",
48
+ "src/lib/gen1/chance.zig",
42
49
  "src/lib/gen1/data.zig",
43
50
  "src/lib/gen1/data/moves.zig",
44
51
  "src/lib/gen1/data/species.zig",
@@ -66,30 +73,30 @@
66
73
  "access": "public"
67
74
  },
68
75
  "dependencies": {
69
- "@pkmn/data": "^0.7.44",
76
+ "@pkmn/data": "^0.7.46",
70
77
  "@pkmn/protocol": "^0.6.12"
71
78
  },
72
79
  "devDependencies": {
73
- "@pkmn/eslint-config": "^3.2.0",
74
- "@pkmn/img": "^0.2.12",
80
+ "@pkmn/eslint-config": "^5.0.0",
81
+ "@pkmn/img": "^0.2.13",
75
82
  "@pkmn/sets": "^5.0.4",
76
- "@pkmn/sim": "0.7.44",
83
+ "@pkmn/sim": "0.7.46",
77
84
  "@types/html-minifier": "^4.0.2",
78
- "@types/jest": "^29.5.2",
85
+ "@types/jest": "^29.5.3",
79
86
  "@types/minimist": "^1.2.2",
80
87
  "@types/mustache": "^4.2.2",
81
- "@types/node": "^20.3.1",
82
- "@vitest/coverage-c8": "^0.32.2",
83
- "binaryen": "^113.0.0",
84
- "eslint": "^8.43.0",
88
+ "@types/node": "^20.4.2",
89
+ "@vitest/coverage-c8": "^0.33.0",
90
+ "binaryen": "^114.0.0",
91
+ "eslint": "^8.44.0",
85
92
  "html-minifier": "^4.0.0",
86
93
  "json-stringify-pretty-compact": "3.0.0",
87
94
  "minimist": "^1.2.8",
88
95
  "mustache": "^4.2.0",
89
96
  "source-map-support": "^0.5.21",
90
97
  "trakr": "^0.2.0",
91
- "typescript": "^5.1.3",
92
- "vitest": "^0.32.2"
98
+ "typescript": "^5.1.6",
99
+ "vitest": "^0.33.0"
93
100
  },
94
101
  "scripts": {
95
102
  "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
@@ -140,7 +147,8 @@
140
147
  "rules": {
141
148
  "no-control-regex": "off",
142
149
  "@typescript-eslint/no-empty-interface": "off",
143
- "@typescript-eslint/no-shadow": "off"
150
+ "@typescript-eslint/no-shadow": "off",
151
+ "@typescript-eslint/no-unsafe-declaration-merging": "off"
144
152
  }
145
153
  },
146
154
  {
@@ -156,7 +164,8 @@
156
164
  "src/test/benchmark*.ts"
157
165
  ],
158
166
  "rules": {
159
- "@typescript-eslint/no-unused-vars": "off"
167
+ "@typescript-eslint/no-unused-vars": "off",
168
+ "@typescript-eslint/no-redundant-type-constituents": "off"
160
169
  }
161
170
  },
162
171
  {
@@ -336,14 +336,18 @@ const downloadImportLib = async () => {
336
336
  node = true;
337
337
  if (!options) {
338
338
  const addon = require(copy);
339
- if (addon.options.showdown) opts.push('-Dshowdown');
340
- if (addon.options.log) opts.push('-Dlog');
339
+ if (addon.engine.options.showdown) opts.push('-Dshowdown');
340
+ if (addon.engine.options.log) opts.push('-Dlog');
341
+ if (addon.engine.options.chance) opts.push('-Dchance');
342
+ if (addon.engine.options.calc) opts.push('-Dcalc');
341
343
  }
342
344
  } else if (!options) {
343
345
  const addon = await WebAssembly.instantiate(fs.readFileSync(copy));
344
346
  const values = new Uint8Array(addon.instance.exports.memory.buffer);
345
347
  if (values[addon.instance.exports.SHOWDOWN.value]) opts.push('-Dshowdown');
346
348
  if (values[addon.instance.exports.LOG.value]) opts.push('-Dlog');
349
+ if (values[addon.instance.exports.CHANCE.value]) opts.push('-Dchance');
350
+ if (values[addon.instance.exports.CALC.value]) opts.push('-Dcalc');
347
351
  }
348
352
  const key = `${type} ${opts.sort().join(' ')}`;
349
353
  if (!configs.has(key)) configs.set(key, {type, options: opts});
@@ -354,8 +358,9 @@ const downloadImportLib = async () => {
354
358
  // either the default options or whatever was passed in
355
359
  if (!configs.size) {
356
360
  node = true;
357
- configs.set('node', {type: 'node', options: options || ['-Dshowdown']});
358
- configs.set('wasm', {type: 'wasm', options: options || ['-Dshowdown']});
361
+ const DEFAULT = ['-Dshowdown', '-Dlog', '-Dchance', '-Dcalc'];
362
+ configs.set('node', {type: 'node', options: options || DEFAULT});
363
+ configs.set('wasm', {type: 'wasm', options: options || DEFAULT});
359
364
  }
360
365
 
361
366
  const headers = node ? await downloadHeaders() : undefined;
@@ -1,6 +1,8 @@
1
1
  const std = @import("std");
2
2
  const pkmn = @import("../pkmn.zig");
3
3
 
4
+ const js = @import("../common/js.zig");
5
+
4
6
  const assert = std.debug.assert;
5
7
 
6
8
  const c = @cImport({
@@ -10,38 +12,49 @@ const c = @cImport({
10
12
 
11
13
  export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi_value {
12
14
  const properties = [_]c.napi_property_descriptor{
13
- Property.init("options", .{ .value = options(env) }),
14
- Property.init("bindings", .{ .value = bindings(env) }),
15
+ js.Property.init("engine", .{ .value = register(env) }),
15
16
  };
16
17
  assert(c.napi_define_properties(env, exports, properties.len, &properties) == c.napi_ok);
17
18
  return exports;
18
19
  }
19
20
 
21
+ pub fn register(env: c.napi_env) c.napi_value {
22
+ var object = js.Object.init(env);
23
+ const properties = [_]c.napi_property_descriptor{
24
+ js.Property.init("options", .{ .value = options(env) }),
25
+ js.Property.init("bindings", .{ .value = bindings(env) }),
26
+ };
27
+ assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
28
+ return object;
29
+ }
30
+
20
31
  fn options(env: c.napi_env) c.napi_value {
21
- var object = Object.init(env);
32
+ var object = js.Object.init(env);
22
33
  const properties = [_]c.napi_property_descriptor{
23
- Property.init("showdown", .{ .value = Boolean.init(env, pkmn.options.showdown) }),
24
- Property.init("log", .{ .value = Boolean.init(env, pkmn.options.log) }),
34
+ js.Property.init("showdown", .{ .value = js.Boolean.init(env, pkmn.options.showdown) }),
35
+ js.Property.init("log", .{ .value = js.Boolean.init(env, pkmn.options.log) }),
36
+ js.Property.init("chance", .{ .value = js.Boolean.init(env, pkmn.options.chance) }),
37
+ js.Property.init("calc", .{ .value = js.Boolean.init(env, pkmn.options.calc) }),
25
38
  };
26
39
  assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
27
40
  return object;
28
41
  }
29
42
 
30
43
  fn bindings(env: c.napi_env) c.napi_value {
31
- var array = Array.init(env, .{ .length = 1 });
32
- Array.set(env, array, 0, bind(env, pkmn.gen1));
44
+ var array = js.Array.init(env, .{ .length = 1 });
45
+ js.Array.set(env, array, 0, bind(env, pkmn.gen1));
33
46
  return array;
34
47
  }
35
48
 
36
49
  fn bind(env: c.napi_env, gen: anytype) c.napi_value {
37
50
  const choices_size: u32 = @intCast(gen.CHOICES_SIZE);
38
51
  const logs_size: u32 = @intCast(gen.LOGS_SIZE);
39
- var object = Object.init(env);
52
+ var object = js.Object.init(env);
40
53
  const properties = [_]c.napi_property_descriptor{
41
- Property.init("CHOICES_SIZE", .{ .value = Number.init(env, choices_size) }),
42
- Property.init("LOGS_SIZE", .{ .value = Number.init(env, logs_size) }),
43
- Property.init("update", .{ .method = update(gen) }),
44
- Property.init("choices", .{ .method = choices(gen) }),
54
+ js.Property.init("CHOICES_SIZE", .{ .value = js.Number.init(env, choices_size) }),
55
+ js.Property.init("LOGS_SIZE", .{ .value = js.Number.init(env, logs_size) }),
56
+ js.Property.init("update", .{ .method = update(gen) }),
57
+ js.Property.init("choices", .{ .method = choices(gen) }),
45
58
  };
46
59
  assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
47
60
  return object;
@@ -62,13 +75,13 @@ fn update(gen: anytype) c.napi_callback {
62
75
  assert(data != null);
63
76
 
64
77
  var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
65
- const c1: pkmn.Choice = @bitCast(Number.get(env, argv[1], u8));
66
- const c2: pkmn.Choice = @bitCast(Number.get(env, argv[2], u8));
78
+ const c1: pkmn.Choice = @bitCast(js.Number.get(env, argv[1], u8));
79
+ const c2: pkmn.Choice = @bitCast(js.Number.get(env, argv[2], u8));
67
80
 
68
81
  var vtype: c.napi_valuetype = undefined;
69
82
  assert(c.napi_typeof(env, argv[3], &vtype) == c.napi_ok);
70
83
  const result = switch (vtype) {
71
- c.napi_undefined, c.napi_null => battle.update(c1, c2, pkmn.protocol.NULL),
84
+ c.napi_undefined, c.napi_null => battle.update(c1, c2, &gen.NULL),
72
85
  else => result: {
73
86
  assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
74
87
  assert(len == gen.LOGS_SIZE);
@@ -76,12 +89,17 @@ fn update(gen: anytype) c.napi_callback {
76
89
 
77
90
  var buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
78
91
  var stream = pkmn.protocol.ByteStream{ .buffer = buf };
79
- var log = pkmn.protocol.FixedLog{ .writer = stream.writer() };
80
- break :result battle.update(c1, c2, log);
92
+ // TODO: extract out
93
+ var opts = pkmn.battle.options(
94
+ pkmn.protocol.FixedLog{ .writer = stream.writer() },
95
+ gen.chance.NULL,
96
+ gen.calc.NULL,
97
+ );
98
+ break :result battle.update(c1, c2, &opts);
81
99
  },
82
100
  } catch unreachable;
83
101
 
84
- return Number.init(env, @as(u8, @bitCast(result)));
102
+ return js.Number.init(env, @as(u8, @bitCast(result)));
85
103
  }
86
104
  }.call;
87
105
  }
@@ -101,8 +119,8 @@ fn choices(gen: anytype) c.napi_callback {
101
119
  assert(data != null);
102
120
 
103
121
  var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
104
- const player: pkmn.Player = @enumFromInt(Number.get(env, argv[1], u8));
105
- const request: pkmn.Choice.Type = @enumFromInt(Number.get(env, argv[2], u8));
122
+ const player: pkmn.Player = @enumFromInt(js.Number.get(env, argv[1], u8));
123
+ const request: pkmn.Choice.Type = @enumFromInt(js.Number.get(env, argv[2], u8));
106
124
 
107
125
  assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
108
126
  assert(len == gen.CHOICES_SIZE);
@@ -110,117 +128,7 @@ fn choices(gen: anytype) c.napi_callback {
110
128
 
111
129
  var out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
112
130
  const n = battle.choices(player, request, out);
113
- return Number.init(env, @as(u8, @bitCast(n)));
131
+ return js.Number.init(env, @as(u8, @bitCast(n)));
114
132
  }
115
133
  }.call;
116
134
  }
117
-
118
- const Array = struct {
119
- fn init(env: c.napi_env, o: struct { length: ?usize }) c.napi_value {
120
- var result: c.napi_value = undefined;
121
- assert(c.napi_ok == if (o.length) |n|
122
- c.napi_create_array_with_length(env, n, &result)
123
- else
124
- c.napi_create_array(env, &result));
125
- return result;
126
- }
127
-
128
- fn set(env: c.napi_env, array: c.napi_value, index: u32, value: c.napi_value) void {
129
- assert(c.napi_set_element(env, array, index, value) == c.napi_ok);
130
- }
131
- };
132
-
133
- const Boolean = struct {
134
- fn init(env: c.napi_env, value: bool) c.napi_value {
135
- var result: c.napi_value = undefined;
136
- assert(c.napi_get_boolean(env, value, &result) == c.napi_ok);
137
- return result;
138
- }
139
- };
140
-
141
- const Number = struct {
142
- fn init(env: c.napi_env, value: anytype) c.napi_value {
143
- const T = @TypeOf(value);
144
- var result: c.napi_value = undefined;
145
- assert(c.napi_ok == switch (@typeInfo(T)) {
146
- .Int => |info| switch (info.bits) {
147
- 0...32 => switch (info.signedness) {
148
- .signed => c.napi_create_int32(env, @as(i32, value), &result),
149
- .unsigned => c.napi_create_uint32(env, @as(u32, value), &result),
150
- },
151
- 33...52 => c.napi_create_int64(env, @as(i64, value), &result),
152
- else => @compileError("int can't be represented as JS number"),
153
- },
154
- else => @compileError("expected number, got: " ++ @typeName(T)),
155
- });
156
- return result;
157
- }
158
-
159
- fn get(env: c.napi_env, value: c.napi_value, comptime T: type) T {
160
- switch (@typeInfo(T)) {
161
- .Int => |info| switch (info.bits) {
162
- 0...32 => switch (info.signedness) {
163
- .signed => {
164
- var result: i32 = undefined;
165
- assert(c.napi_get_value_int32(env, value, &result) == c.napi_ok);
166
- return if (info.bits == 32) result else @intCast(result);
167
- },
168
- .unsigned => {
169
- var result: u32 = undefined;
170
- assert(c.napi_get_value_uint32(env, value, &result) == c.napi_ok);
171
- return if (info.bits == 32) result else @intCast(result);
172
- },
173
- },
174
- 33...63 => {
175
- var result: i64 = undefined;
176
- assert(c.napi_get_value_int64(env, value, &result) == c.napi_ok);
177
- return @intCast(result);
178
- },
179
- else => {
180
- var result: i64 = undefined;
181
- assert(c.napi_get_value_int64(env, value, &result) == c.napi_ok);
182
- return switch (info.signedness) {
183
- .signed => value,
184
- .unsigned => if (0 <= value) @intCast(value) else unreachable,
185
- };
186
- },
187
- },
188
- else => @compileError("expected number, got: " ++ @typeName(T)),
189
- }
190
- }
191
- };
192
-
193
- const Object = struct {
194
- fn init(env: c.napi_env) c.napi_value {
195
- var result: c.napi_value = undefined;
196
- assert(c.napi_create_object(env, &result) == c.napi_ok);
197
- return result;
198
- }
199
- };
200
-
201
- const Property = union(enum) {
202
- method: c.napi_callback,
203
- value: c.napi_value,
204
-
205
- fn init(comptime name: [:0]const u8, property: Property) c.napi_property_descriptor {
206
- return .{
207
- .utf8name = name,
208
- .name = null,
209
- .method = switch (property) {
210
- .method => |m| m,
211
- .value => null,
212
- },
213
- .getter = null,
214
- .setter = null,
215
- .value = switch (property) {
216
- .method => null,
217
- .value => |v| v,
218
- },
219
- .attributes = switch (property) {
220
- .method => c.napi_default,
221
- .value => c.napi_enumerable,
222
- },
223
- .data = null,
224
- };
225
- }
226
- };
@@ -3,6 +3,8 @@ const pkmn = @import("../pkmn.zig");
3
3
 
4
4
  export const SHOWDOWN = pkmn.options.showdown;
5
5
  export const LOG = pkmn.options.log;
6
+ export const CHANCE = pkmn.options.chance;
7
+ export const CALC = pkmn.options.calc;
6
8
 
7
9
  export const GEN1_CHOICES_SIZE =
8
10
  std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.CHOICES_SIZE))) catch unreachable;
@@ -0,0 +1,17 @@
1
+ /// Stores state required by optional features to the engine that can be passed to a generation's
2
+ /// `Battle.update` function. All generations generically support protocol logging (enabled via
3
+ /// `-Dlog`), chance actions and probability tracking (enabled via `-Dchance`), and damage
4
+ /// computation and chance overrides (`-Dcalc`), though the concrete types for these features are
5
+ /// generation dependent.
6
+ pub fn Options(comptime Log: type, comptime Chance: type, comptime Calc: type) type {
7
+ return struct { log: Log, chance: Chance, calc: Calc };
8
+ }
9
+
10
+ /// Helper to create a battle `Options` object with the provided `log`, `chance`, and `calc`.
11
+ pub fn options(
12
+ log: anytype,
13
+ chance: anytype,
14
+ calc: anytype,
15
+ ) Options(@TypeOf(log), @TypeOf(chance), @TypeOf(calc)) {
16
+ return .{ .log = log, .chance = chance, .calc = calc };
17
+ }
@@ -10,18 +10,27 @@ pub fn print(value: anytype) void {
10
10
 
11
11
  nosuspend {
12
12
  stderr.writeAll("\x1b[41m") catch return;
13
- switch (@typeInfo(@TypeOf(value))) {
14
- .Struct => |info| {
15
- if (info.is_tuple) {
16
- inline for (info.fields, 0..) |f, i| {
17
- inspect(@field(value, f.name));
18
- if (i < info.fields.len - 1) stderr.writeAll(" ") catch return;
13
+ if (@TypeOf(@src()) == @TypeOf(value)) {
14
+ stderr.print("{s} ({s}:{d}:{d})", .{
15
+ value.fn_name,
16
+ value.file,
17
+ value.line,
18
+ value.column,
19
+ }) catch return;
20
+ } else {
21
+ switch (@typeInfo(@TypeOf(value))) {
22
+ .Struct => |info| {
23
+ if (info.is_tuple) {
24
+ inline for (info.fields, 0..) |f, i| {
25
+ inspect(@field(value, f.name));
26
+ if (i < info.fields.len - 1) stderr.writeAll(" ") catch return;
27
+ }
28
+ } else {
29
+ inspect(value);
19
30
  }
20
- } else {
21
- inspect(value);
22
- }
23
- },
24
- else => inspect(value),
31
+ },
32
+ else => inspect(value),
33
+ }
25
34
  }
26
35
  stderr.writeAll("\x1b[K\x1b[0m\n") catch return;
27
36
  }
@@ -0,0 +1,118 @@
1
+ const std = @import("std");
2
+
3
+ const assert = std.debug.assert;
4
+
5
+ const c = @cImport({
6
+ @cDefine("NAPI_VERSION", "8");
7
+ @cInclude("node_api.h");
8
+ });
9
+
10
+ pub const Array = struct {
11
+ pub fn init(env: c.napi_env, o: struct { length: ?usize }) c.napi_value {
12
+ var result: c.napi_value = undefined;
13
+ assert(c.napi_ok == if (o.length) |n|
14
+ c.napi_create_array_with_length(env, n, &result)
15
+ else
16
+ c.napi_create_array(env, &result));
17
+ return result;
18
+ }
19
+
20
+ pub fn set(env: c.napi_env, array: c.napi_value, index: u32, value: c.napi_value) void {
21
+ assert(c.napi_set_element(env, array, index, value) == c.napi_ok);
22
+ }
23
+ };
24
+
25
+ pub const Boolean = struct {
26
+ pub fn init(env: c.napi_env, value: bool) c.napi_value {
27
+ var result: c.napi_value = undefined;
28
+ assert(c.napi_get_boolean(env, value, &result) == c.napi_ok);
29
+ return result;
30
+ }
31
+ };
32
+
33
+ pub const Number = struct {
34
+ pub fn init(env: c.napi_env, value: anytype) c.napi_value {
35
+ const T = @TypeOf(value);
36
+ var result: c.napi_value = undefined;
37
+ assert(c.napi_ok == switch (@typeInfo(T)) {
38
+ .Int => |info| switch (info.bits) {
39
+ 0...32 => switch (info.signedness) {
40
+ .signed => c.napi_create_int32(env, @as(i32, value), &result),
41
+ .unsigned => c.napi_create_uint32(env, @as(u32, value), &result),
42
+ },
43
+ 33...52 => c.napi_create_int64(env, @as(i64, value), &result),
44
+ else => @compileError("int can't be represented as JS number"),
45
+ },
46
+ else => @compileError("expected number, got: " ++ @typeName(T)),
47
+ });
48
+ return result;
49
+ }
50
+
51
+ pub fn get(env: c.napi_env, value: c.napi_value, comptime T: type) T {
52
+ switch (@typeInfo(T)) {
53
+ .Int => |info| switch (info.bits) {
54
+ 0...32 => switch (info.signedness) {
55
+ .signed => {
56
+ var result: i32 = undefined;
57
+ assert(c.napi_get_value_int32(env, value, &result) == c.napi_ok);
58
+ return if (info.bits == 32) result else @intCast(result);
59
+ },
60
+ .unsigned => {
61
+ var result: u32 = undefined;
62
+ assert(c.napi_get_value_uint32(env, value, &result) == c.napi_ok);
63
+ return if (info.bits == 32) result else @intCast(result);
64
+ },
65
+ },
66
+ 33...63 => {
67
+ var result: i64 = undefined;
68
+ assert(c.napi_get_value_int64(env, value, &result) == c.napi_ok);
69
+ return @intCast(result);
70
+ },
71
+ else => {
72
+ var result: i64 = undefined;
73
+ assert(c.napi_get_value_int64(env, value, &result) == c.napi_ok);
74
+ return switch (info.signedness) {
75
+ .signed => value,
76
+ .unsigned => if (0 <= value) @intCast(value) else unreachable,
77
+ };
78
+ },
79
+ },
80
+ else => @compileError("expected number, got: " ++ @typeName(T)),
81
+ }
82
+ }
83
+ };
84
+
85
+ pub const Object = struct {
86
+ pub fn init(env: c.napi_env) c.napi_value {
87
+ var result: c.napi_value = undefined;
88
+ assert(c.napi_create_object(env, &result) == c.napi_ok);
89
+ return result;
90
+ }
91
+ };
92
+
93
+ pub const Property = union(enum) {
94
+ method: c.napi_callback,
95
+ value: c.napi_value,
96
+
97
+ pub fn init(comptime name: [:0]const u8, property: Property) c.napi_property_descriptor {
98
+ return .{
99
+ .utf8name = name,
100
+ .name = null,
101
+ .method = switch (property) {
102
+ .method => |m| m,
103
+ .value => null,
104
+ },
105
+ .getter = null,
106
+ .setter = null,
107
+ .value = switch (property) {
108
+ .method => null,
109
+ .value => |v| v,
110
+ },
111
+ .attributes = switch (property) {
112
+ .method => c.napi_default,
113
+ .value => c.napi_enumerable,
114
+ },
115
+ .data = null,
116
+ };
117
+ }
118
+ };
@@ -0,0 +1,60 @@
1
+ const std = @import("std");
2
+
3
+ const expect = std.testing.expect;
4
+ const assert = std.debug.assert;
5
+
6
+ // TODO: ziglang/zig#104
7
+ pub fn Optional(comptime T: type) type {
8
+ const fields = std.meta.fields(switch (@typeInfo(T)) {
9
+ .Bool => enum { false, true },
10
+ else => T,
11
+ });
12
+
13
+ var enumFields: [fields.len + 1]std.builtin.Type.EnumField = undefined;
14
+ var decls = [_]std.builtin.Type.Declaration{};
15
+
16
+ enumFields[0] = .{ .name = "None", .value = 0 };
17
+ inline for (fields, 1..) |field, i| {
18
+ assert(!std.mem.eql(u8, field.name, "None"));
19
+ enumFields[i] = .{
20
+ .name = field.name,
21
+ .value = i,
22
+ };
23
+ }
24
+
25
+ return @Type(.{
26
+ .Enum = .{
27
+ .tag_type = std.math.IntFittingRange(0, fields.len + 1),
28
+ .fields = &enumFields,
29
+ .decls = &decls,
30
+ .is_exhaustive = true,
31
+ },
32
+ });
33
+ }
34
+
35
+ test Optional {
36
+ try expect(@bitSizeOf(Optional(bool)) == 2);
37
+
38
+ const a: Optional(bool) = .true;
39
+ try expect(a != .None);
40
+ try expect(a == .true);
41
+ try expect(a != .false);
42
+
43
+ const b: Optional(bool) = .None;
44
+ try expect(b == .None);
45
+ try expect(b != .true);
46
+ try expect(b != .false);
47
+
48
+ const Player = @import("./data.zig").Player;
49
+ try expect(@bitSizeOf(Optional(Player)) == 2);
50
+
51
+ const p: Optional(Player) = .P2;
52
+ try expect(p != .None);
53
+ try expect(p != .P1);
54
+ try expect(p == .P2);
55
+
56
+ const q: Optional(Player) = .None;
57
+ try expect(q == .None);
58
+ try expect(q != .P1);
59
+ try expect(q != .P2);
60
+ }
@@ -1,11 +1,15 @@
1
1
  const build_options = @import("build_options");
2
2
  const root = @import("root");
3
3
 
4
+ /// Configures the behavior of the pkmn package.
4
5
  pub const Options = struct {
5
6
  showdown: ?bool = null,
6
7
  log: ?bool = null,
8
+ chance: ?bool = null,
9
+ calc: ?bool = null,
7
10
  advance: ?bool = null,
8
11
  ebc: ?bool = null,
12
+ key: ?bool = null,
9
13
  internal: ?bool = null,
10
14
  };
11
15
 
@@ -13,9 +17,14 @@ pub const Options = struct {
13
17
  pub const showdown = get("showdown", false);
14
18
  /// Whether or not protocol message logging is enabled.
15
19
  pub const log = get("log", false);
20
+ /// Whether or not update probability tracking is enabled.
21
+ pub const chance = get("chance", false);
22
+ /// Whether or not damage calculator support is enabled.
23
+ pub const calc = get("calc", false);
16
24
 
17
25
  pub const advance = get("advance", true);
18
26
  pub const ebc = get("ebc", true);
27
+ pub const key = get("key", false);
19
28
  pub const internal = get("internal", false);
20
29
 
21
30
  fn get(comptime name: []const u8, default: bool) bool {