Merge pull request #326 from seriousme/validator-v2

Support @seriousme/openapi-schema-validator v2.0.0

CHANGELOG.md

@@ -4,6 +4,12 @@
 ### Changed
  - Migrated to ES Modules format
 
+## [2.6.8] - 25-04-2022
+### Changed
+ - Updated dependencies:
+    @seriousme/openapi-schema-validator   ^1.7.1  →   ^2.0.0      
+    tap                                  ^16.0.1  →  ^16.1.0   
+
 ## [2.6.7] - 22-04-2022
 ### Changed
  - Deprecation of Nodejs < 14 

examples/generatedProject/package.json

@@ -16,6 +16,6 @@
   "devDependencies": {
     "fastify": "^3.28.0",
     "fastify-cli": "^2.15.0",
-    "tap": "^16.0.1"
+    "tap": "^16.1.0"
   }
 }

lib/parser.js

@@ -1,5 +1,4 @@
 // this class is to bridge various parser versions
-const Validator = require("@seriousme/openapi-schema-validator");
 const ParserV2 = require("./parser.v2");
 const ParserV3 = require("./parser.v3");
 
@@ -24,31 +23,32 @@ class parser {
    */
 
   async preProcessSpec(specification) {
+    const { Validator } = await import("@seriousme/openapi-schema-validator");
     const validator = new Validator();
     try {
       const res = await validator.validate(specification);
-      if(res.valid){
+      if (res.valid) {
         // clone the original specification as resolveRefs modifies the schema
         this.original = JSON.parse(JSON.stringify(validator.specification, null, 2));
-        return { 
+        return {
           valid: true,
           version: validator.version,
           spec: validator.resolveRefs()
         }
       }
-      throw Error(JSON.stringify(res.errors,null,2));
+      throw Error(JSON.stringify(res.errors, null, 2));
     } catch (e) {
       // eslint-disable-next-line
       console.log(e.message);
-      return { valid: false};
+      return { valid: false };
     }
   }
 
   async parse(specification) {
     const supportedVersions = new Set(["2.0", "3.0", "3.1"]);
-   
+
     const res = await this.preProcessSpec(specification);
-    if (!res.valid || !supportedVersions.has(res.version)){
+    if (!res.valid || !supportedVersions.has(res.version)) {
       throw new Error(
         "'specification' parameter must contain a valid version 2.0 or 3.0.x or 3.1.x specification"
       );
@@ -57,8 +57,8 @@ class parser {
     if (res.version === "2.0") {
       const parserV2 = new ParserV2();
       return parserV2.parse(res.spec);
-    } 
-    
+    }
+
     const parserV3 = new ParserV3();
     return parserV3.parse(res.spec);
   }

package.json

@@ -23,7 +23,7 @@
     "openapi-glue": "./bin/openapi-glue-cli.js"
   },
   "dependencies": {
-    "@seriousme/openapi-schema-validator": "^1.7.1",
+    "@seriousme/openapi-schema-validator": "^2.0.0",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
     "fastify-plugin": "^3.0.1",
@@ -39,7 +39,7 @@
   "devDependencies": {
     "fastify": "^3.28.0",
     "fastify-cli": "^2.15.0",
-    "tap": "^16.0.1"
+    "tap": "^16.1.0"
   },
   "repository": {
     "type": "git",