fix partial build of camel-quarkus. PR tests will not pass until many other related PRs are applied
diff --git a/docs/.pnp.js b/docs/.pnp.js
index 60bc4cb..9db5fd9 100755
--- a/docs/.pnp.js
+++ b/docs/.pnp.js
@@ -39,8 +39,8 @@
"packageDependencies": [
["@antora/cli", "npm:3.0.0-alpha.9"],
["@antora/site-generator-default", "npm:3.0.0-alpha.9"],
- ["@djencks/asciidoctor-antora-indexer", "npm:0.0.6"],
- ["@djencks/asciidoctor-jsonpath", "npm:0.0.4"],
+ ["@djencks/asciidoctor-antora-indexer", "npm:0.1.0-alpha.1"],
+ ["@djencks/asciidoctor-jsonpath", "npm:0.1.0-alpha.1"],
["lite-server", "npm:2.5.4"],
["pino-pretty", "npm:5.1.3"]
],
@@ -278,10 +278,11 @@
}]
]],
["@djencks/asciidoctor-antora-indexer", [
- ["npm:0.0.6", {
- "packageLocation": "./.yarn/cache/@djencks-asciidoctor-antora-indexer-npm-0.0.6-4db3f3a720-70a23e1885.zip/node_modules/@djencks/asciidoctor-antora-indexer/",
+ ["npm:0.1.0-alpha.1", {
+ "packageLocation": "./.yarn/cache/@djencks-asciidoctor-antora-indexer-npm-0.1.0-alpha.1-015913d711-cbc7c0da4d.zip/node_modules/@djencks/asciidoctor-antora-indexer/",
"packageDependencies": [
- ["@djencks/asciidoctor-antora-indexer", "npm:0.0.6"],
+ ["@djencks/asciidoctor-antora-indexer", "npm:0.1.0-alpha.1"],
+ ["@djencks/asciidoctor-report-support", "npm:0.1.0-alpha.1"],
["camelcase-keys", "npm:6.2.2"],
["esprima", "npm:4.0.1"],
["picomatch", "npm:2.1.1"],
@@ -291,16 +292,27 @@
}]
]],
["@djencks/asciidoctor-jsonpath", [
- ["npm:0.0.4", {
- "packageLocation": "./.yarn/cache/@djencks-asciidoctor-jsonpath-npm-0.0.4-daa788a548-ba33c6567c.zip/node_modules/@djencks/asciidoctor-jsonpath/",
+ ["npm:0.1.0-alpha.1", {
+ "packageLocation": "./.yarn/cache/@djencks-asciidoctor-jsonpath-npm-0.1.0-alpha.1-7faec6e075-36431697f1.zip/node_modules/@djencks/asciidoctor-jsonpath/",
"packageDependencies": [
- ["@djencks/asciidoctor-jsonpath", "npm:0.0.4"],
+ ["@djencks/asciidoctor-jsonpath", "npm:0.1.0-alpha.1"],
["@antora/user-require-helper", "npm:2.0.0"],
+ ["@djencks/asciidoctor-report-support", "npm:0.1.0-alpha.1"],
["@iarna/toml", "npm:2.2.5"],
- ["esprima", "npm:4.0.1"],
["js-yaml", "npm:4.1.0"],
["json5", "npm:2.2.0"],
- ["jsonpath", "npm:1.1.1"],
+ ["jsonpath", "npm:1.1.1"]
+ ],
+ "linkType": "HARD",
+ }]
+ ]],
+ ["@djencks/asciidoctor-report-support", [
+ ["npm:0.1.0-alpha.1", {
+ "packageLocation": "./.yarn/cache/@djencks-asciidoctor-report-support-npm-0.1.0-alpha.1-8796513cc6-12900388ef.zip/node_modules/@djencks/asciidoctor-report-support/",
+ "packageDependencies": [
+ ["@djencks/asciidoctor-report-support", "npm:0.1.0-alpha.1"],
+ ["@antora/user-require-helper", "npm:2.0.0"],
+ ["esprima", "npm:4.0.1"],
["static-eval", "npm:2.1.0"]
],
"linkType": "HARD",
@@ -968,8 +980,8 @@
["camel-quarkus-docs", "workspace:."],
["@antora/cli", "npm:3.0.0-alpha.9"],
["@antora/site-generator-default", "npm:3.0.0-alpha.9"],
- ["@djencks/asciidoctor-antora-indexer", "npm:0.0.6"],
- ["@djencks/asciidoctor-jsonpath", "npm:0.0.4"],
+ ["@djencks/asciidoctor-antora-indexer", "npm:0.1.0-alpha.1"],
+ ["@djencks/asciidoctor-jsonpath", "npm:0.1.0-alpha.1"],
["lite-server", "npm:2.5.4"],
["pino-pretty", "npm:5.1.3"]
],
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index a9d5fed..6fb9cb9 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -51,9 +51,11 @@
- url: https://github.com/apache/camel-spring-boot.git
branches:
- camel-spring-boot-3.11.x # replace ${camel.sb.docs.branch}
- start_path: docs
+ start_path: docs/components
asciidoc:
+ attributes:
+ requires@: "'util=util/jsonpath-util.js'"
extensions:
- "@djencks/asciidoctor-antora-indexer"
diff --git a/docs/package.json b/docs/package.json
index f1cd251..d77b31e 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -12,8 +12,8 @@
"devDependencies": {
"@antora/cli": "^3.0.0-alpha.9",
"@antora/site-generator-default": "^3.0.0-alpha.9",
- "@djencks/asciidoctor-antora-indexer": "^0.0.6",
- "@djencks/asciidoctor-jsonpath": "^0.0.4",
+ "@djencks/asciidoctor-antora-indexer": "^0.1.0-alpha.1",
+ "@djencks/asciidoctor-jsonpath": "^0.1.0-alpha.1",
"lite-server": "^2.4.0",
"pino-pretty": "^5.0.0"
},
diff --git a/docs/util/jsonpath-util.js b/docs/util/jsonpath-util.js
index e0b7d7d..df51c70 100644
--- a/docs/util/jsonpath-util.js
+++ b/docs/util/jsonpath-util.js
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+const RESOURCEID_RX = /[^$]*\$json\/(.*)\.json/
+
module.exports = {
alias: (name, aliases) => {
for (expr of (aliases || '').split(',')) {
@@ -27,14 +29,20 @@
return ''
},
+ boldLink: (text, idPrefix, suffix = '') => {
+ const idText = `_${idPrefix}_${text.split('.').join('_')}`
+ text = suffix ? `*${text}* (${suffix})` : `*${text}*`
+ return `[#${idText}]\nxref:#${idText}['',role=anchor]${text}`
+ },
+
description: (value) => {
try {
- return module.exports.strong(value, "Autowired")
- + module.exports.strong(value, "Required")
- + module.exports.strong(value, "Deprecated")
- + module.exports.escapeAttributes(value.description) + (value.description.endsWith(".") ? "" : ".")
- + (value.deprecatedNote ? `\n\nNOTE: ${value.deprecatedNote}` : "")
- + (value.enum ? `${["\n\nEnum values:\n"].concat(value.enum).join("\n* ")}` : "")
+ return module.exports.strong(value, 'Autowired')
+ + module.exports.strong(value, 'Required')
+ + module.exports.strong(value, 'Deprecated')
+ + (value.description ? module.exports.escapeAttributes(value.description) + (value.description.endsWith('.') ? '' : '.') : '')
+ + (value.deprecatedNote ? `\n\nNOTE: ${value.deprecatedNote}` : '')
+ + (value.enum ? `${['\n\nEnum values:\n'].concat(value.enum).join('\n* ')}` : '')
} catch (e) {
console.log('error', e)
return e.msg()
@@ -42,7 +50,12 @@
},
escapeAttributes: (text) => {
- return text.split('{').join('\\{')
+ return text ? text.split('{').join('\\{') : text
+ },
+
+ extractSBName: (resourceid) => {
+ const m =resourceid.match(RESOURCEID_RX)
+ return m ? m[1] : 'no match'
},
formatSignature: (signature) => {
@@ -69,9 +82,17 @@
return 'Both producer and consumer are supported'
},
+ starterArtifactId: (data) => {
+ return data['starter-artifactid'] ? data['starter-artifactid'] : `${data.artifactid}-starter`
+ },
+
strong: (data, text) => {
return data[text.toLowerCase()] ? `*${text}* ` : ''
},
+
+ valueAsString: (value) => {
+ return value === undefined ? '' : `${value}`
+ },
}
function splitOnce (querySpec, token = '=') {
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 74410cd..3c3ea8c 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -219,30 +219,41 @@
languageName: node
linkType: hard
-"@djencks/asciidoctor-antora-indexer@npm:^0.0.6":
- version: 0.0.6
- resolution: "@djencks/asciidoctor-antora-indexer@npm:0.0.6"
+"@djencks/asciidoctor-antora-indexer@npm:^0.1.0-alpha.1":
+ version: 0.1.0-alpha.1
+ resolution: "@djencks/asciidoctor-antora-indexer@npm:0.1.0-alpha.1"
dependencies:
+ "@djencks/asciidoctor-report-support": ^0.1.0-alpha.1
camelcase-keys: ^6.2.2
esprima: ^4.0.1
picomatch: ~2.1
static-eval: ^2.1.0
- checksum: 70a23e188556933524608702c30635400852e8b0d59940f74d41fdc0220f667510d3d98681f94eb11c8d6fc60209da1216b93667852a36099de35b0b774b69d2
+ checksum: cbc7c0da4d1b829a2bedabaf7da36b3d6c59467f306ca69851a4caaebb96859ddaa6242aa4a2821d7f5b24eb9ed8729c90f5c799d59a458d0fe9a29e1aaf9d71
languageName: node
linkType: hard
-"@djencks/asciidoctor-jsonpath@npm:^0.0.4":
- version: 0.0.4
- resolution: "@djencks/asciidoctor-jsonpath@npm:0.0.4"
+"@djencks/asciidoctor-jsonpath@npm:^0.1.0-alpha.1":
+ version: 0.1.0-alpha.1
+ resolution: "@djencks/asciidoctor-jsonpath@npm:0.1.0-alpha.1"
dependencies:
"@antora/user-require-helper": ^2.0.0
+ "@djencks/asciidoctor-report-support": ^0.1.0-alpha.1
"@iarna/toml": ^2.2.5
- esprima: ^4.0.1
js-yaml: ^4.1.0
json5: ^2.2.0
jsonpath: ^1.1.1
+ checksum: 36431697f1bda79356c1eb61d01657c605d0ca3e21dcd3874411219ee720569e3d976fc7eb2e5527fd6f1b31cc36339e702275e44cd77d4f845d1e2e66c9454e
+ languageName: node
+ linkType: hard
+
+"@djencks/asciidoctor-report-support@npm:^0.1.0-alpha.1":
+ version: 0.1.0-alpha.1
+ resolution: "@djencks/asciidoctor-report-support@npm:0.1.0-alpha.1"
+ dependencies:
+ "@antora/user-require-helper": ^2.0.0
+ esprima: ^4.0.1
static-eval: ^2.1.0
- checksum: ba33c6567cb4814f778aeafc4a9519a0b9acc27c832c542143294bff69684cdeb2d2c2bbf69fdadb13493a6fd8be7c6de32247e954f85b11ead12bc2af649da0
+ checksum: 12900388efc2624e6e2cb700c412a12c0298fc01c6d4a59b249e41e3d71cd8aeeb248590032d261724c9da7240a647c902ecb66f255b14278d7ef59c24e70f8a
languageName: node
linkType: hard
@@ -822,8 +833,8 @@
dependencies:
"@antora/cli": ^3.0.0-alpha.9
"@antora/site-generator-default": ^3.0.0-alpha.9
- "@djencks/asciidoctor-antora-indexer": ^0.0.6
- "@djencks/asciidoctor-jsonpath": ^0.0.4
+ "@djencks/asciidoctor-antora-indexer": ^0.1.0-alpha.1
+ "@djencks/asciidoctor-jsonpath": ^0.1.0-alpha.1
lite-server: ^2.4.0
pino-pretty: ^5.0.0
dependenciesMeta:
