@effindomv2/fui-as 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-as",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 AssemblyScript frontend framework SDK and browser harness",

package/scripts/build-demo-as.sh

@@ -88,8 +88,8 @@ 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-mvc/src/routes/HomeApp.ts" "${MVC_OUT_DIR}/home.wasm"
+    build_demo_app "templates/demo-mvc/src/routes/SettingsApp.ts" "${MVC_OUT_DIR}/settings.wasm"
     build_demo_app "templates/demo-hello-world/src/App.ts" "${HELLO_OUT_DIR}/app.wasm"
     ;;
   dashboard)
@@ -104,18 +104,18 @@ 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"
+  routed-home|route-home|home-route)
+    build_demo_app "templates/demo-mvc/src/routes/HomeApp.ts" "${MVC_OUT_DIR}/home.wasm"
     ;;
-  mvc-settings|mvc-settings-page)
-    build_demo_app "templates/demo-mvc/src/routes/mvc_settings.ts" "${MVC_OUT_DIR}/mvc-settings.wasm"
+  routed-settings|route-settings|settings-route)
+    build_demo_app "templates/demo-mvc/src/routes/SettingsApp.ts" "${MVC_OUT_DIR}/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|routed-home|routed-settings|hello-world]" >&2
     exit 1
     ;;
 esac

package/scripts/build.sh

@@ -263,8 +263,8 @@ 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-mvc/src/routes/HomeApp.ts" "${MVC_OUT_DIR}/home.wasm"
+build_app "templates/demo-mvc/src/routes/SettingsApp.ts" "${MVC_OUT_DIR}/settings.wasm"
 build_app "templates/demo-hello-world/src/App.ts" "${HELLO_OUT_DIR}/app.wasm"
 build_workers
 write_worker_manifest
@@ -350,19 +350,19 @@ cp "${PACKAGE_DIR}/demo/demo-secondary-texture.png" "${DEMO_OUT_DIR}/demo-second
 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"
+mkdir -p "${MVC_OUT_DIR}/home" "${MVC_OUT_DIR}/settings"
+cp "${PACKAGE_DIR}/templates/demo-mvc/route-shell.html" "${MVC_OUT_DIR}/home/index.html"
+cp "${PACKAGE_DIR}/templates/demo-mvc/route-shell.html" "${MVC_OUT_DIR}/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>
+  <meta http-equiv="refresh" content="0; url=./home/" />
+  <title>FUI-AS Routed Demo</title>
 </head>
 <body>
-  <p>Redirecting to <a href="./mvc-home/">MVC Home</a>…</p>
+  <p>Redirecting to <a href="./home/">Home</a>…</p>
 </body>
 </html>
 EOF
@@ -381,5 +381,5 @@ 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"
+write_runtime_config "${MVC_OUT_DIR}/home" "../runtime/dist/effindom.v2.manifest.json"
+write_runtime_config "${MVC_OUT_DIR}/settings" "../runtime/dist/effindom.v2.manifest.json"

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;
 }