AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

making sure dependencies are formatted

Browse source
This commit is contained in:
Jakub Doka 2024-11-23 10:31:38 +01:00
parent d8d039b67a
commit 4856533b22
No known key found for this signature in database
GPG key ID: C6E9A89936B8C143
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
depell/src/index.js
View file

@ -158,12 +158,13 @@ function wireUp(target) {
const importRe = /@use\s*\(\s*"(([^"]|\\")+)"\s*\)/g; const importRe = /@use\s*\(\s*"(([^"]|\\")+)"\s*\)/g;
/** @param {string} code /** @param {WebAssembly.Instance} fmt
* @param {string} code
* @param {string[]} roots * @param {string[]} roots
* @param {Post[]} buf * @param {Post[]} buf
* @param {Set<string>} prevRoots * @param {Set<string>} prevRoots
* @returns {void} */ * @returns {void} */
function loadCachedPackages(code, roots, buf, prevRoots) { function loadCachedPackages(fmt, code, roots, buf, prevRoots) {
buf[0].code = code; buf[0].code = code;
roots.length = 0; roots.length = 0;
@ -179,7 +180,10 @@ function loadCachedPackages(code, roots, buf, prevRoots) {
for (let imp = roots.pop(); imp !== undefined; imp = roots.pop()) { for (let imp = roots.pop(); imp !== undefined; imp = roots.pop()) {
if (prevRoots.has(imp)) continue; prevRoots.add(imp); if (prevRoots.has(imp)) continue; prevRoots.add(imp);
buf.push({ path: imp, code: localStorage.getItem("package-" + imp) ?? never() });
const fmtd = modifyCode(fmt, localStorage.getItem("package-" + imp) ?? never(), "fmt");
if (typeof fmtd != "string") never();
buf.push({ path: imp, code: fmtd });
for (const match of buf[buf.length - 1].code.matchAll(importRe)) { for (const match of buf[buf.length - 1].code.matchAll(importRe)) {
roots.push(match[1]); roots.push(match[1]);
} }
@ -275,7 +279,7 @@ async function bindCodeEdit(target) {
return; return;
} }
loadCachedPackages(edit.value, ctx.keyBuf, packages, prevRoots); loadCachedPackages(fmt, edit.value, ctx.keyBuf, packages, prevRoots);
errors.textContent = compileCode(hbc, packages); errors.textContent = compileCode(hbc, packages);
const minified_size = modifyCode(fmt, edit.value, "minify")?.length; const minified_size = modifyCode(fmt, edit.value, "minify")?.length;
@ -468,7 +472,6 @@ document.body.addEventListener('htmx:afterSwap', (ev) => {
wireUp(ev.target); wireUp(ev.target);
if (ev.target.tagName == "MAIN" || ev.target.tagName == "BODY") if (ev.target.tagName == "MAIN" || ev.target.tagName == "BODY")
updateTab(ev['detail'].pathInfo.finalRequestPath); updateTab(ev['detail'].pathInfo.finalRequestPath);
console.log(ev);
}); });
getFmtInstance().then(inst => { getFmtInstance().then(inst => {
@ -527,11 +530,11 @@ function runPost(target) {
const output = target.querySelector("pre[id=compiler-output]"); const output = target.querySelector("pre[id=compiler-output]");
if (!(output instanceof HTMLPreElement)) never(); if (!(output instanceof HTMLPreElement)) never();
getHbcInstance().then(async hbc => { Promise.all([getHbcInstance(), getFmtInstance()]).then(async ([hbc, fmt]) => {
const ctx = { keyBuf: [], prevParams: new Set() }; const ctx = { keyBuf: [], prevParams: new Set() };
await fetchPackages(code.textContent ?? never(), new Set(), output, ctx); await fetchPackages(code.innerText ?? never(), new Set(), output, ctx);
const posts = [{ path: "this", code: "" }]; const posts = [{ path: "this", code: "" }];
loadCachedPackages(code.textContent ?? never(), ctx.keyBuf, posts, new Set()); loadCachedPackages(fmt, code.innerText ?? never(), ctx.keyBuf, posts, new Set());
output.textContent = compileCode(hbc, posts); output.textContent = compileCode(hbc, posts);
output.hidden = false; output.hidden = false;
}); });