@explorable-viz/fluid 0.7.105 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.7.105",
+  "version": "0.8.0",
   "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": {

package/script/bundle-website.sh

@@ -29,7 +29,7 @@ echo "Processing other static files:"
 set +xu  # try to remove +u
 TO_COPY=()
 shopt -s dotglob extglob
-for CHILD in ${PREFIX}website/$WEBSITE/!(.|..); do
+for CHILD in website/$WEBSITE/!(.|..); do
    BASENAME="$(basename "$CHILD")"
    if [[ "$BASENAME" =~ ^[a-z.] ]]; then
       TO_COPY+=("$CHILD")
@@ -39,8 +39,7 @@ shopt -u extglob dotglob
 set -xu
 
 for CHILD in "${TO_COPY[@]}"; do
-   BASENAME="$(basename "$CHILD")"
-   cp -rL "$CHILD" "dist/$WEBSITE/$BASENAME"
+   cp -rL "$CHILD" dist/$WEBSITE
 done
 
 echo "Processing Fluid source files:"

package/website/article/convolution/index.html

@@ -83,8 +83,8 @@
 
 <script type="module">
    import { loadFigure, drawCode } from "../shared/load-figure.js"
-   drawCode("../fluid/lib")("matrix")()
-   loadFigure("spec.json")()
+   drawCode("../fluid/lib/matrix.fld")()
+   loadFigure("spec.json")("../fluid/convolution.fld")()
 </script>
 </body>
 </html>

package/website/article/convolution/spec.json

@@ -1,7 +1,5 @@
 {
     "fluidSrcPath": ["../fluid"],
-    "file": "convolution",
-    "imports": [ "convolution/test-image", "convolution/emboss" ],
     "datasets": [],
     "inputs": [ "inputImage", "filter" ],
     "query": true,

package/website/article/fluid/convolution.fld

@@ -1,3 +1,6 @@
+import convolution.testImage
+import convolution.emboss
+
 let lookup m n image =
     let (m_max, n_max) = dims image
     -- in image!(((m - 1) `mod` m_max) + 1, ((n - 1) `mod` n_max) + 1);

package/website/article/moving-average/index.html

@@ -51,7 +51,8 @@
 
 <script type="module">
    import { loadFigure } from "../shared/load-figure.js"
-   loadFigure("spec.json")()
+   loadFigure("spec.json")("../fluid/moving-average.fld")()
+   
 </script>
 </body>
 </html>

package/website/article/moving-average/spec.json

@@ -1,8 +1,6 @@
 {
     "fluidSrcPath": ["../fluid"],
-    "file": "moving-average",
-    "imports": [],
-    "datasets": [["methane", "dataset/methane-emissions"]],
+    "datasets": [["methane", "dataset/methane-emissions.fld"]],
     "inputs": ["methane"],
     "query": false,
     "linking": false

package/website/article/non-renewables/index.html

@@ -39,8 +39,8 @@
 </div>
 
 <script type="module">
-   import { drawCode, loadFigure } from "../shared/load-figure.js"
-   loadFigure("spec.json")()
+   import { loadFigure } from "../shared/load-figure.js"
+   loadFigure("spec.json")("../fluid/non-renewables.fld")()
 </script>
 </body>
 </html>

package/website/article/non-renewables/spec.json

@@ -1,8 +1,6 @@
 {
     "fluidSrcPath": ["../fluid"],
-    "datasets": [["renewables", "dataset/renewables-new"], ["nonRenewables", "dataset/non-renewables"]],
-    "imports": [],
-    "file": "non-renewables",
+    "datasets": [["renewables", "dataset/renewables-new.fld"], ["nonRenewables", "dataset/non-renewables.fld"]],
     "inputs": ["nonRenewables"],
     "query": false,
     "linking": true

package/website/article/transparent-text/index.html

@@ -37,9 +37,8 @@
 </div>
 
 <script type="module">
-    import { drawCode, loadFigure } from "../shared/load-figure.js";
-    loadFigure("spec.json")();
+    import { loadFigure } from "../shared/load-figure.js";
+    loadFigure("spec.json")("../fluid/1805.02474v1-10.fld")();
 </script>
 </body>
 </html>
-

package/website/article/transparent-text/spec.json

@@ -1,8 +1,7 @@
 {
   "imports" : [ "scigen", "util" ],
-  "file" : "1805.02474v1-10",
   "inputs" : [ "tableData" ],
-  "datasets" : [ [ "tableData", "dataset/scigen/1805.02474v1-10" ] ],
+  "datasets" : [ [ "tableData", "dataset/scigen/1805.02474v1-10.fld" ] ],
   "fluidSrcPath" : [ "../fluid" ],
   "query": false,
   "linking": true