Fix code frame for Node.js v21 (#40)

Author: fisker

.github/workflows/main.yml

@@ -10,12 +10,13 @@ jobs:
       fail-fast: false
       matrix:
         node-version:
+          - 21
           - 20
           - 18
           - 16
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install

index.js

@@ -8,6 +8,27 @@ export const JSONError = errorEx('JSONError', {
 	codeFrame: errorEx.append('\n\n%s\n'),
 });
 
+const generateCodeFrame = (string, location, highlightCode = true) =>
+	codeFrameColumns(string, {start: location}, {highlightCode});
+
+const getErrorLocation = (string, error) => {
+	const match = error.message.match(/in JSON at position (?<index>\d+)(?: \(line (?<line>\d+) column (?<column>\d+)\))? while parsing/);
+
+	if (!match) {
+		return;
+	}
+
+	let {index, line, column} = match.groups;
+
+	if (line && column) {
+		return {line: Number(line), column: Number(column)};
+	}
+
+	({line, column} = new LinesAndColumns(string).locationForIndex(Number(index)));
+
+	return {line: line + 1, column: column + 1};
+};
+
 export default function parseJson(string, reviver, filename) {
 	if (typeof reviver === 'string') {
 		filename = reviver;
@@ -23,26 +44,17 @@ export default function parseJson(string, reviver, filename) {
 		}
 	} catch (error) {
 		error.message = error.message.replace(/\n/g, '');
-		const indexMatch = error.message.match(/in JSON at position (\d+) while parsing/);
 
 		const jsonError = new JSONError(error);
+
 		if (filename) {
 			jsonError.fileName = filename;
 		}
 
-		if (indexMatch && indexMatch.length > 0) {
-			const lines = new LinesAndColumns(string);
-			const index = Number(indexMatch[1]);
-			const location = lines.locationForIndex(index);
-
-			const generateCodeFrame = ({highlightCode}) => codeFrameColumns(
-				string,
-				{start: {line: location.line + 1, column: location.column + 1}},
-				{highlightCode},
-			);
-
-			jsonError.codeFrame = generateCodeFrame({highlightCode: true});
-			jsonError.rawCodeFrame = generateCodeFrame({highlightCode: false});
+		const location = getErrorLocation(string, error);
+		if (location) {
+			jsonError.codeFrame = generateCodeFrame(string, location);
+			jsonError.rawCodeFrame = generateCodeFrame(string, location, /* highlightCode */ false);
 		}
 
 		throw jsonError;

test.js

@@ -2,9 +2,19 @@ import process from 'node:process';
 import test from 'ava';
 import parseJson, {JSONError} from './index.js';
 
-const errorMessageRegex = /^v(?:16|18)\./.test(process.version)
-	? /Unexpected token "}"/
-	: /Expected double-quoted property name in JSON at position 16 while parsing/;
+const errorMessageRegex = (() => {
+	const version = Number(process.versions.node.split('.')[0]);
+
+	if (version < 20) {
+		return /Unexpected token "}"/;
+	}
+
+	if (version < 21) {
+		return /Expected double-quoted property name in JSON at position 16 while parsing/;
+	}
+
+	return /Expected double-quoted property name in JSON at position 16 \(line 3 column 1\) while parsing/;
+})();
 const errorMessageRegexWithFileName = new RegExp(errorMessageRegex.source + '.*in foo\\.json');
 
 test('main', t => {