feat: changes after review

Author: DmitryAnansky

packages/core/src/__tests__/ref-utils.test.ts

@@ -1,6 +1,6 @@
 import outdent from 'outdent';
 import { parseYamlToDocument } from '../../__tests__/utils.js';
-import { escapePointer, parseRef, refBaseName, unescapePointerFromURI } from '../ref-utils.js';
+import { escapePointer, unescapePointer, parseRef, refBaseName } from '../ref-utils.js';
 import { lintDocument } from '../lint.js';
 import { createConfig } from '../config/index.js';
 import { BaseResolver } from '../resolve.js';
@@ -159,17 +159,17 @@ describe('ref-utils', () => {
     });
   });
 
-  describe('unescapePointerFromURI', () => {
+  describe('unescapePointer', () => {
     it('should unescape a pointer with a percent sign correctly', () => {
-      expect(unescapePointerFromURI('activity_level_%25')).toStrictEqual('activity_level_%');
+      expect(unescapePointer('activity_level_%25')).toStrictEqual('activity_level_%');
     });
 
     it('should unescape a pointer with a number correctly', () => {
-      expect(unescapePointerFromURI('123')).toStrictEqual('123');
+      expect(unescapePointer('123')).toStrictEqual('123');
     });
 
     it('should unescape a pointer correctly', () => {
-      expect(unescapePointerFromURI('scope~1complex~0name')).toStrictEqual('scope/complex~name');
+      expect(unescapePointer('scope~1complex~0name')).toStrictEqual('scope/complex~name');
     });
   });
 });

packages/core/src/index.ts

@@ -52,7 +52,6 @@ export { YamlParseError } from './errors/yaml-parse-error.js';
 export { parseYaml, stringifyYaml } from './js-yaml/index.js';
 export {
   unescapePointer,
-  unescapePointerFromURI,
   isRef,
   isAbsoluteUrl,
   escapePointer,

packages/core/src/ref-utils.ts

@@ -41,11 +41,7 @@ export class Location {
 }
 
 export function unescapePointer(fragment: string): string {
-  return fragment.replace(/~1/g, '/').replace(/~0/g, '~');
-}
-
-export function unescapePointerFromURI(fragment: string): string {
-  return unescapePointer(decodeURIComponent(fragment));
+  return decodeURIComponent(fragment).replace(/~1/g, '/').replace(/~0/g, '~');
 }
 
 export function escapePointer<T extends string | number>(fragment: T): T {
@@ -57,7 +53,7 @@ export function parseRef(ref: string): { uri: string | null; pointer: string[] }
   const [uri, pointer = ''] = ref.split('#/');
   return {
     uri: (uri.endsWith('#') ? uri.slice(0, -1) : uri) || null,
-    pointer: pointer.split('/').map(unescapePointerFromURI).filter(isTruthy),
+    pointer: pointer.split('/').map(unescapePointer).filter(isTruthy),
   };
 }