fix to work with Ajv2019 class, rewrite "transform" keyword

Author: epoberezkin

README.md

@@ -106,7 +106,7 @@ const ajv = new Ajv({
 })
 ```
 
-`opts` is an object with a property `defaultMeta` - URI of meta-schema to use for keywords that use subschemas (`select` and `deepProperties`).
+`opts` is an optional object with a property `defaultMeta` - URI of meta-schema to use for keywords that use subschemas (`select` and `deepProperties`). The default is `"http://json-schema.org/schema"`.
 
 ## Keywords
 

package.json

@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/epoberezkin/ajv-keywords#readme",
   "peerDependencies": {
-    "ajv": "^7.0.0-beta.3"
+    "ajv": "^7.0.0-beta.6"
   },
   "devDependencies": {
     "@ajv-validator/config": "^0.2.3",
@@ -44,7 +44,7 @@
     "@types/uuid": "^8.3.0",
     "@typescript-eslint/eslint-plugin": "^4.4.1",
     "@typescript-eslint/parser": "^4.4.1",
-    "ajv": "^7.0.0-beta.3",
+    "ajv": "^7.0.0-beta.6",
     "ajv-formats": "^0.3.4",
     "chai": "^4.2.0",
     "dot": "^1.1.1",

spec/schema-tests.spec.ts

@@ -1,4 +1,4 @@
-import Ajv from "ajv"
+import Ajv from "ajv/dist/2019"
 import type {Vocabulary} from "ajv"
 import ajvKeywordsPlugin from "../dist"
 import ajvKeywords from "../dist/definitions"
@@ -16,8 +16,8 @@ const ajvs = [
     "deepRequired",
     "select",
   ]),
-  // ajvKeywordsPlugin(getAjv()),
-  // ajvKeywordsPlugin(getAjv(true)),
+  ajvKeywordsPlugin(getAjv()),
+  ajvKeywordsPlugin(getAjv(true)),
   getAjv(undefined, ajvKeywords()),
   getAjv(true, ajvKeywords()),
   // ajvKeywordsPlugin(getAjvNoMeta()),
@@ -49,7 +49,6 @@ jsonSchemaTest(ajvs, {
 function getAjv(extras?: boolean, keywords?: Vocabulary): Ajv {
   return new Ajv({
     $data: true,
-    unevaluated: true,
     allErrors: extras,
     verbose: extras,
     keywords,
@@ -62,7 +61,6 @@ function getAjv(extras?: boolean, keywords?: Vocabulary): Ajv {
 function getAjvNoMeta(keywords?: Vocabulary): Ajv {
   return new Ajv({
     $data: true,
-    unevaluated: true,
     keywords,
     formats: {allowedUnknown: true},
     meta: false,

spec/transform.spec.ts

@@ -100,9 +100,7 @@ describe('keyword "transform"', () => {
       try {
         ajv.validate(schema, data).should.equal(false)
       } catch (e) {
-        e.message.should.equal(
-          'Missing enum. To use `transform:["toEnumCase"]`, `enum:[...]` is required.'
-        )
+        e.message.should.match(/transform.*enum/)
       }
 
       data = ["ph"]
@@ -113,9 +111,7 @@ describe('keyword "transform"', () => {
       try {
         ajv.validate(schema, data).should.equal(false)
       } catch (e) {
-        e.message.should.equal(
-          'Invalid enum uniqueness. To use `transform:["toEnumCase"]`, all values must be unique when case insensitive.'
-        )
+        e.message.should.match(/transform.*unique/)
       }
 
       data = ["  ph  "]

src/definitions/_util.ts

@@ -1,8 +1,8 @@
 import type {DefinitionOptions} from "./_types"
 import type {SchemaObject, CodeGen, Name} from "ajv"
-import {_} from "ajv/dist/compile/codegen"
+import {_} from "ajv"
 
-const META_SCHEMA_ID = "http://json-schema.org/draft-07/schema"
+const META_SCHEMA_ID = "http://json-schema.org/schema"
 
 export function metaSchemaRef({defaultMeta}: DefinitionOptions = {}): SchemaObject {
   return defaultMeta === false ? {} : {$ref: defaultMeta || META_SCHEMA_ID}

src/definitions/deepRequired.ts

@@ -31,3 +31,5 @@ export default function getDef(): CodeKeywordDefinition {
 function unescapeJPSegment(s: string): string {
   return s.replace(/~1/g, "/").replace(/~0/g, "~")
 }
+
+module.exports = getDef

src/definitions/index.ts

@@ -38,3 +38,4 @@ const definitions: GetDefinition<KeywordDefinition>[] = [
 export default function ajvKeywords(opts?: DefinitionOptions): Vocabulary {
   return definitions.map((d) => d(opts)).concat(selectDef(opts))
 }
+module.exports = ajvKeywords

src/definitions/patternRequired.ts

@@ -40,3 +40,5 @@ export default function getDef(): CodeKeywordDefinition {
     },
   }
 }
+
+module.exports = getDef

src/definitions/regexp.ts

@@ -1,5 +1,5 @@
 import type {CodeKeywordDefinition, KeywordCxt, JSONSchemaType, Name} from "ajv"
-import {_} from "ajv/dist/compile/codegen"
+import {_} from "ajv"
 import {usePattern} from "./_util"
 
 interface RegexpSchema {

src/definitions/select.ts

@@ -1,5 +1,5 @@
 import type {KeywordDefinition, KeywordErrorDefinition, KeywordCxt} from "ajv"
-import {_, str, nil, Name} from "ajv/dist/compile/codegen"
+import {_, str, nil, Name} from "ajv"
 import type {DefinitionOptions} from "./_types"
 import {metaSchemaRef} from "./_util"
 
@@ -63,3 +63,5 @@ export default function getDef(opts?: DefinitionOptions): KeywordDefinition[] {
     },
   ]
 }
+
+module.exports = getDef