From eb004ea268b6e394ac5c0051219d4a00b50ff7f9 Mon Sep 17 00:00:00 2001
From: Tor Colvin <tor.colvin@couchbase.com>
Date: Sat, 25 Oct 2025 21:39:42 -0400
Subject: [PATCH] DOC-13343 call allOf recursively

---
 lib/helpers/lib/each-openapi-module.js |  6 ++++--
 test/fixtures/toc-bootstrap.html       | 14 +++++++++++++-
 test/test-each-openapi.js              | 17 ++++++++++++++++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/lib/helpers/lib/each-openapi-module.js b/lib/helpers/lib/each-openapi-module.js
index 2e9d866c20..e05a2b5147 100644
--- a/lib/helpers/lib/each-openapi-module.js
+++ b/lib/helpers/lib/each-openapi-module.js
@@ -137,8 +137,10 @@ function child_entries(node) {
                 format_additionalProperties(node.additionalProperties) ]]
             : []
 
-    const via_allOf = node.allOf?.flatMap(
-        a => Object.entries(a.properties || {})) || []
+    // allOf can be nested, so call child_entries recursively
+    const via_allOf = (node.allOf || []).flatMap(subNode =>
+      child_entries(subNode)
+    )
 
     return [...via_properties, ...via_additionalProperties, ...via_allOf]
 }
diff --git a/test/fixtures/toc-bootstrap.html b/test/fixtures/toc-bootstrap.html
index 5a9cb908cb..a91f4471fb 100644
--- a/test/fixtures/toc-bootstrap.html
+++ b/test/fixtures/toc-bootstrap.html
@@ -73,7 +73,19 @@
          }
       },
       console: {
-
+         <a href="#logging-console-collation_buffer_size">collation_buffer_size</a>: 10,
+         <a href="#logging-console-color_enabled">color_enabled</a>: false,
+         <a href="#logging-console-enabled">enabled</a>: false,
+         <a href="#logging-console-file_output">file_output</a>: "string",
+         <a href="#logging-console-log_keys">log_keys</a>: ["CRUD,HTTP,Query"...],
+         <a href="#logging-console-log_level">log_level</a>: "info",
+         <a href="#logging-console-rotation">rotation</a>: {
+            <a href="#logging-console-rotation-localtime">localtime</a>: false,
+            <a href="#logging-console-rotation-max_age">max_age</a>: 0,
+            <a href="#logging-console-rotation-max_size">max_size</a>: 100,
+            <a href="#logging-console-rotation-rotated_logs_size_limit">rotated_logs_size_limit</a>: 1024,
+            <a href="#logging-console-rotation-rotation_interval">rotation_interval</a>: "0"
+         }
       },
       <a href="#logging-debug">debug</a>: {
          <a href="#logging-debug-collation_buffer_size">collation_buffer_size</a>: 1000,
diff --git a/test/test-each-openapi.js b/test/test-each-openapi.js
index 3573d88189..26ad28c7b8 100644
--- a/test/test-each-openapi.js
+++ b/test/test-each-openapi.js
@@ -310,6 +310,21 @@ describe('child_entries', function () {
         ['bar', {type: 'number'}]
       ])
   })
+
+  ok('via allOf recursive', function () {
+    assert.deepEqual(
+      child_entries({
+        allOf: [
+          {properties: {'outer': {type: 'string'}}},
+          {allOf: [{properties: {'inner': {type: 'number'}}}]}
+        ]
+      }),
+      [
+        ['outer', {type: 'string'}],
+        ['inner', {type: 'number'}]
+      ])
+  })
+
 })
 
 // Helper function to clean up whitespace in strings for comparison
@@ -318,4 +333,4 @@ function assert_equal_no_whitespace (actual, expected) {
   assert.equal(
     cleanup_whitespace(actual),
     cleanup_whitespace(expected))
-}
\ No newline at end of file
+}