merge-anything 5.1.6 → 6.0.0

package/dist/extensions.d.ts

@@ -0,0 +1 @@
+export declare function concatArrays<T>(originVal: unknown, newVal: T): T;

package/dist/extensions.js

@@ -0,0 +1,8 @@
+import { isArray } from 'is-what';
+export function concatArrays(originVal, newVal) {
+    if (isArray(originVal) && isArray(newVal)) {
+        // concat logic
+        return originVal.concat(newVal);
+    }
+    return newVal; // always return newVal as fallback!!
+}

package/dist/index.js

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

package/dist/{types/merge.d.ts → merge.d.ts}

@@ -13,5 +13,5 @@ export type Merge<T, Ts extends unknown[]> = T extends Record<string | number |
  * Basic types overwrite objects or other basic types.
  */
 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 mergeAndCompare<T, Tn extends unknown[]>(compareFn: (prop1: unknown, prop2: unknown, 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>;

package/dist/{index.es.js → merge.js}

@@ -1,13 +1,5 @@
-import { isArray, isPlainObject, isSymbol } from 'is-what';
-
-function concatArrays(originVal, newVal) {
-    if (isArray(originVal) && isArray(newVal)) {
-        // concat logic
-        return originVal.concat(newVal);
-    }
-    return newVal; // always return newVal as fallback!!
-}
-
+import { isPlainObject, isSymbol } from 'is-what';
+import { concatArrays } from './extensions.js';
 function assignProp(carry, key, newVal, originalObject) {
     const propType = {}.propertyIsEnumerable.call(originalObject, key)
         ? 'enumerable'
@@ -63,17 +55,17 @@ function mergeRecursively(origin, newComer, compareFn) {
  * Objects get merged, special objects (classes etc.) are re-assigned "as is".
  * Basic types overwrite objects or other basic types.
  */
-function merge(object, ...otherObjects) {
+export function merge(object, ...otherObjects) {
     return otherObjects.reduce((result, newComer) => {
         return mergeRecursively(result, newComer);
     }, object);
 }
-function mergeAndCompare(compareFn, object, ...otherObjects) {
+export function mergeAndCompare(compareFn, object, ...otherObjects) {
     return otherObjects.reduce((result, newComer) => {
         return mergeRecursively(result, newComer, compareFn);
     }, object);
 }
-function mergeAndConcat(object, ...otherObjects) {
+export function mergeAndConcat(object, ...otherObjects) {
     return otherObjects.reduce((result, newComer) => {
         return mergeRecursively(result, newComer, concatArrays);
     }, object);
@@ -113,5 +105,3 @@ function mergeAndConcat(object, ...otherObjects) {
 // }
 // const ca = merge<Carguments, Carguments[]>({ key: 'value1' }, { key: 'value2' })
 // type P = Pop<Carguments[]>
-
-export { concatArrays, merge, mergeAndCompare, mergeAndConcat };

package/dist/{types/typeUtils → typeUtils}/Assign.d.ts

@@ -1,6 +1,6 @@
-import type { MergeDeep } from './MergeDeep.js';
-import type { Iteration, IterationOf, Pos, Next } from './Iteration.js';
+import type { Iteration, IterationOf, Next, Pos } from './Iteration.js';
 import type { Length, List } from './List.js';
+import type { MergeDeep } from './MergeDeep.js';
 /**
  * Ask TS to re-check that `A1` extends `A2`.
  * And if it fails, `A2` will be enforced anyway.

package/dist/typeUtils/Assign.js

@@ -0,0 +1,12 @@
+export {};
+// type A1 = { arr: string[] }
+// type A2 = { arr: number[] }
+// type A3 = { arr: boolean[] }
+// type TestA = Assign<A1, [A2, A3]>
+// type B1 = { arr: number[] }
+// type B2 = { arr?: number[] }
+// type TestB = Assign<B1, [B2]>
+// import { Timestamp } from '../../test/Timestamp'
+// type T1 = { date: Timestamp }
+// type T2 = { date: Timestamp }
+// type TestT = Assign<T1, [T2]>

package/dist/typeUtils/Iteration.js

@@ -0,0 +1 @@
+export {};

package/dist/{types/typeUtils → typeUtils}/List.d.ts

@@ -8,7 +8,7 @@
  * type list1 = number[]
  * ```
  */
-export type List<T = any> = readonly T[];
+export type List<T = unknown> = readonly T[];
 /**
  * Get the length of `L`
  * @param L to get length

package/dist/typeUtils/List.js

@@ -0,0 +1 @@
+export {};

package/dist/typeUtils/MergeDeep.js

@@ -0,0 +1,21 @@
+export {};
+// import { PrettyPrint } from './PrettyPrint'
+// type A1 = { arr: string[]; barr?: { b: number } }
+// type A2 = { arr?: number[]; barr?: { b: number } }
+// type TestA = PrettyPrint<MergeDeep<A1, A2>>
+// type B1 = { a: number; b?: number;            d?: number; e?: number; x: string;             y?: number; z: string;  } // prettier-ignore
+// type B2 = { a?: number;           c?: number; d?: number; e: number;  x: number | undefined; y?: string; z?: number; } // prettier-ignore
+// type TestB = PrettyPrint<MergeDeep<B1, B2>>
+// type C1 = { info: { time: string; newDate: Date; very: { deep: { prop: boolean } } } }
+// type C2 = { info: { date: string; very: { deep: { prop: boolean } } } }
+// type TestC = PrettyPrint<MergeDeep<C1, C2>>
+// type D1 = { [key in string]?: { cool: boolean } | null }
+// type D2 = { [key in string]?: { notCool: boolean } | null }
+// type TestD = PrettyPrint<MergeDeep<D1, D2>>
+// import { Timestamp } from '../../test/Timestamp'
+// type T1 = { date: Timestamp }
+// type T2 = { date: Timestamp }
+// type TestT = MergeDeep<T1, T2>
+// interface I1 { date: Timestamp }
+// interface I2 { date: Timestamp }
+// type TestI = MergeDeep<I1, I2>

package/dist/typeUtils/PrettyPrint.js

@@ -0,0 +1,4 @@
+export {};
+// import { Timestamp } from '../../test/Timestamp'
+// type T1 = { b: string } & { nested: { props: number[] } } & { date: Timestamp[]; d: any[] }
+// type Test1 = PrettyPrint<T1>

package/package.json

@@ -1,35 +1,43 @@
 {
   "name": "merge-anything",
-  "version": "5.1.6",
-  "sideEffects": false,
-  "type": "module",
+  "version": "6.0.0",
   "description": "Merge objects & other types recursively. A simple & small integration.",
-  "module": "./dist/index.es.js",
-  "main": "./dist/index.cjs",
-  "types": "./dist/types/index.d.ts",
+  "type": "module",
+  "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./dist/types/index.d.ts",
-      "import": "./dist/index.es.js",
-      "require": "./dist/index.cjs"
+      "require": {
+        "types": "./dist/cjs/index.d.cts",
+        "default": "./dist/cjs/index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     }
   },
-  "files": [
-    "dist"
-  ],
   "engines": {
-    "node": ">=12.13"
+    "node": ">=18"
   },
   "scripts": {
-    "lint": "tsc --noEmit && eslint ./src --ext .ts",
+    "lint": "tsc --noEmit && eslint ./src",
     "test": "vitest run",
-    "build": "rollup --bundleConfigAsCjs -c ./scripts/build.js",
-    "release": "npm run lint && del dist && npm run build && np"
+    "build": "del-cli dist && tsc",
+    "release": "npm run lint && npm run build && np"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mesqueeb/merge-anything.git"
+  "dependencies": {
+    "is-what": "^4.1.8"
+  },
+  "devDependencies": {
+    "del-cli": "^5.1.0",
+    "np": "^10.0.5",
+    "vitest": "^1.6.0",
+    "@cycraft/eslint": "^0.3.0",
+    "@cycraft/tsconfig": "^0.1.2"
   },
+  "files": [
+    "dist"
+  ],
   "keywords": [
     "javascript",
     "merge",
@@ -52,59 +60,13 @@
     "merge-combine",
     "nested-combine"
   ],
-  "author": "Luca Ban - Mesqueeb",
+  "author": "Luca Ban - Mesqueeb (https://cycraft.co)",
   "funding": "https://github.com/sponsors/mesqueeb",
   "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/mesqueeb/merge-anything/issues"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mesqueeb/merge-anything.git"
   },
   "homepage": "https://github.com/mesqueeb/merge-anything#readme",
-  "dependencies": {
-    "is-what": "^4.1.8"
-  },
-  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
-    "del-cli": "^5.0.0",
-    "eslint": "^8.40.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-tree-shaking": "^1.10.0",
-    "np": "^7.7.0",
-    "prettier": "^2.8.8",
-    "rollup": "^3.21.5",
-    "rollup-plugin-typescript2": "^0.34.1",
-    "typescript": "^5.0.4",
-    "vitest": "^0.31.0"
-  },
-  "np": {
-    "yarn": false,
-    "branch": "production"
-  },
-  "eslintConfig": {
-    "ignorePatterns": [
-      "node_modules",
-      "dist",
-      "scripts",
-      "test"
-    ],
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "plugins": [
-      "@typescript-eslint",
-      "tree-shaking"
-    ],
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/eslint-recommended",
-      "plugin:@typescript-eslint/recommended",
-      "prettier"
-    ],
-    "rules": {
-      "@typescript-eslint/no-empty-function": "off",
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/ban-ts-ignore": "off",
-      "tree-shaking/no-side-effects-in-initialization": "error",
-      "@typescript-eslint/ban-ts-comment": "off"
-    }
-  }
+  "bugs": "https://github.com/mesqueeb/merge-anything/issues"
 }

package/dist/index.cjs

@@ -1,122 +0,0 @@
-'use strict';
-
-var isWhat = require('is-what');
-
-function concatArrays(originVal, newVal) {
-    if (isWhat.isArray(originVal) && isWhat.isArray(newVal)) {
-        // concat logic
-        return originVal.concat(newVal);
-    }
-    return newVal; // always return newVal as fallback!!
-}
-
-function assignProp(carry, key, newVal, originalObject) {
-    const propType = {}.propertyIsEnumerable.call(originalObject, key)
-        ? 'enumerable'
-        : 'nonenumerable';
-    if (propType === 'enumerable')
-        carry[key] = newVal;
-    if (propType === 'nonenumerable') {
-        Object.defineProperty(carry, key, {
-            value: newVal,
-            enumerable: false,
-            writable: true,
-            configurable: true,
-        });
-    }
-}
-function mergeRecursively(origin, newComer, compareFn) {
-    // always return newComer if its not an object
-    if (!isWhat.isPlainObject(newComer))
-        return newComer;
-    // define newObject to merge all values upon
-    let newObject = {};
-    if (isWhat.isPlainObject(origin)) {
-        const props = Object.getOwnPropertyNames(origin);
-        const symbols = Object.getOwnPropertySymbols(origin);
-        newObject = [...props, ...symbols].reduce((carry, key) => {
-            const targetVal = origin[key];
-            if ((!isWhat.isSymbol(key) && !Object.getOwnPropertyNames(newComer).includes(key)) ||
-                (isWhat.isSymbol(key) && !Object.getOwnPropertySymbols(newComer).includes(key))) {
-                assignProp(carry, key, targetVal, origin);
-            }
-            return carry;
-        }, {});
-    }
-    // newObject has all properties that newComer hasn't
-    const props = Object.getOwnPropertyNames(newComer);
-    const symbols = Object.getOwnPropertySymbols(newComer);
-    const result = [...props, ...symbols].reduce((carry, key) => {
-        // re-define the origin and newComer as targetVal and newVal
-        let newVal = newComer[key];
-        const targetVal = isWhat.isPlainObject(origin) ? origin[key] : undefined;
-        // When newVal is an object do the merge recursively
-        if (targetVal !== undefined && isWhat.isPlainObject(newVal)) {
-            newVal = mergeRecursively(targetVal, newVal, compareFn);
-        }
-        const propToAssign = compareFn ? compareFn(targetVal, newVal, key) : newVal;
-        assignProp(carry, key, propToAssign, newComer);
-        return carry;
-    }, newObject);
-    return result;
-}
-/**
- * Merge anything recursively.
- * Objects get merged, special objects (classes etc.) are re-assigned "as is".
- * Basic types overwrite objects or other basic types.
- */
-function merge(object, ...otherObjects) {
-    return otherObjects.reduce((result, newComer) => {
-        return mergeRecursively(result, newComer);
-    }, object);
-}
-function mergeAndCompare(compareFn, object, ...otherObjects) {
-    return otherObjects.reduce((result, newComer) => {
-        return mergeRecursively(result, newComer, compareFn);
-    }, object);
-}
-function mergeAndConcat(object, ...otherObjects) {
-    return otherObjects.reduce((result, newComer) => {
-        return mergeRecursively(result, newComer, concatArrays);
-    }, object);
-}
-// import { Timestamp } from '../test/Timestamp'
-// type T1 = { date: Timestamp }
-// type T2 = [{ b: string[] }, { b: number[] }, { date: Timestamp }]
-// type TestT = Merge<T1, T2>
-// type A1 = { arr: string[] }
-// type A2 = { arr: number[] }
-// type A3 = { arr: boolean[] }
-// 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)
-// interface Carguments {
-//   key: string
-// }
-// const ca = merge<Carguments, Carguments[]>({ key: 'value1' }, { key: 'value2' })
-// type P = Pop<Carguments[]>
-
-exports.concatArrays = concatArrays;
-exports.merge = merge;
-exports.mergeAndCompare = mergeAndCompare;
-exports.mergeAndConcat = mergeAndConcat;

package/dist/types/extensions.d.ts

@@ -1 +0,0 @@
-export declare function concatArrays(originVal: any, newVal: any): any | any[];

package/dist/{types/index.d.ts → index.d.ts}

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