bare-url 0.3.8 → 1.0.1

package/CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.25)
+
+project(bare_url C)
+
+include(bare)
+
+if(NOT TARGET utf)
+  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
+endif()
+
+if(NOT TARGET url)
+  add_subdirectory(vendor/liburl EXCLUDE_FROM_ALL)
+endif()
+
+add_bare_module(bare_url)
+
+target_sources(
+  bare_url
+  PRIVATE
+    binding.c
+)
+
+target_link_libraries(
+  bare_url
+  PUBLIC
+    url_static
+)

package/binding.c

@@ -0,0 +1,111 @@
+#include <assert.h>
+#include <bare.h>
+#include <js.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <url.h>
+#include <utf.h>
+#include <utf/string.h>
+
+static js_value_t *
+bare_url_parse (js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 3;
+  js_value_t *argv[3];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 3);
+
+  bool has_base;
+  err = js_is_string(env, argv[1], &has_base);
+  assert(err == 0);
+
+  url_t base;
+  url_init(&base);
+
+  if (has_base) {
+    size_t len;
+    err = js_get_value_string_utf8(env, argv[1], NULL, 0, &len);
+    assert(err == 0);
+
+    utf8_t *input = malloc(len);
+    err = js_get_value_string_utf8(env, argv[1], input, len, NULL);
+    assert(err == 0);
+
+    err = url_parse(&base, input, len, NULL);
+    if (err < 0) {
+      free(input);
+
+      url_destroy(&base);
+
+      js_throw_error(env, NULL, "Invalid base URL");
+
+      return NULL;
+    }
+
+    free(input);
+  }
+
+  size_t len;
+  err = js_get_value_string_utf8(env, argv[0], NULL, 0, &len);
+  assert(err == 0);
+
+  utf8_t *input = malloc(len);
+  err = js_get_value_string_utf8(env, argv[0], input, len, NULL);
+  assert(err == 0);
+
+  uint32_t *components;
+  err = js_get_typedarray_info(env, argv[2], NULL, (void **) &components, NULL, NULL, NULL);
+  assert(err == 0);
+
+  js_value_t *handle;
+
+  url_t url;
+  url_init(&url);
+
+  err = url_parse(&url, input, len, has_base ? &base : NULL);
+  if (err < 0) {
+    free(input);
+
+    url_destroy(&base);
+    url_destroy(&url);
+
+    js_throw_error(env, NULL, "Invalid URL");
+
+    return NULL;
+  }
+
+  free(input);
+
+  js_value_t *href;
+  err = js_create_string_utf8(env, url.href.data, url.href.len, &href);
+  assert(err == 0);
+
+  memcpy(components, &url.components, sizeof(url.components));
+
+  url_destroy(&url);
+
+  return href;
+}
+
+static js_value_t *
+init (js_env_t *env, js_value_t *exports) {
+  int err;
+
+  {
+    js_value_t *fn;
+    err = js_create_function(env, "parse", -1, bare_url_parse, NULL, &fn);
+    assert(err == 0);
+
+    err = js_set_named_property(env, exports, "parse", fn);
+    assert(err == 0);
+  }
+
+  return exports;
+}
+
+BARE_MODULE(bare_url, init)

package/binding.js

@@ -0,0 +1 @@
+module.exports = require.addon()

package/index.js

@@ -1,187 +1,140 @@
 const path = require('bare-path')
 const os = require('bare-os')
-const constants = require('./lib/constants')
+const safetyCatch = require('safety-catch')
+const binding = require('./binding')
 const errors = require('./lib/errors')
-const parse = require('./lib/parse')
-const serialize = require('./lib/serialize')
 
 const URL = exports.URL = class URL {
   constructor (href, base) {
-    if (typeof base === 'string') {
-      try {
-        base = new URL(base)
-      } catch (err) {
-        err.message = 'Invalid base URL'
-        throw err
-      }
-    }
+    if (typeof href !== 'string') throw errors.INVALID_URL()
+
+    if (base && typeof base !== 'string') base = base.href
 
-    this._url = parse(href, base ? base._url : null)
+    this._components = new Uint32Array(8)
+
+    this._parse(href, base)
   }
 
   // https://url.spec.whatwg.org/#dom-url-href
 
   get href () {
-    return serialize(this._url)
+    return this._href
   }
 
   set href (value) {
-    this._url = parse(value)
+    this._update(value)
   }
 
   // https://url.spec.whatwg.org/#dom-url-protocol
 
   get protocol () {
-    return this._url.scheme + ':'
+    return this._slice(0, this._components[0]) + ':'
   }
 
   set protocol (value) {
-    parse(value + ':', null, this._url, constants.STATE_SCHEME_START)
+    this._update(this._replace(value.replace(/:+$/, ''), 0, this._components[0]))
   }
 
   // https://url.spec.whatwg.org/#dom-url-username
 
   get username () {
-    return this._url.username
+    return this._slice(this._components[0] + 3 /* :// */, this._components[1])
   }
 
   set username (value) {
-    if (this._url.host === null || this._url.host === '' || this._url.scheme === 'file') {
+    if (cannotHaveCredentialsOrPort(this)) {
       return
     }
 
-    this._url.username = encodeURIComponent(value)
+    if (this.username === '') value += '@'
+
+    this._update(this._replace(value, this._components[0] + 3 /* :// */, this._components[1]))
   }
 
   // https://url.spec.whatwg.org/#dom-url-password
 
   get password () {
-    return this._url.password
+    return this._href.slice(this._components[1] + 1 /* : */, this._components[2] - 1 /* @ */)
   }
 
   set password (value) {
-    if (this._url.host === null || this._url.host === '' || this._url.scheme === 'file') {
+    if (cannotHaveCredentialsOrPort(this)) {
       return
     }
 
-    this._url.password = encodeURIComponent(value)
+    let start = this._components[1] + 1 /* : */
+    let end = this._components[2] - 1 /* @ */
+
+    if (this.password === '') {
+      value = ':' + value
+      start--
+    }
+
+    if (this.username === '') {
+      value += '@'
+      end++
+    }
+
+    this._update(this._replace(value, start, end))
   }
 
   // https://url.spec.whatwg.org/#dom-url-host
 
   get host () {
-    if (this._url.host === null) return ''
-    if (this._url.port === null) return serialize.host(this._url.host)
-
-    return serialize.host(this._url.host) + ':' + this._url.port.toString(10)
+    return this._slice(this._components[2], this._components[5])
   }
 
   set host (value) {
-    if (typeof this._url.path === 'string') return
-
-    parse(value, null, this._url, constants.STATE_HOST)
   }
 
   // https://url.spec.whatwg.org/#dom-url-hostname
 
   get hostname () {
-    if (this._url.host === null) return ''
-
-    return serialize.host(this._url.host)
+    return this._slice(this._components[2], this._components[3])
   }
 
   set hostname (value) {
-    if (typeof this._url.path === 'string') return
-
-    parse(value, null, this._url, constants.STATE_HOSTNAME)
   }
 
   // https://url.spec.whatwg.org/#dom-url-port
 
   get port () {
-    if (this._url.port === null) return ''
-
-    return this._url.port.toString(10)
+    return this._slice(this._components[3] + 1 /* : */, this._components[5])
   }
 
   set port (value) {
-    if (this._url.host === null || this._url.host === '' || this._url.scheme === 'file') {
-      return
-    }
-
-    if (value === '') {
-      this._url.port = null
-    } else {
-      parse(value, null, this._url, constants.STATE_PORT)
-    }
   }
 
   // https://url.spec.whatwg.org/#dom-url-pathname
 
   get pathname () {
-    if (typeof this._url.path === 'string') return this._url.path
-
-    let output = ''
-
-    for (const segment of this._url.path) output += '/' + segment
-
-    return output
+    return this._slice(this._components[5], this._components[6] - 1 /* ? */)
   }
 
   set pathname (value) {
-    if (typeof this._url.path === 'string') return
-
-    this._url.path = []
+    if (value[0] !== '/' && value[0] !== '\\') {
+      value = '/' + value
+    }
 
-    parse(value, null, this._url, constants.STATE_PATH_START)
+    this._update(this._replace(value, this._components[5], this._components[6] - 1 /* ? */))
   }
 
   // https://url.spec.whatwg.org/#dom-url-search
 
   get search () {
-    if (this._url.query === null || this._url.query === '') return ''
-
-    return '?' + this._url.query
+    return this._slice(this._components[6] - 1 /* ? */, this._components[7] - 1 /* # */)
   }
 
   set search (value) {
-    if (value === '') {
-      this._url.query = null
-
-      return
-    }
-
-    if (value.charCodeAt(0) === 0x3f) {
-      value = value.substring(1)
-    }
-
-    this._url.query = ''
-
-    parse(value, null, this._url, constants.STATE_QUERY)
   }
 
   // https://url.spec.whatwg.org/#dom-url-hash
 
   get hash () {
-    if (this._url.fragment === null || this._url.fragment === '') return ''
-
-    return '#' + this._url.fragment
+    return this._slice(this._components[7] - 1 /* # */)
   }
 
   set hash (value) {
-    if (value === '') {
-      this._url.fragment = null
-
-      return
-    }
-
-    if (value.charCodeAt(0) === 0x23) {
-      value = value.substring(1)
-    }
-
-    this._url.fragment = ''
-
-    parse(value, null, this._url, constants.STATE_FRAGMENT)
   }
 
   [Symbol.for('bare.inspect')] () {
@@ -200,6 +153,37 @@ const URL = exports.URL = class URL {
       hash: this.hash
     }
   }
+
+  _slice (start, end) {
+    return this._href.slice(start, end)
+  }
+
+  _replace (replacement, start, end) {
+    return this._slice(0, start) + replacement + this._slice(end)
+  }
+
+  _parse (href, base) {
+    try {
+      this._href = binding.parse(href, base, this._components)
+    } catch (err) {
+      safetyCatch(err)
+
+      throw errors.INVALID_URL()
+    }
+  }
+
+  _update (href) {
+    try {
+      this._parse(href, null)
+    } catch (err) {
+      safetyCatch(err)
+    }
+  }
+}
+
+// https://url.spec.whatwg.org/#cannot-have-a-username-password-port
+function cannotHaveCredentialsOrPort (url) {
+  return url.hostname === '' || url.protocol === 'file:'
 }
 
 exports.fileURLToPath = function fileURLToPath (url) {

package/lib/errors.js

@@ -19,109 +19,4 @@ module.exports = class URLError extends Error {
   static INVALID_URL_SCHEME (msg = 'Invalid URL') {
     return new URLError(msg, 'INVALID_URL_SCHEME', URLError.INVALID_URL_SCHEME)
   }
-
-  // https://url.spec.whatwg.org/#missing-scheme-non-relative-url
-  static MISSING_SCHEME_NON_RELATIVE_URL (msg = 'Invalid URL') {
-    return new URLError(msg, 'MISSING_SCHEME_NON_RELATIVE_URL', URLError.MISSING_SCHEME_NON_RELATIVE_URL)
-  }
-
-  // https://url.spec.whatwg.org/#invalid-credentials
-  static INVALID_CREDENTIALS (msg = 'Invalid URL') {
-    return new URLError(msg, 'INVALID_CREDENTIALS', URLError.INVALID_CREDENTIALS)
-  }
-
-  // https://url.spec.whatwg.org/#host-missing
-  static HOST_MISSING (msg = 'Invalid URL') {
-    return new URLError(msg, 'HOST_MISSING', URLError.HOST_MISSING)
-  }
-
-  // https://url.spec.whatwg.org/#port-out-of-range
-  static PORT_OUT_OF_RANGE (msg = 'Invalid URL') {
-    return new URLError(msg, 'PORT_OUT_OF_RANGE', URLError.PORT_OUT_OF_RANGE)
-  }
-
-  // https://url.spec.whatwg.org/#port-invalid
-  static PORT_INVALID (msg = 'Invalid URL') {
-    return new URLError(msg, 'PORT_INVALID', URLError.PORT_INVALID)
-  }
-
-  // https://url.spec.whatwg.org/#validation-error-domain-to-ascii
-  static DOMAIN_TO_ASCII (msg = 'Invalid URL') {
-    return new URLError(msg, 'DOMAIN_TO_ASCII', URLError.DOMAIN_TO_ASCII)
-  }
-
-  // https://url.spec.whatwg.org/#domain-invalid-code-point
-  static DOMAIN_INVALID_CODE_POINT (msg = 'Invalid URL') {
-    return new URLError(msg, 'DOMAIN_INVALID_CODE_POINT', URLError.DOMAIN_INVALID_CODE_POINT)
-  }
-
-  // https://url.spec.whatwg.org/#host-invalid-code-point
-  static HOST_INVALID_CODE_POINT (msg = 'Invalid URL') {
-    return new URLError(msg, 'HOST_INVALID_CODE_POINT', URLError.HOST_INVALID_CODE_POINT)
-  }
-
-  // https://url.spec.whatwg.org/#ipv4-too-many-parts
-  static IPV4_TOO_MANY_PARTS (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV4_TOO_MANY_PARTS', URLError.IPV4_TOO_MANY_PARTS)
-  }
-
-  // https://url.spec.whatwg.org/#ipv4-non-numeric-part
-  static IPV4_NON_NUMERIC_PART (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV4_NON_NUMERIC_PART', URLError.IPV4_NON_NUMERIC_PART)
-  }
-
-  // https://url.spec.whatwg.org/#ipv4-out-of-range-part
-  static IPV4_OUT_OF_RANGE_PART (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV4_OUT_OF_RANGE_PART', URLError.IPV4_OUT_OF_RANGE_PART)
-  }
-
-  // https://url.spec.whatwg.org/#ipv6-unclosed
-  static IPV6_UNCLOSED (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV6_UNCLOSED', URLError.IPV6_UNCLOSED)
-  }
-
-  // https://url.spec.whatwg.org/#ipv6-invalid-compression
-  static IPV6_INVALID_COMPRESSION (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV6_INVALID_COMPRESSION', URLError.IPV6_INVALID_COMPRESSION)
-  }
-
-  // https://url.spec.whatwg.org/#ipv6-too-many-pieces
-  static IPV6_TOO_MANY_PIECES (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV6_TOO_MANY_PIECES', URLError.IPV6_TOO_MANY_PIECES)
-  }
-
-  // https://url.spec.whatwg.org/#ipv6-multiple-compression
-  static IPV6_MULTIPLE_COMPRESSION (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV6_MULTIPLE_COMPRESSION', URLError.IPV6_MULTIPLE_COMPRESSION)
-  }
-
-  // https://url.spec.whatwg.org/#ipv6-invalid-code-point
-  static IPV6_INVALID_CODE_POINT (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV6_INVALID_CODE_POINT', URLError.IPV6_INVALID_CODE_POINT)
-  }
-
-  // https://url.spec.whatwg.org/#ipv6-too-few-pieces
-  static IPV6_TOO_FEW_PIECES (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV6_TOO_FEW_PIECES', URLError.IPV6_TOO_FEW_PIECES)
-  }
-
-  // https://url.spec.whatwg.org/#ipv4-in-ipv6-too-many-pieces
-  static IPV4_IN_IPV6_TOO_MANY_PIECES (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV4_IN_IPV6_TOO_MANY_PIECES', URLError.IPV4_IN_IPV6_TOO_MANY_PIECES)
-  }
-
-  // https://url.spec.whatwg.org/#ipv4-in-ipv6-invalid-code-point
-  static IPV4_IN_IPV6_INVALID_CODE_POINT (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV4_IN_IPV6_INVALID_CODE_POINT', URLError.IPV4_IN_IPV6_INVALID_CODE_POINT)
-  }
-
-  // https://url.spec.whatwg.org/#ipv4-in-ipv6-out-of-range-part
-  static IPV4_IN_IPV6_OUT_OF_RANGE_PART (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV4_IN_IPV6_OUT_OF_RANGE_PART', URLError.IPV4_IN_IPV6_OUT_OF_RANGE_PART)
-  }
-
-  // https://url.spec.whatwg.org/#ipv4-in-ipv6-too-few-parts
-  static IPV4_IN_IPV6_TOO_FEW_PARTS (msg = 'Invalid URL') {
-    return new URLError(msg, 'IPV4_IN_IPV6_TOO_FEW_PARTS', URLError.IPV4_IN_IPV6_TOO_FEW_PARTS)
-  }
 }

package/package.json

@@ -1,12 +1,23 @@
 {
   "name": "bare-url",
-  "version": "0.3.8",
+  "version": "1.0.1",
   "description": "URL parser for JavaScript",
   "main": "index.js",
   "files": [
     "index.js",
-    "lib"
+    "binding.c",
+    "binding.js",
+    "CMakeLists.txt",
+    "lib",
+    "prebuilds",
+    "vendor/liburl/include",
+    "vendor/liburl/src",
+    "vendor/libutf/include",
+    "vendor/libutf/src"
   ],
+  "addon": {
+    "target": "bare_url"
+  },
   "scripts": {
     "test": "standard && bare test.js"
   },
@@ -23,7 +34,7 @@
   "dependencies": {
     "bare-os": "^2.0.0",
     "bare-path": "^2.0.0",
-    "tr46": "^5.0.0"
+    "safety-catch": "^1.0.2"
   },
   "devDependencies": {
     "brittle": "^3.3.2",

package/vendor/liburl/CMakeLists.txt

@@ -0,0 +1,79 @@
+cmake_minimum_required(VERSION 3.25)
+
+project(url C)
+
+if(NOT TARGET utf)
+  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
+endif()
+
+add_library(url OBJECT)
+
+set_target_properties(
+  url
+  PROPERTIES
+  C_STANDARD 11
+  POSITION_INDEPENDENT_CODE ON
+)
+
+target_sources(
+  url
+  INTERFACE
+    include/url.h
+  PRIVATE
+    src/character-set.h
+    src/infra.h
+    src/parse.h
+    src/percent-encode.h
+    src/serialize.h
+    src/type.h
+    src/url.c
+)
+
+target_include_directories(
+  url
+  PUBLIC
+    include
+    $<TARGET_PROPERTY:utf,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
+add_library(url_shared SHARED)
+
+set_target_properties(
+  url_shared
+  PROPERTIES
+  OUTPUT_NAME url
+  WINDOWS_EXPORT_ALL_SYMBOLS ON
+)
+
+target_link_libraries(
+  url_shared
+  PUBLIC
+    url
+    utf_shared
+)
+
+add_library(url_static STATIC)
+
+set_target_properties(
+  url_static
+  PROPERTIES
+  OUTPUT_NAME url
+  PREFIX lib
+)
+
+target_link_libraries(
+  url_static
+  PUBLIC
+    url
+    utf_static
+)
+
+install(TARGETS url_shared url_static)
+
+install(FILES include/url.h DESTINATION include)
+
+if(PROJECT_IS_TOP_LEVEL)
+  enable_testing()
+  add_subdirectory(bench)
+  add_subdirectory(test)
+endif()