npm - @asyncapi/converter - Versions diffs - 0.6.1 → 0.7.2 - Mend

@asyncapi/converter 0.6.1 → 0.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/.github/workflows/add-good-first-issue-labels.yml +68 -0
package/.github/workflows/automerge-for-humans-merging.yml +1 -1
package/.github/workflows/automerge.yml +9 -18
package/.github/workflows/autoupdate.yml +9 -5
package/.github/workflows/bump.yml +3 -2
package/.github/workflows/help-command.yml +19 -4
package/.github/workflows/if-go-pr-testing.yml +17 -7
package/.github/workflows/if-nodejs-pr-testing.yml +10 -4
package/.github/workflows/if-nodejs-release.yml +8 -3
package/.github/workflows/notify-tsc-members-mention.yml +142 -0
package/cli.js +10 -3
package/lib/helpers.js +20 -2
package/lib/index.js +18 -8
package/package.json +1 -1
package/test/index.js +58 -1
package/test/input/2.0.0/streetlights.json +172 -0
package/test/input/2.0.0/streetlights.yml +0 -1
package/test/input/2.0.0-rc2/streetlights.yml +0 -1
package/test/input/2.1.0/streetlights.yml +0 -1
package/test/input/2.2.0/streetlights.yml +112 -0
package/test/output/2.0.0/streetlights.yml +0 -1
package/test/output/2.0.0-rc2/streetlights.yml +0 -1
package/test/output/2.1.0/streetlights.json +172 -0
package/test/output/2.1.0/streetlights.yml +0 -1
package/test/output/2.2.0/streetlights.yml +0 -1
package/test/output/2.3.0/streetlights.yml +112 -0

package/.github/workflows/add-good-first-issue-labels.yml ADDED Viewed

@@ -0,0 +1,68 @@
+#This workflow 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
+#Purpose of this workflow is to enable anyone to label issue with 'Good First Issue' and 'area/*' with a single command.
+name: Add 'Good First Issue' and 'area/*' labels # if proper comment added
+on:
+    issue_comment:
+        types:
+            - created
+jobs:
+  add-labels:
+    if: ${{!github.event.issue.pull_request && github.event.issue.state != 'closed' && github.actor != 'asyncapi-bot'}}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add label
+        if: contains(github.event.comment.body, '/good-first-issue') || contains(github.event.comment.body, '/gfi' )
+        uses: actions/github-script@v5
+        with:
+          github-token: ${{ secrets.GH_TOKEN }}
+          script: |
+            const areas = ['javascript', 'typescript', 'java' , 'go', 'docs', 'ci-cd', 'design'];
+            const values = context.payload.comment.body.split(" ");
+            switch(values[1]){
+              case 'ts':
+                values[1] = 'typescript';
+                break;
+              case 'js':
+                values[1] = 'javascript';
+              case 'markdown':
+                values[1] = 'docs';
+            }
+            if(values.length != 2 || !areas.includes(values[1])){
+              const message = `Hey @${context.payload.sender.login}, your message doesn't follow the requirements, you can try \`/help\`.`
+              await github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: message
+              })
+            } else {
+              //remove complexity and areas if there are any before adding new labels;
+              const currentLabels = (await github.rest.issues.listLabelsOnIssue({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+              })).data.map(label => label.name);
+              const shouldBeRemoved = currentLabels.filter(label => (label.startsWith('area/') && !label.endsWith(values[1])));
+              shouldBeRemoved.forEach(label => {
+                github.rest.issues.deleteLabel({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  name: label,
+                });
+              });
+              //add new labels
+              github.rest.issues.addLabels({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                labels: ['good first issue', `area/${values[1]}`]
+              });
+            }

package/.github/workflows/automerge-for-humans-merging.yml CHANGED Viewed

@@ -27,6 +27,6 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
           MERGE_LABELS: "!do-not-merge,ready-to-merge"
           MERGE_METHOD: "squash"
-          MERGE_COMMIT_MESSAGE: "pull-request-title"
+          MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
           MERGE_RETRIES: "20"
           MERGE_RETRY_SLEEP: "30000"

package/.github/workflows/automerge.yml CHANGED Viewed

@@ -1,27 +1,20 @@
- # 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.
+# 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.
 name: Automerge release bump PR
 on:
   pull_request_target:
     types:
-      - labeled
-      - unlabeled
-      - synchronize
       - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
+      - synchronize
 jobs:
   autoapprove:
-    if: github.event.pull_request.draft == false && (github.event.pull_request.user.login == 'asyncapi-bot' || github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'dependabot-preview[bot]') && !contains(github.event.pull_request.labels.*.name, 'released')
+    if: >
+      contains(fromJson('["asyncapi-bot", "dependabot[bot]", "dependabot-preview[bot]"]'), github.event.pull_request.user.login) &&
+      contains(fromJson('["asyncapi-bot", "dependabot[bot]", "dependabot-preview[bot]"]'), github.actor) &&
+      !contains(github.event.pull_request.labels.*.name, 'released')
     runs-on: ubuntu-latest
     steps:
       - name: Autoapproving
@@ -39,12 +32,10 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               labels: ['autoapproved']
-            })
+            })
   automerge:
     needs: [autoapprove]
-    if: github.event.pull_request.user.login == 'asyncapi-bot' || github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'dependabot-preview[bot]'
     runs-on: ubuntu-latest
     steps:
       - name: Automerging
@@ -54,6 +45,6 @@ jobs:
           GITHUB_LOGIN: asyncapi-bot
           MERGE_LABELS: ""
           MERGE_METHOD: "squash"
-          MERGE_COMMIT_MESSAGE: "pull-request-title"
+          MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
           MERGE_RETRIES: "20"
           MERGE_RETRY_SLEEP: "30000"

package/.github/workflows/autoupdate.yml CHANGED Viewed

@@ -2,7 +2,7 @@
 #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
 #This workflow is designed to work with:
-# - autoapprove and automerge workflows for dependabot and asyncapibot.
+# - autoapprove and automerge workflows for dependabot and asyncapibot.
 # - special release branches that we from time to time create in upstream repos. If we open up PRs for them from the very beginning of the release, the release branch will constantly update with new things from the destination branch they are opened against
 # It uses GitHub Action that auto-updates pull requests branches, whenever changes are pushed to their destination branch.
@@ -11,17 +11,21 @@
 name: autoupdate
 on:
-  push: {}
-jobs:
+  push:
+    branches-ignore:
+      - 'version-bump/**'
+      - 'dependabot/**'
+      - 'bot/**'
+      - 'all-contributors/**'
+jobs:
   autoupdate:
     runs-on: ubuntu-latest
     steps:
       - name: Autoupdating
         uses: docker://chinthakagodawita/autoupdate-action:v1
         env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          GITHUB_TOKEN: '${{ secrets.GH_TOKEN }}'
           PR_FILTER: "labelled"
           PR_LABELS: "autoapproved"
           PR_READY_STATE: "ready_for_review"

package/.github/workflows/bump.yml CHANGED Viewed

@@ -15,6 +15,7 @@ on:
 jobs:
   bump:
+    if: startsWith(github.event.commits[0].message, 'chore(release):')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
@@ -22,9 +23,9 @@ jobs:
       - name: Check if Node.js project and has package.json
         id: packagejson
         run: test -e ./package.json && echo "::set-output name=exists::true" || echo "::set-output name=exists::false"
-      - if: steps.packagejson.outputs.exists == 'true' && startsWith(github.event.commits[0].message, 'chore(release):')
+      - 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@v3
+        uses: derberg/npm-dependency-manager-for-your-github-org@v4
         with:
           github_token: ${{ secrets.GH_TOKEN }}
           committer_username: asyncapi-bot

package/.github/workflows/help-command.yml CHANGED Viewed

@@ -9,12 +9,11 @@ on:
             - created
 jobs:
-  create_help_comment:
-    if: github.event.issue.pull_request
+  create_help_comment_pr:
+    if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/help') && github.actor != 'asyncapi-bot' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions-ecosystem/action-create-comment@v1
-        if: contains(github.event.comment.body, '/help')
         with:
           github_token: ${{ secrets.GH_TOKEN }}
           body: |
@@ -25,4 +24,20 @@ jobs:
             At the moment the following comments are supported in pull requests:
             - `/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
+            - `/do-not-merge` or `/dnm` - This comment will block automerging even if all conditions are met and ready-to-merge label is added
+  create_help_comment_issue:
+    if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/help') && github.actor != 'asyncapi-bot' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-ecosystem/action-create-comment@v1
+        with:
+          github_token: ${{ secrets.GH_TOKEN }}
+          body: |
+            Hello, @${{ github.actor }}! 👋🏼
+            I'm Genie from the magic lamp. Looks like somebody needs a hand! 🆘
+            At the moment the following comments are supported in issues:
+            - `/good-first-issue {js | ts | java | go | docs | design | ci-cd} ` or `/gfi {js | ts | java | go | docs | design | ci-cd} ` - label an issue as a `good first issue`.
+            example: `/gfi js` or `/good-first-issue ci-cd`

package/.github/workflows/if-go-pr-testing.yml CHANGED Viewed

@@ -6,16 +6,21 @@ name: PR testing - if Go project
 on:
   pull_request:
     types: [opened, reopened, synchronize, ready_for_review]
 jobs:
   lint:
-    if: github.event.pull_request.draft == false
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
+      - if: "github.event.pull_request.draft == false &&!((github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'ci: update global workflows')) || (github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'chore(release):')) || (github.actor == 'allcontributors' && startsWith(github.event.pull_request.title, 'docs: add')))"
+        id: should_run
+        name: Should Run
+        run: echo "::set-output name=shouldrun::true"
+      - if: steps.should_run.outputs.shouldrun == 'true'
+        name: Checkout repository
         uses: actions/checkout@v2
-      - name: Check if Go project and has go.mod
+      - if: steps.should_run.outputs.shouldrun == 'true'
+        name: Check if Go project and has go.mod
         id: gomod
         run: test -e ./go.mod && echo "::set-output name=exists::true" || echo "::set-output name=exists::false"
         shell: bash
@@ -31,16 +36,21 @@ jobs:
           skip-go-installation: true # we wanna control the version of Go in use
   test:
-    if: github.event.pull_request.draft == false
     name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-      - name: Checkout repository
+      - if: "github.event.pull_request.draft == false &&!((github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'ci: update global workflows')) || (github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'chore(release):')) || (github.actor == 'allcontributors' && startsWith(github.event.pull_request.title, 'docs: add')))"
+        id: should_run
+        name: Should Run
+        run: echo "::set-output name=shouldrun::true"
+      - if: steps.should_run.outputs.shouldrun == 'true'
+        name: Checkout repository
         uses: actions/checkout@v2
-      - name: Check if Go project and has go.mod
+      - if: steps.should_run.outputs.shouldrun == 'true'
+        name: Check if Go project and has go.mod
         id: gomod
         run: test -e ./go.mod && echo "::set-output name=exists::true" || echo "::set-output name=exists::false"
         shell: bash

package/.github/workflows/if-nodejs-pr-testing.yml CHANGED Viewed

@@ -9,20 +9,26 @@ on:
 jobs:
   test:
-    if: github.event.pull_request.draft == false
     name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-      - name: Set git to use LF #to once and for all finish neverending fight between Unix and Windows
+      - if: "github.event.pull_request.draft == false &&!((github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'ci: update global workflows')) || (github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'chore(release):')) || (github.actor == 'allcontributors' && startsWith(github.event.pull_request.title, 'docs: add')))"
+        id: should_run
+        name: Should Run
+        run: echo "::set-output name=shouldrun::true"
+      - 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
-      - name: Checkout repository
+      - if: steps.should_run.outputs.shouldrun == 'true'
+        name: Checkout repository
         uses: actions/checkout@v2
-      - name: Check if Node.js project and has package.json
+      - if: steps.should_run.outputs.shouldrun == 'true'
+        name: Check if Node.js project and has package.json
         id: packagejson
         run: test -e ./package.json && echo "::set-output name=exists::true" || echo "::set-output name=exists::false"
         shell: bash

package/.github/workflows/if-nodejs-release.yml CHANGED Viewed

@@ -10,7 +10,10 @@ on:
       # below lines are not enough to have release supported for these branches
       # make sure configuration of `semantic-release` package mentiones these branches
       - next
-      - '**-release'
+      - next-major
+      - beta
+      - alpha
+      - '**-release' # custom
 jobs:
@@ -47,7 +50,7 @@ jobs:
   release:
     needs: test
-    name: Publish to NPM and GitHub
+    name: Publish to any of NPM, Github, and Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Set git to use LF #to once and for all finish neverending fight between Unix and Windows
@@ -68,11 +71,13 @@ jobs:
         name: Install dependencies
         run: npm install
       - if: steps.packagejson.outputs.exists == 'true'
-        name: Release to NPM and GitHub
+        name: Publish to any of NPM, Github, and Docker Hub
         id: release
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           GIT_AUTHOR_NAME: asyncapi-bot
           GIT_AUTHOR_EMAIL: info@asyncapi.io
           GIT_COMMITTER_NAME: asyncapi-bot

package/.github/workflows/notify-tsc-members-mention.yml ADDED Viewed

@@ -0,0 +1,142 @@
+#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
+#This action notifies community on slack whenever there is a new issue, PR or discussion started in given repository
+name: Notify slack whenever TSC members are mentioned in GitHub
+on:
+    issue_comment:
+      types:
+        - created
+        - edited
+    discussion_comment:
+      types:
+        - created
+        - edited
+    issues:
+      types:
+        - opened
+        - reopened
+    pull_request_target:
+      types:
+        - opened
+        - reopened
+        - ready_for_review
+    discussion:
+      types:
+        - created
+        - edited
+jobs:
+    issue:
+      if: github.event_name == 'issues' && contains(github.event.issue.body, '@asyncapi/tsc_members')
+      name: On every new issue
+      runs-on: ubuntu-latest
+      steps:
+        - name: Convert markdown to slack markdown
+          uses: LoveToKnow/slackify-markdown-action@v1.0.0
+          id: issuemarkdown
+          with:
+            text: "[${{github.event.issue.title}}](${{github.event.issue.html_url}}) \n ${{github.event.issue.body}}"
+        - name: Send info about issue
+          uses: rtCamp/action-slack-notify@v2
+          env:
+            SLACK_WEBHOOK: ${{secrets.SLACK_TSC_MEMBERS_NOTIFY}}
+            SLACK_TITLE: 🆘 New issue that requires TSC Members attention 🆘
+            SLACK_MESSAGE: ${{steps.issuemarkdown.outputs.text}}
+            MSG_MINIMAL: true
+    pull_request:
+      if: github.event_name == 'pull_request_target' && contains(github.event.pull_request.body, '@asyncapi/tsc_members')
+      name: On every new pull request
+      runs-on: ubuntu-latest
+      steps:
+        - name: Convert markdown to slack markdown
+          uses: LoveToKnow/slackify-markdown-action@v1.0.0
+          id: prmarkdown
+          with:
+            text: "[${{github.event.pull_request.title}}](${{github.event.pull_request.html_url}}) \n ${{github.event.pull_request.body}}"
+        - name: Send info about pull request
+          uses: rtCamp/action-slack-notify@v2
+          env:
+            SLACK_WEBHOOK: ${{secrets.SLACK_TSC_MEMBERS_NOTIFY}}
+            SLACK_TITLE: 🆘 New PR that requires TSC Members attention 🆘
+            SLACK_MESSAGE: ${{steps.prmarkdown.outputs.text}}
+            MSG_MINIMAL: true
+    discussion:
+      if: github.event_name == 'discussion' && contains(github.event.discussion.body, '@asyncapi/tsc_members')
+      name: On every new discussion
+      runs-on: ubuntu-latest
+      steps:
+        - name: Convert markdown to slack markdown
+          uses: LoveToKnow/slackify-markdown-action@v1.0.0
+          id: discussionmarkdown
+          with:
+            text: "[${{github.event.discussion.title}}](${{github.event.discussion.html_url}}) \n ${{github.event.discussion.body}}"
+        - name: Send info about pull request
+          uses: rtCamp/action-slack-notify@v2
+          env:
+            SLACK_WEBHOOK: ${{secrets.SLACK_TSC_MEMBERS_NOTIFY}}
+            SLACK_TITLE: 🆘 New discussion that requires TSC Members attention 🆘
+            SLACK_MESSAGE: ${{steps.discussionmarkdown.outputs.text}}
+            MSG_MINIMAL: true
+    issue_comment:
+      if: ${{ github.event_name == 'issue_comment' && !github.event.issue.pull_request && contains(github.event.comment.body, '@asyncapi/tsc_members') }}
+      name: On every new comment in issue
+      runs-on: ubuntu-latest
+      steps:
+        - name: Convert markdown to slack markdown
+          uses: LoveToKnow/slackify-markdown-action@v1.0.0
+          id: issuemarkdown
+          with:
+            text: "[${{github.event.issue.title}}](${{github.event.comment.html_url}}) \n ${{github.event.comment.body}}"
+        - name: Send info about issue comment
+          uses: rtCamp/action-slack-notify@v2
+          env:
+            SLACK_WEBHOOK: ${{secrets.SLACK_TSC_MEMBERS_NOTIFY}}
+            SLACK_TITLE: 🆘 New comment under existing issue that requires TSC Members attention 🆘
+            SLACK_MESSAGE: ${{steps.issuemarkdown.outputs.text}}
+            MSG_MINIMAL: true
+    pr_comment:
+      if: github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '@asyncapi/tsc_members')
+      name: On every new comment in pr
+      runs-on: ubuntu-latest
+      steps:
+        - name: Convert markdown to slack markdown
+          uses: LoveToKnow/slackify-markdown-action@v1.0.0
+          id: prmarkdown
+          with:
+            text: "[${{github.event.issue.title}}](${{github.event.comment.html_url}}) \n ${{github.event.comment.body}}"
+        - name: Send info about PR comment
+          uses: rtCamp/action-slack-notify@v2
+          env:
+            SLACK_WEBHOOK: ${{secrets.SLACK_TSC_MEMBERS_NOTIFY}}
+            SLACK_TITLE: 🆘 New comment under existing PR that requires TSC Members attention 🆘
+            SLACK_MESSAGE: ${{steps.prmarkdown.outputs.text}}
+            MSG_MINIMAL: true
+    discussion_comment:
+      if: github.event_name == 'discussion_comment' && contains(github.event.comment.body, '@asyncapi/tsc_members')
+      name: On every new comment in discussion
+      runs-on: ubuntu-latest
+      steps:
+        - name: Convert markdown to slack markdown
+          uses: LoveToKnow/slackify-markdown-action@v1.0.0
+          id: discussionmarkdown
+          with:
+            text: "[${{github.event.discussion.title}}](${{github.event.comment.html_url}}) \n ${{github.event.comment.body}}"
+        - name: Send info about discussion comment
+          uses: rtCamp/action-slack-notify@v2
+          env:
+            SLACK_WEBHOOK: ${{secrets.SLACK_TSC_MEMBERS_NOTIFY}}
+            SLACK_TITLE: 🆘 New comment under existing discussion that requires TSC Members attention 🆘
+            SLACK_MESSAGE: ${{steps.discussionmarkdown.outputs.text}}
+            MSG_MINIMAL: true

package/cli.js CHANGED Viewed

@@ -32,14 +32,21 @@ if (!asyncapiFile) {
   program.help(); // This exits the process
 }
 if (!version) {
-  version = '2.1.0';
+  version = '2.3.0';
 }
 try {
   const asyncapi = fs.readFileSync(asyncapiFile, 'utf-8');
-  console.log(converter.convert(asyncapi, version, {
+  let converted = converter.convert(asyncapi, version, {
     id: program.id,
-  }));
+  });
+  // JSON case
+  if (typeof converted === 'object') {
+    converted = JSON.stringify(converted, undefined, 2);
+  }
+  console.log(converted);
 } catch (e) {
   showErrorAndExit(e);
 }

package/lib/helpers.js CHANGED Viewed

@@ -3,16 +3,34 @@ const yaml = require('js-yaml');
 const helpers = module.exports;
 helpers.serialize = (text) => {
+    if (typeof text === 'object') {
+        return {
+            isYAML: false,
+            parsed: text,
+        };
+    }
     try {
+        const maybeJSON = JSON.parse(text);
+        if (typeof maybeJSON === 'object') {
+            return {
+                isYAML: false,
+                parsed: maybeJSON,
+            };
+        }
+        // if `maybeJSON` is object, then we have 100% sure that we operate on JSON,
+        // but if it's `string` then we have option that it can be YAML but it doesn't have to be
         return {
             isYAML: true,
             parsed: yaml.safeLoad(text)
         };
     } catch (e) {
         try {
+            // try to parse again YAML, because the text itself may not have a JSON representation and cannot be represented as a JSON object/string
             return {
-                isYAML: false,
-                parsed: JSON.parse(text)
+                isYAML: true,
+                parsed: yaml.safeLoad(text)
             };
         } catch (err) {
             throw new Error('AsyncAPI document must be a valid JSON or YAML document.');

package/lib/index.js CHANGED Viewed

@@ -22,6 +22,7 @@ const conversions = {
   '2.0.0': from__2_0_0_rc2__to__2_0_0,
   '2.1.0': from__2_0_0__to__2_1_0,
   '2.2.0': from__2_1_0__to__2_2_0,
+  '2.3.0': from__2_2_0__to__2_3_0,
 }
 const conversionVersions = Object.keys(conversions);
@@ -181,6 +182,12 @@ function from__2_0_0_rc1__to__2_0_0_rc2(asyncapi2rc1, options) { // NOSONAR
     });
   }
+  if (result.components && result.components.parameters) {
+    _.each(result.components.parameters, (parameter) => {
+      if (parameter.name) delete parameter.name;
+    });
+  }
   if (!options.id) delete result.id;
   return result;
 }
@@ -192,14 +199,17 @@ function from__2_0_0_rc2__to__2_0_0(asyncapi2rc2, options) {
   return result;
 }
-function from__2_0_0__to__2_1_0(asyncapi2) {
-  const result = asyncapi2;
-  result.asyncapi = '2.1.0';
-  return result;
+function from__2_0_0__to__2_1_0(asyncapi) {
+  asyncapi.asyncapi = '2.1.0';
+  return asyncapi;
 }
-function from__2_1_0__to__2_2_0(asyncapi2) {
-  const result = asyncapi2;
-  result.asyncapi = '2.2.0';
-  return result;
+function from__2_1_0__to__2_2_0(asyncapi) {
+  asyncapi.asyncapi = '2.2.0';
+  return asyncapi;
 }
+function from__2_2_0__to__2_3_0(asyncapi) {
+  asyncapi.asyncapi = '2.3.0';
+  return asyncapi;
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@asyncapi/converter",
-	"version": "0.6.1",
+	"version": "0.7.2",
 	"description": "Convert AsyncAPI documents from older to newer versions.",
 	"bin": {
 		"asyncapi-converter": "cli.js"

package/test/index.js CHANGED Viewed

@@ -2,6 +2,7 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require("path");
 const { convert } = require('../lib');
+const { serialize } = require('../lib/helpers');
 describe('#convert', () => {
     it('should not convert to lowest version', () => {
@@ -179,6 +180,62 @@ describe('#convert', () => {
         const result = convert(input, '2.2.0');
         assertResults(output, result);
     });
+    it('should convert from 2.1.0 to 2.3.0', () => {
+        const input = fs.readFileSync(path.resolve(__dirname, 'input', '2.1.0', 'streetlights.yml'), 'utf8');
+        const output = fs.readFileSync(path.resolve(__dirname, 'output', '2.3.0', 'streetlights.yml'), 'utf8');
+        const result = convert(input, '2.3.0');
+        assertResults(output, result);
+    });
+    it('should convert from 2.2.0 to 2.3.0', () => {
+        const input = fs.readFileSync(path.resolve(__dirname, 'input', '2.2.0', 'streetlights.yml'), 'utf8');
+        const output = fs.readFileSync(path.resolve(__dirname, 'output', '2.3.0', 'streetlights.yml'), 'utf8');
+        const result = convert(input, '2.3.0');
+        assertResults(output, result);
+    });
+    it('should convert from 2.0.0 to 2.1.0 (JSON case)', () => {
+        const input = fs.readFileSync(path.resolve(__dirname, 'input', '2.0.0', 'streetlights.json'), 'utf8');
+        let output = fs.readFileSync(path.resolve(__dirname, 'output', '2.1.0', 'streetlights.json'), 'utf8');
+        let result = convert(input, '2.1.0');
+        output = JSON.stringify(JSON.parse(output));
+        result = JSON.stringify(JSON.parse(JSON.stringify(result)));
+        assert.strictEqual(output, result);
+    });
+});
+describe('#serialize', () => {
+    it('should serialize JSON', () => {
+        const input = '{"foo": "bar"}';
+        const output = serialize(input);
+        assert.strictEqual(output.isYAML, false);
+        assert.deepEqual(output.parsed, {foo: "bar"});
+    });
+    it('should serialize YAML', () => {
+        const input = 'foo: bar';
+        const output = serialize(input);
+        assert.strictEqual(output.isYAML, true);
+        assert.deepEqual(output.parsed, {foo: "bar"});
+    });
+    it('should serialize YAML (with JSON syntax)', () => {
+        const input = '{foo: bar}';
+        const output = serialize(input);
+        assert.strictEqual(output.isYAML, true);
+        assert.deepEqual(output.parsed, {foo: "bar"});
+    });
+    it('should throw error', () => {
+        const input = '%{foo: bar}';
+        try {
+            serialize(input);
+        } catch(e) {
+            assert.strictEqual(e.message, 'AsyncAPI document must be a valid JSON or YAML document.');
+        }
+    });
 });
 /*
@@ -191,4 +248,4 @@ function removeLineBreaks(str) {
 function assertResults(output, result){
     assert.strictEqual(removeLineBreaks(output), removeLineBreaks(result));
-}
+}

package/test/input/2.0.0/streetlights.json ADDED Viewed

@@ -0,0 +1,172 @@
+{
+  "asyncapi": "2.0.0",
+  "info": {
+    "title": "Streetlights API",
+    "version": "1.0.0",
+    "description": "The Smartylighting Streetlights API allows you to remotely manage the city lights.\n\n### Check out its awesome features:\n\n* Turn a specific streetlight on/off 🌃\n* Dim a specific streetlight 😎\n* Receive real-time information about environmental lighting conditions 📈\n",
+    "license": {
+      "name": "Apache 2.0",
+      "url": "https://www.apache.org/licenses/LICENSE-2.0"
+    }
+  },
+  "servers": {
+    "default": {
+      "url": "api.streetlights.smartylighting.com:{port}",
+      "description": "Test broker",
+      "variables": {
+        "port": {
+          "description": "Secure connection (TLS) is available through port 8883.",
+          "default": "1883",
+          "enum": [
+            "1883",
+            "8883"
+          ]
+        }
+      },
+      "protocol": "mqtt",
+      "security": [
+        {
+          "apiKey": []
+        }
+      ]
+    }
+  },
+  "components": {
+    "messages": {
+      "lightMeasured": {
+        "summary": "Inform about environmental lighting conditions for a particular streetlight.",
+        "payload": {
+          "$ref": "#/components/schemas/lightMeasuredPayload"
+        }
+      },
+      "turnOnOff": {
+        "summary": "Command a particular streetlight to turn the lights on or off.",
+        "payload": {
+          "$ref": "#/components/schemas/turnOnOffPayload"
+        }
+      },
+      "dimLight": {
+        "summary": "Command a particular streetlight to dim the lights.",
+        "payload": {
+          "$ref": "#/components/schemas/dimLightPayload"
+        }
+      }
+    },
+    "schemas": {
+      "lightMeasuredPayload": {
+        "type": "object",
+        "properties": {
+          "lumens": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Light intensity measured in lumens."
+          },
+          "sentAt": {
+            "$ref": "#/components/schemas/sentAt"
+          }
+        }
+      },
+      "turnOnOffPayload": {
+        "type": "object",
+        "properties": {
+          "command": {
+            "type": "string",
+            "enum": [
+              "on",
+              "off"
+            ],
+            "description": "Whether to turn on or off the light."
+          },
+          "sentAt": {
+            "$ref": "#/components/schemas/sentAt"
+          }
+        }
+      },
+      "dimLightPayload": {
+        "type": "object",
+        "properties": {
+          "percentage": {
+            "type": "integer",
+            "description": "Percentage to which the light should be dimmed to.",
+            "minimum": 0,
+            "maximum": 100
+          },
+          "sentAt": {
+            "$ref": "#/components/schemas/sentAt"
+          }
+        }
+      },
+      "sentAt": {
+        "type": "string",
+        "format": "date-time",
+        "description": "Date and time when the message was sent."
+      }
+    },
+    "securitySchemes": {
+      "apiKey": {
+        "type": "apiKey",
+        "in": "user",
+        "description": "Provide your API key as the user and leave the password empty."
+      }
+    },
+    "parameters": {
+      "streetlightId": {
+        "name": "streetlightId",
+        "description": "The ID of the streetlight.",
+        "schema": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "channels": {
+    "smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured": {
+      "parameters": {
+        "streetlightId": {
+          "$ref": "#/components/parameters/streetlightId"
+        }
+      },
+      "publish": {
+        "message": {
+          "$ref": "#/components/messages/lightMeasured"
+        }
+      }
+    },
+    "smartylighting/streetlights/1/0/action/{streetlightId}/turn/on": {
+      "parameters": {
+        "streetlightId": {
+          "$ref": "#/components/parameters/streetlightId"
+        }
+      },
+      "subscribe": {
+        "message": {
+          "$ref": "#/components/messages/turnOnOff"
+        }
+      }
+    },
+    "smartylighting/streetlights/1/0/action/{streetlightId}/turn/off": {
+      "parameters": {
+        "streetlightId": {
+          "$ref": "#/components/parameters/streetlightId"
+        }
+      },
+      "subscribe": {
+        "message": {
+          "$ref": "#/components/messages/turnOnOff"
+        }
+      }
+    },
+    "smartylighting/streetlights/1/0/action/{streetlightId}/dim": {
+      "parameters": {
+        "streetlightId": {
+          "$ref": "#/components/parameters/streetlightId"
+        }
+      },
+      "subscribe": {
+        "message": {
+          "$ref": "#/components/messages/dimLight"
+        }
+      }
+    }
+  }
+}

package/test/input/2.0.0/streetlights.yml CHANGED Viewed

@@ -78,7 +78,6 @@ components:
       description: Provide your API key as the user and leave the password empty.
   parameters:
     streetlightId:
-      name: streetlightId
       description: The ID of the streetlight.
       schema:
         type: string

package/test/input/2.0.0-rc2/streetlights.yml CHANGED Viewed

@@ -78,7 +78,6 @@ components:
       description: Provide your API key as the user and leave the password empty.
   parameters:
     streetlightId:
-      name: streetlightId
       description: The ID of the streetlight.
       schema:
         type: string

package/test/input/2.1.0/streetlights.yml CHANGED Viewed

@@ -78,7 +78,6 @@ components:
       description: Provide your API key as the user and leave the password empty.
   parameters:
     streetlightId:
-      name: streetlightId
       description: The ID of the streetlight.
       schema:
         type: string

package/test/input/2.2.0/streetlights.yml ADDED Viewed

@@ -0,0 +1,112 @@
+asyncapi: 2.2.0
+info:
+  title: Streetlights API
+  version: 1.0.0
+  description: "The Smartylighting Streetlights API allows you to remotely manage the city lights.\n\n### Check out its awesome features:\n\n* Turn a specific streetlight on/off \U0001F303\n* Dim a specific streetlight \U0001F60E\n* Receive real-time information about environmental lighting conditions \U0001F4C8\n"
+  license:
+    name: Apache 2.0
+    url: 'https://www.apache.org/licenses/LICENSE-2.0'
+servers:
+  default:
+    url: 'api.streetlights.smartylighting.com:{port}'
+    description: Test broker
+    variables:
+      port:
+        description: Secure connection (TLS) is available through port 8883.
+        default: '1883'
+        enum:
+          - '1883'
+          - '8883'
+    protocol: mqtt
+    security:
+      - apiKey: []
+components:
+  messages:
+    lightMeasured:
+      summary: >-
+        Inform about environmental lighting conditions for a particular
+        streetlight.
+      payload:
+        $ref: '#/components/schemas/lightMeasuredPayload'
+    turnOnOff:
+      summary: Command a particular streetlight to turn the lights on or off.
+      payload:
+        $ref: '#/components/schemas/turnOnOffPayload'
+    dimLight:
+      summary: Command a particular streetlight to dim the lights.
+      payload:
+        $ref: '#/components/schemas/dimLightPayload'
+  schemas:
+    lightMeasuredPayload:
+      type: object
+      properties:
+        lumens:
+          type: integer
+          minimum: 0
+          description: Light intensity measured in lumens.
+        sentAt:
+          $ref: '#/components/schemas/sentAt'
+    turnOnOffPayload:
+      type: object
+      properties:
+        command:
+          type: string
+          enum:
+            - 'on'
+            - 'off'
+          description: Whether to turn on or off the light.
+        sentAt:
+          $ref: '#/components/schemas/sentAt'
+    dimLightPayload:
+      type: object
+      properties:
+        percentage:
+          type: integer
+          description: Percentage to which the light should be dimmed to.
+          minimum: 0
+          maximum: 100
+        sentAt:
+          $ref: '#/components/schemas/sentAt'
+    sentAt:
+      type: string
+      format: date-time
+      description: Date and time when the message was sent.
+  securitySchemes:
+    apiKey:
+      type: apiKey
+      in: user
+      description: Provide your API key as the user and leave the password empty.
+  parameters:
+    streetlightId:
+      description: The ID of the streetlight.
+      schema:
+        type: string
+channels:
+  'smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured':
+    parameters:
+      streetlightId:
+        $ref: '#/components/parameters/streetlightId'
+    publish:
+      message:
+        $ref: '#/components/messages/lightMeasured'
+  'smartylighting/streetlights/1/0/action/{streetlightId}/turn/on':
+    parameters:
+      streetlightId:
+        $ref: '#/components/parameters/streetlightId'
+    subscribe:
+      message:
+        $ref: '#/components/messages/turnOnOff'
+  'smartylighting/streetlights/1/0/action/{streetlightId}/turn/off':
+    parameters:
+      streetlightId:
+        $ref: '#/components/parameters/streetlightId'
+    subscribe:
+      message:
+        $ref: '#/components/messages/turnOnOff'
+  'smartylighting/streetlights/1/0/action/{streetlightId}/dim':
+    parameters:
+      streetlightId:
+        $ref: '#/components/parameters/streetlightId'
+    subscribe:
+      message:
+        $ref: '#/components/messages/dimLight'

package/test/output/2.0.0/streetlights.yml CHANGED Viewed

@@ -78,7 +78,6 @@ components:
       description: Provide your API key as the user and leave the password empty.
   parameters:
     streetlightId:
-      name: streetlightId
       description: The ID of the streetlight.
       schema:
         type: string

package/test/output/2.0.0-rc2/streetlights.yml CHANGED Viewed

@@ -78,7 +78,6 @@ components:
       description: Provide your API key as the user and leave the password empty.
   parameters:
     streetlightId:
-      name: streetlightId
       description: The ID of the streetlight.
       schema:
         type: string

package/test/output/2.1.0/streetlights.json ADDED Viewed

@@ -0,0 +1,172 @@
+{
+  "asyncapi": "2.1.0",
+  "info": {
+    "title": "Streetlights API",
+    "version": "1.0.0",
+    "description": "The Smartylighting Streetlights API allows you to remotely manage the city lights.\n\n### Check out its awesome features:\n\n* Turn a specific streetlight on/off 🌃\n* Dim a specific streetlight 😎\n* Receive real-time information about environmental lighting conditions 📈\n",
+    "license": {
+      "name": "Apache 2.0",
+      "url": "https://www.apache.org/licenses/LICENSE-2.0"
+    }
+  },
+  "servers": {
+    "default": {
+      "url": "api.streetlights.smartylighting.com:{port}",
+      "description": "Test broker",
+      "variables": {
+        "port": {
+          "description": "Secure connection (TLS) is available through port 8883.",
+          "default": "1883",
+          "enum": [
+            "1883",
+            "8883"
+          ]
+        }
+      },
+      "protocol": "mqtt",
+      "security": [
+        {
+          "apiKey": []
+        }
+      ]
+    }
+  },
+  "components": {
+    "messages": {
+      "lightMeasured": {
+        "summary": "Inform about environmental lighting conditions for a particular streetlight.",
+        "payload": {
+          "$ref": "#/components/schemas/lightMeasuredPayload"
+        }
+      },
+      "turnOnOff": {
+        "summary": "Command a particular streetlight to turn the lights on or off.",
+        "payload": {
+          "$ref": "#/components/schemas/turnOnOffPayload"
+        }
+      },
+      "dimLight": {
+        "summary": "Command a particular streetlight to dim the lights.",
+        "payload": {
+          "$ref": "#/components/schemas/dimLightPayload"
+        }
+      }
+    },
+    "schemas": {
+      "lightMeasuredPayload": {
+        "type": "object",
+        "properties": {
+          "lumens": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Light intensity measured in lumens."
+          },
+          "sentAt": {
+            "$ref": "#/components/schemas/sentAt"
+          }
+        }
+      },
+      "turnOnOffPayload": {
+        "type": "object",
+        "properties": {
+          "command": {
+            "type": "string",
+            "enum": [
+              "on",
+              "off"
+            ],
+            "description": "Whether to turn on or off the light."
+          },
+          "sentAt": {
+            "$ref": "#/components/schemas/sentAt"
+          }
+        }
+      },
+      "dimLightPayload": {
+        "type": "object",
+        "properties": {
+          "percentage": {
+            "type": "integer",
+            "description": "Percentage to which the light should be dimmed to.",
+            "minimum": 0,
+            "maximum": 100
+          },
+          "sentAt": {
+            "$ref": "#/components/schemas/sentAt"
+          }
+        }
+      },
+      "sentAt": {
+        "type": "string",
+        "format": "date-time",
+        "description": "Date and time when the message was sent."
+      }
+    },
+    "securitySchemes": {
+      "apiKey": {
+        "type": "apiKey",
+        "in": "user",
+        "description": "Provide your API key as the user and leave the password empty."
+      }
+    },
+    "parameters": {
+      "streetlightId": {
+        "name": "streetlightId",
+        "description": "The ID of the streetlight.",
+        "schema": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "channels": {
+    "smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured": {
+      "parameters": {
+        "streetlightId": {
+          "$ref": "#/components/parameters/streetlightId"
+        }
+      },
+      "publish": {
+        "message": {
+          "$ref": "#/components/messages/lightMeasured"
+        }
+      }
+    },
+    "smartylighting/streetlights/1/0/action/{streetlightId}/turn/on": {
+      "parameters": {
+        "streetlightId": {
+          "$ref": "#/components/parameters/streetlightId"
+        }
+      },
+      "subscribe": {
+        "message": {
+          "$ref": "#/components/messages/turnOnOff"
+        }
+      }
+    },
+    "smartylighting/streetlights/1/0/action/{streetlightId}/turn/off": {
+      "parameters": {
+        "streetlightId": {
+          "$ref": "#/components/parameters/streetlightId"
+        }
+      },
+      "subscribe": {
+        "message": {
+          "$ref": "#/components/messages/turnOnOff"
+        }
+      }
+    },
+    "smartylighting/streetlights/1/0/action/{streetlightId}/dim": {
+      "parameters": {
+        "streetlightId": {
+          "$ref": "#/components/parameters/streetlightId"
+        }
+      },
+      "subscribe": {
+        "message": {
+          "$ref": "#/components/messages/dimLight"
+        }
+      }
+    }
+  }
+}

package/test/output/2.1.0/streetlights.yml CHANGED Viewed

@@ -78,7 +78,6 @@ components:
       description: Provide your API key as the user and leave the password empty.
   parameters:
     streetlightId:
-      name: streetlightId
       description: The ID of the streetlight.
       schema:
         type: string

package/test/output/2.2.0/streetlights.yml CHANGED Viewed

@@ -78,7 +78,6 @@ components:
       description: Provide your API key as the user and leave the password empty.
   parameters:
     streetlightId:
-      name: streetlightId
       description: The ID of the streetlight.
       schema:
         type: string

package/test/output/2.3.0/streetlights.yml ADDED Viewed

@@ -0,0 +1,112 @@
+asyncapi: 2.3.0
+info:
+  title: Streetlights API
+  version: 1.0.0
+  description: "The Smartylighting Streetlights API allows you to remotely manage the city lights.\n\n### Check out its awesome features:\n\n* Turn a specific streetlight on/off \U0001F303\n* Dim a specific streetlight \U0001F60E\n* Receive real-time information about environmental lighting conditions \U0001F4C8\n"
+  license:
+    name: Apache 2.0
+    url: 'https://www.apache.org/licenses/LICENSE-2.0'
+servers:
+  default:
+    url: 'api.streetlights.smartylighting.com:{port}'
+    description: Test broker
+    variables:
+      port:
+        description: Secure connection (TLS) is available through port 8883.
+        default: '1883'
+        enum:
+          - '1883'
+          - '8883'
+    protocol: mqtt
+    security:
+      - apiKey: []
+components:
+  messages:
+    lightMeasured:
+      summary: >-
+        Inform about environmental lighting conditions for a particular
+        streetlight.
+      payload:
+        $ref: '#/components/schemas/lightMeasuredPayload'
+    turnOnOff:
+      summary: Command a particular streetlight to turn the lights on or off.
+      payload:
+        $ref: '#/components/schemas/turnOnOffPayload'
+    dimLight:
+      summary: Command a particular streetlight to dim the lights.
+      payload:
+        $ref: '#/components/schemas/dimLightPayload'
+  schemas:
+    lightMeasuredPayload:
+      type: object
+      properties:
+        lumens:
+          type: integer
+          minimum: 0
+          description: Light intensity measured in lumens.
+        sentAt:
+          $ref: '#/components/schemas/sentAt'
+    turnOnOffPayload:
+      type: object
+      properties:
+        command:
+          type: string
+          enum:
+            - 'on'
+            - 'off'
+          description: Whether to turn on or off the light.
+        sentAt:
+          $ref: '#/components/schemas/sentAt'
+    dimLightPayload:
+      type: object
+      properties:
+        percentage:
+          type: integer
+          description: Percentage to which the light should be dimmed to.
+          minimum: 0
+          maximum: 100
+        sentAt:
+          $ref: '#/components/schemas/sentAt'
+    sentAt:
+      type: string
+      format: date-time
+      description: Date and time when the message was sent.
+  securitySchemes:
+    apiKey:
+      type: apiKey
+      in: user
+      description: Provide your API key as the user and leave the password empty.
+  parameters:
+    streetlightId:
+      description: The ID of the streetlight.
+      schema:
+        type: string
+channels:
+  'smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured':
+    parameters:
+      streetlightId:
+        $ref: '#/components/parameters/streetlightId'
+    publish:
+      message:
+        $ref: '#/components/messages/lightMeasured'
+  'smartylighting/streetlights/1/0/action/{streetlightId}/turn/on':
+    parameters:
+      streetlightId:
+        $ref: '#/components/parameters/streetlightId'
+    subscribe:
+      message:
+        $ref: '#/components/messages/turnOnOff'
+  'smartylighting/streetlights/1/0/action/{streetlightId}/turn/off':
+    parameters:
+      streetlightId:
+        $ref: '#/components/parameters/streetlightId'
+    subscribe:
+      message:
+        $ref: '#/components/messages/turnOnOff'
+  'smartylighting/streetlights/1/0/action/{streetlightId}/dim':
+    parameters:
+      streetlightId:
+        $ref: '#/components/parameters/streetlightId'
+    subscribe:
+      message:
+        $ref: '#/components/messages/dimLight'