@jsopen/objects 2.0.2 → 2.1.1

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

@@ -3,3 +3,4 @@ export * from './is-object.js';
 export * from './merge.js';
 export * from './omit.js';
 export * from './type-guards.js';
+export { updateErrorMessage } from './update-error-message.js';

package/{esm/index.js → index.js}

@@ -3,3 +3,4 @@ export * from './is-object.js';
 export * from './merge.js';
 export * from './omit.js';
 export * from './type-guards.js';
+export { updateErrorMessage } from './update-error-message.js';

package/{esm/merge.js → merge.js}

@@ -64,7 +64,21 @@ export function merge(targetObject, sourceObject, options) {
             })) {
                 continue;
             }
-            if (keepExisting && hasOwnProperty.call(target, key)) {
+            _goDeep = !!(deep &&
+                typeof srcVal === 'object' &&
+                (!isBuiltIn(srcVal) || Array.isArray(srcVal)));
+            if (_goDeep) {
+                if (deepFn)
+                    _goDeep = deepFn(srcVal, {
+                        key,
+                        source,
+                        target,
+                        path: parentPath + (parentPath ? '.' : '') + String(key),
+                    });
+                else
+                    _goDeep = deepFull || isPlainObject(srcVal) || Array.isArray(srcVal);
+            }
+            if (!_goDeep && keepExisting && hasOwnProperty.call(target, key)) {
                 if (!keepExistingFn)
                     continue;
                 if (keepExistingFn(srcVal, {
@@ -91,46 +105,32 @@ export function merge(targetObject, sourceObject, options) {
             if (ignoreNulls && srcVal === null) {
                 continue;
             }
-            if (deep &&
-                typeof srcVal === 'object' &&
-                (!isBuiltIn(srcVal) || Array.isArray(srcVal))) {
-                _goDeep =
-                    (deepFn &&
-                        deepFn(srcVal, {
-                            key,
-                            source,
-                            target,
-                            path: parentPath + (parentPath ? '.' : '') + String(key),
-                        })) ||
-                        (!deepFn &&
-                            (deepFull || isPlainObject(srcVal) || Array.isArray(srcVal)));
-                if (_goDeep) {
-                    /** Array */
-                    if (Array.isArray(srcVal)) {
-                        if (Array.isArray(target[key]) &&
-                            (mergeArrays ||
-                                mergeArraysFn?.(srcVal, {
-                                    key,
-                                    source,
-                                    target,
-                                    path: parentPath + (parentPath ? '.' : '') + String(key),
-                                }))) {
-                            target[key] = _arrayClone(target[key], parentPath + (parentPath ? '.' : '') + String(key));
-                        }
-                        else
-                            target[key] = [];
-                        target[key].push(..._arrayClone(srcVal, parentPath + (parentPath ? '.' : '') + String(key)));
-                        if (mergeArraysUnique)
-                            target[key] = Array.from(new Set(target[key]));
-                        continue;
-                    }
-                    else {
-                        /** Object */
-                        if (!isObject(target[key]))
-                            target[key] = {};
-                        _merge(target[key], srcVal, parentPath + (parentPath ? '.' : '') + String(key));
-                        continue;
+            if (_goDeep) {
+                /** Array */
+                if (Array.isArray(srcVal)) {
+                    if (Array.isArray(target[key]) &&
+                        (mergeArrays ||
+                            mergeArraysFn?.(srcVal, {
+                                key,
+                                source,
+                                target,
+                                path: parentPath + (parentPath ? '.' : '') + String(key),
+                            }))) {
+                        target[key] = _arrayClone(target[key], parentPath + (parentPath ? '.' : '') + String(key));
                     }
+                    else
+                        target[key] = [];
+                    target[key].push(..._arrayClone(srcVal, parentPath + (parentPath ? '.' : '') + String(key)));
+                    if (mergeArraysUnique)
+                        target[key] = Array.from(new Set(target[key]));
+                    continue;
+                }
+                else {
+                    /** Object */
+                    if (!isObject(target[key]))
+                        target[key] = {};
+                    _merge(target[key], srcVal, parentPath + (parentPath ? '.' : '') + String(key));
+                    continue;
                 }
             }
             if (copyDescriptors) {

package/package.json

@@ -1,30 +1,22 @@
 {
   "name": "@jsopen/objects",
   "description": "Helper utilities for working with JavaScript objects and arrays",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "tslib": "^2.8.1"
   },
   "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "require": {
-        "types": "./types/index.d.cts",
-        "default": "./cjs/index.js"
-      },
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "default": "./index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
   ],
@@ -35,14 +27,6 @@
   "engines": {
     "node": ">= 16.0"
   },
-  "files": [
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md",
-    "CHANGELOG.md"
-  ],
   "keywords": [
     "object",
     "util",

package/update-error-message.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Updates the error message and stack trace at sametime.
+ * @param err
+ * @param newMessage
+ */
+export declare function updateErrorMessage(err: Error, newMessage: string): Error | undefined;
+/**
+ * Updates the error message and stack trace at sametime.
+ * @param err
+ * @param newMessage
+ */
+export declare function updateErrorMessageFallback(err: Error, newMessage: string): Error;

package/update-error-message.js

@@ -0,0 +1,42 @@
+/**
+ * Updates the error message and stack trace at sametime.
+ * @param err
+ * @param newMessage
+ */
+export function updateErrorMessage(err, newMessage) {
+    err.message = String(newMessage);
+    /** V8 */
+    if (typeof Error.captureStackTrace === 'function') {
+        Error.captureStackTrace(err);
+        return;
+    }
+    /** Other engines */
+    return updateErrorMessageFallback(err, newMessage);
+}
+/**
+ * Updates the error message and stack trace at sametime.
+ * @param err
+ * @param newMessage
+ */
+export function updateErrorMessageFallback(err, newMessage) {
+    err.message = String(newMessage);
+    /** Other engines */
+    const stack = typeof err.stack === 'string' ? err.stack : null;
+    if (!stack)
+        return err;
+    const name = err.name || 'Error';
+    const lines = stack.split('\n');
+    const firstFrameIdx = lines.findIndex(l => /^\s*at\s+/.test(l));
+    if (firstFrameIdx === -1) {
+        const msgLines = String(newMessage).split(/\r?\n/);
+        lines[0] = `${name}: ${msgLines[0] ?? ''}`;
+        lines.splice(1, 0, ...msgLines.slice(1));
+        err.stack = lines.join('\n');
+        return err;
+    }
+    const frameLines = lines.slice(firstFrameIdx);
+    const msgLines = String(newMessage).split(/\r?\n/);
+    const newHead = [`${name}: ${msgLines[0] ?? ''}`, ...msgLines.slice(1)];
+    err.stack = [...newHead, ...frameLines].join('\n');
+    return err;
+}

package/CHANGELOG.md

@@ -1,7 +0,0 @@
-## Changelog
-
-### [v2.0.2](https://github.com/panates/jsopen-objects/compare/v2.0.1...v2.0.2) - 
-
-#### 🛠 Refactoring and Updates
-
-- refactor: Minor typing changes @Eray Hanoğlu 

package/cjs/clone.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.clone = clone;
-exports.deepClone = deepClone;
-const merge_js_1 = require("./merge.js");
-function clone(obj, options) {
-    return (0, merge_js_1.merge)({}, obj, {
-        ...options,
-        deep: options?.deep ?? true,
-    });
-}
-function deepClone(obj, options) {
-    return clone(obj, { ...options, deep: 'full' });
-}

package/cjs/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./clone.js"), exports);
-tslib_1.__exportStar(require("./is-object.js"), exports);
-tslib_1.__exportStar(require("./merge.js"), exports);
-tslib_1.__exportStar(require("./omit.js"), exports);
-tslib_1.__exportStar(require("./type-guards.js"), exports);

package/cjs/is-object.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObject = isObject;
-exports.isPlainObject = isPlainObject;
-const objCtorStr = Function.prototype.toString.call(Object);
-function isObject(v) {
-    return v && typeof v === 'object' && !Array.isArray(v);
-}
-function isPlainObject(obj) {
-    if (obj &&
-        typeof obj === 'object' &&
-        Object.prototype.toString.call(obj) === '[object Object]') {
-        const proto = Object.getPrototypeOf(obj);
-        /* istanbul ignore next */
-        if (!proto)
-            return true;
-        const ctor = Object.prototype.hasOwnProperty.call(proto, 'constructor') &&
-            proto.constructor;
-        return (typeof ctor === 'function' &&
-            ctor instanceof ctor &&
-            Function.prototype.toString.call(ctor) === objCtorStr);
-    }
-    return false;
-}

package/cjs/merge.js

@@ -1,163 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = merge;
-const is_object_js_1 = require("./is-object.js");
-const type_guards_js_1 = require("./type-guards.js");
-const hasOwnProperty = Object.prototype.hasOwnProperty;
-function merge(targetObject, sourceObject, options) {
-    if (!((0, is_object_js_1.isObject)(targetObject) || typeof targetObject === 'function')) {
-        throw new TypeError('"target" argument must be an object');
-    }
-    if (sourceObject == null)
-        return targetObject;
-    if (!((0, is_object_js_1.isObject)(sourceObject) ||
-        typeof sourceObject === 'function' ||
-        Array.isArray(sourceObject))) {
-        throw new TypeError('"target" argument must be an object or array of objects');
-    }
-    const keepExisting = options?.keepExisting;
-    const keepExistingFn = typeof options?.keepExisting === 'function'
-        ? options?.keepExisting
-        : undefined;
-    const filterFn = options?.filter;
-    const ignoreUndefined = options?.ignoreUndefined ?? true;
-    const ignoreNulls = options?.ignoreNulls;
-    const deep = options?.deep;
-    const deepFull = deep === 'full';
-    const deepFn = typeof options?.deep === 'function' ? options?.deep : undefined;
-    const copyDescriptors = options?.copyDescriptors;
-    const mergeArrays = options?.mergeArrays;
-    const mergeArraysUnique = options?.mergeArrays === 'unique';
-    const mergeArraysFn = typeof options?.mergeArrays === 'function'
-        ? options?.mergeArrays
-        : undefined;
-    const _merge = (target, source, parentPath = '') => {
-        if (!(0, is_object_js_1.isObject)(source))
-            return;
-        const keys = Object.getOwnPropertyNames(source);
-        if (options?.symbolKeys ?? true)
-            keys.push(...Object.getOwnPropertySymbols(source));
-        let key;
-        let descriptor;
-        let srcVal;
-        let _goDeep = false;
-        if ((0, is_object_js_1.isPlainObject)(target))
-            Object.setPrototypeOf(target, Object.getPrototypeOf(source));
-        const ignoreFn = options?.ignoreSource;
-        let i = 0;
-        const len = keys.length;
-        for (i = 0; i < len; i++) {
-            key = keys[i];
-            /** Should not overwrite __proto__ and constructor properties */
-            if (key === '__proto__' || key === 'constructor')
-                continue;
-            if (copyDescriptors) {
-                descriptor = Object.getOwnPropertyDescriptor(source, key);
-                if (descriptor?.get || descriptor?.set) {
-                    Object.defineProperty(target, key, descriptor);
-                    continue;
-                }
-            }
-            srcVal = source[key];
-            if (ignoreFn?.(srcVal, {
-                key,
-                source,
-                target,
-                path: parentPath + (parentPath ? '.' : '') + String(key),
-            })) {
-                continue;
-            }
-            if (keepExisting && hasOwnProperty.call(target, key)) {
-                if (!keepExistingFn)
-                    continue;
-                if (keepExistingFn(srcVal, {
-                    key,
-                    source,
-                    target,
-                    path: parentPath + (parentPath ? '.' : '') + String(key),
-                })) {
-                    continue;
-                }
-            }
-            if (filterFn &&
-                !filterFn(srcVal, {
-                    key,
-                    source,
-                    target,
-                    path: parentPath + (parentPath ? '.' : '') + String(key),
-                })) {
-                continue;
-            }
-            if (ignoreUndefined && srcVal === undefined) {
-                continue;
-            }
-            if (ignoreNulls && srcVal === null) {
-                continue;
-            }
-            if (deep &&
-                typeof srcVal === 'object' &&
-                (!(0, type_guards_js_1.isBuiltIn)(srcVal) || Array.isArray(srcVal))) {
-                _goDeep =
-                    (deepFn &&
-                        deepFn(srcVal, {
-                            key,
-                            source,
-                            target,
-                            path: parentPath + (parentPath ? '.' : '') + String(key),
-                        })) ||
-                        (!deepFn &&
-                            (deepFull || (0, is_object_js_1.isPlainObject)(srcVal) || Array.isArray(srcVal)));
-                if (_goDeep) {
-                    /** Array */
-                    if (Array.isArray(srcVal)) {
-                        if (Array.isArray(target[key]) &&
-                            (mergeArrays ||
-                                mergeArraysFn?.(srcVal, {
-                                    key,
-                                    source,
-                                    target,
-                                    path: parentPath + (parentPath ? '.' : '') + String(key),
-                                }))) {
-                            target[key] = _arrayClone(target[key], parentPath + (parentPath ? '.' : '') + String(key));
-                        }
-                        else
-                            target[key] = [];
-                        target[key].push(..._arrayClone(srcVal, parentPath + (parentPath ? '.' : '') + String(key)));
-                        if (mergeArraysUnique)
-                            target[key] = Array.from(new Set(target[key]));
-                        continue;
-                    }
-                    else {
-                        /** Object */
-                        if (!(0, is_object_js_1.isObject)(target[key]))
-                            target[key] = {};
-                        _merge(target[key], srcVal, parentPath + (parentPath ? '.' : '') + String(key));
-                        continue;
-                    }
-                }
-            }
-            if (copyDescriptors) {
-                descriptor = { ...Object.getOwnPropertyDescriptor(source, key) };
-                descriptor.value = srcVal;
-                Object.defineProperty(target, key, descriptor);
-                continue;
-            }
-            target[key] = srcVal;
-        }
-        return target;
-    };
-    const _arrayClone = (arr, curPath) => {
-        return arr.map((x, index) => {
-            if (Array.isArray(x))
-                return _arrayClone(x, curPath + '[' + index + ']');
-            if (typeof x === 'object' && !(0, type_guards_js_1.isBuiltIn)(x))
-                return _merge({}, x, curPath + '[' + index + ']');
-            return x;
-        });
-    };
-    const sources = Array.isArray(sourceObject) ? sourceObject : [sourceObject];
-    for (const src of sources) {
-        _merge(targetObject, src);
-    }
-    return targetObject;
-}

package/cjs/omit.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.omit = omit;
-exports.omitUndefined = omitUndefined;
-exports.omitNull = omitNull;
-exports.omitNullish = omitNullish;
-const merge_js_1 = require("./merge.js");
-function omit(obj, keys) {
-    const keysSet = new Set(keys);
-    return (0, merge_js_1.merge)({}, obj, {
-        deep: false,
-        filter(_, { key }) {
-            return !keysSet.has(key);
-        },
-    });
-}
-function omitUndefined(obj, deep) {
-    return (0, merge_js_1.merge)({}, obj, {
-        deep,
-        ignoreUndefined: true,
-        copyDescriptors: true,
-    });
-}
-function omitNull(obj, deep) {
-    return (0, merge_js_1.merge)({}, obj, {
-        deep,
-        ignoreNulls: true,
-        ignoreUndefined: false,
-        copyDescriptors: true,
-    });
-}
-function omitNullish(obj, deep) {
-    return (0, merge_js_1.merge)({}, obj, {
-        deep,
-        ignoreNulls: true,
-        ignoreUndefined: true,
-        copyDescriptors: true,
-    });
-}

package/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/cjs/tsconfig-build-cjs.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["../../src/clone.ts","../../src/index.ts","../../src/is-object.ts","../../src/merge.ts","../../src/omit.ts","../../src/type-guards.ts"],"version":"5.9.2"}

package/cjs/type-guards.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBuiltIn = isBuiltIn;
-exports.isConstructor = isConstructor;
-exports.isIterable = isIterable;
-exports.isAsyncIterable = isAsyncIterable;
-function isBuiltIn(v) {
-    return ((v &&
-        typeof v === 'object' &&
-        (v instanceof Date ||
-            v instanceof RegExp ||
-            v instanceof Map ||
-            v instanceof Set ||
-            v instanceof WeakMap ||
-            v instanceof WeakSet ||
-            v instanceof WeakRef ||
-            v instanceof Promise ||
-            v instanceof Error ||
-            v instanceof ArrayBuffer ||
-            v instanceof Uint8Array ||
-            v instanceof Uint8ClampedArray ||
-            v instanceof Uint16Array ||
-            v instanceof Uint32Array ||
-            v instanceof BigUint64Array ||
-            v instanceof Int8Array ||
-            v instanceof Int16Array ||
-            v instanceof Int32Array ||
-            v.constructor.name === 'SharedArrayBuffer' ||
-            Buffer.isBuffer(v))) ||
-        Array.isArray(v));
-}
-function isConstructor(fn) {
-    return (typeof fn === 'function' &&
-        fn.prototype &&
-        fn.prototype.constructor === fn &&
-        fn.prototype.constructor.name !== 'Function' &&
-        fn.prototype.constructor.name !== 'embedded');
-}
-function isIterable(x) {
-    return Symbol.iterator in x;
-}
-function isAsyncIterable(x) {
-    return Symbol.asyncIterator in x;
-}

package/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}

package/esm/tsconfig-build-esm.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["../../src/clone.ts","../../src/index.ts","../../src/is-object.ts","../../src/merge.ts","../../src/omit.ts","../../src/type-guards.ts"],"version":"5.9.2"}

package/types/index.d.cts

@@ -1,5 +0,0 @@
-export * from './clone.js';
-export * from './is-object.js';
-export * from './merge.js';
-export * from './omit.js';
-export * from './type-guards.js';