koffi 2.12.5-beta.1 → 2.12.5-beta.2

package/doc/pages/contribute.md

@@ -123,7 +123,7 @@ node qemu.js info debian_x64
 
 First, you must update the code in three steps:
 
-- Change the version numbers in `package.json` (version and stable for stable releases)
+- Change the version number in `package.json`
 - Add an entry to `CHANGELOG` to summarize the changes since last release
 - Commit theses changes with the message *Bump Koffi to X.Y.Z*
 

package/index.d.ts

@@ -119,9 +119,13 @@ export function disposable(name: string | null | undefined, type: TypeSpec): IKo
 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;
 

package/index.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// package/src/cnoke/src/tools.js
+// bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "package/src/cnoke/src/tools.js"(exports2, module2) {
+  "bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -397,13 +397,12 @@ var require_tools = __commonJS({
   }
 });
 
-// package/src/koffi/package.json
+// bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "package/src/koffi/package.json"(exports2, module2) {
+  "bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.12.5-beta.1",
-      stable: "2.12.4",
+      version: "2.12.5-beta.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -444,9 +443,9 @@ var require_package = __commonJS({
   }
 });
 
-// package/src/koffi/src/init.js
+// bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "package/src/koffi/src/init.js"(exports, module) {
+  "bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -529,7 +528,7 @@ var require_init = __commonJS({
   }
 });
 
-// package/src/koffi/index.js
+// bin/Koffi/package/src/koffi/index.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var native2 = null;

package/indirect.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// package/src/cnoke/src/tools.js
+// bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "package/src/cnoke/src/tools.js"(exports2, module2) {
+  "bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -397,13 +397,12 @@ var require_tools = __commonJS({
   }
 });
 
-// package/src/koffi/package.json
+// bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "package/src/koffi/package.json"(exports2, module2) {
+  "bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.12.5-beta.1",
-      stable: "2.12.4",
+      version: "2.12.5-beta.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -444,9 +443,9 @@ var require_package = __commonJS({
   }
 });
 
-// package/src/koffi/src/init.js
+// bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "package/src/koffi/src/init.js"(exports, module) {
+  "bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -529,7 +528,7 @@ var require_init = __commonJS({
   }
 });
 
-// package/src/koffi/indirect.js
+// bin/Koffi/package/src/koffi/indirect.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var mod2 = init2(triplet2, null);

package/package.json

@@ -1,7 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.12.5-beta.1",
-    "stable": "2.12.4",
+    "version": "2.12.5-beta.2",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/koffi/src/ffi.cc

@@ -995,6 +995,8 @@ static Napi::Value CreateArrayType(const Napi::CallbackInfo &info)
 
 static bool ParseClassicFunction(const Napi::CallbackInfo &info, bool concrete, FunctionInfo *out_func)
 {
+    RG_ASSERT(info.Length() >= 2);
+
     Napi::Env env = info.Env();
     InstanceData *instance = env.GetInstanceData<InstanceData>();
 
@@ -1004,17 +1006,22 @@ static bool ParseClassicFunction(const Napi::CallbackInfo &info, bool concrete,
 
     // Detect optional call convention
     if (name.IsString() && DetectCallConvention(name.Utf8Value().c_str(), &out_func->convention)) {
-        if (info.Length() < 4) {
-            ThrowError<Napi::TypeError>(env, "Expected 4 arguments, got %1", info.Length());
+        if (info.Length() < 3) {
+            ThrowError<Napi::TypeError>(env, "Expected 3 or 4 arguments, got %1", info.Length());
             return false;
         }
 
         name = info[1u].As<Napi::String>();
         ret = info[2u];
-        parameters = info[3u].As<Napi::Array>();
+        parameters = (info.Length() >= 4 ? info[3u] : env.Null()).As<Napi::Array>();
     }
 
-    bool named = true;
+    bool named = parameters.IsArray();
+
+    if (!named) {
+        parameters = ret.As<Napi::Array>();
+        ret = name;
+    }
 
 #if defined(_WIN32)
     if (name.IsNumber()) {
@@ -1096,7 +1103,7 @@ static Napi::Value CreateFunctionType(const Napi::CallbackInfo &info)
     FunctionInfo *func = instance->callbacks.AppendDefault();
     RG_DEFER_N(err_guard) { instance->callbacks.RemoveLast(1); };
 
-    if (info.Length() >= 3) {
+    if (info.Length() >= 2) {
         if (!ParseClassicFunction(info, false, func))
             return env.Null();
     } else if (info.Length() >= 1) {
@@ -1109,7 +1116,7 @@ static Napi::Value CreateFunctionType(const Napi::CallbackInfo &info)
         if (!ParsePrototype(env, proto.c_str(), false, func))
             return env.Null();
     } else {
-        ThrowError<Napi::TypeError>(env, "Expected 1 or 3 arguments, got %1", info.Length());
+        ThrowError<Napi::TypeError>(env, "Expected 1 to 4 arguments, got %1", info.Length());
         return env.Null();
     }
 
@@ -1665,7 +1672,7 @@ static Napi::Value FindLibraryFunction(const Napi::CallbackInfo &info)
 
     func->lib = lib->Ref();
 
-    if (info.Length() >= 3) {
+    if (info.Length() >= 2) {
         if (!ParseClassicFunction(info, true, func))
             return env.Null();
     } else if (info.Length() >= 1) {
@@ -1678,7 +1685,7 @@ static Napi::Value FindLibraryFunction(const Napi::CallbackInfo &info)
         if (!ParsePrototype(env, proto.c_str(), true, func))
             return env.Null();
     } else {
-        ThrowError<Napi::TypeError>(env, "Expected 1 or 3 arguments, got %1", info.Length());
+        ThrowError<Napi::TypeError>(env, "Expected 1 to 4 arguments, got %1", info.Length());
         return env.Null();
     }
 

package/src/koffi/src/parser.cc

@@ -49,7 +49,10 @@ bool PrototypeParser::Parse(const char *str, bool concrete, FunctionInfo *out_fu
     if (IsIdentifier(tokens[offset])) {
         Span<const char> tok = tokens[offset++];
         out_func->name = DuplicateString(tok, &instance->str_alloc).ptr;
-    } else if (concrete) {
+    } else if (!concrete) {
+        // Leave anonymous naming responsibility to caller
+        out_func->name = nullptr;
+    } else {
         MarkError("Unexpected token '%1', expected identifier", tokens[offset]);
         return false;
     }