Attempt JS object RDataFrame conversion before RList

r-wasm · Jul 28, 2024 · 7387adb · 7387adb
1 parent 0bca2d4
commit 7387adb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/_extensions/live/resources/live-runtime.js b/_extensions/live/resources/live-runtime.js
diff --git a/live-runtime/src/environment.ts b/live-runtime/src/environment.ts
@@ -26,7 +26,15 @@ export class WebREnvironmentManager {
 
     const shelter = await this.shelter;
     if (value && value.constructor === Object) {
-      value = await new shelter.RList(value);
+      try {
+        value = await new shelter.RObject(value);
+      } catch (_e) {
+        const e = _e as Error;
+        if (!e.message.includes("Can't construct `data.frame`")) {
+          throw e;
+        }
+        value = await new shelter.RList(value);
+      }
     } else if (value && value.constructor === Array) {
       try {
         value = await new shelter.RObject(value);
@@ -36,9 +44,7 @@ export class WebREnvironmentManager {
           throw e;
         }
         value = await Promise.all(value.map((v) => {
-          return new shelter.RList(v).then((obj) => {
-            return obj;
-          })
+          return new shelter.RList(v);
         }));
       }
     }