@explorable-viz/fluid 0.0.23 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.0.23",
+  "version": "0.7.2",
   "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": {
@@ -11,38 +11,35 @@
     "PureScript",
     "JavaScript"
   ],
-  "author": "explorable-viz",
+  "author": "Fluid Contributors",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/explorable-viz/fluid/issues"
   },
   "homepage": "https://f.luid.org",
-  "files": ["dist/article/"],
+  "files": [
+    "dist/fluid/",
+    "script/rebundle-website.sh",
+    "script/util/clean.sh",
+    "script/util/lisp_case.sh"
+  ],
   "scripts": {
     "tidy": "./script/tidy.sh",
-
-    "build-app": "./script/build.sh app App",
-    "serve-app": "./script/serve.sh app",
-
-    "build-artifact": "./script/build.sh artifact Artifact",
-    "serve-artifact": "./script/serve.sh artifact",
-
-    "build-standalone-all": "./script/build-standalone-all.sh",
-    "build-standalone": "./script/build-standalone.sh",
-
-    "build-bench": "./script/build.sh bench Test.Benchmark",
-    "bench": "./script/serve.sh bench",
-
-    "build": "./script/build.sh test Test.Test",
+    "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",
+    "serve": "./script/serve.sh",
     "test": "./script/test.sh",
     "test-browser": "./script/test.sh --browsers=Chrome --singleRun=false",
-
-    "build-puppeteer": "./script/build.sh test-puppeteer Test.Puppeteer --platform=node",
-    "test-puppeteer": "./script/test-puppeteer.sh",
-
-    "build-article": "./script/build-article.sh",
-
-    "npm-publish": "./script/npm-publish.sh"
+    "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"
   },
   "dependencies": {
     "@codemirror/commands": "6.2.2",
@@ -54,9 +51,12 @@
     "datetime": "^0.0.3",
     "express": "^4.19.2",
     "express-static": "^1.2.6",
+    "http-serve": "^1.0.1",
     "http-shutdown": "^1.2.2",
+    "node": "^22.11.0",
     "node-process": "^1.0.1",
-    "purescript": "^0.15.10"
+    "os": "^0.1.2",
+    "util": "^0.12.5"
   },
   "devDependencies": {
     "esbuild": "0.15.1",
@@ -65,16 +65,18 @@
     "karma-chrome-launcher": "3.1.1",
     "karma-mocha": "2.0.1",
     "karma-mocha-reporter": "2.2.5",
-    "mocha": "10.0.0",
-    "puppeteer": "^23.1.0",
+    "mocha": "^10.0.0",
+    "puppeteer": "^23.2.0",
+    "purescript": "^0.15.10",
     "purescript-language-server": "0.16.6",
     "purescript-psa": "0.8.2",
-    "purs-backend-es": "1.1.0",
+    "purs-backend-es": "1.4.2",
     "purs-tidy": "^0.9.3",
     "spago": "^0.21.0",
     "typescript": "^5.5.3"
   },
   "bin": {
-    "fluid": "./fluid.js"
-  }
+    "fluid": "./dist/fluid/fluid.mjs"
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

package/script/rebundle-website.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+set -xe
+
+WEBSITE="Misc"
+
+while getopts "w:" opt; do
+   case $opt in
+      w) WEBSITE="$OPTARG";;
+   esac
+done
+
+SRC_PATH=${WEBSITE//./\/}
+SRC_PATH_LISP_CASE=$(./script/util/lisp-case.sh "$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=$(./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
+        if [[ -e "website/$SRC_PATH.html" ]]; then
+            ./script/util/clean.sh $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=$(./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 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/util/clean.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -xe
+
+rm -rf dist/$1
+mkdir -p dist/$1