@quartz-community/folder-page 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.0.2
+
+### Patch Changes
+
+- bdb1aaa: Generate folder pages for folders that hold only virtual pages, such as `.base` or `.canvas` files rendered by bases-page / canvas-page, so going up a level no longer gives a 404 (jackyzha0/quartz#2576). Folder listings now also list a subfolder that has its own index page, and fall back to all pages when the folder is not in Quartz's folder hierarchy.
+- 398001e: Bundles `@quartz-community/utils` 1.1.0: a short wikilink to an Obsidian folder note (`[[Topic]]` for `Topic/Topic.md`) reaches the folder page, and anchors to headings use the same slug as heading ids. `github-slugger` is no longer a dependency of this plugin.
+
+## 1.0.1
+
+### Patch Changes
+
+- e7de665: A note with a frontmatter `permalink` (published at its permalink, Quartz 5.1+) stays in its folder in the folder listings, as in Obsidian Publish: pages are placed by their file path and linked by their address.
+
 ## 1.0.0
 
 ### Major Changes

package/dist/components/index.js

@@ -287,12 +287,26 @@ function byDateAndAlphabetical() {
     return f1Title.localeCompare(f2Title);
   };
 }
-
-// node_modules/@quartz-community/utils/dist/path.js
 function simplifySlug(fp) {
   const res = stripSlashes(trimSuffix(fp, "index"), true);
   return res.length === 0 ? "/" : res;
 }
+function slugifyFilePath(fp, excludeExt) {
+  fp = stripSlashes(fp);
+  const ext = getFileExtension(fp);
+  const withoutFileExt = fp.replace(new RegExp(ext + "$"), "");
+  const finalExt = [".md", ".html", void 0].includes(ext) ? "" : ext;
+  let slug2 = _sluggify(withoutFileExt);
+  if (endsWith(slug2, "_index")) {
+    slug2 = slug2.replace(/_index$/, "index");
+  }
+  const segments = slug2.split("/");
+  if (segments.length >= 2 && segments[segments.length - 1] === segments[segments.length - 2]) {
+    segments[segments.length - 1] = "index";
+    slug2 = segments.join("/");
+  }
+  return slug2 + (finalExt ?? "");
+}
 function joinSegments(...args) {
   if (args.length === 0) {
     return "";
@@ -326,6 +340,9 @@ function stripSlashes(s2, onlyStripPrefix) {
   }
   return s2;
 }
+function getFileExtension(s2) {
+  return s2.match(/\.[A-Za-z0-9]+$/)?.[0];
+}
 function isFolderPath(fplike) {
   return fplike.endsWith("/") || endsWith(fplike, "index") || endsWith(fplike, "index.md") || endsWith(fplike, "index.html");
 }
@@ -340,6 +357,14 @@ function resolveRelative(current, target) {
   const res = joinSegments(pathToRoot(current), simplifySlug(target));
   return res;
 }
+function slugifyPath(s2) {
+  return s2.split("/").map(
+    (segment) => segment.replace(/\s/g, "-").replace(/&/g, "-and-").replace(/%/g, "-percent").replace(/\?/g, "").replace(/#/g, "").replace(/[<>:"|*]/g, "").toLowerCase()
+  ).join("/").replace(/\/$/, "");
+}
+function _sluggify(s2) {
+  return slugifyPath(s2);
+}
 
 // node_modules/preact/dist/preact.mjs
 var n;
@@ -2737,7 +2762,8 @@ function pagesFromAllFiles(allFiles, folderSlug, showSubfolders) {
   const subfolderFiles = /* @__PURE__ */ new Map();
   for (const file of allFiles) {
     if (file.unlisted === true) continue;
-    const fileSlug = file.slug;
+    const rel = file.relativePath;
+    const fileSlug = rel ? slugifyFilePath(rel) : file.slug;
     if (!fileSlug || !fileSlug.startsWith(folderPrefix)) continue;
     const relativePath = fileSlug.slice(folderPrefix.length);
     if (!relativePath || relativePath === "index") continue;
@@ -2754,7 +2780,10 @@ function pagesFromAllFiles(allFiles, folderSlug, showSubfolders) {
   }
   for (const [subfolderName, files] of subfolderFiles) {
     const indexFile = files.find((f3) => f3.slug === `${folderPrefix}${subfolderName}/index`);
-    if (indexFile) continue;
+    if (indexFile) {
+      if (indexFile.unlisted !== true) directChildren.push(indexFile);
+      continue;
+    }
     directChildren.push({
       slug: `${folderPrefix}${subfolderName}/index`,
       dates: mostRecentDatesFromEntries(files),
@@ -2801,16 +2830,15 @@ var FolderContent_default = ((opts) => {
   const FolderContent = (props) => {
     const { tree, fileData, allFiles, cfg } = props;
     const ctx = props.ctx;
-    const slug2 = fileData?.slug;
-    if (!slug2) return null;
+    const slug = fileData?.slug;
+    if (!slug) return null;
     const trie = ctx?.trie;
     let allPagesInFolder;
-    if (trie) {
-      const folder = trie.findNode(slug2.split("/"));
-      if (!folder) return null;
+    const folder = trie?.findNode(slug.split("/"));
+    if (folder) {
       allPagesInFolder = pagesFromTrie(folder, options.showSubfolders);
     } else {
-      allPagesInFolder = pagesFromAllFiles(allFiles ?? [], slug2, options.showSubfolders);
+      allPagesInFolder = pagesFromAllFiles(allFiles ?? [], slug, options.showSubfolders);
     }
     const cssClasses = fileData?.frontmatter?.cssclasses ?? [];
     const classes = cssClasses.join(" ");