@explorable-viz/fluid 0.12.3 → 0.12.5

package/output-es/Web.XHR.ResponseType/index.js

@@ -0,0 +1,5 @@
+const string = "";
+const document = "document";
+const blob = "blob";
+const arrayBuffer = "arraybuffer";
+export {arrayBuffer, blob, document, string};

package/output-es/Web.XHR.XMLHttpRequest/foreign.js

@@ -0,0 +1,41 @@
+export function _xmlHttpRequest(respType) {
+  var xhr = new XMLHttpRequest();
+  xhr.responseType = respType;
+  return xhr;
+}
+
+export function _abort(xhr) {
+  xhr.abort();
+}
+
+export function _getAllResponseHeaders(xhr) {
+  return xhr.getAllResponseHeaders();
+}
+
+export function _getResponseHeader(header, xhr) {
+  return xhr.getResponseHeader(header);
+}
+
+export function _open(method, url, username, password, xhr) {
+  xhr.open(method, url, true, username, password);
+}
+
+export function _overrideMimeType(mimeType, xhr) {
+  xhr.overrideMimeType(mimeType);
+}
+
+export function _send(payload, xhr) {
+  xhr.send(payload);
+}
+
+export function _setRequestHeader(header, value, xhr) {
+  xhr.setRequestHeader(header, value);
+}
+
+export function _setProperty(prop, value, xhr) {
+  xhr[prop] = value;
+}
+
+export function _getProperty(prop, xhr) {
+  return xhr[prop];
+}

package/output-es/Web.XHR.XMLHttpRequest/index.js

@@ -0,0 +1,95 @@
+import * as $runtime from "../runtime.js";
+import * as Data$dHTTP$dMethod from "../Data.HTTP.Method/index.js";
+import * as Data$dMaybe from "../Data.Maybe/index.js";
+import * as Data$dNullable from "../Data.Nullable/index.js";
+import * as Effect$dUncurried from "../Effect.Uncurried/index.js";
+import * as Unsafe$dCoerce from "../Unsafe.Coerce/index.js";
+import * as Web$dXHR$dReadyState from "../Web.XHR.ReadyState/index.js";
+import {_abort, _getAllResponseHeaders, _getProperty, _getResponseHeader, _open, _overrideMimeType, _send, _setProperty, _setRequestHeader, _xmlHttpRequest} from "./foreign.js";
+const xmlHttpRequest = /* #__PURE__ */ Effect$dUncurried.runEffectFn1(_xmlHttpRequest);
+const withCredentials = xhr => () => _getProperty("withCredentials", xhr);
+const upload = xhr => () => _getProperty("upload", xhr);
+const toEventTarget = Unsafe$dCoerce.unsafeCoerce;
+const timeout = xhr => () => _getProperty("timeout", xhr);
+const statusText = xhr => () => _getProperty("statusText", xhr);
+const status = xhr => () => _getProperty("status", xhr);
+const setWithCredentials = wc => xhr => () => _setProperty("withCredentials", wc, xhr);
+const setTimeout = ms => xhr => () => _setProperty("timeout", ms, xhr);
+const setRequestHeader = header => value => xhr => () => _setRequestHeader(header, value, xhr);
+const sendString = payload => xhr => () => _send(payload, xhr);
+const sendFormData = payload => xhr => () => _send(payload, xhr);
+const sendDocument = payload => xhr => () => _send(payload, xhr);
+const sendBlob = payload => xhr => () => _send(payload, xhr);
+const sendArrayView = payload => xhr => () => _send(payload, xhr);
+const send = xhr => () => _send(Data$dNullable.null, xhr);
+const responseURL = xhr => () => _getProperty("responseURL", xhr);
+const response = xhr => () => {
+  const a$p = _getProperty("response", xhr);
+  return Data$dNullable.nullable(a$p, Data$dMaybe.Nothing, Data$dMaybe.Just);
+};
+const readyState = xhr => () => {
+  const a$p = _getProperty("readyState", xhr);
+  if (a$p === 0) { return Web$dXHR$dReadyState.Unsent; }
+  if (a$p === 1) { return Web$dXHR$dReadyState.Opened; }
+  if (a$p === 2) { return Web$dXHR$dReadyState.HeadersReceived; }
+  if (a$p === 3) { return Web$dXHR$dReadyState.Loading; }
+  if (a$p === 4) { return Web$dXHR$dReadyState.Done; }
+  return Web$dXHR$dReadyState.Unsent;
+};
+const overrideMimeType = ty => req => () => _overrideMimeType(ty, req);
+const open$p = options => xhr => {
+  const $0 = Data$dHTTP$dMethod.print(options.method);
+  const $1 = options.url;
+  const $2 = (() => {
+    if (options.username.tag === "Nothing") { return Data$dNullable.null; }
+    if (options.username.tag === "Just") { return Data$dNullable.notNull(options.username._1); }
+    $runtime.fail();
+  })();
+  const $3 = (() => {
+    if (options.password.tag === "Nothing") { return Data$dNullable.null; }
+    if (options.password.tag === "Just") { return Data$dNullable.notNull(options.password._1); }
+    $runtime.fail();
+  })();
+  return () => _open($0, $1, $2, $3, xhr);
+};
+const open = method => url => xhr => {
+  const $0 = Data$dHTTP$dMethod.print(method);
+  return () => _open($0, url, Data$dNullable.null, Data$dNullable.null, xhr);
+};
+const getResponseHeader = header => xhr => () => {
+  const a$p = _getResponseHeader(header, xhr);
+  return Data$dNullable.nullable(a$p, Data$dMaybe.Nothing, Data$dMaybe.Just);
+};
+const getAllResponseHeaders = xhr => () => {
+  const a$p = _getAllResponseHeaders(xhr);
+  return Data$dNullable.nullable(a$p, Data$dMaybe.Nothing, Data$dMaybe.Just);
+};
+const abort = /* #__PURE__ */ Effect$dUncurried.runEffectFn1(_abort);
+export {
+  abort,
+  getAllResponseHeaders,
+  getResponseHeader,
+  open,
+  open$p,
+  overrideMimeType,
+  readyState,
+  response,
+  responseURL,
+  send,
+  sendArrayView,
+  sendBlob,
+  sendDocument,
+  sendFormData,
+  sendString,
+  setRequestHeader,
+  setTimeout,
+  setWithCredentials,
+  status,
+  statusText,
+  timeout,
+  toEventTarget,
+  upload,
+  withCredentials,
+  xmlHttpRequest
+};
+export * from "./foreign.js";

package/output-es/Web.XHR.XMLHttpRequestUpload/index.js

@@ -0,0 +1,3 @@
+import * as Unsafe$dCoerce from "../Unsafe.Coerce/index.js";
+const toEventTarget = Unsafe$dCoerce.unsafeCoerce;
+export {toEventTarget};

package/output-es/Website.Test.Article.EnergyScatter/index.js

@@ -0,0 +1,12 @@
+import * as Control$dPromise from "../Control.Promise/index.js";
+import * as Data$dFoldable from "../Data.Foldable/index.js";
+import * as Effect$dAff from "../Effect.Aff/index.js";
+import * as Test$dUtil$dPuppeteer from "../Test.Util.Puppeteer/index.js";
+const testFig = page => {
+  const clickScatterPlotPoint = Effect$dAff._bind(Test$dUtil$dPuppeteer.waitFor("div#fig .scatterplot-point")(page))(() => Effect$dAff._bind(Test$dUtil$dPuppeteer.click("div#fig .scatterplot-point")(page))(() => Effect$dAff._bind(Test$dUtil$dPuppeteer.checkAttributeContains(page)("div#fig .scatterplot-point")("class")("selected-primary-persistent"))(() => Effect$dAff._bind(Test$dUtil$dPuppeteer.checkAttribute(page)("div#fig .scatterplot-point")("r")("3.2"))(() => Test$dUtil$dPuppeteer.checkTextContent(page)("div#fig-input-renewables > div.table-caption")("renewables (40 of 240 × 5 of 5)")))));
+  return Effect$dAff._bind(Test$dUtil$dPuppeteer.waitFor("svg")(page))(() => Effect$dAff._bind(Test$dUtil$dPuppeteer.clickToggle(page)("fig-data-pane"))(() => clickScatterPlotPoint));
+};
+const main = /* #__PURE__ */ Control$dPromise.fromAff(/* #__PURE__ */ Data$dFoldable.traverse_(Effect$dAff.applicativeAff)(Data$dFoldable.foldableArray)(Data$dFoldable.identity)(/* #__PURE__ */ Test$dUtil$dPuppeteer.testURL("energy-scatter")([
+  testFig
+])));
+export {main, testFig};

package/output-es/Website.Test.Article.RenewablesLinked/index.js

@@ -0,0 +1,14 @@
+import * as Control$dPromise from "../Control.Promise/index.js";
+import * as Data$dFoldable from "../Data.Foldable/index.js";
+import * as Effect$dAff from "../Effect.Aff/index.js";
+import * as Test$dUtil$dPuppeteer from "../Test.Util.Puppeteer/index.js";
+const testFig = page => {
+  const checkXTicks = Test$dUtil$dPuppeteer.waitFor("#fig-output > :nth-child(2) g.x-axis")(page);
+  const checkPointRadius = Effect$dAff._bind(Test$dUtil$dPuppeteer.waitFor("#fig-output > :nth-child(2) circle.linechart-point")(page))(() => Test$dUtil$dPuppeteer.checkAttribute(page)("#fig-output > :nth-child(2) circle.linechart-point")("r")("2.0"));
+  const clickBarChart = Effect$dAff._bind(Test$dUtil$dPuppeteer.waitFor("#fig-output > :nth-child(1) rect.bar")(page))(() => Effect$dAff._bind(Test$dUtil$dPuppeteer.click("#fig-output > :nth-child(1) rect.bar")(page))(() => Test$dUtil$dPuppeteer.checkAttribute(page)("#fig-output > :nth-child(1) rect.bar")("fill")("#57a157")));
+  return Effect$dAff._bind(Test$dUtil$dPuppeteer.waitFor("#fig-output > :nth-child(1)")(page))(() => Effect$dAff._bind(Test$dUtil$dPuppeteer.waitFor("#fig-output > :nth-child(2)")(page))(() => Effect$dAff._bind(checkXTicks)(() => Effect$dAff._bind(checkPointRadius)(() => Effect$dAff._bind(Test$dUtil$dPuppeteer.clickToggle(page)("fig-data-pane"))(() => clickBarChart)))));
+};
+const main = /* #__PURE__ */ Control$dPromise.fromAff(/* #__PURE__ */ Data$dFoldable.traverse_(Effect$dAff.applicativeAff)(Data$dFoldable.foldableArray)(Data$dFoldable.identity)(/* #__PURE__ */ Test$dUtil$dPuppeteer.testURL("renewables-linked")([
+  testFig
+])));
+export {main, testFig};

package/output-es/package.json

@@ -0,0 +1 @@
+{"type": "module"}

package/output-es/runtime.js

@@ -0,0 +1,33 @@
+export function binding(init) {
+  let state = 0;
+  let value;
+
+  return () => {
+    if (state === 2) {
+      return value;
+    }
+    if (state === 1) {
+      throw new Error("Binding demanded before initialized");
+    }
+    state = 1;
+    value = init();
+    state = 2;
+    return value;
+  };
+}
+
+export function* range(lo, hi) {
+  for (let i = lo; i < hi; i++) {
+    yield i;
+  }
+}
+
+export function fail() {
+  throw new Error("Failed pattern match");
+}
+
+export function intDiv(x, y) {
+  if (y > 0) return Math.floor(x / y);
+  if (y < 0) return -Math.floor(x / -y);
+  return 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "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",
@@ -19,13 +19,15 @@
   "files": [
     "dist/fluid/shared",
     "dist/fluid/fluid/lib",
+    "output-es",
     "web/lib",
-    "website/article"
+    "website/article",
+    "script/webtest-lib.mjs"
   ],
   "scripts": {
     "build": "./script/build.sh",
     "build-prod": "BUILD_ENV=prod ./script/build.sh",
-    "build-publish": "yarn build-prod && ./script/stage-website.sh article && yarn npm publish --access public",
+    "build-publish": "yarn build-prod && ./script/stage-website.sh article && npm publish --access public",
     "build-test": "./script/build-test.sh",
     "bundle-fluid": "./script/bundle-fluid.sh",
     "fluid": "node ./dist/fluid/shared/fluid.mjs",

package/script/install-website.sh

@@ -18,10 +18,23 @@ if [ -e "$DEST" ]; then
    exit 1
 fi
 
-echo "Installing $WEBSITE from $SRC..."
+# Get the installed version of @explorable-viz/fluid
+VERSION=$(node -e "console.log(require('./$NPM_ROOT/package.json').version)")
+
+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"
+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/webtest-lib.mjs

@@ -0,0 +1,101 @@
+import puppeteer from "puppeteer"
+
+const TIMEOUT = 60000
+const LOGGING = true
+const HEADLESS = true
+const VIEWPORT = { width: 1200, height: 800, deviceScaleFactor: 1.0 }
+
+function log(msg) {
+   if (LOGGING) console.log(msg)
+}
+
+function testOutcome(pass, msg) {
+   const sym = pass ? "\x1b[32m ✔\x1b[0m" : "\x1b[31m ✖\x1b[0m"
+   console.log(`${sym} ${msg}`)
+   if (!pass) throw new Error("Test failed")
+}
+
+async function launchBrowser(browserName) {
+   return puppeteer.launch({
+      browser: browserName,
+      headless: HEADLESS,
+      defaultViewport: VIEWPORT,
+   })
+}
+
+export async function waitFor(page, selector) {
+   log(`Waiting for ${selector}`)
+   try {
+      await page.waitForSelector(selector, { timeout: TIMEOUT, visible: true })
+      log("-> found")
+      testOutcome(true, `${selector}: exists`)
+   } catch (e) {
+      testOutcome(false, `${selector}: ${e.message}`)
+   }
+}
+
+export async function waitForHidden(page, selector) {
+   log(`Waiting for ${selector} (hidden)`)
+   await page.waitForSelector(selector, { timeout: TIMEOUT, visible: false })
+   log("-> found")
+}
+
+export async function click(page, selector) {
+   await page.click(selector)
+   testOutcome(true, `${selector}: click`)
+}
+
+export async function checkAttribute(page, selector, attr, expected) {
+   const found = await page.$eval(selector, (el, a) => el.getAttribute(a), attr)
+   const pass = found === expected
+   const errorMsg = pass ? "" : ` (got "${found}")`
+   testOutcome(pass, `${selector}: ${attr} == "${expected}"${errorMsg}`)
+}
+
+export async function checkAttributeContains(page, selector, attr, expected) {
+   const found = await page.$eval(selector, (el, a) => el.getAttribute(a), attr)
+   const pass = found.includes(expected)
+   const errorMsg = pass ? "" : ` (got "${found}")`
+   testOutcome(pass, `${selector}: ${attr} contains "${expected}"${errorMsg}`)
+}
+
+export async function checkTextContent(page, selector, expected) {
+   await waitFor(page, selector)
+   const text = await page.$eval(selector, el => el.textContent)
+   const pass = text === expected
+   testOutcome(pass, `${selector}: text == "${expected}"${pass ? "" : ` (got "${text}")`}`)
+}
+
+export async function checkComputedStyle(page, selector, property, expected) {
+   await waitFor(page, selector)
+   const value = await page.$eval(selector, (el, prop) => getComputedStyle(el)[prop], property)
+   const pass = value === expected
+   testOutcome(pass, `${selector}: ${property} == "${expected}"${pass ? "" : ` (got "${value}")`}`)
+}
+
+export async function clickToggle(page) {
+   await waitFor(page, "#grid.data-pane-hidden")
+   const toggle = "button[title='Show data pane']"
+   await waitFor(page, toggle)
+   await click(page, toggle)
+   await waitFor(page, "#grid:not(.data-pane-hidden)")
+}
+
+async function browserTests(url, browserName, tests) {
+   log(`browserTests: ${browserName}`)
+   const browser = await launchBrowser(browserName)
+   const page = await browser.newPage()
+   for (const test of tests) {
+      await page.goto(url)
+      await test(page)
+   }
+   await browser.close()
+}
+
+const BASE_URL = process.env.BASE_URL || "http://127.0.0.1:8080"
+
+export async function testURL(suffix, tests) {
+   const url = `${BASE_URL}/${suffix}`
+   await browserTests(url, "chrome", tests)
+   await browserTests(url, "firefox", tests)
+}