@effindomv2/fui-as 0.1.3 → 0.1.5

package/browser/src/common-harness/host-imports.ts

@@ -45,6 +45,15 @@ export interface HostImportDeps {
 }
 
 export function createHostImportModule(deps: HostImportDeps) {
+  function safeNotify(label: string, notify: () => void): void {
+    try {
+      notify();
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(`[fui_host] ${label}: ${message}`);
+    }
+  }
+
   return {
     request_render(): void {
       const runtime = deps.getRuntime();
@@ -229,14 +238,18 @@ export function createHostImportModule(deps: HostImportDeps) {
         if (deps.getCurrentSessionOrNull() !== session) {
           return;
         }
-        deps.notifySvgLoaded(session, svgId, result.width, result.height);
+        safeNotify(`failed to deliver SVG ${String(svgId)} success callback`, () => {
+          deps.notifySvgLoaded(session, svgId, result.width, result.height);
+        });
       }).catch((error: unknown) => {
         const message = error instanceof Error ? error.message : String(error);
         console.error(`[fui_host] SVG ${String(svgId)} failed to load from ${url}: ${message}`);
         if (deps.getCurrentSessionOrNull() !== session) {
           return;
         }
-        deps.notifySvgFailed(session, svgId, message);
+        safeNotify(`failed to deliver SVG ${String(svgId)} failure callback`, () => {
+          deps.notifySvgFailed(session, svgId, message);
+        });
       });
     },
     fui_load_texture(textureId: number, ptr: number, len: number): void {
@@ -247,14 +260,18 @@ export function createHostImportModule(deps: HostImportDeps) {
         if (deps.getCurrentSessionOrNull() !== session) {
           return;
         }
-        deps.notifyTextureLoaded(session, textureId, result.width, result.height);
+        safeNotify(`failed to deliver texture ${String(textureId)} success callback`, () => {
+          deps.notifyTextureLoaded(session, textureId, result.width, result.height);
+        });
       }).catch((error: unknown) => {
         const message = error instanceof Error ? error.message : String(error);
         console.error(`[fui_host] texture ${String(textureId)} failed to load from ${url}: ${message}`);
         if (deps.getCurrentSessionOrNull() !== session) {
           return;
         }
-        deps.notifyTextureFailed(session, textureId, message);
+        safeNotify(`failed to deliver texture ${String(textureId)} failure callback`, () => {
+          deps.notifyTextureFailed(session, textureId, message);
+        });
       });
     },
     fui_release_svg(svgId: number): void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-as",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 AssemblyScript frontend framework SDK and browser harness",
@@ -67,17 +67,18 @@
     "LICENSES"
   ],
   "scripts": {
-    "build": "bash scripts/build.sh",
-    "build:only": "bash scripts/build.sh",
-    "build:full": "bash scripts/build.sh",
+    "guard:runtime-dependency": "bash scripts/check-runtime-dependency.sh",
+    "build": "npm run guard:runtime-dependency && bash scripts/build.sh",
+    "build:only": "npm run guard:runtime-dependency && bash scripts/build.sh",
+    "build:full": "npm run guard:runtime-dependency && bash scripts/build.sh",
     "build:demo:as": "bash scripts/build-demo-as.sh",
-    "test:unit": "asp --verbose -c as-pect.config.mjs -a as-pect.asconfig.json",
+    "test:unit": "npm run guard:runtime-dependency && asp --verbose -c as-pect.config.mjs -a as-pect.asconfig.json",
     "test:integration": "npm run build:full && playwright test -c playwright.config.ts",
-    "typecheck": "tsc -p tsconfig.json --noEmit"
+    "typecheck": "npm run guard:runtime-dependency && tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
     "@assemblyscript/loader": "^0.28.17",
-    "@effindomv2/runtime": "0.1.0"
+    "@effindomv2/runtime": "0.1.1"
   },
   "devDependencies": {
     "@as-pect/assembly": "8.1.0",

package/scripts/build-demo-as.sh

@@ -5,13 +5,11 @@ set -euo pipefail
 PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 REPO_ROOT="$(cd "${PACKAGE_DIR}/../.." && pwd)"
 DEMO_OUT_DIR="${REPO_ROOT}/public/v2/fui-as/demo"
-MVC_OUT_DIR="${REPO_ROOT}/public/v2/fui-as/demo-mvc"
-HELLO_OUT_DIR="${REPO_ROOT}/public/v2/fui-as/demo-hello-world"
 HOST_SERVICE_GENERATOR_BUILD="${PACKAGE_DIR}/build/generate-host-services.mjs"
 HOST_EVENT_GENERATOR_BUILD="${PACKAGE_DIR}/build/generate-host-events.mjs"
 BUILD_TARGET="${1:-all}"
 
-mkdir -p "${PACKAGE_DIR}/build" "${DEMO_OUT_DIR}" "${MVC_OUT_DIR}" "${HELLO_OUT_DIR}" "${PACKAGE_DIR}/templates/demo-mvc/src/host/generated" "${PACKAGE_DIR}/templates/demo-hello-world/src/host/generated"
+mkdir -p "${PACKAGE_DIR}/build" "${DEMO_OUT_DIR}"
 cd "${PACKAGE_DIR}"
 
 build_demo_app() {
@@ -77,10 +75,6 @@ generate_host_services "demo/src/host-services.ts" "demoHostServices" "demo/src/
 generate_host_events "demo/src/host-events.ts" "demoHostEvents" "demo/src/generated/HostEvents.ts"
 generate_host_services "demo/src/worker-host-services.ts" "demoWorkerHostServices" "demo/src/generated/WorkerHostServices.ts"
 generate_host_services "scripts/framework-host-services.ts" "frameworkHostServices" "src/core/generated/FrameworkHostServices.ts" "" "fui_host"
-generate_host_services "templates/demo-hello-world/src/host/host-services.ts" "appHostServices" "templates/demo-hello-world/src/host/generated/HostServices.ts" "../../fui/FuiPrimitives"
-generate_host_events "templates/demo-hello-world/src/host/host-events.ts" "appHostEvents" "templates/demo-hello-world/src/host/generated/HostEvents.ts" "../../fui/FuiPrimitives"
-generate_host_services "templates/demo-mvc/src/host/host-services.ts" "appHostServices" "templates/demo-mvc/src/host/generated/HostServices.ts" "../../fui/FuiPrimitives"
-generate_host_events "templates/demo-mvc/src/host/host-events.ts" "appHostEvents" "templates/demo-mvc/src/host/generated/HostEvents.ts" "../../fui/FuiPrimitives"
 
 case "${BUILD_TARGET}" in
   all)
@@ -88,9 +82,6 @@ case "${BUILD_TARGET}" in
     build_demo_app "demo/src/routes/demo_home.ts" "${DEMO_OUT_DIR}/home.wasm"
     build_demo_app "demo/src/routes/demo_advanced_controls.ts" "${DEMO_OUT_DIR}/advanced-controls.wasm"
     build_demo_app "demo/src/routes/templated-controls.ts" "${DEMO_OUT_DIR}/templated-controls.wasm"
-    build_demo_app "templates/demo-mvc/src/routes/mvc_home.ts" "${MVC_OUT_DIR}/mvc-home.wasm"
-    build_demo_app "templates/demo-mvc/src/routes/mvc_settings.ts" "${MVC_OUT_DIR}/mvc-settings.wasm"
-    build_demo_app "templates/demo-hello-world/src/App.ts" "${HELLO_OUT_DIR}/app.wasm"
     ;;
   dashboard)
     build_demo_app "demo/src/dashboard.ts" "${DEMO_OUT_DIR}/demo.wasm"
@@ -104,18 +95,9 @@ case "${BUILD_TARGET}" in
   templated-controls|templated)
     build_demo_app "demo/src/routes/templated-controls.ts" "${DEMO_OUT_DIR}/templated-controls.wasm"
     ;;
-  mvc-home|mvc-home-page)
-    build_demo_app "templates/demo-mvc/src/routes/mvc_home.ts" "${MVC_OUT_DIR}/mvc-home.wasm"
-    ;;
-  mvc-settings|mvc-settings-page)
-    build_demo_app "templates/demo-mvc/src/routes/mvc_settings.ts" "${MVC_OUT_DIR}/mvc-settings.wasm"
-    ;;
-  hello-world|hello)
-    build_demo_app "templates/demo-hello-world/src/App.ts" "${HELLO_OUT_DIR}/app.wasm"
-    ;;
   *)
     echo "Unknown build target: ${BUILD_TARGET}" >&2
-    echo "Usage: bash scripts/build-demo-as.sh [all|dashboard|home|advanced-controls|templated-controls|mvc-home|mvc-settings|hello-world]" >&2
+    echo "Usage: bash scripts/build-demo-as.sh [all|dashboard|home|advanced-controls|templated-controls]" >&2
     exit 1
     ;;
 esac

package/scripts/build.sh

@@ -8,8 +8,6 @@ BROWSER_SRC_DIR="${PACKAGE_DIR}/browser/src"
 SMOKE_FIXTURE_DIR="${PACKAGE_DIR}/tests/fixtures/smoke"
 OUT_DIR="${REPO_ROOT}/public/v2/fui-as"
 DEMO_OUT_DIR="${OUT_DIR}/demo"
-MVC_OUT_DIR="${OUT_DIR}/demo-mvc"
-HELLO_OUT_DIR="${OUT_DIR}/demo-hello-world"
 WORKER_BUILD_DIR="${PACKAGE_DIR}/build/workers"
 WORKER_BOOTSTRAP_BUILD="${PACKAGE_DIR}/build/worker-bootstrap.js"
 WORKER_BOOTSTRAP_MAP_BUILD="${PACKAGE_DIR}/build/worker-bootstrap.js.map"
@@ -24,7 +22,7 @@ RUNTIME_CONFIG_FILE="effindom-runtime-config.js"
 DEFAULT_MANIFEST_PATH="./runtime/dist/effindom.v2.manifest.json"
 
 rm -rf "${OUT_DIR}"
-mkdir -p "${PACKAGE_DIR}/build" "${OUT_DIR}" "${DEMO_OUT_DIR}" "${MVC_OUT_DIR}" "${HELLO_OUT_DIR}" "${WORKER_BUILD_DIR}" "${PACKAGE_DIR}/templates/demo-mvc/src/host/generated" "${PACKAGE_DIR}/templates/demo-hello-world/src/host/generated"
+mkdir -p "${PACKAGE_DIR}/build" "${OUT_DIR}" "${DEMO_OUT_DIR}" "${WORKER_BUILD_DIR}"
 
 cd "${PACKAGE_DIR}"
 
@@ -253,19 +251,12 @@ generate_host_services "demo/src/host-services.ts" "demoHostServices" "demo/src/
 generate_host_events "demo/src/host-events.ts" "demoHostEvents" "demo/src/generated/HostEvents.ts"
 generate_host_services "demo/src/worker-host-services.ts" "demoWorkerHostServices" "demo/src/generated/WorkerHostServices.ts"
 generate_host_services "scripts/framework-host-services.ts" "frameworkHostServices" "src/core/generated/FrameworkHostServices.ts" "" "fui_host"
-generate_host_services "templates/demo-hello-world/src/host/host-services.ts" "appHostServices" "templates/demo-hello-world/src/host/generated/HostServices.ts" "../../fui/FuiPrimitives"
-generate_host_events "templates/demo-hello-world/src/host/host-events.ts" "appHostEvents" "templates/demo-hello-world/src/host/generated/HostEvents.ts" "../../fui/FuiPrimitives"
-generate_host_services "templates/demo-mvc/src/host/host-services.ts" "appHostServices" "templates/demo-mvc/src/host/generated/HostServices.ts" "../../fui/FuiPrimitives"
-generate_host_events "templates/demo-mvc/src/host/host-events.ts" "appHostEvents" "templates/demo-mvc/src/host/generated/HostEvents.ts" "../../fui/FuiPrimitives"
 
 build_app "tests/fixtures/smoke/app.ts" "${OUT_DIR}/app.wasm"
 build_app "demo/src/dashboard.ts" "${DEMO_OUT_DIR}/demo.wasm"
 build_app "demo/src/routes/demo_home.ts" "${DEMO_OUT_DIR}/home.wasm"
 build_app "demo/src/routes/demo_advanced_controls.ts" "${DEMO_OUT_DIR}/advanced-controls.wasm"
 build_app "demo/src/routes/templated-controls.ts" "${DEMO_OUT_DIR}/templated-controls.wasm"
-build_app "templates/demo-mvc/src/routes/mvc_home.ts" "${MVC_OUT_DIR}/mvc-home.wasm"
-build_app "templates/demo-mvc/src/routes/mvc_settings.ts" "${MVC_OUT_DIR}/mvc-settings.wasm"
-build_app "templates/demo-hello-world/src/App.ts" "${HELLO_OUT_DIR}/app.wasm"
 build_workers
 write_worker_manifest
 
@@ -287,24 +278,6 @@ npx esbuild "${PACKAGE_DIR}/demo/harness.ts" \
   --outfile="${DEMO_OUT_DIR}/harness.js" \
   --sourcemap
 
-npx esbuild "${PACKAGE_DIR}/templates/demo-mvc/harness.ts" \
-  --bundle \
-  --format=esm \
-  --platform=browser \
-  --target=es2020 \
-  --minify \
-  --outfile="${MVC_OUT_DIR}/harness.js" \
-  --sourcemap
-
-npx esbuild "${PACKAGE_DIR}/templates/demo-hello-world/harness.ts" \
-  --bundle \
-  --format=esm \
-  --platform=browser \
-  --target=es2020 \
-  --minify \
-  --outfile="${HELLO_OUT_DIR}/harness.js" \
-  --sourcemap
-
 npx esbuild "${BROWSER_SRC_DIR}/file-processing-worker.ts" \
   --bundle \
   --format=iife \
@@ -318,10 +291,6 @@ cp "${FILE_PROCESSING_WORKER_BUILD}" "${OUT_DIR}/file-processing-worker.js"
 cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${OUT_DIR}/file-processing-worker.js.map"
 cp "${FILE_PROCESSING_WORKER_BUILD}" "${DEMO_OUT_DIR}/file-processing-worker.js"
 cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${DEMO_OUT_DIR}/file-processing-worker.js.map"
-cp "${FILE_PROCESSING_WORKER_BUILD}" "${MVC_OUT_DIR}/file-processing-worker.js"
-cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${MVC_OUT_DIR}/file-processing-worker.js.map"
-cp "${FILE_PROCESSING_WORKER_BUILD}" "${HELLO_OUT_DIR}/file-processing-worker.js"
-cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${HELLO_OUT_DIR}/file-processing-worker.js.map"
 
 npx esbuild "${BROWSER_SRC_DIR}/worker-bootstrap.ts" \
   --bundle \
@@ -343,43 +312,18 @@ npx esbuild "${PACKAGE_DIR}/demo/worker-host-services.ts" \
 
 cp "${SMOKE_FIXTURE_DIR}/index.html" "${OUT_DIR}/index.html"
 cp "${PACKAGE_DIR}/demo/index.html" "${DEMO_OUT_DIR}/index.html"
-cp "${PACKAGE_DIR}/templates/demo-hello-world/index.html" "${HELLO_OUT_DIR}/index.html"
 cp "${PACKAGE_DIR}/demo/demo-texture.png" "${DEMO_OUT_DIR}/demo-texture.png"
 cp "${PACKAGE_DIR}/demo/demo-secondary-texture.png" "${DEMO_OUT_DIR}/demo-secondary-texture.png"
 
 mkdir -p "${DEMO_OUT_DIR}/advanced-controls" "${DEMO_OUT_DIR}/templated-controls"
 cp "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/advanced-controls/index.html"
 cp "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/templated-controls/index.html"
-mkdir -p "${MVC_OUT_DIR}/mvc-home" "${MVC_OUT_DIR}/mvc-settings"
-cp "${PACKAGE_DIR}/templates/demo-mvc/route-shell.html" "${MVC_OUT_DIR}/mvc-home/index.html"
-cp "${PACKAGE_DIR}/templates/demo-mvc/route-shell.html" "${MVC_OUT_DIR}/mvc-settings/index.html"
-cat > "${MVC_OUT_DIR}/index.html" <<'EOF'
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="refresh" content="0; url=./mvc-home/" />
-  <title>FUI-AS MVC Demo</title>
-</head>
-<body>
-  <p>Redirecting to <a href="./mvc-home/">MVC Home</a>…</p>
-</body>
-</html>
-EOF
 
 copy_runtime_assets "${OUT_DIR}"
 copy_runtime_assets "${DEMO_OUT_DIR}"
-copy_runtime_assets "${MVC_OUT_DIR}"
-copy_runtime_assets "${HELLO_OUT_DIR}"
 copy_worker_assets "${OUT_DIR}"
 copy_worker_assets "${DEMO_OUT_DIR}"
-copy_worker_assets "${MVC_OUT_DIR}"
-copy_worker_assets "${HELLO_OUT_DIR}"
 write_runtime_config "${OUT_DIR}" "${DEFAULT_MANIFEST_PATH}"
 write_runtime_config "${DEMO_OUT_DIR}" "${DEFAULT_MANIFEST_PATH}"
-write_runtime_config "${MVC_OUT_DIR}" "${DEFAULT_MANIFEST_PATH}"
-write_runtime_config "${HELLO_OUT_DIR}" "${DEFAULT_MANIFEST_PATH}"
 write_runtime_config "${DEMO_OUT_DIR}/advanced-controls" "../runtime/dist/effindom.v2.manifest.json"
 write_runtime_config "${DEMO_OUT_DIR}/templated-controls" "../runtime/dist/effindom.v2.manifest.json"
-write_runtime_config "${MVC_OUT_DIR}/mvc-home" "../runtime/dist/effindom.v2.manifest.json"
-write_runtime_config "${MVC_OUT_DIR}/mvc-settings" "../runtime/dist/effindom.v2.manifest.json"

package/scripts/check-runtime-dependency.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+REPO_ROOT="$(cd "${PACKAGE_DIR}/../.." && pwd)"
+PACKAGE_JSON="${PACKAGE_DIR}/package.json"
+RUNTIME_PACKAGE_JSON="${REPO_ROOT}/v2/browser-bridge/package.json"
+
+if [ ! -f "${PACKAGE_JSON}" ]; then
+  echo "Missing package.json at ${PACKAGE_JSON}" >&2
+  exit 1
+fi
+
+runtime_spec="$(
+  node -e '
+    const fs = require("node:fs");
+    const pkg = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+    process.stdout.write(String(pkg.dependencies?.["@effindomv2/runtime"] ?? ""));
+  ' "${PACKAGE_JSON}"
+)"
+
+if [ -z "${runtime_spec}" ]; then
+  echo "@effindomv2/runtime must be declared in dependencies." >&2
+  exit 1
+fi
+
+if ! printf '%s' "${runtime_spec}" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+([-.][0-9A-Za-z.]+)?$'; then
+  echo "@effindomv2/runtime must be pinned to an exact version, found: ${runtime_spec}" >&2
+  exit 1
+fi
+
+if [ -f "${RUNTIME_PACKAGE_JSON}" ]; then
+  runtime_version="$(
+    node -e '
+      const fs = require("node:fs");
+      const pkg = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+      process.stdout.write(String(pkg.version ?? ""));
+    ' "${RUNTIME_PACKAGE_JSON}"
+  )"
+
+  if [ -n "${runtime_version}" ] && [ "${runtime_spec}" != "${runtime_version}" ]; then
+    echo "@effindomv2/fui-as depends on @effindomv2/runtime@${runtime_spec}, but monorepo runtime is ${runtime_version}." >&2
+    echo "Update v2/fui-as/package.json to match v2/browser-bridge/package.json." >&2
+    exit 1
+  fi
+fi
+

package/src/Fui.ts

@@ -1,4 +1,10 @@
-export { Application, ApplicationRegistration, createApplication, createManagedApplication } from "./core/Application";
+export {
+  Application,
+  ApplicationRegistration,
+  ManagedApplicationController,
+  createApplication,
+  createManagedApplication,
+} from "./core/Application";
 export { Action, CallbackAction, HandlerAction, NodeAction, SignalHandler } from "./core/Action";
 export { ObjectDisposedError } from "./core/Errors";
 export {

package/src/core/Application.ts

@@ -271,6 +271,20 @@ export class Application<TPage> {
   }
 }
 
+export class ManagedApplicationController {
+  getRoot(): Node {
+    throw new Error("ManagedApplicationController.getRoot() must be overridden.");
+  }
+
+  mount(): void {
+    Application.mount(this.getRoot());
+  }
+
+  dispose(): void {
+    Application.unmount();
+  }
+}
+
 function getNodeRoot(page: Node): Node {
   return page;
 }
@@ -283,11 +297,21 @@ export function createApplication(buildPage: () => Node): Application<Node> {
 
 export function createManagedApplication<TPage>(
   buildPage: () => TPage,
-  getRoot: (page: TPage) => Node,
-  mountPage: ((page: TPage) => void) | null,
-  disposePage: ((page: TPage) => void) | null,
+  getRoot: ((page: TPage) => Node) | null = null,
+  mountPage: ((page: TPage) => void) | null = null,
+  disposePage: ((page: TPage) => void) | null = null,
 ): Application<TPage> {
-  const app = new Application<TPage>(buildPage, getRoot, mountPage, disposePage);
+  let managedGetRootFn: (page: TPage) => Node;
+  let managedMountPageFn = mountPage;
+  let managedDisposePageFn = disposePage;
+  if (getRoot === null) {
+    managedGetRootFn = (page: TPage): Node => changetype<ManagedApplicationController>(page).getRoot();
+    managedMountPageFn = (page: TPage): void => changetype<ManagedApplicationController>(page).mount();
+    managedDisposePageFn = (page: TPage): void => changetype<ManagedApplicationController>(page).dispose();
+  } else {
+    managedGetRootFn = getRoot;
+  }
+  const app = new Application<TPage>(buildPage, managedGetRootFn, managedMountPageFn, managedDisposePageFn);
   exportedApplication = changetype<Application<Node>>(app);
   return app;
 }

package/src/nodes/ScrollBox.ts

@@ -39,7 +39,7 @@ export class ScrollBox extends FlexBox {
   private scrollbarGutterValue: f32 = DEFAULT_SCROLLBAR_GUTTER;
   private verticalChromeVisibleValue: bool = false;
   private horizontalChromeVisibleValue: bool = false;
-  private persistScrollValue: bool = false;
+  private persistScrollValue: bool = true;
   private persistedScrollRestorePending: bool = false;
 
   constructor(scrollState: ScrollState = new ScrollState(), viewportOverride: ScrollView | null = null) {

package/src/nodes/ScrollView.ts

@@ -60,7 +60,7 @@ export class ScrollView extends Node {
   private pendingProgrammaticOffsetY: f32 = 0.0;
   private hasFriction: bool = false;
   private _scrollState: ScrollState = new ScrollState();
-  private persistScrollValue: bool = false;
+  private persistScrollValue: bool = true;
   private persistedScrollRestorePending: bool = false;
   private transitionsValue: NodeTransitions | null = null;
   private scrollOffsetTransitionAnimation: Animation | null = null;