Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion packages/playground-v2/src/compiler-versions.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { gte, prerelease, rcompare, valid } from "semver"
import { gte, lte, prerelease, rcompare, valid } from "semver"
import { CompilerDownloadError, fetchCompilerResource } from "./compiler-assets"

export type PublishedCompilerVersions = {
Expand Down Expand Up @@ -106,6 +106,18 @@ export function publishedNativeCompilerSelection(published: PublishedCompilerVer
return { version, channel: useStable ? ("stable" as const) : ("nightly" as const) }
}

export function latestStableCompilerVersion(legacyVersions: readonly string[], published: PublishedCompilerVersions) {
const latest = published.tags.latest
if (latest && valid(latest) !== null && !prerelease(latest)) {
if (!isUnsupportedNativeCompilerVersion(latest) && published.versions.includes(latest)) return latest
const supported = compilerVersionChoices(legacyVersions, published).find(
({ version }) => valid(version) !== null && !prerelease(version) && lte(version, latest)
)
if (supported) return supported.version
}
throw new Error("No supported TypeScript release is published as latest")
}

export function compilerVersionChoices(
legacyVersions: readonly string[],
published?: PublishedCompilerVersions,
Expand Down
2 changes: 2 additions & 0 deletions packages/playground-v2/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ <h2 id="text-input-title">Enter a value</h2>
<progress id="loading-progress" max="100" value="0" aria-labelledby="loading-message"></progress>
<small id="loading-detail"></small>
<button id="retry-startup-button" class="action-button" type="button" hidden>Retry</button>
<button id="use-latest-startup-button" class="action-button" type="button" hidden>Use latest</button>
<button id="use-nightly-startup-button" class="action-button" type="button" hidden>Use Nightly</button>
</div>
<section id="download-consent" class="download-consent" aria-labelledby="download-consent-title" hidden>
<h2 id="download-consent-title">Download TypeScript?</h2>
Expand Down
66 changes: 62 additions & 4 deletions packages/playground-v2/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
isUnsupportedNativeCompilerVersion,
loadPublishedCompilerVersions,
loadLegacyCompilerVersions,
latestStableCompilerVersion,
publishedNativeCompilerSelection,
} from "./compiler-versions"
import "monaco-editor/editor/contrib/links/browser/links.js"
Expand Down Expand Up @@ -253,10 +254,15 @@ const downloadSize = getElement("download-size")
const rememberDownloadConsent = getElement<HTMLInputElement>("remember-download-consent")
const confirmDownloadButton = getElement<HTMLButtonElement>("confirm-download-button")
const retryStartupButton = getElement<HTMLButtonElement>("retry-startup-button")
const useLatestStartupButton = getElement<HTMLButtonElement>("use-latest-startup-button")
const useNightlyStartupButton = getElement<HTMLButtonElement>("use-nightly-startup-button")

let compilerReady = false
let lspReady = false
let compilerFailure: string | undefined
let attemptedCompilerVersion: string | undefined
let versionRecovery: { latest: boolean; nightly: boolean } | undefined
let versionRecoveryFailure: string | undefined
let lspFailure: string | undefined
let projectFailure: string | undefined
let languageServer: TsgoLspController | undefined
Expand Down Expand Up @@ -877,6 +883,8 @@ toggleRunOutputButton.addEventListener("click", () => {
navigateBackButton.addEventListener("click", navigateBack)
runButton.addEventListener("click", runProject)
retryStartupButton.addEventListener("click", retryStartup)
useLatestStartupButton.addEventListener("click", () => void useLatestCompilerVersion())
useNightlyStartupButton.addEventListener("click", () => void selectCompilerVersion("next"))
settingsButton.addEventListener("click", openSettings)
settingsCancelButton.addEventListener("click", () => settingsDialog.close())
settingsResetButton.addEventListener("click", () => populateSettingsForm(defaultPlaygroundSettings()))
Expand Down Expand Up @@ -964,7 +972,7 @@ async function initializeNativeCompiler() {
const message = error instanceof Error ? error.message : String(error)
compilerFailure = message
completeInitialTypeQueries()
renderStatus()
offerVersionRecovery()
console.error(error)
}
}
Expand All @@ -973,6 +981,7 @@ async function initializeStradaCompiler(requestedVersion: string) {
try {
setLoadingIndeterminate("Loading TypeScript...", "")
const version = await resolveStradaVersion(requestedVersion)
attemptedCompilerVersion = version
let mirroredVersions: string[] = []
try {
mirroredVersions = await getLegacyCompilerVersions()
Expand Down Expand Up @@ -1042,7 +1051,7 @@ async function initializeStradaCompiler(requestedVersion: string) {
} catch (error) {
compilerFailure = error instanceof Error ? error.message : String(error)
completeInitialTypeQueries()
renderStatus()
offerVersionRecovery()
console.error(error)
}
}
Expand Down Expand Up @@ -1250,6 +1259,48 @@ function normalizeRequestedVersion(version: string) {
return version === "Nightly" ? "next" : version
}

function offerVersionRecovery() {
const recovery = { latest: true, nightly: normalizeRequestedVersion(selectedCompiler ?? "") !== "next" }
versionRecovery = recovery
renderStatus()
const failedVersion = attemptedCompilerVersion
if (failedVersion === undefined) return
void (async () => {
const published = await getPublishedCompilerVersions()
if (published.tags.next === failedVersion) recovery.nightly = false
if (latestStableCompilerVersion(await getLegacyCompilerVersions(), published) === failedVersion) {
recovery.latest = false
}
})()
.catch(error => console.warn("Could not compare recovery versions with the failed compiler", error))
.finally(renderStatus)
}

async function useLatestCompilerVersion() {
useLatestStartupButton.disabled = true
versionRecoveryFailure = undefined
renderStatus()
try {
let published
try {
published = await getPublishedCompilerVersions()
} catch {
publishedCompilerVersionsPromise = undefined
published = await getPublishedCompilerVersions()
}
const legacyVersions = await getLegacyCompilerVersions().catch(() => {
legacyCompilerVersionsPromise = undefined
return getLegacyCompilerVersions().catch(() => [])
})
await selectCompilerVersion(latestStableCompilerVersion(legacyVersions, published))
} catch (error) {
versionRecoveryFailure = error instanceof Error ? error.message : String(error)
useLatestStartupButton.disabled = false
renderStatus()
console.error(error)
}
}

async function resolveStradaVersion(requestedVersion: string) {
const normalized = normalizeRequestedVersion(requestedVersion)
if (normalized !== "next" && normalized !== "latest") return normalized
Expand Down Expand Up @@ -1869,7 +1920,10 @@ function applyEditorLocation(location: EditorLocation) {
}

function getCompilerDistribution() {
compilerDistributionPromise ??= resolveNativeCompilerVersion().then(loadPublishedCompilerDistribution)
compilerDistributionPromise ??= resolveNativeCompilerVersion().then(version => {
attemptedCompilerVersion = version
return loadPublishedCompilerDistribution(version)
})
return compilerDistributionPromise
}

Expand Down Expand Up @@ -2604,10 +2658,14 @@ function renderStatus() {
loader.dataset.state = "error"
loadingMessage.textContent = failure
loadingProgress.hidden = true
loadingDetail.textContent = ""
loadingDetail.textContent = versionRecoveryFailure ?? ""
retryStartupButton.hidden = false
useLatestStartupButton.hidden = !versionRecovery?.latest
useNightlyStartupButton.hidden = !versionRecovery?.nightly
return
}
useLatestStartupButton.hidden = true
useNightlyStartupButton.hidden = true
if (!compilerReady) {
loadingMessage.textContent = "Loading TypeScript..."
return
Expand Down
24 changes: 24 additions & 0 deletions packages/playground-v2/src/native-compiler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
compilerVersionChoices,
isUnsupportedNativeCompilerVersion,
isWasmCompilerVersion,
latestStableCompilerVersion,
publishedNativeCompilerSelection,
} from "./compiler-versions"
import { loadStradaLibraries, type StradaLibraryProgress } from "./strada-libraries"
Expand Down Expand Up @@ -661,6 +662,29 @@ test("native channel resolution rejects missing, incompatible and unlisted versi
)
})

test("the latest release resolves to an exact supported stable version without falling back to Nightly", () => {
const next = "7.1.0-dev.20261031.1"
const legacy = ["5.9.3", "6.0.2", "6.0.3"]
assert.equal(
latestStableCompilerVersion(legacy, { versions: ["6.0.3", next], tags: { latest: "6.0.3", next } }),
"6.0.3"
)
assert.equal(
latestStableCompilerVersion(legacy, { versions: ["7.1.0", next], tags: { latest: "7.1.0", next } }),
"7.1.0"
)
assert.equal(
latestStableCompilerVersion(legacy, { versions: ["7.0.2", next], tags: { latest: "7.0.2", next } }),
"6.0.3"
)
for (const published of [
{ versions: ["7.0.2", next], tags: { latest: "7.0.2", next } },
{ versions: [next], tags: { next } },
]) {
assert.throws(() => latestStableCompilerVersion([], published), /No supported TypeScript release/)
}
})

test("version choices sort supported releases and the resolved Nightly by descending semver", () => {
const choices = compilerVersionChoices(["7.0.2", "5.9.2", "6.0.2", "3.1.6", "5.9.3", "6.0.3"], {
versions: ["7.0.2", "7.1.0-beta", "7.1.0-dev.20261030.1", "7.1.1", "7.1.2", "7.2.0-dev.20261101.1"],
Expand Down
Loading