fix: resolve API alias paths correctly for config files located outside the root folder

Author: tatomyr

.changeset/silly-chairs-applaud.md

@@ -0,0 +1,5 @@
+---
+"@redocly/cli": patch
+---
+
+Fixed an issue where an API alias's root path might be resolved incorrectly for configuration files located outside the root folder.

__tests__/commands.test.ts

@@ -613,6 +613,20 @@ describe('E2E', () => {
       const result = getCommandOutput(args, testPath);
       (<any>expect(cleanupOutput(result))).toMatchSpecificSnapshot(join(testPath, 'snapshot.js'));
     });
+
+    test('apply a decorator to a specific api (without specifying the api)', () => {
+      const testPath = join(folderPath, 'apply-per-api-decorators');
+      const args = getParams('../../../packages/cli/src/index.ts', 'bundle');
+      const result = getCommandOutput(args, testPath);
+      (<any>expect(cleanupOutput(result))).toMatchSpecificSnapshot(join(testPath, 'snapshot.js'));
+    });
+
+    test('apply a decorator to a specific api (when the api is specified as an alias)', () => {
+      const testPath = join(folderPath, 'apply-per-api-decorators');
+      const args = getParams('../../../packages/cli/src/index.ts', 'bundle', ['test@v1']);
+      const result = getCommandOutput(args, testPath);
+      (<any>expect(cleanupOutput(result))).toMatchSpecificSnapshot(join(testPath, 'snapshot.js'));
+    });
   });
 
   describe('build-docs', () => {

__tests__/miscellaneous/apply-per-api-decorators/openapi.yaml

@@ -0,0 +1,8 @@
+openapi: 3.1.0
+info:
+  title: Test
+paths: {}
+components:
+  schemas:
+    Unused:
+      type: string

__tests__/miscellaneous/apply-per-api-decorators/plugins/decorators/version.js

@@ -0,0 +1,11 @@
+module.exports = sparkle;
+
+function sparkle() {
+  return {
+    Info: {
+      leave(target) {
+        target.version = '1.0.0';
+      },
+    },
+  };
+}

__tests__/miscellaneous/apply-per-api-decorators/plugins/test.js

@@ -0,0 +1,12 @@
+const version = require('./decorators/version.js');
+
+module.exports = function testPlugin() {
+  return {
+    id: 'test',
+    decorators: {
+      oas3: {
+        version,
+      },
+    },
+  };
+};

__tests__/miscellaneous/apply-per-api-decorators/redocly.yaml

@@ -0,0 +1,8 @@
+apis:
+  test@v1:
+    root: openapi.yaml
+    decorators:
+      test/version: on
+      remove-unused-components: on
+plugins:
+  - plugins/test.js

__tests__/miscellaneous/apply-per-api-decorators/snapshot.js

@@ -0,0 +1,33 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`E2E miscellaneous apply a decorator to a specific api (when the api is specified as an alias) 1`] = `
+openapi: 3.1.0
+info:
+  title: Test
+  version: 1.0.0
+paths: {}
+components:
+  schemas:
+    Unused:
+      type: string
+
+bundling ./__tests__/miscellaneous/apply-per-api-decorators/openapi.yaml...
+📦 Created a bundle for ./__tests__/miscellaneous/apply-per-api-decorators/openapi.yaml at stdout <test>ms.
+
+`;
+
+exports[`E2E miscellaneous apply a decorator to a specific api (without specifying the api) 1`] = `
+openapi: 3.1.0
+info:
+  title: Test
+  version: 1.0.0
+paths: {}
+components:
+  schemas:
+    Unused:
+      type: string
+
+bundling ./__tests__/miscellaneous/apply-per-api-decorators/openapi.yaml...
+📦 Created a bundle for ./__tests__/miscellaneous/apply-per-api-decorators/openapi.yaml at stdout <test>ms.
+
+`;

packages/cli/src/commands/login.ts

@@ -1,6 +1,6 @@
 import { blue, green, gray } from 'colorette';
 import { RedoclyClient } from '@redocly/openapi-core';
-import { promptUser } from '../utils/miscellaneous';
+import { exitWithError, promptUser } from '../utils/miscellaneous';
 
 import type { CommandArgs } from '../wrapper';
 import type { Region } from '@redocly/openapi-core';
@@ -21,10 +21,14 @@ export type LoginOptions = {
 };
 
 export async function handleLogin({ argv, config }: CommandArgs<LoginOptions>) {
-  const region = argv.region || config.region;
-  const client = new RedoclyClient(region);
-  const clientToken = await promptClientToken(client.domain);
-  process.stdout.write(gray('\n  Logging in...\n'));
-  await client.login(clientToken, argv.verbose);
-  process.stdout.write(green('  Authorization confirmed. ✅\n\n'));
+  try {
+    const region = argv.region || config.region;
+    const client = new RedoclyClient(region);
+    const clientToken = await promptClientToken(client.domain);
+    process.stdout.write(gray('\n  Logging in...\n'));
+    await client.login(clientToken, argv.verbose);
+    process.stdout.write(green('  Authorization confirmed. ✅\n\n'));
+  } catch (err) {
+    exitWithError('  ' + err?.message);
+  }
 }

packages/cli/src/utils/miscellaneous.ts

@@ -92,9 +92,9 @@ function getAliasOrPath(config: ConfigApis, aliasOrPath: string): Entrypoint {
   const aliasApi = config.apis[aliasOrPath];
   return aliasApi
     ? {
-        path: aliasApi.root,
+        path: resolve(getConfigDirectory(config), aliasApi.root),
         alias: aliasOrPath,
-        output: aliasApi.output,
+        output: aliasApi.output && resolve(getConfigDirectory(config), aliasApi.output),
       }
     : {
         path: aliasOrPath,

packages/core/src/config/config-resolvers.ts

@@ -370,19 +370,19 @@ export async function resolveApis({
   return resolvedApis;
 }
 
-async function resolveAndMergeNestedStyleguideConfig(
-  {
-    styleguideConfig,
-    configPath = '',
-    resolver = new BaseResolver(),
-  }: {
-    styleguideConfig?: StyleguideRawConfig;
-    configPath?: string;
-    resolver?: BaseResolver;
-  },
-  parentConfigPaths: string[] = [],
-  extendPaths: string[] = []
-): Promise<ResolvedStyleguideConfig> {
+async function resolveAndMergeNestedStyleguideConfig({
+  styleguideConfig,
+  configPath = '',
+  resolver = new BaseResolver(),
+  parentConfigPaths = [],
+  extendPaths = [],
+}: {
+  styleguideConfig?: StyleguideRawConfig;
+  configPath?: string;
+  resolver?: BaseResolver;
+  parentConfigPaths?: string[];
+  extendPaths?: string[];
+}): Promise<ResolvedStyleguideConfig> {
   if (parentConfigPaths.includes(configPath)) {
     throw new Error(`Circular dependency in config file: "${configPath}"`);
   }
@@ -414,15 +414,13 @@ async function resolveAndMergeNestedStyleguideConfig(
         ? new URL(presetItem, configPath).href
         : path.resolve(path.dirname(configPath), presetItem);
       const extendedStyleguideConfig = await loadExtendStyleguideConfig(pathItem, resolver);
-      return await resolveAndMergeNestedStyleguideConfig(
-        {
-          styleguideConfig: extendedStyleguideConfig,
-          configPath: pathItem,
-          resolver: resolver,
-        },
-        [...parentConfigPaths, resolvedConfigPath],
-        extendPaths
-      );
+      return await resolveAndMergeNestedStyleguideConfig({
+        styleguideConfig: extendedStyleguideConfig,
+        configPath: pathItem,
+        resolver,
+        parentConfigPaths: [...parentConfigPaths, resolvedConfigPath],
+        extendPaths,
+      });
     }) || []
   );
 
@@ -446,20 +444,14 @@ async function resolveAndMergeNestedStyleguideConfig(
   };
 }
 
-export async function resolveStyleguideConfig(
-  opts: {
-    styleguideConfig?: StyleguideRawConfig;
-    configPath?: string;
-    resolver?: BaseResolver;
-  },
-  parentConfigPaths: string[] = [],
-  extendPaths: string[] = []
-): Promise<ResolvedStyleguideConfig> {
-  const resolvedStyleguideConfig = await resolveAndMergeNestedStyleguideConfig(
-    opts,
-    parentConfigPaths,
-    extendPaths
-  );
+export async function resolveStyleguideConfig(opts: {
+  styleguideConfig?: StyleguideRawConfig;
+  configPath?: string;
+  resolver?: BaseResolver;
+  parentConfigPaths?: string[];
+  extendPaths?: string[];
+}): Promise<ResolvedStyleguideConfig> {
+  const resolvedStyleguideConfig = await resolveAndMergeNestedStyleguideConfig(opts);
 
   return {
     ...resolvedStyleguideConfig,