ordered-binary 1.1.2 → 1.1.3

package/dist/index.cjs

@@ -216,20 +216,57 @@ function makeStringBuilder() {
 	let stringBuildCode = '(source) => {';
 	let previous = [];
 	for (let i = 0; i < 0x30; i++) {
-	let v = fromCharCode((i & 0xf) + 97) + fromCharCode((i >> 4) + 97);
-	stringBuildCode += `
-	let ${v} = source[position++]
-	if (${v} === 0)
-	return fromCharCode(${previous})
-	else if (${v} >= 0x80)
-	${v} = finishUtf8(${v}, source)
-`;
-	previous.push(v);
+		let v = fromCharCode((i & 0xf) + 97) + fromCharCode((i >> 4) + 97);
+		stringBuildCode += `
+		let ${v} = source[position++]
+		if (${v} === 0)
+		return fromCharCode(${previous})
+		else if (${v} >= 0x80)
+		${v} = finishUtf8(${v}, source)
+		`;
+		previous.push(v);
+		if (i == 1000000) // this just exists to prevent rollup from doing dead code elimination on finishUtf8
+			finishUtf8();
 	}
 	stringBuildCode += `return fromCharCode(${previous}) + readString(source)}`;
 	return stringBuildCode
 }
 
+let pendingSurrogate;
+function finishUtf8(byte1, src) {
+	if ((byte1 & 0xe0) === 0xc0) {
+		// 2 bytes
+		const byte2 = src[position++] & 0x3f;
+		return ((byte1 & 0x1f) << 6) | byte2
+	} else if ((byte1 & 0xf0) === 0xe0) {
+		// 3 bytes
+		const byte2 = src[position++] & 0x3f;
+		const byte3 = src[position++] & 0x3f;
+		return ((byte1 & 0x1f) << 12) | (byte2 << 6) | byte3
+	} else if ((byte1 & 0xf8) === 0xf0) {
+		// 4 bytes
+		if (pendingSurrogate) {
+		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
+		}
+		return unit
+	} else {
+		return byte1
+	}
+}
+
 const enableNullTermination = () => nullTerminate = true;
 
 const readString = eval(makeStringBuilder());

package/index.js

@@ -214,15 +214,17 @@ function makeStringBuilder() {
 	let stringBuildCode = '(source) => {'
 	let previous = []
 	for (let i = 0; i < 0x30; i++) {
-	let v = fromCharCode((i & 0xf) + 97) + fromCharCode((i >> 4) + 97)
-	stringBuildCode += `
-	let ${v} = source[position++]
-	if (${v} === 0)
-	return fromCharCode(${previous})
-	else if (${v} >= 0x80)
-	${v} = finishUtf8(${v}, source)
-`
-	previous.push(v)
+		let v = fromCharCode((i & 0xf) + 97) + fromCharCode((i >> 4) + 97)
+		stringBuildCode += `
+		let ${v} = source[position++]
+		if (${v} === 0)
+		return fromCharCode(${previous})
+		else if (${v} >= 0x80)
+		${v} = finishUtf8(${v}, source)
+		`
+		previous.push(v)
+		if (i == 1000000) // this just exists to prevent rollup from doing dead code elimination on finishUtf8
+			finishUtf8()
 	}
 	stringBuildCode += `return fromCharCode(${previous}) + readString(source)}`
 	return stringBuildCode

package/package.json

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