npm - @malloydata/malloyyo - Versions diffs - 0.2.9 → 0.2.10 - Mend

@malloydata/malloyyo 0.2.9 → 0.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/index.js +52 -10
package/package.json +1 -1

package/dist/index.js CHANGED Viewed

@@ -2262,7 +2262,8 @@ function makeBundler() {
   };
 }
 var html = (body, title) => `<!doctype html><html><head><meta charset="utf-8"><title>${title}</title><meta name="viewport" content="width=device-width,initial-scale=1"></head><body style="margin:0">${body}</body></html>`;
-function parentShell(dash, frameBase, all) {
+function parentShell(dash, frameBase, all, initialGivens) {
+  const givensQs = Object.entries(initialGivens).map(([k, v]) => `&${encodeURIComponent(k)}=${encodeURIComponent(v)}`).join("");
   const d = JSON.stringify(dash.name);
   const fb = JSON.stringify(frameBase);
   const nav = all.length > 1 ? `<nav style="display:flex;gap:4px;align-items:center;padding:8px 12px;background:#f6f7f9;border-bottom:1px solid #e2e4e8;font:13px system-ui,sans-serif"><span style="color:#888;margin-right:8px">Dashboards</span>` + all.map((x) => {
@@ -2270,11 +2271,20 @@ function parentShell(dash, frameBase, all) {
     return `<a href="/?d=${encodeURIComponent(x.name)}" style="padding:4px 10px;border-radius:6px;text-decoration:none;${on ? "background:#1a1a1a;color:#fff" : "color:#333"}">${esc(x.manifest.title || x.name)}</a>`;
   }).join("") + `</nav>` : "";
   return html(
-    `<div style="display:flex;flex-direction:column;height:100vh">` + nav + `<iframe id="f" sandbox="allow-scripts allow-same-origin" src="${frameBase}/frame?d=${encodeURIComponent(dash.name)}" style="border:0;flex:1;width:100%"></iframe></div><script>
+    `<div style="display:flex;flex-direction:column;height:100vh">` + nav + `<iframe id="f" sandbox="allow-scripts allow-same-origin" src="${frameBase}/frame?d=${encodeURIComponent(dash.name)}${givensQs}" style="border:0;flex:1;width:100%"></iframe></div><script>
 const f=document.getElementById('f');
+try{new EventSource('/events').onmessage=()=>location.reload();}catch(e){}
 window.addEventListener('message',async(e)=>{
   if(e.source!==f.contentWindow||e.origin!==${fb})return;
-  const m=e.data; if(!m||m.type!=='run')return;
+  const m=e.data;
+  if(m&&m.type==='givens'){
+    const u=new URL(location.href); u.search='';
+    u.searchParams.set('d',${d});
+    for(const [k,v] of Object.entries(m.givens)) u.searchParams.set(k,String(v));
+    history.replaceState(null,'',u.pathname+u.search);
+    return;
+  }
+  if(!m||m.type!=='run')return;
   let out;
   try{
     const res=await fetch('/api/run',{method:'POST',headers:{'content-type':'application/json'},
@@ -2287,9 +2297,14 @@ window.addEventListener('message',async(e)=>{
     dash.manifest.title
   );
 }
-function frameDoc(dash) {
+function givensFromUrl(url4) {
+  const g = {};
+  for (const [k, v] of url4.searchParams) if (k !== "d") g[k] = v;
+  return g;
+}
+function frameDoc(dash, initialGivens) {
   return html(
-    `<div id="root"></div><script>window.__MANIFEST__=${JSON.stringify(dash.manifest)}</script><script src="/bundle.js?d=${encodeURIComponent(dash.name)}"></script>`,
+    `<div id="root"></div><script>window.__MANIFEST__=${JSON.stringify(dash.manifest)};window.__INITIAL_GIVENS__=${JSON.stringify(initialGivens)}</script><script src="/bundle.js?d=${encodeURIComponent(dash.name)}"></script>`,
     dash.manifest.title
   );
 }
@@ -2304,17 +2319,37 @@ async function serveDashboard(opts) {
   const port = opts.port ?? 4173;
   const framePort = port + 1;
   const frameBase = `http://localhost:${framePort}`;
-  const dashboards = discoverDashboards(root);
+  let dashboards = discoverDashboards(root);
   if (dashboards.length === 0) {
     throw new Error(`No dashboards found under ${path4.join(root, "dashboards")}/`);
   }
-  const byName = new Map(dashboards.map((d) => [d.name, d]));
+  let byName = new Map(dashboards.map((d) => [d.name, d]));
   const runner = await makeRunner(root);
   if (!runner.entryExists()) {
     throw new Error(`No index.malloy at ${root} \u2014 run this from a Malloy model repo.`);
   }
   const bundle = makeBundler();
   const pick = (url4) => byName.get(url4.searchParams.get("d") ?? dashboards[0].name) ?? dashboards[0];
+  const sseClients = /* @__PURE__ */ new Set();
+  const notifyReload = () => {
+    for (const c of sseClients) c.write("data: reload\n\n");
+  };
+  let debounce;
+  try {
+    fs3.watch(root, { recursive: true }, (_evt, filename) => {
+      const f = filename?.toString() ?? "";
+      if (!f.endsWith(".malloy") && !f.includes("dashboards")) return;
+      clearTimeout(debounce);
+      debounce = setTimeout(() => {
+        dashboards = discoverDashboards(root);
+        byName = new Map(dashboards.map((d) => [d.name, d]));
+        console.error(`  \u21BB ${f} changed \u2014 reloading`);
+        notifyReload();
+      }, 150);
+    });
+  } catch (e) {
+    console.error(`  (file watch unavailable: ${e.message} \u2014 edits won't auto-reload)`);
+  }
   const handler = async (req, res) => {
     const onFramePort = (req.socket.localPort ?? port) === framePort;
     const url4 = new URL(req.url ?? "/", `http://localhost:${onFramePort ? framePort : port}`);
@@ -2325,15 +2360,22 @@ async function serveDashboard(opts) {
     try {
       if (onFramePort) {
         if (url4.pathname === "/frame") {
-          return send(200, "text/html; charset=utf-8", frameDoc(pick(url4)));
+          return send(200, "text/html; charset=utf-8", frameDoc(pick(url4), givensFromUrl(url4)));
         }
         if (url4.pathname === "/bundle.js") {
           return send(200, "application/javascript; charset=utf-8", await bundle(pick(url4)));
         }
         return send(404, "text/plain", "not found");
       }
+      if (url4.pathname === "/events") {
+        res.writeHead(200, { "content-type": "text/event-stream", "cache-control": "no-cache", connection: "keep-alive" });
+        res.write("retry: 1000\n\n");
+        sseClients.add(res);
+        req.on("close", () => sseClients.delete(res));
+        return;
+      }
       if (url4.pathname === "/") {
-        return send(200, "text/html; charset=utf-8", parentShell(pick(url4), frameBase, dashboards));
+        return send(200, "text/html; charset=utf-8", parentShell(pick(url4), frameBase, dashboards, givensFromUrl(url4)));
       }
       if (url4.pathname === "/api/run" && req.method === "POST") {
         const { d, query, givens } = JSON.parse(await readBody(req));
@@ -2367,7 +2409,7 @@ async function serveDashboard(opts) {
 }
 // package.json
-var version = "0.2.9";
+var version = "0.2.10";
 // src/index.ts
 function shortSha(sha) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloyyo",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Publish Malloy models to a Malloyyo instance",
   "license": "MIT",
   "repository": {