Skip to content

refactor: migrate to typescript #261

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

Merged
flick9000 merged 6 commits into from
Oct 7, 2026
Merged

refactor: migrate to typescript #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0056124
feat: migrate scripts.js to ts
flick9000 Oct 6, 2026
a72501b
feat: migrate appinstall to ts
flick9000 Oct 6, 2026
770f31a
feat: migrate unattend to ts
flick9000 Oct 6, 2026
28fcda8
feat: migrate main to ts
flick9000 Oct 6, 2026
5dac775
feat(ci): update compare for ts files
flick9000 Oct 6, 2026
94c8c7c
chore: remove comments
flick9000 Oct 7, 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
8 changes: 4 additions & 4 deletions .github/workflows/compare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ jobs:
}
}

$appInstallApp = "app/src/assets/js/appinstall.js"
$appInstallWeb = "website/src/assets/js/appinstall.js"
$appInstallApp = "app/src/assets/js/appinstall.ts"
$appInstallWeb = "website/src/assets/js/appinstall.ts"

if ((Test-Path $appInstallApp) -and (Test-Path $appInstallWeb)) {
if ((Get-FileHash $appInstallApp).Hash -ne (Get-FileHash $appInstallWeb).Hash) {
Expand All @@ -81,8 +81,8 @@ jobs:
}
}

$scriptsApp = "app/src/assets/js/scripts.js"
$scriptsWeb = "website/src/assets/js/scripts.js"
$scriptsApp = "app/src/assets/js/scripts.ts"
$scriptsWeb = "website/src/assets/js/scripts.ts"

if ((Test-Path $scriptsApp) -and (Test-Path $scriptsWeb)) {
if ((Get-FileHash $scriptsApp).Hash -ne (Get-FileHash $scriptsWeb).Hash) {
Expand Down
86 changes: 48 additions & 38 deletions app/src/assets/js/appinstall.js → app/src/assets/js/appinstall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,15 +388,15 @@ function appsInstallChocolatey() {
return appListChocolatey
.filter((app) => {
const element = document.getElementById(app.id);
return element && element.checked;
return element instanceof HTMLInputElement && element.checked;
})
.map((app) => app.url);
}

// Function to update the command display
function updateCommandDisplay() {
const checkedUrls = getCheckedUrls();
const allUrls = [...checkedUrls, ...window.manualURLs];
const allUrls = [...checkedUrls, ...(window.manualURLs ?? [])];
const finalURL = allUrls
.filter((url) => url && url.trim() !== "")
.map((url) => `\\"${url}\\"`)
Expand All @@ -413,19 +413,22 @@ function appsInstallChocolatey() {
: "";

// Display the final URL in the div
document.querySelector(".div-install").style.display = allUrls.length > 0 ? "block" : "none";
document.querySelector(".winget-container").style.display = "none";
document.querySelector(".chocolatey-container").style.display =
allUrls.length > 0 ? "block" : "none";
const divInstall = document.querySelector(".div-install") as HTMLDivElement;
const wingetContainer = document.querySelector(".winget-container") as HTMLDivElement;
const chocolateyContainer = document.querySelector(".chocolatey-container") as HTMLDivElement;

divInstall.style.display = allUrls.length > 0 ? "block" : "none";
wingetContainer.style.display = "none";
chocolateyContainer.style.display = allUrls.length > 0 ? "block" : "none";

const commandDisplay = document.querySelector(".commandDisplay");
commandDisplay.textContent = command;
if (commandDisplay) commandDisplay.textContent = command;

const installingApps = document.querySelector(".installingApps");
installingApps.textContent = allUrls.join(", ");
if (installingApps) installingApps.textContent = allUrls.join(", ");

const manualList = document.getElementById("manualList");
if (window.manualURLs.length > 0) {
if (window.manualURLs && window.manualURLs.length > 0 && manualList) {
manualList.innerHTML = "Manual packages added: " + window.manualURLs.join(" | ");
}
}
Expand Down Expand Up @@ -823,15 +826,15 @@ function appsInstallWinget() {
return appListWinget
.filter((app) => {
const element = document.getElementById(app.id);
return element && element.checked;
return element instanceof HTMLInputElement && element.checked;
})
.map((app) => app.url);
}

// Function to update the command display
function updateCommandDisplay() {
const checkedUrls = getCheckedUrls();
const allUrls = [...checkedUrls, ...window.manualURLs];
const allUrls = [...checkedUrls, ...(window.manualURLs ?? [])];
const finalURL = allUrls
.filter((url) => url && url.trim() !== "")
.map((url) => `\\"${url}\\"`)
Expand All @@ -845,22 +848,26 @@ function appsInstallWinget() {
: "";

// Display the final URL in the div
document.querySelector(".div-install").style.display = allUrls.length > 0 ? "block" : "none";
document.querySelector(".chocolatey-container").style.display = "none";
document.querySelector(".winget-container").style.display =
allUrls.length > 0 ? "block" : "none";
const divInstall = document.querySelector(".div-install") as HTMLDivElement;
const chocolateyContainer = document.querySelector(".chocolatey-container") as HTMLDivElement;
const wingetContainer = document.querySelector(".winget-container") as HTMLDivElement;

divInstall.style.display = allUrls.length > 0 ? "block" : "none";
chocolateyContainer.style.display = "none";
wingetContainer.style.display = allUrls.length > 0 ? "block" : "none";

const commandDisplay = document.querySelector(".commandDisplay");
commandDisplay.textContent = command;
if (commandDisplay) commandDisplay.textContent = command;

const installingApps = document.querySelector(".installingApps");
installingApps.textContent = allUrls.join(", ");
if (installingApps) installingApps.textContent = allUrls.join(", ");

const wingetUpgrade = document.getElementById("wingetUpgrade");
wingetUpgrade.textContent = `$v = winget -v; if ([version]($v.TrimStart('v')) -lt [version]'1.7.0') { Write-Output '-- Old Winget version detected, upgrading.'; Set-Location $env:USERPROFILE; Invoke-WebRequest -Uri 'https://aka.ms/getwinget' -OutFile 'winget.msixbundle'; Add-AppPackage -ForceApplicationShutdown .\\winget.msixbundle; Remove-Item .\\winget.msixbundle } else { Write-Output 'Winget is already up to date, skipping upgrade.' }`;
if (wingetUpgrade)
wingetUpgrade.textContent = `$v = winget -v; if ([version]($v.TrimStart('v')) -lt [version]'1.7.0') { Write-Output '-- Old Winget version detected, upgrading.'; Set-Location $env:USERPROFILE; Invoke-WebRequest -Uri 'https://aka.ms/getwinget' -OutFile 'winget.msixbundle'; Add-AppPackage -ForceApplicationShutdown .\\winget.msixbundle; Remove-Item .\\winget.msixbundle } else { Write-Output 'Winget is already up to date, skipping upgrade.' }`;

const manualList = document.getElementById("manualList");
if (window.manualURLs.length > 0) {
if (window.manualURLs && window.manualURLs.length > 0 && manualList) {
manualList.innerHTML = "Manual packages added: " + window.manualURLs.join(" | ");
}
}
Expand All @@ -871,8 +878,8 @@ function appsInstallWinget() {
appsInstallWinget();
appsInstallChocolatey();

const selectedPackageManager = document.getElementById("packageManager");
selectedPackageManager.addEventListener("change", () => {
const selectedPackageManager = document.getElementById("packageManager") as HTMLInputElement;
selectedPackageManager?.addEventListener("change", () => {
if (selectedPackageManager.value === "chocolatey") {
appsInstallChocolatey();
} else if (selectedPackageManager.value === "winget") {
Expand All @@ -881,35 +888,38 @@ selectedPackageManager.addEventListener("change", () => {
});

// Check manual IDs
function isValidManualId(manualId) {
function isValidManualId(manualId: string) {
return /^[A-Za-z0-9._+\-]+$/.test(manualId);
}

// Manual IDs button listener
const addButton = document.getElementById("addApp");
addButton.addEventListener("click", () => {
const manualInput = document.getElementById("manualInput").value.trim();
if (manualInput) {
if (!isValidManualId(manualInput)) {
const manualList = document.getElementById("manualList");
manualList.innerHTML = "Please enter a valid package ID.";
return;
}
window.manualURLs.push(manualInput);
document.getElementById("manualInput").value = ""; // Clear input
if (selectedPackageManager.value === "chocolatey") {
appsInstallChocolatey();
} else if (selectedPackageManager.value === "winget") {
appsInstallWinget();
}
addButton?.addEventListener("click", () => {
const manualInput = document.getElementById("manualInput") as HTMLInputElement;
const manualList = document.getElementById("manualList");
const inputValue = manualInput.value.trim();

if (!manualInput || !manualList) return;

if (!isValidManualId(inputValue)) {
manualList.innerHTML = "Please enter a valid package ID.";
return;
}
if (window.manualURLs) window.manualURLs.push(inputValue);
manualInput.value = "";

if (selectedPackageManager.value === "chocolatey") {
appsInstallChocolatey();
} else if (selectedPackageManager.value === "winget") {
appsInstallWinget();
}
});

// Checkboxes event listeners
const apps = document.querySelectorAll('[js-target="install"]');
document.addEventListener("DOMContentLoaded", () => {
document.body.addEventListener("change", (event) => {
if (event.target.matches("[js-target=install]")) {
if (event.target instanceof Element && event.target.matches("[js-target=install]")) {
if (selectedPackageManager.value === "chocolatey") {
appsInstallChocolatey();
} else if (selectedPackageManager.value === "winget") {
Expand Down
7 changes: 7 additions & 0 deletions app/src/assets/js/global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
declare global {
interface Window {
manualURLs?: string[];
}
}

export {};
Loading
Loading