@pkmn/engine 0.1.0-dev.550c3889 → 0.1.0-dev.565de616

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 (83) hide show
  1. package/LICENSE +1 -3
  2. package/README.md +97 -59
  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 +21 -0
  11. package/build/pkg/addon/wasm.js.map +1 -0
  12. package/build/pkg/addon.d.ts +22 -0
  13. package/build/pkg/addon.js +35 -57
  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 +12 -14
  21. package/build/pkg/gen1.js +39 -21
  22. package/build/pkg/gen1.js.map +1 -1
  23. package/build/pkg/index.d.ts +59 -15
  24. package/build/pkg/index.js +15 -10
  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 -68
  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 +141 -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 +333 -139
  40. package/package.json +84 -35
  41. package/src/bin/install-pkmn-engine +40 -25
  42. package/src/bin/pkmn-debug +1 -1
  43. package/src/lib/common/array.zig +77 -0
  44. package/src/lib/common/battle.zig +17 -0
  45. package/src/lib/common/data.zig +19 -31
  46. package/src/lib/common/debug.zig +58 -18
  47. package/src/lib/common/js.zig +120 -0
  48. package/src/lib/common/optional.zig +71 -0
  49. package/src/lib/common/options.zig +15 -0
  50. package/src/lib/common/protocol.zig +912 -372
  51. package/src/lib/common/rational.zig +449 -0
  52. package/src/lib/common/rng.zig +31 -24
  53. package/src/lib/common/util.zig +61 -0
  54. package/src/lib/gen1/calc.zig +953 -0
  55. package/src/lib/gen1/chance.zig +1185 -0
  56. package/src/lib/gen1/data/moves.zig +203 -193
  57. package/src/lib/gen1/data/species.zig +6 -8
  58. package/src/lib/gen1/data/types.zig +11 -12
  59. package/src/lib/gen1/data.zig +96 -85
  60. package/src/lib/gen1/helpers.zig +141 -55
  61. package/src/lib/gen1/mechanics.zig +1205 -814
  62. package/src/lib/gen2/calc.zig +153 -0
  63. package/src/lib/gen2/chance.zig +902 -0
  64. package/src/lib/gen2/data/items.zig +15 -23
  65. package/src/lib/gen2/data/moves.zig +665 -573
  66. package/src/lib/gen2/data/species.zig +3 -5
  67. package/src/lib/gen2/data/types.zig +138 -36
  68. package/src/lib/gen2/data.zig +130 -95
  69. package/src/lib/gen2/generated.zig +801 -0
  70. package/src/lib/gen2/helpers.zig +59 -44
  71. package/src/lib/gen2/mechanics.zig +3571 -30
  72. package/src/lib/node.zig +129 -0
  73. package/src/lib/pkmn.zig +85 -5
  74. package/src/lib/wasm.zig +12 -0
  75. package/src/tools/display/dom.ts +96 -0
  76. package/src/tools/display/ui.css +354 -0
  77. package/build/test/display.js +0 -383
  78. package/build/test/display.js.map +0 -1
  79. package/src/lib/binding/node.zig +0 -229
  80. package/src/lib/binding/wasm.zig +0 -10
  81. package/src/lib/gen1/README.md +0 -793
  82. package/src/lib/gen2/README.md +0 -309
  83. 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, log: ?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
26
  build_options.addOption(?bool, "log", options.log);
11
- return b.createModule(.{
12
- .source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
13
- .dependencies = &.{.{ .name = "build_options", .module = build_options.createModule() }},
14
- });
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,55 +47,100 @@ 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;
30
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;
31
54
 
32
55
  const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
33
56
 
34
- var parser = std.json.Parser.init(b.allocator, false);
35
- defer parser.deinit();
36
- var tree = try parser.parse(@embedFile("package.json"));
37
- defer tree.deinit();
38
- const version = tree.root.Object.get("version").?.String;
39
- const description = tree.root.Object.get("description").?.String;
40
- 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, ":");
41
63
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
42
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
+
43
71
  const showdown =
44
72
  b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
45
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");
46
77
 
47
78
  const options = b.addOptions();
48
79
  options.addOption(?bool, "showdown", showdown);
49
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
+ }
50
100
 
51
101
  const name = if (showdown) "pkmn-showdown" else "pkmn";
52
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
+
53
113
  var c = false;
54
114
  if (node_headers) |headers| {
55
115
  const addon = b.fmt("{s}.node", .{name});
56
- 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) .{
57
118
  .name = addon,
58
- .root_source_file = .{ .path = "src/lib/binding/node.zig" },
119
+ .root_source_file = path,
59
120
  .optimize = optimize,
60
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,
61
129
  });
62
- lib.addOptions("build_options", options);
63
- lib.setMainPkgPath("./");
64
- 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));
65
132
  lib.linkLibC();
66
133
  if (node_import_lib) |il| {
67
- lib.addObjectFile(il);
68
- } 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) {
69
136
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
70
137
  std.process.exit(1);
71
138
  }
72
139
  lib.linker_allow_shlib_undefined = true;
73
140
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
74
- if (pic) lib.force_pic = pic;
141
+ if (force_pic and pic orelse false) lib.force_pic = pic;
75
142
  // Always emit to build/lib because this is where the driver code expects to find it
76
- // 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):
77
144
  //
78
145
  // lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
79
146
  // b.getInstallStep().dependOn(&lib.step);
@@ -82,74 +149,80 @@ pub fn build(b: *std.Build) !void {
82
149
  // rename the file ourself in install-pkmn-engine
83
150
  b.installArtifact(lib);
84
151
  } else if (wasm) {
85
- const lib = b.addSharedLibrary(.{
86
- .name = name,
87
- .root_source_file = .{ .path = "src/lib/binding/wasm.zig" },
88
- .optimize = switch (optimize) {
89
- .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
90
- else => optimize,
91
- },
92
- .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
93
- });
94
- lib.addOptions("build_options", options);
95
- lib.setMainPkgPath("./");
96
- lib.stack_size = wasm_stack_size;
97
- lib.rdynamic = true;
98
- lib.strip = strip;
99
- if (pic) lib.force_pic = pic;
100
- const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
101
- if (optimize != .Debug and opt != null) {
102
- const out = b.fmt("build/lib/{s}.wasm", .{name});
103
- const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
104
- sh.addArtifactArg(lib);
105
- sh.addArg("-o");
106
- sh.addFileSourceArg(.{ .path = out });
107
- b.getInstallStep().dependOn(&sh.step);
108
- }
109
- b.installArtifact(lib);
152
+ try buildWasm(b, name, "src/lib/wasm.zig", optimize, strip, pic, wasm_stack_size, options);
110
153
  } else if (dynamic) {
111
- 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) .{
112
156
  .name = name,
113
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
114
- .version = try std.builtin.Version.parse(version),
157
+ .root_source_file = path,
158
+ .version = try std.SemanticVersion.parse(version),
115
159
  .optimize = optimize,
116
160
  .target = target,
161
+ } else .{
162
+ .name = name,
163
+ .root_source_file = path,
164
+ .version = try std.SemanticVersion.parse(version),
165
+ .optimize = optimize,
166
+ .target = target,
167
+ .strip = strip,
168
+ .pic = pic,
117
169
  });
118
- lib.addOptions("build_options", options);
119
- lib.setMainPkgPath("./");
120
- 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"));
121
172
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
122
- if (pic) lib.force_pic = pic;
173
+ if (force_pic and pic orelse false) lib.force_pic = pic;
123
174
  b.installArtifact(lib);
124
175
  c = true;
125
176
  } else {
126
- 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) .{
127
179
  .name = name,
128
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
180
+ .root_source_file = path,
129
181
  .optimize = optimize,
130
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,
131
190
  });
132
- lib.addOptions("build_options", options);
133
- lib.setMainPkgPath("./");
134
- 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"));
135
193
  lib.bundle_compiler_rt = true;
136
194
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
137
- if (pic) lib.force_pic = pic;
138
- if (emit_asm) lib.emit_asm = .emit;
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
+ }
139
210
  b.installArtifact(lib);
140
211
  c = true;
141
212
  }
142
213
 
143
214
  if (c) {
144
- const header = b.addInstallFileWithDir(
145
- .{ .path = "src/include/pkmn.h" },
146
- .header,
147
- "pkmn.h",
148
- );
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");
149
218
  b.getInstallStep().dependOn(&header.step);
150
219
 
151
220
  const pc = b.fmt("lib{s}.pc", .{name});
152
- 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
+ );
153
226
  const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
154
227
 
155
228
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
@@ -178,14 +251,21 @@ pub fn build(b: *std.Build) !void {
178
251
  .strip = strip,
179
252
  .cmd = cmd,
180
253
  };
254
+
255
+ // TODO: tests can be run multiple times due to @imports
181
256
  const tests = TestStep.create(b, options, config);
182
257
 
183
- var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
258
+ var exes = std.ArrayList(*Step.Compile).init(b.allocator);
184
259
  const tools: ToolConfig = .{
185
- .general = config,
186
- .tool = .{
260
+ .options = .{
187
261
  .showdown = showdown,
188
262
  .log = log,
263
+ .chance = chance,
264
+ .calc = calc,
265
+ },
266
+ .module = pkmn,
267
+ .general = config,
268
+ .tool = .{
189
269
  .tests = if (tests.build) tests else null,
190
270
  .exes = &exes,
191
271
  },
@@ -194,39 +274,115 @@ pub fn build(b: *std.Build) !void {
194
274
  var benchmark_config = tools;
195
275
  benchmark_config.general.optimize = .ReleaseFast;
196
276
  benchmark_config.general.strip = true;
197
- const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
277
+ const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
198
278
 
199
279
  var fuzz_config = tools;
200
280
  fuzz_config.general.strip = false;
201
281
  fuzz_config.tool.name = "fuzz";
202
- const fuzz = tool(b, "src/test/benchmark.zig", fuzz_config);
203
-
204
- const serde = tool(b, "src/tools/serde.zig", tools);
205
- const protocol = tool(b, "src/tools/protocol.zig", tools);
206
-
207
- const lint_exe =
208
- b.addExecutable(.{ .name = "lint", .root_source_file = .{ .path = "src/tools/lint.zig" } });
209
- if (tests.build) tests.step.dependOn(&lint_exe.step);
210
- const lint = b.addRunArtifact(lint_exe);
211
-
212
- b.step("benchmark", "Run benchmark code").dependOn(&benchmark.step);
213
- b.step("fuzz", "Run fuzz tester").dependOn(&fuzz.step);
214
- b.step("lint", "Lint source files").dependOn(&lint.step);
215
- b.step("protocol", "Run protocol dump tool").dependOn(&protocol.step);
216
- 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);
217
298
  b.step("test", "Run all tests").dependOn(&tests.step);
218
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
+ const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
321
+ b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding })
322
+ else
323
+ ResolvedTarget{ .cpu_arch = .wasm32, .os_tag = .freestanding };
324
+ const path = if (has_path) .{ .path = root_src_file } else b.path(root_src_file);
325
+ const bin = if (entry) bin: {
326
+ const exe = b.addExecutable(if (force_pic) .{
327
+ .name = name,
328
+ .root_source_file = path,
329
+ .optimize = mode,
330
+ .target = freestanding,
331
+ } else .{
332
+ .name = name,
333
+ .root_source_file = path,
334
+ .optimize = mode,
335
+ .target = freestanding,
336
+ .strip = strip,
337
+ .pic = pic,
338
+ });
339
+ (if (root_module) exe.root_module else exe).export_symbol_names = try exports(b);
340
+ exe.entry = .disabled;
341
+ break :bin exe;
342
+ } else bin: {
343
+ const lib = b.addSharedLibrary(.{
344
+ .name = name,
345
+ .root_source_file = path,
346
+ .optimize = mode,
347
+ .target = freestanding,
348
+ });
349
+ lib.rdynamic = true;
350
+ break :bin lib;
351
+ };
352
+ bin.stack_size = wasm_stack_size;
353
+ if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
354
+ if (force_pic and pic orelse false) bin.force_pic = pic;
355
+ (if (root_module) bin.root_module else bin).addOptions("build_options", options);
356
+
357
+ const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
358
+ if (optimize != .Debug and opt != null) {
359
+ const out = b.fmt("build/lib/{s}.wasm", .{name});
360
+ const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
361
+ sh.addArtifactArg(bin);
362
+ sh.addArg("-o");
363
+ if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
364
+ sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
365
+ } else {
366
+ sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
367
+ }
368
+ b.getInstallStep().dependOn(&sh.step);
369
+ if (!entry) b.installArtifact(bin);
370
+ } else if (entry) {
371
+ b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
372
+ .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
373
+ }).step);
374
+ }
219
375
  }
220
376
 
221
377
  fn maybeStrip(
222
378
  b: *std.Build,
223
- artifact: *std.Build.CompileStep,
379
+ artifact: *Step.Compile,
224
380
  step: *std.Build.Step,
225
- strip: bool,
381
+ strip: ?bool,
226
382
  cmd: ?[]const u8,
227
383
  ) void {
228
- artifact.strip = strip;
229
- if (!strip or cmd == null) return;
384
+ if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
385
+ if (!(strip orelse false) or cmd == null) return;
230
386
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
231
387
  const mac = builtin.os.tag == .macos;
232
388
  if (mac and artifact.isDynamicLibrary()) return;
@@ -238,86 +394,104 @@ fn maybeStrip(
238
394
  }
239
395
 
240
396
  const Config = struct {
241
- target: std.zig.CrossTarget,
397
+ target: ResolvedTarget,
242
398
  optimize: std.builtin.OptimizeMode,
243
- pic: bool,
244
- strip: bool,
399
+ pic: ?bool,
400
+ strip: ?bool,
245
401
  cmd: ?[]const u8,
246
402
  };
247
403
 
248
- const TESTS = .{
249
- "src/lib/common/test.zig",
250
- "src/lib/gen1/test.zig",
251
- "src/lib/gen2/test.zig",
252
- };
253
-
254
404
  const TestStep = struct {
255
405
  step: std.Build.Step,
256
406
  build: bool,
257
407
 
258
- pub fn create(b: *std.Build, options: *std.Build.OptionsStep, config: Config) *TestStep {
408
+ pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
259
409
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
260
- const test_file = b.option([]const u8, "test-file", "Input file for test");
261
410
  const test_filter =
262
411
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
263
412
 
264
413
  const self = b.allocator.create(TestStep) catch @panic("OOM");
265
414
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
266
- self.* = TestStep{ .step = step, .build = test_filter == null };
267
-
268
- const paths: []const []const u8 =
269
- if (test_file) |t| &.{t} else if (coverage != null) &.{"src/lib/test.zig"} else &TESTS;
270
- for (paths) |path| {
271
- const tests = b.addTest(.{
272
- .name = std.fs.path.basename(std.fs.path.dirname(path).?),
273
- .root_source_file = .{ .path = path },
274
- .optimize = config.optimize,
275
- .target = config.target,
276
- .filter = test_filter,
277
- });
278
- tests.setMainPkgPath("./");
279
- tests.addOptions("build_options", options);
415
+ self.* = .{ .step = step, .build = test_filter == null };
416
+
417
+ const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
418
+ const tests = b.addTest(if (force_pic) .{
419
+ .root_source_file = path,
420
+ .optimize = config.optimize,
421
+ .target = config.target,
422
+ .filter = test_filter,
423
+ } else .{
424
+ .root_source_file = path,
425
+ .optimize = config.optimize,
426
+ .target = config.target,
427
+ .filter = test_filter,
428
+ .single_threaded = true,
429
+ .strip = config.strip,
430
+ .pic = config.pic,
431
+ });
432
+ (if (root_module) tests.root_module else tests).addOptions("build_options", options);
433
+
434
+ maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
435
+ if (force_pic) {
280
436
  tests.single_threaded = true;
281
- maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
282
- if (config.pic) tests.force_pic = config.pic;
283
- if (coverage) |c| {
284
- tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
285
- }
286
- self.step.dependOn(&b.addRunArtifact(tests).step);
437
+ if (config.pic orelse false) tests.force_pic = config.pic;
438
+ }
439
+ if (coverage) |c| {
440
+ tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
287
441
  }
442
+ self.step.dependOn(&b.addRunArtifact(tests).step);
443
+
288
444
  return self;
289
445
  }
290
446
  };
291
447
 
292
448
  const ToolConfig = struct {
449
+ options: Options,
450
+ module: ?*std.Build.Module,
293
451
  general: Config,
294
452
  tool: struct {
295
- showdown: bool,
296
- log: bool,
297
453
  tests: ?*TestStep,
298
454
  name: ?[]const u8 = null,
299
- exes: *std.ArrayList(*std.Build.CompileStep),
455
+ exes: *std.ArrayList(*Step.Compile),
300
456
  },
301
457
  };
302
458
 
303
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep {
459
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
460
+ std.fs.cwd().access(path, .{}) catch |err| switch (err) {
461
+ error.FileNotFound => return null,
462
+ else => |e| return e,
463
+ };
304
464
  var name = config.tool.name orelse std.fs.path.basename(path);
305
465
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
306
466
  if (index) |i| name = name[0..i];
307
- if (config.tool.showdown) name = b.fmt("{s}-showdown", .{name});
467
+ if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
308
468
 
309
- const exe = b.addExecutable(.{
469
+ const exe = b.addExecutable(if (force_pic) .{
310
470
  .name = name,
311
- .root_source_file = .{ .path = path },
471
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
312
472
  .target = config.general.target,
313
473
  .optimize = config.general.optimize,
474
+ } else .{
475
+ .name = name,
476
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
477
+ .target = config.general.target,
478
+ .optimize = config.general.optimize,
479
+ .single_threaded = true,
480
+ .strip = config.general.strip,
481
+ .pic = config.general.pic,
314
482
  });
315
- exe.addModule("pkmn", module(b, .{
316
- .showdown = config.tool.showdown,
317
- .log = config.tool.log,
318
- }));
319
- exe.single_threaded = true;
320
- if (config.general.pic) exe.force_pic = config.general.pic;
483
+
484
+ if (root_module) {
485
+ const import = if (config.module) |m| m else module(b, config.options);
486
+ exe.root_module.addImport("pkmn", import);
487
+ } else {
488
+ exe.addModule("pkmn", module(b, config.options));
489
+ }
490
+
491
+ if (force_pic) {
492
+ exe.single_threaded = true;
493
+ if (config.general.pic orelse false) exe.force_pic = config.general.pic;
494
+ }
321
495
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
322
496
  config.tool.exes.append(exe) catch @panic("OOM");
323
497
 
@@ -331,11 +505,31 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
331
505
  const ToolsStep = struct {
332
506
  step: std.Build.Step,
333
507
 
334
- pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.CompileStep)) *ToolsStep {
508
+ pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
335
509
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
336
510
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
337
- self.* = ToolsStep{ .step = step };
338
- for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t).step);
511
+ self.* = .{ .step = step };
512
+ for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
339
513
  return self;
340
514
  }
341
515
  };
516
+
517
+ fn detect(target: anytype) std.Target {
518
+ if (@hasField(@TypeOf(target), "result")) return target.result;
519
+ return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
520
+ }
521
+
522
+ const WASM = @embedFile("src/lib/wasm.zig");
523
+
524
+ fn exports(b: *std.Build) ![][]const u8 {
525
+ var symbols = std.ArrayList([]const u8).init(b.allocator);
526
+
527
+ var it = std.mem.splitSequence(u8, WASM, "export const ");
528
+ _ = it.next();
529
+ while (it.next()) |s| {
530
+ const i = std.mem.indexOf(u8, s, " ").?;
531
+ try symbols.append(s[0..i]);
532
+ }
533
+
534
+ return symbols.items;
535
+ }