Rebase and apply updated formatting

dexaai · Apr 21, 2024 · 94be866 · 94be866
1 parent d55e09a
commit 94be866
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/model/model.ts b/src/model/model.ts
@@ -40,7 +40,7 @@ export type PartialModelArgs<
   MClient extends Model.Base.Client,
   MConfig extends Model.Base.Config,
   MRun extends Model.Base.Run,
-  MResponse extends Model.Base.Response
+  MResponse extends Model.Base.Response,
 > = Prettify<
   PartialDeep<Pick<ModelArgs<MClient, MConfig, MRun, MResponse>, 'params'>> &
     Partial<Omit<ModelArgs<MClient, MConfig, MRun, MResponse>, 'params'>>
@@ -61,7 +61,7 @@ export abstract class AbstractModel<
 
   /** Clones the model, optionally modifying its config */
   abstract extend<
-    Args extends PartialModelArgs<MClient, MConfig, MRun, MResponse>
+    Args extends PartialModelArgs<MClient, MConfig, MRun, MResponse>,
   >(args?: Args): this;
 
   public abstract readonly modelType: Model.Type;

diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
@@ -13,7 +13,7 @@ const deepMergeEventsImpl: DeepMerge = deepmergeInit({
 // Slightly custom deepMerge which handles `undefined` arguments as empty objects.
 export function deepMerge<
   T1 extends object | undefined | null,
-  T2 extends object | undefined | null
+  T2 extends object | undefined | null,
 >(t1?: T1, t2?: T2): T1 & T2 {
   return deepMergeImpl<T1, T2>(
     t1 ?? ({} as T1),
@@ -25,7 +25,7 @@ export function deepMerge<
 // and ensures that we remove duplicate event handlers.
 export function mergeEvents<
   T1 extends object | undefined,
-  T2 extends object | undefined
+  T2 extends object | undefined,
 >(t1?: T1, t2?: T2): T1 & T2 {
   return deepMergeEventsImpl<T1, T2>(
     t1 ?? ({} as T1),