merge-anything 5.1.2 → 5.1.4

package/dist/index.cjs

@@ -109,7 +109,12 @@ function mergeAndConcat(object, ...otherObjects) {
 // }
 // const ba1: Barguments = { key: 'value1' }
 // const ba2: Barguments = { key: 'value2' }
-// const ba = merge(ba1, ba2)
+// const ba = merge(ba1, ba2)
+// interface Carguments {
+//   key: string
+// }
+// const ca = merge<Carguments, Carguments[]>({ key: 'value1' }, { key: 'value2' })
+// type P = Pop<Carguments[]>
 
 exports.concatArrays = concatArrays;
 exports.merge = merge;

package/dist/index.es.js

@@ -107,6 +107,11 @@ function mergeAndConcat(object, ...otherObjects) {
 // }
 // const ba1: Barguments = { key: 'value1' }
 // const ba2: Barguments = { key: 'value2' }
-// const ba = merge(ba1, ba2)
+// const ba = merge(ba1, ba2)
+// interface Carguments {
+//   key: string
+// }
+// const ca = merge<Carguments, Carguments[]>({ key: 'value1' }, { key: 'value2' })
+// type P = Pop<Carguments[]>
 
 export { concatArrays, merge, mergeAndCompare, mergeAndConcat };

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export * from './merge';
-export * from './extensions';
+export * from './merge.js';
+export * from './extensions.js';

package/dist/types/merge.d.ts

@@ -1,12 +1,12 @@
-import type { Assign } from './typeUtils/Assign';
-import type { Pop } from './typeUtils/List';
-import type { PrettyPrint } from './typeUtils/PrettyPrint';
+import type { Assign } from './typeUtils/Assign.js';
+import type { Pop } from './typeUtils/List.js';
+import type { PrettyPrint } from './typeUtils/PrettyPrint.js';
 /**
  * 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, 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>;
+export 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".

package/dist/types/typeUtils/Assign.d.ts

@@ -1,6 +1,6 @@
-import { MergeDeep } from './MergeDeep';
-import { Iteration, IterationOf, Pos, Next } from './Iteration';
-import { Length, List } from './List';
+import type { MergeDeep } from './MergeDeep.js';
+import type { Iteration, IterationOf, Pos, Next } from './Iteration.js';
+import type { Length, List } from './List.js';
 /**
  * Ask TS to re-check that `A1` extends `A2`.
  * And if it fails, `A2` will be enforced anyway.
@@ -14,7 +14,7 @@ import { Length, List } from './List';
  * type test1 = Cast<'42', number> // number
  * ```
  */
-declare type Cast<A1, A2> = A1 extends A2 ? A1 : A2;
+type Cast<A1, A2> = A1 extends A2 ? A1 : A2;
 /**
  * Check whether `A1` is part of `A2` or not. The difference with
  * `extends` is that it forces a [[Boolean]] return.
@@ -33,9 +33,9 @@ declare type Cast<A1, A2> = A1 extends A2 ? A1 : A2;
  * /// Nothing cannot extend nothing, use `Equals`
  * ```
  */
-declare type Extends<A1, A2> = [A1] extends [never] ? 0 : A1 extends A2 ? 1 : 0;
-declare type __Assign<O extends Record<string | number | symbol, unknown>, Os extends List<Record<string | number | symbol, unknown>>, I extends Iteration = IterationOf<0>> = Extends<Pos<I>, Length<Os>> extends 1 ? O : __Assign<MergeDeep<O, Os[Pos<I>]>, Os, Next<I>>;
-declare type _Assign<O extends Record<string | number | symbol, unknown>, Os extends List<Record<string | number | symbol, unknown>>> = __Assign<O, Os> extends infer X ? Cast<X, Record<string | number | symbol, unknown>> : never;
+type Extends<A1, A2> = [A1] extends [never] ? 0 : A1 extends A2 ? 1 : 0;
+type __Assign<O extends Record<string | number | symbol, unknown>, Os extends List<Record<string | number | symbol, unknown>>, I extends Iteration = IterationOf<0>> = Extends<Pos<I>, Length<Os>> extends 1 ? O : __Assign<MergeDeep<O, Os[Pos<I>]>, Os, Next<I>>;
+type _Assign<O extends Record<string | number | symbol, unknown>, Os extends List<Record<string | number | symbol, unknown>>> = __Assign<O, Os> extends infer X ? Cast<X, Record<string | number | symbol, unknown>> : never;
 /**
  * Assign a list of [[Object]] into `O` with [[MergeDeep]]. Merges from right to
  * left, first items get overridden by the next ones (last-in overrides).
@@ -46,5 +46,5 @@ declare type _Assign<O extends Record<string | number | symbol, unknown>, Os ext
  * ```ts
  * ```
  */
-export declare type Assign<O extends Record<string | number | symbol, unknown>, Os extends List<Record<string | number | symbol, unknown>>> = O extends unknown ? (Os extends unknown ? _Assign<O, Os> : never) : never;
+export type Assign<O extends Record<string | number | symbol, unknown>, Os extends List<Record<string | number | symbol, unknown>>> = O extends unknown ? (Os extends unknown ? _Assign<O, Os> : never) : never;
 export {};

package/dist/types/typeUtils/Iteration.d.ts

@@ -1,14 +1,14 @@
 /**
  * An entry of `IterationMap`
  */
-export declare type Iteration = [
+export type Iteration = [
     value: number,
     sign: '-' | '0' | '+',
     prev: keyof IterationMap,
     next: keyof IterationMap,
     oppo: keyof IterationMap
 ];
-export declare type IterationMap = {
+export type IterationMap = {
     '__': [number, '-' | '0' | '+', '__', '__', '__'];
     '-100': [-100, '-', '__', '-99', '100'];
     '-99': [-99, '-', '-100', '-98', '99'];
@@ -228,7 +228,7 @@ export declare type IterationMap = {
  * type nprev = Pos<prev>    // -1
  * ```
  */
-export declare type IterationOf<N extends number> = `${N}` extends keyof IterationMap ? IterationMap[`${N}`] : IterationMap['__'];
+export type IterationOf<N extends number> = `${N}` extends keyof IterationMap ? IterationMap[`${N}`] : IterationMap['__'];
 /**
  * Get the position of `I` (**number**)
  * @param I to query
@@ -241,7 +241,7 @@ export declare type IterationOf<N extends number> = `${N}` extends keyof Iterati
  * type test1 = Pos<Next<i>> // 21
  * ```
  */
-export declare type Pos<I extends Iteration> = I[0];
+export type Pos<I extends Iteration> = I[0];
 /**
  * Move `I`'s position forward
  * @param I to move
@@ -254,4 +254,4 @@ export declare type Pos<I extends Iteration> = I[0];
  * type test1 = Pos<Next<i>> // 21
  * ```
  */
-export declare type Next<I extends Iteration> = IterationMap[I[3]];
+export type Next<I extends Iteration> = IterationMap[I[3]];

package/dist/types/typeUtils/List.d.ts

@@ -8,7 +8,7 @@
  * type list1 = number[]
  * ```
  */
-export declare type List<T = any> = readonly T[];
+export type List<T = any> = readonly T[];
 /**
  * Get the length of `L`
  * @param L to get length
@@ -17,7 +17,7 @@ export declare type List<T = any> = readonly T[];
  * ```ts
  * ```
  */
-export declare type Length<L extends List> = L['length'];
+export type Length<L extends List> = L['length'];
 /**
  * Return the last item out of a [[List]]
  * @param L
@@ -26,4 +26,4 @@ export declare type Length<L extends List> = L['length'];
  * ```ts
  * ```
  */
-export declare type Pop<L extends List> = L extends readonly [] ? L : L extends readonly [...any, infer Last] ? Last : L;
+export type Pop<L extends List> = L extends readonly [] ? never : L extends [...unknown[], infer Last] ? Last : L extends (infer T)[] ? T : never;

package/dist/types/typeUtils/MergeDeep.d.ts

@@ -6,7 +6,7 @@
  * ```ts
  * ```
  */
-declare type OptionalKeys<O extends object> = O extends unknown ? {
+type OptionalKeys<O extends object> = O extends unknown ? {
     [K in keyof O]-?: {} extends Pick<O, K> ? K : never;
 }[keyof O] : never;
 /**
@@ -17,13 +17,13 @@ declare type OptionalKeys<O extends object> = O extends unknown ? {
  * ```ts
  * ```
  */
-declare type RequiredKeys<O extends object> = O extends unknown ? {
+type RequiredKeys<O extends object> = O extends unknown ? {
     [K in keyof O]-?: {} extends Pick<O, K> ? never : K;
 }[keyof O] : never;
-declare type MergeObjectDeeply<O extends Record<string | number | symbol, unknown>, O1 extends Record<string | number | symbol, unknown>> = {
+type MergeObjectDeeply<O extends Record<string | number | symbol, unknown>, O1 extends Record<string | number | symbol, unknown>> = {
     [K in keyof (O & O1)]: K extends RequiredKeys<O1> ? MergeObjectsOrReturnFallback<O[K], O1[K], O1[K]> : K extends OptionalKeys<O1> ? K extends OptionalKeys<O> ? MergeObjectsOrReturnFallback<Exclude<O[K], undefined>, Exclude<O1[K], undefined>, Exclude<O[K], undefined> | Exclude<O1[K], undefined>> : K extends RequiredKeys<O> ? Exclude<O1[K], undefined> extends O[K] ? O[K] : MergeObjectsOrReturnFallback<O[K], Exclude<O1[K], undefined>, O[K] | Exclude<O1[K], undefined>> : O1[K] : O[K];
 };
-declare type MergeObjectsOrReturnFallback<O, O1, Fallback> = O extends Record<string | number | symbol, unknown> ? O1 extends Record<string | number | symbol, unknown> ? MergeObjectDeeply<O, O1> : Fallback : Fallback;
+type MergeObjectsOrReturnFallback<O, O1, Fallback> = O extends Record<string | number | symbol, unknown> ? O1 extends Record<string | number | symbol, unknown> ? MergeObjectDeeply<O, O1> : Fallback : Fallback;
 /**
  * Accurately merge the fields of `O` with the ones of `O1`. It is
  * equivalent to the spread operator in JavaScript. [[Union]]s and [[Optional]]
@@ -53,5 +53,5 @@ declare type MergeObjectsOrReturnFallback<O, O1, Fallback> = O extends Record<st
  * }
  * ```
  */
-export declare type MergeDeep<O extends Record<string | number | symbol, unknown>, O1 extends Record<string | number | symbol, unknown>> = O extends unknown ? (O1 extends unknown ? MergeObjectDeeply<O, O1> : never) : never;
+export type MergeDeep<O extends Record<string | number | symbol, unknown>, O1 extends Record<string | number | symbol, unknown>> = O extends unknown ? (O1 extends unknown ? MergeObjectDeeply<O, O1> : never) : never;
 export {};

package/dist/types/typeUtils/PrettyPrint.d.ts

@@ -1,6 +1,6 @@
-declare type Has<U, U1> = [U1] extends [U] ? 1 : 0;
-declare type If<B extends 0 | 1, Then, Else = never> = B extends 1 ? Then : Else;
-export declare type PrettyPrint<A, Seen = never> = If<Has<Seen, A>, A, A extends Record<string | number | symbol, unknown> ? {
+type Has<U, U1> = [U1] extends [U] ? 1 : 0;
+type If<B extends 0 | 1, Then, Else = never> = B extends 1 ? Then : Else;
+export type PrettyPrint<A, Seen = never> = If<Has<Seen, A>, A, A extends Record<string | number | symbol, unknown> ? {
     [K in keyof A]: PrettyPrint<A[K], A | Seen>;
 } & unknown : A>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-anything",
-  "version": "5.1.2",
+  "version": "5.1.4",
   "sideEffects": false,
   "type": "module",
   "description": "Merge objects & other types recursively. A simple & small integration.",
@@ -60,21 +60,21 @@
   },
   "homepage": "https://github.com/mesqueeb/merge-anything#readme",
   "dependencies": {
-    "is-what": "^4.1.7"
+    "is-what": "^4.1.8"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
     "del-cli": "^5.0.0",
-    "eslint": "^8.27.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-tree-shaking": "^1.10.0",
     "np": "^7.6.2",
-    "prettier": "^2.7.1",
-    "rollup": "^3.3.0",
+    "prettier": "^2.8.0",
+    "rollup": "^3.5.0",
     "rollup-plugin-typescript2": "^0.34.1",
-    "typescript": "^4.8.4",
-    "vitest": "^0.25.1"
+    "typescript": "^4.9.3",
+    "vitest": "^0.25.3"
   },
   "np": {
     "yarn": false,