Make notarize function overloaded

Author: rotu

src/index.ts

@@ -4,17 +4,28 @@ import retry from 'promise-retry';
 import { checkSignatures } from './check-signature';
 import { isNotaryToolAvailable, notarizeAndWaitForNotaryTool } from './notarytool';
 import { stapleApp } from './staple';
-import { NotarizeOptions, NotaryToolStartOptions } from './types';
+import {
+  NotarizeOptions,
+  NotaryToolStartOptions,
+  NotarizeOptionsLegacy,
+  NotarizeOptionsNotaryTool,
+} from './types';
 
 const d = debug('electron-notarize');
 
 export { NotarizeOptions };
 
 export { validateNotaryToolAuthorizationArgs as validateAuthorizationArgs } from './validate-args';
 
-export async function notarize({ appPath, ...otherOptions }: NotarizeOptions) {
+async function notarize(args: NotarizeOptionsNotaryTool): Promise<void>;
+/** @deprecated */
+async function notarize(args: NotarizeOptionsLegacy): Promise<void>;
+
+async function notarize({ appPath, ...otherOptions }: NotarizeOptions) {
   if (otherOptions.tool === 'legacy') {
-    throw new Error('Notarization with the legacy altool system was decommisioned as of November 2023');
+    throw new Error(
+      'Notarization with the legacy altool system was decommisioned as of November 2023',
+    );
   }
 
   await checkSignatures({ appPath });
@@ -33,3 +44,5 @@ export async function notarize({ appPath, ...otherOptions }: NotarizeOptions) {
     retries: 3,
   });
 }
+
+export { notarize };

src/legacy.ts

@@ -1,21 +1,18 @@
 import debug from 'debug';
 
-import {
-  LegacyNotarizeStartOptions,
-  LegacyNotarizeWaitOptions,
-} from './types';
+import { LegacyNotarizeStartOptions, LegacyNotarizeWaitOptions } from './types';
 
 const d = debug('electron-notarize:legacy');
 
 /** @deprecated */
-export async function startLegacyNotarize(
-  opts: LegacyNotarizeStartOptions,
-): Promise<never> {
+export async function startLegacyNotarize(opts: LegacyNotarizeStartOptions): Promise<never> {
   d('starting notarize process for app:', opts.appPath);
-  throw new Error("Cannot start notarization. Legacy notarization (altool) is no longer available")
+  throw new Error('Cannot start notarization. Legacy notarization (altool) is no longer available');
 }
 
 /** @deprecated */
 export async function waitForLegacyNotarize(opts: LegacyNotarizeWaitOptions): Promise<never> {
-  throw new Error("Cannot wait for notarization. Legacy notarization (altool) is no longer available")
+  throw new Error(
+    'Cannot wait for notarization. Legacy notarization (altool) is no longer available',
+  );
 }

src/types.ts

@@ -65,7 +65,6 @@ export type LegacyNotarizeWaitOptions = NotarizeResult & LegacyNotarizeCredentia
 export type NotarizeStapleOptions = Pick<LegacyNotarizeAppOptions, 'appPath'>;
 
 /** @deprecated */
-export type LegacyNotarizeOptions =  ({ tool?: 'legacy'} & LegacyNotarizeStartOptions)
-export type NotarizeOptions =
-  | /** @deprecate*/ ({ tool?: 'legacy' /** @deprecated */ } & LegacyNotarizeStartOptions)
-  | ({ tool?: 'notarytool' } & NotaryToolStartOptions);
+export type NotarizeOptionsLegacy = { tool: 'legacy' } & LegacyNotarizeStartOptions;
+export type NotarizeOptionsNotaryTool = { tool?: 'notarytool' } & NotaryToolStartOptions;
+export type NotarizeOptions = NotarizeOptionsLegacy | NotarizeOptionsNotaryTool;