koffi 3.0.0 → 3.0.2

package/src/koffi/CMakeLists.txt

@@ -67,6 +67,7 @@ set(KOFFI_SRC
     src/call.cc
     src/ffi.cc
     src/parser.cc
+    src/type.cc
     src/util.cc
     src/uv.cc
     src/win32.cc
@@ -137,6 +138,7 @@ if(WIN32)
 endif()
 
 target_compile_definitions(koffi PRIVATE FELIX_TARGET=koffi NAPI_DISABLE_CPP_EXCEPTIONS NAPI_VERSION=NAPI_VERSION_EXPERIMENTAL)
+
 if(WIN32)
     target_compile_definitions(koffi PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
     target_link_libraries(koffi PRIVATE ws2_32)
@@ -152,27 +154,33 @@ endif()
 option(PGO_GENERATE "Build with PGO profile generation" "")
 option(PGO_USE "Optimize with PGO profile" "")
 
-if(MSVC AND (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
-    target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/GS- /Ob2>)
-
-    if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /clang:-O3")
+if(MSVC)
+    if (NOT CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+        target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/EHsc>)
     endif()
 
-    if(CMAKE_BUILD_TYPE STREQUAL "Release")
-        target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/Oy->)
+    if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+        target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/GS- /Ob2>)
+
+        if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+            set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /clang:-O3")
+        endif()
+
+        if(CMAKE_BUILD_TYPE STREQUAL "Release")
+            target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/Oy->)
+        endif()
     endif()
 endif()
 
 if(NOT MSVC OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
     # Restore C/C++ compiler sanity
 
-    if(NOT MSVC)
-        target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-strict-aliasing -fwrapv
-                                                                       -fno-delete-null-pointer-checks>)
+    target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions -fno-rtti -fno-strict-aliasing
+                                                                   -fno-delete-null-pointer-checks>)
+    if(MSVC)
+        target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/clang:-fwrapv>)
     else()
-        target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-strict-aliasing /clang:-fwrapv
-                                                                       -fno-delete-null-pointer-checks>)
+        target_compile_options(koffi PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fwrapv>)
     endif()
 
     check_cxx_compiler_flag(-fno-finite-loops use_no_finite_loops)

package/src/koffi/index.cjs

@@ -7,9 +7,6 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -32,9 +29,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../cnoke/src/abi.js
+// src/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);
@@ -122,20 +119,20 @@ function decodeElfHeader(buf) {
 }
 var import_node_fs;
 var init_abi = __esm({
-  "../cnoke/src/abi.js"() {
+  "src/cnoke/src/abi.js"() {
     import_node_fs = __toESM(require("node:fs"), 1);
   }
 });
 
-// package.json
+// src/koffi/package.json
 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 } };
+  "src/koffi/package.json"() {
+    package_default = { name: "koffi", version: "3.0.2", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
   }
 });
 
-// src/init.js
+// src/koffi/src/init.js
 var init_exports = {};
 __export(init_exports, {
   detectPlatform: () => detectPlatform,
@@ -145,7 +142,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}`;
@@ -154,13 +151,20 @@ function detectPlatform() {
     triplets2.push(`musl_${abi}`);
   return [package_default.version, pkg2, triplets2];
 }
-function loadDynamic(root, pkg2, triplets2) {
+function loadDynamic(dirname, pkg2, triplets2) {
+  let suffix = "/../../build/koffi";
+  let root = dirname + suffix;
   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) {
+    let suffixes = [
+      "/koffi",
+      "/koffi/build",
+      "/node_modules/koffi/build"
+    ];
+    for (let suffix2 of suffixes)
+      roots.push(process["resourcesPath"] + suffix2);
   }
   let names = [
     `${__dirname}/../../../@koromix/koffi-${pkg2}`,
@@ -170,42 +174,43 @@ function loadDynamic(root, pkg2, triplets2) {
     if (!import_node_fs2.default.existsSync(name))
       continue;
     try {
-      native2 = requireNative(name);
+      native2 = require2(name);
       break;
     } catch (e) {
       err ??= e;
     }
   }
-  if (native2 == null) {
-    err ??= new Error("Cannot find the native Koffi module; did you bundle it correctly?");
+  if (native2 == null && err != null)
     throw err;
-  }
   return native2;
 }
-function wrapNative(native2) {
+function wrapNative(native2, version2) {
+  if (native2 == null)
+    throw new Error("Cannot find the native Koffi module; did you bundle it correctly?");
+  if (native2.version != version2)
+    throw new Error("Mismatched native Koffi modules");
   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,115 +219,73 @@ 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 import_node_util, import_node_fs2, import_node_module, require2;
 var init_init = __esm({
-  "src/init.js"() {
+  "src/koffi/src/init.js"() {
     import_node_util = __toESM(require("node:util"));
     import_node_fs2 = __toESM(require("node:fs"));
     import_node_module = require("node:module");
     init_abi();
     init_package();
-    requireNative = (0, import_node_module.createRequire)(__filename);
-  }
-});
-
-// src/static.js
-var require_static = __commonJS({
-  "src/static.js"(exports2, module2) {
-    var { createRequire: createRequire2 } = require("node:module");
-    var requireNative2 = createRequire2(__filename);
-    var BINARY_ROOT2 = __dirname + "/../../build/koffi";
-    function loadStatic2(pkg2) {
-      let native2 = null;
-      try {
-        if (pkg2 == "linux-arm64")
-          native2 = requireNative2("../../../@koromix/koffi-linux-arm64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "linux-ia32")
-          native2 = requireNative2("../../../@koromix/koffi-linux-ia32");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "linux-x64")
-          native2 = requireNative2("../../../@koromix/koffi-linux-x64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "linux-riscv64")
-          native2 = requireNative2("../../../@koromix/koffi-linux-riscv64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "freebsd-ia32")
-          native2 = requireNative2("../../../@koromix/koffi-freebsd-ia32");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "freebsd-x64")
-          native2 = requireNative2("../../../@koromix/koffi-freebsd-x64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "freebsd-arm64")
-          native2 = requireNative2("../../../@koromix/koffi-freebsd-arm64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "openbsd-ia32")
-          native2 = requireNative2("../../../@koromix/koffi-openbsd-ia32");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "openbsd-x64")
-          native2 = requireNative2("../../../@koromix/koffi-openbsd-x64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "win32-ia32")
-          native2 = requireNative2("../../../@koromix/koffi-win32-ia32");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "win32-x64")
-          native2 = requireNative2("../../../@koromix/koffi-win32-x64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "darwin-x64")
-          native2 = requireNative2("../../../@koromix/koffi-darwin-x64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "darwin-arm64")
-          native2 = requireNative2("../../../@koromix/koffi-darwin-arm64");
-      } catch (err) {
-      }
-      try {
-        if (pkg2 == "linux-loong64")
-          native2 = requireNative2("../../../@koromix/koffi-linux-loong64");
-      } catch (err) {
-      }
-      return native2;
-    }
-    module2.exports = {
-      BINARY_ROOT: BINARY_ROOT2,
-      loadStatic: loadStatic2
-    };
+    require2 = (0, import_node_module.createRequire)(__filename);
   }
 });
 
-// index.cjs
+// src/koffi/index.cjs
 var { detectPlatform: detectPlatform2, loadDynamic: loadDynamic2, wrapNative: wrapNative2 } = (init_init(), __toCommonJS(init_exports));
-var { BINARY_ROOT, loadStatic } = require_static();
+var { loadStatic } = require("./src/static.cjs");
 var [version, pkg, triplets] = detectPlatform2();
-var native = null;
-STATIC: native = loadStatic(pkg);
-if (native == null)
-  native = loadDynamic2(BINARY_ROOT, pkg, triplets);
-if (native.version != version)
-  throw new Error("Mismatched native Koffi modules");
-wrapNative2(native);
-module.exports = native;
+var native = loadStatic(pkg) ?? loadDynamic2(__dirname, pkg, triplets);
+wrapNative2(native, version);
+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"]
+};