@daz4126/swifty 2.2.0 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daz4126/swifty",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/pages.js

@@ -48,6 +48,10 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
         : capitalize(file.name.replace(/\.md$/, "").replace(/-/g, " "));
       const stats = await fs.stat(filePath);
       const isDirectory = file.isDirectory();
+<<<<<<< HEAD
+      const layoutFileExists = parent && await fsExtra.pathExists(`${dirs.layouts}/${parent.filename}.html`);
+      const layout = layoutFileExists ? parent.filename : parent ? parent.layout : config.default_layout_name || "site";
+=======
       const layoutFileExists =
         parent &&
         (await fsExtra.pathExists(`${dirs.layouts}/${parent.filename}.html`));
@@ -56,6 +60,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
         : parent
           ? parent.layout
           : config.default_layout_name;
+>>>>>>> 61ad6f94b646a80d5857c84b58250ea7f00f2758
 
       const page = {
         name,
@@ -123,7 +128,9 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
       }
 
       pages.push(page);
-      pageIndex.push({ url: page.url, title: page.title, nav: page.nav });
+      if (!pageIndex.some((p) => p.url === page.url)) {
+        pageIndex.push({ url: page.url, title: page.title, nav: page.nav });
+      }
     });
 
     // Await all directory recursion
@@ -141,7 +148,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
       folder: true,
       name: "Tags",
       title: "All Tags",
-      layout: "pages",
+      layout: tagLayout ? "tags" : defaultConfig.default_layout_name,
       updated_at: new Date().toLocaleDateString(
         undefined,
         defaultConfig.dateFormat,
@@ -159,16 +166,13 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
           defaultConfig.dateFormat,
         ),
         url: `/tags/${tag}`,
-        layout: tagLayout ? "tags" : "pages",
+        layout: tagLayout ? "tags" : defaultConfig.default_layout_name,
         data: { ...config, title: `Pages tagged with ${capitalize(tag)}` },
       };
-      page.content = pagesForTag
-        .map((p) => `* <a href="${p.url}">${p.title}</a>`)
-        .join("\n");
+      page.content = await generateLinkList("tags", pagesForTag);
 
       tagPage.pages.push(page);
     }
-
     tagPage.content = await generateLinkList("tags", tagPage.pages);
     pages.push(tagPage);
   }
@@ -178,7 +182,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
 const generateLinkList = async (name, pages) => {
   const partial = `${name}.md`;
   const partialPath = path.join(dirs.partials, partial);
-  const linksPath = path.join(dirs.partials, defaultConfig.default_link_name);
+  const linksPath = path.join(dirs.partials, defaultConfig.default_link_name || "links");
   // Check if either file exists in the 'partials' folder
   const fileExists = await fsExtra.pathExists(partialPath);
   const defaultExists = await fsExtra.pathExists(linksPath);
@@ -227,6 +231,16 @@ const addLinks = async (pages, parent) => {
   for (const page of pages) {
     page.data ||= {};
     page.data.links_to_tags = page?.data?.tags?.length
+<<<<<<< HEAD
+      ? page.data.tags.map(tag => `<a class="${defaultConfig.tag_class}" href="/tags/${tag}">${tag}</a>`).join`` : "";
+    const crumb = page.root ? "" : ` ${defaultConfig.breadcrumb_separator || "&raquo;"} <a class="${defaultConfig.breadcrumb_class}" href="${page.url}">${page.name}</a>`;
+    page.data.breadcrumbs = parent ? parent.data.breadcrumbs + crumb
+      : `<a class="${defaultConfig.breadcrumb_class}" href="/">Home</a>` + crumb;
+    page.data.links_to_children = page.pages ? await generateLinkList(page.filename, page.pages) : "";
+    page.data.links_to_siblings = await generateLinkList(page.parent?.filename || "pages", pages.filter(p => p.url !== page.url));
+    page.data.links_to_self_and_siblings = await generateLinkList(page.parent?.filename || "pages", pages);
+    page.data.nav_links = await generateLinkList("nav", pageIndex.filter(p => p.nav));
+=======
       ? page.data.tags.map(
           (tag) =>
             `<a class="${defaultConfig.tag_class}" href="/tags/${tag}">${tag}</a>`,
@@ -254,6 +268,7 @@ const addLinks = async (pages, parent) => {
       "nav",
       pageIndex.filter((p) => p.nav),
     );
+>>>>>>> 61ad6f94b646a80d5857c84b58250ea7f00f2758
     if (page.pages) {
       await addLinks(page.pages, page); // Recursive call
     }

package/src/watcher.js

@@ -1,43 +1,50 @@
 import chokidar from "chokidar";
+import { exec } from "child_process";
+import path from "path";
 
-export default async function startWatcher(outDir = "dist") {
-  const filesToWatch = [
-    "pages/**/*.{md,html}",
-    "layouts/**/*.{html}",
-    "images/**/*",
-    "css/**/*.{css}",
-    "js/**/*.{js}",
-    "partials/**/*.{md,html}",
-    "template.html",
-    "config.yaml",
-    "config.yml",
-    "config.json",
-  ];
+// Define files to watch, resolving relative to the current working directory
+const filesToWatch = [
+  "pages/**/*.{md,html}",
+  "layouts/**/*.html",
+  "images/**/*",
+  "css/**/*.css",
+  "js/**/*.js",
+  "partials/**/*.{md,html}",
+  "template.html",
+  "config.yaml",
+  "config.yml",
+  "config.json",
+].map((pattern) => path.join(process.cwd(), pattern));
 
-  const watcher = chokidar.watch(filesToWatch, {
-    persistent: true,
-    ignoreInitial: true,
-    awaitWriteFinish: { stabilityThreshold: 100 },
-    debounceDelay: 200,
-  });
-
-  const buildModule = await import("./build.js");
-  const build = buildModule.default;
+const buildScript = "npm run build";
 
-  if (typeof build !== "function") {
-    console.error("❌ build.js does not export a default function.");
-    return;
-  }
+// Initialize watcher
+const watcher = chokidar.watch(filesToWatch, {
+  persistent: true,
+  ignoreInitial: true,
+  awaitWriteFinish: {
+    stabilityThreshold: 200,
+    pollInterval: 100,
+  },
+});
 
-  watcher.on("change", async (path) => {
-    console.log(`📄 File changed: ${path}`);
-    try {
-      await build(outDir);
-      console.log("✅ Build completed");
-    } catch (error) {
-      console.error(`❌ Build failed: ${error.message}`);
+// Rebuild function
+function triggerBuild(event, filePath) {
+  console.log(`File ${event}: ${filePath}. Running build...`);
+  exec(buildScript, (error, stdout, stderr) => {
+    if (error) {
+      console.error(`Build failed: ${error.message}`);
+      return;
     }
+    if (stderr) console.error(`stderr: ${stderr}`);
+    if (stdout) console.log(stdout);
   });
-
-  console.log(`👀 Watching for changes in ${outDir}...`);
 }
+
+// Set up event listeners
+watcher
+  .on("change", (filePath) => triggerBuild("changed", filePath))
+  .on("add", (filePath) => triggerBuild("added", filePath))
+  .on("unlink", (filePath) => triggerBuild("deleted", filePath));
+
+console.log("Watching for file changes...");