Merge branch 'master' into extension_cat

.github/workflows/bump.yml

@@ -26,9 +26,10 @@ jobs:
         run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
       - if: steps.packagejson.outputs.exists == 'true'
         name: Bumping latest version of this package in other repositories
-        uses: derberg/npm-dependency-manager-for-your-github-org@3df56be95bcaa5c76a9c9a4af863ab151545b649 # using v6.-.- https://github.com/derberg/npm-dependency-manager-for-your-github-org/releases/tag/v6
+        uses: derberg/npm-dependency-manager-for-your-github-org@1eafd3bf3974f21d395c1abac855cb04b295d570 # using v6.-.- https://github.com/derberg/npm-dependency-manager-for-your-github-org/releases/tag/v6
         with:
           github_token: ${{ secrets.GH_TOKEN }}
           committer_username: asyncapi-bot
           committer_email: [email protected]
           repos_to_ignore: spec,bindings,saunter
+          custom_id: "dependency update from asyncapi bot"

.github/workflows/help-command.yml

@@ -31,6 +31,7 @@ jobs:
         
                     At the moment the following comments are supported in pull requests:
 
+                    - \`/please-take-a-look\` or \`/ptal\` - This comment will add a comment to the PR asking for attention from the reviewrs who have not reviewed the PR yet.
                     - \`/ready-to-merge\` or \`/rtm\` - This comment will trigger automerge of PR in case all required checks are green, approvals in place and do-not-merge label is not added
                     - \`/do-not-merge\` or \`/dnm\` - This comment will block automerging even if all conditions are met and ready-to-merge label is added
                     - \`/autoupdate\` or \`/au\` - This comment will add \`autoupdate\` label to the PR and keeps your PR up-to-date to the target branch's future changes. Unless there is a merge conflict or it is a draft PR.`

.github/workflows/if-nodejs-pr-testing.yml

@@ -33,14 +33,16 @@ jobs:
         id: should_run
         name: Should Run
         run: echo "shouldrun=true" >> $GITHUB_OUTPUT
+        shell: bash
       - if: steps.should_run.outputs.shouldrun == 'true' 
         name: Set git to use LF #to once and for all finish neverending fight between Unix and Windows
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
+        shell: bash
       - if: steps.should_run.outputs.shouldrun == 'true' 
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - if: steps.should_run.outputs.shouldrun == 'true' 
         name: Check if Node.js project and has package.json
         id: packagejson
@@ -52,27 +54,26 @@ jobs:
         id: lockversion
       - if: steps.packagejson.outputs.exists == 'true'
         name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "${{ steps.lockversion.outputs.version }}"
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+      - if: steps.lockversion.outputs.version == '18' && matrix.os == 'windows-latest'
+        #npm cli 10 is buggy because of some cache issue
+        name: Install npm cli 8
+        shell: bash
+        run: npm install -g [email protected]
       - if: steps.packagejson.outputs.exists == 'true'
         name: Install dependencies
-        id: first-installation
-        run: npm install --loglevel verbose
-        continue-on-error: true
-      - if: steps.first-installation.outputs.status == 'failure' && steps.packagejson.outputs.exists == 'true'
-        name: Clear NPM cache and install deps again
-        run: | 
-          npm cache clean --force
-          npm install --loglevel verbose
+        shell: bash
+        run: npm ci
       - if: steps.packagejson.outputs.exists == 'true'
         name: Test
         run: npm test --if-present
-      - if: steps.packagejson.outputs.exists == 'true'
+      - if: steps.packagejson.outputs.exists == 'true' && matrix.os == 'ubuntu-latest'
+        #linting should run just one and not on all possible operating systems
         name: Run linter
         run: npm run lint --if-present
       - if: steps.packagejson.outputs.exists == 'true'
         name: Run release assets generation to make sure PR does not break it
-        run: npm run generate:assets --if-present
+        shell: bash
+        run: npm run generate:assets --if-present

.github/workflows/if-nodejs-release.yml

@@ -38,8 +38,9 @@ jobs:
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
+        shell: bash
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check if Node.js project and has package.json
         id: packagejson
         run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
@@ -50,14 +51,18 @@ jobs:
         id: lockversion
       - if: steps.packagejson.outputs.exists == 'true'
         name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "${{ steps.lockversion.outputs.version }}"
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+      - if: steps.lockversion.outputs.version == '18' && matrix.os == 'windows-latest'
+        name: Install npm cli 8
+        shell: bash
+        #npm cli 10 is buggy because of some cache issues
+        run: npm install -g [email protected]
       - if: steps.packagejson.outputs.exists == 'true'
         name: Install dependencies
-        run: npm install
+        shell: bash
+        run: npm ci
       - if: steps.packagejson.outputs.exists == 'true'
         name: Run test
         run: npm test --if-present
@@ -81,24 +86,24 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check if Node.js project and has package.json
         id: packagejson
         run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
+        shell: bash
       - if: steps.packagejson.outputs.exists == 'true'
         name: Check package-lock version
         uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
         id: lockversion
       - if: steps.packagejson.outputs.exists == 'true'
         name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "${{ steps.lockversion.outputs.version }}"
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
       - if: steps.packagejson.outputs.exists == 'true'
         name: Install dependencies
-        run: npm install
+        shell: bash
+        run: npm ci
       - if: steps.packagejson.outputs.exists == 'true'
         name: Add plugin for conventional commits for semantic-release
         run: npm install --save-dev [email protected]
@@ -123,4 +128,4 @@ jobs:
           fields: repo,action,workflow
           text: 'Release workflow failed in release job'
         env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}

.github/workflows/if-nodejs-version-bump.yml

@@ -37,7 +37,7 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
       - if: steps.packagejson.outputs.exists == 'true'
         name: Install dependencies
-        run: npm install
+        run: npm ci
       - if: steps.packagejson.outputs.exists == 'true'
         name: Assets generation
         run: npm run generate:assets --if-present

.github/workflows/please-take-a-look-command.yml

@@ -0,0 +1,54 @@
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+
+# It uses Github actions to listen for comments on issues and pull requests and 
+# if the comment contains /please-take-a-look or /ptal it will add a comment pinging 
+# the code-owners who are reviewers for PR
+
+name: Please take a Look
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  ping-for-attention:
+    if: >
+      github.event.issue.pull_request &&
+      github.event.issue.state != 'closed' &&
+      github.actor != 'asyncapi-bot' &&
+      (
+        contains(github.event.comment.body, '/please-take-a-look') ||
+        contains(github.event.comment.body, '/ptal') ||
+        contains(github.event.comment.body, '/PTAL') 
+      )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for Please Take a Look Command
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GH_TOKEN }}
+          script: |
+            const prDetailsUrl = context.payload.issue.pull_request.url;
+            const { data: pull } = await github.request(prDetailsUrl);
+            const reviewers = pull.requested_reviewers.map(reviewer => reviewer.login);
+
+            const { data: reviews } = await github.rest.pulls.listReviews({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number
+            });
+
+            const reviewersWhoHaveReviewed = reviews.map(review => review.user.login);
+
+            const reviewersWhoHaveNotReviewed = reviewers.filter(reviewer => !reviewersWhoHaveReviewed.includes(reviewer));
+
+            if (reviewersWhoHaveNotReviewed.length > 0) {
+              const comment = reviewersWhoHaveNotReviewed.filter(reviewer => reviewer !== 'asyncapi-bot-eve' ).map(reviewer => `@${reviewer}`).join(' ');
+              await github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: `${comment} Please take a look at this PR. Thanks! :wave:`
+              });
+            }

.gitignore

@@ -1,4 +1,6 @@
 node_modules
 .nyc_output
 .vscode
-coverage
+coverage
+
+.DS_Store

CODEOWNERS

@@ -6,7 +6,7 @@
 
 # The default owners are automatically added as reviewers when you open a pull request unless different owners are specified in the file.
 
-* @fmvilas @derberg @dalelane @smoya @char0n @asyncapi-bot-eve @GreenRover
+* @fmvilas @derberg @dalelane @smoya @char0n @GreenRover @jonaslagoni @pakisan @asyncapi-bot-eve
 
 /bindings/anypointmq/   @mboss37 @GeraldLoeffler
 /bindings/ibmmq/        @rcoppen

definitions/3.0.0/components.json

@@ -13,14 +13,7 @@
       "description": "An object to hold reusable Schema Object. If this is a Schema Object, then the schemaFormat will be assumed to be 'application/vnd.aai.asyncapi+json;version=asyncapi' where the version is equal to the AsyncAPI Version String.",
       "patternProperties": {
         "^[\\w\\d\\.\\-_]+$": {
-          "oneOf": [
-            {
-              "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-            },
-            {
-              "$ref": "http://asyncapi.com/definitions/3.0.0/anySchema.json"
-            }
-          ]
+          "$ref": "http://asyncapi.com/definitions/3.0.0/anySchema.json"
         }
       }
     },

definitions/3.0.0/multiFormatSchema.json

@@ -1,5 +1,11 @@
 {
   "description": "The Multi Format Schema Object represents a schema definition. It differs from the Schema Object in that it supports multiple schema formats or languages (e.g., JSON Schema, Avro, etc.).",
+  "type": "object",
+  "patternProperties": {
+    "^x-[\\w\\d\\.\\x2d_]+$": {
+      "$ref": "http://asyncapi.com/definitions/3.0.0/specificationExtension.json"
+    }
+  },
   "if": {
     "not": {
       "type": "object"
@@ -9,13 +15,6 @@
     "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
   },
   "else": {
-    "type": "object",
-    "additionalProperties": false,
-    "patternProperties": {
-      "^x-[\\w\\d\\.\\x2d_]+$": {
-        "$ref": "http://asyncapi.com/definitions/3.0.0/specificationExtension.json"
-      }
-    },
     "properties": {
       "schemaFormat": {
         "description": "A string containing the name of the schema format that is used to define the information. If schemaFormat is missing, it MUST default to application/vnd.aai.asyncapi+json;version={{asyncapi}} where {{asyncapi}} matches the AsyncAPI Version String. In such a case, this would make the Multi Format Schema Object equivalent to the Schema Object. When using Reference Object within the schema, the schemaFormat of the resource being referenced MUST match the schemaFormat of the schema that contains the initial reference. For example, if you reference Avro schema, then schemaFormat of referencing resource and the resource being reference MUST match.",
@@ -37,21 +36,18 @@
           {
             "description": "All the schema formats tools are RECOMMENDED to support",
             "enum": [
-              "application/vnd.oai.openapi;version=3.0.0", 
-              "application/vnd.oai.openapi+json;version=3.0.0", 
+              "application/vnd.oai.openapi;version=3.0.0",
+              "application/vnd.oai.openapi+json;version=3.0.0",
               "application/vnd.oai.openapi+yaml;version=3.0.0",
-  
+
               "application/vnd.apache.avro;version=1.9.0",
               "application/vnd.apache.avro+json;version=1.9.0",
               "application/vnd.apache.avro+yaml;version=1.9.0",
-              
+
               "application/raml+yaml;version=1.0"
             ]
           }
         ]
-      },
-      "schema": {
-        "description": "Definition of the message payload. It can be of any type but defaults to Schema Object. It MUST match the schema format defined in schemaFormat, including the encoding type. E.g., Avro should be inlined as either a YAML or JSON object instead of as a string to be parsed as YAML or JSON. Non-JSON-based schemas (e.g., Protobuf or XSD) MUST be inlined as a string."
       }
     },
     "allOf": [
@@ -67,14 +63,7 @@
         "then": {
           "properties": {
             "schema": {
-              "oneOf": [
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-                },
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
-                }
-              ]
+              "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
             }
           }
         }
@@ -119,14 +108,7 @@
         "then": {
           "properties": {
             "schema": {
-              "oneOf": [
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-                },
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
-                }
-              ]
+              "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
             }
           }
         }
@@ -148,14 +130,7 @@
         "then": {
           "properties": {
             "schema": {
-              "oneOf": [
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-                },
-                {
-                  "$ref": "http://json-schema.org/draft-07/schema"
-                }
-              ]
+              "$ref": "http://json-schema.org/draft-07/schema"
             }
           }
         }

definitions/3.0.0/operationBindingsObject.json

@@ -131,7 +131,7 @@
     "kafka": {
       "properties": {
         "bindingVersion": {
-          "enum": ["0.4.0", "0.3.0"]
+          "enum": ["0.5.0", "0.4.0", "0.3.0"]
         }
       },
       "allOf": [

definitions/3.0.0/serverBindingsObject.json

@@ -50,7 +50,7 @@
     "kafka": {
       "properties": {
         "bindingVersion": {
-          "enum": ["0.4.0", "0.3.0"]
+          "enum": ["0.5.0", "0.4.0", "0.3.0"]
         }
       },
       "allOf": [

go.mod

@@ -1,4 +1,4 @@
-module github.com/asyncapi/spec-json-schemas/v4
+module github.com/asyncapi/spec-json-schemas/v6
 
 go 1.17
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/specs",
-  "version": "6.5.3",
+  "version": "6.5.6",
   "description": "AsyncAPI schema versions",
   "main": "index.js",
   "types": "index.d.ts",