docs/guide/formats.md

@@ -30,7 +30,7 @@ addFormats(ajv)
 
 See [ajv-formats](https://github.com/ajv-validator/ajv-formats) documentation for further details.
 
-It is recommended NOT to use "format" keyword implementations with untrusted data, as they may use potentially unsafe regular expressions (even though known issues are fixed) - see [ReDoS attack](./security.md#redos-attack).
+It is recommended NOT to use "format" keyword implementations with untrusted data, as they may use potentially unsafe regular expressions (even though known issues are fixed) - see [ReDoS attack](../security.md#redos-attack).
 
 ::: danger Format validation of untrusted data
 If you need to use "format" keyword to validate untrusted data, you MUST assess their suitability and safety for your validation scenarios.
@@ -61,7 +61,7 @@ JSON Schema draft-07 also defines formats `iri`, `iri-reference`, `idn-hostname`
 
 ## User-defined formats
 
-You can add and replace any formats using [addFormat](./api.md#api-addformat) method:
+You can add and replace any formats using [addFormat](../api.md#ajv-addformat-name-string-format-format-ajv) method:
 
 ```javascript
 ajv.addFormat("identifier", /^a-z\$_[a-zA-Z$_0-9]*$/)

docs/keywords.md

@@ -19,7 +19,7 @@ interface _KeywordDef {
 }
 ```
 
-Keyword definitions may have additional optional properties - see [types](https://github.com/ajv-validator/ajv/blob/master/lib/types/index.ts) and [KeywordCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/context.ts).
+Keyword definitions may have additional optional properties - see [types](https://github.com/ajv-validator/ajv/blob/master/lib/types/index.ts) and [KeywordCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/validate/index.ts).
 
 ### Define keyword with code generation function <Badge text="recommended" />
 
@@ -90,7 +90,7 @@ ajv.addKeyword({
 
 You can review pre-defined Ajv keywords in [validation](https://github.com/ajv-validator/ajv/blob/master/lib/validation) folder for more advanced examples - it is much easier to define code generation keywords than it was in the previous version of Ajv.
 
-See [KeywordCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/context.ts) and [SchemaCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/index.ts) type definitions for more information about properties you can use in your keywords.
+See [KeywordCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/validate/index.ts) and [SchemaCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/index.ts) type definitions for more information about properties you can use in your keywords.
 
 ### Define keyword with "validate" function
 
@@ -243,7 +243,7 @@ Macro keywords an be recursive - i.e. return schemas containing the same keyword
 
 ## Schema compilation context
 
-Schema compilation context [SchemaCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/index.ts) is available in property `it` of [KeywordCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/context.ts) (and it is also the 3rd parameter of `compile` and `macro` keyword functions). See types in the source code on the properties you can use in this object.
+Schema compilation context [SchemaCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/index.ts) is available in property `it` of [KeywordCxt](https://github.com/ajv-validator/ajv/blob/master/lib/compile/validate/index.ts) (and it is also the 3rd parameter of `compile` and `macro` keyword functions). See types in the source code on the properties you can use in this object.
 
 ## Validation time variables
 

docs/options.md

@@ -62,6 +62,7 @@ const defaultOptions = {
   ownProperties: false,
   multipleOfPrecision: undefined, // *
   messages: true, // false with JTD
+  uriResolver: undefined,
   code: {
     // NEW
     es5: false,
@@ -341,6 +342,10 @@ By default `multipleOf` keyword is validated by comparing the result of division
 
 Include human-readable messages in errors. `true` by default. `false` can be passed when messages are generated outside of Ajv code (e.g. with [ajv-i18n](https://github.com/ajv-validator/ajv-i18n)).
 
+### uriResolver
+
+By default `uriResolver` is undefined and relies on the embedded uriResolver [uri-js](https://github.com/garycourt/uri-js). Pass an object that satisfies the interface [UriResolver](https://github.com/ajv-validator/ajv/blob/master/lib/types/index.ts) to be used in replacement. One alternative is [fast-uri](https://github.com/fastify/fast-uri).
+
 ### code <Badge text="v7" />
 
 Code generation options:

lib/vocabularies/discriminator/index.ts

@@ -66,7 +66,7 @@ const def: CodeKeywordDefinition = {
       for (let i = 0; i < oneOf.length; i++) {
         let sch = oneOf[i]
         if (sch?.$ref && !schemaHasRulesButRef(sch, it.self.RULES)) {
-          sch = resolveRef.call(it.self, it.schemaEnv, it.baseId, sch?.$ref)
+          sch = resolveRef.call(it.self, it.schemaEnv.root, it.baseId, sch?.$ref)
           if (sch instanceof SchemaEnv) sch = sch.schema
         }
         const propSch = sch?.properties?.[tagName]

lib/vocabularies/validation/enum.ts

@@ -20,7 +20,9 @@ const def: CodeKeywordDefinition = {
     const {gen, data, $data, schema, schemaCode, it} = cxt
     if (!$data && schema.length === 0) throw new Error("enum must have non-empty array")
     const useLoop = schema.length >= it.opts.loopEnum
-    const eql = useFunc(gen, equal)
+    let eql: Name | undefined
+    const getEql = (): Name => (eql ??= useFunc(gen, equal))
+
     let valid: Code
     if (useLoop || $data) {
       valid = gen.let("valid")
@@ -36,14 +38,14 @@ const def: CodeKeywordDefinition = {
     function loopEnum(): void {
       gen.assign(valid, false)
       gen.forOf("v", schemaCode as Code, (v) =>
-        gen.if(_`${eql}(${data}, ${v})`, () => gen.assign(valid, true).break())
+        gen.if(_`${getEql()}(${data}, ${v})`, () => gen.assign(valid, true).break())
       )
     }
 
     function equalCode(vSchema: Name, i: number): Code {
       const sch = schema[i]
       return typeof sch === "object" && sch !== null
-        ? _`${eql}(${data}, ${vSchema}[${i}])`
+        ? _`${getEql()}(${data}, ${vSchema}[${i}])`
         : _`${data} === ${sch}`
     }
   },

lib/vocabularies/validation/limitProperties.ts

@@ -5,7 +5,7 @@ import {_, str, operators} from "../../compile/codegen"
 const error: KeywordErrorDefinition = {
   message({keyword, schemaCode}) {
     const comp = keyword === "maxProperties" ? "more" : "fewer"
-    return str`must NOT have ${comp} than ${schemaCode} items`
+    return str`must NOT have ${comp} than ${schemaCode} properties`
   },
   params: ({schemaCode}) => _`{limit: ${schemaCode}}`,
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ajv",
-  "version": "8.10.0",
+  "version": "8.11.0",
   "description": "Another JSON Schema Validator",
   "main": "dist/ajv.js",
   "types": "dist/ajv.d.ts",

spec/discriminator.spec.ts

@@ -159,6 +159,88 @@ describe("discriminator keyword", function () {
     })
   })
 
+  describe("validation with deeply referenced schemas", () => {
+    const schema = [
+      {
+        type: "object",
+        properties: {
+          container: {
+            $ref: "#/definitions/Container",
+          },
+        },
+        definitions: {
+          BlockA: {
+            type: "object",
+            properties: {
+              _type: {
+                type: "string",
+                enum: ["a"],
+              },
+              a: {type: "string"},
+            },
+            additionalProperties: false,
+            required: ["_type"],
+            title: "BlockA",
+          },
+          BlockB: {
+            type: "object",
+            properties: {
+              _type: {
+                type: "string",
+                enum: ["b"],
+              },
+              b: {type: "string"},
+            },
+            additionalProperties: false,
+            required: ["_type"],
+            title: "BlockB",
+          },
+          Container: {
+            type: "object",
+            properties: {
+              list: {
+                type: "array",
+                items: {
+                  oneOf: [
+                    {
+                      $ref: "#/definitions/BlockA",
+                    },
+                    {
+                      $ref: "#/definitions/BlockB",
+                    },
+                  ],
+                  discriminator: {
+                    propertyName: "_type",
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    ]
+
+    it("should validate data", () => {
+      assertValid(schema, {
+        container: {
+          list: [
+            {_type: "a", a: "foo"},
+            {_type: "b", b: "bar"},
+          ],
+        },
+      })
+
+      assertInvalid(schema, {
+        container: {
+          list: [
+            {_type: "a", b: "foo"},
+            {_type: "b", b: "bar"},
+          ],
+        },
+      })
+    })
+  })
+
   describe("valid schemas", () => {
     it("should have oneOf", () => {
       invalidSchema(