bare-url 0.3.2 → 0.3.4

package/index.js

@@ -32,11 +32,11 @@ const URL = exports.URL = class URL {
   // https://url.spec.whatwg.org/#dom-url-protocol
 
   get protocol () {
-    return `${this._url.scheme}:`
+    return this._url.scheme + ':'
   }
 
   set protocol (value) {
-    parse(`${value}:`, null, this._url, constants.STATE_SCHEME_START)
+    parse(value + ':', null, this._url, constants.STATE_SCHEME_START)
   }
 
   // https://url.spec.whatwg.org/#dom-url-username
@@ -73,7 +73,7 @@ const URL = exports.URL = class URL {
     if (this._url.host === null) return ''
     if (this._url.port === null) return this._url.host
 
-    return `${this._url.host}:${this._url.port}`
+    return this._url.host + ':' + this._url.port
   }
 
   set host (value) {
@@ -101,7 +101,7 @@ const URL = exports.URL = class URL {
   get port () {
     if (this._url.port === null) return ''
 
-    return `${this._url.port}`
+    return this._url.port.toString(10)
   }
 
   set port (value) {
@@ -123,7 +123,7 @@ const URL = exports.URL = class URL {
 
     let output = ''
 
-    for (const segment of this._url.path) output += `/${segment}`
+    for (const segment of this._url.path) output += '/' + segment
 
     return output
   }
@@ -141,7 +141,7 @@ const URL = exports.URL = class URL {
   get search () {
     if (this._url.query === null || this._url.query === '') return ''
 
-    return `?${this._url.query}`
+    return '?' + this._url.query
   }
 
   set search (value) {
@@ -165,7 +165,7 @@ const URL = exports.URL = class URL {
   get hash () {
     if (this._url.fragment === null || this._url.fragment === '') return ''
 
-    return `#${this._url.fragment}`
+    return '#' + this._url.fragment
   }
 
   set hash (value) {
@@ -214,10 +214,34 @@ exports.fileURLToPath = function fileURLToPath (url) {
   const pathname = path.normalize(decodeURIComponent(url.pathname))
 
   if (os.platform() === 'win32') {
-    if (url.hostname) return `\\\\${url.hostname}${pathname}`
+    if (url.hostname) return '\\\\' + url.hostname + pathname
 
     return pathname.slice(1)
   }
 
   return pathname
 }
+
+exports.pathToFileURL = function pathToFileURL (pathname) {
+  let resolved = path.resolve(pathname)
+
+  if (pathname[pathname.length - 1] === '/') {
+    resolved += '/'
+  } else if (os.platform() === 'win32' && pathname[pathname.length - 1 === '\\']) {
+    resolved += '/'
+  }
+
+  resolved = resolved
+    .replaceAll('%', '%25') // Must be first
+    .replaceAll('#', '%23')
+    .replaceAll('?', '%3f')
+    .replaceAll('\n', '%0a')
+    .replaceAll('\r', '%0d')
+    .replaceAll('\t', '%09')
+
+  if (os.platform() !== 'win32') {
+    resolved = resolved.replaceAll('\\', '%5c')
+  }
+
+  return new URL('file:' + resolved)
+}

package/lib/parse.js

@@ -543,7 +543,7 @@ function defaultPort (scheme) {
 
 // https://url.spec.whatwg.org/#is-special
 function isSpecial (url) {
-  return isSpecialScheme(url)
+  return isSpecialScheme(url.scheme)
 }
 
 // https://url.spec.whatwg.org/#include-credentials

package/lib/serialize.js

@@ -34,7 +34,7 @@ module.exports = function serialize (url, excludeFragment = false) {
   if (typeof url.path === 'string') {
     output += url.path
   } else {
-    output += '/' + url.path.join('/')
+    for (const segment of url.path) output += '/' + segment
   }
 
   if (url.query !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-url",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "URL parser for JavaScript",
   "main": "index.js",
   "files": [