evikit 2.9.2 → 2.10.0

package/index.js

@@ -6,6 +6,7 @@ import {
   Router as IsoRouter,
   LocationProvider,
   prerender,
+  Route,
 } from "preact-iso";
 import { locationStub } from "preact-iso/prerender";
 import { useState } from "preact/hooks";
@@ -63,6 +64,14 @@ export async function hydrate(App, renderTarget) {
   }
 }
 
+/**
+ * @param {string | null} path
+ * @param {() => import("preact").VNode} component
+ */
+export function route(path, component) {
+  return { component, default: !path, path };
+}
+
 /** @param {{ children?: import("preact").ComponentChildren, dehydratedState?: ReturnType<import("./query.js").dehydrate> | undefined, i18n: ReturnType<import("./i18n.js").useI18n> }} props */
 export function Router({ children, dehydratedState, i18n }) {
   const [queryClient] = useState(
@@ -91,16 +100,41 @@ export function Router({ children, dehydratedState, i18n }) {
   );
 }
 
+/** @param {(import("./index.d.ts").SsrApp | import("./index.d.ts").SsrProps | { ErrorPage: () => import("preact").VNode } | ReturnType<import("./index.d.ts").route>)[]} args */
+export function ssr(...args) {
+  if (typeof args[0] == "function") {
+    const App = args[0];
+    /** @type {import("./index.d.ts").SsrProps | undefined} */
+    const props = /** @type {any} */ (args[1]);
+    if (props) {
+      return ssrInner(App, props);
+    }
+    /** @param {import("./index.d.ts").SsrProps} props */
+    return (props) => ssrInner(App, props);
+  }
+  /** @type {() => import("preact").VNode} */
+  const ErrorPage = /** @type {any} */ (args[0]).ErrorPage;
+  /** @type {ReturnType<import("./index.d.ts").route>[]} */
+  const routes = /** @type {any} */ (args.slice(1));
+  /** @type {import("./index.d.ts").SsrApp} */
+  function App(props) {
+    return h(
+      Router,
+      props,
+      ...routes.map((route) => h(Route, route)),
+      h(Route, { component: ErrorPage, default: true }),
+    );
+  }
+  hydrate(App, "#app");
+  /** @param {import("./index.d.ts").SsrProps} props */
+  return (props) => ssrInner(App, props);
+}
+
 /**
  * @param {(props: { dehydratedState?: ReturnType<import("./query.js").dehydrate> | undefined, i18n: ReturnType<import("./i18n.js").useI18n> }) => import("preact").VNode} App
- * @param {{ cookie?: string | undefined, lang?: string, url: string }} [data]
+ * @param {{ cookie?: string | undefined, lang?: string, url: string }} data
  */
-export async function ssr(App, data) {
-  if (!data) {
-    /** @param {NonNullable<typeof data>} data */
-    return (data) => ssr(App, data);
-  }
-
+async function ssrInner(App, data) {
   const i18n = await getI18n(...(data.lang ? [data.lang] : []));
 
   const queryClient = new QueryClient({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "evikit",
   "description": "Preact/SQLite SSR framework for small web apps",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "type": "module",
   "exports": {
     ".": "./index.js",