bare-url 2.0.2 → 2.0.4

package/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.25)
 
-project(bare_url C)
+find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
 
-include(bare)
+project(bare_url C)
 
 if(NOT TARGET utf)
   add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
@@ -16,6 +16,8 @@ add_bare_module(bare_url)
 
 target_sources(
   ${bare_url}
+  PUBLIC
+    $<TARGET_OBJECTS:url>
   PRIVATE
     binding.c
 )
@@ -23,5 +25,5 @@ target_sources(
 target_link_libraries(
   ${bare_url}
   PUBLIC
-    url_static
+    url
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-url",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "WHATWG URL implementation for JavaScript",
   "main": "index.js",
   "files": [
@@ -35,6 +35,7 @@
   },
   "devDependencies": {
     "brittle": "^3.3.2",
+    "cmake-bare": "^1.1.6",
     "standard": "^17.1.0"
   }
 }

package/vendor/liburl/src/parse.h

@@ -828,6 +828,11 @@ url__parse (url_t *url, const utf8_string_view_t input, const url_t *base) {
             url->components.port = base->components.port;
           }
         } else {
+          if (base->components.scheme_end + 3 /* :// */ == base->components.username_end) {
+            err = utf8_string_append_literal(&url->href, (utf8_t *) "//", 2);
+            if (err < 0) goto err;
+          }
+
           url->components.username_end = url->href.len;
           url->components.host_start = url->href.len;
           url->components.host_end = url->href.len;
@@ -881,12 +886,12 @@ url__parse (url_t *url, const utf8_string_view_t input, const url_t *base) {
       } else {
         utf8_string_view_t host = url_get_host(base);
 
-        if (url->type == url_type_opaque && base->components.scheme_end + 3 /* :// */ == base->components.host_start) {
-          err = utf8_string_append_literal(&url->href, (utf8_t *) "//", 2);
-          if (err < 0) goto err;
-        }
-
         if (!utf8_string_view_empty(host)) {
+          if (url->type == url_type_opaque) {
+            err = utf8_string_append_literal(&url->href, (utf8_t *) "//", 2);
+            if (err < 0) goto err;
+          }
+
           utf8_string_view_t username = url_get_username(base);
 
           if (!utf8_string_view_empty(username)) {
@@ -928,6 +933,11 @@ url__parse (url_t *url, const utf8_string_view_t input, const url_t *base) {
             if (err < 0) goto err;
           }
         } else {
+          if (url->type == url_type_opaque && base->components.scheme_end + 3 /* :// */ == base->components.username_end) {
+            err = utf8_string_append_literal(&url->href, (utf8_t *) "//", 2);
+            if (err < 0) goto err;
+          }
+
           url->components.username_end = url->href.len;
           url->components.host_start = url->href.len;
           url->components.host_end = url->href.len;