bare-url 2.0.9 → 2.1.1

package/global.js

@@ -0,0 +1 @@
+global.URL = require('.')

package/index.d.ts

@@ -0,0 +1,33 @@
+declare class URL {
+  constructor(input: string, base?: string | URL)
+
+  href: string
+  protocol: string
+  username: string
+  password: string
+  host: string
+  hostname: string
+  port: string
+  pathname: string
+  search: string
+  hash: string
+
+  toString(): string
+  toJSON(): string
+}
+
+declare namespace URL {
+  export function isURL(value: unknown): value is URL
+
+  export function parse(input: string, base?: string | URL): URL | null
+
+  export function canParse(input: string, base?: string | URL): boolean
+
+  export function fileURLToPath(url: URL | string): string
+
+  export function pathToFileURL(pathname: string): URL
+
+  export { URL }
+}
+
+export = URL

package/index.js

@@ -5,12 +5,12 @@ const errors = require('./lib/errors')
 
 const isWindows = Bare.platform === 'win32'
 
-const URL = module.exports = exports = class URL {
+module.exports = exports = class URL {
   static {
     binding.tag(this)
   }
 
-  constructor (input, base, opts = {}) {
+  constructor(input, base, opts = {}) {
     if (arguments.length === 0) throw errors.INVALID_URL()
 
     input = `${input}`
@@ -24,47 +24,58 @@ const URL = module.exports = exports = class URL {
 
   // https://url.spec.whatwg.org/#dom-url-href
 
-  get href () {
+  get href() {
     return this._href
   }
 
-  set href (value) {
+  set href(value) {
     this._update(value)
   }
 
   // https://url.spec.whatwg.org/#dom-url-protocol
 
-  get protocol () {
+  get protocol() {
     return this._slice(0, this._components[0]) + ':'
   }
 
-  set protocol (value) {
-    this._update(this._replace(value.replace(/:+$/, ''), 0, this._components[0]))
+  set protocol(value) {
+    this._update(
+      this._replace(value.replace(/:+$/, ''), 0, this._components[0])
+    )
   }
 
   // https://url.spec.whatwg.org/#dom-url-username
 
-  get username () {
+  get username() {
     return this._slice(this._components[0] + 3 /* :// */, this._components[1])
   }
 
-  set username (value) {
+  set username(value) {
     if (cannotHaveCredentialsOrPort(this)) {
       return
     }
 
     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 /* @ */)
+  get password() {
+    return this._href.slice(
+      this._components[1] + 1 /* : */,
+      this._components[2] - 1 /* @ */
+    )
   }
 
-  set password (value) {
+  set password(value) {
     if (cannotHaveCredentialsOrPort(this)) {
       return
     }
@@ -87,25 +98,31 @@ const URL = module.exports = exports = class URL {
 
   // https://url.spec.whatwg.org/#dom-url-host
 
-  get host () {
+  get host() {
     return this._slice(this._components[2], this._components[5])
   }
 
-  set host (value) {
+  set host(value) {
     if (hasOpaquePath(this)) {
       return
     }
 
-    this._update(this._replace(value, this._components[2], this._components[value.includes(':') ? 5 : 3]))
+    this._update(
+      this._replace(
+        value,
+        this._components[2],
+        this._components[value.includes(':') ? 5 : 3]
+      )
+    )
   }
 
   // https://url.spec.whatwg.org/#dom-url-hostname
 
-  get hostname () {
+  get hostname() {
     return this._slice(this._components[2], this._components[3])
   }
 
-  set hostname (value) {
+  set hostname(value) {
     if (hasOpaquePath(this)) {
       return
     }
@@ -115,11 +132,11 @@ const URL = module.exports = exports = class URL {
 
   // https://url.spec.whatwg.org/#dom-url-port
 
-  get port () {
+  get port() {
     return this._slice(this._components[3] + 1 /* : */, this._components[5])
   }
 
-  set port (value) {
+  set port(value) {
     if (cannotHaveCredentialsOrPort(this)) {
       return
     }
@@ -136,11 +153,11 @@ const URL = module.exports = exports = class URL {
 
   // https://url.spec.whatwg.org/#dom-url-pathname
 
-  get pathname () {
+  get pathname() {
     return this._slice(this._components[5], this._components[6] - 1 /* ? */)
   }
 
-  set pathname (value) {
+  set pathname(value) {
     if (hasOpaquePath(this)) {
       return
     }
@@ -149,42 +166,53 @@ const URL = 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 /* # */)
+  get search() {
+    return this._slice(
+      this._components[6] - 1 /* ? */,
+      this._components[7] - 1 /* # */
+    )
   }
 
-  set search (value) {
+  set search(value) {
     if (value && value[0] !== '?') value = '?' + value
 
-    this._update(this._replace(value, this._components[6] - 1 /* ? */, this._components[7] - 1 /* # */))
+    this._update(
+      this._replace(
+        value,
+        this._components[6] - 1 /* ? */,
+        this._components[7] - 1 /* # */
+      )
+    )
   }
 
   // https://url.spec.whatwg.org/#dom-url-hash
 
-  get hash () {
+  get hash() {
     return this._slice(this._components[7] - 1 /* # */)
   }
 
-  set hash (value) {
+  set hash(value) {
     if (value && value[0] !== '#') value = '#' + value
 
     this._update(this._replace(value, this._components[7] - 1 /* # */))
   }
 
-  toString () {
+  toString() {
     return this._href
   }
 
-  toJSON () {
+  toJSON() {
     return this._href
   }
 
-  [Symbol.for('bare.inspect')] () {
+  [Symbol.for('bare.inspect')]() {
     return {
       __proto__: { constructor: URL },
 
@@ -201,17 +229,22 @@ const URL = module.exports = exports = class URL {
     }
   }
 
-  _slice (start, end = this._href.length) {
+  _slice(start, end = this._href.length) {
     return this._href.slice(start, end)
   }
 
-  _replace (replacement, start, end = this._href.length) {
+  _replace(replacement, start, end = this._href.length) {
     return this._slice(0, start) + replacement + this._slice(end)
   }
 
-  _parse (href, base, shouldThrow) {
+  _parse(href, base, shouldThrow) {
     try {
-      this._href = binding.parse(String(href), base ? String(base) : null, this._components, shouldThrow)
+      this._href = binding.parse(
+        String(href),
+        base ? String(base) : null,
+        this._components,
+        shouldThrow
+      )
     } catch (err) {
       if (err instanceof TypeError) throw err
 
@@ -219,7 +252,7 @@ const URL = module.exports = exports = class URL {
     }
   }
 
-  _update (href) {
+  _update(href) {
     try {
       this._parse(href, null, true)
     } catch (err) {
@@ -229,18 +262,20 @@ const URL = module.exports = exports = class URL {
 }
 
 // https://url.spec.whatwg.org/#url-opaque-path
-function hasOpaquePath (url) {
+function hasOpaquePath(url) {
   return url.pathname[0] !== '/'
 }
 
 // https://url.spec.whatwg.org/#cannot-have-a-username-password-port
-function cannotHaveCredentialsOrPort (url) {
+function cannotHaveCredentialsOrPort(url) {
   return url.hostname === '' || url.protocol === 'file:'
 }
 
-exports.URL = exports // For Node.js compatibility
+const URL = exports
 
-exports.isURL = function isURL (value) {
+exports.URL = URL // For Node.js compatibility
+
+exports.isURL = function isURL(value) {
   if (typeof value !== 'object' || value === null) return false
 
   let constructor = value.constructor
@@ -254,16 +289,16 @@ exports.isURL = function isURL (value) {
   return false
 }
 
-exports.parse = function parse (input, base) {
+exports.parse = function parse(input, base) {
   const url = new URL(input, base, { throw: false })
   return url.href ? url : null
 }
 
-exports.canParse = function canParse (input, base) {
+exports.canParse = function canParse(input, base) {
   return binding.canParse(String(input), base ? String(base) : null)
 }
 
-exports.fileURLToPath = function fileURLToPath (url) {
+exports.fileURLToPath = function fileURLToPath(url) {
   if (typeof url === 'string') {
     url = new URL(url)
   }
@@ -274,15 +309,21 @@ exports.fileURLToPath = function fileURLToPath (url) {
 
   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')
+      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')
+      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'
+      )
     }
   }
 
@@ -293,7 +334,11 @@ 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')
     }
 
@@ -303,12 +348,12 @@ exports.fileURLToPath = function fileURLToPath (url) {
   return pathname
 }
 
-exports.pathToFileURL = function pathToFileURL (pathname) {
+exports.pathToFileURL = function pathToFileURL(pathname) {
   let resolved = path.resolve(pathname)
 
   if (pathname[pathname.length - 1] === '/') {
     resolved += '/'
-  } else if (isWindows && pathname[pathname.length - 1 === '\\']) {
+  } else if (isWindows && pathname[pathname.length - 1] === '\\') {
     resolved += '\\'
   }
 

package/lib/errors.js

@@ -1,5 +1,5 @@
 module.exports = class URLError extends Error {
-  constructor (msg, code, fn = URLError) {
+  constructor(msg, code, fn = URLError) {
     super(`${code}: ${msg}`)
     this.code = code
 
@@ -8,23 +8,31 @@ module.exports = class URLError extends Error {
     }
   }
 
-  get name () {
+  get name() {
     return 'URLError'
   }
 
-  static INVALID_URL (msg = 'Invalid URL') {
+  static INVALID_URL(msg = 'Invalid URL') {
     return new URLError(msg, 'INVALID_URL', URLError.INVALID_URL)
   }
 
-  static INVALID_URL_SCHEME (msg = 'Invalid URL') {
+  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_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)
+  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,10 +1,19 @@
 {
   "name": "bare-url",
-  "version": "2.0.9",
+  "version": "2.1.1",
   "description": "WHATWG URL implementation for JavaScript",
-  "main": "index.js",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./index.js"
+    },
+    "./package": "./package.json",
+    "./global": "./global.js"
+  },
   "files": [
     "index.js",
+    "index.d.ts",
+    "global.js",
     "binding.c",
     "binding.js",
     "CMakeLists.txt",
@@ -13,7 +22,7 @@
   ],
   "addon": true,
   "scripts": {
-    "test": "standard && bare test.js"
+    "test": "prettier . --check && bare test.js"
   },
   "repository": {
     "type": "git",
@@ -32,6 +41,7 @@
     "brittle": "^3.3.2",
     "cmake-bare": "^1.1.6",
     "cmake-fetch": "^1.0.0",
-    "standard": "^17.1.0"
+    "prettier": "^3.3.3",
+    "prettier-config-standard": "^7.0.0"
   }
 }