@quartz-community/tag-page 1.0.0 → 1.0.2

package/dist/index.js

@@ -271,8 +271,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;
@@ -2784,6 +2782,19 @@ function i18n(locale) {
   return locales[locale] || en_US_default;
 }
 
+// src/util/tags.ts
+function hasChildTags(tag, allTags) {
+  const prefix = `${tag}/`;
+  for (const t2 of allTags) {
+    if (t2.startsWith(prefix)) return true;
+  }
+  return false;
+}
+function tagPageSlug(tag, allTags) {
+  if (tag === "index") return "tags/index";
+  return hasChildTags(tag, allTags) ? joinSegments("tags", tag, "index") : joinSegments("tags", tag);
+}
+
 // src/components/styles/listPage.scss
 var listPage_default = "ul.section-ul {\n  list-style: none;\n  margin-top: 2em;\n  padding-left: 0;\n}\n\nli.section-li {\n  margin-bottom: 1em;\n}\nli.section-li > .section {\n  display: grid;\n  grid-template-columns: fit-content(8em) 3fr 1fr;\n}\n@media all and (max-width: 600px) {\n  li.section-li > .section > .tags {\n    display: none;\n  }\n}\nli.section-li > .section > .desc > h3 > a {\n  background-color: transparent;\n}\nli.section-li > .section .meta {\n  margin: 0 1em 0 0;\n  opacity: 0.6;\n}\n\n.popover .section {\n  grid-template-columns: fit-content(8em) 1fr !important;\n}\n.popover .section > .tags {\n  display: none;\n}";
 
@@ -2803,12 +2814,13 @@ var TagContent_default = ((opts) => {
   const TagContent = (props) => {
     const { tree, fileData, allFiles, cfg } = props;
     const fd = fileData;
-    const slug2 = fd.slug;
+    const slug = fd.slug;
     const locale = cfg?.locale ?? "en-US";
-    if (!(slug2?.startsWith("tags/") || slug2 === "tags")) {
-      throw new Error(`Component "TagContent" tried to render a non-tag page: ${slug2}`);
+    if (!(slug?.startsWith("tags/") || slug === "tags")) {
+      throw new Error(`Component "TagContent" tried to render a non-tag page: ${slug}`);
     }
-    const tag = simplifySlug(slug2.slice("tags/".length));
+    let tag = simplifySlug(slug.slice("tags/".length));
+    if (tag !== "/" && tag.endsWith("/")) tag = tag.slice(0, -1);
     const allPagesWithTag = (t2) => allFiles.filter(isListed).filter(
       (file) => (file.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes).includes(t2)
     );
@@ -2841,12 +2853,12 @@ var TagContent_default = ((opts) => {
             sort: options?.sort
           });
           const contentPage = allFiles.find(
-            (file) => file.slug === `tags/${t2}`
+            (file) => file.slug === `tags/${t2}` || file.slug === `tags/${t2}/index`
           );
           const root2 = contentPage?.filePath ? contentPage?.htmlAst : void 0;
           const tagDesc = !root2 || root2.children.length === 0 ? contentPage?.description : htmlToJsx(root2);
-          const tagListingPage = `/tags/${t2}`;
-          const href = resolveRelative(slug2, tagListingPage);
+          const tagListingPage = contentPage?.slug ?? tagPageSlug(t2, tags);
+          const href = resolveRelative(slug, tagListingPage);
           return /* @__PURE__ */ u2("div", { children: [
             /* @__PURE__ */ u2("h2", { children: /* @__PURE__ */ u2("a", { class: "internal tag-link", href, children: t2 }) }),
             tagDesc && /* @__PURE__ */ u2("p", { children: tagDesc }),
@@ -2889,8 +2901,8 @@ var TagContent_default = ((opts) => {
 });
 
 // src/pageType.ts
-var tagMatcher = ({ slug: slug2 }) => {
-  return slug2.startsWith("tags/") || slug2 === "tags";
+var tagMatcher = ({ slug }) => {
+  return slug.startsWith("tags/") || slug === "tags";
 };
 var TagPage = (opts) => ({
   name: "TagPage",
@@ -2905,18 +2917,20 @@ var TagPage = (opts) => ({
     tags.add("index");
     const existingTagSlugs = /* @__PURE__ */ new Set();
     for (const [, file] of content) {
-      const slug2 = file.data?.slug;
-      if (slug2 && slug2.startsWith("tags/")) {
-        existingTagSlugs.add(slug2);
+      const slug = file.data?.slug;
+      if (slug && slug.startsWith("tags/")) {
+        existingTagSlugs.add(slug);
       }
     }
     const virtualPages = [];
     for (const tag of tags) {
-      const slug2 = joinSegments("tags", tag);
-      if (existingTagSlugs.has(slug2)) continue;
+      const slug = tagPageSlug(tag, tags);
+      if (existingTagSlugs.has(joinSegments("tags", tag)) || existingTagSlugs.has(joinSegments("tags", tag, "index"))) {
+        continue;
+      }
       const title = tag === "index" ? i18n(locale).pages.tagContent.tagIndex : opts?.prefixTags ? `${i18n(locale).pages.tagContent.tag}: ${tag}` : tag;
       virtualPages.push({
-        slug: slug2,
+        slug,
         title,
         data: {}
       });