@mgks/docmd 0.2.4 → 0.2.5

package/src/commands/init.js

@@ -4,7 +4,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const readline = require('readline');
 
-const defaultConfigContent = `// config.js: basic config for docmd
+const defaultConfigContent = `// docmd.config.js: basic config for docmd
 module.exports = {
   // Core Site Metadata
   siteTitle: 'docmd',
@@ -108,6 +108,8 @@ module.exports = {
       { title: 'GitHub', path: 'https://github.com/mgks/docmd', icon: 'github', external: true },
       { title: 'Support the Project', path: 'https://github.com/sponsors/mgks', icon: 'heart', external: true },
     ],
+    
+  pageNavigation: true, // Enable previous / next page navigation at the bottom of each page
 
   // Sponsor Ribbon Configuration
   Sponsor: {
@@ -139,7 +141,7 @@ Start writing your Markdown content here.
 async function initProject() {
   const baseDir = process.cwd();
   const docsDir = path.join(baseDir, 'docs');
-  const configFile = path.join(baseDir, 'config.js');
+  const configFile = path.join(baseDir, 'docmd.config.js');
   const indexMdFile = path.join(docsDir, 'index.md');
   const assetsDir = path.join(baseDir, 'assets');
   const assetsCssDir = path.join(assetsDir, 'css');
@@ -154,6 +156,11 @@ async function initProject() {
   
   // Check each file individually
   if (await fs.pathExists(configFile)) {
+    existingFiles.push('docmd.config.js');
+  }
+  // Check for the config.js as well to warn the user
+  const oldConfigFile = path.join(baseDir, 'config.js');
+  if (await fs.pathExists(oldConfigFile)) {
     existingFiles.push('config.js');
   }
   
@@ -230,14 +237,11 @@ async function initProject() {
   }
   
   // Write config file if it doesn't exist or user confirmed override
-  if (!await fs.pathExists(configFile)) {
-    await fs.writeFile(configFile, defaultConfigContent, 'utf8');
-    console.log('📄 Created `config.js`');
-  } else if (shouldOverride) {
+  if (!await fs.pathExists(configFile) || shouldOverride) {
     await fs.writeFile(configFile, defaultConfigContent, 'utf8');
-    console.log('📄 Updated `config.js`');
+    console.log(`📄 ${shouldOverride ? 'Updated' : 'Created'} \`docmd.config.js\``);
   } else {
-    console.log('⏭️  Skipped existing `config.js`');
+    console.log('⏭️  Skipped existing `docmd.config.js`');
   }
   
   // Write index.md file if it doesn't exist or user confirmed override

package/src/core/config-loader.js

@@ -14,12 +14,13 @@ async function loadConfig(configPath) {
     const config = require(absoluteConfigPath);
 
     // Basic validation and defaults
-    if (!config.siteTitle) throw new Error('`siteTitle` is missing in config.js');
+    if (!config.siteTitle) throw new Error('`siteTitle` is missing in config file');
     config.srcDir = config.srcDir || 'docs';
     config.outputDir = config.outputDir || 'site';
     config.theme = config.theme || {};
     config.theme.defaultMode = config.theme.defaultMode || 'light';
     config.navigation = config.navigation || [{ title: 'Home', path: '/' }];
+    config.pageNavigation = config.pageNavigation ?? true;
 
     return config;
   } catch (e) {

package/src/core/file-processor.js

@@ -34,6 +34,11 @@ function createMarkdownItInstance(config) {
   // Conditionally enable highlighting
   if (config.theme?.codeHighlight !== false) {
     mdOptions.highlight = function (str, lang) {
+      // Handle mermaid diagrams
+      if (lang === 'mermaid') {
+        return `<pre class="mermaid">${new MarkdownIt().utils.escapeHtml(str)}</pre>`;
+      }
+      
       if (lang && hljs.getLanguage(lang)) {
         try {
           return `<pre class="hljs"><code>${hljs.highlight(str, { language: lang, ignoreIllegals: true }).value}</code></pre>`;
@@ -41,6 +46,14 @@ function createMarkdownItInstance(config) {
       }
       return `<pre class="hljs"><code>${new MarkdownIt().utils.escapeHtml(str)}</code></pre>`;
     };
+  } else {
+    // Even if highlighting is disabled, we need to handle mermaid
+    mdOptions.highlight = function (str, lang) {
+      if (lang === 'mermaid') {
+        return `<pre class="mermaid">${new MarkdownIt().utils.escapeHtml(str)}</pre>`;
+      }
+      return `<pre><code>${new MarkdownIt().utils.escapeHtml(str)}</code></pre>`;
+    };
   }
 
   const md = new MarkdownIt(mdOptions);
@@ -464,6 +477,11 @@ function enhancedTabsRule(state, startLine, endLine, silent) {
         typographer: true,
         breaks: true,
         highlight: function (str, lang) {
+          // Handle mermaid diagrams in tabs
+          if (lang === 'mermaid') {
+            return '<pre class="mermaid">' + MarkdownIt.utils.escapeHtml(str) + '</pre>';
+          }
+          
           if (lang && hljs.getLanguage(lang)) {
             try {
               return '<pre class="hljs"><code>' +

package/src/core/html-generator.js

@@ -124,7 +124,7 @@ async function generateHtmlPage(templateData) {
         prevPage,
         nextPage,
         currentPagePath,
-        headings: headings || [],
+        headings: frontmatter.toc !== false ? (headings || []) : [],
         isActivePage,
         frontmatter,
         config: config,

package/src/templates/layout.ejs

@@ -79,7 +79,7 @@
                 <div class="main-content">
                     <%- content %>
                     
-                    <% if (prevPage || nextPage) { %>
+                    <% if (config.pageNavigation && (prevPage || nextPage)) { %>
                     <div class="page-navigation">
                         <% if (prevPage) { %>
                         <a href="<%= prevPage.url %>" class="prev-page">
@@ -129,6 +129,10 @@
     </div>
 
     <script src="<%= relativePathToRoot %>assets/js/docmd-main.js"></script>
+    
+    <!-- Mermaid.js for diagram rendering -->
+    <script src="https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.min.js"></script>
+    <script src="<%= relativePathToRoot %>assets/js/docmd-mermaid.js"></script>
 
     <% (customJsFiles || []).forEach(jsFile => { %>
       <script src="<%= relativePathToRoot %><%- jsFile.startsWith('/') ? jsFile.substring(1) : jsFile %>"></script>

package/src/templates/toc.ejs

@@ -15,7 +15,7 @@ function decodeHtmlEntities(html) {
 const shouldShowToc = typeof isActivePage !== 'undefined' ? isActivePage : 
                       (typeof navigationHtml !== 'undefined' && navigationHtml && navigationHtml.includes('class="active"'));
 
-if (shouldShowToc) {
+if (shouldShowToc && !frontmatter?.toc || frontmatter?.toc !== 'false') {
   // If direct headings aren't available, we'll try to extract them from the content
   let tocHeadings = [];
   if (headings && headings.length > 0) {