fossbook 0.0.4 → 0.0.6

package/lib/mod/config.js

@@ -1,136 +1,136 @@
-const path = require("path");
-const fs = require("fs");
-const { execSync } = require("child_process");
-
-const defaults = {
-  blogName: "My Blog",
-  authorName: "",
-  authorDescription: "",
-  authorWebsite: "",
-  blogDescription: "",
-  blogsite: "http://localhost:3000",
-  githubCNAME: "",
-  googleAnalyticsID: "",
-  authorTwitter: "",
-  siteTwitter: "",
-  githubRepository: "",
-  image: "",
-  theme: "archie",
-  basePath: "",  // auto-detected for GitHub Pages project sites, e.g. "/repo-name/"
-  comments: null,  // { provider: "utterances", repo: "user/repo", issueTerm: "pathname", theme: "github-light" }
-  content: "./content",
-  postsDir: "./content/posts",
-  outputDir: "./public",
-  staticDir: "./static",
-  themesDir: "./themes",
-};
-
-/**
- * Resolve the theme path, checking the user's themesDir first,
- * then falling back to the built-in themes directory.
- */
-function resolveThemePath(config) {
-  const themeName = config.theme || "archie";
-  const userThemePath = path.resolve(config.themesDir || "./themes", themeName);
-  const builtinThemePath = path.resolve(__dirname, "../../themes", themeName);
-
-  if (fs.existsSync(userThemePath)) {
-    return userThemePath;
-  }
-  if (fs.existsSync(builtinThemePath)) {
-    return builtinThemePath;
-  }
-  console.error(`Theme "${themeName}" not found in ${userThemePath} or ${builtinThemePath}`);
-  process.exit(1);
-}
-
-/**
- * Load configuration from the user's fossbook.config.js (or a custom path),
- * merge with defaults, and build the internal dev paths.
- */
-function loadConfig(configPath) {
-  const resolvedConfigPath = path.resolve(configPath || "./fossbook.config.js");
-
-  let userConfig = {};
-  if (fs.existsSync(resolvedConfigPath)) {
-    userConfig = require(resolvedConfigPath);
-  } else if (configPath) {
-    // Only error if user explicitly specified a config path
-    console.error(`Config file not found: ${resolvedConfigPath}`);
-    process.exit(1);
-  } else {
-    console.warn("No fossbook.config.js found, using defaults.");
-  }
-
-  const merged = { ...defaults, ...userConfig };
-
-  // Build the internal dev paths object used by the generator modules
-  const themePath = resolveThemePath(merged);
-
-  merged.dev = {
-    postsdir: path.resolve(merged.postsDir),
-    content: path.resolve(merged.content),
-    about: path.resolve(merged.content, "about.md"),
-    outdir: path.resolve(merged.outputDir),
-    themePath: path.dirname(themePath), // e.g. /path/to/themes
-    staticDir: path.resolve(merged.staticDir),
-  };
-
-  merged.themePath = themePath; // full path to the active theme directory
-
-  // Inject version and build date
-  merged.version = require("../../package.json").version;
-  merged.date_time = formatDate(new Date());
-
-  // Auto-detect basePath if not explicitly set
-  if (!merged.basePath) {
-    merged.basePath = detectBasePath(merged);
-  }
-  // Ensure basePath has trailing slash
-  if (!merged.basePath.endsWith("/")) {
-    merged.basePath += "/";
-  }
-
-  return merged;
-}
-
-function formatDate(
-  date,
-  locale = "en-US",
-  options = {
-    year: "numeric",
-    month: "short",
-    day: "numeric",
-  },
-) {
-  return date.toLocaleDateString(locale, options);
-}
-
-/**
- * Auto-detect basePath for GitHub Pages project sites.
- * Returns "/repo-name/" for project sites, or "/" for user sites / custom domains.
- */
-function detectBasePath(config) {
-  // If user has a custom domain, no prefix needed
-  if (config.githubCNAME) return "/";
-
-  try {
-    const remoteUrl = execSync("git remote get-url origin", {
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "ignore"],
-    }).trim();
-    const match = remoteUrl.match(/github\.com[:/](.+?)(?:\.git)?$/);
-    if (match) {
-      const [owner, repo] = match[1].split("/");
-      // User/org sites (e.g. username.github.io) are served at root
-      if (repo === `${owner}.github.io`) return "/";
-      // Project sites need the repo name as prefix
-      return `/${repo}/`;
-    }
-  } catch {
-    // Not a git repo or no remote — fall back to root
-  }
-  return "/";
-}
-
-module.exports = { loadConfig, resolveThemePath, formatDate };
+const path = require("path");
+const fs = require("fs");
+const { execSync } = require("child_process");
+
+const defaults = {
+  blogName: "My Blog",
+  authorName: "",
+  authorDescription: "",
+  authorWebsite: "",
+  blogDescription: "",
+  blogsite: "http://localhost:3000",
+  githubCNAME: "",
+  googleAnalyticsID: "",
+  authorTwitter: "",
+  siteTwitter: "",
+  githubRepository: "",
+  image: "",
+  theme: "archie",
+  basePath: "",  // auto-detected for GitHub Pages project sites, e.g. "/repo-name/"
+  comments: null,  // { provider: "utterances", repo: "user/repo", issueTerm: "pathname", theme: "github-light" }
+  content: "./content",
+  postsDir: "./content/posts",
+  outputDir: "./public",
+  staticDir: "./static",
+  themesDir: "./themes",
+};
+
+/**
+ * Resolve the theme path, checking the user's themesDir first,
+ * then falling back to the built-in themes directory.
+ */
+function resolveThemePath(config) {
+  const themeName = config.theme || "archie";
+  const userThemePath = path.resolve(config.themesDir || "./themes", themeName);
+  const builtinThemePath = path.resolve(__dirname, "../../themes", themeName);
+
+  if (fs.existsSync(userThemePath)) {
+    return userThemePath;
+  }
+  if (fs.existsSync(builtinThemePath)) {
+    return builtinThemePath;
+  }
+  console.error(`Theme "${themeName}" not found in ${userThemePath} or ${builtinThemePath}`);
+  process.exit(1);
+}
+
+/**
+ * Load configuration from the user's fossbook.config.js (or a custom path),
+ * merge with defaults, and build the internal dev paths.
+ */
+function loadConfig(configPath) {
+  const resolvedConfigPath = path.resolve(configPath || "./fossbook.config.js");
+
+  let userConfig = {};
+  if (fs.existsSync(resolvedConfigPath)) {
+    userConfig = require(resolvedConfigPath);
+  } else if (configPath) {
+    // Only error if user explicitly specified a config path
+    console.error(`Config file not found: ${resolvedConfigPath}`);
+    process.exit(1);
+  } else {
+    console.warn("No fossbook.config.js found, using defaults.");
+  }
+
+  const merged = { ...defaults, ...userConfig };
+
+  // Build the internal dev paths object used by the generator modules
+  const themePath = resolveThemePath(merged);
+
+  merged.dev = {
+    postsdir: path.resolve(merged.postsDir),
+    content: path.resolve(merged.content),
+    about: path.resolve(merged.content, "about.md"),
+    outdir: path.resolve(merged.outputDir),
+    themePath: path.dirname(themePath), // e.g. /path/to/themes
+    staticDir: path.resolve(merged.staticDir),
+  };
+
+  merged.themePath = themePath; // full path to the active theme directory
+
+  // Inject version and build date
+  merged.version = require("../../package.json").version;
+  merged.date_time = formatDate(new Date());
+
+  // Auto-detect basePath if not explicitly set
+  if (!merged.basePath) {
+    merged.basePath = detectBasePath(merged);
+  }
+  // Ensure basePath has trailing slash
+  if (!merged.basePath.endsWith("/")) {
+    merged.basePath += "/";
+  }
+
+  return merged;
+}
+
+function formatDate(
+  date,
+  locale = "en-US",
+  options = {
+    year: "numeric",
+    month: "short",
+    day: "numeric",
+  },
+) {
+  return date.toLocaleDateString(locale, options);
+}
+
+/**
+ * Auto-detect basePath for GitHub Pages project sites.
+ * Returns "/repo-name/" for project sites, or "/" for user sites / custom domains.
+ */
+function detectBasePath(config) {
+  // If user has a custom domain, no prefix needed
+  if (config.githubCNAME) return "/";
+
+  try {
+    const remoteUrl = execSync("git remote get-url origin", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "ignore"],
+    }).trim();
+    const match = remoteUrl.match(/github\.com[:/](.+?)(?:\.git)?$/);
+    if (match) {
+      const [owner, repo] = match[1].split("/");
+      // User/org sites (e.g. username.github.io) are served at root
+      if (repo === `${owner}.github.io`) return "/";
+      // Project sites need the repo name as prefix
+      return `/${repo}/`;
+    }
+  } catch {
+    // Not a git repo or no remote — fall back to root
+  }
+  return "/";
+}
+
+module.exports = { loadConfig, resolveThemePath, formatDate };

package/lib/mod/marked.js

@@ -1,95 +1,95 @@
-const marked = require("marked");
-
-marked.setOptions({
-  renderer: new marked.Renderer(),
-  highlight: function (code, language) {
-    const hljs = require("highlight.js");
-    const validLanguage = hljs.getLanguage(language) ? language : "plaintext";
-    return hljs.highlight(validLanguage, code).value;
-  },
-  pedantic: false,
-  gfm: true,
-  breaks: false,
-  sanitize: false,
-  smartLists: true,
-  smartypants: false,
-  xhtml: false,
-});
-
-// Override function
-const renderer = {
-  image(href, title, text) {
-    let size = null;
-    // Check if the title contains a size specification
-    if (title && title.includes("size:")) {
-      const sizeMatch = title.match(/size:(\d+%)/);
-      if (sizeMatch && sizeMatch[1]) {
-        size = sizeMatch[1];
-        // Remove the size specification from the title
-        title = title.replace(/size:\d+%/g, "").trim();
-      }
-    }
-    let align = "center";
-    if (title && title.includes("align:")) {
-      // align: left, right, center
-      const alignMatch = title.match(/align:(left|right|center)/);
-      if (alignMatch && alignMatch[1]) {
-        align = alignMatch[1];
-        // Remove the alignment specification from the title
-        title = title.replace(/align:(left|right|center)/g, "").trim();
-      }
-    }
-
-    // Construct the image tag with optional size and title
-    let imageTag = `<img src="${href}" alt="${text}"`;
-    if (size) {
-      imageTag += ` style="width: ${size};"`;
-    }
-    imageTag += ">";
-
-    return `
-        <div style="text-align: ${align};">
-          <figure style="text-align: ${align};">
-            ${imageTag}
-            ${title ? `<figcaption>${title}</figcaption>` : ""}
-          </figure>
-        </div>
-      `;
-  },
-  link(href, title, text) {
-    let align = null;
-    if (title && title.includes("align:")) {
-      // align: left, right, center
-      const alignMatch = title.match(/align:(left|right|center)/);
-      if (alignMatch && alignMatch[1]) {
-        align = alignMatch[1];
-        // Remove the alignment specification from the title
-        title = title.replace(/align:(left|right|center)/g, "").trim();
-      }
-    }
-    // if align is not null, add div with text-align style
-    if (align) {
-      return `
-          <div style="text-align: ${align};">
-            <a href="${href} "${title ? `title="${title}"` : ""}>${text}</a>
-          </div>`;
-    } else {
-      return `<a href="${href} "${title ? `title="${title}"` : ""}>${text}</a>`;
-    }
-  },
-  blockquote(quote) {
-    return `<div class="blockquote-container"><blockquote>${quote}</blockquote></div>`;
-  },
-  paragraph(text) {
-    // remove <p> surrounding the image
-    if (text.includes('<figure style="text-align: center;">')) {
-      return text;
-    } else {
-      return `<p>${text}</p>`;
-    }
-  },
-};
-
-marked.use({ renderer });
-
-module.exports = marked;
+const marked = require("marked");
+
+marked.setOptions({
+  renderer: new marked.Renderer(),
+  highlight: function (code, language) {
+    const hljs = require("highlight.js");
+    const validLanguage = hljs.getLanguage(language) ? language : "plaintext";
+    return hljs.highlight(validLanguage, code).value;
+  },
+  pedantic: false,
+  gfm: true,
+  breaks: false,
+  sanitize: false,
+  smartLists: true,
+  smartypants: false,
+  xhtml: false,
+});
+
+// Override function
+const renderer = {
+  image(href, title, text) {
+    let size = null;
+    // Check if the title contains a size specification
+    if (title && title.includes("size:")) {
+      const sizeMatch = title.match(/size:(\d+%)/);
+      if (sizeMatch && sizeMatch[1]) {
+        size = sizeMatch[1];
+        // Remove the size specification from the title
+        title = title.replace(/size:\d+%/g, "").trim();
+      }
+    }
+    let align = "center";
+    if (title && title.includes("align:")) {
+      // align: left, right, center
+      const alignMatch = title.match(/align:(left|right|center)/);
+      if (alignMatch && alignMatch[1]) {
+        align = alignMatch[1];
+        // Remove the alignment specification from the title
+        title = title.replace(/align:(left|right|center)/g, "").trim();
+      }
+    }
+
+    // Construct the image tag with optional size and title
+    let imageTag = `<img src="${href}" alt="${text}"`;
+    if (size) {
+      imageTag += ` style="width: ${size};"`;
+    }
+    imageTag += ">";
+
+    return `
+        <div style="text-align: ${align};">
+          <figure style="text-align: ${align};">
+            ${imageTag}
+            ${title ? `<figcaption>${title}</figcaption>` : ""}
+          </figure>
+        </div>
+      `;
+  },
+  link(href, title, text) {
+    let align = null;
+    if (title && title.includes("align:")) {
+      // align: left, right, center
+      const alignMatch = title.match(/align:(left|right|center)/);
+      if (alignMatch && alignMatch[1]) {
+        align = alignMatch[1];
+        // Remove the alignment specification from the title
+        title = title.replace(/align:(left|right|center)/g, "").trim();
+      }
+    }
+    // if align is not null, add div with text-align style
+    if (align) {
+      return `
+          <div style="text-align: ${align};">
+            <a href="${href} "${title ? `title="${title}"` : ""}>${text}</a>
+          </div>`;
+    } else {
+      return `<a href="${href} "${title ? `title="${title}"` : ""}>${text}</a>`;
+    }
+  },
+  blockquote(quote) {
+    return `<div class="blockquote-container"><blockquote>${quote}</blockquote></div>`;
+  },
+  paragraph(text) {
+    // remove <p> surrounding the image
+    if (text.includes('<figure style="text-align: center;">')) {
+      return text;
+    } else {
+      return `<p>${text}</p>`;
+    }
+  },
+};
+
+marked.use({ renderer });
+
+module.exports = marked;