bare-buffer 2.5.10 → 2.5.11

package/CMakeLists.txt

@@ -1,20 +1,13 @@
 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_buffer C)
 
-if(NOT TARGET utf)
-  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
-endif()
-
-if(NOT TARGET base64)
-  add_subdirectory(vendor/libbase64 EXCLUDE_FROM_ALL)
-endif()
-
-if(NOT TARGET hex)
-  add_subdirectory(vendor/libhex EXCLUDE_FROM_ALL)
-endif()
+fetch_package("github:holepunchto/libutf#65b6ba0")
+fetch_package("github:holepunchto/libbase64#4cd8d8b")
+fetch_package("github:holepunchto/libhex#939999b")
 
 add_bare_module(bare_buffer)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-buffer",
-  "version": "2.5.10",
+  "version": "2.5.11",
   "description": "Native buffers for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -13,13 +13,7 @@
     "binding.js",
     "CMakeLists.txt",
     "lib",
-    "prebuilds",
-    "vendor/libbase64/include",
-    "vendor/libbase64/src",
-    "vendor/libhex/include",
-    "vendor/libhex/src",
-    "vendor/libutf/include",
-    "vendor/libutf/src"
+    "prebuilds"
   ],
   "addon": true,
   "scripts": {
@@ -38,6 +32,7 @@
   "devDependencies": {
     "brittle": "^3.1.1",
     "cmake-bare": "^1.1.6",
+    "cmake-fetch": "^1.0.0",
     "standard": "^17.0.0"
   }
 }

package/vendor/libbase64/CMakeLists.txt

@@ -1,70 +0,0 @@
-cmake_minimum_required(VERSION 3.22)
-
-project(base64 C)
-
-if(NOT TARGET utf)
-  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
-endif()
-
-add_library(base64 OBJECT)
-
-set_target_properties(
-  base64
-  PROPERTIES
-  C_STANDARD 99
-  POSITION_INDEPENDENT_CODE ON
-)
-
-target_sources(
-  base64
-  INTERFACE
-    include/base64.h
-  PRIVATE
-    src/base64.c
-)
-
-target_include_directories(
-  base64
-  PUBLIC
-    include
-    $<TARGET_PROPERTY:utf,INTERFACE_INCLUDE_DIRECTORIES>
-)
-
-add_library(base64_shared SHARED)
-
-set_target_properties(
-  base64_shared
-  PROPERTIES
-  OUTPUT_NAME base64
-  WINDOWS_EXPORT_ALL_SYMBOLS ON
-)
-
-target_link_libraries(
-  base64_shared
-  PUBLIC
-    base64
-)
-
-add_library(base64_static STATIC)
-
-set_target_properties(
-  base64_static
-  PROPERTIES
-  OUTPUT_NAME base64
-  PREFIX lib
-)
-
-target_link_libraries(
-  base64_static
-  PUBLIC
-    base64
-)
-
-install(TARGETS base64_shared base64_static)
-
-install(FILES include/base64.h DESTINATION include)
-
-if(PROJECT_IS_TOP_LEVEL)
-  enable_testing()
-  add_subdirectory(test)
-endif()

package/vendor/libbase64/include/base64.h

@@ -1,128 +0,0 @@
-#ifndef BASE64_H
-#define BASE64_H
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <utf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static const char base64__alphabet[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static const char base64__inverse_alphabet[256] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
-
-static inline int
-base64__encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
-  size_t len = 4 * ((buffer_len + 2) / 3);
-
-  if (string == NULL) {
-    *string_len = len;
-    return 0;
-  }
-
-  if (*string_len < len) return -1;
-
-  bool terminate = *string_len > len;
-
-  *string_len = len;
-
-  size_t k = 0, i = 0, n = buffer_len;
-
-  uint8_t a, b, c;
-
-  for (; i + 2 < n; i += 3) {
-    a = buffer[i];
-    b = buffer[i + 1];
-    c = buffer[i + 2];
-
-    string[k++] = base64__alphabet[a >> 2];
-    string[k++] = base64__alphabet[((a & 0x03) << 4) | (b >> 4)];
-    string[k++] = base64__alphabet[((b & 0x0f) << 2) | (c >> 6)];
-    string[k++] = base64__alphabet[c & 0x3f];
-  }
-
-  if (i < n) {
-    a = buffer[i];
-
-    string[k++] = base64__alphabet[a >> 2];
-
-    if (i + 1 < n) {
-      b = buffer[i + 1];
-
-      string[k++] = base64__alphabet[((a & 0x03) << 4) | (b >> 4)];
-      string[k++] = base64__alphabet[(b & 0x0f) << 2];
-    } else {
-      string[k++] = base64__alphabet[(a & 0x03) << 4];
-      string[k++] = '=';
-    }
-
-    string[k++] = '=';
-  }
-
-  if (terminate) string[k] = '\0';
-
-  return 0;
-}
-
-static inline int
-base64__decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
-  if (string_len % 4 != 0) return -1;
-
-  if (string_len == 0) {
-    *buffer_len = 0;
-    return 0;
-  }
-
-  size_t len = string_len / 4 * 3;
-
-  if (string[string_len - 1] == '=') len--;
-  if (string[string_len - 2] == '=') len--;
-
-  if (buffer == NULL) {
-    *buffer_len = len;
-    return 0;
-  }
-
-  if (*buffer_len < len) return -1;
-
-  *buffer_len = len;
-
-  size_t k = 0;
-
-  for (size_t i = 0, n = string_len; i < n; i += 4) {
-    char chunk[4];
-
-    for (size_t j = 0; j < 4; j++) {
-      chunk[j] = string[i + j] == '=' ? 0 : base64__inverse_alphabet[string[i + j]];
-
-      if (chunk[j] == (char) -1) return -1;
-    }
-
-    uint32_t triple = (chunk[0] << 3 * 6) + (chunk[1] << 2 * 6) + (chunk[2] << 1 * 6) + (chunk[3] << 0 * 6);
-
-    if (k < len) buffer[k++] = (triple >> 2 * 8) & 0xFF;
-    if (k < len) buffer[k++] = (triple >> 1 * 8) & 0xFF;
-    if (k < len) buffer[k++] = (triple >> 0 * 8) & 0xFF;
-  }
-
-  return 0;
-}
-
-inline int
-base64_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
-  return base64__encode(buffer, buffer_len, string, string_len);
-}
-
-inline int
-base64_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
-  return base64__decode(string, string_len, buffer, buffer_len);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // BASE64_H

package/vendor/libbase64/src/base64.c

@@ -1,10 +0,0 @@
-#include <stdint.h>
-#include <utf.h>
-
-#include "../include/base64.h"
-
-extern int
-base64_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len);
-
-extern int
-base64_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len);

package/vendor/libhex/CMakeLists.txt

@@ -1,71 +0,0 @@
-cmake_minimum_required(VERSION 3.22)
-
-project(hex C)
-
-if(NOT TARGET utf)
-  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
-endif()
-
-add_library(hex OBJECT)
-
-set_target_properties(
-  hex
-  PROPERTIES
-  C_STANDARD 99
-  POSITION_INDEPENDENT_CODE ON
-)
-
-target_sources(
-  hex
-  INTERFACE
-    include/hex.h
-  PRIVATE
-    src/hex.c
-)
-
-target_include_directories(
-  hex
-  PUBLIC
-    include
-    $<TARGET_PROPERTY:utf,INTERFACE_INCLUDE_DIRECTORIES>
-)
-
-add_library(hex_shared SHARED)
-
-set_target_properties(
-  hex_shared
-  PROPERTIES
-  OUTPUT_NAME hex
-  WINDOWS_EXPORT_ALL_SYMBOLS ON
-)
-
-target_link_libraries(
-  hex_shared
-  PUBLIC
-    hex
-)
-
-add_library(hex_static STATIC)
-
-set_target_properties(
-  hex_static
-  PROPERTIES
-  OUTPUT_NAME hex
-  PREFIX lib
-)
-
-target_link_libraries(
-  hex_static
-  PUBLIC
-    hex
-)
-
-install(TARGETS hex_shared hex_static)
-
-install(FILES include/hex.h DESTINATION include)
-
-if(PROJECT_IS_TOP_LEVEL)
-  enable_testing()
-
-  add_subdirectory(test)
-endif()

package/vendor/libhex/include/hex.h

@@ -1,88 +0,0 @@
-#ifndef HEX_H
-#define HEX_H
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <utf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static const char hex__alphabet[16] = "0123456789abcdef";
-
-static const char hex__inverse_alphabet[256] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
-
-static inline int
-hex__encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
-  size_t len = buffer_len * 2;
-
-  if (string == NULL) {
-    *string_len = len;
-    return 0;
-  }
-
-  if (*string_len < len) return -1;
-
-  bool terminate = *string_len > len;
-
-  *string_len = len;
-
-  size_t k = 0;
-
-  for (size_t i = 0, n = buffer_len; i < n; i++) {
-    string[k++] = hex__alphabet[buffer[i] >> 4];
-    string[k++] = hex__alphabet[buffer[i] & 0x0f];
-  }
-
-  if (terminate) string[k] = '\0';
-
-  return 0;
-}
-
-static inline int
-hex__decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
-  size_t len = string_len >> 1;
-
-  if (buffer == NULL) {
-    *buffer_len = len;
-    return 0;
-  }
-
-  if (*buffer_len < len) return -1;
-
-  *buffer_len = len;
-
-  size_t k = 0;
-
-  for (size_t i = 0, n = string_len; i < n; i += 2) {
-    char chunk[2];
-
-    for (size_t j = 0; j < 2; j++) {
-      chunk[j] = i + j < n ? hex__inverse_alphabet[string[i + j]] : 0;
-
-      if (chunk[j] == (char) -1) return -1;
-    }
-
-    buffer[k++] = (chunk[0] << 4) | chunk[1];
-  }
-
-  return 0;
-}
-
-inline int
-hex_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
-  return hex__encode(buffer, buffer_len, string, string_len);
-}
-
-inline int
-hex_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
-  return hex__decode(string, string_len, buffer, buffer_len);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // HEX_H

package/vendor/libhex/src/hex.c

@@ -1,10 +0,0 @@
-#include <stdint.h>
-#include <utf.h>
-
-#include "../include/hex.h"
-
-extern int
-hex_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len);
-
-extern int
-hex_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len);

package/vendor/libutf/CMakeLists.txt

@@ -1,93 +0,0 @@
-cmake_minimum_required(VERSION 3.25)
-
-project(utf C)
-
-add_library(utf OBJECT)
-
-set_target_properties(
-  utf
-  PROPERTIES
-  C_STANDARD 99
-  POSITION_INDEPENDENT_CODE ON
-)
-
-target_sources(
-  utf
-  INTERFACE
-    include/utf.h
-    include/utf/string.h
-  PRIVATE
-    src/endianness.c
-    src/endianness.h
-    src/ascii/validate.c
-    src/utf8/convert-to-latin1.c
-    src/utf8/convert-to-utf16.c
-    src/utf8/convert-to-utf32.c
-    src/utf8/length-from-latin1.c
-    src/utf8/length-from-utf16.c
-    src/utf8/length-from-utf32.c
-    src/utf8/string.c
-    src/utf8/validate.c
-    src/utf16/convert-to-latin1.c
-    src/utf16/convert-to-utf8.c
-    src/utf16/convert-to-utf32.c
-    src/utf16/length-from-latin1.c
-    src/utf16/length-from-utf8.c
-    src/utf16/length-from-utf32.c
-    src/utf16/validate.c
-    src/utf32/convert-to-latin1.c
-    src/utf32/convert-to-utf8.c
-    src/utf32/convert-to-utf16.c
-    src/utf32/length-from-latin1.c
-    src/utf32/length-from-utf8.c
-    src/utf32/length-from-utf16.c
-    src/utf32/validate.c
-)
-
-target_include_directories(
-  utf
-  PUBLIC
-    include
-)
-
-add_library(utf_shared SHARED)
-
-set_target_properties(
-  utf_shared
-  PROPERTIES
-  OUTPUT_NAME utf
-  WINDOWS_EXPORT_ALL_SYMBOLS ON
-)
-
-target_link_libraries(
-  utf_shared
-  PUBLIC
-    utf
-)
-
-add_library(utf_static STATIC)
-
-set_target_properties(
-  utf_static
-  PROPERTIES
-  OUTPUT_NAME utf
-  PREFIX lib
-)
-
-target_link_libraries(
-  utf_static
-  PUBLIC
-    utf
-)
-
-install(TARGETS utf_shared utf_static)
-
-install(FILES include/utf.h DESTINATION include)
-
-install(DIRECTORY include/utf DESTINATION include)
-
-if(PROJECT_IS_TOP_LEVEL)
-  enable_testing()
-
-  add_subdirectory(test)
-endif()