investira.sdk 2.3.16 → 2.3.18

package/CHANGELOG.md

@@ -521,3 +521,11 @@ O contrutor para a criação das mensagem foi alterado.
 # 2.3.16
 
 -   [objetcs] Alteração da getDiff
+
+# 2.3.17
+
+-   [objetcs] Alteração da getDiff
+
+# 2.3.18
+
+-   [objetcs] Correção da mergeObject

package/lib/utils/httpRequests.js

@@ -229,7 +229,7 @@ const httpRequests = {
     /**
      * Retorna ip original do request
      *
-     * @param {*} req
+     * @param {*} pAddress
      * @returns
      */
     getAddress: pAddress => {
@@ -253,9 +253,11 @@ const httpRequests = {
      * @param {string} [pUrl='https://investira.com.br'] Ação a se executa se não houver conexão
      * @return {Promise}
      */
-    hasConnection: async (pUrl = 'https://investira.com.br') => {
+    hasConnection: async (pUrl = 'https://investira.com.br', pTimeout = null) => {
         const xProps = { url: pUrl, rejectUnauthorized: false };
-
+        if (pTimeout) {
+            xProps.timeout = pTimeout;
+        }
         let xResult = false;
 
         await httpRequests

package/lib/utils/objects.js

@@ -316,6 +316,7 @@ const objects = {
     },
 
     mergeObject: (pTarget, pSource, pOptionsArgument) => {
+        let xTarget = pTarget || {};
         let xDestination = {};
         if (isMergeable(pTarget)) {
             Object.keys(pTarget).forEach(xKey => {
@@ -323,10 +324,10 @@ const objects = {
             });
         }
         Object.keys(pSource).forEach(xKey => {
-            if (!isMergeable(pSource[xKey]) || !pTarget[xKey]) {
+            if (!isMergeable(pSource[xKey]) || !xTarget[xKey]) {
                 xDestination[xKey] = objects.cloneIfNecessary(pSource[xKey], pOptionsArgument);
             } else {
-                xDestination[xKey] = objects.deepMerge(pTarget[xKey], pSource[xKey], pOptionsArgument);
+                xDestination[xKey] = objects.deepMerge(xTarget[xKey], pSource[xKey], pOptionsArgument);
             }
         });
         return xDestination;
@@ -343,9 +344,10 @@ const objects = {
         let xCurrentData = objects.deepCopy(pCurrentData);
         let xNewData = objects.deepCopy(pNewData);
         if (isFunction(pOnMerge)) {
+            //Exclui dados nulos do registro atual
             xCurrentData = objects.deleteNull(xCurrentData);
+            //Incorpora os dados novos dentro do registro atual
             xNewData = objects.deepMerge(xCurrentData, xNewData);
-            xCurrentData = objects.deepMerge(xNewData, xCurrentData);
             pOnMerge(xNewData);
         }
         return diff(xCurrentData, xNewData, {

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "investira.sdk",
-    "version": "2.3.16",
+    "version": "2.3.18",
     "author": "Investira",
     "description": "Investira SDK",
     "main": "index.js",
     "type": "commonjs",
     "registry": true,
-    "raw": "investira.sdk@2.3.16",
+    "raw": "investira.sdk@2.3.18",
     "escapedName": "investira.sdk",
-    "rawSpec": "2.3.16",
+    "rawSpec": "2.3.18",
     "saveSpec": null,
-    "fetchSpec": "2.3.16",
+    "fetchSpec": "2.3.18",
     "homepage": "https://investira.com.br/",
     "engines": {
         "node": ">=11.11.0 <=18.12",
@@ -38,7 +38,7 @@
         "axios": "1.5.1",
         "deep-diff": "1.0.2",
         "flatted": "3.2.9",
-        "investira.data": "^1.3.4",
+        "investira.data": "^1.3.6",
         "moment": "^2.30.1"
     },
     "devDependencies": {