⚠️<%= diagnostic.message %>
<%= diagnostic.path %>
diff --git a/src/components/Info.ejs b/src/components/Info.ejs index a4d499c..9ac28ce 100644 --- a/src/components/Info.ejs +++ b/src/components/Info.ejs @@ -1,7 +1,5 @@<%= title %> <%= version %> documentation
-<% if(extensions && extensions.has('x-logo')) { %> --
<% if (specId) { %>
-
diff --git a/src/components/Info.ts b/src/components/Info.ts
deleted file mode 100644
index 87a6c72..0000000
--- a/src/components/Info.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {AsyncAPIDocumentInterface } from '@asyncapi/parser';
-
-export default function info(asyncapi:AsyncAPIDocumentInterface) {
-
- const info = asyncapi.info();
- const defaultContentType = asyncapi.defaultContentType();
- const specId = info.id();
- const termsOfService = info.termsOfService();
- const license = info.license();
- const contact = info.contact();
- const externalDocs = info.externalDocs();
- const extensions: any = info.extensions();
-
- const infoList = [];
- if (specId) {
- infoList.push(`Specification ID: \`${specId}\``);
- }
- if (license) {
- infoList.push(license.url() ? (
- `License: [${license.name()}](${license.url()})`
- ) : `License: ${license.name()}`);
- }
- if (termsOfService) {
- infoList.push(
- `[${termsOfService}](${termsOfService})`
- );
- }
- if (defaultContentType) {
- infoList.push(
- `Default content type: [${defaultContentType}](https://www.iana.org/assignments/media-types/${defaultContentType})`
- );
- }
- if (contact) {
- if (contact.url()) {
- infoList.push(
- `Support: [${contact.url()}](${contact.name() || 'Link'})`
- );
- }
- if (contact.email()) {
- infoList.push(
- `Email support: [${`mailto:${contact.email()}`}](${contact.email()})`
- );
- }
- }
-
- return (
- `
-# ${info.title()} ${info.version()} documentation
-
-${
- infoList.map((value)=>{
- return '\n* '+ value;
- })
-}
-
-)?extensions.get('x-logo').value():null})
-
-
-#### ${info.description()}
- `);
-}
\ No newline at end of file
diff --git a/src/components/MermaidDiagram.ts b/src/components/MermaidDiagram.ts
deleted file mode 100644
index 179d866..0000000
--- a/src/components/MermaidDiagram.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {AsyncAPIDocumentInterface } from '@asyncapi/parser';
-
-export default function mermaidDiagram(asyncapi:AsyncAPIDocumentInterface){
-
-
- return ``;
-}
\ No newline at end of file
diff --git a/src/components/Message.ejs b/src/components/Message.ejs
index 7986a83..f03f183 100644
--- a/src/components/Message.ejs
+++ b/src/components/Message.ejs
@@ -1,4 +1,4 @@
-<% if (message) {
+<% if (message && !message.incorrect) {
const messageId = message.id();
const headers = message.headers();
const payload = message.payload();
@@ -35,11 +35,11 @@
<% if(correlationId) { %>
- - Correlation ID: <%= correlationId.location() %> + Correlation ID: <%= correlationId?.location() %> - <% if(correlationId.hasDescription()) { %> + <% if(correlationId?.hasDescription()) { %>
- <%- md.render(correlationId.description()) %> + <%- md.render(correlationId?.description()) %> <% } %>Headers
- <%- include(schemaPath,{schema:headers,schemaName:"", hideTitle:true, schemaHelper, md, path:""}) %> + <%- include(schemaPath,{schema:headers.schema? headers.schema : headers,schemaName:"", hideTitle:true, schemaHelper, md, path:""}) %> <% const ex = messageHelper.getHeadersExamples(message); if (ex) { %>Examples of headers
@@ -76,11 +76,34 @@ <% } %> <% } %> - <% } %> + <% }else if(headers && headers.incorrect) { %> + <% function renderHeaderObject(obj, indent) { %> + <% for (let key in obj) { %> + <% if (key != 'incorrect') { %> + <% if (typeof obj[key] === 'object' && obj[key] !== null) { %> +> + <%= key %>: ++ <% } else { %> ++ <%= renderHeaderObject(obj[key], indent + 20) %> ++> + <%= key %>: + <%= obj[key] %> ++ <% } %> + <% } %> + <% } %> + <% } %> ++ <%= renderHeaderObject(headers, 0) %> ++ <% } %> - <% if(payload) { %> + <% if(payload && !payload.incorrect) { %>Payload
- <%- include(schemaPath,{schema:payload, schemaName:"", hideTitle:true, schemaHelper, md, path:""}) %> + <%- include(schemaPath,{schema:payload.schema? payload.schema : payload, schemaName:"", hideTitle:true, schemaHelper, md, path:""}) %> <% const examples = messageHelper.getPayloadExamples(message); if (examples) { %>Examples of payload
@@ -100,10 +123,40 @@ <% } %> - <% } %> + <% }else if(payload && payload.incorrect) { %> + <% function renderPayloadObject(obj, indent) { %> + <% for (let key in obj) { %> + <% if(key != 'incorrect') { %> + <% if (typeof obj[key] === 'object' && obj[key] !== null) { %> +> + <%= key %>: ++ <% } else { %> ++ <%= renderPayloadObject(obj[key], indent + 20) %> ++> + <%= key %>: + <%= obj[key] %> ++ <% } %> + <% } %> + <% } %> + <% } %> ++ <%= renderPayloadObject(payload, 0) %> ++ <% } %> <%- include(bindingsPath,{name:"Message specific information", bindings:message.bindings(), schemaHelper, schemaPath}) %> <%- include(extensionsPath,{name:"Message extensions", extensions:message.extensions(), schemaHelper, schemaPath}) %> <%- include(tagsPath,{name:"Message tags", tags:message.tags()}) %> +<% }else if(message && message.incorrect) { %> +Message
+-
+ <% for (let ref of message.refs) { %>
+
- <%= `${Object.values(ref || {})[0].split('/')[2]?.replaceAll('~1',' / ')} / ${Object.values(ref || {})[0].split('/').pop()}` %> + <% } %> +
<%= entry.id() %> -<%= entry.description() %> +<%= entry.description() %> <% if(entry.hasDefaultValue()){ %><%= entry.defaultValue() %> <% }else { %> diff --git a/src/components/Tags.ejs b/src/components/Tags.ejs index 47e077c..56548e2 100644 --- a/src/components/Tags.ejs +++ b/src/components/Tags.ejs @@ -12,9 +12,9 @@- <%= entry.name() %> -<%= entry.description() %> - <% if(entry.externalDocs()){ %> +<%= entry.name() || '-' %> +<%= entry.description() || '-' %> + <% if(entry.externalDocs() && entry.externalDocs().url()){ %><%= entry.externalDocs() && entry.externalDocs().hasDescription() ? entry.externalDocs().description() : 'Find more info here' %> <% }else { %>- diff --git a/src/globals.css b/src/globals.css index 564602a..0b6a2be 100644 --- a/src/globals.css +++ b/src/globals.css @@ -117,7 +117,9 @@ a:hover { thead, tbody, th, td, tr { display: block; } - + td { + background-color: #efefef; + } th { position: absolute; top: -9999px; @@ -151,6 +153,7 @@ a:hover { } .diagnostic { + position: relative; display: flex; border: 1px solid #ccc; border-radius: 10px; @@ -168,7 +171,7 @@ a:hover { } .left-bar { - width: 10px; + width: 7px; border-radius: 10px 0 0 10px; display: inline-block; vertical-align: top; @@ -224,4 +227,24 @@ a:hover { font-style: italic; color: #999; margin-top: 10px; +} + +.close-btn { + position: absolute; + top: 10px; + right: 10px; + background: none; + border: none; + font-size: 16px; + cursor: pointer; +} + +.nested-object { + margin-left: 20px; +} +.key { + font-weight: bold; +} +.value { + color: blue; } \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index f24ea73..efee6b9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -67,10 +67,6 @@ const extensionConfig = { { from: 'src/components', to: 'components' - }, - { - from:'src/globals.css', - to:'globals.css' } ],