Skip to content

refactor(ng-dev): use const objects rather than enums for merge modes #3381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josephperrott merged 1 commit into from
Jan 21, 2026
Merged

refactor(ng-dev): use const objects rather than enums for merge modes #3381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .github/local-actions/branch-manager/main.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions ng-dev/utils/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {Log} from './logging.js';
import {getCachedConfig, setCachedConfig} from './config-cache.js';
import {determineRepoBaseDirFromCwd} from './repo-directory.js';
import {pathToFileURL} from 'url';
import {MergeMode} from './git/repository-merge-mode.js';
import {RepositoryMergeMode} from './git/repository-merge-mode.js';

/**
* Type describing a ng-dev configuration.
Expand All @@ -24,9 +24,6 @@ export type NgDevConfig<T = {}> = T & {
__isNgDevConfigObject: boolean;
};

/** The merge modes repositories can defined as their normal merge mode. */
export type RepositoryMergeMode = Extract<MergeMode, 'team-only' | 'caretaker-only'>;

/**
* Describes the Github configuration for dev-infra. This configuration is
* used for API requests, determining the upstream remote, etc.
Expand Down
17 changes: 12 additions & 5 deletions ng-dev/utils/git/repository-merge-mode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,18 @@ import {AuthenticatedGitClient} from './authenticated-git-client';

const mergeModePropertyName = 'merge-mode';

export enum MergeMode {
TEAM_ONLY = 'team-only',
CARETAKER_ONLY = 'caretaker-only',
RELEASE = 'release',
}
/** The merge modes repositories can defined as their normal merge mode. */
export const RepositoryMergeMode = {
TEAM_ONLY: 'team-only',
CARETAKER_ONLY: 'caretaker-only',
} as const;
export type RepositoryMergeMode = (typeof RepositoryMergeMode)[keyof typeof RepositoryMergeMode];

export const MergeMode = {
...RepositoryMergeMode,
RELEASE: 'release',
} as const;
export type MergeMode = (typeof MergeMode)[keyof typeof MergeMode];

const mergeModes = Object.values(MergeMode);

Expand Down