bare-url 1.0.4 → 1.0.6

package/CMakeLists.txt

@@ -16,6 +16,8 @@ add_bare_module(bare_url)
 
 target_sources(
   ${bare_url}
+  PUBLIC
+    $<TARGET_OBJECTS:url>
   PRIVATE
     binding.c
 )
@@ -23,5 +25,5 @@ target_sources(
 target_link_libraries(
   ${bare_url}
   PUBLIC
-    url_static
+    url
 )

package/index.js

@@ -1,9 +1,11 @@
+/* global Bare */
 const path = require('bare-path')
-const os = require('bare-os')
 const safetyCatch = require('safety-catch')
 const binding = require('./binding')
 const errors = require('./lib/errors')
 
+const isWindows = Bare.platform === 'win32'
+
 const URL = exports.URL = class URL {
   constructor (href, base) {
     if (typeof href !== 'string') throw errors.INVALID_URL()
@@ -195,11 +197,31 @@ exports.fileURLToPath = function fileURLToPath (url) {
     throw errors.INVALID_URL_SCHEME('The URL must use the file: protocol')
   }
 
+  if (isWindows) {
+    if (/%2f|%5c/i.test(url.pathname)) {
+      throw errors.INVALID_FILE_URL_PATH('The file: URL path must not include encoded \\ or / characters')
+    }
+  } else {
+    if (url.hostname) {
+      throw errors.INVALID_FILE_URL_HOST('The file: URL host must be \'localhost\' or empty')
+    }
+
+    if (/%2f/i.test(url.pathname)) {
+      throw errors.INVALID_FILE_URL_PATH('The file: URL path must not include encoded / characters')
+    }
+  }
+
   const pathname = path.normalize(decodeURIComponent(url.pathname))
 
-  if (os.platform() === 'win32') {
+  if (isWindows) {
     if (url.hostname) return '\\\\' + url.hostname + pathname
 
+    const letter = pathname.charCodeAt(1) | 0x20
+
+    if (letter < 0x61 /* a */ || letter > 0x7a /* z */ || pathname.charCodeAt(2) !== 0x3a /* : */) {
+      throw errors.INVALID_FILE_URL_PATH('The file: URL path must be absolute')
+    }
+
     return pathname.slice(1)
   }
 
@@ -211,7 +233,7 @@ exports.pathToFileURL = function pathToFileURL (pathname) {
 
   if (pathname[pathname.length - 1] === '/') {
     resolved += '/'
-  } else if (os.platform() === 'win32' && pathname[pathname.length - 1 === '\\']) {
+  } else if (isWindows && pathname[pathname.length - 1 === '\\']) {
     resolved += '\\'
   }
 
@@ -223,7 +245,7 @@ exports.pathToFileURL = function pathToFileURL (pathname) {
     .replaceAll('\r', '%0d')
     .replaceAll('\t', '%09')
 
-  if (os.platform() !== 'win32') {
+  if (!isWindows) {
     resolved = resolved.replaceAll('\\', '%5c')
   }
 

package/lib/errors.js

@@ -19,4 +19,12 @@ module.exports = class URLError extends Error {
   static INVALID_URL_SCHEME (msg = 'Invalid URL') {
     return new URLError(msg, 'INVALID_URL_SCHEME', URLError.INVALID_URL_SCHEME)
   }
+
+  static INVALID_FILE_URL_HOST (msg = 'Invalid file: URL host') {
+    return new URLError(msg, 'INVALID_FILE_URL_HOST', URLError.INVALID_FILE_URL_HOST)
+  }
+
+  static INVALID_FILE_URL_PATH (msg = 'Invalid file: URL path') {
+    return new URLError(msg, 'INVALID_FILE_URL_PATH', URLError.INVALID_FILE_URL_PATH)
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-url",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "URL parser for JavaScript",
   "main": "index.js",
   "files": [
@@ -30,7 +30,6 @@
   },
   "homepage": "https://github.com/holepunchto/bare-url",
   "dependencies": {
-    "bare-os": "^2.0.0",
     "bare-path": "^2.0.0",
     "safety-catch": "^1.0.2"
   },