bare-buffer 1.2.8 → 1.2.10

package/binding.c

@@ -36,7 +36,17 @@ bare_buffer_set_zero_fill_enabled (js_env_t *env, js_callback_info_t *info) {
 
 static uint32_t
 bare_buffer_byte_length_utf8_fast (js_ffi_receiver_t *receiver, js_ffi_string_t *str) {
-  return str->len;
+  const uint8_t *data = (const uint8_t *) str->data;
+
+  uint32_t len = 0;
+
+  for (uint32_t i = 0, n = str->len; i < n; i++) {
+    // The string data is latin1 so we add an additional byte count for all
+    // non-ASCII characters.
+    len += 1 + (data[i] >> 7);
+  }
+
+  return len;
 }
 
 static js_value_t *

package/index.js

@@ -118,17 +118,13 @@ const Buffer = module.exports = exports = class Buffer extends Uint8Array {
   }
 
   indexOf (value, offset = 0, encoding) {
-    if (typeof value === 'number') {
-      return super.indexOf(value & 0xff, offset)
-    }
+    if (typeof value === 'number') return super.indexOf(value & 0xff, offset)
 
     return bidirectionalIndexOf(this, value, offset, encoding, true /* first */)
   }
 
   lastIndexOf (value, offset = this.byteLength - 1, encoding) {
-    if (typeof value === 'number') {
-      return super.lastIndexOf(value & 0xff, offset)
-    }
+    if (typeof value === 'number') return super.lastIndexOf(value & 0xff, offset)
 
     return bidirectionalIndexOf(this, value, offset, encoding, false /* last */)
   }
@@ -172,8 +168,10 @@ const Buffer = module.exports = exports = class Buffer extends Uint8Array {
   }
 
   toString (encoding, start = 0, end = this.byteLength) {
+    // toString()
     if (arguments.length === 0) return utf8.toString(this)
 
+    // toString(encoding)
     if (arguments.length === 1) return codecFor(encoding).toString(this)
 
     if (start < 0) start = 0
@@ -190,6 +188,7 @@ const Buffer = module.exports = exports = class Buffer extends Uint8Array {
   }
 
   write (string, offset = 0, length = this.byteLength - offset, encoding = 'utf8') {
+    // write(string)
     if (arguments.length === 1) return utf8.write(this, string)
 
     // write(string, encoding)

package/lib/base64.js

@@ -9,10 +9,6 @@ exports.byteLength = function byteLength (string) {
   return (len * 3) >>> 2
 }
 
-exports.toString = function toString (buffer) {
-  return binding.toStringBase64(buffer)
-}
+exports.toString = binding.toStringBase64
 
-exports.write = function write (buffer, string) {
-  return binding.writeBase64(buffer, string)
-}
+exports.write = binding.writeBase64

package/lib/hex.js

@@ -4,10 +4,6 @@ exports.byteLength = function byteLength (string) {
   return string.length >>> 1
 }
 
-exports.toString = function toString (buffer) {
-  return binding.toStringHex(buffer)
-}
+exports.toString = binding.toStringHex
 
-exports.write = function write (buffer, string) {
-  return binding.writeHex(buffer, string)
-}
+exports.write = binding.writeHex

package/lib/utf16le.js

@@ -4,10 +4,6 @@ exports.byteLength = function byteLength (string) {
   return string.length * 2
 }
 
-exports.toString = function toString (buffer) {
-  return binding.toStringUTF16LE(buffer)
-}
+exports.toString = binding.toStringUTF16LE
 
-exports.write = function write (buffer, string) {
-  return binding.writeUTF16LE(buffer, string)
-}
+exports.write = binding.writeUTF16LE

package/lib/utf8.js

@@ -1,13 +1,7 @@
 const binding = require('../binding')
 
-exports.byteLength = function byteLength (string) {
-  return binding.byteLengthUTF8(string)
-}
+exports.byteLength = binding.byteLengthUTF8
 
-exports.toString = function toString (buffer) {
-  return binding.toStringUTF8(buffer)
-}
+exports.toString = binding.toStringUTF8
 
-exports.write = function write (buffer, string) {
-  return binding.writeUTF8(buffer, string)
-}
+exports.write = binding.writeUTF8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-buffer",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "Native buffers for JavaScript",
   "main": "index.js",
   "files": [