@adriansteffan/reactive 0.0.30 → 0.0.31

package/dist/{web-D4yetCSC.js → web-D0E0X8r4.js}

@@ -1,4 +1,4 @@
-import { W as e } from "./mod-BY9yD0Pz.js";
+import { W as e } from "./mod-OYK5S6rI.js";
 class s extends e {
   async enable() {
     console.log("Immersive mode is only available on Android");

package/dist/{web-Crj4uOnK.js → web-GcUUyn5k.js}

@@ -1,4 +1,4 @@
-import { W as P, b as x, E } from "./mod-BY9yD0Pz.js";
+import { W as P, b as x, E } from "./mod-OYK5S6rI.js";
 function m(w) {
   const e = w.split("/").filter((t) => t !== "."), r = [];
   return e.forEach((t) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adriansteffan/reactive",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/src/components/upload.tsx

@@ -88,22 +88,39 @@ function convertArrayOfObjectsToCSV(data: DataObject[]): string {
   return [headerRow, ...dataRows].join('\n');
 }
 
+// TODO: for better cohesion move this into the components on registration
+const defaultFlatteningFunctions = {
+  'CanvasBlock': (item: TrialData) => {
+    const responseData = item.responseData;
+    if (Array.isArray(responseData)) {
+      return responseData.map((i) => ({
+        block: item.name,
+        ...i,
+      }));
+    }
+    return [];
+  }
+}
+
+const transform = ({responseData, ...obj}: any) => ({ ...obj, ...Object.entries(responseData || {}).reduce((acc, [k, v]) => ({...acc, [`data_${k}`]: v}), {}) });
+
 function combineTrialsToCsv(
   data: any[],
   filename: string,
   names: string[],
+  flatteningFunctions: Record<string, (item: any) => any[]>,
   fun?: (obj: any) => any,
 ) {
+
   const processedData = names
     .flatMap((name) => {
-      const responseData = data.find((d) => d.name === name)?.responseData;
-      if (Array.isArray(responseData)) {
-        return responseData.map((i) => ({
-          block: name,
-          ...i,
-        }));
-      }
-      return [];
+      const matchingItems = data.filter((d) => d.name === name);
+      
+      return matchingItems.flatMap((item) => {
+        const flattener = item.type && flatteningFunctions[item.type];
+        
+        return flattener ? flattener(item) : transform(item);
+      });
     })
     .map((x) => (fun ? fun(x) : x));
 
@@ -256,7 +273,7 @@ export default function Upload({
   sessionID,
   generateFiles,
   sessionCSVBuilder,
-  trialCSVBuilders,
+  trialCSVBuilder,
   uploadRaw = true,
   autoUpload = false,
   androidFolderName,
@@ -264,7 +281,7 @@ export default function Upload({
   sessionID?: string | null;
   generateFiles: (sessionID: string, data: TrialData[], store?: Store) => FileUpload[];
   sessionCSVBuilder: CSVBuilder;
-  trialCSVBuilders: CSVBuilder[];
+  trialCSVBuilder: {flatteners: Record<string, ((item: TrialData) => Record<string, any>[])>, builders: CSVBuilder[]};
   uploadRaw: boolean;
   autoUpload: boolean;
   androidFolderName?: string;
@@ -396,13 +413,14 @@ export default function Upload({
       });
     }
 
-    if (trialCSVBuilders) {
-      for (const builder of trialCSVBuilders) {
+    if (trialCSVBuilder) {
+      for (const builder of trialCSVBuilder.builders) {
         files.push(
           combineTrialsToCsv(
             data,
             `${sessionIDUpload}${builder.filename}.csv`,
             builder.trials ?? [],
+            {...defaultFlatteningFunctions, ...trialCSVBuilder.flatteners},
             builder.fun,
           ),
         );