@mongez/reinforcements 2.3.2 → 2.3.4

package/README.md

@@ -2057,6 +2057,10 @@ To run tests run `npm run test` or `yarn test`
 
 ## Change Log
 
+- 2.3.4 (06 May 2023)
+  - Fixed clone function array cloning does not lose reference for nested objects.
+- 2.3.3 (06 May 2023)
+  - Fixed clone function array cloning does not lose reference for nested objects.
 - 2.3.2 (06 May 2023)
   - Fixed clone function array cloning does not lose reference for nested objects.
 - 2.3.0 (25 Mar 2023)

package/cjs/mixed/clone/clone.d.ts

@@ -1,5 +1,2 @@
-/**
- * Make a deep copy for the given object/array and its nested objects/arrays as well
- */
-export default function clone(value: any): any;
+export default function clone<T>(value: T): T;
 //# sourceMappingURL=clone.d.ts.map

package/cjs/mixed/clone/clone.js

@@ -1,12 +1,25 @@
 "use strict";
-var merge = require("../../object/merge.js");
-/**
- * Make a deep copy for the given object/array and its nested objects/arrays as well
- */
 function clone(value) {
-  if (value && (Array.isArray(value) || typeof value === "object")) {
-    return merge({}, value);
+  if (typeof value === "object" && value !== null) {
+    if (Array.isArray(value)) {
+      return value.map(item => clone(item));
+    } else if (value instanceof Date) {
+      return new Date(value.getTime());
+    } else if (value instanceof Set) {
+      return new Set(Array.from(value, clone));
+    } else if (value instanceof Map) {
+      return new Map(Array.from(value, ([key, val]) => [key, clone(val)]));
+    } else {
+      const clonedObject = Object.create(Object.getPrototypeOf(value));
+      return Object.assign(
+        clonedObject,
+        ...Object.keys(value).map(key => ({
+          [key]: clone(value[key]),
+        })),
+      );
+    }
+  } else {
+    return value;
   }
-  return value;
 }
 module.exports = clone;

package/cjs/object/merge.d.ts

@@ -1,2 +1,5 @@
+/**
+ * Merge deep objects or arrays
+ */
 export default function merge(...objects: any[]): any;
 //# sourceMappingURL=merge.d.ts.map

package/cjs/object/merge.js

@@ -10,6 +10,7 @@ var Is__default = /*#__PURE__*/ _interopDefault(Is);
  * But removed unnecessary parts and added some types, also add some comments and updated constant/variable names and types
  */
 const isObject = Is__default.default.plainObject;
+const isArray = Array.isArray;
 function isDescriptor(object) {
   if (!isObject(object)) {
     return false;
@@ -23,11 +24,14 @@ function isDescriptor(object) {
         "configurable" in object))
   );
 }
+/**
+ * Merge deep objects or arrays
+ */
 function merge(...objects) {
-  if (objects.length === 0) return objects[0];
+  if (objects.length === 0 || !objects[0]) return objects[0];
   const refinedObjects = [];
   for (let object of objects) {
-    if (isObject(object)) {
+    if (isObject(object) || isArray(object)) {
       refinedObjects.push(object);
     }
   }
@@ -45,10 +49,10 @@ function merge(...objects) {
       const srcValue = srcObject[key];
       const targetValue = targetObject[key];
       let mergedObject = srcValue;
-      if (Array.isArray(mergedObject)) {
+      if (isArray(mergedObject)) {
         mergedObject = [...mergedObject];
       } else if (isObject(mergedObject) && !isDescriptor(mergedObject)) {
-        if (isObject(targetValue)) {
+        if (isObject(targetValue) || isArray(targetValue)) {
           mergedObject = merge(targetValue, mergedObject);
         } else {
           mergedObject = merge(mergedObject);
@@ -56,18 +60,6 @@ function merge(...objects) {
       }
       // New descriptor returned via callback
       if (isDescriptor(mergedObject)) {
-        // Defining properties using Object.defineProperty() works
-        // different than using the assignment operator (obj.a = 1).
-        // Specifically, the descriptor properties 'configurable',
-        // 'enumerable', and 'writable' default to 'false' when
-        // using Object.defineProperty() but to 'true' when using
-        // the assignment operator. The code below ensures that
-        // descriptors returned from callbacks are treated as if
-        // they were assigned using the assignment operator unless
-        // those properties are explicitly defined in the
-        // descriptor. This allow merging properties that may
-        // otherwise fail due to 'configurable' or 'writable' being
-        // set to 'false'.
         // Accessor and data descriptor
         mergedObject.configurable = !("configurable" in mergedObject)
           ? true

package/esm/mixed/clone/clone.d.ts

@@ -1,5 +1,2 @@
-/**
- * Make a deep copy for the given object/array and its nested objects/arrays as well
- */
-export default function clone(value: any): any;
+export default function clone<T>(value: T): T;
 //# sourceMappingURL=clone.d.ts.map

package/esm/mixed/clone/clone.js

@@ -1,11 +1,24 @@
-import merge from "../../object/merge.js";
-/**
- * Make a deep copy for the given object/array and its nested objects/arrays as well
- */
 function clone(value) {
-  if (value && (Array.isArray(value) || typeof value === "object")) {
-    return merge({}, value);
+  if (typeof value === "object" && value !== null) {
+    if (Array.isArray(value)) {
+      return value.map(item => clone(item));
+    } else if (value instanceof Date) {
+      return new Date(value.getTime());
+    } else if (value instanceof Set) {
+      return new Set(Array.from(value, clone));
+    } else if (value instanceof Map) {
+      return new Map(Array.from(value, ([key, val]) => [key, clone(val)]));
+    } else {
+      const clonedObject = Object.create(Object.getPrototypeOf(value));
+      return Object.assign(
+        clonedObject,
+        ...Object.keys(value).map(key => ({
+          [key]: clone(value[key]),
+        })),
+      );
+    }
+  } else {
+    return value;
   }
-  return value;
 }
 export { clone as default };

package/esm/object/merge.d.ts

@@ -1,2 +1,5 @@
+/**
+ * Merge deep objects or arrays
+ */
 export default function merge(...objects: any[]): any;
 //# sourceMappingURL=merge.d.ts.map

package/esm/object/merge.js

@@ -5,6 +5,7 @@ import Is from "@mongez/supportive-is";
  * But removed unnecessary parts and added some types, also add some comments and updated constant/variable names and types
  */
 const isObject = Is.plainObject;
+const isArray = Array.isArray;
 function isDescriptor(object) {
   if (!isObject(object)) {
     return false;
@@ -18,11 +19,14 @@ function isDescriptor(object) {
         "configurable" in object))
   );
 }
+/**
+ * Merge deep objects or arrays
+ */
 function merge(...objects) {
-  if (objects.length === 0) return objects[0];
+  if (objects.length === 0 || !objects[0]) return objects[0];
   const refinedObjects = [];
   for (let object of objects) {
-    if (isObject(object)) {
+    if (isObject(object) || isArray(object)) {
       refinedObjects.push(object);
     }
   }
@@ -40,10 +44,10 @@ function merge(...objects) {
       const srcValue = srcObject[key];
       const targetValue = targetObject[key];
       let mergedObject = srcValue;
-      if (Array.isArray(mergedObject)) {
+      if (isArray(mergedObject)) {
         mergedObject = [...mergedObject];
       } else if (isObject(mergedObject) && !isDescriptor(mergedObject)) {
-        if (isObject(targetValue)) {
+        if (isObject(targetValue) || isArray(targetValue)) {
           mergedObject = merge(targetValue, mergedObject);
         } else {
           mergedObject = merge(mergedObject);
@@ -51,18 +55,6 @@ function merge(...objects) {
       }
       // New descriptor returned via callback
       if (isDescriptor(mergedObject)) {
-        // Defining properties using Object.defineProperty() works
-        // different than using the assignment operator (obj.a = 1).
-        // Specifically, the descriptor properties 'configurable',
-        // 'enumerable', and 'writable' default to 'false' when
-        // using Object.defineProperty() but to 'true' when using
-        // the assignment operator. The code below ensures that
-        // descriptors returned from callbacks are treated as if
-        // they were assigned using the assignment operator unless
-        // those properties are explicitly defined in the
-        // descriptor. This allow merging properties that may
-        // otherwise fail due to 'configurable' or 'writable' being
-        // set to 'false'.
         // Accessor and data descriptor
         mergedObject.configurable = !("configurable" in mergedObject)
           ? true

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mongez/reinforcements",
-    "version": "2.3.2",
+    "version": "2.3.4",
     "description": "A lightweight package to give a massive reinforcements to variant types of data in Nodejs/Javascript",
     "main": "./cjs/index.js",
     "dependencies": {