@askrjs/askr 0.0.64 → 0.0.66

package/dist/ssg/index.js

@@ -1,7 +1,8 @@
 import "../access-ePqdQqkV.js";
-import { a as resolveDeferredValues, b as getRenderHandler, c as bindResolvedRouteData } from "../deferred-vBQJwHl5.js";
+import { S as getRenderHandler, a as resolveDeferredValues, l as createRouteRegistry, u as bindResolvedRouteData } from "../deferred-Eh9bCVGH.js";
+import { a as route } from "../authoring-Di8MInO-.js";
 import { n as renderDocument } from "../ssr-CbQO5xd3.js";
-import { n as renderToString } from "../ssr-CAYo-kNy.js";
+import { n as renderToString } from "../ssr-Y8Pq8riM.js";
 import * as fs from "node:fs/promises";
 import * as pathModule from "node:path";
 import * as os from "node:os";
@@ -73,7 +74,7 @@ function isStringRecord(value) {
 }
 function validateRouteShape(route) {
 	if (typeof route.path !== "string" || !route.path.startsWith("/")) throw new Error(`route path must be a string starting with "/", got "${route.path}"`);
-	if (typeof (route.handler ?? route.component) !== "function") throw new Error(`route handler must be a function for path "${route.path}"`);
+	if (typeof route.handler !== "function") throw new Error(`route handler must be a function for path "${route.path}"`);
 	if (route.params !== void 0 && !isStringRecord(route.params)) throw new Error(`route "${route.path}" params must be an object containing only string values`);
 	if (route.invalidationKeys !== void 0) {
 		if (!Array.isArray(route.invalidationKeys)) throw new Error(`route "${route.path}" invalidationKeys must be an array of strings`);
@@ -141,28 +142,25 @@ async function batchRenderRoutes(routes, options = {}) {
 	const results = [];
 	results.length = routes.length;
 	let nextIndex = 0;
-	const renderOne = async (route) => {
+	const sharedRegistry = new Set(routes.map((route) => route.path)).size === routes.length ? createRouteRegistry(() => {
+		for (const route$1 of routes) route(route$1.path, route$1.handler, { namespace: route$1.namespace });
+	}) : void 0;
+	const renderOne = async (route$2) => {
 		const startTime = performance.now();
-		const url = interpolateRoutePath(route.path, route.params);
+		const url = interpolateRoutePath(route$2.path, route$2.params);
 		const requestUrl = new URL(url, "http://localhost");
-		const resolvedData = resolveSsgRouteData(dataMap, route.path, url);
+		const resolvedData = resolveSsgRouteData(dataMap, route$2.path, url);
 		const baseData = resolvedData.hasData ? resolvedData.data : void 0;
 		const resourceCount = resolvedData.hasData && baseData ? Object.keys(baseData).length : 0;
-		const mergedHandler = route.handler ? route.handler : (params, ctx) => {
-			const component = route.component;
-			return component({
-				...route.props,
-				...params
-			}, ctx);
-		};
+		const mergedHandler = route$2.handler;
 		try {
 			let routeData;
 			let hasRouteData = false;
-			if (route.loader) {
+			if (route$2.loader) {
 				const controller = new AbortController();
 				const loadContext = {
 					mode: "ssg",
-					params: route.params ?? {},
+					params: route$2.params ?? {},
 					pathname: requestUrl.pathname,
 					search: requestUrl.search,
 					hash: requestUrl.hash,
@@ -175,7 +173,7 @@ async function batchRenderRoutes(routes, options = {}) {
 					},
 					signal: controller.signal
 				};
-				const loaded = await route.loader({
+				const loaded = await route$2.loader({
 					...loadContext,
 					request: new Request(requestUrl)
 				});
@@ -183,13 +181,12 @@ async function batchRenderRoutes(routes, options = {}) {
 				routeData = loaded;
 				hasRouteData = true;
 			}
+			const renderedHandler = hasRouteData ? bindResolvedRouteData(mergedHandler, routeData) : mergedHandler;
 			const html = renderToString({
 				url,
-				routes: [{
-					path: route.path,
-					handler: hasRouteData ? bindResolvedRouteData(mergedHandler, routeData) : mergedHandler,
-					namespace: route.namespace
-				}],
+				registry: hasRouteData || !sharedRegistry ? createRouteRegistry(() => {
+					route(route$2.path, renderedHandler, { namespace: route$2.namespace });
+				}) : sharedRegistry,
 				seed,
 				data: baseData,
 				document: document === void 0 ? void 0 : ({ appHtml }) => renderDocument(document, {
@@ -200,12 +197,12 @@ async function batchRenderRoutes(routes, options = {}) {
 						pathname: requestUrl.pathname,
 						search: requestUrl.search,
 						hash: requestUrl.hash,
-						params: route.params ?? {},
+						params: route$2.params ?? {},
 						data: baseData,
 						seed,
 						route: {
-							path: route.path,
-							namespace: route.namespace
+							path: route$2.path,
+							namespace: route$2.namespace
 						}
 					}
 				}, "createStaticGen()")
@@ -579,21 +576,24 @@ async function splitStaticRoutes(routes) {
 	};
 }
 function normalizeStaticRoutes(options) {
-	if (options.registry) return routeRegistryToRouteConfigs(options.registry);
-	return [...options.routes ?? []];
+	return routeRegistryToRouteConfigs(options.registry);
 }
 function routeRegistryToRouteConfigs(registry) {
 	const routeConfigs = [];
 	for (const record of registry.manifest.records) {
 		if (record.isFallback) continue;
+		const options = record.options;
 		routeConfigs.push({
 			path: record.path,
 			handler: getRenderHandler(record),
-			namespace: record.options.namespace,
-			auth: record.options.auth,
-			policies: record.options.policies,
-			entries: record.options.entries,
-			loader: record.options.loader
+			params: options.params,
+			props: options.props,
+			invalidationKeys: options.invalidationKeys ? [...options.invalidationKeys] : void 0,
+			namespace: options.namespace,
+			auth: options.auth,
+			policies: options.policies,
+			entries: options.entries,
+			loader: options.loader
 		});
 	}
 	return routeConfigs;
@@ -672,10 +672,7 @@ async function replaceOutputDirectory(stagingDir, outputDir, fileOperations = fs
 * Usage:
 * ```ts
 * const ssg = createStaticGen({
-*   routes: [
-*     { path: '/', component: HomePage },
-*     { path: '/about', component: AboutPage },
-*   ],
+*   registry,
 *   outputDir: './dist',
 *   dataOverrides: {
 *     '/api/posts': { posts: [...] }
@@ -688,11 +685,12 @@ async function replaceOutputDirectory(stagingDir, outputDir, fileOperations = fs
 */
 function createStaticGen(options) {
 	let result = null;
+	if (!options || !("registry" in options) || !options.registry) throw new Error("route registry is required");
 	const configuredRoutes = normalizeStaticRoutes(options);
 	const seed = options.seed ?? 12345;
 	const resolvedParallelism = resolveParallelism(options.parallelism);
 	const resolvedConcurrency = Math.max(1, options.concurrency ?? resolvedParallelism);
-	if (configuredRoutes.length === 0) throw new Error("routes array or route registry is required");
+	if (configuredRoutes.length === 0) throw new Error("route registry is required");
 	if (!options.outputDir || options.outputDir.trim().length === 0) throw new Error("outputDir is required");
 	return {
 		/**

package/dist/ssr/index.d.ts

@@ -1,7 +1,7 @@
 import { c as RenderableChild, d as DocumentRenderContext, f as DocumentRenderer, p as SSRData, u as DocumentRenderArgs } from "../control-CMzFPMjr.js";
 import { r as JSXElement, s as Props } from "../jsx-Dvr2SGRG.js";
 import { D as QueryPrefetchContext, n as ServerQueryRegistry, u as CoreTelemetry, v as DataRuntime } from "../index-Bki2rqcr.js";
-import { L as RouteRequestResult, P as RouteRegistry, a as AccessRedirectDecision, b as RouteHandler, j as RouteRecord, m as RouteAuthOptions, p as Route, r as AccessDenyDecision, x as RouteManifest } from "../router-Dz7ZoLja.js";
+import { A as RouteRecord, L as RouteRequestResult, N as RouteRegistry, a as AccessRedirectDecision, f as Route, p as RouteAuthOptions, r as AccessDenyDecision, y as RouteHandler } from "../router-4EhVGcma.js";
 import { AuthContext } from "@askrjs/auth";
 
 //#region src/common/page-render-envelope.d.ts
@@ -86,10 +86,6 @@ type SSRRoute = {
 };
 type SSRRouteSource = {
   registry: RouteRegistry;
-  routes?: readonly SSRRoute[];
-} | {
-  registry?: RouteRegistry;
-  routes: readonly SSRRoute[];
 };
 type RouteRenderOptions = SSRRouteSource & {
   url: string;
@@ -110,38 +106,6 @@ type RouteStreamOptions = RouteRenderOptions & {
 declare function resolveRequest(opts: {
   url: string;
   registry: RouteRegistry;
-  manifest?: RouteManifest;
-  routes?: Array<{
-    path: string;
-    handler: RouteHandler;
-    namespace?: string;
-  }>;
-  auth?: RouteAuthOptions;
-  authContext?: AuthContext;
-  request?: Request;
-  signal?: AbortSignal;
-} | {
-  url: string;
-  manifest: RouteManifest;
-  registry?: RouteRegistry;
-  routes?: Array<{
-    path: string;
-    handler: RouteHandler;
-    namespace?: string;
-  }>;
-  auth?: RouteAuthOptions;
-  authContext?: AuthContext;
-  request?: Request;
-  signal?: AbortSignal;
-} | {
-  url: string;
-  manifest?: RouteManifest;
-  registry?: RouteRegistry;
-  routes: Array<{
-    path: string;
-    handler: RouteHandler;
-    namespace?: string;
-  }>;
   auth?: RouteAuthOptions;
   authContext?: AuthContext;
   request?: Request;
@@ -176,11 +140,7 @@ declare function renderToStringSync(component: (props?: Record<string, unknown>)
 //#region src/ssr/render-resolved.d.ts
 declare function renderResolvedToStringSync(opts: {
   url: string;
-  routes: ReadonlyArray<{
-    path: string;
-    handler: RouteHandler;
-    namespace?: string;
-  }>;
+  registry: RouteRegistry;
   handler: RouteHandler;
   params?: Record<string, string>;
   options?: {
@@ -195,8 +155,7 @@ declare function renderResolvedToStringSync(opts: {
 //#region src/ssr/route-request-render.d.ts
 interface RenderRouteRequestOptions {
   url: string;
-  manifest?: RouteManifest;
-  registry?: RouteRegistry;
+  registry: RouteRegistry;
   auth?: RouteAuthOptions;
   authContext?: AuthContext;
   request?: Request;

package/dist/ssr/index.js

@@ -1,3 +1,3 @@
 import { u as SSRDataMissingError } from "../render-context-Clw3rFiO.js";
-import { a as renderResolvedToStringSync, c as createRenderContext, d as withRenderContextAsync, i as renderRouteRequestToString, l as getRenderContext, n as renderToString, o as renderToStringSync, r as renderRouteRequest, s as resolveRequest, t as renderToStream, u as withRenderContext } from "../ssr-CAYo-kNy.js";
+import { a as renderResolvedToStringSync, c as createRenderContext, d as withRenderContextAsync, i as renderRouteRequestToString, l as getRenderContext, n as renderToString, o as renderToStringSync, r as renderRouteRequest, s as resolveRequest, t as renderToStream, u as withRenderContext } from "../ssr-Y8Pq8riM.js";
 export { SSRDataMissingError, createRenderContext, getRenderContext, renderResolvedToStringSync, renderRouteRequest, renderRouteRequestToString, renderToStream, renderToString, renderToStringSync, resolveRequest, withRenderContext, withRenderContextAsync };

package/dist/{ssr-CAYo-kNy.js → ssr-Y8Pq8riM.js}

@@ -6,14 +6,15 @@ import { c as callWithContext, d as getExecutionContextFrame, f as getVNodeConte
 import { f as getCurrentComponentInstance, w as setCurrentComponentInstance } from "./component-scope-CC3cojX9.js";
 import { h as cleanupComponent, m as isPromiseLike } from "./component-lifecycle-DEMPihoZ.js";
 import { g as evaluateShowState, h as evaluateCaseState, i as evaluateForState, o as rollbackForStateTransaction, r as commitForStateTransaction } from "./for-internal-B2rBq6yB.js";
+import { _ as isPageRenderEnvelope, g as isEmptyPageRenderEnvelope, h as createPageRenderEnvelope, i as isDeferred, l as createRouteRegistry, m as resolveRouteRequest, t as DEFERRED_BOUNDARY } from "./deferred-Eh9bCVGH.js";
 import { c as stopRenderPhase$1, o as startRenderPhase$1, t as configureRenderContextProvider, u as SSRDataMissingError } from "./render-context-Clw3rFiO.js";
 import { a as disposeDefaultPortalScope, t as DefaultPortal } from "./portal-D2tPWNrC.js";
 import { t as getPublicAttributeName } from "./attr-names-CjhzmHOn.js";
 import { r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-C-8E85El.js";
 import { t as createDataRuntime } from "./data-runtime-SJ1BSUvk.js";
 import { c as withTelemetry, i as dehydrateDataRuntime, t as createQueryPrefetchContext } from "./query-registry-CQIT4mXr.js";
-import { a as resolveRouteFromRoutes, t as _resolveRouteMatchFromRoutes } from "./route-matching-vJpvLVbX.js";
-import { f as resolveRouteRequest, g as isPageRenderEnvelope, h as isEmptyPageRenderEnvelope, i as isDeferred, m as createPageRenderEnvelope, t as DEFERRED_BOUNDARY, x as _preloadRouteHandler } from "./deferred-vBQJwHl5.js";
+import { a as resolveRouteFromRoutes, t as _resolveRouteMatchFromRoutes } from "./route-matching-DLBWDeXX.js";
+import { a as route } from "./authoring-Di8MInO-.js";
 import { n as renderDocument, t as SSR_RENDER_DATA_ATTR } from "./ssr-CbQO5xd3.js";
 //#region src/ssr/escape.ts
 /**
@@ -358,23 +359,14 @@ function routeHasSSRLoader(manifest, route) {
 	});
 }
 function resolvePolicyAwareSSRRoute(opts, routeTable) {
-	const manifest = opts.registry?.manifest;
-	if (!manifest) {
-		const matched = _resolveRouteMatchFromRoutes(new URL(opts.url, "http://localhost").pathname, routeTable);
-		if (!matched) throw new Error(`SSR: no route found for url: ${opts.url}`);
-		return {
-			url: opts.url,
-			route: matched.route,
-			params: matched.params
-		};
-	}
+	const manifest = opts.registry.manifest;
 	let href = opts.url;
 	const visited = /* @__PURE__ */ new Set();
 	for (let redirects = 0; redirects <= MAX_SSR_REDIRECTS; redirects += 1) {
 		const matched = _resolveRouteMatchFromRoutes(new URL(href, "http://localhost").pathname, routeTable);
 		if (!matched) throw new Error(`SSR: no route found for url: ${href}`);
 		const resolved = getRouteRequestResultSync(resolveRouteRequest(href, {
-			manifest,
+			registry: opts.registry,
 			mode: "ssr"
 		}));
 		if (resolved === null) throw new Error(`SSR: no route found for url: ${href}`);
@@ -489,31 +481,20 @@ var StreamSink = class {
 //#endregion
 //#region src/ssr/route-render.ts
 async function resolveRequest(opts) {
+	if (!opts?.registry) throw new TypeError("resolveRequest requires opts.registry.");
 	const { url, auth, authContext, request, signal } = opts;
-	const manifest = opts.manifest ?? opts.registry?.manifest;
-	const routes = opts.routes ?? opts.registry?.routes;
-	if (manifest) return await resolveRouteRequest(url, {
-		manifest,
+	return await resolveRouteRequest(url, {
+		registry: opts.registry,
 		mode: "ssr",
 		auth,
 		authContext,
 		request,
 		signal
 	});
-	if (!routes) throw new Error("resolveRequest requires a route manifest or route table.");
-	const resolved = resolveRouteFromRoutes(new URL(url, "http://localhost").pathname, routes);
-	if (!resolved) return null;
-	await _preloadRouteHandler(resolved.handler);
-	return {
-		kind: "render",
-		handler: resolved.handler,
-		params: resolved.params
-	};
 }
 function resolveSSRRouteSource(source) {
-	const routes = source.routes ?? source.registry?.routes;
-	if (!routes || routes.length === 0) throw new Error("SSR requires a route registry or route table.");
-	return routes.map((route) => ({
+	if (source.registry.routes.length === 0) throw new Error("SSR requires a non-empty route registry.");
+	return source.registry.routes.map((route) => ({
 		...route,
 		path: route.path,
 		handler: route.handler,
@@ -1245,19 +1226,23 @@ function sameRouteParams(left, right) {
 	return true;
 }
 function renderResolvedToStringSync(opts) {
-	const { url, routes, handler, params, options } = opts;
+	const { url, registry, handler, params, options } = opts;
+	const routes = registry.routes;
 	const requestUrl = new URL(url, "http://localhost");
 	const matchedIndex = routes.findIndex((route) => {
 		const resolved = resolveRouteFromRoutes(requestUrl.pathname, [route]);
 		return resolved !== null && resolved.handler === route.handler && sameRouteParams(resolved.params, params);
 	});
 	if (matchedIndex < 0) throw new Error(`renderResolvedToStringSync: no route found for url: ${url}`);
+	const effectiveRoutes = routes.map((route, index) => index === matchedIndex ? {
+		...route,
+		handler
+	} : route);
 	return renderToString({
 		url,
-		routes: routes.map((route, index) => index === matchedIndex ? {
-			...route,
-			handler
-		} : route),
+		registry: createRouteRegistry(() => {
+			for (const route$1 of effectiveRoutes) route(route$1.path, route$1.handler, { namespace: route$1.namespace });
+		}),
 		seed: options?.seed,
 		data: options?.data,
 		dataRuntime: options?.dataRuntime,
@@ -1370,9 +1355,9 @@ async function renderRouteRequestToString(options) {
 	};
 }
 async function renderRouteRequestInternal(options) {
+	if (!options?.registry) throw new TypeError("renderRouteRequest requires options.registry.");
 	const cspNonce = validateCspNonce(options.cspNonce);
-	const manifest = options.manifest ?? options.registry?.manifest;
-	if (!manifest) throw new Error("renderRouteRequestToString requires a route manifest or registry.");
+	const manifest = options.registry.manifest;
 	const signal = options.signal ?? options.request?.signal ?? new AbortController().signal;
 	const request = options.request ?? new Request(new URL(options.url, "http://localhost"));
 	const runtime = options.dataRuntime ?? createDataRuntime();
@@ -1396,7 +1381,7 @@ async function renderRouteRequestInternal(options) {
 	});
 	return withTelemetry(options.telemetry?.ssrRender, {}, () => withRenderContextAsync(context, async () => {
 		const resolved = await resolveRouteRequest(options.url, {
-			manifest,
+			registry: options.registry,
 			mode: "ssr",
 			auth: options.auth ?? manifest.auth,
 			authContext: options.authContext,

package/dist/testing/index.d.ts

@@ -1,5 +1,5 @@
 import { C as Query, k as QueryStaleReason } from "../index-Bki2rqcr.js";
-import { S as RouteMatch, p as Route, x as RouteManifest } from "../router-Dz7ZoLja.js";
+import { N as RouteRegistry, x as RouteMatch } from "../router-4EhVGcma.js";
 
 //#region src/testing/index.d.ts
 type MockRefresh = () => void | Promise<void>;
@@ -17,8 +17,7 @@ interface InvalidationRecorder {
   stop(): void;
 }
 interface MatchRouteOptions {
-  manifest?: RouteManifest;
-  routes?: readonly Route[];
+  registry: RouteRegistry;
 }
 interface RoutePatternWarning {
   kind: 'route-collision';
@@ -46,7 +45,7 @@ declare const queryState: {
   pendingWrite: <T extends {}>(data: T, options?: MockQueryOptions) => Query<T>;
 };
 declare function createInvalidationRecorder(): InvalidationRecorder;
-declare function matchRoute(path: string, options?: MatchRouteOptions): RouteMatch | null;
-declare function getRouteWarnings(options?: MatchRouteOptions): RoutePatternWarning[];
+declare function matchRoute(path: string, options: MatchRouteOptions): RouteMatch | null;
+declare function getRouteWarnings(options: MatchRouteOptions): RoutePatternWarning[];
 //#endregion
 export { InvalidationRecord, InvalidationRecorder, MockQueryOptions, MockRefresh, RoutePatternWarning, createInvalidationRecorder, getRouteWarnings, matchRoute, mockQuery, queryState };

package/dist/testing/index.js

@@ -1,5 +1,5 @@
 import { t as addInvalidationListener } from "../invalidation-listeners-Des3AHYs.js";
-import { R as parseSegments, r as computeRouteActivityMatches } from "../route-matching-vJpvLVbX.js";
+import { r as computeRouteActivityMatches } from "../route-matching-DLBWDeXX.js";
 //#region src/testing/index.ts
 function normalizeRefresh(options) {
 	return async () => {
@@ -114,20 +114,17 @@ function createInvalidationRecorder() {
 		}
 	};
 }
-function matchRoute(path, options = {}) {
-	return computeRouteActivityMatches(path, options)[0] ?? null;
+function matchRoute(path, options) {
+	if (!options?.registry) throw new TypeError("matchRoute requires options.registry.");
+	return computeRouteActivityMatches(path, { registry: options.registry })[0] ?? null;
 }
 function getRoutePatternRecords(options) {
-	if (options.manifest) return options.manifest.records.map((record) => ({
+	if (!options?.registry) throw new TypeError("getRouteWarnings requires options.registry.");
+	return options.registry.manifest.records.map((record) => ({
 		path: record.path,
 		segments: record.segments,
 		namespace: record.options.namespace
 	}));
-	return (options.routes ?? []).map((route) => ({
-		path: route.path,
-		segments: parseSegments(route.path),
-		namespace: route.namespace
-	}));
 }
 function routePrefixMatches(splatPrefix, routeSegments) {
 	if (routeSegments.length <= splatPrefix.length) return false;
@@ -138,7 +135,7 @@ function routePrefixMatches(splatPrefix, routeSegments) {
 	}
 	return true;
 }
-function getRouteWarnings(options = {}) {
+function getRouteWarnings(options) {
 	const records = getRoutePatternRecords(options);
 	const warnings = [];
 	for (const record of records) {

package/dist/{verify-hydration-DfsBcGSf.js → verify-hydration-BcZXRU-q.js}

@@ -1,5 +1,5 @@
 import { t as SSR_RENDER_DATA_ATTR } from "./ssr-CbQO5xd3.js";
-import { a as renderResolvedToStringSync } from "./ssr-CAYo-kNy.js";
+import { a as renderResolvedToStringSync } from "./ssr-Y8Pq8riM.js";
 //#region src/ssr/verify-hydration.ts
 function normalizeHydrationHtml(html) {
 	const template = document.createElement("template");
@@ -8,10 +8,10 @@ function normalizeHydrationHtml(html) {
 	return template.innerHTML.replace(/<!--[\s\S]*?-->/g, "");
 }
 function verifyHydrationSyncForUrl(opts) {
-	const { root, url, routes, resolved, options } = opts;
+	const { root, url, registry, resolved, options } = opts;
 	const expected = renderResolvedToStringSync({
 		url,
-		routes,
+		registry,
 		handler: resolved.handler,
 		params: resolved.params,
 		options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askrjs/askr",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "description": "Actor-backed deterministic UI framework",
   "keywords": [
     "askr",