resobjectify 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.js +20 -20
  2. package/package.json +1 -1
package/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  function objectify(arr, fields, object = false, index = 0, parents = []) {
2
2
  /*arr=[{id:111,code:'aaa',name:"prova", rule_id:1, formula:"asd", meter_id:8,area_id:31},
3
- {id:111,code:'aaa',name:"prova", rule_id:1, formula:"asd", meter_id:8,area_id:95},
3
+ {id:111,code:'aaa',name:"prova", rule_id:2, formula:"asd", meter_id:8,area_id:95},
4
4
  {id:111,code:'aaa',name:"prova", rule_id:1, formula:"asd", meter_id:10,area_id:31},
5
5
  {id:111,code:'aaa',name:"prova", rule_id:1, formula:"asd", meter_id:10,area_id:95},
6
6
  {id:111,code:'aaa',name:"prova", rule_id:2, formula:"asd", meter_id:10,area_id:95}]*/
@@ -8,27 +8,27 @@ function objectify(arr, fields, object = false, index = 0, parents = []) {
8
8
  let result = fields.length == 1 ? [] : object ? {} : [];
9
9
  let added = [];
10
10
 
11
- for (let j = index; j < arr.length && (!parents.length || checkParents(arr, j, index, parents)); j++) {
12
- if (added.indexOf(arr[j][fields[0].key ? fields[0].key : fields[0]]) == -1) {
13
- let obj = {};
14
- for (let f of fields) {
15
- if (!Array.isArray(f)) {
16
- obj[f.as ? f.as : f.key ? f.key : f] = f.json ? (arr[j][f.key ? f.key : f] === null ? null : JSON.parse(arr[j][f.key ? f.key : f])) : arr[j][f.key ? f.key : f];
17
- } else {
18
- //obj[f[0].name ? f[0].name : f[0]] = objectify(arr, f[1], f[0].object!=undefined ? f[0].object : object, j, parent ? parent : (fields[0].key ? fields[0].key : fields[0]));
19
- obj[f[0].name ? f[0].name : f[0]] = objectify(arr, f[1], f[0].object != undefined ? f[0].object : object, j, [...parents, fields[0].key ? fields[0].key : fields[0]]);
20
- }
21
- }
22
- added.push(arr[j][fields[0].key ? fields[0].key : fields[0]]);
23
- if (obj[fields[0].as ? fields[0].as : fields[0].key ? fields[0].key : fields[0]] != null) {
24
- if (fields.length == 1)
25
- result.push(obj[fields[0].key ? fields[0].key : fields[0]]);
26
- else if (object)
27
- result[arr[j][fields[0].key ? fields[0].key : fields[0]]] = obj;
28
- else
29
- result.push(obj);
11
+ for (let j = index; j < arr.length; j++) {
12
+ if (!checkParents(arr, j, index, parents) || added.includes(arr[j][fields[0].key || fields[0]]))
13
+ continue;
14
+
15
+ let obj = {};
16
+ for (let f of fields) {
17
+ if (!Array.isArray(f)) {
18
+ obj[f.as || f.key || f] = f.json ? (arr[j][f.key || f] === null ? null : JSON.parse(arr[j][f.key || f])) : arr[j][f.key || f];
19
+ } else {
20
+ obj[f[0].name || f[0]] = objectify(arr, f[1], f[0].object != undefined ? f[0].object : object, j, [...parents, fields[0].key || fields[0]]);
30
21
  }
31
22
  }
23
+ added.push(arr[j][fields[0].key || fields[0]]);
24
+ if (obj[fields[0].as || fields[0].key || fields[0]] != null) {
25
+ if (fields.length == 1)
26
+ result.push(obj[fields[0].as || fields[0].key || fields[0]]);
27
+ else if (object)
28
+ result[arr[j][fields[0].key || fields[0]]] = obj;
29
+ else
30
+ result.push(obj);
31
+ }
32
32
  }
33
33
  return result;
34
34
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "resobjectify",
3
- "version": "1.0.0",
3
+ "version": "1.1.0",
4
4
  "description": "Parse an array of one dimensional objects to nested array/object",
5
5
  "main": "index.js",
6
6
  "scripts": {