@kenjura/ursa 0.48.0 → 0.49.0

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.49.0
+2025-12-20
+
+- Fixed more instances of false inactive links, this time in wikitext files (.txt)
 
 
 # 0.48.0
@@ -10,6 +14,8 @@
 - **Menu Collapse Fix**: Fixed issue where clicking the caret on a folder containing the current page wouldn't collapse it
 - **URL Encoding Fix**: Fixed menu not highlighting current page when URLs contain spaces or special characters
 - **Link Validation Fix**: Links to folders are no longer incorrectly marked as inactive (folders now included in valid paths since auto-index generates index.html for all)
+- **WikiText Link Fix**: Fixed wikitext links (in .txt files) being incorrectly marked as inactive. Link validation is now handled centrally by the link validator after HTML generation.
+- **Folder/Index Link Fix**: Links to folders containing a `(foldername).md` file (instead of `index.md`) are now correctly recognized as valid
 
 # 0.47.0
 2025-12-20

package/package.json

@@ -2,7 +2,7 @@
   "name": "@kenjura/ursa",
   "author": "Andrew London <andrew@kenjura.com>",
   "type": "module",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "static site generator from MD/wikitext/YML",
   "main": "lib/index.js",
   "bin": {

package/src/helper/linkValidator.js

@@ -1,4 +1,4 @@
-import { extname, dirname, join, normalize, posix } from "path";
+import { extname, dirname, join, normalize, posix, basename } from "path";
 
 /**
  * Build a set of valid internal paths from the list of source files and directories
@@ -38,6 +38,19 @@ export function buildValidPaths(sourceFiles, source, directories = []) {
       validPaths.add((dirPath + "/").toLowerCase());
       validPaths.add((dirPath + "/index.html").toLowerCase());
     }
+    
+    // Handle (foldername).md files - they get promoted to index.html by auto-index
+    // e.g., /foo/bar/bar.md becomes /foo/bar/index.html (bar.html promoted to index.html)
+    const fileName = basename(relativePath); // e.g., "bar" from "/foo/bar/bar"
+    const parentDir = dirname(relativePath); // e.g., "/foo/bar" from "/foo/bar/bar"
+    const parentDirName = basename(parentDir); // e.g., "bar" from "/foo/bar"
+    
+    if (fileName === parentDirName) {
+      // This file has same name as its parent folder - it will be promoted to index.html
+      validPaths.add(parentDir.toLowerCase());
+      validPaths.add((parentDir + "/").toLowerCase());
+      validPaths.add((parentDir + "/index.html").toLowerCase());
+    }
   }
   
   // Add all directories as valid paths (they get auto-generated index.html)

package/src/helper/wikitextHelper.js

@@ -10,8 +10,6 @@ export function wikiToHtml({ wikitext, articleName, args } = {}) {
   const linkbase = ("/" + db + "/").replace(/\/\//g, "/");
   const imageroot = ("/" + db + "/img/").replace(/\/\//g, "/");
 
-  const allArticles = args.allArticles || [];
-
   // console.log('wikitext=',wikitext);
   var html = String(wikitext);
   // instance.article = article;
@@ -226,31 +224,19 @@ export function wikiToHtml({ wikitext, articleName, args } = {}) {
     if (!anchor) anchor = "";
     else anchor = "#" + anchor;
 
-    var active = true;
-
-    active = !!allArticles.find((article) => article.match(articleName));
+    // Note: Link validation (active/inactive status) is now handled by linkValidator.js
+    // after HTML generation, so we don't set active/inactive class here.
 
     if (articleName.indexOf("/") >= 0) {
       // assume the link is fully formed
-      return `<a class="wikiLink${
-        active ? " active" : ""
-      } data-articleName="${articleName}" href="${articleName}">${
+      return `<a class="wikiLink" data-articleName="${articleName}" href="${articleName}">${
         displayName || articleName
       }</a>`;
     } else {
       var link = linkbase + articleName + anchor;
 
-      // not sure what this did, but I need a new handler for this case
-      // if (articleName.indexOf('/')>-1) {
-      // 	link = '/'+articleName+anchor;
-      // 	displayName = articleName.substr(articleName.indexOf('/')+1);
-      // 	console.log('link=',link);
-      // }
-
       return (
-        '<a class="wikiLink ' +
-        (active ? "active" : "inactive") +
-        '" data-articleName="' +
+        '<a class="wikiLink" data-articleName="' +
         articleName +
         '" href="' +
         link +