@vedivad/typst-web-service 0.2.1 → 0.3.0

package/dist/worker.js

@@ -2016,6 +2016,50 @@ function getDiagnosticsArg(diagnostics) {
   }
 }
 
+// ../../node_modules/.bun/@myriaddreamin+typst.ts@0.7.0-rc2+5e675a3c06b42b50/node_modules/@myriaddreamin/typst.ts/dist/esm/fs/memory.mjs
+var MemoryAccessModel = class {
+  constructor() {
+    __publicField(this, "mTimes", /* @__PURE__ */ new Map());
+    __publicField(this, "mData", /* @__PURE__ */ new Map());
+  }
+  reset() {
+    this.mTimes.clear();
+    this.mData.clear();
+  }
+  insertFile(path, data, mtime) {
+    this.mTimes.set(path, mtime);
+    this.mData.set(path, data);
+  }
+  removeFile(path) {
+    this.mTimes.delete(path);
+    this.mData.delete(path);
+  }
+  getMTime(path) {
+    if (!path.startsWith("/@memory/")) {
+      return void 0;
+    }
+    if (this.mTimes.has(path)) {
+      return this.mTimes.get(path);
+    }
+    return void 0;
+  }
+  isFile() {
+    return true;
+  }
+  getRealPath(path) {
+    return path;
+  }
+  readAll(path) {
+    if (!path.startsWith("/@memory/")) {
+      return void 0;
+    }
+    if (this.mData.has(path)) {
+      return this.mData.get(path);
+    }
+    return void 0;
+  }
+};
+
 // ../../node_modules/.bun/@myriaddreamin+typst.ts@0.7.0-rc2+5e675a3c06b42b50/node_modules/@myriaddreamin/typst.ts/dist/esm/fs/package.mjs
 var FetchPackageRegistry = class {
   constructor(am) {
@@ -2064,52 +2108,8 @@ var FetchPackageRegistry = class {
   }
 };
 
-// ../../node_modules/.bun/@myriaddreamin+typst.ts@0.7.0-rc2+5e675a3c06b42b50/node_modules/@myriaddreamin/typst.ts/dist/esm/fs/memory.mjs
-var MemoryAccessModel = class {
-  constructor() {
-    __publicField(this, "mTimes", /* @__PURE__ */ new Map());
-    __publicField(this, "mData", /* @__PURE__ */ new Map());
-  }
-  reset() {
-    this.mTimes.clear();
-    this.mData.clear();
-  }
-  insertFile(path, data, mtime) {
-    this.mTimes.set(path, mtime);
-    this.mData.set(path, data);
-  }
-  removeFile(path) {
-    this.mTimes.delete(path);
-    this.mData.delete(path);
-  }
-  getMTime(path) {
-    if (!path.startsWith("/@memory/")) {
-      return void 0;
-    }
-    if (this.mTimes.has(path)) {
-      return this.mTimes.get(path);
-    }
-    return void 0;
-  }
-  isFile() {
-    return true;
-  }
-  getRealPath(path) {
-    return path;
-  }
-  readAll(path) {
-    if (!path.startsWith("/@memory/")) {
-      return void 0;
-    }
-    if (this.mData.has(path)) {
-      return this.mData.get(path);
-    }
-    return void 0;
-  }
-};
-
 // src/worker.ts
-var PDF_FORMAT = 1;
+var MAIN_FILE = "/main.typ";
 var accessModel = new MemoryAccessModel();
 var packageRegistry = new FetchPackageRegistry(accessModel);
 var compiler = null;
@@ -2126,20 +2126,31 @@ async function initCompiler(wasmUrl, fontUrls, packages) {
 function parseRange(range) {
   const m = range.match(/(\d+):(\d+)-(\d+):(\d+)/);
   if (!m) {
-    console.warn(`[typst-web-service] Skipping diagnostic with unrecognized range format: ${JSON.stringify(range)}`);
+    console.warn(
+      `[typst-web-service] Skipping diagnostic with unrecognized range format: ${JSON.stringify(range)}`
+    );
     return null;
   }
   return { startLine: +m[1], startCol: +m[2], endLine: +m[3], endCol: +m[4] };
 }
-async function compile(source) {
+async function compile(files) {
   if (!compiler) throw new Error("Compiler not initialized");
-  compiler.addSource("/main.typ", source);
-  const result = await compiler.compile({ mainFilePath: "/main.typ", diagnostics: "full" });
-  const diagnostics = (result.diagnostics ?? []).flatMap((d) => {
-    const range = parseRange(d.range);
-    if (!range) return [];
-    return [{ ...d, severity: d.severity, range }];
+  for (const [path, source] of Object.entries(files)) {
+    compiler.addSource(path, source);
+  }
+  const result = await compiler.compile({
+    mainFilePath: MAIN_FILE,
+    diagnostics: "full"
   });
+  const diagnostics = (result.diagnostics ?? []).flatMap(
+    (d) => {
+      const range = parseRange(d.range);
+      if (!range) return [];
+      return [
+        { ...d, severity: d.severity, range }
+      ];
+    }
+  );
   return { diagnostics, vector: result.result ?? void 0 };
 }
 function postError(id, err) {
@@ -2150,61 +2161,73 @@ function postError(id, err) {
   });
 }
 function transferBuffer(data) {
-  return data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
+  return data.buffer.slice(
+    data.byteOffset,
+    data.byteOffset + data.byteLength
+  );
 }
 var yieldToEventLoop = () => new Promise((r) => setTimeout(r, 0));
-var pendingCompile = null;
-var processingCompile = false;
-var pendingRender = null;
-var processingRender = false;
-async function drainCompileQueue() {
-  processingCompile = true;
-  while (pendingCompile) {
-    const req = pendingCompile;
-    pendingCompile = null;
-    await yieldToEventLoop();
-    if (pendingCompile) {
-      self.postMessage({ type: "cancelled", id: req.id });
-      continue;
-    }
-    try {
-      const { diagnostics, vector: vectorData } = await compile(req.source);
-      const vector = vectorData ? transferBuffer(vectorData) : void 0;
-      const msg = { type: "result", id: req.id, diagnostics, vector };
-      self.postMessage(msg, vector ? [vector] : []);
-    } catch (err) {
-      postError(req.id, err);
+function makeQueue(handle) {
+  let pending = null;
+  let processing = false;
+  async function drain() {
+    processing = true;
+    while (pending) {
+      const req = pending;
+      pending = null;
+      await yieldToEventLoop();
+      if (pending) {
+        self.postMessage({
+          type: "cancelled",
+          id: req.id
+        });
+        continue;
+      }
+      await handle(req);
     }
+    processing = false;
   }
-  processingCompile = false;
+  return (req) => {
+    pending = req;
+    if (!processing) drain();
+  };
 }
-async function drainRenderQueue() {
-  processingRender = true;
-  while (pendingRender) {
-    const req = pendingRender;
-    pendingRender = null;
-    await yieldToEventLoop();
-    if (pendingRender) {
-      self.postMessage({ type: "cancelled", id: req.id });
-      continue;
-    }
-    try {
-      if (!compiler) throw new Error("Compiler not initialized");
-      compiler.addSource("/main.typ", req.source);
-      const result = await compiler.compile({
-        mainFilePath: "/main.typ",
-        format: PDF_FORMAT,
-        diagnostics: "none"
-      });
-      if (!result.result) throw new Error("Compilation produced no output");
-      const data = transferBuffer(result.result);
-      self.postMessage({ type: "pdf", id: req.id, data }, [data]);
-    } catch (err) {
-      postError(req.id, err);
+var enqueueCompile = makeQueue(async (req) => {
+  try {
+    const { diagnostics, vector: vectorData } = await compile(req.files);
+    const vector = vectorData ? transferBuffer(vectorData) : void 0;
+    const msg = {
+      type: "result",
+      id: req.id,
+      diagnostics,
+      vector
+    };
+    self.postMessage(msg, vector ? [vector] : []);
+  } catch (err) {
+    postError(req.id, err);
+  }
+});
+var enqueueRender = makeQueue(async (req) => {
+  try {
+    if (!compiler) throw new Error("Compiler not initialized");
+    for (const [path, source] of Object.entries(req.files)) {
+      compiler.addSource(path, source);
     }
+    const result = await compiler.compile({
+      mainFilePath: MAIN_FILE,
+      format: CompileFormatEnum.pdf,
+      diagnostics: "none"
+    });
+    if (!result.result) throw new Error("Compilation produced no output");
+    const data = transferBuffer(result.result);
+    self.postMessage(
+      { type: "pdf", id: req.id, data },
+      [data]
+    );
+  } catch (err) {
+    postError(req.id, err);
   }
-  processingRender = false;
-}
+});
 self.onmessage = async (e) => {
   const req = e.data;
   if (req.type === "init") {
@@ -2217,17 +2240,18 @@ self.onmessage = async (e) => {
     return;
   }
   if (req.type === "compile") {
-    pendingCompile = req;
-    if (!processingCompile) drainCompileQueue();
+    enqueueCompile(req);
     return;
   }
   if (req.type === "render") {
-    pendingRender = req;
-    if (!processingRender) drainRenderQueue();
+    enqueueRender(req);
     return;
   }
   if (req.type === "destroy") {
-    self.postMessage({ type: "destroyed", id: req.id });
+    self.postMessage({
+      type: "destroyed",
+      id: req.id
+    });
   }
 };
 //# sourceMappingURL=worker.js.map