@explorable-viz/fluid 0.7.106 → 0.8.1

package/dist/fluid/shared/load-figure.js

@@ -326,15 +326,6 @@ var applyEither = {
   Functor0: () => functorEither
 };
 var applicativeEither = { pure: Right, Apply0: () => applyEither };
-var altEither = {
-  alt: (v) => (v1) => {
-    if (v.tag === "Left") {
-      return v1;
-    }
-    return v;
-  },
-  Functor0: () => functorEither
-};
 
 // output-es/Effect/foreign.js
 var pureE = function(a) {
@@ -800,6 +791,12 @@ var foldrDefault = (dictFoldable) => {
   const foldMap22 = dictFoldable.foldMap(monoidEndo);
   return (c) => (u) => (xs) => foldMap22((x2) => c(x2))(xs)(u);
 };
+var find = (dictFoldable) => (p) => dictFoldable.foldl((v) => (v1) => {
+  if (v.tag === "Nothing" && p(v1)) {
+    return $Maybe("Just", v1);
+  }
+  return v;
+})(Nothing);
 
 // output-es/Unsafe.Coerce/foreign.js
 var unsafeCoerce = function(x2) {
@@ -1167,6 +1164,7 @@ var nubBy = (comp) => (xs) => {
   }
   fail();
 };
+var foldM = (dictMonad) => (f) => (b) => unconsImpl((v) => dictMonad.Applicative0().pure(b))((a) => (as) => dictMonad.Bind1().bind(f(b)(a))((b$p) => foldM(dictMonad)(f)(b$p)(as)));
 var findIndex = /* @__PURE__ */ findIndexImpl(Just)(Nothing);
 var notElem = (dictEq) => (a) => (arr) => {
   const $0 = findIndex((v) => dictEq.eq(v)(a))(arr);
@@ -1384,11 +1382,11 @@ var fromFoldable = (dictFoldable) => {
     return s;
   };
 };
-var foldM = (dictMonad) => {
+var foldM2 = (dictMonad) => {
   const bind1 = dictMonad.Bind1().bind;
   return (f) => (z) => _foldM(bind1)(f)(dictMonad.Applicative0().pure(z));
 };
-var foldM1 = /* @__PURE__ */ foldM(monadST);
+var foldM1 = /* @__PURE__ */ foldM2(monadST);
 var union = (m) => mutate((s) => foldM1((s$p) => (k) => (v) => () => {
   s$p[k] = v;
   return s$p;
@@ -1851,7 +1849,7 @@ var foldableNonEmptyList = {
 };
 var semigroupNonEmptyList = { append: (v) => (as$p) => $NonEmpty(v._1, foldableList.foldr(Cons)($List("Cons", as$p._1, as$p._2))(v._2)) };
 var showList = (dictShow) => {
-  const show4 = dictShow.show;
+  const show5 = dictShow.show;
   return {
     show: (v) => {
       if (v.tag === "Nil") {
@@ -1875,7 +1873,7 @@ var showList = (dictShow) => {
         }
         return go$r;
       };
-      return "(" + go({ init: true, acc: "" })(listMap(show4)(v)).acc + " : Nil)";
+      return "(" + go({ init: true, acc: "" })(listMap(show5)(v)).acc + " : Nil)";
     }
   };
 };
@@ -4206,10 +4204,10 @@ function childMatcher(selector) {
 }
 
 // node_modules/d3-selection/src/selection/selectChild.js
-var find = Array.prototype.find;
+var find2 = Array.prototype.find;
 function childFind(match4) {
   return function() {
-    return find.call(this.children, match4);
+    return find2.call(this.children, match4);
   };
 }
 function childFirst() {
@@ -14831,7 +14829,7 @@ var ViewState = class {
           return;
         }
       }
-      let gap = find2(current, (gap2) => gap2.from >= line2.from && gap2.to <= line2.to && Math.abs(gap2.from - from) < halfMargin && Math.abs(gap2.to - to) < halfMargin && !avoid.some((pos) => gap2.from < pos && gap2.to > pos));
+      let gap = find3(current, (gap2) => gap2.from >= line2.from && gap2.to <= line2.to && Math.abs(gap2.from - from) < halfMargin && Math.abs(gap2.to - to) < halfMargin && !avoid.some((pos) => gap2.from < pos && gap2.to > pos));
       if (!gap) {
         if (to < line2.to && mayMeasure && wrapping && mayMeasure.visibleRanges.some((r) => r.from <= to && r.to >= to)) {
           let lineStart = mayMeasure.moveToLineBoundary(EditorSelection.cursor(to), false, true).head;
@@ -14982,7 +14980,7 @@ function findFraction(structure, pos) {
   }
   return counted / structure.total;
 }
-function find2(array2, f) {
+function find3(array2, f) {
   for (let val of array2)
     if (f(val))
       return val;
@@ -18250,10 +18248,10 @@ function tagHighlighter(tags2, options) {
       for (let tag of style.tag)
         map3[tag.id] = style.class;
   }
-  let { scope, all: all3 = null } = options || {};
+  let { scope, all: all4 = null } = options || {};
   return {
     style: (tags3) => {
-      let cls = all3;
+      let cls = all4;
       for (let tag of tags3) {
         for (let sub of tag.set) {
           let tagClass = map3[sub.id];
@@ -19008,14 +19006,14 @@ var HighlightStyle = class {
       (modSpec || (modSpec = /* @__PURE__ */ Object.create(null)))["." + cls] = spec;
       return cls;
     }
-    const all3 = typeof options.all == "string" ? options.all : options.all ? def(options.all) : void 0;
+    const all4 = typeof options.all == "string" ? options.all : options.all ? def(options.all) : void 0;
     const scopeOpt = options.scope;
     this.scope = scopeOpt instanceof Language ? (type2) => type2.prop(languageDataProp) == scopeOpt.data : scopeOpt ? (type2) => type2 == scopeOpt : void 0;
     this.style = tagHighlighter(specs.map((style) => ({
       tag: style.tag,
       class: style.class || def(Object.assign({}, style, { tag: null }))
     })), {
-      all: all3
+      all: all4
     }).style;
     this.module = modSpec ? new StyleModule(modSpec) : null;
     this.themeType = options.themeType;
@@ -20632,6 +20630,16 @@ var groupBy = (v) => (v1) => {
   }
   fail();
 };
+var foldM3 = (dictMonad) => (v) => (v1) => (v2) => {
+  if (v2.tag === "Nil") {
+    return dictMonad.Applicative0().pure(v1);
+  }
+  if (v2.tag === "Cons") {
+    const $0 = v2._2;
+    return dictMonad.Bind1().bind(v(v1)(v2._1))((b$p) => foldM3(dictMonad)(v)(b$p)($0));
+  }
+  fail();
+};
 var drop2 = (drop$a0$copy) => (drop$a1$copy) => {
   let drop$a0 = drop$a0$copy, drop$a1 = drop$a1$copy, drop$c = true, drop$r;
   while (drop$c) {
@@ -20805,7 +20813,10 @@ var filter3 = (p) => {
 var $KickUp = (_1, _2, _3, _4) => ({ tag: "KickUp", _1, _2, _3, _4 });
 var $$$Map = (tag, _1, _2, _3, _4, _5, _6, _7) => ({ tag, _1, _2, _3, _4, _5, _6, _7 });
 var $TreeContext = (tag, _1, _2, _3, _4, _5, _6) => ({ tag, _1, _2, _3, _4, _5, _6 });
+var identity15 = (x2) => x2;
 var Leaf2 = /* @__PURE__ */ $$$Map("Leaf");
+var Two = (value0) => (value1) => (value2) => (value3) => $$$Map("Two", value0, value1, value2, value3);
+var Three = (value0) => (value1) => (value2) => (value3) => (value4) => (value5) => (value6) => $$$Map("Three", value0, value1, value2, value3, value4, value5, value6);
 var size2 = (v) => {
   if (v.tag === "Leaf") {
     return 0;
@@ -20924,6 +20935,20 @@ var lookup2 = (dictOrd) => (k) => {
   };
   return go;
 };
+var functorMap = {
+  map: (v) => (v1) => {
+    if (v1.tag === "Leaf") {
+      return Leaf2;
+    }
+    if (v1.tag === "Two") {
+      return $$$Map("Two", functorMap.map(v)(v1._1), v1._2, v(v1._3), functorMap.map(v)(v1._4));
+    }
+    if (v1.tag === "Three") {
+      return $$$Map("Three", functorMap.map(v)(v1._1), v1._2, v(v1._3), functorMap.map(v)(v1._4), v1._5, v(v1._6), functorMap.map(v)(v1._7));
+    }
+    fail();
+  }
+};
 var fromZipper = (fromZipper$a0$copy) => (fromZipper$a1$copy) => (fromZipper$a2$copy) => {
   let fromZipper$a0 = fromZipper$a0$copy, fromZipper$a1 = fromZipper$a1$copy, fromZipper$a2 = fromZipper$a2$copy, fromZipper$c = true, fromZipper$r;
   while (fromZipper$c) {
@@ -21710,6 +21735,27 @@ var foldableWithIndexMap = {
   },
   Foldable0: () => foldableMap
 };
+var traversableMap = {
+  traverse: (dictApplicative) => {
+    const Apply0 = dictApplicative.Apply0();
+    const $0 = Apply0.Functor0();
+    return (v) => (v1) => {
+      if (v1.tag === "Leaf") {
+        return dictApplicative.pure(Leaf2);
+      }
+      if (v1.tag === "Two") {
+        return Apply0.apply(Apply0.apply(Apply0.apply($0.map(Two)(traversableMap.traverse(dictApplicative)(v)(v1._1)))(dictApplicative.pure(v1._2)))(v(v1._3)))(traversableMap.traverse(dictApplicative)(v)(v1._4));
+      }
+      if (v1.tag === "Three") {
+        return Apply0.apply(Apply0.apply(Apply0.apply(Apply0.apply(Apply0.apply(Apply0.apply($0.map(Three)(traversableMap.traverse(dictApplicative)(v)(v1._1)))(dictApplicative.pure(v1._2)))(v(v1._3)))(traversableMap.traverse(dictApplicative)(v)(v1._4)))(dictApplicative.pure(v1._5)))(v(v1._6)))(traversableMap.traverse(dictApplicative)(v)(v1._7));
+      }
+      fail();
+    };
+  },
+  sequence: (dictApplicative) => traversableMap.traverse(dictApplicative)(identity15),
+  Functor0: () => functorMap,
+  Foldable1: () => foldableMap
+};
 var findMin = /* @__PURE__ */ (() => {
   const go = (go$a0$copy) => (go$a1$copy) => {
     let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
@@ -22152,7 +22198,7 @@ var intercalate3 = (sep) => (xs) => {
   };
   return go({ init: true, acc: Nil })(xs).acc;
 };
-var identity17 = (x2) => x2;
+var identity18 = (x2) => x2;
 var isEmptySet = { isEmpty: isEmpty2 };
 var isEmptyObject = { isEmpty };
 var $$throw = (dictMonadThrow) => (x2) => dictMonadThrow.throwError(error(x2));
@@ -22252,13 +22298,13 @@ var bind2Flipped = (dictMonad) => {
 };
 var assertWith = (v) => (v1) => {
   if (v1) {
-    return identity17;
+    return identity18;
   }
   return (v2) => throwException(error("Assertion failure: " + v))();
 };
 var assertWhen = (v) => (v1) => {
   if (!v) {
-    return (v$1) => identity17;
+    return (v$1) => identity18;
   }
   if (v) {
     return (x2) => assertWith(v1)(x2());
@@ -22305,7 +22351,7 @@ function intersectionWith_Object(f) {
 }
 
 // output-es/Util.Map/index.js
-var identity18 = (x2) => x2;
+var identity19 = (x2) => x2;
 var mapObjectString = {
   maplet: singleton,
   keys: /* @__PURE__ */ (() => {
@@ -22358,7 +22404,7 @@ var update2 = (dictShow) => (dictMap) => (f) => (k) => {
 };
 
 // output-es/Dict/index.js
-var identity19 = (x2) => x2;
+var identity20 = (x2) => x2;
 var isEmptyDict = { isEmpty: (v) => isEmpty(v) };
 var setDictString = {
   empty,
@@ -22411,7 +22457,7 @@ var traversableDict = {
     const $0 = traversableWithIndexObject.traverseWithIndex(dictApplicative);
     return (f) => (m) => dictApplicative.Apply0().Functor0().map((v1) => v1)($0((v) => f)(m));
   },
-  sequence: (dictApplicative) => (v) => traversableDict.traverse(dictApplicative)(identity19)(v),
+  sequence: (dictApplicative) => (v) => traversableDict.traverse(dictApplicative)(identity20)(v),
   Functor0: () => functorDict,
   Foldable1: () => foldableDict
 };
@@ -22488,16 +22534,16 @@ var toTuple = (v) => $Tuple(v._1, v._2);
 var unzip3 = (xys) => unzip(listMap(toTuple)(xys));
 
 // output-es/Lattice/index.js
-var identity20 = (x2) => x2;
-var meetSemilatticeUnit = { meet: (v) => identity20 };
+var identity21 = (x2) => x2;
+var meetSemilatticeUnit = { meet: (v) => identity21 };
 var meetSemilatticeBoolean = { meet: boolConj };
-var joinSemilatticeUnit = { join: (v) => identity20 };
+var joinSemilatticeUnit = { join: (v) => identity21 };
 var boundedMeetSemilatticeUni = { top: void 0, MeetSemilattice0: () => meetSemilatticeUnit };
 var boundedMeetSemilatticeBoo = { top: true, MeetSemilattice0: () => meetSemilatticeBoolean };
 var boundedJoinSemilatticeUni = { bot: void 0, JoinSemilattice0: () => joinSemilatticeUnit };
 
 // output-es/Data.Profunctor.Choice/index.js
-var identity21 = (x2) => x2;
+var identity22 = (x2) => x2;
 var fanin = (dictCategory) => {
   const identity1 = dictCategory.identity;
   const $0 = dictCategory.Semigroupoid0();
@@ -22510,7 +22556,7 @@ var fanin = (dictCategory) => {
       return v2._1;
     }
     fail();
-  })(identity21)(identity1))($1.compose(dictChoice.right(r))(dictChoice.left(l)));
+  })(identity22)(identity1))($1.compose(dictChoice.right(r))(dictChoice.left(l)));
 };
 var choiceFn = /* @__PURE__ */ (() => ({
   left: (v) => (v1) => {
@@ -28802,7 +28848,7 @@ var between = (open) => (close) => (p) => (state1, more, lift12, $$throw2, done)
 var $Assoc = (tag) => tag;
 var $Operator = (tag, _1, _2) => ({ tag, _1, _2 });
 var choice2 = /* @__PURE__ */ choice(foldableList);
-var identity22 = (x2) => x2;
+var identity23 = (x2) => x2;
 var AssocNone = /* @__PURE__ */ $Assoc("AssocNone");
 var AssocLeft = /* @__PURE__ */ $Assoc("AssocLeft");
 var AssocRight = /* @__PURE__ */ $Assoc("AssocRight");
@@ -28983,7 +29029,7 @@ var makeParser = (term) => (ops) => {
               if ($7) {
                 return $22(v4, $6);
               }
-              return $32(v2$1, identity22);
+              return $32(v2$1, identity23);
             });
           },
           $32
@@ -29001,7 +29047,7 @@ var makeParser = (term) => (ops) => {
               if ($7) {
                 return $22(v4, $6);
               }
-              return $32(v2$1, identity22);
+              return $32(v2$1, identity23);
             });
           },
           $32
@@ -29020,7 +29066,7 @@ var makeParser = (term) => (ops) => {
               if ($8) {
                 return $32(v4, $7);
               }
-              return $42(v2$1, identity22);
+              return $42(v2$1, identity23);
             });
           },
           $42
@@ -29038,7 +29084,7 @@ var makeParser = (term) => (ops) => {
               if ($8) {
                 return $32(v4, $7);
               }
-              return $42(v2$1, identity22);
+              return $42(v2$1, identity23);
             });
           },
           $42
@@ -29057,7 +29103,7 @@ var makeParser = (term) => (ops) => {
               if ($9) {
                 return $42(v4, $8);
               }
-              return $52(v2$1, identity22);
+              return $52(v2$1, identity23);
             });
           },
           $52
@@ -29075,7 +29121,7 @@ var makeParser = (term) => (ops) => {
               if ($9) {
                 return $42(v4, $8);
               }
-              return $52(v2$1, identity22);
+              return $52(v2$1, identity23);
             });
           },
           $52
@@ -29170,7 +29216,7 @@ var makeParser = (term) => (ops) => {
             if ($5) {
               return $$throw2(v4, $4);
             }
-            return $1(state1, identity22);
+            return $1(state1, identity23);
           });
         },
         $1
@@ -29262,7 +29308,7 @@ var unions = /* @__PURE__ */ (() => {
   };
   return go(Leaf2);
 })();
-var identity25 = (x2) => x2;
+var identity26 = (x2) => x2;
 var Unquote = (value0) => $DocCommentElem("Unquote", value0);
 var None = /* @__PURE__ */ $DocOpt("None");
 var Doc = (value0) => $DocOpt("Doc", value0);
@@ -29469,18 +29515,18 @@ var traversableDocCommentElem = (dictTraversable) => {
   };
   return {
     traverse: (dictApplicative) => {
-      const traverse2 = dictTraversable.traverse(dictApplicative);
+      const traverse22 = dictTraversable.traverse(dictApplicative);
       return (f) => (m) => {
         if (m.tag === "Token") {
           return dictApplicative.pure($DocCommentElem("Token", m._1));
         }
         if (m.tag === "Unquote") {
-          return dictApplicative.Apply0().Functor0().map((v1) => $DocCommentElem("Unquote", v1))(traverse2(f)(m._1));
+          return dictApplicative.Apply0().Functor0().map((v1) => $DocCommentElem("Unquote", v1))(traverse22(f)(m._1));
         }
         fail();
       };
     },
-    sequence: (dictApplicative) => (v) => traversableDocCommentElem(dictTraversable).traverse(dictApplicative)(identity25)(v),
+    sequence: (dictApplicative) => (v) => traversableDocCommentElem(dictTraversable).traverse(dictApplicative)(identity26)(v),
     Functor0: () => functorDocCommentElem1,
     Foldable1: () => foldableDocCommentElem1
   };
@@ -29490,19 +29536,19 @@ var traversableDocOpt = (dictTraversable) => {
   const foldableDocOpt1 = foldableDocOpt(dictTraversable.Foldable1());
   return {
     traverse: (dictApplicative) => {
-      const traverse2 = traversableList.traverse(dictApplicative);
+      const traverse22 = traversableList.traverse(dictApplicative);
       const traverse3 = traversableDocCommentElem(dictTraversable).traverse(dictApplicative);
       return (f) => (m) => {
         if (m.tag === "None") {
           return dictApplicative.pure(None);
         }
         if (m.tag === "Doc") {
-          return dictApplicative.Apply0().Functor0().map((v1) => $DocOpt("Doc", v1))(traverse2(traverse3(f))(m._1));
+          return dictApplicative.Apply0().Functor0().map((v1) => $DocOpt("Doc", v1))(traverse22(traverse3(f))(m._1));
         }
         fail();
       };
     },
-    sequence: (dictApplicative) => (v) => traversableDocOpt(dictTraversable).traverse(dictApplicative)(identity25)(v),
+    sequence: (dictApplicative) => (v) => traversableDocOpt(dictTraversable).traverse(dictApplicative)(identity26)(v),
     Functor0: () => functorDocOpt1,
     Foldable1: () => foldableDocOpt1
   };
@@ -29655,7 +29701,7 @@ var unions12 = /* @__PURE__ */ (() => {
   };
   return go(Leaf2);
 })();
-var identity26 = (x2) => x2;
+var identity27 = (x2) => x2;
 var compare3 = /* @__PURE__ */ (() => ordTuple(ordString)(ordString).compare)();
 var compare4 = /* @__PURE__ */ (() => ordSet(ordString).compare)();
 var setSet2 = /* @__PURE__ */ setSet(ordString);
@@ -30168,7 +30214,7 @@ var traversableVarDef = {
     const Apply0 = dictApplicative.Apply0();
     return (f) => (m) => Apply0.apply(Apply0.Functor0().map((v2) => (v3) => $VarDef(v2, v3))(traversableElim.traverse(dictApplicative)(f)(m._1)))(traversableExpr.traverse(dictApplicative)(f)(m._2));
   },
-  sequence: (dictApplicative) => (v) => traversableVarDef.traverse(dictApplicative)(identity26)(v),
+  sequence: (dictApplicative) => (v) => traversableVarDef.traverse(dictApplicative)(identity27)(v),
   Functor0: () => functorVarDef,
   Foldable1: () => foldableVarDef
 };
@@ -30178,7 +30224,7 @@ var traversableRecDefs = {
     const traverse5 = traversableDict.traverse(dictApplicative);
     return (f) => (m) => Apply0.apply(Apply0.Functor0().map((v2) => (v3) => $RecDefs(v2, v3))(f(m._1)))(traverse5(traversableElim.traverse(dictApplicative)(f))(m._2));
   },
-  sequence: (dictApplicative) => (v) => traversableRecDefs.traverse(dictApplicative)(identity26)(v),
+  sequence: (dictApplicative) => (v) => traversableRecDefs.traverse(dictApplicative)(identity27)(v),
   Functor0: () => functorRecDefs,
   Foldable1: () => foldableRecDefs
 };
@@ -30240,7 +30286,7 @@ var traversableExpr = {
       fail();
     };
   },
-  sequence: (dictApplicative) => (v) => traversableExpr.traverse(dictApplicative)(identity26)(v),
+  sequence: (dictApplicative) => (v) => traversableExpr.traverse(dictApplicative)(identity27)(v),
   Functor0: () => functorExpr,
   Foldable1: () => foldableExpr
 };
@@ -30263,7 +30309,7 @@ var traversableElim = {
       fail();
     };
   },
-  sequence: (dictApplicative) => (v) => traversableElim.traverse(dictApplicative)(identity26)(v),
+  sequence: (dictApplicative) => (v) => traversableElim.traverse(dictApplicative)(identity27)(v),
   Functor0: () => functorElim,
   Foldable1: () => foldableElim
 };
@@ -30280,7 +30326,7 @@ var traversableCont = {
       fail();
     };
   },
-  sequence: (dictApplicative) => (v) => traversableCont.traverse(dictApplicative)(identity26)(v),
+  sequence: (dictApplicative) => (v) => traversableCont.traverse(dictApplicative)(identity27)(v),
   Functor0: () => functorCont,
   Foldable1: () => foldableCont
 };
@@ -33643,13 +33689,13 @@ var varDefFwd = (dictMonadError) => {
 };
 var recDefsFwd = (dictMonadError) => {
   const Monad0 = dictMonadError.MonadThrow0().Monad0();
-  const traverse2 = traversableNonEmptyList.traverse(Monad0.Applicative0());
+  const traverse22 = traversableNonEmptyList.traverse(Monad0.Applicative0());
   return (dictBoundedLattice) => {
     const top3 = dictBoundedLattice.BoundedMeetSemilattice1().top;
     return (xcs) => Monad0.Bind1().Apply0().Functor0().map((() => {
       const $0 = RecDefs(top3);
       return (x2) => $0(fromFoldable16(x2));
-    })())(traverse2(recDefFwd(dictMonadError)(dictBoundedLattice))((() => {
+    })())(traverse22(recDefFwd(dictMonadError)(dictBoundedLattice))((() => {
       const $0 = wrappedOperation("groupBy")(groupBy((x2) => (y2) => x2._1 === y2._1))(xcs);
       return $NonEmpty($0._1, listMap(RecDef)($0._2));
     })()));
@@ -33851,7 +33897,7 @@ var exprFwd = (dictBoundedLattice) => {
     const Bind1 = Monad0.Bind1();
     const Apply0 = Bind1.Apply0();
     const Functor0 = Apply0.Functor0();
-    const traverse2 = traversableList.traverse(Applicative0);
+    const traverse22 = traversableList.traverse(Applicative0);
     return (dictJoinSemilattice) => (v) => {
       if (v.tag === "Var") {
         return Applicative0.pure($Expr("Var", v._1));
@@ -33878,14 +33924,14 @@ var exprFwd = (dictBoundedLattice) => {
         const $0 = v._3;
         const $1 = v._4;
         const $2 = v._1;
-        return Bind1.bind(desugComment(dictBoundedLattice)(dictMonadError)(v._2))((edoc) => Functor0.map(Constr($2)(edoc)($0))(traverse2(exprFwd(dictBoundedLattice)(dictMonadError)(dictBoundedLattice.BoundedJoinSemilattice0().JoinSemilattice0()))($1)));
+        return Bind1.bind(desugComment(dictBoundedLattice)(dictMonadError)(v._2))((edoc) => Functor0.map(Constr($2)(edoc)($0))(traverse22(exprFwd(dictBoundedLattice)(dictMonadError)(dictBoundedLattice.BoundedJoinSemilattice0().JoinSemilattice0()))($1)));
       }
       if (v.tag === "Dictionary") {
         const $0 = v._2;
         const $1 = v._1;
         const v1 = unzip(v._3);
         const $2 = v1._2;
-        return Bind1.bind(traverse2(desugarableDictEntryExpr.desug(dictMonadError)(dictBoundedLattice))(v1._1))((ks$p) => Bind1.bind(traverse2(exprFwd(dictBoundedLattice)(dictMonadError)(dictBoundedLattice.BoundedJoinSemilattice0().JoinSemilattice0()))($2))((es) => Bind1.bind(desugComment(dictBoundedLattice)(dictMonadError)($0))((edoc) => Functor0.map(Dictionary($1)(edoc))(Applicative0.pure(zipWith2((k) => (v2) => $Pair(
+        return Bind1.bind(traverse22(desugarableDictEntryExpr.desug(dictMonadError)(dictBoundedLattice))(v1._1))((ks$p) => Bind1.bind(traverse22(exprFwd(dictBoundedLattice)(dictMonadError)(dictBoundedLattice.BoundedJoinSemilattice0().JoinSemilattice0()))($2))((es) => Bind1.bind(desugComment(dictBoundedLattice)(dictMonadError)($0))((edoc) => Functor0.map(Dictionary($1)(edoc))(Applicative0.pure(zipWith2((k) => (v2) => $Pair(
           k,
           v2
         ))(ks$p)(es))))));
@@ -34420,11 +34466,11 @@ var moduleFwd = (dictMonadError) => {
   const $0 = Monad0.Bind1().Apply0().Functor0();
   const varDefFwd1 = varDefFwd(dictMonadError);
   const recDefsFwd1 = recDefsFwd(dictMonadError);
-  const traverse2 = traversableList.traverse(Monad0.Applicative0());
+  const traverse22 = traversableList.traverse(Monad0.Applicative0());
   return (dictBoundedLattice) => {
     const varDefFwd2 = varDefFwd1(dictBoundedLattice);
     const recDefsFwd2 = recDefsFwd1(dictBoundedLattice);
-    return (v) => $0.map(Module)(traverse2((v1) => {
+    return (v) => $0.map(Module)(traverse22((v1) => {
       if (v1.tag === "Left") {
         return $0.map(Left)(varDefFwd2(v1._1));
       }
@@ -34521,7 +34567,7 @@ var toUnfoldable13 = /* @__PURE__ */ toAscUnfoldable(unfoldableList);
 var Simple = /* @__PURE__ */ $ExprType("Simple");
 var Expression = /* @__PURE__ */ $ExprType("Expression");
 var vert = (dictFoldable) => {
-  const fromFoldable26 = dictFoldable.foldr(Cons)(Nil);
+  const fromFoldable27 = dictFoldable.foldr(Cons)(Nil);
   return (delim) => {
     const vert$p = (v) => {
       if (v.tag === "Nil") {
@@ -34537,7 +34583,7 @@ var vert = (dictFoldable) => {
       }
       fail();
     };
-    return (x2) => vert$p(fromFoldable26(x2));
+    return (x2) => vert$p(fromFoldable27(x2));
   };
 };
 var vert1 = /* @__PURE__ */ vert(foldableArray);
@@ -35266,7 +35312,7 @@ var unions13 = /* @__PURE__ */ (() => {
   return go(Leaf2);
 })();
 var foldMap2 = /* @__PURE__ */ foldMap({ mempty: Leaf2, Semigroup0: () => ({ append: union3(ordDVertex$p) }) });
-var identity27 = (x2) => x2;
+var identity28 = (x2) => x2;
 var ordTuple3 = /* @__PURE__ */ ordTuple(ordInt);
 var boundedLattice = { BoundedJoinSemilattice0: () => boundedJoinSemilatticeUni, BoundedMeetSemilattice1: () => boundedMeetSemilatticeUni };
 var show3 = /* @__PURE__ */ (() => showSet(showString).show)();
@@ -35394,7 +35440,7 @@ var mapEnvStringVal = {
 var highlightableVertex = {
   highlightIf: (v) => (doc2) => beside(beside(doc2)(checkOneLine(split("\n")(" _"))))(checkOneLine(split("\n")(" \u27E8" + v + "\u27E9")))
 };
-var highlightableUnit = { highlightIf: (v) => identity27 };
+var highlightableUnit = { highlightIf: (v) => identity28 };
 var functorMatrixDim = { map: (f) => (m) => $Tuple(m._1, f(m._2)) };
 var functorVal = { map: (f) => (m) => $Val(f(m._1), functorDocOpt(functorVal).map(f)(m._2), functorBaseVal.map(f)(m._3)) };
 var functorMatrixRep = {
@@ -35449,7 +35495,7 @@ var functorEnvExpr = { map: (f) => (m) => $EnvExpr(_fmapObject(m._1, functorVal.
 var foldableMatrixDim = { foldl: (f) => (z) => (m) => f(z)(m._2), foldr: (f) => (z) => (m) => f(m._2)(z), foldMap: (dictMonoid) => (f) => (m) => f(m._2) };
 var traversableMatrixDim = {
   traverse: (dictApplicative) => (f) => (m) => dictApplicative.Apply0().Functor0().map((v1) => v1)(traversableTuple.traverse(dictApplicative)(f)(m)),
-  sequence: (dictApplicative) => (v) => traversableMatrixDim.traverse(dictApplicative)(identity27)(v),
+  sequence: (dictApplicative) => (v) => traversableMatrixDim.traverse(dictApplicative)(identity28)(v),
   Functor0: () => functorMatrixDim,
   Foldable1: () => foldableMatrixDim
 };
@@ -35675,7 +35721,7 @@ var traversableVal = {
     const Apply0 = dictApplicative.Apply0();
     return (f) => (m) => Apply0.apply(Apply0.apply(Apply0.Functor0().map((v3) => (v4) => (v5) => $Val(v3, v4, v5))(f(m._1)))(traversableDocOpt(traversableVal).traverse(dictApplicative)(f)(m._2)))(traversableBaseVal.traverse(dictApplicative)(f)(m._3));
   },
-  sequence: (dictApplicative) => (v) => traversableVal.traverse(dictApplicative)(identity27)(v),
+  sequence: (dictApplicative) => (v) => traversableVal.traverse(dictApplicative)(identity28)(v),
   Functor0: () => functorVal,
   Foldable1: () => foldableVal
 };
@@ -35711,7 +35757,7 @@ var traversableFun = {
       fail();
     };
   },
-  sequence: (dictApplicative) => (v) => traversableFun.traverse(dictApplicative)(identity27)(v),
+  sequence: (dictApplicative) => (v) => traversableFun.traverse(dictApplicative)(identity28)(v),
   Functor0: () => functorFun,
   Foldable1: () => foldableFun
 };
@@ -35720,7 +35766,7 @@ var traversableEnv = {
     const traverse8 = traversableDict.traverse(dictApplicative);
     return (f) => (m) => dictApplicative.Apply0().Functor0().map((v1) => v1)(traverse8(traversableVal.traverse(dictApplicative)(f))(m));
   },
-  sequence: (dictApplicative) => (v) => traversableEnv.traverse(dictApplicative)(identity27)(v),
+  sequence: (dictApplicative) => (v) => traversableEnv.traverse(dictApplicative)(identity28)(v),
   Functor0: () => functorEnv,
   Foldable1: () => foldableEnv
 };
@@ -35764,7 +35810,7 @@ var traversableBaseVal = {
       fail();
     };
   },
-  sequence: (dictApplicative) => (v) => traversableBaseVal.traverse(dictApplicative)(identity27)(v),
+  sequence: (dictApplicative) => (v) => traversableBaseVal.traverse(dictApplicative)(identity28)(v),
   Functor0: () => functorBaseVal,
   Foldable1: () => foldableBaseVal
 };
@@ -38294,7 +38340,7 @@ var viewDocViewUnit = {
 };
 
 // output-es/App.View.LineChart/index.js
-var identity28 = (x2) => x2;
+var identity29 = (x2) => x2;
 var join = (v) => (v1) => {
   if (v1.tag === "Inert") {
     return v;
@@ -38348,7 +38394,7 @@ var viewLineChartUnit = {
           const $3 = attrs(point2)(fromFoldable9((() => {
             const $32 = definitely("index within bounds")(index(v3.points)(point$p.j));
             const sel = join($32.x._2)($32.y._2);
-            const fill$p = (isPersistent(sel) ? (a) => colorShade(a)(-30) : identity28)(nameCol(definitely("absurd")((() => {
+            const fill$p = (isPersistent(sel) ? (a) => colorShade(a)(-30) : identity29)(nameCol(definitely("absurd")((() => {
               const $4 = v3.name._1;
               return findIndex((v$1) => v$1 === $4)(arrayMap((x2) => x2.name._1)($0));
             })())));
@@ -38389,7 +38435,7 @@ var viewLineChartUnit = {
             return [
               $Tuple(
                 "stroke",
-                (isTransient(sel) ? (a) => colorShade(a)(-30) : identity28)((isPersistent(sel) ? (a) => colorShade(a)(-30) : identity28)(nameCol(definitely("absurd")((() => {
+                (isTransient(sel) ? (a) => colorShade(a)(-30) : identity29)((isPersistent(sel) ? (a) => colorShade(a)(-30) : identity29)(nameCol(definitely("absurd")((() => {
                   const $3 = v3.name._1;
                   return findIndex((v$1) => v$1 === $3)(arrayMap((x2) => x2.name._1)($0));
                 })()))))
@@ -38893,8 +38939,8 @@ var toStringWith = (v) => {
 var $Filter = (tag) => tag;
 var toUnfoldable10 = /* @__PURE__ */ toUnfoldable4(unfoldableArray);
 var $$for = /* @__PURE__ */ (() => {
-  const traverse2 = traversableArray.traverse(applicativeEffect);
-  return (x2) => (f) => traverse2(f)(x2);
+  const traverse22 = traversableArray.traverse(applicativeEffect);
+  return (x2) => (f) => traverse22(f)(x2);
 })();
 var for_5 = /* @__PURE__ */ for_(applicativeEffect)(foldableArray);
 var forWithIndex_4 = /* @__PURE__ */ forWithIndex_(applicativeEffect)(foldableWithIndexArray);
@@ -39167,9 +39213,9 @@ var viewTextUnit = {
     const $0 = v1._1;
     const $1 = select(":nth-child(1)")(rootElement);
     return () => {
-      const elem2 = $1();
+      const elem3 = $1();
       const listener = eventListener((x2) => redraw(selectionEventData$p(x2)._2))();
-      const $2 = styles(elem2)(fromFoldable9(textAttrs(textualString)($0)))();
+      const $2 = styles(elem3)(fromFoldable9(textAttrs(textualString)($0)))();
       return for_2(["mousedown", "mouseenter", "mouseleave"])((ev) => on(ev)(listener)($2))();
     };
   }
@@ -39263,7 +39309,7 @@ var pack32 = (x2) => (v) => v(viewScatterPlotUnit)(x2);
 var pack4 = (x2) => (v) => v(viewMultiViewUnit)(x2);
 var pack5 = (x2) => (v) => v(viewParagraphUnit)(x2);
 var pack6 = (x2) => (v) => v(viewLinkUnit)(x2);
-var identity29 = (x2) => x2;
+var identity30 = (x2) => x2;
 var pack7 = (x2) => (v) => v(viewTableViewUnit)(x2);
 var pack8 = (x2) => (v) => v(viewMatrixViewUnit)(x2);
 var fromFoldable11 = /* @__PURE__ */ (() => fromFoldableImpl(foldableList.foldr))();
@@ -39455,7 +39501,7 @@ var view = () => (v) => (v1) => (v2) => {
           return pack5($Paragraph(false, arrayApply(vws)(arrayMap((v$1) => Nothing)(vws))));
         }
         if (v1._3._1 === "Nil" || v1._3._1 === ":") {
-          const records = arrayMap(dict(identity29))(reflectValSelStates\u{1D54A}Array.from()(v1));
+          const records = arrayMap(dict(identity30))(reflectValSelStates\u{1D54A}Array.from()(v1));
           const colNames = headers(records);
           return pack7({
             title: v,
@@ -39471,7 +39517,7 @@ var view = () => (v) => (v1) => (v2) => {
       }
     }
     if (v1._3._1 === "Nil" || v1._3._1 === ":") {
-      const records = arrayMap(dict(identity29))(reflectValSelStates\u{1D54A}Array.from()(v1));
+      const records = arrayMap(dict(identity30))(reflectValSelStates\u{1D54A}Array.from()(v1));
       const colNames = headers(records);
       return pack7({
         title: v,
@@ -39920,6 +39966,7 @@ var greaterThanOrEq = /* @__PURE__ */ (() => {
   return (a1) => (a2) => $0.compare(a1)(a2) !== "LT";
 })();
 var show32 = (v) => "(Tuple " + showIntImpl(v._1) + " " + showIntImpl(v._2) + ")";
+var traverse2 = /* @__PURE__ */ (() => traversableList.traverse(applicativeMaybe))();
 var concatM = (dictMonad) => foldableList.foldr((() => {
   const $0 = dictMonad.Bind1();
   return (f) => (g) => (a) => $0.bind(f(a))(g);
@@ -40063,9 +40110,9 @@ var graphGC = (dictGraph) => {
 };
 var closeDefs = (dictMonadWithGraphAlloc) => {
   const Monad0 = dictMonadWithGraphAlloc.MonadWithGraph2().Monad0();
-  const traverse2 = traversableDict.traverse(Monad0.Applicative0());
+  const traverse2$1 = traversableDict.traverse(Monad0.Applicative0());
   const $$new = dictMonadWithGraphAlloc.new(typeNameVal);
-  return (\u03B3) => (\u03C1) => (\u03B1s) => Monad0.Bind1().Apply0().Functor0().map(Env)(traverse2((\u03C3) => {
+  return (\u03B3) => (\u03C1) => (\u03B1s) => Monad0.Bind1().Apply0().Functor0().map(Env)(traverse2$1((\u03C3) => {
     const \u03C1$p = forDefs(\u03C1)(\u03C3);
     return $$new((a) => Val(a)(None))(\u03B1s)($BaseVal(
       "Fun",
@@ -40094,7 +40141,7 @@ var new$p = (dictMonadWithGraphAlloc) => {
       if (v2.tag === "None") {
         return $$new((\u03B1s$p) => (u$p) => $Val(\u03B1s$p, None, u$p))(v1)(v3);
       }
-      return Bind1.bind(fresh)((\u03B1) => Bind1.bind(evalDocOpt(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity18)(v)((() => {
+      return Bind1.bind(fresh)((\u03B1) => Bind1.bind(evalDocOpt(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity19)(v)((() => {
         const $0 = {};
         $0.this = $Val(\u03B1, None, v3);
         return $0;
@@ -40142,8 +40189,8 @@ var $$eval = (dictMonadWithGraphAlloc) => {
     const Bind1 = Monad0.Bind1();
     const $0 = Bind1.Apply0().Functor0();
     const Applicative0 = Monad0.Applicative0();
-    const traverse2 = traversableList.traverse(Applicative0);
-    const traverse3 = traversablePair.traverse(Applicative0);
+    const traverse3 = traversableList.traverse(Applicative0);
+    const traverse4 = traversablePair.traverse(Applicative0);
     const sequence2 = traversableArray.traverse(Applicative0)(identity5);
     return (dictLoadFile) => (v) => (v1) => (v2) => {
       if (v1.tag === "Var") {
@@ -40164,7 +40211,7 @@ var $$eval = (dictMonadWithGraphAlloc) => {
       if (v1.tag === "Dictionary") {
         const $1 = v1._2;
         const $2 = v1._1;
-        return Bind1.bind($0.map(unzip3)(traverse2(traverse3((() => {
+        return Bind1.bind($0.map(unzip3)(traverse3(traverse4((() => {
           const $3 = $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(v);
           return (a) => $3(a)(v2);
         })()))(v1._3)))((v3) => {
@@ -40200,7 +40247,7 @@ var $$eval = (dictMonadWithGraphAlloc) => {
             return go$r;
           };
           return go(0)($3);
-        })()))(() => Bind1.bind(traverse2((() => {
+        })()))(() => Bind1.bind(traverse3((() => {
           const $5 = $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(v);
           return (a) => $5(a)(v2);
         })())($3))((vs) => new$p(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(v)(insert3(ordVertex)($4)()(v2))($2)($BaseVal("Constr", $1, vs))));
@@ -40222,7 +40269,7 @@ var $$eval = (dictMonadWithGraphAlloc) => {
             1
           )) + "); got (" + show32($Tuple($6, $7)) + ")"))(() => Bind1.bind(sequence2(arrayBind(range(1)($6))((i) => [
             sequence2(arrayBind(range(1)($7))((j) => [
-              $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity18)(v)(disjointUnion2((() => {
+              $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity19)(v)(disjointUnion2((() => {
                 const $10 = {};
                 $10[$3] = $Val($8, None, $BaseVal("Int", i));
                 return $10;
@@ -40296,7 +40343,7 @@ var $$eval = (dictMonadWithGraphAlloc) => {
         return Bind1.bind($$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(v)(v1._2)(v2))((v3) => Bind1.bind($$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(v)($2)(v2))((v$p) => Bind1.bind(apply2(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(v3)(v$p))((v4) => {
           const $3 = v4._3;
           const $4 = v4._1;
-          return Bind1.bind(evalDocOpt(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity18)(v)((() => {
+          return Bind1.bind(evalDocOpt(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity19)(v)((() => {
             const $5 = {};
             $5.this = v4;
             return $5;
@@ -40306,12 +40353,12 @@ var $$eval = (dictMonadWithGraphAlloc) => {
       if (v1.tag === "Let") {
         const $1 = v1._2;
         const $2 = v1._1._1;
-        return Bind1.bind($$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(v)(v1._1._2)(v2))((v3) => Bind1.bind(match1(v3)($2))((v4) => $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity18)(v)(v4._1))($1)(v4._2._2)));
+        return Bind1.bind($$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(v)(v1._1._2)(v2))((v3) => Bind1.bind(match1(v3)($2))((v4) => $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity19)(v)(v4._1))($1)(v4._2._2)));
       }
       if (v1.tag === "LetRec") {
         const $1 = v1._2;
         const $2 = v1._1._1;
-        return Bind1.bind(closeDefs1(v)(v1._1._2)(insert3(ordVertex)($2)()(v2)))((\u03B3$p) => $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity18)(v)(\u03B3$p))($1)(insert3(ordVertex)($2)()(v2)));
+        return Bind1.bind(closeDefs1(v)(v1._1._2)(insert3(ordVertex)($2)()(v2)))((\u03B3$p) => $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity19)(v)(\u03B3$p))($1)(insert3(ordVertex)($2)()(v2)));
       }
       fail();
     };
@@ -40323,7 +40370,7 @@ var concatDocs = (dictMonadWithGraphAlloc) => (dictMonadReader) => {
     const $0 = v._3;
     const $1 = v._2;
     const $2 = v._1;
-    return Monad0.Bind1().bind(evalDocOpt(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity18)(\u03B3)((() => {
+    return Monad0.Bind1().bind(evalDocOpt(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity19)(\u03B3)((() => {
       const $3 = {};
       $3.this = $Val($2, None, $0);
       return $3;
@@ -40345,7 +40392,7 @@ var apply2 = (dictMonadWithGraphAlloc) => {
           const $1 = v._1;
           const $2 = v._3._1._1;
           const $3 = v._3._1._3;
-          return Bind1.bind(closeDefs1($2)(v._3._1._2)($$$Map("Two", Leaf2, $1, void 0, Leaf2)))((\u03B32) => Bind1.bind(match1(v1)($3))((v3) => $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity18)(unionWith((v$1) => identity18)($2)(\u03B32))(v3._1))(v3._2._1.tag === "ContExpr" ? v3._2._1._1 : throwException(error("Expression expected"))())(insert3(ordVertex)($1)()(v3._2._2))));
+          return Bind1.bind(closeDefs1($2)(v._3._1._2)($$$Map("Two", Leaf2, $1, void 0, Leaf2)))((\u03B32) => Bind1.bind(match1(v1)($3))((v3) => $$eval(dictMonadWithGraphAlloc)(dictMonadReader)(dictLoadFile)(unionWith((v$1) => identity19)(unionWith((v$1) => identity19)($2)(\u03B32))(v3._1))(v3._2._1.tag === "ContExpr" ? v3._2._1._1 : throwException(error("Expression expected"))())(insert3(ordVertex)($1)()(v3._2._2))));
         }
         if (v._3._1.tag === "Foreign") {
           const $1 = v._3._1._1._2;
@@ -40465,11 +40512,11 @@ var eval_module = (dictMonadWithGraphAlloc) => {
             if (v1._1.tag === "Left") {
               const $1 = v1._2;
               const $2 = v1._1._1._1;
-              return $0.bind(eval3(unionWith((v$1) => identity18)(\u03B3)(v))(v1._1._1._2)(v2))((v3) => $0.bind(match1(v3)($2))((v4) => go(unionWith((v$1) => identity18)(v)(v4._1))($1)(v4._2._2)));
+              return $0.bind(eval3(unionWith((v$1) => identity19)(\u03B3)(v))(v1._1._1._2)(v2))((v3) => $0.bind(match1(v3)($2))((v4) => go(unionWith((v$1) => identity19)(v)(v4._1))($1)(v4._2._2)));
             }
             if (v1._1.tag === "Right") {
               const $1 = v1._2;
-              return $0.bind(closeDefs1(unionWith((v$1) => identity18)(\u03B3)(v))(v1._1._1._2)(insert3(ordVertex)(v1._1._1._1)()(v2)))((\u03B3$p$p) => go(unionWith((v$1) => identity18)(v)(\u03B3$p$p))($1)(v2));
+              return $0.bind(closeDefs1(unionWith((v$1) => identity19)(\u03B3)(v))(v1._1._1._2)(insert3(ordVertex)(v1._1._1._1)()(v2)))((\u03B3$p$p) => go(unionWith((v$1) => identity19)(v)(\u03B3$p$p))($1)(v2));
             }
           }
           fail();
@@ -40492,14 +40539,87 @@ var eval_progCxt = (dictMonadWithGraphAlloc) => {
     return (dictLoadFile) => {
       const eval_module3 = eval_module2(dictLoadFile);
       const eval3 = eval2(dictLoadFile);
-      return (v) => concatM1(foldableList.foldr(Cons)(listMap((v1) => (\u03B3) => {
-        const $2 = v1._1;
-        return $0.bind(eval3(\u03B3)(v1._2)(setSet4.empty))((v2) => $1.pure(unionWith((v$1) => identity18)(\u03B3)((() => {
-          const $3 = {};
-          $3[$2] = v2;
-          return $3;
-        })())));
-      })(reverse2(v.datasets)))(listMap((mod) => (\u03B3) => $0.bind(eval_module3(\u03B3)(mod)(setSet4.empty))((\u03B3$p) => $1.pure(unionWith((v$1) => identity18)(\u03B3)(\u03B3$p))))(reverse2(v.mods))))(v.primitives);
+      return (v) => (v1) => {
+        const $2 = v.datasets;
+        const $3 = v1.graph;
+        const $4 = v1.modules;
+        const $5 = v.primitives;
+        const $6 = v1.roots;
+        return $0.bind(foldM3(Monad0)((\u03B3s) => (name3) => {
+          const v2 = definitely("deps evaluated")((() => {
+            const $7 = lookup2(ordString)(name3)($3);
+            if ($7.tag === "Just") {
+              const $8 = traverse2((dep) => lookup2(ordString)(dep)(\u03B3s))($7._1);
+              if ($8.tag === "Just") {
+                const $9 = lookup2(ordString)(name3)($4);
+                if ($9.tag === "Just") {
+                  return $Maybe("Just", $Tuple($9._1, $8._1));
+                }
+                if ($9.tag === "Nothing") {
+                  return Nothing;
+                }
+                fail();
+              }
+              if ($8.tag === "Nothing") {
+                return Nothing;
+              }
+              fail();
+            }
+            if ($7.tag === "Nothing") {
+              return Nothing;
+            }
+            fail();
+          })());
+          return $0.bind(eval_module3((() => {
+            const go = (go$a0$copy) => (go$a1$copy) => {
+              let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
+              while (go$c) {
+                const b = go$a0, v$1 = go$a1;
+                if (v$1.tag === "Nil") {
+                  go$c = false;
+                  go$r = b;
+                  continue;
+                }
+                if (v$1.tag === "Cons") {
+                  go$a0 = unionWith((v$2) => identity19)(b)(v$1._1);
+                  go$a1 = v$1._2;
+                  continue;
+                }
+                fail();
+              }
+              return go$r;
+            };
+            return go($5)(v2._2);
+          })())(v2._1)(setSet4.empty))((\u03B3$p) => $1.pure(insert3(ordString)(name3)(\u03B3$p)(\u03B3s)));
+        })(Leaf2)(v1.topsorted))((\u03B3s) => {
+          const go = (go$a0$copy) => (go$a1$copy) => {
+            let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
+            while (go$c) {
+              const b = go$a0, v$1 = go$a1;
+              if (v$1.tag === "Nil") {
+                go$c = false;
+                go$r = b;
+                continue;
+              }
+              if (v$1.tag === "Cons") {
+                go$a0 = unionWith((v$2) => identity19)(b)(v$1._1);
+                go$a1 = v$1._2;
+                continue;
+              }
+              fail();
+            }
+            return go$r;
+          };
+          return concatM1(listMap((v2) => (\u03B3) => {
+            const $7 = v2._1;
+            return $0.bind(eval3(\u03B3)(v2._2)(setSet4.empty))((v3) => $1.pure(unionWith((v$1) => identity19)(\u03B3)((() => {
+              const $8 = {};
+              $8[$7] = v3;
+              return $8;
+            })())));
+          })(reverse2($2)))(go($5)(listMap((dep) => definitely("has env")(lookup2(ordString)(dep)(\u03B3s)))($6)));
+        });
+      };
     };
   };
 };
@@ -40519,17 +40639,14 @@ var graphEval = (dictMonadAff) => {
     const monadReaderStateT2 = monadReaderStateT(monadReaderStateT(dictMonadReader));
     return (dictLoadFile) => (dictMonadError) => {
       const eval1 = $$eval(monadWithGraphAllocWithGr(dictMonadError))(monadReaderStateT2)((() => {
-        const loadFile1 = dictLoadFile.loadFile(dictMonadError)(dictMonadAff);
+        const loadFileFromPath1 = dictLoadFile.loadFileFromPath(dictMonadError)(dictMonadAff);
         return {
-          loadFile: (dictMonadError1) => (dictMonadAff1) => (folders) => {
-            const $3 = loadFile1(folders);
-            return (x2) => {
-              const $4 = $3(x2);
-              return (s) => $1.Bind1().bind((s$1) => $2.Bind1().bind($4)((x$1) => $2.Applicative0().pure($Tuple(x$1, s$1))))((x$1) => $1.Applicative0().pure($Tuple(
-                x$1,
-                s
-              )));
-            };
+          loadFileFromPath: (dictMonadError1) => (dictMonadAff1) => (x2) => {
+            const $3 = loadFileFromPath1(x2);
+            return (s) => $1.Bind1().bind((s$1) => $2.Bind1().bind($3)((x$1) => $2.Applicative0().pure($Tuple(x$1, s$1))))((x$1) => $1.Applicative0().pure($Tuple(
+              x$1,
+              s
+            )));
           }
         };
       })());
@@ -40560,6 +40677,87 @@ var graphEval = (dictMonadAff) => {
   };
 };
 
+// output-es/File/index.js
+var bindExceptT2 = /* @__PURE__ */ bindExceptT(monadAff);
+var applicativeExceptT2 = /* @__PURE__ */ applicativeExceptT(monadAff);
+var Folder = (x2) => x2;
+var show4 = /* @__PURE__ */ showArrayImpl(showStringImpl);
+var loadFileAff = {
+  loadFileFromPath: (dictMonadError) => (dictMonadAff) => (v) => _bind(bindExceptT2.bind(dictMonadAff.liftAff(_bind(request(driver)({
+    method: $Either("Left", HEAD),
+    url: v,
+    headers: [],
+    content: Nothing,
+    username: Nothing,
+    password: Nothing,
+    withCredentials: false,
+    responseFormat: $ResponseFormat("String", identity),
+    timeout: Nothing
+  }))((resp) => _pure((() => {
+    if (resp.tag === "Right") {
+      if (resp._1.status === 200) {
+        return $Either("Right", $Tuple(resp._1, v));
+      }
+      return $Either("Left", RequestFailedError);
+    }
+    if (resp.tag === "Left") {
+      return $Either("Left", resp._1);
+    }
+    fail();
+  })()))))((v1) => {
+    const $0 = v1._2;
+    return bindExceptT2.bind(applicativeExceptT2.pure())(() => bindExceptT2.bind(dictMonadAff.liftAff(request(driver)({
+      method: $Either("Left", GET),
+      url: $0,
+      headers: [],
+      content: Nothing,
+      username: Nothing,
+      password: Nothing,
+      withCredentials: false,
+      responseFormat: $ResponseFormat("String", identity),
+      timeout: Nothing
+    })))((contents) => applicativeExceptT2.pure(contents.body)));
+  }))((result) => _pure((() => {
+    if (result.tag === "Left") {
+      return Nothing;
+    }
+    if (result.tag === "Right") {
+      return $Maybe("Just", result._1);
+    }
+    fail();
+  })()))
+};
+var prependFolder = (v) => (v1) => v + "/" + v1;
+var loadFile = (dictLoadFile) => (dictMonad) => {
+  const $0 = dictMonad.Applicative0();
+  return (dictMonadError) => {
+    const loadFileFromPath2 = dictLoadFile.loadFileFromPath(dictMonadError);
+    return (dictMonadAff) => {
+      const loadFileFromPath3 = loadFileFromPath2(dictMonadAff);
+      return (folders) => (file) => {
+        const paths = arrayApply(arrayMap(prependFolder)(folders))([file]);
+        return dictMonad.Bind1().bind(foldM(dictMonad)((v) => (v1) => {
+          if (v.tag === "Just") {
+            return $0.pure($Maybe("Just", v._1));
+          }
+          if (v.tag === "Nothing") {
+            return loadFileFromPath3(v1);
+          }
+          fail();
+        })(Nothing)(paths))((result) => {
+          if (result.tag === "Just") {
+            return $0.pure(result._1);
+          }
+          if (result.tag === "Nothing") {
+            return throwException(error("File not found in any path: " + show4(paths)))();
+          }
+          fail();
+        });
+      };
+    };
+  };
+};
+
 // output-es/Data.CodePoint.Unicode/index.js
 var isUpper = (x2) => checkAttr([512, 524288])(x2);
 var isSpace = (c) => {
@@ -40721,7 +40919,7 @@ var toLowerSimple = /* @__PURE__ */ convert(uTowlower);
 var toUpperSimple = /* @__PURE__ */ convert(uTowupper);
 
 // output-es/Parsing.Token/index.js
-var identity30 = (x2) => x2;
+var identity31 = (x2) => x2;
 var choice3 = /* @__PURE__ */ choice(foldableArray);
 var toUnfoldable15 = /* @__PURE__ */ toUnfoldable2(unfoldableArray);
 var theReservedNames = (v) => {
@@ -41034,10 +41232,10 @@ var makeTokenParser = (v) => {
                 if ($132) {
                   return $42(v4$1, $122);
                 }
-                return $52(v2, identity30);
+                return $52(v2, identity31);
               });
             },
-            (state2, a) => $22((v2$1) => $52(state2, identity30))
+            (state2, a) => $22((v2$1) => $52(state2, identity31))
           )));
         });
       },
@@ -42303,7 +42501,7 @@ var onlyIf = (b) => (a) => {
 };
 var choose2 = /* @__PURE__ */ choose(altParserT);
 var fanin3 = /* @__PURE__ */ fanin(categoryFn)(choiceFn);
-var identity31 = (x2) => x2;
+var identity32 = (x2) => x2;
 var operators = (binaryOp) => fromFoldable20(listMap(arrayMap((v) => $Operator(
   "Infix",
   (() => {
@@ -42327,6 +42525,10 @@ var operators = (binaryOp) => fromFoldable20(listMap(arrayMap((v) => $Operator(
   }
   fail();
 })(foldableMap.foldr(Cons)(Nil)(opDefs))))));
+var letters = ($$char) => {
+  const $0 = some(alternativeParserT)(lazyParserT)($$char);
+  return (state1, more, lift12, $$throw2, done) => more((v1) => $0(state1, more, lift12, $$throw2, (state2, a) => more((v2) => done(state2, fromCharArray(a)))));
+};
 var languageDef = /* @__PURE__ */ (() => {
   const opChar = oneOf([":", "!", "#", "$", "%", "&", "*", "+", ".", "/", "<", "=", ">", "?", "@", "\\", "^", "|", "-", "~"]);
   return {
@@ -42380,7 +42582,7 @@ var languageDef = /* @__PURE__ */ (() => {
     })(),
     opStart: opChar,
     opLetter: opChar,
-    reservedNames: ["as", "else", "fun", "if", "in", "let", "match", "then"],
+    reservedNames: ["as", "else", "fun", "if", "in", "let", "match", "then", "import"],
     reservedOpNames: ["|", "..", "=", "<-", "->"],
     caseSensitive: true
   };
@@ -42415,6 +42617,34 @@ var keyword2 = (str$p) => {
   }
   return throwException(error(str$p + " is not a reserved word"))();
 };
+var imports_ = /* @__PURE__ */ manyRec2(/* @__PURE__ */ (() => {
+  const $0 = keyword2("import");
+  const $1 = joinWith("/");
+  const $2 = sepBy1(token.identifier)(token.reservedOp("."));
+  return (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => $0(
+    state1,
+    more,
+    lift12,
+    $$throw2,
+    (state2, a) => more((v2$1) => more((v3) => more((v1$1) => $2(
+      state2,
+      more,
+      lift12,
+      $$throw2,
+      (state2$1, a$1) => more((v2$2) => {
+        const $3 = $1(fromFoldable111(a$1));
+        return more((v4) => done(state2$1, $3));
+      })
+    ))))
+  )));
+})());
+var withImports = (p) => topLevel((state1, more, lift12, $$throw2, done) => more((v1) => imports_(
+  state1,
+  more,
+  lift12,
+  $$throw2,
+  (state2, a) => more((v2) => more((v1$1) => p(state2, more, lift12, $$throw2, (state2$1, a$1) => more((v2$1) => done(state2$1, $Tuple(a$1, a))))))
+)));
 var ident = (state1, more, lift12, $$throw2, done) => more((v1) => token.identifier(
   state1,
   more,
@@ -42716,17 +42946,8 @@ var varDefs = (expr$p) => {
   )));
 };
 var commentToken = /* @__PURE__ */ (() => {
-  const $0 = some(alternativeParserT)(lazyParserT)(docCommentLetter);
-  return (state1, more, lift12, $$throw2, done) => more((v1) => more((v1$1) => $0(
-    state1,
-    more,
-    lift12,
-    $$throw2,
-    (state2, a) => more((v2) => {
-      const $1 = fromCharArray(a);
-      return more((v2$1) => done(state2, $DocCommentElem("Token", $1)));
-    })
-  )));
+  const $0 = letters(docCommentLetter);
+  return (state1, more, lift12, $$throw2, done) => more((v1) => $0(state1, more, lift12, $$throw2, (state2, a) => more((v2) => done(state2, $DocCommentElem("Token", a)))));
 })();
 var commentExpr = (expr$p) => (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => string3("$")(
   state1,
@@ -43406,10 +43627,10 @@ var expr_$lazy = /* @__PURE__ */ binding(() => {
                                                         if ($47) {
                                                           return $42($ParseState(v4$5._1, v4$5._2, false), $46);
                                                         }
-                                                        return $43($ParseState($29, $30, false), identity31);
+                                                        return $43($ParseState($29, $30, false), identity32);
                                                       });
                                                     },
-                                                    (state2, a) => $25((v2$3) => $43(state2, identity31))
+                                                    (state2, a) => $25((v2$3) => $43(state2, identity32))
                                                   )));
                                                 });
                                               },
@@ -43450,10 +43671,10 @@ var expr_$lazy = /* @__PURE__ */ binding(() => {
                                                   if ($45) {
                                                     return $40($ParseState(v4$4._1, v4$4._2, false), $44);
                                                   }
-                                                  return $41($ParseState($29, $30, false), identity31);
+                                                  return $41($ParseState($29, $30, false), identity32);
                                                 });
                                               },
-                                              (state2, a) => $25((v2$3) => $41(state2, identity31))
+                                              (state2, a) => $25((v2$3) => $41(state2, identity32))
                                             )));
                                           });
                                         },
@@ -43797,25 +44018,19 @@ var expr_$lazy = /* @__PURE__ */ binding(() => {
   return go;
 });
 var expr_ = /* @__PURE__ */ expr_$lazy();
-var module_ = /* @__PURE__ */ (() => {
-  const $0 = topLevel((() => {
-    const $02 = sepBy_try(defs(expr_))(token.semi);
-    return (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => $02(
-      state1,
-      more,
-      lift12,
-      $$throw2,
-      (state2, a) => more((v2$1) => more((v3) => token.semi(state2, more, lift12, $$throw2, (state3, a$1) => more((v4) => done(state3, a)))))
-    )));
-  })());
-  return (state1, more, lift12, $$throw2, done) => more((v1) => $0(
+var module_ = /* @__PURE__ */ withImports(/* @__PURE__ */ (() => {
+  const $0 = sepBy_try(defs(expr_))(token.semi);
+  return (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => more((v1$1) => $0(
     state1,
     more,
     lift12,
     $$throw2,
-    (state2, a) => more((v2) => done(state2, $Module(bindList.bind(a)(identity13))))
-  ));
-})();
+    (state2, a) => more((v2$1) => {
+      const $1 = $Module(bindList.bind(a)(identity13));
+      return more((v2$2) => more((v3) => token.semi(state2, more, lift12, $$throw2, (state3, a$1) => more((v4) => done(state3, $1)))));
+    })
+  ))));
+})());
 
 // output-es/Primitive.Defs/index.js
 var foldM4 = (dictMonad) => (f) => (b0) => foldableDict.foldl((b) => (a) => dictMonad.Bind1().bind(b)((a$1) => f(a$1)(a)))(dictMonad.Applicative0().pure(b0));
@@ -43997,7 +44212,7 @@ var dict_intersectionWith = /* @__PURE__ */ $Tuple(
                 const $1 = v._1;
                 const $2 = v._2._1._1;
                 const $3 = v._2._2._1._1;
-                return Bind1.bind($0.map(Dictionary3)($0.map(DictRep)(traversableDict.traverse(Applicative0)(identity19)(intersectionWith_Object((v2) => (v3) => {
+                return Bind1.bind($0.map(Dictionary3)($0.map(DictRep)(traversableDict.traverse(Applicative0)(identity20)(intersectionWith_Object((v2) => (v3) => {
                   const $4 = v3._2;
                   const $5 = v2._1;
                   const $6 = v3._1;
@@ -44218,7 +44433,7 @@ var unions4 = /* @__PURE__ */ (() => {
   };
   return go(Leaf2);
 })();
-var identity32 = (x2) => x2;
+var identity33 = (x2) => x2;
 var verticesProgCxtVertex = {
   vertices: (v) => union7(unions13(listMap(verticesValVertex.vertices)(mapObjectString.values(v.primitives))))(union7(unions4(listMap(verticesModuleVertex.vertices)(v.mods)))(unions4(listMap((x2) => verticesExprVertex.vertices(x2._2))(v.datasets))))
 };
@@ -44295,13 +44510,47 @@ var traversableProgCxt = {
     const traverse9 = traversableEnv.traverse(dictApplicative);
     return (f) => (m) => Apply0.apply(Apply0.apply(Apply0.Functor0().map((v1) => (v2) => (v3) => ({ primitives: v3, mods: v2, datasets: v1 }))(traverse5(traversableTuple.traverse(dictApplicative)(traverse7(f)))(m.datasets)))(traverse5(traverse8(f))(m.mods)))(traverse9(f)(m.primitives));
   },
-  sequence: (dictApplicative) => (v) => traversableProgCxt.traverse(dictApplicative)(identity32)(v),
+  sequence: (dictApplicative) => (v) => traversableProgCxt.traverse(dictApplicative)(identity33)(v),
   Functor0: () => functorProgCxt,
   Foldable1: () => foldableProgCxt
 };
 
 // output-es/Module/index.js
+var all3 = /* @__PURE__ */ (() => foldableList.foldMap((() => {
+  const semigroupConj1 = { append: (v) => (v1) => v && v1 };
+  return { mempty: true, Semigroup0: () => semigroupConj1 };
+})()))();
+var elem2 = /* @__PURE__ */ (() => {
+  const any1 = foldableList.foldMap((() => {
+    const semigroupDisj1 = { append: (v) => (v1) => v || v1 };
+    return { mempty: false, Semigroup0: () => semigroupDisj1 };
+  })());
+  return (x2) => any1(($0) => x2 === $0);
+})();
+var fromFoldable21 = /* @__PURE__ */ (() => foldableSet.foldr(Cons)(Nil))();
 var boundedLattice2 = { BoundedJoinSemilattice0: () => boundedJoinSemilatticeUni, BoundedMeetSemilattice1: () => boundedMeetSemilatticeUni };
+var unions5 = /* @__PURE__ */ (() => {
+  const go = (go$a0$copy) => (go$a1$copy) => {
+    let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
+    while (go$c) {
+      const b = go$a0, v = go$a1;
+      if (v.tag === "Nil") {
+        go$c = false;
+        go$r = b;
+        continue;
+      }
+      if (v.tag === "Cons") {
+        go$a0 = unionWith2(ordDVertex$p)($$const)(b)(v._1);
+        go$a1 = v._2;
+        continue;
+      }
+      fail();
+    }
+    return go$r;
+  };
+  return go(Leaf2);
+})();
+var union8 = /* @__PURE__ */ (() => setSet(ordDVertex$p).union)();
 var concatM2 = (dictMonad) => foldrArray((() => {
   const $0 = dictMonad.Bind1();
   return (f) => (g) => (a) => $0.bind(f(a))(g);
@@ -44323,38 +44572,105 @@ var parse = (dictMonadError) => {
     };
   };
 };
-var parseProgram = (dictLoadFile) => (folders) => (file) => (dictMonadAff) => (dictMonadError) => dictMonadAff.MonadEffect0().Monad0().Bind1().bind(dictLoadFile.loadFile(dictMonadError)(dictMonadAff)(folders)(file))((() => {
-  const $0 = parse(dictMonadError);
-  return (a) => $0(a)(topLevel(expr_));
-})());
-var module_2 = (dictMonadAff) => {
+var loadModuleGraph = (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
-  const Bind1 = Monad0.Bind1();
-  const Applicative0 = Monad0.Applicative0();
+  const $0 = Monad0.Bind1();
+  const $1 = Monad0.Applicative0();
   return (dictMonadError) => {
     const parse1 = parse(dictMonadError);
     const desugarModuleFwd = moduleFwd(dictMonadError)(boundedLattice2);
-    return (dictLoadFile) => {
-      const loadFile = dictLoadFile.loadFile(dictMonadError)(dictMonadAff);
-      return (folders) => (file) => (v) => {
-        const $0 = v.mods;
-        return Bind1.bind(Applicative0.pure())(() => Bind1.bind(loadFile(folders)(file))((src) => Bind1.bind(Bind1.bind(parse1(src)(module_))(desugarModuleFwd))((mod) => Applicative0.pure({
-          primitives: v.primitives,
-          mods: $List("Cons", mod, $0),
-          datasets: v.datasets
-        }))));
+    return (dictMonadReader) => {
+      const ask = dictMonadReader.MonadAsk0().ask;
+      return (dictLoadFile) => {
+        const loadFile2 = loadFile(dictLoadFile)(Monad0)(dictMonadError)(dictMonadAff);
+        return (roots) => {
+          const collectModules = (visited) => (graph) => (modules) => (imports) => {
+            if (imports.tag === "Nil") {
+              return $1.pure($Tuple(graph, modules));
+            }
+            if (imports.tag === "Cons") {
+              if ((() => {
+                const $2 = lookup2(ordString)(imports._1)(visited);
+                if ($2.tag === "Nothing") {
+                  return false;
+                }
+                if ($2.tag === "Just") {
+                  return true;
+                }
+                fail();
+              })()) {
+                return collectModules(visited)(graph)(modules)(imports._2);
+              }
+              return $0.bind($0.bind(ask)((v) => $0.bind(loadFile2(v.fluidSrcPaths)(imports._1 + ".fld"))((src) => $0.bind(parse1(src)(module_))((v1) => {
+                const $2 = v1._2;
+                return $0.bind(desugarModuleFwd(v1._1))((mod$p) => $1.pure($Tuple(
+                  mod$p,
+                  imports._1 === "lib/prelude" ? $2 : $List("Cons", "lib/prelude", $2)
+                )));
+              }))))((v) => collectModules(insert3(ordString)(imports._1)()(visited))(insert3(ordString)(imports._1)(v._2)(graph))(insert3(ordString)(imports._1)(v._1)(modules))(foldableList.foldr(Cons)(imports._2)(v._2)));
+            }
+            fail();
+          };
+          return $0.bind(collectModules(Leaf2)(Leaf2)(Leaf2)(roots))((v) => {
+            const $2 = v._1;
+            return $1.pure({
+              roots,
+              topsorted: (() => {
+                const go = (go$a0$copy) => (go$a1$copy) => {
+                  let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
+                  while (go$c) {
+                    const v$1 = go$a0, v1 = go$a1;
+                    if (v$1.tag === "Nil") {
+                      go$c = false;
+                      go$r = reverse2(v1);
+                      continue;
+                    }
+                    const v2 = find(foldableList)((mod) => {
+                      const v22 = lookup2(ordString)(mod)($2);
+                      if (v22.tag === "Nothing") {
+                        return true;
+                      }
+                      if (v22.tag === "Just") {
+                        return all3((dep) => !elem2(dep)(v$1))(v22._1);
+                      }
+                      fail();
+                    })(v$1);
+                    if (v2.tag === "Nothing") {
+                      go$c = false;
+                      go$r = throwException(error("Modules contain circular imports"))();
+                      continue;
+                    }
+                    if (v2.tag === "Just") {
+                      go$a0 = deleteBy2(eqStringImpl)(v2._1)(v$1);
+                      go$a1 = $List("Cons", v2._1, v1);
+                      continue;
+                    }
+                    fail();
+                  }
+                  return go$r;
+                };
+                return go(fromFoldable21(functorMap.map((v$1) => {
+                })($2)))(Nil);
+              })(),
+              graph: $2,
+              modules: v._2
+            });
+          });
+        };
       };
     };
   };
 };
 var initialConfig = (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
-  const Bind1 = Monad0.Bind1();
-  const Applicative0 = Monad0.Applicative0();
-  const $0 = monadAllocAllocT(Monad0);
-  const fresh1 = $0.fresh;
-  const alloc = traversableProgCxt.traverse($0.Monad0().Applicative0())((v) => fresh1);
-  const $1 = bindStateT(Monad0);
+  const $0 = bindStateT(Monad0);
+  const $1 = monadAllocAllocT(Monad0);
+  const Applicative0 = $1.Monad0().Applicative0();
+  const fresh1 = $1.fresh;
+  const alloc1 = traversableProgCxt.traverse(Applicative0)((v) => fresh1);
+  const applicativeStateT2 = applicativeStateT(Monad0);
+  const traverse1 = traversableMap.traverse(applicativeStateT2);
+  const alloc2 = traversableModule.traverse(Applicative0)((v) => fresh1);
   const runWithGraphT_spy2 = runWithGraphT_spy({
     Applicative0: () => applicativeStateT(Monad0),
     Bind1: () => bindStateT(Monad0)
@@ -44367,30 +44683,35 @@ var initialConfig = (dictMonadAff) => {
       const eval_progCxt1 = eval_progCxt2(monadReaderStateT(monadReaderStateT(dictMonadReader)));
       return (dictLoadFile) => {
         const eval_progCxt22 = eval_progCxt1((() => {
-          const loadFile1 = dictLoadFile.loadFile(dictMonadError)(dictMonadAff);
+          const loadFileFromPath1 = dictLoadFile.loadFileFromPath(dictMonadError)(dictMonadAff);
           return {
-            loadFile: (dictMonadError1) => (dictMonadAff1) => (folders) => {
-              const $4 = loadFile1(folders);
-              return (x2) => {
-                const $5 = $4(x2);
-                return (s) => $2.Bind1().bind((s$1) => $3.Bind1().bind($5)((x$1) => $3.Applicative0().pure($Tuple(x$1, s$1))))((x$1) => $2.Applicative0().pure($Tuple(
-                  x$1,
-                  s
-                )));
-              };
+            loadFileFromPath: (dictMonadError1) => (dictMonadAff1) => (x2) => {
+              const $4 = loadFileFromPath1(x2);
+              return (s) => $2.Bind1().bind((s$1) => $3.Bind1().bind($4)((x$1) => $3.Applicative0().pure($Tuple(x$1, s$1))))((x$1) => $2.Applicative0().pure($Tuple(
+                x$1,
+                s
+              )));
             }
           };
         })());
-        return (dictFV) => (e) => (progCxt) => Bind1.bind(Applicative0.pure())(() => Bind1.bind(runAllocT(Monad0)($1.bind(alloc(progCxt))((progCxt$p) => $1.bind(runWithGraphT_spy2(eval_progCxt22(progCxt$p))(verticesProgCxtVertex.vertices(progCxt$p)))((v) => applicativeStateT(Monad0).pure($Tuple(
+        return (dictFV) => (e) => (progCxt) => (moduleCxt) => Monad0.Bind1().bind(runAllocT(Monad0)($0.bind(alloc1(progCxt))((progCxt$p) => $0.bind(traverse1(alloc2)(moduleCxt.modules))((modules$p) => $0.bind(runWithGraphT_spy2(eval_progCxt22(progCxt$p)({
+          modules: modules$p,
+          graph: moduleCxt.graph,
+          roots: moduleCxt.roots,
+          topsorted: moduleCxt.topsorted
+        }))(union8(verticesProgCxtVertex.vertices(progCxt$p))(unions5(listMap(verticesModuleVertex.vertices)(foldableMap.foldr(Cons)(Nil)(modules$p))))))((v) => applicativeStateT2.pure($Tuple(
           progCxt$p,
-          (() => {
-            const $4 = dictFV.fv(e);
-            return filterWithKey((x2) => {
-              const $5 = setSet(ordString).member(x2)($4);
-              return (v$1) => $5;
-            })(v._2);
-          })()
-        )))))(0))((v) => Applicative0.pure({ n: v._1, progCxt: v._2._2._1, "\u03B3": v._2._2._2 })));
+          $Tuple(
+            modules$p,
+            (() => {
+              const $4 = dictFV.fv(e);
+              return filterWithKey((x2) => {
+                const $5 = setSet(ordString).member(x2)($4);
+                return (v$1) => $5;
+              })(v._2);
+            })()
+          )
+        ))))))(0))((v) => Monad0.Applicative0().pure({ n: v._1, progCxt: v._2._2._1, "\u03B3": v._2._2._2._2 }));
       };
     };
   };
@@ -44398,37 +44719,46 @@ var initialConfig = (dictMonadAff) => {
 var prepConfig = (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
   const $0 = Monad0.Bind1();
+  const loadModuleGraph1 = loadModuleGraph(dictMonadAff);
   const initialConfig1 = initialConfig(dictMonadAff);
   return (dictMonadError) => {
+    const loadModuleGraph2 = loadModuleGraph1(dictMonadError);
     const desug1 = exprFwd(boundedLattice2)(dictMonadError)(joinSemilatticeUnit);
     const initialConfig2 = initialConfig1(dictMonadError);
     return (dictMonadReader) => {
-      const ask = dictMonadReader.MonadAsk0().ask;
+      const loadModuleGraph3 = loadModuleGraph2(dictMonadReader);
       const initialConfig3 = initialConfig2(dictMonadReader);
       return (dictLoadFile) => {
+        const loadModuleGraph4 = loadModuleGraph3(dictLoadFile);
         const initialConfig4 = initialConfig3(dictLoadFile)(fVExpr);
-        return (file) => (progCxt) => $0.bind(ask)((v) => $0.bind(parseProgram(dictLoadFile)(v.fluidSrcPaths)(file)(dictMonadAff)(dictMonadError))((s) => $0.bind(desug1(s))((e) => $0.bind(initialConfig4(e)(progCxt))((gconfig) => Monad0.Applicative0().pure({
-          s,
-          e,
-          gconfig
-        })))));
+        return (progCxt) => (fluidSrc) => $0.bind(parse(dictMonadError)(fluidSrc)(withImports(expr_)))((v) => {
+          const $1 = v._1;
+          return $0.bind(loadModuleGraph4($List("Cons", "lib/prelude", v._2)))((moduleCxt) => $0.bind(desug1($1))((e) => $0.bind(initialConfig4(e)(progCxt)(moduleCxt))((gconfig) => Monad0.Applicative0().pure({
+            s: $1,
+            e,
+            gconfig
+          }))));
+        });
       };
     };
   };
 };
 var datasetAs = (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
-  const $0 = Monad0.Bind1();
+  const Bind1 = Monad0.Bind1();
   return (dictMonadError) => {
     const desug1 = exprFwd(boundedLattice2)(dictMonadError)(joinSemilatticeUnit);
-    return (dictLoadFile) => (folders) => (v) => (v1) => {
-      const $1 = v1.datasets;
-      const $2 = v._1;
-      return $0.bind($0.bind(parseProgram(dictLoadFile)(folders)(v._2)(dictMonadAff)(dictMonadError))(desug1))((e\u03B1) => Monad0.Applicative0().pure({
-        primitives: v1.primitives,
-        mods: v1.mods,
-        datasets: $List("Cons", $Tuple($2, e\u03B1), $1)
-      }));
+    return (dictLoadFile) => {
+      const loadFile2 = loadFile(dictLoadFile)(Monad0)(dictMonadError)(dictMonadAff);
+      return (folders) => (v) => (v1) => {
+        const $0 = v1.datasets;
+        const $1 = v._1;
+        return Bind1.bind(loadFile2(folders)(v._2))((src) => Bind1.bind(Bind1.bind(Bind1.Apply0().Functor0().map(fst)(parse(dictMonadError)(src)(withImports(expr_))))(desug1))((e\u03B1) => Monad0.Applicative0().pure({
+          primitives: v1.primitives,
+          mods: v1.mods,
+          datasets: $List("Cons", $Tuple($1, e\u03B1), $0)
+        })));
+      };
     };
   };
 };
@@ -44436,21 +44766,18 @@ var loadProgCxt = (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
   const $0 = Monad0.Bind1();
   const concatM1 = concatM2(Monad0);
-  const module_1 = module_2(dictMonadAff);
   const datasetAs1 = datasetAs(dictMonadAff);
   return (dictMonadError) => {
-    const module_22 = module_1(dictMonadError);
     const datasetAs2 = datasetAs1(dictMonadError);
     return (dictMonadReader) => {
       const ask = dictMonadReader.MonadAsk0().ask;
       return (dictLoadFile) => {
-        const module_3 = module_22(dictLoadFile);
         const datasetAs3 = datasetAs2(dictLoadFile);
-        return (mods) => (datasets) => $0.bind(ask)((v) => $0.bind($0.bind(Monad0.Applicative0().pure({
+        return (datasets) => $0.bind(ask)((v) => $0.bind(Monad0.Applicative0().pure({
           primitives,
           mods: Nil,
           datasets: Nil
-        }))(concatM1(arrayMap(module_3(v.fluidSrcPaths))(["lib/prelude", ...mods]))))(concatM1(arrayMap((() => {
+        }))(concatM1(arrayMap((() => {
           const $1 = datasetAs3(v.fluidSrcPaths);
           return (x2) => $1($Tuple(x2._1, x2._2));
         })())(datasets))));
@@ -44460,12 +44787,12 @@ var loadProgCxt = (dictMonadAff) => {
 };
 
 // output-es/App.Fig/index.js
-var fromFoldable21 = /* @__PURE__ */ fromFoldable(foldableSet);
+var fromFoldable25 = /* @__PURE__ */ fromFoldable(foldableSet);
 var ordVal2 = /* @__PURE__ */ ordVal(ordVertex);
 var botOf2 = /* @__PURE__ */ (() => ({ botOf: functorSelStates.map((v) => false) }))();
 var select\u{1D539}s = /* @__PURE__ */ (() => select\u03B1s\u{1D539}Vertex(applyVal)(foldableVal)["select\u{1D539}s"])();
 var fromFoldable112 = /* @__PURE__ */ fromFoldable(foldableDict);
-var fromFoldable25 = /* @__PURE__ */ foldlArray((m) => (a) => insert3(ordString)(a)()(m))(Leaf2);
+var fromFoldable26 = /* @__PURE__ */ foldlArray((m) => (a) => insert3(ordString)(a)()(m))(Leaf2);
 var graphGC2 = /* @__PURE__ */ graphGC(graphGraphImpl);
 var graphGC1 = /* @__PURE__ */ graphGC2(applyVal)(applyEnvExpr)(foldableVal)(foldableEnvExpr);
 var graphGC22 = /* @__PURE__ */ graphGC2(applyEnvExpr)(applyVal)(foldableEnvExpr)(foldableVal);
@@ -44489,7 +44816,7 @@ var \u03B9from\u03B1s = (dictGraph) => (g) => {
     }
     return Nothing;
   });
-  return (x2) => fromFoldable21($0(x2));
+  return (x2) => fromFoldable25($0(x2));
 };
 var unprojExpr = (dictBoundedMeetSemilattice) => (v) => {
   const $0 = v._2;
@@ -44815,16 +45142,15 @@ var loadFig = (dictMonadAff) => {
         const loadProgCxt3 = loadProgCxt22(dictLoadFile);
         const prepConfig3 = prepConfig22(dictLoadFile);
         const graphEval22 = graphEval1(dictLoadFile)(dictMonadError);
-        return (v) => {
-          const $1 = v.file;
-          const $2 = v.inputs;
-          const $3 = v.linking;
-          return $0.bind(loadProgCxt3(v.imports)(v.datasets))((progCxt) => $0.bind(prepConfig3($1)(progCxt))((v1) => {
-            const $4 = v1.s;
+        return (v) => (fluidSrc) => {
+          const $1 = v.inputs;
+          const $2 = v.linking;
+          return $0.bind(loadProgCxt3(v.datasets))((progCxt) => $0.bind(prepConfig3(progCxt)(fluidSrc))((v1) => {
+            const $3 = v1.s;
             return $0.bind(graphEval22(v1.gconfig)(v1.e))((v2) => {
-              const $5 = v2.g;
-              const $6 = v2["out\u03B1"];
-              const $7 = v2["in\u03B1"]._1;
+              const $4 = v2.g;
+              const $5 = v2["out\u03B1"];
+              const $6 = v2["in\u03B1"]._1;
               const opEval = {
                 g: $GraphImpl({ out: v2.g._1.in_, in_: v2.g._1.out, sinks: v2.g._1.sources, sources: v2.g._1.sinks, vertices: v2.g._1.vertices }),
                 graph_fwd: v2.graph_fwd,
@@ -44832,86 +45158,86 @@ var loadFig = (dictMonadAff) => {
                 "in\u03B1": v2["out\u03B1"],
                 "out\u03B1": v2["in\u03B1"]
               };
-              const inputs$p = fromFoldable25($2);
+              const inputs$p = fromFoldable26($1);
               const v3 = functorEnvExpr.map((v$1) => {
               })(v2["in\u03B1"]);
-              const $8 = unrestrictGC(boundedMeetSemilatticeBoo)(v3._1)(inputs$p);
-              const $9 = unprojExpr(boundedMeetSemilatticeBoo)($EnvExpr(v3._1, v3._2));
-              const $10 = filterWithKey((x2) => {
-                const $102 = setSet(ordString).member(x2)(inputs$p);
-                return (v$1) => $102;
-              })($7);
-              const $11 = _fmapObject($7, functorVal.map((v$1) => false));
-              const $12 = functorVal.map((v$1) => false)($6);
+              const $7 = unrestrictGC(boundedMeetSemilatticeBoo)(v3._1)(inputs$p);
+              const $8 = unprojExpr(boundedMeetSemilatticeBoo)($EnvExpr(v3._1, v3._2));
+              const $9 = filterWithKey((x2) => {
+                const $92 = setSet(ordString).member(x2)(inputs$p);
+                return (v$1) => $92;
+              })($6);
+              const $10 = _fmapObject($6, functorVal.map((v$1) => false));
+              const $11 = functorVal.map((v$1) => false)($5);
               const graphgc_op = graphGC1(opEval);
               const graphgc = graphGC22(v2);
-              const inertFwd = verticesGraphImpl.vertices(graphgc.fwd($9.fwd($8.fwd($11)))._2);
-              const inertBwd = setSet5.difference(verticesGraphImpl.vertices($5))(verticesGraphImpl.vertices(graphgc.bwd(functorVal.map((v$1) => true)($6))._2));
-              const $13 = select\u03B1s\u{1D539}Vertex2["select\u{1D539}s"]($7)(inertBwd);
-              const $14 = select\u{1D539}s($6)(inertFwd);
-              const $15 = _fmapObject($13, functorVal.map(selState));
-              const $16 = functorVal.map(selState)($14);
-              const demands = lift1($15)((v6) => {
-                const $17 = graphgc.bwd(v6);
-                return $Tuple($8.bwd($9.bwd($17._1)), $17._2);
+              const inertFwd = verticesGraphImpl.vertices(graphgc.fwd($8.fwd($7.fwd($10)))._2);
+              const inertBwd = setSet5.difference(verticesGraphImpl.vertices($4))(verticesGraphImpl.vertices(graphgc.bwd(functorVal.map((v$1) => true)($5))._2));
+              const $12 = select\u03B1s\u{1D539}Vertex2["select\u{1D539}s"]($6)(inertBwd);
+              const $13 = select\u{1D539}s($5)(inertFwd);
+              const $14 = _fmapObject($12, functorVal.map(selState));
+              const $15 = functorVal.map(selState)($13);
+              const demands = lift1($14)((v6) => {
+                const $16 = graphgc.bwd(v6);
+                return $Tuple($7.bwd($8.bwd($16._1)), $16._2);
               });
-              const demandedBy = lift2($16)((\u03B31) => graphgc_op.bwd(deMorgan((x2) => $9.fwd($8.fwd(x2)))(\u03B31)));
+              const demandedBy = lift2($15)((\u03B31) => graphgc_op.bwd(deMorgan((x2) => $8.fwd($7.fwd(x2)))(\u03B31)));
               return Monad0.Applicative0().pure({
                 spec: v,
-                s: $4,
+                s: $3,
                 "\u03B3": intersectionWith_Object(apply)(_fmapObject(
                   intersectionWith_Object(apply)(_fmapObject(
-                    _fmapObject($13, functorVal.map(selStates)),
+                    _fmapObject($12, functorVal.map(selStates)),
                     applyVal.apply
-                  ))($11),
+                  ))($10),
                   applyVal.apply
-                ))($11),
-                v: applyVal.apply(applyVal.apply(functorVal.map(selStates)($14))($12))($12),
+                ))($10),
+                v: applyVal.apply(applyVal.apply(functorVal.map(selStates)($13))($11))($11),
                 "\u03B9": empty,
                 linkedOutputs: (selType) => (v6) => {
                   const v$p = functorVal.map(getSel(selType))(v6);
                   const v7 = demands(v$p);
-                  return $Tuple(v7._1, $Tuple($3 ? demandedBy(v7._1)._1 : v$p, verticesGraphImpl.vertices(v7._2)));
+                  return $Tuple(v7._1, $Tuple($2 ? demandedBy(v7._1)._1 : v$p, verticesGraphImpl.vertices(v7._2)));
                 },
                 linkedInputs: (selType) => (\u03B31) => {
                   const \u03B3$p = _fmapObject(\u03B31, functorVal.map(getSel(selType)));
                   const v6 = demandedBy(\u03B3$p);
-                  return $Tuple($3 ? demands(v6._1)._1 : \u03B3$p, $Tuple(v6._1, verticesGraphImpl.vertices(v6._2)));
+                  return $Tuple($2 ? demands(v6._1)._1 : \u03B3$p, $Tuple(v6._1, verticesGraphImpl.vertices(v6._2)));
                 },
                 linkIntermediates: (\u03B9) => {
                   const \u03B1s = select\u03B1s\u{1D539}Vertex2["select\u03B1s"](_fmapObject(
                     \u03B9,
                     functorVal.map((x2) => {
-                      const $17 = getSel(Transient)(x2);
-                      if ($17.tag === "Inert") {
+                      const $16 = getSel(Transient)(x2);
+                      if ($16.tag === "Inert") {
                         return false;
                       }
-                      if ($17.tag === "Reactive") {
-                        return $17._1;
+                      if ($16.tag === "Reactive") {
+                        return $16._1;
                       }
                       fail();
                     })
-                  ))(\u03B9from\u03B1s(graphGraphImpl)($5)(mapObjectString.keys(\u03B9)));
+                  ))(\u03B9from\u03B1s(graphGraphImpl)($4)(mapObjectString.keys(\u03B9)));
                   return $Tuple(
-                    intersectionWith_Object(apply)(_fmapObject($15, applyVal.apply))(select\u03B1s\u{1D539}Vertex2["select\u{1D539}s"]($7)(verticesGraphImpl.vertices(bwdSlice3($Tuple(
+                    intersectionWith_Object(apply)(_fmapObject($14, applyVal.apply))(select\u03B1s\u{1D539}Vertex2["select\u{1D539}s"]($6)(verticesGraphImpl.vertices(bwdSlice3($Tuple(
                       \u03B1s,
                       v2.g
                     ))))),
                     $Tuple(
-                      applyVal.apply($16)(select\u{1D539}s($6)(verticesGraphImpl.vertices(bwdSlice3($Tuple(\u03B1s, opEval.g))))),
+                      applyVal.apply($15)(select\u{1D539}s($5)(verticesGraphImpl.vertices(bwdSlice3($Tuple(\u03B1s, opEval.g))))),
                       map2(ordDVertex$p)((\u03B1) => $Tuple(
                         \u03B1,
-                        definitely("in graph")(_lookup(Nothing, Just, \u03B1, $5._1.out))._2
+                        definitely("in graph")(_lookup(Nothing, Just, \u03B1, $4._1.out))._2
                       ))(\u03B1s)
                     )
                   );
                 },
                 dir: { persistent: LinkedOutputs, transient: LinkedOutputs },
-                in_views: _fmapObject($10, (v$1) => Nothing),
+                in_views: _fmapObject($9, (v$1) => Nothing),
                 out_view: Nothing,
                 intermediate_views: empty,
                 in_roots: fold((z) => (v$1) => (a) => insert3(ordVertex)(a)()(z))(Leaf2)(_fmapObject(
-                  $10,
+                  $9,
                   (v6) => v6._1
                 )),
                 inerts: intersection3(inertFwd)(inertBwd)
@@ -45246,69 +45572,6 @@ var gDecodeJsonCons = (dictDecodeJsonField) => (dictGDecodeJson) => (dictIsSymbo
   }
 });
 
-// output-es/File/index.js
-var Folder = (x2) => x2;
-
-// output-es/Module.Web/index.js
-var findM = (xs) => (f) => (base2) => foldrArray((x2) => (acc) => applyAff.apply(_map(altEither.alt)(acc))(f(x2)))(_pure(base2))(xs);
-var loadFileWebT = (dictMonadThrow) => {
-  const Monad0 = dictMonadThrow.Monad0();
-  const bind1 = bindReaderT(Monad0.Bind1()).bind;
-  const monadWebT1 = monadReaderT(Monad0);
-  const bindExceptT2 = bindExceptT(monadWebT1);
-  const applicativeExceptT2 = applicativeExceptT(monadWebT1);
-  const $0 = Monad0.Applicative0();
-  return {
-    loadFile: (dictMonadError) => (dictMonadAff) => (folders) => (v) => bind1(bindExceptT2.bind(dictMonadAff.liftAff(findM(arrayMap((() => {
-      const $1 = v + ".fld";
-      return (a) => a + "/" + $1;
-    })())(folders))((v1) => _bind(request(driver)({
-      method: $Either("Left", HEAD),
-      url: v1,
-      headers: [],
-      content: Nothing,
-      username: Nothing,
-      password: Nothing,
-      withCredentials: false,
-      responseFormat: $ResponseFormat("String", identity),
-      timeout: Nothing
-    }))((resp) => _pure((() => {
-      if (resp.tag === "Right") {
-        if (resp._1.status === 200) {
-          return $Either("Right", $Tuple(resp._1, v1));
-        }
-        return $Either("Left", RequestFailedError);
-      }
-      if (resp.tag === "Left") {
-        return $Either("Left", resp._1);
-      }
-      fail();
-    })())))($Either("Left", RequestFailedError))))((v1) => {
-      const $1 = v1._2;
-      return bindExceptT2.bind(applicativeExceptT2.pure())(() => bindExceptT2.bind(dictMonadAff.liftAff(request(driver)({
-        method: $Either("Left", GET),
-        url: $1,
-        headers: [],
-        content: Nothing,
-        username: Nothing,
-        password: Nothing,
-        withCredentials: false,
-        responseFormat: $ResponseFormat("String", identity),
-        timeout: Nothing
-      })))((contents) => applicativeExceptT2.pure(contents.body)));
-    }))((result) => {
-      if (result.tag === "Left") {
-        return monadThrowReaderT(dictMonadThrow).throwError(error(printError(result._1)));
-      }
-      if (result.tag === "Right") {
-        const $1 = $0.pure(result._1);
-        return (v$1) => $1;
-      }
-      fail();
-    })
-  };
-};
-
 // output-es/App.LoadFigure/index.js
 var gDecodeJsonCons2 = /* @__PURE__ */ gDecodeJsonCons(/* @__PURE__ */ (() => {
   const $0 = decodeArray(caseJsonString($Either(
@@ -45356,39 +45619,27 @@ var decodeJson = /* @__PURE__ */ (() => decodeRecord(gDecodeJsonCons((() => {
       return Nothing;
     }
   };
-})())(gDecodeJsonCons({
-  decodeJsonField: (j) => {
-    if (j.tag === "Just") {
-      return $Maybe(
-        "Just",
-        _caseJson(
-          (v) => $Either("Left", $JsonDecodeError("TypeMismatch", "String")),
-          (v) => $Either("Left", $JsonDecodeError("TypeMismatch", "String")),
-          (v) => $Either("Left", $JsonDecodeError("TypeMismatch", "String")),
-          Right,
-          (v) => $Either("Left", $JsonDecodeError("TypeMismatch", "String")),
-          (v) => $Either("Left", $JsonDecodeError("TypeMismatch", "String")),
-          j._1
-        )
-      );
-    }
-    return Nothing;
-  }
-})(gDecodeJsonCons2(gDecodeJsonCons2(gDecodeJsonCons2(gDecodeJsonCons1(gDecodeJsonCons1(gDecodeJsonNil)({ reflectSymbol: () => "query" })()())({
+})())(gDecodeJsonCons2(gDecodeJsonCons2(gDecodeJsonCons1(gDecodeJsonCons1(gDecodeJsonNil)({ reflectSymbol: () => "query" })()())({
   reflectSymbol: () => "linking"
-})()())({ reflectSymbol: () => "inputs" })()())({ reflectSymbol: () => "imports" })()())({ reflectSymbol: () => "fluidSrcPath" })()())({ reflectSymbol: () => "file" })()())({
-  reflectSymbol: () => "datasets"
-})()())().decodeJson)();
-var monadAffWebT = /* @__PURE__ */ monadAffReader(monadAffAff);
-var monadErrorErrorWebT = /* @__PURE__ */ monadErrorReaderT(monadErrorAff);
-var loadFileWebT2 = /* @__PURE__ */ loadFileWebT(monadThrowAff);
-var loadFig2 = /* @__PURE__ */ loadFig(monadAffWebT)(monadErrorErrorWebT)(/* @__PURE__ */ monadReaderReaderT(monadAff))(loadFileWebT2);
-var loadFile$p = (folders) => (file) => (dictMonadAff) => (dictMonadError) => dictMonadAff.MonadEffect0().Monad0().Bind1().Apply0().Functor0().map((v) => $Tuple(file, v))(loadFileWebT2.loadFile(dictMonadError)(dictMonadAff)(folders)(file));
+})()())({ reflectSymbol: () => "inputs" })()())({ reflectSymbol: () => "fluidSrcPath" })()())({ reflectSymbol: () => "datasets" })()())().decodeJson)();
+var loadFig2 = /* @__PURE__ */ loadFig(/* @__PURE__ */ monadAffReader(monadAffAff))(/* @__PURE__ */ monadErrorReaderT(monadErrorAff))(/* @__PURE__ */ monadReaderReaderT(monadAff))({
+  loadFileFromPath: (dictMonadError1) => (dictMonadAff1) => (x2) => {
+    const $0 = loadFileAff.loadFileFromPath(monadErrorAff)(monadAffAff)(x2);
+    return (v) => $0;
+  }
+});
+var loadSpec = (filename) => _bind($$get(driver)($ResponseFormat("Json", identity))(filename))((result) => {
+  if (result.tag === "Left") {
+    return throwException(error("Json fetching failed with " + printError(result._1)))();
+  }
+  if (result.tag === "Right") {
+    return _pure(result._1.body);
+  }
+  fail();
+});
 var figSpecFromJson = (v) => ({
   fluidSrcPaths: arrayMap(Folder)(v.fluidSrcPath),
   datasets: v.datasets,
-  imports: v.imports,
-  file: v.file,
   inputs: v.inputs,
   query: v.query ? $Maybe(
     "Just",
@@ -45408,25 +45659,79 @@ var figSpecFromJson = (v) => ({
   ) : Nothing,
   linking: v.linking
 });
-var loadFigure = (fileName) => runAffs_((v) => drawFig(v._1)(v._2))([
-  _bind($$get(driver)($ResponseFormat("Json", identity))(fileName))((result) => {
-    if (result.tag === "Left") {
-      return throwException(error("Json fetching failed with " + printError(result._1)))();
+var loadFigureSpecSrc = (jsonSpec) => (fluidSrc) => runAffs_((v) => drawFig(v._1)(v._2))([
+  (() => {
+    const v = decodeJson(jsonSpec);
+    if (v.tag === "Left") {
+      return throwException(error("JSON decoding failed with " + showJsonDecodeError.show(v._1)))();
     }
-    if (result.tag === "Right") {
-      const v = decodeJson(result._1.body);
-      if (v.tag === "Left") {
-        return throwException(error("JSON decoding failed with " + showJsonDecodeError.show(v._1)))();
+    if (v.tag === "Right") {
+      const v1 = figSpecFromJson(v._1);
+      return _map((v2) => $Tuple("fig", v2))(loadFig2(v1)(fluidSrc)({ fluidSrcPaths: v1.fluidSrcPaths }));
+    }
+    fail();
+  })()
+]);
+var loadFigureSpec = (jsonSpec) => (srcFile) => {
+  const $0 = _makeFiber(
+    ffiUtil,
+    _bind(loadFileAff.loadFileFromPath(monadErrorAff)(monadAffAff)(srcFile))((fluidSrc) => _liftEffect(loadFigureSpecSrc(jsonSpec)(definitely("absurd")(fluidSrc))))
+  );
+  return () => {
+    const fiber = $0();
+    fiber.run();
+  };
+};
+var loadFigure = (specFile) => (srcFile) => {
+  const $0 = _makeFiber(ffiUtil, _bind(loadSpec(specFile))((jsonSpec) => _liftEffect(loadFigureSpec(jsonSpec)(srcFile))));
+  return () => {
+    const fiber = $0();
+    fiber.run();
+  };
+};
+var loadFigureSrc = (specFile) => (fluidSrc) => {
+  const $0 = _makeFiber(ffiUtil, _bind(loadSpec(specFile))((jsonSpec) => _liftEffect(loadFigureSpecSrc(jsonSpec)(fluidSrc))));
+  return () => {
+    const fiber = $0();
+    fiber.run();
+  };
+};
+var drawCode2 = (file) => {
+  const $0 = split("/")(file);
+  const $1 = index($0)($0.length - 1 | 0);
+  const filename = (() => {
+    if ($1.tag === "Just") {
+      const $22 = index(split(".")($1._1))(0);
+      if ($22.tag === "Just") {
+        if ($22._1 === "") {
+          return Nothing;
+        }
+        return $Maybe("Just", $22._1);
       }
-      if (v.tag === "Right") {
-        const v1 = figSpecFromJson(v._1);
-        return _map((v2) => $Tuple("fig", v2))(loadFig2(v1)({ fluidSrcPaths: v1.fluidSrcPaths }));
+      if ($22.tag === "Nothing") {
+        return Nothing;
       }
+      fail();
+    }
+    if ($1.tag === "Nothing") {
+      return Nothing;
     }
     fail();
-  })
-]);
-var drawCode2 = (folder) => (file) => runAffs_(drawFile)([loadFile$p([folder])(file)(monadAffWebT)(monadErrorErrorWebT)({ fluidSrcPaths: [folder] })]);
+  })();
+  const errNotFound = "drawCode: File not found: " + file;
+  const errEmptyName = "drawCode: Filename cannot be empty: " + file;
+  const $2 = _makeFiber(
+    ffiUtil,
+    _bind(loadFileAff.loadFileFromPath(monadErrorAff)(monadAffAff)(file))((fluidSrc) => _liftEffect(drawFile($Tuple(
+      definitely(errEmptyName)(filename),
+      definitely(errNotFound)(fluidSrc)
+    ))))
+  );
+  return () => {
+    const fiber = $2();
+    fiber.run();
+  };
+};
 export {
   decodeJson,
   drawCode2 as drawCode,
@@ -45435,8 +45740,8 @@ export {
   gDecodeJsonCons1,
   loadFig2 as loadFig,
   loadFigure,
-  loadFile$p,
-  loadFileWebT2 as loadFileWebT,
-  monadAffWebT,
-  monadErrorErrorWebT
+  loadFigureSpec,
+  loadFigureSpecSrc,
+  loadFigureSrc,
+  loadSpec
 };