@pkmn/engine 0.1.0-dev.c5fe6d07 → 0.1.0-dev.cdc837af

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