koffi 3.0.0-alpha.4 → 3.0.0-alpha.6

package/doc/contribute.md

@@ -145,8 +145,10 @@ cd src/koffi
 node tools/brew.js test # If not done before
 node tools/brew.js build
 
-cd ../../bin/Koffi/package
-npm publish
+cd ../../bin/koffi/packages
+
+./prepare.sh
+./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!

package/doc/packaging.md

@@ -11,7 +11,7 @@ Koffi uses native modules to work. The NPM package contains binaries for various
 
 In theory, the **packagers/bundlers should be able to find all native modules** because they are explictly listed in the Javascript file (as static strings) and package them somehow.
 
-If that is not the case, you can manually arrange to copy the `node_modules/koffi/build/koffi` directory next to your bundled script.
+If that is not the case, you can manually arrange to copy the `node_modules/koffi/bin/koffi` directory next to your bundled script.
 
 Here is an example that would work:
 

package/index.d.ts

@@ -152,8 +152,6 @@ type KoffiConfig = {
     resident_async_pools?: number;
     max_async_calls?: number;
     max_type_size?: number;
-    fast_pointers?: boolean;
-    fast_callbacks?: boolean;
 };
 type KoffiStats = {
     disposed: number

package/index.js

@@ -1 +1 @@
-export koffi from "./src/koffi/index.js";
+export { default } from "./src/koffi/index.js";

package/indirect.js

@@ -1 +1 @@
-export koffi from "./src/koffi/indirect.js";
+export { default } from "./src/koffi/indirect.js";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "3.0.0-alpha.4",
+    "version": "3.0.0-alpha.6",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",
@@ -21,18 +21,29 @@
         "email": "niels.martignene@protonmail.com",
         "url": "https://koromix.dev/"
     },
-    "module": "./index.js",
     "scripts": {
-        "install": "node src/build.js -P . -D src/koffi --prebuild --release"
+        "install": "node ./build.js -P . -D src/koffi --prebuild --release"
     },
     "license": "MIT",
     "cnoke": {
         "api": "../../vendor/node-api-headers",
-        "output": "build/koffi/{{ toolchain }}",
+        "output": "bin/koffi/{{ toolchain }}",
         "node": 16,
         "napi": 8
     },
     "funding": "https://liberapay.com/Koromix",
+    "type": "module",
     "main": "./index.cjs",
+    "module": "./index.js",
+    "exports": {
+        ".": {
+            "import": "./index.js",
+            "require": "./index.cjs"
+        },
+        "./indirect": {
+            "import": "./indirect.js",
+            "require": "./indirect.cjs"
+        }
+    },
     "types": "./index.d.ts"
 }

package/src/koffi/index.cjs

@@ -4,6 +4,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 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;
 };
@@ -29,154 +32,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/static.js
-var require_static = __commonJS({
-  "src/static.js"(exports2, module2) {
-    var { createRequire: createRequire2 } = require("node:module");
-    var requireNative2 = createRequire2(__dirname);
-    function loadStatic2(pkg2) {
-      let native2 = null;
-      if (native2 == null && pkg2 == "linux-arm64") {
-        try {
-          native2 = requireNative2("../../build/koffi/linux_arm64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "linux-arm64") {
-        try {
-          native2 = requireNative2("../../build/koffi/musl_arm64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "linux-ia32") {
-        try {
-          native2 = requireNative2("../../build/koffi/linux_ia32/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "linux-x64") {
-        try {
-          native2 = requireNative2("../../build/koffi/linux_x64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "linux-x64") {
-        try {
-          native2 = requireNative2("../../build/koffi/musl_x64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "freebsd-ia32") {
-        try {
-          native2 = requireNative2("../../build/koffi/freebsd_ia32/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "freebsd-x64") {
-        try {
-          native2 = requireNative2("../../build/koffi/freebsd_x64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "freebsd-arm64") {
-        try {
-          native2 = requireNative2("../../build/koffi/freebsd_arm64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "openbsd-ia32") {
-        try {
-          native2 = requireNative2("../../build/koffi/openbsd_ia32/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "openbsd-x64") {
-        try {
-          native2 = requireNative2("../../build/koffi/openbsd_x64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "win32-ia32") {
-        try {
-          native2 = requireNative2("../../build/koffi/win32_ia32/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "win32-x64") {
-        try {
-          native2 = requireNative2("../../build/koffi/win32_x64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "darwin-x64") {
-        try {
-          native2 = requireNative2("../../build/koffi/darwin_x64/koffi.node");
-        } catch (err) {
-        }
-      }
-      if (native2 == null && pkg2 == "darwin-arm64") {
-        try {
-          native2 = requireNative2("../../build/koffi/darwin_arm64/koffi.node");
-        } catch (err) {
-        }
-      }
-      return native2;
-    }
-    module2.exports = { loadStatic: loadStatic2 };
-  }
-});
-
-// index.js
-var index_exports = {};
-__export(index_exports, {
-  Union: () => _Union,
-  address: () => _address,
-  alias: () => _alias,
-  alignof: () => _alignof,
-  alloc: () => _alloc,
-  array: () => _array,
-  as: () => _as,
-  call: () => _call,
-  config: () => _config,
-  decode: () => _decode,
-  disposable: () => _disposable,
-  encode: () => _encode,
-  errno: () => _errno,
-  extension: () => _extension,
-  free: () => _free,
-  in: () => _in,
-  inout: () => _inout,
-  introspect: () => _introspect,
-  load: () => _load,
-  node: () => _node,
-  offsetof: () => _offsetof,
-  opaque: () => _opaque,
-  os: () => _os,
-  out: () => _out,
-  pack: () => _pack,
-  pointer: () => _pointer,
-  proto: () => _proto,
-  register: () => _register,
-  reset: () => _reset,
-  resolve: () => _resolve,
-  sizeof: () => _sizeof,
-  stats: () => _stats,
-  struct: () => _struct,
-  types: () => _types,
-  union: () => _union,
-  unregister: () => _unregister,
-  version: () => _version,
-  view: () => _view
-});
-module.exports = __toCommonJS(index_exports);
-
-// src/init.js
-var import_util = __toESM(require("util"));
-var import_fs2 = __toESM(require("fs"));
-var import_node_module = require("node:module");
-
 // ../cnoke/src/abi.js
-var import_fs = __toESM(require("fs"), 1);
 function determineAbi() {
   let abi = process.arch;
   if (abi == "riscv32" || abi == "riscv64") {
@@ -264,52 +120,28 @@ function decodeElfHeader(buf) {
   }
   return header;
 }
+var import_fs;
+var init_abi = __esm({
+  "../cnoke/src/abi.js"() {
+    import_fs = __toESM(require("fs"), 1);
+  }
+});
 
 // package.json
-var package_default = {
-  name: "koffi",
-  version: "3.0.0-alpha.4",
-  description: "Fast and simple C FFI (foreign function interface) for Node.js",
-  keywords: [
-    "foreign",
-    "function",
-    "interface",
-    "ffi",
-    "binding",
-    "c",
-    "napi"
-  ],
-  repository: {
-    type: "git",
-    url: "https://github.com/Koromix/koffi"
-  },
-  homepage: "https://koffi.dev/",
-  author: {
-    name: "Niels Martign\xE8ne",
-    email: "niels.martignene@protonmail.com",
-    url: "https://koromix.dev/"
-  },
-  main: "./index.cjs",
-  module: "./index.js",
-  types: "./index.d.ts",
-  scripts: {
-    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/brew.js build"
-  },
-  license: "MIT",
-  cnoke: {
-    api: "../../vendor/node-api-headers",
-    output: "../../bin/Koffi/{{ toolchain }}",
-    node: 16,
-    napi: 8
-  },
-  funding: "https://liberapay.com/Koromix"
-};
+var package_default;
+var init_package = __esm({
+  "package.json"() {
+    package_default = { name: "koffi", version: "3.0.0-alpha.6", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
+  }
+});
 
 // src/init.js
-var requireNative = (0, import_node_module.createRequire)(__dirname);
+var init_exports = {};
+__export(init_exports, {
+  detectPlatform: () => detectPlatform,
+  loadDynamic: () => loadDynamic,
+  wrapNative: () => wrapNative
+});
 function detectPlatform() {
   if (process.versions.napi == null || process.versions.napi < package_default.cnoke.napi) {
     let major = parseInt(process.versions.node, 10);
@@ -326,19 +158,17 @@ function loadDynamic(root, pkg2, triplets2) {
   let roots = [root];
   let native2 = null;
   let err = null;
-  if (process.resourcesPath != null)
+  if (process.resourcesPath != null) {
     roots.push(process.resourcesPath);
-  let filenames = roots.flatMap((dir) => triplets2.flatMap((triplet) => [
-    `${dir}/build/koffi/${triplet}/koffi.node`,
-    `${dir}/bin/Koffi/${triplet}/koffi.node`,
-    `${dir}/node_modules/koffi/build/koffi/${triplet}/koffi.node`,
-    `${dir}/../@koromix/koffi-${pkg2}/${triplet}/koffi.node`
-  ]));
-  for (let filename of filenames) {
-    if (!import_fs2.default.existsSync(filename))
-      continue;
+    roots.push(process.resourcesPath + "/node_modules/koffi");
+  }
+  let names = [
+    `@koromix/koffi-${pkg2}`,
+    ...triplets2.flatMap((triplet) => roots.map((dir) => `${dir}/bin/koffi/${triplet}/koffi.node`))
+  ];
+  for (let name of names) {
     try {
-      native2 = requireNative(filename);
+      native2 = requireNative(name);
       break;
     } catch (e) {
       err ??= e;
@@ -361,93 +191,123 @@ function wrapNative(native2) {
     return lib;
   };
 }
+var import_util, import_node_module, requireNative;
+var init_init = __esm({
+  "src/init.js"() {
+    import_util = __toESM(require("util"));
+    import_node_module = require("node:module");
+    init_abi();
+    init_package();
+    requireNative = (0, import_node_module.createRequire)(__dirname);
+  }
+});
+
+// src/static.js
+var require_static = __commonJS({
+  "src/static.js"(exports2, module2) {
+    var { createRequire: createRequire2 } = require("node:module");
+    var requireNative2 = createRequire2(__dirname);
+    function loadStatic2(pkg2) {
+      let native2 = null;
+      if (native2 == null && pkg2 == "linux-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/musl_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/musl_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "openbsd-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/openbsd_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "openbsd-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/openbsd_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "win32-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/win32_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "win32-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/win32_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "darwin-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/darwin_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "darwin-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/darwin_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      return native2;
+    }
+    module2.exports = { loadStatic: loadStatic2 };
+  }
+});
 
-// index.js
-var import_static = __toESM(require_static());
-var [version, pkg, triplets] = detectPlatform();
+// index.cjs
+var { detectPlatform: detectPlatform2, loadDynamic: loadDynamic2, wrapNative: wrapNative2 } = (init_init(), __toCommonJS(init_exports));
+var { loadStatic } = require_static();
+var [version, pkg, triplets] = detectPlatform2();
 var native = null;
-STATIC: native = (0, import_static.loadStatic)(pkg);
+STATIC: native = loadStatic(pkg);
 if (native == null)
-  native = loadDynamic(__dirname + "/../..", pkg, triplets);
+  native = loadDynamic2(__dirname + "/../..", pkg, triplets);
 if (native.version != version)
   throw new Error("Mismatched native Koffi modules");
-wrapNative(native);
-var _config = native.config;
-var _stats = native.stats;
-var _struct = native.struct;
-var _pack = native.pack;
-var _union = native.union;
-var _Union = native.Union;
-var _opaque = native.opaque;
-var _pointer = native.pointer;
-var _array = native.array;
-var _proto = native.proto;
-var _alias = native.alias;
-var _sizeof = native.sizeof;
-var _alignof = native.alignof;
-var _offsetof = native.offsetof;
-var _resolve = native.resolve;
-var _introspect = native.introspect;
-var _load = native.load;
-var _in = native.in;
-var _out = native.out;
-var _inout = native.inout;
-var _disposable = native.disposable;
-var _alloc = native.alloc;
-var _free = native.free;
-var _register = native.register;
-var _unregister = native.unregister;
-var _as = native.as;
-var _decode = native.decode;
-var _address = native.address;
-var _call = native.call;
-var _encode = native.encode;
-var _view = native.view;
-var _reset = native.reset;
-var _errno = native.errno;
-var _os = native.os;
-var _extension = native.extension;
-var _types = native.types;
-var _node = native.node;
-var _version = native.version;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Union,
-  address,
-  alias,
-  alignof,
-  alloc,
-  array,
-  as,
-  call,
-  config,
-  decode,
-  disposable,
-  encode,
-  errno,
-  extension,
-  free,
-  in: null,
-  inout,
-  introspect,
-  load,
-  node,
-  offsetof,
-  opaque,
-  os,
-  out,
-  pack,
-  pointer,
-  proto,
-  register,
-  reset,
-  resolve,
-  sizeof,
-  stats,
-  struct,
-  types,
-  union,
-  unregister,
-  version,
-  view
-});
+wrapNative2(native);
+module.exports = native;