bare-url 1.0.11 → 1.1.1

package/binding.c

@@ -8,17 +8,19 @@
 #include <utf.h>
 #include <utf/string.h>
 
+static js_type_tag_t bare_url__tag = {0x6f1fd92f476698b0, 0x93b59c349143ee50};
+
 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];
+  size_t argc = 5;
+  js_value_t *argv[5];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 3);
+  assert(argc == 5);
 
   bool has_base;
   err = js_is_string(env, argv[1], &has_base);
@@ -37,17 +39,16 @@ bare_url_parse (js_env_t *env, js_callback_info_t *info) {
     assert(err == 0);
 
     err = url_parse(&base, input, len, NULL);
-    if (err < 0) {
-      free(input);
 
+    free(input);
+
+    if (err < 0) {
       url_destroy(&base);
 
       js_throw_error(env, NULL, "Invalid base URL");
 
       return NULL;
     }
-
-    free(input);
   }
 
   size_t len;
@@ -58,19 +59,16 @@ bare_url_parse (js_env_t *env, js_callback_info_t *info) {
   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);
 
+  free(input);
+
+  if (err < 0) {
     url_destroy(&base);
     url_destroy(&url);
 
@@ -79,12 +77,23 @@ bare_url_parse (js_env_t *env, js_callback_info_t *info) {
     return NULL;
   }
 
-  free(input);
-
   js_value_t *href;
   err = js_create_string_utf8(env, url.href.data, url.href.len, &href);
   assert(err == 0);
 
+  bool tag;
+  err = js_get_value_bool(env, argv[2], &tag);
+  assert(err == 0);
+
+  if (tag) {
+    err = js_add_type_tag(env, argv[3], &bare_url__tag);
+    assert(err == 0);
+  }
+
+  uint32_t *components;
+  err = js_get_typedarray_info(env, argv[4], NULL, (void **) &components, NULL, NULL, NULL);
+  assert(err == 0);
+
   memcpy(components, &url.components, sizeof(url.components));
 
   url_destroy(&base);
@@ -94,19 +103,115 @@ bare_url_parse (js_env_t *env, js_callback_info_t *info) {
 }
 
 static js_value_t *
-init (js_env_t *env, js_value_t *exports) {
+bare_url_can_parse (js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  {
-    js_value_t *fn;
-    err = js_create_function(env, "parse", -1, bare_url_parse, NULL, &fn);
+  size_t argc = 2;
+  js_value_t *argv[2];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 2);
+
+  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);
 
-    err = js_set_named_property(env, exports, "parse", fn);
+    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);
+
+    free(input);
+
+    if (err < 0) {
+      url_destroy(&base);
+
+      js_value_t *result;
+      err = js_get_boolean(env, false, &result);
+      assert(err == 0);
+
+      return result;
+    }
   }
 
+  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);
+
+  url_t url;
+  url_init(&url);
+
+  err = url_parse(&url, input, len, has_base ? &base : NULL);
+
+  free(input);
+
+  url_destroy(&base);
+  url_destroy(&url);
+
+  js_value_t *result;
+  err = js_get_boolean(env, err == 0, &result);
+  assert(err == 0);
+
+  return result;
+}
+
+static js_value_t *
+bare_url_is_url (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;
+
+#define V(name, fn) \
+  { \
+    js_value_t *val; \
+    err = js_create_function(env, name, -1, fn, NULL, &val); \
+    assert(err == 0); \
+    err = js_set_named_property(env, exports, name, val); \
+    assert(err == 0); \
+  }
+
+  V("parse", bare_url_parse)
+  V("canParse", bare_url_can_parse)
+  V("isURL", bare_url_is_url)
+#undef V
+
   return exports;
 }
 
-BARE_MODULE(bare_url, init)
+BARE_MODULE(bare_url, bare_url_exports)

package/index.js

@@ -6,7 +6,7 @@ const errors = require('./lib/errors')
 
 const isWindows = Bare.platform === 'win32'
 
-const URL = exports.URL = class URL {
+const URL = module.exports = exports = class URL {
   constructor (href, base) {
     if (typeof href !== 'string') throw errors.INVALID_URL()
 
@@ -14,7 +14,7 @@ const URL = exports.URL = class URL {
 
     this._components = new Uint32Array(8)
 
-    this._parse(href, base)
+    this._parse(href, base, true /* Tag */)
   }
 
   // https://url.spec.whatwg.org/#dom-url-href
@@ -204,9 +204,9 @@ const URL = exports.URL = class URL {
     return this._slice(0, start) + replacement + this._slice(end)
   }
 
-  _parse (href, base) {
+  _parse (href, base, tag = false) {
     try {
-      this._href = binding.parse(href, base, this._components)
+      this._href = binding.parse(String(href), base ? String(base) : null, tag, this, this._components)
     } catch (err) {
       safetyCatch(err)
 
@@ -216,7 +216,7 @@ const URL = exports.URL = class URL {
 
   _update (href) {
     try {
-      this._parse(href, null)
+      this._parse(href, null, false /* Tag */)
     } catch (err) {
       safetyCatch(err)
     }
@@ -233,6 +233,16 @@ function cannotHaveCredentialsOrPort (url) {
   return url.hostname === '' || url.protocol === 'file:'
 }
 
+exports.URL = exports // For Node.js compatibility
+
+exports.isURL = function isURL (value) {
+  return typeof value === 'object' && value !== null && binding.isURL(value)
+}
+
+exports.canParse = function canParse (href, base) {
+  return binding.canParse(String(href), base ? String(base) : null)
+}
+
 exports.fileURLToPath = function fileURLToPath (url) {
   if (typeof url === 'string') {
     url = new URL(url)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-url",
-  "version": "1.0.11",
+  "version": "1.1.1",
   "description": "WHATWG URL implementation for JavaScript",
   "main": "index.js",
   "files": [