@explorable-viz/fluid 0.12.5 → 0.12.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.12.5",
+  "version": "0.12.7",
   "description": "A functional programming language which integrates a bidirectional dynamic analysis, connecting outputs to data sources in a fine-grained way. Fluid is implemented in PureScript and runs in the browser.",
   "repository": {
     "type": "git",
@@ -20,9 +20,11 @@
     "dist/fluid/shared",
     "dist/fluid/fluid/lib",
     "output-es",
+    "script/test-website.sh",
+    "script/util",
+    "script/webtest-lib.mjs",
     "web/lib",
-    "website/article",
-    "script/webtest-lib.mjs"
+    "website/article"
   ],
   "scripts": {
     "build": "./script/build.sh",
@@ -77,6 +79,7 @@
   },
   "svelte": "./web/lib/index.js",
   "exports": {
-    ".": "./web/lib/index.js"
+    ".": "./web/lib/index.js",
+    "./script/*": "./script/*"
   }
 }

package/script/install-website.sh

@@ -25,16 +25,13 @@ echo "Installing $WEBSITE from @explorable-viz/fluid@$VERSION..."
 mkdir -p "$(dirname "$DEST")"
 cp -r "$SRC" "$DEST"
 
-# Rewrite workspace:* dependency to the actual installed version
-sed -i.bak "s/\"workspace:\*\"/\"$VERSION\"/" "$DEST/package.json"
-# Remove monorepo-relative test script
-sed -i.bak "s|\"test\":.*test-website.sh\"|\"test\": \"echo 'No standalone test — run from project root'\"|" "$DEST/package.json"
+# Rewrite monorepo-relative paths for standalone use
+sed -i.bak \
+  -e "s/\"workspace:\*\"/\"$VERSION\"/" \
+  -e "s|../../fluid/script/|../../$NPM_ROOT/script/|" \
+  "$DEST/package.json"
 rm -f "$DEST/package.json.bak"
 
-# Rewrite webtest-lib import path for installed context
-sed -i.bak "s|../../script/webtest-lib.mjs|../../$NPM_ROOT/script/webtest-lib.mjs|" "$DEST/test.mjs"
-rm -f "$DEST/test.mjs.bak"
-
 # Recreate symlinks pointing into node_modules
 rm -rf "$DEST/static/fluid/lib"
 ln -s "../../../../$NPM_ROOT/dist/fluid/fluid/lib" "$DEST/static/fluid/lib"

package/script/test-website.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# Run from a website directory (e.g. website/article/) that has a test.mjs.
+set -e
+
+WEBSITE_DIR="$PWD"
+WEBSITE="$(basename "$WEBSITE_DIR")"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+echo "Testing website: ${WEBSITE}"
+
+"$SCRIPT_DIR/util/install-puppeteer.sh"
+
+cd "$WEBSITE_DIR"
+
+echo "Building ${WEBSITE}..."
+yarn build
+
+# Ensure port is free (previous test run may not have fully released it)
+if command -v lsof > /dev/null 2>&1; then
+   lsof -ti:8080 | xargs kill -9 2>/dev/null || true
+elif command -v fuser > /dev/null 2>&1; then
+   fuser -k 8080/tcp 2>/dev/null || true
+fi
+sleep 1
+
+echo "Starting preview server on port 8080..."
+npx vite preview --port 8080 --host 127.0.0.1 --strictPort &
+SERVER_PID=$!
+
+cleanup() {
+   echo "Shutting down preview server (PID $SERVER_PID)..."
+   kill "$SERVER_PID" 2>/dev/null || true
+   wait "$SERVER_PID" 2>/dev/null || true
+   # Ensure port is fully released before next test run
+   for i in $(seq 1 10); do
+      if ! curl -s http://127.0.0.1:8080/ > /dev/null 2>&1; then
+         break
+      fi
+      sleep 0.5
+   done
+   echo "Everything is cleanly shut down."
+}
+trap cleanup EXIT
+
+# Wait for server to be ready
+echo "Waiting for server..."
+for i in $(seq 1 30); do
+   if curl -s http://127.0.0.1:8080/ > /dev/null 2>&1; then
+      echo "Server is ready."
+      break
+   fi
+   if [ "$i" -eq 30 ]; then
+      echo "Error: Server failed to start within 30 seconds." >&2
+      exit 1
+   fi
+   sleep 1
+done
+
+"$SCRIPT_DIR/util/run-website-tests.sh"

package/script/util/bundle.sh

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

package/script/util/clean.sh

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

package/script/util/compile.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -xe
+
+rm -rf output-es
+yarn tidy
+
+if [ "$BUILD_ENV" = "prod" ]; then
+    echo "Building for production"
+    yarn spago --config spago.prod.dhall build --purs-args '--strict --censor-codes=UserDefinedWarning'
+else
+    echo "Building for development"
+    yarn spago build --purs-args '--strict --censor-codes=UserDefinedWarning'
+fi

package/script/util/install-puppeteer.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+FLUID_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+
+echo "Installing Puppeteer browsers..."
+cd "$FLUID_ROOT"
+yarn puppeteer browsers install chrome
+yarn puppeteer browsers install firefox

package/script/util/lisp-case.sh

@@ -0,0 +1,10 @@
+#!/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"

package/script/util/poll.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Poll until a shell command succeeds.
+# Usage: poll.sh <description> <max_attempts> <shell_command>
+set -e
+
+DESCRIPTION="$1"
+MAX_ATTEMPTS="$2"
+COMMAND="$3"
+
+echo "$DESCRIPTION"
+for i in $(seq 1 "$MAX_ATTEMPTS"); do
+   if eval "$COMMAND"; then
+      exit 0
+   fi
+   echo "  Attempt $i..."
+   sleep 10
+done
+echo "Error: $DESCRIPTION — timed out." >&2
+exit 1

package/script/util/run-website-tests.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Run test.mjs in the current directory against a base URL.
+# Usage: run-website-tests.sh <base-url>
+set -e
+
+BASE_URL="${1:-http://127.0.0.1:8080}"
+
+if [ ! -f "test.mjs" ]; then
+   echo "Error: no test.mjs in $(pwd)" >&2
+   exit 1
+fi
+
+echo "Running tests against $BASE_URL..."
+BASE_URL="$BASE_URL" node -e "import('./test.mjs').then(({ main }) => main()).then(() => process.exit(0)).catch(e => { console.error(e); process.exit(1); })"
+echo "Tests passed."

package/website/article/package.json

@@ -12,7 +12,7 @@
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"format": "prettier --write .",
 		"lint": "prettier --check . && eslint .",
-		"test": "../../script/test-website.sh"
+		"test": "../../fluid/script/test-website.sh"
 	},
 	"dependencies": {
 		"@explorable-viz/fluid": "workspace:*"

package/website/article/test.mjs

@@ -1,7 +1,7 @@
 import {
    checkAttribute, checkAttributeContains, checkComputedStyle, checkTextContent,
    click, clickToggle, testURL, waitFor
-} from "../../script/webtest-lib.mjs"
+} from "@explorable-viz/fluid/script/webtest-lib.mjs"
 
 export const main = async () => {
    await testURL("convolution", [