From 483aaf73db132a1361da6561ee8587bb74382886 Mon Sep 17 00:00:00 2001
From: Sam Nolan <samnolan555@gmail.com>
Date: Wed, 21 Sep 2022 09:39:28 +0930
Subject: [PATCH 1/3] Fixes multiple plots

---
 packages/components/src/lib/plotParser.ts | 86 +++++++++++++----------
 1 file changed, 49 insertions(+), 37 deletions(-)

diff --git a/packages/components/src/lib/plotParser.ts b/packages/components/src/lib/plotParser.ts
index 3673957c..3ad247a1 100644
--- a/packages/components/src/lib/plotParser.ts
+++ b/packages/components/src/lib/plotParser.ts
@@ -1,5 +1,11 @@
 import * as yup from "yup";
-import { SqDistribution, result, SqRecord } from "@quri/squiggle-lang";
+import {
+  SqValue,
+  SqValueTag,
+  SqDistribution,
+  result,
+  SqRecord,
+} from "@quri/squiggle-lang";
 
 export type LabeledDistribution = {
   name: string;
@@ -22,47 +28,53 @@ function ok<a, b>(x: a): result<a, b> {
 const schema = yup
   .object()
   .strict()
-  .noUnknown()
   .shape({
-    distributions: yup.object().shape({
-      tag: yup.mixed().oneOf(["array"]),
-      value: yup
-        .array()
-        .of(
-          yup.object().shape({
-            tag: yup.mixed().oneOf(["record"]),
-            value: yup.object({
-              name: yup.object().shape({
-                tag: yup.mixed().oneOf(["string"]),
-                value: yup.string().required(),
-              }),
-              // color: yup
-              //   .object({
-              //     tag: yup.mixed().oneOf(["string"]),
-              //     value: yup.string().required(),
-              //   })
-              //   .default(undefined),
-              distribution: yup.object({
-                tag: yup.mixed().oneOf(["distribution"]),
-                value: yup.mixed(),
-              }),
-            }),
-          })
-        )
-        .required(),
-    }),
+    distributions: yup
+      .array()
+      .required()
+      .of(
+        yup.object().required().shape({
+          name: yup.string().required(),
+          distribution: yup.mixed(),
+        })
+      ),
   });
 
+type JsonObject =
+  | string
+  | { [key: string]: JsonObject }
+  | JsonObject[]
+  | SqDistribution;
+
+function toJson(val: SqValue): JsonObject {
+  if (val.tag === SqValueTag.String) {
+    return val.value;
+  } else if (val.tag === SqValueTag.Record) {
+    return toJsonRecord(val.value);
+  } else if (val.tag === SqValueTag.Array) {
+    return val.value.getValues().map(toJson);
+  } else if (val.tag === SqValueTag.Distribution) {
+    return val.value;
+  } else {
+    throw new Error("Could not parse object of type " + val.tag);
+  }
+}
+
+function toJsonRecord(val: SqRecord): JsonObject {
+  let recordObject: JsonObject = {};
+  val.entries().forEach(([key, value]) => (recordObject[key] = toJson(value)));
+  return recordObject;
+}
+
 export function parsePlot(record: SqRecord): result<Plot, string> {
   try {
-    const plotRecord = schema.validateSync(record);
-    return ok({
-      distributions: plotRecord.distributions.value.map((x) => ({
-        name: x.value.name.value,
-        // color: x.value.color?.value, // not supported yet
-        distribution: x.value.distribution.value,
-      })),
-    });
+    const plotRecord = schema.validateSync(toJsonRecord(record));
+    if (plotRecord.distributions) {
+      return ok({ distributions: plotRecord.distributions.map((x) => x) });
+    } else {
+      // I have no idea why yup's typings thinks this is possible
+      return error("no distributions field. Should never get here");
+    }
   } catch (e) {
     const message = e instanceof Error ? e.message : "Unknown error";
     return error(message);

From 59e937ad7c4748bf54fff59d27bf59328b99f80a Mon Sep 17 00:00:00 2001
From: Sam Nolan <samnolan555@gmail.com>
Date: Wed, 21 Sep 2022 09:42:21 +0930
Subject: [PATCH 2/3] Re-add noUnknown to yup schema for plots

---
 packages/components/src/lib/plotParser.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/src/lib/plotParser.ts b/packages/components/src/lib/plotParser.ts
index 3ad247a1..a6dd477b 100644
--- a/packages/components/src/lib/plotParser.ts
+++ b/packages/components/src/lib/plotParser.ts
@@ -27,6 +27,7 @@ function ok<a, b>(x: a): result<a, b> {
 
 const schema = yup
   .object()
+  .noUnknown()
   .strict()
   .shape({
     distributions: yup

From 46fd5900d2506352448fadd180ba8a142e246c9f Mon Sep 17 00:00:00 2001
From: Sam Nolan <samnolan555@gmail.com>
Date: Wed, 21 Sep 2022 16:14:06 +1000
Subject: [PATCH 3/3] Make distributions required

---
 packages/components/src/lib/plotParser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/lib/plotParser.ts b/packages/components/src/lib/plotParser.ts
index a6dd477b..64e757fc 100644
--- a/packages/components/src/lib/plotParser.ts
+++ b/packages/components/src/lib/plotParser.ts
@@ -36,7 +36,7 @@ const schema = yup
       .of(
         yup.object().required().shape({
           name: yup.string().required(),
-          distribution: yup.mixed(),
+          distribution: yup.mixed().required(),
         })
       ),
   });