@pkmn/engine 0.1.0-dev.a5a9f4b2 → 0.1.0-dev.a77ab8e2

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 (62) hide show
  1. package/LICENSE +1 -3
  2. package/README.md +102 -64
  3. package/build/pkg/addon.d.ts +1 -1
  4. package/build/pkg/addon.js +13 -13
  5. package/build/pkg/addon.js.map +1 -1
  6. package/build/pkg/data/ids.json +12 -12
  7. package/build/pkg/data/layout.json +27 -5
  8. package/build/pkg/data/protocol.json +69 -12
  9. package/build/pkg/data.d.ts +4 -4
  10. package/build/pkg/data.js.map +1 -1
  11. package/build/pkg/gen1.d.ts +5 -4
  12. package/build/pkg/gen1.js +48 -32
  13. package/build/pkg/gen1.js.map +1 -1
  14. package/build/pkg/index.d.ts +18 -14
  15. package/build/pkg/index.js.map +1 -1
  16. package/build/pkg/protocol.d.ts +4 -2
  17. package/build/pkg/protocol.js +65 -44
  18. package/build/pkg/protocol.js.map +1 -1
  19. package/build/test/display.js +37 -15
  20. package/build/test/display.js.map +1 -1
  21. package/build/tools/debug.js +5 -4
  22. package/build/tools/debug.js.map +1 -1
  23. package/build.zig +291 -134
  24. package/package.json +58 -25
  25. package/src/bin/install-pkmn-engine +40 -25
  26. package/src/lib/common/array.zig +77 -0
  27. package/src/lib/common/battle.zig +17 -0
  28. package/src/lib/common/data.zig +19 -31
  29. package/src/lib/common/debug.zig +23 -13
  30. package/src/lib/common/js.zig +120 -0
  31. package/src/lib/common/optional.zig +71 -0
  32. package/src/lib/common/options.zig +14 -3
  33. package/src/lib/common/protocol.zig +947 -403
  34. package/src/lib/common/rational.zig +447 -0
  35. package/src/lib/common/rng.zig +31 -22
  36. package/src/lib/common/util.zig +61 -0
  37. package/src/lib/gen1/calc.zig +806 -0
  38. package/src/lib/gen1/chance.zig +1167 -0
  39. package/src/lib/gen1/data/moves.zig +202 -190
  40. package/src/lib/gen1/data/species.zig +5 -5
  41. package/src/lib/gen1/data/types.zig +10 -10
  42. package/src/lib/gen1/data.zig +93 -78
  43. package/src/lib/gen1/helpers.zig +144 -39
  44. package/src/lib/gen1/mechanics.zig +1211 -795
  45. package/src/lib/gen2/calc.zig +161 -0
  46. package/src/lib/gen2/chance.zig +905 -0
  47. package/src/lib/gen2/data/items.zig +14 -20
  48. package/src/lib/gen2/data/moves.zig +664 -570
  49. package/src/lib/gen2/data/species.zig +2 -2
  50. package/src/lib/gen2/data/types.zig +137 -34
  51. package/src/lib/gen2/data.zig +125 -86
  52. package/src/lib/gen2/generated.zig +806 -0
  53. package/src/lib/gen2/helpers.zig +54 -28
  54. package/src/lib/gen2/mechanics.zig +3567 -12
  55. package/src/lib/node.zig +131 -0
  56. package/src/lib/pkmn.zig +85 -9
  57. package/src/lib/wasm.zig +13 -0
  58. package/src/test/display/pkmn.html.tmpl +5 -5
  59. package/src/lib/binding/node.zig +0 -229
  60. package/src/lib/binding/wasm.zig +0 -10
  61. package/src/lib/gen1/README.md +0 -791
  62. package/src/lib/gen2/README.md +0 -309
package/build.zig CHANGED
@@ -1,23 +1,47 @@
1
1
  const std = @import("std");
2
2
  const builtin = @import("builtin");
3
3
 
4
- pub const Options = struct { showdown: ?bool = null, trace: ?bool = null };
4
+ pub const Options = struct {
5
+ showdown: ?bool = null,
6
+ log: ?bool = null,
7
+ chance: ?bool = null,
8
+ calc: ?bool = null,
9
+ };
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;
5
21
 
6
22
  pub fn module(b: *std.Build, options: Options) *std.Build.Module {
23
+ if (!has_path) @panic("Use build.zig.zon package management");
24
+
7
25
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
8
26
  const build_options = b.addOptions();
9
27
  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
- });
28
+ build_options.addOption(?bool, "log", options.log);
29
+ build_options.addOption(?bool, "chance", options.chance);
30
+ build_options.addOption(?bool, "calc", options.calc);
31
+
32
+ const root_source_file = .{ .cwd_relative = dirname ++ "/src/lib/pkmn.zig" };
33
+ const imports = &.{.{ .name = "build_options", .module = build_options.createModule() }};
34
+ return b.createModule(if (@hasDecl(std.Build, "CreateModuleOptions"))
35
+ .{ .source_file = root_source_file, .dependencies = imports }
36
+ else
37
+ .{ .root_source_file = root_source_file, .imports = imports });
15
38
  }
16
39
 
17
40
  pub fn build(b: *std.Build) !void {
18
41
  const target = b.standardTargetOptions(.{});
19
42
  const optimize = b.standardOptimizeOption(.{});
20
43
 
44
+ const default: ?bool = if (force_pic) false else null;
21
45
  const node_headers = b.option([]const u8, "node-headers", "Path to node-headers");
22
46
  const node_import_lib =
23
47
  b.option([]const u8, "node-import-library", "Path to node import library (Windows)");
@@ -25,55 +49,82 @@ pub fn build(b: *std.Build) !void {
25
49
  const wasm_stack_size =
26
50
  b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
27
51
  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;
52
+ const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse default;
53
+ const pic = b.option(bool, "pic", "Force position independent code") orelse default;
30
54
  const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
55
+ const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
31
56
 
32
57
  const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
33
58
 
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, ":");
59
+ const json = @embedFile("package.json");
60
+ var parsed = try std.json.parseFromSlice(std.json.Value, b.allocator, json, .{});
61
+ defer parsed.deinit();
62
+ const version = parsed.value.object.get("version").?.string;
63
+ const description = parsed.value.object.get("description").?.string;
64
+ var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
41
65
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
42
66
 
67
+ const fast = try std.SemanticVersion.parse("0.12.0-dev.866+3a47bc715");
68
+ if (optimize != .Debug and fast.order(builtin.zig_version) == .lt) {
69
+ std.log.warn("Release builds are ~10-20% slower than before Zig " ++
70
+ "v0.12.0-dev.866+3a47bc715 due to ziglang/zig#17768", .{});
71
+ }
72
+
43
73
  const showdown =
44
74
  b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
45
- const trace = b.option(bool, "trace", "Enable trace logs") orelse false;
75
+ const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
76
+ const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
77
+ const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
46
78
 
47
79
  const options = b.addOptions();
48
80
  options.addOption(?bool, "showdown", showdown);
49
- options.addOption(?bool, "trace", trace);
81
+ options.addOption(?bool, "log", log);
82
+ options.addOption(?bool, "chance", chance);
83
+ options.addOption(?bool, "calc", calc);
50
84
 
51
85
  const name = if (showdown) "pkmn-showdown" else "pkmn";
52
86
 
87
+ const pkmn = if (@hasDecl(std.Build, "CreateModuleOptions")) null else b.addModule("pkmn", .{
88
+ .root_source_file = if (has_path)
89
+ .{ .path = "src/lib/pkmn.zig" }
90
+ else
91
+ b.path("src/lib/pkmn.zig"),
92
+ .optimize = optimize,
93
+ .target = target,
94
+ .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
95
+ });
96
+
53
97
  var c = false;
54
98
  if (node_headers) |headers| {
55
99
  const addon = b.fmt("{s}.node", .{name});
56
- const lib = b.addSharedLibrary(.{
100
+ const path = if (has_path) .{ .path = "src/lib/node.zig" } else b.path("src/lib/node.zig");
101
+ const lib = b.addSharedLibrary(if (force_pic) .{
57
102
  .name = addon,
58
- .root_source_file = .{ .path = "src/lib/binding/node.zig" },
103
+ .root_source_file = path,
59
104
  .optimize = optimize,
60
105
  .target = target,
106
+ } else .{
107
+ .name = addon,
108
+ .root_source_file = path,
109
+ .optimize = optimize,
110
+ .target = target,
111
+ .strip = strip,
112
+ .pic = pic,
61
113
  });
62
- lib.addOptions("build_options", options);
63
- lib.setMainPkgPath("./");
64
- lib.addSystemIncludePath(headers);
114
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
115
+ lib.addSystemIncludePath(if (has_path) .{ .path = headers } else b.path(headers));
65
116
  lib.linkLibC();
66
117
  if (node_import_lib) |il| {
67
- lib.addObjectFile(il);
68
- } else if ((try std.zig.system.NativeTargetInfo.detect(target)).target.os.tag == .windows) {
118
+ lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
119
+ } else if (detect(target).os.tag == .windows) {
69
120
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
70
121
  std.process.exit(1);
71
122
  }
72
123
  lib.linker_allow_shlib_undefined = true;
73
124
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
74
- if (pic) lib.force_pic = pic;
125
+ if (force_pic and pic orelse false) lib.force_pic = pic;
75
126
  // 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):
127
+ // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
77
128
  //
78
129
  // lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
79
130
  // b.getInstallStep().dependOn(&lib.step);
@@ -82,74 +133,146 @@ pub fn build(b: *std.Build) !void {
82
133
  // rename the file ourself in install-pkmn-engine
83
134
  b.installArtifact(lib);
84
135
  } 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;
136
+ const entry = @hasDecl(Step.Compile, "Entry");
137
+ const mode = switch (optimize) {
138
+ .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
139
+ else => optimize,
140
+ };
141
+ const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
142
+ b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding })
143
+ else
144
+ ResolvedTarget{ .cpu_arch = .wasm32, .os_tag = .freestanding };
145
+ const path = if (has_path) .{ .path = "src/lib/wasm.zig" } else b.path("src/lib/wasm.zig");
146
+ const bin = if (entry) bin: {
147
+ const exe = b.addExecutable(if (force_pic) .{
148
+ .name = name,
149
+ .root_source_file = path,
150
+ .optimize = mode,
151
+ .target = freestanding,
152
+ } else .{
153
+ .name = name,
154
+ .root_source_file = path,
155
+ .optimize = mode,
156
+ .target = freestanding,
157
+ .strip = strip,
158
+ .pic = pic,
159
+ });
160
+ (if (root_module) exe.root_module else exe).export_symbol_names = &[_][]const u8{
161
+ "SHOWDOWN",
162
+ "LOG",
163
+ "CHANCE",
164
+ "CALC",
165
+ "GEN1_CHOICES_SIZE",
166
+ "GEN1_LOGS_SIZE",
167
+ };
168
+ exe.entry = .disabled;
169
+ break :bin exe;
170
+ } else bin: {
171
+ const lib = b.addSharedLibrary(.{
172
+ .name = name,
173
+ .root_source_file = path,
174
+ .optimize = mode,
175
+ .target = freestanding,
176
+ });
177
+ lib.rdynamic = true;
178
+ break :bin lib;
179
+ };
180
+ bin.stack_size = wasm_stack_size;
181
+ if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
182
+ if (force_pic and pic orelse false) bin.force_pic = pic;
183
+ (if (root_module) bin.root_module else bin).addOptions("build_options", options);
184
+
100
185
  const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
101
186
  if (optimize != .Debug and opt != null) {
102
187
  const out = b.fmt("build/lib/{s}.wasm", .{name});
103
188
  const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
104
- sh.addArtifactArg(lib);
189
+ sh.addArtifactArg(bin);
105
190
  sh.addArg("-o");
106
- sh.addFileSourceArg(.{ .path = out });
191
+ if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
192
+ sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
193
+ } else {
194
+ sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
195
+ }
107
196
  b.getInstallStep().dependOn(&sh.step);
197
+ if (!entry) b.installArtifact(bin);
198
+ } else if (entry) {
199
+ b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
200
+ .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
201
+ }).step);
108
202
  }
109
- b.installArtifact(lib);
110
203
  } else if (dynamic) {
111
- const lib = b.addSharedLibrary(.{
204
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
205
+ const lib = b.addSharedLibrary(if (force_pic) .{
206
+ .name = name,
207
+ .root_source_file = path,
208
+ .version = try std.SemanticVersion.parse(version),
209
+ .optimize = optimize,
210
+ .target = target,
211
+ } else .{
112
212
  .name = name,
113
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
114
- .version = try std.builtin.Version.parse(version),
213
+ .root_source_file = path,
214
+ .version = try std.SemanticVersion.parse(version),
115
215
  .optimize = optimize,
116
216
  .target = target,
217
+ .strip = strip,
218
+ .pic = pic,
117
219
  });
118
- lib.addOptions("build_options", options);
119
- lib.setMainPkgPath("./");
120
- lib.addIncludePath("src/include");
220
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
221
+ lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
121
222
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
122
- if (pic) lib.force_pic = pic;
223
+ if (force_pic and pic orelse false) lib.force_pic = pic;
123
224
  b.installArtifact(lib);
124
225
  c = true;
125
226
  } else {
126
- const lib = b.addStaticLibrary(.{
227
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
228
+ const lib = b.addStaticLibrary(if (force_pic) .{
127
229
  .name = name,
128
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
230
+ .root_source_file = path,
129
231
  .optimize = optimize,
130
232
  .target = target,
233
+ } else .{
234
+ .name = name,
235
+ .root_source_file = path,
236
+ .optimize = optimize,
237
+ .target = target,
238
+ .strip = strip,
239
+ .pic = pic,
131
240
  });
132
- lib.addOptions("build_options", options);
133
- lib.setMainPkgPath("./");
134
- lib.addIncludePath("src/include");
241
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
242
+ lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
135
243
  lib.bundle_compiler_rt = true;
136
244
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
137
- if (pic) lib.force_pic = pic;
138
- if (emit_asm) lib.emit_asm = .emit;
245
+ if (force_pic and pic orelse false) lib.force_pic = pic;
246
+ if (emit_asm) {
247
+ b.getInstallStep().dependOn(&b.addInstallFileWithDir(
248
+ lib.getEmittedAsm(),
249
+ .prefix,
250
+ b.fmt("{s}.s", .{name}),
251
+ ).step);
252
+ }
253
+ if (emit_ll) {
254
+ b.getInstallStep().dependOn(&b.addInstallFileWithDir(
255
+ lib.getEmittedLlvmIr(),
256
+ .prefix,
257
+ b.fmt("{s}.ll", .{name}),
258
+ ).step);
259
+ }
139
260
  b.installArtifact(lib);
140
261
  c = true;
141
262
  }
142
263
 
143
264
  if (c) {
144
- const header = b.addInstallFileWithDir(
145
- .{ .path = "src/include/pkmn.h" },
146
- .header,
147
- "pkmn.h",
148
- );
265
+ const path =
266
+ if (has_path) .{ .path = "src/include/pkmn.h" } else b.path("src/include/pkmn.h");
267
+ const header = b.addInstallFileWithDir(path, .header, "pkmn.h");
149
268
  b.getInstallStep().dependOn(&header.step);
150
269
 
151
270
  const pc = b.fmt("lib{s}.pc", .{name});
152
- const file = try b.cache_root.join(b.allocator, &.{pc});
271
+ const file = try std.fs.path.relative(
272
+ b.allocator,
273
+ try std.process.getCwdAlloc(b.allocator),
274
+ try b.cache_root.join(b.allocator, &.{pc}),
275
+ );
153
276
  const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
154
277
 
155
278
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
@@ -178,14 +301,21 @@ pub fn build(b: *std.Build) !void {
178
301
  .strip = strip,
179
302
  .cmd = cmd,
180
303
  };
304
+
305
+ // TODO: tests can be run multiple times due to @imports
181
306
  const tests = TestStep.create(b, options, config);
182
307
 
183
- var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
308
+ var exes = std.ArrayList(*Step.Compile).init(b.allocator);
184
309
  const tools: ToolConfig = .{
310
+ .options = .{
311
+ .showdown = showdown,
312
+ .log = log,
313
+ .chance = chance,
314
+ .calc = calc,
315
+ },
316
+ .module = pkmn,
185
317
  .general = config,
186
318
  .tool = .{
187
- .showdown = showdown,
188
- .trace = trace,
189
319
  .tests = if (tests.build) tests else null,
190
320
  .exes = &exes,
191
321
  },
@@ -194,39 +324,43 @@ pub fn build(b: *std.Build) !void {
194
324
  var benchmark_config = tools;
195
325
  benchmark_config.general.optimize = .ReleaseFast;
196
326
  benchmark_config.general.strip = true;
197
- const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
327
+ const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
198
328
 
199
329
  var fuzz_config = tools;
200
330
  fuzz_config.general.strip = false;
201
331
  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);
332
+ const fuzz = try tool(b, "src/test/fuzz.zig", fuzz_config);
333
+
334
+ const analyze = try tool(b, "src/tools/analyze.zig", tools);
335
+ const dump = try tool(b, "src/tools/dump.zig", tools);
336
+ const transitions = try tool(b, "src/tools/transitions.zig", tools);
337
+
338
+ // FIXME: serde randomly fails to build in some release configurations
339
+ var hack = tools;
340
+ if (optimize != .Debug) hack.tool.tests = null;
341
+ const serde = try tool(b, "src/tools/serde.zig", hack);
342
+
343
+ if (analyze) |t| b.step("analyze", "Run LLVM analysis tool").dependOn(&t.step);
344
+ if (benchmark) |t| b.step("benchmark", "Run benchmark code").dependOn(&t.step);
345
+ if (dump) |t| b.step("dump", "Run protocol dump tool").dependOn(&t.step);
346
+ if (fuzz) |t| b.step("fuzz", "Run fuzz tester").dependOn(&t.step);
347
+ if (serde) |t| b.step("serde", "Run serialization/deserialization tool").dependOn(&t.step);
217
348
  b.step("test", "Run all tests").dependOn(&tests.step);
218
349
  b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
350
+ if (transitions) |t| {
351
+ b.step("transitions", "Visualize transitions algorithm search").dependOn(&t.step);
352
+ }
219
353
  }
220
354
 
221
355
  fn maybeStrip(
222
356
  b: *std.Build,
223
- artifact: *std.Build.CompileStep,
357
+ artifact: *Step.Compile,
224
358
  step: *std.Build.Step,
225
- strip: bool,
359
+ strip: ?bool,
226
360
  cmd: ?[]const u8,
227
361
  ) void {
228
- artifact.strip = strip;
229
- if (!strip or cmd == null) return;
362
+ if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
363
+ if (!(strip orelse false) or cmd == null) return;
230
364
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
231
365
  const mac = builtin.os.tag == .macos;
232
366
  if (mac and artifact.isDynamicLibrary()) return;
@@ -238,86 +372,104 @@ fn maybeStrip(
238
372
  }
239
373
 
240
374
  const Config = struct {
241
- target: std.zig.CrossTarget,
375
+ target: ResolvedTarget,
242
376
  optimize: std.builtin.OptimizeMode,
243
- pic: bool,
244
- strip: bool,
377
+ pic: ?bool,
378
+ strip: ?bool,
245
379
  cmd: ?[]const u8,
246
380
  };
247
381
 
248
- const TESTS = .{
249
- "src/lib/common/test.zig",
250
- "src/lib/gen1/test.zig",
251
- "src/lib/gen2/test.zig",
252
- };
253
-
254
382
  const TestStep = struct {
255
383
  step: std.Build.Step,
256
384
  build: bool,
257
385
 
258
- pub fn create(b: *std.Build, options: *std.Build.OptionsStep, config: Config) *TestStep {
386
+ pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
259
387
  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
388
  const test_filter =
262
389
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
263
390
 
264
391
  const self = b.allocator.create(TestStep) catch @panic("OOM");
265
392
  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);
393
+ self.* = .{ .step = step, .build = test_filter == null };
394
+
395
+ const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
396
+ const tests = b.addTest(if (force_pic) .{
397
+ .root_source_file = path,
398
+ .optimize = config.optimize,
399
+ .target = config.target,
400
+ .filter = test_filter,
401
+ } else .{
402
+ .root_source_file = path,
403
+ .optimize = config.optimize,
404
+ .target = config.target,
405
+ .filter = test_filter,
406
+ .single_threaded = true,
407
+ .strip = config.strip,
408
+ .pic = config.pic,
409
+ });
410
+ (if (root_module) tests.root_module else tests).addOptions("build_options", options);
411
+
412
+ maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
413
+ if (force_pic) {
280
414
  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);
415
+ if (config.pic orelse false) tests.force_pic = config.pic;
416
+ }
417
+ if (coverage) |c| {
418
+ tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
287
419
  }
420
+ self.step.dependOn(&b.addRunArtifact(tests).step);
421
+
288
422
  return self;
289
423
  }
290
424
  };
291
425
 
292
426
  const ToolConfig = struct {
427
+ options: Options,
428
+ module: ?*std.Build.Module,
293
429
  general: Config,
294
430
  tool: struct {
295
- showdown: bool,
296
- trace: bool,
297
431
  tests: ?*TestStep,
298
432
  name: ?[]const u8 = null,
299
- exes: *std.ArrayList(*std.Build.CompileStep),
433
+ exes: *std.ArrayList(*Step.Compile),
300
434
  },
301
435
  };
302
436
 
303
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep {
437
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
438
+ std.fs.cwd().access(path, .{}) catch |err| switch (err) {
439
+ error.FileNotFound => return null,
440
+ else => |e| return e,
441
+ };
304
442
  var name = config.tool.name orelse std.fs.path.basename(path);
305
443
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
306
444
  if (index) |i| name = name[0..i];
307
- if (config.tool.showdown) name = b.fmt("{s}-showdown", .{name});
445
+ if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
308
446
 
309
- const exe = b.addExecutable(.{
447
+ const exe = b.addExecutable(if (force_pic) .{
448
+ .name = name,
449
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
450
+ .target = config.general.target,
451
+ .optimize = config.general.optimize,
452
+ } else .{
310
453
  .name = name,
311
- .root_source_file = .{ .path = path },
454
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
312
455
  .target = config.general.target,
313
456
  .optimize = config.general.optimize,
457
+ .single_threaded = true,
458
+ .strip = config.general.strip,
459
+ .pic = config.general.pic,
314
460
  });
315
- exe.addModule("pkmn", module(b, .{
316
- .showdown = config.tool.showdown,
317
- .trace = config.tool.trace,
318
- }));
319
- exe.single_threaded = true;
320
- if (config.general.pic) exe.force_pic = config.general.pic;
461
+
462
+ if (root_module) {
463
+ const import = if (config.module) |m| m else module(b, config.options);
464
+ exe.root_module.addImport("pkmn", import);
465
+ } else {
466
+ exe.addModule("pkmn", module(b, config.options));
467
+ }
468
+
469
+ if (force_pic) {
470
+ exe.single_threaded = true;
471
+ if (config.general.pic orelse false) exe.force_pic = config.general.pic;
472
+ }
321
473
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
322
474
  config.tool.exes.append(exe) catch @panic("OOM");
323
475
 
@@ -331,11 +483,16 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
331
483
  const ToolsStep = struct {
332
484
  step: std.Build.Step,
333
485
 
334
- pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.CompileStep)) *ToolsStep {
486
+ pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
335
487
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
336
488
  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);
489
+ self.* = .{ .step = step };
490
+ for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
339
491
  return self;
340
492
  }
341
493
  };
494
+
495
+ fn detect(target: anytype) std.Target {
496
+ if (@hasField(@TypeOf(target), "result")) return target.result;
497
+ return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
498
+ }