bare-url 2.0.7 → 2.0.8

package/package.json

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

package/vendor/liburl/CMakeLists.txt

@@ -19,13 +19,13 @@ target_sources(
   url
   INTERFACE
     include/url.h
+    include/url/character-set.h
+    include/url/infra.h
+    include/url/parse.h
+    include/url/percent-encode.h
+    include/url/serialize.h
+    include/url/type.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
 )
 
@@ -72,6 +72,8 @@ install(TARGETS url_shared url_static)
 
 install(FILES include/url.h DESTINATION include)
 
+install(DIRECTORY include/url DESTINATION include)
+
 if(PROJECT_IS_TOP_LEVEL)
   enable_testing()
   add_subdirectory(bench)

package/vendor/liburl/{src → include/url}/parse.h

@@ -9,7 +9,7 @@
 #include <utf.h>
 #include <utf/string.h>
 
-#include "../include/url.h"
+#include "../url.h"
 #include "character-set.h"
 #include "infra.h"
 #include "percent-encode.h"

package/vendor/liburl/{src → include/url}/type.h

@@ -4,7 +4,7 @@
 #include <utf.h>
 #include <utf/string.h>
 
-#include "../include/url.h"
+#include "../url.h"
 
 static inline url_type_t
 url__type (const utf8_string_view_t scheme) {

package/vendor/liburl/include/url.h

@@ -12,7 +12,7 @@ extern "C" {
 typedef struct url_s url_t;
 typedef uint32_t url_component_t;
 
-static const url_component_t url_component_unset = (url_component_t) -1;
+#define url_component_unset ((url_component_t) - 1);
 
 enum {
   url_has_opaque_path = 0x1,
@@ -64,41 +64,81 @@ struct url_s {
   } components;
 };
 
-void
-url_init (url_t *url);
+inline void
+url_init (url_t *url) {
+  url->flags = 0;
+  url->type = url_type_opaque;
+
+  url->components.scheme_end = 0;
+  url->components.username_end = 0;
+  url->components.host_start = 0;
+  url->components.host_end = 0;
+  url->components.port = url_component_unset;
+  url->components.path_start = 0;
+  url->components.query_start = url_component_unset;
+  url->components.fragment_start = url_component_unset;
+
+  utf8_string_init(&url->href);
+}
+
+inline void
+url_destroy (url_t *url) {
+  utf8_string_destroy(&url->href);
+}
 
-void
-url_destroy (url_t *url);
+inline utf8_string_view_t
+url_get_href (const url_t *url) {
+  return utf8_string_substring(&url->href, 0, url->href.len);
+}
 
-int
-url_parse (url_t *url, const utf8_t *input, size_t len, const url_t *base);
+inline utf8_string_view_t
+url_get_scheme (const url_t *url) {
+  return utf8_string_substring(&url->href, 0, url->components.scheme_end);
+}
+
+inline utf8_string_view_t
+url_get_username (const url_t *url) {
+  return utf8_string_substring(&url->href, url->components.scheme_end + 3 /* :// */, url->components.username_end);
+}
 
-utf8_string_view_t
-url_get_href (const url_t *url);
+inline utf8_string_view_t
+url_get_password (const url_t *url) {
+  return utf8_string_substring(&url->href, url->components.username_end + 1 /* : */, url->components.host_start - 1 /* @ */);
+}
 
-utf8_string_view_t
-url_get_scheme (const url_t *url);
+inline utf8_string_view_t
+url_get_host (const url_t *url) {
+  return utf8_string_substring(&url->href, url->components.host_start, url->components.host_end);
+}
 
-utf8_string_view_t
-url_get_username (const url_t *url);
+inline utf8_string_view_t
+url_get_port (const url_t *url) {
+  return utf8_string_substring(&url->href, url->components.host_end + 1 /* : */, url->components.path_start);
+}
 
-utf8_string_view_t
-url_get_password (const url_t *url);
+inline utf8_string_view_t
+url_get_path (const url_t *url) {
+  return utf8_string_substring(&url->href, url->components.path_start, url->components.query_start - 1 /* ? */);
+}
 
-utf8_string_view_t
-url_get_host (const url_t *url);
+inline utf8_string_view_t
+url_get_query (const url_t *url) {
+  return utf8_string_substring(&url->href, url->components.query_start, url->components.fragment_start - 1 /* # */);
+}
 
-utf8_string_view_t
-url_get_port (const url_t *url);
+inline utf8_string_view_t
+url_get_fragment (const url_t *url) {
+  return utf8_string_substring(&url->href, url->components.fragment_start, url->href.len);
+}
 
-utf8_string_view_t
-url_get_path (const url_t *url);
+#include "url/parse.h"
 
-utf8_string_view_t
-url_get_query (const url_t *url);
+inline int
+url_parse (url_t *url, const utf8_t *input, size_t len, const url_t *base) {
+  if (len == (size_t) -1) len = strlen((char *) input);
 
-utf8_string_view_t
-url_get_fragment (const url_t *url);
+  return url__parse(url, utf8_string_view_init(input, len), base);
+}
 
 #ifdef __cplusplus
 }

package/vendor/liburl/src/url.c

@@ -4,78 +4,39 @@
 #include <utf/string.h>
 
 #include "../include/url.h"
-#include "parse.h"
 
-void
-url_init (url_t *url) {
-  url->flags = 0;
-  url->type = url_type_opaque;
+extern void
+url_init (url_t *url);
 
-  url->components.scheme_end = 0;
-  url->components.username_end = 0;
-  url->components.host_start = 0;
-  url->components.host_end = 0;
-  url->components.port = url_component_unset;
-  url->components.path_start = 0;
-  url->components.query_start = url_component_unset;
-  url->components.fragment_start = url_component_unset;
+extern void
+url_destroy (url_t *url);
 
-  utf8_string_init(&url->href);
-}
+extern utf8_string_view_t
+url_get_href (const url_t *url);
 
-void
-url_destroy (url_t *url) {
-  utf8_string_destroy(&url->href);
-}
+extern utf8_string_view_t
+url_get_scheme (const url_t *url);
 
-int
-url_parse (url_t *url, const utf8_t *input, size_t len, const url_t *base) {
-  if (len == (size_t) -1) len = strlen((char *) input);
+extern utf8_string_view_t
+url_get_username (const url_t *url);
 
-  return url__parse(url, utf8_string_view_init(input, len), base);
-}
+extern utf8_string_view_t
+url_get_password (const url_t *url);
 
-utf8_string_view_t
-url_get_href (const url_t *url) {
-  return utf8_string_substring(&url->href, 0, url->href.len);
-}
+extern utf8_string_view_t
+url_get_host (const url_t *url);
 
-utf8_string_view_t
-url_get_scheme (const url_t *url) {
-  return utf8_string_substring(&url->href, 0, url->components.scheme_end);
-}
+extern utf8_string_view_t
+url_get_port (const url_t *url);
 
-utf8_string_view_t
-url_get_username (const url_t *url) {
-  return utf8_string_substring(&url->href, url->components.scheme_end + 3 /* :// */, url->components.username_end);
-}
+extern utf8_string_view_t
+url_get_path (const url_t *url);
 
-utf8_string_view_t
-url_get_password (const url_t *url) {
-  return utf8_string_substring(&url->href, url->components.username_end + 1 /* : */, url->components.host_start - 1 /* @ */);
-}
+extern utf8_string_view_t
+url_get_query (const url_t *url);
 
-utf8_string_view_t
-url_get_host (const url_t *url) {
-  return utf8_string_substring(&url->href, url->components.host_start, url->components.host_end);
-}
+extern utf8_string_view_t
+url_get_fragment (const url_t *url);
 
-utf8_string_view_t
-url_get_port (const url_t *url) {
-  return utf8_string_substring(&url->href, url->components.host_end + 1 /* : */, url->components.path_start);
-}
-
-utf8_string_view_t
-url_get_path (const url_t *url) {
-  return utf8_string_substring(&url->href, url->components.path_start, url->components.query_start - 1 /* ? */);
-}
-
-utf8_string_view_t
-url_get_query (const url_t *url) {
-  return utf8_string_substring(&url->href, url->components.query_start, url->components.fragment_start - 1 /* # */);
-}
-
-utf8_string_view_t
-url_get_fragment (const url_t *url) {
-  return utf8_string_substring(&url->href, url->components.fragment_start, url->href.len);
-}
+extern int
+url_parse (url_t *url, const utf8_t *input, size_t len, const url_t *base);