fix $ref to absolute uri (#2)

Author: Eomm

README.md

@@ -121,6 +121,14 @@ const anotherResolvedSchema = ref.resolve(input_2_Schema)
 const sharedDefinitions = ref.definitions()
 ```
 
+## Debug
+
+To debug this module, simply set:
+
+```bash
+export DEBUG=json-schema-resolver
+```
+
 ## License
 
 Licensed under [MIT](./LICENSE).

ref-resolver.js

@@ -106,7 +106,7 @@ function jsonSchemaResolver (options) {
 
       const evaluatedJson = allIds.get(baseUri)
       if (!evaluatedJson) {
-        debug('External $ref %s not provided', ref)
+        debug('External $ref %s not provided with baseUri %s', ref, baseUri)
         return
       }
       evaluatedJson[kConsumed] = true
@@ -161,6 +161,8 @@ function jsonSchemaResolver (options) {
       const newBaseUri = Object.assign({}, baseUri)
       newBaseUri.path = refUri.path
       baseUri = newBaseUri
+    } else if (refUri.reference === 'uri' || refUri.reference === 'absolute') {
+      baseUri = { ...refUri, fragment: undefined }
     }
 
     const ref = URI.serialize(refUri)

test/ref-resolver.test.js

@@ -182,8 +182,65 @@ test('missing id in root schema', t => {
 
   const resolver = RefResolver()
   const out = resolver.resolve(schema, opts)
-  save(out)
   t.deepEquals(schema, out, 'the output is the same input modified')
   t.ok(out.definitions, 'definitions has been added')
   t.deepEquals(Object.values(out.definitions), opts.externalSchemas, 'external schema has been added to definitions')
 })
+
+test('absolute $ref', t => {
+  t.plan(2)
+  const schema = { $ref: 'http://example.com/#/definitions/idParam' }
+
+  const absSchemaId = {
+    $id: 'http://example.com/',
+    definitions: {
+      uuid: {
+        type: 'string',
+        pattern: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+      },
+      idParam: {
+        type: 'object',
+        required: ['id'],
+        properties: {
+          id: { $ref: '#/definitions/uuid' }
+        },
+        additionalProperties: false
+      }
+    }
+  }
+
+  const externalSchemas = [absSchemaId]
+
+  const resolver = RefResolver({ clone: true, applicationUri: 'todo.com', externalSchemas })
+  const out = resolver.resolve(schema)
+
+  t.notEqual(out.$ref, 'http://example.com/#/definitions/idParam')
+  t.deepEquals(resolver.definitions(), {
+    definitions: {
+      'def-0': absSchemaId
+    }
+  })
+})
+
+test('absolute $ref #2', t => {
+  t.plan(2)
+  const schema = factory('absoluteId-absoluteRef')
+
+  const absSchemaId = {
+    $id: 'http://other-site.com/relativeAddress',
+    type: 'object',
+    properties: {
+      uuid: {
+        type: 'string',
+        pattern: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+      }
+    }
+  }
+
+  const externalSchemas = [absSchemaId]
+
+  const resolver = RefResolver({ clone: true })
+  const out = resolver.resolve(schema, { externalSchemas })
+  t.equal(out.properties.address.$ref, '#/definitions/def-0')
+  t.equal(out.properties.houses.items.$ref, '#/definitions/def-0')
+})