fix(ruleset-migrator): http/https uris not followed correctly (#2247)

stoplightio · Aug 30, 2022 · 573e112 · 573e112
1 parent 7d16080
commit 573e112
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 5 deletions.
diff --git a/packages/ruleset-migrator/src/__tests__/ruleset.test.ts b/packages/ruleset-migrator/src/__tests__/ruleset.test.ts
@@ -161,6 +161,61 @@ describe('migrator', () => {
     });
   });
 
+  it('should follow links correctly', async () => {
+    serveAssets({
+      'http://domain/bitbucket/projects/API/repos/spectral-rules/raw/.spectral.yml?at=refs%2Fheads%2Fmaster': {
+        extends: ['spectral:oas', 'oas-rules.yml'],
+        rules: {
+          'valid-type': 'error',
+        },
+      },
+      'http://domain/bitbucket/projects/API/repos/spectral-rules/raw/oas-rules.yml': {
+        rules: {
+          'valid-type': {
+            given: '$',
+            function: {
+              then: 'truthy',
+            },
+          },
+        },
+      },
+    });
+
+    await vol.promises.writeFile(
+      path.join(cwd, 'ruleset.json'),
+      JSON.stringify({
+        extends: [
+          'http://domain/bitbucket/projects/API/repos/spectral-rules/raw/.spectral.yml?at=refs%2Fheads%2Fmaster',
+        ],
+      }),
+    );
+
+    expect(
+      await migrateRuleset(path.join(cwd, 'ruleset.json'), {
+        format: 'esm',
+        fs: vol as any,
+      }),
+    ).toEqual(`import {oas} from "@stoplight/spectral-rulesets";
+export default {
+  "extends": [{
+    "extends": [oas, {
+      "rules": {
+        "valid-type": {
+          "given": "$",
+          "function": {
+            "then": "truthy"
+          }
+        }
+      }
+    }],
+    "rules": {
+      "valid-type": "error"
+    }
+  }]
+};
+`);
+  });
+
   describe('custom npm registry', () => {
     it('should be supported', async () => {
       serveAssets({

diff --git a/packages/ruleset-migrator/src/tree/index.ts b/packages/ruleset-migrator/src/tree/index.ts
@@ -128,11 +128,6 @@ export class Tree {
     if (path.isURL(identifier) || path.isAbsolute(identifier)) {
       resolved = identifier;
       this.#resolvedPaths.add(identifier);
-    } else if (kind === 'ruleset' && isPackageImport(identifier)) {
-      resolved =
-        ctx.npmRegistry !== null
-          ? path.join(ctx.npmRegistry, identifier)
-          : requireResolve?.(identifier, { paths: [ctx.cwd] }) ?? path.join(ctx.cwd, identifier);
     } else if (
       (ctx.npmRegistry !== null && ctx.filepath.startsWith(ctx.npmRegistry)) ||
       isKnownNpmRegistry(ctx.filepath)
@@ -142,6 +137,11 @@ export class Tree {
       // <origin>/<pkg-name>
       // <origin>/<pkg-name>/<asset> where asset can be a custom fn, etc.
       resolved = path.join(ctx.filepath, identifier);
+    } else if (kind === 'ruleset' && !path.isURL(ctx.filepath) && isPackageImport(identifier)) {
+      resolved =
+        ctx.npmRegistry !== null
+          ? path.join(ctx.npmRegistry, identifier)
+          : requireResolve?.(identifier, { paths: [ctx.cwd] }) ?? path.join(ctx.cwd, identifier);
     } else {
       resolved = path.join(ctx.filepath, '..', identifier);
       this.#resolvedPaths.add(resolved);