ordered-binary 1.4.0 → 1.4.1

package/.nyc_output/5b6bd808-0399-4ee6-9395-344688761dfa.json

@@ -0,0 +1 @@
+{}

package/.nyc_output/processinfo/5b6bd808-0399-4ee6-9395-344688761dfa.json

@@ -0,0 +1 @@
+{"parent":null,"pid":240712,"argv":["/home/kzyp/.nvm/versions/node/v20.0.0/bin/node","/home/kzyp/dev/ordered-binary/node_modules/mocha/bin/mocha","--ui","tdd","--reporter","/home/kzyp/.local/share/JetBrains/Toolbox/apps/CLion/ch-0/222.4167.35.plugins/NodeJS/js/mocha-intellij/lib/mochaIntellijReporter.js","/home/kzyp/dev/ordered-binary/tests/test.js"],"execArgv":[],"cwd":"/home/kzyp/dev/ordered-binary","time":1688411366364,"ppid":240701,"coverageFilename":"/home/kzyp/dev/ordered-binary/.nyc_output/5b6bd808-0399-4ee6-9395-344688761dfa.json","externalId":"","uuid":"5b6bd808-0399-4ee6-9395-344688761dfa","files":[]}

package/.nyc_output/processinfo/index.json

@@ -0,0 +1 @@
+{"processes":{"5b6bd808-0399-4ee6-9395-344688761dfa":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/dist/index.cjs

@@ -69,7 +69,7 @@ function writeKey(key, target, position, inSequence) {
 			}
 		} else {
 			if (target.utf8Write)
-				position += target.utf8Write(key, position);
+				position += target.utf8Write(key, position, 0xffffffff);
 			else
 				position += textEncoder.encodeInto(key, target.subarray(position)).written;
 			if (position > target.length - 4)
@@ -288,20 +288,19 @@ function finishUtf8(byte1, src) {
 	} else if ((byte1 & 0xf8) === 0xf0) {
 		// 4 bytes
 		if (pendingSurrogate) {
-		byte1 = pendingSurrogate;
-		pendingSurrogate = null;
-		position += 3;
-		return byte1
+			byte1 = pendingSurrogate;
+			pendingSurrogate = null;
+			position += 3;
+			return byte1
 		}
 		const byte2 = src[position++] & 0x3f;
 		const byte3 = src[position++] & 0x3f;
 		const byte4 = src[position++] & 0x3f;
 		let unit = ((byte1 & 0x07) << 0x12) | (byte2 << 0x0c) | (byte3 << 0x06) | byte4;
 		if (unit > 0xffff) {
-		unit -= 0x10000;
-		unit = 0xdc00 | (unit & 0x3ff);
-		pendingSurrogate = ((unit >>> 10) & 0x3ff) | 0xd800;
-		position -= 4; // reset so we can return the next part of the surrogate pair
+			pendingSurrogate = 0xdc00 | (unit & 0x3ff);
+			unit = (((unit - 0x10000) >>> 10) & 0x3ff) | 0xd800;
+			position -= 4; // reset so we can return the next part of the surrogate pair
 		}
 		return unit
 	} else {
@@ -309,7 +308,23 @@ function finishUtf8(byte1, src) {
 	}
 }
 
-const readString = eval(makeStringBuilder());
+const readString =
+	typeof process !== 'undefined' && process.isBun ? // the eval in bun doesn't properly closure on position, so we
+		// have to manually update it
+		(function(reading) {
+			let { setPosition, getPosition, readString } = reading;
+			return (source) => {
+				setPosition(position);
+				let value = readString(source);
+				position = getPosition();
+				return value;
+			};
+		})((new Function('fromCharCode', 'let position; let readString = ' + makeStringBuilder() +
+			';return {' +
+			'setPosition(p) { position = p },' +
+			'getPosition() { return position },' +
+			'readString }'))(fromCharCode)) :
+		eval(makeStringBuilder());
 
 function compareKeys(a, b) {
 	// compare with type consistency that matches binary comparison

package/index.js

@@ -65,7 +65,7 @@ export function writeKey(key, target, position, inSequence) {
 			}
 		} else {
 			if (target.utf8Write)
-				position += target.utf8Write(key, position)
+				position += target.utf8Write(key, position, 0xffffffff)
 			else
 				position += textEncoder.encodeInto(key, target.subarray(position)).written
 			if (position > target.length - 4)
@@ -284,20 +284,19 @@ function finishUtf8(byte1, src) {
 	} else if ((byte1 & 0xf8) === 0xf0) {
 		// 4 bytes
 		if (pendingSurrogate) {
-		byte1 = pendingSurrogate
-		pendingSurrogate = null
-		position += 3
-		return byte1
+			byte1 = pendingSurrogate
+			pendingSurrogate = null
+			position += 3
+			return byte1
 		}
 		const byte2 = src[position++] & 0x3f
 		const byte3 = src[position++] & 0x3f
 		const byte4 = src[position++] & 0x3f
 		let unit = ((byte1 & 0x07) << 0x12) | (byte2 << 0x0c) | (byte3 << 0x06) | byte4
 		if (unit > 0xffff) {
-		unit -= 0x10000
-		unit = 0xdc00 | (unit & 0x3ff)
-		pendingSurrogate = ((unit >>> 10) & 0x3ff) | 0xd800
-		position -= 4 // reset so we can return the next part of the surrogate pair
+			pendingSurrogate = 0xdc00 | (unit & 0x3ff)
+			unit = (((unit - 0x10000) >>> 10) & 0x3ff) | 0xd800
+			position -= 4 // reset so we can return the next part of the surrogate pair
 		}
 		return unit
 	} else {
@@ -305,7 +304,23 @@ function finishUtf8(byte1, src) {
 	}
 }
 
-const readString = eval(makeStringBuilder())
+const readString =
+	typeof process !== 'undefined' && process.isBun ? // the eval in bun doesn't properly closure on position, so we
+		// have to manually update it
+		(function(reading) {
+			let { setPosition, getPosition, readString } = reading;
+			return (source) => {
+				setPosition(position);
+				let value = readString(source);
+				position = getPosition();
+				return value;
+			};
+		})((new Function('fromCharCode', 'let position; let readString = ' + makeStringBuilder() +
+			';return {' +
+			'setPosition(p) { position = p },' +
+			'getPosition() { return position },' +
+			'readString }'))(fromCharCode)) :
+		eval(makeStringBuilder())
 
 export function compareKeys(a, b) {
 	// compare with type consistency that matches binary comparison

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ordered-binary",
   "author": "Kris Zyp",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Conversion of JavaScript primitives to and from Buffer with binary order matching natural primitive order",
   "license": "MIT",
   "repository": {

package/tests/test.js

@@ -46,6 +46,7 @@ suite('key buffers', () => {
     assert.strictEqual(fromBufferKey(toBufferKey('')), '')
     assert.strictEqual(fromBufferKey(toBufferKey('\x00')), '\x00')
     assert.strictEqual(fromBufferKey(toBufferKey('\x03test\x01\x00')), '\x03test\x01\x00')
+    assert.strictEqual(fromBufferKey(toBufferKey('prance 🧚🏻‍♀️🩷')), 'prance 🧚🏻‍♀️🩷')
   })
   test('string comparison', () => {
     assertBufferComparison(toBufferKey('4'), toBufferKey('5'))