@ansi-tools/parser 1.0.2 → 1.0.4

package/dist/escaped.js

@@ -1,7 +1,8 @@
-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-D-nJlcK3.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-BrF7Yirl.js";
 
 //#region src/tokenize.escaped.ts
 const CSI_ESCAPED = "\\u009b";
+const ABANDONED = "ABANDONED";
 const INTRODUCERS = [
 	["\\u001b", 6],
 	[CSI_ESCAPED, 6],
@@ -102,25 +103,27 @@ function* tokenizer(input) {
 							});
 							i += len + 1;
 							setState("SEQUENCE", next);
-						} else if (next && next.charCodeAt(0) >= 32 && next.charCodeAt(0) <= 47) {
-							yield emit({
-								type: TOKEN_TYPES.INTRODUCER,
-								pos: i,
-								raw: seq + next,
-								code: ESC,
-								intermediate: next
-							});
-							i += len + 1;
-							setState("SEQUENCE", ESC);
 						} else if (next) {
-							yield emit({
-								type: TOKEN_TYPES.INTRODUCER,
-								pos: i,
-								raw: seq,
-								code: ESC
-							});
-							i += len;
-							setState("SEQUENCE", ESC);
+							let j = i + len;
+							while (j < input.length && input.charCodeAt(j) >= 32 && input.charCodeAt(j) <= 47) j++;
+							if (j < input.length) {
+								const is = input.slice(i + len, j);
+								if (is) yield emit({
+									type: TOKEN_TYPES.INTRODUCER,
+									pos: i,
+									raw: seq + is,
+									code: ESC,
+									intermediate: is
+								});
+								else yield emit({
+									type: TOKEN_TYPES.INTRODUCER,
+									pos: i,
+									raw: seq,
+									code: ESC
+								});
+								i = j;
+								setState("SEQUENCE", ESC);
+							} else i = j;
 						} else i += len;
 					}
 					break;
@@ -137,7 +140,7 @@ function* tokenizer(input) {
 			const char = input[i];
 			if (code === CSI) {
 				const charCode = input.charCodeAt(i);
-				if (charCode >= 64 && charCode < 126) {
+				if (charCode >= 64 && charCode <= 126) {
 					terminator = char;
 					terminatorPos = i;
 					i++;
@@ -172,6 +175,28 @@ function* tokenizer(input) {
 					}
 				}
 			}
+			if (!terminator && char === BACKSLASH) {
+				const nextChar = input[i + 1];
+				if (nextChar) {
+					const candidates = INTRODUCER_LOOKUP.get(nextChar);
+					if (candidates) {
+						for (const [seq, len] of candidates) {
+							if (i + len > input.length) continue;
+							let matches = true;
+							for (let j = 0; j < len; j++) if (input[i + j] !== seq[j]) {
+								matches = false;
+								break;
+							}
+							if (matches) {
+								terminator = ABANDONED;
+								terminatorPos = i;
+								break;
+							}
+						}
+						if (terminator === ABANDONED) break;
+					}
+				}
+			}
 			if (!terminator) i++;
 		}
 		if (terminatorPos > pos) {
@@ -182,7 +207,7 @@ function* tokenizer(input) {
 				raw: data
 			});
 		}
-		if (terminator) yield emit({
+		if (terminator && terminator !== ABANDONED) yield emit({
 			type: TOKEN_TYPES.FINAL,
 			pos: terminatorPos,
 			raw: terminator

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-D-nJlcK3.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-BrF7Yirl.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-D-nJlcK3.js → parse-BrF7Yirl.js}

@@ -350,25 +350,27 @@ function* tokenizer(input) {
 					});
 					i += 2;
 					setState("SEQUENCE", next);
-				} else if (next && next.charCodeAt(0) >= 32 && next.charCodeAt(0) <= 47) {
-					yield emit$1({
-						type: TOKEN_TYPES.INTRODUCER,
-						pos: i,
-						raw: char + next,
-						code: ESC,
-						intermediate: next
-					});
-					i += 2;
-					setState("SEQUENCE", ESC);
 				} else if (next) {
-					yield emit$1({
-						type: TOKEN_TYPES.INTRODUCER,
-						pos: i,
-						raw: char,
-						code: ESC
-					});
-					i++;
-					setState("SEQUENCE", ESC);
+					let j = i + 1;
+					while (j < input.length && input.charCodeAt(j) >= 32 && input.charCodeAt(j) <= 47) j++;
+					if (j < input.length) {
+						const is = input.slice(i + 1, j);
+						if (is) yield emit$1({
+							type: TOKEN_TYPES.INTRODUCER,
+							pos: i,
+							raw: char + is,
+							code: ESC,
+							intermediate: is
+						});
+						else yield emit$1({
+							type: TOKEN_TYPES.INTRODUCER,
+							pos: i,
+							raw: char,
+							code: ESC
+						});
+						i = j;
+						setState("SEQUENCE", ESC);
+					} else i = j;
 				} else i++;
 			}
 		}
@@ -379,7 +381,7 @@ function* tokenizer(input) {
 		if (code === CSI) while (i < input.length) {
 			const char = input[i];
 			const charCode = char.charCodeAt(0);
-			if (charCode >= 64 && charCode < 126) {
+			if (charCode >= 64 && charCode <= 126) {
 				if (data) yield emit$1({
 					type: TOKEN_TYPES.DATA,
 					pos,
@@ -426,6 +428,14 @@ function* tokenizer(input) {
 				i += terminator.length;
 				break;
 			}
+			if (char === ESC) {
+				if (data) yield emit$1({
+					type: TOKEN_TYPES.DATA,
+					pos,
+					raw: data
+				});
+				break;
+			}
 			data += char;
 			i++;
 		}
@@ -466,7 +476,7 @@ function* parser(tokens) {
 					final = nextToken;
 					current = tokens.next();
 					break;
-				}
+				} else if (nextToken.type === TOKEN_TYPES.INTRODUCER) break;
 				current = tokens.next();
 			}
 			if (final) switch (introducer.code) {

package/package.json

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