@pkmn/engine 0.1.0-dev.d4119c62 → 0.1.0-dev.d4bd80b1

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 (83) hide show
  1. package/LICENSE +1 -3
  2. package/README.md +46 -18
  3. package/build/pkg/addon/browser.d.ts +3 -0
  4. package/build/pkg/addon/browser.js +47 -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 +110 -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/layout.json +15 -2
  16. package/build/pkg/data/protocol.json +23 -9
  17. package/build/pkg/data.d.ts +27 -5
  18. package/build/pkg/data.js.map +1 -1
  19. package/build/pkg/gen1.d.ts +15 -18
  20. package/build/pkg/gen1.js +28 -19
  21. package/build/pkg/gen1.js.map +1 -1
  22. package/build/pkg/index.d.ts +40 -90
  23. package/build/pkg/index.js +23 -70
  24. package/build/pkg/index.js.map +1 -1
  25. package/build/pkg/protocol.d.ts +20 -1
  26. package/build/pkg/protocol.js +109 -107
  27. package/build/pkg/protocol.js.map +1 -1
  28. package/build/tools/debug.js +53 -78
  29. package/build/tools/debug.js.map +1 -1
  30. package/build/tools/display/debug.jsx +152 -0
  31. package/build/tools/display/debug.jsx.map +1 -0
  32. package/build/tools/display/index.js +152 -0
  33. package/build/tools/display/index.js.map +1 -0
  34. package/build/tools/display/ui.jsx +359 -0
  35. package/build/tools/display/ui.jsx.map +1 -0
  36. package/build/tools/display/util.js +33 -0
  37. package/build/tools/display/util.js.map +1 -0
  38. package/build.zig +330 -104
  39. package/package.json +60 -134
  40. package/src/bin/install-pkmn-engine +32 -21
  41. package/src/bin/pkmn-debug +1 -1
  42. package/src/lib/bindings/c.zig +255 -0
  43. package/src/lib/{binding → bindings}/node.zig +8 -21
  44. package/src/lib/bindings/wasm.zig +59 -0
  45. package/src/lib/common/array.zig +77 -0
  46. package/src/lib/common/data.zig +4 -4
  47. package/src/lib/common/debug.zig +39 -8
  48. package/src/lib/common/js.zig +4 -2
  49. package/src/lib/common/optional.zig +14 -10
  50. package/src/lib/common/options.zig +6 -0
  51. package/src/lib/common/protocol.zig +63 -67
  52. package/src/lib/common/rational.zig +128 -32
  53. package/src/lib/common/rng.zig +7 -9
  54. package/src/lib/common/util.zig +50 -1
  55. package/src/lib/gen1/calc.zig +686 -159
  56. package/src/lib/gen1/chance.zig +405 -280
  57. package/src/lib/gen1/data/moves.zig +2 -4
  58. package/src/lib/gen1/data/species.zig +2 -4
  59. package/src/lib/gen1/data/types.zig +1 -2
  60. package/src/lib/gen1/data.zig +24 -27
  61. package/src/lib/gen1/helpers.zig +92 -548
  62. package/src/lib/gen1/mechanics.zig +379 -258
  63. package/src/lib/gen2/calc.zig +37 -27
  64. package/src/lib/gen2/chance.zig +84 -496
  65. package/src/lib/gen2/data/items.zig +1 -3
  66. package/src/lib/gen2/data/moves.zig +2 -4
  67. package/src/lib/gen2/data/species.zig +1 -3
  68. package/src/lib/gen2/data/types.zig +1 -2
  69. package/src/lib/gen2/data.zig +19 -22
  70. package/src/lib/gen2/generated.zig +19 -26
  71. package/src/lib/gen2/helpers.zig +46 -25
  72. package/src/lib/gen2/mechanics.zig +217 -163
  73. package/src/lib/node.zig +18 -0
  74. package/src/lib/pkmn.zig +37 -15
  75. package/src/lib/wasm.zig +17 -0
  76. package/src/tools/display/dom.ts +95 -0
  77. package/src/tools/display/ui.css +354 -0
  78. package/build/test/display.js +0 -400
  79. package/build/test/display.js.map +0 -1
  80. package/src/lib/binding/wasm.zig +0 -12
  81. package/src/lib/gen1/README.md +0 -894
  82. package/src/lib/gen2/README.md +0 -329
  83. 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
- .source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
20
- .dependencies = &.{.{ .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") orelse false;
36
- const pic = b.option(bool, "pic", "Force position independent code") orelse false;
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) .{
68
131
  .name = addon,
69
- .main_pkg_path = .{ .path = "." },
70
- .root_source_file = .{ .path = "src/lib/binding/node.zig" },
132
+ .root_source_file = path,
71
133
  .optimize = optimize,
72
134
  .target = target,
135
+ } else .{
136
+ .name = addon,
137
+ .root_source_file = path,
138
+ .optimize = optimize,
139
+ .target = target,
140
+ .strip = strip,
141
+ .pic = pic,
73
142
  });
74
- lib.addOptions("build_options", options);
75
- 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));
76
145
  lib.linkLibC();
77
146
  if (node_import_lib) |il| {
78
- lib.addObjectFile(.{ .path = il });
79
- } else if ((try std.zig.system.NativeTargetInfo.detect(target)).target.os.tag == .windows) {
147
+ lib.addObjectFile(if (has_path) .{ .path = il } else b.path(il));
148
+ } else if (detect(target).os.tag == .windows) {
80
149
  try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
81
150
  std.process.exit(1);
82
151
  }
83
152
  lib.linker_allow_shlib_undefined = true;
84
153
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
85
- if (pic) lib.force_pic = pic;
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,70 +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
- .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 },
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,
105
175
  });
106
- exe.addOptions("build_options", options);
107
- exe.export_symbol_names = &[_][]const u8{
108
- "SHOWDOWN",
109
- "LOG",
110
- "CHANCE",
111
- "CALC",
112
- "GEN1_CHOICES_SIZE",
113
- "GEN1_LOGS_SIZE",
114
- };
115
- exe.entry = .disabled;
116
- exe.stack_size = wasm_stack_size;
117
- exe.strip = strip;
118
- if (pic) exe.force_pic = pic;
119
- const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
120
- if (optimize != .Debug and opt != null) {
121
- const out = b.fmt("build/lib/{s}.wasm", .{name});
122
- const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
123
- sh.addArtifactArg(exe);
124
- sh.addArg("-o");
125
- sh.addFileSourceArg(.{ .path = out });
126
- b.getInstallStep().dependOn(&sh.step);
127
- } else {
128
- b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
129
- .dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
130
- }).step);
131
- }
176
+ try buildWasm(b, n, path, optimize, strip, pic, wasm_stack_size, mod, options);
132
177
  } else if (dynamic) {
133
- 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) .{
134
180
  .name = name,
135
- .main_pkg_path = .{ .path = "." },
136
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
181
+ .root_source_file = path,
137
182
  .version = try std.SemanticVersion.parse(version),
138
183
  .optimize = optimize,
139
184
  .target = target,
185
+ } else .{
186
+ .name = name,
187
+ .root_source_file = path,
188
+ .version = try std.SemanticVersion.parse(version),
189
+ .optimize = optimize,
190
+ .target = target,
191
+ .strip = strip,
192
+ .pic = pic,
140
193
  });
141
- lib.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);
144
- if (pic) lib.force_pic = pic;
197
+ if (force_pic and pic orelse false) lib.force_pic = pic;
145
198
  b.installArtifact(lib);
146
199
  c = true;
147
200
  } else {
148
- 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 .{
149
208
  .name = name,
150
- .main_pkg_path = .{ .path = "." },
151
- .root_source_file = .{ .path = "src/lib/binding/c.zig" },
209
+ .root_source_file = path,
152
210
  .optimize = optimize,
153
211
  .target = target,
212
+ .strip = strip,
213
+ .pic = pic,
154
214
  });
155
- lib.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);
159
- if (pic) lib.force_pic = pic;
219
+ if (force_pic and pic orelse false) lib.force_pic = pic;
160
220
  if (emit_asm) {
161
221
  b.getInstallStep().dependOn(&b.addInstallFileWithDir(
162
222
  lib.getEmittedAsm(),
@@ -176,15 +236,17 @@ pub fn build(b: *std.Build) !void {
176
236
  }
177
237
 
178
238
  if (c) {
179
- const header = b.addInstallFileWithDir(
180
- .{ .path = "src/include/pkmn.h" },
181
- .header,
182
- "pkmn.h",
183
- );
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");
184
242
  b.getInstallStep().dependOn(&header.step);
185
243
 
186
244
  const pc = b.fmt("lib{s}.pc", .{name});
187
- 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
+ );
188
250
  const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
189
251
 
190
252
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
@@ -206,7 +268,7 @@ pub fn build(b: *std.Build) !void {
206
268
  b.installFile(file, b.fmt("share/pkgconfig/{s}", .{pc}));
207
269
  }
208
270
 
209
- const config = .{
271
+ const config: Config = .{
210
272
  .target = target,
211
273
  .optimize = optimize,
212
274
  .pic = pic,
@@ -217,7 +279,7 @@ pub fn build(b: *std.Build) !void {
217
279
  // TODO: tests can be run multiple times due to @imports
218
280
  const tests = TestStep.create(b, options, config);
219
281
 
220
- var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
282
+ var exes = std.ArrayList(*Step.Compile).init(b.allocator);
221
283
  const tools: ToolConfig = .{
222
284
  .options = .{
223
285
  .showdown = showdown,
@@ -225,6 +287,7 @@ pub fn build(b: *std.Build) !void {
225
287
  .chance = chance,
226
288
  .calc = calc,
227
289
  },
290
+ .module = pkmn,
228
291
  .general = config,
229
292
  .tool = .{
230
293
  .tests = if (tests.build) tests else null,
@@ -263,15 +326,128 @@ pub fn build(b: *std.Build) !void {
263
326
  }
264
327
  }
265
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
+
266
442
  fn maybeStrip(
267
443
  b: *std.Build,
268
- artifact: *std.Build.CompileStep,
444
+ artifact: *Step.Compile,
269
445
  step: *std.Build.Step,
270
- strip: bool,
446
+ strip: ?bool,
271
447
  cmd: ?[]const u8,
272
448
  ) void {
273
- artifact.strip = strip;
274
- if (!strip or cmd == null) return;
449
+ if (@hasDecl(@TypeOf(artifact.*), "strip")) artifact.strip = strip orelse false;
450
+ if (!(strip orelse false) or cmd == null) return;
275
451
  // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
276
452
  const mac = builtin.os.tag == .macos;
277
453
  if (mac and artifact.isDynamicLibrary()) return;
@@ -283,10 +459,10 @@ fn maybeStrip(
283
459
  }
284
460
 
285
461
  const Config = struct {
286
- target: std.zig.CrossTarget,
462
+ target: ResolvedTarget,
287
463
  optimize: std.builtin.OptimizeMode,
288
- pic: bool,
289
- strip: bool,
464
+ pic: ?bool,
465
+ strip: ?bool,
290
466
  cmd: ?[]const u8,
291
467
  };
292
468
 
@@ -294,9 +470,8 @@ const TestStep = struct {
294
470
  step: std.Build.Step,
295
471
  build: bool,
296
472
 
297
- pub fn create(b: *std.Build, options: *std.Build.OptionsStep, config: Config) *TestStep {
473
+ pub fn create(b: *std.Build, options: *Step.Options, config: Config) *TestStep {
298
474
  const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
299
- const test_file = b.option([]const u8, "test-file", "Input file for test");
300
475
  const test_filter =
301
476
  b.option([]const u8, "test-filter", "Skip tests that do not match filter");
302
477
 
@@ -304,22 +479,28 @@ const TestStep = struct {
304
479
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
305
480
  self.* = .{ .step = step, .build = test_filter == null };
306
481
 
307
- const path = test_file orelse "src/lib/test.zig";
308
- const tests = b.addTest(.{
309
- .name = b.fmt("{s}-{s}", .{
310
- std.fs.path.basename(std.fs.path.dirname(path).?),
311
- std.fs.path.stem(std.fs.path.basename(path)),
312
- }),
313
- .main_pkg_path = .{ .path = "." },
314
- .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,
315
485
  .optimize = config.optimize,
316
486
  .target = config.target,
317
487
  .filter = test_filter,
488
+ } else .{
489
+ .root_source_file = path,
490
+ .optimize = config.optimize,
491
+ .target = config.target,
492
+ .filter = test_filter,
493
+ .single_threaded = true,
494
+ .strip = config.strip,
495
+ .pic = config.pic,
318
496
  });
319
- tests.addOptions("build_options", options);
320
- tests.single_threaded = true;
497
+ (if (root_module) tests.root_module else tests).addOptions("build_options", options);
498
+
321
499
  maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
322
- if (config.pic) tests.force_pic = config.pic;
500
+ if (force_pic) {
501
+ tests.single_threaded = true;
502
+ if (config.pic orelse false) tests.force_pic = config.pic;
503
+ }
323
504
  if (coverage) |c| {
324
505
  tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
325
506
  }
@@ -331,34 +512,48 @@ const TestStep = struct {
331
512
 
332
513
  const ToolConfig = struct {
333
514
  options: Options,
515
+ module: ?*std.Build.Module,
334
516
  general: Config,
335
517
  tool: struct {
336
518
  tests: ?*TestStep,
337
519
  name: ?[]const u8 = null,
338
- exes: *std.ArrayList(*std.Build.CompileStep),
520
+ exes: *std.ArrayList(*Step.Compile),
339
521
  },
340
522
  };
341
523
 
342
- fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.RunStep {
343
- std.fs.cwd().access(path, .{}) catch |err| switch (err) {
344
- error.FileNotFound => return null,
345
- else => |e| return e,
346
- };
524
+ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*Step.Run {
525
+ if (!try exists(path)) return null;
347
526
  var name = config.tool.name orelse std.fs.path.basename(path);
348
527
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
349
528
  if (index) |i| name = name[0..i];
350
529
  if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
351
530
 
352
- 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 .{
353
537
  .name = name,
354
- .root_source_file = .{ .path = path },
538
+ .root_source_file = if (has_path) .{ .path = path } else b.path(path),
355
539
  .target = config.general.target,
356
540
  .optimize = config.general.optimize,
541
+ .single_threaded = true,
542
+ .strip = config.general.strip,
543
+ .pic = config.general.pic,
357
544
  });
358
- exe.addModule("pkmn", module(b, config.options));
359
545
 
360
- exe.single_threaded = true;
361
- if (config.general.pic) exe.force_pic = config.general.pic;
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
+ }
362
557
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
363
558
  config.tool.exes.append(exe) catch @panic("OOM");
364
559
 
@@ -369,10 +564,18 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.RunSte
369
564
  return run;
370
565
  }
371
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
+
372
575
  const ToolsStep = struct {
373
576
  step: std.Build.Step,
374
577
 
375
- pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.CompileStep)) *ToolsStep {
578
+ pub fn create(b: *std.Build, exes: *std.ArrayList(*Step.Compile)) *ToolsStep {
376
579
  const self = b.allocator.create(ToolsStep) catch @panic("OOM");
377
580
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
378
581
  self.* = .{ .step = step };
@@ -380,3 +583,26 @@ const ToolsStep = struct {
380
583
  return self;
381
584
  }
382
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
+ }