@noego/wood 0.6.1 → 0.7.0

package/dist/testing/browser.cjs

@@ -28,8 +28,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var browser_exports = {};
 __export(browser_exports, {
-  browser: () => browser,
+  browserAssertions: () => browserAssertions,
   createBrowserBridgeFixture: () => createBrowserBridgeFixture,
+  createBrowserFixture: () => createBrowserFixture,
+  createWoodBrowserResolver: () => createWoodBrowserResolver,
+  loadSveltePlugin: () => loadSveltePlugin,
   startSharedBrowserViteServer: () => startSharedBrowserViteServer
 });
 module.exports = __toCommonJS(browser_exports);
@@ -40,6 +43,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_url = require("node:url");
 var import_tracing = require("../tracing/index.js");
 var import_trace_testing = require("../trace-testing/index.js");
+var import_renderer_app_generator = require("../codegen/renderer_app_generator.cjs");
 var import_geometry = require("./geometry.js");
 const DEFAULT_VIEWPORT = {
   width: 1280,
@@ -97,6 +101,16 @@ async function waitForBoundedClose(promise, timeoutMs = DEFAULT_RESOURCE_CLOSE_T
     clearTimeout(timeout);
   }
 }
+async function closeRequired(promise, owner) {
+  let timeout;
+  try {
+    await Promise.race([promise, new Promise((_, reject) => {
+      timeout = setTimeout(() => reject(new Error(`${owner} cleanup timed out`)), DEFAULT_RESOURCE_CLOSE_TIMEOUT_MS);
+    })]);
+  } finally {
+    if (timeout) clearTimeout(timeout);
+  }
+}
 function channelToManifestEntry(channel, handler) {
   const pathSegments = channel.split(".").filter(Boolean);
   const action = pathSegments.length > 0 ? pathSegments[pathSegments.length - 1] : channel;
@@ -256,6 +270,11 @@ function createWoodBrowserResolver(rootDir) {
     name: "wood-browser-resolver",
     enforce: "pre",
     resolveId(source) {
+      if (source.startsWith("@noego/wood/")) {
+        const resolved = resolvePackageModule(rootDir, source);
+        const esm = resolved?.endsWith(".cjs") ? resolved.replace(/\.cjs$/, ".js") : resolved;
+        return esm && import_node_fs.default.existsSync(esm) ? esm : null;
+      }
       if (source === "svelte") {
         return svelteClientEntry;
       }
@@ -339,14 +358,14 @@ function workerRuntimeKey(input) {
   ].join("::");
 }
 async function createBrowserWorkerRuntime(input) {
-  let browser2 = null;
+  let browser = null;
   let cacheRoot = null;
   let ownedServer = null;
   try {
     const playwrightBrowser = await loadPlaywright(input.browserName, input.rootDir);
     if (input.wsEndpoint) {
       try {
-        browser2 = await playwrightBrowser.connect(input.wsEndpoint);
+        browser = await playwrightBrowser.connect(input.wsEndpoint);
       } catch (error) {
         if (!browserConnectWarnings.has(input.wsEndpoint)) {
           browserConnectWarnings.add(input.wsEndpoint);
@@ -357,8 +376,8 @@ async function createBrowserWorkerRuntime(input) {
         }
       }
     }
-    if (!browser2) {
-      browser2 = await playwrightBrowser.launch({ headless: input.headless });
+    if (!browser) {
+      browser = await playwrightBrowser.launch({ headless: input.headless });
     }
     let vite;
     if (input.viteUrl) {
@@ -378,7 +397,7 @@ async function createBrowserWorkerRuntime(input) {
       };
     }
     return {
-      browser: browser2,
+      browser,
       vite,
       rootDir: input.rootDir,
       key: input.key,
@@ -388,7 +407,7 @@ async function createBrowserWorkerRuntime(input) {
     };
   } catch (error) {
     await Promise.all([
-      browser2?.close().catch(() => void 0),
+      browser?.close().catch(() => void 0),
       ownedServer?.close().catch(() => void 0)
     ]);
     if (cacheRoot) {
@@ -499,7 +518,19 @@ function assertFileExists(filePath, label) {
 function writeEntry(tempDir, name, source) {
   import_node_fs.default.mkdirSync(tempDir, { recursive: true });
   const entryPath = import_node_path.default.join(tempDir, `${name}.ts`);
-  import_node_fs.default.writeFileSync(entryPath, source);
+  import_node_fs.default.writeFileSync(entryPath, `import { unmount as __woodHarnessUnmount } from 'svelte';
+` + source + `
+let __woodHarnessClosing;
+window.__WOOD_BROWSER_UNMOUNT__ = () => __woodHarnessClosing ??= Promise.resolve().then(async () => {
+  const app = window.__WOOD_BROWSER_APP__;
+  if (!app) return;
+  try { await app.disposeNavigation?.(); }
+  finally {
+    await __woodHarnessUnmount(app);
+    window.__WOOD_BROWSER_APP__ = undefined;
+  }
+});
+`);
   return entryPath;
 }
 function writeHtml(tempDir, name, entryPath, cssFiles) {
@@ -532,103 +563,6 @@ function findView(views, routeKey) {
   }
   return found;
 }
-function resolveComponentPath(rootDir, componentDir, filePath) {
-  if (import_node_path.default.isAbsolute(filePath)) return filePath;
-  const base = componentDir ? resolveFromRoot(rootDir, componentDir) : rootDir;
-  const componentDirName = componentDir ? import_node_path.default.basename(componentDir) : "";
-  if (componentDirName && filePath.replace(/\\/g, "/").startsWith(`${componentDirName}/`)) {
-    return import_node_path.default.resolve(base, filePath.slice(componentDirName.length + 1));
-  }
-  return import_node_path.default.resolve(base, filePath);
-}
-function buildRouteEntrySource(input) {
-  const { view, rootDir, componentDir, routeKey, route } = input;
-  const viewPath = resolveComponentPath(rootDir, componentDir, view.viewPath);
-  const layoutPaths = view.layouts.map((layout) => resolveComponentPath(rootDir, componentDir, layout));
-  const controllerPath = view.controller ? resolveComponentPath(rootDir, componentDir, view.controller) : null;
-  const layoutControllerPaths = view.layoutControllers?.map(
-    (controller) => controller ? resolveComponentPath(rootDir, componentDir, controller) : null
-  ) ?? [];
-  const imports = [
-    `import { mount } from 'svelte';`,
-    `import NavigationShell from '@noego/wood/navigation-shell';`,
-    `import { getContainer } from '@noego/wood/client';`,
-    `import { getNavigation } from '@noego/wood/navigation';`,
-    `import ViewComponent from '${viteImport(viewPath)}';`,
-    ...layoutPaths.map((layoutPath, index) => `import Layout${index} from '${viteImport(layoutPath)}';`),
-    ...controllerPath ? [`import PageController from '${viteImport(controllerPath)}';`] : [],
-    ...layoutControllerPaths.map(
-      (controllerPath2, index) => controllerPath2 ? `import LayoutController${index} from '${viteImport(controllerPath2)}';` : ""
-    ).filter(Boolean)
-  ];
-  const layoutControllerClasses = layoutControllerPaths.map(
-    (controllerPath2, index) => controllerPath2 ? `LayoutController${index}` : "undefined"
-  );
-  return `${imports.join("\n")}
-
-const entry = {
-  key: ${JSON.stringify(routeKey)},
-  windowName: ${JSON.stringify(view.windowName)},
-  pageName: ${JSON.stringify(view.pageName)},
-  viewPath: ${JSON.stringify(view.viewPath)},
-  layoutPaths: ${JSON.stringify(view.layouts)},
-  layoutControllers: ${JSON.stringify(view.layoutControllers ?? [])},
-  controller: ${JSON.stringify(view.controller)},
-  layoutControllerClasses: [${layoutControllerClasses.join(", ")}],
-  controllerClass: ${controllerPath ? "PageController" : "undefined"},
-  view: ViewComponent,
-  layouts: [${layoutPaths.map((_, index) => `Layout${index}`).join(", ")}],
-};
-
-function createScopedContainer() {
-  const root = getContainer();
-  const scope = root.extend();
-  return scope;
-}
-
-async function resolveController(ControllerClass) {
-  if (!ControllerClass) return undefined;
-  const scope = createScopedContainer();
-  scope.registerClass?.(ControllerClass);
-  return await scope.get(ControllerClass);
-}
-
-async function createViewController(nextEntry) {
-  return await resolveController(nextEntry.controllerClass);
-}
-
-async function createLayoutControllers(nextEntry) {
-  const controllers = [];
-  for (const ControllerClass of nextEntry.layoutControllerClasses) {
-    controllers.push(await resolveController(ControllerClass));
-  }
-  return controllers;
-}
-
-function getViewManifestEntry(nextKey) {
-  return nextKey === entry.key ? entry : null;
-}
-
-const navigation = getNavigation();
-navigation.replace(entry.key, ${JSON.stringify(route.params)}, ${JSON.stringify(route.query)});
-
-const controller = await createViewController(entry);
-const layoutControllers = await createLayoutControllers(entry);
-
-window.__WOOD_BROWSER_APP__ = mount(NavigationShell, {
-  target: document.getElementById('app'),
-  props: {
-    manifest: { [entry.key]: entry },
-    initialEntry: entry,
-    initialController: controller,
-    initialLayoutControllers: layoutControllers,
-    createViewControllerFn: createViewController,
-    createLayoutControllersFn: createLayoutControllers,
-    getViewManifestEntryFn: getViewManifestEntry,
-  },
-});
-`;
-}
 function buildGeneratedAppEntrySource(input) {
   const hasRouteContext = Object.keys(input.route.params).length > 0 || Object.keys(input.route.query).length > 0;
   const rendererTraceEnable = input.enableRendererTrace ? `try {
@@ -638,14 +572,14 @@ function buildGeneratedAppEntrySource(input) {
   traceConfiguration.configureEnabled(true);
 } catch (error) { /* best-effort renderer-trace enable */ }` : "";
   const navigationApply = hasRouteContext ? `getNavigation().replace(${JSON.stringify(input.routeKey)}, ${JSON.stringify(input.route.params)}, ${JSON.stringify(input.route.query)});` : "";
-  return `import { app } from '${viteImport(input.generatedApp)}';
+  return `import * as generated from '${viteImport(input.generatedApp)}';
 import { getNavigation } from '${input.navigationModule}';
 import { getContainer, TraceProviderConfiguration } from '${input.clientModule}';
 window.__WOOD_BROWSER_DEFAULT_ROUTE__ = ${JSON.stringify(input.routeKey)};
-window.__WOOD_BROWSER_APP__ = await app(document.getElementById('app'));
+window.__WOOD_BROWSER_APP__ = await generated.app(document.getElementById('app'), ${JSON.stringify(input.route)});
 window.__WOOD_BROWSER_NAV__ = getNavigation();
 ${rendererTraceEnable}
-${navigationApply}
+if (!generated.supportsInitialRoute) { ${navigationApply} }
 `;
 }
 function buildComponentEntrySource(input) {
@@ -1048,7 +982,7 @@ async function captureCoverage(page, selector) {
     await cdp.detach().catch(() => void 0);
   }
 }
-function createExpect(page, outputDir) {
+function browserAssertions(page, outputDir = import_node_path.default.resolve(".wood-browser-output")) {
   async function waitForVisible(selector) {
     const locator = page.locator(selector).first();
     try {
@@ -1369,19 +1303,7 @@ function createSurface(input) {
     page: input.page,
     bridge: input.bridge,
     navigation: createMountedNavigation(input.page),
-    expect: createExpect(input.page, input.outputDir),
-    locator(selector) {
-      return input.page.locator(selector);
-    },
-    async click(selector) {
-      await input.page.locator(selector).click();
-    },
-    async fill(selector, value) {
-      await input.page.locator(selector).fill(value);
-    },
-    async evaluate(fn) {
-      return await input.page.evaluate(fn);
-    },
+    assertions: browserAssertions(input.page, input.outputDir),
     destroy: input.destroy
   };
 }
@@ -1418,17 +1340,17 @@ async function openMountPage(input) {
     bridge: mountedBridge,
     outputDir: import_node_path.default.join(input.runtime.rootDir, "test-results", "wood-browser"),
     destroy: async () => {
-      await page.evaluate(() => {
-        const app = window.__WOOD_BROWSER_APP__;
-        if (app && typeof app === "object" && typeof app.$destroy === "function") {
-          app.$destroy();
-        }
-      }).catch(() => void 0);
+      if (!page.isClosed()) await page.evaluate(() => window.__WOOD_BROWSER_UNMOUNT__?.());
     }
   });
 }
-async function createHarness(config = {}) {
+async function createBrowserFixture(config = {}) {
   const rootDir = normalizeRoot(config.rootDir);
+  const css = (config.css ?? []).map((cssPath) => {
+    const resolved = resolveFromRoot(rootDir, cssPath);
+    assertFileExists(resolved, "CSS file");
+    return resolved;
+  });
   const browserName = config.browser?.browserName ?? "chromium";
   const headless = config.browser?.headless ?? true;
   const workerRuntime = await acquireBrowserWorkerRuntime({
@@ -1437,7 +1359,7 @@ async function createHarness(config = {}) {
     headless
   });
   let released = false;
-  let destroyed = false;
+  let destroying;
   let tempDir = null;
   let context = null;
   let page = null;
@@ -1476,11 +1398,6 @@ async function createHarness(config = {}) {
     rootDir,
     transportCleanups: []
   };
-  const css = (config.css ?? []).map((cssPath) => {
-    const resolved = resolveFromRoot(rootDir, cssPath);
-    assertFileExists(resolved, "CSS file");
-    return resolved;
-  });
   return {
     page,
     ...traceRecorder ? { traceRecorder } : {},
@@ -1495,12 +1412,20 @@ async function createHarness(config = {}) {
         const viewsPath = resolveFromRoot(rootDir, config.viewsConfig);
         const views = await loadViews(viewsPath);
         const view = findView(views, routeKey);
-        entrySource = buildRouteEntrySource({
+        const generatedApp = import_node_path.default.join(runtime.tempDir, `route-app-${routeKey.replace(/[^a-zA-Z0-9_-]/g, "-")}.ts`);
+        import_node_fs.default.writeFileSync(generatedApp, (0, import_renderer_app_generator.generateRendererApp)([view], {
+          componentDir: config.componentDir ? resolveFromRoot(rootDir, config.componentDir) : rootDir,
+          outDir: runtime.tempDir,
+          entryViewKey: routeKey
+        }));
+        entrySource = buildGeneratedAppEntrySource({
+          generatedApp,
           routeKey,
-          view,
-          rootDir,
-          componentDir: config.componentDir,
-          route
+          route,
+          navigationModule: resolveEsmModule(rootDir, "@noego/wood/navigation"),
+          clientModule: resolveEsmModule(rootDir, "@noego/wood/client"),
+          enableRendererTrace: config.trace?.enabled === true,
+          traceMinLevel: config.trace?.minLevel ?? "debug"
         });
       } else if (config.generatedApp) {
         const generatedApp = resolveFromRoot(rootDir, config.generatedApp);
@@ -1515,7 +1440,7 @@ async function createHarness(config = {}) {
           traceMinLevel: config.trace?.minLevel ?? "debug"
         });
       } else {
-        throw new Error("mountRoute requires either viewsConfig or generatedApp in browser.createHarness().");
+        throw new Error("mountRoute requires either viewsConfig or generatedApp in createBrowserFixture().");
       }
       const mounted = await openMountPage({
         runtime,
@@ -1613,34 +1538,38 @@ async function createHarness(config = {}) {
     async flushRendererTraces() {
       await page.evaluate(() => window.__woodBrowserTraceFlush?.()).catch(() => void 0);
     },
-    async destroy() {
-      if (destroyed) {
-        return;
-      }
-      destroyed = true;
-      for (const cleanup of runtime.transportCleanups.splice(0)) {
-        try {
-          cleanup();
-        } catch {
-        }
-      }
-      await Promise.all([
-        waitForBoundedClose(page.close()),
-        waitForBoundedClose(context.close())
-      ]);
-      traceRecorder?.disable();
-      import_node_fs.default.rmSync(tempDir, { recursive: true, force: true });
-      releaseRuntimeOnce();
+    destroy() {
+      return destroying ?? (destroying = Promise.resolve().then(async () => {
+        const errors = [];
+        const attempt = async (action) => {
+          try {
+            await action();
+          } catch (error) {
+            errors.push(error);
+          }
+        };
+        if (!page.isClosed()) await attempt(() => closeRequired(
+          page.evaluate(() => window.__WOOD_BROWSER_UNMOUNT__?.()),
+          "renderer"
+        ));
+        for (const cleanup of runtime.transportCleanups.splice(0)) await attempt(cleanup);
+        await attempt(() => closeRequired(page.close(), "browser page"));
+        await attempt(() => closeRequired(context.close(), "browser context"));
+        await attempt(() => traceRecorder?.disable());
+        await attempt(() => import_node_fs.default.rmSync(tempDir, { recursive: true, force: true }));
+        releaseRuntimeOnce();
+        if (errors.length) throw Object.assign(new Error("Wood browser cleanup failed: " + errors.map((error) => error instanceof Error ? error.message : String(error)).join("; ")), { errors });
+      }));
     }
   };
 }
-const browser = {
-  createHarness
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  browser,
+  browserAssertions,
   createBrowserBridgeFixture,
+  createBrowserFixture,
+  createWoodBrowserResolver,
+  loadSveltePlugin,
   startSharedBrowserViteServer
 });
 //# sourceMappingURL=browser.cjs.map