@vizhub/runtime 0.6.0 → 0.7.0

package/dist/{build-DU4cyBtp.js → build-NWFvyYnC.js}

@@ -1,14 +1,14 @@
 import { magicSandbox as j } from "magic-sandbox";
-import { isVizId as z, getFileText as k, generateVizId as U, vizFilesToFileCollection as J } from "@vizhub/viz-utils";
-import { transform as V } from "sucrase";
-const jt = () => (Math.random() + "").slice(2);
+import { isVizId as U, getFileText as k, generateVizId as V, fileCollectionToVizFiles as J, vizFilesToFileCollection as D } from "@vizhub/viz-utils";
+import { transform as B } from "sucrase";
+const $t = () => (Math.random() + "").slice(2);
 function I() {
   return {
     name: "sucrase",
     transform(e, t) {
       if (!t.match(/\.(?:js|[jt]sx)$/))
         return null;
-      const n = V(e, {
+      const n = B(e, {
         transforms: ["jsx", "typescript"],
         filePath: t,
         // For source maps
@@ -28,41 +28,41 @@ const T = {
   dependencies: {},
   vizhub: {},
   license: "MIT"
-}, D = !1, x = (e) => {
+}, A = !1, E = (e) => {
   const t = e["package.json"];
   try {
     const n = t ? JSON.parse(t) : T;
-    return D && console.log(
+    return A && console.log(
       "[packageJSON] pkg:",
       JSON.stringify(n, null, 2)
     ), n;
   } catch {
     return T;
   }
-}, N = (e) => x(e).dependencies || {}, C = (e) => (x(e).vizhub || {}).libraries || {}, R = ({ name: e, version: t }, n, r = "jsdelivr") => {
+}, N = (e) => E(e).dependencies || {}, C = (e) => (E(e).vizhub || {}).libraries || {}, R = ({ name: e, version: t }, n, r = "jsdelivr") => {
   const s = n[e] && n[e].path || "";
   return r === "jsdelivr" ? `https://cdn.jsdelivr.net/npm/${e}@${t}${s}` : `https://unpkg.com/${e}@${t}${s}`;
-}, B = (e) => {
+}, q = (e) => {
   var n;
   const t = (n = e == null ? void 0 : e.vizhub) == null ? void 0 : n.libraries;
   return t ? Object.entries(t).reduce(
     (r, [s, o]) => (o.global && (r[s] = o.global), r),
     {}
   ) : {};
-}, A = {
+}, Y = {
   d3: "d3",
   react: "React",
   "react-dom": "ReactDOM"
 }, W = (e) => {
-  const t = B(e);
+  const t = q(e);
   return {
-    ...A,
+    ...Y,
     ...t
   };
-}, v = (e) => {
+}, g = (e) => {
   const [t, ...n] = e.split("/"), r = n.join("/");
   return { vizId: t, fileName: r };
-}, q = `var EOL = {},
+}, _ = `var EOL = {},
   EOF = {},
   QUOTE = 34,
   NEWLINE = 10,
@@ -182,32 +182,32 @@ var tsv = dsv('	');
 
 var tsvParse = tsv.parse;
 
-export { csvParse, tsvParse };`, Y = (e) => (
+export { csvParse, tsvParse };`, G = (e) => (
   // str.replace(/`/g, '\\`');
   e.replace(/\\/g, "\\\\").replace(/`/g, "\\`")
-), _ = () => ({
+), H = () => ({
   name: "transformDSV",
   // `id` here is of the form
   // `{vizId}/{fileName}`
   transform: async (e, t) => {
-    const { fileName: n } = v(t), r = n.endsWith(".csv"), s = n.endsWith(".tsv");
+    const { fileName: n } = g(t), r = n.endsWith(".csv"), s = n.endsWith(".tsv");
     if (r || s)
       return {
         code: `
-            ${q}
-            const data = ${r ? "csvParse" : "tsvParse"}(\`${Y(e)}\`);
+            ${_}
+            const data = ${r ? "csvParse" : "tsvParse"}(\`${G(e)}\`);
             export default data;
           `,
         map: { mappings: "" }
       };
   }
-}), G = (e) => {
+}), Q = (e) => {
   const t = /^@([a-zA-Z0-9_-]+)\/([a-zA-Z0-9_-]+)$/, n = e.match(t);
   return n ? {
     userName: n[1],
     idOrSlug: n[2]
   } : null;
-}, H = ({
+}, Z = ({
   vizId: e,
   slugCache: t
 }) => ({
@@ -219,15 +219,15 @@ export { csvParse, tsvParse };`, Y = (e) => (
         const {
           vizId: i,
           fileName: c
-        } = v(r), a = c.split("/").slice(0, -1).join("/"), l = a ? `${a}/${o}` : o;
+        } = g(r), a = c.split("/").slice(0, -1).join("/"), l = a ? `${a}/${o}` : o;
         return `${i}/${l}`;
       }
       return e + "/" + o;
     }
-    const s = G(n);
+    const s = Q(n);
     if (s) {
       let o;
-      if (z(s.idOrSlug))
+      if (U(s.idOrSlug))
         o = s.idOrSlug;
       else {
         if (!t)
@@ -241,32 +241,40 @@ export { csvParse, tsvParse };`, Y = (e) => (
       return o + "/index.js";
     }
   }
-}), Q = ({
+}), K = ({
   vizCache: e,
-  trackCSSImport: t
+  trackCSSImport: t,
+  vizId: n,
+  files: r
 }) => ({
   name: "vizLoad",
   // `id` here is of the form
   // `{vizId}/{fileName}`
-  load: async (n) => {
-    const { vizId: r, fileName: s } = v(n);
-    if (s.endsWith(".css"))
-      return t(n), "";
-    const o = await e.get(r), i = k(o, s);
-    if (i === null)
+  load: async (s) => {
+    const o = g(s), i = o.vizId, c = o.fileName;
+    if (c.endsWith(".css"))
+      return t(s), "";
+    let a = null;
+    if (i === n && r)
+      a = r[c] || null;
+    else {
+      const l = await e.get(i);
+      a = k(l, c);
+    }
+    if (a === null)
       throw new Error(
-        `Imported file "${s}" not found.`
+        `Imported file "${c}" not found.`
       );
-    return i;
+    return a;
   }
 }), M = /* @__PURE__ */ new Map();
 let S;
-const w = "https://cdn.jsdelivr.net/npm/svelte@4.2.9", St = `${w}/compiler.cjs`, Z = ({
+const v = "https://cdn.jsdelivr.net/npm/svelte@4.2.9", Ot = `${v}/compiler.cjs`, X = ({
   getSvelteCompiler: e
 }) => ({
   name: "transformSvelte",
   load: async (t) => {
-    if (!t.startsWith(w))
+    if (!t.startsWith(v))
       return;
     const n = M.get(t);
     if (n) return n;
@@ -278,19 +286,19 @@ const w = "https://cdn.jsdelivr.net/npm/svelte@4.2.9", St = `${w}/compiler.cjs`,
   // From https://github.com/sveltejs/sites/blob/master/packages/repl/src/lib/workers/bundler/index.js#L255C2-L271C5
   resolveId: async (t, n) => {
     if (t === "svelte")
-      return `${w}/src/runtime/index.js`;
+      return `${v}/src/runtime/index.js`;
     if (t.startsWith("svelte/")) {
       const r = t.slice(7);
-      return `${w}/src/runtime/${r}/index.js`;
+      return `${v}/src/runtime/${r}/index.js`;
     }
     if (/^https?:/.test(t)) return t;
-    if (t.startsWith(".") && n && n.startsWith(w)) {
+    if (t.startsWith(".") && n && n.startsWith(v)) {
       const r = new URL(t, n).href;
       return new URL(t, n).href, r;
     }
   },
   transform: async (t, n) => {
-    const { fileName: r } = v(n);
+    const { fileName: r } = g(n);
     if (r.endsWith(".svelte")) {
       if (!S) {
         if (!e)
@@ -303,7 +311,7 @@ const w = "https://cdn.jsdelivr.net/npm/svelte@4.2.9", St = `${w}/compiler.cjs`,
       }).js;
     }
   }
-}), K = async ({
+}), tt = async ({
   files: e,
   rollup: t,
   enableSourcemap: n = !0,
@@ -320,40 +328,47 @@ const w = "https://cdn.jsdelivr.net/npm/svelte@4.2.9", St = `${w}/compiler.cjs`,
   const d = {
     input: "./index.js",
     plugins: [
-      ...s ? [H({ vizId: s, slugCache: o })] : [],
-      _(),
+      ...s ? [Z({ vizId: s, slugCache: o })] : [],
+      H(),
       I(),
-      Z({ getSvelteCompiler: i }),
-      ...r ? [Q({ vizCache: r, trackCSSImport: a })] : []
+      X({ getSvelteCompiler: i }),
+      ...r ? [
+        K({
+          vizCache: r,
+          trackCSSImport: a,
+          vizId: s,
+          files: e
+        })
+      ] : []
     ],
-    onwarn(u, h) {
-      u.code !== "UNRESOLVED_IMPORT" && h(u);
+    onwarn(u, f) {
+      u.code !== "UNRESOLVED_IMPORT" && f(u);
     }
   }, p = {
     format: "umd",
     name: "Viz",
     sourcemap: !!n,
     compact: !0
-  }, f = x(e);
-  if (f) {
-    const u = W(f);
+  }, h = E(e);
+  if (h) {
+    const u = W(h);
     u && (d.external = Object.keys(u), p.globals = u);
   }
-  const g = await t(d), { output: m } = await g.generate(p);
+  const x = await t(d), { output: m } = await x.generate(p);
   return {
     src: m[0].code,
     cssFiles: Array.from(c)
   };
 };
-function X() {
+function et() {
   return Math.random().toString().slice(2, 7);
 }
-const tt = ({
+const nt = ({
   cdn: e,
   src: t,
   styles: n
 }) => {
-  const s = `viz-container-${X()}`;
+  const s = `viz-container-${et()}`;
   return `<!DOCTYPE html>
 <html>
 <head>
@@ -433,7 +448,7 @@ const tt = ({
   <\/script>
 </body>
 </html>`;
-}, et = async ({
+}, rt = async ({
   files: e,
   rollup: t,
   enableSourcemap: n = !0,
@@ -442,7 +457,7 @@ const tt = ({
   slugCache: o,
   getSvelteCompiler: i
 }) => {
-  const { src: c, cssFiles: a } = await K({
+  const { src: c, cssFiles: a } = await tt({
     files: e,
     rollup: t,
     enableSourcemap: n,
@@ -454,21 +469,28 @@ const tt = ({
   let l = [];
   if (a.length > 0)
     for (let m = 0; m < a.length; m++) {
-      const u = a[m], { vizId: h, fileName: y } = v(u), b = await r.get(h), E = k(b, y);
-      E && l.push(E);
+      const u = a[m], f = g(u), y = f.vizId, b = f.fileName;
+      let w = null;
+      if (y === s && e)
+        w = e[b] || null;
+      else {
+        const L = await r.get(y);
+        w = k(L, b);
+      }
+      w && l.push(w);
     }
   const d = l.join(`
 `), p = `
     <style id="injected-style">${d}</style>`;
-  let f = "";
-  const g = Object.entries(
+  let h = "";
+  const x = Object.entries(
     N(e)
   );
-  if (g.length > 0) {
+  if (x.length > 0) {
     const m = C(e);
-    f = g.map(([u, h], y) => {
+    h = x.map(([u, f], y) => {
       const b = R(
-        { name: u, version: h },
+        { name: u, version: f },
         m
       );
       return `${y > 0 ? "    " : `
@@ -476,11 +498,11 @@ const tt = ({
     }).join("");
   }
   return {
-    html: tt({ cdn: f, src: c, styles: p }),
+    html: nt({ cdn: h, src: c, styles: p }),
     css: d,
     js: c
   };
-}, nt = ({
+}, st = ({
   initialContents: e,
   handleCacheMiss: t
 }) => {
@@ -506,7 +528,7 @@ const tt = ({
   }, invalidate: (i) => {
     n.delete(i);
   } };
-}, $t = ({
+}, It = ({
   initialMappings: e = {},
   handleCacheMiss: t
 }) => {
@@ -530,53 +552,40 @@ const tt = ({
   }, invalidate: (i) => {
     n.delete(i);
   } };
-}, rt = (e, t = "Sample Content for Exporting") => {
-  const n = U(), r = {};
-  return Object.entries(e).forEach(
-    ([s, o]) => {
-      const i = Math.floor(
-        Math.random() * 1e7
-      ).toString();
-      r[i] = {
-        name: s,
-        text: o
-      };
-    }
-  ), {
-    id: n,
-    files: r,
-    title: t
-  };
-}, st = (e) => {
+}, ot = (e, t = "Sample Content for Exporting", n = V()) => ({
+  id: n,
+  files: J(e),
+  title: t
+}), it = (e) => {
   if (Object.keys(e).length === 0)
     return null;
   const t = "index.html" in e, n = "index.js" in e, r = "index.jsx" in e;
   return t ? e["index.html"].includes('type="module"') ? "v4" : n || r ? "v2" : "v1" : !t && n ? "v3" : null;
-}, $ = (e, t) => new RegExp(`<${t}\\b`, "i").test(e) && new RegExp(`</${t}>`, "i").test(e), ot = (e) => {
+}, $ = (e, t) => new RegExp(`<${t}\\b`, "i").test(e) && new RegExp(`</${t}>`, "i").test(e), ct = (e) => {
   const t = e.trim();
   return $(t, "html") && $(t, "head") && $(t, "body") ? t : `<html><head></head><body>${t}</body></html>`;
-}, it = (e, t) => e.replace(
+}, at = (e, t) => e.replace(
   new RegExp(
     `<script[^>]*src=["'][^"']*${t.source}[^"']*["'][^>]*>\\s*<\/script>`,
     "gi"
   ),
   ""
-), P = (e, t, n) => e.replace(
+), F = (e, t, n) => e.replace(
   new RegExp(t, "i"),
   `${n}${t}`
-), ct = (e, t) => {
-  let n = ot(e);
+), lt = (e, t) => {
+  let n = ct(e);
   const r = Object.entries(N(t));
   if (r.length) {
     const o = C(t);
     r.forEach(([c]) => {
-      n = it(n, new RegExp(`${c}@`));
+      n = at(n, new RegExp(`${c}@`));
     });
     const i = r.map(
       ([c, a]) => R({ name: c, version: a }, o)
     ).map((c) => `<script src="${c}"><\/script>`).join(`
 `);
-    n = P(
+    n = F(
       n,
       "</head>",
       i + `
@@ -590,25 +599,25 @@ const tt = ({
       if (l === -1) return !1;
       const d = n.search(/<body\b[^>]*>/i), p = n.search(/<\/body>/i);
       return d !== -1 && p !== -1 && l > d && l < p;
-    })() || (n = n.replace(i, ""), n = P(n, "</body>", o));
+    })() || (n = n.replace(i, ""), n = F(n, "</body>", o));
   }
   return /^\s*<!DOCTYPE/i.test(n) ? n : `<!DOCTYPE html>${n}`;
-}, at = (e) => {
+}, ut = (e) => {
   const t = e["index.html"];
-  return !t && !e["index.js"] && !e["bundle.js"] ? "" : ct(t || "<!DOCTYPE html><html><head></head><body></body></html>", e);
-}, F = (e) => {
+  return !t && !e["index.js"] && !e["bundle.js"] ? "" : lt(t || "<!DOCTYPE html><html><head></head><body></body></html>", e);
+}, P = (e) => {
   let t = e.replace(/^\.\//, "");
   return t = t.replace(/\/+/g, "/"), t = t.replace(/\/$/, ""), t;
-}, lt = (e, t) => {
+}, dt = (e, t) => {
   const n = e.includes("/") ? e.slice(0, e.lastIndexOf("/")) : "", r = t.split("/"), s = n ? n.split("/") : [];
   for (const o of r)
     o === ".." ? s.pop() : o !== "." && o !== "" && s.push(o);
   return s.join("/");
-}, L = (e) => ({
+}, z = (e) => ({
   name: "virtual-file-system",
   resolveId(t, n) {
     if (t.startsWith("./") || t.startsWith("../")) {
-      const s = F(n ? lt(n, t) : t);
+      const s = P(n ? dt(n, t) : t);
       if (e[s])
         return s;
       const o = [".js", ".jsx", ".ts", ".tsx"];
@@ -631,7 +640,7 @@ const tt = ({
   load(t) {
     return e[t] ? e[t] : null;
   }
-}), ut = async ({
+}), pt = async ({
   files: e,
   rollup: t,
   enableSourcemap: n = !0
@@ -640,33 +649,33 @@ const tt = ({
     throw new Error("Missing index.js");
   const s = {
     input: "./index.js",
-    plugins: [L(e), I()],
+    plugins: [z(e), I()],
     onwarn(l, d) {
       l.code !== "UNRESOLVED_IMPORT" && d(l);
     }
   }, o = {
     format: "iife",
     sourcemap: n
-  }, i = x(e);
+  }, i = E(e);
   if (i) {
     const l = W(i);
     l && (s.external = Object.keys(l), o.globals = l);
   }
   const c = await t(s), { output: a } = await c.generate(o);
   return a[0].code;
-}, dt = async ({
+}, mt = async ({
   files: e,
   rollup: t,
   enableSourcemap: n
 }) => ({
   ...e,
-  "bundle.js": await ut({
+  "bundle.js": await pt({
     files: e,
     rollup: t,
     enableSourcemap: n
   }),
-  "index.html": at(e)
-}), pt = (e) => {
+  "index.html": ut(e)
+}), ft = (e) => {
   const t = [], n = /<script\b([^>]*)>[\s\S]*?<\/script>/gi;
   let r;
   for (; (r = n.exec(e)) !== null; ) {
@@ -679,7 +688,7 @@ const tt = ({
     o && t.push(o[1]);
   }
   return t;
-}, mt = async ({
+}, ht = async ({
   entryPoint: e,
   files: t,
   rollup: n,
@@ -687,7 +696,7 @@ const tt = ({
 }) => {
   const s = {
     input: `./${e}`,
-    plugins: [L(t), I()],
+    plugins: [z(t), I()],
     external: (c) => t[c] ? !1 : !c.startsWith("./"),
     onwarn(c, a) {
       a(c);
@@ -697,13 +706,13 @@ const tt = ({
     sourcemap: r
   });
   return i[0].code;
-}, O = (e, t) => new RegExp(`<${t}\\b`, "i").test(e) && new RegExp(`</${t}>`, "i").test(e), ft = (e) => {
+}, O = (e, t) => new RegExp(`<${t}\\b`, "i").test(e) && new RegExp(`</${t}>`, "i").test(e), wt = (e) => {
   const t = e.trim();
   return O(t, "html") && O(t, "head") && O(t, "body") ? t : `<html><head></head><body>${t}</body></html>`;
-}, ht = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), wt = (e, t, n) => e.replace(
+}, vt = (e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), gt = (e, t, n) => e.replace(
   new RegExp(t, "i"),
   `${n}${t}`
-), vt = (e) => {
+), xt = (e) => {
   const t = N(e);
   if (Object.keys(t).length === 0) return null;
   const n = C(e), r = {};
@@ -713,12 +722,12 @@ const tt = ({
       n
     );
   return JSON.stringify({ imports: r }, null, 2);
-}, gt = (e, t) => {
+}, yt = (e, t) => {
   if (!e["index.html"]) return "";
-  let n = ft(e["index.html"]);
+  let n = wt(e["index.html"]);
   t.forEach((s, o) => {
     const i = new RegExp(
-      `<script\\b[^>]*\\bsrc=["']${ht(o)}["'][^>]*>[^<]*<\/script>`,
+      `<script\\b[^>]*\\bsrc=["']${vt(o)}["'][^>]*>[^<]*<\/script>`,
       "gi"
     );
     n = n.replace(
@@ -728,7 +737,7 @@ ${s}
 <\/script>`
     );
   });
-  const r = vt(e);
+  const r = xt(e);
   if (r && !/<script\b[^>]*type=["']importmap["'][^>]*>/i.test(
     n
   )) {
@@ -736,24 +745,24 @@ ${s}
 ${r}
 <\/script>
 `;
-    n = wt(
+    n = gt(
       n,
       "</head>",
       o
     );
   }
   return /^\s*<!DOCTYPE/i.test(n) ? n : `<!DOCTYPE html>${n}`;
-}, xt = async ({
+}, bt = async ({
   files: e,
   rollup: t,
   enableSourcemap: n = !0
 }) => {
-  const r = e["index.html"] || "", s = pt(r);
+  const r = e["index.html"] || "", s = ft(r);
   if (s.length === 0)
     return e;
   const o = /* @__PURE__ */ new Map();
   for (const c of s) {
-    const a = await mt({
+    const a = await ht({
       entryPoint: c,
       files: e,
       rollup: t,
@@ -761,12 +770,12 @@ ${r}
     });
     o.set(c, a);
   }
-  const i = gt(e, o);
+  const i = yt(e, o);
   return {
     ...e,
     "index.html": i
   };
-}, Ot = async ({
+}, Nt = async ({
   files: e,
   rollup: t,
   enableSourcemap: n = !0,
@@ -782,11 +791,11 @@ ${r}
     throw new Error(
       "vizId is required when using vizCache"
     );
-  if (!e && r && s && (e = J(
+  if (!e && r && s && (e = D(
     (a = await r.get(s)) == null ? void 0 : a.files
   )), !e)
     throw new Error("Upable to extract viz files");
-  const c = st(e);
+  const c = it(e);
   if (c === "v1")
     return {
       html: j(e)
@@ -796,7 +805,7 @@ ${r}
       throw new Error("Rollup is required for v2 runtime");
     return {
       html: j(
-        await dt({ files: e, rollup: t, enableSourcemap: n })
+        await mt({ files: e, rollup: t, enableSourcemap: n })
       )
     };
   }
@@ -804,8 +813,8 @@ ${r}
     if (!t)
       throw new Error("Rollup is required for v3 runtime");
     if (!r && !s) {
-      const l = rt(e);
-      s = l.id, r = nt({
+      const l = ot(e);
+      s = l.id, r = st({
         initialContents: [l],
         handleCacheMiss: async () => {
           throw new Error(
@@ -819,8 +828,10 @@ ${r}
         "vizCache is required for v3 runtime"
       );
     if (!s)
-      throw new Error("vizId is required for v3 runtime");
-    return await et({
+      throw new Error(
+        "vizId is required for v3 runtime if vizCache is provided"
+      );
+    return await rt({
       files: e,
       rollup: t,
       vizCache: r,
@@ -834,7 +845,7 @@ ${r}
       throw new Error("Rollup is required for v4 runtime");
     return {
       html: j(
-        await xt({ files: e, rollup: t, enableSourcemap: n })
+        await bt({ files: e, rollup: t, enableSourcemap: n })
       )
     };
   }
@@ -843,13 +854,13 @@ ${r}
   );
 };
 export {
-  nt as a,
-  Ot as b,
-  K as c,
-  $t as d,
-  rt as e,
-  jt as g,
-  St as s,
-  et as v
+  st as a,
+  Nt as b,
+  tt as c,
+  It as d,
+  ot as e,
+  $t as g,
+  Ot as s,
+  rt as v
 };
-//# sourceMappingURL=build-DU4cyBtp.js.map
+//# sourceMappingURL=build-NWFvyYnC.js.map