bare-url 2.0.7 → 2.0.9

package/CMakeLists.txt

@@ -1,16 +1,12 @@
 cmake_minimum_required(VERSION 3.25)
 
 find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
+find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 
 project(bare_url C)
 
-if(NOT TARGET utf)
-  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
-endif()
-
-if(NOT TARGET url)
-  add_subdirectory(vendor/liburl EXCLUDE_FROM_ALL)
-endif()
+fetch_package("github:holepunchto/libutf#65b6ba0")
+fetch_package("github:holepunchto/liburl#54406f0")
 
 add_bare_module(bare_url)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-url",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "WHATWG URL implementation for JavaScript",
   "main": "index.js",
   "files": [
@@ -9,11 +9,7 @@
     "binding.js",
     "CMakeLists.txt",
     "lib",
-    "prebuilds",
-    "vendor/liburl/include",
-    "vendor/liburl/src",
-    "vendor/libutf/include",
-    "vendor/libutf/src"
+    "prebuilds"
   ],
   "addon": true,
   "scripts": {
@@ -35,6 +31,7 @@
   "devDependencies": {
     "brittle": "^3.3.2",
     "cmake-bare": "^1.1.6",
+    "cmake-fetch": "^1.0.0",
     "standard": "^17.1.0"
   }
 }

package/vendor/liburl/CMakeLists.txt

@@ -1,79 +0,0 @@
-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()

package/vendor/liburl/include/url.h

@@ -1,107 +0,0 @@
-#ifndef URL_H
-#define URL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include <utf.h>
-#include <utf/string.h>
-
-typedef struct url_s url_t;
-typedef uint32_t url_component_t;
-
-static const url_component_t url_component_unset = (url_component_t) -1;
-
-enum {
-  url_has_opaque_path = 0x1,
-};
-
-typedef enum {
-  url_type_opaque,
-  url_type_http,
-  url_type_https,
-  url_type_ws,
-  url_type_wss,
-  url_type_ftp,
-  url_type_file,
-} url_type_t;
-
-struct url_s {
-  uint8_t flags;
-
-  url_type_t type;
-
-  /**
-   * The normalized serialization of the URL. This is used as the canonical
-   * representation to both minimize memory allocation and also provide fast,
-   * immutable views over the various URL components.
-   */
-  utf8_string_t href;
-
-  /**
-   * https://user:pass@example.com:1234/foo/bar?baz#quux
-   *      |      |     |          |^^^^|        |   |
-   *      |      |     |          ||   |        |   `---- fragment_start
-   *      |      |     |          ||   |        `-------- query_start
-   *      |      |     |          ||   `----------------- path_start
-   *      |      |     |          |`--------------------- port
-   *      |      |     |          `---------------------- host_end
-   *      |      |     `--------------------------------- host_start
-   *      |      `--------------------------------------- username_end
-   *      `---------------------------------------------- scheme_end
-   */
-  struct {
-    url_component_t scheme_end;
-    url_component_t username_end;
-    url_component_t host_start;
-    url_component_t host_end;
-    url_component_t port;
-    url_component_t path_start;
-    url_component_t query_start;
-    url_component_t fragment_start;
-  } components;
-};
-
-void
-url_init (url_t *url);
-
-void
-url_destroy (url_t *url);
-
-int
-url_parse (url_t *url, const utf8_t *input, size_t len, const url_t *base);
-
-utf8_string_view_t
-url_get_href (const url_t *url);
-
-utf8_string_view_t
-url_get_scheme (const url_t *url);
-
-utf8_string_view_t
-url_get_username (const url_t *url);
-
-utf8_string_view_t
-url_get_password (const url_t *url);
-
-utf8_string_view_t
-url_get_host (const url_t *url);
-
-utf8_string_view_t
-url_get_port (const url_t *url);
-
-utf8_string_view_t
-url_get_path (const url_t *url);
-
-utf8_string_view_t
-url_get_query (const url_t *url);
-
-utf8_string_view_t
-url_get_fragment (const url_t *url);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // URL_H

package/vendor/liburl/src/character-set.h

@@ -1,41 +0,0 @@
-#ifndef URL_CHARACTER_SET
-#define URL_CHARACTER_SET
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <utf.h>
-#include <utf/string.h>
-
-/**
- * A character set is stored as a 32 x 8 bit list with each bit
- * representing an ASCII byte. A given ASCII byte is in the character set
- * if its corresponding bit is set.
- */
-typedef const uint8_t url_character_set_t[32];
-
-static inline bool
-url__is_in_character_set (url_character_set_t character_set, utf8_t character) {
-  return (character_set[character >> 3] & (1 << (character & 7))) != 0;
-}
-
-static inline bool
-url__contains_from_character_set (url_character_set_t character_set, utf8_string_view_t input) {
-  size_t i = 0, n = input.len;
-
-  uint8_t accumulator = 0;
-
-  for (; i + 4 <= n; i += 4) {
-    accumulator |= url__is_in_character_set(character_set, input.data[i]);
-    accumulator |= url__is_in_character_set(character_set, input.data[i + 1]);
-    accumulator |= url__is_in_character_set(character_set, input.data[i + 2]);
-    accumulator |= url__is_in_character_set(character_set, input.data[i + 3]);
-  }
-
-  for (; i < n; i++) {
-    accumulator |= url__is_in_character_set(character_set, input.data[i]);
-  }
-
-  return accumulator;
-}
-
-#endif // URL_CHARACTER_SET

package/vendor/liburl/src/idna.h

@@ -1,14 +0,0 @@
-#ifndef URL_IDNA_H
-#define URL_IDNA_H
-
-#include <utf.h>
-#include <utf/string.h>
-
-static inline int
-url__idna_to_ascii (utf8_string_view_t input, utf8_string_t *result) {
-  // TODO
-
-  return -1;
-}
-
-#endif // URL_IDNA_H

package/vendor/liburl/src/infra.h

@@ -1,141 +0,0 @@
-#ifndef URL_INFRA_H
-#define URL_INFRA_H
-
-#include <stdbool.h>
-#include <utf.h>
-
-#include "character-set.h"
-
-// https://infra.spec.whatwg.org/#ascii-alpha
-static url_character_set_t url__ascii_alpha_character_set = {
-  // 00    01     02     03     04     05     06     07
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 08    09     0a     0b     0c     0d     0e     0f
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 10    11     12     13     14     15     16     17
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 18    19     1a     1b     1c     1d     1e     1f
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 20    21     22     23     24     25     26     27
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 28    29     2a     2b     2c     2d     2e     2f
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 30    31     32     33     34     35     36     37
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 38    39     3a     3b     3c     3d     3e     3f
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 40    41     42     43     44     45     46     47
-  0x00 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 48    49     4a     4b     4c     4d     4e     4f
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 50    51     52     53     54     55     56     57
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 58    59     5a     5b     5c     5d     5e     5f
-  0x01 | 0x02 | 0x04 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 60    61     62     63     64     65     66     67
-  0x00 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 68    69     6a     6b     6c     6d     6e     6f
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 70    71     72     73     74     75     76     77
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 78    79     7a
-  0x01 | 0x02 | 0x04,
-};
-
-// https://infra.spec.whatwg.org/#ascii-alphanumeric
-static url_character_set_t url__ascii_alphanumeric_character_set = {
-  // 00    01     02     03     04     05     06     07
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 08    09     0a     0b     0c     0d     0e     0f
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 10    11     12     13     14     15     16     17
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 18    19     1a     1b     1c     1d     1e     1f
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 20    21     22     23     24     25     26     27
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 28    29     2a     2b     2c     2d     2e     2f
-  0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 30    31     32     33     34     35     36     37
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 38    39     3a     3b     3c     3d     3e     3f
-  0x01 | 0x02 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 40    41     42     43     44     45     46     47
-  0x00 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 48    49     4a     4b     4c     4d     4e     4f
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 50    51     52     53     54     55     56     57
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 58    59     5a     5b     5c     5d     5e     5f
-  0x01 | 0x02 | 0x04 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
-  // 60    61     62     63     64     65     66     67
-  0x00 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 68    69     6a     6b     6c     6d     6e     6f
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 70    71     72     73     74     75     76     77
-  0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
-  // 78    79     7a
-  0x01 | 0x02 | 0x04,
-};
-
-// https://infra.spec.whatwg.org/#ascii-digit
-static inline bool
-url__is_ascii_digit (utf8_t c) {
-  return c >= 0x30 && c <= 0x39;
-}
-
-// https://infra.spec.whatwg.org/#ascii-upper-hex-digit
-static inline bool
-url__is_ascii_upper_hex_digit (utf8_t c) {
-  return url__is_ascii_digit(c) || (c >= 0x41 && c <= 0x46);
-}
-
-// https://infra.spec.whatwg.org/#ascii-lower-hex-digit
-static inline bool
-url__is_ascii_lower_hex_digit (utf8_t c) {
-  return url__is_ascii_digit(c) || (c >= 0x61 && c <= 0x66);
-}
-
-// https://infra.spec.whatwg.org/#ascii-hex-digit
-static inline bool
-url__is_ascii_hex_digit (utf8_t c) {
-  return url__is_ascii_digit(c) || (c >= 0x41 && c <= 0x46) || (c >= 0x61 && c <= 0x66);
-}
-
-// https://infra.spec.whatwg.org/#ascii-upper-alpha
-static inline bool
-url__is_ascii_upper_alpha (utf8_t c) {
-  return c >= 0x41 && c <= 0x5a;
-}
-
-// https://infra.spec.whatwg.org/#ascii-lower-alpha
-static inline bool
-url__is_ascii_lower_alpha (utf8_t c) {
-  return c >= 0x61 && c <= 0x7a;
-}
-
-// https://infra.spec.whatwg.org/#ascii-alpha
-static inline bool
-url__is_ascii_alpha (utf8_t c) {
-  return url__is_in_character_set(url__ascii_alpha_character_set, c);
-}
-
-// https://infra.spec.whatwg.org/#ascii-alphanumeric
-static inline bool
-url__is_ascii_alphanumeric (utf8_t c) {
-  return url__is_in_character_set(url__ascii_alphanumeric_character_set, c);
-}
-
-// https://infra.spec.whatwg.org/#ascii-lowercase
-static inline utf8_t
-url__to_ascii_lowercase (utf8_t c) {
-  return c | 0x20;
-}
-
-// https://infra.spec.whatwg.org/#ascii-uppercase
-static inline utf8_t
-url__to_ascii_uppercase (utf8_t c) {
-  return c & ~0x20;
-}
-
-#endif // URL_INFRA_H