@quartz-community/folder-page 1.0.1 → 1.0.2

package/dist/index.js

@@ -273,8 +273,6 @@ function getDate(data) {
   const dates = data.dates;
   return dates?.[defaultDateType];
 }
-
-// node_modules/@quartz-community/utils/dist/path.js
 function simplifySlug(fp) {
   const res = stripSlashes(trimSuffix(fp, "index"), true);
   return res.length === 0 ? "/" : res;
@@ -2768,7 +2766,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),
@@ -2815,16 +2816,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(" ");
@@ -2851,11 +2851,11 @@ var FolderContent_default = ((opts) => {
   FolderContent.css = concatenateResources(listPage_default, PageList.css);
   return FolderContent;
 });
-var folderMatcher = ({ slug: slug2 }) => {
-  return slug2.endsWith("/index");
+var folderMatcher = ({ slug }) => {
+  return slug.endsWith("/index");
 };
-function getFolders(slug2) {
-  let folderName = path.dirname(slug2 ?? "");
+function getFolders(slug) {
+  let folderName = path.dirname(slug ?? "");
   const parentFolderNames = [folderName];
   while (folderName !== ".") {
     folderName = path.dirname(folderName ?? "");
@@ -2863,29 +2863,38 @@ function getFolders(slug2) {
   }
   return parentFolderNames;
 }
+function virtualPagesOf(ctx) {
+  const pages = ctx?.virtualPages;
+  return Array.isArray(pages) ? pages : [];
+}
 var FolderPage = (opts) => {
   const body = () => FolderContent_default(opts);
   return {
     name: "FolderPage",
     priority: 10,
     match: folderMatcher,
-    generate({ content, cfg }) {
-      const allFiles = content.map((c2) => c2[1].data).filter((d2) => d2?.unlisted !== true);
+    generate({ content, cfg, ctx }) {
+      const virtual = virtualPagesOf(ctx).filter((c2) => {
+        const slug = c2[1].data?.slug;
+        return !!slug && slug !== "tags" && !slug.startsWith("tags/");
+      });
+      const files = [...content, ...virtual];
+      const allFiles = files.map((c2) => c2[1].data).filter((d2) => d2?.unlisted !== true);
       const locale = cfg?.locale ?? "en-US";
       const folders = /* @__PURE__ */ new Set();
       const folderDisplayNames = /* @__PURE__ */ new Map();
       for (const file of allFiles) {
-        const slug2 = file?.slug;
-        if (!slug2) continue;
+        const slug = file?.slug;
+        if (!slug) continue;
         const rel = file?.relativePath;
-        const position3 = rel ? slugifyFilePath(rel) : slug2;
+        const position3 = rel ? slugifyFilePath(rel) : slug;
         const fileFolders = getFolders(position3).filter((f3) => f3 !== "." && f3 !== "tags");
         for (const f3 of fileFolders) {
           folders.add(f3);
         }
         const relativePath = file?.relativePath;
         if (relativePath) {
-          const slugParts = path.dirname(slug2).split("/").filter((s2) => s2 !== ".");
+          const slugParts = path.dirname(slug).split("/").filter((s2) => s2 !== ".");
           const pathParts = path.dirname(relativePath).split("/").filter((s2) => s2 !== ".");
           for (let i2 = 0; i2 < slugParts.length && i2 < pathParts.length; i2++) {
             const slugPart = slugParts[i2];
@@ -2897,21 +2906,21 @@ var FolderPage = (opts) => {
         }
       }
       const foldersWithIndex = /* @__PURE__ */ new Set();
-      for (const [, file] of content) {
+      for (const [, file] of files) {
         const data = file.data;
         if (data?.unlisted === true) continue;
-        const slug2 = data?.slug;
-        if (slug2 && slug2.endsWith("/index")) {
-          const folder = slug2.slice(0, -"/index".length);
+        const slug = data?.slug;
+        if (slug && slug.endsWith("/index")) {
+          const folder = slug.slice(0, -"/index".length);
           foldersWithIndex.add(folder);
         }
       }
       for (const [, file] of content) {
-        const slug2 = file.data?.slug;
-        if (!slug2 || !slug2.endsWith("/index")) continue;
+        const slug = file.data?.slug;
+        if (!slug || !slug.endsWith("/index")) continue;
         const frontmatter = file.data.frontmatter;
         if (!frontmatter || frontmatter.title && frontmatter.title !== "index") continue;
-        const folder = slug2.slice(0, -"/index".length);
+        const folder = slug.slice(0, -"/index".length);
         const slugSegment = folder.split("/").pop() ?? folder;
         const folderName = folderDisplayNames.get(slugSegment) ?? slugSegment;
         frontmatter.title = opts?.prefixFolders ? `${i18n(locale).pages.folderContent.folder}: ${folderName}` : folderName;
@@ -2919,12 +2928,12 @@ var FolderPage = (opts) => {
       const virtualPages = [];
       for (const folder of folders) {
         if (foldersWithIndex.has(folder)) continue;
-        const slug2 = joinSegments(folder, "index");
+        const slug = joinSegments(folder, "index");
         const slugSegment = folder.split("/").pop() ?? folder;
         const folderName = folderDisplayNames.get(slugSegment) ?? slugSegment;
         const title = opts?.prefixFolders ? `${i18n(locale).pages.folderContent.folder}: ${folderName}` : folderName;
         virtualPages.push({
-          slug: slug2,
+          slug,
           title,
           data: {}
         });