@pkmn/engine 0.1.0-dev.6195e056 → 0.1.0-dev.6c5fdce2

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.
Files changed (61) hide show
  1. package/README.md +104 -65
  2. package/build/pkg/addon.d.ts +7 -0
  3. package/build/pkg/addon.js +112 -0
  4. package/build/pkg/addon.js.map +1 -0
  5. package/build/pkg/data/ids.json +12 -12
  6. package/build/pkg/data/layout.json +27 -5
  7. package/build/pkg/data/protocol.json +69 -12
  8. package/build/pkg/data.d.ts +4 -4
  9. package/build/pkg/data.js +3 -5
  10. package/build/pkg/data.js.map +1 -1
  11. package/build/pkg/gen1.d.ts +5 -4
  12. package/build/pkg/gen1.js +49 -33
  13. package/build/pkg/gen1.js.map +1 -1
  14. package/build/pkg/index.d.ts +18 -14
  15. package/build/pkg/index.js +1 -1
  16. package/build/pkg/index.js.map +1 -1
  17. package/build/pkg/protocol.d.ts +4 -2
  18. package/build/pkg/protocol.js +61 -40
  19. package/build/pkg/protocol.js.map +1 -1
  20. package/build/test/display.js +400 -0
  21. package/build/test/display.js.map +1 -0
  22. package/build/tools/debug.js +135 -0
  23. package/build/tools/debug.js.map +1 -0
  24. package/build.zig +136 -105
  25. package/package.json +76 -42
  26. package/src/bin/install-pkmn-engine +68 -36
  27. package/src/bin/pkmn-debug +62 -0
  28. package/src/lib/binding/node.zig +47 -142
  29. package/src/lib/binding/wasm.zig +6 -4
  30. package/src/lib/common/battle.zig +17 -0
  31. package/src/lib/common/data.zig +19 -31
  32. package/src/lib/common/debug.zig +74 -0
  33. package/src/lib/common/js.zig +118 -0
  34. package/src/lib/common/optional.zig +67 -0
  35. package/src/lib/common/options.zig +12 -3
  36. package/src/lib/common/protocol.zig +931 -387
  37. package/src/lib/common/rational.zig +357 -0
  38. package/src/lib/common/rng.zig +24 -15
  39. package/src/lib/common/util.zig +12 -0
  40. package/src/lib/gen1/README.md +309 -192
  41. package/src/lib/gen1/calc.zig +426 -0
  42. package/src/lib/gen1/chance.zig +1060 -0
  43. package/src/lib/gen1/data/moves.zig +202 -190
  44. package/src/lib/gen1/data/species.zig +4 -4
  45. package/src/lib/gen1/data/types.zig +10 -10
  46. package/src/lib/gen1/data.zig +91 -77
  47. package/src/lib/gen1/helpers.zig +577 -36
  48. package/src/lib/gen1/mechanics.zig +1223 -826
  49. package/src/lib/gen2/README.md +105 -85
  50. package/src/lib/gen2/calc.zig +143 -0
  51. package/src/lib/gen2/chance.zig +1314 -0
  52. package/src/lib/gen2/data/items.zig +14 -20
  53. package/src/lib/gen2/data/moves.zig +664 -570
  54. package/src/lib/gen2/data/species.zig +2 -2
  55. package/src/lib/gen2/data/types.zig +137 -34
  56. package/src/lib/gen2/data.zig +128 -90
  57. package/src/lib/gen2/generated.zig +808 -0
  58. package/src/lib/gen2/helpers.zig +16 -22
  59. package/src/lib/gen2/mechanics.zig +3511 -12
  60. package/src/lib/pkmn.zig +68 -9
  61. package/src/test/display/pkmn.html.tmpl +368 -0
package/build.zig CHANGED
@@ -1,15 +1,20 @@
1
1
  const std = @import("std");
2
2
  const builtin = @import("builtin");
3
3
 
4
- const NativeTargetInfo = std.zig.system.NativeTargetInfo;
5
-
6
- pub const Options = struct { showdown: ?bool = null, trace: ?bool = null };
4
+ pub const Options = struct {
5
+ showdown: ?bool = null,
6
+ log: ?bool = null,
7
+ chance: ?bool = null,
8
+ calc: ?bool = null,
9
+ };
7
10
 
8
11
  pub fn module(b: *std.Build, options: Options) *std.Build.Module {
9
12
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
10
13
  const build_options = b.addOptions();
11
14
  build_options.addOption(?bool, "showdown", options.showdown);
12
- build_options.addOption(?bool, "trace", options.trace);
15
+ build_options.addOption(?bool, "log", options.log);
16
+ build_options.addOption(?bool, "chance", options.chance);
17
+ build_options.addOption(?bool, "calc", options.calc);
13
18
  return b.createModule(.{
14
19
  .source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
15
20
  .dependencies = &.{.{ .name = "build_options", .module = build_options.createModule() }},
@@ -29,25 +34,30 @@ pub fn build(b: *std.Build) !void {
29
34
  const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
30
35
  const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse false;
31
36
  const pic = b.option(bool, "pic", "Force position independent code") orelse false;
37
+ const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
38
+ const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
32
39
 
33
- const cmd = b.findProgram(&[_][]const u8{"strip"}, &[_][]const u8{}) catch null;
40
+ const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
34
41
 
35
- var parser = std.json.Parser.init(b.allocator, false);
36
- defer parser.deinit();
37
- var tree = try parser.parse(@embedFile("package.json"));
38
- defer tree.deinit();
39
- const version = tree.root.Object.get("version").?.String;
40
- const description = tree.root.Object.get("description").?.String;
41
- var repository = std.mem.split(u8, tree.root.Object.get("repository").?.String, ":");
42
+ const json = @embedFile("package.json");
43
+ var parsed = try std.json.parseFromSlice(std.json.Value, b.allocator, json, .{});
44
+ defer parsed.deinit();
45
+ const version = parsed.value.object.get("version").?.string;
46
+ const description = parsed.value.object.get("description").?.string;
47
+ var repository = std.mem.split(u8, parsed.value.object.get("repository").?.string, ":");
42
48
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
43
49
 
44
50
  const showdown =
45
51
  b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
46
- const trace = b.option(bool, "trace", "Enable trace logs") orelse false;
52
+ const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
53
+ const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
54
+ const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
47
55
 
48
56
  const options = b.addOptions();
49
57
  options.addOption(?bool, "showdown", showdown);
50
- options.addOption(?bool, "trace", trace);
58
+ options.addOption(?bool, "log", log);
59
+ options.addOption(?bool, "chance", chance);
60
+ options.addOption(?bool, "calc", calc);
51
61
 
52
62
  const name = if (showdown) "pkmn-showdown" else "pkmn";
53
63
 
@@ -56,17 +66,17 @@ pub fn build(b: *std.Build) !void {
56
66
  const addon = b.fmt("{s}.node", .{name});
57
67
  const lib = b.addSharedLibrary(.{
58
68
  .name = addon,
69
+ .main_pkg_path = .{ .path = "." },
59
70
  .root_source_file = .{ .path = "src/lib/binding/node.zig" },
60
71
  .optimize = optimize,
61
72
  .target = target,
62
73
  });
63
74
  lib.addOptions("build_options", options);
64
- lib.setMainPkgPath("./");
65
- lib.addSystemIncludePath(headers);
75
+ lib.addSystemIncludePath(.{ .path = headers });
66
76
  lib.linkLibC();
67
77
  if (node_import_lib) |il| {
68
- lib.addObjectFile(il);
69
- } else if ((try NativeTargetInfo.detect(target)).target.os.tag == .windows) {
78
+ lib.addObjectFile(.{ .path = il });
79
+ } else if ((try std.zig.system.NativeTargetInfo.detect(target)).target.os.tag == .windows) {
70
80
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
71
81
  std.process.exit(1);
72
82
  }
@@ -74,17 +84,18 @@ pub fn build(b: *std.Build) !void {
74
84
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
75
85
  if (pic) lib.force_pic = pic;
76
86
  // Always emit to build/lib because this is where the driver code expects to find it
77
- // TODO(ziglang/zig#2231): using the following used to work (though be hacky):
87
+ // TODO(ziglang/zig#2231): using the following used to work (though was hacky):
78
88
  //
79
89
  // lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
80
90
  // b.getInstallStep().dependOn(&lib.step);
81
91
  //
82
92
  // But ziglang/zig#14647 broke this so we now need to do an install() and then manually
83
93
  // rename the file ourself in install-pkmn-engine
84
- lib.install();
94
+ b.installArtifact(lib);
85
95
  } else if (wasm) {
86
- const lib = b.addSharedLibrary(.{
96
+ const exe = b.addExecutable(.{
87
97
  .name = name,
98
+ .main_pkg_path = .{ .path = "." },
88
99
  .root_source_file = .{ .path = "src/lib/binding/wasm.zig" },
89
100
  .optimize = switch (optimize) {
90
101
  .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
@@ -92,54 +103,75 @@ pub fn build(b: *std.Build) !void {
92
103
  },
93
104
  .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
94
105
  });
95
- lib.addOptions("build_options", options);
96
- lib.setMainPkgPath("./");
97
- lib.stack_size = wasm_stack_size;
98
- lib.rdynamic = true;
99
- lib.strip = strip;
100
- if (pic) lib.force_pic = pic;
101
- const opt = b.findProgram(
102
- &[_][]const u8{"wasm-opt"},
103
- &[_][]const u8{"./node_modules/.bin"},
104
- ) catch null;
106
+ exe.addOptions("build_options", options);
107
+ exe.export_symbol_names = &[_][]const u8{
108
+ "SHOWDOWN",
109
+ "LOG",
110
+ "CHANCE",
111
+ "CALC",
112
+ "GEN1_CHOICES_SIZE",
113
+ "GEN1_LOGS_SIZE",
114
+ };
115
+ exe.entry = .disabled;
116
+ exe.stack_size = wasm_stack_size;
117
+ exe.strip = strip;
118
+ if (pic) exe.force_pic = pic;
119
+ const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
105
120
  if (optimize != .Debug and opt != null) {
106
121
  const out = b.fmt("build/lib/{s}.wasm", .{name});
107
- const sh = b.addSystemCommand(&[_][]const u8{ opt.?, "-O4" });
108
- sh.addArtifactArg(lib);
122
+ const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
123
+ sh.addArtifactArg(exe);
109
124
  sh.addArg("-o");
110
125
  sh.addFileSourceArg(.{ .path = out });
111
126
  b.getInstallStep().dependOn(&sh.step);
127
+ } else {
128
+ b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
129
+ .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
130
+ }).step);
112
131
  }
113
- lib.install();
114
132
  } else if (dynamic) {
115
133
  const lib = b.addSharedLibrary(.{
116
134
  .name = name,
135
+ .main_pkg_path = .{ .path = "." },
117
136
  .root_source_file = .{ .path = "src/lib/binding/c.zig" },
118
- .version = try std.builtin.Version.parse(version),
137
+ .version = try std.SemanticVersion.parse(version),
119
138
  .optimize = optimize,
120
139
  .target = target,
121
140
  });
122
141
  lib.addOptions("build_options", options);
123
- lib.setMainPkgPath("./");
124
- lib.addIncludePath("src/include");
142
+ lib.addIncludePath(.{ .path = "src/include" });
125
143
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
126
144
  if (pic) lib.force_pic = pic;
127
- lib.install();
145
+ b.installArtifact(lib);
128
146
  c = true;
129
147
  } else {
130
148
  const lib = b.addStaticLibrary(.{
131
149
  .name = name,
150
+ .main_pkg_path = .{ .path = "." },
132
151
  .root_source_file = .{ .path = "src/lib/binding/c.zig" },
133
152
  .optimize = optimize,
134
153
  .target = target,
135
154
  });
136
155
  lib.addOptions("build_options", options);
137
- lib.setMainPkgPath("./");
138
- lib.addIncludePath("src/include");
156
+ lib.addIncludePath(.{ .path = "src/include" });
139
157
  lib.bundle_compiler_rt = true;
140
158
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
141
159
  if (pic) lib.force_pic = pic;
142
- lib.install();
160
+ if (emit_asm) {
161
+ b.getInstallStep().dependOn(&b.addInstallFileWithDir(
162
+ lib.getEmittedAsm(),
163
+ .prefix,
164
+ b.fmt("{s}.s", .{name}),
165
+ ).step);
166
+ }
167
+ if (emit_ll) {
168
+ b.getInstallStep().dependOn(&b.addInstallFileWithDir(
169
+ lib.getEmittedLlvmIr(),
170
+ .prefix,
171
+ b.fmt("{s}.ll", .{name}),
172
+ ).step);
173
+ }
174
+ b.installArtifact(lib);
143
175
  c = true;
144
176
  }
145
177
 
@@ -181,14 +213,20 @@ pub fn build(b: *std.Build) !void {
181
213
  .strip = strip,
182
214
  .cmd = cmd,
183
215
  };
216
+
217
+ // TODO: tests can be run multiple times due to @imports
184
218
  const tests = TestStep.create(b, options, config);
185
219
 
186
220
  var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
187
221
  const tools: ToolConfig = .{
222
+ .options = .{
223
+ .showdown = showdown,
224
+ .log = log,
225
+ .chance = chance,
226
+ .calc = calc,
227
+ },
188
228
  .general = config,
189
229
  .tool = .{
190
- .showdown = showdown,
191
- .trace = trace,
192
230
  .tests = if (tests.build) tests else null,
193
231
  .exes = &exes,
194
232
  },
@@ -197,28 +235,32 @@ pub fn build(b: *std.Build) !void {
197
235
  var benchmark_config = tools;
198
236
  benchmark_config.general.optimize = .ReleaseFast;
199
237
  benchmark_config.general.strip = true;
200
- const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
238
+ const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
201
239
 
202
240
  var fuzz_config = tools;
203
241
  fuzz_config.general.strip = false;
204
242
  fuzz_config.tool.name = "fuzz";
205
- const fuzz = tool(b, "src/test/benchmark.zig", fuzz_config);
206
-
207
- const serde = tool(b, "src/tools/serde.zig", tools);
208
- const protocol = tool(b, "src/tools/protocol.zig", tools);
209
-
210
- const lint_exe =
211
- b.addExecutable(.{ .name = "lint", .root_source_file = .{ .path = "src/tools/lint.zig" } });
212
- if (tests.build) tests.step.dependOn(&lint_exe.step);
213
- const lint = lint_exe.run();
214
-
215
- b.step("benchmark", "Run benchmark code").dependOn(&benchmark.step);
216
- b.step("fuzz", "Run fuzz tester").dependOn(&fuzz.step);
217
- b.step("lint", "Lint source files").dependOn(&lint.step);
218
- b.step("protocol", "Run protocol dump tool").dependOn(&protocol.step);
219
- b.step("serde", "Run serialization/deserialization tool").dependOn(&serde.step);
243
+ const fuzz = try tool(b, "src/test/fuzz.zig", fuzz_config);
244
+
245
+ const analyze = try tool(b, "src/tools/analyze.zig", tools);
246
+ const dump = try tool(b, "src/tools/dump.zig", tools);
247
+ const transitions = try tool(b, "src/tools/transitions.zig", tools);
248
+
249
+ // FIXME: serde randomly fails to build in some release configurations
250
+ var hack = tools;
251
+ if (optimize != .Debug) hack.tool.tests = null;
252
+ const serde = try tool(b, "src/tools/serde.zig", hack);
253
+
254
+ if (analyze) |t| b.step("analyze", "Run LLVM analysis tool").dependOn(&t.step);
255
+ if (benchmark) |t| b.step("benchmark", "Run benchmark code").dependOn(&t.step);
256
+ if (dump) |t| b.step("dump", "Run protocol dump tool").dependOn(&t.step);
257
+ if (fuzz) |t| b.step("fuzz", "Run fuzz tester").dependOn(&t.step);
258
+ if (serde) |t| b.step("serde", "Run serialization/deserialization tool").dependOn(&t.step);
220
259
  b.step("test", "Run all tests").dependOn(&tests.step);
221
260
  b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
261
+ if (transitions) |t| {
262
+ b.step("transitions", "Visualize transitions algorithm search").dependOn(&t.step);
263
+ }
222
264
  }
223
265
 
224
266
  fn maybeStrip(
@@ -235,7 +277,7 @@ fn maybeStrip(
235
277
  if (mac and artifact.isDynamicLibrary()) return;
236
278
  // Assuming GNU strip, which complains "illegal pathname found in archive member"...
237
279
  if (!mac and artifact.isStaticLibrary()) return;
238
- const sh = b.addSystemCommand(&[_][]const u8{ cmd.?, if (mac) "-x" else "-s" });
280
+ const sh = b.addSystemCommand(&.{ cmd.?, if (mac) "-x" else "-s" });
239
281
  sh.addArtifactArg(artifact);
240
282
  step.dependOn(&sh.step);
241
283
  }
@@ -248,12 +290,6 @@ const Config = struct {
248
290
  cmd: ?[]const u8,
249
291
  };
250
292
 
251
- const TESTS = [_][]const u8{
252
- "src/lib/common/test.zig",
253
- "src/lib/gen1/test.zig",
254
- "src/lib/gen2/test.zig",
255
- };
256
-
257
293
  const TestStep = struct {
258
294
  step: std.Build.Step,
259
295
  build: bool,
@@ -261,60 +297,57 @@ const TestStep = struct {
261
297
  pub fn create(b: *std.Build, options: *std.Build.OptionsStep, config: Config) *TestStep {
262
298
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
263
299
  const test_file = b.option([]const u8, "test-file", "Input file for test");
264
- const test_bin = b.option([]const u8, "test-bin", "Emit test binary to");
265
300
  const test_filter =
266
301
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
267
- const test_no_exec =
268
- b.option(bool, "test-no-exec", "Compiles test binary without running it") orelse false;
269
302
 
270
303
  const self = b.allocator.create(TestStep) catch @panic("OOM");
271
304
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
272
- self.* = TestStep{ .step = step, .build = test_filter == null };
273
-
274
- const paths: []const []const u8 =
275
- if (test_file) |t| &.{t} else if (coverage != null) &.{"src/lib/test.zig"} else &TESTS;
276
- for (paths) |path| {
277
- const tests = b.addTest(.{
278
- .name = std.fs.path.basename(std.fs.path.dirname(path).?),
279
- .root_source_file = .{ .path = path },
280
- .optimize = config.optimize,
281
- .target = config.target,
282
- });
283
- tests.setMainPkgPath("./");
284
- tests.setFilter(test_filter);
285
- tests.addOptions("build_options", options);
286
- tests.single_threaded = true;
287
- maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
288
- if (config.pic) tests.force_pic = config.pic;
289
- if (test_bin) |bin| {
290
- tests.name = std.fs.path.basename(bin);
291
- if (std.fs.path.dirname(bin)) |dir| tests.setOutputDir(dir);
292
- }
293
- if (coverage) |c| {
294
- tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
295
- }
296
- self.step.dependOn(if (test_no_exec) &tests.step else &tests.run().step);
305
+ self.* = .{ .step = step, .build = test_filter == null };
306
+
307
+ const path = test_file orelse "src/lib/test.zig";
308
+ const tests = b.addTest(.{
309
+ .name = b.fmt("{s}-{s}", .{
310
+ std.fs.path.basename(std.fs.path.dirname(path).?),
311
+ std.fs.path.stem(std.fs.path.basename(path)),
312
+ }),
313
+ .main_pkg_path = .{ .path = "." },
314
+ .root_source_file = .{ .path = path },
315
+ .optimize = config.optimize,
316
+ .target = config.target,
317
+ .filter = test_filter,
318
+ });
319
+ tests.addOptions("build_options", options);
320
+ tests.single_threaded = true;
321
+ maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
322
+ if (config.pic) tests.force_pic = config.pic;
323
+ if (coverage) |c| {
324
+ tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
297
325
  }
326
+ self.step.dependOn(&b.addRunArtifact(tests).step);
327
+
298
328
  return self;
299
329
  }
300
330
  };
301
331
 
302
332
  const ToolConfig = struct {
333
+ options: Options,
303
334
  general: Config,
304
335
  tool: struct {
305
- showdown: bool,
306
- trace: bool,
307
336
  tests: ?*TestStep,
308
337
  name: ?[]const u8 = null,
309
338
  exes: *std.ArrayList(*std.Build.CompileStep),
310
339
  },
311
340
  };
312
341
 
313
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep {
342
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.RunStep {
343
+ std.fs.cwd().access(path, .{}) catch |err| switch (err) {
344
+ error.FileNotFound => return null,
345
+ else => |e| return e,
346
+ };
314
347
  var name = config.tool.name orelse std.fs.path.basename(path);
315
348
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
316
349
  if (index) |i| name = name[0..i];
317
- if (config.tool.showdown) name = b.fmt("{s}-showdown", .{name});
350
+ if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
318
351
 
319
352
  const exe = b.addExecutable(.{
320
353
  .name = name,
@@ -322,16 +355,14 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
322
355
  .target = config.general.target,
323
356
  .optimize = config.general.optimize,
324
357
  });
325
- exe.addModule("pkmn", module(b, .{
326
- .showdown = config.tool.showdown,
327
- .trace = config.tool.trace,
328
- }));
358
+ exe.addModule("pkmn", module(b, config.options));
359
+
329
360
  exe.single_threaded = true;
330
361
  if (config.general.pic) exe.force_pic = config.general.pic;
331
362
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
332
363
  config.tool.exes.append(exe) catch @panic("OOM");
333
364
 
334
- const run = exe.run();
365
+ const run = b.addRunArtifact(exe);
335
366
  maybeStrip(b, exe, &run.step, config.general.strip, config.general.cmd);
336
367
  if (b.args) |args| run.addArgs(args);
337
368
 
@@ -344,8 +375,8 @@ const ToolsStep = struct {
344
375
  pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.CompileStep)) *ToolsStep {
345
376
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
346
377
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
347
- self.* = ToolsStep{ .step = step };
348
- for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t).step);
378
+ self.* = .{ .step = step };
379
+ for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
349
380
  return self;
350
381
  }
351
382
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pkmn/engine",
3
- "version": "0.1.0-dev.6195e056",
3
+ "version": "0.1.0-dev.6c5fdce2",
4
4
  "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
5
5
  "repository": "github:pkmn/engine",
6
6
  "license": "MIT",
@@ -9,85 +9,107 @@
9
9
  "types": "build/pkg/index.d.ts",
10
10
  "files": [
11
11
  "build.zig",
12
+ "build/pkg/data.d.ts",
13
+ "build/pkg/data.js.map",
14
+ "build/pkg/addon.d.ts",
15
+ "build/pkg/addon.js.map",
16
+ "build/pkg/addon.js",
17
+ "build/pkg/data.js",
18
+ "build/pkg/data/ids.json",
19
+ "build/pkg/data/layout.json",
20
+ "build/pkg/data/protocol.json",
21
+ "build/pkg/gen1.d.ts",
22
+ "build/pkg/gen1.js.map",
23
+ "build/pkg/gen1.js",
24
+ "build/pkg/index.d.ts",
25
+ "build/pkg/index.js.map",
26
+ "build/pkg/index.js",
27
+ "build/pkg/protocol.d.ts",
28
+ "build/pkg/protocol.js.map",
29
+ "build/pkg/protocol.js",
30
+ "build/test/display.js.map",
31
+ "build/test/display.js",
32
+ "build/tools/debug.js.map",
33
+ "build/tools/debug.js",
12
34
  "src/bin/install-pkmn-engine",
13
35
  "src/lib/binding/node.zig",
14
36
  "src/lib/binding/wasm.zig",
37
+ "src/lib/common/battle.zig",
15
38
  "src/lib/common/data.zig",
39
+ "src/lib/common/debug.zig",
40
+ "src/lib/common/js.zig",
41
+ "src/lib/common/optional.zig",
16
42
  "src/lib/common/options.zig",
17
43
  "src/lib/common/protocol.zig",
44
+ "src/lib/common/rational.zig",
18
45
  "src/lib/common/rng.zig",
46
+ "src/lib/common/util.zig",
47
+ "src/lib/gen1/calc.zig",
48
+ "src/lib/gen1/chance.zig",
49
+ "src/lib/gen1/data.zig",
19
50
  "src/lib/gen1/data/moves.zig",
20
51
  "src/lib/gen1/data/species.zig",
21
52
  "src/lib/gen1/data/types.zig",
22
- "src/lib/gen1/data.zig",
23
53
  "src/lib/gen1/helpers.zig",
24
54
  "src/lib/gen1/mechanics.zig",
55
+ "src/lib/gen2/calc.zig",
56
+ "src/lib/gen2/chance.zig",
57
+ "src/lib/gen2/data.zig",
25
58
  "src/lib/gen2/data/items.zig",
26
59
  "src/lib/gen2/data/moves.zig",
27
60
  "src/lib/gen2/data/species.zig",
28
61
  "src/lib/gen2/data/types.zig",
29
- "src/lib/gen2/data.zig",
62
+ "src/lib/gen2/generated.zig",
30
63
  "src/lib/gen2/helpers.zig",
31
64
  "src/lib/gen2/mechanics.zig",
32
65
  "src/lib/pkmn.zig",
33
- "build/pkg/data/ids.json",
34
- "build/pkg/data/layout.json",
35
- "build/pkg/data/protocol.json",
36
- "build/pkg/data.d.ts",
37
- "build/pkg/data.js",
38
- "build/pkg/data.js.map",
39
- "build/pkg/gen1.d.ts",
40
- "build/pkg/gen1.js",
41
- "build/pkg/gen1.js.map",
42
- "build/pkg/index.d.ts",
43
- "build/pkg/index.js",
44
- "build/pkg/index.js.map",
45
- "build/pkg/protocol.d.ts",
46
- "build/pkg/protocol.js",
47
- "build/pkg/protocol.js.map"
66
+ "src/test/display/pkmn.html.tmpl"
48
67
  ],
49
68
  "engines": {
50
69
  "node": ">=16.0.0"
51
70
  },
52
71
  "bin": {
53
- "install-pkmn-engine": "src/bin/install-pkmn-engine"
72
+ "install-pkmn-engine": "src/bin/install-pkmn-engine",
73
+ "pkmn-debug": "src/bin/pkmn-debug"
54
74
  },
55
75
  "publishConfig": {
56
76
  "access": "public"
57
77
  },
58
78
  "dependencies": {
59
- "@pkmn/data": "^0.7.33",
60
- "@pkmn/protocol": "^0.6.11"
79
+ "@pkmn/data": "^0.7.54",
80
+ "@pkmn/protocol": "^0.6.16"
61
81
  },
62
82
  "devDependencies": {
63
- "@pkmn/eslint-config": "^3.0.0-alpha.0",
64
- "@pkmn/img": "^0.2.8",
65
- "@pkmn/sets": "^5.0.4",
66
- "@pkmn/sim": "0.7.33",
67
- "@types/html-minifier": "^4.0.2",
68
- "@types/jest": "^29.5.0",
69
- "@types/minimist": "^1.2.2",
70
- "@types/mustache": "^4.2.2",
71
- "@types/node": "^18.15.11",
72
- "@vitest/coverage-c8": "^0.29.8",
73
- "binaryen": "^112.0.0",
74
- "eslint": "^8.37.0",
83
+ "@pkmn/eslint-config": "^5.3.0",
84
+ "@pkmn/img": "^0.2.18",
85
+ "@pkmn/sets": "^5.1.0",
86
+ "@pkmn/sim": "0.7.54",
87
+ "@types/html-minifier": "^4.0.4",
88
+ "@types/jest": "^29.5.6",
89
+ "@types/minimist": "^1.2.4",
90
+ "@types/mustache": "^4.2.4",
91
+ "@types/node": "^20.8.9",
92
+ "@vitest/coverage-c8": "^0.33.0",
93
+ "binaryen": "^116.0.0",
94
+ "eslint": "^8.52.0",
75
95
  "html-minifier": "^4.0.0",
76
96
  "json-stringify-pretty-compact": "3.0.0",
77
97
  "minimist": "^1.2.8",
78
98
  "mustache": "^4.2.0",
79
99
  "source-map-support": "^0.5.21",
100
+ "table": "^6.8.1",
80
101
  "trakr": "^0.2.0",
81
- "typescript": "^5.0.2",
82
- "vitest": "^0.29.8"
102
+ "typescript": "^5.2.2",
103
+ "vitest": "^0.34.6"
83
104
  },
84
105
  "scripts": {
85
- "lint": "eslint --cache src --ext ts,js && eslint src/bin/install-pkmn-engine",
86
- "fix": "eslint --fix src --ext ts,js && eslint --fix src/bin/install-pkmn-engine",
106
+ "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
107
+ "fix": "eslint --fix src --ext ts,js && eslint --fix src/bin/*",
87
108
  "compile": "tsc -p .",
88
109
  "build": "npm run compile",
89
110
  "test": "vitest src/pkg",
90
111
  "test:integration": "vitest src/test",
112
+ "debug": "npm run compile && node build/tools/debug",
91
113
  "fuzz": "npm run compile && node build/test/fuzz",
92
114
  "generate": "npm run compile && node build/tools/generate",
93
115
  "release": "npm run compile && node build/tools/release",
@@ -100,7 +122,7 @@
100
122
  "ignorePatterns": [
101
123
  "dist/",
102
124
  "node_modules/",
103
- "src/examples/zig",
125
+ "examples/zig",
104
126
  "build/"
105
127
  ],
106
128
  "env": {
@@ -116,7 +138,7 @@
116
138
  "parserOptions": {
117
139
  "project": [
118
140
  "./tsconfig.json",
119
- "./src/examples/js/tsconfig.json"
141
+ "./examples/js/tsconfig.json"
120
142
  ]
121
143
  }
122
144
  },
@@ -129,7 +151,8 @@
129
151
  "rules": {
130
152
  "no-control-regex": "off",
131
153
  "@typescript-eslint/no-empty-interface": "off",
132
- "@typescript-eslint/no-shadow": "off"
154
+ "@typescript-eslint/no-shadow": "off",
155
+ "@typescript-eslint/no-unsafe-declaration-merging": "off"
133
156
  }
134
157
  },
135
158
  {
@@ -145,12 +168,23 @@
145
168
  "src/test/benchmark*.ts"
146
169
  ],
147
170
  "rules": {
148
- "@typescript-eslint/no-unused-vars": "off"
171
+ "@typescript-eslint/no-unused-vars": "off",
172
+ "@typescript-eslint/no-redundant-type-constituents": "off"
173
+ }
174
+ },
175
+ {
176
+ "files": [
177
+ "src/pkg/protocol.test.ts"
178
+ ],
179
+ "rules": {
180
+ "jest/no-standalone-expect": "off",
181
+ "jest/no-conditional-expect": "off"
149
182
  }
150
183
  },
151
184
  {
152
185
  "files": [
153
- "src/test/*.test.ts"
186
+ "src/test/*.test.ts",
187
+ "src/test/regression/*.test.ts"
154
188
  ],
155
189
  "rules": {
156
190
  "jest/no-standalone-expect": "off"