@explorable-viz/fluid 0.7.60 → 0.7.62

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/example/linked-inputs/energyscatter.fld

@@ -19,6 +19,5 @@ let plot year countries =
 in ScatterPlot {
   caption: "Clean energy efficiency vs. proportion of renewable energy capacity",
   points: plot 2018 [ "BRA", "CHN", "DEU", "FRA", "EGY", "IND", "JPN", "MEX", "NGA", "USA" ],
-  xlabel: "Renewables/TotalEnergyCap",
-  ylabel: "Clean Capacity Factor"
+  labels: { x: "Renewables/TotalEnergyCap", y: "Clean Capacity Factor" }
 }

package/dist/fluid/fluid/example/linked-inputs/mini-energyscatter.fld

@@ -25,6 +25,5 @@ in ScatterPlot {
                 x: country.nonRenewables / country.totalCap,
                 y: country.renCapFactor
             }| country <- energy 2018 ["USA"]],
-    xlabel: "Renewables/TotalEnergyCap",
-    ylabel: "Clean Capacity Factor"
+    labels: { x: "Renewables/TotalEnergyCap", y: "Clean Capacity Factor" }
 }

package/dist/fluid/fluid/example/plot/non-renewables.fld

@@ -2,8 +2,8 @@ let countries = ["BRA", "EGY", "IND", "JPN"];
 let totalFor year country =
    let [ row ] = [ row | row <- nonRenewables, row.year == year, row.country == country ]
    in row.nuclearOut + row.gasOut + row.coalOut + row.petrolOut;
-    stack year = [ { y: country, z: totalFor year country } | country <- countries ];
-    yearData year = [ row | row <- nonRenewables, row.year == year, row.country `elem` countries ]
+let stack year = [ { y: country, z: totalFor year country } | country <- countries ];
+let yearData year = [ row | row <- nonRenewables, row.year == year, row.country `elem` countries ]
 in MultiView {
    barChart: BarChart {
       caption: "Non-renewables output",
@@ -16,7 +16,6 @@ in MultiView {
          x: sum [ row.nuclearOut | row <- yearData year ],
          y: sum [ row.nuclearCap | row <- yearData year ]
       } | year <- [2014..2018] ],
-      xlabel: "Nuclear capacity",
-      ylabel: "Nuclear output"
+      labels: { x: "Nuclear capacity", y: "Nuclear output" }
    }
 }

package/dist/fluid/fluid/example/slicing/linked-outputs/stacked-bar-scatter-plot.fld

@@ -33,7 +33,6 @@ MultiView {
       in ScatterPlot {
          caption: "Clean energy efficiency vs proportion of renewable energy capacity",
          points: plot 2018 [ "BRA", "CHN", "DEU", "FRA", "EGY", "IND", "JPN", "MEX", "NGA", "USA" ],
-         xlabel: "Renewables/TotalEnergyCap",
-         ylabel: "Clean Capacity Factor"
+         labels: { x: "Renewables/TotalEnergyCap", y: "Clean Capacity Factor" }
       }
 }

package/dist/fluid/fluid/lib/convolution.fld

@@ -2,15 +2,16 @@ let zero n = const n;
     wrap n n_max = ((n - 1) `mod` n_max) + 1;
     extend n = min (max n 1);
 
-let convolve image kernel method =
+let convolve image kernel boundary =
     let ((m, n), (i, j)) = (dims image, dims kernel);
         (half_i, half_j) = (i `quot` 2, j `quot` 2);
         area = i * j
     in  [| let weightedSum = sum [
            image!(x, y) * kernel!(i' + 1, j' + 1)
            | (i', j') <- range (0, 0) (i - 1, j - 1),
-             let x = method (m' + i' - half_i) m,
-             let y = method (n' + j' - half_j) n,
+             let x = boundary (m' + i' - half_i) m,
+             let y = boundary (n' + j' - half_j) n,
              x >= 1, x <= m, y >= 1, y <= n
          ] in weightedSum `quot` area
          | (m', n') in (m, n) |];
+

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

@@ -10170,8 +10170,7 @@ var dataTypes = /* @__PURE__ */ foldrArray(Cons)(Nil)([
     /* @__PURE__ */ $Tuple("Viewport", 9)
   ]),
   /* @__PURE__ */ dataType("Transform")([/* @__PURE__ */ $Tuple("Scale", 2), /* @__PURE__ */ $Tuple("Translate", 2)]),
-  /* @__PURE__ */ dataType("Marker")([/* @__PURE__ */ $Tuple("Arrowhead", 0)]),
-  /* @__PURE__ */ dataType("Explanation")([/* @__PURE__ */ $Tuple("Explained", 2)])
+  /* @__PURE__ */ dataType("Marker")([/* @__PURE__ */ $Tuple("Arrowhead", 0)])
 ]);
 var ctrToDataType = /* @__PURE__ */ (() => fromFoldable2(foldableList)(bindList.bind(listMap((d) => listMap((v) => $Tuple(
   v,
@@ -24828,17 +24827,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 +24872,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 +24884,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 +24904,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 +25068,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 +28373,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 +28382,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 +28398,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,26 +28415,29 @@ 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))));
   }
   if (v.tag === "Publish") {
-    return _bind(_map((v$1) => {
-    })(_liftEffect(publish(v._1)(v._2))))(() => _liftEffect(log("Published")));
+    return _map((v$1) => {
+    })(_liftEffect(publish(v._1)(v._2)));
   }
   fail();
 };
@@ -28429,7 +28446,8 @@ var callback = (v) => {
     return log(showErrorImpl(v._1));
   }
   if (v.tag === "Right") {
-    return log("Success");
+    return () => {
+    };
   }
   fail();
 };
@@ -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(