Refresh Corsa with the revised WASI package layout

Use the committed compiler build with the reactor host owned by the
TypeScript API package. Keep its binary, library index, declarations,
and configuration schemas paired with the matching implementation.

Refresh from fa49b4514d79a1121c9e20fb7796412233f8fd25 and consume the
artifact package's library index instead of maintaining a separate
copy of the standard libraries.

Author: jakebailey

packages/playground-v2/scripts/build.mjs

@@ -1,7 +1,7 @@
 import { context } from "esbuild"
 import { createHash } from "node:crypto"
-import { cp, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises"
-import { basename, dirname, resolve } from "node:path"
+import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises"
+import { dirname, resolve } from "node:path"
 import { fileURLToPath } from "node:url"
 import { compatibilityHtml, compatibilityPaths, playgroundPath } from "./routes.mjs"
 
@@ -16,9 +16,9 @@ const compatibilityDirectories = compatibilityPaths.map(path =>
 const serve = process.argv.includes("--serve")
 const playgroundBase = serve ? "/" : process.env.PLAYGROUND_BASE ?? playgroundPath
 
-const wasmFile = resolve(vendorDirectory, "typescript-wasip1-wasm/lib/tsc.wasm")
-const libDirectory = resolve(vendorDirectory, "lib")
-const configSchema = resolve(websiteDirectory, "packages/tsconfig-reference/scripts/schema/result/schema.json")
+const wasmFile = new URL(import.meta.resolve("@typescript/typescript-wasip1-wasm/lib/tsc.wasm"))
+const libListURL = new URL(import.meta.resolve("@typescript/typescript-wasip1-wasm/lib/libFiles.json"))
+const configSchema = new URL(import.meta.resolve("@typescript/typescript/schemas/tsconfig.schema.json"))
 const releaseIndex = resolve(packageDirectory, "vendor/versions.json")
 const examplesIndex = resolve(packageDirectory, "vendor/examples.json")
 const helpIndex = resolve(packageDirectory, "vendor/help.json")
@@ -33,12 +33,12 @@ const indexHtml = (await readFile(resolve(packageDirectory, "src/index.html"), "
 
 await rm(outputDirectory, { force: true, recursive: true })
 await mkdir(outputDirectory, { recursive: true })
-const libFileNames = (await readdir(libDirectory)).filter(fileName => /^lib(?:\..+)?\.d\.ts$/.test(fileName)).sort()
+const libFileNames = JSON.parse(await readFile(libListURL, "utf8"))
 const libFiles = Object.fromEntries(
   await Promise.all(
     libFileNames.map(async fileName => [
-      `/${basename(fileName)}`,
-      await readFile(resolve(libDirectory, fileName), "utf8"),
+      `/${fileName}`,
+      await readFile(new URL(fileName, libListURL), "utf8"),
     ])
   )
 )

packages/playground-v2/scripts/smoke-test.mjs

@@ -1,12 +1,11 @@
 import assert from "node:assert/strict"
 import { readFile, readdir } from "node:fs/promises"
-import { resolve } from "node:path"
 import { runInNewContext } from "node:vm"
 import { compatibilityHtml, compatibilityPaths, compatibilityScript, playgroundPath } from "./routes.mjs"
 import { API } from "@typescript/typescript/unstable/sync"
-import { instantiateWasm, WasmTransport, wasmURL } from "@typescript/typescript-wasip1-wasm"
+import { instantiateWasm, WasmTransport } from "@typescript/typescript/unstable/wasm"
+import { wasmURL } from "@typescript/typescript-wasip1-wasm"
 
-const packageDirectory = resolve(import.meta.dirname, "..")
 const wasm = await readFile(wasmURL)
 const module = await WebAssembly.compile(wasm)
 const instance = await instantiateWasm(module)
@@ -30,10 +29,14 @@ try {
     assert.equal(redirected, `${playgroundPath}${original.search}${original.hash}`)
   }
 
-  const libDirectory = resolve(packageDirectory, "vendor/lib")
-  const libFileNames = (await readdir(libDirectory)).filter(fileName => /^lib(?:\..+)?\.d\.ts$/.test(fileName))
+  const libListURL = new URL(import.meta.resolve("@typescript/typescript-wasip1-wasm/lib/libFiles.json"))
+  const libFileNames = JSON.parse(await readFile(libListURL, "utf8"))
+  assert.deepEqual(
+    libFileNames,
+    (await readdir(new URL("./", libListURL))).filter(fileName => /^lib(?:\..+)?\.d\.ts$/.test(fileName)).sort()
+  )
   for (const fileName of libFileNames) {
-    transport.setFile(`/${fileName}`, await readFile(resolve(libDirectory, fileName), "utf8"))
+    transport.setFile(`/${fileName}`, await readFile(new URL(fileName, libListURL), "utf8"))
   }
 
   const files = {

packages/playground-v2/scripts/vendor-typescript.mjs

@@ -9,10 +9,26 @@ const typescriptDirectory = resolve(process.env.TYPESCRIPT_REPO || resolve(websi
 const vendorDirectory = resolve(packageDirectory, "vendor")
 const typescriptPackage = resolve(typescriptDirectory, "packages/typescript")
 const wasmPackage = resolve(typescriptDirectory, "packages/typescript-wasip1-wasm")
-const libDirectory = resolve(typescriptDirectory, "built/local")
+const libDirectory = resolve(wasmPackage, "lib")
 const packageNames = ["typescript", "typescript-wasip1-wasm"]
 const legalFiles = ["LICENSE.txt", "NOTICE.txt"]
 
+const libFileNames = JSON.parse(await readFile(resolve(libDirectory, "libFiles.json"), "utf8"))
+const expectedLibFileNames = (await readdir(libDirectory)).filter(fileName => /^lib(?:\..+)?\.d\.ts$/.test(fileName)).sort()
+if (
+  !Array.isArray(libFileNames) ||
+  libFileNames.length === 0 ||
+  JSON.stringify(libFileNames) !== JSON.stringify(expectedLibFileNames)
+) {
+  throw new Error("The WASI package library index does not match its declaration files")
+}
+await Promise.all([
+  readFile(resolve(typescriptPackage, "dist/wasm/index.js")),
+  readFile(resolve(typescriptPackage, "schemas/tsconfig.schema.json")),
+  readFile(resolve(typescriptPackage, "schemas/jsconfig.schema.json")),
+  readFile(resolve(wasmPackage, "lib/tsc.wasm")),
+])
+
 await Promise.all([
   rm(resolve(vendorDirectory, "lib"), { force: true, recursive: true }),
   rm(resolve(vendorDirectory, "typescript"), { force: true, recursive: true }),
@@ -28,9 +44,8 @@ await Promise.all([
   cp(resolve(wasmPackage, "dist"), resolve(vendorDirectory, "typescript-wasip1-wasm/dist"), {
     recursive: true,
   }),
-  mkdir(resolve(vendorDirectory, "typescript-wasip1-wasm/lib"), { recursive: true }).then(() =>
-    cp(resolve(wasmPackage, "lib/tsc.wasm"), resolve(vendorDirectory, "typescript-wasip1-wasm/lib/tsc.wasm"))
-  ),
+  cp(resolve(wasmPackage, "lib"), resolve(vendorDirectory, "typescript-wasip1-wasm/lib"), { recursive: true }),
+  cp(resolve(typescriptPackage, "schemas"), resolve(vendorDirectory, "typescript/schemas"), { recursive: true }),
   writeVendorManifest(typescriptPackage, "typescript"),
   writeVendorManifest(wasmPackage, "typescript-wasip1-wasm"),
   ...packageNames.flatMap(packageName =>
@@ -40,13 +55,6 @@ await Promise.all([
   ),
 ])
 
-const vendorLibDirectory = resolve(vendorDirectory, "lib")
-await mkdir(vendorLibDirectory, { recursive: true })
-const libFileNames = (await readdir(libDirectory)).filter(fileName => /^lib(?:\..+)?\.d\.ts$/.test(fileName))
-await Promise.all(
-  libFileNames.map(fileName => cp(resolve(libDirectory, fileName), resolve(vendorLibDirectory, fileName)))
-)
-
 const versionResult = spawnSync(resolve(typescriptDirectory, "built/local/tsc"), ["--version"], { encoding: "utf8" })
 if (versionResult.status !== 0) {
   throw new Error(versionResult.stderr || "Unable to read the TypeScript version")
@@ -85,7 +93,7 @@ async function writeVendorManifest(sourceDirectory, vendorName) {
     version: manifest.version,
     license: manifest.license,
     type: manifest.type,
-    files: vendorName === "typescript-wasip1-wasm" ? ["dist", "lib/tsc.wasm", ...legalFiles] : ["dist", ...legalFiles],
+    files: vendorName === "typescript-wasip1-wasm" ? ["dist", "lib", ...legalFiles] : ["dist", "schemas", ...legalFiles],
     exports,
     imports,
   }

packages/playground-v2/src/ata/README.md

@@ -21,6 +21,11 @@ path references, and standard-library references. Literal dynamic imports,
 import types, re-exports, and import-equals are supported. Existing
 `// types: VERSION` annotations are preserved.
 
+The native API and reactor host come from the same TypeScript package.
+The matching WASI artifact package supplies the binary and standard libraries;
+its `lib/libFiles.json` index determines which libraries the build includes.
+Configuration schemas are vendored from the compiler package alongside its API.
+
 ## Resolution
 
 - Node builtin imports resolve directly to `@types/node`.

packages/playground-v2/src/ata/ata.test.ts

@@ -3,7 +3,7 @@ import { readFile } from "node:fs/promises"
 import { createRequire } from "node:module"
 import { test } from "node:test"
 import { API } from "@typescript/typescript/unstable/sync"
-import { instantiateWasm, WasmTransport } from "@typescript/typescript-wasip1-wasm"
+import { instantiateWasm, WasmTransport } from "@typescript/typescript/unstable/wasm"
 import { acquisitionOptions } from "./config"
 import { corsaDiscovery, stradaDiscovery, PackageTypeAcquirer, type AcquisitionProgress, type Dependency } from "./index"
 import { packageName, safePackagePath } from "./packages"

packages/playground-v2/src/native-compiler.test.ts

@@ -2,15 +2,16 @@ import assert from "node:assert/strict"
 import { readFile, readdir } from "node:fs/promises"
 import { test } from "node:test"
 import { API } from "@typescript/typescript/unstable/sync"
-import { instantiateWasm, WasmTransport } from "@typescript/typescript-wasip1-wasm"
+import { instantiateWasm, WasmTransport } from "@typescript/typescript/unstable/wasm"
 import { NativeCompiler, type NativeCompileInput } from "./native-compiler"
 
 test("native compiler reuses snapshots across edits, types, and configuration changes", async () => {
   const directory = process.env.PLAYGROUND_DIR!
   const module = await WebAssembly.compile(await readFile(`${directory}/vendor/typescript-wasip1-wasm/lib/tsc.wasm`))
   const transport = new WasmTransport({ instance: await instantiateWasm(module), cwd: "/workspace" })
-  for (const name of await readdir(`${directory}/vendor/lib`)) {
-    if (/^lib(?:\..+)?\.d\.ts$/.test(name)) transport.setFile(`/${name}`, await readFile(`${directory}/vendor/lib/${name}`, "utf8"))
+  const libDirectory = `${directory}/vendor/typescript-wasip1-wasm/lib`
+  for (const name of await readdir(libDirectory)) {
+    if (/^lib(?:\..+)?\.d\.ts$/.test(name)) transport.setFile(`/${name}`, await readFile(`${libDirectory}/${name}`, "utf8"))
   }
   const api = new API({ transport })
   const createProgram = api.createProgram

packages/playground-v2/src/native-compiler.ts

@@ -1,6 +1,6 @@
 import { API, type Diagnostic, type FileNotifications, type Snapshot } from "@typescript/typescript/unstable/sync"
 import type { Node } from "@typescript/typescript/unstable/ast"
-import type { WasmTransport } from "@typescript/typescript-wasip1-wasm"
+import type { WasmTransport } from "@typescript/typescript/unstable/wasm"
 import { TextDocument } from "vscode-languageserver-textdocument"
 import { corsaDiscovery, type Dependency, type SourceFile } from "./ata"
 

packages/playground-v2/src/native.worker.ts

@@ -1,5 +1,5 @@
 import { API } from "@typescript/typescript/unstable/sync"
-import { instantiateWasm, WasmTransport } from "@typescript/typescript-wasip1-wasm"
+import { instantiateWasm, WasmTransport } from "@typescript/typescript/unstable/wasm"
 import type { SourceFile } from "./ata"
 import { NativeCompiler, type NativeCompileInput } from "./native-compiler"
 

packages/playground-v2/vendor/source-revision.txt

@@ -1 +1 @@
-d27e2f5148eec753f9492e7ff730adedf336d146
+fa49b4514d79a1121c9e20fb7796412233f8fd25

packages/playground-v2/vendor/typescript-wasip1-wasm/dist/index.d.ts

@@ -1,73 +1,2 @@
-export { wasmURL } from "#wasmURL";
-export { instantiateWasm, type InstantiateWasmOptions, instantiateWasmSync } from "./wasi.ts";
-import { type WasmFileSystem } from "./wasi.ts";
-export interface WasmReactorExports {
-    memory: {
-        readonly buffer: ArrayBufferLike;
-    };
-    create_session(optionsPointer: number, optionsLength: number): number;
-    close_session(): void;
-    get_request_buffer(size: number): number;
-    handle_request(methodLength: number, payloadLength: number): number;
-    set_file(pathLength: number, contentLength: number): number;
-    read_file(pathLength: number): number;
-    remove_file(pathLength: number): number;
-    response_ptr(): number;
-    response_len(): number;
-}
-export interface WasmReactorInstance {
-    readonly exports: object;
-}
-export interface WasmTransportOptions {
-    /**
-     * An instantiated reactor whose WASI host has already initialized it.
-     * For example, call `wasi.initialize(instance)` before constructing the transport.
-     */
-    instance: WasmReactorInstance;
-    cwd?: string | undefined;
-    useCaseSensitiveFileNames?: boolean | undefined;
-    collectTiming?: boolean | undefined;
-    fs?: WasmFileSystem | undefined;
-}
-/**
- * Synchronous API transport backed by an in-process TypeScript WebAssembly reactor.
- *
- * Host callbacks must complete synchronously and cannot call this transport while
- * an outer request is in progress.
- */
-export declare class WasmTransport {
-    lastBytesSent: number;
-    lastBytesReceived: number;
-    private readonly instance;
-    private readonly exports;
-    private requestPointer;
-    private closed;
-    private inCallback;
-    constructor(options: WasmTransportOptions);
-    setFileSystem(fs: WasmFileSystem | undefined): void;
-    requestSync(method: string, payload: string): string;
-    request(method: string, payload: string): {
-        value: string;
-        bytesSent: number;
-        bytesReceived: number;
-    };
-    requestBinarySync(method: string, payload: Uint8Array): Uint8Array;
-    requestBinary(method: string, payload: Uint8Array): {
-        value: Uint8Array;
-        bytesSent: number;
-        bytesReceived: number;
-    };
-    registerCallback(name: string, callback: (name: string, payload: string) => string): void;
-    unregisterCallback(name: string): void;
-    setFile(path: string, content: string): void;
-    /** Read a file from the reactor's in-memory filesystem. */
-    readFile(path: string): string | undefined;
-    removeFile(path: string): void;
-    close(): void;
-    private call;
-    private writeRequest;
-    private readResponseText;
-    private readResponseBytes;
-    private ensureOpen;
-}
+export declare const wasmURL: URL;
 //# sourceMappingURL=index.d.ts.map