Merge pull request #31 from seriousme/fix-multiple-byte-tests

Fix multiple byte tests
ajv-validator · Aug 14, 2021 · 10669ff · 10669ff
2 parents df9c29e + 9ad8d8b
commit 10669ff
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/formats.ts b/src/formats.ts
@@ -75,7 +75,7 @@ export const fullFormats: DefinedFormats = {
   "relative-json-pointer": /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/,
   // the following formats are used by the openapi specification: https://spec.openapis.org/oas/v3.0.0#data-types
   // byte: https://github.com/miguelmota/is-base64
-  byte: /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/gm,
+  byte,
   // signed 32 bit integer
   int32: {type: "number", validate: validateInt32},
   // signed 64 bit integer
@@ -197,6 +197,13 @@ function uri(str: string): boolean {
   return NOT_URI_FRAGMENT.test(str) && URI.test(str)
 }
 
+const BYTE = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/gm
+
+function byte(str: string): boolean {
+  BYTE.lastIndex = 0
+  return BYTE.test(str)
+}
+
 const MIN_INT32 = -(2 ** 31)
 const MAX_INT32 = 2 ** 31 - 1
 

diff --git a/tests/extras/format.json b/tests/extras/format.json
@@ -743,6 +743,11 @@
         "data": "VGhpcyBpcyBhIGJhc2U2NCBtdWx0aWxpbmUgc3RyaW5nIHRoYXQgc3BhbnMgbW9yZSB0aGFuIDc2\nIGNoYXJhY3RlcnMgdG8gdGVzdCBtdWx0aWxpbmUgY2FwYWJpbGl0aWVzCg==",
         "valid": true
       },
+      {
+        "description": "second round multiline base64",
+        "data": "VGhpcyBpcyBhIGJhc2U2NCBtdWx0aWxpbmUgc3RyaW5nIHRoYXQgc3BhbnMgbW9yZSB0aGFuIDc2\nIGNoYXJhY3RlcnMgdG8gdGVzdCBtdWx0aWxpbmUgY2FwYWJpbGl0aWVzCg==",
+        "valid": true
+      },
       {
         "description": "Invalid base64",
         "data": "aGVsbG8gd29ybG=",

diff --git a/tests/extras/formatMinimum.json b/tests/extras/formatMinimum.json
@@ -179,7 +179,7 @@
         "valid": false
       },
       {
-        "description": "same date, time before the minimum time is stillinvalid",
+        "description": "same date, time before the minimum time is still invalid",
         "data": "2015-08-17T10:33:55.000Z",
         "valid": false
       },

diff --git a/tests/extras/issues/1061_alternative_time_offsets.json b/tests/extras/issues/1061_alternative_time_offsets.json
@@ -4,7 +4,7 @@
     "schema": {"format": "date-time"},
     "tests": [
       {
-        "description": "valid positiive two digit",
+        "description": "valid positive two digit",
         "data": "2016-01-31T02:31:17+01",
         "valid": true
       },
@@ -14,7 +14,7 @@
         "valid": true
       },
       {
-        "description": "valid positiive four digit no colon",
+        "description": "valid positive four digit no colon",
         "data": "2016-01-31T02:31:17+0130",
         "valid": true
       },
@@ -24,7 +24,7 @@
         "valid": true
       },
       {
-        "description": "invalid positiive three digit no colon",
+        "description": "invalid positive three digit no colon",
         "data": "2016-01-31T02:31:17+013",
         "valid": false
       },
@@ -40,7 +40,7 @@
     "schema": {"format": "time"},
     "tests": [
       {
-        "description": "valid positiive two digit",
+        "description": "valid positive two digit",
         "data": "02:31:17+01",
         "valid": true
       },
@@ -50,7 +50,7 @@
         "valid": true
       },
       {
-        "description": "valid positiive four digit no colon",
+        "description": "valid positive four digit no colon",
         "data": "02:31:17+0130",
         "valid": true
       },
@@ -60,7 +60,7 @@
         "valid": true
       },
       {
-        "description": "invalid positiive three digit no colon",
+        "description": "invalid positive three digit no colon",
         "data": "02:31:17+013",
         "valid": false
       },