Merge branch 'master' into form-component

KhudaDad414 · Dec 12, 2023 · f1fe7b4 · f1fe7b4
2 parents 7818d86 + 2116282
commit f1fe7b4
Show file tree

Hide file tree

Showing 15 changed files with 365 additions and 234 deletions.
diff --git a/.changeset/fluffy-plums-mix.md b/.changeset/fluffy-plums-mix.md
diff --git a/apps/studio/package.json b/apps/studio/package.json
@@ -23,12 +23,13 @@
     "./LICENSE"
   ],
   "dependencies": {
-    "@asyncapi/avro-schema-parser": "^3.0.6",
-    "@asyncapi/converter": "^1.4.4",
+    "@asyncapi/avro-schema-parser": "^3.0.7",
+    "@asyncapi/converter": "^1.4.5",
     "@asyncapi/openapi-schema-parser": "^3.0.4",
-    "@asyncapi/parser": "^3.0.0",
+    "@asyncapi/parser": "^3.0.1",
+    "@asyncapi/protobuf-schema-parser": "^3.0.4",
     "@asyncapi/react-component": "^1.2.2",
-    "@asyncapi/specs": "^6.0.0",
+    "@asyncapi/specs": "^6.1.0",
     "@ebay/nice-modal-react": "^1.2.10",
     "@headlessui/react": "^1.7.4",
     "@hookstate/core": "^4.0.0-rc21",
@@ -75,7 +76,7 @@
   },
   "devDependencies": {
     "@asyncapi/dotnet-nats-template": "^0.12.1",
-    "@asyncapi/go-watermill-template": "^0.2.47",
+    "@asyncapi/go-watermill-template": "^0.2.50",
     "@asyncapi/html-template": "^2.0.0",
     "@asyncapi/java-spring-cloud-stream-template": "^0.13.4",
     "@asyncapi/java-spring-template": "^1.4.0",

diff --git a/apps/studio/src/examples/ibmmq.yml b/apps/studio/src/examples/ibmmq.yml
@@ -27,13 +27,13 @@ operations:
     channel:
       $ref: '#/channels/songReleased'
     messages:
-      - $ref: '#/components/messages/Song'
+      - $ref: '#/channels/songReleased/messages/Song'
   sendSong:
     action: send
     channel:
       $ref: '#/channels/songReleased'
     messages:
-      - $ref: '#/components/messages/Song'
+      - $ref: '#/channels/songReleased/messages/Song'
 components:
   messages:
     Song:

diff --git a/apps/studio/src/examples/real-world/gitter-streaming.yml b/apps/studio/src/examples/real-world/gitter-streaming.yml
@@ -38,8 +38,8 @@ operations:
       http:
         method: POST
     messages:
-      - $ref: '#/components/messages/chatMessage'
-      - $ref: '#/components/messages/heartbeat'
+      - $ref: '#/channels/rooms/messages/chatMessage'
+      - $ref: '#/channels/rooms/messages/heartbeat'
 components:
   securitySchemes:
     httpBearerToken:

diff --git a/apps/studio/src/examples/real-world/kraken-api-request-reply-filter.yml b/apps/studio/src/examples/real-world/kraken-api-request-reply-filter.yml
@@ -49,21 +49,21 @@ operations:
       channel: 
         $ref: '#/channels/currencyExchange'
       messages:
-        - $ref: '#/components/messages/pong'
+        - $ref: '#/channels/currencyExchange/messages/pong'
     messages:
-      - $ref: '#/components/messages/ping'
+      - $ref: '#/channels/currencyExchange/messages/ping'
   sendHeartbeat:
     action: send
     channel: 
       $ref: '#/channels/currencyExchange'
     messages:
-      - $ref: '#/components/messages/heartbeat'
+      - $ref: '#/channels/currencyExchange/messages/heartbeat'
   systemStatus:
     action: send
     channel: 
       $ref: '#/channels/currencyExchange'
     messages:
-      - $ref: '#/components/messages/systemStatus'
+      - $ref: '#/channels/currencyExchange/messages/systemStatus'
   receiveSubscribeRequest:
     action: receive
     channel: 
@@ -72,10 +72,10 @@ operations:
       channel: 
         $ref: '#/channels/currencyExchange'
       messages:
-        - $ref: '#/components/messages/subscriptionStatus'
-        - $ref: '#/components/messages/dummyCurrencyInfo'
+        - $ref: '#/channels/currencyExchange/messages/subscriptionStatus'
+        - $ref: '#/channels/currencyExchange/messages/dummyCurrencyInfo'
     messages:
-      - $ref: '#/components/messages/subscribe'
+      - $ref: '#/channels/currencyExchange/messages/subscribe'
   receiveUnsubscribeRequest:
     action: receive
     channel: 
@@ -84,9 +84,9 @@ operations:
       channel: 
         $ref: '#/channels/currencyExchange'   
       messages:
-        - $ref: '#/components/messages/subscriptionStatus'
+        - $ref: '#/channels/currencyExchange/messages/subscriptionStatus'
     messages:
-      - $ref: '#/components/messages/unsubscribe'
+      - $ref: '#/channels/currencyExchange/messages/unsubscribe'
 
 
 components:

diff --git a/apps/studio/src/examples/real-world/slack-rtm.yml b/apps/studio/src/examples/real-world/slack-rtm.yml
@@ -115,58 +115,58 @@ operations:
     channel:
       $ref: '#/channels/root'
     messages:
-      - $ref: '#/components/messages/outgoingMessage'
+      - $ref: '#/channels/root/messages/outgoingMessage'
   sendMessages:
     action: send
     channel:
       $ref: '#/channels/root'
     messages:
-      - $ref: '#/components/messages/hello'
-      - $ref: '#/components/messages/connectionError'
-      - $ref: '#/components/messages/accountsChanged'
-      - $ref: '#/components/messages/botAdded'
-      - $ref: '#/components/messages/botChanged'
-      - $ref: '#/components/messages/channelArchive'
-      - $ref: '#/components/messages/channelCreated'
-      - $ref: '#/components/messages/channelDeleted'
-      - $ref: '#/components/messages/channelHistoryChanged'
-      - $ref: '#/components/messages/channelJoined'
-      - $ref: '#/components/messages/channelLeft'
-      - $ref: '#/components/messages/channelMarked'
-      - $ref: '#/components/messages/channelRename'
-      - $ref: '#/components/messages/channelUnarchive'
-      - $ref: '#/components/messages/commandsChanged'
-      - $ref: '#/components/messages/dndUpdated'
-      - $ref: '#/components/messages/dndUpdatedUser'
-      - $ref: '#/components/messages/emailDomainChanged'
-      - $ref: '#/components/messages/emojiRemoved'
-      - $ref: '#/components/messages/emojiAdded'
-      - $ref: '#/components/messages/fileChange'
-      - $ref: '#/components/messages/fileCommentAdded'
-      - $ref: '#/components/messages/fileCommentDeleted'
-      - $ref: '#/components/messages/fileCommentEdited'
-      - $ref: '#/components/messages/fileCreated'
-      - $ref: '#/components/messages/fileDeleted'
-      - $ref: '#/components/messages/filePublic'
-      - $ref: '#/components/messages/fileShared'
-      - $ref: '#/components/messages/fileUnshared'
-      - $ref: '#/components/messages/goodbye'
-      - $ref: '#/components/messages/groupArchive'
-      - $ref: '#/components/messages/groupClose'
-      - $ref: '#/components/messages/groupHistoryChanged'
-      - $ref: '#/components/messages/groupJoined'
-      - $ref: '#/components/messages/groupLeft'
-      - $ref: '#/components/messages/groupMarked'
-      - $ref: '#/components/messages/groupOpen'
-      - $ref: '#/components/messages/groupRename'
-      - $ref: '#/components/messages/groupUnarchive'
-      - $ref: '#/components/messages/imClose'
-      - $ref: '#/components/messages/imCreated'
-      - $ref: '#/components/messages/imMarked'
-      - $ref: '#/components/messages/imOpen'
-      - $ref: '#/components/messages/manualPresenceChange'
-      - $ref: '#/components/messages/memberJoinedChannel'
-      - $ref: '#/components/messages/message'
+      - $ref: '#/channels/root/messages/hello'
+      - $ref: '#/channels/root/messages/connectionError'
+      - $ref: '#/channels/root/messages/accountsChanged'
+      - $ref: '#/channels/root/messages/botAdded'
+      - $ref: '#/channels/root/messages/botChanged'
+      - $ref: '#/channels/root/messages/channelArchive'
+      - $ref: '#/channels/root/messages/channelCreated'
+      - $ref: '#/channels/root/messages/channelDeleted'
+      - $ref: '#/channels/root/messages/channelHistoryChanged'
+      - $ref: '#/channels/root/messages/channelJoined'
+      - $ref: '#/channels/root/messages/channelLeft'
+      - $ref: '#/channels/root/messages/channelMarked'
+      - $ref: '#/channels/root/messages/channelRename'
+      - $ref: '#/channels/root/messages/channelUnarchive'
+      - $ref: '#/channels/root/messages/commandsChanged'
+      - $ref: '#/channels/root/messages/dndUpdated'
+      - $ref: '#/channels/root/messages/dndUpdatedUser'
+      - $ref: '#/channels/root/messages/emailDomainChanged'
+      - $ref: '#/channels/root/messages/emojiRemoved'
+      - $ref: '#/channels/root/messages/emojiAdded'
+      - $ref: '#/channels/root/messages/fileChange'
+      - $ref: '#/channels/root/messages/fileCommentAdded'
+      - $ref: '#/channels/root/messages/fileCommentDeleted'
+      - $ref: '#/channels/root/messages/fileCommentEdited'
+      - $ref: '#/channels/root/messages/fileCreated'
+      - $ref: '#/channels/root/messages/fileDeleted'
+      - $ref: '#/channels/root/messages/filePublic'
+      - $ref: '#/channels/root/messages/fileShared'
+      - $ref: '#/channels/root/messages/fileUnshared'
+      - $ref: '#/channels/root/messages/goodbye'
+      - $ref: '#/channels/root/messages/groupArchive'
+      - $ref: '#/channels/root/messages/groupClose'
+      - $ref: '#/channels/root/messages/groupHistoryChanged'
+      - $ref: '#/channels/root/messages/groupJoined'
+      - $ref: '#/channels/root/messages/groupLeft'
+      - $ref: '#/channels/root/messages/groupMarked'
+      - $ref: '#/channels/root/messages/groupOpen'
+      - $ref: '#/channels/root/messages/groupRename'
+      - $ref: '#/channels/root/messages/groupUnarchive'
+      - $ref: '#/channels/root/messages/imClose'
+      - $ref: '#/channels/root/messages/imCreated'
+      - $ref: '#/channels/root/messages/imMarked'
+      - $ref: '#/channels/root/messages/imOpen'
+      - $ref: '#/channels/root/messages/manualPresenceChange'
+      - $ref: '#/channels/root/messages/memberJoinedChannel'
+      - $ref: '#/channels/root/messages/message'
 components:
   securitySchemes:
     token:

diff --git a/apps/studio/src/examples/simple.yml b/apps/studio/src/examples/simple.yml
@@ -15,7 +15,7 @@ operations:
     channel:
       $ref: '#/channels/userSignedup'
     messages:
-      - $ref: '#/components/messages/UserSignedUp'
+      - $ref: '#/channels/userSignedup/messages/UserSignedUp'
 components:
   messages:
     UserSignedUp:

diff --git a/apps/studio/src/examples/streetlights-kafka.yml b/apps/studio/src/examples/streetlights-kafka.yml
@@ -81,31 +81,31 @@ operations:
     traits:
       - $ref: '#/components/operationTraits/kafka'
     messages:
-      - $ref: '#/components/messages/lightMeasured'
+      - $ref: '#/channels/lightingMeasured/messages/lightMeasured'
   turnOn:
     action: send
     channel:
       $ref: '#/channels/lightTurnOn'
     traits:
       - $ref: '#/components/operationTraits/kafka'
     messages:
-      - $ref: '#/components/messages/turnOnOff'
+      - $ref: '#/channels/lightTurnOn/messages/turnOn'
   turnOff:
     action: send
     channel:
       $ref: '#/channels/lightTurnOff'
     traits:
       - $ref: '#/components/operationTraits/kafka'
     messages:
-      - $ref: '#/components/messages/turnOnOff'
+      - $ref: '#/channels/lightTurnOff/messages/turnOff'
   dimLight:
     action: send
     channel:
       $ref: '#/channels/lightsDim'
     traits:
       - $ref: '#/components/operationTraits/kafka'
     messages:
-      - $ref: '#/components/messages/dimLight'
+      - $ref: '#/channels/lightsDim/messages/dimLight'
 components:
   messages:
     lightMeasured:

diff --git a/apps/studio/src/examples/streetlights-mqtt.yml b/apps/studio/src/examples/streetlights-mqtt.yml
@@ -107,31 +107,31 @@ operations:
     traits:
       - $ref: '#/components/operationTraits/mqtt'
     messages:
-      - $ref: '#/components/messages/lightMeasured'
+      - $ref: '#/channels/lightingMeasured/messages/lightMeasured'
   turnOn:
     action: send
     channel:
       $ref: '#/channels/lightTurnOn'
     traits:
       - $ref: '#/components/operationTraits/mqtt'
     messages:
-      - $ref: '#/components/messages/turnOnOff'
+      - $ref: '#/channels/lightTurnOn/messages/turnOn'
   turnOff:
     action: send
     channel:
       $ref: '#/channels/lightTurnOff'
     traits:
       - $ref: '#/components/operationTraits/mqtt'
     messages:
-      - $ref: '#/components/messages/turnOnOff'
+      - $ref: '#/channels/lightTurnOff/messages/turnOff'
   dimLight:
     action: send
     channel:
       $ref: '#/channels/lightsDim'
     traits:
       - $ref: '#/components/operationTraits/mqtt'
     messages:
-      - $ref: '#/components/messages/dimLight'
+      - $ref: '#/channels/lightsDim/messages/dimLight'
 components:
   messages:
     lightMeasured:

diff --git a/apps/studio/src/examples/websocket-gemini.yml b/apps/studio/src/examples/websocket-gemini.yml
@@ -155,7 +155,7 @@ operations:
       $ref: '#/channels/marketDataV1'
     summary: Receive market updates on a given symbol
     messages:
-      - $ref: '#/components/messages/marketData'
+      - $ref: '#/channels/marketDataV1/messages/marketData'
 components:
   messages:
     marketData:

diff --git a/apps/studio/src/services/parser.service.ts b/apps/studio/src/services/parser.service.ts
@@ -3,6 +3,7 @@ import { AbstractService } from './abstract.service';
 import { Parser, DiagnosticSeverity } from '@asyncapi/parser/cjs';
 import { OpenAPISchemaParser } from '@asyncapi/openapi-schema-parser';
 import { AvroSchemaParser } from '@asyncapi/avro-schema-parser';
+import { ProtoBuffSchemaParser } from '@asyncapi/protobuf-schema-parser';
 import { untilde } from '@asyncapi/parser/cjs/utils';
 
 import { isDeepEqual } from '../helpers';
@@ -21,6 +22,7 @@ export class ParserService extends AbstractService {
         // Temporary fix for TS error
         OpenAPISchemaParser() as SchemaParser<unknown, unknown>,
         AvroSchemaParser() as SchemaParser<unknown, unknown>,
+        ProtoBuffSchemaParser() as SchemaParser<unknown, unknown>,
       ],
       __unstable: {
         resolver: {