Merge pull request #511 from paulRbr/truly-upgrade-asyncapi-spec

deps: make sure to force the minimum version of AsyncAPI spec

package.json

@@ -82,7 +82,7 @@
   "types": "lib/index.d.ts",
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^9.0.7",
-    "@asyncapi/specs": "^4.0.1",
+    "@asyncapi/specs": "^5.1.0",
     "@clack/prompts": "^0.6.3",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.17.0",

src/definition.ts

@@ -7,23 +7,26 @@ import {
   JSONSchema4Object,
   JSONSchema6,
   JSONSchema6Object,
+  JSONSchema7,
 } from 'json-schema';
 import path from 'path';
 
+type SpecSchema = JSONSchema4 | JSONSchema6 | JSONSchema7;
+
 class SupportedFormat {
   static readonly openapi: Record<string, SpecSchema> = {
     '2.0': require('oas-schemas/schemas/v2.0/schema.json'),
     '3.0': require('oas-schemas/schemas/v3.0/schema.json'),
     '3.1': require('oas-schemas/schemas/v3.1/schema.json'),
   };
   static readonly asyncapi: Record<string, SpecSchema> = {
-    '2.0': asyncapi['2.0.0'],
-    '2.1': asyncapi['2.1.0'],
-    '2.2': asyncapi['2.2.0'],
-    '2.3': asyncapi['2.3.0'],
-    '2.4': asyncapi['2.4.0'],
-    '2.5': asyncapi['2.5.0'],
-    '2.6': asyncapi['2.6.0'],
+    '2.0': asyncapi.schemas['2.0.0'],
+    '2.1': asyncapi.schemas['2.1.0'],
+    '2.2': asyncapi.schemas['2.2.0'],
+    '2.3': asyncapi.schemas['2.3.0'],
+    '2.4': asyncapi.schemas['2.4.0'],
+    '2.5': asyncapi.schemas['2.5.0'],
+    '2.6': asyncapi.schemas['2.6.0'],
   };
 }
 
@@ -67,7 +70,7 @@ class API {
     }
   }
 
-  getSpec(definition: APIDefinition): Record<string, unknown> {
+  getSpec(definition: APIDefinition): SpecSchema {
     if (API.isAsyncAPI(definition)) {
       return SupportedFormat.asyncapi[this.versionWithoutPatch()];
     } else {

typings.d.ts

@@ -1,15 +1,6 @@
 // oas-schemas doesn't define TS types
 declare module 'oas-schemas';
 
-type SpecSchema = Record<string, unknown>;
-
-// AsyncAPI doesn't define TS types
-declare module '@asyncapi/specs' {
-  const asyncapi: Record<string, SpecSchema>;
-
-  export default asyncapi;
-}
-
 // Internals of json-schema-ref-parser doesn't expose types
 declare module '@apidevtools/json-schema-ref-parser/lib/options';