@junejs/server 0.1.2-dev.9 → 0.1.3

package/dist/route-rank.d.ts

@@ -0,0 +1,11 @@
+//#region src/route-rank.d.ts
+type SegmentKind = "static" | "param" | "optional" | "catchAll" | "optionalCatchAll";
+declare function parseSegment(segment: string): {
+  kind: SegmentKind;
+  name?: string;
+};
+declare function segmentRank(segment: string): number;
+declare function compareSegments(a: string, b: string): number;
+declare function compareRoutePatterns(a: string, b: string): number;
+//#endregion
+export { SegmentKind, compareRoutePatterns, compareSegments, parseSegment, segmentRank };

package/dist/route-rank.js

@@ -0,0 +1,38 @@
+//#region src/route-rank.ts
+const DYNAMIC = /^\[(\[)?(\.\.\.)?([A-Za-z_][A-Za-z0-9_]*)\](\])?$/;
+function parseSegment(segment) {
+	const m = segment.match(DYNAMIC);
+	if (!m || !!m[1] !== !!m[4]) return { kind: "static" };
+	const optional = !!m[1];
+	return {
+		kind: !!m[2] ? optional ? "optionalCatchAll" : "catchAll" : optional ? "optional" : "param",
+		name: m[3]
+	};
+}
+const RANK = {
+	static: 0,
+	param: 1,
+	optional: 2,
+	catchAll: 3,
+	optionalCatchAll: 4
+};
+function segmentRank(segment) {
+	return RANK[parseSegment(segment).kind];
+}
+function compareSegments(a, b) {
+	return segmentRank(a) - segmentRank(b) || (a < b ? -1 : a > b ? 1 : 0);
+}
+function compareRoutePatterns(a, b) {
+	const as = a.split("/").filter(Boolean);
+	const bs = b.split("/").filter(Boolean);
+	for (let i = 0; i < Math.max(as.length, bs.length); i++) {
+		const x = as[i];
+		const y = bs[i];
+		if (x === void 0) return -1;
+		if (y === void 0) return 1;
+		if (x !== y) return compareSegments(x, y);
+	}
+	return 0;
+}
+//#endregion
+export { compareRoutePatterns, compareSegments, parseSegment, segmentRank };

package/dist/router.js

@@ -1,3 +1,4 @@
+import { compareSegments, parseSegment } from "./route-rank.js";
 import { existsSync } from "node:fs";
 import { readdir } from "node:fs/promises";
 import { join, relative, sep } from "node:path";
@@ -42,11 +43,11 @@ function isSpecialFile(file) {
 	return SPECIAL_FILES.has(baseName(file));
 }
 const isRouteGroup = (name) => /^\(.+\)$/.test(name);
-const isParamDir = (name) => /^\[([A-Za-z_][A-Za-z0-9_]*)\]$/.test(name);
-const isOptionalDir = (name) => /^\[\[([A-Za-z_][A-Za-z0-9_]*)\]\]$/.test(name);
-const isOptionalCatchAllDir = (name) => /^\[\[\.\.\.([A-Za-z_][A-Za-z0-9_]*)\]\]$/.test(name);
-const isCatchAllDir = (name) => /^\[\.\.\.([A-Za-z_][A-Za-z0-9_]*)\]$/.test(name);
-const paramName = (name) => name.replace(/^\[+(\.\.\.)?|\]+$/g, "");
+const isParamDir = (name) => parseSegment(name).kind === "param";
+const isOptionalDir = (name) => parseSegment(name).kind === "optional";
+const isOptionalCatchAllDir = (name) => parseSegment(name).kind === "optionalCatchAll";
+const isCatchAllDir = (name) => parseSegment(name).kind === "catchAll";
+const paramName = (name) => parseSegment(name).name;
 async function listDir(dir) {
 	return (await readdir(dir, { withFileTypes: true }).catch(() => [])).filter((e) => !e.name.startsWith("_") && !e.name.startsWith(".")).map((e) => ({
 		name: e.name,
@@ -85,7 +86,7 @@ function routePath(appDir, file) {
 async function matchRouteTree(appDir, pathname, options = {}) {
 	const urlSegments = pathname.split("/").filter(Boolean).map(decodeURIComponent);
 	async function descend(dir, rest, params, chain) {
-		const entries = await listDir(dir);
+		const entries = (await listDir(dir)).sort((a, b) => compareSegments(a.name, b.name));
 		const segments = [...chain, segmentAt(dir, entries)];
 		if (rest.length === 0) {
 			const page = fileFor(entries, dir, "page") ?? fileFor(entries, dir, "index") ?? fileFor(entries, dir, "route");

package/dist/worker.d.ts

@@ -16,6 +16,7 @@ type WorkerManifest = {
     pattern: string;
     handler: ResourceHandler;
   }>;
+  generatedRoutes?: string[];
   layoutChains?: Record<string, LayoutComponent[]>;
   layoutBoundaries?: Record<string, {
     index: number;

package/dist/worker.js

@@ -1,4 +1,5 @@
 import { durableAgentSurface } from "./agent-durable.js";
+import { compareRoutePatterns, parseSegment } from "./route-rank.js";
 import { createPipeline } from "./pipeline.js";
 import { RESERVED_PREFIX, contentTypeFor, safeRelativePath } from "./static-files.js";
 //#region src/worker.ts
@@ -7,34 +8,16 @@ function compilePattern(pattern) {
 	let source = "";
 	let allOptional = true;
 	for (const seg of pattern.split("/").filter(Boolean)) {
-		const oca = seg.match(/^\[\[\.\.\.(\w+)\]\]$/);
-		if (oca) {
-			names.push(oca[1]);
-			source += "(?:/(.+))?";
-			continue;
-		}
-		const ca = seg.match(/^\[\.\.\.(\w+)\]$/);
-		if (ca) {
-			names.push(ca[1]);
-			source += "/(.+)";
-			allOptional = false;
-			continue;
-		}
-		const op = seg.match(/^\[\[(\w+)\]\]$/);
-		if (op) {
-			names.push(op[1]);
-			source += "(?:/([^/]+))?";
-			continue;
-		}
-		const p = seg.match(/^\[(\w+)\]$/);
-		if (p) {
-			names.push(p[1]);
-			source += "/([^/]+)";
+		const { kind, name } = parseSegment(seg);
+		if (name) names.push(name);
+		if (kind === "optionalCatchAll") source += "(?:/(.+))?";
+		else if (kind === "optional") source += "(?:/([^/]+))?";
+		else {
+			if (kind === "catchAll") source += "/(.+)";
+			else if (kind === "param") source += "/([^/]+)";
+			else source += "/" + seg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 			allOptional = false;
-			continue;
 		}
-		source += "/" + seg.replace(/[.*+?^${}()|\\]/g, "\\$&");
-		allOptional = false;
 	}
 	if (source === "") return {
 		regex: /^\/$/,
@@ -46,20 +29,42 @@ function compilePattern(pattern) {
 	};
 }
 function createWorker(manifest) {
-	const dynamic = (manifest.dynamicRoutes ?? []).map((d) => ({
-		...compilePattern(d.pattern),
-		def: d.def,
-		pattern: d.pattern
-	}));
-	const resources = (manifest.resourceRoutes ?? []).map((r) => ({
-		...compilePattern(r.pattern),
-		handler: r.handler,
-		pattern: r.pattern
-	}));
+	const generated = new Set(manifest.generatedRoutes ?? []);
+	const row = (pattern) => ({
+		...compilePattern(pattern),
+		pattern,
+		generated: generated.has(pattern)
+	});
+	const table = [
+		...Object.entries(manifest.routes).map(([pattern, def]) => ({
+			...row(pattern),
+			def
+		})),
+		...(manifest.dynamicRoutes ?? []).map((d) => ({
+			...row(d.pattern),
+			def: d.def
+		})),
+		...(manifest.resourceRoutes ?? []).map((r) => ({
+			...row(r.pattern),
+			handler: r.handler
+		}))
+	];
+	table.sort((a, b) => Number(a.generated) - Number(b.generated) || compareRoutePatterns(a.pattern, b.pattern) || Number(!!a.handler) - Number(!!b.handler));
 	const routeList = [...Object.keys(manifest.routes), ...(manifest.dynamicRoutes ?? []).map((d) => d.pattern)].sort();
 	const chainFor = (key) => manifest.layoutChains?.[key] ?? [];
 	const loadingFor = (key) => manifest.loadings?.[key];
 	const boundaryFor = (key) => manifest.layoutBoundaries?.[key] ?? null;
+	const resolvedPage = (def, key, params) => {
+		const b = boundaryFor(key);
+		return {
+			def,
+			params,
+			chain: chainFor(key),
+			boundaryIndex: b?.index ?? null,
+			boundaryKey: b?.key ?? null,
+			loading: loadingFor(key)
+		};
+	};
 	let currentEnv;
 	const provider = manifest.resources;
 	const servicesProvider = manifest.services;
@@ -85,47 +90,18 @@ function createWorker(manifest) {
 		services: servicesProvider ? () => (servicesCache ??= { v: servicesProvider(currentEnv) }).v : void 0,
 		resolve: async (pathname) => {
 			const staticDef = manifest.routes[pathname];
-			if (staticDef) {
-				const b = boundaryFor(pathname);
-				return {
-					def: staticDef,
-					params: {},
-					chain: chainFor(pathname),
-					boundaryIndex: b?.index ?? null,
-					boundaryKey: b?.key ?? null,
-					loading: loadingFor(pathname)
-				};
-			}
-			for (const d of dynamic) {
-				const m = pathname.match(d.regex);
-				if (m) {
-					const params = Object.fromEntries(d.names.flatMap((n, i) => {
-						const v = m[i + 1];
-						return v === void 0 ? [] : [[n, decodeURIComponent(v)]];
-					}));
-					const b = boundaryFor(d.pattern);
-					return {
-						def: d.def,
-						params,
-						chain: chainFor(d.pattern),
-						boundaryIndex: b?.index ?? null,
-						boundaryKey: b?.key ?? null,
-						loading: loadingFor(d.pattern)
-					};
-				}
-			}
-			for (const r of resources) {
+			if (staticDef && !generated.has(pathname)) return resolvedPage(staticDef, pathname, {});
+			for (const r of table) {
 				const m = pathname.match(r.regex);
-				if (m) {
-					const params = Object.fromEntries(r.names.flatMap((n, i) => {
-						const v = m[i + 1];
-						return v === void 0 ? [] : [[n, decodeURIComponent(v)]];
-					}));
-					return {
-						handler: r.handler,
-						params
-					};
-				}
+				if (!m) continue;
+				const params = Object.fromEntries(r.names.flatMap((n, i) => {
+					const v = m[i + 1];
+					return v === void 0 ? [] : [[n, decodeURIComponent(v)]];
+				}));
+				return r.handler ? {
+					handler: r.handler,
+					params
+				} : resolvedPage(r.def, r.pattern, params);
 			}
 			return null;
 		}
@@ -159,7 +135,7 @@ function withAssets(pipeline, opts = {}) {
 				});
 			}
 		}
-		if (assets) {
+		if (assets && (request.method === "GET" || request.method === "HEAD")) {
 			const a = await assets.fetch(request);
 			if (a.status !== 404) {
 				const ct = a.headers.get("content-type") ?? "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "0.1.2-dev.9",
+  "version": "0.1.3",
   "description": "June host adapters + dev server. Host-coupled; depends on the pure @junejs/core contract layer.",
   "type": "module",
   "license": "MIT",
@@ -125,14 +125,14 @@
     "build": "tsdown"
   },
   "dependencies": {
-    "@junejs/db": ">=0.0.34-dev.0",
+    "@junejs/core": ">=0.1.0",
+    "@junejs/db": ">=0.0.33",
     "@momiji-rs/sparkdown": "^0.0.4",
     "lightningcss": "^1.27.0",
     "oxc-parser": "^0.137.0",
     "rolldown": "^1.1.0"
   },
   "peerDependencies": {
-    "@junejs/core": ">=0.1.1-dev.16",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-server-dom-webpack": "19.2.7",