@pkmn/engine 0.1.0-dev.cf6f5d2c → 0.1.0-dev.d1b39ff0
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.
- package/LICENSE +1 -3
- package/README.md +95 -59
- package/build/pkg/addon.js +9 -9
- package/build/pkg/addon.js.map +1 -1
- package/build/pkg/data/ids.json +12 -12
- package/build/pkg/data/layout.json +27 -5
- package/build/pkg/data/protocol.json +69 -12
- package/build/pkg/data.d.ts +4 -4
- package/build/pkg/data.js.map +1 -1
- package/build/pkg/gen1.d.ts +2 -1
- package/build/pkg/gen1.js +38 -20
- package/build/pkg/gen1.js.map +1 -1
- package/build/pkg/index.d.ts +7 -4
- package/build/pkg/index.js.map +1 -1
- package/build/pkg/protocol.d.ts +4 -2
- package/build/pkg/protocol.js +65 -44
- package/build/pkg/protocol.js.map +1 -1
- package/build/test/display.js +15 -6
- package/build/test/display.js.map +1 -1
- package/build/tools/debug.js +5 -4
- package/build/tools/debug.js.map +1 -1
- package/build.zig +148 -126
- package/package.json +53 -24
- package/src/bin/install-pkmn-engine +35 -22
- package/src/lib/common/battle.zig +17 -0
- package/src/lib/common/data.zig +19 -31
- package/src/lib/common/debug.zig +22 -13
- package/src/lib/common/js.zig +118 -0
- package/src/lib/common/optional.zig +67 -0
- package/src/lib/common/options.zig +11 -0
- package/src/lib/common/protocol.zig +906 -367
- package/src/lib/common/rational.zig +454 -0
- package/src/lib/common/rng.zig +35 -26
- package/src/lib/common/util.zig +12 -0
- package/src/lib/gen1/calc.zig +802 -0
- package/src/lib/gen1/chance.zig +1159 -0
- package/src/lib/gen1/data/moves.zig +202 -190
- package/src/lib/gen1/data/species.zig +5 -5
- package/src/lib/gen1/data/types.zig +10 -10
- package/src/lib/gen1/data.zig +104 -90
- package/src/lib/gen1/helpers.zig +140 -42
- package/src/lib/gen1/mechanics.zig +1135 -773
- package/src/lib/gen2/calc.zig +135 -0
- package/src/lib/gen2/chance.zig +895 -0
- package/src/lib/gen2/data/items.zig +14 -20
- package/src/lib/gen2/data/moves.zig +664 -570
- package/src/lib/gen2/data/species.zig +2 -2
- package/src/lib/gen2/data/types.zig +137 -34
- package/src/lib/gen2/data.zig +130 -92
- package/src/lib/gen2/generated.zig +806 -0
- package/src/lib/gen2/helpers.zig +50 -26
- package/src/lib/gen2/mechanics.zig +3568 -12
- package/src/lib/node.zig +131 -0
- package/src/lib/pkmn.zig +81 -5
- package/src/lib/wasm.zig +13 -0
- package/src/test/display/pkmn.html.tmpl +5 -5
- package/src/lib/binding/node.zig +0 -229
- package/src/lib/binding/wasm.zig +0 -10
- package/src/lib/gen1/README.md +0 -804
- package/src/lib/gen2/README.md +0 -309
package/build.zig
CHANGED
|
@@ -1,19 +1,6 @@
|
|
|
1
1
|
const std = @import("std");
|
|
2
2
|
const builtin = @import("builtin");
|
|
3
3
|
|
|
4
|
-
pub const Options = struct { showdown: ?bool = null, log: ?bool = null };
|
|
5
|
-
|
|
6
|
-
pub fn module(b: *std.Build, options: Options) *std.Build.Module {
|
|
7
|
-
const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
|
|
8
|
-
const build_options = b.addOptions();
|
|
9
|
-
build_options.addOption(?bool, "showdown", options.showdown);
|
|
10
|
-
build_options.addOption(?bool, "log", options.log);
|
|
11
|
-
return b.createModule(.{
|
|
12
|
-
.source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
|
|
13
|
-
.dependencies = &.{.{ .name = "build_options", .module = build_options.createModule() }},
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
|
|
17
4
|
pub fn build(b: *std.Build) !void {
|
|
18
5
|
const target = b.standardTargetOptions(.{});
|
|
19
6
|
const optimize = b.standardOptimizeOption(.{});
|
|
@@ -25,55 +12,66 @@ pub fn build(b: *std.Build) !void {
|
|
|
25
12
|
const wasm_stack_size =
|
|
26
13
|
b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
|
|
27
14
|
const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
|
|
28
|
-
const strip = b.option(bool, "strip", "Strip debugging symbols from binary")
|
|
29
|
-
const pic = b.option(bool, "pic", "Force position independent code")
|
|
15
|
+
const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
|
|
16
|
+
const pic = b.option(bool, "pic", "Force position independent code");
|
|
30
17
|
const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
|
|
18
|
+
const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
|
|
31
19
|
|
|
32
20
|
const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
|
|
33
21
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
var repository = std.mem.split(u8, tree.root.Object.get("repository").?.String, ":");
|
|
22
|
+
const json = @embedFile("package.json");
|
|
23
|
+
var parsed = try std.json.parseFromSlice(std.json.Value, b.allocator, json, .{});
|
|
24
|
+
defer parsed.deinit();
|
|
25
|
+
const version = parsed.value.object.get("version").?.string;
|
|
26
|
+
const description = parsed.value.object.get("description").?.string;
|
|
27
|
+
var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
|
|
41
28
|
std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
|
|
42
29
|
|
|
43
30
|
const showdown =
|
|
44
31
|
b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
|
|
45
32
|
const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
|
|
33
|
+
const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
|
|
34
|
+
const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
|
|
46
35
|
|
|
47
36
|
const options = b.addOptions();
|
|
48
37
|
options.addOption(?bool, "showdown", showdown);
|
|
49
38
|
options.addOption(?bool, "log", log);
|
|
39
|
+
options.addOption(?bool, "chance", chance);
|
|
40
|
+
options.addOption(?bool, "calc", calc);
|
|
50
41
|
|
|
51
42
|
const name = if (showdown) "pkmn-showdown" else "pkmn";
|
|
52
43
|
|
|
44
|
+
const module = b.addModule("pkmn", .{
|
|
45
|
+
.root_source_file = b.path("src/lib/pkmn.zig"),
|
|
46
|
+
.optimize = optimize,
|
|
47
|
+
.target = target,
|
|
48
|
+
.imports = &.{.{ .name = "build_options", .module = options.createModule() }},
|
|
49
|
+
});
|
|
50
|
+
|
|
53
51
|
var c = false;
|
|
54
52
|
if (node_headers) |headers| {
|
|
55
53
|
const addon = b.fmt("{s}.node", .{name});
|
|
56
54
|
const lib = b.addSharedLibrary(.{
|
|
57
55
|
.name = addon,
|
|
58
|
-
.root_source_file = .
|
|
56
|
+
.root_source_file = b.path("src/lib/node.zig"),
|
|
59
57
|
.optimize = optimize,
|
|
60
58
|
.target = target,
|
|
59
|
+
.strip = strip,
|
|
60
|
+
.pic = pic,
|
|
61
61
|
});
|
|
62
|
-
lib.addOptions("build_options", options);
|
|
63
|
-
lib.
|
|
64
|
-
lib.addSystemIncludePath(headers);
|
|
62
|
+
lib.root_module.addOptions("build_options", options);
|
|
63
|
+
lib.addSystemIncludePath(b.path(headers));
|
|
65
64
|
lib.linkLibC();
|
|
66
65
|
if (node_import_lib) |il| {
|
|
67
|
-
lib.addObjectFile(il);
|
|
68
|
-
} else if (
|
|
66
|
+
lib.addObjectFile(b.path(il));
|
|
67
|
+
} else if (target.result.os.tag == .windows) {
|
|
69
68
|
try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
|
|
70
69
|
std.process.exit(1);
|
|
71
70
|
}
|
|
72
71
|
lib.linker_allow_shlib_undefined = true;
|
|
73
72
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
74
|
-
if (pic) lib.force_pic = pic;
|
|
75
73
|
// Always emit to build/lib because this is where the driver code expects to find it
|
|
76
|
-
// TODO
|
|
74
|
+
// TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
|
|
77
75
|
//
|
|
78
76
|
// lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
|
|
79
77
|
// b.getInstallStep().dependOn(&lib.step);
|
|
@@ -82,74 +80,101 @@ pub fn build(b: *std.Build) !void {
|
|
|
82
80
|
// rename the file ourself in install-pkmn-engine
|
|
83
81
|
b.installArtifact(lib);
|
|
84
82
|
} else if (wasm) {
|
|
85
|
-
const
|
|
83
|
+
const exe = b.addExecutable(.{
|
|
86
84
|
.name = name,
|
|
87
|
-
.root_source_file = .
|
|
85
|
+
.root_source_file = b.path("src/lib/wasm.zig"),
|
|
88
86
|
.optimize = switch (optimize) {
|
|
89
87
|
.ReleaseFast, .ReleaseSafe => .ReleaseSmall,
|
|
90
88
|
else => optimize,
|
|
91
89
|
},
|
|
92
|
-
.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
|
|
90
|
+
.target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
|
|
91
|
+
.strip = strip,
|
|
92
|
+
.pic = pic,
|
|
93
93
|
});
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
94
|
+
exe.root_module.addOptions("build_options", options);
|
|
95
|
+
exe.root_module.export_symbol_names = &[_][]const u8{
|
|
96
|
+
"SHOWDOWN",
|
|
97
|
+
"LOG",
|
|
98
|
+
"CHANCE",
|
|
99
|
+
"CALC",
|
|
100
|
+
"GEN1_CHOICES_SIZE",
|
|
101
|
+
"GEN1_LOGS_SIZE",
|
|
102
|
+
};
|
|
103
|
+
exe.entry = .disabled;
|
|
104
|
+
exe.stack_size = wasm_stack_size;
|
|
100
105
|
const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
|
|
101
106
|
if (optimize != .Debug and opt != null) {
|
|
102
107
|
const out = b.fmt("build/lib/{s}.wasm", .{name});
|
|
103
108
|
const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
|
|
104
|
-
sh.addArtifactArg(
|
|
109
|
+
sh.addArtifactArg(exe);
|
|
105
110
|
sh.addArg("-o");
|
|
106
|
-
sh.
|
|
111
|
+
sh.addFileArg(b.path(out));
|
|
107
112
|
b.getInstallStep().dependOn(&sh.step);
|
|
113
|
+
} else {
|
|
114
|
+
b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
|
|
115
|
+
.dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
|
|
116
|
+
}).step);
|
|
108
117
|
}
|
|
109
|
-
b.installArtifact(lib);
|
|
110
118
|
} else if (dynamic) {
|
|
111
119
|
const lib = b.addSharedLibrary(.{
|
|
112
120
|
.name = name,
|
|
113
|
-
.root_source_file = .
|
|
114
|
-
.version = try std.
|
|
121
|
+
.root_source_file = b.path("src/lib/c.zig"),
|
|
122
|
+
.version = try std.SemanticVersion.parse(version),
|
|
115
123
|
.optimize = optimize,
|
|
116
124
|
.target = target,
|
|
125
|
+
.strip = strip,
|
|
126
|
+
.pic = pic,
|
|
117
127
|
});
|
|
118
|
-
lib.addOptions("build_options", options);
|
|
119
|
-
lib.
|
|
120
|
-
lib.addIncludePath("src/include");
|
|
128
|
+
lib.root_module.addOptions("build_options", options);
|
|
129
|
+
lib.addIncludePath(b.path("src/include"));
|
|
121
130
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
122
|
-
if (pic) lib.force_pic = pic;
|
|
123
131
|
b.installArtifact(lib);
|
|
124
132
|
c = true;
|
|
125
133
|
} else {
|
|
126
134
|
const lib = b.addStaticLibrary(.{
|
|
127
135
|
.name = name,
|
|
128
|
-
.root_source_file = .
|
|
136
|
+
.root_source_file = b.path("src/lib/c.zig"),
|
|
129
137
|
.optimize = optimize,
|
|
130
138
|
.target = target,
|
|
139
|
+
.strip = strip,
|
|
140
|
+
.pic = pic,
|
|
131
141
|
});
|
|
132
|
-
lib.addOptions("build_options", options);
|
|
133
|
-
lib.
|
|
134
|
-
lib.addIncludePath("src/include");
|
|
142
|
+
lib.root_module.addOptions("build_options", options);
|
|
143
|
+
lib.addIncludePath(b.path("src/include"));
|
|
135
144
|
lib.bundle_compiler_rt = true;
|
|
136
145
|
maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
|
|
137
|
-
if (
|
|
138
|
-
|
|
146
|
+
if (emit_asm) {
|
|
147
|
+
b.getInstallStep().dependOn(&b.addInstallFileWithDir(
|
|
148
|
+
lib.getEmittedAsm(),
|
|
149
|
+
.prefix,
|
|
150
|
+
b.fmt("{s}.s", .{name}),
|
|
151
|
+
).step);
|
|
152
|
+
}
|
|
153
|
+
if (emit_ll) {
|
|
154
|
+
b.getInstallStep().dependOn(&b.addInstallFileWithDir(
|
|
155
|
+
lib.getEmittedLlvmIr(),
|
|
156
|
+
.prefix,
|
|
157
|
+
b.fmt("{s}.ll", .{name}),
|
|
158
|
+
).step);
|
|
159
|
+
}
|
|
139
160
|
b.installArtifact(lib);
|
|
140
161
|
c = true;
|
|
141
162
|
}
|
|
142
163
|
|
|
143
164
|
if (c) {
|
|
144
165
|
const header = b.addInstallFileWithDir(
|
|
145
|
-
.
|
|
166
|
+
b.path("src/include/pkmn.h"),
|
|
146
167
|
.header,
|
|
147
168
|
"pkmn.h",
|
|
148
169
|
);
|
|
149
170
|
b.getInstallStep().dependOn(&header.step);
|
|
150
171
|
|
|
151
172
|
const pc = b.fmt("lib{s}.pc", .{name});
|
|
152
|
-
const file = try
|
|
173
|
+
const file = try std.fs.path.relative(
|
|
174
|
+
b.allocator,
|
|
175
|
+
try std.process.getCwdAlloc(b.allocator),
|
|
176
|
+
try b.cache_root.join(b.allocator, &.{pc}),
|
|
177
|
+
);
|
|
153
178
|
const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
|
|
154
179
|
|
|
155
180
|
const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
|
|
@@ -178,14 +203,16 @@ pub fn build(b: *std.Build) !void {
|
|
|
178
203
|
.strip = strip,
|
|
179
204
|
.cmd = cmd,
|
|
180
205
|
};
|
|
206
|
+
|
|
207
|
+
// TODO: tests can be run multiple times due to @imports
|
|
181
208
|
const tests = TestStep.create(b, options, config);
|
|
182
209
|
|
|
183
|
-
var exes = std.ArrayList(*std.Build.
|
|
210
|
+
var exes = std.ArrayList(*std.Build.Step.Compile).init(b.allocator);
|
|
184
211
|
const tools: ToolConfig = .{
|
|
212
|
+
.showdown = showdown,
|
|
213
|
+
.module = module,
|
|
185
214
|
.general = config,
|
|
186
215
|
.tool = .{
|
|
187
|
-
.showdown = showdown,
|
|
188
|
-
.log = log,
|
|
189
216
|
.tests = if (tests.build) tests else null,
|
|
190
217
|
.exes = &exes,
|
|
191
218
|
},
|
|
@@ -194,39 +221,42 @@ pub fn build(b: *std.Build) !void {
|
|
|
194
221
|
var benchmark_config = tools;
|
|
195
222
|
benchmark_config.general.optimize = .ReleaseFast;
|
|
196
223
|
benchmark_config.general.strip = true;
|
|
197
|
-
const benchmark = tool(b, "src/test/benchmark.zig", benchmark_config);
|
|
224
|
+
const benchmark = try tool(b, "src/test/benchmark.zig", benchmark_config);
|
|
198
225
|
|
|
199
226
|
var fuzz_config = tools;
|
|
200
227
|
fuzz_config.general.strip = false;
|
|
201
228
|
fuzz_config.tool.name = "fuzz";
|
|
202
|
-
const fuzz = tool(b, "src/test/
|
|
203
|
-
|
|
204
|
-
const
|
|
205
|
-
const
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
b.step("
|
|
214
|
-
b.step("
|
|
215
|
-
b.step("
|
|
216
|
-
b.step("
|
|
229
|
+
const fuzz = try tool(b, "src/test/fuzz.zig", fuzz_config);
|
|
230
|
+
|
|
231
|
+
const analyze = try tool(b, "src/tools/analyze.zig", tools);
|
|
232
|
+
const dump = try tool(b, "src/tools/dump.zig", tools);
|
|
233
|
+
const transitions = try tool(b, "src/tools/transitions.zig", tools);
|
|
234
|
+
|
|
235
|
+
// FIXME: serde randomly fails to build in some release configurations
|
|
236
|
+
var hack = tools;
|
|
237
|
+
if (optimize != .Debug) hack.tool.tests = null;
|
|
238
|
+
const serde = try tool(b, "src/tools/serde.zig", hack);
|
|
239
|
+
|
|
240
|
+
if (analyze) |t| b.step("analyze", "Run LLVM analysis tool").dependOn(&t.step);
|
|
241
|
+
if (benchmark) |t| b.step("benchmark", "Run benchmark code").dependOn(&t.step);
|
|
242
|
+
if (dump) |t| b.step("dump", "Run protocol dump tool").dependOn(&t.step);
|
|
243
|
+
if (fuzz) |t| b.step("fuzz", "Run fuzz tester").dependOn(&t.step);
|
|
244
|
+
if (serde) |t| b.step("serde", "Run serialization/deserialization tool").dependOn(&t.step);
|
|
217
245
|
b.step("test", "Run all tests").dependOn(&tests.step);
|
|
218
246
|
b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
|
|
247
|
+
if (transitions) |t| {
|
|
248
|
+
b.step("transitions", "Visualize transitions algorithm search").dependOn(&t.step);
|
|
249
|
+
}
|
|
219
250
|
}
|
|
220
251
|
|
|
221
252
|
fn maybeStrip(
|
|
222
253
|
b: *std.Build,
|
|
223
|
-
artifact: *std.Build.
|
|
254
|
+
artifact: *std.Build.Step.Compile,
|
|
224
255
|
step: *std.Build.Step,
|
|
225
|
-
strip: bool,
|
|
256
|
+
strip: ?bool,
|
|
226
257
|
cmd: ?[]const u8,
|
|
227
258
|
) void {
|
|
228
|
-
|
|
229
|
-
if (!strip or cmd == null) return;
|
|
259
|
+
if (!(strip orelse false) or cmd == null) return;
|
|
230
260
|
// Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
|
|
231
261
|
const mac = builtin.os.tag == .macos;
|
|
232
262
|
if (mac and artifact.isDynamicLibrary()) return;
|
|
@@ -238,86 +268,78 @@ fn maybeStrip(
|
|
|
238
268
|
}
|
|
239
269
|
|
|
240
270
|
const Config = struct {
|
|
241
|
-
target: std.
|
|
271
|
+
target: std.Build.ResolvedTarget,
|
|
242
272
|
optimize: std.builtin.OptimizeMode,
|
|
243
|
-
pic: bool,
|
|
244
|
-
strip: bool,
|
|
273
|
+
pic: ?bool,
|
|
274
|
+
strip: ?bool,
|
|
245
275
|
cmd: ?[]const u8,
|
|
246
276
|
};
|
|
247
277
|
|
|
248
|
-
const TESTS = .{
|
|
249
|
-
"src/lib/common/test.zig",
|
|
250
|
-
"src/lib/gen1/test.zig",
|
|
251
|
-
"src/lib/gen2/test.zig",
|
|
252
|
-
};
|
|
253
|
-
|
|
254
278
|
const TestStep = struct {
|
|
255
279
|
step: std.Build.Step,
|
|
256
280
|
build: bool,
|
|
257
281
|
|
|
258
|
-
pub fn create(b: *std.Build, options: *std.Build.
|
|
282
|
+
pub fn create(b: *std.Build, options: *std.Build.Step.Options, config: Config) *TestStep {
|
|
259
283
|
const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
|
|
260
|
-
const test_file = b.option([]const u8, "test-file", "Input file for test");
|
|
261
284
|
const test_filter =
|
|
262
285
|
b.option([]const u8, "test-filter", "Skip tests that do not match filter");
|
|
263
286
|
|
|
264
287
|
const self = b.allocator.create(TestStep) catch @panic("OOM");
|
|
265
288
|
const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
|
|
266
|
-
self.* =
|
|
267
|
-
|
|
268
|
-
const
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
tests.
|
|
281
|
-
maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
|
|
282
|
-
if (config.pic) tests.force_pic = config.pic;
|
|
283
|
-
if (coverage) |c| {
|
|
284
|
-
tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
|
|
285
|
-
}
|
|
286
|
-
self.step.dependOn(&b.addRunArtifact(tests).step);
|
|
289
|
+
self.* = .{ .step = step, .build = test_filter == null };
|
|
290
|
+
|
|
291
|
+
const tests = b.addTest(.{
|
|
292
|
+
.root_source_file = b.path("src/lib/test.zig"),
|
|
293
|
+
.optimize = config.optimize,
|
|
294
|
+
.target = config.target,
|
|
295
|
+
.filter = test_filter,
|
|
296
|
+
.single_threaded = true,
|
|
297
|
+
.strip = config.strip,
|
|
298
|
+
.pic = config.pic,
|
|
299
|
+
});
|
|
300
|
+
tests.root_module.addOptions("build_options", options);
|
|
301
|
+
maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
|
|
302
|
+
if (coverage) |c| {
|
|
303
|
+
tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
|
|
287
304
|
}
|
|
305
|
+
self.step.dependOn(&b.addRunArtifact(tests).step);
|
|
306
|
+
|
|
288
307
|
return self;
|
|
289
308
|
}
|
|
290
309
|
};
|
|
291
310
|
|
|
292
311
|
const ToolConfig = struct {
|
|
312
|
+
showdown: ?bool,
|
|
313
|
+
module: *std.Build.Module,
|
|
293
314
|
general: Config,
|
|
294
315
|
tool: struct {
|
|
295
|
-
showdown: bool,
|
|
296
|
-
log: bool,
|
|
297
316
|
tests: ?*TestStep,
|
|
298
317
|
name: ?[]const u8 = null,
|
|
299
|
-
exes: *std.ArrayList(*std.Build.
|
|
318
|
+
exes: *std.ArrayList(*std.Build.Step.Compile),
|
|
300
319
|
},
|
|
301
320
|
};
|
|
302
321
|
|
|
303
|
-
fn tool(b: *std.Build, path: []const u8, config: ToolConfig)
|
|
322
|
+
fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
|
|
323
|
+
std.fs.cwd().access(path, .{}) catch |err| switch (err) {
|
|
324
|
+
error.FileNotFound => return null,
|
|
325
|
+
else => |e| return e,
|
|
326
|
+
};
|
|
304
327
|
var name = config.tool.name orelse std.fs.path.basename(path);
|
|
305
328
|
const index = std.mem.lastIndexOfScalar(u8, name, '.');
|
|
306
329
|
if (index) |i| name = name[0..i];
|
|
307
|
-
if (config.
|
|
330
|
+
if (config.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
|
|
308
331
|
|
|
309
332
|
const exe = b.addExecutable(.{
|
|
310
333
|
.name = name,
|
|
311
|
-
.root_source_file = .
|
|
334
|
+
.root_source_file = b.path(path),
|
|
312
335
|
.target = config.general.target,
|
|
313
336
|
.optimize = config.general.optimize,
|
|
337
|
+
.single_threaded = true,
|
|
338
|
+
.strip = config.general.strip,
|
|
339
|
+
.pic = config.general.pic,
|
|
314
340
|
});
|
|
315
|
-
exe.
|
|
316
|
-
|
|
317
|
-
.log = config.tool.log,
|
|
318
|
-
}));
|
|
319
|
-
exe.single_threaded = true;
|
|
320
|
-
if (config.general.pic) exe.force_pic = config.general.pic;
|
|
341
|
+
exe.root_module.addImport("pkmn", config.module);
|
|
342
|
+
|
|
321
343
|
if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
|
|
322
344
|
config.tool.exes.append(exe) catch @panic("OOM");
|
|
323
345
|
|
|
@@ -331,11 +353,11 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
|
|
|
331
353
|
const ToolsStep = struct {
|
|
332
354
|
step: std.Build.Step,
|
|
333
355
|
|
|
334
|
-
pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.
|
|
356
|
+
pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.Step.Compile)) *ToolsStep {
|
|
335
357
|
const self = b.allocator.create(ToolsStep) catch @panic("OOM");
|
|
336
358
|
const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
|
|
337
|
-
self.* =
|
|
338
|
-
for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t).step);
|
|
359
|
+
self.* = .{ .step = step };
|
|
360
|
+
for (exes.items) |t| self.step.dependOn(&b.addInstallArtifact(t, .{}).step);
|
|
339
361
|
return self;
|
|
340
362
|
}
|
|
341
363
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pkmn/engine",
|
|
3
|
-
"version": "0.1.0-dev.
|
|
3
|
+
"version": "0.1.0-dev.d1b39ff0",
|
|
4
4
|
"description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
|
|
5
5
|
"repository": "github:pkmn/engine",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,28 +31,37 @@
|
|
|
31
31
|
"build/test/display.js",
|
|
32
32
|
"build/tools/debug.js.map",
|
|
33
33
|
"build/tools/debug.js",
|
|
34
|
-
"src/
|
|
35
|
-
"src/lib/binding/node.zig",
|
|
36
|
-
"src/lib/binding/wasm.zig",
|
|
34
|
+
"src/lib/common/battle.zig",
|
|
37
35
|
"src/lib/common/data.zig",
|
|
38
36
|
"src/lib/common/debug.zig",
|
|
37
|
+
"src/lib/common/js.zig",
|
|
38
|
+
"src/lib/common/optional.zig",
|
|
39
39
|
"src/lib/common/options.zig",
|
|
40
40
|
"src/lib/common/protocol.zig",
|
|
41
|
+
"src/lib/common/rational.zig",
|
|
41
42
|
"src/lib/common/rng.zig",
|
|
43
|
+
"src/lib/common/util.zig",
|
|
44
|
+
"src/lib/gen1/calc.zig",
|
|
45
|
+
"src/lib/gen1/chance.zig",
|
|
42
46
|
"src/lib/gen1/data.zig",
|
|
43
47
|
"src/lib/gen1/data/moves.zig",
|
|
44
48
|
"src/lib/gen1/data/species.zig",
|
|
45
49
|
"src/lib/gen1/data/types.zig",
|
|
46
50
|
"src/lib/gen1/helpers.zig",
|
|
47
51
|
"src/lib/gen1/mechanics.zig",
|
|
52
|
+
"src/lib/gen2/calc.zig",
|
|
53
|
+
"src/lib/gen2/chance.zig",
|
|
48
54
|
"src/lib/gen2/data.zig",
|
|
49
55
|
"src/lib/gen2/data/items.zig",
|
|
50
56
|
"src/lib/gen2/data/moves.zig",
|
|
51
57
|
"src/lib/gen2/data/species.zig",
|
|
52
58
|
"src/lib/gen2/data/types.zig",
|
|
59
|
+
"src/lib/gen2/generated.zig",
|
|
53
60
|
"src/lib/gen2/helpers.zig",
|
|
54
61
|
"src/lib/gen2/mechanics.zig",
|
|
62
|
+
"src/lib/node.zig",
|
|
55
63
|
"src/lib/pkmn.zig",
|
|
64
|
+
"src/lib/wasm.zig",
|
|
56
65
|
"src/test/display/pkmn.html.tmpl"
|
|
57
66
|
],
|
|
58
67
|
"engines": {
|
|
@@ -66,30 +75,31 @@
|
|
|
66
75
|
"access": "public"
|
|
67
76
|
},
|
|
68
77
|
"dependencies": {
|
|
69
|
-
"@pkmn/data": "^0.
|
|
70
|
-
"@pkmn/protocol": "^0.6.
|
|
78
|
+
"@pkmn/data": "^0.9.11",
|
|
79
|
+
"@pkmn/protocol": "^0.6.25"
|
|
71
80
|
},
|
|
72
81
|
"devDependencies": {
|
|
73
|
-
"@pkmn/eslint-config": "^
|
|
74
|
-
"@pkmn/img": "^0.2.
|
|
75
|
-
"@pkmn/sets": "^5.
|
|
76
|
-
"@pkmn/sim": "0.
|
|
77
|
-
"@types/html-minifier": "^4.0.
|
|
78
|
-
"@types/jest": "^29.5.
|
|
79
|
-
"@types/minimist": "^1.2.
|
|
80
|
-
"@types/mustache": "^4.2.
|
|
81
|
-
"@types/node": "^
|
|
82
|
-
"@vitest/coverage-
|
|
83
|
-
"binaryen": "^
|
|
84
|
-
"eslint": "
|
|
82
|
+
"@pkmn/eslint-config": "^8.1.0",
|
|
83
|
+
"@pkmn/img": "^0.2.31",
|
|
84
|
+
"@pkmn/sets": "^5.1.2",
|
|
85
|
+
"@pkmn/sim": "0.9.11",
|
|
86
|
+
"@types/html-minifier": "^4.0.5",
|
|
87
|
+
"@types/jest": "^29.5.12",
|
|
88
|
+
"@types/minimist": "^1.2.5",
|
|
89
|
+
"@types/mustache": "^4.2.5",
|
|
90
|
+
"@types/node": "^22.0.2",
|
|
91
|
+
"@vitest/coverage-v8": "^2.0.5",
|
|
92
|
+
"binaryen": "^118.0.0",
|
|
93
|
+
"eslint": "<=8",
|
|
85
94
|
"html-minifier": "^4.0.0",
|
|
86
95
|
"json-stringify-pretty-compact": "4.0.0",
|
|
87
96
|
"minimist": "^1.2.8",
|
|
88
97
|
"mustache": "^4.2.0",
|
|
89
98
|
"source-map-support": "^0.5.21",
|
|
99
|
+
"table": "^6.8.2",
|
|
90
100
|
"trakr": "^0.2.0",
|
|
91
|
-
"typescript": "^5.
|
|
92
|
-
"vitest": "^0.
|
|
101
|
+
"typescript": "^5.5.4",
|
|
102
|
+
"vitest": "^2.0.5"
|
|
93
103
|
},
|
|
94
104
|
"scripts": {
|
|
95
105
|
"lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
|
|
@@ -111,7 +121,7 @@
|
|
|
111
121
|
"ignorePatterns": [
|
|
112
122
|
"dist/",
|
|
113
123
|
"node_modules/",
|
|
114
|
-
"
|
|
124
|
+
"examples/zig",
|
|
115
125
|
"build/"
|
|
116
126
|
],
|
|
117
127
|
"env": {
|
|
@@ -127,10 +137,18 @@
|
|
|
127
137
|
"parserOptions": {
|
|
128
138
|
"project": [
|
|
129
139
|
"./tsconfig.json",
|
|
130
|
-
"./
|
|
140
|
+
"./examples/js/tsconfig.json"
|
|
131
141
|
]
|
|
132
142
|
}
|
|
133
143
|
},
|
|
144
|
+
{
|
|
145
|
+
"files": [
|
|
146
|
+
"src/test/display.ts"
|
|
147
|
+
],
|
|
148
|
+
"rules": {
|
|
149
|
+
"@typescript-eslint/no-unnecessary-type-assertion": "off"
|
|
150
|
+
}
|
|
151
|
+
},
|
|
134
152
|
{
|
|
135
153
|
"files": [
|
|
136
154
|
"src/pkg/index.ts",
|
|
@@ -140,7 +158,8 @@
|
|
|
140
158
|
"rules": {
|
|
141
159
|
"no-control-regex": "off",
|
|
142
160
|
"@typescript-eslint/no-empty-interface": "off",
|
|
143
|
-
"@typescript-eslint/no-shadow": "off"
|
|
161
|
+
"@typescript-eslint/no-shadow": "off",
|
|
162
|
+
"@typescript-eslint/no-unsafe-declaration-merging": "off"
|
|
144
163
|
}
|
|
145
164
|
},
|
|
146
165
|
{
|
|
@@ -156,7 +175,17 @@
|
|
|
156
175
|
"src/test/benchmark*.ts"
|
|
157
176
|
],
|
|
158
177
|
"rules": {
|
|
159
|
-
"@typescript-eslint/no-unused-vars": "off"
|
|
178
|
+
"@typescript-eslint/no-unused-vars": "off",
|
|
179
|
+
"@typescript-eslint/no-redundant-type-constituents": "off"
|
|
180
|
+
}
|
|
181
|
+
},
|
|
182
|
+
{
|
|
183
|
+
"files": [
|
|
184
|
+
"src/pkg/protocol.test.ts"
|
|
185
|
+
],
|
|
186
|
+
"rules": {
|
|
187
|
+
"jest/no-standalone-expect": "off",
|
|
188
|
+
"jest/no-conditional-expect": "off"
|
|
160
189
|
}
|
|
161
190
|
},
|
|
162
191
|
{
|