From 2f04ef786dc963e7b21063658728fc2dd475e30f Mon Sep 17 00:00:00 2001
From: Bitbucket Build <build@sapienspaas.com>
Date: Thu, 25 Oct 2018 17:40:45 +0300
Subject: [PATCH 1/2] Fix for glitch preventing subelements of indexed array to
 map correctly.

---
 src/set-key-value.js |  33 ++++++-
 test/test.js         | 220 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 250 insertions(+), 3 deletions(-)

diff --git a/src/set-key-value.js b/src/set-key-value.js
index 8220295..666271b 100644
--- a/src/set-key-value.js
+++ b/src/set-key-value.js
@@ -126,16 +126,43 @@ function _setValue(destinationObject, key, keys, fromValue) {
       if (Array.isArray(fromValue) && _isNextArrayProperty(keys) === false) {
         for (valueIndex = 0; valueIndex < fromValue.length; valueIndex++) {
           value = fromValue[valueIndex];
-          destinationObject[key][arrayIndex + valueIndex] = _setValue(destinationObject[key][arrayIndex + valueIndex], keys[0], keys.slice(1), value);
+          const targetIndex = arrayIndex ? parseInt(arrayIndex) : parseInt(valueIndex);
+          destinationObject[key][targetIndex] = _setValue(destinationObject[key][targetIndex], keys[0], keys.slice(1), value);
         }
       } else {
-        destinationObject[key][arrayIndex] = _setValue(destinationObject[key][arrayIndex], keys[0], keys.slice(1), fromValue);
+        const findFirstIndexWithoutProp = function(keys, array) {
+            for(var i=0;i<array.length;i++) {
+                if(!subElementExists(keys, array[i])) {
+                    return i;
+                }
+            }
+
+            return array.length;
+        };
+
+        const subElementExists = function(keys, objectToCheck) {
+            const keyToCheck = keys[0];
+            const otherKeys = keys.slice(1);
+
+            if (objectToCheck[keyToCheck] && otherKeys.length == 0 ) {
+                return true;
+            } else if (objectToCheck[keyToCheck]) {
+                return subElementExists(otherKeys, objectToCheck[keyToCheck]);
+            }
+
+            return false;
+        };
+
+        const targetIndex = destinationObject[key][arrayIndex] && subElementExists(keys, destinationObject[key][arrayIndex]) ? findFirstIndexWithoutProp(keys, destinationObject[key]) : arrayIndex;
+        destinationObject[key][targetIndex] = _setValue(destinationObject[key][targetIndex], keys[0], keys.slice(1), fromValue);
       }
     } else if (Array.isArray(destinationObject)) {
       if (Array.isArray(fromValue)) {
         for (valueIndex = 0; valueIndex < fromValue.length; valueIndex++) {
           value = fromValue[valueIndex];
-          destinationObject[arrayIndex + valueIndex] = _setValue(destinationObject[arrayIndex + valueIndex], keys[0], keys.slice(1), value);
+          const arrayIndexInt = parseInt(arrayIndex);
+          const valueIndexInt = parseInt(valueIndex);
+          destinationObject[arrayIndexInt + valueIndexInt] = _setValue(destinationObject[arrayIndexInt + valueIndexInt], keys[0], keys.slice(1), value);
         }
       } else {
         destinationObject[arrayIndex] = _setValue(destinationObject[arrayIndex], keys[0], keys.slice(1), fromValue);
diff --git a/test/test.js b/test/test.js
index 4e469b7..ec5476a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1885,3 +1885,223 @@ test('Mapping properties with glob patterns with incomplete path', function (t)
   t.deepEqual(result, expect);
   t.end();
 });
+
+test('Should correctly map to a subelement of indexed array item.', function (t) {
+  var obj = {
+    "nodes": [
+      {
+        "type": "db",
+        "image": "mongodb"
+      },
+      {
+        "type": "app",
+        "image": "nginx"
+      }
+    ]
+  };
+
+  var expect = {
+    "result": [ {
+      "env": {
+        "nodes": [
+          {
+            "type": "db",
+            "image": "mongodb"
+          },
+          {
+            "type": "app",
+            "image": "nginx"
+          }]
+      }
+    }]
+  };
+  var map = {
+    'nodes[].type': 'result[0].env.nodes[].type',
+    'nodes[].image': 'result[0].env.nodes[].image'
+  };
+
+  var result = om(obj, map);
+
+  t.deepEqual(result, expect);
+  t.end();
+});
+
+test('Should correctly map to a subelement of indexed array item deep in the object hierarchy.', function (t) {
+
+  const obj = {
+    policyNumber: "PN1",
+    status: "ST1",
+    productName: "PN1",
+    productVersion: "PV1",
+    productType: "PT1",
+    startDate: "SD1",
+    endDate: "ED1",
+    policyContacts: [
+      {
+        contactType: "CT11",
+        contactId: "CI11"
+      },
+      {
+        contactType: "CT12",
+        contactId: "CI12"
+      }
+    ],
+    currency: "CUR1",
+    covers: [
+      {
+        coverName: "CN11",
+        coverId: "CID11",
+        startDate: "SD11",
+        endDate: "ED11",
+        excess: "EX11",
+        insuredAmount: "IA11",
+        yearlyPremium: "YP11",
+        status: "ST11"
+      }
+    ],
+    riskObjects: [
+      {
+        assetId: "AID11",
+        type: "T11",
+        assetDescription: "AD11",
+        address: {
+          city: "C11",
+          houseNumber: "HN11",
+          country: "CN11",
+          zipCode: "ZC11",
+        }
+      }
+    ]
+
+  };
+
+  const expect = {
+    policyHeader: [
+      {
+        policiesList: {
+          policies: {
+            externalPolicyNr: "PN1",
+            policyLobsList: {
+              policyLobs: {
+                lobRef: {
+                  value: "PT1"
+                },
+                policyLobAssetsList: {
+                  policyLobAssets: [
+                    {
+                      coversList: {
+                        covers: [
+                          {
+                            coverPerilsList: {
+                              coverPerils: [
+                                {
+                                  perilRef: {
+                                    value: "CN11"
+                                  }
+                                }
+                              ]
+                            },
+                            externalNumber: "CID11",
+                            startDate: "SD11",
+                            endDate: "ED11",
+                            excessAmount: "EX11",
+                            insuranceAmount: "IA11",
+                            basicYearlyPremiumAmount: "YP11",
+                            coverStatusRef: {
+                              value: "ST11"
+                            }
+                          }
+                        ]
+                      },
+                      originalLobAssetId: "AID11",
+                      asset: {
+                        assetTypeRef: {
+                          value: "T11"
+                        },
+                        propertyOccupationTypeRef: "AD11",
+                        address: {
+                          cityName: "C11",
+                          houseNr: "HN11",
+                          countryRef: {
+                            value: "CN11"
+                          },
+                          zipCode: "ZC11"
+
+                        }
+
+                      }
+                    }
+                  ]
+
+                }
+              }
+            },
+            policyContactsList: {
+              policyContacts: [
+                {
+                  policyContactRoleRef: {
+                    value: "CT11"
+                  },
+                  contactExtNum: "CI11"
+                },
+                {
+                  policyContactRoleRef: {
+                    value: "CT12"
+                  },
+                  contactExtNum: "CI12"
+                },
+              ]
+            }
+          }
+        },
+        statusCodeRef: {
+          value: "ST1"
+        },
+        productRef: {
+          value: "PN1"
+        },
+        productVersionRef: {
+          value: "PV1"
+        },
+        policyStartDate: "SD1",
+        policyEndDate: "ED1",
+        currencyRef: {
+          value: "CUR1"
+        }
+      }
+    ]
+  };
+
+  var map = {
+    "covers[].coverId": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].coversList.covers[].externalNumber",
+    "covers[].coverName": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].coversList.covers[].coverPerilsList.coverPerils[0].perilRef.value",
+    "covers[].endDate": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].coversList.covers[].endDate",
+    "covers[].excess": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].coversList.covers[].excessAmount",
+    "covers[].insuredAmount": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].coversList.covers[].insuranceAmount",
+    "covers[].startDate": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].coversList.covers[].startDate",
+    "covers[].status": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].coversList.covers[].coverStatusRef.value",
+    "covers[].yearlyPremium": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].coversList.covers[].basicYearlyPremiumAmount",
+    "currency": "policyHeader[0].currencyRef.value",
+    "endDate": "policyHeader[0].policyEndDate",
+    "policyContacts[].contactId": "policyHeader[0].policiesList.policies.policyContactsList.policyContacts[].contactExtNum",
+    "policyContacts[].contactType": "policyHeader[0].policiesList.policies.policyContactsList.policyContacts[].policyContactRoleRef.value",
+    "policyNumber": "policyHeader[0].policiesList.policies.externalPolicyNr",
+    "productName": "policyHeader[0].productRef.value",
+    "productType": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.lobRef.value",
+    "productVersion": "policyHeader[0].productVersionRef.value",
+    "riskObjects[].address.city": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].asset.address.cityName",
+    "riskObjects[].address.country": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].asset.address.countryRef.value",
+    "riskObjects[].address.houseNumber": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].asset.address.houseNr",
+    "riskObjects[].address.zipCode": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].asset.address.zipCode",
+    "riskObjects[].assetDescription": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].asset.propertyOccupationTypeRef",
+    "riskObjects[].assetId": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].originalLobAssetId",
+    "riskObjects[].type": "policyHeader[0].policiesList.policies.policyLobsList.policyLobs.policyLobAssetsList.policyLobAssets[].asset.assetTypeRef.value",
+    "startDate": "policyHeader[0].policyStartDate",
+    "status": "policyHeader[0].statusCodeRef.value"
+  };
+
+  var result = om(obj, map);
+
+  t.deepEqual(result, expect);
+  t.end();
+});
\ No newline at end of file

From 0998699f0f6051efc8e4d031436a7d95e096e746 Mon Sep 17 00:00:00 2001
From: Bitbucket Build <build@sapienspaas.com>
Date: Thu, 25 Oct 2018 17:47:42 +0300
Subject: [PATCH 2/2] Fix to be compliant with the strict mode.

---
 src/set-key-value.js | 16 ++++++++--------
 test/test.js         |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/set-key-value.js b/src/set-key-value.js
index 666271b..5ffb292 100644
--- a/src/set-key-value.js
+++ b/src/set-key-value.js
@@ -126,11 +126,11 @@ function _setValue(destinationObject, key, keys, fromValue) {
       if (Array.isArray(fromValue) && _isNextArrayProperty(keys) === false) {
         for (valueIndex = 0; valueIndex < fromValue.length; valueIndex++) {
           value = fromValue[valueIndex];
-          const targetIndex = arrayIndex ? parseInt(arrayIndex) : parseInt(valueIndex);
+          var targetIndex = arrayIndex ? parseInt(arrayIndex) : parseInt(valueIndex);
           destinationObject[key][targetIndex] = _setValue(destinationObject[key][targetIndex], keys[0], keys.slice(1), value);
         }
       } else {
-        const findFirstIndexWithoutProp = function(keys, array) {
+        var findFirstIndexWithoutProp = function(keys, array) {
             for(var i=0;i<array.length;i++) {
                 if(!subElementExists(keys, array[i])) {
                     return i;
@@ -140,9 +140,9 @@ function _setValue(destinationObject, key, keys, fromValue) {
             return array.length;
         };
 
-        const subElementExists = function(keys, objectToCheck) {
-            const keyToCheck = keys[0];
-            const otherKeys = keys.slice(1);
+        var subElementExists = function(keys, objectToCheck) {
+            var keyToCheck = keys[0];
+            var otherKeys = keys.slice(1);
 
             if (objectToCheck[keyToCheck] && otherKeys.length == 0 ) {
                 return true;
@@ -153,15 +153,15 @@ function _setValue(destinationObject, key, keys, fromValue) {
             return false;
         };
 
-        const targetIndex = destinationObject[key][arrayIndex] && subElementExists(keys, destinationObject[key][arrayIndex]) ? findFirstIndexWithoutProp(keys, destinationObject[key]) : arrayIndex;
+        var targetIndex = destinationObject[key][arrayIndex] && subElementExists(keys, destinationObject[key][arrayIndex]) ? findFirstIndexWithoutProp(keys, destinationObject[key]) : arrayIndex;
         destinationObject[key][targetIndex] = _setValue(destinationObject[key][targetIndex], keys[0], keys.slice(1), fromValue);
       }
     } else if (Array.isArray(destinationObject)) {
       if (Array.isArray(fromValue)) {
         for (valueIndex = 0; valueIndex < fromValue.length; valueIndex++) {
           value = fromValue[valueIndex];
-          const arrayIndexInt = parseInt(arrayIndex);
-          const valueIndexInt = parseInt(valueIndex);
+          var arrayIndexInt = parseInt(arrayIndex);
+          var valueIndexInt = parseInt(valueIndex);
           destinationObject[arrayIndexInt + valueIndexInt] = _setValue(destinationObject[arrayIndexInt + valueIndexInt], keys[0], keys.slice(1), value);
         }
       } else {
diff --git a/test/test.js b/test/test.js
index ec5476a..94c5ca7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1928,7 +1928,7 @@ test('Should correctly map to a subelement of indexed array item.', function (t)
 
 test('Should correctly map to a subelement of indexed array item deep in the object hierarchy.', function (t) {
 
-  const obj = {
+  var obj = {
     policyNumber: "PN1",
     status: "ST1",
     productName: "PN1",
@@ -1975,7 +1975,7 @@ test('Should correctly map to a subelement of indexed array item deep in the obj
 
   };
 
-  const expect = {
+  var expect = {
     policyHeader: [
       {
         policiesList: {