bare-url 2.3.0 → 2.3.2

package/CMakeLists.txt

@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 4.0)
 
 find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
 find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 
 project(bare_url C)
 
-fetch_package("github:holepunchto/libutf#9c5d642")
+fetch_package("github:holepunchto/libutf#6b1a36f")
 fetch_package("github:holepunchto/liburl#03f1488")
 
 add_bare_module(bare_url)
@@ -19,7 +19,9 @@ target_sources(
 target_link_libraries(
   ${bare_url}
   PRIVATE
+    $<TARGET_OBJECTS:utf>
     $<TARGET_OBJECTS:url>
   PUBLIC
+    utf
     url
 )

package/index.js

@@ -49,9 +49,7 @@ module.exports = exports = class URL {
   }
 
   set protocol(value) {
-    this._update(
-      this._replace(value.replace(/:+$/, ''), 0, this._components[0])
-    )
+    this._update(this._replace(value.replace(/:+$/, ''), 0, this._components[0]))
   }
 
   // https://url.spec.whatwg.org/#dom-url-username
@@ -67,22 +65,13 @@ module.exports = exports = class URL {
 
     if (this.username === '') value += '@'
 
-    this._update(
-      this._replace(
-        value,
-        this._components[0] + 3 /* :// */,
-        this._components[1]
-      )
-    )
+    this._update(this._replace(value, this._components[0] + 3 /* :// */, this._components[1]))
   }
 
   // https://url.spec.whatwg.org/#dom-url-password
 
   get password() {
-    return this._href.slice(
-      this._components[1] + 1 /* : */,
-      this._components[2] - 1 /* @ */
-    )
+    return this._href.slice(this._components[1] + 1 /* : */, this._components[2] - 1 /* @ */)
   }
 
   set password(value) {
@@ -118,11 +107,7 @@ module.exports = exports = class URL {
     }
 
     this._update(
-      this._replace(
-        value,
-        this._components[2],
-        this._components[value.includes(':') ? 5 : 3]
-      )
+      this._replace(value, this._components[2], this._components[value.includes(':') ? 5 : 3])
     )
   }
 
@@ -176,29 +161,20 @@ module.exports = exports = class URL {
       value = '/' + value
     }
 
-    this._update(
-      this._replace(value, this._components[5], this._components[6] - 1 /* ? */)
-    )
+    this._update(this._replace(value, this._components[5], this._components[6] - 1 /* ? */))
   }
 
   // https://url.spec.whatwg.org/#dom-url-search
 
   get search() {
-    return this._slice(
-      this._components[6] - 1 /* ? */,
-      this._components[7] - 1 /* # */
-    )
+    return this._slice(this._components[6] - 1 /* ? */, this._components[7] - 1 /* # */)
   }
 
   set search(value) {
     if (value && value[0] !== '?') value = '?' + value
 
     this._update(
-      this._replace(
-        value,
-        this._components[6] - 1 /* ? */,
-        this._components[7] - 1 /* # */
-      )
+      this._replace(value, this._components[6] - 1 /* ? */, this._components[7] - 1 /* # */)
     )
 
     this._params._parse(this.search)
@@ -267,7 +243,7 @@ module.exports = exports = class URL {
     } catch (err) {
       if (err instanceof TypeError) throw err
 
-      throw errors.INVALID_URL()
+      throw errors.INVALID_URL(`Invalid URL '${input}'`, input)
     }
   }
 
@@ -300,9 +276,7 @@ exports.errors = errors
 exports.isURL = function isURL(value) {
   if (value instanceof URL) return true
 
-  return (
-    typeof value === 'object' && value !== null && value[kind] === URL[kind]
-  )
+  return typeof value === 'object' && value !== null && value[kind] === URL[kind]
 }
 
 // https://url.spec.whatwg.org/#dom-url-parse
@@ -333,15 +307,11 @@ exports.fileURLToPath = function fileURLToPath(url) {
     }
   } else {
     if (url.hostname) {
-      throw errors.INVALID_FILE_URL_HOST(
-        "The file: URL host must be 'localhost' or empty"
-      )
+      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'
-      )
+      throw errors.INVALID_FILE_URL_PATH('The file: URL path must not include encoded / characters')
     }
   }
 
@@ -352,11 +322,7 @@ exports.fileURLToPath = function fileURLToPath(url) {
 
     const letter = pathname.charCodeAt(1) | 0x20
 
-    if (
-      letter < 0x61 /* a */ ||
-      letter > 0x7a /* z */ ||
-      pathname.charCodeAt(2) !== 0x3a /* : */
-    ) {
+    if (letter < 0x61 /* a */ || letter > 0x7a /* z */ || pathname.charCodeAt(2) !== 0x3a /* : */) {
       throw errors.INVALID_FILE_URL_PATH('The file: URL path must be absolute')
     }
 
@@ -391,18 +357,7 @@ exports.pathToFileURL = function pathToFileURL(pathname) {
 }
 
 exports.format = function format(parts) {
-  const {
-    protocol,
-    auth,
-    host,
-    hostname,
-    port,
-    pathname,
-    search,
-    query,
-    hash,
-    slashes
-  } = parts
+  const { protocol, auth, host, hostname, port, pathname, search, query, hash, slashes } = parts
 
   let result = ''
 

package/lib/errors.d.ts

@@ -1,8 +1,10 @@
+interface URLError extends Error {
+  readonly code: string
+  readonly input?: string
+}
+
 declare class URLError extends Error {
-  static INVALID_URL(msg?: string): URLError
-  static INVALID_URL_SCHEME(msg?: string): URLError
-  static INVALID_FILE_URL_HOST(msg?: string): URLError
-  static INVALID_FILE_URL_PATH(msg?: string): URLError
+  private constructor()
 }
 
 export = URLError

package/lib/errors.js

@@ -1,38 +1,33 @@
 module.exports = class URLError extends Error {
-  constructor(msg, code, fn = URLError) {
+  constructor(msg, fn = URLError, code = fn.name) {
     super(`${code}: ${msg}`)
+
     this.code = code
 
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, fn)
-    }
+    if (Error.captureStackTrace) Error.captureStackTrace(this, fn)
   }
 
   get name() {
     return 'URLError'
   }
 
-  static INVALID_URL(msg = 'Invalid URL') {
-    return new URLError(msg, 'INVALID_URL', URLError.INVALID_URL)
+  static INVALID_URL(msg, input) {
+    const err = new URLError(msg, URLError.INVALID_URL)
+
+    err.input = input
+
+    return err
   }
 
   static INVALID_URL_SCHEME(msg = 'Invalid URL') {
-    return new URLError(msg, 'INVALID_URL_SCHEME', URLError.INVALID_URL_SCHEME)
+    return new URLError(msg, 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
-    )
+    return new URLError(msg, 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
-    )
+    return new URLError(msg, URLError.INVALID_FILE_URL_PATH)
   }
 }

package/lib/url-search-params.d.ts

@@ -13,9 +13,7 @@ interface URLSearchParams extends Iterable<[name: string, value: string]> {
 }
 
 declare class URLSearchParams {
-  constructor(
-    init: string | Record<string, string> | Iterable<[string, string]>
-  )
+  constructor(init: string | Record<string, string> | Iterable<[string, string]>)
 }
 
 export = URLSearchParams

package/lib/url-search-params.js

@@ -142,9 +142,7 @@ module.exports = class URLSearchParams {
       if (i === -1) i = sequence.length
 
       const name = decodeURIComponent(sequence.substring(0, i))
-      const value = decodeURIComponent(
-        sequence.substring(i + 1, sequence.length)
-      )
+      const value = decodeURIComponent(sequence.substring(i + 1, sequence.length))
 
       let list = this._params.get(name)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-url",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "WHATWG URL implementation for JavaScript",
   "exports": {
     "./package": "./package.json",
@@ -46,6 +46,6 @@
     "cmake-bare": "^1.1.6",
     "cmake-fetch": "^1.0.0",
     "prettier": "^3.3.3",
-    "prettier-config-standard": "^7.0.0"
+    "prettier-config-holepunch": "^2.0.0"
   }
 }