@pkmn/engine 0.1.0-dev.f3aaee39 → 0.1.0-dev.f3b63b86

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 (85) hide show
  1. package/LICENSE +1 -3
  2. package/README.md +77 -23
  3. package/build/pkg/addon/browser.d.ts +3 -0
  4. package/build/pkg/addon/browser.js +47 -0
  5. package/build/pkg/addon/browser.js.map +1 -0
  6. package/build/pkg/addon/node.d.ts +3 -0
  7. package/build/pkg/addon/node.js +110 -0
  8. package/build/pkg/addon/node.js.map +1 -0
  9. package/build/pkg/addon/wasm.d.ts +2 -0
  10. package/build/pkg/addon/wasm.js +53 -0
  11. package/build/pkg/addon/wasm.js.map +1 -0
  12. package/build/pkg/addon.d.ts +26 -4
  13. package/build/pkg/addon.js +39 -71
  14. package/build/pkg/addon.js.map +1 -1
  15. package/build/pkg/data/ids.json +12 -12
  16. package/build/pkg/data/layout.json +17 -4
  17. package/build/pkg/data/protocol.json +84 -13
  18. package/build/pkg/data.d.ts +27 -5
  19. package/build/pkg/data.js.map +1 -1
  20. package/build/pkg/gen1.d.ts +15 -18
  21. package/build/pkg/gen1.js +30 -21
  22. package/build/pkg/gen1.js.map +1 -1
  23. package/build/pkg/index.d.ts +42 -91
  24. package/build/pkg/index.js +23 -70
  25. package/build/pkg/index.js.map +1 -1
  26. package/build/pkg/protocol.d.ts +20 -1
  27. package/build/pkg/protocol.js +123 -102
  28. package/build/pkg/protocol.js.map +1 -1
  29. package/build/tools/debug.js +69 -74
  30. package/build/tools/debug.js.map +1 -1
  31. package/build/tools/display/debug.jsx +152 -0
  32. package/build/tools/display/debug.jsx.map +1 -0
  33. package/build/tools/display/index.js +152 -0
  34. package/build/tools/display/index.js.map +1 -0
  35. package/build/tools/display/ui.jsx +359 -0
  36. package/build/tools/display/ui.jsx.map +1 -0
  37. package/build/tools/display/util.js +33 -0
  38. package/build/tools/display/util.js.map +1 -0
  39. package/build.zig +273 -120
  40. package/package.json +64 -123
  41. package/src/bin/install-pkmn-engine +47 -21
  42. package/src/bin/pkmn-debug +1 -1
  43. package/src/lib/bindings/c.zig +200 -0
  44. package/src/lib/{binding → bindings}/node.zig +15 -32
  45. package/src/lib/bindings/wasm.zig +50 -0
  46. package/src/lib/common/array.zig +70 -0
  47. package/src/lib/common/data.zig +12 -24
  48. package/src/lib/common/debug.zig +32 -11
  49. package/src/lib/common/js.zig +3 -7
  50. package/src/lib/common/optional.zig +19 -18
  51. package/src/lib/common/options.zig +6 -0
  52. package/src/lib/common/protocol.zig +919 -430
  53. package/src/lib/common/rational.zig +341 -254
  54. package/src/lib/common/rng.zig +22 -15
  55. package/src/lib/common/util.zig +33 -1
  56. package/src/lib/gen1/calc.zig +706 -177
  57. package/src/lib/gen1/chance.zig +428 -302
  58. package/src/lib/gen1/data/moves.zig +193 -183
  59. package/src/lib/gen1/data/species.zig +4 -6
  60. package/src/lib/gen1/data/types.zig +9 -10
  61. package/src/lib/gen1/data.zig +60 -75
  62. package/src/lib/gen1/helpers.zig +90 -563
  63. package/src/lib/gen1/mechanics.zig +682 -600
  64. package/src/lib/gen2/calc.zig +150 -0
  65. package/src/lib/gen2/chance.zig +896 -0
  66. package/src/lib/gen2/data/items.zig +13 -21
  67. package/src/lib/gen2/data/moves.zig +664 -572
  68. package/src/lib/gen2/data/species.zig +2 -4
  69. package/src/lib/gen2/data/types.zig +139 -34
  70. package/src/lib/gen2/data.zig +121 -96
  71. package/src/lib/gen2/generated.zig +801 -0
  72. package/src/lib/gen2/helpers.zig +53 -38
  73. package/src/lib/gen2/mechanics.zig +3580 -29
  74. package/src/lib/napi.h +2 -0
  75. package/src/lib/node.zig +14 -0
  76. package/src/lib/pkmn.zig +125 -29
  77. package/src/lib/wasm.zig +13 -0
  78. package/src/tools/display/dom.ts +93 -0
  79. package/src/tools/display/ui.css +354 -0
  80. package/build/test/display.js +0 -400
  81. package/build/test/display.js.map +0 -1
  82. package/src/lib/binding/wasm.zig +0 -12
  83. package/src/lib/gen1/README.md +0 -892
  84. package/src/lib/gen2/README.md +0 -308
  85. package/src/test/display/pkmn.html.tmpl +0 -368
package/build.zig CHANGED
@@ -1,5 +1,9 @@
1
- const std = @import("std");
2
1
  const builtin = @import("builtin");
2
+ const std = @import("std");
3
+
4
+ fn ArrayList(comptime T: type) type {
5
+ return std.array_list.Aligned(T, null);
6
+ }
3
7
 
4
8
  pub const Options = struct {
5
9
  showdown: ?bool = null,
@@ -15,10 +19,12 @@ pub fn module(b: *std.Build, options: Options) *std.Build.Module {
15
19
  build_options.addOption(?bool, "log", options.log);
16
20
  build_options.addOption(?bool, "chance", options.chance);
17
21
  build_options.addOption(?bool, "calc", options.calc);
18
- return b.createModule(.{
19
- .source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
20
- .dependencies = &.{.{ .name = "build_options", .module = build_options.createModule() }},
21
- });
22
+
23
+ const root_source_file: std.Build.LazyPath =
24
+ .{ .cwd_relative = dirname ++ "/src/lib/pkmn.zig" };
25
+ const imports: []const std.Build.Module.Import =
26
+ &.{.{ .name = "build_options", .module = build_options.createModule() }};
27
+ return b.createModule(.{ .root_source_file = root_source_file, .imports = imports });
22
28
  }
23
29
 
24
30
  pub fn build(b: *std.Build) !void {
@@ -28,12 +34,16 @@ pub fn build(b: *std.Build) !void {
28
34
  const node_headers = b.option([]const u8, "node-headers", "Path to node-headers");
29
35
  const node_import_lib =
30
36
  b.option([]const u8, "node-import-library", "Path to node import library (Windows)");
37
+ const demo = if (try exists(b, "src/tools/demo.zig"))
38
+ b.option(bool, "demo", "Build the demo library") orelse false
39
+ else
40
+ false;
31
41
  const wasm = b.option(bool, "wasm", "Build a WASM library") orelse false;
32
42
  const wasm_stack_size =
33
43
  b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
34
44
  const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
35
- const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse false;
36
- const pic = b.option(bool, "pic", "Force position independent code") orelse false;
45
+ const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
46
+ const pic = b.option(bool, "pic", "Force position independent code");
37
47
  const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
38
48
  const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
39
49
 
@@ -44,7 +54,7 @@ pub fn build(b: *std.Build) !void {
44
54
  defer parsed.deinit();
45
55
  const version = parsed.value.object.get("version").?.string;
46
56
  const description = parsed.value.object.get("description").?.string;
47
- var repository = std.mem.split(u8, parsed.value.object.get("repository").?.string, ":");
57
+ var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
48
58
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
49
59
 
50
60
  const showdown =
@@ -52,6 +62,7 @@ pub fn build(b: *std.Build) !void {
52
62
  const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
53
63
  const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
54
64
  const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
65
+ const extra = b.option([]const []const u8, "option", "Enable extra option");
55
66
 
56
67
  const options = b.addOptions();
57
68
  options.addOption(?bool, "showdown", showdown);
@@ -59,32 +70,67 @@ pub fn build(b: *std.Build) !void {
59
70
  options.addOption(?bool, "chance", chance);
60
71
  options.addOption(?bool, "calc", calc);
61
72
 
73
+ if (extra) |opts| {
74
+ for (opts) |opt| {
75
+ if (std.mem.indexOfScalar(u8, opt, '=')) |i| {
76
+ options.addOption(?bool, opt[0..i], if (std.mem.eql(u8, opt[i + 1 ..], "true"))
77
+ true
78
+ else if (std.mem.eql(u8, opt[i + 1 ..], "false"))
79
+ false
80
+ else {
81
+ std.log.err("Invalid option: {s}\n", .{opt});
82
+ return error.InvalidOption;
83
+ });
84
+ } else {
85
+ options.addOption(?bool, opt, true);
86
+ }
87
+ }
88
+ }
89
+
62
90
  const name = if (showdown) "pkmn-showdown" else "pkmn";
63
91
 
92
+ const pkmn: *std.Build.Module = b.addModule("pkmn", .{
93
+ .root_source_file = b.path("src/lib/pkmn.zig"),
94
+ .optimize = optimize,
95
+ .target = target,
96
+ .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
97
+ });
98
+
64
99
  var c = false;
65
100
  if (node_headers) |headers| {
101
+ const translate_c = b.addTranslateC(.{
102
+ .root_source_file = b.path("src/lib/napi.h"),
103
+ .target = target,
104
+ .optimize = optimize,
105
+ });
106
+ translate_c.addSystemIncludePath(b.path(headers));
66
107
  const addon = b.fmt("{s}.node", .{name});
67
- const lib = b.addSharedLibrary(.{
108
+ const path = b.path("src/lib/node.zig");
109
+ const lib = b.addLibrary(.{
110
+ .linkage = .dynamic,
68
111
  .name = addon,
69
- .main_pkg_path = .{ .path = "." },
70
- .root_source_file = .{ .path = "src/lib/binding/node.zig" },
71
- .optimize = optimize,
72
- .target = target,
112
+ .root_module = b.createModule(.{
113
+ .root_source_file = path,
114
+ .optimize = optimize,
115
+ .target = target,
116
+ .strip = strip,
117
+ .pic = pic,
118
+ }),
73
119
  });
74
- lib.addOptions("build_options", options);
75
- lib.addSystemIncludePath(.{ .path = headers });
76
- lib.linkLibC();
120
+ lib.root_module.addOptions("build_options", options);
121
+ lib.root_module.addImport("napi", translate_c.createModule());
122
+ lib.root_module.link_libc = true;
77
123
  if (node_import_lib) |il| {
78
- lib.addObjectFile(.{ .path = il });
79
- } else if ((try std.zig.system.NativeTargetInfo.detect(target)).target.os.tag == .windows) {
80
- try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
124
+ lib.root_module.addObjectFile(b.path(il));
125
+ } else if (target.result.os.tag == .windows) {
126
+ var err = std.Io.File.stderr().writer(b.graph.io, &.{});
127
+ try err.interface.writeAll("Must provide --node-import-library path on Windows\n");
81
128
  std.process.exit(1);
82
129
  }
83
130
  lib.linker_allow_shlib_undefined = true;
84
131
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
85
- if (pic) lib.force_pic = pic;
86
132
  // Always emit to build/lib because this is where the driver code expects to find it
87
- // TODO(ziglang/zig#2231): using the following used to work (though was hacky):
133
+ // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
88
134
  //
89
135
  // lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
90
136
  // b.getInstallStep().dependOn(&lib.step);
@@ -93,59 +139,48 @@ pub fn build(b: *std.Build) !void {
93
139
  // rename the file ourself in install-pkmn-engine
94
140
  b.installArtifact(lib);
95
141
  } else if (wasm) {
96
- const lib = b.addSharedLibrary(.{
97
- .name = name,
98
- .main_pkg_path = .{ .path = "." },
99
- .root_source_file = .{ .path = "src/lib/binding/wasm.zig" },
100
- .optimize = switch (optimize) {
101
- .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
102
- else => optimize,
103
- },
104
- .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
105
- });
106
- lib.addOptions("build_options", options);
107
- lib.stack_size = wasm_stack_size;
108
- lib.rdynamic = true;
109
- lib.strip = strip;
110
- if (pic) lib.force_pic = pic;
111
- const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
112
- if (optimize != .Debug and opt != null) {
113
- const out = b.fmt("build/lib/{s}.wasm", .{name});
114
- const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
115
- sh.addArtifactArg(lib);
116
- sh.addArg("-o");
117
- sh.addFileSourceArg(.{ .path = out });
118
- b.getInstallStep().dependOn(&sh.step);
119
- }
120
- b.installArtifact(lib);
142
+ const path = "src/lib/wasm.zig";
143
+ try buildWasm(b, name, path, optimize, strip, pic, wasm_stack_size, null, options);
144
+ } else if (demo) {
145
+ const path = "src/tools/demo.zig";
146
+ const n = if (showdown) "demo-showdown" else "demo";
147
+ const mod = pkmn;
148
+ try buildWasm(b, n, path, optimize, strip, pic, wasm_stack_size, mod, options);
121
149
  } else if (dynamic) {
122
- const lib = b.addSharedLibrary(.{
150
+ const path = b.path("src/lib/c.zig");
151
+ const lib = b.addLibrary(.{
152
+ .linkage = .dynamic,
123
153
  .name = name,
124
- .main_pkg_path = .{ .path = "." },
125
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
126
- .version = try std.SemanticVersion.parse(version),
127
- .optimize = optimize,
128
- .target = target,
154
+ .root_module = b.createModule(.{
155
+ .root_source_file = path,
156
+ .optimize = optimize,
157
+ .target = target,
158
+ .strip = strip,
159
+ .pic = pic,
160
+ }),
129
161
  });
130
- lib.addOptions("build_options", options);
131
- lib.addIncludePath(.{ .path = "src/include" });
162
+ lib.root_module.addOptions("build_options", options);
163
+ lib.root_module.addIncludePath(b.path("src/include"));
132
164
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
133
- if (pic) lib.force_pic = pic;
134
165
  b.installArtifact(lib);
135
166
  c = true;
136
167
  } else {
137
- const lib = b.addStaticLibrary(.{
168
+ const path = b.path("src/lib/c.zig");
169
+ const lib = b.addLibrary(.{
170
+ .linkage = .static,
138
171
  .name = name,
139
- .main_pkg_path = .{ .path = "." },
140
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
141
- .optimize = optimize,
142
- .target = target,
172
+ .root_module = b.createModule(.{
173
+ .root_source_file = path,
174
+ .optimize = optimize,
175
+ .target = target,
176
+ .strip = strip,
177
+ .pic = pic,
178
+ }),
143
179
  });
144
- lib.addOptions("build_options", options);
145
- lib.addIncludePath(.{ .path = "src/include" });
180
+ lib.root_module.addOptions("build_options", options);
181
+ lib.root_module.addIncludePath(b.path("src/include"));
146
182
  lib.bundle_compiler_rt = true;
147
183
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
148
- if (pic) lib.force_pic = pic;
149
184
  if (emit_asm) {
150
185
  b.getInstallStep().dependOn(&b.addInstallFileWithDir(
151
186
  lib.getEmittedAsm(),
@@ -165,20 +200,25 @@ pub fn build(b: *std.Build) !void {
165
200
  }
166
201
 
167
202
  if (c) {
168
- const header = b.addInstallFileWithDir(
169
- .{ .path = "src/include/pkmn.h" },
170
- .header,
171
- "pkmn.h",
172
- );
203
+ const path = b.path("src/include/pkmn.h");
204
+ const header = b.addInstallFileWithDir(path, .header, "pkmn.h");
173
205
  b.getInstallStep().dependOn(&header.step);
174
206
 
175
207
  const pc = b.fmt("lib{s}.pc", .{name});
176
- const file = try b.cache_root.join(b.allocator, &.{pc});
177
- const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
208
+ const cwd = try std.process.getCwdAlloc(b.allocator);
209
+ const file = try std.Io.Dir.path.relative(
210
+ b.allocator,
211
+ try std.process.getCwdAlloc(b.allocator),
212
+ &b.graph.environ_map,
213
+ cwd,
214
+ try b.cache_root.join(b.allocator, &.{pc}),
215
+ );
216
+ const pkgconfig_file = try std.Io.Dir.cwd().createFile(b.graph.io, file, .{});
217
+ defer pkgconfig_file.close(b.graph.io);
178
218
 
179
219
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
180
- const writer = pkgconfig_file.writer();
181
- try writer.print(
220
+ var writer = pkgconfig_file.writer(b.graph.io, &.{});
221
+ try writer.interface.print(
182
222
  \\prefix={0s}/{1s}
183
223
  \\includedir=${{prefix}}/include
184
224
  \\libdir=${{prefix}}/lib
@@ -190,12 +230,11 @@ pub fn build(b: *std.Build) !void {
190
230
  \\Cflags: -I${{includedir}}
191
231
  \\Libs: -L${{libdir}} -l{2s}
192
232
  , .{ dirname, b.install_path, name, repository.next().?, description, version });
193
- defer pkgconfig_file.close();
194
233
 
195
234
  b.installFile(file, b.fmt("share/pkgconfig/{s}", .{pc}));
196
235
  }
197
236
 
198
- const config = .{
237
+ const config: Config = .{
199
238
  .target = target,
200
239
  .optimize = optimize,
201
240
  .pic = pic,
@@ -206,7 +245,7 @@ pub fn build(b: *std.Build) !void {
206
245
  // TODO: tests can be run multiple times due to @imports
207
246
  const tests = TestStep.create(b, options, config);
208
247
 
209
- var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
248
+ var exes: ArrayList(*std.Build.Step.Compile) = .empty;
210
249
  const tools: ToolConfig = .{
211
250
  .options = .{
212
251
  .showdown = showdown,
@@ -214,6 +253,7 @@ pub fn build(b: *std.Build) !void {
214
253
  .chance = chance,
215
254
  .calc = calc,
216
255
  },
256
+ .module = pkmn,
217
257
  .general = config,
218
258
  .tool = .{
219
259
  .tests = if (tests.build) tests else null,
@@ -224,41 +264,121 @@ pub fn build(b: *std.Build) !void {
224
264
  var benchmark_config = tools;
225
265
  benchmark_config.general.optimize = .ReleaseFast;
226
266
  benchmark_config.general.strip = true;
227
- const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
267
+ const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
228
268
 
229
269
  var fuzz_config = tools;
230
270
  fuzz_config.general.strip = false;
231
271
  fuzz_config.tool.name = "fuzz";
232
- const fuzz = tool(b, "src/test/fuzz.zig", fuzz_config);
272
+ const fuzz = try tool(b, "src/test/fuzz.zig", fuzz_config);
233
273
 
234
- const analyze = tool(b, "src/tools/analyze.zig", tools);
235
- const dump = tool(b, "src/tools/dump.zig", tools);
236
- const transitions = tool(b, "src/tools/transitions.zig", tools);
274
+ const analyze = try tool(b, "src/tools/analyze.zig", tools);
275
+ const dump = try tool(b, "src/tools/dump.zig", tools);
276
+ const transitions = try tool(b, "src/tools/transitions.zig", tools);
237
277
 
238
278
  // FIXME: serde randomly fails to build in some release configurations
239
279
  var hack = tools;
240
280
  if (optimize != .Debug) hack.tool.tests = null;
241
- const serde = tool(b, "src/tools/serde.zig", hack);
281
+ const serde = try tool(b, "src/tools/serde.zig", hack);
242
282
 
243
- b.step("analyze", "Run LLVM analysis tool").dependOn(&analyze.step);
244
- b.step("benchmark", "Run benchmark code").dependOn(&benchmark.step);
245
- b.step("dump", "Run protocol dump tool").dependOn(&dump.step);
246
- b.step("fuzz", "Run fuzz tester").dependOn(&fuzz.step);
247
- b.step("serde", "Run serialization/deserialization tool").dependOn(&serde.step);
283
+ if (analyze) |t| b.step("analyze", "Run LLVM analysis tool").dependOn(&t.step);
284
+ if (benchmark) |t| b.step("benchmark", "Run benchmark code").dependOn(&t.step);
285
+ if (dump) |t| b.step("dump", "Run protocol dump tool").dependOn(&t.step);
286
+ if (fuzz) |t| b.step("fuzz", "Run fuzz tester").dependOn(&t.step);
287
+ if (serde) |t| b.step("serde", "Run serialization/deserialization tool").dependOn(&t.step);
248
288
  b.step("test", "Run all tests").dependOn(&tests.step);
249
289
  b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
250
- b.step("transitions", "Visualize transitions algorithm search").dependOn(&transitions.step);
290
+ if (transitions) |t| {
291
+ b.step("transitions", "Visualize transitions algorithm search").dependOn(&t.step);
292
+ }
293
+ }
294
+
295
+ fn buildWasm(
296
+ b: *std.Build,
297
+ name: []const u8,
298
+ root_src_file: []const u8,
299
+ optimize: std.builtin.OptimizeMode,
300
+ strip: ?bool,
301
+ pic: ?bool,
302
+ wasm_stack_size: u64,
303
+ import: ?*std.Build.Module,
304
+ options: anytype,
305
+ ) !void {
306
+ const mode = switch (optimize) {
307
+ .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
308
+ else => optimize,
309
+ };
310
+ // https://webassembly.org/features/
311
+ var features = std.Target.wasm.featureSet(&.{
312
+ .atomics,
313
+ .bulk_memory,
314
+ // .exception_handling,
315
+ .extended_const,
316
+ // .half_precision,
317
+ // .multimemory,
318
+ .mutable_globals,
319
+ .nontrapping_fptoint,
320
+ .reference_types,
321
+ // .relaxed_simd,
322
+ .sign_ext,
323
+ .simd128,
324
+ // .tail_call,
325
+ });
326
+ if (builtin.zig_version.order(try std.SemanticVersion.parse("0.12.0")) != .lt) {
327
+ features.addFeature(@intFromEnum(std.Target.wasm.Feature.multivalue));
328
+ }
329
+ const freestanding = b.resolveTargetQuery(.{
330
+ .cpu_arch = .wasm32,
331
+ .os_tag = .freestanding,
332
+ .cpu_features_add = features,
333
+ });
334
+ const path = b.path(root_src_file);
335
+ const exe = b.addExecutable(.{
336
+ .name = name,
337
+ .root_module = b.createModule(.{
338
+ .root_source_file = path,
339
+ .optimize = mode,
340
+ .target = freestanding,
341
+ .strip = strip,
342
+ .pic = pic,
343
+ }),
344
+ });
345
+
346
+ var file = try std.Io.Dir.cwd().openFile(b.graph.io, root_src_file, .{});
347
+ defer file.close(b.graph.io);
348
+ var reader = file.reader(b.graph.io, &.{});
349
+ const bytes = try reader.interface.allocRemaining(b.allocator, .unlimited);
350
+ exe.root_module.export_symbol_names = try exports(b, bytes);
351
+ exe.entry = .disabled;
352
+
353
+ if (import) |i| {
354
+ exe.root_module.addImport("pkmn", i);
355
+ }
356
+ exe.stack_size = wasm_stack_size;
357
+ exe.root_module.addOptions("build_options", options);
358
+
359
+ const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
360
+ if (optimize != .Debug and opt != null) {
361
+ const out = b.fmt("build/lib/{s}.wasm", .{name});
362
+ const sh = b.addSystemCommand(&.{ opt.?, "--enable-bulk-memory", "--enable-simd", "-O4" });
363
+ sh.addArtifactArg(exe);
364
+ sh.addArg("-o");
365
+ sh.addFileArg(b.path(out));
366
+ b.getInstallStep().dependOn(&sh.step);
367
+ } else {
368
+ b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
369
+ .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
370
+ }).step);
371
+ }
251
372
  }
252
373
 
253
374
  fn maybeStrip(
254
375
  b: *std.Build,
255
- artifact: *std.Build.CompileStep,
376
+ artifact: *std.Build.Step.Compile,
256
377
  step: *std.Build.Step,
257
- strip: bool,
378
+ strip: ?bool,
258
379
  cmd: ?[]const u8,
259
380
  ) void {
260
- artifact.strip = strip;
261
- if (!strip or cmd == null) return;
381
+ if (!(strip orelse false) or cmd == null) return;
262
382
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
263
383
  const mac = builtin.os.tag == .macos;
264
384
  if (mac and artifact.isDynamicLibrary()) return;
@@ -270,10 +390,10 @@ fn maybeStrip(
270
390
  }
271
391
 
272
392
  const Config = struct {
273
- target: std.zig.CrossTarget,
393
+ target: std.Build.ResolvedTarget,
274
394
  optimize: std.builtin.OptimizeMode,
275
- pic: bool,
276
- strip: bool,
395
+ pic: ?bool,
396
+ strip: ?bool,
277
397
  cmd: ?[]const u8,
278
398
  };
279
399
 
@@ -281,32 +401,30 @@ const TestStep = struct {
281
401
  step: std.Build.Step,
282
402
  build: bool,
283
403
 
284
- pub fn create(b: *std.Build, options: *std.Build.OptionsStep, config: Config) *TestStep {
404
+ pub fn create(b: *std.Build, options: *std.Build.Step.Options, config: Config) *TestStep {
285
405
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
286
- const test_file = b.option([]const u8, "test-file", "Input file for test");
287
406
  const test_filter =
288
407
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
289
408
 
290
409
  const self = b.allocator.create(TestStep) catch @panic("OOM");
291
410
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
292
- self.* = TestStep{ .step = step, .build = test_filter == null };
411
+ self.* = .{ .step = step, .build = test_filter == null };
293
412
 
294
- const path = test_file orelse "src/lib/test.zig";
413
+ const path = b.path("src/lib/test.zig");
295
414
  const tests = b.addTest(.{
296
- .name = b.fmt("{s}-{s}", .{
297
- std.fs.path.basename(std.fs.path.dirname(path).?),
298
- std.fs.path.stem(std.fs.path.basename(path)),
415
+ .root_module = b.createModule(.{
416
+ .root_source_file = path,
417
+ .optimize = config.optimize,
418
+ .target = config.target,
419
+ .single_threaded = true,
420
+ .strip = config.strip,
421
+ .pic = config.pic,
299
422
  }),
300
- .main_pkg_path = .{ .path = "." },
301
- .root_source_file = .{ .path = path },
302
- .optimize = config.optimize,
303
- .target = config.target,
304
- .filter = test_filter,
423
+ .filters = if (test_filter) |filter| &.{filter} else &.{},
305
424
  });
306
- tests.addOptions("build_options", options);
307
- tests.single_threaded = true;
425
+ tests.root_module.addOptions("build_options", options);
426
+
308
427
  maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
309
- if (config.pic) tests.force_pic = config.pic;
310
428
  if (coverage) |c| {
311
429
  tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
312
430
  }
@@ -318,15 +436,17 @@ const TestStep = struct {
318
436
 
319
437
  const ToolConfig = struct {
320
438
  options: Options,
439
+ module: ?*std.Build.Module,
321
440
  general: Config,
322
441
  tool: struct {
323
442
  tests: ?*TestStep,
324
443
  name: ?[]const u8 = null,
325
- exes: *std.ArrayList(*std.Build.CompileStep),
444
+ exes: *ArrayList(*std.Build.Step.Compile),
326
445
  },
327
446
  };
328
447
 
329
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep {
448
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
449
+ if (!try exists(b, path)) return null;
330
450
  var name = config.tool.name orelse std.fs.path.basename(path);
331
451
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
332
452
  if (index) |i| name = name[0..i];
@@ -334,16 +454,23 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
334
454
 
335
455
  const exe = b.addExecutable(.{
336
456
  .name = name,
337
- .root_source_file = .{ .path = path },
338
- .target = config.general.target,
339
- .optimize = config.general.optimize,
457
+ .root_module = b.createModule(.{
458
+ .root_source_file = b.path(path),
459
+ .target = config.general.target,
460
+ .optimize = config.general.optimize,
461
+ .strip = config.general.strip,
462
+ .pic = config.general.pic,
463
+ }),
340
464
  });
341
- exe.addModule("pkmn", module(b, config.options));
342
465
 
343
- exe.single_threaded = true;
344
- if (config.general.pic) exe.force_pic = config.general.pic;
466
+ const import = if (config.module) |m| m else module(b, config.options);
467
+ exe.root_module.addImport("pkmn", import);
468
+ if (config.general.target.result.os.tag == .windows) {
469
+ exe.root_module.linkSystemLibrary("advapi32", .{});
470
+ }
471
+
345
472
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
346
- config.tool.exes.append(exe) catch @panic("OOM");
473
+ config.tool.exes.append(b.allocator, exe) catch @panic("OOM");
347
474
 
348
475
  const run = b.addRunArtifact(exe);
349
476
  maybeStrip(b, exe, &run.step, config.general.strip, config.general.cmd);
@@ -352,14 +479,40 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
352
479
  return run;
353
480
  }
354
481
 
482
+ fn exists(b: *std.Build, path: []const u8) !bool {
483
+ std.Io.Dir.cwd().access(b.graph.io, path, .{}) catch |err| switch (err) {
484
+ error.FileNotFound => return false,
485
+ else => |e| return e,
486
+ };
487
+ return true;
488
+ }
489
+
355
490
  const ToolsStep = struct {
356
491
  step: std.Build.Step,
357
492
 
358
- pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.CompileStep)) *ToolsStep {
493
+ pub fn create(b: *std.Build, exes: *ArrayList(*std.Build.Step.Compile)) *ToolsStep {
359
494
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
360
495
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
361
- self.* = ToolsStep{ .step = step };
496
+ self.* = .{ .step = step };
362
497
  for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
363
498
  return self;
364
499
  }
365
500
  };
501
+
502
+ pub fn exports(b: *std.Build, bytes: []const u8) ![][]const u8 {
503
+ var symbols: ArrayList([]const u8) = .empty;
504
+
505
+ var it = std.mem.splitSequence(u8, bytes, "export ");
506
+ _ = it.next();
507
+ while (it.next()) |s| {
508
+ if (std.mem.startsWith(u8, s, "const ")) {
509
+ const i = std.mem.indexOf(u8, s[6..], " ").?;
510
+ try symbols.append(b.allocator, s[6 .. 6 + i]);
511
+ } else { // "fn "
512
+ const i = std.mem.indexOf(u8, s[3..], "(").?;
513
+ try symbols.append(b.allocator, s[3 .. 3 + i]);
514
+ }
515
+ }
516
+
517
+ return symbols.items;
518
+ }