@explorable-viz/fluid 0.7.59 → 0.7.61

package/.spago/node-process/v11.0.0/.eslintrc.json

@@ -0,0 +1,29 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "extends": "eslint:recommended",
+  "env": {
+    "node": true
+  },
+  "rules": {
+    "strict": [2, "global"],
+    "block-scoped-var": 2,
+    "consistent-return": 2,
+    "eqeqeq": [2, "smart"],
+    "guard-for-in": 2,
+    "no-caller": 2,
+    "no-extend-native": 2,
+    "no-loop-func": 2,
+    "no-new": 2,
+    "no-param-reassign": 2,
+    "no-return-assign": 2,
+    "no-unused-expressions": 2,
+    "no-use-before-define": 2,
+    "radix": [2, "always"],
+    "indent": [2, 2],
+    "quotes": [2, "double"],
+    "semi": [2, "always"]
+  }
+}

package/.spago/node-process/v11.0.0/.gitignore

@@ -0,0 +1,8 @@
+/.*
+!/.gitignore
+!/.eslintrc.json
+!/.github/
+/bower_components/
+/node_modules/
+/output/
+package-lock.json

package/.spago/node-process/v11.1.0/.eslintrc.json

@@ -0,0 +1,29 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "extends": "eslint:recommended",
+  "env": {
+    "node": true
+  },
+  "rules": {
+    "strict": [2, "global"],
+    "block-scoped-var": 2,
+    "consistent-return": 2,
+    "eqeqeq": [2, "smart"],
+    "guard-for-in": 2,
+    "no-caller": 2,
+    "no-extend-native": 2,
+    "no-loop-func": 2,
+    "no-new": 2,
+    "no-param-reassign": 2,
+    "no-return-assign": 2,
+    "no-unused-expressions": 2,
+    "no-use-before-define": 2,
+    "radix": [2, "always"],
+    "indent": [2, 2],
+    "quotes": [2, "double"],
+    "semi": [2, "always"]
+  }
+}

package/.spago/node-process/v11.1.0/.gitignore

@@ -0,0 +1,8 @@
+/.*
+!/.gitignore
+!/.eslintrc.json
+!/.github/
+/bower_components/
+/node_modules/
+/output/
+package-lock.json

package/.spago/node-process/v11.2.0/.eslintrc.json

@@ -0,0 +1,29 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "extends": "eslint:recommended",
+  "env": {
+    "node": true
+  },
+  "rules": {
+    "strict": [2, "global"],
+    "block-scoped-var": 2,
+    "consistent-return": 2,
+    "eqeqeq": [2, "smart"],
+    "guard-for-in": 2,
+    "no-caller": 2,
+    "no-extend-native": 2,
+    "no-loop-func": 2,
+    "no-new": 2,
+    "no-param-reassign": 2,
+    "no-return-assign": 2,
+    "no-unused-expressions": 2,
+    "no-use-before-define": 2,
+    "radix": [2, "always"],
+    "indent": [2, 2],
+    "quotes": [2, "double"],
+    "semi": [2, "always"]
+  }
+}

package/.spago/node-process/v11.2.0/.gitignore

@@ -0,0 +1,8 @@
+/.*
+!/.gitignore
+!/.eslintrc.json
+!/.github/
+/bower_components/
+/node_modules/
+/output/
+package-lock.json

package/.spago/optparse/v6.0.0/.gitignore

@@ -0,0 +1,8 @@
+/.*
+!/.github
+!/.gitignore
+!/.npmrc
+!/.travis.yml
+/bower_components/
+/node_modules/
+/output/

package/.spago/optparse/v6.0.0/.npmrc

@@ -0,0 +1 @@
+package-lock=false

package/README.md

@@ -22,23 +22,42 @@ Additionally, for Windows users only:
 - Run `./script/setup/dev-setup.sh` from the top-level directory
 - Run `yarn build`
 
-#### Running tests on command line
+## Use
 
-After building, tests can be run from the command line via `yarn test-all`
+The following assumes you have already succesfully run `yarn build` (see above).
 
-#### Running tests in browser
-- As per command-line tests above, but run `yarn test-browser`, which opens
-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).
+### Running programs from the command line
 
-#### Running the fluid.org website locally
+Fluid examples in the `dist/fluid/fluid` can be evaluated from the command line as follows
+(from the top-level directory):
 
-(Assumes you have already run `yarn build`)
+```
+npx fluid evaluate -f <path>
+```
+Note that the path is relative and should not include the `.fld` extension, e.g. for the `range.fld` example:
+```
+% npx fluid evaluate -f example/range
+((0, 0) : ((0, 1) : ((1, 0) : ((1, 1) : []))))
+Success
+```
+
+### Running the fluid.org website locally
 
 - `yarn serve fluid-org` (you may be prompted to proceed: type `y`).
 - Open a browser at the served URL (usually `127.0.0.1:8080`)
 
-#### Run Puppeteer tests for page Y of website X
+## Testing
+
+### Running the tests from the command line
+
+After building, tests can be run from the command line via `yarn test-all`
+
+### Running tests in browser
+- As per command-line tests above, but run `yarn test-browser`, which opens
+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
 
 Rebuild with `puppeteerTests.headless` set to `false` to run in browser. Then:
 - `yarn bundle-website X`

package/dist/fluid/fluid/lib/text-viz.fld

@@ -2,17 +2,17 @@ let likelihoodMap table prob = (fromSome (find (fun x -> x.prob <= prob) table))
 
 let mkPercent num = (numToStr (num * 100)) ++ "%";
 
-let leqP n m = 
+let leqP n m =
     if n <= m
     then "less"
     else "more";
 
-let gradedLeqP n m = 
-    let ratio = n / m 
-    in if ratio <= 1.0 
+let gradedLeqP n m =
+    let ratio = n / m
+    in if ratio <= 1.0
         then if ratio <=0.5
             then "much less"
             else "less"
         else if ratio >= 2.0
             then "much more"
-            else "more";
+            else "more";

package/dist/fluid/shared/fluid.mjs

@@ -24828,17 +24828,18 @@ var parseProgram = (loadFile2) => (folder) => (file) => (dictMonadAff) => (dictM
 })());
 var module_2 = (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
-  const $0 = Monad0.Bind1();
+  const Bind1 = Monad0.Bind1();
+  const Applicative0 = Monad0.Applicative0();
   return (dictMonadError) => {
     const parse1 = parse(dictMonadError);
     const desugarModuleFwd = moduleFwd(dictMonadError)(boundedLattice2);
-    return (loadFile2) => (file) => (v) => {
-      const $1 = v.mods;
-      return $0.bind(loadFile2("fluid")(file)(dictMonadAff)(dictMonadError))((src) => $0.bind($0.bind(parse1(src)(module_))(desugarModuleFwd))((mod) => Monad0.Applicative0().pure({
+    return (loadFile2) => (folder) => (file) => (v) => {
+      const $0 = v.mods;
+      return Bind1.bind(Applicative0.pure())(() => Bind1.bind(loadFile2(folder)(file)(dictMonadAff)(dictMonadError))((src) => Bind1.bind(Bind1.bind(parse1(src)(module_))(desugarModuleFwd))((mod) => Applicative0.pure({
         primitives: v.primitives,
-        mods: $List("Cons", mod, $1),
+        mods: $List("Cons", mod, $0),
         datasets: v.datasets
-      })));
+      }))));
     };
   };
 };
@@ -24872,7 +24873,7 @@ var prepConfig = (dictMonadAff) => {
   return (dictMonadError) => {
     const desug1 = exprFwd(boundedLattice2)(dictMonadError)(joinSemilatticeUnit);
     const initialConfig1 = initialConfig(dictMonadError)(fVExpr);
-    return (loadFile2) => (file) => (progCxt) => $0.bind(parseProgram(loadFile2)("fluid/example")(file)(dictMonadAff)(dictMonadError))((s) => $0.bind(desug1(s))((e) => $0.bind(initialConfig1(e)(progCxt))((gconfig) => Monad0.Applicative0().pure({
+    return (v) => (file) => (progCxt) => $0.bind(parseProgram(v.loadFile)(v.fluidSrcPath)(file)(dictMonadAff)(dictMonadError))((s) => $0.bind(desug1(s))((e) => $0.bind(initialConfig1(e)(progCxt))((gconfig) => Monad0.Applicative0().pure({
       s,
       e,
       gconfig
@@ -24884,10 +24885,10 @@ var datasetAs = (dictMonadAff) => {
   const $0 = Monad0.Bind1();
   return (dictMonadError) => {
     const desug1 = exprFwd(boundedLattice2)(dictMonadError)(joinSemilatticeUnit);
-    return (loadFile2) => (v) => (v1) => {
+    return (loadFile2) => (folder) => (v) => (v1) => {
       const $1 = v1.datasets;
       const $2 = v._1;
-      return $0.bind($0.bind(parseProgram(loadFile2)("fluid")(v._2)(dictMonadAff)(dictMonadError))(desug1))((e\u03B1) => Monad0.Applicative0().pure({
+      return $0.bind($0.bind(parseProgram(loadFile2)(folder)(v._2)(dictMonadAff)(dictMonadError))(desug1))((e\u03B1) => Monad0.Applicative0().pure({
         primitives: v1.primitives,
         mods: v1.mods,
         datasets: $List("Cons", $Tuple($2, e\u03B1), $1)
@@ -24904,12 +24905,12 @@ var loadProgCxt = (dictMonadAff) => {
   return (dictMonadError) => {
     const module_22 = module_1(dictMonadError);
     const datasetAs2 = datasetAs1(dictMonadError);
-    return (loadFile2) => (mods) => (datasets) => $0.bind($0.bind(Monad0.Applicative0().pure({
+    return (v) => (mods) => (datasets) => $0.bind($0.bind(Monad0.Applicative0().pure({
       primitives,
       mods: Nil,
       datasets: Nil
-    }))(concatM1(arrayMap(module_22(loadFile2))(["lib/prelude", ...mods]))))(concatM1(arrayMap((() => {
-      const $1 = datasetAs2(loadFile2);
+    }))(concatM1(arrayMap(module_22(v.loadFile)(v.fluidSrcPath))(["lib/prelude", ...mods]))))(concatM1(arrayMap((() => {
+      const $1 = datasetAs2(v.loadFile)(v.fluidSrcPath);
       return (x) => $1($Tuple(x._1, x._2));
     })())(datasets)));
   };
@@ -25068,6 +25069,20 @@ var loadFile = (v) => (v1) => (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
   return (dictMonadError) => Monad0.Bind1().bind(dictMonadAff.liftAff(toAff2(readTextFile)(UTF8)(v + "/" + v1 + ".fld")))((buffer) => Monad0.Applicative0().pure(buffer));
 };
+var loadProgCxt2 = (dictMonadAff) => {
+  const loadProgCxt1 = loadProgCxt(dictMonadAff);
+  return (dictMonadError) => {
+    const loadProgCxt22 = loadProgCxt1(dictMonadError);
+    return (fluidSrcPath) => loadProgCxt22({ loadFile, fluidSrcPath });
+  };
+};
+var prepConfig2 = (dictMonadAff) => {
+  const prepConfig1 = prepConfig(dictMonadAff);
+  return (dictMonadError) => {
+    const prepConfig22 = prepConfig1(dictMonadError);
+    return (fluidSrcPath) => prepConfig22({ loadFile, fluidSrcPath });
+  };
+};
 
 // output-es/Node.ChildProcess/foreign.js
 import { spawn, exec, execFile, execSync, execFileSync, fork as cp_fork } from "child_process";
@@ -28359,8 +28374,8 @@ var execParserPure = (pprefs) => (pinfo) => (args) => {
 // output-es/Fluid/index.js
 var $Command = (tag, _1, _2) => ({ tag, _1, _2 });
 var $Program = (_1) => ({ tag: "Program", _1 });
-var loadProgCxt2 = /* @__PURE__ */ loadProgCxt(monadAffAff)(monadErrorAff)(loadFile);
-var prepConfig2 = /* @__PURE__ */ prepConfig(monadAffAff)(monadErrorAff)(loadFile);
+var loadProgCxt3 = /* @__PURE__ */ loadProgCxt2(monadAffAff)(monadErrorAff);
+var prepConfig3 = /* @__PURE__ */ prepConfig2(monadAffAff)(monadErrorAff);
 var graphEval2 = /* @__PURE__ */ graphEval(monadErrorAff);
 var fromFoldable29 = /* @__PURE__ */ (() => fromFoldableImpl(foldableList.foldr))();
 var Evaluate = (value0) => $Command("Evaluate", value0);
@@ -28368,7 +28383,7 @@ var Publish = (value0) => (value1) => $Command("Publish", value0, value1);
 var parseImports = /* @__PURE__ */ $Parser(
   "BindP",
   /* @__PURE__ */ manyM(/* @__PURE__ */ option(readerAsk)(/* @__PURE__ */ (() => {
-    const $0 = help("A comma separated list of import file locations");
+    const $0 = help("Comma-separated list of files to import");
     const $1 = $0._2._1.tag === "Nothing" ? Nothing : $0._2._1;
     const $2 = $0._2._2.tag === "Nothing" ? Nothing : $0._2._2;
     return $Mod(
@@ -28384,7 +28399,7 @@ var parseImports = /* @__PURE__ */ $Parser(
 );
 var evaluate = (v) => {
   const $0 = v._1.fileName;
-  return _bind(loadProgCxt2(v._1.imports)(v._1.datasets))((progCxt) => _bind(prepConfig2($0)(progCxt))((v1) => _bind(graphEval2(v1.gconfig)(v1.e))((v2) => _pure($Val(
+  return _bind(loadProgCxt3("fluid")(v._1.imports)(v._1.datasets))((progCxt) => _bind(prepConfig3("fluid")($0)(progCxt))((v1) => _bind(graphEval2(v1.gconfig)(v1.e))((v2) => _pure($Val(
     void 0,
     functorBaseVal.map((v$1) => {
     })(v2["out\u03B1"]._2)
@@ -28401,19 +28416,22 @@ var copyOptions = {
   encoding: Nothing,
   shell: Nothing
 };
-var publish = (website) => ($$package) => exec2($$package ? "./node_modules/@explorable-viz/fluid/script/bundle-website.sh -w " + website + " -r true" : "./script/bundle-website.sh -w " + website)(copyOptions)((v) => {
-  if (v.error.tag === "Just") {
-    return log(showErrorImpl(v.error._1));
-  }
-  if (v.error.tag === "Nothing") {
-    const $0 = toString2(monadEffect)(ASCII)(v.stdout);
-    return () => {
-      const $1 = $0();
-      return log($1)();
-    };
-  }
-  fail();
-});
+var publish = (website) => ($$package) => {
+  const cmd$p = "/script/bundle-website.sh -w " + website;
+  return exec2($$package ? "./node_modules/@explorable-viz/fluid" + cmd$p + " -r true" : "." + cmd$p)(copyOptions)((v) => {
+    if (v.error.tag === "Just") {
+      return log(showErrorImpl(v.error._1));
+    }
+    if (v.error.tag === "Nothing") {
+      const $0 = toString2(monadEffect)(ASCII)(v.stdout);
+      return () => {
+        const $1 = $0();
+        return log($1)();
+      };
+    }
+    fail();
+  });
+};
 var dispatchCommand = (v) => {
   if (v.tag === "Evaluate") {
     return _bind(evaluate(v._1))((v1) => _liftEffect(log(intercalate4("\n")(removeDocWS(prettyVal(highlightableUnit).pretty(v1)).lines))));
@@ -28459,24 +28477,10 @@ var parsePair = /* @__PURE__ */ between3("(")(")")((s) => {
   }
   return $Either("Left", "Expected a pair but got " + s);
 });
-var parseDataset$p = (s) => {
-  const $0 = parsePair(s);
-  return (() => {
-    if ($0.tag === "Left") {
-      const $1 = $0._1;
-      return (v) => $Either("Left", $1);
-    }
-    if ($0.tag === "Right") {
-      const $1 = $0._1;
-      return (f) => f($1);
-    }
-    fail();
-  })()((dataset) => $Either("Right", dataset));
-};
 var parseDatasets = /* @__PURE__ */ $Parser(
   "BindP",
-  /* @__PURE__ */ manyM(/* @__PURE__ */ option(/* @__PURE__ */ eitherReader(parseDataset$p))(/* @__PURE__ */ (() => {
-    const $0 = help("A comma separated list of datasets");
+  /* @__PURE__ */ manyM(/* @__PURE__ */ option(/* @__PURE__ */ eitherReader(parsePair))(/* @__PURE__ */ (() => {
+    const $0 = help("Comma-separated list of datasets");
     const $1 = $0._2._1.tag === "Nothing" ? Nothing : $0._2._1;
     const $2 = $0._2._2.tag === "Nothing" ? Nothing : $0._2._2;
     return $Mod(

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

@@ -43673,17 +43673,18 @@ var parseProgram = (loadFile2) => (folder) => (file) => (dictMonadAff) => (dictM
 })());
 var module_2 = (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
-  const $0 = Monad0.Bind1();
+  const Bind1 = Monad0.Bind1();
+  const Applicative0 = Monad0.Applicative0();
   return (dictMonadError) => {
     const parse1 = parse(dictMonadError);
     const desugarModuleFwd = moduleFwd(dictMonadError)(boundedLattice2);
-    return (loadFile2) => (file) => (v) => {
-      const $1 = v.mods;
-      return $0.bind(loadFile2("fluid")(file)(dictMonadAff)(dictMonadError))((src) => $0.bind($0.bind(parse1(src)(module_))(desugarModuleFwd))((mod) => Monad0.Applicative0().pure({
+    return (loadFile2) => (folder) => (file) => (v) => {
+      const $0 = v.mods;
+      return Bind1.bind(Applicative0.pure())(() => Bind1.bind(loadFile2(folder)(file)(dictMonadAff)(dictMonadError))((src) => Bind1.bind(Bind1.bind(parse1(src)(module_))(desugarModuleFwd))((mod) => Applicative0.pure({
         primitives: v.primitives,
-        mods: $List("Cons", mod, $1),
+        mods: $List("Cons", mod, $0),
         datasets: v.datasets
-      })));
+      }))));
     };
   };
 };
@@ -43717,7 +43718,7 @@ var prepConfig = (dictMonadAff) => {
   return (dictMonadError) => {
     const desug1 = exprFwd(boundedLattice2)(dictMonadError)(joinSemilatticeUnit);
     const initialConfig1 = initialConfig(dictMonadError)(fVExpr);
-    return (loadFile2) => (file) => (progCxt) => $0.bind(parseProgram(loadFile2)("fluid/example")(file)(dictMonadAff)(dictMonadError))((s) => $0.bind(desug1(s))((e) => $0.bind(initialConfig1(e)(progCxt))((gconfig) => Monad0.Applicative0().pure({
+    return (v) => (file) => (progCxt) => $0.bind(parseProgram(v.loadFile)(v.fluidSrcPath)(file)(dictMonadAff)(dictMonadError))((s) => $0.bind(desug1(s))((e) => $0.bind(initialConfig1(e)(progCxt))((gconfig) => Monad0.Applicative0().pure({
       s,
       e,
       gconfig
@@ -43729,10 +43730,10 @@ var datasetAs = (dictMonadAff) => {
   const $0 = Monad0.Bind1();
   return (dictMonadError) => {
     const desug1 = exprFwd(boundedLattice2)(dictMonadError)(joinSemilatticeUnit);
-    return (loadFile2) => (v) => (v1) => {
+    return (loadFile2) => (folder) => (v) => (v1) => {
       const $1 = v1.datasets;
       const $2 = v._1;
-      return $0.bind($0.bind(parseProgram(loadFile2)("fluid")(v._2)(dictMonadAff)(dictMonadError))(desug1))((e\u03B1) => Monad0.Applicative0().pure({
+      return $0.bind($0.bind(parseProgram(loadFile2)(folder)(v._2)(dictMonadAff)(dictMonadError))(desug1))((e\u03B1) => Monad0.Applicative0().pure({
         primitives: v1.primitives,
         mods: v1.mods,
         datasets: $List("Cons", $Tuple($2, e\u03B1), $1)
@@ -43749,12 +43750,12 @@ var loadProgCxt = (dictMonadAff) => {
   return (dictMonadError) => {
     const module_22 = module_1(dictMonadError);
     const datasetAs2 = datasetAs1(dictMonadError);
-    return (loadFile2) => (mods) => (datasets) => $0.bind($0.bind(Monad0.Applicative0().pure({
+    return (v) => (mods) => (datasets) => $0.bind($0.bind(Monad0.Applicative0().pure({
       primitives,
       mods: Nil,
       datasets: Nil
-    }))(concatM1(arrayMap(module_22(loadFile2))(["lib/prelude", ...mods]))))(concatM1(arrayMap((() => {
-      const $1 = datasetAs2(loadFile2);
+    }))(concatM1(arrayMap(module_22(v.loadFile)(v.fluidSrcPath))(["lib/prelude", ...mods]))))(concatM1(arrayMap((() => {
+      const $1 = datasetAs2(v.loadFile)(v.fluidSrcPath);
       return (x2) => $1($Tuple(x2._1, x2._2));
     })())(datasets)));
   };
@@ -43765,9 +43766,10 @@ var loadFile = (v) => (v1) => (dictMonadAff) => {
   const MonadEffect0 = dictMonadAff.MonadEffect0();
   const Monad0 = MonadEffect0.Monad0();
   const Bind1 = Monad0.Bind1();
+  const Applicative0 = Monad0.Applicative0();
   return (dictMonadError) => Bind1.bind(dictMonadAff.liftAff(request(driver)({
     method: $Either("Left", GET),
-    url: "/" + v + "/" + v1 + ".fld",
+    url: v + "/" + v1 + ".fld",
     headers: [],
     content: Nothing,
     username: Nothing,
@@ -43781,12 +43783,27 @@ var loadFile = (v) => (v1) => (dictMonadAff) => {
       return Bind1.bind(MonadEffect0.liftEffect(log2("Failed with " + printError($0))))(() => dictMonadError.MonadThrow0().throwError(error(printError($0))));
     }
     if (result.tag === "Right") {
-      return Monad0.Applicative0().pure(result._1.body);
+      const $0 = result._1;
+      return Bind1.bind(Applicative0.pure())(() => Applicative0.pure($0.body));
     }
     fail();
   });
 };
 var loadFile$p = (folder) => (file) => (dictMonadAff) => (dictMonadError) => dictMonadAff.MonadEffect0().Monad0().Bind1().Apply0().Functor0().map((v) => $Tuple(file, v))(loadFile(folder)(file)(dictMonadAff)(dictMonadError));
+var loadProgCxt2 = (dictMonadAff) => {
+  const loadProgCxt1 = loadProgCxt(dictMonadAff);
+  return (dictMonadError) => {
+    const loadProgCxt22 = loadProgCxt1(dictMonadError);
+    return (fluidSrcPath) => loadProgCxt22({ loadFile, fluidSrcPath });
+  };
+};
+var prepConfig2 = (dictMonadAff) => {
+  const prepConfig1 = prepConfig(dictMonadAff);
+  return (dictMonadError) => {
+    const prepConfig22 = prepConfig1(dictMonadError);
+    return (fluidSrcPath) => prepConfig22({ loadFile, fluidSrcPath });
+  };
+};
 
 // output-es/App.Fig/index.js
 var highlightableSelState2 = /* @__PURE__ */ highlightableSelState(highlightableBoolean)(joinSemilatticeBoolean);
@@ -43972,67 +43989,68 @@ var lift3 = /* @__PURE__ */ lift(applyVal)(applyEnv);
 var loadFig = (v) => (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
   const $0 = Monad0.Bind1();
-  const loadProgCxt1 = loadProgCxt(dictMonadAff);
-  const prepConfig1 = prepConfig(dictMonadAff);
+  const loadProgCxt3 = loadProgCxt2(dictMonadAff);
+  const prepConfig3 = prepConfig2(dictMonadAff);
   return (dictMonadError) => {
-    const prepConfig1$1 = prepConfig1(dictMonadError)(loadFile);
+    const prepConfig1 = prepConfig3(dictMonadError);
     const graphEval2 = graphEval(dictMonadError);
     const $1 = v.file;
-    const $2 = v.inputs;
-    return $0.bind(loadProgCxt1(dictMonadError)(loadFile)(v.imports)(v.datasets))((progCxt) => $0.bind(prepConfig1$1($1)(progCxt))((v1) => {
-      const $3 = v1.s;
+    const $2 = v.fluidSrcPath;
+    const $3 = v.inputs;
+    return $0.bind(loadProgCxt3(dictMonadError)($2)(v.imports)(v.datasets))((progCxt) => $0.bind(prepConfig1($2)($1)(progCxt))((v1) => {
+      const $4 = v1.s;
       return $0.bind(graphEval2(v1.gconfig)(v1.e))((v2) => {
         const v3 = functorEnvExpr.map((v$1) => {
         })(v2["in\u03B1"]);
         const \u03B30 = _fmapObject(v2["in\u03B1"]._1, functorVal.map((v$1) => false));
         const v0 = $Val(false, functorBaseVal.map((v$1) => false)(v2["out\u03B1"]._2));
-        const $4 = unrestrictGC(boundedMeetSemilatticeBoo)(v3._1)(fromFoldable28($2));
-        const $5 = unprojExpr(boundedMeetSemilatticeBoo)($EnvExpr(v3._1, v3._2));
-        const focus = { fwd: (x2) => $5.fwd($4.fwd(x2)), bwd: (x2) => $4.bwd($5.bwd(x2)) };
-        const $6 = graphGC1(v2);
-        const gc = { fwd: (x2) => $6.fwd(focus.fwd(x2)), bwd: (x2) => focus.bwd($6.bwd(x2)) };
-        const $7 = gc.fwd(\u03B30);
-        const vInert = $Val(selState($7._1), functorBaseVal.map(selState)($7._2));
+        const $5 = unrestrictGC(boundedMeetSemilatticeBoo)(v3._1)(fromFoldable28($3));
+        const $6 = unprojExpr(boundedMeetSemilatticeBoo)($EnvExpr(v3._1, v3._2));
+        const focus = { fwd: (x2) => $6.fwd($5.fwd(x2)), bwd: (x2) => $5.bwd($6.bwd(x2)) };
+        const $7 = graphGC1(v2);
+        const gc = { fwd: (x2) => $7.fwd(focus.fwd(x2)), bwd: (x2) => focus.bwd($7.bwd(x2)) };
+        const $8 = gc.fwd(\u03B30);
+        const vInert = $Val(selState($8._1), functorBaseVal.map(selState)($8._2));
         const \u03B3Inert = _fmapObject(
           _fmapObject(gc.bwd($Val(true, functorBaseVal.map((v$1) => true)(v2["out\u03B1"]._2))), functorVal.map(boolNot)),
           functorVal.map(selState)
         );
-        const $8 = graphGC22({
+        const $9 = graphGC22({
           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,
           graph_bwd: v2.graph_bwd,
           "in\u03B1": v2["out\u03B1"],
           "out\u03B1": v2["in\u03B1"]
         });
-        const $9 = dual(focus);
-        const gc_dual = { fwd: (x2) => $9.fwd($8.fwd(x2)), bwd: (x2) => $8.bwd($9.bwd(x2)) };
+        const $10 = dual(focus);
+        const gc_dual = { fwd: (x2) => $10.fwd($9.fwd(x2)), bwd: (x2) => $9.bwd($10.bwd(x2)) };
         return Monad0.Applicative0().pure({
           spec: v,
-          s: $3,
+          s: $4,
           "\u03B3": intersectionWith_Object(apply)(_fmapObject(
             intersectionWith_Object(apply)(_fmapObject(\u03B3Inert, applyVal.apply))(\u03B30),
             applyVal.apply
           ))(\u03B30),
           v: applyVal.apply(applyVal.apply(vInert)(v0))(v0),
           linkedOutputs: (() => {
-            const $10 = lift3(vInert)(\u03B3Inert)(gc_dual);
-            const $11 = lift1(\u03B3Inert)(vInert)(gc);
+            const $11 = lift3(vInert)(\u03B3Inert)(gc_dual);
+            const $12 = lift1(\u03B3Inert)(vInert)(gc);
             return {
-              fwd: (x2) => $11.fwd(meet1.fwd($Tuple($10.fwd(x2._1), categoryGaloisConnection.identity.fwd(x2._2)))),
+              fwd: (x2) => $12.fwd(meet1.fwd($Tuple($11.fwd(x2._1), categoryGaloisConnection.identity.fwd(x2._2)))),
               bwd: (x2) => {
-                const $12 = meet1.bwd($11.bwd(x2));
-                return $Tuple($10.bwd($12._1), categoryGaloisConnection.identity.bwd($12._2));
+                const $13 = meet1.bwd($12.bwd(x2));
+                return $Tuple($11.bwd($13._1), categoryGaloisConnection.identity.bwd($13._2));
               }
             };
           })(),
           linkedInputs: (() => {
-            const $10 = lift1(\u03B3Inert)(vInert)(gc);
-            const $11 = lift3(vInert)(\u03B3Inert)(gc_dual);
+            const $11 = lift1(\u03B3Inert)(vInert)(gc);
+            const $12 = lift3(vInert)(\u03B3Inert)(gc_dual);
             return {
-              fwd: (x2) => $11.fwd(meet.fwd($Tuple($10.fwd(x2._1), categoryGaloisConnection.identity.fwd(x2._2)))),
+              fwd: (x2) => $12.fwd(meet.fwd($Tuple($11.fwd(x2._1), categoryGaloisConnection.identity.fwd(x2._2)))),
               bwd: (x2) => {
-                const $12 = meet.bwd($11.bwd(x2));
-                return $Tuple($10.bwd($12._1), categoryGaloisConnection.identity.bwd($12._2));
+                const $13 = meet.bwd($12.bwd(x2));
+                return $Tuple($11.bwd($13._1), categoryGaloisConnection.identity.bwd($13._2));
               }
             };
           })(),
@@ -44250,7 +44268,26 @@ var gDecodeJsonCons = (dictDecodeJsonField) => (dictGDecodeJson) => (dictIsSymbo
 var monadAffAff = { liftAff: (x2) => x2, MonadEffect0: () => monadEffectAff };
 
 // output-es/App.LoadFigure/index.js
-var gDecodeJsonCons2 = /* @__PURE__ */ gDecodeJsonCons(/* @__PURE__ */ (() => {
+var gDecodeJsonCons2 = /* @__PURE__ */ 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;
+  }
+});
+var gDecodeJsonCons1 = /* @__PURE__ */ gDecodeJsonCons(/* @__PURE__ */ (() => {
   const $0 = decodeArray(caseJsonString($Either(
     "Left",
     $JsonDecodeError("TypeMismatch", "String")
@@ -44264,7 +44301,7 @@ var gDecodeJsonCons2 = /* @__PURE__ */ gDecodeJsonCons(/* @__PURE__ */ (() => {
     }
   };
 })());
-var jsonToSpec = /* @__PURE__ */ (() => decodeRecord(gDecodeJsonCons((() => {
+var decodeJson = /* @__PURE__ */ (() => decodeRecord(gDecodeJsonCons((() => {
   const $0 = decodeArray(decodeTuple(caseJsonString($Either(
     "Left",
     $JsonDecodeError("TypeMismatch", "String")
@@ -44277,40 +44314,28 @@ var jsonToSpec = /* @__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(gDecodeJsonNil)({ reflectSymbol: () => "inputs" })()())({ reflectSymbol: () => "imports" })()())({
-  reflectSymbol: () => "file"
-})()())({ reflectSymbol: () => "datasets" })()())().decodeJson)();
-var figSpecFromJson = (spec) => ({ datasets: spec.datasets, imports: spec.imports, file: spec.file, inputs: spec.inputs });
+})())(gDecodeJsonCons2(gDecodeJsonCons2(gDecodeJsonCons1(gDecodeJsonCons1(gDecodeJsonNil)({ reflectSymbol: () => "inputs" })()())({
+  reflectSymbol: () => "imports"
+})()())({ reflectSymbol: () => "fluidSrcPath" })()())({ reflectSymbol: () => "file" })()())({ reflectSymbol: () => "datasets" })()())().decodeJson)();
+var figSpecFromJson = (spec) => ({ fluidSrcPath: spec.fluidSrcPath, datasets: spec.datasets, imports: spec.imports, file: spec.file, inputs: spec.inputs });
 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)))();
     }
     if (result.tag === "Right") {
-      const v = jsonToSpec(result._1.body);
+      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") {
-        return _map((v1) => $Tuple("fig", v1))(loadFig({ datasets: v._1.datasets, imports: v._1.imports, file: v._1.file, inputs: v._1.inputs })(monadAffAff)(monadErrorAff));
+        return _map((v1) => $Tuple("fig", v1))(loadFig({
+          fluidSrcPath: v._1.fluidSrcPath,
+          datasets: v._1.datasets,
+          imports: v._1.imports,
+          file: v._1.file,
+          inputs: v._1.inputs
+        })(monadAffAff)(monadErrorAff));
       }
     }
     fail();
@@ -44318,9 +44343,10 @@ var loadFigure = (fileName) => runAffs_((v) => drawFig(v._1)(v._2))([
 ]);
 var drawCode2 = (folder) => (file) => runAffs_(drawFile)([loadFile$p(folder)(file)(monadAffAff)(monadErrorAff)]);
 export {
+  decodeJson,
   drawCode2 as drawCode,
   figSpecFromJson,
   gDecodeJsonCons2 as gDecodeJsonCons,
-  jsonToSpec,
+  gDecodeJsonCons1,
   loadFigure
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.7.59",
+  "version": "0.7.61",
   "description": "Fluid is an experimental programming language which integrates a bidirectional dynamic analysis to connect outputs to data sources in a fine-grained way. Fluid is implemented in PureScript and runs in the browser.",
   "main": "index.js",
   "repository": {
@@ -25,23 +25,22 @@
     "script/util/lisp-case.sh"
   ],
   "scripts": {
-    "tidy": "./script/tidy.sh",
+    "benchmark": "./script/benchmark.sh",
     "build": "./script/build.sh",
     "build-test": "./script/build-test.sh",
     "bundle-fluid": "./script/bundle-fluid.sh",
     "bundle-page": "./script/bundle-page.sh",
     "bundle-website": "./script/bundle-website.sh",
     "bundle-website-all": "./script/bundle-website-all.sh",
+    "npm-publish": "./script/npm-publish.sh",
     "serve": "./script/serve.sh",
     "test": "./script/test.sh",
+    "test-all": "./script/test-all.sh",
     "test-browser": "./script/test.sh --browsers=Chrome --singleRun=false",
     "test-page": "./script/test-page.sh",
     "test-website": "./script/test-website.sh",
     "test-website-all": "./script/test-website-all.sh",
-    "test-all": "./script/test-all.sh",
-    "npm-publish": "./script/npm-publish.sh",
-    "fluid": "./script/fluid.sh",
-    "benchmark": "./script/benchmark.sh"
+    "tidy": "./script/tidy.sh"
   },
   "dependencies": {
     "@codemirror/commands": "6.2.2",

package/script/bundle-website.sh

@@ -50,7 +50,6 @@ echo "Processing shared js files:"
 cp -r "${PREFIX:+$PREFIX/}dist/fluid/shared" dist/$WEBSITE_LISP_CASE
 cp -r fluid dist/$WEBSITE_LISP_CASE
 
-
 if [[ -e "website/$SRC_PATH/test.mjs" ]]; then
    cp website/$SRC_PATH/test.mjs dist/SRC_PATH_LISP_CASE/test.mjs
 fi

package/.spago/affjax-node/v1.0.0/.editorconfig

@@ -1,13 +0,0 @@
-# https://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false

package/.spago/affjax-node/v1.0.0/.eslintrc.json

@@ -1,30 +0,0 @@
-{
-  "env": { "browser": true },
-  "extends": "eslint:recommended",
-  "parserOptions": { "ecmaVersion": 6, "sourceType": "module" },
-  "rules": {
-    "block-scoped-var": "error",
-    "consistent-return": "error",
-    "eqeqeq": "error",
-    "guard-for-in": "error",
-    "no-bitwise": "error",
-    "no-caller": "error",
-    "no-constant-condition": ["error", { "checkLoops": false }],
-    "no-extra-parens": "off",
-    "no-extend-native": "error",
-    "no-loop-func": "error",
-    "no-new": "error",
-    "no-param-reassign": "error",
-    "no-return-assign": "error",
-    "no-sequences": "error",
-    "no-unused-expressions": "error",
-    "no-use-before-define": "error",
-    "no-undef": "error",
-    "no-eq-null": "error",
-    "radix": ["error", "always"],
-    "indent": ["error", 2, { "SwitchCase": 0 }],
-    "quotes": ["error", "double"],
-    "semi": ["error", "always"],
-    "strict": ["error", "global"]
-  }
-}

package/.spago/affjax-node/v1.0.0/.gitignore

@@ -1,13 +0,0 @@
-.*
-!.gitignore
-!.github
-!.editorconfig
-!.eslintrc.json
-
-output
-generated-docs
-bower_components
-
-node_modules
-package-lock.json
-*.lock

package/.spago/pathy/v9.0.0/.editorconfig

@@ -1,13 +0,0 @@
-# https://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false

package/.spago/pathy/v9.0.0/.gitignore

@@ -1,9 +0,0 @@
-.*
-!.gitignore
-!.github
-!.editorconfig
-!.tidyrc.json
-
-output
-generated-docs
-bower_components

package/.spago/pathy/v9.0.0/.tidyrc.json

@@ -1,10 +0,0 @@
-{
-  "importSort": "source",
-  "importWrap": "source",
-  "indent": 2,
-  "operatorsFile": null,
-  "ribbon": 1,
-  "typeArrowPlacement": "first",
-  "unicode": "never",
-  "width": null
-}