Merge pull request #483 from bourgeoa/solid-namespace

use of solid prefixes

Author: angelo-v

package-lock.json

@@ -49,6 +49,7 @@
     "cross-fetch": "^3.0.6",
     "jsonld": "^3.3.0",
     "n3": "^1.8.0",
+    "solid-namespace": "^0.5.0",
     "xmldom": "^0.4.0"
   },
   "devDependencies": {

package.json

@@ -11,14 +11,22 @@ import * as Uri from './uri'
 import * as Util from './utils-js'
 import CanonicalDataFactory from './factories/canonical-data-factory'
 import { createXSD } from './xsd'
+import solidNs from 'solid-namespace'
 
 export default (function () {
   var __Serializer = function (store) {
     this.flags = ''
     this.base = null
 
     this.prefixes = [] // suggested prefixes
-    this.namespaces = [] // complementary indexes
+    this.namespaces = [] // complementary
+    const nsKeys = Object.keys(solidNs())
+    for (const i in nsKeys) {
+      const uri = solidNs()[nsKeys[i]]('')
+      const prefix = nsKeys[i]
+      this.prefixes[uri] = prefix
+      this.namespaces[prefix] = uri
+    }
 
     this.suggestPrefix('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#') // XML code assumes this!
     this.suggestPrefix('xml', 'reserved:reservedForFutureUse') // XML reserves xml: in the spec.

src/serializer.js

@@ -1,24 +1,24 @@
 @prefix : </details.ttl#>.
+@prefix cal: <http://www.w3.org/2002/12/cal/ical#>.
 @prefix dc: <http://purl.org/dc/elements/1.1/>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix sched: <http://www.w3.org/ns/pim/schedule#>.
+@prefix space: <http://www.w3.org/ns/pim/space#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
 @prefix c: <https://www.w3.org/People/Berners-Lee/card#>.
-@prefix sp: <http://www.w3.org/ns/pim/space#>.
 @prefix det: <http://linkeddata.github.io/app-schedule/details.ttl#>.
-@prefix ic: <http://www.w3.org/2002/12/cal/ical#>.
-@prefix n0: <http://xmlns.com/foaf/0.1/>.
-@prefix rd: <http://www.w3.org/2000/01/rdf-schema#>.
 
 :event
     a sched:SchedulableEvent;
     dc:author c:i;
     dc:created "2015-09-15T11:20:05Z"^^xsd:dateTime;
-    sp:inspiration det:event1.
+    space:inspiration det:event1.
 :event1
     dc:author :id1442316021316;
     dc:title "TAG 2016 Q1 Meeting ";
-    rd:comment "Three day meeting, starting date:";
-    ic:location "Melbourne Australia";
+    rdfs:comment "Three day meeting, starting date:";
+    cal:location "Melbourne Australia";
     sched:availabilityOptions sched:YesNoMaybe;
     sched:invitee
         :id1442316021320, :id1442316359855, :id1442316381050, :id1442316382860,
@@ -27,27 +27,27 @@
     sched:option :id1442316021318, :id1442316021319;
     sched:ready "2015-09-15T11:20:21Z"^^xsd:dateTime;
     sched:results </results.ttl>.
-:id1442316021316 n0:mbox "timbl@w3.org"; n0:name "Tim BL".
+:id1442316021316 foaf:mbox "timbl@w3.org"; foaf:name "Tim BL".
 
-:id1442316021318 ic:dtstart "2016-01-13".
+:id1442316021318 cal:dtstart "2016-01-13".
 
-:id1442316021319 ic:dtstart "2016-01-20".
+:id1442316021319 cal:dtstart "2016-01-20".
 
-:id1442316021320 n0:mbox "peter.linss@hp.com".
+:id1442316021320 foaf:mbox "peter.linss@hp.com".
 
-:id1442316359855 n0:mbox "appelquist@gmail.com".
+:id1442316359855 foaf:mbox "appelquist@gmail.com".
 
-:id1442316381050 n0:mbox "mnot@mnot.net".
+:id1442316381050 foaf:mbox "mnot@mnot.net".
 
-:id1442316382860 n0:mbox "hadley@linkedgov.org".
+:id1442316382860 foaf:mbox "hadley@linkedgov.org".
 
-:id1442316551915 n0:mbox "yzhu@yahoo-inc.com".
+:id1442316551915 foaf:mbox "yzhu@yahoo-inc.com".
 
-:id1442316616585 n0:mbox "ylafon@w3.org".
+:id1442316616585 foaf:mbox "ylafon@w3.org".
 
-:id1442316618393 n0:mbox "slightlyoff@google.com".
+:id1442316618393 foaf:mbox "slightlyoff@google.com".
 
-:id1442316627647 n0:mbox "travis.leithead@microsoft.com".
+:id1442316627647 foaf:mbox "travis.leithead@microsoft.com".
 
-:id1442316628781 n0:mbox "timbl@w3.org".
+:id1442316628781 foaf:mbox "timbl@w3.org".
 

tests/serialize/t10-ref.ttl

@@ -1,11 +1,11 @@
 @prefix : </structures.n3#>.
-@prefix XML: <http://www.w3.org/2001/XMLSchema#>.
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
 
 :DSK :name "Dexter Scott King".
 
 :MLK
-    :born "1929-01-17"^^XML:date;
-    :died "1968-01-15"^^XML:date;
+    :born "1929-01-17"^^xsd:date;
+    :died "1968-01-15"^^xsd:date;
     :friend [];
     :name "Martin Luther King, Jr";
     :spouse _:_g_L4C88;
@@ -17,7 +17,7 @@
 :ZooReading1
     :boolDisabled false;
     :boolEnabled true;
-    :date "2015-02-28"^^XML:date;
+    :date "2015-02-28"^^xsd:date;
     :decBig 1234567890.99;
     :decBigNegative -1234567890.99;
     :decWithPoint 10.0;
@@ -29,10 +29,10 @@
     :intBig 1234567890;
     :intCount 16;
     :intNegative -123;
-    :time "2015-03-16T17:53Z"^^XML:dateTime.
+    :time "2015-03-16T17:53Z"^^xsd:dateTime.
 _:_g_L4C88 :name "Coretta Scott King".
 
-[ a :Speech; :author :MLK; :date "1963-08-23"^^XML:date; :title "I have a dream" ].
+[ a :Speech; :author :MLK; :date "1963-08-23"^^xsd:date; :title "I have a dream" ].
 
 [ :friend :MLK ].
 

tests/serialize/t12-ref.ttl

@@ -1,13 +1,13 @@
 @prefix : </,structures.nt#>.
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
 @prefix str: </structures.n3#>.
-@prefix XML: <http://www.w3.org/2001/XMLSchema#>.
 
 str:DSK str:name "Dexter Scott King".
 
 str:MLK
-    str:born "1929-01-17"^^XML:date;
-    str:died "1968-01-15"^^XML:date;
+    str:born "1929-01-17"^^xsd:date;
+    str:died "1968-01-15"^^xsd:date;
     str:friend [];
     str:name "Martin Luther King, Jr";
     str:spouse _:_g_L4C88;
@@ -19,7 +19,7 @@ str:YK str:name "Yolanda King".
 str:ZooReading1
     str:boolDisabled false;
     str:boolEnabled true;
-    str:date "2015-02-28"^^XML:date;
+    str:date "2015-02-28"^^xsd:date;
     str:decBig 1234567890.99;
     str:decBigNegative -1234567890.99;
     str:decWithPoint 10.0;
@@ -31,13 +31,13 @@ str:ZooReading1
     str:intBig 1234567890;
     str:intCount 16;
     str:intNegative -123;
-    str:time "2015-03-16T17:53Z"^^XML:dateTime.
+    str:time "2015-03-16T17:53Z"^^xsd:dateTime.
 _:_g_L4C88 str:name "Coretta Scott King".
 
 [
     a str:Speech;
     str:author str:MLK;
-    str:date "1963-08-23"^^XML:date;
+    str:date "1963-08-23"^^xsd:date;
     str:title "I have a dream"
 ].
 [ str:friend str:MLK ].