@ansi-tools/parser 1.0.7 → 1.0.9

package/dist/escaped.d.ts

@@ -1,4 +1,4 @@
-import { APC, APC_OPEN, BACKSLASH, BELL, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TEXT, TOKEN, TOKEN_TYPES, parser } from "./parse-Nkb7K322.js";
+import { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TEXT, TOKEN, TOKEN_TYPES, parser } from "./parse-BLVd8fU0.js";
 
 //#region src/parse.escaped.d.ts
 declare function parse(input: string): CODE[];
@@ -7,4 +7,4 @@ declare function parse(input: string): CODE[];
 declare function tokenizer(input: string): Generator<TOKEN>;
 declare function tokenize(input: string): TOKEN[];
 //#endregion
-export { APC, APC_OPEN, BACKSLASH, BELL, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TEXT, TOKEN, TOKEN_TYPES, parse, parser, tokenize, tokenizer };
+export { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TEXT, TOKEN, TOKEN_TYPES, parse, parser, tokenize, tokenizer };

package/dist/escaped.js

@@ -1,15 +1,29 @@
-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";
+import { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TOKEN_TYPES, parser } from "./parse-DmFIqYg6.js";
 
 //#region src/tokenize.escaped.ts
 const CSI_ESCAPED = "\\u009b";
+const CSI_ESCAPED_HEX = "\\x9b";
 const ABANDONED = "ABANDONED";
 const INTRODUCERS = [
 	["\\u001b", 6],
 	[CSI_ESCAPED, 6],
+	[CSI_ESCAPED_HEX, 4],
 	["\\x1b", 4],
 	["\\033", 4],
 	["\\e", 2]
 ];
+const INTERRUPTERS_ESCAPED = [
+	["\\x18", 4],
+	["\\x1a", 4],
+	["\\u0018", 6],
+	["\\u001a", 6]
+];
+const INTERRUPTER_LOOKUP = /* @__PURE__ */ new Map();
+for (const [sequence, len] of INTERRUPTERS_ESCAPED) {
+	const secondChar = sequence[1];
+	if (!INTERRUPTER_LOOKUP.has(secondChar)) INTERRUPTER_LOOKUP.set(secondChar, []);
+	INTERRUPTER_LOOKUP.get(secondChar)?.push([sequence, len]);
+}
 const INTRODUCER_LOOKUP = /* @__PURE__ */ new Map();
 const INTRODUCER_FIRST_CHAR_CACHE = /* @__PURE__ */ new Map();
 for (const [sequence, len] of INTRODUCERS) {
@@ -75,7 +89,7 @@ function* tokenizer(input) {
 					}
 					if (isSeqMatch) {
 						isMatch = true;
-						if (seq === CSI_ESCAPED) {
+						if (seq === CSI_ESCAPED || seq === CSI_ESCAPED_HEX) {
 							yield emit({
 								type: TOKEN_TYPES.INTRODUCER,
 								pos: i,
@@ -150,8 +164,27 @@ function* tokenizer(input) {
 		while (!terminator && i < l) {
 			const char = input[i];
 			if (char === BACKSLASH) {
+				const next = input[i + 1];
+				if (next) {
+					const interrupters = INTERRUPTER_LOOKUP.get(next);
+					if (interrupters) {
+						for (const [seq, len] of interrupters) if (i + len <= l) {
+							let matched = true;
+							for (let k = 0; k < len; k++) if (input[i + k] !== seq[k]) {
+								matched = false;
+								break;
+							}
+							if (matched) {
+								terminator = ABANDONED;
+								terminatorPos = i;
+								i += len;
+								break;
+							}
+						}
+					}
+				}
+				if (terminator) break;
 				if (code !== CSI && code !== ESC) {
-					const next = input[i + 1];
 					if (next === "a" && i + 2 <= l) {
 						if (code === OSC && input[i + 1] === "a") {
 							terminator = "\\a";
@@ -191,7 +224,6 @@ function* tokenizer(input) {
 					}
 				}
 				if (!terminator) {
-					const next = input[i + 1];
 					if (next) {
 						const candidates = INTRODUCER_LOOKUP.get(next);
 						if (candidates) for (const [seq, len] of candidates) {
@@ -250,4 +282,4 @@ function parse(input) {
 }
 
 //#endregion
-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 };
+export { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TOKEN_TYPES, parse, parser, tokenize, tokenizer };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { APC, APC_OPEN, BACKSLASH, BELL, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TEXT, TOKEN, TOKEN_TYPES, parse, parser } from "./parse-Nkb7K322.js";
+import { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TEXT, TOKEN, TOKEN_TYPES, parse, parser } from "./parse-BLVd8fU0.js";
 
 //#region src/tokenize.d.ts
 declare function tokenizer(input: string): Generator<TOKEN>;
 declare function tokenize(input: string): TOKEN[];
 //#endregion
-export { APC, APC_OPEN, BACKSLASH, BELL, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TEXT, TOKEN, TOKEN_TYPES, parse, parser, tokenize, tokenizer };
+export { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TEXT, TOKEN, TOKEN_TYPES, parse, parser, tokenize, tokenizer };

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-CYNZDD06.js";
+import { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TOKEN_TYPES, parse, parser, tokenize, tokenizer } from "./parse-DmFIqYg6.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 };
+export { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TOKEN_TYPES, parse, parser, tokenize, tokenizer };

package/dist/{parse-Nkb7K322.d.ts → parse-BLVd8fU0.d.ts}

@@ -1,5 +1,7 @@
 //#region src/constants.d.ts
 declare const BELL: string;
+declare const CAN: string;
+declare const SUB: string;
 declare const ESC: string;
 declare const BACKSLASH: string;
 declare const DCS: string;
@@ -18,6 +20,9 @@ declare const APC_OPEN = "_";
 declare const SOS_OPEN = "^";
 declare const PM_OPEN = "X";
 declare const STRING_OPENERS: Set<string>;
+declare const INTERRUPTERS: Set<string>;
+declare const C0_INTERRUPTERS: Set<string>;
+declare const PARAM_SEPARATOR: RegExp;
 declare const TOKEN_TYPES: {
   readonly TEXT: "TEXT";
   readonly INTRODUCER: "INTRODUCER";
@@ -44,8 +49,9 @@ type TOKEN = {
   code?: string;
   intermediate?: string;
 };
+type CONTROL_CODE_TYPE = Exclude<keyof typeof CODE_TYPES, TEXT["type"]>;
 type CONTROL_CODE = {
-  type: "CSI" | "DCS" | "DEC" | "ESC" | "OSC" | "SGR" | "STRING" | "PRIVATE";
+  type: CONTROL_CODE_TYPE;
   command: string;
   raw: string;
   params: string[];
@@ -62,4 +68,4 @@ type CODE = CONTROL_CODE | TEXT;
 declare function parser(tokens: Generator<TOKEN>): Generator<CODE>;
 declare function parse(input: string): CODE[];
 //#endregion
-export { APC, APC_OPEN, BACKSLASH, BELL, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, OSC, OSC_OPEN, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, TEXT, TOKEN, TOKEN_TYPES, parse, parser };
+export { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE, CODE_TYPES, CONTROL_CODE, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TEXT, TOKEN, TOKEN_TYPES, parse, parser };

package/dist/{parse-CYNZDD06.js → parse-DmFIqYg6.js}

@@ -1,5 +1,7 @@
 //#region src/constants.ts
 const BELL = String.fromCharCode(7);
+const CAN = String.fromCharCode(24);
+const SUB = String.fromCharCode(26);
 const ESC = String.fromCharCode(27);
 const BACKSLASH = String.fromCharCode(92);
 const DCS = String.fromCharCode(144);
@@ -27,6 +29,19 @@ const STRING_OPENERS = new Set([
 	SOS_OPEN,
 	PM_OPEN
 ]);
+const INTERRUPTERS = new Set([
+	CAN,
+	SUB,
+	ESC,
+	CSI,
+	OSC,
+	DCS,
+	APC,
+	PM,
+	SOS
+]);
+const C0_INTERRUPTERS = new Set([CAN, SUB]);
+const PARAM_SEPARATOR = /[;:]/;
 const TOKEN_TYPES = {
 	TEXT: "TEXT",
 	INTRODUCER: "INTRODUCER",
@@ -49,51 +64,57 @@ const CODE_TYPES = {
 //#region src/parsers/csi.ts
 function parseCSI(introducer, dataTokens, final) {
 	const data = dataTokens.map((t) => t.raw).join("");
-	const raw = introducer.raw + data + final.raw;
+	const raw = introducer.raw + data + (final?.raw || "");
 	const params = [];
+	let type = CODE_TYPES.CSI;
 	let intermediates = "";
+	let paramSection = "";
 	if (data) {
 		let i = 0;
-		let paramSection = "";
-		while (i < data.length && data.charCodeAt(i) >= 48 && data.charCodeAt(i) <= 63) {
-			paramSection += data[i];
-			i++;
+		while (i < data.length) {
+			const charCode = data.charCodeAt(i);
+			if (charCode >= 48 && charCode <= 63) {
+				paramSection += data[i];
+				i++;
+			} else break;
 		}
 		intermediates = data.slice(i);
-		if (paramSection) {
-			const parts = paramSection.replace(/:/g, ";").split(";");
-			for (const part of parts) params.push(part || "-1");
-		}
 	}
+	if (paramSection) for (const part of paramSection.split(PARAM_SEPARATOR)) params.push(part || "0");
 	const command = intermediates + (final?.raw ?? "");
-	return {
-		type: CODE_TYPES.CSI,
-		pos: introducer.pos,
-		raw,
-		command,
-		params
-	};
-}
-function parsePrivateCSI(introducer, dataTokens, finalToken) {
-	const data = dataTokens.map((t) => t.raw).join("");
-	const raw = introducer.raw + data + (finalToken?.raw ?? "");
-	const privateIndicator = data[0] || "";
-	const withoutIndicator = data.slice(1);
-	const match = withoutIndicator.match(/^([\d;:]*)(.*)/);
-	const paramsRaw = match?.[1] ?? "";
-	const intermediates = match?.[2] ?? "";
-	const command = `${privateIndicator}${intermediates}${finalToken.raw}`;
-	const params = [];
-	if (paramsRaw) {
-		let current = "";
-		for (let i = 0; i < paramsRaw.length; i++) if (paramsRaw[i] === ";") {
-			params.push(current || "-1");
-			current = "";
-		} else current += paramsRaw[i];
-		params.push(current || "-1");
+	const start = params[0];
+	if (start?.startsWith("?")) {
+		type = CODE_TYPES.DEC;
+		if (start.length > 1) params[0] = start.slice(1);
+		else params.shift();
+		return {
+			type,
+			pos: introducer.pos,
+			raw,
+			command,
+			params
+		};
 	}
+	for (const param of params) if (param && param.length > 0 && PRIVATE_OPENERS.has(param[0])) {
+		type = CODE_TYPES.PRIVATE;
+		const privateCommand = param[0] + command;
+		for (let i = 0; i < params.length; i++) if (params[i] && params[i].length > 0 && PRIVATE_OPENERS.has(params[i][0])) {
+			if (params[i].length > 1) params[i] = params[i].slice(1);
+			else params.splice(i, 1);
+			break;
+		}
+		return {
+			type,
+			pos: introducer.pos,
+			raw,
+			command: privateCommand,
+			params
+		};
+	}
+	if (command === "m" && params.length === 5 && params[1] === "2" && (start === "38" || start === "48")) params.splice(2, 0, "0");
+	if (command === "r" && params.length === 2 && params[1] === "0") params[1] = "-1";
 	return {
-		type: CODE_TYPES.PRIVATE,
+		type,
 		pos: introducer.pos,
 		raw,
 		command,
@@ -123,14 +144,7 @@ function parseDCS(introducer, dataTokens, final) {
 	for (const [pattern, length] of DCS_PATTERNS) if (data.startsWith(pattern)) {
 		const remainder = data.slice(length);
 		const params = [];
-		if (remainder) {
-			let current = "";
-			for (let i = 0; i < remainder.length; i++) if (remainder[i] === ";") {
-				params.push(current || "-1");
-				current = "";
-			} else current += remainder[i];
-			params.push(current || "-1");
-		}
+		if (remainder) for (const part of remainder.split(PARAM_SEPARATOR)) params.push(part || "-1");
 		return {
 			type: CODE_TYPES.DCS,
 			pos: introducer.pos,
@@ -148,41 +162,11 @@ function parseDCS(introducer, dataTokens, final) {
 	};
 }
 
-//#endregion
-//#region src/parsers/dec.ts
-function parseDEC(introducer, dataTokens, final) {
-	const data = dataTokens.map((t) => t.raw).join("");
-	const raw = introducer.raw + data + final.raw;
-	let i = 0;
-	let paramsRaw = "";
-	while (i < data.length && data.charCodeAt(i) >= 48 && data.charCodeAt(i) <= 63) {
-		paramsRaw += data[i];
-		i++;
-	}
-	const command = data.slice(i) + final.raw;
-	const params = [];
-	if (paramsRaw) {
-		let current = "";
-		for (let j = 0; j < paramsRaw.length; j++) if (paramsRaw[j] === ";") {
-			params.push(current || "-1");
-			current = "";
-		} else current += paramsRaw[j];
-		params.push(current || "-1");
-	}
-	return {
-		type: CODE_TYPES.DEC,
-		pos: introducer.pos,
-		raw,
-		command,
-		params
-	};
-}
-
 //#endregion
 //#region src/parsers/esc.ts
 function parseESC(introducer, dataTokens, final) {
 	const data = dataTokens.map((t) => t.raw).join("");
-	const command = introducer.intermediate || (dataTokens[0]?.raw ?? final?.raw);
+	const command = introducer.intermediate || (dataTokens[0]?.raw ?? final?.raw ?? "");
 	const params = introducer.intermediate ? final?.raw ? [final.raw] : [] : [];
 	const raw = introducer.raw + data + (final?.raw ?? "");
 	return {
@@ -198,7 +182,7 @@ function parseESC(introducer, dataTokens, final) {
 //#region src/parsers/osc.ts
 function parseOSC(introducer, dataTokens, final) {
 	const data = dataTokens.map((t) => t.raw).join("");
-	const raw = introducer.raw + data + final.raw;
+	const raw = introducer.raw + data + (final?.raw || "");
 	const semicolonIndex = data.indexOf(";");
 	if (semicolonIndex === -1) return {
 		type: CODE_TYPES.OSC,
@@ -238,7 +222,7 @@ function parseOSC(introducer, dataTokens, final) {
 //#region src/parsers/apc.ts
 function parseAPC(introducer, dataTokens, final) {
 	const data = dataTokens.map((t) => t.raw).join("");
-	const raw = introducer.raw + data + final.raw;
+	const raw = introducer.raw + data + (final?.raw || "");
 	return {
 		type: CODE_TYPES.STRING,
 		pos: introducer.pos,
@@ -252,7 +236,7 @@ function parseAPC(introducer, dataTokens, final) {
 //#region src/parsers/pm.ts
 function parsePM(introducer, dataTokens, final) {
 	const data = dataTokens.map((t) => t.raw).join("");
-	const raw = introducer.raw + data + final.raw;
+	const raw = introducer.raw + data + (final?.raw || "");
 	return {
 		type: CODE_TYPES.STRING,
 		pos: introducer.pos,
@@ -266,7 +250,7 @@ function parsePM(introducer, dataTokens, final) {
 //#region src/parsers/sos.ts
 function parseSOS(introducer, dataTokens, final) {
 	const data = dataTokens.map((t) => t.raw).join("");
-	const raw = introducer.raw + data + final.raw;
+	const raw = introducer.raw + data + (final?.raw || "");
 	return {
 		type: CODE_TYPES.STRING,
 		pos: introducer.pos,
@@ -380,13 +364,14 @@ function* tokenizer(input) {
 		let data = "";
 		if (code === CSI) while (i < input.length) {
 			const char = input[i];
-			if (INTRODUCERS.has(char)) {
+			if (INTERRUPTERS.has(char)) {
 				if (data) yield emit$1({
 					type: TOKEN_TYPES.DATA,
 					pos,
 					raw: data
 				});
 				setState("GROUND");
+				if (C0_INTERRUPTERS.has(char)) i++;
 				break;
 			}
 			const charCode = char.charCodeAt(0);
@@ -411,8 +396,10 @@ function* tokenizer(input) {
 		else if (code === ESC) {
 			if (i < input.length) {
 				const char = input[i];
-				if (INTRODUCERS.has(char)) setState("GROUND");
-				else {
+				if (INTERRUPTERS.has(char)) {
+					setState("GROUND");
+					if (C0_INTERRUPTERS.has(char)) i++;
+				} else {
 					yield emit$1({
 						type: TOKEN_TYPES.FINAL,
 						pos: i,
@@ -443,13 +430,14 @@ function* tokenizer(input) {
 				setState("GROUND");
 				break;
 			}
-			if (INTRODUCERS.has(char)) {
+			if (INTERRUPTERS.has(char)) {
 				if (data) yield emit$1({
 					type: TOKEN_TYPES.DATA,
 					pos,
 					raw: data
 				});
 				setState("GROUND");
+				if (C0_INTERRUPTERS.has(char)) i++;
 				break;
 			}
 			data += char;
@@ -493,13 +481,12 @@ function* parser(tokens) {
 					current = tokens.next();
 					break;
 				} else if (nextToken.type === TOKEN_TYPES.INTRODUCER) break;
+				else if (nextToken.type === TOKEN_TYPES.TEXT) break;
 				current = tokens.next();
 			}
-			if (final) switch (introducer.code) {
+			switch (introducer.code) {
 				case CSI:
-					if (data[0]?.raw.startsWith(DEC_OPEN)) yield emit(parseDEC(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));
+					yield emit(parseCSI(introducer, data, final));
 					break;
 				case OSC:
 					yield emit(parseOSC(introducer, data, final));
@@ -524,7 +511,6 @@ function* parser(tokens) {
 					yield emit(parseESC(introducer, data, final));
 					break;
 			}
-			else if (introducer.code === ESC) yield emit(parseESC(introducer, data, void 0));
 		} else current = tokens.next();
 	}
 }
@@ -533,4 +519,4 @@ function parse(input) {
 }
 
 //#endregion
-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 };
+export { APC, APC_OPEN, BACKSLASH, BELL, C0_INTERRUPTERS, CAN, CODE_TYPES, CSI, CSI_OPEN, DCS, DCS_OPEN, DEC_OPEN, ESC, INTERRUPTERS, OSC, OSC_OPEN, PARAM_SEPARATOR, PM, PM_OPEN, PRIVATE_OPENERS, SOS, SOS_OPEN, ST, STRING_OPENERS, SUB, TOKEN_TYPES, parse, parser, tokenize, tokenizer };

package/package.json

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