@askrjs/askr 0.4.0 → 0.4.2

package/dist/ssg/index.js

@@ -1,8 +1,8 @@
-import { mt as prepareRouteHydrationData, nt as getRenderHandler, ot as RouteDataLoadError, rt as _preloadRouteHandler, t as bindResolvedRouteData, x as addRouteBasePath } from "../resolution-Cx82-xjW.js";
-import { n as createRouteRegistry } from "../manifest-CW9gyNBY.js";
-import { c as route, n as resolveDeferredValues } from "../deferred-bEEHHvic.js";
-import { n as renderDocument } from "../ssr-DoV-vJ-5.js";
-import { n as renderToString } from "../ssr-BJ8ug7zH.js";
+import { ct as encodePathSegment, mt as prepareRouteHydrationData, nt as getRenderHandler, ot as RouteDataLoadError, rt as _preloadRouteHandler, t as bindResolvedRouteData, x as addRouteBasePath } from "../resolution-CF1BqHLm.js";
+import { n as createRouteRegistry } from "../manifest-BNupb86f.js";
+import { c as route, n as resolveDeferredValues } from "../deferred-nGZglpj6.js";
+import { n as renderDocument } from "../ssr-DPfdcq0e.js";
+import { n as renderToString } from "../ssr-DueDLmhp.js";
 import * as fs$1 from "node:fs/promises";
 import * as os from "node:os";
 import * as pathModule from "node:path";
@@ -128,9 +128,33 @@ function getOutputFilePath(pathStr) {
 	if (pathStr === "/") return "index.html";
 	return `${pathStr.replace(/^\/|\/$/g, "")}/index.html`;
 }
+/** Prefer normalized names while accepting legacy raw template keys. */
+function readRouteParameter(params, key) {
+	const normalized = key.trim();
+	const splat = normalized.startsWith("*");
+	const name = splat ? normalized.slice(1).trim() : normalized;
+	const canonical = params[name];
+	return {
+		name,
+		splat,
+		value: key === name || typeof canonical === "string" || Object.prototype.hasOwnProperty.call(params, name) ? canonical : params[key]
+	};
+}
 function interpolateRoutePath(routePath, params) {
 	if (!params) return routePath;
-	return routePath.replace(/\{([^}]+)\}/g, (_, key) => params[key] ?? "");
+	return routePath.replace(/\{([^}]+)\}/g, (_, key) => {
+		return readRouteParameter(params, key).value ?? "";
+	});
+}
+/** Encode the render URL while retaining the existing concrete output path. */
+function interpolateRouteUrl(routePath, params) {
+	assertSafeRoutePath(interpolateRoutePath(routePath, params));
+	if (!params) return routePath;
+	return routePath.replace(/\{([^}]+)\}/g, (_, key) => {
+		const { splat, value: parameterValue } = readRouteParameter(params, key);
+		const value = parameterValue ?? "";
+		return splat ? value.split("/").map(encodePathSegment).join("/") : encodePathSegment(value);
+	});
 }
 function resolveRouteDescriptor(route) {
 	const path = interpolateRoutePath(route.path, route.params);
@@ -238,9 +262,12 @@ function validateRoutes(routes) {
 		if (seen.has(key)) throw new Error(`duplicate route entry detected for path "${route.path}"`);
 		seen.add(key);
 		if (route.path.includes("{")) {
-			const paramNames = Array.from(route.path.matchAll(/\{([^}]+)\}/g)).map((m) => m[1]);
+			const paramKeys = route.path.split("/").filter((segment) => segment.startsWith("{") && segment.endsWith("}")).map((segment) => segment.slice(1, -1));
 			if (!route.params) throw new Error(`route "${route.path}" uses path parameters and requires params`);
-			for (const name of paramNames) if (!(name in route.params)) throw new Error(`route "${route.path}" missing required param "${name}"`);
+			for (const paramKey of paramKeys) {
+				const { name, value } = readRouteParameter(route.params, paramKey);
+				if (typeof value !== "string") throw new Error(`route "${route.path}" missing required param "${name}"`);
+			}
 		}
 	}
 }
@@ -266,10 +293,11 @@ async function batchRenderRoutes(routes, options = {}) {
 	}, { basePath: sharedBasePath }) : void 0;
 	const renderOne = async (route$2) => {
 		const startTime = performance.now();
-		const url = interpolateRoutePath(route$2.path, route$2.params);
+		const path = interpolateRoutePath(route$2.path, route$2.params);
+		const url = interpolateRouteUrl(route$2.path, route$2.params);
 		const publicUrl = addRouteBasePath(url, route$2.basePath ?? "");
 		const requestUrl = new URL(url, "http://localhost");
-		const resolvedData = resolveSsgRouteData(dataMap, route$2.path, url);
+		const resolvedData = resolveSsgRouteData(dataMap, route$2.path, path);
 		const baseData = resolvedData.hasData ? resolvedData.data : void 0;
 		const resourceCount = resolvedData.hasData && baseData ? Object.keys(baseData).length : 0;
 		const mergedHandler = route$2.handler;
@@ -342,8 +370,8 @@ async function batchRenderRoutes(routes, options = {}) {
 			});
 			const duration = performance.now() - startTime;
 			return {
-				path: url,
-				filePath: getOutputFilePath(url),
+				path,
+				filePath: getOutputFilePath(path),
 				html,
 				fileSize: Buffer.byteLength(html, "utf8"),
 				renderDuration: Math.round(duration),
@@ -355,8 +383,8 @@ async function batchRenderRoutes(routes, options = {}) {
 		} catch (error) {
 			const duration = performance.now() - startTime;
 			return {
-				path: url,
-				filePath: getOutputFilePath(url),
+				path,
+				filePath: getOutputFilePath(path),
 				html: "",
 				fileSize: 0,
 				renderDuration: Math.round(duration),
@@ -927,6 +955,7 @@ function createStaticGen(options) {
 				for (let index = 0; index < eligibleDescriptors.length; index += 1) {
 					const descriptor = eligibleDescriptors[index];
 					const entry = selectRouteForGeneration(descriptor, previousEntries.get(descriptor.routeId) ?? null, effectiveMode, changedKeys, changedRoutes);
+					if (entry.reason === "unchanged" && !outputFileExists(options.outputDir, descriptor.filePath)) entry.reason = "new-route";
 					selected.push(entry);
 					if (entry.reason !== "unchanged") routesToRender.push(entry);
 				}

package/dist/ssr/index.js

@@ -1,4 +1,4 @@
 import { T as SSRDataMissingError } from "../render-context-DGHnEveC.js";
-import { a as SSRAccessDecisionError, i as renderRouteRequestToString, n as renderToString, r as renderRouteRequest, t as renderToStream } from "../ssr-BJ8ug7zH.js";
-import { c as getRenderContext, d as escapeHtml, l as withRenderContext, n as renderToStringSync, s as createRenderContext, u as withRenderContextAsync } from "../render-sync-IC5lMFpq.js";
+import { a as SSRAccessDecisionError, i as renderRouteRequestToString, n as renderToString, r as renderRouteRequest, t as renderToStream } from "../ssr-DueDLmhp.js";
+import { c as getRenderContext, d as escapeHtml, l as withRenderContext, n as renderToStringSync, s as createRenderContext, u as withRenderContextAsync } from "../render-sync-Qz-9Hcqw.js";
 export { SSRAccessDecisionError, SSRDataMissingError, createRenderContext, escapeHtml, getRenderContext, renderRouteRequest, renderRouteRequestToString, renderToStream, renderToString, renderToStringSync, withRenderContext, withRenderContextAsync };

package/dist/{ssr-DoV-vJ-5.js → ssr-DPfdcq0e.js}

@@ -1,5 +1,5 @@
 import { n as isPromiseLike } from "./promise-Dz8iIHAm.js";
-import { d as isCustomElementName } from "./url-CnbfpX0K.js";
+import { d as isCustomElementName } from "./url-C9xMpMMv.js";
 //#region src/common/prop-classification.ts
 /**
 * The prop vocabulary shared by the DOM renderer and the SSR renderer.

package/dist/{ssr-BJ8ug7zH.js → ssr-DueDLmhp.js}

@@ -1,11 +1,11 @@
-import { r as validateCspNonce } from "./csp-nonce-DwGw1A6Q.js";
+import { r as validateCspNonce } from "./csp-nonce-D-XM_uuJ.js";
 import { T as SSRDataMissingError, n as getActiveRenderContext, u as setDeferredBoundaryParent } from "./render-context-DGHnEveC.js";
 import { n as isPromiseLike } from "./promise-Dz8iIHAm.js";
-import { c as withTelemetry, i as dehydrateDataRuntime, t as createQueryPrefetchContext } from "./query-registry-WMCN0BJL.js";
-import { C as removeRouteBasePath, S as normalizeRouteBasePath, _ as getMatchingRouteRecord, a as resolveRouteRequest, n as getRouteRenderContext } from "./resolution-Cx82-xjW.js";
-import { t as createDataRuntime } from "./data-runtime-C1bFAlba.js";
-import { n as renderDocument } from "./ssr-DoV-vJ-5.js";
-import { a as serializeHydrationRenderData, i as StringSink, n as renderToStringSync, o as withHydratedAuth, r as StreamSink, s as createRenderContext, t as renderSSRRouteAppToSink, u as withRenderContextAsync } from "./render-sync-IC5lMFpq.js";
+import { c as withTelemetry, i as dehydrateDataRuntime, t as createQueryPrefetchContext } from "./query-registry-tzSiVrV_.js";
+import { C as removeRouteBasePath, S as normalizeRouteBasePath, _ as getMatchingRouteRecord, a as resolveRouteRequest, n as getRouteRenderContext } from "./resolution-CF1BqHLm.js";
+import { t as createDataRuntime } from "./data-runtime-i-RD0Ffm.js";
+import { n as renderDocument } from "./ssr-DPfdcq0e.js";
+import { a as serializeHydrationRenderData, i as StringSink, n as renderToStringSync, o as withHydratedAuth, r as StreamSink, s as createRenderContext, t as renderSSRRouteAppToSink, u as withRenderContextAsync } from "./render-sync-Qz-9Hcqw.js";
 //#region src/ssr/errors.ts
 /**
 * Thrown by synchronous route SSR (`renderToString()`/`renderToStream()`) when

package/dist/{state-DWO1KzkX.js → state-i9D4EtY6.js}

@@ -1,4 +1,4 @@
-import { D as isTracking, E as getTrackingComputation, F as logger, L as isProductionEnvironment, O as notifySource, S as queueTask, T as Signal, a as getCurrentInstance, b as getFlushVersion, h as isRendering, k as trackSource, r as claimHook, s as requireInstance, v as effectScheduler, w as Computation } from "./instance-BAnfmXOR.js";
+import { D as isTracking, E as getTrackingComputation, I as logger, O as notifySource, R as isProductionEnvironment, S as queueTask, T as Signal, a as getCurrentInstance, b as getFlushVersion, d as recordUndo, h as isRendering, k as trackSource, r as claimHook, s as requireInstance, v as effectScheduler, w as Computation } from "./instance-DL-YKrj6.js";
 import { t as markReadable } from "./readable-DFWOsTac.js";
 import { n as isSnapshotSource } from "./snapshot-Cjx4N988.js";
 //#region src/core/api/state.ts
@@ -114,6 +114,13 @@ function createDerived(owner, compute, label) {
 		})),
 		setCompute(fn) {
 			if (fn === current) return;
+			const previous = current;
+			const sources = new Set(computation._sources ?? []);
+			recordUndo(() => {
+				current = previous;
+				computation.restoreSources(sources);
+				computation.deferRetry();
+			});
 			current = fn;
 			computation.invalidate();
 		}
@@ -212,6 +219,17 @@ function createSelector(owner, initialSource, initialEquals) {
 	return {
 		predicate,
 		setSource(nextSource, nextEquals) {
+			if (nextSource === source && nextEquals === equals) return;
+			const previousSource = source;
+			const previousEquals = equals;
+			const sources = new Set(watcher._sources ?? []);
+			recordUndo(() => {
+				source = previousSource;
+				equals = previousEquals;
+				watcher.restoreSources(sources);
+				watcher.invalidate();
+				notifySource(allObjects);
+			});
 			const comparatorChanged = equals !== nextEquals;
 			equals = nextEquals;
 			if (comparatorChanged) notifySource(allObjects, getTrackingComputation() ?? void 0);

package/dist/{structures-D4dDMqHX.js → structures-CkehlOT3.js}

@@ -111,7 +111,7 @@ function createCollection() {
 		};
 		registry.set(node, item);
 		return () => {
-			registry.delete(node);
+			if (registry.get(node) === item) registry.delete(node);
 		};
 	}
 	function items() {

package/dist/testing/index.js

@@ -1,9 +1,9 @@
-import { y as flushSync } from "../instance-BAnfmXOR.js";
-import { n as createSource, s as notify, u as readSource } from "../hooks-BimKStr4.js";
-import { v as matchRoute } from "../resolution-Cx82-xjW.js";
-import { a as cleanupApp, n as createSPA, r as createIsland } from "../boot-DaoTYoCw.js";
-import { h as addInvalidationListener, t as createDataRuntime, u as resolveDataRuntimeState } from "../data-runtime-C1bFAlba.js";
-import { a as loadingQueryState, i as freshQueryState, o as refreshingQueryState, r as errorQueryState, s as staleQueryState } from "../data-BCwClJiF.js";
+import { y as flushSync } from "../instance-DL-YKrj6.js";
+import { n as createSource, s as notify, u as readSource } from "../hooks-kjLigwDJ.js";
+import { v as matchRoute } from "../resolution-CF1BqHLm.js";
+import { a as cleanupApp, n as createSPA, r as createIsland } from "../boot-DUJkrqGs.js";
+import { h as addInvalidationListener, t as createDataRuntime, u as resolveDataRuntimeState } from "../data-runtime-i-RD0Ffm.js";
+import { a as loadingQueryState, i as freshQueryState, o as refreshingQueryState, r as errorQueryState, s as staleQueryState } from "../data-BsnOUpQ6.js";
 import { i as normalizeAsyncDataError } from "../shared-O2ZnmYAf.js";
 //#region src/testing/render.ts
 const renderStates = /* @__PURE__ */ new WeakMap();

package/dist/{url-CnbfpX0K.js → url-C9xMpMMv.js}

@@ -1,4 +1,4 @@
-import { F as logger, I as isDevelopmentEnvironment } from "./instance-BAnfmXOR.js";
+import { I as logger, L as isDevelopmentEnvironment } from "./instance-DL-YKrj6.js";
 //#region src/common/attr-names.ts
 /**
 * JSX prop name to rendered attribute name, shared by the DOM renderer and SSR.
@@ -15,7 +15,7 @@ import { F as logger, I as isDevelopmentEnvironment } from "./instance-BAnfmXOR.
 * Custom elements (a tag name containing `-`) define their own attributes, so
 * they only get this base table and never the SVG table below.
 */
-const PUBLIC_ATTRIBUTE_NAME_MAP = {
+const PUBLIC_ATTRIBUTE_NAME_MAP = Object.assign(Object.create(null), {
 	className: "class",
 	htmlFor: "for",
 	autoComplete: "autocomplete",
@@ -36,8 +36,8 @@ const PUBLIC_ATTRIBUTE_NAME_MAP = {
 	strokeLinejoin: "stroke-linejoin",
 	fillRule: "fill-rule",
 	clipRule: "clip-rule"
-};
-const SVG_ATTRIBUTE_NAME_MAP = {};
+});
+const SVG_ATTRIBUTE_NAME_MAP = Object.create(null);
 /**
 * SVG presentation attributes are hyphenated, and the XML-namespaced ones use
 * a prefix; JSX spells both in camelCase (`strokeDasharray`, `xlinkHref`).
@@ -52,11 +52,11 @@ function getPublicAttributeName(propName, customElement = false) {
 	if (propName.startsWith("attr:")) return propName.slice(5);
 	return PUBLIC_ATTRIBUTE_NAME_MAP[propName] ?? (customElement ? void 0 : SVG_ATTRIBUTE_NAME_MAP[propName]) ?? propName;
 }
-const ATTRIBUTE_PREFIX_NAMESPACES = {
+const ATTRIBUTE_PREFIX_NAMESPACES = Object.assign(Object.create(null), {
 	xlink: "http://www.w3.org/1999/xlink",
 	xml: "http://www.w3.org/XML/1998/namespace",
 	xmlns: "http://www.w3.org/2000/xmlns/"
-};
+});
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 const MATHML_NAMESPACE = "http://www.w3.org/1998/Math/MathML";
 /**

package/dist/{verify-hydration-DpVaDnqz.js → verify-hydration-Jh5rnm_w.js}

@@ -1,8 +1,8 @@
-import { r as validateCspNonce } from "./csp-nonce-DwGw1A6Q.js";
+import { r as validateCspNonce } from "./csp-nonce-D-XM_uuJ.js";
 import { g as withHydrationVerificationRender, v as getHydrationRenderUrl } from "./render-context-DGHnEveC.js";
-import { C as removeRouteBasePath, S as normalizeRouteBasePath, f as currentAuth, n as getRouteRenderContext, y as resolveRouteFromRoutes } from "./resolution-Cx82-xjW.js";
-import { t as SSR_RENDER_DATA_ATTR } from "./ssr-DoV-vJ-5.js";
-import { i as StringSink, s as createRenderContext, t as renderSSRRouteAppToSink } from "./render-sync-IC5lMFpq.js";
+import { C as removeRouteBasePath, S as normalizeRouteBasePath, f as currentAuth, n as getRouteRenderContext, y as resolveRouteFromRoutes } from "./resolution-CF1BqHLm.js";
+import { t as SSR_RENDER_DATA_ATTR } from "./ssr-DPfdcq0e.js";
+import { i as StringSink, s as createRenderContext, t as renderSSRRouteAppToSink } from "./render-sync-Qz-9Hcqw.js";
 //#region src/ssr/render-resolved.ts
 function sameRouteParams(left, right) {
 	if (!left || !right) return !left && !right;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askrjs/askr",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "A TypeScript UI runtime with getter-based state, fine-grained bindings, transactional commits with rollback, and one route graph for SPA, SSR, and SSG.",
   "keywords": [
     "askr",