koffi 3.0.0 → 3.0.1

package/src/koffi/index.js

@@ -6,7 +6,7 @@ import { createRequire } from "node:module";
 // ../cnoke/src/abi.js
 import fs from "node:fs";
 function determineAbi() {
-  let abi = process.arch;
+  let abi = process.arch.toString();
   if (abi == "riscv32" || abi == "riscv64") {
     let buf = readFileHeader(process.execPath, 512);
     let header = decodeElfHeader(buf);
@@ -94,14 +94,14 @@ function decodeElfHeader(buf) {
 }
 
 // package.json
-var package_default = { name: "koffi", version: "3.0.0", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
+var package_default = { name: "koffi", version: "3.0.1", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
 
 // src/init.js
 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);
-    throw new Error(`This engine is based on Node ${process.versions.node}, but ${package_default.name} does not support the Node ${major}.x branch (N-API < ${package_default.cnoke.napi})`);
+    throw new Error(`This engine is based on Node ${process.versions.node}, but ${package_default.name} does not support the Node ${major}.x branch (Node-API < ${package_default.cnoke.napi})`);
   }
   let abi = determineAbi();
   let pkg2 = `${process.platform}-${process.arch}`;
@@ -114,9 +114,9 @@ function loadDynamic(root, pkg2, triplets2) {
   let roots = [root];
   let native2 = null;
   let err = null;
-  if (process.resourcesPath != null) {
-    roots.push(process.resourcesPath);
-    roots.push(process.resourcesPath + "/node_modules/koffi");
+  if (process["resourcesPath"] != null) {
+    roots.push(process["resourcesPath"]);
+    roots.push(process["resourcesPath"] + "/node_modules/koffi");
   }
   let names = [
     `${import.meta.dirname}/../../../@koromix/koffi-${pkg2}`,
@@ -141,27 +141,26 @@ function loadDynamic(root, pkg2, triplets2) {
 function wrapNative(native2) {
   let load = native2.load;
   let register = native2.register;
-  native2.sizeof = (spec) => native2.type(spec).size;
-  native2.alignof = (spec) => native2.type(spec).alignment;
+  let introspect = native2.introspect ?? native2.type;
+  native2.sizeof = (spec) => introspect(spec).size;
+  native2.alignof = (spec) => introspect(spec).alignment;
   native2.offsetof = (spec, name) => {
-    let type = native2.type(spec);
-    if (type.primitive != "Record")
+    let info = introspect(spec);
+    if (info.primitive != "Record")
       throw new TypeError("The offsetof() function can only be used with record types");
-    let member = type.members[name];
+    let member = info.members[name];
     if (member == null)
-      throw new Error(`Record type ${type.name} does not have member '${name}'`);
+      throw new Error(`Record type ${info.name} does not have member '${name}'`);
     return member.offset;
   };
   native2.register = (...args) => {
     if (args.length >= 3 && typeof args[1] == "function") {
-      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 3.0, use function.bind() instead", "DeprecationWarning", "KOFFI009");
+      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 2.17, use function.bind() instead", "DeprecationWarning", "KOFFI009");
       args[1] = args[1].bind(args[0]);
       args = args.slice(1);
     }
     return register(...args);
   };
-  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");
@@ -170,6 +169,12 @@ function wrapNative(native2) {
     lib.thiscall = util.deprecate((...args2) => lib.func("__thiscall", ...args2), 'The koffi.thiscall() function was deprecated in Koffi 2.7, use koffi.func("__thiscall", ...) instead', "KOFFI006");
     return lib;
   };
+  if (native2.introspect == null) {
+    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");
+  } else {
+    native2.resolve = native2.type;
+  }
 }
 
 // src/static.js
@@ -260,7 +265,91 @@ if (native == null)
 if (native.version != version)
   throw new Error("Mismatched native Koffi modules");
 wrapNative(native);
+var mod_LibraryHandle = native.LibraryHandle;
+var mod_TypeObject = native.TypeObject;
+var mod_Union = native.Union;
+var mod_address = native.address;
+var mod_alias = native.alias;
+var mod_alignof = native.alignof;
+var mod_alloc = native.alloc;
+var mod_array = native.array;
+var mod_as = native.as;
+var mod_call = native.call;
+var mod_config = native.config;
+var mod_decode = native.decode;
+var mod_disposable = native.disposable;
+var mod_encode = native.encode;
+var mod_enumeration = native.enumeration;
+var mod_errno = native.errno;
+var mod_extension = native.extension;
+var mod_free = native.free;
+var mod_in = native.in;
+var mod_inout = native.inout;
+var mod_introspect = native.introspect;
+var mod_load = native.load;
+var mod_node = native.node;
+var mod_offsetof = native.offsetof;
+var mod_opaque = native.opaque;
+var mod_os = native.os;
+var mod_out = native.out;
+var mod_pack = native.pack;
+var mod_pointer = native.pointer;
+var mod_proto = native.proto;
+var mod_register = native.register;
+var mod_reset = native.reset;
+var mod_resolve = native.resolve;
+var mod_sizeof = native.sizeof;
+var mod_stats = native.stats;
+var mod_struct = native.struct;
+var mod_type = native.type;
+var mod_types = native.types;
+var mod_union = native.union;
+var mod_unregister = native.unregister;
+var mod_version = native.version;
+var mod_view = native.view;
 var index_default = native;
 export {
-  index_default as default
+  mod_LibraryHandle as LibraryHandle,
+  mod_TypeObject as TypeObject,
+  mod_Union as Union,
+  mod_address as address,
+  mod_alias as alias,
+  mod_alignof as alignof,
+  mod_alloc as alloc,
+  mod_array as array,
+  mod_as as as,
+  mod_call as call,
+  mod_config as config,
+  mod_decode as decode,
+  index_default as default,
+  mod_disposable as disposable,
+  mod_encode as encode,
+  mod_enumeration as enumeration,
+  mod_errno as errno,
+  mod_extension as extension,
+  mod_free as free,
+  mod_in as in,
+  mod_inout as inout,
+  mod_introspect as introspect,
+  mod_load as load,
+  mod_node as node,
+  mod_offsetof as offsetof,
+  mod_opaque as opaque,
+  mod_os as os,
+  mod_out as out,
+  mod_pack as pack,
+  mod_pointer as pointer,
+  mod_proto as proto,
+  mod_register as register,
+  mod_reset as reset,
+  mod_resolve as resolve,
+  mod_sizeof as sizeof,
+  mod_stats as stats,
+  mod_struct as struct,
+  mod_type as type,
+  mod_types as types,
+  mod_union as union,
+  mod_unregister as unregister,
+  mod_version as version,
+  mod_view as view
 };

package/src/koffi/indirect.cjs

@@ -34,7 +34,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 
 // ../cnoke/src/abi.js
 function determineAbi() {
-  let abi = process.arch;
+  let abi = process.arch.toString();
   if (abi == "riscv32" || abi == "riscv64") {
     let buf = readFileHeader(process.execPath, 512);
     let header = decodeElfHeader(buf);
@@ -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", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
+    package_default = { name: "koffi", version: "3.0.1", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
   }
 });
 
@@ -145,7 +145,7 @@ __export(init_exports, {
 function detectPlatform() {
   if (process.versions.napi == null || process.versions.napi < package_default.cnoke.napi) {
     let major = parseInt(process.versions.node, 10);
-    throw new Error(`This engine is based on Node ${process.versions.node}, but ${package_default.name} does not support the Node ${major}.x branch (N-API < ${package_default.cnoke.napi})`);
+    throw new Error(`This engine is based on Node ${process.versions.node}, but ${package_default.name} does not support the Node ${major}.x branch (Node-API < ${package_default.cnoke.napi})`);
   }
   let abi = determineAbi();
   let pkg2 = `${process.platform}-${process.arch}`;
@@ -158,9 +158,9 @@ function loadDynamic(root, pkg2, triplets2) {
   let roots = [root];
   let native2 = null;
   let err = null;
-  if (process.resourcesPath != null) {
-    roots.push(process.resourcesPath);
-    roots.push(process.resourcesPath + "/node_modules/koffi");
+  if (process["resourcesPath"] != null) {
+    roots.push(process["resourcesPath"]);
+    roots.push(process["resourcesPath"] + "/node_modules/koffi");
   }
   let names = [
     `${__dirname}/../../../@koromix/koffi-${pkg2}`,
@@ -185,27 +185,26 @@ function loadDynamic(root, pkg2, triplets2) {
 function wrapNative(native2) {
   let load = native2.load;
   let register = native2.register;
-  native2.sizeof = (spec) => native2.type(spec).size;
-  native2.alignof = (spec) => native2.type(spec).alignment;
+  let introspect = native2.introspect ?? native2.type;
+  native2.sizeof = (spec) => introspect(spec).size;
+  native2.alignof = (spec) => introspect(spec).alignment;
   native2.offsetof = (spec, name) => {
-    let type = native2.type(spec);
-    if (type.primitive != "Record")
+    let info = introspect(spec);
+    if (info.primitive != "Record")
       throw new TypeError("The offsetof() function can only be used with record types");
-    let member = type.members[name];
+    let member = info.members[name];
     if (member == null)
-      throw new Error(`Record type ${type.name} does not have member '${name}'`);
+      throw new Error(`Record type ${info.name} does not have member '${name}'`);
     return member.offset;
   };
   native2.register = (...args) => {
     if (args.length >= 3 && typeof args[1] == "function") {
-      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 3.0, use function.bind() instead", "DeprecationWarning", "KOFFI009");
+      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 2.17, use function.bind() instead", "DeprecationWarning", "KOFFI009");
       args[1] = args[1].bind(args[0]);
       args = args.slice(1);
     }
     return register(...args);
   };
-  native2.resolve = import_node_util.default.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
-  native2.introspect = import_node_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_node_util.default.deprecate((...args2) => lib.func("__cdecl", ...args2), "The koffi.cdecl() function was deprecated in Koffi 2.7, use koffi.func(...) instead", "KOFFI003");
@@ -214,6 +213,12 @@ function wrapNative(native2) {
     lib.thiscall = import_node_util.default.deprecate((...args2) => lib.func("__thiscall", ...args2), 'The koffi.thiscall() function was deprecated in Koffi 2.7, use koffi.func("__thiscall", ...) instead', "KOFFI006");
     return lib;
   };
+  if (native2.introspect == null) {
+    native2.resolve = import_node_util.default.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
+    native2.introspect = import_node_util.default.deprecate(native2.type, "The koffi.introspect() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI008");
+  } else {
+    native2.resolve = native2.type;
+  }
 }
 var import_node_util, import_node_fs2, import_node_module, requireNative;
 var init_init = __esm({
@@ -324,4 +329,48 @@ if (native == null)
 if (native.version != version)
   throw new Error("Mismatched native Koffi modules");
 wrapNative2(native);
-module.exports = native;
+module.exports = {
+  default: native,
+  "LibraryHandle": native["LibraryHandle"],
+  "TypeObject": native["TypeObject"],
+  "Union": native["Union"],
+  "address": native["address"],
+  "alias": native["alias"],
+  "alignof": native["alignof"],
+  "alloc": native["alloc"],
+  "array": native["array"],
+  "as": native["as"],
+  "call": native["call"],
+  "config": native["config"],
+  "decode": native["decode"],
+  "disposable": native["disposable"],
+  "encode": native["encode"],
+  "enumeration": native["enumeration"],
+  "errno": native["errno"],
+  "extension": native["extension"],
+  "free": native["free"],
+  "in": native["in"],
+  "inout": native["inout"],
+  "introspect": native["introspect"],
+  "load": native["load"],
+  "node": native["node"],
+  "offsetof": native["offsetof"],
+  "opaque": native["opaque"],
+  "os": native["os"],
+  "out": native["out"],
+  "pack": native["pack"],
+  "pointer": native["pointer"],
+  "proto": native["proto"],
+  "register": native["register"],
+  "reset": native["reset"],
+  "resolve": native["resolve"],
+  "sizeof": native["sizeof"],
+  "stats": native["stats"],
+  "struct": native["struct"],
+  "type": native["type"],
+  "types": native["types"],
+  "union": native["union"],
+  "unregister": native["unregister"],
+  "version": native["version"],
+  "view": native["view"]
+};

package/src/koffi/indirect.js

@@ -6,7 +6,7 @@ import { createRequire } from "node:module";
 // ../cnoke/src/abi.js
 import fs from "node:fs";
 function determineAbi() {
-  let abi = process.arch;
+  let abi = process.arch.toString();
   if (abi == "riscv32" || abi == "riscv64") {
     let buf = readFileHeader(process.execPath, 512);
     let header = decodeElfHeader(buf);
@@ -94,14 +94,14 @@ function decodeElfHeader(buf) {
 }
 
 // package.json
-var package_default = { name: "koffi", version: "3.0.0", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
+var package_default = { name: "koffi", version: "3.0.1", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
 
 // src/init.js
 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);
-    throw new Error(`This engine is based on Node ${process.versions.node}, but ${package_default.name} does not support the Node ${major}.x branch (N-API < ${package_default.cnoke.napi})`);
+    throw new Error(`This engine is based on Node ${process.versions.node}, but ${package_default.name} does not support the Node ${major}.x branch (Node-API < ${package_default.cnoke.napi})`);
   }
   let abi = determineAbi();
   let pkg2 = `${process.platform}-${process.arch}`;
@@ -114,9 +114,9 @@ function loadDynamic(root, pkg2, triplets2) {
   let roots = [root];
   let native2 = null;
   let err = null;
-  if (process.resourcesPath != null) {
-    roots.push(process.resourcesPath);
-    roots.push(process.resourcesPath + "/node_modules/koffi");
+  if (process["resourcesPath"] != null) {
+    roots.push(process["resourcesPath"]);
+    roots.push(process["resourcesPath"] + "/node_modules/koffi");
   }
   let names = [
     `${import.meta.dirname}/../../../@koromix/koffi-${pkg2}`,
@@ -141,27 +141,26 @@ function loadDynamic(root, pkg2, triplets2) {
 function wrapNative(native2) {
   let load = native2.load;
   let register = native2.register;
-  native2.sizeof = (spec) => native2.type(spec).size;
-  native2.alignof = (spec) => native2.type(spec).alignment;
+  let introspect = native2.introspect ?? native2.type;
+  native2.sizeof = (spec) => introspect(spec).size;
+  native2.alignof = (spec) => introspect(spec).alignment;
   native2.offsetof = (spec, name) => {
-    let type = native2.type(spec);
-    if (type.primitive != "Record")
+    let info = introspect(spec);
+    if (info.primitive != "Record")
       throw new TypeError("The offsetof() function can only be used with record types");
-    let member = type.members[name];
+    let member = info.members[name];
     if (member == null)
-      throw new Error(`Record type ${type.name} does not have member '${name}'`);
+      throw new Error(`Record type ${info.name} does not have member '${name}'`);
     return member.offset;
   };
   native2.register = (...args) => {
     if (args.length >= 3 && typeof args[1] == "function") {
-      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 3.0, use function.bind() instead", "DeprecationWarning", "KOFFI009");
+      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 2.17, use function.bind() instead", "DeprecationWarning", "KOFFI009");
       args[1] = args[1].bind(args[0]);
       args = args.slice(1);
     }
     return register(...args);
   };
-  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");
@@ -170,6 +169,12 @@ function wrapNative(native2) {
     lib.thiscall = util.deprecate((...args2) => lib.func("__thiscall", ...args2), 'The koffi.thiscall() function was deprecated in Koffi 2.7, use koffi.func("__thiscall", ...) instead', "KOFFI006");
     return lib;
   };
+  if (native2.introspect == null) {
+    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");
+  } else {
+    native2.resolve = native2.type;
+  }
 }
 
 // src/static.js
@@ -185,7 +190,91 @@ if (native == null)
 if (native.version != version)
   throw new Error("Mismatched native Koffi modules");
 wrapNative(native);
+var mod_LibraryHandle = native.LibraryHandle;
+var mod_TypeObject = native.TypeObject;
+var mod_Union = native.Union;
+var mod_address = native.address;
+var mod_alias = native.alias;
+var mod_alignof = native.alignof;
+var mod_alloc = native.alloc;
+var mod_array = native.array;
+var mod_as = native.as;
+var mod_call = native.call;
+var mod_config = native.config;
+var mod_decode = native.decode;
+var mod_disposable = native.disposable;
+var mod_encode = native.encode;
+var mod_enumeration = native.enumeration;
+var mod_errno = native.errno;
+var mod_extension = native.extension;
+var mod_free = native.free;
+var mod_in = native.in;
+var mod_inout = native.inout;
+var mod_introspect = native.introspect;
+var mod_load = native.load;
+var mod_node = native.node;
+var mod_offsetof = native.offsetof;
+var mod_opaque = native.opaque;
+var mod_os = native.os;
+var mod_out = native.out;
+var mod_pack = native.pack;
+var mod_pointer = native.pointer;
+var mod_proto = native.proto;
+var mod_register = native.register;
+var mod_reset = native.reset;
+var mod_resolve = native.resolve;
+var mod_sizeof = native.sizeof;
+var mod_stats = native.stats;
+var mod_struct = native.struct;
+var mod_type = native.type;
+var mod_types = native.types;
+var mod_union = native.union;
+var mod_unregister = native.unregister;
+var mod_version = native.version;
+var mod_view = native.view;
 var index_default = native;
 export {
-  index_default as default
+  mod_LibraryHandle as LibraryHandle,
+  mod_TypeObject as TypeObject,
+  mod_Union as Union,
+  mod_address as address,
+  mod_alias as alias,
+  mod_alignof as alignof,
+  mod_alloc as alloc,
+  mod_array as array,
+  mod_as as as,
+  mod_call as call,
+  mod_config as config,
+  mod_decode as decode,
+  index_default as default,
+  mod_disposable as disposable,
+  mod_encode as encode,
+  mod_enumeration as enumeration,
+  mod_errno as errno,
+  mod_extension as extension,
+  mod_free as free,
+  mod_in as in,
+  mod_inout as inout,
+  mod_introspect as introspect,
+  mod_load as load,
+  mod_node as node,
+  mod_offsetof as offsetof,
+  mod_opaque as opaque,
+  mod_os as os,
+  mod_out as out,
+  mod_pack as pack,
+  mod_pointer as pointer,
+  mod_proto as proto,
+  mod_register as register,
+  mod_reset as reset,
+  mod_resolve as resolve,
+  mod_sizeof as sizeof,
+  mod_stats as stats,
+  mod_struct as struct,
+  mod_type as type,
+  mod_types as types,
+  mod_union as union,
+  mod_unregister as unregister,
+  mod_version as version,
+  mod_view as view
 };