From 2e0bbf8515b2656a4a25f72cb4f3291c4180ee39 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@users.noreply.github.com>
Date: Fri, 13 Dec 2024 16:52:18 -0700
Subject: [PATCH 1/5] doveadm: Add support for adding example arguments to
 doveadm commands

These example arguments will be used for building example command/HTTP
queries
---
 components/DoveadmComponent.vue | 4 ++++
 data/doveadm.js                 | 5 +++++
 lib/data/doveadm.data.js        | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/components/DoveadmComponent.vue b/components/DoveadmComponent.vue
index 00b4278e6..b257f07d5 100644
--- a/components/DoveadmComponent.vue
+++ b/components/DoveadmComponent.vue
@@ -106,6 +106,7 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
         <th>Argument(s)</th>
         <th>Type</th>
         <th>Description</th>
+        <th>Example</th>
        </tr>
       </thead>
       <tbody>
@@ -114,6 +115,7 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
          <td><code>{{ elem.flag }}</code></td>
          <td>{{ elem.type }}</td>
          <td v-html="elem.text" />
+         <td><code v-if="elem.example">{{ elem.example }}</code></td>
         </tr>
        </template>
       </tbody>
@@ -130,6 +132,7 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
         <th>Parameter</th>
         <th>Type</th>
         <th>Description</th>
+        <th>Example</th>
        </tr>
       </thead>
       <tbody>
@@ -138,6 +141,7 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
          <td><code>{{ elem.param }}</code></td>
          <td>{{ elem.type }}</td>
          <td v-html="elem.text" />
+         <td><code v-if="elem.example">{{ elem.example }}</code></td>
         </tr>
        </template>
       </tbody>
diff --git a/data/doveadm.js b/data/doveadm.js
index 91e27598d..56c0680b2 100644
--- a/data/doveadm.js
+++ b/data/doveadm.js
@@ -20,6 +20,11 @@ export const doveadm = {
 				// If true, only show for cli, not HTTP.
 				// cli_only: true,
 
+				// If set, will use as command example argument.
+				// i.e., for HTTP API requests, this argument will be added
+				// to the example argument string.
+				example: false,
+
 				// If true, this is an optional positional argument.
 				// optional: true,
 
diff --git a/lib/data/doveadm.data.js b/lib/data/doveadm.data.js
index c60fe6ab3..9dc4fb1ac 100644
--- a/lib/data/doveadm.data.js
+++ b/lib/data/doveadm.data.js
@@ -124,6 +124,8 @@ async function normalizeDoveadm(doveadm) {
 			for (const [k2, v2] of Object.entries(v.args)) {
 				if (!v2.hidden) {
 					args.push({
+						/* Undefined examples will resolve to undefined. */
+						example: v2.example,
 						flag: v2.cli ? '-' + v2.cli : (v2.positional ? k2 : '--' + k2),
 						param: argToHttpParam(k2),
 						type: typeToString(v2.type),

From 9f5c1b51fe10dfe4c5136bbb5076eb758f4eb190 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@users.noreply.github.com>
Date: Fri, 13 Dec 2024 23:56:46 -0700
Subject: [PATCH 2/5] doveadm: Output HTTP API examples for each command

Dynamically generate this data only when the user clicks on the API
documentation for a command, otherwise we are creating giant pages
which will noticeably slowdown browsing.

Additionally, add the command name to the HTTP output as well, since
that was previously missing (although it can be found in the request
example, it is not clearly labeled there).
---
 components/DoveadmComponent.vue        | 33 +++------
 components/DoveadmHttpApiComponent.vue | 92 ++++++++++++++++++++++++++
 lib/data/doveadm.data.js               |  5 ++
 package-lock.json                      | 14 ++++
 package.json                           |  1 +
 5 files changed, 121 insertions(+), 24 deletions(-)
 create mode 100644 components/DoveadmHttpApiComponent.vue

diff --git a/components/DoveadmComponent.vue b/components/DoveadmComponent.vue
index b257f07d5..09e85f24f 100644
--- a/components/DoveadmComponent.vue
+++ b/components/DoveadmComponent.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { data } from '../lib/data/doveadm.data.js'
+import { ref } from 'vue'
 
 /* Properties for this component:
  * 'plugin' (string): Filter by the plugin property.
@@ -16,6 +17,11 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
 	 ((v.plugin && v.plugin == props.tag) ||
 	  (v.tags.includes(props.tag))))
 ).sort())
+
+let apiComponent = ref({})
+function httpApiClick(k) {
+	apiComponent.value[k] = 'DoveadmHttpApiComponent'
+}
 </script>
 
 <style scoped>
@@ -115,7 +121,7 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
          <td><code>{{ elem.flag }}</code></td>
          <td>{{ elem.type }}</td>
          <td v-html="elem.text" />
-         <td><code v-if="elem.example">{{ elem.example }}</code></td>
+         <td><code v-if="elem.example !== undefined">{{ JSON.stringify(elem.example) }}</code></td>
         </tr>
        </template>
       </tbody>
@@ -123,30 +129,9 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
     </div>
    </div>
 
-   <details v-if="v.args" class="details custom-block">
+   <details v-if="v.args" @click.capture.once="httpApiClick(k)" class="details custom-block">
     <summary v-html="data.http_api_link" />
-    <div>
-     <table>
-      <thead>
-       <tr>
-        <th>Parameter</th>
-        <th>Type</th>
-        <th>Description</th>
-        <th>Example</th>
-       </tr>
-      </thead>
-      <tbody>
-       <template v-for="elem in v.args">
-        <tr>
-         <td><code>{{ elem.param }}</code></td>
-         <td>{{ elem.type }}</td>
-         <td v-html="elem.text" />
-         <td><code v-if="elem.example">{{ elem.example }}</code></td>
-        </tr>
-       </template>
-      </tbody>
-     </table>
-    </div>
+    <component v-if="apiComponent[k]" :is="apiComponent[k]" :data="v" />
    </details>
 
   </article>
diff --git a/components/DoveadmHttpApiComponent.vue b/components/DoveadmHttpApiComponent.vue
new file mode 100644
index 000000000..6a87b00e8
--- /dev/null
+++ b/components/DoveadmHttpApiComponent.vue
@@ -0,0 +1,92 @@
+<script setup>
+/* Properties for this component:
+ * 'data' (object): The command argument data.
+ *
+ * Note: Clipboard behavior is handled by re-using the Vitepress code.
+ */
+const props = defineProps(['data'])
+const d = props.data
+
+const args = {}
+for (let elem of d.args.filter(e => e.example !== undefined && !e.cli_only)) {
+	args[elem.param] = elem.example
+}
+
+const jsonReq =
+[
+	[
+		d.http_cmd,
+		args,
+		"tag1"
+	]
+]
+</script>
+
+<template>
+ <div>
+  <p class="custom-block-title">
+   Command Name: <code>{{ d.http_cmd }}</code>
+  </p>
+
+  <table>
+   <thead>
+    <tr>
+     <th>Parameter</th>
+     <th>Type</th>
+     <th>Description</th>
+     <th>Example</th>
+    </tr>
+   </thead>
+   <tbody>
+    <template v-for="elem in d.args">
+     <tr v-if="!elem.cli_only">
+      <td><code>{{ elem.param }}</code></td>
+      <td>{{ elem.type }}</td>
+      <td v-html="elem.text" />
+      <td><code v-if="elem.example">{{ JSON.stringify(elem.example) }}</code></td>
+     </tr>
+    </template>
+   </tbody>
+  </table>
+
+  <p class="custom-block-title">Example Request Payload</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>{{ JSON.stringify(jsonReq, null, 4) }}</code></pre>
+  </div>
+
+  <p class="custom-block-title">Example Curl Request (using Dovecot API Key)</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>curl -X POST -H "Authorization: X-Dovecot-API &lt;base64 encoded dovecot_api_key&gt;" -H "Content-Type: application/json" -d '{{ JSON.stringify(jsonReq) }}' http://example.com:8080/doveadm/v1</code></pre>
+  </div>
+
+  <p class="custom-block-title">Example Curl Request (using Doveadm Password)</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>curl -X POST -u doveadm:secretpassword -H "Content-Type: application/json" -d '{{ JSON.stringify(jsonReq) }}' http://example.com:8080/doveadm/v1</code></pre>
+  </div>
+
+  <p class="custom-block-title">Example Wget Request (using Dovecot API Key)</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>wget --header="Authorization: X-Dovecot-API &lt;base64 encoded dovecot_api_key&gt;" --header="Content-Type: application/json" --post-data='{{ JSON.stringify(jsonReq) }}' --output-document - http://example.com:8080/doveadm/v1</code></pre>
+  </div>
+
+  <p class="custom-block-title">Example Wget Request (using Doveadm Password)</p>
+
+  <div class="language- vp-adaptive-theme">
+   <button class="copy" title="Copy" />
+   <span class="lang"></span>
+   <pre><code>wget --header="Content-Type: application/json" --user=doveadm --password=password --auth-no-challenge --post-data='{{ JSON.stringify(jsonReq) }}' --output-document - http://example.com:8080/doveadm/v1</code></pre>
+  </div>
+ </div>
+</template>
diff --git a/lib/data/doveadm.data.js b/lib/data/doveadm.data.js
index 9dc4fb1ac..7816107be 100644
--- a/lib/data/doveadm.data.js
+++ b/lib/data/doveadm.data.js
@@ -1,6 +1,7 @@
 import { doveadm_arg_types, doveadm_flag_types, getDoveadmCmdLine } from '../doveadm.js'
 import { getVitepressMd } from '../markdown.js'
 import { addWatchPaths, loadData, normalizeArrayData } from '../utility.js'
+import camelCase from 'camelcase'
 import slugify from '@sindresorhus/slugify'
 
 const doveadm_userargs = {
@@ -125,6 +126,7 @@ async function normalizeDoveadm(doveadm) {
 				if (!v2.hidden) {
 					args.push({
 						/* Undefined examples will resolve to undefined. */
+						cli_only: v2.cli_only,
 						example: v2.example,
 						flag: v2.cli ? '-' + v2.cli : (v2.positional ? k2 : '--' + k2),
 						param: argToHttpParam(k2),
@@ -138,6 +140,9 @@ async function normalizeDoveadm(doveadm) {
 		if (!v.args || !v.args.length) {
 			delete v['args']
 		}
+
+		/* HTTP API info. */
+		v.http_cmd = camelCase(k)
 	}
 
 	return {
diff --git a/package-lock.json b/package-lock.json
index a0dd608e0..d6d86118f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,6 +6,7 @@
     "": {
       "devDependencies": {
         "@sindresorhus/slugify": "^2.2.1",
+        "camelcase": "^8.0.0",
         "commander": "^12.1.0",
         "dayjs": "^1.11.13",
         "fast-glob": "^3.3.2",
@@ -1923,6 +1924,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/camelcase": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz",
+      "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ccount": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
diff --git a/package.json b/package.json
index 34d6c9d7c..3852003af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "devDependencies": {
     "@sindresorhus/slugify": "^2.2.1",
+    "camelcase": "^8.0.0",
     "commander": "^12.1.0",
     "dayjs": "^1.11.13",
     "fast-glob": "^3.3.2",

From edfe7d70abe4a3ab5c3782920571c3bcd2ceaa2e Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:56:13 -0700
Subject: [PATCH 3/5] doveadm: CLI usage information should be displayed the
 same as HTTP API

Namely, hide under a clickable element, so user only sees the doveadm mode
they need after clicking.
---
 components/DoveadmCliComponent.vue | 36 ++++++++++++++++++++++
 components/DoveadmComponent.vue    | 49 +++++++++---------------------
 2 files changed, 50 insertions(+), 35 deletions(-)
 create mode 100644 components/DoveadmCliComponent.vue

diff --git a/components/DoveadmCliComponent.vue b/components/DoveadmCliComponent.vue
new file mode 100644
index 000000000..eec92ead7
--- /dev/null
+++ b/components/DoveadmCliComponent.vue
@@ -0,0 +1,36 @@
+<script setup>
+/* Properties for this component:
+ * 'data' (object): The command argument data.
+ */
+const props = defineProps(['data'])
+const d = props.data
+</script>
+
+<template>
+ <div>
+  <ul>
+   <li>Usage: <code>doveadm {{ d.usage }}</code></li>
+  </ul>
+
+  <table v-if="d.args">
+   <thead>
+    <tr>
+     <th>Argument(s)</th>
+     <th>Type</th>
+     <th>Description</th>
+     <th>Example</th>
+    </tr>
+   </thead>
+   <tbody>
+    <template v-for="elem in d.args">
+     <tr>
+      <td><code>{{ elem.flag }}</code></td>
+      <td>{{ elem.type }}</td>
+      <td v-html="elem.text" />
+      <td><code v-if="elem.example !== undefined">{{ JSON.stringify(elem.example) }}</code></td>
+     </tr>
+    </template>
+   </tbody>
+  </table>
+ </div>
+</template>
diff --git a/components/DoveadmComponent.vue b/components/DoveadmComponent.vue
index 09e85f24f..91a3e0a8b 100644
--- a/components/DoveadmComponent.vue
+++ b/components/DoveadmComponent.vue
@@ -18,9 +18,14 @@ const d = Object.fromEntries(Object.entries(data.doveadm).filter(([k, v]) =>
 	  (v.tags.includes(props.tag))))
 ).sort())
 
-let apiComponent = ref({})
-function httpApiClick(k) {
-	apiComponent.value[k] = 'DoveadmHttpApiComponent'
+const cliComponent = ref({})
+function cliClick(k) {
+	cliComponent.value[k] = 'DoveadmCliComponent'
+}
+
+const httpComponent = ref({})
+function httpClick(k) {
+	httpComponent.value[k] = 'DoveadmHttpApiComponent'
 }
 </script>
 
@@ -99,41 +104,15 @@ function httpApiClick(k) {
 
    <div v-if="v.text" v-html="v.text" />
 
-   <div class="info custom-block">
-    <p class="custom-block-title">CLI</p>
-    <div>
-     <ul>
-      <li>Usage: <code>doveadm {{ v.usage }}</code></li>
-     </ul>
-
-     <table v-if="v.args">
-      <thead>
-       <tr>
-        <th>Argument(s)</th>
-        <th>Type</th>
-        <th>Description</th>
-        <th>Example</th>
-       </tr>
-      </thead>
-      <tbody>
-       <template v-for="elem in v.args">
-        <tr>
-         <td><code>{{ elem.flag }}</code></td>
-         <td>{{ elem.type }}</td>
-         <td v-html="elem.text" />
-         <td><code v-if="elem.example !== undefined">{{ JSON.stringify(elem.example) }}</code></td>
-        </tr>
-       </template>
-      </tbody>
-     </table>
-    </div>
-   </div>
+   <details @click.capture.once="cliClick(k)" class="details custom-block">
+    <summary>CLI</summary>
+    <component v-if="cliComponent[k]" :is="cliComponent[k]" :data="v" />
+   </details>
 
-   <details v-if="v.args" @click.capture.once="httpApiClick(k)" class="details custom-block">
+   <details v-if="v.args" @click.capture.once="httpClick(k)" class="details custom-block">
     <summary v-html="data.http_api_link" />
-    <component v-if="apiComponent[k]" :is="apiComponent[k]" :data="v" />
+    <component v-if="httpComponent[k]" :is="httpComponent[k]" :data="v" />
    </details>
-
   </article>
  </section>
 </template>

From 1d672278b6e28bc6456fb529be18f52a8c6d64c5 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@users.noreply.github.com>
Date: Tue, 17 Dec 2024 18:05:41 -0700
Subject: [PATCH 4/5] doveadm: Add missing man pages to various entries

---
 data/doveadm.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/doveadm.js b/data/doveadm.js
index 56c0680b2..ec292223d 100644
--- a/data/doveadm.js
+++ b/data/doveadm.js
@@ -1321,6 +1321,7 @@ Applicable to [[link,mdbox]] and [[link,sdbox]] mailbox formats only.
 		},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
+		man: 'doveadm-mailbox-cryptokey',
 		text: `
 Generate new keypair for user or folder.
 
@@ -1357,6 +1358,7 @@ to secure it.
 		fields: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
+		man: 'doveadm-mailbox-cryptokey',
 		text: `List all keys for user or mailbox.`
 	},
 
@@ -1376,6 +1378,7 @@ to secure it.
 		fields: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
+		man: 'doveadm-mailbox-cryptokey',
 		text: `Exports user or folder private keys.`
 	},
 
@@ -1410,6 +1413,7 @@ to secure it.
 		fields: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
+		man: 'doveadm-mailbox-cryptokey',
 		text: `Sets, changes or clears password for user's private key.`
 	},
 
@@ -1563,7 +1567,7 @@ to secure it.
 				type: doveadm_arg_types.ARRAY
 			},
 		},
-		// TODO: Missing man page
+		man: 'doveadm-mailbox',
 	},
 
 	'mailbox path': {
@@ -2022,7 +2026,7 @@ returned.`,
 		man: 'doveadm-sieve'
 	},
 
-	/* Deprecated. TODO: No man page, but that might be ok? */
+	/* Deprecated. */
 	'sis find': {
 		args: {
 			'root-dir': {

From 25e850cc8871d7cbe0e9eade61b9f42901b461e8 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@users.noreply.github.com>
Date: Tue, 17 Dec 2024 19:00:22 -0700
Subject: [PATCH 5/5] doveadm: Rework response documentation

The old 'fields' entry in data/doveadm.js has been replaced with the
'response' entry.

This new entry allows for text description and data type output.

Output example JSON server response in the HTTP API block.
---
 components/DoveadmComponent.vue        | 14 ++++----
 components/DoveadmHttpApiComponent.vue | 26 +++++++++++++++
 data/doveadm.js                        | 33 ++++++++++++++-----
 lib/data/doveadm.data.js               | 44 ++++++++++++++++----------
 lib/doveadm.js                         |  6 ++++
 5 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/components/DoveadmComponent.vue b/components/DoveadmComponent.vue
index 91a3e0a8b..50e55403a 100644
--- a/components/DoveadmComponent.vue
+++ b/components/DoveadmComponent.vue
@@ -49,7 +49,7 @@ function httpClick(k) {
     <a class="header-anchor" :href="'#' + k"></a>
    </h3>
 
-   <table v-if="v.man_link || v.fields || v.added || v.changed || v.deprecated || v.removed">
+   <table v-if="v.man_link || v.response || v.added || v.changed || v.deprecated || v.removed">
     <tbody>
      <tr v-if="v.man_link">
       <th style="text-align: right;">Man Page</th>
@@ -80,20 +80,22 @@ function httpClick(k) {
       </td>
     </tr>
 
-     <tr v-if="v.fields">
-      <th style="text-align: right;">Return Values</th>
+     <tr v-if="v.response">
+      <th style="text-align: right;">Response Values</th>
       <td>
        <table>
         <thead>
          <tr>
           <th>Key</th>
-          <th>Value</th>
+          <th>Type</th>
+          <th>Description</th>
          </tr>
         </thead>
         <tbody>
-         <tr v-for="elem in v.fields">
+         <tr v-for="elem in v.response">
           <td><code>{{ elem.key }}</code></td>
-          <td v-html="elem.value" />
+          <td v-html="elem.type" />
+          <td v-html="elem.text" />
          </tr>
         </tbody>
        </table>
diff --git a/components/DoveadmHttpApiComponent.vue b/components/DoveadmHttpApiComponent.vue
index 6a87b00e8..4feacb1c2 100644
--- a/components/DoveadmHttpApiComponent.vue
+++ b/components/DoveadmHttpApiComponent.vue
@@ -20,6 +20,22 @@ const jsonReq =
 		"tag1"
 	]
 ]
+
+const resp = {}
+if (d.response) {
+	for (let elem of d.response) {
+		resp[elem.key] = elem.example
+	}
+}
+
+const jsonResp =
+[
+	[
+		"doveadmResponse",
+		[ resp ],
+		"tag1"
+	]
+]
 </script>
 
 <template>
@@ -88,5 +104,15 @@ const jsonReq =
    <span class="lang"></span>
    <pre><code>wget --header="Content-Type: application/json" --user=doveadm --password=password --auth-no-challenge --post-data='{{ JSON.stringify(jsonReq) }}' --output-document - http://example.com:8080/doveadm/v1</code></pre>
   </div>
+
+  <template v-if="d.response?.length">
+   <p class="custom-block-title">Example Server Response</p>
+
+   <div class="language- vp-adaptive-theme">
+    <button class="copy" title="Copy" />
+    <span class="lang"></span>
+     <pre><code>{{ JSON.stringify(jsonResp, null, 4) }}</code></pre>
+   </div>
+  </template>
  </div>
 </template>
diff --git a/data/doveadm.js b/data/doveadm.js
index ec292223d..6cef96428 100644
--- a/data/doveadm.js
+++ b/data/doveadm.js
@@ -2,7 +2,8 @@
 import { doveadm_arg_types,
 		 doveadm_args_query,
 		 doveadm_args_usermask,
-		 doveadm_flag_types } from '../lib/doveadm.js'
+		 doveadm_flag_types,
+		 doveadm_response_types } from '../lib/doveadm.js'
 
 export const doveadm = {
 
@@ -51,8 +52,21 @@ export const doveadm = {
 		// deprecated: {},
 		// removed: {},
 
-		// Fields/Values returned. Values are rendered w/Markdown.
-		// fields: {},
+		// Response data.
+		// KEY = identifier
+		// response: {
+		//     key: {
+		//         // An example value to be used in documentation.
+		//         example: 0,
+		//
+		//         // The description of the response data type.
+		//         // Rendered w/Markdown.
+		//         text: `Description`,
+		//
+		//         // The response data type
+		//         type: doveadm_response_types.INTEGER,
+		//     }
+		// },
 
 		// What doveadm flags does this command support (bit field)
 		// Arguments are automatically added for each flag set
@@ -237,8 +251,11 @@ Applicable to [[link,mdbox]] and [[link,sdbox]] mailbox formats only.
 				text: `UID of user to apply operation to.`,
 			},
 		},
-		fields: {
-			'entries': 0
+		response: {
+			entries: {
+				type: doveadm_response_types.INTEGER,
+				text: `The number of cache entries flushed.`
+			},
 		},
 		man: 'doveadm-auth',
 		text: `Flush authentication cache.`,
@@ -1355,7 +1372,7 @@ to secure it.
 				text: `Mailbox mask.`
 			},
 		},
-		fields: {},
+		response: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
 		man: 'doveadm-mailbox-cryptokey',
@@ -1375,7 +1392,7 @@ to secure it.
 				text: `Mailbox mask.`
 			},
 		},
-		fields: {},
+		response: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
 		man: 'doveadm-mailbox-cryptokey',
@@ -1410,7 +1427,7 @@ to secure it.
 				text: `Old password.`
 			},
 		},
-		fields: {},
+		response: {},
 		flags: doveadm_flag_types.USER,
 		plugin: 'mail-crypt',
 		man: 'doveadm-mailbox-cryptokey',
diff --git a/lib/data/doveadm.data.js b/lib/data/doveadm.data.js
index 7816107be..d783c8b14 100644
--- a/lib/data/doveadm.data.js
+++ b/lib/data/doveadm.data.js
@@ -1,4 +1,4 @@
-import { doveadm_arg_types, doveadm_flag_types, getDoveadmCmdLine } from '../doveadm.js'
+import { doveadm_arg_types, doveadm_flag_types, doveadm_response_types, getDoveadmCmdLine } from '../doveadm.js'
 import { getVitepressMd } from '../markdown.js'
 import { addWatchPaths, loadData, normalizeArrayData } from '../utility.js'
 import camelCase from 'camelcase'
@@ -39,17 +39,26 @@ const doveadm_userfileargs = {
 function typeToString(type) {
 	switch (type) {
 	case doveadm_arg_types.ARRAY:
-		return 'array';
+		return 'array'
 	case doveadm_arg_types.BOOL:
-		return 'boolean';
+		return 'boolean'
 	case doveadm_arg_types.INTEGER:
-		return 'integer';
+		return 'integer'
 	case doveadm_arg_types.STRING:
-		return 'string';
+		return 'string'
 	case doveadm_arg_types.SEARCH_QUERY:
-		return 'search_query';
+		return 'search_query'
 	case doveadm_arg_types.ISTREAM:
-		return 'istream';
+		return 'istream'
+	}
+}
+
+function responseTypeLookup(type) {
+	switch (type) {
+	case doveadm_response_types.INTEGER:
+		return [ 'integer', 1 ]
+	case doveadm_response_types.STRING:
+		return [ 'string', 'example' ]
 	}
 }
 
@@ -97,19 +106,22 @@ async function normalizeDoveadm(doveadm) {
 			}
 		}
 
-		/* Return values. */
-		if (v.fields) {
-			const fields = []
-			for (const [k2, v2] of Object.entries(v.fields)) {
-				fields.push({
+		/* Response values. */
+		if (v.response) {
+			const response = []
+			for (const [k2, v2] of Object.entries(v.response)) {
+				var rtl = responseTypeLookup(v2.type)
+				response.push({
+					example: v2.example ?? rtl[1],
 					key: k2,
-					value: v2 ? md.renderInline(String(v2)) : null
+					type: rtl[0],
+					text: v2.text ? md.renderInline(String(v2.text)) : null
 				})
 			}
-			v.fields = fields
+			v.response = response
 		}
-		if (!v.fields || !v.fields.length) {
-			delete v['fields']
+		if (!v.response || !v.response.length) {
+			delete v['response']
 		}
 
 		/* Text Description. */
diff --git a/lib/doveadm.js b/lib/doveadm.js
index 548a9f057..b6367db44 100644
--- a/lib/doveadm.js
+++ b/lib/doveadm.js
@@ -16,6 +16,12 @@ export const doveadm_flag_types = {
 	USERMASK:		4,
 }
 
+/* List of Doveadm response value types. */
+export const doveadm_response_types = {
+	INTEGER:	1,
+	STRING:		2,
+}
+
 export const doveadm_args_query = {
 	//example: ['mailbox', 'INBOX/myfoldertoo', 'savedbefore', 'since', '30d'],
 	positional: true,