Merge branch 'refResolveBaseURI' of https://github.com/rbuckton/ajv into rbuckton-refResolveBaseURI

Author: epoberezkin

lib/compile/resolve.ts

@@ -89,10 +89,10 @@ export function resolveUrl(baseId: string, id: string): string {
 
 const ANCHOR = /^[a-z_][-a-z0-9._]*$/i
 
-export function getSchemaRefs(this: Ajv, schema: AnySchema): LocalRefs {
+export function getSchemaRefs(this: Ajv, schema: AnySchema, baseId: string): LocalRefs {
   if (typeof schema == "boolean") return {}
   const {schemaId} = this.opts
-  const schId = normalizeId(schema[schemaId])
+  const schId = normalizeId(schema[schemaId] || baseId)
   const baseIds: {[JsonPtr in string]?: string} = {"": schId}
   const pathPrefix = getFullPath(schId, false)
   const localRefs: LocalRefs = {}

lib/core.ts

@@ -694,8 +694,8 @@ export default class Ajv {
     let sch = this._cache.get(schema)
     if (sch !== undefined) return sch
 
-    const localRefs = getSchemaRefs.call(this, schema)
     baseId = normalizeId(id || baseId)
+    const localRefs = getSchemaRefs.call(this, schema, baseId)
     sch = new SchemaEnv({schema, schemaId, meta, baseId, localRefs})
     this._cache.set(sch.schema, sch)
     if (addSchema && !baseId.startsWith("#")) {

spec/resolve.spec.ts

@@ -68,6 +68,29 @@ describe("resolve", () => {
       })
     })
 
+    it("should resolve fragment $id in schema refs when root $id not present", () => {
+      const schema = {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "definitions": {
+          "SeeAlso": { "$id": "#SeeAlso", "type": "number" },
+          "Engine": {
+            "$id": "#Engine",
+            "type": "object",
+            "properties": {
+              "see_also": { "$ref": "#SeeAlso" }
+            }
+          }
+        }
+      }
+
+      instances.forEach((ajv) => {
+        ajv.addSchema(schema, "yaml.json")
+        const data = { see_also: 1 }
+        const validate = ajv.validate("yaml.json#/definitions/Engine", data)
+        validate.should.equal(true)
+      })
+    })
+
     it("should throw if the same id resolves to two different schemas", () => {
       instances.forEach((ajv) => {
         ajv.compile({