koffi 2.16.0-beta.2 → 2.16.0

package/CHANGELOG.md

@@ -5,8 +5,67 @@
 
 ## Koffi 2
 
+### Koffi 2.16
+
+#### Koffi 2.16.0
+
+*Released on 2026-04-14*
+
+- Support buffers and typed arrays in `koffi.address()`
+- Put x86 SEH record at the top of stack frame
+- Optimize Koffi binaries produced by GCC (with `-fno-semantic-interposition`)
+- Fix nonsensical addresses in Koffi call dumps (when using DUMP_CALLS=1 environement variable)
+
+- Reduce Koffi package size even more:
+  * Replace table of callback trampoline pointers with simple offset computation
+  * Strip out unused data and functions from Koffi binaries
+  * Generate repeated trampoline source and macros at build time
+  * Remove files not needed to build from source: tests, scripts, etc.
+  * Maximize NPM tarball compression with Zopfli
+- This reduces decompressed Koffi package size from 41.4 MB to 28.7 MB
+
 ### Koffi 2.15
 
+#### Koffi 2.15.6
+
+*Released on 2026-04-07*
+
+- Fix possible exit crash after using `koffi.reset()` (regression introduced in Koffi 2.15.2)
+
+#### Koffi 2.15.5
+
+*Released on 2026-04-05*
+
+- Reduce repeated trampoline code size:
+  * Use single set of trampolines to forward general and floating-point values
+  * Minimize trampoline size by jumping early to common handling code
+- This reduces decompressed Koffi package size from 85.9 MB to 41.4 MB
+
+#### Koffi 2.15.4
+
+*Released on 2026-04-03*
+
+- Fix ABI issue with variadic parameters that are passed on the stack on Apple ARM64 platforms
+- Remove erroneous assertion from debug builds
+
+#### Koffi 2.15.3
+
+*Released on 2026-04-03*
+
+- Fix *IsOnCentralStack()* assertion/crash when using callbacks in recent Node versions
+- Support SetUnhandledExceptionFilter on Windows x64 and x86 ([@longhun12346](https://github.com/longhun12346))
+- Fix incorrect stack alignment when relaying callbacks on 32-bit x86 platforms
+
+#### Koffi 2.15.2
+
+*Released on 2026-03-11*
+
+- Fix possible deadlock or crash after a callback has been used when exiting from Node 24.14+
+- Fix build problems on Android/Termux
+- Fix failing indirect loading caused by missing path test
+- Don't force users to set all members when using koffi.config() in TypeScript
+- Use Clang to build Linux ARM64 prebuild
+
 #### Koffi 2.15.1
 
 *Released on 2025-01-24*

package/index.d.ts

@@ -145,15 +145,13 @@ export function introspect(type: TypeSpec): TypeInfo;
 export function alias(name: string, type: TypeSpec): IKoffiCType;
 
 type KoffiConfig = {
-    sync_stack_size?: number;
-    sync_heap_size?: number;
-    async_stack_size?: number;
-    async_heap_size?: number;
-    resident_async_pools?: number;
-    max_async_calls?: number;
-    max_type_size?: number;
-    fast_pointers?: boolean;
-    fast_callbacks?: boolean;
+    sync_stack_size?: number
+    sync_heap_size?: number
+    async_stack_size?: number
+    async_heap_size?: number
+    resident_async_pools?: number
+    max_async_calls?: number
+    max_type_size?: number
 };
 type KoffiStats = {
     disposed: number
@@ -171,8 +169,8 @@ export function errno(value: number): number;
 
 export function reset(): void;
 
-export const internal: boolean;
-export const extension: string;
+export const internal: Boolean;
+export const extension: String;
 
 export const os: {
     errno: Record<string, number>

package/index.js

@@ -345,11 +345,7 @@ var require_tools = __commonJS({
     }
     function unlink_recursive(path3) {
       try {
-        if (fs2.rmSync != null) {
-          fs2.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
-        } else {
-          fs2.rmdirSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
-        }
+        fs2.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
       } catch (err) {
         if (err.code !== "ENOENT")
           throw err;
@@ -402,7 +398,7 @@ var require_package = __commonJS({
   "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.16.0-beta.2",
+      version: "2.16.0",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -426,15 +422,15 @@ var require_package = __commonJS({
       main: "./index.js",
       types: "./index.d.ts",
       scripts: {
-        test: "node tools/koffi.js test",
+        test: "node tools/brew.js test",
         prepack: `echo 'Use "npm run package" instead' && false`,
         prepublishOnly: `echo 'Use "npm run package" instead' && false`,
-        package: "node tools/koffi.js build"
+        package: "node tools/brew.js build"
       },
       license: "MIT",
       cnoke: {
         api: "../../vendor/node-api-headers",
-        output: "../../bin/Koffi/{{ platform }}_{{ arch }}",
+        output: "../../bin/Koffi/{{ toolchain }}",
         node: 16,
         napi: 8,
         require: "./index.js"
@@ -477,6 +473,7 @@ var require_init = __commonJS({
           triplets.push(musl);
         }
         let filenames = roots.flatMap((root) => triplets.flatMap((triplet3) => [
+          `${root}/koffi/build/koffi/${triplet3}/koffi.node`,
           `${root}/build/koffi/${triplet3}/koffi.node`,
           `${root}/koffi/${triplet3}/koffi.node`,
           `${root}/node_modules/koffi/build/koffi/${triplet3}/koffi.node`,

package/indirect.js

@@ -345,11 +345,7 @@ var require_tools = __commonJS({
     }
     function unlink_recursive(path3) {
       try {
-        if (fs2.rmSync != null) {
-          fs2.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
-        } else {
-          fs2.rmdirSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
-        }
+        fs2.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
       } catch (err) {
         if (err.code !== "ENOENT")
           throw err;
@@ -402,7 +398,7 @@ var require_package = __commonJS({
   "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.16.0-beta.2",
+      version: "2.16.0",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -426,15 +422,15 @@ var require_package = __commonJS({
       main: "./index.js",
       types: "./index.d.ts",
       scripts: {
-        test: "node tools/koffi.js test",
+        test: "node tools/brew.js test",
         prepack: `echo 'Use "npm run package" instead' && false`,
         prepublishOnly: `echo 'Use "npm run package" instead' && false`,
-        package: "node tools/koffi.js build"
+        package: "node tools/brew.js build"
       },
       license: "MIT",
       cnoke: {
         api: "../../vendor/node-api-headers",
-        output: "../../bin/Koffi/{{ platform }}_{{ arch }}",
+        output: "../../bin/Koffi/{{ toolchain }}",
         node: 16,
         napi: 8,
         require: "./index.js"
@@ -477,6 +473,7 @@ var require_init = __commonJS({
           triplets.push(musl);
         }
         let filenames = roots.flatMap((root) => triplets.flatMap((triplet3) => [
+          `${root}/koffi/build/koffi/${triplet3}/koffi.node`,
           `${root}/build/koffi/${triplet3}/koffi.node`,
           `${root}/koffi/${triplet3}/koffi.node`,
           `${root}/node_modules/koffi/build/koffi/${triplet3}/koffi.node`,

package/lib/native/base/base.cc

@@ -3125,12 +3125,7 @@ RenameResult RenameFile(const char *src_filename, const char *dest_filename, uns
         if (rename(src_filename, dest_filename) < 0)
             goto error;
     } else {
-#if defined(RENAME_NOREPLACE)
-        if (!renameat2(AT_FDCWD, src_filename, AT_FDCWD, dest_filename, RENAME_NOREPLACE))
-            goto sync;
-        if (!IsErrnoNotSupported(errno) && errno != EINVAL)
-            goto error;
-#elif defined(SYS_renameat2)
+#if defined(SYS_renameat2)
         {
             int dirfd = AT_FDCWD;
             int rflags = 1; // RENAME_NOREPLACE

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.16.0-beta.2",
+    "version": "2.16.0",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",
@@ -24,12 +24,12 @@
     "main": "./index.js",
     "types": "./index.d.ts",
     "scripts": {
-        "install": "node src/cnoke/cnoke.js -p . -d src/koffi --prebuild"
+        "install": "node src/cnoke/cnoke.js -P . -D src/koffi --prebuild"
     },
     "license": "MIT",
     "cnoke": {
         "api": "../../vendor/node-api-headers",
-        "output": "build/koffi/{{ platform }}_{{ arch }}",
+        "output": "build/koffi/{{ toolchain }}",
         "node": 16,
         "napi": 8,
         "require": "./index.js"

package/src/cnoke/assets/FindCNoke.cmake

@@ -8,22 +8,6 @@ else()
     set(USE_UNITY_BUILDS OFF CACHE BOOL "Use single-TU builds (aka. Unity builds)")
 endif()
 
-if(NODE_JS_LINK_DEF)
-    set(NODE_JS_LINK_LIB "${CMAKE_CURRENT_BINARY_DIR}/node.lib")
-    if (MSVC)
-        add_custom_command(OUTPUT node.lib
-                           COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
-                                   /def:${NODE_JS_LINK_DEF} /out:${NODE_JS_LINK_LIB}
-                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                           MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
-    else()
-        add_custom_command(OUTPUT node.lib
-                           COMMAND ${CMAKE_DLLTOOL} -d ${NODE_JS_LINK_DEF} -l ${NODE_JS_LINK_LIB}
-                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                           MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
-    endif()
-endif()
-
 function(add_node_addon)
     cmake_parse_arguments(ARG "" "NAME" "SOURCES" ${ARGN})
     add_library(${ARG_NAME} SHARED ${ARG_SOURCES} ${NODE_JS_SOURCES})
@@ -45,6 +29,33 @@ function(target_link_node TARGET)
     endif()
 endfunction()
 
+if(WIN32)
+    function(create_import_lib OUTPUT SRC)
+        if (MSVC)
+            add_custom_command(OUTPUT ${OUTPUT}
+                               COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
+                                       /def:${SRC} /out:"${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}"
+                               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                               MAIN_DEPENDENCY ${SRC})
+        elseif(DEFINED NODE_JS_DLLTOOL_MACHINE)
+            add_custom_command(OUTPUT ${OUTPUT}
+                               COMMAND ${CMAKE_DLLTOOL} -d ${SRC} -l "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}" -m ${NODE_JS_DLLTOOL_MACHINE}
+                               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                               MAIN_DEPENDENCY ${SRC})
+        else()
+            add_custom_command(OUTPUT ${OUTPUT}
+                               COMMAND ${CMAKE_DLLTOOL} -d ${SRC} -l "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}"
+                               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                               MAIN_DEPENDENCY ${SRC})
+        endif()
+    endfunction()
+endif()
+
+if(NODE_JS_LINK_DEF)
+    create_import_lib(node.lib ${NODE_JS_LINK_DEF})
+    set(NODE_JS_LINK_LIB "${CMAKE_CURRENT_BINARY_DIR}/node.lib")
+endif()
+
 if(USE_UNITY_BUILDS)
     function(enable_unity_build TARGET)
         cmake_parse_arguments(ARG "" "" "EXCLUDE" ${ARGN})

package/src/cnoke/assets/toolchains.json

@@ -0,0 +1,126 @@
+{
+    "linux_ia32": {
+        "system": "Linux",
+        "processor": "i386",
+        "triplet": "i686-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_i386"
+    },
+    "linux_x64": {
+        "system": "Linux",
+        "processor": "x86_64",
+        "triplet": "x86_64-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_x64"
+    },
+    "linux_armhf": {
+        "system": "Linux",
+        "processor": "arm",
+        "triplet": "arm-linux-gnueabihf",
+        "sysroot": "../../tools/cross/sysroots/debian_arm32"
+    },
+    "linux_arm64": {
+        "system": "Linux",
+        "processor": "aarch64",
+        "triplet": "aarch64-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_arm64"
+    },
+    "linux_riscv64d": {
+        "system": "Linux",
+        "processor": "riscv64",
+        "triplet": "riscv64-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_riscv64"
+    },
+    "linux_loong64": {
+        "system": "Linux",
+        "processor": "loongarch64",
+        "triplet": "loongarch64-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_loong64"
+    },
+
+    "win32_ia32": {
+        "system": "Windows",
+        "processor": "X86",
+        "lib": "win-x86",
+        "flags": ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe;/SAFESEH:NO", "-A", "Win32"],
+
+        "triplet": "i386-pc-windows-msvc",
+        "linux": {
+            "sysroot": "../../tools/cross/sysroots/windows_i386",
+            "flags": ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe,/SAFESEH:NO", "-DNODE_JS_DLLTOOL_MACHINE=i386"],
+            "variables": {
+                "CMAKE_DLLTOOL": "llvm-dlltool",
+                "CMAKE_RC_COMPILER": "llvm-rc",
+                "CMAKE_C_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_CXX_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_EXE_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
+                "CMAKE_STATIC_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
+                "CMAKE_SHARED_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp"
+            }
+        }
+    },
+    "win32_x64": {
+        "system": "Windows",
+        "processor": "AMD64",
+        "lib": "win-x64",
+        "flags": ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe"],
+
+        "triplet": "x86_64-pc-windows-msvc",
+        "linux": {
+            "sysroot": "../../tools/cross/sysroots/windows_x64",
+            "flags": ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe", "-DNODE_JS_DLLTOOL_MACHINE=i386:x86-64"],
+            "variables": {
+                "CMAKE_DLLTOOL": "llvm-dlltool",
+                "CMAKE_RC_COMPILER": "llvm-rc",
+                "CMAKE_C_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_CXX_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_EXE_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
+                "CMAKE_STATIC_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
+                "CMAKE_SHARED_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp"
+            }
+        }
+    },
+    "win32_arm64": {
+        "system": "Windows",
+        "processor": "ARM64",
+        "lib": "win-arm64",
+        "flags": ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe;/SAFESEH:NO", "-A", "ARM64"],
+
+        "triplet": "aarch64-pc-windows-msvc",
+        "linux": {
+            "sysroot": "../../tools/cross/sysroots/windows_arm64",
+            "flags": ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe,/SAFESEH:NO", "-DNODE_JS_DLLTOOL_MACHINE=arm64"],
+            "variables": {
+                "CMAKE_DLLTOOL": "llvm-dlltool",
+                "CMAKE_RC_COMPILER": "llvm-rc",
+                "CMAKE_C_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_CXX_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_EXE_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp",
+                "CMAKE_STATIC_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp",
+                "CMAKE_SHARED_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp"
+            }
+        }
+    },
+
+    "darwin_x64": {
+        "system": "Darwin",
+        "processor": "x86_64",
+        "flags": ["-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup", "-DCMAKE_OSX_ARCHITECTURES=x86_64"]
+    },
+    "darwin_arm64": {
+        "system": "Darwin",
+        "processor": "arm64",
+        "flags": ["-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup", "-DCMAKE_OSX_ARCHITECTURES=arm64"]
+    },
+
+    "freebsd_x64": {
+        "system": "FreeBSD",
+        "processor": "amd64",
+        "triplet": "x86_64-unknown-freebsd",
+        "sysroot": "../../tools/cross/sysroots/freebsd_x64"
+    },
+    "freebsd_arm64": {
+        "system": "FreeBSD",
+        "processor": "arm64",
+        "triplet": "aarch64-unknown-freebsd",
+        "sysroot": "../../tools/cross/sysroots/freebsd_arm64"
+    }
+}

package/src/cnoke/cnoke.js

@@ -53,41 +53,36 @@ async function main() {
             if (arg == '--help') {
                 print_usage();
                 return;
-            } else if (arg == '-d' || arg == '--directory') {
+            } else if (arg == '-D' || arg == '--directory') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
                 config.project_dir = fs.realpathSync(value);
-            } else if (arg == '-p' || arg == '--package') {
+            } else if (arg == '-P' || arg == '--package') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
                 config.package_dir = fs.realpathSync(value);
-            } else if (arg == '-O' || arg == '--out') {
+            } else if (arg == '-O' || arg == '--output') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
                 config.output_directory = value;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-v' || arg == '--runtime-version')) {
+            } else if ((command == 'build' || command == 'configure') && arg == '--runtime') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
                 if (!value.match(/^[0-9]+\.[0-9]+\.[0-9]+$/))
                     throw new Error(`Malformed runtime version '${value}'`);
 
                 config.runtime_version = value;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-a' || arg == '--arch')) {
-                if (value == null)
-                    throw new Error(`Missing value for ${arg}`);
-
-                config.arch = value;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-t' || arg == '--toolset')) {
+            } else if ((command == 'build' || command == 'configure') && arg == '--clang') {
+                config.prefer_clang = true;
+            } else if ((command == 'build' || command == 'configure') && (arg == '-t' || arg == '--toolchain')) {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
-                config.toolset = value;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-C' || arg == '--prefer-clang')) {
-                config.prefer_clang = true;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-B' || arg == '--config')) {
+                config.toolchain = value;
+            } else if ((command == 'build' || command == 'configure') && (arg == '-c' || arg == '--config')) {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
@@ -100,17 +95,19 @@ async function main() {
                         throw new Error(`Unknown value '${value}' for ${arg}`);
                     } break;
                 }
-            } else if ((command == 'build' || command == 'configure') && (arg == '-D' || arg == '--debug')) {
+            } else if ((command == 'build' || command == 'configure') && arg == '--debug') {
                 config.mode = 'Debug';
-            } else if (command == 'build' && arg == '--verbose') {
-                config.verbose = true;
+            } else if ((command == 'build' || command == 'configure') && arg == '--release') {
+                config.mode = 'Release';
             } else if (command == 'build' && arg == '--prebuild') {
                 config.prebuild = true;
-            } else if (command == 'build' && (arg == '-T' || arg == '--target')) {
+            } else if (command == 'build' && arg == '--target') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
                 config.targets = [value];
+            } else if (command == 'build' && (arg == '-v' || arg == '--verbose')) {
+                config.verbose = true;
             } else {
                 if (arg[0] == '-') {
                     throw new Error(`Unexpected argument '${arg}'`);
@@ -141,30 +138,27 @@ Commands:
 
 Options:
 
-    -d, --directory <DIR>                Change source directory
+    -D, --directory <DIR>                Change source directory
                                          (default: current working directory)
-    -p, --package <DIR>                  Change package directory
+    -P, --package <DIR>                  Change package directory
                                          (default: current working directory)
-
-    -O, --out <DIR>                      Set explicit output directory
+    -O, --output <DIR>                   Set explicit output directory
                                          (default: ./build)
 
-    -B, --config <CONFIG>                Change build type: RelWithDebInfo, Debug, Release
+    -c, --config <CONFIG>                Change build type: RelWithDebInfo, Debug, Release
                                          (default: ${cnoke.DefaultOptions.mode})
-    -D, --debug                          Shortcut for --config Debug
+        --debug                          Shortcut for --config Debug
+        --release                        Shortcut for --config Release
 
-        --prebuild                       Use prebuilt binary if available
-
-    -a, --arch <ARCH>                    Change architecture and ABI
-                                         (default: ${cnoke.determine_arch()})
-    -v, --runtime-version <VERSION>      Change node version
+    -t, --toolchain <TOOLCHAIN>          Cross-compile for specific platform
+        --runtime <VERSION>              Change node version
                                          (default: ${process.version})
-    -t, --toolset <TOOLSET>              Change default CMake toolset
-    -C, --prefer-clang                   Use Clang instead of default CMake compiler
+        --clang                          Use Clang instead of default CMake compiler
 
-    -T, --target <TARGET>                Only build the specified target
+        --prebuild                       Use prebuilt binary if available
+        --target <TARGET>                Only build the specified target
 
-        --verbose                        Show build commands while building
+    -v, --verbose                        Show build commands while building
 
 The ARCH value is similar to process.arch, with the following differences: