@explorable-viz/fluid 0.8.1 → 0.8.3

package/README.md

@@ -62,11 +62,12 @@ After building, tests can be run from the command line via `yarn test-all`
 a browser window.
 - To observe the status of tests, click `Debug` in the browser window, and then open the JavaScript Console for your browser (e.g., via the Developer Tools).
 
-### Run Puppeteer tests for page Y of website X
+### Run Puppeteer tests for website X
 
-Rebuild with `puppeteerTests.headless` set to `false` to run in browser. Then:
 - `yarn bundle-website X`
-- `./script/test-page.sh X X.Y`
+- `yarn test-website X`
+
+Rebuild with `puppeteerTests.headless` set to `false` to run in browser.
 
 ## Development via VS Code
 

package/dist/fluid/shared/fluid.mjs

@@ -1574,19 +1574,6 @@ var stripPrefix = (v) => (str) => {
   return Nothing;
 };
 var indexOf = /* @__PURE__ */ _indexOf(Just)(Nothing);
-var contains = (pat) => {
-  const $0 = indexOf(pat);
-  return (x) => {
-    const $1 = $0(x);
-    if ($1.tag === "Nothing") {
-      return false;
-    }
-    if ($1.tag === "Just") {
-      return true;
-    }
-    fail();
-  };
-};
 var charAt2 = /* @__PURE__ */ _charAt(Just)(Nothing);
 
 // output-es/Data.String.Common/foreign.js
@@ -16785,13 +16772,67 @@ var semigroupColumns = { append: (v) => (v1) => beside(v)(v1) };
 var monoidColumns = { mempty: empty2, Semigroup0: () => semigroupColumns };
 
 // output-es/Pretty/index.js
-var $ExprType = (tag) => tag;
 var hcat = /* @__PURE__ */ (() => foldableList.foldMap(monoidColumns)(unsafeCoerce))();
 var hcat1 = /* @__PURE__ */ (() => foldableArray.foldMap(monoidColumns)(unsafeCoerce))();
 var toUnfoldable8 = /* @__PURE__ */ toUnfoldable4(unfoldableList);
 var toUnfoldable13 = /* @__PURE__ */ toAscUnfoldable(unfoldableList);
-var Simple = /* @__PURE__ */ $ExprType("Simple");
-var Expression = /* @__PURE__ */ $ExprType("Expression");
+var isSimpleVal = {
+  isSimple: (v) => {
+    if (v._3.tag === "Constr") {
+      return v._3._2.tag !== "Cons";
+    }
+    if (v._3.tag === "Fun" && v._3._1.tag === "PartialConstr") {
+      return v._3._1._2.tag !== "Cons";
+    }
+    return true;
+  }
+};
+var isSimpleExpr = {
+  isSimple: (v) => {
+    if (v.tag === "Var") {
+      return true;
+    }
+    if (v.tag === "Op") {
+      return true;
+    }
+    if (v.tag === "Int") {
+      return true;
+    }
+    if (v.tag === "Float") {
+      return true;
+    }
+    if (v.tag === "Str") {
+      return true;
+    }
+    if (v.tag === "Constr") {
+      return v._4.tag === "Nil";
+    }
+    return v.tag === "Dictionary" || v.tag === "Matrix" || v.tag === "Project" || v.tag === "DProject";
+  }
+};
+var isSimpleExpr1 = {
+  isSimple: (v) => {
+    if (v.tag === "Var") {
+      return true;
+    }
+    if (v.tag === "Op") {
+      return true;
+    }
+    if (v.tag === "Int") {
+      return true;
+    }
+    if (v.tag === "Float") {
+      return true;
+    }
+    if (v.tag === "Str") {
+      return true;
+    }
+    if (v.tag === "Constr") {
+      return v._4.tag === "Nil";
+    }
+    return v.tag === "Dictionary" || v.tag === "Matrix" || v.tag === "Project" || v.tag === "DProject" || v.tag === "ListEmpty" || v.tag === "ListNonEmpty" || v.tag === "ListEnum" || v.tag === "ListComp";
+  }
+};
 var vert = (dictFoldable) => {
   const fromFoldable26 = dictFoldable.foldr(Cons)(Nil);
   return (delim) => {
@@ -16904,75 +16945,6 @@ var getPrec = (x) => {
   }
   fail();
 };
-var exprType = (v) => {
-  if (v.tag === "Var") {
-    return Simple;
-  }
-  if (v.tag === "Op") {
-    return Simple;
-  }
-  if (v.tag === "Int") {
-    return Simple;
-  }
-  if (v.tag === "Float") {
-    return Simple;
-  }
-  if (v.tag === "Str") {
-    return Simple;
-  }
-  if (v.tag === "Constr") {
-    if (v._4.tag === "Nil") {
-      return Simple;
-    }
-    return Expression;
-  }
-  if (v.tag === "Dictionary") {
-    return Simple;
-  }
-  if (v.tag === "Matrix") {
-    return Simple;
-  }
-  if (v.tag === "Lambda") {
-    return Simple;
-  }
-  if (v.tag === "Project") {
-    return Simple;
-  }
-  if (v.tag === "DProject") {
-    return Simple;
-  }
-  if (v.tag === "App") {
-    return Expression;
-  }
-  if (v.tag === "BinaryApp") {
-    return Expression;
-  }
-  if (v.tag === "MatchAs") {
-    return Simple;
-  }
-  if (v.tag === "IfElse") {
-    return Simple;
-  }
-  if (v.tag === "ListEmpty") {
-    return Simple;
-  }
-  if (v.tag === "ListNonEmpty") {
-    return Simple;
-  }
-  if (v.tag === "ListEnum") {
-    return Simple;
-  }
-  if (v.tag === "ListComp") {
-    return Simple;
-  }
-  if (v.tag === "Let") {
-    return Expression;
-  }
-  if (v.tag === "LetRec") {
-    return Expression;
-  }
-  fail();
-};
 var comma = /* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" ,"));
 var hcomma = (dictFoldable) => {
   const $0 = dictFoldable.foldr(Cons)(Nil);
@@ -16989,30 +16961,29 @@ var between2 = (l) => (r) => (doc) => beside(beside(l)(doc))(r);
 var brackets = /* @__PURE__ */ between2(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" [")))(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" ]")));
 var curlyBraces = /* @__PURE__ */ between2(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" {")))(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" }")));
 var keyBracks = /* @__PURE__ */ between2(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" [")))(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" ]")));
-var parens = /* @__PURE__ */ between2(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" (")))(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" )")));
-var prettyParensOpt = (dictPretty) => (x) => {
-  const doc = dictPretty.pretty(x);
-  if (contains(" ")(intercalate4("\n")(doc.lines))) {
-    return parens(doc);
+var parentheses = /* @__PURE__ */ between2(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" (")))(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" )")));
+var prettySimple = (dictIsSimple) => (dictPretty) => (s) => {
+  if (dictIsSimple.isSimple(s)) {
+    return dictPretty.pretty(s);
   }
-  return doc;
+  return parentheses(dictPretty.pretty(s));
 };
-var prettyConstr = (dictPretty) => (v) => (v1) => {
+var prettyConstr = (dictIsSimple) => (dictPretty) => (v) => (v1) => {
   const $0 = (c, xs) => hcat($List(
     "Cons",
     checkOneLine(split("\n")(" " + showCtr(c))),
-    listMap(prettyParensOpt(dictPretty))(xs)
+    listMap(prettySimple(dictIsSimple)(dictPretty))(xs)
   ));
   if (v1.tag === "Cons") {
     if (v1._2.tag === "Cons") {
       if (v === "Pair") {
-        return assertWith("")(v1._2._2.tag === "Nil")(parens(hcomma2([dictPretty.pretty(v1._1), dictPretty.pretty(v1._2._1)])));
+        return assertWith("")(v1._2._2.tag === "Nil")(parentheses(hcomma2([dictPretty.pretty(v1._1), dictPretty.pretty(v1._2._1)])));
       }
       if (v === "Nil") {
         return assertWith("")(v1.tag === "Nil")(nil2);
       }
       if (v === ":") {
-        return assertWith("")(v1._2._2.tag === "Nil")(parens(hcat1([
+        return assertWith("")(v1._2._2.tag === "Nil")(parentheses(hcat1([
           dictPretty.pretty(v1._1),
           checkOneLine(split("\n")(" :")),
           dictPretty.pretty(v1._2._1)
@@ -17024,7 +16995,7 @@ var prettyConstr = (dictPretty) => (v) => (v1) => {
       return assertWith("")(v1.tag === "Nil")(nil2);
     }
     if (v1._2.tag === "Nil") {
-      return beside(checkOneLine(split("\n")(" " + showCtr(v))))(dictPretty.pretty(v1._1));
+      return beside(checkOneLine(split("\n")(" " + showCtr(v))))(prettySimple(dictIsSimple)(dictPretty)(v1._1));
     }
     return $0(v, v1);
   }
@@ -17033,7 +17004,6 @@ var prettyConstr = (dictPretty) => (v) => (v1) => {
   }
   return $0(v, v1);
 };
-var parentheses = /* @__PURE__ */ between2(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" (")))(/* @__PURE__ */ checkOneLine(/* @__PURE__ */ split("\n")(" )")));
 var prettyPattern = {
   pretty: (v) => {
     if (v.tag === "PVar") {
@@ -17138,7 +17108,7 @@ var prettyExpr = (dictHighlightable) => ({
       return beside(prettyDocOpt(prettyExpr(dictHighlightable)).pretty(v._2))(dictHighlightable.highlightIf(v._1)(prettyRecordOrDict(prettyExpr(dictHighlightable))(checkOneLine(split("\n")(" :")))(keyBracks)(curlyBraces)(prettyExpr(dictHighlightable).pretty)(listMap(toTuple)(v._3))));
     }
     if (v.tag === "Constr") {
-      return beside(prettyDocOpt(prettyExpr(dictHighlightable)).pretty(v._2))(dictHighlightable.highlightIf(v._1)(prettyConstr(prettyExpr(dictHighlightable))(v._3)(v._4)));
+      return beside(prettyDocOpt(prettyExpr(dictHighlightable)).pretty(v._2))(dictHighlightable.highlightIf(v._1)(prettyConstr(isSimpleExpr)(prettyExpr(dictHighlightable))(v._3)(v._4)));
     }
     if (v.tag === "Matrix") {
       return beside(prettyDocOpt(prettyExpr(dictHighlightable)).pretty(v._2))(dictHighlightable.highlightIf(v._1)(prettyMatrix(dictHighlightable)(v._3)(v._4._1)(v._4._2)(v._5)));
@@ -17147,7 +17117,7 @@ var prettyExpr = (dictHighlightable) => ({
       return hcat1([dictHighlightable.highlightIf(v._1)(checkOneLine(split("\n")(" fun"))), prettyElim(dictHighlightable).pretty(v._2)]);
     }
     if (v.tag === "Op") {
-      return parens(checkOneLine(split("\n")(" " + v._1)));
+      return parentheses(checkOneLine(split("\n")(" " + v._1)));
     }
     if (v.tag === "Let") {
       return atop(hcat1([
@@ -17248,7 +17218,7 @@ var prettyFun = (dictHighlightable) => ({
       return checkOneLine(split("\n")(" " + v._1._1));
     }
     if (v.tag === "PartialConstr") {
-      return prettyConstr(prettyVal(dictHighlightable))(v._1)(v._2);
+      return prettyConstr(isSimpleVal)(prettyVal(dictHighlightable))(v._1)(v._2);
     }
     fail();
   }
@@ -17285,7 +17255,7 @@ var prettyBaseVal = (dictHighlightable) => ({
       ))(toUnfoldable13(v._1)));
     }
     if (v.tag === "Constr") {
-      return prettyConstr(prettyVal(dictHighlightable))(v._1)(v._2);
+      return prettyConstr(isSimpleVal)(prettyVal(dictHighlightable))(v._1)(v._2);
     }
     if (v.tag === "Matrix") {
       return vert1(comma)(arrayMap((() => {
@@ -17387,7 +17357,7 @@ var prettyExpr1 = (dictAnn) => {
         return beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._2))($0.highlightIf(v._1)(checkOneLine(split("\n")(' "' + v._3 + '"'))));
       }
       if (v.tag === "Constr") {
-        return beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._2))($0.highlightIf(v._1)(prettyConstr(prettyExpr1(dictAnn))(v._3)(v._4)));
+        return beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._2))($0.highlightIf(v._1)(prettyConstr(isSimpleExpr1)(prettyExpr1(dictAnn))(v._3)(v._4)));
       }
       if (v.tag === "Dictionary") {
         return beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._2))($0.highlightIf(v._1)(curlyBraces(prettyDictEntries(dictAnn)(atop)(v._3))));
@@ -17396,13 +17366,13 @@ var prettyExpr1 = (dictAnn) => {
         return beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._2))($0.highlightIf(v._1)(arrayBrackets(beside(beside(beside(beside(prettyExpr1(dictAnn).pretty(v._3))(checkOneLine(split("\n")(" |"))))(parentheses(beside(beside(checkOneLine(split("\n")(" " + v._4._1)))(checkOneLine(split("\n")(" ,"))))(checkOneLine(split("\n")(" " + v._4._2))))))(checkOneLine(split("\n")(" in"))))(prettyExpr1(dictAnn).pretty(v._5)))));
       }
       if (v.tag === "Lambda") {
-        return parentheses(beside(checkOneLine(split("\n")(" fun")))(prettyClauses(dictAnn).pretty(v._1)));
+        return beside(checkOneLine(split("\n")(" fun")))(prettyClauses(dictAnn).pretty(v._1));
       }
       if (v.tag === "Project") {
-        return beside(beside(beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._1))(prettySimple(dictAnn)(v._2)))(checkOneLine(split("\n")(" ."))))(checkOneLine(split("\n")(" " + v._3)));
+        return beside(beside(beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._1))(prettySimple(isSimpleExpr1)(prettyExpr1(dictAnn))(v._2)))(checkOneLine(split("\n")(" ."))))(checkOneLine(split("\n")(" " + v._3)));
       }
       if (v.tag === "DProject") {
-        return beside(beside(beside(beside(beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._1))(prettySimple(dictAnn)(v._2)))(checkOneLine(split("\n")(" ."))))(checkOneLine(split("\n")(" ["))))(prettySimple(dictAnn)(v._3)))(checkOneLine(split("\n")(" ]")));
+        return beside(beside(beside(beside(beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._1))(prettySimple(isSimpleExpr1)(prettyExpr1(dictAnn))(v._2)))(checkOneLine(split("\n")(" ."))))(checkOneLine(split("\n")(" ["))))(prettySimple(isSimpleExpr1)(prettyExpr1(dictAnn))(v._3)))(checkOneLine(split("\n")(" ]")));
       }
       if (v.tag === "App") {
         return beside(prettyDocOpt(prettyExpr1(dictAnn)).pretty(v._1))(prettyAppChain(dictAnn)($Expr2("App", v._1, v._2, v._3)));
@@ -17464,16 +17434,6 @@ var prettyBranch = (dictAnn) => ({
     v._2._2
   )))
 });
-var prettySimple = (dictAnn) => (s) => {
-  const v = exprType(s);
-  if (v === "Simple") {
-    return prettyExpr1(dictAnn).pretty(s);
-  }
-  if (v === "Expression") {
-    return parentheses(prettyExpr1(dictAnn).pretty(s));
-  }
-  fail();
-};
 var prettyDictEntries = (dictAnn) => (v) => (v1) => {
   if (v1.tag === "Nil") {
     return empty2;
@@ -17502,9 +17462,9 @@ var prettyBinApp = (dictAnn) => (v) => (v1) => {
 };
 var prettyAppChain = (dictAnn) => (v) => {
   if (v.tag === "App") {
-    return beside(prettyAppChain(dictAnn)(v._2))(prettySimple(dictAnn)(v._3));
+    return beside(prettyAppChain(dictAnn)(v._2))(prettySimple(isSimpleExpr1)(prettyExpr1(dictAnn))(v._3));
   }
-  return prettySimple(dictAnn)(v);
+  return prettySimple(isSimpleExpr1)(prettyExpr1(dictAnn))(v);
 };
 
 // output-es/Val/index.js