feat: different approach with encode in ajv validator

Author: DmitryAnansky

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

@@ -168,10 +168,6 @@ describe('ref-utils', () => {
       expect(escapePointerFragment(123)).toStrictEqual(123);
     });
 
-    it('should URI-encode percent sign when escaping pointer fragments', () => {
-      expect(escapePointerFragment('percent%')).toStrictEqual('percent%25');
-    });
-
     it('should not URI-encode other special characters when escaping pointer fragments per https://datatracker.ietf.org/doc/html/rfc6901#section-6', () => {
       expect(escapePointerFragment('curly{braces}')).toStrictEqual('curly{braces}');
       expect(escapePointerFragment('plus+')).toStrictEqual('plus+');

packages/core/src/ref-utils.ts

@@ -41,21 +41,18 @@ export class Location {
 }
 
 export function unescapePointerFragment(fragment: string): string {
+  const unescaped = fragment.replace(/~1/g, '/').replace(/~0/g, '~');
+
   try {
-    return decodeURIComponent(fragment.replaceAll('~1', '/').replaceAll('~0', '~'));
-  } catch (error) {
-    return fragment.replaceAll('~1', '/').replaceAll('~0', '~');
+    return decodeURIComponent(unescaped);
+  } catch (e) {
+    return unescaped;
   }
 }
 
 export function escapePointerFragment<T extends string | number>(fragment: T): T {
   if (typeof fragment === 'number') return fragment;
-  let result: string = fragment;
-  // add only % escape if % is present
-  if (result.includes('%')) {
-    result = result.replaceAll('%', '%25');
-  }
-  return result.replaceAll('~', '~0').replaceAll('/', '~1') as T;
+  return fragment.replaceAll('~', '~0').replaceAll('/', '~1') as T;
 }
 
 export function parseRef(ref: string): { uri: string | null; pointer: string[] } {

packages/core/src/rules/ajv.ts

@@ -44,12 +44,13 @@ function getAjvValidator(
   allowAdditionalProperties: boolean
 ): ValidateFunction | undefined {
   const ajv = getAjv(resolve, allowAdditionalProperties);
+  const $id = encodeURI(loc.absolutePointer);
 
-  if (!ajv.getSchema(loc.absolutePointer)) {
-    ajv.addSchema({ $id: loc.absolutePointer, ...schema }, loc.absolutePointer);
+  if (!ajv.getSchema($id)) {
+    ajv.addSchema({ $id, ...schema }, $id);
   }
 
-  return ajv.getSchema(loc.absolutePointer);
+  return ajv.getSchema($id);
 }
 
 export function validateJsonSchema(

tests/e2e/lint/no-invalid-schema-examples-oas3.1-error/snapshot.txt

@@ -32,7 +32,7 @@ referenced from openapi.yaml:36:19 at #/paths/~1my_post/post/requestBody/content
 Error was generated by the no-invalid-schema-examples rule.
 
 
-[3] openapi.yaml:44:28 at #/paths/~1my_post/post/requestBody/content/application~1json/schema/properties/three_%25/example
+[3] openapi.yaml:44:28 at #/paths/~1my_post/post/requestBody/content/application~1json/schema/properties/three_%/example
 
 Example value must conform to the schema: type must be number.
 
@@ -43,7 +43,7 @@ Example value must conform to the schema: type must be number.
 45 |
 46 | responses:
 
-referenced from openapi.yaml:43:19 at #/paths/~1my_post/post/requestBody/content/application~1json/schema/properties/three_%25 
+referenced from openapi.yaml:43:19 at #/paths/~1my_post/post/requestBody/content/application~1json/schema/properties/three_% 
 
 Error was generated by the no-invalid-schema-examples rule.