koffi 3.0.0-alpha.7 → 3.0.0-alpha.8

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 > [!NOTE]
 > Consult the [migration guide](migration) to migrate between major Koffi versions.
 
+## Koffi 3
+
+### Koffi 3.0
+
+#### Koffi 3.0.0 (WIP)
+
+**Main changes:**
+
+- Replace use of externals with type objects:
+  * Use `koffi.type()` to resolve type specifiers (strings or objects) to type objects
+  * Access type information directly on type variables without `koffi.introspect()`
+- Replace use of externals with BigInt pointers
+- Rewrite call preparation and execution for vastly improved performance
+
+**Other changes:**
+
+- Add `koffi.enumeration()` to create [enum types](input#enum-types)
+
+**Newly deprecated functions:**
+
+- Deprecate `koffi.resolve()` function, replace with `koffi.type()`
+- Deprecate `koffi.introspect()` function, replace with `koffi.type()`
+
+**Removed deprecated functions:**
+
+- Remove `koffi.callback()` long replaced with `koffi.proto()`
+- Remove `koffi.handle()` long replaced with `koffi.opaque()`
+
+Consult the [migration guide](migration) for more information.
+
 ## Koffi 2
 
 ### Koffi 2.16

package/doc/callbacks.md

@@ -162,7 +162,7 @@ let cb2 = koffi.register(store, store.get, 'IntCallback *'); // However in this
 
 *New in Koffi 2.2, changed in Koffi 2.3*
 
-Koffi does not have enough information to convert callback pointer arguments to an appropriate JS value. In this case, your JS function will receive an opaque *External* object.
+Koffi does not have enough information to convert callback pointer arguments to an appropriate JS value. In this case, your JS function will receive a *BigInt* value with the pointer address.
 
 You can pass this value through to another C function that expects a pointer of the same type, or you can use [koffi.decode()](variables#decode-to-js-values) function to decode pointer arguments.
 

package/doc/contribute.md

@@ -151,7 +151,7 @@ cd ../../bin/koffi/packages
 ./publish.sh
 ```
 
-Some platforms are emulated so this can take a few minutes until the pre-built binaries are ready. Go grab a cup of coffee, come back and execute the `npm publish` command!
+Some platforms are emulated so this can take a few minutes until the pre-built binaries are ready. You might want to go grab a cup of coffee :)
 
 # Code style
 

package/doc/input.md

@@ -466,6 +466,70 @@ console.log(array); // Prints { count: 8, numbers: [1, 2, 3, 4, 5, 10, 12, 14] }
 
 In C, dynamically-sized arrays are usually passed around as pointers. Read more about [array pointers](pointers#dynamic-arrays) in the relevant section.
 
+# Enum types
+
+*Added in Koffi 3.0*
+
+C enumeration values are stored as integers. The underlying integer type is implementation-defined but Koffi tries to match usual platform behavior.
+
+On POSIX platforms, Koffi follows the following rules:
+
+- If no negative value exists: `unsigned int` by default, `uint64_t` if needed
+- If any negative value exists: `int` by default, `int64_t` if needed
+
+On Windows, things are simpler, and `int` is used all the time. Koffi will throw an error if any enumeration value does not fit in a 32-bit integer.
+
+```js
+// For OpenResult, the underlying type will be unsigned int on POSIX, int on Windows
+const OpenResult = koffi.enumeration('OpenResult', {
+    Success: 0,
+    MissingFile: 1,
+    AccessDenied: 2,
+    OtherError: 3
+});
+
+// For RelativePosition, the underlying type will be int everywhere
+const RelativePosition = koffi.enumeration('RelativePosition', {
+    Left: -1,
+    Center: 0,
+    Right: 1
+});
+
+// For IntLimits, the underlying type will be int64_t on POSIX, and fail on Windows
+const Int64Limits = koffi.enumeration('Int64Limits', {
+    Min: -9223372036854775808n,
+    Max: 9223372036854775807n
+});
+```
+
+```{warning}
+This behavior may not match your compiler:
+
+- POSIX platforms: GCC and Clang support will use a short integer type if `-fshort-enums` is specified and the enumeration values fit in `short` or `unsigned short`
+- Windows: MSVC (and Clang) always use `int` even if some values do not fit, which matches what Koffi does... unless the compiler flag `/Zc:enumTypes` is set, maybe.
+
+Use an explicit type specifier to work around these problems, as shown below.
+```
+
+You can access the constants in `values` member of the type object.
+
+```js
+console.log(OpenResult.values.MissingFile); // Prints 1
+console.log(RelativePosition.values.Left); // Prints -1
+```
+
+You can specify the storage type explicitly as the last argument to `koffi.enumeration(name, values, type)`.
+
+```js
+// This one explictly uses int64_t as the underlying type,
+// despite the fact that the values fit inside an int.
+const ExplicitEnum = koffi.enumeration('ExplicitEnum', {
+    Zero: 0,
+    One: 1,
+    Two: 2
+}, 'int64_t');
+```
+
 # Union types
 
 The declaration and use of [union types](unions) will be explained in a later section, they are only briefly mentioned here if you need them.

package/doc/misc.md

@@ -1,19 +1,17 @@
 # Types
 
-## Introspection
+## Type specifiers
 
-*New in Koffi 2.0: `koffi.resolve()`, new in Koffi 2.2: `koffi.offsetof()`*
+*Changed in Koffi 3.0*
 
 > [!NOTE]
-> The value returned by `introspect()` has **changed in version 2.0 and in version 2.2**.
->
-> In Koffi 1.x, it could only be used with struct types and returned the object passed to koffi.struct() with the member names and types.
->
-> Starting in Koffi 2.2, each record member is exposed as an object containing the name, the type and the offset within the record.
+> In Koffi 2.0, types were External values, you had to use `koffi.introspect()` to get type information. In Koffi 3.0, this information is directly available in type objects, and this function is deprecated.
 >
 > Consult the [migration guide](migration) for more information.
 
-Use `koffi.introspect(type)` to get detailed information about a type: name, primitive, size, alignment, members (record types), reference type (array, pointer) and length (array).
+You can use strings or type objects to give type information to Koffi (when declaring functions, structs, and so on). Use `koffi.type(spec)` to resolve all accepted type values (strings and type objects) to type objects.
+
+You can inspect the type object for information: name, primitive, size, alignment, members (record types), reference type (array, pointer), length (array), arguments and return type (prototypes).
 
 ```js
 const FoobarType = koffi.struct('FoobarType', {
@@ -22,7 +20,7 @@ const FoobarType = koffi.struct('FoobarType', {
     c: 'double'
 });
 
-console.log(koffi.introspect(FoobarType));
+console.log(FoobarType);
 
 // Expected result on 64-bit machines:
 // {
@@ -30,10 +28,11 @@ console.log(koffi.introspect(FoobarType));
 //     primitive: 'Record',
 //     size: 24,
 //     alignment: 8,
+//     disposable: false,
 //     members: {
-//         a: { name: 'a', type: [External: 4b28a60], offset: 0 },
-//         b: { name: 'b', type: [External: 4b292e0], offset: 8 },
-//         c: { name: 'c', type: [External: 4b29260], offset: 16 }
+//         a: { name: 'a', type: [Type], offset: 0 },
+//         b: { name: 'b', type: [Type], offset: 8 },
+//         c: { name: 'c', type: [Type], offset: 16 }
 //     }
 // }
 ```
@@ -43,7 +42,7 @@ Koffi also exposes a few more utility functions to get a subset of this informat
 - `koffi.sizeof(type)` to get the size of a type
 - `koffi.alignof(type)` to get the alignment of a type
 - `koffi.offsetof(type, member_name)` to get the offset of a record member
-- `koffi.resolve(type)` to get the resolved type object from a type string
+- `koffi.type(type)` to get the resolved type object from a type string
 
 Just like before, you can refer to primitive types by their name or through `koffi.types`:
 

package/doc/pointers.md

@@ -49,6 +49,8 @@ const GetHandleInformation = lib.func('bool __stdcall GetHandleInformation(HANDL
 const CloseHandle = lib.func('bool __stdcall CloseHandle(HANDLE h)');
 ```
 
+Koffi uses BigInt numbers to represent opaque pointers.
+
 ## Pointer to primitive types
 
 In javascript, it is not possible to pass a primitive value by reference to another function. This means that you cannot call a function and expect it to modify the value of one of its number or string parameter.
@@ -322,7 +324,3 @@ function write(filename, str) {
     }
 }
 ```
-
-# Unwrap pointers
-
-You can use `koffi.address(ptr)` on a pointer to get the numeric value as a [BigInt object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt).

package/doc/variables.md

@@ -23,7 +23,7 @@ You cannot directly manipulate these variables, use:
 
 *New in Koffi 2.2, changed in Koffi 2.3*
 
-Use `koffi.decode()` to decode C pointers, wrapped as external objects or as simple numbers.
+Use `koffi.decode()` to decode C pointers, represented by BigInt numbers.
 
 Some arguments are optional and this function can be called in several ways:
 
@@ -66,12 +66,12 @@ console.log(koffi.decode(my_string, 'const char *', 3)) // Prints "foo"
 
 *New in Koffi 2.6*
 
-Use `koffi.encode()` to encode JS values into C symbols or pointers, wrapped as external objects or as simple numbers.
+Use `koffi.encode()` to encode JS values into C symbols or pointers, which are represented by BigInt numbers.
 
 Some arguments are optional and this function can be called in several ways:
 
-- `koffi.encode(ref, type, value)`: no offset
-- `koffi.encode(ref, offset, type, value)`: explicit offset to add to the pointer before encoding
+- `koffi.encode(ptr, type, value)`: no offset
+- `koffi.encode(ptr, offset, type, value)`: explicit offset to add to the pointer before encoding
 
 We'll reuse the examples shown above and change the variable values with `koffi.encode()`.
 

package/index.d.ts

@@ -19,8 +19,12 @@ type PrimitiveKind = 'Void' | 'Bool' | 'Int8' | 'UInt8' | 'Int16' | 'Int16S' | '
                      'Prototype' | 'Callback';
 type ArrayHint = 'Array' | 'Typed' | 'String';
 
-type TypeSpec = string | IKoffiCType;
-type TypeSpecWithAlignment = TypeSpec | [number, TypeSpec];
+type PrototypeInfo = {
+    name: string;
+    arguments: TypeInfo[];
+    result: TypeInfo
+};
+
 type TypeInfo = {
     name: string;
     primitive: PrimitiveKind;
@@ -29,26 +33,22 @@ type TypeInfo = {
     disposable: boolean;
     length?: number;
     hint?: ArrayHint;
-    ref?: IKoffiCType;
-    members?: Record<string, { name: string, type: IKoffiCType, offset: number }>;
+    ref?: TypeInfo;
+    members?: Record<string, { name: string, type: TypeInfo, offset: number }>;
+    proto?: PrototypeInfo;
+    values?: Record<string, number | bigint>;
 };
+type TypeSpec = string | TypeInfo | IKoffiCType;
+type TypeSpecWithAlignment = TypeSpec | [number, TypeSpec];
+
 type KoffiFunction = {
     (...args: any[]) : any;
     async: (...args: any[]) => any;
-    info: {
-        name: string,
-        arguments: IKoffiCType[],
-        result: IKoffiCType
-    };
+    info: PrototypeInfo;
 };
-
 export type KoffiFunc<T extends (...args: any) => any> = T & {
    async: (...args: [...Parameters<T>, (err: any, result: ReturnType<T>) => void]) => void;
-   info: {
-      name: string;
-      arguments: IKoffiCType[];
-      result: IKoffiCType;
-   };
+   info: PrototypeInfo;
 };
 
 export interface IKoffiLib {
@@ -70,53 +70,56 @@ export interface IKoffiLib {
     unload(): void;
 }
 
-export function struct(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
-export function struct(ref: IKoffiCType, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
-export function struct(def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
-export function pack(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
-export function pack(ref: IKoffiCType, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
-export function pack(def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
+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 union(name: string | null | undefined, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
-export function union(ref: IKoffiCType, def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
-export function union(def: Record<string, TypeSpecWithAlignment>): IKoffiCType;
+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 class Union {
     constructor(type: TypeSpec);
     [s: string]: any;
 }
 
-export function array(ref: TypeSpec, len: number, hint?: ArrayHint | null): IKoffiCType;
-export function array(ref: TypeSpec, countedBy: string, maxLen: number, hint?: ArrayHint | null): IKoffiCType;
+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): IKoffiCType;
-export function opaque(): IKoffiCType;
-/** @deprecated */ export function handle(name: string | null | undefined): IKoffiCType;
-/** @deprecated */ export function handle(): IKoffiCType;
+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): IKoffiCType;
-export function pointer(ref: TypeSpec, count: number): IKoffiCType;
-export function pointer(name: string | null | undefined, ref: TypeSpec, countedBy?: string | null): IKoffiCType;
-export function pointer(name: string | null | undefined, ref: TypeSpec, count: number): IKoffiCType;
+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): IKoffiCType;
-export function disposable(type: TypeSpec, freeFunction: Function): IKoffiCType;
-export function disposable(name: string | null | undefined, type: TypeSpec): IKoffiCType;
-export function disposable(name: string | null | undefined, type: TypeSpec, freeFunction: Function): IKoffiCType;
-
-export function proto(definition: string): IKoffiCType;
-export function proto(result: TypeSpec, arguments: TypeSpec[]): IKoffiCType;
-export function proto(convention: string, result: TypeSpec, arguments: TypeSpec[]): IKoffiCType;
-export function proto(name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): IKoffiCType;
-export function proto(convention: string, name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): IKoffiCType;
-/** @deprecated */ export function callback(definition: string): IKoffiCType;
-/** @deprecated */ export function callback(result: TypeSpec, arguments: TypeSpec[]): IKoffiCType;
-/** @deprecated */ export function callback(convention: string, result: TypeSpec, arguments: TypeSpec[]): IKoffiCType;
-/** @deprecated */ export function callback(name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): IKoffiCType;
-/** @deprecated */ export function callback(convention: string, name: string | null | undefined, result: TypeSpec, arguments: 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;
@@ -136,13 +139,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 sizeof(type: TypeSpec): number;
 export function alignof(type: TypeSpec): number;
 export function offsetof(type: TypeSpec, member_name: string): number;
-export function resolve(type: TypeSpec): IKoffiCType;
-export function introspect(type: TypeSpec): TypeInfo;
+/** @deprecated */ export function resolve(type: TypeSpec): TypeInfo;
+/** @deprecated */ export function introspect(type: TypeSpec): TypeInfo;
 
-export function alias(name: string, type: TypeSpec): IKoffiCType;
+export function alias(name: string, type: TypeSpec): TypeInfo;
 
 type KoffiConfig = {
     sync_stack_size?: number;
@@ -257,7 +261,7 @@ type PrimitiveTypes =
     | 'void'
     | 'wchar'
     | 'wchar_t';
-export const types: Record<PrimitiveTypes, IKoffiCType>;
+export const types: Record<PrimitiveTypes, TypeInfo>;
 
 export interface IKoffiPollOptions {
     readable?: boolean;

package/lib/native/base/base.hh

@@ -3645,7 +3645,14 @@ static inline int64_t GetCoreCycles()
 {
     uint64_t counter;
     __asm__ __volatile__ ("mrs %0, cntvct_el0" : "=r" (counter));
-    return counter;
+    return (int64_t)counter;
+}
+#elif defined(__riscv)
+static inline int64_t GetCoreCycles()
+{
+    uint64_t counter;
+    __asm__ __volatile__("csrr %0, mcycle" : "=r"(counter));
+    return (int64_t)counter;
 }
 #endif
 

package/package.json

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

package/src/koffi/CMakeLists.txt

@@ -60,8 +60,8 @@ add_custom_command(OUTPUT trampolines/gnu.inc
                           trampolines/masm64.inc
                    COMMENT "Generate trampoline macros"
                    COMMAND "${NODE_JS_EXECPATH}"
-                   ARGS "${CMAKE_CURRENT_SOURCE_DIR}/src/trampolines.js" "${CMAKE_CURRENT_BINARY_DIR}/trampolines" 8192
-                   DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/trampolines.js")
+                   ARGS "${CMAKE_CURRENT_SOURCE_DIR}/src/trampolines.cjs" "${CMAKE_CURRENT_BINARY_DIR}/trampolines" 8192
+                   DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/trampolines.cjs")
 
 set(KOFFI_SRC
     src/call.cc

package/src/koffi/index.cjs

@@ -131,7 +131,7 @@ var init_abi = __esm({
 var package_default;
 var init_package = __esm({
   "package.json"() {
-    package_default = { name: "koffi", version: "3.0.0-alpha.7", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
+    package_default = { name: "koffi", version: "3.0.0-alpha.8", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
   }
 });
 
@@ -163,7 +163,7 @@ function loadDynamic(root, pkg2, triplets2) {
     roots.push(process.resourcesPath + "/node_modules/koffi");
   }
   let names = [
-    `@koromix/koffi-${pkg2}`,
+    `../../../@koromix/koffi-${pkg2}`,
     ...triplets2.flatMap((triplet) => roots.map((dir) => `${dir}/bin/koffi/${triplet}/koffi.node`))
   ];
   for (let name of names) {
@@ -182,6 +182,19 @@ function loadDynamic(root, pkg2, triplets2) {
 }
 function wrapNative(native2) {
   let load = native2.load;
+  native2.sizeof = (spec) => native2.type(spec).size;
+  native2.alignof = (spec) => native2.type(spec).alignment;
+  native2.offsetof = (spec, name) => {
+    let type = native2.type(spec);
+    if (type.primitive != "Record")
+      throw new TypeError("The offsetof() function can only be used with record types");
+    let member = type.members[name];
+    if (member == null)
+      throw new Error(`Record type ${type.name} does not have member '${name}'`);
+    return member.offset;
+  };
+  native2.resolve = import_util.default.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
+  native2.introspect = import_util.default.deprecate(native2.type, "The koffi.introspect() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI008");
   native2.load = (...args) => {
     let lib = load(...args);
     lib.cdecl = import_util.default.deprecate((...args2) => lib.func("__cdecl", ...args2), "The koffi.cdecl() function was deprecated in Koffi 2.7, use koffi.func(...) instead", "KOFFI003");
@@ -198,7 +211,7 @@ var init_init = __esm({
     import_node_module = require("node:module");
     init_abi();
     init_package();
-    requireNative = (0, import_node_module.createRequire)(__dirname);
+    requireNative = (0, import_node_module.createRequire)(__filename);
   }
 });
 
@@ -206,7 +219,7 @@ var init_init = __esm({
 var require_static = __commonJS({
   "src/static.js"(exports2, module2) {
     var { createRequire: createRequire2 } = require("node:module");
-    var requireNative2 = createRequire2(__dirname);
+    var requireNative2 = createRequire2(__filename);
     function loadStatic2(pkg2) {
       let native2 = null;
       if (native2 == null && pkg2 == "linux-arm64") {

package/src/koffi/index.js

@@ -93,10 +93,10 @@ function decodeElfHeader(buf) {
 }
 
 // package.json
-var package_default = { name: "koffi", version: "3.0.0-alpha.7", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
+var package_default = { name: "koffi", version: "3.0.0-alpha.8", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
 
 // src/init.js
-var requireNative = createRequire(import.meta.dirname);
+var requireNative = createRequire(import.meta.url);
 function detectPlatform() {
   if (process.versions.napi == null || process.versions.napi < package_default.cnoke.napi) {
     let major = parseInt(process.versions.node, 10);
@@ -118,7 +118,7 @@ function loadDynamic(root, pkg2, triplets2) {
     roots.push(process.resourcesPath + "/node_modules/koffi");
   }
   let names = [
-    `@koromix/koffi-${pkg2}`,
+    `../../../@koromix/koffi-${pkg2}`,
     ...triplets2.flatMap((triplet) => roots.map((dir) => `${dir}/bin/koffi/${triplet}/koffi.node`))
   ];
   for (let name of names) {
@@ -137,6 +137,19 @@ function loadDynamic(root, pkg2, triplets2) {
 }
 function wrapNative(native2) {
   let load = native2.load;
+  native2.sizeof = (spec) => native2.type(spec).size;
+  native2.alignof = (spec) => native2.type(spec).alignment;
+  native2.offsetof = (spec, name) => {
+    let type = native2.type(spec);
+    if (type.primitive != "Record")
+      throw new TypeError("The offsetof() function can only be used with record types");
+    let member = type.members[name];
+    if (member == null)
+      throw new Error(`Record type ${type.name} does not have member '${name}'`);
+    return member.offset;
+  };
+  native2.resolve = util.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
+  native2.introspect = util.deprecate(native2.type, "The koffi.introspect() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI008");
   native2.load = (...args) => {
     let lib = load(...args);
     lib.cdecl = util.deprecate((...args2) => lib.func("__cdecl", ...args2), "The koffi.cdecl() function was deprecated in Koffi 2.7, use koffi.func(...) instead", "KOFFI003");
@@ -149,7 +162,7 @@ function wrapNative(native2) {
 
 // src/static.js
 import { createRequire as createRequire2 } from "node:module";
-var requireNative2 = createRequire2(import.meta.dirname);
+var requireNative2 = createRequire2(import.meta.url);
 function loadStatic(pkg2) {
   let native2 = null;
   if (native2 == null && pkg2 == "linux-arm64") {

package/src/koffi/indirect.cjs

@@ -131,7 +131,7 @@ var init_abi = __esm({
 var package_default;
 var init_package = __esm({
   "package.json"() {
-    package_default = { name: "koffi", version: "3.0.0-alpha.7", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
+    package_default = { name: "koffi", version: "3.0.0-alpha.8", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
   }
 });
 
@@ -163,7 +163,7 @@ function loadDynamic(root, pkg2, triplets2) {
     roots.push(process.resourcesPath + "/node_modules/koffi");
   }
   let names = [
-    `@koromix/koffi-${pkg2}`,
+    `../../../@koromix/koffi-${pkg2}`,
     ...triplets2.flatMap((triplet) => roots.map((dir) => `${dir}/bin/koffi/${triplet}/koffi.node`))
   ];
   for (let name of names) {
@@ -182,6 +182,19 @@ function loadDynamic(root, pkg2, triplets2) {
 }
 function wrapNative(native2) {
   let load = native2.load;
+  native2.sizeof = (spec) => native2.type(spec).size;
+  native2.alignof = (spec) => native2.type(spec).alignment;
+  native2.offsetof = (spec, name) => {
+    let type = native2.type(spec);
+    if (type.primitive != "Record")
+      throw new TypeError("The offsetof() function can only be used with record types");
+    let member = type.members[name];
+    if (member == null)
+      throw new Error(`Record type ${type.name} does not have member '${name}'`);
+    return member.offset;
+  };
+  native2.resolve = import_util.default.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
+  native2.introspect = import_util.default.deprecate(native2.type, "The koffi.introspect() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI008");
   native2.load = (...args) => {
     let lib = load(...args);
     lib.cdecl = import_util.default.deprecate((...args2) => lib.func("__cdecl", ...args2), "The koffi.cdecl() function was deprecated in Koffi 2.7, use koffi.func(...) instead", "KOFFI003");
@@ -198,7 +211,7 @@ var init_init = __esm({
     import_node_module = require("node:module");
     init_abi();
     init_package();
-    requireNative = (0, import_node_module.createRequire)(__dirname);
+    requireNative = (0, import_node_module.createRequire)(__filename);
   }
 });
 
@@ -206,7 +219,7 @@ var init_init = __esm({
 var require_static = __commonJS({
   "src/static.js"(exports2, module2) {
     var { createRequire: createRequire2 } = require("node:module");
-    var requireNative2 = createRequire2(__dirname);
+    var requireNative2 = createRequire2(__filename);
     function loadStatic2(pkg2) {
       let native2 = null;
       if (native2 == null && pkg2 == "linux-arm64") {