xbintsc 0.5.32 → 0.5.36

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 (173) hide show
  1. package/README.md +10 -7
  2. package/README.zh-CN.md +10 -8
  3. package/dist/scripts/check-version.d.ts +27 -0
  4. package/dist/scripts/check-version.js +71 -0
  5. package/dist/scripts/check-version.js.map +1 -0
  6. package/dist/scripts/package-platform.d.ts +58 -0
  7. package/dist/scripts/package-platform.js +142 -0
  8. package/dist/scripts/package-platform.js.map +1 -0
  9. package/dist/scripts/verify-platform-package.d.ts +34 -0
  10. package/dist/scripts/verify-platform-package.js +161 -0
  11. package/dist/scripts/verify-platform-package.js.map +1 -0
  12. package/dist/src/cli/help.d.ts +1 -1
  13. package/dist/src/cli/main.js +3 -1
  14. package/dist/src/cli/main.js.map +1 -1
  15. package/dist/src/driver/runtime-lib.d.ts +29 -4
  16. package/dist/src/driver/runtime-lib.js +68 -10
  17. package/dist/src/driver/runtime-lib.js.map +1 -1
  18. package/dist/src/driver/version.d.ts +1 -1
  19. package/dist/src/driver/version.js +1 -1
  20. package/dist/src/extensions/gui/index.js +6 -5
  21. package/dist/src/extensions/gui/index.js.map +1 -1
  22. package/dist/src/extensions/media/index.js +4 -3
  23. package/dist/src/extensions/media/index.js.map +1 -1
  24. package/dist/src/parser/context.d.ts +41 -0
  25. package/dist/src/parser/context.js +89 -4
  26. package/dist/src/parser/context.js.map +1 -1
  27. package/dist/src/parser/literals.js +6 -12
  28. package/dist/src/parser/literals.js.map +1 -1
  29. package/dist/tests/driver/platform-package.test.d.ts +1 -0
  30. package/dist/tests/driver/platform-package.test.js +49 -0
  31. package/dist/tests/driver/platform-package.test.js.map +1 -0
  32. package/dist/tests/driver/runtime-lib.test.js +51 -4
  33. package/dist/tests/driver/runtime-lib.test.js.map +1 -1
  34. package/dist/tests/e2e/gui-audio.test.d.ts +14 -0
  35. package/dist/tests/e2e/gui-audio.test.js +287 -0
  36. package/dist/tests/e2e/gui-audio.test.js.map +1 -0
  37. package/dist/tests/e2e/gui-helpers.d.ts +7 -0
  38. package/dist/tests/e2e/gui-helpers.js +1 -0
  39. package/dist/tests/e2e/gui-helpers.js.map +1 -1
  40. package/dist/tests/e2e/gui-media.test.js +78 -0
  41. package/dist/tests/e2e/gui-media.test.js.map +1 -1
  42. package/dist/tests/e2e/gui-style.test.js +55 -0
  43. package/dist/tests/e2e/gui-style.test.js.map +1 -1
  44. package/dist/tests/e2e/gui-webgl.test.js +258 -0
  45. package/dist/tests/e2e/gui-webgl.test.js.map +1 -1
  46. package/dist/tests/e2e/gui-webgl2-3d.test.d.ts +4 -0
  47. package/dist/tests/e2e/gui-webgl2-3d.test.js +264 -0
  48. package/dist/tests/e2e/gui-webgl2-3d.test.js.map +1 -0
  49. package/dist/tests/e2e/gui-webgl2-blit.test.d.ts +10 -0
  50. package/dist/tests/e2e/gui-webgl2-blit.test.js +262 -0
  51. package/dist/tests/e2e/gui-webgl2-blit.test.js.map +1 -0
  52. package/dist/tests/e2e/gui-webgl2-formats.test.d.ts +6 -0
  53. package/dist/tests/e2e/gui-webgl2-formats.test.js +395 -0
  54. package/dist/tests/e2e/gui-webgl2-formats.test.js.map +1 -0
  55. package/dist/tests/e2e/gui-webgl2-mrt.test.d.ts +4 -0
  56. package/dist/tests/e2e/gui-webgl2-mrt.test.js +105 -0
  57. package/dist/tests/e2e/gui-webgl2-mrt.test.js.map +1 -0
  58. package/dist/tests/e2e/gui-webgl2-ubo.test.d.ts +8 -0
  59. package/dist/tests/e2e/gui-webgl2-ubo.test.js +112 -0
  60. package/dist/tests/e2e/gui-webgl2-ubo.test.js.map +1 -0
  61. package/dist/tests/e2e/gui-webgl2.test.js +45 -1
  62. package/dist/tests/e2e/gui-webgl2.test.js.map +1 -1
  63. package/dist/tests/extensions/gui-index.test.js +1 -0
  64. package/dist/tests/extensions/gui-index.test.js.map +1 -1
  65. package/dist/tests/extensions/media.test.js +1 -0
  66. package/dist/tests/extensions/media.test.js.map +1 -1
  67. package/dist/tests/parser/expressions.test.js +30 -0
  68. package/dist/tests/parser/expressions.test.js.map +1 -1
  69. package/dist/tests/platform-tarball.test.d.ts +1 -0
  70. package/dist/tests/platform-tarball.test.js +111 -0
  71. package/dist/tests/platform-tarball.test.js.map +1 -0
  72. package/dist/tests/version.test.js +6 -0
  73. package/dist/tests/version.test.js.map +1 -1
  74. package/doc/ai/contributing.md +11 -0
  75. package/doc/ai/extensions.md +7 -4
  76. package/doc/ai/troubleshooting.md +7 -5
  77. package/doc/ai/zh-CN/contributing.md +9 -0
  78. package/doc/ai/zh-CN/extensions.md +4 -2
  79. package/doc/ai/zh-CN/troubleshooting.md +5 -3
  80. package/doc/gui/api.md +61 -13
  81. package/doc/gui/build.md +11 -4
  82. package/doc/gui/dom.md +6 -3
  83. package/doc/gui/media.md +4 -0
  84. package/doc/gui/webgl.md +105 -46
  85. package/doc/gui.md +7 -3
  86. package/doc/npm-package.md +55 -27
  87. package/doc/requirements.md +6 -2
  88. package/doc/zh-CN/gui/api.md +51 -10
  89. package/doc/zh-CN/gui/build.md +7 -2
  90. package/doc/zh-CN/gui/dom.md +3 -1
  91. package/doc/zh-CN/gui/media.md +3 -0
  92. package/doc/zh-CN/gui/webgl.md +22 -16
  93. package/doc/zh-CN/gui.md +3 -2
  94. package/doc/zh-CN/npm-package.md +44 -23
  95. package/doc/zh-CN/requirements.md +4 -1
  96. package/package.json +17 -1
  97. package/runtime/ext_gui/audio.cpp +365 -153
  98. package/runtime/ext_gui/audio_buffer.cpp +166 -0
  99. package/runtime/ext_gui/audio_buffer.h +37 -0
  100. package/runtime/ext_gui/audio_decode.cpp +219 -0
  101. package/runtime/ext_gui/audio_decode.h +39 -0
  102. package/runtime/ext_gui/audio_device.cpp +87 -0
  103. package/runtime/ext_gui/audio_effects.cpp +163 -0
  104. package/runtime/ext_gui/audio_effects.h +25 -0
  105. package/runtime/ext_gui/audio_internal.h +30 -0
  106. package/runtime/ext_gui/audio_mixer.cpp +494 -0
  107. package/runtime/ext_gui/audio_mixer.h +238 -0
  108. package/runtime/ext_gui/audio_param.cpp +104 -0
  109. package/runtime/ext_gui/audio_param_object.cpp +155 -0
  110. package/runtime/ext_gui/browser.cpp +11 -1
  111. package/runtime/ext_gui/css_selector.cpp +21 -3
  112. package/runtime/ext_gui/dom_api_internal.h +16 -0
  113. package/runtime/ext_gui/dom_api_webgl.cpp +7 -0
  114. package/runtime/ext_gui/dom_api_webgl2.cpp +151 -36
  115. package/runtime/ext_gui/dom_api_webgl2_draw.cpp +3 -3
  116. package/runtime/ext_gui/dom_api_webgl_buffer.cpp +6 -2
  117. package/runtime/ext_gui/dom_api_webgl_compressed.cpp +167 -0
  118. package/runtime/ext_gui/dom_api_webgl_framebuffer.cpp +160 -0
  119. package/runtime/ext_gui/dom_api_webgl_shader.cpp +4 -4
  120. package/runtime/ext_gui/dom_api_webgl_source.cpp +161 -0
  121. package/runtime/ext_gui/dom_api_webgl_state.cpp +169 -23
  122. package/runtime/ext_gui/dom_api_webgl_texture.cpp +276 -236
  123. package/runtime/ext_gui/dom_api_webgl_ubo.cpp +81 -0
  124. package/runtime/ext_gui/gui.cpp +44 -9
  125. package/runtime/ext_gui/gui_engine.h +9 -4
  126. package/runtime/ext_gui/image_bitmap.cpp +28 -0
  127. package/runtime/ext_gui/image_bitmap.h +26 -0
  128. package/runtime/ext_gui/image_bitmap_browser.cpp +136 -0
  129. package/runtime/ext_gui/media.cpp +32 -0
  130. package/runtime/ext_gui/media.h +13 -0
  131. package/runtime/ext_gui/media_api.h +23 -0
  132. package/runtime/ext_gui/webgl.h +152 -18
  133. package/runtime/ext_gui/webgl_blit.cpp +95 -0
  134. package/runtime/ext_gui/webgl_buffer.cpp +178 -263
  135. package/runtime/ext_gui/webgl_buffer_objects.cpp +270 -0
  136. package/runtime/ext_gui/webgl_clear.cpp +142 -0
  137. package/runtime/ext_gui/webgl_compressed.cpp +180 -0
  138. package/runtime/ext_gui/webgl_context.cpp +241 -156
  139. package/runtime/ext_gui/webgl_draw.cpp +68 -3
  140. package/runtime/ext_gui/webgl_draw_buffers.cpp +75 -0
  141. package/runtime/ext_gui/webgl_glsl.h +40 -0
  142. package/runtime/ext_gui/webgl_glsl_compile.cpp +6 -0
  143. package/runtime/ext_gui/webgl_glsl_rewrite.cpp +18 -0
  144. package/runtime/ext_gui/webgl_glsl_scan.cpp +20 -11
  145. package/runtime/ext_gui/webgl_glsl_scan_block.cpp +126 -0
  146. package/runtime/ext_gui/webgl_glsl_tokens.h +28 -0
  147. package/runtime/ext_gui/webgl_pipeline.cpp +71 -19
  148. package/runtime/ext_gui/webgl_program_blocks.cpp +58 -0
  149. package/runtime/ext_gui/webgl_program_internal.h +6 -0
  150. package/runtime/ext_gui/webgl_shader.cpp +13 -1
  151. package/runtime/ext_gui/webgl_state.cpp +228 -0
  152. package/runtime/ext_gui/webgl_texture.cpp +144 -17
  153. package/runtime/ext_gui/webgl_texture_3d.cpp +215 -0
  154. package/runtime/ext_gui/webgl_uniform_block.h +31 -0
  155. package/runtime/ext_gui/webgl_webgl2.cpp +58 -5
  156. package/runtime/ext_media/decode_audio.cpp +308 -0
  157. package/runtime/ext_media/media_bridge.c +2 -0
  158. package/runtime/rt.h +17 -0
  159. package/runtime/xt_array_buffer.c +30 -0
  160. package/runtime/xt_typed_array/elements.inc +13 -0
  161. package/scripts/build-media.ts +14 -6
  162. package/scripts/build-runtime.ts +21 -16
  163. package/scripts/check-version.ts +39 -9
  164. package/scripts/package-platform.ts +183 -0
  165. package/scripts/set-platform-version.ts +62 -0
  166. package/scripts/verify-platform-package.ts +182 -0
  167. package/src/cli/main.ts +5 -1
  168. package/src/driver/runtime-lib.ts +73 -9
  169. package/src/driver/version.ts +1 -1
  170. package/src/extensions/gui/index.ts +6 -5
  171. package/src/extensions/media/index.ts +4 -3
  172. package/src/parser/context.ts +99 -4
  173. package/src/parser/literals.ts +6 -12
@@ -0,0 +1,182 @@
1
+ #!/usr/bin/env node
2
+ /**
3
+ * Verify the `@xbintsc/<os>-<arch>` npm tarballs staged for a release.
4
+ *
5
+ * `release.yml` publishes one platform package per host before `xbintsc` and
6
+ * then points the main manifest's `optionalDependencies` at exactly those
7
+ * versions, so every tarball has to prove it was packed from this release: its
8
+ * manifest must name `@xbintsc/<slug>@<version>` and it must carry the runtime
9
+ * archives the driver links (`core` and `ext_node`, see `requiredArchives`).
10
+ *
11
+ * This runs in Node on purpose. The check used to be a shell pipeline,
12
+ * `tar -tf x.tgz | grep -q <pattern>`, under `set -o pipefail`: `grep -q` closes
13
+ * the pipe on its first match, so `tar` — still decompressing the tens of
14
+ * megabytes that follow `core.a` — dies of SIGPIPE, and the pipeline reports a
15
+ * perfectly good tarball as "has no core runtime archive". Reading the gzip
16
+ * stream here has no such race, needs no external `tar` and behaves the same on
17
+ * every host.
18
+ *
19
+ * Usage: `npm run verify:platform -- --dir platform-packages [--version x.y.z]`
20
+ */
21
+
22
+ import { existsSync, readFileSync } from "node:fs";
23
+ import { basename, dirname, join, resolve } from "node:path";
24
+ import { fileURLToPath, pathToFileURL } from "node:url";
25
+ import { gunzipSync } from "node:zlib";
26
+ import {
27
+ PLATFORM_SLUGS,
28
+ platformPackageFileName,
29
+ platformPackageName,
30
+ requiredArchives,
31
+ } from "./package-platform.js";
32
+
33
+ /** One member of a tar archive; `data` is a view into the decompressed stream. */
34
+ export interface TarEntry {
35
+ readonly path: string;
36
+ readonly data: Buffer;
37
+ }
38
+
39
+ const BLOCK = 512;
40
+
41
+ /** Read a header field, stopping at its NUL padding. */
42
+ function readString(block: Buffer, offset: number, length: number): string {
43
+ const field = block.subarray(offset, offset + length);
44
+ const end = field.indexOf(0);
45
+ return field.subarray(0, end === -1 ? field.length : end).toString("utf8");
46
+ }
47
+
48
+ /** Decode a numeric header field (octal, or base-256 for very large values). */
49
+ function readNumber(block: Buffer, offset: number, length: number): number {
50
+ if ((block[offset]! & 0x80) !== 0) {
51
+ let value = block[offset]! & 0x7f;
52
+ for (let index = 1; index < length; index += 1) value = value * 256 + block[offset + index]!;
53
+ return value;
54
+ }
55
+ const text = readString(block, offset, length).trim();
56
+ return text === "" ? 0 : Number.parseInt(text, 8);
57
+ }
58
+
59
+ /** The `path=` record of a pax extended header, when it carries one. */
60
+ function paxPath(data: Buffer): string | undefined {
61
+ // Records are `<byte length> <key>=<value>\n`; only the path matters here.
62
+ const match = /(?:^|\n)\d+ path=([^\n]*)\n/.exec(data.toString("utf8"));
63
+ return match?.[1];
64
+ }
65
+
66
+ /** List the regular files of a gzip-compressed tar archive, in archive order. */
67
+ export function tarballEntries(tgz: Buffer, source = "tarball"): TarEntry[] {
68
+ let tar: Buffer;
69
+ try {
70
+ tar = gunzipSync(tgz);
71
+ } catch (error) {
72
+ const reason = error instanceof Error ? error.message : String(error);
73
+ throw new Error(`${source} is not a gzip-compressed tar archive (${reason})`);
74
+ }
75
+ const entries: TarEntry[] = [];
76
+ let offset = 0;
77
+ let override: string | undefined;
78
+ while (offset + BLOCK <= tar.length) {
79
+ const header = tar.subarray(offset, offset + BLOCK);
80
+ if (header.every((byte) => byte === 0)) break;
81
+ const size = readNumber(header, 124, 12);
82
+ const type = header[156] === 0 ? "0" : String.fromCharCode(header[156]!);
83
+ const dataStart = offset + BLOCK;
84
+ if (dataStart + size > tar.length) throw new Error(`${source} is truncated`);
85
+ const data = tar.subarray(dataStart, dataStart + size);
86
+ offset = dataStart + Math.ceil(size / BLOCK) * BLOCK;
87
+
88
+ // A long path arrives in its own preceding header: GNU `L` stores it
89
+ // verbatim, pax `x` records it as `path=`. `K` only renames a link target.
90
+ if (type === "L") {
91
+ override = readString(data, 0, data.length);
92
+ continue;
93
+ }
94
+ if (type === "x") {
95
+ override = paxPath(data) ?? override;
96
+ continue;
97
+ }
98
+ if (type === "K") continue;
99
+
100
+ const prefix = readString(header, 345, 155);
101
+ const name = readString(header, 0, 100);
102
+ const path = override ?? (prefix === "" ? name : `${prefix}/${name}`);
103
+ override = undefined;
104
+ // Only regular files can be the archives checked below; directories and
105
+ // links are skipped instead of being reported by their trailing slash.
106
+ if (type === "0" || type === "7") entries.push({ path, data });
107
+ }
108
+ return entries;
109
+ }
110
+
111
+ /** Read the manifest out of an already-parsed platform tarball. */
112
+ function manifestOf(entries: readonly TarEntry[], source: string): { name?: string; version?: string } {
113
+ const manifest = entries.find((entry) => entry.path === "package/package.json");
114
+ if (!manifest) throw new Error(`${source} has no package/package.json`);
115
+ try {
116
+ return JSON.parse(manifest.data.toString("utf8")) as { name?: string; version?: string };
117
+ } catch {
118
+ throw new Error(`${source} has an unreadable package/package.json`);
119
+ }
120
+ }
121
+
122
+ /**
123
+ * Check one platform tarball's manifest identity and runtime archives.
124
+ * `source` names the tarball in error messages (its path, or a fixture name).
125
+ */
126
+ export function verifyPlatformEntries(
127
+ entries: readonly TarEntry[],
128
+ slug: string,
129
+ version: string,
130
+ source = "platform package",
131
+ ): void {
132
+ const parsed = manifestOf(entries, source);
133
+ const expectedName = platformPackageName(slug);
134
+ if (parsed.name !== expectedName || parsed.version !== version) {
135
+ throw new Error(`${source} contains ${parsed.name}@${parsed.version}, expected ${expectedName}@${version}`);
136
+ }
137
+
138
+ const paths = new Set(entries.map((entry) => entry.path));
139
+ for (const archive of requiredArchives(slug)) {
140
+ const expected = `package/runtime/lib/${slug}/${archive}`;
141
+ if (paths.has(expected)) continue;
142
+ // Keep the historical wording: `core.a`/`core.lib` is "the core archive".
143
+ const label = archive.replace(/\.(a|lib)$/, "");
144
+ throw new Error(`${source} has no ${label} runtime archive (expected ${expected})`);
145
+ }
146
+ }
147
+
148
+ /** Read `tgzPath` and verify it as the platform package for `slug`/`version`. */
149
+ export function verifyPlatformPackage(tgzPath: string, slug: string, version: string): TarEntry[] {
150
+ const entries = tarballEntries(readFileSync(tgzPath), tgzPath);
151
+ verifyPlatformEntries(entries, slug, version, tgzPath);
152
+ return entries;
153
+ }
154
+
155
+ /** Value of `--name <value>`, or `undefined` when the flag is absent. */
156
+ function argument(name: string): string | undefined {
157
+ const index = process.argv.indexOf(name);
158
+ return index >= 0 ? process.argv[index + 1] : undefined;
159
+ }
160
+
161
+ const invokedDirectly =
162
+ process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href;
163
+
164
+ if (invokedDirectly) {
165
+ try {
166
+ const root = resolve(dirname(fileURLToPath(import.meta.url)), "..");
167
+ const dir = argument("--dir") ?? join(root, "platform-packages");
168
+ const version =
169
+ argument("--version") ??
170
+ (JSON.parse(readFileSync(join(root, "package.json"), "utf8")) as { version: string }).version;
171
+ for (const slug of PLATFORM_SLUGS) {
172
+ const file = join(dir, platformPackageFileName(slug, version));
173
+ if (!existsSync(file)) throw new Error(`Missing npm platform package ${file}.`);
174
+ const entries = verifyPlatformPackage(file, slug, version);
175
+ console.log(`xbintsc: ${basename(file)} carries ${entries.length} files`);
176
+ }
177
+ console.log(`xbintsc: verified ${PLATFORM_SLUGS.length} platform packages at ${version}`);
178
+ } catch (error) {
179
+ console.error(`xbintsc: ${error instanceof Error ? error.message : String(error)}`);
180
+ process.exit(1);
181
+ }
182
+ }
package/src/cli/main.ts CHANGED
@@ -20,7 +20,7 @@ import { formatDiagnostic, type Diagnostic } from "../diagnostics/diagnostic.js"
20
20
  import { SourceFile } from "../diagnostics/source.js";
21
21
  import { build, compileEntry, COMPILER_VERSION, type EmitKind, type PhaseTiming } from "../driver/compiler.js";
22
22
  import { findRuntimeDir, platformSlug } from "../driver/paths.js";
23
- import { runtimeLibDir } from "../driver/runtime-lib.js";
23
+ import { findRuntimeLibrary, runtimeLibDir } from "../driver/runtime-lib.js";
24
24
  import { resolveToolchain, type ResolvedToolchain } from "../driver/toolchain-provider.js";
25
25
  import { MINIMUM_CLANG_MAJOR, probeClang, realRunner, ToolchainError } from "../driver/toolchain.js";
26
26
  import {
@@ -290,6 +290,10 @@ function doctor(io: CliIo): number {
290
290
 
291
291
  try {
292
292
  io.stdout(`runtime lib: ${runtimeLibDir()}\n`);
293
+ const archives = ["core", "ext_node", "gui", "media"].filter((name) => findRuntimeLibrary(name) !== undefined);
294
+ io.stdout(
295
+ `archives : ${archives.length > 0 ? archives.join(", ") : "none (C runtime compiled on demand)"}\n`,
296
+ );
293
297
  } catch {
294
298
  io.stdout("runtime lib: unavailable\n");
295
299
  }
@@ -7,26 +7,90 @@
7
7
  * runtime/lib/<os>-<arch>/core.a (the core `xt_*.c` runtime)
8
8
  * runtime/lib/<os>-<arch>/ext_<name>.a (per-extension sources, e.g. ext_node.a)
9
9
  *
10
+ * A source checkout or a release archive carries them in the package itself.
11
+ * An npm install instead receives them from the optional
12
+ * `@xbintsc/<os>-<arch>` package (installed only for the host platform), which
13
+ * uses the same `runtime/lib/<os>-<arch>/` layout. The driver reads that folder
14
+ * in place, so no install script has to copy anything into `node_modules`.
15
+ *
10
16
  * Shipping these lets `build` link without compiling C, and shortens the first
11
17
  * build. When an archive is missing the driver transparently falls back to
12
18
  * compiling the `.c` sources, so the archives are an optimization, not a hard
13
19
  * dependency.
14
20
  */
15
21
 
16
- import { existsSync } from "node:fs";
17
- import { join } from "node:path";
22
+ import { existsSync, readdirSync } from "node:fs";
23
+ import { dirname, join } from "node:path";
18
24
  import { findRuntimeDir, platformSlug } from "./paths.js";
19
25
 
20
- /** Directory holding the prebuilt archives for the current host. */
21
- export function runtimeLibDir(): string {
26
+ /** Archive suffixes, in the order a name is probed. */
27
+ const ARCHIVE_SUFFIXES = [".a", ".lib"] as const;
28
+
29
+ /**
30
+ * Folder holding the archives for the current host inside the xbintsc package
31
+ * itself (a source checkout or an unpacked release archive).
32
+ */
33
+ function packagedRuntimeLibDir(): string {
22
34
  return join(findRuntimeDir(), "lib", platformSlug());
23
35
  }
24
36
 
25
- /** Absolute path to a prebuilt archive (`core`, `ext_node`, …), if present. */
26
- export function findRuntimeLibrary(name: string): string | undefined {
27
- const base = join(runtimeLibDir(), name);
28
- for (const candidate of [`${base}.a`, `${base}.lib`]) {
29
- if (existsSync(candidate)) return candidate;
37
+ /**
38
+ * Archive folders of an installed `@xbintsc/<os>-<arch>` package, given the
39
+ * root of the installed xbintsc package.
40
+ *
41
+ * Package managers place the optional dependency either inside xbintsc's own
42
+ * `node_modules` or in the nearest hoisted `node_modules`, so every ancestor is
43
+ * probed. Yarn PnP has no `node_modules`; there the driver simply falls back to
44
+ * compiling the runtime sources.
45
+ */
46
+ export function platformRuntimeLibDirs(packageRoot: string, slug: string = platformSlug()): string[] {
47
+ const dirs = new Set<string>();
48
+ let dir = packageRoot;
49
+ for (;;) {
50
+ dirs.add(join(dir, "node_modules", "@xbintsc", slug, "runtime", "lib", slug));
51
+ const parent = dirname(dir);
52
+ if (parent === dir) break;
53
+ dir = parent;
54
+ }
55
+ return [...dirs];
56
+ }
57
+
58
+ /** Every folder searched for a prebuilt archive, most specific first. */
59
+ export function runtimeLibDirs(): readonly string[] {
60
+ return [packagedRuntimeLibDir(), ...platformRuntimeLibDirs(dirname(findRuntimeDir()))];
61
+ }
62
+
63
+ /** True when a folder holds at least one runtime archive. */
64
+ function containsArchive(dir: string): boolean {
65
+ try {
66
+ return readdirSync(dir).some((entry) => ARCHIVE_SUFFIXES.some((suffix) => entry.endsWith(suffix)));
67
+ } catch {
68
+ return false;
69
+ }
70
+ }
71
+
72
+ /**
73
+ * Directory holding the prebuilt archives for the current host: the package's
74
+ * own `runtime/lib/<slug>`, or the optional platform package when the former
75
+ * has no archives (a normal npm install).
76
+ */
77
+ export function runtimeLibDir(dirs: readonly string[] = runtimeLibDirs()): string {
78
+ return dirs.find((dir) => containsArchive(dir)) ?? dirs[0]!;
79
+ }
80
+
81
+ /**
82
+ * Absolute path to a prebuilt archive (`core`, `ext_node`, `gui`, `media`, …),
83
+ * if present. `dirs` is injectable for tests.
84
+ */
85
+ export function findRuntimeLibrary(
86
+ name: string,
87
+ dirs: readonly string[] = runtimeLibDirs(),
88
+ ): string | undefined {
89
+ for (const dir of dirs) {
90
+ for (const suffix of ARCHIVE_SUFFIXES) {
91
+ const candidate = join(dir, `${name}${suffix}`);
92
+ if (existsSync(candidate)) return candidate;
93
+ }
30
94
  }
31
95
  return undefined;
32
96
  }
@@ -9,4 +9,4 @@
9
9
  * `main`/`master` only (see `.githooks/pre-commit`), so feature branches never
10
10
  * change this line and merging two of them cannot conflict here.
11
11
  */
12
- export const COMPILER_VERSION = "0.5.32";
12
+ export const COMPILER_VERSION = "0.5.36";
@@ -23,8 +23,8 @@
23
23
 
24
24
  import { join } from "node:path";
25
25
  import type { Extension, ExtensionModule } from "../registry.js";
26
- import { findRuntimeDir, platformSlug } from "../../driver/paths.js";
27
- import { findRuntimeLibrary } from "../../driver/runtime-lib.js";
26
+ import { platformSlug } from "../../driver/paths.js";
27
+ import { findRuntimeLibrary, runtimeLibDir } from "../../driver/runtime-lib.js";
28
28
  import { loadHtmlAsset } from "./html.js";
29
29
  import { loadScriptAsset } from "./three.js";
30
30
 
@@ -102,7 +102,7 @@ const browserGlobals: Record<string, { symbol: string; argument?: string }> = {
102
102
  navigator: { symbol: "xt_browser_navigator" },
103
103
  localStorage: { symbol: "xt_browser_local_storage" },
104
104
  __THREE_DEVTOOLS__: { symbol: "xt_browser_missing" },
105
- createImageBitmap: { symbol: "xt_browser_missing" },
105
+ createImageBitmap: { symbol: "xt_browser_create_image_bitmap" },
106
106
  };
107
107
  for (const type of hostTypes) {
108
108
  browserGlobals[type] = { symbol: "xt_browser_type", argument: type };
@@ -111,7 +111,7 @@ for (const type of hostTypes) {
111
111
  /** Absolute path to the per-platform prebuilt GUI archive (`gui.a`, or
112
112
  * `gui.lib` with the MSVC ABI on Windows). */
113
113
  function guiArchive(): string {
114
- return join(findRuntimeDir(), "lib", platformSlug(), "gui.a");
114
+ return join(runtimeLibDir(), "gui.a");
115
115
  }
116
116
 
117
117
  export const guiExtension: Extension = {
@@ -122,7 +122,8 @@ export const guiExtension: Extension = {
122
122
  if (archive === undefined) {
123
123
  throw new Error(
124
124
  `GUI native library not found at ${guiArchive()} (or gui.lib).\n` +
125
- `Build it for ${platformSlug()} first (see doc/gui.md).`,
125
+ `The optional @xbintsc/${platformSlug()} package ships it: reinstall xbintsc ` +
126
+ `without --omit=optional, or build it from a source checkout (see doc/gui.md).`,
126
127
  );
127
128
  }
128
129
  return [archive];
@@ -28,11 +28,11 @@
28
28
  import { join } from "node:path";
29
29
  import type { Extension } from "../registry.js";
30
30
  import { findRuntimeDir, platformSlug } from "../../driver/paths.js";
31
- import { findRuntimeLibrary } from "../../driver/runtime-lib.js";
31
+ import { findRuntimeLibrary, runtimeLibDir } from "../../driver/runtime-lib.js";
32
32
 
33
33
  /** Absolute path to the per-platform prebuilt media archive. */
34
34
  function mediaArchive(): string {
35
- return join(findRuntimeDir(), "lib", platformSlug(), process.platform === "win32" ? "media.lib" : "media.a");
35
+ return join(runtimeLibDir(), process.platform === "win32" ? "media.lib" : "media.a");
36
36
  }
37
37
 
38
38
  export const mediaExtension: Extension = {
@@ -50,7 +50,8 @@ export const mediaExtension: Extension = {
50
50
  if (archive === undefined) {
51
51
  throw new Error(
52
52
  `media native library not found at ${mediaArchive()} (media.a or media.lib).\n` +
53
- `Build it for ${platformSlug()} first with \`npm run media\` (see doc/gui/build.md).`,
53
+ `The optional @xbintsc/${platformSlug()} package ships it: reinstall xbintsc ` +
54
+ `without --omit=optional, or build it with \`npm run media\` (see doc/gui/build.md).`,
54
55
  );
55
56
  }
56
57
  return [archive];
@@ -15,11 +15,25 @@ import { SyntaxKind } from "../ast/kinds.js";
15
15
  import type { Identifier, StringLiteral } from "../ast/nodes.js";
16
16
  import { SpeculationError } from "./speculation.js";
17
17
 
18
+ /**
19
+ * The template-literal context of the scanner at one point in the token
20
+ * stream. `frames` holds the brace depth of every open `${ … }` substitution
21
+ * (innermost last); `pendingOffset` is the `}` that must be re-read as template
22
+ * text before the next token is scanned.
23
+ */
24
+ interface TemplateState {
25
+ readonly frames: readonly number[];
26
+ readonly pendingOffset: number | undefined;
27
+ }
28
+
29
+ const OUTSIDE_TEMPLATE: TemplateState = { frames: [], pendingOffset: undefined };
30
+
18
31
  export interface ParserState {
19
32
  index: number;
20
33
  tokens: Token[];
21
34
  pos: number;
22
35
  consumed: number;
36
+ template: TemplateState;
23
37
  }
24
38
 
25
39
  export class ParserContext {
@@ -32,12 +46,22 @@ export class ParserContext {
32
46
  speculating = 0;
33
47
  /** Monotonic count of tokens consumed; used to detect lack of progress. */
34
48
  consumed = 0;
49
+ /** Brace depth of each open `${ … }` substitution, innermost last. */
50
+ private templateFrames: number[] = [];
51
+ /** Offset of the `}` that must be re-read as template text on the next scan. */
52
+ private pendingTemplateOffset: number | undefined;
53
+ /**
54
+ * Template context after each buffered token. A parser method that rewinds
55
+ * the scanner (the regex fallback) restores the context recorded on the
56
+ * current token so a template that was only seen by lookahead stays coherent.
57
+ */
58
+ private readonly templateStates = new WeakMap<Token, TemplateState>();
35
59
 
36
60
  constructor(source: SourceFile, diagnostics: DiagnosticBag) {
37
61
  this.source = source;
38
62
  this.diagnostics = diagnostics;
39
63
  this.scanner = new Scanner(source, diagnostics);
40
- this.tokens = [this.scanner.nextToken()];
64
+ this.tokens = [this.scanToken()];
41
65
  }
42
66
 
43
67
  // -- token access ---------------------------------------------------------
@@ -61,7 +85,7 @@ export class ParserContext {
61
85
 
62
86
  lookAhead(k: number): Token {
63
87
  while (this.tokens.length <= this.index + k) {
64
- this.tokens.push(this.scanner.nextToken());
88
+ this.tokens.push(this.scanToken());
65
89
  }
66
90
  return this.tokens[this.index + k]!;
67
91
  }
@@ -72,12 +96,76 @@ export class ParserContext {
72
96
  if (this.index + 1 < this.tokens.length) {
73
97
  this.index++;
74
98
  } else {
75
- this.tokens = [this.scanner.nextToken()];
99
+ this.tokens = [this.scanToken()];
76
100
  this.index = 0;
77
101
  }
78
102
  return current;
79
103
  }
80
104
 
105
+ /**
106
+ * Scan the next token, keeping a template literal together. A `${ … }`
107
+ * substitution is ordinary token stream (so the parser can parse the
108
+ * expression), but the `}` that closes it must be followed by a token that
109
+ * re-reads the source as template text. Scanning the tail of a template as
110
+ * normal tokens would let its raw text (quotes, parens, `}`) leak into
111
+ * lookahead - and `findMatchingParen` would then count characters that are
112
+ * part of the literal.
113
+ */
114
+ private scanToken(): Token {
115
+ let token: Token;
116
+ if (this.pendingTemplateOffset !== undefined) {
117
+ const offset = this.pendingTemplateOffset;
118
+ this.pendingTemplateOffset = undefined;
119
+ token = this.scanner.continueTemplate(offset);
120
+ if (token.kind === TokenKind.NoSubstitutionTemplateLiteral) {
121
+ this.templateFrames.pop();
122
+ } else if (token.kind === TokenKind.TemplateHead) {
123
+ /* Another `${` in the same template restarts its brace depth. */
124
+ const top = this.templateFrames.length - 1;
125
+ if (top >= 0) this.templateFrames[top] = 0;
126
+ }
127
+ } else {
128
+ token = this.scanner.nextToken();
129
+ if (token.kind === TokenKind.TemplateHead) {
130
+ this.templateFrames.push(0);
131
+ } else if (this.templateFrames.length > 0) {
132
+ const top = this.templateFrames.length - 1;
133
+ if (token.kind === TokenKind.OpenBrace) {
134
+ this.templateFrames[top] = this.templateFrames[top]! + 1;
135
+ } else if (token.kind === TokenKind.CloseBrace) {
136
+ if (this.templateFrames[top]! === 0) this.pendingTemplateOffset = token.start;
137
+ else this.templateFrames[top] = this.templateFrames[top]! - 1;
138
+ }
139
+ }
140
+ }
141
+ if (this.templateFrames.length > 0 || this.pendingTemplateOffset !== undefined) {
142
+ this.templateStates.set(token, this.snapshotTemplateState());
143
+ }
144
+ return token;
145
+ }
146
+
147
+ /**
148
+ * Discard any lookahead and continue scanning at `offset`. Used when a
149
+ * literal's raw text has to be re-read (the regex fallback). The template
150
+ * context is restored to the state recorded for the current token, because
151
+ * the skipped source cannot have opened or closed a template.
152
+ */
153
+ rescanFrom(offset: number): void {
154
+ this.restoreTemplateState(this.templateStates.get(this.token) ?? OUTSIDE_TEMPLATE);
155
+ this.scanner.seek(offset);
156
+ this.tokens = [this.scanToken()];
157
+ this.index = 0;
158
+ }
159
+
160
+ private snapshotTemplateState(): TemplateState {
161
+ return { frames: this.templateFrames.slice(), pendingOffset: this.pendingTemplateOffset };
162
+ }
163
+
164
+ private restoreTemplateState(state: TemplateState): void {
165
+ this.templateFrames = [...state.frames];
166
+ this.pendingTemplateOffset = state.pendingOffset;
167
+ }
168
+
81
169
  parseExpected(kind: TokenKind, message?: string): Token {
82
170
  if (this.token.kind === kind) return this.nextToken();
83
171
  this.error(
@@ -173,7 +261,13 @@ export class ParserContext {
173
261
  // -- state save / restore (for speculative parsing) -----------------------
174
262
 
175
263
  saveState(): ParserState {
176
- return { index: this.index, tokens: this.tokens.slice(), pos: this.scanner.position, consumed: this.consumed };
264
+ return {
265
+ index: this.index,
266
+ tokens: this.tokens.slice(),
267
+ pos: this.scanner.position,
268
+ consumed: this.consumed,
269
+ template: this.snapshotTemplateState(),
270
+ };
177
271
  }
178
272
 
179
273
  restoreState(state: ParserState): void {
@@ -181,5 +275,6 @@ export class ParserContext {
181
275
  this.tokens = state.tokens;
182
276
  this.scanner.seek(state.pos);
183
277
  this.consumed = state.consumed;
278
+ this.restoreTemplateState(state.template);
184
279
  }
185
280
  }
@@ -206,10 +206,8 @@ export const literalMethods: LiteralMethods = {
206
206
  } as unknown as TemplateLiteral;
207
207
  }
208
208
  if (startToken.kind === TokenKind.Backtick) {
209
- // Re-scan from the backtick so the scanner produces a TemplateHead.
210
- this.scanner.seek(startToken.start);
211
- this.tokens = [this.scanner.nextToken()];
212
- this.index = 0;
209
+ // Re-scan from the backtick so the scanner produces a template token.
210
+ this.rescanFrom(startToken.start);
213
211
  return this.parseTemplateLiteral();
214
212
  }
215
213
  const head = String(startToken.value ?? "");
@@ -222,11 +220,9 @@ export const literalMethods: LiteralMethods = {
222
220
  this.error(DiagnosticCode.UnterminatedTemplate, "Expected '}' to close template substitution");
223
221
  return { kind: SyntaxKind.TemplateLiteral, head, raw: headRaw, spans, start: startToken.start, end: this.token.end };
224
222
  }
225
- // The `}` terminates a substitution; re-read it as template text without
226
- // first scanning the following (template) characters as normal tokens.
227
- const closeStart = this.token.start;
228
- this.tokens = [this.scanner.continueTemplate(closeStart)];
229
- this.index = 0;
223
+ // The `}` terminates a substitution; the token after it is the template
224
+ // continuation (the token stream re-reads that source as literal text).
225
+ this.nextToken();
230
226
  const literalToken = this.token;
231
227
  if (literalToken.kind === TokenKind.NoSubstitutionTemplateLiteral) {
232
228
  this.nextToken();
@@ -287,9 +283,7 @@ export const literalMethods: LiteralMethods = {
287
283
  const flagsStart = i;
288
284
  while (i < text.length && /[a-z]/i.test(text[i]!)) i++;
289
285
  const flags = text.slice(flagsStart, i);
290
- this.scanner.seek(i);
291
- this.tokens = [this.scanner.nextToken()];
292
- this.index = 0;
286
+ this.rescanFrom(i);
293
287
  return { kind: SyntaxKind.RegularExpressionLiteral, text: text.slice(token.start, i), pattern, flags, start: token.start, end: i };
294
288
  },
295
289
  };