@redocly/portal-plugin-async-api 1.0.202 → 1.0.203

package/lib/template.js

@@ -1,32 +1,39 @@
 import AsyncApiComponent from '@asyncapi/react-component';
 import React from 'react';
 import styled from 'styled-components';
-// @ts-ignore
 import { Breadcrumbs as ThemeBreadcrumbs } from '@redocly/theme';
-import '@asyncapi/react-component/lib/styles/fiori.css';
 // @ts-ignore has no exported member error
 import { usePageSharedData } from '@portal/hooks';
+import '@asyncapi/react-component/styles/default.css';
 import { StylesProvider } from './styles.js';
 function AsyncApiDocs({ pageProps }) {
     const { settings = {} } = pageProps;
     const asyncApiDefinition = usePageSharedData('AsyncApiDefinition');
-    const { schemaId, hideChannels, hideErrors, hideInfo, hideMessages, hideSchemas, hideServers, expandChannels, expandMessages, expandSchemas, expandServers, } = settings;
+    const { schemaId, hideOperations, hideErrors, hideInfo, hideMessages, hideSchemas, hideServers } = settings;
     const componentConfig = {
         schemaID: schemaId,
-        showErrors: !hideErrors,
         show: {
+            errors: !hideErrors,
             info: !hideInfo,
-            channels: !hideChannels,
+            operations: !hideOperations,
             servers: !hideServers,
             messages: !hideMessages,
             schemas: !hideSchemas,
+            sidebar: false,
         },
         expand: {
-            schemas: expandSchemas,
-            channels: expandChannels,
-            messages: expandMessages,
-            servers: expandServers,
+            messageExamples: false,
         },
+        sidebar: {
+            showServers: 'byDefault',
+            showOperations: 'byDefault',
+        },
+        publishLabel: 'PUBLISHER',
+        subscribeLabel: 'SUBSCRIBER',
+        sendLabel: 'SEND',
+        receiveLabel: 'RECEIVE',
+        requestLabel: 'REQUEST',
+        replyLabel: 'REPLY',
     };
     return (React.createElement(StylesProvider, null,
         React.createElement(Breadcrumbs, null),

package/lib/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../src/template.tsx"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,aAAa;AACb,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,gDAAgD,CAAC;AAOxD,0CAA0C;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAQ7C,SAAS,YAAY,CAAC,EAAE,SAAS,EAAqB;IACpD,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC;IACpC,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,oBAAoB,CAA4B,CAAC;IAE9F,MAAM,EACJ,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,WAAW,EACX,cAAc,EACd,cAAc,EACd,aAAa,EACb,aAAa,GACd,GAAG,QAAQ,CAAC;IAEb,MAAM,eAAe,GAWjB;QACF,QAAQ,EAAE,QAAQ;QAClB,UAAU,EAAE,CAAC,UAAU;QACvB,IAAI,EAAE;YACJ,IAAI,EAAE,CAAC,QAAQ;YACf,QAAQ,EAAE,CAAC,YAAY;YACvB,OAAO,EAAE,CAAC,WAAW;YACrB,QAAQ,EAAE,CAAC,YAAY;YACvB,OAAO,EAAE,CAAC,WAAW;SACtB;QACD,MAAM,EAAE;YACN,OAAO,EAAE,aAAa;YACtB,QAAQ,EAAE,cAAc;YACxB,QAAQ,EAAE,cAAc;YACxB,OAAO,EAAE,aAAa;SACvB;KACF,CAAC;IAEF,OAAO,CACL,oBAAC,cAAc;QACb,oBAAC,WAAW,OAAG;QACf,oBAAC,iBAAiB,IAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe,GAAI,CAC3D,CAClB,CAAC;AACJ,CAAC;AAED,eAAe,YAAY,CAAC;AAE5B,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAA;;CAE3C,CAAC"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../src/template.tsx"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAMjE,0CAA0C;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,8CAA8C,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAQ7C,SAAS,YAAY,CAAC,EAAE,SAAS,EAAqB;IACpD,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC;IACpC,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,oBAAoB,CAA4B,CAAC;IAE9F,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,GAC9F,QAAQ,CAAC;IAEX,MAAM,eAAe,GAA6B;QAChD,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE;YACJ,MAAM,EAAE,CAAC,UAAU;YACnB,IAAI,EAAE,CAAC,QAAQ;YACf,UAAU,EAAE,CAAC,cAAc;YAC3B,OAAO,EAAE,CAAC,WAAW;YACrB,QAAQ,EAAE,CAAC,YAAY;YACvB,OAAO,EAAE,CAAC,WAAW;YACrB,OAAO,EAAE,KAAK;SACf;QACD,MAAM,EAAE;YACN,eAAe,EAAE,KAAK;SACvB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,WAAW;YACxB,cAAc,EAAE,WAAW;SAC5B;QACD,YAAY,EAAE,WAAW;QACzB,cAAc,EAAE,YAAY;QAC5B,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,SAAS;QACvB,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,OAAO;KACpB,CAAC;IAEF,OAAO,CACL,oBAAC,cAAc;QACb,oBAAC,WAAW,OAAG;QACf,oBAAC,iBAAiB,IAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe,GAAI,CAC3D,CAClB,CAAC;AACJ,CAAC;AAED,eAAe,YAAY,CAAC;AAE5B,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAA;;CAE3C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/portal-plugin-async-api",
-  "version": "1.0.202",
+  "version": "1.0.203",
   "description": "Async API plugin for @redocly/portal",
   "type": "module",
   "exports": {
@@ -26,16 +26,16 @@
     "typescript": "5.2.2"
   },
   "dependencies": {
-    "@asyncapi/bundler": "^0.4.0",
-    "@asyncapi/react-component": "^0.24.22",
+    "@asyncapi/parser": "^3.0.14",
+    "@asyncapi/react-component": "^2.0.0",
     "json-schema-to-ts": "^2.9.1",
     "styled-components": "^5.3.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "@redocly/realm": "0.85.1",
-    "@redocly/theme": "0.37.2"
+    "@redocly/realm": "0.86.0",
+    "@redocly/theme": "0.37.3"
   },
   "peerDependenciesMeta": {
     "@redocly/realm": {

package/src/config.ts

@@ -1,28 +1,15 @@
 import type { FromSchema } from 'json-schema-to-ts';
 
-const expandSectionSchema = {
-  type: 'object',
-  properties: {
-    root: { type: 'boolean' },
-    elements: { type: 'boolean' },
-  },
-  additionalProperties: false,
-} as const;
-
 const asyncApiDocsSchema = {
   type: 'object',
   properties: {
     schemaId: { type: 'string' },
     hideErrors: { type: 'boolean' },
     hideInfo: { type: 'boolean' },
-    hideChannels: { type: 'boolean' },
+    hideOperations: { type: 'boolean' },
     hideServers: { type: 'boolean' },
     hideMessages: { type: 'boolean' },
     hideSchemas: { type: 'boolean' },
-    expandChannels: expandSectionSchema,
-    expandServers: expandSectionSchema,
-    expandMessages: expandSectionSchema,
-    expandSchemas: expandSectionSchema,
   },
   additionalProperties: false,
 } as const;

package/src/plugin.ts

@@ -1,8 +1,7 @@
-import path from 'path';
 // FIXME: think of a way to make these imports shorter?
 import { REDOCLY_ROUTE_RBAC } from '@redocly/realm/dist/shared/constants.js';
 import { withPathPrefix } from '@redocly/realm/dist/shared/urls.js';
-import bundle from '@asyncapi/bundler';
+import { fromFile, Parser } from '@asyncapi/parser';
 import { Feature } from '@redocly/realm/dist/server/entitlements/entitlements.types.js';
 
 import type { PageStaticData } from '@redocly/realm/dist/shared/types';
@@ -17,6 +16,8 @@ const ASYNCAPI_TEMPLATE_ID = 'asyncapi-docs';
 const ASYNCAPI_SHARED_DATA_PREFIX = 'asyncapi-docs-';
 
 export default async function asyncAPIDocsPlugin(): Promise<PluginInstance> {
+  const parser = new Parser();
+
   return {
     id: Feature.Asyncapi,
     processContent: async (contentProvider, actions) => {
@@ -31,17 +32,24 @@ export default async function asyncAPIDocsPlugin(): Promise<PluginInstance> {
       const definitions = loadDefinitions();
       const currentScriptLocation = process.cwd();
 
-      for (const [relativePath, parsedDefinition] of definitions) {
+      for (const [relativePath] of definitions) {
         const pageSlug = contentProvider.slugFromRelativePath(relativePath);
 
         const sharedDataKey = `${ASYNCAPI_SHARED_DATA_PREFIX}${relativePath}`;
         try {
+          const absolutePath = contentProvider.getFsAbsolutePath(relativePath);
           const fsRelativePath = contentProvider.getFsRelativePath(relativePath);
-          const fileLocation = path.dirname(fsRelativePath);
-          // todo: workaround for $ref resolving until following issue is resolved: https://github.com/asyncapi/bundler/issues/136
-          process.chdir(path.join(contentProvider.cwd, fileLocation));
-          const bundledContent = await bundle([parsedDefinition as string]);
-          await actions.createSharedData(sharedDataKey, bundledContent.string());
+          const { document, diagnostics } = await fromFile(parser, absolutePath).parse();
+
+          diagnostics
+            .filter((d) => d.severity === 0)
+            .forEach(({ message, path }) =>
+              console.error(
+                `Cannot parse AsyncAPI schema: ${message} in '${fsRelativePath}:${path.join('.')}'`,
+              ),
+            );
+
+          await actions.createSharedData(sharedDataKey, document?.json() ?? {});
 
           const route = {
             slug: pageSlug,