create-rezi 0.1.0-alpha.25 → 0.1.0-alpha.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-rezi",
-  "version": "0.1.0-alpha.25",
+  "version": "0.1.0-alpha.26",
   "description": "Scaffold a Rezi terminal UI app.",
   "license": "Apache-2.0",
   "homepage": "https://rezitui.dev",
@@ -28,6 +28,6 @@
     "bun": ">=1.3.0"
   },
   "devDependencies": {
-    "@rezi-ui/testkit": "0.1.0-alpha.25"
+    "@rezi-ui/testkit": "0.1.0-alpha.26"
   }
 }

package/templates/cli-tool/README.md

@@ -64,4 +64,4 @@ bun run dev
 ```
 
 `npm run dev` / `bun run dev` starts the app with `--hsr` so route edits hot-swap via
-`app.replaceRoutes(...)` while preserving app state, focus, and form input.
+`createNodeApp({ hotReload: ... })` + `app.replaceRoutes(...)` while preserving app state, focus, and form input.

package/templates/cli-tool/src/main.ts

@@ -1,6 +1,5 @@
 import { exit } from "node:process";
-import { createApp } from "@rezi-ui/core";
-import { createHotStateReload, createNodeBackend } from "@rezi-ui/node";
+import { createNodeApp } from "@rezi-ui/node";
 import { resolveCliCommand } from "./helpers/keybindings.js";
 import { createInitialState, reduceCliState } from "./helpers/state.js";
 import { createCliRoutes } from "./screens/index.js";
@@ -12,9 +11,8 @@ const LOG_TICK_MS = 1000;
 
 const initialState = createInitialState();
 
-let app!: ReturnType<typeof createApp<typeof initialState>>;
+let app!: ReturnType<typeof createNodeApp<typeof initialState>>;
 const enableHsr = process.argv.includes("--hsr") || process.env.REZI_HSR === "1";
-let hsrController: ReturnType<typeof createHotStateReload<typeof initialState>> | null = null;
 let stopping = false;
 let logTimer: ReturnType<typeof setInterval> | null = null;
 
@@ -61,11 +59,6 @@ async function stopApp(): Promise<void> {
   if (stopping) return;
   stopping = true;
 
-  if (hsrController) {
-    await hsrController.stop();
-    hsrController = null;
-  }
-
   if (logTimer) {
     clearInterval(logTimer);
     logTimer = null;
@@ -116,13 +109,27 @@ function applyCommand(command: ReturnType<typeof resolveCliCommand>): void {
 
 const routes = buildCliRoutes(createCliRoutes);
 
-app = createApp({
-  backend: createNodeBackend({ fpsCap: UI_FPS_CAP }),
+app = createNodeApp({
   initialState,
   routes,
   initialRoute: "home",
   config: { fpsCap: UI_FPS_CAP },
   theme: themeSpec(initialState.themeName).theme,
+  ...(enableHsr
+    ? {
+        hotReload: {
+          routesModule: new URL("./screens/index.ts", import.meta.url),
+          moduleRoot: new URL("./", import.meta.url),
+          resolveRoutes: (moduleNs: unknown) => {
+            const createRoutes = (moduleNs as CliRoutesModule).createCliRoutes;
+            if (typeof createRoutes !== "function") {
+              throw new Error("HSR: ./screens/index.ts must export createCliRoutes(deps)");
+            }
+            return buildCliRoutes(createRoutes);
+          },
+        },
+      }
+    : {}),
 });
 
 app.keys({
@@ -159,29 +166,8 @@ logTimer = setInterval(() => {
 }, LOG_TICK_MS);
 
 try {
-  if (enableHsr) {
-    hsrController = createHotStateReload<typeof initialState>({
-      app,
-      routesModule: new URL("./screens/index.ts", import.meta.url),
-      moduleRoot: new URL("./", import.meta.url),
-      resolveRoutes: (moduleNs) => {
-        const createRoutes = (moduleNs as CliRoutesModule).createCliRoutes;
-        if (typeof createRoutes !== "function") {
-          throw new Error("HSR: ./screens/index.ts must export createCliRoutes(deps)");
-        }
-        return buildCliRoutes(createRoutes);
-      },
-    });
-    await hsrController.start();
-  }
-
   await app.start();
 } finally {
-  if (hsrController) {
-    await hsrController.stop();
-    hsrController = null;
-  }
-
   if (logTimer) {
     clearInterval(logTimer);
     logTimer = null;

package/templates/dashboard/README.md

@@ -58,4 +58,4 @@ bun run dev
 ```
 
 `npm run dev` / `bun run dev` starts the app with `--hsr` so view edits hot-swap via
-`app.replaceView(...)` while preserving app state, focus, and form/input context.
+`createNodeApp({ hotReload: ... })` + `app.replaceView(...)` while preserving app state, focus, and form/input context.

package/templates/dashboard/src/main.ts

@@ -1,6 +1,5 @@
 import { exit } from "node:process";
-import { createApp } from "@rezi-ui/core";
-import { createHotStateReload, createNodeBackend } from "@rezi-ui/node";
+import { createNodeApp } from "@rezi-ui/node";
 import { resolveDashboardCommand } from "./helpers/keybindings.js";
 import { reduceDashboardState, selectedService } from "./helpers/state.js";
 import { createInitialState } from "./helpers/state.js";
@@ -12,24 +11,39 @@ const UI_FPS_CAP = 30;
 const TICK_MS = 900;
 
 const initialState = createInitialState();
+const enableHsr = process.argv.includes("--hsr") || process.env.REZI_HSR === "1";
 
-const app = createApp({
-  backend: createNodeBackend({
+type OverviewRenderer = typeof renderOverviewScreen;
+type OverviewModule = Readonly<{
+  renderOverviewScreen?: OverviewRenderer;
+}>;
+
+const app = createNodeApp({
+  config: {
     fpsCap: UI_FPS_CAP,
     emojiWidthPolicy: "auto",
     executionMode: "worker",
-  }),
-  config: { fpsCap: UI_FPS_CAP },
+  },
   initialState,
   theme: themeSpec(initialState.themeName).theme,
+  ...(enableHsr
+    ? {
+        hotReload: {
+          viewModule: new URL("./screens/overview.ts", import.meta.url),
+          moduleRoot: new URL("./", import.meta.url),
+          resolveView: (moduleNs: unknown) => {
+            const render = (moduleNs as OverviewModule).renderOverviewScreen;
+            if (typeof render !== "function") {
+              throw new Error(
+                "HSR: ./screens/overview.ts must export renderOverviewScreen(state, actions)",
+              );
+            }
+            return buildOverviewView(render);
+          },
+        },
+      }
+    : {}),
 });
-const enableHsr = process.argv.includes("--hsr") || process.env.REZI_HSR === "1";
-let hsrController: ReturnType<typeof createHotStateReload<DashboardState>> | null = null;
-
-type OverviewRenderer = typeof renderOverviewScreen;
-type OverviewModule = Readonly<{
-  renderOverviewScreen?: OverviewRenderer;
-}>;
 
 function buildOverviewView(renderer: OverviewRenderer) {
   return (state: DashboardState) =>
@@ -67,11 +81,6 @@ async function stopApp(): Promise<void> {
   if (stopping) return;
   stopping = true;
 
-  if (hsrController) {
-    await hsrController.stop();
-    hsrController = null;
-  }
-
   if (telemetryTimer) {
     clearInterval(telemetryTimer);
     telemetryTimer = null;
@@ -166,29 +175,8 @@ telemetryTimer = setInterval(() => {
 }, TICK_MS);
 
 try {
-  if (enableHsr) {
-    hsrController = createHotStateReload<DashboardState>({
-      app,
-      viewModule: new URL("./screens/overview.ts", import.meta.url),
-      moduleRoot: new URL("./", import.meta.url),
-      resolveView: (moduleNs) => {
-        const render = (moduleNs as OverviewModule).renderOverviewScreen;
-        if (typeof render !== "function") {
-          throw new Error(
-            "HSR: ./screens/overview.ts must export renderOverviewScreen(state, actions)",
-          );
-        }
-        return buildOverviewView(render);
-      },
-    });
-    await hsrController.start();
-  }
   await app.start();
 } finally {
-  if (hsrController) {
-    await hsrController.stop();
-    hsrController = null;
-  }
   if (telemetryTimer) {
     clearInterval(telemetryTimer);
     telemetryTimer = null;

package/templates/minimal/README.md

@@ -42,7 +42,7 @@ bun run dev
 ```
 
 `npm run dev` / `bun run dev` starts the app with `--hsr` so view edits hot-swap via
-`app.replaceView(...)` while preserving app state, focus, and form/input context.
+`createNodeApp({ hotReload: ... })` + `app.replaceView(...)` while preserving app state, focus, and form/input context.
 
 ## Controls
 

package/templates/minimal/src/main.ts

@@ -1,6 +1,5 @@
 import { exit } from "node:process";
-import { createApp } from "@rezi-ui/core";
-import { createHotStateReload, createNodeBackend } from "@rezi-ui/node";
+import { createNodeApp } from "@rezi-ui/node";
 import { resolveMinimalCommand } from "./helpers/keybindings.js";
 import { createInitialState, reduceMinimalState } from "./helpers/state.js";
 import { renderMainScreen } from "./screens/main-screen.js";
@@ -8,21 +7,36 @@ import { themeSpec } from "./theme.js";
 import type { MinimalAction, MinimalState } from "./types.js";
 
 const initialState = createInitialState();
-
-const app = createApp({
-  backend: createNodeBackend({ fpsCap: 30 }),
-  initialState,
-  config: { fpsCap: 30 },
-  theme: themeSpec(initialState.themeName).theme,
-});
 const enableHsr = process.argv.includes("--hsr") || process.env.REZI_HSR === "1";
-let hsrController: ReturnType<typeof createHotStateReload<MinimalState>> | null = null;
 
 type MainScreenRenderer = typeof renderMainScreen;
 type MainScreenModule = Readonly<{
   renderMainScreen?: MainScreenRenderer;
 }>;
 
+const app = createNodeApp({
+  initialState,
+  config: { fpsCap: 30 },
+  theme: themeSpec(initialState.themeName).theme,
+  ...(enableHsr
+    ? {
+        hotReload: {
+          viewModule: new URL("./screens/main-screen.ts", import.meta.url),
+          moduleRoot: new URL("./", import.meta.url),
+          resolveView: (moduleNs: unknown) => {
+            const render = (moduleNs as MainScreenModule).renderMainScreen;
+            if (typeof render !== "function") {
+              throw new Error(
+                "HSR: ./screens/main-screen.ts must export renderMainScreen(state, actions)",
+              );
+            }
+            return buildMainView(render);
+          },
+        },
+      }
+    : {}),
+});
+
 function buildMainView(renderer: MainScreenRenderer) {
   return (state: MinimalState) =>
     renderer(state, {
@@ -58,11 +72,6 @@ async function shutdown(): Promise<void> {
   if (stopping) return;
   stopping = true;
 
-  if (hsrController) {
-    await hsrController.stop();
-    hsrController = null;
-  }
-
   try {
     await app.stop();
   } catch {
@@ -134,29 +143,8 @@ process.once("SIGINT", onSignal);
 process.once("SIGTERM", onSignal);
 
 try {
-  if (enableHsr) {
-    hsrController = createHotStateReload<MinimalState>({
-      app,
-      viewModule: new URL("./screens/main-screen.ts", import.meta.url),
-      moduleRoot: new URL("./", import.meta.url),
-      resolveView: (moduleNs) => {
-        const render = (moduleNs as MainScreenModule).renderMainScreen;
-        if (typeof render !== "function") {
-          throw new Error(
-            "HSR: ./screens/main-screen.ts must export renderMainScreen(state, actions)",
-          );
-        }
-        return buildMainView(render);
-      },
-    });
-    await hsrController.start();
-  }
   await app.start();
 } finally {
-  if (hsrController) {
-    await hsrController.stop();
-    hsrController = null;
-  }
   process.off("SIGINT", onSignal);
   process.off("SIGTERM", onSignal);
 }