changeUriprefix return identity map

Author: jamesamcl

SBOLTestSuite

@@ -66,6 +66,8 @@ export default class Graph {
         const matches = this.match(s, p, o)
 
         if(matches.length > 1) {
+            console.error('results:')
+            console.dir(matches)
             throw new Error('Got more than one result for matchOne { ' + [s, p, o].join(', ') + ' }')
         }
 

sbolgraph/Graph.ts

@@ -518,7 +518,7 @@ export default class SBOLXGraph extends Graph {
 
     }
 
-    changeURIPrefix(newPrefix:string) {
+    changeURIPrefix(newPrefix:string):Map<string,string> {
 
         let topLevels = new Set([
             Types.SBOLX.Collection,
@@ -530,7 +530,7 @@ export default class SBOLXGraph extends Graph {
             Types.Prov.Activity
         ])
 
-        changeURIPrefix(this, topLevels, newPrefix)
+        return changeURIPrefix(this, topLevels, newPrefix)
 
     }
 

sbolgraph/SBOLXGraph.ts

@@ -4,14 +4,16 @@ import rdf = require('rdf-ext')
 import RdfGraphArray = require('rdf-graph-array')
 import { Predicates } from 'bioterms'
 
-export default function changeURIPrefix(graph:Graph, topLevels:Set<string>, newPrefix:string) {
+export default function changeURIPrefix(graph:Graph, topLevels:Set<string>, newPrefix:string):Map<string,string> {
 
     let triples = graph.graph._graph
 
     let newGraph = new RdfGraphArray.Graph([])
 
     let prefixes = new Set()
 
+    let identityMap = new Map()
+
     for(let triple of triples) {
 
         if(triple.predicate.nominalValue === Predicates.a) {
@@ -35,7 +37,9 @@ export default function changeURIPrefix(graph:Graph, topLevels:Set<string>, newP
 
         for(let prefix of prefixes) {
             if(subject.nominalValue.indexOf(prefix) === 0) {
-                subject = rdf.createNamedNode(newPrefix + subject.nominalValue.slice(prefix.length))
+                let newSubject = rdf.createNamedNode(newPrefix + subject.nominalValue.slice(prefix.length))
+                identityMap.set(subject.nominalValue, newSubject.nominalValue)
+                subject = newSubject
                 matched = true
                 break
             }
@@ -49,7 +53,9 @@ export default function changeURIPrefix(graph:Graph, topLevels:Set<string>, newP
         if(object.interfaceName === 'NamedNode') {
             for(let prefix of prefixes) {
                 if(object.nominalValue.indexOf(prefix) === 0) {
-                    object = rdf.createNamedNode(newPrefix + object.nominalValue.slice(prefix.length))
+                    let newObject = rdf.createNamedNode(newPrefix + object.nominalValue.slice(prefix.length))
+                    identityMap.set(object.nominalValue, newObject.nominalValue)
+                    object = newObject
                     break
                 }
             }
@@ -63,6 +69,8 @@ export default function changeURIPrefix(graph:Graph, topLevels:Set<string>, newP
 
     graph.graph = newGraph
 
+    return identityMap
+
     // TODO currently only works for compliant URIs
     // 
     function prefix(uri:string) {