koffi 3.0.0-alpha.8 → 3.0.0-alpha.9

package/LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2025  Niels Martignène <niels.martignene@protonmail.com>
+Copyright (C) 2026  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

package/{build.cjs → cnoke.cjs}

@@ -196,7 +196,7 @@ function compareVersions(ver1, ver2) {
 
 // ../cnoke/src/assets.js
 var FIND_CNOKE_CMAKE = `# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2025 Niels Martign\xE8ne <niels.martignene@protonmail.com>
+# SPDX-FileCopyrightText: 2026 Niels Martign\xE8ne <niels.martignene@protonmail.com>
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR
    CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
@@ -324,7 +324,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU
 endif()
 `;
 var WIN_DELAY_HOOK_C = `// SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: 2025 Niels Martign\xE8ne <niels.martignene@protonmail.com>
+// SPDX-FileCopyrightText: 2026 Niels Martign\xE8ne <niels.martignene@protonmail.com>
 
 #include <stdlib.h>
 #if !defined(NOMINMAX)

package/doc/callbacks.md

@@ -5,8 +5,8 @@
 In order to pass a JS function to a C function expecting a callback, you must first create a callback type with the expected return type and parameters. The syntax is similar to the one used to load functions from a shared library.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 // With the classic syntax, this callback expects an integer and returns nothing
 const ExampleCallback = koffi.proto('ExampleCallback', 'void', ['int']);
@@ -71,8 +71,8 @@ int TransferToJS(const char *name, int age, int (*cb)(const char *str, int age))
 ```
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('./callbacks.so'); // Fake path
 
@@ -121,8 +121,8 @@ void SayIt(const char *name)
 ```
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('./callbacks.so'); // Fake path
 
@@ -169,8 +169,8 @@ You can pass this value through to another C function that expects a pointer of
 The following examples uses it to sort an array of strings in-place with the standard C function `qsort()`:
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('libc.so.6');
 

package/doc/functions.md

@@ -3,8 +3,8 @@
 To declare functions, start by loading the shared library with `koffi.load(filename)`.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('/path/to/shared/library'); // File extension depends on platforms: .so, .dll, .dylib, etc.
 ```
@@ -105,8 +105,8 @@ You can safely use these on non-x86 platforms, they are simply ignored.
 Below you can find a small example showing how to use a non-default calling convention, with the two syntaxes:
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('user32.dll');
 
@@ -142,8 +142,8 @@ printf('Integer %d, double %g, str %s', 'int', 6, 'double', 8.5, 'str', 'THE END
 You can issue asynchronous calls by calling the function through its async member. In this case, you need to provide a callback function as the last argument, with `(err, res)` parameters.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('libc.so.6');
 

package/doc/input.md

@@ -278,8 +278,8 @@ const char *ConcatBuild(Concat *c)
 ```
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('./handles.so');
 
@@ -348,8 +348,8 @@ Koffi applies the following conversion rules when passing arrays to/from C:
 See the example below:
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 // Those two structs are exactly the same, only the array conversion hint is different
 const Foo1 = koffi.struct('Foo1', {
@@ -438,8 +438,8 @@ void AppendValues(struct FlexibleArray *arr, size_t count, int start, int step)
 ```
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('./flexible.so');
 

package/doc/misc.md

@@ -151,8 +151,8 @@ The standard POSIX error codes are available in `koffi.os.errno`, as shown below
 ```js
 const assert = require('assert');
 
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('libc.so.6');
 

package/doc/output.md

@@ -29,8 +29,8 @@ The same can be done when declaring a function with a C-like prototype string, w
 This Windows example enumerate all Chrome windows along with their PID and their title. The `GetWindowThreadProcessId()` function illustrates how to get a primitive value from an output argument.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const user32 = koffi.load('user32.dll');
 
@@ -87,8 +87,8 @@ for (let hwnd = null;;) {
 This example calls the POSIX function `gettimeofday()`, and uses the prototype-like syntax.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('libc.so.6');
 
@@ -115,8 +115,8 @@ console.log(tv);
 Many Win32 functions that use struct outputs require you to set a size member (often named `cbSize`). These functions won't work with `_Out_` because the size value must be copied from JS to C, use `_Inout_` in this case.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const user32 = koffi.load('user32.dll');
 
@@ -137,8 +137,8 @@ console.log(success, info);
 This example opens an in-memory SQLite database, and uses the node-ffi-style function declaration syntax.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('sqlite3.so');
 
@@ -215,8 +215,8 @@ You can use buffers and typed arrays for output (and input/output) pointer param
 Once the native function returns, you can decode the content with `koffi.decode(value, type)` as in the following example:
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('libc.so.6');
 

package/doc/packaging.md

@@ -45,7 +45,7 @@ MyApp.exe
 
 Some bundlers (such as vite) don't like when require is used with native modules.
 
-In this case, you can use `require('koffi/indirect')` but you will need to make sure that the native Koffi modules are packaged properly.
+In this case, you can use `import koffi from 'koffi/indirect'` but you will need to make sure that the native Koffi modules are packaged properly.
 
 # Packaging examples
 
@@ -53,7 +53,7 @@ In this case, you can use `require('koffi/indirect')` but you will need to make
 
 Packaging with electron-builder should work as-is.
 
-Take a look at the full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/electron-builder).
+Take a look at the full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/packaging/electron-builder).
 
 ## Electron Forge
 
@@ -63,13 +63,13 @@ Packaging with Electron Force should work as-is, even when using webpack as conf
 npm init electron-app@latest my-app -- --template=webpack
 ```
 
-Take a look at the full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/electron-forge).
+Take a look at the full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/packaging/electron-forge).
 
 ## NW.js
 
 Packagers such as nw-builder should work as-is.
 
-You can find a full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/nwjs).
+You can find a full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/packaging/nwjs).
 
 ## Node.js and esbuild
 
@@ -79,10 +79,10 @@ You can easily tell esbuild to copy the native files with the copy loader and th
 esbuild index.js --platform=node --bundle --loader:.node=copy --outdir=dist/
 ```
 
-You can find a full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/node-esbuild).
+You can find a full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/packaging/node-esbuild).
 
 ## Node.js and yao-pkg
 
 Use [yao-pkg](https://github.com/yao-pkg/pkg) to make binary packages of your Node.js-based project.
 
-You can find a full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/yao-pkg).
+You can find a full [working example in the repository](https://codeberg.org/Koromix/rygel/src/branch/master/src/koffi/examples/packaging/yao-pkg).

package/doc/pointers.md

@@ -14,8 +14,8 @@ In C, pointer arguments are used for differenty purposes. It is important to dis
 The following Win32 example uses `GetCursorPos()` (with an output parameter) to retrieve and show the current cursor position.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('user32.dll');
 
@@ -117,8 +117,8 @@ int64_t ComputeTotalLength(const char **strings)
 ```
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('./length.so');
 
@@ -146,8 +146,8 @@ Koffi provides two features to deal with this:
 The example below shows the use of `koffi.as()` to read the header of a PNG file with `fread()` directly to a JS object.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('libc.so.6');
 
@@ -218,8 +218,8 @@ const ExplicitFree = koffi.disposable('HeapStr16', 'str16', koffi.free); // You
 The following example illustrates the use of a disposable type derived from *str*.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('libc.so.6');
 
@@ -233,8 +233,8 @@ console.log(copy); // Prints Hello!
 When you declare functions with the [prototype-like syntax](functions#definition-syntax), you can either use named disposable types or use the '!' shortcut qualifier with compatibles types, as shown in the example below. This qualifier creates an anonymous disposable type that calls `koffi.free(ptr)`.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const lib = koffi.load('libc.so.6');
 
@@ -262,8 +262,8 @@ You can access unmanaged memory with `koffi.view(ptr, len)`. This function takes
 The following Linux example writes the string "Hello World!" to a file named "hello.txt" through mmaped memory, to demontrate the use of `koffi.view()`:
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 const libc = koffi.load('libc.so.6');
 

package/doc/start.md

@@ -30,8 +30,8 @@ This is a small example for Linux systems, which uses `gettimeofday()`, `localti
 It illustrates the use of output parameters.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 // Load the shared library
 const lib = koffi.load('libc.so.6');
@@ -81,8 +81,8 @@ This is a small example targeting the Win32 API, using `MessageBox()` to show a
 It illustrates the use of the x86 stdcall calling convention, and the use of UTF-8 and UTF-16 string arguments.
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 // Load the shared library
 const lib = koffi.load('user32.dll');

package/doc/unions.md

@@ -56,8 +56,8 @@ DoSomething('string', { str: 'Hello!' });
 The following example uses the [SendInput](https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-sendinput) Win32 API to emit the Win+D shortcut and hide windows (show the desktop).
 
 ```js
-// ES6 syntax: import koffi from 'koffi';
-const koffi = require('koffi');
+import koffi from 'koffi';
+// CJS: const koffi = require('koffi');
 
 // Win32 type and functions
 

package/index.d.ts

@@ -1,17 +1,5 @@
 // SPDX-License-Identifier: MIT
-// SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
-
-type LoadOptions = {
-    lazy?: boolean,
-    global?: boolean,
-    deep?: boolean
-};
-
-export function load(path: string | null, options?: LoadOptions): IKoffiLib;
-
-interface IKoffiCType { __brand: 'IKoffiCType' }
-interface IKoffiPointerCast { __brand: 'IKoffiPointerCast' }
-interface IKoffiRegisteredCallback { __brand: 'IKoffiRegisteredCallback' }
+// SPDX-FileCopyrightText: 2026 Niels Martignène <niels.martignene@protonmail.com>
 
 type PrimitiveKind = 'Void' | 'Bool' | 'Int8' | 'UInt8' | 'Int16' | 'Int16S' | 'UInt16' | 'UInt16S' |
                      'Int32' | 'Int32S' | 'UInt32' | 'UInt32S' | 'Int64' | 'Int64S' | 'UInt64' | 'UInt64S' |
@@ -21,11 +9,14 @@ type ArrayHint = 'Array' | 'Typed' | 'String';
 
 type PrototypeInfo = {
     name: string;
-    arguments: TypeInfo[];
-    result: TypeInfo
+    arguments: TypeObject[];
+    result: TypeObject
 };
 
-type TypeInfo = {
+interface IKoffiDirectionMarker { __brand: 'IKoffiDirectionMarker' }
+interface IKoffiPointerCast { __brand: 'IKoffiPointerCast' }
+
+export type TypeObject = {
     name: string;
     primitive: PrimitiveKind;
     size: number;
@@ -33,12 +24,13 @@ type TypeInfo = {
     disposable: boolean;
     length?: number;
     hint?: ArrayHint;
-    ref?: TypeInfo;
-    members?: Record<string, { name: string, type: TypeInfo, offset: number }>;
+    ref?: TypeObject;
+    members?: Record<string, { name: string, type: TypeObject, offset: number }>;
     proto?: PrototypeInfo;
     values?: Record<string, number | bigint>;
 };
-type TypeSpec = string | TypeInfo | IKoffiCType;
+
+type TypeSpec = string | TypeObject | IKoffiDirectionMarker;
 type TypeSpecWithAlignment = TypeSpec | [number, TypeSpec];
 
 type KoffiFunction = {
@@ -51,7 +43,15 @@ export type KoffiFunc<T extends (...args: any) => any> = T & {
    info: PrototypeInfo;
 };
 
-export interface IKoffiLib {
+export type CallbackHandle = {};
+
+type LoadOptions = {
+    lazy?: boolean,
+    global?: boolean,
+    deep?: boolean
+};
+
+export type LibraryHandle = {
     func(definition: string): KoffiFunction;
     func(name: string | number, result: TypeSpec, arguments: TypeSpec[]): KoffiFunction;
     func(convention: string, name: string | number, result: TypeSpec, arguments: TypeSpec[]): KoffiFunction;
@@ -68,62 +68,57 @@ export interface IKoffiLib {
     symbol(name: string, type: TypeSpec): any;
 
     unload(): void;
-}
+};
 
-export function struct(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): TypeInfo;
-export function struct(ref: TypeInfo, def: Record<string, TypeSpecWithAlignment>): TypeInfo;
-export function struct(def: Record<string, TypeSpecWithAlignment>): TypeInfo;
-export function pack(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): TypeInfo;
-export function pack(ref: TypeInfo, def: Record<string, TypeSpecWithAlignment>): TypeInfo;
-export function pack(def: Record<string, TypeSpecWithAlignment>): TypeInfo;
+export function load(path: string | null, options?: LoadOptions): LibraryHandle;
 
-export function union(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): TypeInfo;
-export function union(ref: TypeInfo, def: Record<string, TypeSpecWithAlignment>): TypeInfo;
-export function union(def: Record<string, TypeSpecWithAlignment>): TypeInfo;
+export function struct(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): TypeObject;
+export function struct(ref: TypeObject, def: Record<string, TypeSpecWithAlignment>): TypeObject;
+export function struct(def: Record<string, TypeSpecWithAlignment>): TypeObject;
+export function pack(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): TypeObject;
+export function pack(ref: TypeObject, def: Record<string, TypeSpecWithAlignment>): TypeObject;
+export function pack(def: Record<string, TypeSpecWithAlignment>): TypeObject;
+
+export function union(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): TypeObject;
+export function union(ref: TypeObject, def: Record<string, TypeSpecWithAlignment>): TypeObject;
+export function union(def: Record<string, TypeSpecWithAlignment>): TypeObject;
 
 export class Union {
     constructor(type: TypeSpec);
     [s: string]: any;
 }
 
-export function enumeration(name: string | null | undefined, def: Record<string, number | bigint>, storage?: TypeSpec | null) : TypeInfo;
-export function enumeration(def: Record<string, number | bigint>, storage?: TypeSpec | null) : TypeInfo;
-
-export function array(ref: TypeSpec, len: number, hint?: ArrayHint | null): TypeInfo;
-export function array(ref: TypeSpec, countedBy: string, maxLen: number, hint?: ArrayHint | null): TypeInfo;
-
-export function opaque(name: string | null | undefined): TypeInfo;
-export function opaque(): TypeInfo;
-/** @deprecated */ export function handle(name: string | null | undefined): TypeInfo;
-/** @deprecated */ export function handle(): TypeInfo;
-
-export function pointer(ref: TypeSpec): TypeInfo;
-export function pointer(ref: TypeSpec, count: number): TypeInfo;
-export function pointer(name: string | null | undefined, ref: TypeSpec, countedBy?: string | null): TypeInfo;
-export function pointer(name: string | null | undefined, ref: TypeSpec, count: number): TypeInfo;
-
-export function out(type: TypeSpec): IKoffiCType;
-export function inout(type: TypeSpec): IKoffiCType;
-
-export function disposable(type: TypeSpec): TypeInfo;
-export function disposable(type: TypeSpec, freeFunction: Function): TypeInfo;
-export function disposable(name: string | null | undefined, type: TypeSpec): TypeInfo;
-export function disposable(name: string | null | undefined, type: TypeSpec, freeFunction: Function): TypeInfo;
-
-export function proto(definition: string): TypeInfo;
-export function proto(result: TypeSpec, arguments: TypeSpec[]): TypeInfo;
-export function proto(convention: string, result: TypeSpec, arguments: TypeSpec[]): TypeInfo;
-export function proto(name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): TypeInfo;
-export function proto(convention: string, name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): TypeInfo;
-/** @deprecated */ export function callback(definition: string): TypeInfo;
-/** @deprecated */ export function callback(result: TypeSpec, arguments: TypeSpec[]): TypeInfo;
-/** @deprecated */ export function callback(convention: string, result: TypeSpec, arguments: TypeSpec[]): TypeInfo;
-/** @deprecated */ export function callback(name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): TypeInfo;
-/** @deprecated */ export function callback(convention: string, name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): TypeInfo;
-
-export function register(callback: Function, type: TypeSpec): IKoffiRegisteredCallback;
-export function register(thisValue: any, callback: Function, type: TypeSpec): IKoffiRegisteredCallback;
-export function unregister(callback: IKoffiRegisteredCallback): void;
+export function enumeration(name: string | null | undefined, def: Record<string, number | bigint>, storage?: TypeSpec | null) : TypeObject;
+export function enumeration(def: Record<string, number | bigint>, storage?: TypeSpec | null) : TypeObject;
+
+export function array(ref: TypeSpec, len: number, hint?: ArrayHint | null): TypeObject;
+export function array(ref: TypeSpec, countedBy: string, maxLen: number, hint?: ArrayHint | null): TypeObject;
+
+export function opaque(name: string | null | undefined): TypeObject;
+export function opaque(): TypeObject;
+
+export function pointer(ref: TypeSpec): TypeObject;
+export function pointer(ref: TypeSpec, count: number): TypeObject;
+export function pointer(name: string | null | undefined, ref: TypeSpec, countedBy?: string | null): TypeObject;
+export function pointer(name: string | null | undefined, ref: TypeSpec, count: number): TypeObject;
+
+export function out(type: TypeSpec): IKoffiDirectionMarker;
+export function inout(type: TypeSpec): IKoffiDirectionMarker;
+
+export function disposable(type: TypeSpec): TypeObject;
+export function disposable(type: TypeSpec, freeFunction: Function): TypeObject;
+export function disposable(name: string | null | undefined, type: TypeSpec): TypeObject;
+export function disposable(name: string | null | undefined, type: TypeSpec, freeFunction: Function): TypeObject;
+
+export function proto(definition: string): TypeObject;
+export function proto(result: TypeSpec, arguments: TypeSpec[]): TypeObject;
+export function proto(convention: string, result: TypeSpec, arguments: TypeSpec[]): TypeObject;
+export function proto(name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): TypeObject;
+export function proto(convention: string, name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): TypeObject;
+
+export function register(callback: Function, type: TypeSpec): CallbackHandle;
+export function register(thisValue: any, callback: Function, type: TypeSpec): CallbackHandle;
+export function unregister(callback: CallbackHandle): void;
 
 export function as(value: any, type: TypeSpec): IKoffiPointerCast;
 export function decode(value: any, type: TypeSpec): any;
@@ -139,14 +134,14 @@ export function encode(ref: any, offset: number, type: TypeSpec, value: any): vo
 export function encode(ref: any, offset: number, type: TypeSpec, value: any, len: number): void;
 export function view(ref: any, len: number): ArrayBuffer;
 
-export function type(type: TypeSpec): TypeInfo;
+export function type(type: TypeSpec): TypeObject;
 export function sizeof(type: TypeSpec): number;
 export function alignof(type: TypeSpec): number;
 export function offsetof(type: TypeSpec, member_name: string): number;
-/** @deprecated */ export function resolve(type: TypeSpec): TypeInfo;
-/** @deprecated */ export function introspect(type: TypeSpec): TypeInfo;
+/** @deprecated */ export function resolve(type: TypeSpec): TypeObject;
+/** @deprecated */ export function introspect(type: TypeSpec): TypeObject;
 
-export function alias(name: string, type: TypeSpec): TypeInfo;
+export function alias(name: string, type: TypeSpec): TypeObject;
 
 type KoffiConfig = {
     sync_stack_size?: number;
@@ -261,32 +256,32 @@ type PrimitiveTypes =
     | 'void'
     | 'wchar'
     | 'wchar_t';
-export const types: Record<PrimitiveTypes, TypeInfo>;
-
-export interface IKoffiPollOptions {
-    readable?: boolean;
-    writable?: boolean;
-    disconnect?: boolean;
-}
-
-export interface IKoffiPollEvents {
-    readable: boolean;
-    writable: boolean;
-    disconnect: boolean;
-}
+export const types: Record<PrimitiveTypes, TypeObject>;
 
 export namespace node {
     export const env: { __brand: 'IKoffiNodeEnv' };
 
+    export type PollOptions = {
+        readable?: boolean;
+        writable?: boolean;
+        disconnect?: boolean;
+    };
+
+    export type PollEvents = {
+        readable: boolean;
+        writable: boolean;
+        disconnect: boolean;
+    };
+
     export class PollHandle {
-        start(opts: IKoffiPollOptions, callback: (ev: IKoffiPollEvents) => void): void;
-        start(callback: (ev: IKoffiPollEvents) => void): void;
+        start(opts: PollOptions, callback: (ev: PollEvents) => void): void;
+        start(callback: (ev: PollEvents) => void): void;
         stop(): void;
         close(): void;
         unref(): void;
         ref(): void;
     }
 
-    export function poll(fd: number, opts: IKoffiPollOptions, callback: (ev: IKoffiPollEvents) => void): PollHandle;
-    export function poll(fd: number, callback: (ev: IKoffiPollEvents) => void): PollHandle;
+    export function poll(fd: number, opts: PollOptions, callback: (ev: PollEvents) => void): PollHandle;
+    export function poll(fd: number, callback: (ev: PollEvents) => void): PollHandle;
 }