gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-25 10:33:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace custom entries with Object.entries

Browse Source 
Remove custom entries utility and replace its usage with 
Object.entries across hotkeys and branch utility files.
This commit is contained in:
estib 2024-09-23 12:21:18 +02:00
parent 992496f6a5
commit 22e7f46950
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/desktop/src/lib/utils/branch.ts
View File

@ -1,5 +1,3 @@
import { entries, type UnknowObject } from './object';
const PREFERRED_REMOTE = 'origin';
const BRANCH_SEPARATOR = '/';
const REF_REMOTES_PREFIX = 'refs/remotes/';
@ -22,14 +20,14 @@ export function getBranchRemoteFromRef(ref: string): string | undefined {
return parts.length > 1 ? parts[0] : undefined;
}
const BRANCH_RANKING_EXACT: UnknowObject<number> = {
const BRANCH_RANKING_EXACT: Record<string, number> = {
'upstream/main': 100,
'upstream/master': 100,
'origin/main': 90,
'origin/master': 90
};
const BRANCH_RANKING_ENDS_WITH: UnknowObject<number> = {
const BRANCH_RANKING_ENDS_WITH: Record<string, number> = {
'/master': 70,
'/main': 70
};
@ -40,7 +38,7 @@ function branchRank(branchName: string): number {
return exactMatch;
}
for (const [key, value] of entries(BRANCH_RANKING_ENDS_WITH)) {
for (const [key, value] of Object.entries(BRANCH_RANKING_ENDS_WITH)) {
if (branchName.endsWith(key)) {
return value;
}

3
apps/desktop/src/lib/utils/hotkeys.ts
View File

@ -1,4 +1,3 @@
import { entries } from './object';
import { createKeybindingsHandler } from 'tinykeys';
interface KeybindDefinitions {
@ -26,7 +25,7 @@ export function createKeybind(keybinds: KeybindDefinitions) {
Backspace: () => {}
};
for (const [combo, callback] of entries(keybinds)) {
for (const [combo, callback] of Object.entries(keybinds)) {
keys[combo] = (event: KeyboardEvent) => {
if (
event.repeat ||

5
apps/desktop/src/lib/utils/object.ts
View File

@ -1,5 +0,0 @@
export type UnknowObject<T> = Record<string, T>;
export function entries<T, Obj extends UnknowObject<T>>(obj: Obj): [keyof Obj, Obj[keyof Obj]][] {
return Object.entries(obj) as [keyof Obj, Obj[keyof Obj]][];
}