@pkmn/engine 0.1.0-dev.437f6a52 → 0.1.0-dev.43ee07e2

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 (80) hide show
  1. package/LICENSE +1 -3
  2. package/README.md +87 -52
  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 -58
  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 +2 -2
  17. package/build/pkg/data/protocol.json +69 -12
  18. package/build/pkg/data.d.ts +27 -5
  19. package/build/pkg/data.js.map +1 -1
  20. package/build/pkg/gen1.js +3 -3
  21. package/build/pkg/gen1.js.map +1 -1
  22. package/build/pkg/index.d.ts +24 -10
  23. package/build/pkg/index.js +15 -10
  24. package/build/pkg/index.js.map +1 -1
  25. package/build/pkg/protocol.d.ts +20 -1
  26. package/build/pkg/protocol.js +123 -102
  27. package/build/pkg/protocol.js.map +1 -1
  28. package/build/tools/debug.js +36 -68
  29. package/build/tools/debug.js.map +1 -1
  30. package/build/tools/display/debug.jsx +141 -0
  31. package/build/tools/display/debug.jsx.map +1 -0
  32. package/build/tools/display/index.js +141 -0
  33. package/build/tools/display/index.js.map +1 -0
  34. package/build/tools/display/ui.jsx +349 -0
  35. package/build/tools/display/ui.jsx.map +1 -0
  36. package/build/tools/display/util.js +18 -0
  37. package/build/tools/display/util.js.map +1 -0
  38. package/build.zig +304 -125
  39. package/package.json +83 -34
  40. package/src/bin/install-pkmn-engine +31 -21
  41. package/src/bin/pkmn-debug +1 -1
  42. package/src/lib/common/array.zig +77 -0
  43. package/src/lib/common/battle.zig +17 -0
  44. package/src/lib/common/data.zig +12 -24
  45. package/src/lib/common/debug.zig +39 -8
  46. package/src/lib/common/js.zig +120 -0
  47. package/src/lib/common/optional.zig +71 -0
  48. package/src/lib/common/options.zig +6 -0
  49. package/src/lib/common/protocol.zig +811 -332
  50. package/src/lib/common/rational.zig +449 -0
  51. package/src/lib/common/rng.zig +22 -15
  52. package/src/lib/common/util.zig +61 -0
  53. package/src/lib/gen1/calc.zig +953 -0
  54. package/src/lib/gen1/chance.zig +1185 -0
  55. package/src/lib/gen1/data/moves.zig +193 -183
  56. package/src/lib/gen1/data/species.zig +4 -6
  57. package/src/lib/gen1/data/types.zig +8 -9
  58. package/src/lib/gen1/data.zig +67 -77
  59. package/src/lib/gen1/helpers.zig +91 -409
  60. package/src/lib/gen1/mechanics.zig +669 -612
  61. package/src/lib/gen2/calc.zig +153 -0
  62. package/src/lib/gen2/chance.zig +902 -0
  63. package/src/lib/gen2/data/items.zig +13 -21
  64. package/src/lib/gen2/data/moves.zig +664 -572
  65. package/src/lib/gen2/data/species.zig +2 -4
  66. package/src/lib/gen2/data/types.zig +135 -33
  67. package/src/lib/gen2/data.zig +115 -91
  68. package/src/lib/gen2/generated.zig +801 -0
  69. package/src/lib/gen2/helpers.zig +54 -37
  70. package/src/lib/gen2/mechanics.zig +3569 -29
  71. package/src/lib/{binding/node.zig → node.zig} +9 -14
  72. package/src/lib/pkmn.zig +36 -15
  73. package/src/lib/{binding/wasm.zig → wasm.zig} +1 -1
  74. package/src/tools/display/dom.ts +96 -0
  75. package/src/tools/display/ui.css +354 -0
  76. package/build/test/display.js +0 -400
  77. package/build/test/display.js.map +0 -1
  78. package/src/lib/gen1/README.md +0 -814
  79. package/src/lib/gen2/README.md +0 -309
  80. package/src/test/display/pkmn.html.tmpl +0 -368
package/build.zig CHANGED
@@ -1,5 +1,5 @@
1
- const std = @import("std");
2
1
  const builtin = @import("builtin");
2
+ const std = @import("std");
3
3
 
4
4
  pub const Options = struct {
5
5
  showdown: ?bool = null,
@@ -8,6 +8,17 @@ pub const Options = struct {
8
8
  calc: ?bool = null,
9
9
  };
10
10
 
11
+ const Step = if (@hasDecl(std.Build, "Step")) std.Build.Step else .{
12
+ .Compile = std.Build.CompileStep,
13
+ .Options = std.Build.OptionsStep,
14
+ .Run = std.Build.RunStep,
15
+ };
16
+ const has_path = @hasField(std.Build.LazyPath, "path");
17
+ const root_module = @hasField(Step.Compile, "root_module");
18
+ const force_pic = !@hasField(std.Build.SharedLibraryOptions, "pic");
19
+ const ResolvedTarget =
20
+ if (@hasDecl(std.Build, "ResolvedTarget")) std.Build.ResolvedTarget else std.zig.CrossTarget;
21
+
11
22
  pub fn module(b: *std.Build, options: Options) *std.Build.Module {
12
23
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
13
24
  const build_options = b.addOptions();
@@ -15,16 +26,20 @@ pub fn module(b: *std.Build, options: Options) *std.Build.Module {
15
26
  build_options.addOption(?bool, "log", options.log);
16
27
  build_options.addOption(?bool, "chance", options.chance);
17
28
  build_options.addOption(?bool, "calc", options.calc);
18
- return b.createModule(.{
19
- .source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
20
- .dependencies = &.{.{ .name = "build_options", .module = build_options.createModule() }},
21
- });
29
+
30
+ const root_source_file = .{ .cwd_relative = dirname ++ "/src/lib/pkmn.zig" };
31
+ const imports = &.{.{ .name = "build_options", .module = build_options.createModule() }};
32
+ return b.createModule(if (@hasDecl(std.Build, "CreateModuleOptions"))
33
+ .{ .source_file = root_source_file, .dependencies = imports }
34
+ else
35
+ .{ .root_source_file = root_source_file, .imports = imports });
22
36
  }
23
37
 
24
38
  pub fn build(b: *std.Build) !void {
25
39
  const target = b.standardTargetOptions(.{});
26
40
  const optimize = b.standardOptimizeOption(.{});
27
41
 
42
+ const default: ?bool = if (force_pic) false else null;
28
43
  const node_headers = b.option([]const u8, "node-headers", "Path to node-headers");
29
44
  const node_import_lib =
30
45
  b.option([]const u8, "node-import-library", "Path to node import library (Windows)");
@@ -32,9 +47,10 @@ pub fn build(b: *std.Build) !void {
32
47
  const wasm_stack_size =
33
48
  b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
34
49
  const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
35
- const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse false;
36
- 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;
37
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;
38
54
 
39
55
  const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
40
56
 
@@ -43,14 +59,21 @@ pub fn build(b: *std.Build) !void {
43
59
  defer parsed.deinit();
44
60
  const version = parsed.value.object.get("version").?.string;
45
61
  const description = parsed.value.object.get("description").?.string;
46
- var repository = std.mem.split(u8, parsed.value.object.get("repository").?.string, ":");
62
+ var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
47
63
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
48
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
+
49
71
  const showdown =
50
72
  b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
51
73
  const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
52
74
  const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
53
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");
54
77
 
55
78
  const options = b.addOptions();
56
79
  options.addOption(?bool, "showdown", showdown);
@@ -58,32 +81,66 @@ pub fn build(b: *std.Build) !void {
58
81
  options.addOption(?bool, "chance", chance);
59
82
  options.addOption(?bool, "calc", calc);
60
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
+ }
100
+
61
101
  const name = if (showdown) "pkmn-showdown" else "pkmn";
62
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
+
63
113
  var c = false;
64
114
  if (node_headers) |headers| {
65
115
  const addon = b.fmt("{s}.node", .{name});
66
- 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) .{
118
+ .name = addon,
119
+ .root_source_file = path,
120
+ .optimize = optimize,
121
+ .target = target,
122
+ } else .{
67
123
  .name = addon,
68
- .root_source_file = .{ .path = "src/lib/binding/node.zig" },
124
+ .root_source_file = path,
69
125
  .optimize = optimize,
70
126
  .target = target,
127
+ .strip = strip,
128
+ .pic = pic,
71
129
  });
72
- lib.addOptions("build_options", options);
73
- lib.setMainPkgPath("./");
74
- 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));
75
132
  lib.linkLibC();
76
133
  if (node_import_lib) |il| {
77
- lib.addObjectFile(il);
78
- } 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) {
79
136
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
80
137
  std.process.exit(1);
81
138
  }
82
139
  lib.linker_allow_shlib_undefined = true;
83
140
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
84
- if (pic) lib.force_pic = pic;
141
+ if (force_pic and pic orelse false) lib.force_pic = pic;
85
142
  // Always emit to build/lib because this is where the driver code expects to find it
86
- // 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):
87
144
  //
88
145
  // lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
89
146
  // b.getInstallStep().dependOn(&lib.step);
@@ -92,74 +149,80 @@ pub fn build(b: *std.Build) !void {
92
149
  // rename the file ourself in install-pkmn-engine
93
150
  b.installArtifact(lib);
94
151
  } else if (wasm) {
95
- const lib = b.addSharedLibrary(.{
96
- .name = name,
97
- .root_source_file = .{ .path = "src/lib/binding/wasm.zig" },
98
- .optimize = switch (optimize) {
99
- .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
100
- else => optimize,
101
- },
102
- .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
103
- });
104
- lib.addOptions("build_options", options);
105
- lib.setMainPkgPath("./");
106
- lib.stack_size = wasm_stack_size;
107
- lib.rdynamic = true;
108
- lib.strip = strip;
109
- if (pic) lib.force_pic = pic;
110
- const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
111
- if (optimize != .Debug and opt != null) {
112
- const out = b.fmt("build/lib/{s}.wasm", .{name});
113
- const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
114
- sh.addArtifactArg(lib);
115
- sh.addArg("-o");
116
- sh.addFileSourceArg(.{ .path = out });
117
- b.getInstallStep().dependOn(&sh.step);
118
- }
119
- b.installArtifact(lib);
152
+ try buildWasm(b, name, "src/lib/wasm.zig", optimize, strip, pic, wasm_stack_size, options);
120
153
  } else if (dynamic) {
121
- 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) .{
122
156
  .name = name,
123
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
157
+ .root_source_file = path,
124
158
  .version = try std.SemanticVersion.parse(version),
125
159
  .optimize = optimize,
126
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,
127
169
  });
128
- lib.addOptions("build_options", options);
129
- lib.setMainPkgPath("./");
130
- 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"));
131
172
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
132
- if (pic) lib.force_pic = pic;
173
+ if (force_pic and pic orelse false) lib.force_pic = pic;
133
174
  b.installArtifact(lib);
134
175
  c = true;
135
176
  } else {
136
- 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) .{
137
179
  .name = name,
138
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
180
+ .root_source_file = path,
139
181
  .optimize = optimize,
140
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,
141
190
  });
142
- lib.addOptions("build_options", options);
143
- lib.setMainPkgPath("./");
144
- 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"));
145
193
  lib.bundle_compiler_rt = true;
146
194
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
147
- if (pic) lib.force_pic = pic;
148
- 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
+ }
149
210
  b.installArtifact(lib);
150
211
  c = true;
151
212
  }
152
213
 
153
214
  if (c) {
154
- const header = b.addInstallFileWithDir(
155
- .{ .path = "src/include/pkmn.h" },
156
- .header,
157
- "pkmn.h",
158
- );
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");
159
218
  b.getInstallStep().dependOn(&header.step);
160
219
 
161
220
  const pc = b.fmt("lib{s}.pc", .{name});
162
- 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
+ );
163
226
  const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
164
227
 
165
228
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
@@ -192,7 +255,7 @@ pub fn build(b: *std.Build) !void {
192
255
  // TODO: tests can be run multiple times due to @imports
193
256
  const tests = TestStep.create(b, options, config);
194
257
 
195
- var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
258
+ var exes = std.ArrayList(*Step.Compile).init(b.allocator);
196
259
  const tools: ToolConfig = .{
197
260
  .options = .{
198
261
  .showdown = showdown,
@@ -200,6 +263,7 @@ pub fn build(b: *std.Build) !void {
200
263
  .chance = chance,
201
264
  .calc = calc,
202
265
  },
266
+ .module = pkmn,
203
267
  .general = config,
204
268
  .tool = .{
205
269
  .tests = if (tests.build) tests else null,
@@ -210,41 +274,115 @@ pub fn build(b: *std.Build) !void {
210
274
  var benchmark_config = tools;
211
275
  benchmark_config.general.optimize = .ReleaseFast;
212
276
  benchmark_config.general.strip = true;
213
- const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
277
+ const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
214
278
 
215
279
  var fuzz_config = tools;
216
280
  fuzz_config.general.strip = false;
217
281
  fuzz_config.tool.name = "fuzz";
218
- const fuzz = tool(b, "src/test/fuzz.zig", fuzz_config);
219
-
220
- const dump = tool(b, "src/tools/dump.zig", tools);
221
- const serde = tool(b, "src/tools/serde.zig", tools);
222
- const transitions = tool(b, "src/tools/transitions.zig", tools);
223
-
224
- const lint_exe =
225
- b.addExecutable(.{ .name = "lint", .root_source_file = .{ .path = "src/tools/lint.zig" } });
226
- if (tests.build) tests.step.dependOn(&lint_exe.step);
227
- const lint = b.addRunArtifact(lint_exe);
228
-
229
- b.step("benchmark", "Run benchmark code").dependOn(&benchmark.step);
230
- b.step("dump", "Run protocol dump tool").dependOn(&dump.step);
231
- b.step("fuzz", "Run fuzz tester").dependOn(&fuzz.step);
232
- b.step("lint", "Lint source files").dependOn(&lint.step);
233
- 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);
234
298
  b.step("test", "Run all tests").dependOn(&tests.step);
235
299
  b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
236
- b.step("transitions", "Visualize transitions algorithm search").dependOn(&transitions.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
+ }
237
375
  }
238
376
 
239
377
  fn maybeStrip(
240
378
  b: *std.Build,
241
- artifact: *std.Build.CompileStep,
379
+ artifact: *Step.Compile,
242
380
  step: *std.Build.Step,
243
- strip: bool,
381
+ strip: ?bool,
244
382
  cmd: ?[]const u8,
245
383
  ) void {
246
- artifact.strip = strip;
247
- 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;
248
386
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
249
387
  const mac = builtin.os.tag == .macos;
250
388
  if (mac and artifact.isDynamicLibrary()) return;
@@ -256,83 +394,104 @@ fn maybeStrip(
256
394
  }
257
395
 
258
396
  const Config = struct {
259
- target: std.zig.CrossTarget,
397
+ target: ResolvedTarget,
260
398
  optimize: std.builtin.OptimizeMode,
261
- pic: bool,
262
- strip: bool,
399
+ pic: ?bool,
400
+ strip: ?bool,
263
401
  cmd: ?[]const u8,
264
402
  };
265
403
 
266
- const TESTS = .{
267
- "src/lib/common/test.zig",
268
- "src/lib/gen1/test.zig",
269
- "src/lib/gen2/test.zig",
270
- };
271
-
272
404
  const TestStep = struct {
273
405
  step: std.Build.Step,
274
406
  build: bool,
275
407
 
276
- 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 {
277
409
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
278
- const test_file = b.option([]const u8, "test-file", "Input file for test");
279
410
  const test_filter =
280
411
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
281
412
 
282
413
  const self = b.allocator.create(TestStep) catch @panic("OOM");
283
414
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
284
- self.* = TestStep{ .step = step, .build = test_filter == null };
285
-
286
- const paths: []const []const u8 =
287
- if (test_file) |t| &.{t} else if (coverage != null) &.{"src/lib/test.zig"} else &TESTS;
288
- for (paths) |path| {
289
- const tests = b.addTest(.{
290
- .name = std.fs.path.basename(std.fs.path.dirname(path).?),
291
- .root_source_file = .{ .path = path },
292
- .optimize = config.optimize,
293
- .target = config.target,
294
- .filter = test_filter,
295
- });
296
- tests.setMainPkgPath("./");
297
- 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) {
298
436
  tests.single_threaded = true;
299
- maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
300
- if (config.pic) tests.force_pic = config.pic;
301
- if (coverage) |c| {
302
- tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
303
- }
304
- 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 });
305
441
  }
442
+ self.step.dependOn(&b.addRunArtifact(tests).step);
443
+
306
444
  return self;
307
445
  }
308
446
  };
309
447
 
310
448
  const ToolConfig = struct {
311
449
  options: Options,
450
+ module: ?*std.Build.Module,
312
451
  general: Config,
313
452
  tool: struct {
314
453
  tests: ?*TestStep,
315
454
  name: ?[]const u8 = null,
316
- exes: *std.ArrayList(*std.Build.CompileStep),
455
+ exes: *std.ArrayList(*Step.Compile),
317
456
  },
318
457
  };
319
458
 
320
- 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
+ };
321
464
  var name = config.tool.name orelse std.fs.path.basename(path);
322
465
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
323
466
  if (index) |i| name = name[0..i];
324
467
  if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
325
468
 
326
- const exe = b.addExecutable(.{
469
+ const exe = b.addExecutable(if (force_pic) .{
470
+ .name = name,
471
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
472
+ .target = config.general.target,
473
+ .optimize = config.general.optimize,
474
+ } else .{
327
475
  .name = name,
328
- .root_source_file = .{ .path = path },
476
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
329
477
  .target = config.general.target,
330
478
  .optimize = config.general.optimize,
479
+ .single_threaded = true,
480
+ .strip = config.general.strip,
481
+ .pic = config.general.pic,
331
482
  });
332
- exe.addModule("pkmn", module(b, config.options));
333
483
 
334
- exe.single_threaded = true;
335
- if (config.general.pic) exe.force_pic = config.general.pic;
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
+ }
336
495
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
337
496
  config.tool.exes.append(exe) catch @panic("OOM");
338
497
 
@@ -346,11 +505,31 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
346
505
  const ToolsStep = struct {
347
506
  step: std.Build.Step,
348
507
 
349
- 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 {
350
509
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
351
510
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
352
- self.* = ToolsStep{ .step = step };
353
- 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);
354
513
  return self;
355
514
  }
356
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
+ }