chore: revert previous fix

Author: AlbinaBlazhko17

packages/core/src/__tests__/resolve.test.ts

@@ -163,7 +163,7 @@ describe('collect refs', () => {
     // expect(resolvedRefs.size).toEqual(2);
     expect(Array.from(resolvedRefs.keys()).map((ref) => ref.substring(cwd.length + 1))).toEqual([
       'foobar.yaml::./externalInfo.yaml#/info',
-      'foobar.yaml::./externalLicense.yaml',
+      'externalInfo.yaml::./externalLicense.yaml',
     ]);
 
     expect(Array.from(resolvedRefs.values()).map((info) => info.node)).toEqual([
@@ -201,9 +201,9 @@ describe('collect refs', () => {
         .sort()
     ).toMatchInlineSnapshot(`
       [
-        "openapi-with-back.yaml::../openapi-with-back.yaml#/components/schemas/TypeB",
         "openapi-with-back.yaml::./schemas/type-a.yaml#/",
         "openapi-with-back.yaml::./schemas/type-b.yaml#/",
+        "schemas/type-a.yaml::../openapi-with-back.yaml#/components/schemas/TypeB",
       ]
     `);
 
@@ -277,8 +277,8 @@ describe('collect refs', () => {
           "openapi.yaml::#/components/schemas/Local/properties/string",
           "openapi.yaml::./External.yaml#/properties/string",
           "openapi.yaml::./External.yaml",
-          "openapi.yaml::./External2.yaml",
-          "openapi.yaml::./External.yaml#/properties",
+          "External.yaml::./External2.yaml",
+          "External2.yaml::./External.yaml#/properties",
         ]
       `);
 

packages/core/src/resolve.ts

@@ -377,7 +377,7 @@ export async function resolveDocument(opts: {
           document,
           nodePointer: ref.$ref,
         };
-        const refId = makeRefId(rootDocument.source.absoluteRef, ref.$ref);
+        const refId = makeRefId(document.source.absoluteRef, ref.$ref);
         resolvedRefMap.set(refId, resolvedRef);
         return resolvedRef;
       }
@@ -404,7 +404,7 @@ export async function resolveDocument(opts: {
           document: undefined,
           error: error,
         };
-        const refId = makeRefId(rootDocument.source.absoluteRef, ref.$ref);
+        const refId = makeRefId(document.source.absoluteRef, ref.$ref);
         resolvedRefMap.set(refId, resolvedRef);
         return resolvedRef;
       }
@@ -446,7 +446,7 @@ export async function resolveDocument(opts: {
 
       resolvedRef.node = target;
       resolvedRef.document = targetDoc;
-      const refId = makeRefId(rootDocument.source.absoluteRef, ref.$ref);
+      const refId = makeRefId(document.source.absoluteRef, ref.$ref);
       if (resolvedRef.document && isRef(target)) {
         resolvedRef = await followRef(resolvedRef.document, target, pushRef(refStack, target));
       }

packages/core/src/rules/ajv.ts

@@ -25,8 +25,8 @@ function getAjv(resolve: ResolveFn, allowAdditionalProperties: boolean) {
       allowUnionTypes: true,
       validateFormats: true,
       defaultUnevaluatedProperties: allowAdditionalProperties,
-      loadSchemaSync(_: string, $ref: string, $id: string) {
-        const resolvedRef = resolve({ $ref });
+      loadSchemaSync(base: string, $ref: string, $id: string) {
+        const resolvedRef = resolve({ $ref }, base.split('#')[0]);
         if (!resolvedRef || !resolvedRef.location) return false;
         return { $id: resolvedRef.location.source.absoluteRef + '#' + $id, ...resolvedRef.node };
       },

packages/core/src/walk.ts

@@ -141,7 +141,7 @@ export function walkDocument<T extends BaseVisitor>(opts: {
     parent: any,
     key: string | number
   ) {
-    const resolve: ResolveFn = (ref, from = document.source.absoluteRef) => {
+    const resolve: ResolveFn = (ref, from = currentLocation.source.absoluteRef) => {
       if (!isRef(ref)) return { location, node: ref };
       const refId = makeRefId(from, ref.$ref);
       const resolvedRef = resolvedRefMap.get(refId);