@pkmn/engine 0.1.0-dev.49f6bf26 → 0.1.0-dev.4b74e5f9

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 (81) hide show
  1. package/README.md +20 -15
  2. package/build/pkg/addon/browser.d.ts +3 -0
  3. package/build/pkg/addon/browser.js +47 -0
  4. package/build/pkg/addon/browser.js.map +1 -0
  5. package/build/pkg/addon/node.d.ts +3 -0
  6. package/build/pkg/addon/node.js +110 -0
  7. package/build/pkg/addon/node.js.map +1 -0
  8. package/build/pkg/addon/wasm.d.ts +2 -0
  9. package/build/pkg/addon/wasm.js +53 -0
  10. package/build/pkg/addon/wasm.js.map +1 -0
  11. package/build/pkg/addon.d.ts +25 -3
  12. package/build/pkg/addon.js +39 -71
  13. package/build/pkg/addon.js.map +1 -1
  14. package/build/pkg/data/layout.json +15 -2
  15. package/build/pkg/data/protocol.json +23 -9
  16. package/build/pkg/data.d.ts +25 -4
  17. package/build/pkg/data.js.map +1 -1
  18. package/build/pkg/gen1.d.ts +15 -18
  19. package/build/pkg/gen1.js +28 -19
  20. package/build/pkg/gen1.js.map +1 -1
  21. package/build/pkg/index.d.ts +40 -90
  22. package/build/pkg/index.js +23 -70
  23. package/build/pkg/index.js.map +1 -1
  24. package/build/pkg/protocol.d.ts +20 -1
  25. package/build/pkg/protocol.js +109 -107
  26. package/build/pkg/protocol.js.map +1 -1
  27. package/build/tools/debug.js +53 -78
  28. package/build/tools/debug.js.map +1 -1
  29. package/build/tools/display/debug.jsx +152 -0
  30. package/build/tools/display/debug.jsx.map +1 -0
  31. package/build/tools/display/index.js +152 -0
  32. package/build/tools/display/index.js.map +1 -0
  33. package/build/tools/display/ui.jsx +359 -0
  34. package/build/tools/display/ui.jsx.map +1 -0
  35. package/build/tools/display/util.js +33 -0
  36. package/build/tools/display/util.js.map +1 -0
  37. package/build.zig +314 -87
  38. package/package.json +55 -137
  39. package/src/bin/install-pkmn-engine +19 -8
  40. package/src/bin/pkmn-debug +1 -1
  41. package/src/lib/bindings/c.zig +255 -0
  42. package/src/lib/bindings/node.zig +121 -0
  43. package/src/lib/bindings/wasm.zig +59 -0
  44. package/src/lib/common/array.zig +77 -0
  45. package/src/lib/common/data.zig +8 -8
  46. package/src/lib/common/debug.zig +39 -8
  47. package/src/lib/common/js.zig +4 -2
  48. package/src/lib/common/optional.zig +13 -9
  49. package/src/lib/common/options.zig +6 -0
  50. package/src/lib/common/protocol.zig +55 -52
  51. package/src/lib/common/rational.zig +121 -29
  52. package/src/lib/common/rng.zig +11 -13
  53. package/src/lib/common/util.zig +60 -1
  54. package/src/lib/gen1/calc.zig +691 -156
  55. package/src/lib/gen1/chance.zig +415 -290
  56. package/src/lib/gen1/data/moves.zig +2 -4
  57. package/src/lib/gen1/data/species.zig +2 -4
  58. package/src/lib/gen1/data/types.zig +1 -2
  59. package/src/lib/gen1/data.zig +38 -41
  60. package/src/lib/gen1/helpers.zig +92 -548
  61. package/src/lib/gen1/mechanics.zig +361 -237
  62. package/src/lib/gen2/calc.zig +37 -27
  63. package/src/lib/gen2/chance.zig +90 -502
  64. package/src/lib/gen2/data/items.zig +1 -3
  65. package/src/lib/gen2/data/moves.zig +2 -4
  66. package/src/lib/gen2/data/species.zig +1 -3
  67. package/src/lib/gen2/data/types.zig +1 -2
  68. package/src/lib/gen2/data.zig +26 -29
  69. package/src/lib/gen2/generated.zig +18 -23
  70. package/src/lib/gen2/helpers.zig +46 -25
  71. package/src/lib/gen2/mechanics.zig +198 -140
  72. package/src/lib/node.zig +3 -116
  73. package/src/lib/pkmn.zig +17 -18
  74. package/src/lib/wasm.zig +13 -9
  75. package/src/tools/display/dom.ts +93 -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/gen1/README.md +0 -894
  80. package/src/lib/gen2/README.md +0 -329
  81. 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,25 +26,39 @@ 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
- .root_source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
20
- .imports = &.{.{ .name = "build_options", .module = build_options.createModule() }},
21
- });
29
+
30
+ const root_source_file: std.Build.LazyPath =
31
+ .{ .cwd_relative = dirname ++ "/src/lib/pkmn.zig" };
32
+ const Import = if (@hasDecl(std.Build.Module, "Import"))
33
+ std.Build.Module.Import
34
+ else
35
+ std.Build.ModuleDependency;
36
+ const imports: []const Import =
37
+ &.{.{ .name = "build_options", .module = build_options.createModule() }};
38
+ return b.createModule(if (@hasDecl(std.Build, "CreateModuleOptions"))
39
+ .{ .source_file = root_source_file, .dependencies = imports }
40
+ else
41
+ .{ .root_source_file = root_source_file, .imports = imports });
22
42
  }
23
43
 
24
44
  pub fn build(b: *std.Build) !void {
25
45
  const target = b.standardTargetOptions(.{});
26
46
  const optimize = b.standardOptimizeOption(.{});
27
47
 
48
+ const default: ?bool = if (force_pic) false else null;
28
49
  const node_headers = b.option([]const u8, "node-headers", "Path to node-headers");
29
50
  const node_import_lib =
30
51
  b.option([]const u8, "node-import-library", "Path to node import library (Windows)");
52
+ const demo = if (try exists("src/tools/demo.zig"))
53
+ b.option(bool, "demo", "Build the demo library") orelse false
54
+ else
55
+ false;
31
56
  const wasm = b.option(bool, "wasm", "Build a WASM library") orelse false;
32
57
  const wasm_stack_size =
33
58
  b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
34
59
  const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
35
- const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
36
- const pic = b.option(bool, "pic", "Force position independent code");
60
+ const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse default;
61
+ const pic = b.option(bool, "pic", "Force position independent code") orelse default;
37
62
  const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
38
63
  const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
39
64
 
@@ -44,14 +69,21 @@ pub fn build(b: *std.Build) !void {
44
69
  defer parsed.deinit();
45
70
  const version = parsed.value.object.get("version").?.string;
46
71
  const description = parsed.value.object.get("description").?.string;
47
- var repository = std.mem.split(u8, parsed.value.object.get("repository").?.string, ":");
72
+ var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
48
73
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
49
74
 
75
+ const fast = try std.SemanticVersion.parse("0.12.0-dev.866+3a47bc715");
76
+ if (optimize != .Debug and fast.order(builtin.zig_version) == .lt) {
77
+ std.log.warn("Release builds are ~10-20% slower than before Zig " ++
78
+ "v0.12.0-dev.866+3a47bc715 due to ziglang/zig#17768", .{});
79
+ }
80
+
50
81
  const showdown =
51
82
  b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
52
83
  const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
53
84
  const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
54
85
  const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
86
+ const extra = b.option([]const []const u8, "option", "Enable extra option");
55
87
 
56
88
  const options = b.addOptions();
57
89
  options.addOption(?bool, "showdown", showdown);
@@ -59,32 +91,69 @@ pub fn build(b: *std.Build) !void {
59
91
  options.addOption(?bool, "chance", chance);
60
92
  options.addOption(?bool, "calc", calc);
61
93
 
94
+ if (extra) |opts| {
95
+ for (opts) |opt| {
96
+ if (std.mem.indexOfScalar(u8, opt, '=')) |i| {
97
+ options.addOption(?bool, opt[0..i], if (std.mem.eql(u8, opt[i + 1 ..], "true"))
98
+ true
99
+ else if (std.mem.eql(u8, opt[i + 1 ..], "false"))
100
+ false
101
+ else {
102
+ std.log.err("Invalid option: {s}\n", .{opt});
103
+ return error.InvalidOption;
104
+ });
105
+ } else {
106
+ options.addOption(?bool, opt, true);
107
+ }
108
+ }
109
+ }
110
+
62
111
  const name = if (showdown) "pkmn-showdown" else "pkmn";
63
112
 
113
+ const pkmn: ?*std.Build.Module = if (@hasDecl(std.Build, "CreateModuleOptions"))
114
+ null
115
+ else
116
+ b.addModule("pkmn", .{
117
+ .root_source_file = if (has_path)
118
+ .{ .path = "src/lib/pkmn.zig" }
119
+ else
120
+ b.path("src/lib/pkmn.zig"),
121
+ .optimize = optimize,
122
+ .target = target,
123
+ .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
124
+ });
125
+
64
126
  var c = false;
65
127
  if (node_headers) |headers| {
66
128
  const addon = b.fmt("{s}.node", .{name});
67
- const lib = b.addSharedLibrary(.{
129
+ const path = if (has_path) .{ .path = "src/lib/node.zig" } else b.path("src/lib/node.zig");
130
+ const lib = b.addSharedLibrary(if (force_pic) .{
131
+ .name = addon,
132
+ .root_source_file = path,
133
+ .optimize = optimize,
134
+ .target = target,
135
+ } else .{
68
136
  .name = addon,
69
- .root_source_file = .{ .path = "src/lib/node.zig" },
137
+ .root_source_file = path,
70
138
  .optimize = optimize,
71
139
  .target = target,
72
140
  .strip = strip,
73
141
  .pic = pic,
74
142
  });
75
- lib.root_module.addOptions("build_options", options);
76
- lib.addSystemIncludePath(.{ .path = headers });
143
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
144
+ lib.addSystemIncludePath(if (has_path) .{ .path = headers } else b.path(headers));
77
145
  lib.linkLibC();
78
146
  if (node_import_lib) |il| {
79
- lib.addObjectFile(.{ .path = il });
80
- } else if (target.result.os.tag == .windows) {
147
+ lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
148
+ } else if (detect(target).os.tag == .windows) {
81
149
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
82
150
  std.process.exit(1);
83
151
  }
84
152
  lib.linker_allow_shlib_undefined = true;
85
153
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
154
+ if (force_pic and pic orelse false) lib.force_pic = pic;
86
155
  // 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):
156
+ // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
88
157
  //
89
158
  // lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
90
159
  // b.getInstallStep().dependOn(&lib.step);
@@ -93,69 +162,61 @@ pub fn build(b: *std.Build) !void {
93
162
  // rename the file ourself in install-pkmn-engine
94
163
  b.installArtifact(lib);
95
164
  } else if (wasm) {
96
- const exe = b.addExecutable(.{
97
- .name = name,
98
- .root_source_file = .{ .path = "src/lib/wasm.zig" },
99
- .optimize = switch (optimize) {
100
- .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
101
- else => optimize,
102
- },
103
- .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
104
- .strip = strip,
105
- .pic = pic,
165
+ const path = "src/lib/wasm.zig";
166
+ try buildWasm(b, name, path, optimize, strip, pic, wasm_stack_size, null, options);
167
+ } else if (demo) {
168
+ const path = "src/tools/demo.zig";
169
+ const n = if (showdown) "demo-showdown" else "demo";
170
+ const mod = pkmn orelse module(b, .{
171
+ .showdown = showdown,
172
+ .log = log,
173
+ .chance = chance,
174
+ .calc = calc,
106
175
  });
107
- exe.root_module.addOptions("build_options", options);
108
- exe.root_module.export_symbol_names = &[_][]const u8{
109
- "SHOWDOWN",
110
- "LOG",
111
- "CHANCE",
112
- "CALC",
113
- "GEN1_CHOICES_SIZE",
114
- "GEN1_LOGS_SIZE",
115
- };
116
- exe.entry = .disabled;
117
- exe.stack_size = wasm_stack_size;
118
- const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
119
- if (optimize != .Debug and opt != null) {
120
- const out = b.fmt("build/lib/{s}.wasm", .{name});
121
- const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
122
- sh.addArtifactArg(exe);
123
- sh.addArg("-o");
124
- sh.addFileArg(.{ .path = out });
125
- b.getInstallStep().dependOn(&sh.step);
126
- } else {
127
- b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
128
- .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
129
- }).step);
130
- }
176
+ try buildWasm(b, n, path, optimize, strip, pic, wasm_stack_size, mod, options);
131
177
  } else if (dynamic) {
132
- const lib = b.addSharedLibrary(.{
178
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
179
+ const lib = b.addSharedLibrary(if (force_pic) .{
180
+ .name = name,
181
+ .root_source_file = path,
182
+ .version = try std.SemanticVersion.parse(version),
183
+ .optimize = optimize,
184
+ .target = target,
185
+ } else .{
133
186
  .name = name,
134
- .root_source_file = .{ .path = "src/lib/c.zig" },
187
+ .root_source_file = path,
135
188
  .version = try std.SemanticVersion.parse(version),
136
189
  .optimize = optimize,
137
190
  .target = target,
138
191
  .strip = strip,
139
192
  .pic = pic,
140
193
  });
141
- lib.root_module.addOptions("build_options", options);
142
- lib.addIncludePath(.{ .path = "src/include" });
194
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
195
+ lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
143
196
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
197
+ if (force_pic and pic orelse false) lib.force_pic = pic;
144
198
  b.installArtifact(lib);
145
199
  c = true;
146
200
  } else {
147
- const lib = b.addStaticLibrary(.{
201
+ const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
202
+ const lib = b.addStaticLibrary(if (force_pic) .{
203
+ .name = name,
204
+ .root_source_file = path,
205
+ .optimize = optimize,
206
+ .target = target,
207
+ } else .{
148
208
  .name = name,
149
- .root_source_file = .{ .path = "src/lib/c.zig" },
209
+ .root_source_file = path,
150
210
  .optimize = optimize,
151
211
  .target = target,
152
212
  .strip = strip,
153
213
  .pic = pic,
154
214
  });
155
- lib.root_module.addOptions("build_options", options);
156
- lib.addIncludePath(.{ .path = "src/include" });
215
+ (if (root_module) lib.root_module else lib).addOptions("build_options", options);
216
+ lib.addIncludePath(if (has_path) .{ .path = "src/include" } else b.path("src/include"));
157
217
  lib.bundle_compiler_rt = true;
158
218
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
219
+ if (force_pic and pic orelse false) lib.force_pic = pic;
159
220
  if (emit_asm) {
160
221
  b.getInstallStep().dependOn(&b.addInstallFileWithDir(
161
222
  lib.getEmittedAsm(),
@@ -175,15 +236,17 @@ pub fn build(b: *std.Build) !void {
175
236
  }
176
237
 
177
238
  if (c) {
178
- const header = b.addInstallFileWithDir(
179
- .{ .path = "src/include/pkmn.h" },
180
- .header,
181
- "pkmn.h",
182
- );
239
+ const path =
240
+ if (has_path) .{ .path = "src/include/pkmn.h" } else b.path("src/include/pkmn.h");
241
+ const header = b.addInstallFileWithDir(path, .header, "pkmn.h");
183
242
  b.getInstallStep().dependOn(&header.step);
184
243
 
185
244
  const pc = b.fmt("lib{s}.pc", .{name});
186
- const file = try b.cache_root.join(b.allocator, &.{pc});
245
+ const file = try std.fs.path.relative(
246
+ b.allocator,
247
+ try std.process.getCwdAlloc(b.allocator),
248
+ try b.cache_root.join(b.allocator, &.{pc}),
249
+ );
187
250
  const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
188
251
 
189
252
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
@@ -205,7 +268,7 @@ pub fn build(b: *std.Build) !void {
205
268
  b.installFile(file, b.fmt("share/pkgconfig/{s}", .{pc}));
206
269
  }
207
270
 
208
- const config = .{
271
+ const config: Config = .{
209
272
  .target = target,
210
273
  .optimize = optimize,
211
274
  .pic = pic,
@@ -216,7 +279,7 @@ pub fn build(b: *std.Build) !void {
216
279
  // TODO: tests can be run multiple times due to @imports
217
280
  const tests = TestStep.create(b, options, config);
218
281
 
219
- var exes = std.ArrayList(*std.Build.Step.Compile).init(b.allocator);
282
+ var exes = std.ArrayList(*Step.Compile).init(b.allocator);
220
283
  const tools: ToolConfig = .{
221
284
  .options = .{
222
285
  .showdown = showdown,
@@ -224,6 +287,7 @@ pub fn build(b: *std.Build) !void {
224
287
  .chance = chance,
225
288
  .calc = calc,
226
289
  },
290
+ .module = pkmn,
227
291
  .general = config,
228
292
  .tool = .{
229
293
  .tests = if (tests.build) tests else null,
@@ -262,13 +326,127 @@ pub fn build(b: *std.Build) !void {
262
326
  }
263
327
  }
264
328
 
329
+ fn buildWasm(
330
+ b: *std.Build,
331
+ name: []const u8,
332
+ root_src_file: []const u8,
333
+ optimize: std.builtin.OptimizeMode,
334
+ strip: ?bool,
335
+ pic: ?bool,
336
+ wasm_stack_size: u64,
337
+ import: ?*std.Build.Module,
338
+ options: anytype,
339
+ ) !void {
340
+ const entry = @hasDecl(Step.Compile, "Entry");
341
+ const mode = switch (optimize) {
342
+ .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
343
+ else => optimize,
344
+ };
345
+ // https://webassembly.org/features/
346
+ var features = std.Target.wasm.featureSet(&.{
347
+ .atomics,
348
+ .bulk_memory,
349
+ // .exception_handling,
350
+ .extended_const,
351
+ // .half_precision,
352
+ // .multimemory,
353
+ .mutable_globals,
354
+ .nontrapping_fptoint,
355
+ .reference_types,
356
+ // .relaxed_simd,
357
+ .sign_ext,
358
+ .simd128,
359
+ // .tail_call,
360
+ });
361
+ if (builtin.zig_version.order(try std.SemanticVersion.parse("0.12.0")) != .lt) {
362
+ features.addFeature(@intFromEnum(std.Target.wasm.Feature.multivalue));
363
+ }
364
+ const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
365
+ b.resolveTargetQuery(.{
366
+ .cpu_arch = .wasm32,
367
+ .os_tag = .freestanding,
368
+ .cpu_features_add = features,
369
+ })
370
+ else
371
+ ResolvedTarget{
372
+ .cpu_arch = .wasm32,
373
+ .os_tag = .freestanding,
374
+ .cpu_features_add = features,
375
+ };
376
+ const path = if (has_path) .{ .path = root_src_file } else b.path(root_src_file);
377
+ const bin = if (entry) bin: {
378
+ const exe = b.addExecutable(if (force_pic) .{
379
+ .name = name,
380
+ .root_source_file = path,
381
+ .optimize = mode,
382
+ .target = freestanding,
383
+ } else .{
384
+ .name = name,
385
+ .root_source_file = path,
386
+ .optimize = mode,
387
+ .target = freestanding,
388
+ .strip = strip,
389
+ .pic = pic,
390
+ });
391
+
392
+ var file = try std.fs.cwd().openFile(root_src_file, .{});
393
+ defer file.close();
394
+ const bytes = try file.readToEndAlloc(b.allocator, std.math.maxInt(usize));
395
+ (if (root_module) exe.root_module else exe).export_symbol_names = try exports(b, bytes);
396
+ exe.entry = .disabled;
397
+ break :bin exe;
398
+ } else bin: {
399
+ const lib = b.addSharedLibrary(.{
400
+ .name = name,
401
+ .root_source_file = path,
402
+ .optimize = mode,
403
+ .target = freestanding,
404
+ });
405
+ lib.rdynamic = true;
406
+ break :bin lib;
407
+ };
408
+ if (import) |i| {
409
+ if (root_module) {
410
+ bin.root_module.addImport("pkmn", i);
411
+ } else {
412
+ bin.addModule("pkmn", i);
413
+ }
414
+ }
415
+ bin.stack_size = wasm_stack_size;
416
+ if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
417
+ if (force_pic and pic orelse false) bin.force_pic = pic;
418
+ (if (root_module) bin.root_module else bin).addOptions("build_options", options);
419
+
420
+ const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
421
+ if (optimize != .Debug and opt != null) {
422
+ const out = b.fmt("build/lib/{s}.wasm", .{name});
423
+ const sh = b.addSystemCommand(&.{ opt.?, "--enable-bulk-memory", "--enable-simd", "-O4" });
424
+ sh.addArtifactArg(bin);
425
+ sh.addArg("-o");
426
+ if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
427
+ sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
428
+ } else {
429
+ sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
430
+ }
431
+ b.getInstallStep().dependOn(&sh.step);
432
+ if (!entry) b.installArtifact(bin);
433
+ } else if (entry) {
434
+ b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
435
+ .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
436
+ }).step);
437
+ } else {
438
+ b.installArtifact(bin);
439
+ }
440
+ }
441
+
265
442
  fn maybeStrip(
266
443
  b: *std.Build,
267
- artifact: *std.Build.Step.Compile,
444
+ artifact: *Step.Compile,
268
445
  step: *std.Build.Step,
269
446
  strip: ?bool,
270
447
  cmd: ?[]const u8,
271
448
  ) void {
449
+ if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
272
450
  if (!(strip orelse false) or cmd == null) return;
273
451
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
274
452
  const mac = builtin.os.tag == .macos;
@@ -281,7 +459,7 @@ fn maybeStrip(
281
459
  }
282
460
 
283
461
  const Config = struct {
284
- target: std.Build.ResolvedTarget,
462
+ target: ResolvedTarget,
285
463
  optimize: std.builtin.OptimizeMode,
286
464
  pic: ?bool,
287
465
  strip: ?bool,
@@ -292,9 +470,8 @@ const TestStep = struct {
292
470
  step: std.Build.Step,
293
471
  build: bool,
294
472
 
295
- pub fn create(b: *std.Build, options: *std.Build.Step.Options, config: Config) *TestStep {
473
+ pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
296
474
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
297
- const test_file = b.option([]const u8, "test-file", "Input file for test");
298
475
  const test_filter =
299
476
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
300
477
 
@@ -302,13 +479,14 @@ const TestStep = struct {
302
479
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
303
480
  self.* = .{ .step = step, .build = test_filter == null };
304
481
 
305
- const path = test_file orelse "src/lib/test.zig";
306
- const tests = b.addTest(.{
307
- .name = b.fmt("{s}-{s}", .{
308
- std.fs.path.basename(std.fs.path.dirname(path).?),
309
- std.fs.path.stem(std.fs.path.basename(path)),
310
- }),
311
- .root_source_file = .{ .path = path },
482
+ const path = if (has_path) .{ .path = "src/lib/test.zig" } else b.path("src/lib/test.zig");
483
+ const tests = b.addTest(if (force_pic) .{
484
+ .root_source_file = path,
485
+ .optimize = config.optimize,
486
+ .target = config.target,
487
+ .filter = test_filter,
488
+ } else .{
489
+ .root_source_file = path,
312
490
  .optimize = config.optimize,
313
491
  .target = config.target,
314
492
  .filter = test_filter,
@@ -316,8 +494,13 @@ const TestStep = struct {
316
494
  .strip = config.strip,
317
495
  .pic = config.pic,
318
496
  });
319
- tests.root_module.addOptions("build_options", options);
497
+ (if (root_module) tests.root_module else tests).addOptions("build_options", options);
498
+
320
499
  maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
500
+ if (force_pic) {
501
+ tests.single_threaded = true;
502
+ if (config.pic orelse false) tests.force_pic = config.pic;
503
+ }
321
504
  if (coverage) |c| {
322
505
  tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
323
506
  }
@@ -329,35 +512,48 @@ const TestStep = struct {
329
512
 
330
513
  const ToolConfig = struct {
331
514
  options: Options,
515
+ module: ?*std.Build.Module,
332
516
  general: Config,
333
517
  tool: struct {
334
518
  tests: ?*TestStep,
335
519
  name: ?[]const u8 = null,
336
- exes: *std.ArrayList(*std.Build.Step.Compile),
520
+ exes: *std.ArrayList(*Step.Compile),
337
521
  },
338
522
  };
339
523
 
340
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
341
- std.fs.cwd().access(path, .{}) catch |err| switch (err) {
342
- error.FileNotFound => return null,
343
- else => |e| return e,
344
- };
524
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
525
+ if (!try exists(path)) return null;
345
526
  var name = config.tool.name orelse std.fs.path.basename(path);
346
527
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
347
528
  if (index) |i| name = name[0..i];
348
529
  if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
349
530
 
350
- const exe = b.addExecutable(.{
531
+ const exe = b.addExecutable(if (force_pic) .{
532
+ .name = name,
533
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
534
+ .target = config.general.target,
535
+ .optimize = config.general.optimize,
536
+ } else .{
351
537
  .name = name,
352
- .root_source_file = .{ .path = path },
538
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
353
539
  .target = config.general.target,
354
540
  .optimize = config.general.optimize,
355
541
  .single_threaded = true,
356
542
  .strip = config.general.strip,
357
543
  .pic = config.general.pic,
358
544
  });
359
- exe.root_module.addImport("pkmn", module(b, config.options));
360
545
 
546
+ if (root_module) {
547
+ const import = if (config.module) |m| m else module(b, config.options);
548
+ exe.root_module.addImport("pkmn", import);
549
+ } else {
550
+ exe.addModule("pkmn", module(b, config.options));
551
+ }
552
+
553
+ if (force_pic) {
554
+ exe.single_threaded = true;
555
+ if (config.general.pic orelse false) exe.force_pic = config.general.pic;
556
+ }
361
557
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
362
558
  config.tool.exes.append(exe) catch @panic("OOM");
363
559
 
@@ -368,10 +564,18 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.R
368
564
  return run;
369
565
  }
370
566
 
567
+ fn exists(path: []const u8) !bool {
568
+ std.fs.cwd().access(path, .{}) catch |err| switch (err) {
569
+ error.FileNotFound => return false,
570
+ else => |e| return e,
571
+ };
572
+ return true;
573
+ }
574
+
371
575
  const ToolsStep = struct {
372
576
  step: std.Build.Step,
373
577
 
374
- pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.Step.Compile)) *ToolsStep {
578
+ pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
375
579
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
376
580
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
377
581
  self.* = .{ .step = step };
@@ -379,3 +583,26 @@ const ToolsStep = struct {
379
583
  return self;
380
584
  }
381
585
  };
586
+
587
+ fn detect(target: anytype) std.Target {
588
+ if (@hasField(@TypeOf(target), "result")) return target.result;
589
+ return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
590
+ }
591
+
592
+ pub fn exports(b: *std.Build, bytes: []const u8) ![][]const u8 {
593
+ var symbols = std.ArrayList([]const u8).init(b.allocator);
594
+
595
+ var it = std.mem.splitSequence(u8, bytes, "export ");
596
+ _ = it.next();
597
+ while (it.next()) |s| {
598
+ if (std.mem.startsWith(u8, s, "const ")) {
599
+ const i = std.mem.indexOf(u8, s[6..], " ").?;
600
+ try symbols.append(s[6 .. 6 + i]);
601
+ } else { // "fn "
602
+ const i = std.mem.indexOf(u8, s[3..], "(").?;
603
+ try symbols.append(s[3 .. 3 + i]);
604
+ }
605
+ }
606
+
607
+ return symbols.items;
608
+ }