Skip to content

Add wasip1 npm build target #4733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jake Bailey (jakebailey) wants to merge 2 commits into from
Closed

Add wasip1 npm build target #4733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73440a4
Add wasip1 npm build target
jakebailey Jul 24, 2026
0e35cce
Avoid signal watcher on wasip1
jakebailey Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions Herebyfile.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,8 +1486,8 @@ const mainNativePreviewPackage = {
};

/**
* @typedef {"win32" | "linux" | "darwin" | "aix" | "android" | "freebsd" | "netbsd" | "openbsd" | "sunos"} OS
* @typedef {"x64" | "arm" | "arm64" | "ia32" | "ppc64" | "loong64" | "mips64el" | "riscv64" | "s390x"} Arch
* @typedef {"win32" | "linux" | "darwin" | "aix" | "android" | "freebsd" | "netbsd" | "openbsd" | "sunos" | "wasip1"} OS
* @typedef {"x64" | "arm" | "arm64" | "ia32" | "ppc64" | "loong64" | "mips64el" | "riscv64" | "s390x" | "wasm"} Arch
* @typedef {"Microsoft400" | "LinuxSign" | "MacDeveloperHarden" | "8020" | "VSCodePublisher"} Cert
* @typedef {`${OS | "alpine"}-${Exclude<Arch, "arm"> | "armhf"}`} VSCodeTarget
* @typedef {{ name: string; sourceDir: string }} VsixExtensionPackage
Expand Down Expand Up @@ -1534,7 +1534,7 @@ const platforms = [
{ os: "openbsd", arch: "arm64" },
{ os: "openbsd", arch: "x64" },
{ os: "sunos", arch: "x64" },
// Wasm?
{ os: "wasip1", arch: "wasm" },
];

const ignoredGoTargets = new Map([
Expand All @@ -1558,7 +1558,7 @@ const ignoredGoTargets = new Map([

/**
* @param {string} os
* @returns {"windows" | "illumos" | "darwin" | "linux" | "aix" | "android" | "freebsd" | "netbsd" | "openbsd"}
* @returns {"windows" | "illumos" | "darwin" | "linux" | "aix" | "android" | "freebsd" | "netbsd" | "openbsd" | "wasip1"}
*/
function nodeToGOOS(os) {
switch (os) {
Expand All @@ -1573,6 +1573,7 @@ function nodeToGOOS(os) {
case "freebsd":
case "netbsd":
case "openbsd":
case "wasip1":
return os;
default:
throw new Error(`Unsupported OS: ${os}`);
Expand All @@ -1582,7 +1583,7 @@ function nodeToGOOS(os) {
/**
* @param {string} arch
* @param {string} os
* @returns {"amd64" | "386" | "mips64le" | "ppc64" | "ppc64le" | "arm" | "arm64" | "loong64" | "riscv64" | "s390x"}
* @returns {"amd64" | "386" | "mips64le" | "ppc64" | "ppc64le" | "arm" | "arm64" | "loong64" | "riscv64" | "s390x" | "wasm"}
*/
function nodeToGOARCH(arch, os) {
switch (arch) {
Expand All @@ -1599,6 +1600,7 @@ function nodeToGOARCH(arch, os) {
case "loong64":
case "riscv64":
case "s390x":
case "wasm":
return arch;
default:
throw new Error(`Unsupported ARCH: ${arch}`);
Expand All @@ -1609,7 +1611,7 @@ const getPlatforms = memoize(() => {
const publishTag = getPublishTag();
let supportedPlatforms = publishAsTypescript && publishTag !== "next"
? platforms
: platforms.filter(({ vsix }) => vsix);
: platforms.filter(({ os, vsix }) => vsix || os === "wasip1");

if (!options.forRelease) {
supportedPlatforms = supportedPlatforms.filter(({ os, arch }) => os === process.platform && arch === process.arch);
Expand Down Expand Up @@ -1697,6 +1699,7 @@ function goDistTargetToPlatform(target) {
case "linux":
case "netbsd":
case "openbsd":
case "wasip1":
nodeOs = target.GOOS;
break;
default:
Expand Down Expand Up @@ -1726,6 +1729,7 @@ function goDistTargetToPlatform(target) {
case "loong64":
case "riscv64":
case "s390x":
case "wasm":
nodeArch = target.GOARCH;
break;
default:
Expand Down Expand Up @@ -1863,7 +1867,7 @@ async function runBuildNativePreviewPackages() {
const mainPackage = {
...inputPackageJson,
name: mainNativePreviewPackage.npmPackageName,
optionalDependencies: Object.fromEntries(platforms.map(p => [p.npmPackageName, getVersion()])),
optionalDependencies: Object.fromEntries(platforms.filter(p => p.nodeOs !== "wasip1").map(p => [p.npmPackageName, getVersion()])),

@jakebailey Jake Bailey (jakebailey) Jul 24, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's basically expected at this stage, unless we make the shim able to load in Node the wasm blob, which, as far as I can tell is unstable. But I need to recheck.

};

const mainPackageDir = mainNativePreviewPackage.npmDir;
Expand Down Expand Up @@ -1923,8 +1927,8 @@ async function runBuildNativePreviewPackages() {
imports: undefined,
dependencies: undefined,
name: npmPackageName,
os: [nodeOs],
cpu: [nodeArch],
os: nodeOs === "wasip1" ? undefined : [nodeOs],
cpu: nodeOs === "wasip1" ? undefined : [nodeArch],
exports: {
"./package.json": "./package.json",
},
Expand All @@ -1948,7 +1952,7 @@ async function runBuildNativePreviewPackages() {

const exeName = nativePreviewExeName(nodeOs);
await buildTsgo({
out: publishAsTypescript ? path.join(out, exeName) : out,
out: publishAsTypescript || nodeOs === "wasip1" ? path.join(out, exeName) : out,
env: { GOOS: goos, GOARCH: goarch, GOARM: "6", CGO_ENABLED: "0" },
extraFlags,
});
Expand Down Expand Up @@ -1979,7 +1983,14 @@ export const signNativePreviewPackages = task({
*/
function nativePreviewExeName(nodeOs) {
const baseName = publishAsTypescript ? "tsc" : "tsgo";
return nodeOs === "win32" ? `${baseName}.exe` : baseName;
switch (nodeOs) {
case "win32":
return `${baseName}.exe`;
case "wasip1":
return `${baseName}.wasm`;
default:
return baseName;
}
}

async function runSignNativePreviewPackages() {
Expand Down
3 changes: 1 addition & 2 deletions cmd/tsgo/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"flag"
"fmt"
"os"
"os/signal"
"strings"
"syscall"

Expand Down Expand Up @@ -50,7 +49,7 @@ func runAPI(args []string) int {

s := api.NewStdioServer(options)

ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
ctx, stop := notifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
defer stop()

if err := s.Run(ctx); err != nil {
Expand Down
3 changes: 1 addition & 2 deletions cmd/tsgo/lsp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"os"
"os/exec"
"os/signal"
"syscall"
"time"

Expand Down Expand Up @@ -44,7 +43,7 @@ func runLSP(args []string) int {
defaultLibraryPath := bundled.LibPath()
typingsLocation := osvfs.GetGlobalTypingsCacheLocation()

ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
ctx, stop := notifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
defer stop()

s := lsp.NewServer(&lsp.ServerOptions{
Expand Down
10 changes: 9 additions & 1 deletion cmd/tsgo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"os"
"os/signal"
"runtime"
"syscall"

"github.com/microsoft/typescript-go/internal/core"
Expand All @@ -25,8 +26,15 @@ func runMain() int {
return runAPI(args[1:])
}
}
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
ctx, stop := notifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
defer stop()
result := execute.CommandLine(ctx, newSystem(), args, nil)
return int(result.Status)
}

func notifyContext(parent context.Context, signals ...os.Signal) (context.Context, context.CancelFunc) {
if runtime.GOOS == "wasip1" {
return context.WithCancel(parent)
}
return signal.NotifyContext(parent, signals...)
}