Fix internal linking

Author: werwolf2303

internal/documentation/jsdoc-to-markdown.js

@@ -123,7 +123,12 @@ class MarkdownDocFile extends HTMLUtils {
         });
 
         // 2. Parse content
-        this.markdownElements = this.#parseSections(this.findHTMLTag(html, "article").node);
+        const articleResult = this.findHTMLTag(html, "article");
+        if (articleResult.found && articleResult.node) {
+            this.markdownElements = this.#parseSections(articleResult.node);
+        } else {
+            this.markdownElements = [];
+        }
 
         return this;
     }

internal/documentation/jsdoc/docdash/publish.js

@@ -520,11 +520,6 @@ exports.publish = function(taffyData, opts, tutorials) {
         ).concat(files),
     indexUrl);
 
-    // common nav generation, no need for templating here, we already have full html
-    if (docdash.commonNav) {
-        fs.writeFileSync(path.join(outdir, 'nav.inc.html'), view.nav, 'utf8');
-    }
-
     // set up the lists that we'll use to generate pages
     var classes = taffy(members.classes);
     var modules = taffy(members.modules);
@@ -596,7 +591,7 @@ exports.publish = function(taffyData, opts, tutorials) {
 function linkTo(longname, linkText, cssClass, fragmentId) {
     const classString = cssClass ? util.format(' class="%s"', cssClass) : '';
     let fileUrl;
-    const fragmentString = fragmentId ? `#${fragmentId}` : '';
+    let fragmentString = fragmentId ? `#${fragmentId}` : '';
     let stripped;
     let text;
 
@@ -621,14 +616,24 @@ function linkTo(longname, linkText, cssClass, fragmentId) {
         fileUrl = helper.longnameToUrl[longname] || '';
         text = linkText || longname;
 
+        // If the URL contains a fragment (hash), extract it
+        if (fileUrl && fileUrl.indexOf('#') > -1) {
+            const parts = fileUrl.split('#');
+            fileUrl = parts[0];
+            // Only use the URL's fragment if no explicit fragmentId was provided
+            if (!fragmentId) {
+                fragmentString = '#' + parts[1];
+            }
+        }
+
         // Convert source file links to GitHub URLs if configured
         if (fileUrl && githubSourceBaseUrl && (fileUrl.endsWith('.js.md') || longname.endsWith('.js'))) {
             fileUrl = convertSourceLinkToGitHub(fileUrl, longname);
         }
         // Remove .md extension from internal links for VitePress compatibility
         // Handle both cases: with and without fragment identifiers
         else if (fileUrl) {
-            fileUrl = fileUrl.replace(/\.md(#|$)/, '$1');
+            fileUrl = fileUrl.replace(/\.md$/, '');
         }
     }
 

internal/documentation/jsdoc/docdash/tmpl/members.tmpl

@@ -1,8 +1,11 @@
 <?js
 var data = obj;
 var self = this;
+var signature = data.signature ? data.signature : '';
+// Check if signature already contains closing </div>, if so don't add another one
+var hasClosingDiv = signature.includes('</div>');
 ?>
-#### <?js= data.attribs + name + (data.signature ? data.signature : '') ?>
+#### <div class='jsdoc-object' id='<?js= data.id ?>'><?js= data.attribs.replace(/<div class='jsdoc-object'>/, '').replace(/<\/div>$/, '') + name + signature + (hasClosingDiv ? '' : '</div>') ?>
 
 <?js if (data.summary) { ?>
 <?js= summary ?>

internal/documentation/jsdoc/docdash/tmpl/method.tmpl

@@ -7,7 +7,7 @@ var self = this;
 ## Constructor
     <?js } ?>
 
-#### <?js= data.attribs ?><?js
+#### <div class='jsdoc-object' id='<?js= data.id ?>'><?js= data.attribs.replace(/<div class='jsdoc-object'>/, '') ?><?js
       if(kind === 'class' && name.indexOf('module:') === 0) {
         print('new (require("' + name.slice(7) + '"))');
       } else if(kind === 'class') {
@@ -79,7 +79,7 @@ var self = this;
 <?js }); ?>
 <?js } ?>
 
-<?js if (data.modifies && modifies.length) {?>		
+<?js if (data.modifies && modifies.length) {?>
 ##### Modifies:
 <?js if (modifies.length > 1) { ?>
 <?js modifies.forEach(function(m) { ?>
@@ -115,7 +115,7 @@ var self = this;
     <?js });
 } } ?>
 
-<?js if (data.yields && yields.length) { ?>		
+<?js if (data.yields && yields.length) { ?>
 ##### Yields:
 <?js if (yields.length > 1) { ?>
 <?js yields.forEach(function(r) { ?>

internal/documentation/jsdoc/jsdoc-workspace.json

@@ -63,6 +63,6 @@
 				"id": "github_link"
 			}
 		},
-		"githubSourceBaseUrl": "https://github.com/UI5/cli/blob/main"
+		"githubSourceBaseUrl": "https://github.com/UI5/cli/blob/main/packages"
 	}
 }

internal/documentation/jsdoc/jsdoc.json

@@ -62,6 +62,6 @@
 				"id": "github_link"
 			}
 		},
-		"githubSourceBaseUrl": "https://github.com/UI5/cli/blob/main"
+		"githubSourceBaseUrl": "https://github.com/UI5/cli/blob/main/pacakges/"
 	}
 }