Encode URI templates according to spec

lib/MetadataBuilder.js

@@ -1,4 +1,5 @@
 const fs = require('fs')
+const encodeURIComponent = require('strict-uri-encode')
 
 class MetadataBuilder {
   static readFirstLine (filename) {

lib/metadata/TableSchema.js

@@ -1,7 +1,7 @@
 const difference = require('lodash/difference')
 const namespace = require('../namespace')
 const parseDateTime = require('../parseDateTime')
-const uriTemplate = require('uri-templates')
+const uriTemplate = require('url-template')
 const URL = require('url')
 const RdfUtils = require('./RdfUtils')
 
@@ -37,10 +37,10 @@ class TableSchema {
       return
     }
 
-    const aboutUrlTemplate = uriTemplate(aboutUrl)
+    const aboutUrlTemplate = uriTemplate.parse(aboutUrl)
 
     return (row) => {
-      return this.factory.namedNode(URL.resolve(this.baseIRI, aboutUrlTemplate.fill(row))) // eslint-disable-line node/no-deprecated-api
+      return this.factory.namedNode(URL.resolve(this.baseIRI, aboutUrlTemplate.expand(row))) // eslint-disable-line node/no-deprecated-api
     }
   }
 
@@ -51,7 +51,7 @@ class TableSchema {
       return
     }
 
-    return uriTemplate(url)
+    return uriTemplate.parse(url)
   }
 
   parseColumns () {
@@ -70,17 +70,17 @@ class TableSchema {
       const valueUrl = RdfUtils.findValue(this.dataset, node, this.ns.valueUrl)
 
       return {
-        aboutUrl: aboutUrl && uriTemplate(aboutUrl),
+        aboutUrl: aboutUrl && uriTemplate.parse(aboutUrl),
         datatype: this.parseDatatype(node),
-        language: language && uriTemplate(language),
+        language: language && uriTemplate.parse(language),
         name,
         nullValue,
         defaultValue,
-        propertyUrl: (propertyUrl && uriTemplate(propertyUrl)) || this.propertyUrl || this.defaultPropertyUrl(name),
+        propertyUrl: (propertyUrl && uriTemplate.parse(propertyUrl)) || this.propertyUrl || this.defaultPropertyUrl(name),
         suppressOutput: suppressOutput === 'true',
         titles,
         virtual,
-        valueUrl: valueUrl && uriTemplate(valueUrl)
+        valueUrl: valueUrl && uriTemplate.parse(valueUrl)
       }
     })
   }
@@ -136,7 +136,7 @@ class TableSchema {
       return null
     }
 
-    return this.factory.namedNode(URL.resolve(this.baseIRI, column.aboutUrl.fill(row))) // eslint-disable-line node/no-deprecated-api
+    return this.factory.namedNode(URL.resolve(this.baseIRI, column.aboutUrl.expand(row))) // eslint-disable-line node/no-deprecated-api
   }
 
   value (column, row) {
@@ -145,7 +145,7 @@ class TableSchema {
     }
 
     if (column.valueUrl) {
-      return this.factory.namedNode(column.valueUrl.fill(row))
+      return this.factory.namedNode(column.valueUrl.expand(row))
     }
 
     let value = column.titles.reduce((value, title) => {
@@ -169,12 +169,12 @@ class TableSchema {
     }
 
     if (column.datatype.base) {
-      return this.factory.literal(value, (column.language && column.language.fill(row).toLowerCase()) || column.datatype.base)
+      return this.factory.literal(value, (column.language && column.language.expand(row).toLowerCase()) || column.datatype.base)
     }
   }
 
   property (column, row) {
-    return this.factory.namedNode(column.propertyUrl.fill(row))
+    return this.factory.namedNode(column.propertyUrl.expand(row))
   }
 
   createAllColumns (row) {
@@ -198,7 +198,7 @@ class TableSchema {
 
   defaultPropertyUrl (name) {
     return {
-      fill: () => {
+      expand: () => {
         return this.baseIRI + '#' + encodeURI(name)
       }
     }

package.json

@@ -32,7 +32,8 @@
     "lodash": "^4.17.15",
     "luxon": "^1.17.3",
     "readable-stream": "^3.4.0",
-    "uri-templates": "^0.2.0"
+    "strict-uri-encode": "^2.0.0",
+    "url-template": "^2"
   },
   "devDependencies": {
     "@rdfjs/parser-jsonld": "^1.1.2",

test/support/test031-strict-url-encode.csv

@@ -0,0 +1,2 @@
+(foo)
+(bar)

test/support/test031-strict-url-encode.csv-metadata.json

@@ -0,0 +1,14 @@
+{
+  "@context": "http://www.w3.org/ns/csvw",
+  "url": "test031-strict-url-encode.csv",
+  "tableSchema": {
+    "aboutUrl": "http://example.org/data.csv#{_row}",
+    "columns": [
+      {
+        "titles": "(foo)",
+        "propertyUrl": "http://example.org/vocab#{_name}",
+        "valueUrl": "http://example.org/object/{%28foo%29}"
+      }
+    ]
+  }
+}

test/support/test031-strict-url-encode.nt

@@ -0,0 +1,10 @@
+<http://example.org/data.csv#1> <http://example.org/vocab#%28foo%29> <http://example.org/object/%28bar%29> .
+_:c14n0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/csvw#Row> .
+_:c14n0 <http://www.w3.org/ns/csvw#describes> <http://example.org/data.csv#1> .
+_:c14n0 <http://www.w3.org/ns/csvw#rownum> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
+_:c14n0 <http://www.w3.org/ns/csvw#url> <test031-strict-url-encode.csv#row=2> .
+_:c14n1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/csvw#Table> .
+_:c14n1 <http://www.w3.org/ns/csvw#row> _:c14n0 .
+_:c14n1 <http://www.w3.org/ns/csvw#url> <test031-strict-url-encode.csv> .
+_:c14n2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/csvw#TableGroup> .
+_:c14n2 <http://www.w3.org/ns/csvw#table> _:c14n1 .