Fix unresolved location if some key in data contains slash

jirutka · Jun 25, 2024 · acafb2b · acafb2b
1 parent f3e5625
commit acafb2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/commands/validate.ts b/src/commands/validate.ts
@@ -14,7 +14,7 @@ import { ProgramError } from '../errors.js'
 import { type ParsedFile, parseFile, parseFileWithMeta } from '../parsers/index.js'
 import { getSimpleErrors } from '../vendor/simple-ajv-errors/index.js'
 import type { VerboseErrorObject } from '../vendor/simple-ajv-errors/types.js'
-import { expandFilePaths, sha1sum } from '../utils.js'
+import { expandFilePaths, sha1sum, unescapeJsonPointer } from '../utils.js'
 import type { LocationRange, ValidationError } from '../types.js'
 
 const optionsSchema = {
@@ -251,7 +251,7 @@ function withInstanceLocation<T extends ValidationError>(
     ...err,
     instanceLocation: {
       filename: file.filename,
-      ...file.locate(err.instancePath.split('/').slice(1)),
+      ...file.locate(err.instancePath.split('/').slice(1).map(unescapeJsonPointer)),
     },
   }))
 }
diff --git a/src/utils.ts b/src/utils.ts
@@ -36,3 +36,7 @@ export function sanitizeId(input: string): string {
 export function sha1sum(data: unknown): string {
   return crypto.createHash('sha1').update(JSON.stringify(data)).digest('hex')
 }
+
+export function unescapeJsonPointer(pointer: string): string {
+  return pointer.replaceAll('~1', '/').replaceAll('~0', '~')
+}