hdoc-tools 0.18.3 → 0.18.5

package/hdoc-build.js

@@ -451,7 +451,7 @@
       else html_txt = `${fm_header_content}\n${doc_header}\n${html_txt}`;
 
       // Wrap h2 and h3 tags, plus content, in id'd divs
-      html_txt = hdoc.wrapHContent(html_txt);
+      const h_html_txt = hdoc.wrapHContent(html_txt);
 
       let relative_path = file_path.relativePath;
       if (
@@ -461,7 +461,7 @@
         relative_path = relative_path.replace("/index.html", "");
       }
 
-      const index_data = hdoc_index.transform_html_for_index(html_txt);
+      const index_data = hdoc_index.transform_html_for_index(h_html_txt);
 
       index_data.sections.forEach(section => {
         index_records.push({
@@ -812,7 +812,7 @@
       else html_txt = `${fm_header}\n${doc_header}\n${html_txt}`;
 
       // Wrap h2 and h3 tags, plus content, in id'd divs
-      html_txt = hdoc.wrapHContent(html_txt);
+      const h_html_txt = hdoc.wrapHContent(html_txt);
 
       // Save HTML into HTML file
       const target_file = file_path.path.replace(
@@ -836,7 +836,7 @@
         relative_path = relative_path.replace("/index.html", "");
       }
 
-      const index_data = hdoc_index.transform_html_for_index(html_txt);
+      const index_data = hdoc_index.transform_html_for_index(h_html_txt);
 
       index_data.sections.forEach(section => {
         index_records.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {

package/templates/init/.github/workflows/hdocbuild_onpull.yml

@@ -1,4 +1,5 @@
 name: HDocBuildPull
+
 on:
   # Triggers the workflow on pull request opened or reopened events
   pull_request_target:
@@ -6,49 +7,11 @@ on:
     paths-ignore:
       - '.github/**'
 
-  
 jobs:
-  validate_pull_request:
-    runs-on: ubuntu-latest
-    steps:
-      # Setup NodeJS Active LTS (20 currently, moving to 22 as the next LTS)
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      # Checkout the relevant content for pull_request_target
-      - name: Checkout For Pull Request Target
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      # Install hdoc-tools globally
-      - name: Install hdoc-tools
-        run: npm install hdoc-tools -g
-     
-     # Run hdoc validate against checked-out content
-      - name: Perform Validation
-        id: hdocbuild
-        run: |
-          if result=`hdoc validate 2>&1`; then
-              printf "Build Success!\n\n"
-              printf "$result"
-              exit 0
-          else
-            valout=$(echo "$result" | awk '/Validation Output/,0')
-            printf "Build Failed!\n\n-----------------------\n"
-            printf "$valout"
-            exit 1
-          fi
-          
-      # If build validation fails, and event trigger was a pull request  then close the pull request
-      - name: Reject Pull Request
-        if: failure()
-        uses: superbrothers/close-pull-request@v3
-        with:
-          comment: "Your pull request has been rejected as build validation has failed. See the Perform Validation step of the build job for more information: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-      
-      # If build validation is successful, echo message
-      - name: Build Success
-        if: success()
-        run: echo "::notice::Build validation passed successfully."
+  call-workflow-pull-validate:
+    uses: Hornbill-Docs/hdoc-library/.github/workflows/hdocbuild_shared_pull.yml@main
+    with:
+      branch: ${{ github.event.pull_request.head.sha }}
+      server_url: ${{ github.server_url }}
+      repo: ${{ github.repository }}
+      run_id: ${{ github.run_id }}

package/templates/init/.github/workflows/hdocbuild_onpush.yml

@@ -9,41 +9,7 @@ on:
   workflow_dispatch:
   
 jobs:
-  validate_push:
-    runs-on: ubuntu-latest
-    steps:
-      # Setup NodeJS Active LTS (20 currently, moving to 22 as the next LTS)
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      # Checkout the relevant content for push or workflow_dispatch
-      - name: Checkout For Push or Workflow Dispatch
-        uses: actions/checkout@v4
-        with:
-           ref: ${{ github.event.inputs.branch }}
-           fetch-depth: 0    
-
-      # Install hdoc-tools globally
-      - name: Install hdoc-tools
-        run: npm install hdoc-tools -g
-     
-     # Run hdoc validate against checked-out content
-      - name: Perform Validation
-        id: hdocbuild
-        run: |
-          if result=`hdoc validate 2>&1`; then
-              printf "Build Success!\n\n"
-              printf "$result"
-              exit 0
-          else
-            valout=$(echo "$result" | awk '/Validation Output/,0')
-            printf "Build Failed!\n\n-----------------------\n"
-            printf "$valout"
-            exit 1
-          fi
-  
-      # If build validation is successful, echo message
-      - name: Build Success
-        if: success()
-        run: echo "::notice::Build validation passed successfully."
+  call-workflow-push-validate:
+    uses: Hornbill-Docs/hdoc-library/.github/workflows/hdocbuild_shared_push.yml@main
+    with:
+      branch: ${{ github.event.inputs.branch }}