@c4a/context-cli 0.7.81 → 0.7.82

package/cli.js

@@ -89769,18 +89769,11 @@ function sidebar(entries2, label2 = (entry) => entry.title) {
   }));
 }
 function siteSections(entries2) {
-  const directoriesFirst = (siblings) => {
-    const ordered = [
-      ...siblings.filter((entry) => entry.children.length > 0),
-      ...siblings.filter((entry) => entry.children.length === 0)
-    ];
-    return ordered.map((entry) => ({ ...entry, children: directoriesFirst(entry.children) }));
-  };
   const pageLinks = (entry) => [
     ...entry.href ? [entry.href.split("#")[0]] : [],
     ...entry.children.flatMap(pageLinks)
   ];
-  return entries2.map((entry) => ({ ...entry, children: directoriesFirst(entry.children) })).map((entry) => ({
+  return entries2.map((entry) => ({
     key: entry.key,
     title: entry.title,
     entry,
@@ -90008,16 +90001,24 @@ ${localized.body}`);
     for (const section of sections) {
       await writeFile22(join72(temporary, section.href.slice(1).replace(/\.html$/u, ".md")), localizer.variants((tag) => {
         const lines = [`# ${mdLabel(localizer.entryTitle(tag, section.entry))}`, "", '<div class="context-section-grid">', ""];
-        const groups = section.entries.filter((entry) => entry.children.length > 0);
-        const articles = section.entries.filter((entry) => entry.children.length === 0);
-        for (const group of groups) {
-          card(lines, group.href ? `[${mdLabel(localizer.entryTitle(tag, group))}](${group.href})` : mdLabel(localizer.entryTitle(tag, group)), group.children, tag);
-        }
-        if (groups.length === 0)
-          for (const article of articles)
-            card(lines, undefined, [article], tag);
-        else if (articles.length)
-          card(lines, undefined, articles, tag);
+        const grouped = section.entries.some((entry) => entry.children.length > 0);
+        let articles = [];
+        const flush = () => {
+          if (articles.length)
+            card(lines, undefined, articles, tag);
+          articles = [];
+        };
+        for (const entry of section.entries) {
+          if (entry.children.length === 0) {
+            articles.push(entry);
+            if (!grouped)
+              flush();
+            continue;
+          }
+          flush();
+          card(lines, entry.href ? `[${mdLabel(localizer.entryTitle(tag, entry))}](${entry.href})` : mdLabel(localizer.entryTitle(tag, entry)), entry.children, tag);
+        }
+        flush();
         lines.push("</div>");
         return lines.join(`
 `) + `