Remove string dependency.

Author: RubenVerborgh

lib/handlers/get.js

@@ -4,7 +4,6 @@ const fs = require('fs')
 const glob = require('glob')
 const _path = require('path')
 const $rdf = require('rdflib')
-const S = require('string')
 const Negotiator = require('negotiator')
 const url = require('url')
 const mime = require('mime-types')
@@ -160,14 +159,14 @@ function globHandler (req, res, next) {
 
     debugGlob('found matches ' + matches)
     Promise.all(matches.map(match => new Promise((resolve, reject) => {
-      const baseUri = utils.filenameToBaseUri(match, reqOrigin, root)
+      const baseUri = reqOrigin + '/' + match.substr(root.length)
       fs.readFile(match, {encoding: 'utf8'}, function (err, fileData) {
         if (err) {
           debugGlob('error ' + err)
           return resolve()
         }
         aclAllow(match, req, res, function (allowed) {
-          if (!S(match).endsWith('.ttl') || !allowed) {
+          if (!match.endsWith('.ttl') || !allowed) {
             return resolve()
           }
           try {

lib/header.js

@@ -6,7 +6,6 @@ module.exports.addPermissions = addPermissions
 
 const li = require('li')
 const path = require('path')
-const S = require('string')
 const metadata = require('./metadata.js')
 const debug = require('./debug.js')
 const utils = require('./utils.js')
@@ -54,7 +53,7 @@ function linksHandler (req, res, next) {
     return next(error(404, 'Trying to access metadata file as regular file'))
   }
   let fileMetadata = new metadata.Metadata()
-  if (S(filename).endsWith('/')) {
+  if (filename.endsWith('/')) {
     fileMetadata.isContainer = true
     fileMetadata.isBasicContainer = true
   } else {

lib/ldp-container.js

@@ -9,7 +9,6 @@ const debug = require('./debug')
 const error = require('./http-error')
 const fs = require('fs')
 const ns = require('solid-namespace')($rdf)
-const S = require('string')
 const mime = require('mime-types')
 const path = require('path')
 
@@ -33,7 +32,7 @@ function addContainerStats (ldp, reqUri, filename, resourceGraph, next) {
 
 function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container, file, callback) {
   // Skip .meta and .acl
-  if (S(file).endsWith(ldp.suffixMeta) || S(file).endsWith(ldp.suffixAcl)) {
+  if (file.endsWith(ldp.suffixMeta) || file.endsWith(ldp.suffixAcl)) {
     return callback(null)
   }
 

lib/utils.js

@@ -1,11 +1,9 @@
 module.exports.uriToFilename = uriToFilename
 module.exports.uriToRelativeFilename = uriToRelativeFilename
-module.exports.filenameToBaseUri = filenameToBaseUri
 module.exports.getBaseUri = getBaseUri
 module.exports.pathBasename = pathBasename
 module.exports.getFullUri = getFullUri
 module.exports.hasSuffix = hasSuffix
-module.exports.getResourceLink = getResourceLink
 module.exports.parse = parse
 module.exports.serialize = serialize
 module.exports.translate = translate
@@ -17,7 +15,6 @@ module.exports.fullUrlForReq = fullUrlForReq
 
 const fs = require('fs')
 const path = require('path')
-const S = require('string')
 const $rdf = require('rdflib')
 const from = require('from2')
 const url = require('url')
@@ -81,7 +78,7 @@ function uriToFilename (uri, base) {
     if (fileStats.isDirectory() && !filename.endsWith('/')) {
       filename += '/'
     } else if (fileStats.isFile() && filename.endsWith('/')) {
-      filename = S(filename).chompRight('/').s
+      filename = filename.substr(0, filename.length - 1)
     }
   } catch (err) {}
   return filename
@@ -93,11 +90,6 @@ function uriToRelativeFilename (uri, base) {
   return relative
 }
 
-function filenameToBaseUri (filename, uri, base) {
-  const uriPath = S(filename).strip(base).toString()
-  return uri + '/' + uriPath
-}
-
 function getBaseUri (req) {
   // Obtain the protocol from the configured server URI
   // (in case the server is running behind a reverse proxy)
@@ -145,17 +137,6 @@ function hasSuffix (path, suffixes) {
   return false
 }
 
-function getResourceLink (filename, uri, base, suffix, otherSuffix) {
-  const link = filenameToBaseUri(filename, uri, base)
-  if (link.endsWith(suffix)) {
-    return link
-  } else if (link.endsWith(otherSuffix)) {
-    return S(link).chompRight(otherSuffix).s + suffix
-  } else {
-    return link + suffix
-  }
-}
-
 function parse (data, baseUri, contentType, callback) {
   const graph = $rdf.graph()
   try {

package-lock.json

@@ -71,7 +71,6 @@
     "solid-namespace": "^0.1.0",
     "solid-permissions": "^0.5.2",
     "solid-ws": "^0.2.3",
-    "string": "^3.3.0",
     "ulid": "^0.1.0",
     "uuid": "^3.0.0",
     "valid-url": "^1.0.9",