koffi 2.12.1 → 2.12.2

package/CHANGELOG.md

@@ -7,6 +7,17 @@
 
 ### Koffi 2.12
 
+#### Koffi 2.12.2
+
+*Released on 2025-07-16*
+
+- Validate identifiers against Unicode XID table
+- Skip struct and union members with placeholder name '\_'
+- Add Koffi prebuild for Linux (musl) ARM64
+
+> [!NOTE]
+> The Koffi 3 codebase has been put aside, and some of it will be progressively integrated into Koffi 2 over the following months.
+
 #### Koffi 2.12.1
 
 *Released on 2025-07-05*

package/LICENSE.txt

@@ -1,9 +1,9 @@
 MIT License
 
-Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the “Software”), to deal in 
+this software and associated documentation files (the “Software”), to deal in
 the Software without restriction, including without limitation the rights to use,
 copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 Software, and to permit persons to whom the Software is furnished to do so,

package/README.md

@@ -9,14 +9,14 @@ Koffi is a fast and easy-to-use C FFI module for Node.js, featuring:
 
 The following combinations of OS and architectures __are officially supported and tested__ at the moment:
 
-ISA / OS           | Windows     | Linux    | macOS       | FreeBSD     | OpenBSD
------------------- | ----------- | -------- | ----------- | ----------- | --------
-x86 (IA32) [^1]    | ✅ Yes      | ✅ Yes   | ⬜️ *N/A*    | ✅ Yes      | ✅ Yes
-x86_64 (AMD64)     | ✅ Yes      | ✅ Yes   | ✅ Yes      | ✅ Yes      | ✅ Yes
-ARM32 LE [^2]      | ⬜️ *N/A*    | ✅ Yes   | ⬜️ *N/A*    | 🟨 Probably | 🟨 Probably
-ARM64 (AArch64) LE | ✅ Yes      | ✅ Yes   | ✅ Yes      | ✅ Yes      | 🟨 Probably
-RISC-V 64 [^3]     | ⬜️ *N/A*    | ✅ Yes   | ⬜️ *N/A*    | 🟨 Probably | 🟨 Probably
-LoongArch64        | ⬜️ *N/A*    | ✅ Yes   | ⬜️ *N/A*    | 🟨 Probably | 🟨 Probably
+ISA / OS           | Windows     | Linux (glibc) | Linux (musl) | macOS       | FreeBSD     | OpenBSD
+------------------ | ----------- | ------------- | ------------ | ----------- | ----------- | --------
+x86 (IA32) [^1]    | ✅ Yes      | ✅ Yes        | 🟨 Probably  | ⬜️ *N/A*    | ✅ Yes      | ✅ Yes
+x86_64 (AMD64)     | ✅ Yes      | ✅ Yes        | ✅ Yes       | ✅ Yes      | ✅ Yes      | ✅ Yes
+ARM32 LE [^2]      | ⬜️ *N/A*    | ✅ Yes        | 🟨 Probably  | ⬜️ *N/A*    | 🟨 Probably | 🟨 Probably
+ARM64 (AArch64) LE | ✅ Yes      | ✅ Yes        | ✅ Yes       | ✅ Yes      | ✅ Yes      | 🟨 Probably
+RISC-V 64 [^3]     | ⬜️ *N/A*    | ✅ Yes        | 🟨 Probably  | ⬜️ *N/A*    | 🟨 Probably | 🟨 Probably
+LoongArch64        | ⬜️ *N/A*    | ✅ Yes        | 🟨 Probably  | ⬜️ *N/A*    | 🟨 Probably | 🟨 Probably
 
 [^1]: The following call conventions are supported: cdecl, stdcall, MS fastcall, thiscall.
 [^2]: The prebuilt binary uses the hard float ABI and expects a VFP coprocessor. Build from source to use Koffi with a different ABI (softfp, soft).

package/doc/assets.ini

@@ -1,4 +1,4 @@
-EsbuildPath = ../../vendor/esbuild/bin
+EsbuildPath = ../../vendor/esbuild/native/node_modules/@esbuild
 
 [favicon.png]
 Type = Copy
@@ -11,7 +11,7 @@ Ignore = favicon.png *.js *.css
 
 [static/site.min.js]
 Type = Bundle
-Source = flat/static.js
+Source = ../../src/web/flat/static.js
 
 [static/highlight.min.js]
 Type = Bundle
@@ -20,4 +20,4 @@ Source = static/highlight.js
 [static/site.min.css]
 Type = Bundle
 Source = static/koffi.css
-Options = --loader:.woff=file --loader:.woff2=file --loader:.png=file --loader:.webp=file
+Options = --loader:.woff2=file --loader:.png=file --loader:.webp=file

package/doc/develop.sh

@@ -3,12 +3,13 @@
 cd "$(dirname $0)"
 
 ../../bootstrap.sh
-../../felix -pFast serf hodler
+../../felix -pFast nestor hodler
 
 trap 'kill $(jobs -p) 2>/dev/null' EXIT
 trap 'kill $(jobs -p) 2>/dev/null' SIGINT
 
-../../bin/Fast/serf dist/ &
-../../bin/Fast/hodler . -O dist --loop &
+mkdir -p dist
+../../bin/Fast/nestor dist/ &
+../../bin/Fast/hodler . -O dist --loop --sourcemap &
 
 wait $(jobs -p)

package/doc/pages/platforms.md

@@ -19,7 +19,7 @@ ISA / OS           | Windows | Linux (glibc) | Linux (musl)
 x86 (IA32) [^1]    | ✅      | ✅            | 🟨
 x86_64 (AMD64)     | ✅      | ✅            | ✅
 ARM32 LE [^2]      | ⬜️      | ✅            | 🟨
-ARM64 (AArch64) LE | ✅      | ✅            | 🟨
+ARM64 (AArch64) LE | ✅      | ✅            | ✅
 RISC-V 64 [^3]     | ⬜️      | ✅            | 🟨
 LoongArch64        | ⬜️      | ✅            | 🟨
 

package/doc/static/highlight.js

@@ -1,4 +1,4 @@
-// Copyright (C) 2024  Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

package/doc/static/koffi.css

@@ -1,4 +1,4 @@
-/* Copyright (C) 2024  Niels Martignène <niels.martignene@protonmail.com>
+/* Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,10 +13,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
-@import url('../flat/flat.css');
+@import url('../../../src/web/flat/flat.css');
 @import url('../../../vendor/highlight.js/styles/base16/tomorrow.css');
 
 html {
     --top_color: #ec7400;
+    --button_color: #ec7400;
     --anchor_color: #ec7400;
 }

package/doc/static/print.css

@@ -1,4 +1,4 @@
-/* Copyright (C) 2024  Niels Martignène <niels.martignene@protonmail.com>
+/* Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/doc/templates/code.html

@@ -12,8 +12,8 @@
         <meta name="theme-color" content="#6aa051">
         <link rel="stylesheet" href="{{ ASSET static/site.min.css }}">
 
-        <script type="text/javascript" src="{{ ASSET static/site.min.js }}" async></script>
-        <script type="text/javascript" src="{{ ASSET static/highlight.min.js }}" async></script>
+        <script type="text/javascript" src="{{ ASSET static/site.min.js }}"></script>
+        <script type="text/javascript" src="{{ ASSET static/highlight.min.js }}"></script>
     </head>
 
     <body>
@@ -21,7 +21,7 @@
 
         <nav id="top">
             <menu>
-                <a id="logo" href="/"><img src="{{ ASSET static/logo.webp }}" alt="Logo Koffi" /></a>
+                <a id="logo" href="/"><img src="{{ ASSET static/logo.webp }}" width="370" height="198" alt="" /></a>
 
 {{ LINKS }}
 
@@ -39,9 +39,9 @@
         </main>
 
         <footer>
-            <div>Koffi © 2024</div>
+            <div>Koffi © 2025</div>
             <div style="font-size: 0.8em;">
-                Niels Martignène (<a href="https://github.com/Koromix/" target="_blank">Koromix</a>)<br>
+                Niels Martignène (<a href="https://koromix.dev/" target="_blank">Koromix</a>)<br>
                 <a href="mailto:niels.martignene@protonmail.com" style="font-weight: bold; color: inherit;">niels.martignene@protonmail.com</a>
             </div>
         </footer>

package/doc/templates/page.html

@@ -12,7 +12,7 @@
         <meta name="theme-color" content="#6aa051">
         <link rel="stylesheet" href="{{ ASSET static/site.min.css }}">
 
-        <script type="text/javascript" src="{{ ASSET static/site.min.js }}" async></script>
+        <script type="text/javascript" src="{{ ASSET static/site.min.js }}"></script>
     </head>
 
     <body>
@@ -20,7 +20,7 @@
 
         <nav id="top">
             <menu>
-                <a id="logo" href="/"><img src="{{ ASSET static/logo.webp }}" alt="Logo Koffi" /></a>
+                <a id="logo" href="/"><img src="{{ ASSET static/logo.webp }}" width="370" height="198" alt="" /></a>
 
 {{ LINKS }}
 
@@ -38,9 +38,9 @@
         </main>
 
         <footer>
-            <div>Koffi © 2024</div>
+            <div>Koffi © 2025</div>
             <div style="font-size: 0.8em;">
-                Niels Martignène (<a href="https://github.com/Koromix/" target="_blank">Koromix</a>)<br>
+                Niels Martignène (<a href="https://koromix.dev/" target="_blank">Koromix</a>)<br>
                 <a href="mailto:niels.martignene@protonmail.com" style="font-weight: bold; color: inherit;">niels.martignene@protonmail.com</a>
             </div>
         </footer>

package/index.d.ts

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,

package/index.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// ../../bin/Koffi/package/src/cnoke/src/tools.js
+// package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
+  "package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -178,6 +178,28 @@ var require_tools = __commonJS({
         return true;
       return false;
     }
+    function sync_files(src_dir, dest_dir) {
+      let keep = /* @__PURE__ */ new Set();
+      {
+        let entries = fs2.readdirSync(src_dir, { withFileTypes: true });
+        for (let entry of entries) {
+          if (!entry.isFile())
+            continue;
+          keep.add(entry.name);
+          fs2.copyFileSync(src_dir + `/${entry.name}`, dest_dir + `/${entry.name}`);
+        }
+      }
+      {
+        let entries = fs2.readdirSync(dest_dir, { withFileTypes: true });
+        for (let entry of entries) {
+          if (!entry.isFile())
+            continue;
+          if (keep.has(entry.name))
+            continue;
+          fs2.unlinkSync(dest_dir + `/${entry.name}`);
+        }
+      }
+    }
     function determine_arch2() {
       let arch = process.arch;
       if (arch == "riscv32" || arch == "riscv64") {
@@ -366,6 +388,7 @@ var require_tools = __commonJS({
       extract_targz,
       path_is_absolute,
       path_has_dotdot,
+      sync_files,
       determine_arch: determine_arch2,
       unlink_recursive,
       get_napi_version: get_napi_version2,
@@ -374,13 +397,13 @@ var require_tools = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/package.json
+// package/src/koffi/package.json
 var require_package = __commonJS({
-  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
+  "package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.12.1",
-      stable: "2.12.1",
+      version: "2.12.2",
+      stable: "2.12.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -410,9 +433,6 @@ var require_package = __commonJS({
         package: "node tools/koffi.js build"
       },
       license: "MIT",
-      devDependencies: {
-        esbuild: "^0.19.2"
-      },
       cnoke: {
         api: "../../vendor/node-api-headers",
         output: "../../bin/Koffi/{{ platform }}_{{ arch }}",
@@ -424,9 +444,9 @@ var require_package = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/src/init.js
+// package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
+  "package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -509,7 +529,7 @@ var require_init = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/index.js
+// package/src/koffi/index.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var native2 = null;
@@ -599,31 +619,11 @@ try {
 } catch {
   try {
     switch (triplet2) {
-      case "linux_armhf":
-        {
-          native2 = require("./build/koffi/musl_armhf/koffi.node");
-        }
-        break;
       case "linux_arm64":
         {
           native2 = require("./build/koffi/musl_arm64/koffi.node");
         }
         break;
-      case "linux_ia32":
-        {
-          native2 = require("./build/koffi/musl_ia32/koffi.node");
-        }
-        break;
-      case "linux_loong64":
-        {
-          native2 = require("./build/koffi/musl_loong64/koffi.node");
-        }
-        break;
-      case "linux_riscv64d":
-        {
-          native2 = require("./build/koffi/musl_riscv64d/koffi.node");
-        }
-        break;
       case "linux_x64":
         {
           native2 = require("./build/koffi/musl_x64/koffi.node");

package/indirect.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// ../../bin/Koffi/package/src/cnoke/src/tools.js
+// package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
+  "package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -178,6 +178,28 @@ var require_tools = __commonJS({
         return true;
       return false;
     }
+    function sync_files(src_dir, dest_dir) {
+      let keep = /* @__PURE__ */ new Set();
+      {
+        let entries = fs2.readdirSync(src_dir, { withFileTypes: true });
+        for (let entry of entries) {
+          if (!entry.isFile())
+            continue;
+          keep.add(entry.name);
+          fs2.copyFileSync(src_dir + `/${entry.name}`, dest_dir + `/${entry.name}`);
+        }
+      }
+      {
+        let entries = fs2.readdirSync(dest_dir, { withFileTypes: true });
+        for (let entry of entries) {
+          if (!entry.isFile())
+            continue;
+          if (keep.has(entry.name))
+            continue;
+          fs2.unlinkSync(dest_dir + `/${entry.name}`);
+        }
+      }
+    }
     function determine_arch2() {
       let arch = process.arch;
       if (arch == "riscv32" || arch == "riscv64") {
@@ -366,6 +388,7 @@ var require_tools = __commonJS({
       extract_targz,
       path_is_absolute,
       path_has_dotdot,
+      sync_files,
       determine_arch: determine_arch2,
       unlink_recursive,
       get_napi_version: get_napi_version2,
@@ -374,13 +397,13 @@ var require_tools = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/package.json
+// package/src/koffi/package.json
 var require_package = __commonJS({
-  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
+  "package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.12.1",
-      stable: "2.12.1",
+      version: "2.12.2",
+      stable: "2.12.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -410,9 +433,6 @@ var require_package = __commonJS({
         package: "node tools/koffi.js build"
       },
       license: "MIT",
-      devDependencies: {
-        esbuild: "^0.19.2"
-      },
       cnoke: {
         api: "../../vendor/node-api-headers",
         output: "../../bin/Koffi/{{ platform }}_{{ arch }}",
@@ -424,9 +444,9 @@ var require_package = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/src/init.js
+// package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
+  "package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -509,7 +529,7 @@ var require_init = __commonJS({
   }
 });
 
-// ../../bin/Koffi/package/src/koffi/indirect.js
+// package/src/koffi/indirect.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var mod2 = init2(triplet2, null);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koffi",
-    "version": "2.12.1",
-    "stable": "2.12.1",
+    "version": "2.12.2",
+    "stable": "2.12.2",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/cnoke/LICENSE.txt

@@ -1,9 +1,9 @@
 MIT License
 
-Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the “Software”), to deal in 
+this software and associated documentation files (the “Software”), to deal in
 the Software without restriction, including without limitation the rights to use,
 copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 Software, and to permit persons to whom the Software is furnished to do so,

package/src/cnoke/README.md

@@ -65,11 +65,13 @@ You can find the same help text by running `cnoke --help`:
 Usage: cnoke [command] [options...] [targets...]
 
 Commands:
+
     configure                            Configure CMake build
     build                                Build project (configure if needed)
     clean                                Clean build files
 
 Options:
+
     -d, --directory <DIR>                Change project directory
                                          (default: current working directory)
 

package/src/cnoke/assets/FindCNoke.cmake

@@ -1,7 +1,7 @@
-# Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+# Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the “Software”), to deal in 
+# this software and associated documentation files (the “Software”), to deal in
 # the Software without restriction, including without limitation the rights to use,
 # copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 # Software, and to permit persons to whom the Software is furnished to do so,
@@ -110,3 +110,13 @@ else()
     function(enable_unity_build TARGET)
     endfunction()
 endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    message(STATUS ${CMAKE_SYSTEM_PROCESSOR})
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64|x86_64)")
+        foreach(lang C CXX)
+            set(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} -mpopcnt -msse4.1 -msse4.2 -mssse3 -mcx16")
+            set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO "${CMAKE_${lang}_FLAGS_RELWITHDEBINFO} -mpopcnt -msse4.1 -msse4.2 -mssse3 -mcx16")
+        endforeach()
+    endif()
+endif()

package/src/cnoke/assets/win_delay_hook.c

@@ -1,7 +1,7 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -20,10 +20,10 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 
 #include <stdlib.h>
-#ifndef NOMINMAX
+#if !defined(NOMINMAX)
     #define NOMINMAX
 #endif
-#ifndef WIN32_LEAN_AND_MEAN
+#if !defined(WIN32_LEAN_AND_MEAN)
     #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>

package/src/cnoke/cnoke.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+// Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
+// this software and associated documentation files (the “Software”), to deal in
 // the Software without restriction, including without limitation the rights to use,
 // copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
 // Software, and to permit persons to whom the Software is furnished to do so,
@@ -153,11 +153,13 @@ function print_usage() {
     let help = `Usage: cnoke [command] [options...]
 
 Commands:
+
     configure                            Configure CMake build
     build                                Build project (configure if needed)
     clean                                Clean build files
 
 Options:
+
     -d, --directory <DIR>                Change source directory
                                          (default: current working directory)
     -p, --package <DIR>                  Change package directory

package/src/cnoke/package.json

@@ -11,7 +11,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Koromix/rygel.git"
+    "url": "https://codeberg.org/Koromix/rygel.git"
   },
   "author": {
     "name": "Niels Martignène",