@noego/wood 0.1.0 → 0.1.2

package/src/client/controller_contract.ts

@@ -0,0 +1,18 @@
+import type { ControllerLifecycle } from '../controller/controller_lifecycle';
+export type { ControllerLifecycle } from '../controller/controller_lifecycle';
+
+export interface ControllerState {}
+
+export interface ControllerInput {}
+
+export interface ControllerEvents {}
+
+export interface PageController<
+  S extends ControllerState = ControllerState,
+  I extends ControllerInput = ControllerInput,
+  E extends ControllerEvents = ControllerEvents,
+> extends ControllerLifecycle {
+  readonly data?: S;
+  readonly input?: I;
+  readonly events?: E;
+}

package/src/components/NavigationShell.svelte

@@ -1,6 +1,8 @@
 <script lang="ts">
   import { setContext, onDestroy } from 'svelte';
   import { getNavigation } from '@noego/wood/navigation';
+  import { disposeControllerLifecycle } from '../controller/controller_lifecycle';
+  import { createNavigationMountKey } from '../navigation/navigation_identity';
   import WoodRecursiveRender from './WoodRecursiveRender.svelte';
 
   type ViewManifestEntry = {
@@ -48,6 +50,7 @@
   let activeLayoutControllers: Array<unknown> = $state(initialLayoutControllers);
   let activeParams: Record<string, unknown> = $state({});
   let activeQuery: Record<string, unknown> = $state({});
+  let activeMountKey = $state(createNavigationMountKey(initialEntry.key, {}));
 
   let activePage = $derived({
     key: activeEntry.key,
@@ -106,6 +109,13 @@
     }
   }
 
+  async function disposeActiveControllers(): Promise<void> {
+    await disposeControllerLifecycle(activeController);
+    for (const layoutController of activeLayoutControllers) {
+      await disposeControllerLifecycle(layoutController);
+    }
+  }
+
   setContext('wood:navigate', (
     viewKey: string,
     params?: Record<string, unknown>,
@@ -138,6 +148,7 @@
       if (navEntry) {
         activeParams = { ...navEntry.params };
         activeQuery = { ...navEntry.query };
+        activeMountKey = createNavigationMountKey(navEntry.page, navEntry.params);
       }
       return;
     }
@@ -148,12 +159,15 @@
     const entry = getViewManifestEntryFn(newKey);
     if (!entry) return;
 
-    if (newKey === activeEntry.key) {
+    const nextMountKey = createNavigationMountKey(newKey, navEntry.params);
+
+    if (nextMountKey === activeMountKey) {
       activeParams = { ...navEntry.params };
       activeQuery = { ...navEntry.query };
       return;
     }
 
+    await disposeActiveControllers();
     const [controller, layoutControllers] = await Promise.all([
       createViewControllerFn(entry),
       createLayoutControllersFn(entry),
@@ -164,6 +178,7 @@
     activeLayoutControllers = layoutControllers;
     activeParams = { ...navEntry.params };
     activeQuery = { ...navEntry.query };
+    activeMountKey = nextMountKey;
   });
 
   const bridge = getWoodBridge();
@@ -188,10 +203,11 @@
   onDestroy(() => {
     unsubscribe();
     unsubscribeWindowNavigate?.();
+    void disposeActiveControllers();
   });
 </script>
 
-{#key activeEntry.key}
+{#key activeMountKey}
   <WoodRecursiveRender
     layouts={activeEntry.layouts}
     layoutControllers={activeLayoutControllers}

package/src/controller/controller_lifecycle.ts

@@ -0,0 +1,24 @@
+export interface ControllerLifecycle {
+  dispose?(): void | Promise<void>;
+  destroy?(): void | Promise<void>;
+}
+
+/**
+ * Dispose a controller or controller-like instance if it exposes a lifecycle
+ * hook. `dispose` is the preferred Wood lifecycle name; `destroy` is supported
+ * for existing page controllers.
+ */
+export async function disposeControllerLifecycle(target: unknown): Promise<void> {
+  if (!target || (typeof target !== 'object' && typeof target !== 'function')) {
+    return;
+  }
+
+  const lifecycle = target as ControllerLifecycle;
+  if (typeof lifecycle.dispose === 'function') {
+    await lifecycle.dispose();
+    return;
+  }
+  if (typeof lifecycle.destroy === 'function') {
+    await lifecycle.destroy();
+  }
+}

package/src/navigation/navigation_identity.ts

@@ -0,0 +1,23 @@
+export type NavigationParams = Record<string, unknown>;
+
+function normalizeParamValue(value: unknown): string {
+  if (value === null || value === undefined) {
+    return '';
+  }
+  return String(value);
+}
+
+export function hashNavigationParams(params: NavigationParams = {}): string {
+  const normalizedEntries = Object.entries(params)
+    .map(([key, value]) => [String(key), normalizeParamValue(value)] as const)
+    .sort(([left], [right]) => left.localeCompare(right));
+
+  return JSON.stringify(normalizedEntries);
+}
+
+export function createNavigationMountKey(
+  page: string,
+  params: NavigationParams = {},
+): string {
+  return `${page}:${hashNavigationParams(params)}`;
+}

package/src/stick/WoodRecursiveRender.svelte

@@ -1,74 +0,0 @@
-<script lang="ts">
-    // SSR-only recursive layout renderer for stick (wood's visual preview CLI).
-    // Simplified version of Forge's RecursiveRender — no stores, navigation, or error boundaries.
-    let {
-        layouts = [],
-        view = null,
-        data = { layout: [], view: {} },
-        wood = undefined,
-    } = $props<{
-        layouts?: any[];
-        view?: any;
-        data?: { layout?: any[]; view?: any };
-        wood?: any;
-    }>();
-
-    let topLayout = $derived(layouts[0]);
-    let childLayouts = $derived(layouts.slice(1));
-    let topData = $derived((data.layout || [])[0]);
-    let otherData = $derived((data.layout || []).slice(1));
-    let viewData = $derived(data.view);
-    let recursiveChildData = $derived({
-        layout: otherData,
-        view: data.view,
-    });
-</script>
-
-{#if childLayouts.length > 0}
-    {#snippet nested_child()}
-        <svelte:self
-            layouts={childLayouts}
-            view={view}
-            data={recursiveChildData}
-            {wood}
-        />
-    {/snippet}
-    <svelte:component
-        this={topLayout}
-        {...(topData || {})}
-        data={topData?.controller?.data}
-        input={topData?.controller?.input}
-        events={topData?.controller?.events}
-        {wood}
-        children={nested_child}
-    />
-{:else if topLayout}
-    {#snippet view_child()}
-        <svelte:component
-            this={view}
-            {...(viewData || {})}
-            data={viewData?.controller?.data}
-            input={viewData?.controller?.input}
-            events={viewData?.controller?.events}
-            {wood}
-        />
-    {/snippet}
-    <svelte:component
-        this={topLayout}
-        {...(topData || {})}
-        data={topData?.controller?.data}
-        input={topData?.controller?.input}
-        events={topData?.controller?.events}
-        {wood}
-        children={view_child}
-    />
-{:else}
-    <svelte:component
-        this={view}
-        {...(viewData || {})}
-        data={viewData?.controller?.data}
-        input={viewData?.controller?.input}
-        events={viewData?.controller?.events}
-        {wood}
-    />
-{/if}