feat: add unicode flag to regular expressions, passes ecmascript-rege…

…x and non-bmp-regex tests
ajv-validator · Sep 11, 2020 · 912c3f4 · 912c3f4
1 parent 8daaf7d
commit 912c3f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/lib/vocabularies/util.ts b/lib/vocabularies/util.ts
@@ -77,8 +77,8 @@ export function callValidateCode(
 export function usePattern(gen: CodeGen, pattern: string): Name {
   return gen.scopeValue("pattern", {
     key: pattern,
-    ref: new RegExp(pattern),
-    code: _`new RegExp(${pattern})`,
+    ref: new RegExp(pattern, "u"),
+    code: _`new RegExp(${pattern}, "u")`,
   })
 }
 

diff --git a/lib/vocabularies/validation/pattern.ts b/lib/vocabularies/validation/pattern.ts
@@ -10,8 +10,7 @@ const def: CodeKeywordDefinition = {
   $data: true,
   code(cxt: KeywordCxt) {
     const {gen, data, $data, schema, schemaCode} = cxt
-    // const bdt = bad$DataType(schemaCode, <string>def.schemaType, $data)
-    const regExp = $data ? _`(new RegExp(${schemaCode}))` : usePattern(gen, schema) // TODO regexp should be wrapped in try/catch
+    const regExp = $data ? _`(new RegExp(${schemaCode}, "u"))` : usePattern(gen, schema) // TODO regexp should be wrapped in try/catch
     cxt.fail$data(_`!${regExp}.test(${data})`)
   },
   error: {

diff --git a/spec/json-schema.spec.ts b/spec/json-schema.spec.ts
@@ -14,8 +14,6 @@ const remoteRefs = {
 }
 
 const SKIP6 = [
-  "optional/ecmascript-regex", // TODO only format needs to be skipped, too much is skipped here
-  "optional/non-bmp-regex",
   "format",
   "optional/format/date",
   "optional/format/date-time",