Merge branch 'master' into add-allComponent-functions

.github/workflows/bounty-program-commands.yml

@@ -14,12 +14,18 @@ on:
     types:
       - created
 
+env:
+  BOUNTY_PROGRAM_LABELS_JSON: |
+    [
+      {"name": "bounty", "color": "0e8a16", "description": "Participation in the Bounty Program"}
+    ]
+
 jobs:
   guard-against-unauthorized-use:
     if: >
       github.actor != ('aeworxet' || 'thulieblack') &&
       (
-        contains(github.event.comment.body, '/bounty' )
+        startsWith(github.event.comment.body, '/bounty' )
       )
 
     runs-on: ubuntu-latest
@@ -46,15 +52,10 @@ jobs:
     if: >
       github.actor == ('aeworxet' || 'thulieblack') &&
       (
-        contains(github.event.comment.body, '/bounty' )
+        startsWith(github.event.comment.body, '/bounty' )
       )
 
     runs-on: ubuntu-latest
-    env:
-      BOUNTY_PROGRAM_LABELS_JSON: |
-        [
-          {"name": "bounty", "color": "0e8a16", "description": "Participation in the Bounty Program"}
-        ]
 
     steps:
       - name: Add label `bounty`
@@ -88,3 +89,38 @@ jobs:
               repo: context.repo.repo,
               labels: [BOUNTY_PROGRAM_LABELS[0].name]
             })
+
+  remove-label-bounty:
+    if: >
+      github.actor == ('aeworxet' || 'thulieblack') &&
+      (
+        startsWith(github.event.comment.body, '/unbounty' )
+      )
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Remove label `bounty`
+        uses: actions/github-script@v6
+
+        with:
+          github-token: ${{ secrets.GH_TOKEN }}
+          script: |
+            const BOUNTY_PROGRAM_LABELS = JSON.parse(process.env.BOUNTY_PROGRAM_LABELS_JSON);
+            let LIST_OF_LABELS_FOR_ISSUE = await github.rest.issues.listLabelsOnIssue({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                });
+
+            LIST_OF_LABELS_FOR_ISSUE = LIST_OF_LABELS_FOR_ISSUE.data.map(key => key.name);
+
+            if (LIST_OF_LABELS_FOR_ISSUE.includes(BOUNTY_PROGRAM_LABELS[0].name)) {
+              console.log('Removing label `bounty`...');
+              github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: [BOUNTY_PROGRAM_LABELS[0].name]
+              })
+            }

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

@@ -14,7 +14,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        # Using macos-13 instead of latest (macos-14) due to an issue with Puppeteer and such runner. 
+        # See: https://github.com/puppeteer/puppeteer/issues/12327 and https://github.com/asyncapi/parser-js/issues/1001
+        os: [ubuntu-latest, macos-13, windows-latest]
     steps:
       - if: >
           !github.event.pull_request.draft && !(

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

@@ -15,6 +15,7 @@ on:
       - next-major-spec
       - beta
       - alpha
+      - next
 
 jobs:
 
@@ -32,7 +33,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        # Using macos-13 instead of latest (macos-14) due to an issue with Puppeteer and such runner. 
+        # See: https://github.com/puppeteer/puppeteer/issues/12327 and https://github.com/asyncapi/parser-js/issues/1001
+        os: [ubuntu-latest, macos-13, windows-latest]
     steps:
       - name: Set git to use LF #to once and for all finish neverending fight between Unix and Windows
         run: |
@@ -128,4 +131,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 }}

.releaserc

@@ -13,6 +13,8 @@ branches:
   prerelease: true
 - name: alpha
   prerelease: true
+- name: next
+  prerelease: true
 plugins:
 - - "@semantic-release/commit-analyzer"
   - preset: conventionalcommits

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/parser",
-  "version": "3.0.14",
+  "version": "3.0.16",
   "description": "JavaScript AsyncAPI parser.",
   "bugs": {
     "url": "https://github.com/asyncapi/parser-js/issues"
@@ -41,7 +41,7 @@
     "prepublishOnly": "npm run generate:assets"
   },
   "dependencies": {
-    "@asyncapi/specs": "^6.6.0",
+    "@asyncapi/specs": "^6.7.1",
     "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0",
     "@stoplight/json": "^3.20.2",
     "@stoplight/json-ref-readers": "^1.2.2",
@@ -62,7 +62,7 @@
     "node-fetch": "2.6.7"
   },
   "devDependencies": {
-    "@asyncapi/avro-schema-parser": "^3.0.22",
+    "@asyncapi/avro-schema-parser": "^3.0.23",
     "@jest/types": "^29.0.2",
     "@swc/core": "^1.2.248",
     "@swc/jest": "^0.2.22",

src/custom-operations/apply-traits.ts

@@ -51,11 +51,9 @@ function applyTraitsToObjectV2(value: Record<string, unknown>) {
 const v3TraitPaths = [
   // operations
   '$.operations.*',
-  '$.operations.*.channel.*',
   '$.operations.*.channel.messages.*',
   '$.operations.*.messages.*',
   '$.components.operations.*',
-  '$.components.operations.*.channel.*',
   '$.components.operations.*.channel.messages.*',
   '$.components.operations.*.messages.*',
   // Channels

test/validate.spec.ts

@@ -51,4 +51,47 @@ describe('validate()', function() {
     expect(hasErrorDiagnostic(diagnostics)).toEqual(false);
     expect(hasWarningDiagnostic(diagnostics)).toEqual(true);
   });
+
+  // See https://github.com/asyncapi/parser-js/issues/996
+  it('user case - null channel address should not make operation traits appliance fail', async function() {
+    const documentRaw = {
+      asyncapi: '3.0.0',
+      info: {
+        title: 'Nexus Server API',
+        version: '1.0.0'
+      },
+      channels: {
+        Exchange: {
+          address: null,
+          messages: {
+            FooEvent: {
+              name: 'FooEvent',
+              title: 'Tenant Created',
+              contentType: 'application/json',
+              payload: {
+                type: 'string'
+              }
+            }
+          }
+        }
+      },
+      operations: {
+        sendTenantCreated: {
+          title: 'Send tenant created event to client',
+          action: 'send',
+          channel: {
+            $ref: '#/channels/Exchange'
+          },
+          messages: [
+            {
+              $ref: '#/channels/Exchange/messages/FooEvent'
+            }
+          ]
+        }
+      }
+    };
+    const { document, diagnostics } = await parser.parse(documentRaw, { validateOptions: { allowedSeverity: { warning: false } } });
+    console.log(diagnostics);
+    expect(diagnostics).toHaveLength(0);
+  });
 });