From 2ecb2b4720c6c02fe08461dea52c33d7759a704a Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Tue, 11 Jun 2024 13:58:49 +0200 Subject: [PATCH 1/5] ci: update of files from global .github repo (#1009) --- .github/workflows/issues-prs-notifications.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/issues-prs-notifications.yml b/.github/workflows/issues-prs-notifications.yml index 78ebe9601..b8b20c6ba 100644 --- a/.github/workflows/issues-prs-notifications.yml +++ b/.github/workflows/issues-prs-notifications.yml @@ -20,8 +20,6 @@ jobs: name: Notify slack on every new issue runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v3 - name: Convert markdown to slack markdown for issue uses: asyncapi/.github/.github/actions/slackify-markdown@master id: issuemarkdown @@ -40,8 +38,6 @@ jobs: name: Notify slack on every new pull request runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v3 - name: Convert markdown to slack markdown for pull request uses: asyncapi/.github/.github/actions/slackify-markdown@master id: prmarkdown @@ -60,8 +56,6 @@ jobs: name: Notify slack on every new pull request runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v3 - name: Convert markdown to slack markdown for pull request uses: asyncapi/.github/.github/actions/slackify-markdown@master id: discussionmarkdown From 3a14fd07a8c7df070cad54bfad16f4a0d29c5f1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:05:16 +0200 Subject: [PATCH 2/5] chore(deps-dev): bump braces from 3.0.2 to 3.0.3 (#1010) --- package-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1ce390de2..76eab98cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3327,12 +3327,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -5558,9 +5558,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -13644,12 +13644,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "brorand": { @@ -15420,9 +15420,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" From dc54de7d3d34bb49cc263a98275d62e34f643eb1 Mon Sep 17 00:00:00 2001 From: Sergio Moya <1083296+smoya@users.noreply.github.com> Date: Wed, 12 Jun 2024 14:18:03 +0200 Subject: [PATCH 3/5] fix: remove v2 Spectral schema rules from v3 rules (#1013) --- src/ruleset/v2/ruleset.ts | 1 + test/validate.spec.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ruleset/v2/ruleset.ts b/src/ruleset/v2/ruleset.ts index bbd3a65af..7e80f89f6 100644 --- a/src/ruleset/v2/ruleset.ts +++ b/src/ruleset/v2/ruleset.ts @@ -192,6 +192,7 @@ export const v2CoreRuleset = { export const v2SchemasRuleset = (parser: Parser) => { return { description: 'Schemas AsyncAPI 2.x.x ruleset.', + formats: AsyncAPIFormats.filterByMajorVersions(['2']).formats(), rules: { 'asyncapi2-schemas': asyncApi2SchemaParserRule(parser), 'asyncapi2-schema-default': { diff --git a/test/validate.spec.ts b/test/validate.spec.ts index 60b85730a..5a5ab00ad 100644 --- a/test/validate.spec.ts +++ b/test/validate.spec.ts @@ -1,3 +1,4 @@ +import { AsyncAPIDocument } from '../src/models/v3/asyncapi'; import { Parser } from '../src/parser'; import { hasErrorDiagnostic, hasWarningDiagnostic } from '../src/utils'; @@ -91,7 +92,7 @@ describe('validate()', function() { } }; const { document, diagnostics } = await parser.parse(documentRaw, { validateOptions: { allowedSeverity: { warning: false } } }); - console.log(diagnostics); expect(diagnostics).toHaveLength(0); + expect(document).toBeInstanceOf(AsyncAPIDocument); }); }); From 63085beff17092754ec3b4782af7ca3399ecadc3 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Wed, 12 Jun 2024 14:26:36 +0200 Subject: [PATCH 4/5] chore(release): v3.1.0 (#1014) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 76eab98cc..18b45531e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@asyncapi/parser", - "version": "3.0.16", + "version": "3.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@asyncapi/parser", - "version": "3.0.16", + "version": "3.1.0", "license": "Apache-2.0", "dependencies": { "@asyncapi/specs": "^6.7.1", diff --git a/package.json b/package.json index 3a12c916f..9de091ebb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@asyncapi/parser", - "version": "3.0.16", + "version": "3.1.0", "description": "JavaScript AsyncAPI parser.", "bugs": { "url": "https://github.com/asyncapi/parser-js/issues" From 55f1df98cf800b8abc937f9dde4a098e10326e70 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Wed, 12 Jun 2024 14:51:32 +0200 Subject: [PATCH 5/5] chore: update @asyncapi/avro-schema-parser to 3.0.24 version and others (#1015) --- package-lock.json | 34 +++++++++++++++++----------------- package.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 18b45531e..b59fc41d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "node-fetch": "2.6.7" }, "devDependencies": { - "@asyncapi/avro-schema-parser": "^3.0.23", + "@asyncapi/avro-schema-parser": "^3.0.24", "@jest/types": "^29.0.2", "@swc/core": "^1.2.248", "@swc/jest": "^0.2.22", @@ -82,23 +82,23 @@ } }, "node_modules/@asyncapi/avro-schema-parser": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-3.0.23.tgz", - "integrity": "sha512-NVJg84ldlsIjngRfKejiqDoXx+e32b7oCkzGv9b1vVvaalUBjbw9HOpnLak6FXPigqEKJ4BesMVU4TnZXtGWNQ==", + "version": "3.0.24", + "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-3.0.24.tgz", + "integrity": "sha512-YMyr2S2heMrWHRyECknjHeejlZl5exUSv9nD1gTejAT13fSf0PqIRydZ9ZuoglCLBg55AeehypR2zLIBu/9kHQ==", "dev": true, "dependencies": { - "@asyncapi/parser": "^3.0.15", + "@asyncapi/parser": "^3.1.0", "@types/json-schema": "^7.0.11", "avsc": "^5.7.6" } }, "node_modules/@asyncapi/parser": { - "version": "3.0.15", - "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.15.tgz", - "integrity": "sha512-tP4O6c9jM8pKimg8kw3+/SdPAKJQWPmYozO6ZFJB5ziVtsr3Z8Qe06V13QcBOg4LzIWAwontyG5lZ5jnyvuDPQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.1.0.tgz", + "integrity": "sha512-rUd+fsPRE68o+F3gLqk7OaBj5J5VgBiLk9eJBGEXolNmKbVd45mxJm2aBpMkphQEmYHuBvxZyiNYlSCyr1D2fA==", "dev": true, "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", @@ -11135,23 +11135,23 @@ } }, "@asyncapi/avro-schema-parser": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-3.0.23.tgz", - "integrity": "sha512-NVJg84ldlsIjngRfKejiqDoXx+e32b7oCkzGv9b1vVvaalUBjbw9HOpnLak6FXPigqEKJ4BesMVU4TnZXtGWNQ==", + "version": "3.0.24", + "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-3.0.24.tgz", + "integrity": "sha512-YMyr2S2heMrWHRyECknjHeejlZl5exUSv9nD1gTejAT13fSf0PqIRydZ9ZuoglCLBg55AeehypR2zLIBu/9kHQ==", "dev": true, "requires": { - "@asyncapi/parser": "^3.0.15", + "@asyncapi/parser": "^3.1.0", "@types/json-schema": "^7.0.11", "avsc": "^5.7.6" } }, "@asyncapi/parser": { - "version": "3.0.15", - "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.15.tgz", - "integrity": "sha512-tP4O6c9jM8pKimg8kw3+/SdPAKJQWPmYozO6ZFJB5ziVtsr3Z8Qe06V13QcBOg4LzIWAwontyG5lZ5jnyvuDPQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.1.0.tgz", + "integrity": "sha512-rUd+fsPRE68o+F3gLqk7OaBj5J5VgBiLk9eJBGEXolNmKbVd45mxJm2aBpMkphQEmYHuBvxZyiNYlSCyr1D2fA==", "dev": true, "requires": { - "@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", diff --git a/package.json b/package.json index 9de091ebb..92d8bfc21 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "node-fetch": "2.6.7" }, "devDependencies": { - "@asyncapi/avro-schema-parser": "^3.0.23", + "@asyncapi/avro-schema-parser": "^3.0.24", "@jest/types": "^29.0.2", "@swc/core": "^1.2.248", "@swc/jest": "^0.2.22",