@quartz-community/obsidian-plugin-excalidraw 1.0.1 → 1.1.0

package/dist/index.js

@@ -488,8 +488,6 @@ var require_lz_string = __commonJS({
     }
   }
 });
-
-// node_modules/@quartz-community/utils/dist/path.js
 function isRelativeURL(s4) {
   const validStart = /^\.{1,2}/.test(s4);
   const validEnding = !endsWith(s4, "index");
@@ -4789,19 +4787,28 @@ var ExcalidrawBody_default = ((userOpts) => {
 var excalidrawMatcher = ({ fileData }) => {
   return "excalidrawData" in fileData;
 };
+var isDrawing = (path) => path.endsWith(".excalidraw.md") || path.endsWith(".excalidraw");
+var drawingNotesBuild;
+var drawingNotes = /* @__PURE__ */ new Map();
+function drawingNotesOf(ctx) {
+  if (drawingNotesBuild !== ctx.buildId) {
+    drawingNotesBuild = ctx.buildId;
+    drawingNotes.clear();
+  }
+  return drawingNotes;
+}
 var ExcalidrawPage = (opts) => ({
   name: "ExcalidrawPage",
   priority: 25,
   fileExtensions: [".excalidraw.md", ".excalidraw"],
   match: excalidrawMatcher,
   generate({ ctx }) {
-    const excalidrawFiles = ctx.allFiles.filter(
-      (fp) => fp.endsWith(".excalidraw.md") || fp.endsWith(".excalidraw")
-    );
+    const excalidrawFiles = ctx.allFiles.filter(isDrawing);
     const imageFiles = ctx.allFiles.filter(
       (fp) => /\.(png|jpe?g|gif|svg|webp|avif|bmp|ico)$/i.test(fp)
     );
     const virtualPages = [];
+    const notes = drawingNotesOf(ctx);
     for (const filePath of excalidrawFiles) {
       const fullPath = join(ctx.argv.directory, filePath);
       let content;
@@ -4810,6 +4817,9 @@ var ExcalidrawPage = (opts) => ({
       } catch {
         continue;
       }
+      const isNote = filePath.endsWith(".md");
+      const noteFrontmatter = isNote ? notes.get(filePath) : void 0;
+      if (isNote && !noteFrontmatter) continue;
       const data = parseExcalidraw(content, filePath);
       if (!data) continue;
       const resolvedImagePaths = {};
@@ -4827,12 +4837,18 @@ var ExcalidrawPage = (opts) => ({
         }
       }
       const baseName = filePath.replace(/\.excalidraw\.md$/, "").replace(/\.excalidraw$/, "").split("/").pop() ?? "Excalidraw Drawing";
-      const slug2 = slugifyFilePath(filePath);
+      const slug = slugifyFilePath(filePath);
       virtualPages.push({
-        slug: slug2,
+        slug,
         title: baseName,
         data: {
-          frontmatter: { title: baseName, tags: ["excalidraw"] },
+          // The page stands for the drawing file: give it the source paths Quartz's parser
+          // sets on notes (instead of the synthetic `<slug>.md`), so bases list it as that
+          // file (file.ext "excalidraw", or "md" for a drawing stored as Markdown), and
+          // folder listings and the content index see its real path.
+          filePath: joinSegments(ctx.argv.directory, filePath),
+          relativePath: filePath,
+          frontmatter: { ...noteFrontmatter, title: baseName, tags: ["excalidraw"] },
           excalidrawData: data,
           excalidrawOptions: opts,
           excalidrawImagePaths: resolvedImagePaths
@@ -4841,12 +4857,13 @@ var ExcalidrawPage = (opts) => ({
     }
     return virtualPages;
   },
-  shouldPublish(_ctx, content) {
-    const relativePath = content[1].data.relativePath ?? "";
-    if (relativePath.endsWith(".excalidraw.md") || relativePath.endsWith(".excalidraw")) {
-      return false;
-    }
-    return true;
+  shouldPublish(ctx, content) {
+    const data = content[1].data;
+    if ("excalidrawData" in data) return true;
+    const relativePath = data.relativePath ?? "";
+    if (!isDrawing(relativePath)) return true;
+    drawingNotesOf(ctx).set(relativePath, { ...data.frontmatter ?? {} });
+    return false;
   },
   layout: "excalidraw",
   frame: "excalidraw",