Feature and documentation: Title, Theme, SESSION_SECRET in .env and config.js

.gitignore

@@ -34,3 +34,5 @@ themes/default/public/lib/
 *.pdf
 .DS_Store
 .idea
+
+.env

app/functions/contentProcessors.js

@@ -6,6 +6,7 @@
 import startCase from 'lodash/startCase.js';
 import trim from 'lodash/trim.js';
 import yaml from 'js-yaml';
+import { error } from 'node:console';
 
 // Regex for page meta (considers Byte Order Mark \uFEFF in case there's one)
 // Look for the the following header formats at the beginning of the file:
@@ -17,8 +18,9 @@
 // {header string}
 // ---
 // TODO: DEPRECATED Non-YAML
-const META_REGEX = /^\uFEFF?\/\*([\s\S]*?)\*\//i;
-const META_REGEX_YAML = /^\uFEFF?---([\s\S]*?)---/i;
+const META_REGEX = /^\uFEFF?\/\*([\s\S]*)\*\//i;
+const META_REGEX_YAML = /^\uFEFF?---\n([\s\S]*)\n---\n/i;
+const META_REGEX_MARKDOWN_TITLE = /^\uFEFF?(---[\s\S]*---\n)?\# ([^\n]+)/i;
 
 function cleanString(str, useUnderscore = false) {
   str = str.replaceAll('/', ' ').trim();
@@ -58,36 +60,54 @@
 
 // Get metadata from Markdown content
 function processMeta(markdownContent) {
-  if (META_REGEX.test(markdownContent)) {
-    const meta = {};
-    const metaArr = markdownContent.match(META_REGEX);
-    const metaString = metaArr?.[1]?.trim() ?? '';
+  let ret = {};
+  let metaString = '';
+  let meta = {};
+  let metaArr = {};
 
-    if (metaString) {
-      const lines = metaString.split('\n');
-      for (const line of lines) {
-        const colonIndex = line.indexOf(': ');
-        if (colonIndex <= 0) {
-          continue;
-        }
-        const key = line.substring(0, colonIndex).trim();
-        const value = line.substring(colonIndex + 2).trim();
-        if (key && value) {
-          meta[cleanString(key, true)] = value;
+  if (META_REGEX.test(markdownContent)) {
+    metaArr = markdownContent.match(META_REGEX);
+    if (metaArr !== null && metaArr[1] !== null) {
+      metaString = metaArr[1].trim();
+      if (metaString) {
+        const lines = metaString.split('\n');
+        for (const line of lines) {
+          const colonIndex = line.indexOf(': ');
+          if (colonIndex <= 0) {
+            continue; 
+          }
+          const key = line.substring(0, colonIndex).trim();
+          const value = line.substring(colonIndex + 2).trim();
+          if (key && value) {
+            meta[cleanString(key, true)] = value;
+          }
         }
       }
+      ret = meta;
     }
-    return meta;
   }
 
+  try {
   if (META_REGEX_YAML.test(markdownContent)) {
-    const metaArr = markdownContent.match(META_REGEX_YAML);
-    const metaString = metaArr?.[1]?.trim() ?? '';
-    const yamlObject = yaml.load(metaString);
-    return cleanObjectStrings(yamlObject);
+    // metaArr = markdownContent.match(META_REGEX_YAML);
+    // if (metaArr !== null && metaArr[1] !== null) {
+      metaString = markdownContent.match(META_REGEX_YAML)[1].trim();
+      const yamlObject = yaml.load(metaString);
+      ret = cleanObjectStrings(yamlObject);
+    // }
   }
-
-  return {};
+  } catch (e) {
+    console.error(e);
+  }
+  try {
+    if (!("Title" in ret) && META_REGEX_MARKDOWN_TITLE.test(markdownContent)) {
+      const title = markdownContent.match(META_REGEX_MARKDOWN_TITLE)[2];
+      ret.title = title;
+    }
+  } catch (e) {
+    console.error(e);
+  }
+  return ret;
 }
 
 // Replace content variables in Markdown content
@@ -121,7 +141,11 @@
     const title = meta.title ? meta.title : slugToTitle(id);
     const body = file;
 
-    return { id, title, body };
+    return {
+      id,
+      title,
+      body
+    };
   } catch (e) {
     if (debug) {
       console.log(e);

app/functions/createMetaInfo.js

@@ -3,24 +3,25 @@
 
 // Returns an empty string if all input strings are empty
 function createMetaInfo(metaTitle, metaDescription, metaSort) {
-  const yamlDocument = {};
-  const metaInfoIsPresent = metaTitle || metaDescription || metaSort;
+    const yamlDocument = {};
+    const metaInfoIsPresent = metaTitle || metaDescription || metaSort;
 
-  if (metaInfoIsPresent) {
-    if (metaTitle) {
-      yamlDocument.Title = metaTitle;
-    }
-    if (metaDescription) {
-      yamlDocument.Description = metaDescription;
-    }
-    if (metaSort) {
-      yamlDocument.Sort = Number.parseInt(metaSort, 10);
-    }
+    if (metaInfoIsPresent) {
+        if (metaTitle) {
+            yamlDocument.Title = metaTitle;
+        }
+        if (metaDescription) {
+            yamlDocument.Description = metaDescription;
+        }
+        if (metaSort) {
+            yamlDocument.Sort = Number.parseInt(metaSort, 10);
+        }
 
-    return `---\n${yaml.dump(yamlDocument)}---\n`;
-  }
-  return '---\n---\n';
+        return `---\n${yaml.dump(yamlDocument)}---\n`;
+    }
+    return '---\n---\n';
+    // return '';
 }
 
 // Exports
-export default createMetaInfo;
+export default createMetaInfo;