@explorable-viz/fluid 0.7.22 → 0.7.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.7.22",
+  "version": "0.7.24",
   "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": {
@@ -19,9 +19,9 @@
   "homepage": "https://f.luid.org",
   "files": [
     "dist/fluid/",
-    "script/bundle-website.sh",
-    "script/util/",
-    "script/bundle-page.sh"
+    "script/rebundle-website.sh",
+    "script/util/clean.sh",
+    "script/util/lisp_case.sh"
   ],
   "scripts": {
     "tidy": "./script/tidy.sh",

package/script/rebundle-website.sh

@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+set -xe
+
+WEBSITE="Misc"
+SCRIPT_ROOT=false
+
+
+while getopts "w:r:" opt; do
+   case $opt in
+      w) WEBSITE="$OPTARG";;
+      r) SCRIPT_ROOT="$OPTARG";;
+   esac
+done
+
+if [[ "$SCRIPT_ROOT" = true ]]; then
+    CLEAN=./node_modules/@explorable-viz/fluid/script/util/clean.sh
+    LISP_CASE=./node_modules/@explorable-viz/fluid/script/util/lisp-case.sh
+    DIST="node_modules/@explorable-viz/fluid/dist"
+else
+    CLEAN=./script/util/clean.sh
+    LISP_CASE=./script/util/lisp-case.sh
+    DIST="dist"
+fi
+
+
+SRC_PATH=${WEBSITE//./\/}
+SRC_PATH_LISP_CASE=$($LISP_CASE "$SRC_PATH")
+echo "$SRC_PATH -> $SRC_PATH_LISP_CASE"
+
+shopt -s nullglob
+
+set +x
+PAGES=($(for FILE in website/$WEBSITE/*.html; do
+    basename "$FILE" | sed 's/\.[^.]*$//'
+done | sort -u))
+set -x
+for PAGE in "${PAGES[@]}"; do
+    MODULE=$WEBSITE.$PAGE
+    SRC_PATH=${MODULE//./\/}
+    SRC_PATH_LISP_CASE=$($LISP_CASE "$SRC_PATH")
+    echo "$SRC_PATH -> $SRC_PATH_LISP_CASE"
+
+    if [[ ! -e "website/$SRC_PATH.purs" ]]; then
+        $CLEAN $SRC_PATH_LISP_CASE
+
+        cp website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
+    else
+        if [[ -e "website/$SRC_PATH.html" ]]; then
+            $CLEAN $SRC_PATH_LISP_CASE
+
+            cp website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
+        fi
+    fi
+    
+    if [[ -e "website/$SRC_PATH.json" ]]; then
+        echo "exists"
+        cp website/$SRC_PATH.json dist/$SRC_PATH_LISP_CASE/spec.json
+    else
+        if [[ ! -e "website/$SRC_PATH.json" ]]; then
+            echo "doesn't exist"
+        fi
+    fi
+done
+
+
+WEBSITE_LISP_CASE=$($LISP_CASE "$WEBSITE")
+
+set +x
+TO_COPY=()
+for CHILD in website/$WEBSITE/*; do
+   BASENAME="$(basename "$CHILD")"
+   if [[ "$BASENAME" =~ ^[a-z] ]]; then
+      TO_COPY+=("$CHILD")
+   fi
+done
+set -x
+
+echo "Processing shared files:"
+cp -r $DIST/fluid/shared dist/$WEBSITE_LISP_CASE/shared
+cp $DIST/fluid/load-fig.js dist/$WEBSITE_LISP_CASE/shared/load-fig.js
+
+cp -r $DIST/fluid/font dist/$WEBSITE_LISP_CASE/font
+cp -r $DIST/fluid/css dist/$WEBSITE_LISP_CASE/css
+cp $DIST/fluid/favicon.ico dist/$WEBSITE_LISP_CASE/favicon.ico
+
+echo "Processing static files:"
+
+for CHILD in "${TO_COPY[@]}"; do
+   BASENAME="$(basename "$CHILD")"
+   cp -r "$CHILD" "dist/$WEBSITE_LISP_CASE/$BASENAME"
+   done
+
+shopt -u nullglob
+cp -r fluid dist/$WEBSITE_LISP_CASE
+echo "Bundled website $WEBSITE"

package/script/bundle-page.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# run from project root
-set -xe
-
-MODULE=$1
-SRC_PATH=${MODULE//./\/}
-SRC_PATH_LISP_CASE=$(./script/util/lisp-case.sh "$SRC_PATH")
-echo "$SRC_PATH -> $SRC_PATH_LISP_CASE"
-
-if [[ ! -e "website/$SRC_PATH.purs" ]]; then
-   ./script/util/clean.sh $SRC_PATH_LISP_CASE
-   cp website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
-else
-   ./script/util/bundle.sh $SRC_PATH_LISP_CASE Website.$MODULE
-
-   if [[ -e "website/$SRC_PATH.html" ]]; then
-      cp website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
-   else
-      cp website/FluidOrg/template.html dist/$SRC_PATH_LISP_CASE/index.html
-   fi
-fi

package/script/bundle-website.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-# run from project root
-set -xe
-
-ROOT_DIR=""
-WEBSITE="Misc"
-
-while getopts "r:w:" opt; do
-   case $opt in
-      r) ROOT_DIR="$OPTARG";;
-      w) WEBSITE="$OPTARG";;
-   esac
-done
-
-. $ROOT_DIR script/bundle-page.sh $WEBSITE
-
-# Only support one level of nesting for now
-shopt -s nullglob
-
-set +x
-PAGES=($(for FILE in website/$WEBSITE/*.purs; do
-   basename "$FILE" | sed 's/\.[^.]*$//'
-done | sort -u))
-set -x
-
-echo "Processing ${WEBSITE} pages: ${PAGES[@]}"
-
-for PAGE in "${PAGES[@]}"; do
-   . script/bundle-page.sh $WEBSITE.$PAGE
-   done
-
-WEBSITE_LISP_CASE=$(./script/util/lisp-case.sh "$WEBSITE")
-
-set +x
-TO_COPY=()
-for CHILD in website/$WEBSITE/*; do
-   BASENAME="$(basename "$CHILD")"
-   if [[ "$BASENAME" =~ ^[a-z] ]]; then
-      TO_COPY+=("$CHILD")
-   fi
-done
-set -x
-
-echo "Processing static files:"
-
-for CHILD in "${TO_COPY[@]}"; do
-   BASENAME="$(basename "$CHILD")"
-   cp -rL "$CHILD" "dist/$WEBSITE_LISP_CASE/$BASENAME"
-   done
-
-shopt -u nullglob
-cp -r fluid dist/$WEBSITE_LISP_CASE
-echo "Bundled website $WEBSITE"

package/script/util/bundle.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -xe
-yarn purs-backend-es bundle-app --main $2 --to dist/$1/fluid.js ${@:3} > /dev/null

package/script/util/compile.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -xe
-
-rm -rf output
-rm -rf output-es
-yarn tidy
-yarn spago build --purs-args '--strict --censor-codes=UserDefinedWarning'

package/script/util/lisp-case.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-toLispCase() {
-   INPUT="$1"
-   RESULT=$(echo "$INPUT" | sed -E 's/([a-z0-9])([A-Z])/\1-\2/g' | tr '[:upper:]' '[:lower:]')
-   echo "$RESULT"
-}
-
-toLispCase "$1"