@pkmn/engine 0.1.0-dev.32adfe77 → 0.1.0-dev.36b5d56b

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 (75) hide show
  1. package/README.md +15 -11
  2. package/build/pkg/addon/browser.d.ts +3 -0
  3. package/build/pkg/addon/browser.js +44 -0
  4. package/build/pkg/addon/browser.js.map +1 -0
  5. package/build/pkg/addon/node.d.ts +3 -0
  6. package/build/pkg/addon/node.js +97 -0
  7. package/build/pkg/addon/node.js.map +1 -0
  8. package/build/pkg/addon/wasm.d.ts +2 -0
  9. package/build/pkg/addon/wasm.js +21 -0
  10. package/build/pkg/addon/wasm.js.map +1 -0
  11. package/build/pkg/addon.d.ts +22 -0
  12. package/build/pkg/addon.js +35 -58
  13. package/build/pkg/addon.js.map +1 -1
  14. package/build/pkg/data.d.ts +25 -4
  15. package/build/pkg/data.js.map +1 -1
  16. package/build/pkg/gen1.js +1 -1
  17. package/build/pkg/gen1.js.map +1 -1
  18. package/build/pkg/index.d.ts +22 -9
  19. package/build/pkg/index.js +15 -10
  20. package/build/pkg/index.js.map +1 -1
  21. package/build/pkg/protocol.d.ts +20 -1
  22. package/build/pkg/protocol.js +109 -107
  23. package/build/pkg/protocol.js.map +1 -1
  24. package/build/tools/debug.js +36 -70
  25. package/build/tools/debug.js.map +1 -1
  26. package/build/tools/display/debug.jsx +141 -0
  27. package/build/tools/display/debug.jsx.map +1 -0
  28. package/build/tools/display/index.js +141 -0
  29. package/build/tools/display/index.js.map +1 -0
  30. package/build/tools/display/ui.jsx +349 -0
  31. package/build/tools/display/ui.jsx.map +1 -0
  32. package/build/tools/display/util.js +18 -0
  33. package/build/tools/display/util.js.map +1 -0
  34. package/build.zig +218 -76
  35. package/package.json +53 -33
  36. package/src/bin/install-pkmn-engine +17 -7
  37. package/src/bin/pkmn-debug +1 -1
  38. package/src/lib/common/array.zig +77 -0
  39. package/src/lib/common/data.zig +8 -8
  40. package/src/lib/common/debug.zig +39 -8
  41. package/src/lib/common/js.zig +4 -2
  42. package/src/lib/common/optional.zig +13 -9
  43. package/src/lib/common/options.zig +6 -0
  44. package/src/lib/common/protocol.zig +50 -44
  45. package/src/lib/common/rational.zig +121 -29
  46. package/src/lib/common/rng.zig +5 -7
  47. package/src/lib/common/util.zig +50 -1
  48. package/src/lib/gen1/calc.zig +683 -156
  49. package/src/lib/gen1/chance.zig +415 -290
  50. package/src/lib/gen1/data/moves.zig +2 -4
  51. package/src/lib/gen1/data/species.zig +1 -3
  52. package/src/lib/gen1/data/types.zig +1 -2
  53. package/src/lib/gen1/data.zig +38 -41
  54. package/src/lib/gen1/helpers.zig +92 -548
  55. package/src/lib/gen1/mechanics.zig +325 -235
  56. package/src/lib/gen2/calc.zig +37 -27
  57. package/src/lib/gen2/chance.zig +90 -502
  58. package/src/lib/gen2/data/items.zig +1 -3
  59. package/src/lib/gen2/data/moves.zig +2 -4
  60. package/src/lib/gen2/data/species.zig +1 -3
  61. package/src/lib/gen2/data/types.zig +1 -2
  62. package/src/lib/gen2/data.zig +26 -29
  63. package/src/lib/gen2/generated.zig +18 -23
  64. package/src/lib/gen2/helpers.zig +46 -25
  65. package/src/lib/gen2/mechanics.zig +180 -133
  66. package/src/lib/node.zig +2 -4
  67. package/src/lib/pkmn.zig +14 -16
  68. package/src/lib/wasm.zig +1 -2
  69. package/src/tools/display/dom.ts +96 -0
  70. package/src/tools/display/ui.css +354 -0
  71. package/build/test/display.js +0 -400
  72. package/build/test/display.js.map +0 -1
  73. package/src/lib/gen1/README.md +0 -894
  74. package/src/lib/gen2/README.md +0 -329
  75. package/src/test/display/pkmn.html.tmpl +0 -368
package/build.zig CHANGED
@@ -1,5 +1,5 @@
1
- const std = @import("std");
2
1
  const builtin = @import("builtin");
2
+ const std = @import("std");
3
3
 
4
4
  pub const Options = struct {
5
5
  showdown: ?bool = null,
@@ -8,6 +8,17 @@ pub const Options = struct {
8
8
  calc: ?bool = null,
9
9
  };
10
10
 
11
+ const Step = if (@hasDecl(std.Build, "Step")) std.Build.Step else .{
12
+ .Compile = std.Build.CompileStep,
13
+ .Options = std.Build.OptionsStep,
14
+ .Run = std.Build.RunStep,
15
+ };
16
+ const has_path = @hasField(std.Build.LazyPath, "path");
17
+ const root_module = @hasField(Step.Compile, "root_module");
18
+ const force_pic = !@hasField(std.Build.SharedLibraryOptions, "pic");
19
+ const ResolvedTarget =
20
+ if (@hasDecl(std.Build, "ResolvedTarget")) std.Build.ResolvedTarget else std.zig.CrossTarget;
21
+
11
22
  pub fn module(b: *std.Build, options: Options) *std.Build.Module {
12
23
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
13
24
  const build_options = b.addOptions();
@@ -15,16 +26,20 @@ pub fn module(b: *std.Build, options: Options) *std.Build.Module {
15
26
  build_options.addOption(?bool, "log", options.log);
16
27
  build_options.addOption(?bool, "chance", options.chance);
17
28
  build_options.addOption(?bool, "calc", options.calc);
18
- return b.createModule(.{
19
- .root_source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
20
- .imports = &.{.{ .name = "build_options", .module = build_options.createModule() }},
21
- });
29
+
30
+ const root_source_file = .{ .cwd_relative = dirname ++ "/src/lib/pkmn.zig" };
31
+ const imports = &.{.{ .name = "build_options", .module = build_options.createModule() }};
32
+ return b.createModule(if (@hasDecl(std.Build, "CreateModuleOptions"))
33
+ .{ .source_file = root_source_file, .dependencies = imports }
34
+ else
35
+ .{ .root_source_file = root_source_file, .imports = imports });
22
36
  }
23
37
 
24
38
  pub fn build(b: *std.Build) !void {
25
39
  const target = b.standardTargetOptions(.{});
26
40
  const optimize = b.standardOptimizeOption(.{});
27
41
 
42
+ const default: ?bool = if (force_pic) false else null;
28
43
  const node_headers = b.option([]const u8, "node-headers", "Path to node-headers");
29
44
  const node_import_lib =
30
45
  b.option([]const u8, "node-import-library", "Path to node import library (Windows)");
@@ -32,8 +47,8 @@ pub fn build(b: *std.Build) !void {
32
47
  const wasm_stack_size =
33
48
  b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
34
49
  const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
35
- const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
36
- const pic = b.option(bool, "pic", "Force position independent code");
50
+ const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse default;
51
+ const pic = b.option(bool, "pic", "Force position independent code") orelse default;
37
52
  const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
38
53
  const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
39
54
 
@@ -44,9 +59,15 @@ pub fn build(b: *std.Build) !void {
44
59
  defer parsed.deinit();
45
60
  const version = parsed.value.object.get("version").?.string;
46
61
  const description = parsed.value.object.get("description").?.string;
47
- var repository = std.mem.split(u8, parsed.value.object.get("repository").?.string, ":");
62
+ var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
48
63
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
49
64
 
65
+ const fast = try std.SemanticVersion.parse("0.12.0-dev.866+3a47bc715");
66
+ if (optimize != .Debug and fast.order(builtin.zig_version) == .lt) {
67
+ std.log.warn("Release builds are ~10-20% slower than before Zig " ++
68
+ "v0.12.0-dev.866+3a47bc715 due to ziglang/zig#17768", .{});
69
+ }
70
+
50
71
  const showdown =
51
72
  b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
52
73
  const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
@@ -61,28 +82,45 @@ pub fn build(b: *std.Build) !void {
61
82
 
62
83
  const name = if (showdown) "pkmn-showdown" else "pkmn";
63
84
 
85
+ const pkmn = if (@hasDecl(std.Build, "CreateModuleOptions")) null else b.addModule("pkmn", .{
86
+ .root_source_file = if (has_path)
87
+ .{ .path = "src/lib/pkmn.zig" }
88
+ else
89
+ b.path("src/lib/pkmn.zig"),
90
+ .optimize = optimize,
91
+ .target = target,
92
+ .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
93
+ });
94
+
64
95
  var c = false;
65
96
  if (node_headers) |headers| {
66
97
  const addon = b.fmt("{s}.node", .{name});
67
- const lib = b.addSharedLibrary(.{
98
+ const path = if (has_path) .{ .path = "src/lib/node.zig" } else b.path("src/lib/node.zig");
99
+ const lib = b.addSharedLibrary(if (force_pic) .{
68
100
  .name = addon,
69
- .root_source_file = .{ .path = "src/lib/node.zig" },
101
+ .root_source_file = path,
102
+ .optimize = optimize,
103
+ .target = target,
104
+ } else .{
105
+ .name = addon,
106
+ .root_source_file = path,
70
107
  .optimize = optimize,
71
108
  .target = target,
72
109
  .strip = strip,
73
110
  .pic = pic,
74
111
  });
75
- lib.root_module.addOptions("build_options", options);
76
- lib.addSystemIncludePath(.{ .path = headers });
112
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
113
+ lib.addSystemIncludePath(if (has_path) .{ .path = headers } else b.path(headers));
77
114
  lib.linkLibC();
78
115
  if (node_import_lib) |il| {
79
- lib.addObjectFile(.{ .path = il });
80
- } else if (target.result.os.tag == .windows) {
116
+ lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
117
+ } else if (detect(target).os.tag == .windows) {
81
118
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
82
119
  std.process.exit(1);
83
120
  }
84
121
  lib.linker_allow_shlib_undefined = true;
85
122
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
123
+ if (force_pic and pic orelse false) lib.force_pic = pic;
86
124
  // Always emit to build/lib because this is where the driver code expects to find it
87
125
  // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
88
126
  //
@@ -93,69 +131,50 @@ pub fn build(b: *std.Build) !void {
93
131
  // rename the file ourself in install-pkmn-engine
94
132
  b.installArtifact(lib);
95
133
  } else if (wasm) {
96
- const exe = b.addExecutable(.{
97
- .name = name,
98
- .root_source_file = .{ .path = "src/lib/wasm.zig" },
99
- .optimize = switch (optimize) {
100
- .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
101
- else => optimize,
102
- },
103
- .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
104
- .strip = strip,
105
- .pic = pic,
106
- });
107
- exe.root_module.addOptions("build_options", options);
108
- exe.root_module.export_symbol_names = &[_][]const u8{
109
- "SHOWDOWN",
110
- "LOG",
111
- "CHANCE",
112
- "CALC",
113
- "GEN1_CHOICES_SIZE",
114
- "GEN1_LOGS_SIZE",
115
- };
116
- exe.entry = .disabled;
117
- exe.stack_size = wasm_stack_size;
118
- const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
119
- if (optimize != .Debug and opt != null) {
120
- const out = b.fmt("build/lib/{s}.wasm", .{name});
121
- const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
122
- sh.addArtifactArg(exe);
123
- sh.addArg("-o");
124
- sh.addFileArg(.{ .path = out });
125
- b.getInstallStep().dependOn(&sh.step);
126
- } else {
127
- b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
128
- .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
129
- }).step);
130
- }
134
+ try buildWasm(b, name, "src/lib/wasm.zig", optimize, strip, pic, wasm_stack_size, options);
131
135
  } else if (dynamic) {
132
- const lib = b.addSharedLibrary(.{
136
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
137
+ const lib = b.addSharedLibrary(if (force_pic) .{
138
+ .name = name,
139
+ .root_source_file = path,
140
+ .version = try std.SemanticVersion.parse(version),
141
+ .optimize = optimize,
142
+ .target = target,
143
+ } else .{
133
144
  .name = name,
134
- .root_source_file = .{ .path = "src/lib/c.zig" },
145
+ .root_source_file = path,
135
146
  .version = try std.SemanticVersion.parse(version),
136
147
  .optimize = optimize,
137
148
  .target = target,
138
149
  .strip = strip,
139
150
  .pic = pic,
140
151
  });
141
- lib.root_module.addOptions("build_options", options);
142
- lib.addIncludePath(.{ .path = "src/include" });
152
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
153
+ lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
143
154
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
155
+ if (force_pic and pic orelse false) lib.force_pic = pic;
144
156
  b.installArtifact(lib);
145
157
  c = true;
146
158
  } else {
147
- const lib = b.addStaticLibrary(.{
159
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
160
+ const lib = b.addStaticLibrary(if (force_pic) .{
148
161
  .name = name,
149
- .root_source_file = .{ .path = "src/lib/c.zig" },
162
+ .root_source_file = path,
163
+ .optimize = optimize,
164
+ .target = target,
165
+ } else .{
166
+ .name = name,
167
+ .root_source_file = path,
150
168
  .optimize = optimize,
151
169
  .target = target,
152
170
  .strip = strip,
153
171
  .pic = pic,
154
172
  });
155
- lib.root_module.addOptions("build_options", options);
156
- lib.addIncludePath(.{ .path = "src/include" });
173
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
174
+ lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
157
175
  lib.bundle_compiler_rt = true;
158
176
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
177
+ if (force_pic and pic orelse false) lib.force_pic = pic;
159
178
  if (emit_asm) {
160
179
  b.getInstallStep().dependOn(&b.addInstallFileWithDir(
161
180
  lib.getEmittedAsm(),
@@ -175,15 +194,17 @@ pub fn build(b: *std.Build) !void {
175
194
  }
176
195
 
177
196
  if (c) {
178
- const header = b.addInstallFileWithDir(
179
- .{ .path = "src/include/pkmn.h" },
180
- .header,
181
- "pkmn.h",
182
- );
197
+ const path =
198
+ if (has_path) .{ .path = "src/include/pkmn.h" } else b.path("src/include/pkmn.h");
199
+ const header = b.addInstallFileWithDir(path, .header, "pkmn.h");
183
200
  b.getInstallStep().dependOn(&header.step);
184
201
 
185
202
  const pc = b.fmt("lib{s}.pc", .{name});
186
- const file = try b.cache_root.join(b.allocator, &.{pc});
203
+ const file = try std.fs.path.relative(
204
+ b.allocator,
205
+ try std.process.getCwdAlloc(b.allocator),
206
+ try b.cache_root.join(b.allocator, &.{pc}),
207
+ );
187
208
  const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
188
209
 
189
210
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
@@ -216,7 +237,7 @@ pub fn build(b: *std.Build) !void {
216
237
  // TODO: tests can be run multiple times due to @imports
217
238
  const tests = TestStep.create(b, options, config);
218
239
 
219
- var exes = std.ArrayList(*std.Build.Step.Compile).init(b.allocator);
240
+ var exes = std.ArrayList(*Step.Compile).init(b.allocator);
220
241
  const tools: ToolConfig = .{
221
242
  .options = .{
222
243
  .showdown = showdown,
@@ -224,6 +245,7 @@ pub fn build(b: *std.Build) !void {
224
245
  .chance = chance,
225
246
  .calc = calc,
226
247
  },
248
+ .module = pkmn,
227
249
  .general = config,
228
250
  .tool = .{
229
251
  .tests = if (tests.build) tests else null,
@@ -262,13 +284,86 @@ pub fn build(b: *std.Build) !void {
262
284
  }
263
285
  }
264
286
 
287
+ fn buildWasm(
288
+ b: *std.Build,
289
+ name: []const u8,
290
+ root_src_file: []const u8,
291
+ optimize: std.builtin.OptimizeMode,
292
+ strip: ?bool,
293
+ pic: ?bool,
294
+ wasm_stack_size: u64,
295
+ options: anytype,
296
+ ) !void {
297
+ const entry = @hasDecl(Step.Compile, "Entry");
298
+ const mode = switch (optimize) {
299
+ .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
300
+ else => optimize,
301
+ };
302
+ const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
303
+ b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding })
304
+ else
305
+ ResolvedTarget{ .cpu_arch = .wasm32, .os_tag = .freestanding };
306
+ const path = if (has_path) .{ .path = root_src_file } else b.path(root_src_file);
307
+ const bin = if (entry) bin: {
308
+ const exe = b.addExecutable(if (force_pic) .{
309
+ .name = name,
310
+ .root_source_file = path,
311
+ .optimize = mode,
312
+ .target = freestanding,
313
+ } else .{
314
+ .name = name,
315
+ .root_source_file = path,
316
+ .optimize = mode,
317
+ .target = freestanding,
318
+ .strip = strip,
319
+ .pic = pic,
320
+ });
321
+ (if (root_module) exe.root_module else exe).export_symbol_names = try exports(b);
322
+ exe.entry = .disabled;
323
+ break :bin exe;
324
+ } else bin: {
325
+ const lib = b.addSharedLibrary(.{
326
+ .name = name,
327
+ .root_source_file = path,
328
+ .optimize = mode,
329
+ .target = freestanding,
330
+ });
331
+ lib.rdynamic = true;
332
+ break :bin lib;
333
+ };
334
+ bin.stack_size = wasm_stack_size;
335
+ if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
336
+ if (force_pic and pic orelse false) bin.force_pic = pic;
337
+ (if (root_module) bin.root_module else bin).addOptions("build_options", options);
338
+
339
+ const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
340
+ if (optimize != .Debug and opt != null) {
341
+ const out = b.fmt("build/lib/{s}.wasm", .{name});
342
+ const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
343
+ sh.addArtifactArg(bin);
344
+ sh.addArg("-o");
345
+ if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
346
+ sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
347
+ } else {
348
+ sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
349
+ }
350
+ b.getInstallStep().dependOn(&sh.step);
351
+ if (!entry) b.installArtifact(bin);
352
+ } else if (entry) {
353
+ b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
354
+ .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
355
+ }).step);
356
+ }
357
+ }
358
+
265
359
  fn maybeStrip(
266
360
  b: *std.Build,
267
- artifact: *std.Build.Step.Compile,
361
+ artifact: *Step.Compile,
268
362
  step: *std.Build.Step,
269
363
  strip: ?bool,
270
364
  cmd: ?[]const u8,
271
365
  ) void {
366
+ if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
272
367
  if (!(strip orelse false) or cmd == null) return;
273
368
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
274
369
  const mac = builtin.os.tag == .macos;
@@ -281,7 +376,7 @@ fn maybeStrip(
281
376
  }
282
377
 
283
378
  const Config = struct {
284
- target: std.Build.ResolvedTarget,
379
+ target: ResolvedTarget,
285
380
  optimize: std.builtin.OptimizeMode,
286
381
  pic: ?bool,
287
382
  strip: ?bool,
@@ -292,7 +387,7 @@ const TestStep = struct {
292
387
  step: std.Build.Step,
293
388
  build: bool,
294
389
 
295
- pub fn create(b: *std.Build, options: *std.Build.Step.Options, config: Config) *TestStep {
390
+ pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
296
391
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
297
392
  const test_filter =
298
393
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
@@ -301,8 +396,14 @@ const TestStep = struct {
301
396
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
302
397
  self.* = .{ .step = step, .build = test_filter == null };
303
398
 
304
- const tests = b.addTest(.{
305
- .root_source_file = .{ .path = "src/lib/test.zig" },
399
+ const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
400
+ const tests = b.addTest(if (force_pic) .{
401
+ .root_source_file = path,
402
+ .optimize = config.optimize,
403
+ .target = config.target,
404
+ .filter = test_filter,
405
+ } else .{
406
+ .root_source_file = path,
306
407
  .optimize = config.optimize,
307
408
  .target = config.target,
308
409
  .filter = test_filter,
@@ -310,8 +411,13 @@ const TestStep = struct {
310
411
  .strip = config.strip,
311
412
  .pic = config.pic,
312
413
  });
313
- tests.root_module.addOptions("build_options", options);
414
+ (if (root_module) tests.root_module else tests).addOptions("build_options", options);
415
+
314
416
  maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
417
+ if (force_pic) {
418
+ tests.single_threaded = true;
419
+ if (config.pic orelse false) tests.force_pic = config.pic;
420
+ }
315
421
  if (coverage) |c| {
316
422
  tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
317
423
  }
@@ -323,15 +429,16 @@ const TestStep = struct {
323
429
 
324
430
  const ToolConfig = struct {
325
431
  options: Options,
432
+ module: ?*std.Build.Module,
326
433
  general: Config,
327
434
  tool: struct {
328
435
  tests: ?*TestStep,
329
436
  name: ?[]const u8 = null,
330
- exes: *std.ArrayList(*std.Build.Step.Compile),
437
+ exes: *std.ArrayList(*Step.Compile),
331
438
  },
332
439
  };
333
440
 
334
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
441
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
335
442
  std.fs.cwd().access(path, .{}) catch |err| switch (err) {
336
443
  error.FileNotFound => return null,
337
444
  else => |e| return e,
@@ -341,17 +448,32 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.R
341
448
  if (index) |i| name = name[0..i];
342
449
  if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
343
450
 
344
- const exe = b.addExecutable(.{
451
+ const exe = b.addExecutable(if (force_pic) .{
345
452
  .name = name,
346
- .root_source_file = .{ .path = path },
453
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
454
+ .target = config.general.target,
455
+ .optimize = config.general.optimize,
456
+ } else .{
457
+ .name = name,
458
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
347
459
  .target = config.general.target,
348
460
  .optimize = config.general.optimize,
349
461
  .single_threaded = true,
350
462
  .strip = config.general.strip,
351
463
  .pic = config.general.pic,
352
464
  });
353
- exe.root_module.addImport("pkmn", module(b, config.options));
354
465
 
466
+ if (root_module) {
467
+ const import = if (config.module) |m| m else module(b, config.options);
468
+ exe.root_module.addImport("pkmn", import);
469
+ } else {
470
+ exe.addModule("pkmn", module(b, config.options));
471
+ }
472
+
473
+ if (force_pic) {
474
+ exe.single_threaded = true;
475
+ if (config.general.pic orelse false) exe.force_pic = config.general.pic;
476
+ }
355
477
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
356
478
  config.tool.exes.append(exe) catch @panic("OOM");
357
479
 
@@ -365,7 +487,7 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.R
365
487
  const ToolsStep = struct {
366
488
  step: std.Build.Step,
367
489
 
368
- pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.Step.Compile)) *ToolsStep {
490
+ pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
369
491
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
370
492
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
371
493
  self.* = .{ .step = step };
@@ -373,3 +495,23 @@ const ToolsStep = struct {
373
495
  return self;
374
496
  }
375
497
  };
498
+
499
+ fn detect(target: anytype) std.Target {
500
+ if (@hasField(@TypeOf(target), "result")) return target.result;
501
+ return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
502
+ }
503
+
504
+ const WASM = @embedFile("src/lib/wasm.zig");
505
+
506
+ fn exports(b: *std.Build) ![][]const u8 {
507
+ var symbols = std.ArrayList([]const u8).init(b.allocator);
508
+
509
+ var it = std.mem.splitSequence(u8, WASM, "export const ");
510
+ _ = it.next();
511
+ while (it.next()) |s| {
512
+ const i = std.mem.indexOf(u8, s, " ").?;
513
+ try symbols.append(s[0..i]);
514
+ }
515
+
516
+ return symbols.items;
517
+ }
package/package.json CHANGED
@@ -1,19 +1,31 @@
1
1
  {
2
2
  "name": "@pkmn/engine",
3
- "version": "0.1.0-dev.32adfe77",
3
+ "version": "0.1.0-dev.36b5d56b",
4
4
  "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
5
5
  "repository": "github:pkmn/engine",
6
6
  "license": "MIT",
7
7
  "sideEffects": false,
8
8
  "main": "build/pkg/index.js",
9
9
  "types": "build/pkg/index.d.ts",
10
+ "browser": {
11
+ "./build/pkg/addon/node.js": "./build/pkg/addon/browser.js"
12
+ },
10
13
  "files": [
11
14
  "build.zig",
12
- "build/pkg/data.d.ts",
13
- "build/pkg/data.js.map",
14
15
  "build/pkg/addon.d.ts",
15
16
  "build/pkg/addon.js.map",
16
17
  "build/pkg/addon.js",
18
+ "build/pkg/addon/browser.d.ts",
19
+ "build/pkg/addon/browser.js.map",
20
+ "build/pkg/addon/browser.js",
21
+ "build/pkg/addon/node.d.ts",
22
+ "build/pkg/addon/node.js.map",
23
+ "build/pkg/addon/node.js",
24
+ "build/pkg/addon/wasm.d.ts",
25
+ "build/pkg/addon/wasm.js.map",
26
+ "build/pkg/addon/wasm.js",
27
+ "build/pkg/data.d.ts",
28
+ "build/pkg/data.js.map",
17
29
  "build/pkg/data.js",
18
30
  "build/pkg/data/ids.json",
19
31
  "build/pkg/data/layout.json",
@@ -27,10 +39,17 @@
27
39
  "build/pkg/protocol.d.ts",
28
40
  "build/pkg/protocol.js.map",
29
41
  "build/pkg/protocol.js",
30
- "build/test/display.js.map",
31
- "build/test/display.js",
32
42
  "build/tools/debug.js.map",
33
43
  "build/tools/debug.js",
44
+ "build/tools/display/index.js.map",
45
+ "build/tools/display/index.js",
46
+ "build/tools/display/debug.jsx.map",
47
+ "build/tools/display/debug.jsx",
48
+ "build/tools/display/ui.jsx.map",
49
+ "build/tools/display/ui.jsx",
50
+ "build/tools/display/util.js.map",
51
+ "build/tools/display/util.js",
52
+ "src/lib/common/array.zig",
34
53
  "src/lib/common/battle.zig",
35
54
  "src/lib/common/data.zig",
36
55
  "src/lib/common/debug.zig",
@@ -62,7 +81,8 @@
62
81
  "src/lib/node.zig",
63
82
  "src/lib/pkmn.zig",
64
83
  "src/lib/wasm.zig",
65
- "src/test/display/pkmn.html.tmpl"
84
+ "src/tools/display/dom.ts",
85
+ "src/tools/display/ui.css"
66
86
  ],
67
87
  "engines": {
68
88
  "node": ">=16.0.0"
@@ -75,31 +95,38 @@
75
95
  "access": "public"
76
96
  },
77
97
  "dependencies": {
78
- "@pkmn/data": "^0.8.9",
79
- "@pkmn/protocol": "^0.6.19"
98
+ "@pkmn/data": "^0.9.19",
99
+ "@pkmn/protocol": "^0.6.26"
80
100
  },
81
101
  "devDependencies": {
82
- "@pkmn/eslint-config": "^7.1.0",
83
- "@pkmn/img": "^0.2.25",
102
+ "@pkmn/eslint-config": "^8.4.0",
103
+ "@pkmn/img": "^0.2.32",
84
104
  "@pkmn/sets": "^5.1.2",
85
- "@pkmn/sim": "0.8.9",
105
+ "@pkmn/sim": "0.9.19",
106
+ "@pkmn/smogon": "^0.5.14",
86
107
  "@types/html-minifier": "^4.0.5",
87
- "@types/jest": "^29.5.12",
108
+ "@types/jest": "^29.5.13",
88
109
  "@types/minimist": "^1.2.5",
89
110
  "@types/mustache": "^4.2.5",
90
- "@types/node": "^20.11.25",
91
- "@vitest/coverage-v8": "^1.3.1",
92
- "binaryen": "^116.0.0",
93
- "eslint": "^8.57.0",
111
+ "@types/node": "^22.7.4",
112
+ "@types/react": "^18.3.10",
113
+ "@types/semver": "^7.5.8",
114
+ "@types/vscode": "^1.93.0",
115
+ "@vitest/coverage-v8": "^2.1.1",
116
+ "@vscode/vsce": "^3.1.1",
117
+ "binaryen": "^119.0.0",
118
+ "esbuild": "^0.24.0",
119
+ "eslint": "<=8",
94
120
  "html-minifier": "^4.0.0",
95
- "json-stringify-pretty-compact": "4.0.0",
121
+ "json-stringify-pretty-compact": "3.0.0",
96
122
  "minimist": "^1.2.8",
97
123
  "mustache": "^4.2.0",
124
+ "semver": "^7.6.3",
98
125
  "source-map-support": "^0.5.21",
99
- "table": "^6.8.1",
126
+ "table": "^6.8.2",
100
127
  "trakr": "^0.2.0",
101
- "typescript": "^5.4.2",
102
- "vitest": "^1.3.1"
128
+ "typescript": "^5.6.2",
129
+ "vitest": "^2.1.1"
103
130
  },
104
131
  "scripts": {
105
132
  "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
@@ -109,11 +136,13 @@
109
136
  "test": "vitest src/pkg",
110
137
  "test:integration": "vitest src/test",
111
138
  "debug": "npm run compile && node build/tools/debug",
139
+ "demo": "npm run compile && node build/tools/demo",
112
140
  "fuzz": "npm run compile && node build/test/fuzz",
113
141
  "generate": "npm run compile && node build/tools/generate",
114
142
  "release": "npm run compile && node build/tools/release",
115
143
  "benchmark": "npm run compile && node build/test/benchmark",
116
144
  "integration": "npm run compile && node build/test/integration",
145
+ "extension": "npm -C src/tools/vscode run build",
117
146
  "postinstall": "node src/bin/install-pkmn-engine"
118
147
  },
119
148
  "eslintConfig": {
@@ -122,7 +151,8 @@
122
151
  "dist/",
123
152
  "node_modules/",
124
153
  "examples/zig",
125
- "build/"
154
+ "build/",
155
+ "extension.js"
126
156
  ],
127
157
  "env": {
128
158
  "es6": true,
@@ -141,18 +171,9 @@
141
171
  ]
142
172
  }
143
173
  },
144
- {
145
- "files": [
146
- "src/test/display.ts"
147
- ],
148
- "rules": {
149
- "@typescript-eslint/no-unnecessary-type-assertion": "off"
150
- }
151
- },
152
174
  {
153
175
  "files": [
154
176
  "src/pkg/index.ts",
155
- "src/test/display.ts",
156
177
  "src/test/integration.ts"
157
178
  ],
158
179
  "rules": {
@@ -164,7 +185,7 @@
164
185
  },
165
186
  {
166
187
  "files": [
167
- "src/pkg/addon.ts"
188
+ "src/pkg/addon/node.ts"
168
189
  ],
169
190
  "rules": {
170
191
  "@typescript-eslint/no-var-requires": "off"
@@ -190,8 +211,7 @@
190
211
  },
191
212
  {
192
213
  "files": [
193
- "src/test/*.test.ts",
194
- "src/test/regression/*.test.ts"
214
+ "src/test/*.test.ts"
195
215
  ],
196
216
  "rules": {
197
217
  "jest/no-standalone-expect": "off"