@pkmn/engine 0.1.0-dev.a324c50f → 0.1.0-dev.a5846b2d

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 (84) hide show
  1. package/LICENSE +1 -3
  2. package/README.md +92 -56
  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 +345 -126
  40. package/package.json +68 -121
  41. package/src/bin/install-pkmn-engine +32 -22
  42. package/src/bin/pkmn-debug +1 -1
  43. package/src/lib/{binding → bindings}/node.zig +9 -22
  44. package/src/lib/bindings/wasm.zig +59 -0
  45. package/src/lib/common/array.zig +77 -0
  46. package/src/lib/common/battle.zig +17 -0
  47. package/src/lib/common/data.zig +12 -24
  48. package/src/lib/common/debug.zig +39 -8
  49. package/src/lib/common/js.zig +120 -0
  50. package/src/lib/common/optional.zig +71 -0
  51. package/src/lib/common/options.zig +6 -0
  52. package/src/lib/common/protocol.zig +811 -332
  53. package/src/lib/common/rational.zig +449 -0
  54. package/src/lib/common/rng.zig +22 -15
  55. package/src/lib/common/util.zig +61 -0
  56. package/src/lib/gen1/calc.zig +953 -0
  57. package/src/lib/gen1/chance.zig +1185 -0
  58. package/src/lib/gen1/data/moves.zig +193 -183
  59. package/src/lib/gen1/data/species.zig +4 -6
  60. package/src/lib/gen1/data/types.zig +8 -9
  61. package/src/lib/gen1/data.zig +67 -77
  62. package/src/lib/gen1/helpers.zig +91 -409
  63. package/src/lib/gen1/mechanics.zig +675 -613
  64. package/src/lib/gen2/calc.zig +153 -0
  65. package/src/lib/gen2/chance.zig +902 -0
  66. package/src/lib/gen2/data/items.zig +13 -21
  67. package/src/lib/gen2/data/moves.zig +664 -572
  68. package/src/lib/gen2/data/species.zig +2 -4
  69. package/src/lib/gen2/data/types.zig +135 -33
  70. package/src/lib/gen2/data.zig +115 -91
  71. package/src/lib/gen2/generated.zig +801 -0
  72. package/src/lib/gen2/helpers.zig +54 -37
  73. package/src/lib/gen2/mechanics.zig +3580 -29
  74. package/src/lib/node.zig +18 -0
  75. package/src/lib/pkmn.zig +37 -15
  76. package/src/lib/wasm.zig +17 -0
  77. package/src/tools/display/dom.ts +96 -0
  78. package/src/tools/display/ui.css +354 -0
  79. package/build/test/display.js +0 -400
  80. package/build/test/display.js.map +0 -1
  81. package/src/lib/binding/wasm.zig +0 -12
  82. package/src/lib/gen1/README.md +0 -814
  83. package/src/lib/gen2/README.md +0 -309
  84. package/src/test/display/pkmn.html.tmpl +0 -368
package/package.json CHANGED
@@ -1,19 +1,31 @@
1
1
  {
2
2
  "name": "@pkmn/engine",
3
- "version": "0.1.0-dev.a324c50f",
3
+ "version": "0.1.0-dev.a5846b2d",
4
4
  "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
5
5
  "repository": "github:pkmn/engine",
6
6
  "license": "MIT",
7
7
  "sideEffects": false,
8
8
  "main": "build/pkg/index.js",
9
9
  "types": "build/pkg/index.d.ts",
10
+ "browser": {
11
+ "./build/pkg/addon/node.js": "./build/pkg/addon/browser.js"
12
+ },
10
13
  "files": [
11
14
  "build.zig",
12
- "build/pkg/data.d.ts",
13
- "build/pkg/data.js.map",
14
15
  "build/pkg/addon.d.ts",
15
16
  "build/pkg/addon.js.map",
16
17
  "build/pkg/addon.js",
18
+ "build/pkg/addon/browser.d.ts",
19
+ "build/pkg/addon/browser.js.map",
20
+ "build/pkg/addon/browser.js",
21
+ "build/pkg/addon/node.d.ts",
22
+ "build/pkg/addon/node.js.map",
23
+ "build/pkg/addon/node.js",
24
+ "build/pkg/addon/wasm.d.ts",
25
+ "build/pkg/addon/wasm.js.map",
26
+ "build/pkg/addon/wasm.js",
27
+ "build/pkg/data.d.ts",
28
+ "build/pkg/data.js.map",
17
29
  "build/pkg/data.js",
18
30
  "build/pkg/data/ids.json",
19
31
  "build/pkg/data/layout.json",
@@ -27,33 +39,52 @@
27
39
  "build/pkg/protocol.d.ts",
28
40
  "build/pkg/protocol.js.map",
29
41
  "build/pkg/protocol.js",
30
- "build/test/display.js.map",
31
- "build/test/display.js",
32
42
  "build/tools/debug.js.map",
33
43
  "build/tools/debug.js",
34
- "src/bin/install-pkmn-engine",
35
- "src/lib/binding/node.zig",
36
- "src/lib/binding/wasm.zig",
44
+ "build/tools/display/index.js.map",
45
+ "build/tools/display/index.js",
46
+ "build/tools/display/debug.jsx.map",
47
+ "build/tools/display/debug.jsx",
48
+ "build/tools/display/ui.jsx.map",
49
+ "build/tools/display/ui.jsx",
50
+ "build/tools/display/util.js.map",
51
+ "build/tools/display/util.js",
52
+ "src/lib/bindings/node.zig",
53
+ "src/lib/bindings/wasm.zig",
54
+ "src/lib/common/array.zig",
55
+ "src/lib/common/battle.zig",
37
56
  "src/lib/common/data.zig",
38
57
  "src/lib/common/debug.zig",
58
+ "src/lib/common/js.zig",
59
+ "src/lib/common/optional.zig",
39
60
  "src/lib/common/options.zig",
40
61
  "src/lib/common/protocol.zig",
62
+ "src/lib/common/rational.zig",
41
63
  "src/lib/common/rng.zig",
64
+ "src/lib/common/util.zig",
65
+ "src/lib/gen1/calc.zig",
66
+ "src/lib/gen1/chance.zig",
42
67
  "src/lib/gen1/data.zig",
43
68
  "src/lib/gen1/data/moves.zig",
44
69
  "src/lib/gen1/data/species.zig",
45
70
  "src/lib/gen1/data/types.zig",
46
71
  "src/lib/gen1/helpers.zig",
47
72
  "src/lib/gen1/mechanics.zig",
73
+ "src/lib/gen2/calc.zig",
74
+ "src/lib/gen2/chance.zig",
48
75
  "src/lib/gen2/data.zig",
49
76
  "src/lib/gen2/data/items.zig",
50
77
  "src/lib/gen2/data/moves.zig",
51
78
  "src/lib/gen2/data/species.zig",
52
79
  "src/lib/gen2/data/types.zig",
80
+ "src/lib/gen2/generated.zig",
53
81
  "src/lib/gen2/helpers.zig",
54
82
  "src/lib/gen2/mechanics.zig",
83
+ "src/lib/node.zig",
55
84
  "src/lib/pkmn.zig",
56
- "src/test/display/pkmn.html.tmpl"
85
+ "src/lib/wasm.zig",
86
+ "src/tools/display/dom.ts",
87
+ "src/tools/display/ui.css"
57
88
  ],
58
89
  "engines": {
59
90
  "node": ">=16.0.0"
@@ -66,138 +97,54 @@
66
97
  "access": "public"
67
98
  },
68
99
  "dependencies": {
69
- "@pkmn/data": "^0.7.44",
70
- "@pkmn/protocol": "^0.6.12"
100
+ "@pkmn/data": "^0.9.20",
101
+ "@pkmn/protocol": "^0.6.27"
71
102
  },
72
103
  "devDependencies": {
73
- "@pkmn/eslint-config": "^3.2.0",
74
- "@pkmn/img": "^0.2.12",
75
- "@pkmn/sets": "^5.0.4",
76
- "@pkmn/sim": "0.7.44",
77
- "@types/html-minifier": "^4.0.2",
78
- "@types/jest": "^29.5.2",
79
- "@types/minimist": "^1.2.2",
80
- "@types/mustache": "^4.2.2",
81
- "@types/node": "^20.3.1",
82
- "@vitest/coverage-c8": "^0.32.2",
83
- "binaryen": "^113.0.0",
84
- "eslint": "^8.43.0",
104
+ "@pkmn/eslint-config": "^9.0.0",
105
+ "@pkmn/img": "^0.2.32",
106
+ "@pkmn/sets": "^5.1.2",
107
+ "@pkmn/sim": "0.9.20",
108
+ "@pkmn/smogon": "^0.5.14",
109
+ "@types/html-minifier": "^4.0.5",
110
+ "@types/jest": "^29.5.13",
111
+ "@types/minimist": "^1.2.5",
112
+ "@types/mustache": "^4.2.5",
113
+ "@types/node": "^22.7.6",
114
+ "@types/react": "^18.3.11",
115
+ "@types/semver": "^7.5.8",
116
+ "@types/vscode": "^1.94.0",
117
+ "@vitest/coverage-v8": "^2.1.3",
118
+ "@vscode/vsce": "^3.2.0",
119
+ "binaryen": "^119.0.0",
120
+ "esbuild": "^0.24.0",
121
+ "eslint": "^9.12.0",
85
122
  "html-minifier": "^4.0.0",
86
123
  "json-stringify-pretty-compact": "3.0.0",
87
124
  "minimist": "^1.2.8",
88
125
  "mustache": "^4.2.0",
126
+ "semver": "^7.6.3",
89
127
  "source-map-support": "^0.5.21",
128
+ "table": "^6.8.2",
90
129
  "trakr": "^0.2.0",
91
- "typescript": "^5.1.3",
92
- "vitest": "^0.32.2"
130
+ "typescript": "^5.6.3",
131
+ "vitest": "^2.1.3"
93
132
  },
94
133
  "scripts": {
95
- "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
96
- "fix": "eslint --fix src --ext ts,js && eslint --fix src/bin/*",
134
+ "lint": "eslint --cache src",
135
+ "fix": "eslint --fix src",
97
136
  "compile": "tsc -p .",
98
137
  "build": "npm run compile",
99
138
  "test": "vitest src/pkg",
100
139
  "test:integration": "vitest src/test",
101
140
  "debug": "npm run compile && node build/tools/debug",
141
+ "demo": "npm run compile && node build/tools/demo",
102
142
  "fuzz": "npm run compile && node build/test/fuzz",
103
143
  "generate": "npm run compile && node build/tools/generate",
104
144
  "release": "npm run compile && node build/tools/release",
105
145
  "benchmark": "npm run compile && node build/test/benchmark",
106
146
  "integration": "npm run compile && node build/test/integration",
147
+ "extension": "npm -C src/tools/vscode run build",
107
148
  "postinstall": "node src/bin/install-pkmn-engine"
108
- },
109
- "eslintConfig": {
110
- "extends": "@pkmn",
111
- "ignorePatterns": [
112
- "dist/",
113
- "node_modules/",
114
- "src/examples/zig",
115
- "build/"
116
- ],
117
- "env": {
118
- "es6": true,
119
- "node": true,
120
- "browser": true
121
- },
122
- "overrides": [
123
- {
124
- "files": [
125
- "**/*.ts"
126
- ],
127
- "parserOptions": {
128
- "project": [
129
- "./tsconfig.json",
130
- "./src/examples/js/tsconfig.json"
131
- ]
132
- }
133
- },
134
- {
135
- "files": [
136
- "src/pkg/index.ts",
137
- "src/test/display.ts",
138
- "src/test/integration.ts"
139
- ],
140
- "rules": {
141
- "no-control-regex": "off",
142
- "@typescript-eslint/no-empty-interface": "off",
143
- "@typescript-eslint/no-shadow": "off"
144
- }
145
- },
146
- {
147
- "files": [
148
- "src/pkg/addon.ts"
149
- ],
150
- "rules": {
151
- "@typescript-eslint/no-var-requires": "off"
152
- }
153
- },
154
- {
155
- "files": [
156
- "src/test/benchmark*.ts"
157
- ],
158
- "rules": {
159
- "@typescript-eslint/no-unused-vars": "off"
160
- }
161
- },
162
- {
163
- "files": [
164
- "src/test/*.test.ts",
165
- "src/test/regression/*.test.ts"
166
- ],
167
- "rules": {
168
- "jest/no-standalone-expect": "off"
169
- }
170
- },
171
- {
172
- "files": [
173
- "src/test/showdown/**"
174
- ],
175
- "rules": {
176
- "jest/expect-expect": [
177
- "warn",
178
- {
179
- "assertFunctionNames": [
180
- "expect",
181
- "expectLog",
182
- "verify"
183
- ]
184
- }
185
- ]
186
- }
187
- },
188
- {
189
- "files": [
190
- "src/tools/generate.ts"
191
- ],
192
- "rules": {
193
- "@typescript-eslint/restrict-template-expressions": [
194
- "error",
195
- {
196
- "allowBoolean": true
197
- }
198
- ]
199
- }
200
- }
201
- ]
202
149
  }
203
150
  }
@@ -10,7 +10,7 @@ const path = require('path');
10
10
  const {pipeline} = require('stream/promises');
11
11
  const tty = require('tty');
12
12
 
13
- const ZIG_VERSION = {major: 0, minor: 11, patch: 0, dev: 3859};
13
+ const ZIG_VERSION = {major: 0, minor: 11, patch: 0};
14
14
  const DEV = ZIG_VERSION.dev ? `-dev.${ZIG_VERSION.dev}` : '';
15
15
  const VERSION = `${ZIG_VERSION.major}.${ZIG_VERSION.minor}.${ZIG_VERSION.patch}${DEV}`;
16
16
  const INDEX = 'https://ziglang.org/download/index.json';
@@ -163,8 +163,10 @@ const install = async () => {
163
163
  }
164
164
 
165
165
  const index = JSON.parse(await fetch(INDEX));
166
- const version = Object.keys(index)[+!ZIG_VERSION.dev];
167
- const release = index[version][`${arch}-${platform}`];
166
+ // TODO: ziglang/zig#17768
167
+ // const version = Object.keys(index)[+!ZIG_VERSION.dev];
168
+ const version = VERSION;
169
+ const release = index[VERSION][`${arch}-${platform}`];
168
170
  const url = release.tarball;
169
171
 
170
172
  let base = path.basename(url);
@@ -255,7 +257,7 @@ const downloadImportLib = async () => {
255
257
  }
256
258
 
257
259
  const dir = path.join(ROOT, 'build', 'lib');
258
- const url = new URL('./win-x64/node.lib', process.release.headersUrl).href;
260
+ const url = process.release.libUrl;
259
261
  const dest = path.join(dir, path.basename(url));
260
262
  if (fs.existsSync(path.join(dest))) {
261
263
  log('Node import library:', dest);
@@ -283,19 +285,19 @@ const downloadImportLib = async () => {
283
285
  let error = false;
284
286
  for (let i = 2; i < process.argv.length; i++) {
285
287
  switch (process.argv[i]) {
286
- case "--silent": {
287
- SILENT = true;
288
- break;
289
- }
290
- case "--zig": {
291
- if (options || only) error = true;
292
- only = true;
293
- break;
294
- }
295
- default: {
296
- if (options || only || !process.argv[i].startsWith('--options=')) error = true;
297
- options = process.argv[i].slice(10).split(' ');
298
- }
288
+ case "--silent": {
289
+ SILENT = true;
290
+ break;
291
+ }
292
+ case "--zig": {
293
+ if (options || only) error = true;
294
+ only = true;
295
+ break;
296
+ }
297
+ default: {
298
+ if (options || only || !process.argv[i].startsWith('--options=')) error = true;
299
+ options = process.argv[i].slice(10).split(' ');
300
+ }
299
301
  }
300
302
  }
301
303
  if (error) {
@@ -358,7 +360,7 @@ const downloadImportLib = async () => {
358
360
  // either the default options or whatever was passed in
359
361
  if (!configs.size) {
360
362
  node = true;
361
- const DEFAULT = ['-Dshowdown', '-Dlog', '-Dchance', '-Dcalc'];
363
+ const DEFAULT = ['-Dshowdown'];
362
364
  configs.set('node', {type: 'node', options: options || DEFAULT});
363
365
  configs.set('wasm', {type: 'wasm', options: options || DEFAULT});
364
366
  }
@@ -370,8 +372,10 @@ const downloadImportLib = async () => {
370
372
  const args = ['build', '-p', 'build', ...opts];
371
373
  if (!process.env.DEBUG_PKMN_ENGINE) args.push('-Doptimize=ReleaseFast', '-Dstrip');
372
374
  if (config.type === 'node') {
373
- args.push(`-Dnode-headers=${headers}`);
374
- if (process.platform === 'win32') args.push(`-Dnode-import-library=${lib}`);
375
+ args.push(`-Dnode-headers=${path.relative(ROOT, headers)}`);
376
+ if (process.platform === 'win32') {
377
+ args.push(`-Dnode-import-library=${path.relative(ROOT, lib)}`);
378
+ }
375
379
  } else {
376
380
  args.push('-Dwasm');
377
381
  }
@@ -386,8 +390,14 @@ const downloadImportLib = async () => {
386
390
  const prefix = process.platform === 'win32' ? '' : 'lib';
387
391
  const ext = process.platform === 'darwin'
388
392
  ? 'dylib' : process.platform === 'win32' ? 'dll' : 'so';
389
- const actual = path.join('build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
390
- fs.renameSync(path.join(ROOT, actual), path.join(ROOT, artifact));
393
+ try {
394
+ const actual = path.join(ROOT, 'build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
395
+ fs.renameSync(actual, artifact);
396
+ } catch {
397
+ // ziglang/zig#19743 changed this path
398
+ const actual = path.join(ROOT, 'build', 'bin', `${prefix}pkmn${suffix}.node.${ext}`);
399
+ fs.renameSync(actual, artifact);
400
+ }
391
401
  }
392
402
  }
393
403
  })().catch(e => {
@@ -15,7 +15,7 @@ const ROOT = resolve(__dirname, '..', '..');
15
15
  const packageJSON = JSON.parse(readFileSync(join(ROOT, 'package.json'), 'utf8'));
16
16
 
17
17
  const missing = [];
18
- for (const dep of ['@pkmn/img', 'html-minifier', 'mustache']) {
18
+ for (const dep of ['@pkmn/img', 'html-minifier', 'esbuild']) {
19
19
  try {
20
20
  require.resolve(dep);
21
21
  } catch (e) {
@@ -1,7 +1,6 @@
1
- const std = @import("std");
2
- const pkmn = @import("../pkmn.zig");
3
-
4
1
  const js = @import("../common/js.zig");
2
+ const pkmn = @import("../pkmn.zig");
3
+ const std = @import("std");
5
4
 
6
5
  const assert = std.debug.assert;
7
6
 
@@ -10,16 +9,8 @@ const c = @cImport({
10
9
  @cInclude("node_api.h");
11
10
  });
12
11
 
13
- export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi_value {
14
- const properties = [_]c.napi_property_descriptor{
15
- js.Property.init("engine", .{ .value = register(env) }),
16
- };
17
- assert(c.napi_define_properties(env, exports, properties.len, &properties) == c.napi_ok);
18
- return exports;
19
- }
20
-
21
12
  pub fn register(env: c.napi_env) c.napi_value {
22
- var object = js.Object.init(env);
13
+ const object = js.Object.init(env);
23
14
  const properties = [_]c.napi_property_descriptor{
24
15
  js.Property.init("options", .{ .value = options(env) }),
25
16
  js.Property.init("bindings", .{ .value = bindings(env) }),
@@ -29,7 +20,7 @@ pub fn register(env: c.napi_env) c.napi_value {
29
20
  }
30
21
 
31
22
  fn options(env: c.napi_env) c.napi_value {
32
- var object = js.Object.init(env);
23
+ const object = js.Object.init(env);
33
24
  const properties = [_]c.napi_property_descriptor{
34
25
  js.Property.init("showdown", .{ .value = js.Boolean.init(env, pkmn.options.showdown) }),
35
26
  js.Property.init("log", .{ .value = js.Boolean.init(env, pkmn.options.log) }),
@@ -41,7 +32,7 @@ fn options(env: c.napi_env) c.napi_value {
41
32
  }
42
33
 
43
34
  fn bindings(env: c.napi_env) c.napi_value {
44
- var array = js.Array.init(env, .{ .length = 1 });
35
+ const array = js.Array.init(env, .{ .length = 1 });
45
36
  js.Array.set(env, array, 0, bind(env, pkmn.gen1));
46
37
  return array;
47
38
  }
@@ -49,7 +40,7 @@ fn bindings(env: c.napi_env) c.napi_value {
49
40
  fn bind(env: c.napi_env, gen: anytype) c.napi_value {
50
41
  const choices_size: u32 = @intCast(gen.CHOICES_SIZE);
51
42
  const logs_size: u32 = @intCast(gen.LOGS_SIZE);
52
- var object = js.Object.init(env);
43
+ const object = js.Object.init(env);
53
44
  const properties = [_]c.napi_property_descriptor{
54
45
  js.Property.init("CHOICES_SIZE", .{ .value = js.Number.init(env, choices_size) }),
55
46
  js.Property.init("LOGS_SIZE", .{ .value = js.Number.init(env, logs_size) }),
@@ -72,7 +63,6 @@ fn update(gen: anytype) c.napi_callback {
72
63
  var len: usize = 0;
73
64
  assert(c.napi_get_arraybuffer_info(env, argv[0], &data, &len) == c.napi_ok);
74
65
  assert(len == @sizeOf(gen.Battle(gen.PRNG)));
75
- assert(data != null);
76
66
 
77
67
  var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
78
68
  const c1: pkmn.Choice = @bitCast(js.Number.get(env, argv[1], u8));
@@ -85,10 +75,9 @@ fn update(gen: anytype) c.napi_callback {
85
75
  else => result: {
86
76
  assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
87
77
  assert(len == gen.LOGS_SIZE);
88
- assert(data != null);
89
78
 
90
- var buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
91
- var stream = pkmn.protocol.ByteStream{ .buffer = buf };
79
+ const buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
80
+ var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
92
81
  // TODO: extract out
93
82
  var opts = pkmn.battle.options(
94
83
  pkmn.protocol.FixedLog{ .writer = stream.writer() },
@@ -116,7 +105,6 @@ fn choices(gen: anytype) c.napi_callback {
116
105
  var len: usize = 0;
117
106
  assert(c.napi_get_arraybuffer_info(env, argv[0], &data, &len) == c.napi_ok);
118
107
  assert(len == @sizeOf(gen.Battle(gen.PRNG)));
119
- assert(data != null);
120
108
 
121
109
  var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
122
110
  const player: pkmn.Player = @enumFromInt(js.Number.get(env, argv[1], u8));
@@ -124,9 +112,8 @@ fn choices(gen: anytype) c.napi_callback {
124
112
 
125
113
  assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
126
114
  assert(len == gen.CHOICES_SIZE);
127
- assert(data != null);
128
115
 
129
- var out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
116
+ const out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
130
117
  const n = battle.choices(player, request, out);
131
118
  return js.Number.init(env, @as(u8, @bitCast(n)));
132
119
  }
@@ -0,0 +1,59 @@
1
+ const pkmn = @import("../pkmn.zig");
2
+ const std = @import("std");
3
+
4
+ const assert = std.debug.assert;
5
+
6
+ const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
7
+ const Strong = if (@hasField(std.builtin.GlobalLinkage, "strong")) .strong else .Strong;
8
+
9
+ pub const options = pkmn.options;
10
+
11
+ pub fn gen(comptime num: comptime_int) type {
12
+ const g = @field(pkmn, "gen" ++ std.fmt.comptimePrint("{d}", .{num}));
13
+ return struct {
14
+ pub const CHOICES_SIZE = size(g.CHOICES_SIZE);
15
+ pub const LOGS_SIZE = size(g.LOGS_SIZE);
16
+
17
+ pub fn update(
18
+ battle: *g.Battle(g.PRNG),
19
+ c1: pkmn.Choice,
20
+ c2: pkmn.Choice,
21
+ options_: ?[*]u8,
22
+ ) callconv(.C) pkmn.Result {
23
+ return (if (options_) |o| result: {
24
+ const buf = @as([*]u8, @ptrCast(o))[0..g.LOGS_SIZE];
25
+ var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
26
+ // TODO: extract out
27
+ var opts = pkmn.battle.options(
28
+ pkmn.protocol.FixedLog{ .writer = stream.writer() },
29
+ g.chance.NULL,
30
+ g.calc.NULL,
31
+ );
32
+ break :result battle.update(c1, c2, &opts);
33
+ } else battle.update(c1, c2, &g.NULL)) catch unreachable;
34
+ }
35
+
36
+ pub fn choices(
37
+ battle: *g.Battle(g.PRNG),
38
+ player: u8,
39
+ request: u8,
40
+ buf: [*]u8,
41
+ ) callconv(.C) u8 {
42
+ assert(player <= @field(@typeInfo(pkmn.Player), @tagName(Enum)).fields.len);
43
+ assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
44
+
45
+ const n = CHOICES_SIZE;
46
+ return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(buf[0..n]));
47
+ }
48
+ };
49
+ }
50
+
51
+ pub fn exports() type {
52
+ @export(gen(1).update, .{ .name = "GEN1_update", .linkage = Strong });
53
+ @export(gen(1).choices, .{ .name = "GEN1_choices", .linkage = Strong });
54
+ return struct {};
55
+ }
56
+
57
+ fn size(n: usize) u32 {
58
+ return std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(n))) catch unreachable;
59
+ }
@@ -0,0 +1,77 @@
1
+ const std = @import("std");
2
+
3
+ const expectEqual = std.testing.expectEqual;
4
+ const assert = std.debug.assert;
5
+
6
+ const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
7
+ const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
8
+
9
+ /// Helpers for working with bit-packed arrays of non-powers-of-2 types.
10
+ /// NOTE: ziglang/zig#12547
11
+ pub fn Array(comptime n: comptime_int, comptime U: type) type {
12
+ return struct {
13
+ const size = @bitSizeOf(U);
14
+ const options: std.builtin.Type.Int = .{ .signedness = .unsigned, .bits = size * n };
15
+ pub const T = @Type(if (@hasField(std.builtin.Type, "int"))
16
+ .{ .int = options }
17
+ else
18
+ .{ .Int = options });
19
+
20
+ /// Returns the value stored at index `i` in the array `a`.
21
+ pub fn get(a: T, i: usize) U {
22
+ assert(i < n);
23
+ const shift = i * size;
24
+ const mask: T = (1 << size) - 1;
25
+ const result = (a >> @intCast(shift)) & mask;
26
+ return switch (@typeInfo(U)) {
27
+ Enum => @enumFromInt(result),
28
+ Int => @intCast(result),
29
+ else => unreachable,
30
+ };
31
+ }
32
+
33
+ /// Sets the value at index `i` to `val` in the array `a`.
34
+ pub fn set(a: T, i: usize, val: U) T {
35
+ assert(i < n);
36
+ const v: T = switch (@typeInfo(U)) {
37
+ Enum => @intFromEnum(val),
38
+ Int => @intCast(val),
39
+ else => unreachable,
40
+ };
41
+ const shift = i * size;
42
+ const mask: T = @as(T, @intCast((1 << size) - 1)) << @intCast(shift);
43
+ const result: T = a & ~mask;
44
+ return result | (v << @intCast(shift));
45
+ }
46
+ };
47
+ }
48
+
49
+ test Array {
50
+ const A = Array(5, u8);
51
+ var a: A.T = 0;
52
+ try expectEqual(u40, @TypeOf(a));
53
+
54
+ a = A.set(a, 4, 241);
55
+ try expectEqual(@as(u8, 241), A.get(a, 4));
56
+ a = A.set(a, 4, 1);
57
+ try expectEqual(@as(u8, 1), A.get(a, 4));
58
+
59
+ for (0..5) |i| a = A.set(a, i, @intCast(i));
60
+ for (0..5) |i| try expectEqual(@as(u8, @intCast(i)), A.get(a, i));
61
+
62
+ const Optional = @import("optional.zig").Optional;
63
+
64
+ const B = Array(4, Optional(bool));
65
+ var b: B.T = 0;
66
+ try expectEqual(u8, @TypeOf(b));
67
+
68
+ b = B.set(b, 2, .true);
69
+ try expectEqual(Optional(bool).None, B.get(b, 1));
70
+ try expectEqual(Optional(bool).true, B.get(b, 2));
71
+ try expectEqual(@as(u8, 0b00100000), b);
72
+ b = B.set(b, 2, .None);
73
+ b = B.set(b, 0, .false);
74
+ try expectEqual(Optional(bool).None, B.get(b, 2));
75
+ try expectEqual(Optional(bool).false, B.get(b, 0));
76
+ try expectEqual(@as(u8, 0b0000001), b);
77
+ }
@@ -0,0 +1,17 @@
1
+ /// Stores state required by optional features to the engine that can be passed to a generation's
2
+ /// `Battle.update` function. All generations generically support protocol logging (enabled via
3
+ /// `-Dlog`), chance actions and probability tracking (enabled via `-Dchance`), and damage
4
+ /// computation and chance overrides (`-Dcalc`), though the concrete types for these features are
5
+ /// generation dependent.
6
+ pub fn Options(comptime Log: type, comptime Chance: type, comptime Calc: type) type {
7
+ return struct { log: Log, chance: Chance, calc: Calc };
8
+ }
9
+
10
+ /// Helper to create a battle `Options` object with the provided `log`, `chance`, and `calc`.
11
+ pub fn options(
12
+ log: anytype,
13
+ chance: anytype,
14
+ calc: anytype,
15
+ ) Options(@TypeOf(log), @TypeOf(chance), @TypeOf(calc)) {
16
+ return .{ .log = log, .chance = chance, .calc = calc };
17
+ }