Fix type errors

lkarasinski · May 4, 2022 · 6ab5ae8 · 6ab5ae8
1 parent 5b760fe
commit 6ab5ae8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/javascript/jsc/ffi.exports.js b/src/javascript/jsc/ffi.exports.js
@@ -76,27 +76,23 @@ ffiWrappers[FFIType.i64_fast] = function int64(val) {
     if (val < BigInt(Number.MAX_VALUE)) {
       return Number(val).valueOf() || 0;
     }
-  }
 
-  if (!val) {
-    return 0;
+    return val;
   }
 
-  return +val || 0;
+  return !val ? 0 : +val || 0;
 };
 
 ffiWrappers[FFIType.u64_fast] = function u64_fast(val) {
   if (typeof val === "bigint") {
     if (val < BigInt(Number.MAX_VALUE) && val > 0) {
       return Number(val).valueOf() || 0;
     }
-  }
 
-  if (!val) {
-    return 0;
+    return val;
   }
 
-  return +val || 0;
+  return !val ? 0 : +val || 0;
 };
 
 ffiWrappers[FFIType.int64_t] = function int64(val) {
@@ -105,7 +101,7 @@ ffiWrappers[FFIType.int64_t] = function int64(val) {
   }
 
   if (typeof val === "number") {
-    return BigInt(val);
+    return BigInt(val || 0);
   }
 
   return BigInt(+val || 0);
@@ -117,7 +113,7 @@ ffiWrappers[FFIType.uint64_t] = function uint64(val) {
   }
 
   if (typeof val === "number") {
-    return val <= 0 ? BigInt(0) : BigInt(val);
+    return val <= 0 ? BigInt(0) : BigInt(val || 0);
   }
 
   return BigInt(+val || 0);

diff --git a/types/bun/ffi.d.ts b/types/bun/ffi.d.ts
@@ -460,7 +460,7 @@ declare module "bun:ffi" {
     close(): void;
   }
 
-  export function dlopen(libraryName: string, symbols: Symbols): Library<T>;
+  export function dlopen(libraryName: string, symbols: Symbols): Library;
 
   /**
    * Read a pointer as a {@link Buffer}
@@ -586,7 +586,7 @@ declare module "bun:ffi" {
      * reading beyond the bounds of the pointer will crash the program or cause
      * undefined behavior. Use with care!
      */
-    constructor(ptr: number, byteOffset?: number, byteLength?: number): string;
+    constructor(ptr: number, byteOffset?: number, byteLength?: number);
 
     /**
      * The ptr to the C string