bare-url 0.3.4 → 0.3.6

package/index.js

@@ -228,7 +228,7 @@ exports.pathToFileURL = function pathToFileURL (pathname) {
   if (pathname[pathname.length - 1] === '/') {
     resolved += '/'
   } else if (os.platform() === 'win32' && pathname[pathname.length - 1 === '\\']) {
-    resolved += '/'
+    resolved += '\\'
   }
 
   resolved = resolved

package/lib/parse.js

@@ -183,7 +183,7 @@ module.exports = function parse (
         } else {
           url.username = base.username
           url.password = base.password
-          url.host = base.url
+          url.host = base.host
           url.port = base.port
           state = constants.STATE_PATH
           pointer--
@@ -224,10 +224,12 @@ module.exports = function parse (
               continue
             }
 
+            const encodedCodePoints = UTF8PercentEncode(buffer[i], userinfoPercentEncodeSet)
+
             if (passwordTokenSeen) {
-              url.password += encodeURIComponent(buffer[i])
+              url.password += encodedCodePoints
             } else {
-              url.username += encodeURIComponent(buffer[i])
+              url.username += encodedCodePoints
             }
           }
 
@@ -463,7 +465,7 @@ module.exports = function parse (
             state = constants.STATE_FRAGMENT
           }
         } else {
-          buffer += encodeURIComponent(String.fromCharCode(c))
+          buffer += UTF8PercentEncode(String.fromCharCode(c), pathPercentEncodeSet)
         }
         break
 
@@ -477,7 +479,7 @@ module.exports = function parse (
           state = constants.STATE_FRAGMENT
         } else {
           if (c !== -1) {
-            url.path += encodeURIComponent(String.fromCharCode(c))
+            url.path += UTF8PercentEncode(String.fromCharCode(c), c0ControlPercentEncodeSet)
           }
         }
         break
@@ -485,7 +487,9 @@ module.exports = function parse (
       // https://url.spec.whatwg.org/#query-state
       case constants.STATE_QUERY:
         if ((!stateOverride && c === 0x23) || c === -1) {
-          url.query += encodeURI(buffer)
+          const percentEncodeSet = isSpecial(url) ? specialQueryPercentEncodeSet : queryPercentEncodeSet
+
+          url.query += UTF8PercentEncode(buffer, percentEncodeSet)
           buffer = ''
 
           if (c === 0x23) {
@@ -500,7 +504,7 @@ module.exports = function parse (
       // https://url.spec.whatwg.org/#fragment-state
       case constants.STATE_FRAGMENT:
         if (c !== -1) {
-          url.fragment += encodeURI(String.fromCharCode(c))
+          url.fragment += UTF8PercentEncode(String.fromCharCode(c), fragmentPercentEncodeSet)
         }
     }
   }
@@ -600,3 +604,58 @@ function isSingleDotPathSegment (segment) {
 function isDoubleDotPathSegment (segment) {
   return segment === '..' || decodeURIComponent(segment) === '..'
 }
+
+// https://url.spec.whatwg.org/#percent-encode
+function percentEncode (byte) {
+  return `%${byte.toString(16).toUpperCase().padStart(2, '0')}`
+}
+
+// https://url.spec.whatwg.org/#string-percent-encode-after-encoding
+function percentEncodeAfterEncoding (bytes, percentEncodeSet) {
+  let output = ''
+
+  for (const byte of bytes) {
+    if (percentEncodeSet(byte)) {
+      output += percentEncode(byte)
+    } else {
+      output += String.fromCharCode(byte)
+    }
+  }
+
+  return output
+}
+
+// https://url.spec.whatwg.org/#string-utf-8-percent-encode
+function UTF8PercentEncode (input, percentEncodeSet) {
+  return percentEncodeAfterEncoding(Buffer.from(input, 'utf8'), percentEncodeSet)
+}
+
+// https://url.spec.whatwg.org/#c0-control-percent-encode-set
+function c0ControlPercentEncodeSet (c) {
+  return c <= 0x1f || c > 0x7e
+}
+
+// https://url.spec.whatwg.org/#fragment-percent-encode-set
+function fragmentPercentEncodeSet (c) {
+  return c0ControlPercentEncodeSet(c) || c === 0x20 || c === 0x22 || c === 0x3c || c === 0x3e || c === 0x60
+}
+
+// https://url.spec.whatwg.org/#query-percent-encode-set
+function queryPercentEncodeSet (c) {
+  return c0ControlPercentEncodeSet(c) || c === 0x20 || c === 0x22 || c === 0x23 || c === 0x3c || c === 0x3e
+}
+
+// https://url.spec.whatwg.org/#special-query-percent-encode-set
+function specialQueryPercentEncodeSet (c) {
+  return queryPercentEncodeSet(c) || c === 0x27
+}
+
+// https://url.spec.whatwg.org/#path-percent-encode-set
+function pathPercentEncodeSet (c) {
+  return queryPercentEncodeSet(c) || c === 0x3f || c === 0x60 || c === 0x7b || c === 0x7d
+}
+
+// https://url.spec.whatwg.org/#userinfo-percent-encode-set
+function userinfoPercentEncodeSet (c) {
+  return pathPercentEncodeSet(c) || c === 0x2f || c === 0x3a || c === 0x3b || c === 0x3d || c === 0x40 || c === 0x5b || c === 0x5c || c === 0x5d || c === 0x5e || c === 0x7c
+}

package/package.json

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