removed wankdanker#49 fix - breaks backwards compatibility. Needs dis…

…cussion
switzer · Oct 12, 2019 · 0766113 · 0766113
1 parent d57b328
commit 0766113
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 40 deletions.
diff --git a/src/object-mapper.js b/src/object-mapper.js
@@ -251,8 +251,8 @@ function update_arr(dest, key, data, keys, context)
   if (key.add) {
     if (data !== null && typeof data !== 'undefined') {
       dest = dest || []
-      //dest.push(data)
-      dest = dest.concat(data)
+      dest.push(data)
+      // dest = dest.concat(data)
     }
     return dest
   }

diff --git a/test/test.js b/test/test.js
@@ -1624,16 +1624,11 @@ test('mapping - map and append full array to existing mapped array', function (t
     'thingOther' : 'thing2[]+',
   };
 
-  var expect = {
-    'thing2' : [
-      {a: 'a1', b: 'b1'}
-      , {a: 'a2', b: 'b2'}
-      , {a: 'a3', b: 'b3'}
-      , {a: 'a4', b: 'b4'}
-      , {a: 'a5', b: 'b5'}
-      , {a: 'a6', b: 'b6'}
-    ]
-  };
+  var expect = {thing2:
+    [
+      [ { a: 'a1', b: 'b1' }, { a: 'a2', b: 'b2' }, { a: 'a3', b: 'b3' } ],
+      [ { a: 'a4', b: 'b4' }, { a: 'a5', b: 'b5' }, { a: 'a6', b: 'b6' } ]
+    ]}
 
   var result = om(obj, map);
 
@@ -2173,34 +2168,34 @@ test('Make sure no objects are created without data #48', function (t) {
   t.end();
 });
 
-test('1 array mapping wraps destination in an unwanted array #49', function (t) {
-  const src = {
-    foo: [{ bar: 4 }, { bar: 33 }],
-    bifoo: [{ bar: 77 }, { bar: 97 }]
-  };
-  const mapper = {
-    "foo[].bar": "[]+",
-    "bifoo[].bar": "[]+"
-  }
-  var expect = [4, 33, 77, 97];
-  var result = om(src, mapper);
-  t.deepEqual(result, expect);
-  t.end();
-});
-test('2 array mapping wraps destination in an unwanted array #49', function (t) {
-  const src = {
-    foo: [{ bar: 4 }, { bar: 33 }],
-    bifoo: [{ bar: 77 }, { bar: 97 }]
-  };
-  const mapper2 = {
-    "foo[].bar": "num[]+",
-    "bifoo[].bar": "num[]+"
-  }
-  var expect = {num: [4, 33, 77, 97] };
-  var result = om(src, mapper2);
-  t.deepEqual(result, expect);
-  t.end();
-});
+// test('1 array mapping wraps destination in an unwanted array #49', function (t) {
+//   const src = {
+//     foo: [{ bar: 4 }, { bar: 33 }],
+//     bifoo: [{ bar: 77 }, { bar: 97 }]
+//   };
+//   const mapper = {
+//     "foo[].bar": "[]+",
+//     "bifoo[].bar": "[]+"
+//   }
+//   var expect = [4, 33, 77, 97];
+//   var result = om(src, mapper);
+//   t.deepEqual(result, expect);
+//   t.end();
+// });
+// test('2 array mapping wraps destination in an unwanted array #49', function (t) {
+//   const src = {
+//     foo: [{ bar: 4 }, { bar: 33 }],
+//     bifoo: [{ bar: 77 }, { bar: 97 }]
+//   };
+//   const mapper2 = {
+//     "foo[].bar": "num[]+",
+//     "bifoo[].bar": "num[]+"
+//   }
+//   var expect = {num: [4, 33, 77, 97] };
+//   var result = om(src, mapper2);
+//   t.deepEqual(result, expect);
+//   t.end();
+// });
 
 // test('Including parent items in arrays #50', function (t) {
 //   const src = {
@@ -2234,3 +2229,64 @@ test('2 array mapping wraps destination in an unwanted array #49', function (t)
 //   t.deepEqual(result, expect);
 //   t.end();
 // });
+
+// test('2 array mapping wraps destination in an unwanted array #49', function (t) {
+//   const src = {
+//     "firstName": "S",
+//     "lastName": "J",
+//     "Alias": [{
+//         "firstName": "S111",
+//         "lastName": "J111"
+//     }, {
+//         "firstName": "S111222",
+//         "lastName": "J1222211"
+//     }],
+//     "address": [
+//         {
+//             "streetName": "",
+//             "city": "S2"
+//         },
+//         {
+//             "streetName": "karve",
+//             "city": "pune"
+//         }
+//     ]
+// };
+//   const map = {
+//     "firstName": "Name[].FirstName",
+//      "lastName": "Name[].LastName",
+//      "Alias[].firstName": "Name[].FirstName",
+//      "Alias[].lastName": "Name[].LastName",
+//      "address[].streetName": "Address[].StreetName",
+//      "address[].city": "Address[].City"
+//  }
+//   var expect = {
+//     "Name": [
+//         {
+//             "FirstName": "S",
+//             "LastName": "J"
+//         },
+//         {
+//             "FirstName": "S111",
+//             "LastName": "J111"
+//         },
+//         {
+//             "FirstName": "S111222",
+//             "LastName": "J1222211"
+//         }
+//     ],
+//     "Address": [
+//         {
+//             "StreetName": "",
+//             "City": "S2"
+//         },
+//         {
+//             "StreetName": "karve",
+//             "City": "pune"
+//         }
+//     ]
+// };
+//   var result = om(src, map);
+//   t.deepEqual(result, expect);
+//   t.end();
+// });