fix: resolve an issue with options in the push command (#1419)

.changeset/thin-badgers-worry.md

@@ -0,0 +1,5 @@
+---
+"@redocly/cli": patch
+---
+
+Fixed an issue with the `push` command, when `destination` option does not work without specifying it in `redocly.yaml`.

packages/cli/src/__tests__/commands/push.test.ts

@@ -283,8 +283,7 @@ describe('transformPush', () => {
     const cb = jest.fn();
     transformPush(cb)(
       {
-        api: 'openapi.yaml',
-        maybeDestination: '@testing_org/main@v1',
+        apis: ['openapi.yaml', '@testing_org/main@v1'],
       },
       {} as any
     );
@@ -300,9 +299,7 @@ describe('transformPush', () => {
     const cb = jest.fn();
     transformPush(cb)(
       {
-        api: 'openapi.yaml',
-        maybeDestination: '@testing_org/main@v1',
-        maybeBranchName: 'other',
+        apis: ['openapi.yaml', '@testing_org/main@v1', 'other'],
       },
       {} as any
     );
@@ -319,9 +316,7 @@ describe('transformPush', () => {
     const cb = jest.fn();
     transformPush(cb)(
       {
-        api: 'openapi.yaml',
-        maybeDestination: '@testing_org/main@v1',
-        maybeBranchName: 'other',
+        apis: ['openapi.yaml', '@testing_org/main@v1', 'other'],
         branch: 'priority-branch',
       },
       {} as any
@@ -339,13 +334,13 @@ describe('transformPush', () => {
     const cb = jest.fn();
     transformPush(cb)(
       {
-        api: '@testing_org/main@v1',
+        apis: ['main@v1'],
       },
       {} as any
     );
     expect(cb).toBeCalledWith(
       {
-        destination: '@testing_org/main@v1',
+        destination: 'main@v1',
       },
       {}
     );
@@ -354,7 +349,7 @@ describe('transformPush', () => {
     const cb = jest.fn();
     transformPush(cb)(
       {
-        api: 'test.yaml',
+        apis: ['test.yaml'],
       },
       {} as any
     );
@@ -365,31 +360,32 @@ describe('transformPush', () => {
       {}
     );
   });
-  it('should accept aliases for the old syntax', () => {
+
+  it('should use destination from option', () => {
     const cb = jest.fn();
     transformPush(cb)(
       {
-        api: 'alias',
-        maybeDestination: '@testing_org/main@v1',
+        apis: ['test.yaml', 'test@v1'],
+        destination: 'main@v1',
       },
       {} as any
     );
     expect(cb).toBeCalledWith(
       {
-        destination: '@testing_org/main@v1',
-        api: 'alias',
+        destination: 'main@v1',
+        api: 'test.yaml',
       },
       {}
     );
   });
+
   it('should use --job-id option firstly', () => {
     const cb = jest.fn();
     transformPush(cb)(
       {
         'batch-id': 'b-123',
         'job-id': 'j-123',
-        api: 'test',
-        maybeDestination: 'main@v1',
+        apis: ['test'],
         branch: 'test',
         destination: 'main@v1',
       },

packages/cli/src/commands/push.ts

@@ -55,7 +55,7 @@ export function commonPushHandler({
   if (project && mountPath) {
     return handleCMSPush;
   }
-  return handlePush;
+  return transformPush(handlePush);
 }
 
 export async function handlePush(argv: PushOptions, config: Config): Promise<void> {
@@ -354,8 +354,7 @@ export function getDestinationProps(
 }
 
 type BarePushArgs = Omit<PushOptions, 'destination' | 'branchName'> & {
-  maybeDestination?: string;
-  maybeBranchName?: string;
+  apis?: string[];
   branch?: string;
   destination?: string;
 };
@@ -364,16 +363,16 @@ export const transformPush =
   (callback: typeof handlePush) =>
   (
     {
-      api: maybeApiOrDestination,
-      maybeDestination,
-      maybeBranchName,
+      apis,
       branch,
       'batch-id': batchId,
       'job-id': jobId,
       ...rest
     }: BarePushArgs & { 'batch-id'?: string },
     config: Config
   ) => {
+    const [maybeApiOrDestination, maybeDestination, maybeBranchName] = apis || [];
+
     if (batchId) {
       process.stderr.write(
         yellow(
@@ -410,12 +409,10 @@ export const transformPush =
       apiFile = maybeApiOrDestination;
     }
 
-    destination = rest.destination || destination;
-
     return callback(
       {
         ...rest,
-        destination,
+        destination: rest.destination ?? destination,
         api: apiFile,
         branchName: branch ?? maybeBranchName,
         'job-id': jobId || batchId,