@pkmn/engine 0.1.0-dev.7963b917 → 0.1.0-dev.7c57a8f0

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 (82) hide show
  1. package/LICENSE +1 -3
  2. package/README.md +59 -23
  3. package/build/pkg/addon/browser.d.ts +3 -0
  4. package/build/pkg/addon/browser.js +44 -0
  5. package/build/pkg/addon/browser.js.map +1 -0
  6. package/build/pkg/addon/node.d.ts +3 -0
  7. package/build/pkg/addon/node.js +97 -0
  8. package/build/pkg/addon/node.js.map +1 -0
  9. package/build/pkg/addon/wasm.d.ts +2 -0
  10. package/build/pkg/addon/wasm.js +53 -0
  11. package/build/pkg/addon/wasm.js.map +1 -0
  12. package/build/pkg/addon.d.ts +25 -3
  13. package/build/pkg/addon.js +39 -71
  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 +17 -4
  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 +13 -17
  21. package/build/pkg/gen1.js +8 -12
  22. package/build/pkg/gen1.js.map +1 -1
  23. package/build/pkg/index.d.ts +40 -91
  24. package/build/pkg/index.js +6 -63
  25. package/build/pkg/index.js.map +1 -1
  26. package/build/pkg/protocol.d.ts +20 -1
  27. package/build/pkg/protocol.js +123 -102
  28. package/build/pkg/protocol.js.map +1 -1
  29. package/build/tools/debug.js +36 -69
  30. package/build/tools/debug.js.map +1 -1
  31. package/build/tools/display/debug.jsx +141 -0
  32. package/build/tools/display/debug.jsx.map +1 -0
  33. package/build/tools/display/index.js +142 -0
  34. package/build/tools/display/index.js.map +1 -0
  35. package/build/tools/display/ui.jsx +349 -0
  36. package/build/tools/display/ui.jsx.map +1 -0
  37. package/build/tools/display/util.js +18 -0
  38. package/build/tools/display/util.js.map +1 -0
  39. package/build.zig +302 -109
  40. package/package.json +60 -123
  41. package/src/bin/install-pkmn-engine +31 -21
  42. package/src/bin/pkmn-debug +1 -1
  43. package/src/lib/common/array.zig +77 -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 +4 -2
  47. package/src/lib/common/optional.zig +21 -10
  48. package/src/lib/common/options.zig +6 -0
  49. package/src/lib/common/protocol.zig +808 -332
  50. package/src/lib/common/rational.zig +132 -36
  51. package/src/lib/common/rng.zig +22 -15
  52. package/src/lib/common/util.zig +50 -1
  53. package/src/lib/common/wasm.zig +47 -0
  54. package/src/lib/gen1/calc.zig +688 -162
  55. package/src/lib/gen1/chance.zig +437 -296
  56. package/src/lib/gen1/data/moves.zig +193 -183
  57. package/src/lib/gen1/data/species.zig +4 -6
  58. package/src/lib/gen1/data/types.zig +8 -9
  59. package/src/lib/gen1/data.zig +55 -70
  60. package/src/lib/gen1/helpers.zig +91 -409
  61. package/src/lib/gen1/mechanics.zig +668 -581
  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 +13 -21
  65. package/src/lib/gen2/data/moves.zig +664 -572
  66. package/src/lib/gen2/data/species.zig +2 -4
  67. package/src/lib/gen2/data/types.zig +135 -33
  68. package/src/lib/gen2/data.zig +115 -91
  69. package/src/lib/gen2/generated.zig +801 -0
  70. package/src/lib/gen2/helpers.zig +54 -37
  71. package/src/lib/gen2/mechanics.zig +3580 -29
  72. package/src/lib/{binding/node.zig → node.zig} +9 -14
  73. package/src/lib/pkmn.zig +36 -15
  74. package/src/lib/wasm.zig +16 -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 -400
  78. package/build/test/display.js.map +0 -1
  79. package/src/lib/binding/wasm.zig +0 -12
  80. package/src/lib/gen1/README.md +0 -812
  81. package/src/lib/gen2/README.md +0 -308
  82. 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,14 +59,21 @@ 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;
53
74
  const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
54
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");
55
77
 
56
78
  const options = b.addOptions();
57
79
  options.addOption(?bool, "showdown", showdown);
@@ -59,32 +81,66 @@ pub fn build(b: *std.Build) !void {
59
81
  options.addOption(?bool, "chance", chance);
60
82
  options.addOption(?bool, "calc", calc);
61
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
+
62
101
  const name = if (showdown) "pkmn-showdown" else "pkmn";
63
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
+
64
113
  var c = false;
65
114
  if (node_headers) |headers| {
66
115
  const addon = b.fmt("{s}.node", .{name});
67
- 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) .{
68
118
  .name = addon,
69
- .root_source_file = .{ .path = "src/lib/binding/node.zig" },
119
+ .root_source_file = path,
70
120
  .optimize = optimize,
71
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,
72
129
  });
73
- lib.addOptions("build_options", options);
74
- lib.setMainPkgPath("./");
75
- 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));
76
132
  lib.linkLibC();
77
133
  if (node_import_lib) |il| {
78
- lib.addObjectFile(il);
79
- } 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) {
80
136
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
81
137
  std.process.exit(1);
82
138
  }
83
139
  lib.linker_allow_shlib_undefined = true;
84
140
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
85
- if (pic) lib.force_pic = pic;
141
+ if (force_pic and pic orelse false) lib.force_pic = pic;
86
142
  // 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):
143
+ // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
88
144
  //
89
145
  // lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
90
146
  // b.getInstallStep().dependOn(&lib.step);
@@ -93,75 +149,80 @@ pub fn build(b: *std.Build) !void {
93
149
  // rename the file ourself in install-pkmn-engine
94
150
  b.installArtifact(lib);
95
151
  } else if (wasm) {
96
- const lib = b.addSharedLibrary(.{
97
- .name = name,
98
- .root_source_file = .{ .path = "src/lib/binding/wasm.zig" },
99
- .optimize = switch (optimize) {
100
- .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
101
- else => optimize,
102
- },
103
- .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
104
- });
105
- lib.addOptions("build_options", options);
106
- lib.setMainPkgPath("./");
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);
152
+ try buildWasm(b, name, "src/lib/wasm.zig", optimize, strip, pic, wasm_stack_size, options);
121
153
  } else if (dynamic) {
122
- const lib = b.addSharedLibrary(.{
154
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
155
+ const lib = b.addSharedLibrary(if (force_pic) .{
156
+ .name = name,
157
+ .root_source_file = path,
158
+ .version = try std.SemanticVersion.parse(version),
159
+ .optimize = optimize,
160
+ .target = target,
161
+ } else .{
123
162
  .name = name,
124
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
163
+ .root_source_file = path,
125
164
  .version = try std.SemanticVersion.parse(version),
126
165
  .optimize = optimize,
127
166
  .target = target,
167
+ .strip = strip,
168
+ .pic = pic,
128
169
  });
129
- lib.addOptions("build_options", options);
130
- lib.setMainPkgPath("./");
131
- 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"));
132
172
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
133
- if (pic) lib.force_pic = pic;
173
+ if (force_pic and pic orelse false) lib.force_pic = pic;
134
174
  b.installArtifact(lib);
135
175
  c = true;
136
176
  } else {
137
- 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) .{
138
179
  .name = name,
139
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
180
+ .root_source_file = path,
140
181
  .optimize = optimize,
141
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,
142
190
  });
143
- lib.addOptions("build_options", options);
144
- lib.setMainPkgPath("./");
145
- 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"));
146
193
  lib.bundle_compiler_rt = true;
147
194
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
148
- if (pic) lib.force_pic = pic;
149
- if (emit_asm) lib.emit_asm = .emit;
150
- if (emit_ll) lib.emit_llvm_ir = .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
+ }
151
210
  b.installArtifact(lib);
152
211
  c = true;
153
212
  }
154
213
 
155
214
  if (c) {
156
- const header = b.addInstallFileWithDir(
157
- .{ .path = "src/include/pkmn.h" },
158
- .header,
159
- "pkmn.h",
160
- );
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");
161
218
  b.getInstallStep().dependOn(&header.step);
162
219
 
163
220
  const pc = b.fmt("lib{s}.pc", .{name});
164
- 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
+ );
165
226
  const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
166
227
 
167
228
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
@@ -194,7 +255,7 @@ pub fn build(b: *std.Build) !void {
194
255
  // TODO: tests can be run multiple times due to @imports
195
256
  const tests = TestStep.create(b, options, config);
196
257
 
197
- var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
258
+ var exes = std.ArrayList(*Step.Compile).init(b.allocator);
198
259
  const tools: ToolConfig = .{
199
260
  .options = .{
200
261
  .showdown = showdown,
@@ -202,6 +263,7 @@ pub fn build(b: *std.Build) !void {
202
263
  .chance = chance,
203
264
  .calc = calc,
204
265
  },
266
+ .module = pkmn,
205
267
  .general = config,
206
268
  .tool = .{
207
269
  .tests = if (tests.build) tests else null,
@@ -212,37 +274,117 @@ pub fn build(b: *std.Build) !void {
212
274
  var benchmark_config = tools;
213
275
  benchmark_config.general.optimize = .ReleaseFast;
214
276
  benchmark_config.general.strip = true;
215
- const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
277
+ const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
216
278
 
217
279
  var fuzz_config = tools;
218
280
  fuzz_config.general.strip = false;
219
281
  fuzz_config.tool.name = "fuzz";
220
- const fuzz = tool(b, "src/test/fuzz.zig", fuzz_config);
221
-
222
- const copies = tool(b, "src/tools/copies.zig", tools);
223
- const dump = tool(b, "src/tools/dump.zig", tools);
224
- const serde = tool(b, "src/tools/serde.zig", tools);
225
- const transitions = tool(b, "src/tools/transitions.zig", tools);
226
-
227
- b.step("copies", "Run copy detector").dependOn(&copies.step);
228
- b.step("benchmark", "Run benchmark code").dependOn(&benchmark.step);
229
- b.step("dump", "Run protocol dump tool").dependOn(&dump.step);
230
- b.step("fuzz", "Run fuzz tester").dependOn(&fuzz.step);
231
- 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);
232
298
  b.step("test", "Run all tests").dependOn(&tests.step);
233
299
  b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
234
- 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
+ } else {
375
+ b.installArtifact(bin);
376
+ }
235
377
  }
236
378
 
237
379
  fn maybeStrip(
238
380
  b: *std.Build,
239
- artifact: *std.Build.CompileStep,
381
+ artifact: *Step.Compile,
240
382
  step: *std.Build.Step,
241
- strip: bool,
383
+ strip: ?bool,
242
384
  cmd: ?[]const u8,
243
385
  ) void {
244
- artifact.strip = strip;
245
- if (!strip or cmd == null) return;
386
+ if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
387
+ if (!(strip orelse false) or cmd == null) return;
246
388
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
247
389
  const mac = builtin.os.tag == .macos;
248
390
  if (mac and artifact.isDynamicLibrary()) return;
@@ -254,10 +396,10 @@ fn maybeStrip(
254
396
  }
255
397
 
256
398
  const Config = struct {
257
- target: std.zig.CrossTarget,
399
+ target: ResolvedTarget,
258
400
  optimize: std.builtin.OptimizeMode,
259
- pic: bool,
260
- strip: bool,
401
+ pic: ?bool,
402
+ strip: ?bool,
261
403
  cmd: ?[]const u8,
262
404
  };
263
405
 
@@ -265,32 +407,37 @@ const TestStep = struct {
265
407
  step: std.Build.Step,
266
408
  build: bool,
267
409
 
268
- pub fn create(b: *std.Build, options: *std.Build.OptionsStep, config: Config) *TestStep {
410
+ pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
269
411
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
270
- const test_file = b.option([]const u8, "test-file", "Input file for test");
271
412
  const test_filter =
272
413
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
273
414
 
274
415
  const self = b.allocator.create(TestStep) catch @panic("OOM");
275
416
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
276
- self.* = TestStep{ .step = step, .build = test_filter == null };
277
-
278
- const path = test_file orelse "src/lib/test.zig";
279
- const tests = b.addTest(.{
280
- .name = b.fmt("{s}-{s}", .{
281
- std.fs.path.basename(std.fs.path.dirname(path).?),
282
- std.fs.path.stem(std.fs.path.basename(path)),
283
- }),
284
- .root_source_file = .{ .path = path },
417
+ self.* = .{ .step = step, .build = test_filter == null };
418
+
419
+ const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
420
+ const tests = b.addTest(if (force_pic) .{
421
+ .root_source_file = path,
422
+ .optimize = config.optimize,
423
+ .target = config.target,
424
+ .filter = test_filter,
425
+ } else .{
426
+ .root_source_file = path,
285
427
  .optimize = config.optimize,
286
428
  .target = config.target,
287
429
  .filter = test_filter,
430
+ .single_threaded = true,
431
+ .strip = config.strip,
432
+ .pic = config.pic,
288
433
  });
289
- tests.setMainPkgPath("./");
290
- tests.addOptions("build_options", options);
291
- tests.single_threaded = true;
434
+ (if (root_module) tests.root_module else tests).addOptions("build_options", options);
435
+
292
436
  maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
293
- if (config.pic) tests.force_pic = config.pic;
437
+ if (force_pic) {
438
+ tests.single_threaded = true;
439
+ if (config.pic orelse false) tests.force_pic = config.pic;
440
+ }
294
441
  if (coverage) |c| {
295
442
  tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
296
443
  }
@@ -302,30 +449,51 @@ const TestStep = struct {
302
449
 
303
450
  const ToolConfig = struct {
304
451
  options: Options,
452
+ module: ?*std.Build.Module,
305
453
  general: Config,
306
454
  tool: struct {
307
455
  tests: ?*TestStep,
308
456
  name: ?[]const u8 = null,
309
- exes: *std.ArrayList(*std.Build.CompileStep),
457
+ exes: *std.ArrayList(*Step.Compile),
310
458
  },
311
459
  };
312
460
 
313
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep {
461
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
462
+ std.fs.cwd().access(path, .{}) catch |err| switch (err) {
463
+ error.FileNotFound => return null,
464
+ else => |e| return e,
465
+ };
314
466
  var name = config.tool.name orelse std.fs.path.basename(path);
315
467
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
316
468
  if (index) |i| name = name[0..i];
317
469
  if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
318
470
 
319
- const exe = b.addExecutable(.{
471
+ const exe = b.addExecutable(if (force_pic) .{
472
+ .name = name,
473
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
474
+ .target = config.general.target,
475
+ .optimize = config.general.optimize,
476
+ } else .{
320
477
  .name = name,
321
- .root_source_file = .{ .path = path },
478
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
322
479
  .target = config.general.target,
323
480
  .optimize = config.general.optimize,
481
+ .single_threaded = true,
482
+ .strip = config.general.strip,
483
+ .pic = config.general.pic,
324
484
  });
325
- exe.addModule("pkmn", module(b, config.options));
326
485
 
327
- exe.single_threaded = true;
328
- if (config.general.pic) exe.force_pic = config.general.pic;
486
+ if (root_module) {
487
+ const import = if (config.module) |m| m else module(b, config.options);
488
+ exe.root_module.addImport("pkmn", import);
489
+ } else {
490
+ exe.addModule("pkmn", module(b, config.options));
491
+ }
492
+
493
+ if (force_pic) {
494
+ exe.single_threaded = true;
495
+ if (config.general.pic orelse false) exe.force_pic = config.general.pic;
496
+ }
329
497
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
330
498
  config.tool.exes.append(exe) catch @panic("OOM");
331
499
 
@@ -339,11 +507,36 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
339
507
  const ToolsStep = struct {
340
508
  step: std.Build.Step,
341
509
 
342
- pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.CompileStep)) *ToolsStep {
510
+ pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
343
511
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
344
512
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
345
- self.* = ToolsStep{ .step = step };
346
- for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t).step);
513
+ self.* = .{ .step = step };
514
+ for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
347
515
  return self;
348
516
  }
349
517
  };
518
+
519
+ fn detect(target: anytype) std.Target {
520
+ if (@hasField(@TypeOf(target), "result")) return target.result;
521
+ return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
522
+ }
523
+
524
+ const WASM = @embedFile("src/lib/wasm.zig");
525
+
526
+ fn exports(b: *std.Build) ![][]const u8 {
527
+ var symbols = std.ArrayList([]const u8).init(b.allocator);
528
+
529
+ var it = std.mem.splitSequence(u8, WASM, "export ");
530
+ _ = it.next();
531
+ while (it.next()) |s| {
532
+ if (std.mem.startsWith(u8, s, "const ")) {
533
+ const i = std.mem.indexOf(u8, s[6..], " ").?;
534
+ try symbols.append(s[6 .. 6 + i]);
535
+ } else { // "fn "
536
+ const i = std.mem.indexOf(u8, s[3..], "(").?;
537
+ try symbols.append(s[3 .. 3 + i]);
538
+ }
539
+ }
540
+
541
+ return symbols.items;
542
+ }