From b43508dab754cbc3dfe980428f9bdb5369bbfd7b Mon Sep 17 00:00:00 2001
From: mesqueeb <mesqueeb@users.noreply.github.com>
Date: Tue, 15 Nov 2022 11:26:28 +0900
Subject: [PATCH] chore: build

---
 dist/index.cjs                 | 28 +++++++++++++++++++++++++---
 dist/index.es.js               | 28 +++++++++++++++++++++++++---
 dist/types/merge.d.ts          | 10 +++++-----
 dist/types/typeUtils/List.d.ts |  9 +++++++++
 4 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/dist/index.cjs b/dist/index.cjs
index 2530bef..68471fe 100644
--- a/dist/index.cjs
+++ b/dist/index.cjs
@@ -80,14 +80,36 @@ function mergeAndConcat(object, ...otherObjects) {
         return mergeRecursively(result, newComer, concatArrays);
     }, object);
 }
-// import { Timestamp } from 'firebase/firestore'
+// import { Timestamp } from '../test/Timestamp'
 // type T1 = { date: Timestamp }
 // type T2 = [{ b: string[] }, { b: number[] }, { date: Timestamp }]
-// type Test = Merge<T1, T2>
+// type TestT = Merge<T1, T2>
 // type A1 = { arr: string[] }
 // type A2 = { arr: number[] }
 // type A3 = { arr: boolean[] }
-// type Test = Merge<A1, [A2, A3]>
+// type TestA = Merge<A1, [A2, A3]>
+// interface I1 {
+//   date: Timestamp
+// }
+// interface I2 {
+//   date: Timestamp
+// }
+// const _a: I2 = { date: '' } as unknown as I2
+// type TestI = Merge<I1, [I2]>
+// // ReturnType<(typeof merge)<I1, I2>>
+// const a = merge(_a, [_a])
+// interface Arguments extends Record<string | number | symbol, unknown> {
+//     key: string;
+// }
+// const aa1: Arguments = { key: "value1" }
+// const aa2: Arguments = { key: "value2" }
+// const aa = merge(a1, a2);
+// interface Barguments {
+//   key: string
+// }
+// const ba1: Barguments = { key: 'value1' }
+// const ba2: Barguments = { key: 'value2' }
+// const ba = merge(ba1, ba2)
 
 exports.concatArrays = concatArrays;
 exports.merge = merge;
diff --git a/dist/index.es.js b/dist/index.es.js
index 41615e5..c2f2351 100644
--- a/dist/index.es.js
+++ b/dist/index.es.js
@@ -78,13 +78,35 @@ function mergeAndConcat(object, ...otherObjects) {
         return mergeRecursively(result, newComer, concatArrays);
     }, object);
 }
-// import { Timestamp } from 'firebase/firestore'
+// import { Timestamp } from '../test/Timestamp'
 // type T1 = { date: Timestamp }
 // type T2 = [{ b: string[] }, { b: number[] }, { date: Timestamp }]
-// type Test = Merge<T1, T2>
+// type TestT = Merge<T1, T2>
 // type A1 = { arr: string[] }
 // type A2 = { arr: number[] }
 // type A3 = { arr: boolean[] }
-// type Test = Merge<A1, [A2, A3]>
+// type TestA = Merge<A1, [A2, A3]>
+// interface I1 {
+//   date: Timestamp
+// }
+// interface I2 {
+//   date: Timestamp
+// }
+// const _a: I2 = { date: '' } as unknown as I2
+// type TestI = Merge<I1, [I2]>
+// // ReturnType<(typeof merge)<I1, I2>>
+// const a = merge(_a, [_a])
+// interface Arguments extends Record<string | number | symbol, unknown> {
+//     key: string;
+// }
+// const aa1: Arguments = { key: "value1" }
+// const aa2: Arguments = { key: "value2" }
+// const aa = merge(a1, a2);
+// interface Barguments {
+//   key: string
+// }
+// const ba1: Barguments = { key: 'value1' }
+// const ba2: Barguments = { key: 'value2' }
+// const ba = merge(ba1, ba2)
 
 export { concatArrays, merge, mergeAndCompare, mergeAndConcat };
diff --git a/dist/types/merge.d.ts b/dist/types/merge.d.ts
index 2b0d0a6..0b96bf9 100644
--- a/dist/types/merge.d.ts
+++ b/dist/types/merge.d.ts
@@ -1,17 +1,17 @@
 import type { Assign } from './typeUtils/Assign';
-import type { List } from './typeUtils/List';
+import type { Pop } from './typeUtils/List';
 import type { PrettyPrint } from './typeUtils/PrettyPrint';
 /**
  * The return type of `merge()`. It reflects the type that is returned by JavaScript.
  *
  * This TS Utility can be used as standalone as well
  */
-export declare type Merge<T extends Record<string | number | symbol, unknown>, Ts extends List<Record<string | number | symbol, unknown>>> = PrettyPrint<Assign<T, Ts>>;
+export declare type Merge<T, Ts extends unknown[]> = T extends Record<string | number | symbol, unknown> ? Ts extends Record<string | number | symbol, unknown>[] ? PrettyPrint<Assign<T, Ts>> : Pop<Ts> : Pop<Ts>;
 /**
  * Merge anything recursively.
  * Objects get merged, special objects (classes etc.) are re-assigned "as is".
  * Basic types overwrite objects or other basic types.
  */
-export declare function merge<T extends Record<string | number | symbol, unknown>, Tn extends Record<string | number | symbol, unknown>[]>(object: T, ...otherObjects: Tn): Merge<T, Tn>;
-export declare function mergeAndCompare<T extends Record<string | number | symbol, unknown>, Tn extends Record<string | number | symbol, unknown>[]>(compareFn: (prop1: any, prop2: any, propName: string | symbol) => any, object: T, ...otherObjects: Tn): Merge<T, Tn>;
-export declare function mergeAndConcat<T extends Record<string | number | symbol, unknown>, Tn extends Record<string | number | symbol, unknown>[]>(object: T, ...otherObjects: Tn): Merge<T, Tn>;
+export declare function merge<T, Tn extends unknown[]>(object: T, ...otherObjects: Tn): Merge<T, Tn>;
+export declare function mergeAndCompare<T, Tn extends unknown[]>(compareFn: (prop1: any, prop2: any, propName: string | symbol) => any, object: T, ...otherObjects: Tn): Merge<T, Tn>;
+export declare function mergeAndConcat<T, Tn extends unknown[]>(object: T, ...otherObjects: Tn): Merge<T, Tn>;
diff --git a/dist/types/typeUtils/List.d.ts b/dist/types/typeUtils/List.d.ts
index cf9f4db..76f2c9c 100644
--- a/dist/types/typeUtils/List.d.ts
+++ b/dist/types/typeUtils/List.d.ts
@@ -18,3 +18,12 @@ export declare type List<T = any> = readonly T[];
  * ```
  */
 export declare type Length<L extends List> = L['length'];
+/**
+ * Return the last item out of a [[List]]
+ * @param L
+ * @returns [[List]]
+ * @example
+ * ```ts
+ * ```
+ */
+export declare type Pop<L extends List> = L extends readonly [] ? L : L extends readonly [...any, infer Last] ? Last : L;