@arcjet/redact 1.11.0 → 1.12.0

package/dist/index.js

@@ -35,6 +35,86 @@ function wasmEntitiesToString(entity) {
 function performReplacementInText(text, replacement, start, end) {
 	return text.substring(0, start) + replacement + text.substring(end);
 }
+/**
+* Number of bytes a code point occupies in UTF-8.
+*
+* @param codePoint
+*   Code point.
+* @returns
+*   Byte length.
+*/
+function utf8Length(codePoint) {
+	if (codePoint < 128) return 1;
+	if (codePoint < 2048) return 2;
+	if (codePoint < 65536) return 3;
+	return 4;
+}
+/**
+* Resolve the UTF-8 byte offsets reported by Wasm to UTF-16 code unit indices.
+*
+* The detector counts bytes; `String.prototype.substring` counts UTF-16 code
+* units. The two coincide for ASCII, so applying one as the other looks correct
+* until the text contains a multi-byte character *before* an entity — at which
+* point every replacement lands short by the number of excess bytes and part of
+* the entity survives in the "redacted" output.
+*
+* An offset that falls inside a character is snapped outward — starts back to
+* the beginning of that character, ends on to the end of it — so a span always
+* covers at least the bytes the detector reported. Over-redacting is the safe
+* direction here; under-redacting is the bug.
+*
+* @param text
+*   Text the offsets refer to.
+* @param redactions
+*   Detected entities, carrying byte offsets.
+* @returns
+*   Spans in UTF-16 code unit indices, parallel to `redactions`.
+*/
+function resolveByteOffsets(text, redactions) {
+	const wanted = /* @__PURE__ */ new Set();
+	for (const redaction of redactions) {
+		wanted.add(redaction.start);
+		wanted.add(redaction.end);
+	}
+	const ascending = Array.from(wanted).sort((a, b) => a - b);
+	const floors = /* @__PURE__ */ new Map();
+	const ceilings = /* @__PURE__ */ new Map();
+	let cursor = 0;
+	let byteOffset = 0;
+	let stringIndex = 0;
+	while (cursor < ascending.length && ascending[cursor] <= 0) {
+		floors.set(ascending[cursor], 0);
+		ceilings.set(ascending[cursor], 0);
+		cursor++;
+	}
+	for (const character of text) {
+		if (cursor >= ascending.length) break;
+		const nextByteOffset = byteOffset + utf8Length(character.codePointAt(0));
+		const nextStringIndex = stringIndex + character.length;
+		while (cursor < ascending.length && ascending[cursor] <= nextByteOffset) {
+			const offset = ascending[cursor];
+			const onBoundary = offset === nextByteOffset;
+			floors.set(offset, onBoundary ? nextStringIndex : stringIndex);
+			ceilings.set(offset, nextStringIndex);
+			cursor++;
+		}
+		byteOffset = nextByteOffset;
+		stringIndex = nextStringIndex;
+	}
+	while (cursor < ascending.length) {
+		floors.set(ascending[cursor], text.length);
+		ceilings.set(ascending[cursor], text.length);
+		cursor++;
+	}
+	return redactions.map((redaction) => {
+		const start = floors.get(redaction.start) ?? 0;
+		const end = ceilings.get(redaction.end) ?? text.length;
+		return {
+			start,
+			end: Math.max(start, end)
+		};
+	});
+}
 /* c8 ignore start */
 function noOpDetect(_tokens) {
 	return [];
@@ -105,8 +185,10 @@ async function callRedactWasm(candidate, options) {
 */
 async function redact(candidate, options) {
 	const redactions = await callRedactWasm(candidate, options);
+	const spans = resolveByteOffsets(candidate, redactions);
 	redactions.reverse();
-	for (const redaction of redactions) candidate = performReplacementInText(candidate, redaction.redacted, redaction.start, redaction.end);
+	spans.reverse();
+	for (const [index, redaction] of redactions.entries()) candidate = performReplacementInText(candidate, redaction.redacted, spans[index].start, spans[index].end);
 	function unredact(input) {
 		for (const redaction of redactions) {
 			let position;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcjet/redact",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Arcjet sensitive information redaction library",
   "keywords": [
     "arcjet",
@@ -48,7 +48,7 @@
     "test": "npm run build && npm run test-coverage"
   },
   "dependencies": {
-    "@arcjet/redact-wasm": "1.11.0"
+    "@arcjet/redact-wasm": "1.12.0"
   },
   "devDependencies": {
     "@types/node": "22.20.1",