hdoc-tools 0.63.0 → 0.65.0

package/hdoc-toc.js

@@ -118,12 +118,17 @@ class TocModel {
 	}
 
 	// Resolve a leaf link (path without extension) to a source-relative file.
+	// Links may carry a leading slash (both "/docId/page" and "docId/page"
+	// appear in real books) — the returned rel is normalized to the
+	// slash-free, forward-slash form list_files() produces, or the linked
+	// flags and file labels built from it never match.
 	_resolve_file(link) {
-		const rel = `${link}.md`;
+		const clean = String(link).replace(/^\/+/, "");
+		const rel = `${clean}.md`;
 		if (fs.existsSync(path.join(this.source_path, rel))) {
 			return { file: rel, fileExists: true };
 		}
-		const rel_index = path.join(link, "index.md");
+		const rel_index = `${clean}/index.md`;
 		if (fs.existsSync(path.join(this.source_path, rel_index))) {
 			return { file: rel_index, fileExists: true };
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hdoc-tools",
-	"version": "0.63.0",
+	"version": "0.65.0",
 	"description": "Hornbill HDocBook Development Support Tool",
 	"main": "hdoc.js",
 	"bin": {
@@ -23,6 +23,7 @@
 		"hdoc-mermaid.js",
 		"hdoc-module.js",
 		"hdoc-serve.js",
+		"hdoc-serve-validate.js",
 		"hdoc-spell.js",
 		"hdoc-stats.js",
 		"hdoc-toc.js",

package/ui/index.html

@@ -413,7 +413,9 @@
                           <i v-bind:class="{'bi bi-chevron-right': !asection.expand,'bi bi-chevron-down': asection.expand}" class="bi"></i>
                       </div>
                   </div>
-                  <span class="title-text">{{asection.text}}</span>
+                  <!-- LOCAL PREVIEW PATCH: draft/inline badges so authors can see unpublished
+                       sections in `hdoc serve`/`hdoc edit` - keep on live-site re-sync -->
+                  <span class="title-text"><i v-if="asection.draft" class="bi bi-exclamation-triangle-fill text-danger" title="This section is set to draft."></i><i v-if="asection.inline" class="bi bi-files-alt text-warning" title="This section is set to inline."></i> {{asection.text}}</span>
               </div>
               <!-- A collapsed group now renders NOTHING instead of hidden DOM. With v-show, every
                    descendant of every collapsed group stayed in the document: on a large book that
@@ -429,7 +431,8 @@
 
                       <div v-if="!navSectionItem.items">
                           <a class="DocLink link noitems" v-bind:href="navSectionItem.link" v-bind:target="navSectionItem.target || ''" style="padding-left: 0px;">
-                              <span class="link-text">{{navSectionItem.text}} <i v-if="navSectionItem.target" class="bi bi-box-arrow-up-right"></i> </span>
+                              <!-- LOCAL PREVIEW PATCH: draft badge on leaf links - keep on live-site re-sync -->
+                              <span class="link-text"><i v-if="navSectionItem.draft" class="bi bi-exclamation-triangle-fill text-danger" title="This page is set to draft."></i> {{navSectionItem.text}} <i v-if="navSectionItem.target" class="bi bi-box-arrow-up-right"></i> </span>
                           </a>
                       </div>
 

package/ui/js/bootstrap.js

@@ -81,7 +81,9 @@ function loadJS(arrFiles,callback)
             "js/webcomponents/hdocApprove.js",
             "js/doc.hornbill.js",
             "js/highlightjs/highlight.pack.js",
-            "js/highlightjs-badge.js"
+            "js/highlightjs-badge.js",
+            "js/hdoc-edit-inline.js", //-- LOCAL PREVIEW PATCH: inline edit for `hdoc serve` (no-op unless the server enables it) - keep on live-site re-sync
+            "js/hdoc-edit-book.js" //-- LOCAL PREVIEW PATCH: Edit Mode suite (contents/files management) for `hdoc serve` - keep on live-site re-sync
             ],function()
     {
         intialiseApp();

package/ui/js/doc.hornbill.js

@@ -839,7 +839,21 @@ var docAppMethods = {
             view.docApp.book = data;
             view.docApp.title = data.title || "";
             view.docApp.description = data.description || "";
-                      
+
+            //-- LOCAL PREVIEW PATCH: `hdoc serve`/`hdoc edit` publish the book's _inline/
+            //-- content as a nav_inline fragment on the library.json book entry (see
+            //-- hdoc-content-routes.js build_nav_inline). Append it to the nav tree so
+            //-- inline help pages are reachable from the menu - keep on live-site re-sync.
+            //-- look the book up in the library rather than trusting aBook: some call
+            //-- sites (e.g. search result clicks) pass a bare {docId} stub.
+            var libBook = getLibraryBooksIndex().get(data.docId) || aBook;
+            var navInline = libBook && libBook.nav_inline;
+            if(navInline && Array.isArray(navInline.items) && navInline.items.length &&
+               data.navigation && Array.isArray(data.navigation.items))
+            {
+                data.navigation.items.push(navInline);
+            }
+
 
             view.docApp.loadingBookInfo = false; //-- move this here into timeout to avoid loading glitch that shows main landing page