@pkmn/engine 0.1.0-dev.fb5bf955 → 0.1.0-dev.fb6653d6

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