fix(deps): update dependency ajv to v7 (#966)

* fix(deps): update dependency ajv to v7 * fix(deps): update dependency ajv to v7 * refactor(ajv): changes to be compatible with Ajv v7 Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Sebastian Rettig <[email protected]>
Lumieducation · Dec 18, 2020 · 2f028ac · 2f028ac
1 parent 16ca257
commit 2f028ac
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 44 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,8 @@
     ],
     "dependencies": {
         "@types/react": "^16.9.35",
-        "ajv": "^6.12.0",
+        "ajv": "^7.0.0",
+        "ajv-keywords": "^4.0.0",
         "axios": "^0.21.0",
         "crc": "^3.8.0",
         "debug": "^4.1.1",

diff --git a/src/H5PEditor.ts b/src/H5PEditor.ts
@@ -1,4 +1,5 @@
-import ajv from 'ajv';
+import Ajv, { ValidateFunction } from 'ajv';
+import ajvKeywords from 'ajv-keywords';
 import { PassThrough, Writable, Readable } from 'stream';
 import { ReadStream } from 'fs';
 import { withFile } from 'tmp-promise';
@@ -130,7 +131,8 @@ export default class H5PEditor {
         this.semanticsLocalizer = new SemanticsLocalizer(translationCallback);
         this.dependencyGetter = new DependencyGetter(libraryStorage);
 
-        const jsonValidator = new ajv();
+        const jsonValidator = new Ajv();
+        ajvKeywords(jsonValidator, 'regexp');
         const saveMetadataJsonSchema = require('./schemas/save-metadata.json');
         const libraryNameSchema = require('./schemas/library-name-schema.json');
         jsonValidator.addSchema([saveMetadataJsonSchema, libraryNameSchema]);
@@ -145,7 +147,7 @@ export default class H5PEditor {
     public libraryManager: LibraryManager;
     public packageImporter: PackageImporter;
     public temporaryFileManager: TemporaryFileManager;
-    private contentMetadataValidator: ajv.ValidateFunction;
+    private contentMetadataValidator: ValidateFunction;
 
     private contentStorer: ContentStorer;
     private copyrightSemantics: ISemanticsEntry = defaultCopyrightSemantics as ISemanticsEntry;

diff --git a/src/PackageValidator.ts b/src/PackageValidator.ts
@@ -1,4 +1,5 @@
-import ajv from 'ajv';
+import Ajv, { ValidateFunction } from 'ajv';
+import ajvKeywords from 'ajv-keywords';
 import * as path from 'path';
 import promisepipe from 'promisepipe';
 import { WritableStreamBuffer } from 'stream-buffers';
@@ -473,7 +474,8 @@ export default class PackageValidator {
         }
         log.info(`initializing json validators`);
 
-        const jsonValidator = new ajv();
+        const jsonValidator = new Ajv();
+        ajvKeywords(jsonValidator, 'regexp');
         const h5pJsonSchema = require('./schemas/h5p-schema.json');
         const libraryNameSchema = require('./schemas/library-name-schema.json');
         const librarySchema = require('./schemas/library-schema.json');
@@ -559,7 +561,7 @@ export default class PackageValidator {
      */
     private jsonMustConformToSchema(
         filename: string,
-        schemaValidator: ajv.ValidateFunction,
+        schemaValidator: ValidateFunction,
         errorIdAnyError: string,
         errorIdJsonParse?: string,
         returnContent: boolean = false,

diff --git a/src/schemas/library-name-schema.json b/src/schemas/library-name-schema.json
@@ -1,30 +1,40 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "library-name-schema.json",
-  "title": "h5p library reference",
-  "description": "A combination of machine name and major + minor version",
-  "type": "object",
-  "properties": {
-    "machineName": {
-      "type": "string",
-      "pattern": "^[\\w0-9\\-\\.]{1,255}$"
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "library-name-schema.json",
+    "title": "h5p library reference",
+    "description": "A combination of machine name and major + minor version",
+    "type": "object",
+    "properties": {
+        "machineName": {
+            "type": "string",
+            "pattern": "^[\\w0-9\\-\\.]{1,255}$"
+        },
+        "majorVersion": {
+            "anyOf": [
+                {
+                    "type": "number",
+                    "minimum": 0,
+                    "maximum": 99999
+                },
+                {
+                    "type": "string",
+                    "pattern": "^[0-9]{1,5}$"
+                }
+            ]
+        },
+        "minorVersion": {
+            "anyOf": [
+                {
+                    "type": "number",
+                    "minimum": 0,
+                    "maximum": 99999
+                },
+                {
+                    "type": "string",
+                    "pattern": "^[0-9]{1,5}$"
+                }
+            ]
+        }
     },
-    "majorVersion": {
-      "type": ["number", "string"],
-      "minimum": 0,
-      "maximum": 99999,
-      "pattern": "^[0-9]{1,5}$"
-    },
-    "minorVersion": {
-      "type": ["number", "string"],
-      "minimum": 0,
-      "maximum": 99999,
-      "pattern": "^[0-9]{1,5}$"
-    }
-  },
-  "required": [
-    "machineName",
-    "majorVersion",
-    "minorVersion"
-  ]
-}
+    "required": ["machineName", "majorVersion", "minorVersion"]
+}