fix(core): ensure correct column order in CSV export (#2734)

Closes #2718
apify · Nov 1, 2024 · b66784f · b66784f
1 parent cfaa872
commit b66784f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/packages/core/src/storages/dataset.ts b/packages/core/src/storages/dataset.ts
@@ -347,7 +347,13 @@ export class Dataset<Data extends Dictionary = Dictionary> {
         const items = await this.export(options);
 
         if (contentType === 'text/csv') {
-            const value = stringify([Object.keys(items[0]), ...items.map((item) => Object.values(item))]);
+            const keys = Object.keys(items[0]);
+            const value = stringify([
+                keys,
+                ...items.map((item) => {
+                    return keys.map((k) => item[k]);
+                }),
+            ]);
             await kvStore.setValue(key, value, { contentType });
             return items;
         }

diff --git a/test/core/storages/dataset.test.ts b/test/core/storages/dataset.test.ts
@@ -486,10 +486,16 @@ describe('dataset', () => {
         describe('exportToJSON', () => {
             const dataToPush = [
                 {
-                    hello: 'world',
+                    hello: 'world 1',
+                    foo: 'bar 1',
+                },
+                {
+                    foo: 'bar 2',
+                    hello: 'world 2',
                 },
                 {
-                    foo: 'bar',
+                    hello: 'world 3',
+                    foo: 'bar 3',
                 },
             ];
 
@@ -518,8 +524,12 @@ describe('dataset', () => {
                     foo: 'bar 1',
                 },
                 {
-                    hello: 'world 2',
                     foo: 'bar 2',
+                    hello: 'world 2',
+                },
+                {
+                    hello: 'world 3',
+                    foo: 'bar 3',
                 },
             ];
 
@@ -529,15 +539,15 @@ describe('dataset', () => {
                 await dataset.exportToCSV('HELLO-csv');
 
                 const kvData = await KeyValueStore.getValue('HELLO-csv');
-                expect(kvData).toEqual('hello,foo\nworld 1,bar 1\nworld 2,bar 2\n');
+                expect(kvData).toEqual('hello,foo\nworld 1,bar 1\nworld 2,bar 2\nworld 3,bar 3\n');
             });
 
             it('Should work as a static method for the default dataset', async () => {
                 await Dataset.pushData(dataToPush);
                 await Dataset.exportToCSV('TEST-123-123-csv');
 
                 const kvData = await KeyValueStore.getValue('TEST-123-123-csv');
-                expect(kvData).toEqual('hello,foo\nworld 1,bar 1\nworld 2,bar 2\n');
+                expect(kvData).toEqual('hello,foo\nworld 1,bar 1\nworld 2,bar 2\nworld 3,bar 3\n');
             });
         });
     });