Adjust types for typescript 4.4

Some JSX types (eg. `value?: string`) will probably change to `value?: string | undefined`, so no need to fix those now.

src/Components/Branches/Utils.tsx

@@ -41,14 +41,16 @@ export function toggleTreeItem(e: h.JSX.TargetedMouseEvent<HTMLAnchorElement>) {
 }
 
 function selectAction(c: Link<string>) {
-    updateStore({selectedBranch: {branch: c.props.linkData}})
+    if (c.props.linkData) {
+        updateStore({selectedBranch: {branch: c.props.linkData}});
+    }
 }
 
 // eslint-disable-next-line react/prefer-stateless-function
 export class RenderBranchTree extends PureComponent<{
     branches: BranchTree
-    contextMenu?: (event: h.JSX.TargetedMouseEvent<HTMLAnchorElement>) => void
-    dblClick?: (event: h.JSX.TargetedMouseEvent<HTMLAnchorElement>) => void
+    contextMenu?: ((event: h.JSX.TargetedMouseEvent<HTMLAnchorElement>) => void) | undefined
+    dblClick?: ((event: h.JSX.TargetedMouseEvent<HTMLAnchorElement>) => void) | undefined
     indent: number
 }> {
     render() {

src/Components/Changes.tsx

@@ -3,15 +3,21 @@ import { IpcAction, IpcActionReturn } from "src/Data/Actions";
 import { updateStore, Store, PureStoreComponent } from "../Data/Renderer/store";
 import Link from "./Link";
 
-export default class Changes extends PureStoreComponent<unknown, {staged: number, unstaged: number, repoPath: string}> {
-    state = {
+interface State {
+    staged: number
+    unstaged: number
+}
+
+export default class Changes extends PureStoreComponent<unknown, State> {
+    state: Readonly<State> = {
         staged: 0,
         unstaged: 0,
-        repoPath: "",
     };
     componentDidMount() {
         this.listen("repo", (repo) => {
-            this.setState({repoPath: repo?.path});
+            if (repo?.path !== Store.repo?.path) {
+                this.forceUpdate();
+            }
         });
         this.registerHandler(IpcAction.REFRESH_WORKDIR, (changes: IpcActionReturn[IpcAction.REFRESH_WORKDIR]) => {
             this.setState({

src/Components/CommitList/CommitListItem.tsx

@@ -19,7 +19,9 @@ type Props = {
 };
 
 function selectCommit(c: Link<string>) {
-    updateStore({diffPaneSrc: c.props.linkData});
+    if (c.props.linkData) {
+        updateStore({diffPaneSrc: c.props.linkData});
+    }
 }
 
 // prefer-stateless-function is disabled for PureComponents from react but is not recognized from preact.

src/Components/CommitList/index.tsx

@@ -83,10 +83,11 @@ export default class CommitList extends PureStoreComponent<unknown, State> {
             };
         }
 
-        ipcSendMessage(IpcAction.LOAD_COMMITS, {
-            cursor: this.cursor,
-            ...options
-        });
+        if (this.cursor) {
+            options.cursor = this.cursor;
+        }
+
+        ipcSendMessage(IpcAction.LOAD_COMMITS, options);
     }
     handleCommits(fetched: IpcActionReturn[IpcAction.LOAD_COMMITS]) {
         if (fetched.branch === "history") {

src/Components/Dialog/AddRemote.tsx

@@ -6,6 +6,7 @@ export function AddRemote(dialog: DialogProps[DialogTypes.ADD_REMOTE]) {
     const data: RemoteProps["data"] = {
         name: "",
         pullFrom: "",
+        pushTo: null,
     };
     return <div className="dialog-window">
         <form onSubmit={e => {

src/Components/Dialog/CreateTag.tsx

@@ -3,8 +3,9 @@ import { CreateTagProps } from "./types";
 
 
 export function CreateTag(dialog: CreateTagProps) {
-    const data: {name: string, annotation?: string} = {
-        name: ""
+    const data: {name: string, annotation: string} = {
+        name: "",
+        annotation: "",
     };
     return <div className="dialog-window">
         <form onSubmit={e => {

src/Components/Dialog/EditRemote.tsx

@@ -20,7 +20,7 @@ export function EditRemote(dialog: RemoteProps) {
             </label>
             <label>
                 <p>Push to:</p>
-                <input type="text" name="push" onChange={e => data.pushTo = e.currentTarget.value} value={data.pushTo} />
+                <input type="text" name="push" onChange={e => data.pushTo = e.currentTarget.value} value={data.pushTo || ""} />
             </label>
             <br />
             <button type="submit">Confirm</button>

src/Components/Dialog/types.ts

@@ -36,15 +36,15 @@ export type CompareProps = {
 export type RemoteProps = {
     data: {
         pullFrom: string
-        pushTo?: string
+        pushTo: string | null
         name: string
     }
     confirmCb: (data: RemoteProps["data"]) => void
     cancelCb: () => void
 };
 
 export type BranchProps = {
-    defaultValue?: string
+    defaultValue: string | undefined
     confirmCb: (branchName: string) => void
     cancelCb: () => void
 };

src/Data/Actions.ts

@@ -60,7 +60,7 @@ export type IpcActionParams = {
     [IpcAction.LOAD_COMMIT]: string | null
     [IpcAction.LOAD_PATCHES_WITHOUT_HUNKS]: {
         sha: string
-        options?: DiffOptions
+        options: DiffOptions | undefined
     }
     [IpcAction.LOAD_HUNKS]: (
         {
@@ -84,7 +84,7 @@ export type IpcActionParams = {
     [IpcAction.UNSTAGE_FILE]: string
     [IpcAction.DISCARD_FILE]: string
     [IpcAction.COMMIT]: {
-        amend?: boolean
+        amend: boolean | undefined
         message: {
             summary: string
             body: string
@@ -124,8 +124,8 @@ export type IpcActionParams = {
     [IpcAction.OPEN_COMPARE_REVISIONS]: {from: string, to: string}
     [IpcAction.REMOTES]: null
     [IpcAction.RESOLVE_CONFLICT]: {path: string}
-    [IpcAction.EDIT_REMOTE]: {oldName: string, name: string, pullFrom: string, pushTo?: string}
-    [IpcAction.NEW_REMOTE]: {name: string, pullFrom: string, pushTo?: string}
+    [IpcAction.EDIT_REMOTE]: {oldName: string, name: string, pullFrom: string, pushTo: string | null}
+    [IpcAction.NEW_REMOTE]: {name: string, pullFrom: string, pushTo: string | null}
     [IpcAction.REMOVE_REMOTE]: {name: string}
     [IpcAction.FETCH]: null | {remote: string}
     [IpcAction.SAVE_SETTINGS]: AppConfig
@@ -143,7 +143,7 @@ export type IpcActionParams = {
     }
     [IpcAction.DELETE_TAG]: {
         name: string
-        remote?: boolean
+        remote: boolean | undefined
     }
 };
 
@@ -190,7 +190,7 @@ export type IpcActionReturn = {
     [IpcAction.OPEN_COMPARE_REVISIONS]: PatchObj[]
     [IpcAction.REMOTES]: {
         name: string
-        pushTo?: string
+        pushTo: string | null
         pullFrom: string
     }[]
     [IpcAction.RESOLVE_CONFLICT]: boolean
@@ -296,7 +296,7 @@ export type BranchObj = {
         ahead: number
         behind: number
     }
-    remote?: string
+    remote?: string | undefined
     type: RefType
 };
 
@@ -313,7 +313,7 @@ interface LoadCommitsParamBranch {
 }
 type LoadFileCommitsParam = {
     /** SHA of last fetched commit */
-    cursor?: string
+    cursor: string | undefined
     startAtCursor?: boolean
     num?: number
     file: string
@@ -337,7 +337,7 @@ export type LoadCommitReturn = {
 type LoadCommitsReturn = {
     commits: LoadCommitReturn[]
     branch: string
-    cursor?: string
+    cursor?: string | undefined
 };
 type LoadFileCommitsReturn = {
     commits: Array<LoadCommitReturn & {

src/Data/Config.ts

@@ -30,7 +30,7 @@ export type AppConfig = {
         sshPublicKey?: string
         sshPassphrase?: string
         sshAgent: boolean
-        gpg?: GpgConfig
+        gpg?: GpgConfig | undefined
     }>
     selectedProfile: number
 };

src/Data/Main/Provider.ts

@@ -195,8 +195,10 @@ export async function pull(repo: Repository, branch: string | null, signature: S
         try {
             ref = await repo.getReference(branch);
         } catch (err) {
-            // invalid ref
-            dialog.showErrorBox("Pull failed", `Invalid reference '${branch}'\n${err.message}`);
+            if (err instanceof Error) {
+                // invalid ref
+                dialog.showErrorBox("Pull failed", `Invalid reference '${branch}'\n${err.message}`);
+            }
             return false;
         }
     } else {
@@ -234,7 +236,9 @@ async function pushHead(repo: Repository, auth: AuthConfig) {
         upstream = await Branch.upstream(head);
     }
     catch (err) {
-        dialog.showErrorBox("Missing upstream", err.message);
+        if (err instanceof Error) {
+            dialog.showErrorBox("Missing upstream", err.message);
+        }
         return false;
     }
 
@@ -271,7 +275,9 @@ async function pushBranch(repo: Repository, remote: Remote, localRef: Reference,
 
         status = await Graph.aheadBehind(repo, localRef.target(), upstream.target()) as unknown as { ahead: number, behind: number };
     } catch (err) {
-        dialog.showErrorBox("Push failed", `Invalid upstream: ${err.message}`);
+        if (err instanceof Error) {
+            dialog.showErrorBox("Push failed", `Invalid upstream: ${err.message}`);
+        }
         return false;
     }
 
@@ -318,8 +324,10 @@ async function doPush(remote: Remote, localName: string, remoteName: string, aut
         return !pushResult;
     } catch (err) {
         // invalid authentication?
-        // FIXME: return error message instead of displaying error dialog here
-        dialog.showErrorBox("Push failed", err.message);
+        if (err instanceof Error) {
+            // FIXME: return error message instead of displaying error dialog here
+            dialog.showErrorBox("Push failed", err.message);
+        }
     }
     return false;
 }
@@ -356,7 +364,9 @@ export async function deleteRemoteRef(repo: Repository, refName: string, auth: A
                 }
             });
         } catch (err) {
-            dialog.showErrorBox("No remote ref found", err.message);
+            if (err instanceof Error) {
+                dialog.showErrorBox("No remote ref found", err.message);
+            }
         }
         ref.delete();
     }
@@ -512,7 +522,7 @@ export async function commit(repo: Repository, params: IpcActionParams[IpcAction
             await repo.createCommit("HEAD", committer, committer, message, oid, [parent]);
         }
     } catch (err) {
-        return err;
+        return err as Error;
     }
 
     return loadCommit(repo, null);
@@ -537,7 +547,9 @@ export async function createTag(repo: Repository, data: IpcActionParams[IpcActio
             await repo.createLightweightTag(id, data.name);
         }
     } catch (err) {
-        dialog.showErrorBox("Failed to create tag", err.toString());
+        if (err instanceof Error) {
+            dialog.showErrorBox("Failed to create tag", err.toString());
+        }
     }
 
     return true;
@@ -1018,7 +1030,7 @@ export async function commitWithDiff(repo: Repository, sha: string) {
     return commit;
 }
 
-export async function checkoutBranch(repo: Repository, branch: string): Promise<IpcActionReturn[IpcAction.CHECKOUT_BRANCH]> {
+export async function checkoutBranch(repo: Repository, branch: string) {
     try {
         await repo.checkoutBranch(branch);
         const head = await repo.head();
@@ -1029,9 +1041,9 @@ export async function checkoutBranch(repo: Repository, branch: string): Promise<
             commit: getCommitObj(headCommit),
             normalizedName: head.name(),
             type: RefType.LOCAL
-        };
+        } as IpcActionReturn[IpcAction.CHECKOUT_BRANCH];
     } catch (err) {
-        return err;
+        return err as Error;
     }
 }
 

src/Data/Renderer/Dialogs.ts

@@ -4,7 +4,7 @@ import { normalizeLocalName, normalizeRemoteNameWithoutRemote, normalizeTagName,
 import { ipcGetData, ipcSendMessage } from "./IPC";
 import { closeDialogWindow, createBranchFromSha, createBranchFromRef, openDialogWindow, setUpstream, renameLocalBranch } from "./store";
 
-export function openDialog_EditRemote(data: {name: string, pullFrom: string, pushTo?: string}) {
+export function openDialog_EditRemote(data: {name: string, pullFrom: string, pushTo: string | null}) {
     const oldName = data.name;
     openDialogWindow(DialogTypes.EDIT_REMOTE, {
         data,

src/Data/Renderer/store.ts

@@ -38,13 +38,13 @@ export type StoreType = {
         status: null | RepoStatus
     }
     branches: BranchesObj
-    head?: HeadBranchObj
+    head: HeadBranchObj | undefined
     remotes: IpcActionReturn[IpcAction.REMOTES]
     heads: {
         [key: string]: BranchObj[]
     }
     currentFile: null | {
-        commitSHA?: string
+        commitSHA?: string | undefined
         patch: PatchObj
     }
     locks: {

src/Views/WorkingArea/index.tsx

@@ -88,8 +88,8 @@ export default class WorkingArea extends StoreComponent<unknown, State> {
             };
             if (!amend) {
                 newState.commitMsg = Store.commitMsg;
-            } else {
-                newState.commitMsg = Store.head?.commit.message
+            } else if (Store.head) {
+                newState.commitMsg = Store.head.commit.message;
             }
             this.setState(newState);
         }