@explorable-viz/fluid 0.7.30 → 0.7.32

package/README.md

@@ -8,35 +8,50 @@ Fluid is an experimental programming language which integrates a bidirectional d
 ## Installation
 
 ### Software required
-- Windows users: Ubuntu (WSL)
 - git
 - Node.js >=14.0.0
-- yarn
+- yarn >= 1.22
 
-### For Windows Users
-- Clone the repository under Ubuntu WSL
+Additionally, for Windows users only:
 
-### Notes
-- Run `./script/setup/dev-setup.sh` after cloning repository
-- Avoid having PureScript installed globally
-- `Add Npm Path` is selected in PureScript IDE extension settings
-- VSCode for Windows users:
-	- Launch VSCode through Ubuntu (WSL) terminal
-	- Install WSL extension in VSCode
+- [Ubuntu WSL](https://ubuntu.com/desktop/wsl)
+
+### Building
+
+- Clone the repository (for Windows users, do this under the Ubuntu WSL)
+- Run `./script/setup/dev-setup.sh` from the top-level directory
+- Run `yarn build`
 
 #### Running tests on command line
-- `yarn build` and then `yarn test-all`
+
+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`
-- Hit Debug in the browser window that opens, and then open Developer Tools or equivalent
+- 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 the fluid.org website locally
-- `yarn build`
-- `yarn serve fluid-org`
+
+(Assumes you have already run `yarn build`)
+
+- `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
+
 Rebuild with `puppeteerTests.headless` set to `false` to run in browser. Then:
 - `yarn bundle-website X`
 - `./script/test-page.sh X X.Y`
+
+## Development via VS Code
+
+The following are some notes on developing Fluid using VS Code.
+
+- Avoid having PureScript installed globally
+- Install the PureScript IDE extension
+- In the PureScript IDE extension settings, select `Add Npm Path`
+
+- For Windows users:
+	- Launch VSCode through Ubuntu (WSL) terminal
+	- Install WSL extension in VSCode

package/dist/fluid/fluid/dataset/ssp126-2081-2100.fld

@@ -0,0 +1,194 @@
+[
+  {
+    model: "NorESM2-LM",
+    world: 15.76,
+    world_historical: 14.5,
+    changed: 1.01
+  },
+  {
+    model: "NorESM2-MM",
+    world: 15.22,
+    world_historical: 13.92,
+    changed: 1.05
+  },
+  {
+    model: "GFDL-ESM4",
+    world: 14.82,
+    world_historical: 13.5,
+    changed: 1.07
+  },
+  {
+    model: "CAMS-CSM1-0",
+    world: 15.13,
+    world_historical: 13.8,
+    changed: 1.09
+  },
+  {
+    model: "BCC-CSM2-MR",
+    world: 16.29,
+    world_historical: 14.82,
+    changed: 1.22
+  },
+  {
+    model: "INM-CM4-8",
+    world: 14.79,
+    world_historical: 13.31,
+    changed: 1.23
+  },
+  {
+    model: "FGOALS-g3",
+    world: 14.3,
+    world_historical: 12.81,
+    changed: 1.24
+  },
+  {
+    model: "MPI-ESM1-2-LR",
+    world: 15.03,
+    world_historical: 13.54,
+    changed: 1.24
+  },
+  {
+    model: "INM-CM5-0",
+    world: 14.64,
+    world_historical: 13.14,
+    changed: 1.25
+  },
+  {
+    model: "IITM-ESM",
+    world: 15.56,
+    world_historical: 13.99,
+    changed: 1.32
+  },
+  {
+    model: "MPI-ESM1-2-HR",
+    world: 15.51,
+    world_historical: 13.94,
+    changed: 1.32
+  },
+  {
+    model: "MIROC6",
+    world: 16.72,
+    world_historical: 15.12,
+    changed: 1.35
+  },
+  {
+    model: "MIROC-ES2L",
+    world: 16.6,
+    world_historical: 14.96,
+    changed: 1.39
+  },
+  {
+    model: "MRI-ESM2-0",
+    world: 15.47,
+    world_historical: 13.74,
+    changed: 1.47
+  },
+  {
+    model: "KIOST-ESM",
+    world: 14.22,
+    world_historical: 12.4,
+    changed: 1.57
+  },
+  {
+    model: "AWI-CM-1-1-MR",
+    world: 15.72,
+    world_historical: 13.76,
+    changed: 1.72
+  },
+  {
+    model: "NESM3",
+    world: 15.64,
+    world_historical: 13.66,
+    changed: 1.73
+  },
+  {
+    model: "ACCESS-ESM1-5",
+    world: 16.54,
+    world_historical: 14.54,
+    changed: 1.75
+  },
+  {
+    model: "CNRM-ESM2-1",
+    world: 15.65,
+    world_historical: 13.64,
+    changed: 1.76
+  },
+  {
+    model: "EC-Earth3",
+    world: 16.02,
+    world_historical: 13.94,
+    changed: 1.83
+  },
+  {
+    model: "CNRM-CM6-1",
+    world: 15.0,
+    world_historical: 12.88,
+    changed: 1.87
+  },
+  {
+    model: "CESM2",
+    world: 16.21,
+    world_historical: 14.02,
+    changed: 1.94
+  },
+  {
+    model: "IPSL-CM6A-LR",
+    world: 15.17,
+    world_historical: 12.88,
+    changed: 2.04
+  },
+  {
+    model: "CESM2-WACCM",
+    world: 16.23,
+    world_historical: 13.84,
+    changed: 2.14
+  },
+  {
+    model: "ACCESS-CM2",
+    world: 16.27,
+    world_historical: 13.84,
+    changed: 2.18
+  },
+  {
+    model: "UKESM1-0-LL",
+    world: 16.06,
+    world_historical: 13.45,
+    changed: 2.36
+  },
+  {
+    model: "EC-Earth3-Veg",
+    world: 16.15,
+    world_historical: 13.53,
+    changed: 2.37
+  },
+  {
+    model: "HadGEM3-GC31-LL",
+    world: 16.34,
+    world_historical: 13.71,
+    changed: 2.38
+  },
+  {
+    model: "CMCC-CM2-SR5",
+    world: 16.87,
+    world_historical: 14.1,
+    changed: 2.52
+  },
+  {
+    model: "CNRM-CM6-1-HR",
+    world: 15.12,
+    world_historical: 12.32,
+    changed: 2.54
+  },
+  {
+    model: "CanESM5",
+    world: 16.39,
+    world_historical: 13.54,
+    changed: 2.61
+  },
+  {
+    model: "KACE-1-0-G",
+    world: 16.47,
+    world_historical: 13.55,
+    changed: 2.67
+  }
+]

package/dist/fluid/fluid/example/dict-list-comp.fld

@@ -1 +1 @@
-[ x | {fst: x, snd: []} <- [{fst: 5, third: "hello", snd: []}, {fst: 6, snd: [7, 8]}] ]
+[ x | {fst: x, snd: []} <- [{fst: 5, third: "hello", snd: []}, {fst: 6, snd: [7, 8]}] ]

package/dist/fluid/fluid/example/slicing/qcut.fld

@@ -0,0 +1,2 @@
+let data = mergesort [ x.changed | x <- ssp126]
+in qcut data [ 5, 50, 95 ]

package/dist/fluid/fluid/lib/prelude.fld

@@ -264,3 +264,13 @@ let nub xs =
 -- Int -> Int -> [a] -> [a]
 let slice begin end xs =
    take (end - begin) (drop begin xs);
+
+
+-- (a -> Boolean) -> List a -> (List a, List a)
+let splitOn p data = 
+    let go fls trs [] = (reverse fls, reverse trs);
+        go fls trs (x : xs) = 
+            if p x
+            then go fls (x : trs) xs
+            else go (x : fls) trs xs
+    in go [] [] data;

package/dist/fluid/fluid/lib/stats.fld

@@ -0,0 +1,57 @@
+let split [] = ([], []);
+    split (x : xs) =
+      let (ys, zs) = split xs in (x : zs, ys);
+
+let merge xs ys =
+       match (xs, ys) as {
+          ([], _) -> ys;
+          (x : xs', []) -> xs;
+          (x : xs', y : ys') ->
+             if x < y
+             then x : merge xs' ys
+             else y : merge xs ys'
+       };
+
+let mergesort xs =
+       if length xs < 2
+       then xs
+       else
+          let (ys, zs) = split xs in
+          merge (mergesort ys) (mergesort zs);
+
+-- assume data is sorted
+let findQuantile q p data = 
+    let rank = (p / q) * (length data - 1)
+    in if rank == floor rank
+    then nth rank data
+    else let x1 = floor rank;
+             x2 = ceiling rank;
+             left = nth x1 data;
+             right = nth x2 data
+        in left + (rank - x1) * (right - left);
+
+let findPercentile = findQuantile 100;
+
+let accumBins data Nil = [];
+    accumBins data [l] = [];
+    accumBins data (l : r : es) =  
+        let (ge, le) = splitOn (fun x -> x <= r) data
+        in (le , r - l) : accumBins ge (r : es);
+
+let cut data nbins = 
+    let low = minimum data;
+        binwidth = (maximum data - low) / nbins;
+        edges = [ low + (x * binwidth) | x <- enumFromTo 0 nbins ]
+    in accumBins data edges;
+
+let qcut data qs = 
+        let low = minimum data;
+            high = maximum data;
+            edges = append (low : [ findPercentile x data | x <- qs], [high])
+        in accumBins data edges;
+
+let likelihoodLE data target = 
+    length (filter (fun x -> x <= target) data) / length data;
+
+let likelihoodGE data target = 
+    length (filter (fun x -> x >= target) data) / length data;

package/dist/fluid/fluid.mjs

@@ -25066,7 +25066,7 @@ var toAff2 = (f) => (a) => (b) => {
 // output-es/Module.Node/index.js
 var loadFile = (v) => (v1) => (dictMonadAff) => {
   const Monad0 = dictMonadAff.MonadEffect0().Monad0();
-  return (dictMonadError) => Monad0.Bind1().bind(dictMonadAff.liftAff(toAff2(readTextFile)(ASCII)(v + "/" + v1 + ".fld")))((buffer) => Monad0.Applicative0().pure(buffer));
+  return (dictMonadError) => Monad0.Bind1().bind(dictMonadAff.liftAff(toAff2(readTextFile)(UTF8)(v + "/" + v1 + ".fld")))((buffer) => Monad0.Applicative0().pure(buffer));
 };
 
 // output-es/Node.ChildProcess/foreign.js
@@ -28365,41 +28365,6 @@ var graphEval2 = /* @__PURE__ */ graphEval(monadErrorAff);
 var fromFoldable29 = /* @__PURE__ */ (() => fromFoldableImpl(foldableList.foldr))();
 var Evaluate = (value0) => $Command("Evaluate", value0);
 var Publish = (value0) => (value1) => $Command("Publish", value0, value1);
-var publish = /* @__PURE__ */ (() => $Parser(
-  "MultP",
-  $MultPE(
-    parserFunctor.map(Publish)(parserFunctor.map(Folder)(option(readerAsk)((() => {
-      const $0 = help("root directory of website under dist/");
-      const $1 = $0._2._2.tag === "Nothing" ? Nothing : $0._2._2;
-      return $Mod(
-        (x) => $0._1({
-          optNames: [$OptName("OptShort", "w"), $OptName("OptLong", "website"), ...x.optNames],
-          optCompleter: x.optCompleter,
-          optNoArgError: x.optNoArgError
-        }),
-        $DefaultProp($Maybe("Just", "Misc"), $1.tag === "Nothing" ? Nothing : $1),
-        (x) => $0._3(x)
-      );
-    })()))),
-    $Parser(
-      "AltP",
-      flag$p(true)(foldableArray.foldMap(modMonoid)(identity3)([
-        $Mod(
-          flagFieldsHasName.name($OptName("OptLong", "local")),
-          $DefaultProp(Nothing, Nothing),
-          identity26
-        ),
-        $Mod(
-          flagFieldsHasName.name($OptName("OptShort", "l")),
-          $DefaultProp(Nothing, Nothing),
-          identity26
-        ),
-        help("Are you publishing from source (false), or an npm package (true)?")
-      ])),
-      $Parser("NilP", false)
-    )
-  )
-))();
 var parseImports = /* @__PURE__ */ $Parser(
   "BindP",
   /* @__PURE__ */ manyM(/* @__PURE__ */ option(readerAsk)(/* @__PURE__ */ (() => {
@@ -28417,7 +28382,7 @@ var parseImports = /* @__PURE__ */ $Parser(
     );
   })()))
 );
-var output = (v) => {
+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(
     void 0,
@@ -28436,25 +28401,26 @@ var copyOptions = {
   encoding: Nothing,
   shell: Nothing
 };
-var copyFiles = (website) => (b) => exec2(b ? "./node_modules/@explorable-viz/fluid/script/bundle-website.sh -w " + website + " -r true" : "./script/bundle-website.sh -w " + website)(copyOptions)((v) => {
+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 out = $0();
-      return log(out)();
+      const $1 = $0();
+      return log($1)();
     };
   }
   fail();
 });
 var dispatchCommand = (v) => {
   if (v.tag === "Evaluate") {
-    return _bind(output(v._1))((out) => _liftEffect(log(intercalate4("\n")(removeDocWS(prettyVal(highlightableUnit).pretty(out)).lines))));
+    return _bind(evaluate(v._1))((v1) => _liftEffect(log(intercalate4("\n")(removeDocWS(prettyVal(highlightableUnit).pretty(v1)).lines))));
   }
   if (v.tag === "Publish") {
-    return _bind(_liftEffect(copyFiles(v._1)(v._2)))(() => _liftEffect(log("Published")));
+    return _bind(_map((v$1) => {
+    })(_liftEffect(publish(v._1)(v._2))))(() => _liftEffect(log("Published")));
   }
   fail();
 };
@@ -28550,9 +28516,47 @@ var program = /* @__PURE__ */ (() => $Parser(
     })())
   )
 ))();
+var commands = /* @__PURE__ */ (() => ({
+  publish: $Parser(
+    "MultP",
+    $MultPE(
+      parserFunctor.map(Publish)(parserFunctor.map(Folder)(option(readerAsk)((() => {
+        const $0 = help("root directory of website under dist/");
+        const $1 = $0._2._2.tag === "Nothing" ? Nothing : $0._2._2;
+        return $Mod(
+          (x) => $0._1({
+            optNames: [$OptName("OptShort", "w"), $OptName("OptLong", "website"), ...x.optNames],
+            optCompleter: x.optCompleter,
+            optNoArgError: x.optNoArgError
+          }),
+          $DefaultProp($Maybe("Just", "Misc"), $1.tag === "Nothing" ? Nothing : $1),
+          (x) => $0._3(x)
+        );
+      })()))),
+      $Parser(
+        "AltP",
+        flag$p(true)(foldableArray.foldMap(modMonoid)(identity3)([
+          $Mod(
+            flagFieldsHasName.name($OptName("OptLong", "local")),
+            $DefaultProp(Nothing, Nothing),
+            identity26
+          ),
+          $Mod(
+            flagFieldsHasName.name($OptName("OptShort", "l")),
+            $DefaultProp(Nothing, Nothing),
+            identity26
+          ),
+          help("Are you publishing from source (false), or an npm package (true)?")
+        ])),
+        $Parser("NilP", false)
+      )
+    )
+  ),
+  evaluate: parserFunctor.map(Evaluate)(program)
+}))();
 var commandParser = /* @__PURE__ */ subparser(/* @__PURE__ */ (() => {
   const $0 = command("evaluate")(progDesc("Evaluate a file")({
-    infoParser: parserFunctor.map(Evaluate)(program),
+    infoParser: commands.evaluate,
     infoFullDesc: true,
     infoProgDesc: mempty12,
     infoHeader: mempty12,
@@ -28561,7 +28565,7 @@ var commandParser = /* @__PURE__ */ subparser(/* @__PURE__ */ (() => {
     infoPolicy: Intersperse
   }));
   const $1 = command("publish")(progDesc("Publish a file")({
-    infoParser: publish,
+    infoParser: commands.publish,
     infoFullDesc: true,
     infoProgDesc: mempty12,
     infoHeader: mempty12,

package/dist/fluid/{load-fig.js → load-figure.js}

@@ -44249,7 +44249,7 @@ var gDecodeJsonCons = (dictDecodeJsonField) => (dictGDecodeJson) => (dictIsSymbo
 // output-es/Effect.Aff.Class/index.js
 var monadAffAff = { liftAff: (x2) => x2, MonadEffect0: () => monadEffectAff };
 
-// output-es/Website.LoadFigure/index.js
+// output-es/App.LoadFigure/index.js
 var gDecodeJsonCons2 = /* @__PURE__ */ gDecodeJsonCons(/* @__PURE__ */ (() => {
   const $0 = decodeArray(caseJsonString($Either(
     "Left",
@@ -44264,7 +44264,6 @@ var gDecodeJsonCons2 = /* @__PURE__ */ gDecodeJsonCons(/* @__PURE__ */ (() => {
     }
   };
 })());
-var specToCxt = (spec) => ({ datasets: spec.datasets, imports: spec.imports, file: spec.file, inputs: spec.inputs });
 var jsonToSpec = /* @__PURE__ */ (() => decodeRecord(gDecodeJsonCons((() => {
   const $0 = decodeArray(decodeTuple(caseJsonString($Either(
     "Left",
@@ -44299,6 +44298,7 @@ var jsonToSpec = /* @__PURE__ */ (() => decodeRecord(gDecodeJsonCons((() => {
 })(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 });
 var loadFigure = (fileName) => runAffs_((v) => drawFig(v._1)(v._2))([
   _bind($$get(driver)($ResponseFormat("Json", identity))(fileName))((result) => {
     if (result.tag === "Left") {
@@ -44319,8 +44319,8 @@ var loadFigure = (fileName) => runAffs_((v) => drawFig(v._1)(v._2))([
 var drawCode2 = (folder) => (file) => runAffs_(drawFile)([loadFile$p(folder)(file)(monadAffAff)(monadErrorAff)]);
 export {
   drawCode2 as drawCode,
+  figSpecFromJson,
   gDecodeJsonCons2 as gDecodeJsonCons,
   jsonToSpec,
-  loadFigure,
-  specToCxt
+  loadFigure
 };

package/dist/fluid/puppeteeer.js

@@ -0,0 +1,36 @@
+const express = require('express');
+const serve = require('express-static');
+require('http-shutdown').extend();
+
+const app = express();
+
+const root = __dirname + '/dist/' + process.argv[3];
+app.use(serve(root));
+
+const server = app.listen(8080, function() {
+  console.log("Serving content from " + root);
+}).withShutdown();
+
+(async () => {
+  try {
+    const module = process.argv[2]
+    console.log('Loading Puppeteer test module:', module);
+    import(module).then(({ main }) => {
+      main().then(serverDown);
+    }).catch(err => {
+      console.error("Failed to load PureScript output:", err);
+    });
+  } catch (error) {
+    console.error('Error:', error);
+  }
+})();
+
+function serverDown() {
+  console.log('Shutting down server')
+  server.shutdown(function(err) {
+    if (err) {
+      return console.log('shutdown failed', err.message);
+    }
+    console.log('Everything is cleanly shut down.');
+  });
+}