@kasperrt/smolter 0.4.3 → 0.4.4

package/dist/vite/application/vite.js

@@ -43,12 +43,19 @@ var preactConfig = {
 		"@kasperrt/smolter/preact/lazy-route"
 	] }
 };
-function applicationPlugins({ directory = "src/routes", dataEndpoint = "/_smolter", ssr = true, splitRoutes = true, resourceRequest } = {}) {
+function applicationPlugins({ directory = "src/routes", framework = "preact", dataEndpoint = "/_smolter", ssr = true, splitRoutes = true, resourceRequest } = {}) {
 	return [
 		{
 			name: "smolter-application",
 			enforce: "pre",
-			config: () => preactConfig,
+			config: () => framework === "preact" ? preactConfig : {
+				resolve: { dedupe: [
+					"react",
+					"react-dom",
+					"@kasperrt/smolter"
+				] },
+				ssr: { noExternal: ["@kasperrt/smolter"] }
+			},
 			transformIndexHtml: {
 				order: "post",
 				handler(html, context) {
@@ -66,7 +73,7 @@ function applicationPlugins({ directory = "src/routes", dataEndpoint = "/_smolte
 						const target = new URL(incoming.url, "http://local").searchParams.get("url");
 						if (!target?.startsWith("/") || target.startsWith("//")) return send(new Response("Invalid route URL", { status: 400 }), outgoing);
 						const request = await webRequest(incoming, outgoing, target);
-						const [{ default: routes }, { dispatchRoute }] = await Promise.all([server.ssrLoadModule("virtual:smolter/routes"), server.ssrLoadModule("@kasperrt/smolter/preact/server")]);
+						const [{ default: routes }, { dispatchRoute }] = await Promise.all([server.ssrLoadModule("virtual:smolter/routes"), server.ssrLoadModule(`@kasperrt/smolter/${framework}/server`)]);
 						await send(await dispatchRoute(request, routes), outgoing);
 					};
 					run().catch(next);
@@ -92,10 +99,10 @@ function applicationPlugins({ directory = "src/routes", dataEndpoint = "/_smolte
 			}
 		},
 		browserBoundary(),
-		...splitRoutes ? [lazyFiles(directory, dataEndpoint)] : [],
+		...splitRoutes ? [lazyFiles(directory, dataEndpoint, framework)] : [],
 		routerPlugin({
 			directory,
-			framework: "preact",
+			framework,
 			dataEndpoint
 		})
 	];

package/dist/vite/react.d.ts

@@ -7,4 +7,8 @@ export type { FileRouterOptions } from "./index.ts";
 export declare function routerPlugin(options?: FileRouterOptions): Plugin;
 /** File routing is the default; this alias keeps configuration explicit. */
 export declare const fileRouter: typeof routerPlugin;
+export type { ApplicationOptions } from "./application/vite.ts";
 export { type DeploymentPluginOptions, deploymentPlugin, } from "./deployment.ts";
+import { type ApplicationOptions } from "./application/vite.ts";
+/** Configure React application SSR, scoped data transport and lazy file routing. */
+export declare function applicationPlugins(options?: ApplicationOptions): Plugin[];

package/dist/vite/react.js

@@ -1,6 +1,7 @@
 import { flatRoutes } from "../files/index.js";
 import { routerPlugin as routerPlugin$1 } from "./index.js";
 import { deploymentPlugin } from "./deployment.js";
+import { applicationPlugins as applicationPlugins$1 } from "./application/vite.js";
 //#region .generated/vite/react.ts
 /** Configure flat routes and server transport for React. */
 function routerPlugin(options = {}) {
@@ -11,5 +12,12 @@ function routerPlugin(options = {}) {
 }
 /** File routing is the default; this alias keeps configuration explicit. */
 var fileRouter = routerPlugin;
+/** Configure React application SSR, scoped data transport and lazy file routing. */
+function applicationPlugins(options = {}) {
+	return applicationPlugins$1({
+		...options,
+		framework: "react"
+	});
+}
 //#endregion
-export { deploymentPlugin, fileRouter, flatRoutes, routerPlugin };
+export { applicationPlugins, deploymentPlugin, fileRouter, flatRoutes, routerPlugin };

package/jsr.json

@@ -1,20 +1,21 @@
 {
   "name": "@kasperrt/smolter",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "exports": {
     "./react": "./.generated/react/index.ts",
     "./preact": "./.generated/preact/index.ts",
-    "./react/server": "./.generated/server/index.ts",
+    "./react/server": "./.generated/server/react.ts",
     "./preact/server": "./.generated/server/preact.ts",
-    "./react/client": "./.generated/client/index.ts",
+    "./react/client": "./.generated/react/client.tsx",
     "./preact/client": "./.generated/preact/client.tsx",
     "./utils": "./.generated/core/utils.ts",
     "./utils/http": "./.generated/server/node.ts",
     "./utils/assets": "./.generated/server/assets.ts",
     "./utils/responses": "./.generated/core/responses.ts",
-    "./react/data": "./.generated/react/data.ts",
     "./preact/lazy-route": "./.generated/preact/lazy-route.ts",
-    "./preact/document": "./.generated/preact/document.tsx"
+    "./preact/document": "./.generated/preact/document.tsx",
+    "./react/document": "./.generated/react/document.tsx",
+    "./react/lazy-route": "./.generated/react/lazy-route.ts"
   },
   "imports": {
     "react": "npm:react@19.3.1",
@@ -23,7 +24,10 @@
     "preact/hooks": "npm:preact@11.0.1/hooks",
     "preact/jsx-runtime": "npm:preact@11.0.1/jsx-runtime",
     "preact-render-to-string": "npm:preact-render-to-string@6.8.1",
-    "react/jsx-runtime": "npm:react@19.3.1/jsx-runtime"
+    "react/jsx-runtime": "npm:react@19.3.1/jsx-runtime",
+    "react-dom": "npm:react-dom@19.3.1",
+    "react-dom/client": "npm:react-dom@19.3.1/client",
+    "react-dom/server": "npm:react-dom@19.3.1/server"
   },
   "publish": {
     "include": [

package/package.json

@@ -57,7 +57,7 @@
     "wouter": "3.13.0",
     "wouter-preact": "3.13.0"
   },
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "A tiny typed data router for React and Preact.",
   "sideEffects": false,
   "license": "MIT",
@@ -75,16 +75,16 @@
       "import": "./dist/preact/index.js"
     },
     "./react/server": {
-      "types": "./dist/server/index.d.ts",
-      "import": "./dist/server/index.js"
+      "types": "./dist/server/react.d.ts",
+      "import": "./dist/server/react.js"
     },
     "./preact/server": {
       "types": "./dist/server/preact.d.ts",
       "import": "./dist/server/preact.js"
     },
     "./react/client": {
-      "types": "./dist/client/index.d.ts",
-      "import": "./dist/client/index.js"
+      "types": "./dist/react/client.d.ts",
+      "import": "./dist/react/client.js"
     },
     "./preact/client": {
       "types": "./dist/preact/client.d.ts",
@@ -114,10 +114,6 @@
       "types": "./dist/core/responses.d.ts",
       "import": "./dist/core/responses.js"
     },
-    "./react/data": {
-      "types": "./dist/react/data.d.ts",
-      "import": "./dist/react/data.js"
-    },
     "./preact/lazy-route": {
       "types": "./dist/preact/lazy-route.d.ts",
       "import": "./dist/preact/lazy-route.js"
@@ -125,6 +121,14 @@
     "./preact/document": {
       "types": "./dist/preact/document.d.ts",
       "import": "./dist/preact/document.js"
+    },
+    "./react/document": {
+      "types": "./dist/react/document.d.ts",
+      "import": "./dist/react/document.js"
+    },
+    "./react/lazy-route": {
+      "types": "./dist/react/lazy-route.d.ts",
+      "import": "./dist/react/lazy-route.js"
     }
   },
   "files": [
@@ -139,7 +143,8 @@
     "preact": ">=11.0.1",
     "preact-render-to-string": ">=6.8.1",
     "react": ">=18",
-    "vite": ">=8"
+    "vite": ">=8",
+    "react-dom": ">=18"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -153,6 +158,9 @@
     },
     "preact-render-to-string": {
       "optional": true
+    },
+    "react-dom": {
+      "optional": true
     }
   },
   "author": "Kasper Rynning-Tønnesen <kasperrt@users.noreply.github.com> (https://github.com/kasperrt)",

package/.generated/core/resource-types.ts

@@ -1,48 +0,0 @@
-export type Params = Readonly<Record<string, string>>;
-
-/** Resource parameters and cancellation signal supplied to a loader. */
-export interface LoaderFunctionArgs {
-  params: Params;
-  signal: AbortSignal;
-}
-
-/** Submitted input, resource parameters and cancellation signal supplied to an action. */
-export interface ActionFunctionArgs<Input = unknown> {
-  input: Input;
-  params: Params;
-  signal: AbortSignal;
-}
-
-/** Successful resource data or a normalized resource failure. */
-export interface DataResult<Data> {
-  data: Data | null;
-  error: string;
-  unexpected?: true;
-}
-
-export interface ResourceModule {
-  action?: (args: ActionFunctionArgs) => Promise<DataResult<unknown>>;
-  loader?: (args: LoaderFunctionArgs) => Promise<DataResult<unknown>>;
-  shouldRevalidate?: (args: ShouldRevalidateFunctionArgs) => boolean;
-}
-
-/** Navigation or mutation context used to decide whether loader data should refresh. */
-export interface ShouldRevalidateFunctionArgs {
-  actionResult: DataResult<unknown>;
-  defaultShouldRevalidate: boolean;
-  params: Params;
-}
-
-export type NavigationState = "idle" | "loading" | "submitting";
-
-export interface RouteState {
-  actionData: unknown;
-  actionError: string;
-  actionState: "idle" | "submitting";
-  loaderData: unknown;
-  loaderError: string;
-  loaderInitialized: boolean;
-  loaderState: "idle" | "loading";
-  navigationState: NavigationState;
-  unexpectedError: boolean;
-}

package/.generated/core/resources.ts

@@ -1,446 +0,0 @@
-import { safeWrapAsync } from "./errors.ts";
-import type {
-  DataResult,
-  Params,
-  ResourceModule,
-  RouteState,
-} from "./resource-types.ts";
-
-const IDLE_ROUTE_STATE: RouteState = {
-  actionData: null,
-  actionError: "",
-  actionState: "idle",
-  loaderData: null,
-  loaderError: "",
-  loaderInitialized: false,
-  loaderState: "idle",
-  navigationState: "idle",
-  unexpectedError: false,
-};
-
-/** Manage keyed resource reads, submissions, subscriptions and cancellation independently of navigation. */
-export class ResourceRouter {
-  readonly #cleanupTimers = new Map<string, ReturnType<typeof setTimeout>>();
-  readonly #controllers = new Map<string, AbortController>();
-  readonly #inFlightLoads = new Map<string, Promise<DataResult<unknown>>>();
-  readonly #listeners = new Map<string, Set<() => void>>();
-  readonly #persistentRoutes = new Set<string>();
-  readonly #routes: ReadonlyMap<string, ResourceModule>;
-  readonly #states = new Map<string, RouteState>();
-
-  constructor(routes: ReadonlyMap<string, ResourceModule>) {
-    this.#routes = routes;
-  }
-
-  dispose() {
-    for (const controller of this.#controllers.values()) controller.abort();
-
-    this.#controllers.clear();
-
-    for (const timer of this.#cleanupTimers.values()) clearTimeout(timer);
-
-    this.#cleanupTimers.clear();
-    this.#inFlightLoads.clear();
-    this.#listeners.clear();
-    this.#persistentRoutes.clear();
-  }
-
-  getRoute(routeId: string): ResourceModule | null {
-    return this.#routes.get(routeId) ?? null;
-  }
-
-  getSnapshot(routeId: string, params: Params): RouteState {
-    return (
-      this.#states.get(createRouteKey(routeId, params)) ?? IDLE_ROUTE_STATE
-    );
-  }
-
-  hydrateRoute<Data>(routeId: string, data: Data, params: Params = {}) {
-    const routeKey = createRouteKey(routeId, params);
-    const currentState = this.#states.get(routeKey) ?? IDLE_ROUTE_STATE;
-    this.#setState(routeKey, {
-      ...currentState,
-      loaderData: data,
-      loaderError: "",
-      loaderInitialized: true,
-      loaderState: "idle",
-      navigationState:
-        currentState.actionState === "submitting" ? "submitting" : "idle",
-      unexpectedError: false,
-    });
-  }
-
-  persist(routeId: string, params: Params = {}) {
-    const routeKey = createRouteKey(routeId, params);
-    this.#persistentRoutes.add(routeKey);
-    const cleanupTimer = this.#cleanupTimers.get(routeKey);
-
-    if (!cleanupTimer) return;
-
-    clearTimeout(cleanupTimer);
-    this.#cleanupTimers.delete(routeKey);
-  }
-
-  disposeRoute(routeId: string, params: Params = {}) {
-    this.#disposeRouteKey(createRouteKey(routeId, params));
-  }
-
-  #disposeRouteKey(routeKey: string) {
-    this.#persistentRoutes.delete(routeKey);
-    const cleanupTimer = this.#cleanupTimers.get(routeKey);
-
-    if (cleanupTimer) clearTimeout(cleanupTimer);
-
-    this.#cleanupTimers.delete(routeKey);
-    this.#controllers.get(routeKey)?.abort();
-    this.#controllers.get(`${routeKey}:action`)?.abort();
-    this.#controllers.delete(routeKey);
-    this.#controllers.delete(`${routeKey}:action`);
-    this.#inFlightLoads.delete(routeKey);
-    this.#states.delete(routeKey);
-    this.#notify(routeKey);
-  }
-
-  load<Data>(
-    routeId: string,
-    params: Params = {},
-    force = false,
-  ): Promise<DataResult<Data>> {
-    const routeKey = createRouteKey(routeId, params);
-    const route = this.#routes.get(routeId);
-
-    if (!route?.loader) {
-      return Promise.resolve<DataResult<Data>>({
-        data: null,
-        error: "Route loader not found.",
-      });
-    }
-
-    const currentState = this.#states.get(routeKey);
-
-    if (!force && currentState?.loaderInitialized) {
-      return Promise.resolve({
-        data: currentState?.loaderData as Data,
-        error: currentState?.loaderError ?? "",
-      });
-    }
-
-    const currentLoad = this.#inFlightLoads.get(routeKey);
-
-    if (force && currentLoad) {
-      this.#controllers.get(routeKey)?.abort();
-      this.#inFlightLoads.delete(routeKey);
-    }
-
-    if (!force && currentLoad) return currentLoad as Promise<DataResult<Data>>;
-
-    const controller = this.#replaceController(routeKey);
-    this.#setState(routeKey, {
-      ...(currentState ?? IDLE_ROUTE_STATE),
-      loaderError: "",
-      loaderState: "loading",
-      navigationState:
-        currentState?.actionState === "submitting" ? "submitting" : "loading",
-      unexpectedError: false,
-    });
-    const load = this.#runLoader(route, routeKey, params, controller);
-    this.#inFlightLoads.set(routeKey, load);
-
-    return load as Promise<DataResult<Data>>;
-  }
-
-  subscribe(routeId: string, params: Params, listener: () => void): () => void {
-    const routeKey = createRouteKey(routeId, params);
-    const cleanupTimer = this.#cleanupTimers.get(routeKey);
-
-    if (cleanupTimer) {
-      clearTimeout(cleanupTimer);
-      this.#cleanupTimers.delete(routeKey);
-    }
-
-    const listeners = this.#listeners.get(routeKey) ?? new Set<() => void>();
-    listeners.add(listener);
-    this.#listeners.set(routeKey, listeners);
-
-    return () => {
-      if (!listeners.delete(listener) || listeners.size > 0) return;
-
-      this.#listeners.delete(routeKey);
-
-      if (this.#persistentRoutes.has(routeKey)) return;
-
-      const timer = setTimeout(
-        () => this.#disposeRouteKey(routeKey),
-        routeCleanupGraceMs,
-      );
-      this.#cleanupTimers.set(routeKey, timer);
-    };
-  }
-
-  async submit<Data>(
-    routeId: string,
-    input: unknown,
-    params: Params = {},
-  ): Promise<DataResult<Data>> {
-    const routeKey = createRouteKey(routeId, params);
-    const route = this.#routes.get(routeId);
-
-    if (!route?.action) {
-      return { data: null, error: "Route action not found." };
-    }
-
-    const controllerKey = `${routeKey}:action`;
-    const controller = this.#replaceController(controllerKey);
-    const currentState = this.#states.get(routeKey) ?? IDLE_ROUTE_STATE;
-    this.#setState(routeKey, {
-      ...currentState,
-      actionError: "",
-      actionState: "submitting",
-      navigationState: "submitting",
-      unexpectedError: false,
-    });
-    const { error, data: result } = await safeWrapAsync(() =>
-      route.action?.({ input, params, signal: controller.signal }),
-    );
-
-    if (this.#controllers.get(controllerKey) === controller) {
-      this.#controllers.delete(controllerKey);
-    }
-
-    if (controller.signal.aborted) return { data: null, error: "" };
-
-    const latestState = this.#states.get(routeKey) ?? IDLE_ROUTE_STATE;
-
-    if (error || !result) {
-      const publicError = "The request could not be completed.";
-      this.#setState(routeKey, {
-        ...latestState,
-        actionData: null,
-        actionError: publicError,
-        actionState: "idle",
-        navigationState:
-          latestState.loaderState === "loading" ? "loading" : "idle",
-        unexpectedError: true,
-      });
-
-      return { data: null, error: publicError, unexpected: true };
-    }
-
-    this.#setState(routeKey, {
-      ...latestState,
-      actionData: result.data,
-      actionError: result.error,
-      actionState: "idle",
-      navigationState:
-        latestState.loaderState === "loading" ? "loading" : "idle",
-      unexpectedError: false,
-    });
-    const actionResult = {
-      data: result.data as Data | null,
-      error: result.error,
-    };
-    const { error: revalidationError, data: shouldRevalidate } =
-      await safeWrapAsync(
-        () =>
-          route.shouldRevalidate?.({
-            actionResult: result,
-            defaultShouldRevalidate: Boolean(route.loader),
-            params,
-          }) ?? Boolean(route.loader),
-      );
-
-    if (revalidationError) {
-      const publicError = "The request could not be completed.";
-      this.#setState(routeKey, {
-        ...(this.#states.get(routeKey) ?? IDLE_ROUTE_STATE),
-        actionError: publicError,
-        actionState: "idle",
-        unexpectedError: true,
-      });
-
-      return { data: null, error: publicError, unexpected: true };
-    }
-
-    if (shouldRevalidate) await this.load(routeId, params, true);
-
-    return actionResult;
-  }
-
-  async fetchLoader<Data>(
-    routeId: string,
-    params: Params,
-    signal: AbortSignal,
-  ): Promise<DataResult<Data>> {
-    const route = this.#routes.get(routeId);
-
-    if (!route?.loader) {
-      return { data: null, error: "Route loader not found." };
-    }
-
-    const { error, data: result } = await safeWrapAsync(() =>
-      route.loader?.({ params, signal }),
-    );
-
-    if (signal.aborted) return { data: null, error: "" };
-
-    if (error || !result) {
-      return {
-        data: null,
-        error: "The route could not be loaded.",
-        unexpected: true,
-      };
-    }
-
-    return result as DataResult<Data>;
-  }
-
-  async fetchAction<Data>(
-    routeId: string,
-    input: unknown,
-    params: Params,
-    signal: AbortSignal,
-  ): Promise<DataResult<Data>> {
-    const route = this.#routes.get(routeId);
-
-    if (!route?.action) {
-      return { data: null, error: "Route action not found." };
-    }
-
-    const { error, data: result } = await safeWrapAsync(() =>
-      route.action?.({ input, params, signal }),
-    );
-
-    if (signal.aborted) return { data: null, error: "" };
-
-    if (error || !result) {
-      return {
-        data: null,
-        error: "The request could not be completed.",
-        unexpected: true,
-      };
-    }
-
-    const { error: revalidationError, data: shouldRevalidate } =
-      await safeWrapAsync(
-        () =>
-          route.shouldRevalidate?.({
-            actionResult: result,
-            defaultShouldRevalidate: Boolean(route.loader),
-            params,
-          }) ?? Boolean(route.loader),
-      );
-
-    if (signal.aborted) return { data: null, error: "" };
-
-    if (revalidationError) {
-      return {
-        data: null,
-        error: "The request could not be completed.",
-        unexpected: true,
-      };
-    }
-
-    if (shouldRevalidate) await this.load(routeId, params, true);
-
-    return result as DataResult<Data>;
-  }
-
-  retry(routeId: string, params: Params): Promise<DataResult<unknown>> {
-    const routeKey = createRouteKey(routeId, params);
-    this.#states.set(routeKey, IDLE_ROUTE_STATE);
-    this.#notify(routeKey);
-
-    return this.load(routeId, params, true);
-  }
-
-  reportUnexpected(routeId: string, params: Params) {
-    const routeKey = createRouteKey(routeId, params);
-    const currentState = this.#states.get(routeKey) ?? IDLE_ROUTE_STATE;
-    this.#setState(routeKey, { ...currentState, unexpectedError: true });
-  }
-
-  async #runLoader(
-    route: ResourceModule,
-    routeKey: string,
-    params: Params,
-    controller: AbortController,
-  ): Promise<DataResult<unknown>> {
-    const { error, data: result } = await safeWrapAsync(
-      () =>
-        route.loader?.({ params, signal: controller.signal }) ??
-        Promise.resolve({ data: null, error: "" }),
-    );
-
-    if (this.#controllers.get(routeKey) === controller) {
-      this.#controllers.delete(routeKey);
-      this.#inFlightLoads.delete(routeKey);
-    }
-
-    if (controller.signal.aborted) return { data: null, error: "" };
-
-    if (error || !result) {
-      const publicError = "The route could not be loaded.";
-      this.#setState(routeKey, {
-        actionData: null,
-        actionError: "",
-        actionState: "idle",
-        loaderData: null,
-        loaderError: publicError,
-        loaderInitialized: true,
-        loaderState: "idle",
-        navigationState: "idle",
-        unexpectedError: true,
-      });
-
-      return { data: null, error: publicError, unexpected: true };
-    }
-
-    const currentState = this.#states.get(routeKey) ?? IDLE_ROUTE_STATE;
-    this.#setState(routeKey, {
-      ...currentState,
-      loaderData: result.data,
-      loaderError: result.error,
-      loaderInitialized: true,
-      loaderState: "idle",
-      navigationState:
-        currentState.actionState === "submitting" ? "submitting" : "idle",
-      unexpectedError: false,
-    });
-
-    return result;
-  }
-
-  #replaceController(key: string) {
-    this.#controllers.get(key)?.abort();
-    const controller = new AbortController();
-    this.#controllers.set(key, controller);
-
-    return controller;
-  }
-
-  #setState(routeKey: string, state: RouteState) {
-    this.#states.set(routeKey, state);
-    this.#notify(routeKey);
-  }
-
-  #notify(routeKey: string) {
-    for (const listener of this.#listeners.get(routeKey) ?? []) listener();
-  }
-}
-
-/** Create an independent resource-data router from registered modules; this does not manage URL history. */
-export function createResourceRouter(
-  routes: ReadonlyMap<string, ResourceModule>,
-): ResourceRouter {
-  return new ResourceRouter(routes);
-}
-
-function createRouteKey(routeId: string, params: Params) {
-  const normalizedParams = Object.entries(params).sort(([left], [right]) =>
-    left.localeCompare(right),
-  );
-
-  return `${routeId}:${JSON.stringify(normalizedParams)}`;
-}
-
-const routeCleanupGraceMs = 100;