Merge branch 'master' into fix/asyncapiGH-997

timonback · Jun 18, 2024 · ddc1042 · ddc1042
2 parents 52400c3 + 55f1df9
commit ddc1042
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 42 deletions.
diff --git 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

diff --git a/package-lock.json b/package-lock.json
diff --git 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"
@@ -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",

diff --git 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
@@ -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);
   });
 });