Better checking of absolute IRIs.

gkellogg · davidlehn · commit 43f2992c9bd4 · 2019-11-18T20:08:23.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
   used after non-1.1 contexts.
 - `@vocab` can be relative in 1.0, resolved against either a previous `@vocab`,
   `@base` or document base.
+- Better checking of absolute IRIs.
 
 ### Removed
 - **BREAKING**: Remove callback API support. This includes removing support
diff --git a/lib/context.js b/lib/context.js
@@ -779,7 +779,9 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
     }
 
     // already absolute IRI
-    return value;
+    if(_isAbsoluteIri(value)) {
+      return value;
+    }
   }
 
   // prepend vocab
diff --git a/lib/url.js b/lib/url.js
@@ -66,7 +66,7 @@ api.prependBase = (base, iri) => {
     return iri;
   }
   // already an absolute IRI
-  if(iri.indexOf(':') !== -1) {
+  if(api.isAbsolute(iri)) {
     return iri;
   }
 
diff --git a/tests/test-common.js b/tests/test-common.js
@@ -111,8 +111,6 @@ const TEST_TYPES = {
         /expand-manifest.jsonld#t0102$/,
         // multiple graphs
         /expand-manifest.jsonld#t0103$/,
-        // iris
-        /expand-manifest.jsonld#t0109$/,
         // terms beginning with ':'
         /expand-manifest.jsonld#t0117$/,
         /expand-manifest.jsonld#t0118$/,

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,9 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {`
`779`	`779`	`}`
`780`	`780`
`781`	`781`	`// already absolute IRI`
`782`		`- return value;`
	`782`	`+ if(_isAbsoluteIri(value)) {`
	`783`	`+ return value;`
	`784`	`+ }`
`783`	`785`	`}`
`784`	`786`
`785`	`787`	`// prepend vocab`