@ansi-tools/parser 1.0.5 → 1.0.7

package/dist/escaped.js

@@ -1,4 +1,4 @@
-import { APC, APC_OPEN, BACKSLASH, BELL, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TOKEN_TYPES, parser } from "./parse-Dtk-XHF4.js";
+import { APC, APC_OPEN, BACKSLASH, BELL, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TOKEN_TYPES, parser } from "./parse-CYNZDD06.js";
 
 //#region src/tokenize.escaped.ts
 const CSI_ESCAPED = "\\u009b";
@@ -18,7 +18,6 @@ for (const [sequence, len] of INTRODUCERS) {
 	INTRODUCER_LOOKUP.get(secondChar)?.push([sequence, len]);
 	INTRODUCER_FIRST_CHAR_CACHE.set(sequence, true);
 }
-const INTRODUCER_PEEK_AHEAD = new Set(INTRODUCERS.map((entry) => entry[0][1]));
 function emit(token) {
 	return token;
 }
@@ -39,8 +38,21 @@ function* tokenizer(input) {
 				i = l;
 				break;
 			}
-			const nextChar = input[backslashIndex + 1];
-			if (nextChar && INTRODUCER_PEEK_AHEAD.has(nextChar)) {
+			let isIntroducer = false;
+			const candidates = INTRODUCER_LOOKUP.get(input[backslashIndex + 1]);
+			if (candidates) for (const [seq, len] of candidates) {
+				if (backslashIndex + len > l) continue;
+				let matched = true;
+				for (let k = 0; k < len && matched; k += 2) {
+					matched = input[backslashIndex + k] === seq[k];
+					if (matched && k + 1 < len) matched = input[backslashIndex + k + 1] === seq[k + 1];
+				}
+				if (matched) {
+					isIntroducer = true;
+					break;
+				}
+			}
+			if (isIntroducer) {
 				i = backslashIndex;
 				break;
 			} else i = backslashIndex + 1;
@@ -53,16 +65,16 @@ function* tokenizer(input) {
 		if (i < l) {
 			const candidates = INTRODUCER_LOOKUP.get(input[i + 1]);
 			if (candidates) {
-				let matched = false;
+				let isMatch = false;
 				for (const [seq, len] of candidates) {
 					if (i + len > l) continue;
-					let seqMatched = true;
-					for (let k = 0; k < len && seqMatched; k += 2) {
-						seqMatched = input[i + k] === seq[k];
-						if (seqMatched && k + 1 < len) seqMatched = input[i + k + 1] === seq[k + 1];
+					let isSeqMatch = true;
+					for (let k = 0; k < len && isSeqMatch; k += 2) {
+						isSeqMatch = input[i + k] === seq[k];
+						if (isSeqMatch && k + 1 < len) isSeqMatch = input[i + k + 1] === seq[k + 1];
 					}
-					if (seqMatched) {
-						matched = true;
+					if (isSeqMatch) {
+						isMatch = true;
 						if (seq === CSI_ESCAPED) {
 							yield emit({
 								type: TOKEN_TYPES.INTRODUCER,
@@ -127,7 +139,7 @@ function* tokenizer(input) {
 						break;
 					}
 				}
-				if (!matched) i++;
+				if (!isMatch) i++;
 			} else i++;
 		}
 	} else if (state === "SEQUENCE") {

package/dist/index.js

@@ -1,3 +1,3 @@
-import { APC, APC_OPEN, BACKSLASH, BELL, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TOKEN_TYPES, parse, parser, tokenize, tokenizer } from "./parse-Dtk-XHF4.js";
+import { APC, APC_OPEN, BACKSLASH, BELL, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TOKEN_TYPES, parse, parser, tokenize, tokenizer } from "./parse-CYNZDD06.js";
 
 export { APC, APC_OPEN, BACKSLASH, BELL, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TOKEN_TYPES, parse, parser, tokenize, tokenizer };

package/dist/{parse-Dtk-XHF4.js → parse-CYNZDD06.js}

@@ -498,7 +498,7 @@ function* parser(tokens) {
 			if (final) switch (introducer.code) {
 				case CSI:
 					if (data[0]?.raw.startsWith(DEC_OPEN)) yield emit(parseDEC(introducer, data, final));
-					else if (PRIVATE_OPENERS.has(data[0]?.raw)) yield emit(parsePrivateCSI(introducer, data, final));
+					else if (data[0]?.raw && PRIVATE_OPENERS.has(data[0].raw[0])) yield emit(parsePrivateCSI(introducer, data, final));
 					else yield emit(parseCSI(introducer, data, final));
 					break;
 				case OSC:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ansi-tools/parser",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Tokenize and parse strings containing ANSI escape sequences and control codes",
   "main": "./dist/index.js",
   "type": "module",