@parcel/diagnostic 2.4.1 → 2.5.0

package/lib/diagnostic.d.ts

@@ -1,4 +1,4 @@
-import type { Mapping } from "json-source-map";
+import type { Mapping } from "@mischnic/json-sourcemap";
 /** These positions are 1-based (so <code>1</code> is the first line/column) */
 export declare type DiagnosticHighlightLocation = {
     readonly line: number;
@@ -94,8 +94,8 @@ export default class ThrowableDiagnostic extends Error {
     constructor(opts: ThrowableDiagnosticOpts);
 }
 /**
- * Turns a list of positions in a JSON file with messages into a list of diagnostics.
- * Uses <a href="https://github.com/epoberezkin/json-source-map">epoberezkin/json-source-map</a>.
+ * Turns a list of positions in a JSON5 file with messages into a list of diagnostics.
+ * Uses <a href="https://github.com/mischnic/json-sourcemap">@mischnic/json-sourcemap</a>.
  *
  * @param code the JSON code
  * @param ids A list of JSON keypaths (<code>key: "/some/parent/child"</code>) with corresponding messages, \
@@ -110,7 +110,7 @@ export declare function generateJSONCodeHighlights(data: string | {
     message?: string;
 }>): Array<DiagnosticCodeHighlight>;
 /**
- * Converts entries in <a href="https://github.com/epoberezkin/json-source-map">epoberezkin/json-source-map</a>'s
+ * Converts entries in <a href="https://github.com/mischnic/json-sourcemap">@mischnic/json-sourcemap</a>'s
  * <code>result.pointers</code> array.
  */
 export declare function getJSONSourceLocation(pos: Mapping, type?: ("key" | null | undefined) | "value"): {

package/lib/diagnostic.js

@@ -32,10 +32,10 @@ function _nullthrows() {
   return data;
 }
 
-function _jsonSourceMap() {
-  const data = _interopRequireDefault(require("json-source-map"));
+function _jsonSourcemap() {
+  const data = require("@mischnic/json-sourcemap");
 
-  _jsonSourceMap = function () {
+  _jsonSourcemap = function () {
     return data;
   };
 
@@ -137,8 +137,8 @@ class ThrowableDiagnostic extends Error {
 
 }
 /**
- * Turns a list of positions in a JSON file with messages into a list of diagnostics.
- * Uses <a href="https://github.com/epoberezkin/json-source-map">epoberezkin/json-source-map</a>.
+ * Turns a list of positions in a JSON5 file with messages into a list of diagnostics.
+ * Uses <a href="https://github.com/mischnic/json-sourcemap">@mischnic/json-sourcemap</a>.
  *
  * @param code the JSON code
  * @param ids A list of JSON keypaths (<code>key: "/some/parent/child"</code>) with corresponding messages, \
@@ -149,8 +149,10 @@ class ThrowableDiagnostic extends Error {
 exports.default = ThrowableDiagnostic;
 
 function generateJSONCodeHighlights(data, ids) {
-  // json-source-map doesn't support a tabWidth option (yet)
-  let map = typeof data == 'string' ? _jsonSourceMap().default.parse(data.replace(/\t/g, ' ')) : data;
+  let map = typeof data == 'string' ? (0, _jsonSourcemap().parse)(data, undefined, {
+    dialect: 'JSON5',
+    tabWidth: 1
+  }) : data;
   return ids.map(({
     key,
     type,
@@ -163,18 +165,21 @@ function generateJSONCodeHighlights(data, ids) {
   });
 }
 /**
- * Converts entries in <a href="https://github.com/epoberezkin/json-source-map">epoberezkin/json-source-map</a>'s
+ * Converts entries in <a href="https://github.com/mischnic/json-sourcemap">@mischnic/json-sourcemap</a>'s
  * <code>result.pointers</code> array.
  */
 
 
 function getJSONSourceLocation(pos, type) {
-  if (!type && pos.key && pos.value) {
+  let key = 'key' in pos ? pos.key : undefined;
+  let keyEnd = 'keyEnd' in pos ? pos.keyEnd : undefined;
+
+  if (!type && key && pos.value) {
     // key and value
     return {
       start: {
-        line: pos.key.line + 1,
-        column: pos.key.column + 1
+        line: key.line + 1,
+        column: key.column + 1
       },
       end: {
         line: pos.valueEnd.line + 1,
@@ -182,15 +187,15 @@ function getJSONSourceLocation(pos, type) {
       }
     };
   } else if (type == 'key' || !pos.value) {
-    (0, _assert().default)(pos.key && pos.keyEnd);
+    (0, _assert().default)(key && keyEnd);
     return {
       start: {
-        line: pos.key.line + 1,
-        column: pos.key.column + 1
+        line: key.line + 1,
+        column: key.column + 1
       },
       end: {
-        line: pos.keyEnd.line + 1,
-        column: pos.keyEnd.column
+        line: keyEnd.line + 1,
+        column: keyEnd.column
       }
     };
   } else {
@@ -210,7 +215,7 @@ function getJSONSourceLocation(pos, type) {
 
 
 function encodeJSONKeyComponent(component) {
-  return component.replace(/\//g, '~1');
+  return component.replace(/~/g, '~0').replace(/\//g, '~1');
 }
 
 const escapeCharacters = ['\\', '*', '_', '~'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/diagnostic",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -24,8 +24,8 @@
     "check-ts": "tsc --noEmit lib/diagnostic.d.ts"
   },
   "dependencies": {
-    "json-source-map": "^0.6.1",
+    "@mischnic/json-sourcemap": "^0.1.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "80c728ceffdc0829eca568a6ec66c07e07a0b87b"
+  "gitHead": "5cfb846d742eb86b1232e531be6e0e513551d838"
 }

package/src/diagnostic.js

@@ -2,7 +2,7 @@
 
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
-import jsonMap, {type Mapping} from 'json-source-map';
+import {parse, type Mapping} from '@mischnic/json-sourcemap';
 
 /** These positions are 1-based (so <code>1</code> is the first line/column) */
 export type DiagnosticHighlightLocation = {|
@@ -215,8 +215,8 @@ export default class ThrowableDiagnostic extends Error {
 }
 
 /**
- * Turns a list of positions in a JSON file with messages into a list of diagnostics.
- * Uses <a href="https://github.com/epoberezkin/json-source-map">epoberezkin/json-source-map</a>.
+ * Turns a list of positions in a JSON5 file with messages into a list of diagnostics.
+ * Uses <a href="https://github.com/mischnic/json-sourcemap">@mischnic/json-sourcemap</a>.
  *
  * @param code the JSON code
  * @param ids A list of JSON keypaths (<code>key: "/some/parent/child"</code>) with corresponding messages, \
@@ -231,9 +231,10 @@ export function generateJSONCodeHighlights(
       |},
   ids: Array<{|key: string, type?: ?'key' | 'value', message?: string|}>,
 ): Array<DiagnosticCodeHighlight> {
-  // json-source-map doesn't support a tabWidth option (yet)
   let map =
-    typeof data == 'string' ? jsonMap.parse(data.replace(/\t/g, ' ')) : data;
+    typeof data == 'string'
+      ? parse(data, undefined, {dialect: 'JSON5', tabWidth: 1})
+      : data;
   return ids.map(({key, type, message}) => {
     let pos = nullthrows(map.pointers[key]);
     return {
@@ -244,7 +245,7 @@ export function generateJSONCodeHighlights(
 }
 
 /**
- * Converts entries in <a href="https://github.com/epoberezkin/json-source-map">epoberezkin/json-source-map</a>'s
+ * Converts entries in <a href="https://github.com/mischnic/json-sourcemap">@mischnic/json-sourcemap</a>'s
  * <code>result.pointers</code> array.
  */
 export function getJSONSourceLocation(
@@ -254,17 +255,19 @@ export function getJSONSourceLocation(
   start: DiagnosticHighlightLocation,
   end: DiagnosticHighlightLocation,
 |} {
-  if (!type && pos.key && pos.value) {
+  let key = 'key' in pos ? pos.key : undefined;
+  let keyEnd = 'keyEnd' in pos ? pos.keyEnd : undefined;
+  if (!type && key && pos.value) {
     // key and value
     return {
-      start: {line: pos.key.line + 1, column: pos.key.column + 1},
+      start: {line: key.line + 1, column: key.column + 1},
       end: {line: pos.valueEnd.line + 1, column: pos.valueEnd.column},
     };
   } else if (type == 'key' || !pos.value) {
-    invariant(pos.key && pos.keyEnd);
+    invariant(key && keyEnd);
     return {
-      start: {line: pos.key.line + 1, column: pos.key.column + 1},
-      end: {line: pos.keyEnd.line + 1, column: pos.keyEnd.column},
+      start: {line: key.line + 1, column: key.column + 1},
+      end: {line: keyEnd.line + 1, column: keyEnd.column},
     };
   } else {
     return {
@@ -276,7 +279,7 @@ export function getJSONSourceLocation(
 
 /** Sanitizes object keys before using them as <code>key</code> in generateJSONCodeHighlights */
 export function encodeJSONKeyComponent(component: string): string {
-  return component.replace(/\//g, '~1');
+  return component.replace(/~/g, '~0').replace(/\//g, '~1');
 }
 
 const escapeCharacters = ['\\', '*', '_', '~'];