add array support in assembleQueryData method

os-js · Sep 6, 2021 · d1335a2 · d1335a2
1 parent 3ecb734
commit d1335a2
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 3 deletions.
diff --git a/__tests__/utils/vfs.js b/__tests__/utils/vfs.js
@@ -245,7 +245,7 @@ describe('VFS Utils', () => {
   });
 
   test('assembleQueryData', () => {
-    const result = utils.assembleQueryData({
+    const result1 = utils.assembleQueryData({
       'a': 'b',
       'b.a': 'foo',
       'b.b.a': 'foo',
@@ -258,7 +258,21 @@ describe('VFS Utils', () => {
       'e': '1'
     });
 
-    expect(result).toEqual({
+    const result2 = utils.assembleQueryData({
+      'a.0': 'foo',
+      'a.1': 'foo',
+      'b.0': 'foo',
+      'b.1': 'foo',
+      'b.a': 'foo',
+      'c.a': 'foo',
+      'c.b.0': 'foo',
+      'c.b.1': 'foo',
+      'c.c.0': 'foo',
+      'c.c.1': 'foo',
+      'c.c.a': 'foo',
+    });
+
+    expect(result1).toEqual({
       a: 'b',
       b: {
         a: 'foo',
@@ -274,5 +288,23 @@ describe('VFS Utils', () => {
       d: 'true',
       e: '1'
     });
+
+    expect(result2).toEqual({
+      a: ['foo', 'foo'],
+      b:{
+        '0': 'foo',
+        '1': 'foo',
+        'a': 'foo',
+      },
+      c: {
+        a: 'foo',
+        b: ['foo', 'foo'],
+        c: {
+          '0': 'foo',
+          '1': 'foo',
+          'a': 'foo'
+        }
+      }
+    });
   });
 });
diff --git a/src/utils/vfs.js b/src/utils/vfs.js
@@ -183,14 +183,20 @@ const assembleQueryData = (object) => {
     const dots = key.split('.');
 
     let last = assembled;
+    let parent = null;
     for (let j = 0; j < dots.length; j++) {
       const dot = dots[j];
       if (j >= dots.length - 1) {
+        if (!/^\d+$/.test(dot) && Array.isArray(last)) {
+          last = Object.fromEntries(last.map((value, i) => [i, value]));
+          parent[dots[j - 1]] = last;
+        }
         last[dot] = object[key];
       } else {
-        last[dot] = last[dot] || {};
+        last[dot] = last[dot] || (/^\d+$/.test(dots[j + 1]) ? [] : {});
       }
 
+      parent = last;
       last = last[dot];
     }
   }