Instead of repeating the logic for adding the github token to a repository git url, we add a shared function for automatically computing the URls with token. Additionally, URLs for updating/generating tokens have been moved to a dedicated file in the `utils` folder. Also while being at it, the yargs github token helper is also moved into the dedicated Git/Github related util folder. PR Close #38656
		
			
				
	
	
		
			32 lines
		
	
	
		
			996 B
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
			
		
		
	
	
			32 lines
		
	
	
		
			996 B
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
/**
 | 
						|
 * @license
 | 
						|
 * Copyright Google LLC All Rights Reserved.
 | 
						|
 *
 | 
						|
 * Use of this source code is governed by an MIT-style license that can be
 | 
						|
 * found in the LICENSE file at https://angular.io/license
 | 
						|
 */
 | 
						|
 | 
						|
import {Arguments, Argv} from 'yargs';
 | 
						|
 | 
						|
import {addGithubTokenOption} from '../../utils/git/github-yargs';
 | 
						|
 | 
						|
import {mergePullRequest} from './index';
 | 
						|
 | 
						|
/** The options available to the merge command via CLI. */
 | 
						|
export interface MergeCommandOptions {
 | 
						|
  githubToken: string;
 | 
						|
  'pr-number': number;
 | 
						|
}
 | 
						|
 | 
						|
/** Builds the options for the merge command. */
 | 
						|
export function buildMergeCommand(yargs: Argv): Argv<MergeCommandOptions> {
 | 
						|
  return addGithubTokenOption(yargs).help().strict().positional(
 | 
						|
      'pr-number', {demandOption: true, type: 'number'});
 | 
						|
}
 | 
						|
 | 
						|
/** Handles the merge command. i.e. performs the merge of a specified pull request. */
 | 
						|
export async function handleMergeCommand(
 | 
						|
    {'pr-number': pr, githubToken}: Arguments<MergeCommandOptions>) {
 | 
						|
  await mergePullRequest(pr, githubToken);
 | 
						|
}
 |