bare-url 2.1.5 → 2.2.0

package/binding.c

@@ -165,47 +165,6 @@ bare_url_can_parse (js_env_t *env, js_callback_info_t *info) {
   return result;
 }
 
-static js_value_t *
-bare_url_tag (js_env_t *env, js_callback_info_t *info) {
-  int err;
-
-  size_t argc = 1;
-  js_value_t *argv[1];
-
-  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
-  assert(err == 0);
-
-  assert(argc == 1);
-
-  err = js_add_type_tag(env, argv[0], &bare_url__tag);
-  assert(err == 0);
-
-  return NULL;
-}
-
-static js_value_t *
-bare_url_is_tagged (js_env_t *env, js_callback_info_t *info) {
-  int err;
-
-  size_t argc = 1;
-  js_value_t *argv[1];
-
-  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
-  assert(err == 0);
-
-  assert(argc == 1);
-
-  bool is_url;
-  err = js_check_type_tag(env, argv[0], &bare_url__tag, &is_url);
-  assert(err == 0);
-
-  js_value_t *result;
-  err = js_get_boolean(env, is_url, &result);
-  assert(err == 0);
-
-  return result;
-}
-
 static js_value_t *
 bare_url_exports (js_env_t *env, js_value_t *exports) {
   int err;
@@ -221,8 +180,6 @@ bare_url_exports (js_env_t *env, js_value_t *exports) {
 
   V("parse", bare_url_parse)
   V("canParse", bare_url_can_parse)
-  V("tag", bare_url_tag)
-  V("isTagged", bare_url_is_tagged)
 #undef V
 
   return exports;

package/global.d.ts

@@ -1,9 +1,12 @@
 import * as url from '.'
 
 type URLConstructor = typeof url.URL
+type URLSearchParamsConstructor = typeof url.URLSearchParams
 
 declare global {
   type URL = url.URL
+  type URLSearchParams = url.URLSearchParams
 
   const URL: URLConstructor
+  const URLSearchParams: URLSearchParamsConstructor
 }

package/global.js

@@ -1 +1,2 @@
 global.URL = require('.')
+global.URLSearchParams = require('./lib/url-search-params')

package/index.d.ts

@@ -1,4 +1,5 @@
 import URLError from './lib/errors'
+import URLSearchParams from './lib/url-search-params'
 
 interface URL {
   href: string
@@ -10,6 +11,7 @@ interface URL {
   port: string
   pathname: string
   search: string
+  searchParams: URLSearchParams
   hash: string
 
   toString(): string
@@ -31,7 +33,7 @@ declare namespace URL {
 
   export function pathToFileURL(pathname: string): URL
 
-  export { URL, type URLError, URLError as errors }
+  export { URL, type URLError, URLError as errors, URLSearchParams }
 }
 
 export = URL

package/index.js

@@ -1,24 +1,33 @@
 const path = require('bare-path')
 const binding = require('./binding')
 const errors = require('./lib/errors')
+const URLSearchParams = require('./lib/url-search-params')
+
+const kind = Symbol.for('bare.url.kind')
 
 const isWindows = Bare.platform === 'win32'
 
 module.exports = exports = class URL {
-  static {
-    binding.tag(this)
+  static get [kind]() {
+    return 0 // Compatibility version
   }
 
   constructor(input, base, opts = {}) {
     if (arguments.length === 0) throw errors.INVALID_URL()
 
-    input = `${input}`
+    input = String(input)
 
-    if (base !== undefined) base = `${base}`
+    if (base !== undefined) base = String(base)
 
     this._components = new Uint32Array(8)
 
     this._parse(input, base, opts.throw !== false)
+
+    if (this._href) this._params = new URLSearchParams(this.search, this)
+  }
+
+  get [kind]() {
+    return URL[kind]
   }
 
   // https://url.spec.whatwg.org/#dom-url-href
@@ -29,6 +38,8 @@ module.exports = exports = class URL {
 
   set href(value) {
     this._update(value)
+
+    this._params._parse(this.search)
   }
 
   // https://url.spec.whatwg.org/#dom-url-protocol
@@ -189,6 +200,14 @@ module.exports = exports = class URL {
         this._components[7] - 1 /* # */
       )
     )
+
+    this._params._parse(this.search)
+  }
+
+  // https://url.spec.whatwg.org/#dom-url-searchparams
+
+  get searchParams() {
+    return this._params
   }
 
   // https://url.spec.whatwg.org/#dom-url-hash
@@ -224,6 +243,7 @@ module.exports = exports = class URL {
       port: this.port,
       pathname: this.pathname,
       search: this.search,
+      searchParams: this.searchParams,
       hash: this.hash
     }
   }
@@ -236,10 +256,10 @@ module.exports = exports = class URL {
     return this._slice(0, start) + replacement + this._slice(end)
   }
 
-  _parse(href, base, shouldThrow) {
+  _parse(input, base, shouldThrow) {
     try {
       this._href = binding.parse(
-        String(href),
+        String(input),
         base ? String(base) : null,
         this._components,
         shouldThrow
@@ -251,9 +271,9 @@ module.exports = exports = class URL {
     }
   }
 
-  _update(href) {
+  _update(input) {
     try {
-      this._parse(href, null, true)
+      this._parse(input, null, true)
     } catch (err) {
       if (err instanceof TypeError) throw err
     }
@@ -272,29 +292,26 @@ function cannotHaveCredentialsOrPort(url) {
 
 const URL = exports
 
-exports.URL = URL // For Node.js compatibility
+exports.URL = URL
+exports.URLSearchParams = URLSearchParams
 
 exports.errors = errors
 
 exports.isURL = function isURL(value) {
-  if (typeof value !== 'object' || value === null) return false
-
-  let constructor = value.constructor
-
-  while (typeof constructor === 'function') {
-    if (binding.isTagged(constructor)) return true
-
-    constructor = Reflect.getPrototypeOf(constructor)
-  }
+  if (value instanceof URL) return true
 
-  return false
+  return (
+    typeof value === 'object' && value !== null && value[kind] === URL[kind]
+  )
 }
 
+// https://url.spec.whatwg.org/#dom-url-parse
 exports.parse = function parse(input, base) {
   const url = new URL(input, base, { throw: false })
-  return url.href ? url : null
+  return url._href ? url : null
 }
 
+// https://url.spec.whatwg.org/#dom-url-canparse
 exports.canParse = function canParse(input, base) {
   return binding.canParse(String(input), base ? String(base) : null)
 }

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

@@ -0,0 +1,21 @@
+interface URLSearchParams extends Iterable<[name: string, value: string]> {
+  readonly size: number
+
+  append(name: string, value: string): void
+  delete(name: string, value?: string): void
+  get(name: string): string | undefined
+  getAll(name: string): string[]
+  has(name: string, value?: string): boolean
+  set(name: string, value: string): void
+
+  toString(): string
+  toJSON(): string
+}
+
+declare class URLSearchParams {
+  constructor(
+    init: string | Record<string, string> | Iterable<[string, string]>
+  )
+}
+
+export = URLSearchParams

package/lib/url-search-params.js

@@ -0,0 +1,174 @@
+module.exports = class URLSearchParams {
+  static _urls = new WeakMap()
+
+  // https://url.spec.whatwg.org/#dom-urlsearchparams-urlsearchparams
+  constructor(init, url = null) {
+    this._params = new Map()
+
+    if (url) URLSearchParams._urls.set(this, url)
+
+    if (typeof init === 'string') {
+      this._parse(init)
+    } else if (init) {
+      for (const [name, value] of typeof init[Symbol.iterator] === 'function'
+        ? init
+        : Object.entries(init)) {
+        this.append(name, value)
+      }
+    }
+  }
+
+  // https://url.spec.whatwg.org/#dom-urlsearchparams-size
+  get size() {
+    return this._params.length
+  }
+
+  // https://url.spec.whatwg.org/#dom-urlsearchparams-append
+  append(name, value = null) {
+    if (value === null) return
+
+    let list = this._params.get(name)
+
+    if (list === undefined) {
+      list = []
+      this._params.set(name, list)
+    }
+
+    list.push(value)
+
+    this._update()
+  }
+
+  // https://url.spec.whatwg.org/#dom-urlsearchparams-delete
+  delete(name, value = null) {
+    if (value === null) this._params.delete(name)
+    else {
+      let list = this._params.get(name)
+
+      if (list === undefined) return
+
+      list = list.filter((found) => found !== value)
+
+      if (list.length === 0) this._params.delete(name)
+      else this._params.set(name, list)
+    }
+
+    this._update()
+  }
+
+  // https://url.spec.whatwg.org/#dom-urlsearchparams-get
+  get(name) {
+    const list = this._params.get(name)
+
+    if (list === undefined) return null
+
+    return list[0]
+  }
+
+  // https://url.spec.whatwg.org/#dom-urlsearchparams-getall
+  getAll(name) {
+    const list = this._params.get(name)
+
+    if (list === undefined) return []
+
+    return Array.from(list)
+  }
+
+  // https://url.spec.whatwg.org/#dom-urlsearchparams-has
+  has(name, value = null) {
+    const list = this._params.get(name)
+
+    if (list === undefined) return false
+
+    if (value === null) return true
+
+    return list.includes(value)
+  }
+
+  // https://url.spec.whatwg.org/#dom-urlsearchparams-set
+  set(name, value = null) {
+    if (value === null) this._params.delete(name)
+    else this._params.set(name, [value])
+
+    this._update()
+  }
+
+  toString() {
+    return this._serialize()
+  }
+
+  toJSON() {
+    return [...this]
+  }
+
+  *[Symbol.iterator]() {
+    for (const [name, values] of this._params) {
+      for (const value of values) yield [name, value]
+    }
+  }
+
+  [Symbol.for('bare.inspect')]() {
+    const object = {
+      __proto__: { constructor: URLSearchParams }
+    }
+
+    for (const [name, values] of this._params) {
+      if (values.length === 1) object[name] = values[0]
+      else object[name] = values
+    }
+
+    return object
+  }
+
+  // https://url.spec.whatwg.org/#concept-urlsearchparams-update
+  _update() {
+    const url = URLSearchParams._urls.get(this)
+
+    if (url === undefined) return
+
+    url.search = this._serialize()
+  }
+
+  // https://url.spec.whatwg.org/#concept-urlencoded-parser
+  _parse(input) {
+    if (input[0] === '?') input = input.substring(1)
+
+    this._params = new Map()
+
+    for (const sequence of input.split('&')) {
+      if (sequence.length === 0) continue
+
+      let i = sequence.indexOf('=')
+      if (i === -1) i = sequence.length
+
+      const name = sequence.substring(0, i)
+      const value = sequence.substring(i + 1, sequence.length)
+
+      let list = this._params.get(name)
+
+      if (list === undefined) {
+        list = []
+        this._params.set(name, list)
+      }
+
+      list.push(value)
+    }
+  }
+
+  // https://url.spec.whatwg.org/#concept-urlencoded-serializer
+  _serialize() {
+    let output = ''
+
+    for (let [name, values] of this._params) {
+      name = encodeURIComponent(name)
+
+      for (const value of values) {
+        if (output) output += '&'
+
+        output += name + '=' + encodeURIComponent(value)
+      }
+    }
+
+    return output
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-url",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "description": "WHATWG URL implementation for JavaScript",
   "exports": {
     "./package": "./package.json",