@junejs/server 0.1.2 → 0.2.0

package/dist/manifest.js

@@ -0,0 +1,113 @@
+import { findMiddlewareFile } from "./router.js";
+import { scanAppRoutes } from "./route-scan.js";
+import { resolveBoundary } from "./segment.js";
+import { freezeConfig } from "./config-freeze.js";
+import { existsSync } from "node:fs";
+import { basename, join } from "node:path";
+import { pathToFileURL } from "node:url";
+import { routeFromModule } from "@junejs/core/route";
+//#region src/manifest.ts
+async function importLayout(file) {
+	const mod = await import(pathToFileURL(file).href);
+	return typeof mod.default === "function" ? {
+		component: mod.default,
+		boundary: mod.segmentBoundary === true
+	} : null;
+}
+async function buildManifest(appRoot) {
+	const appDir = join(appRoot, "app");
+	const frozen = await freezeConfig(appRoot);
+	const scanned = await scanAppRoutes(appRoot);
+	const layoutCache = /* @__PURE__ */ new Map();
+	const loadCached = async (f) => {
+		if (!layoutCache.has(f)) layoutCache.set(f, await importLayout(f));
+		return layoutCache.get(f) ?? null;
+	};
+	const componentsFor = async (files) => {
+		const items = [];
+		for (const f of files) {
+			const c = await loadCached(f);
+			items.push({
+				file: f,
+				entry: c?.component ?? null,
+				boundary: !!c?.boundary
+			});
+		}
+		return resolveBoundary(items);
+	};
+	const loadingCache = /* @__PURE__ */ new Map();
+	const loadingFor = async (file) => {
+		if (!file) return void 0;
+		if (!loadingCache.has(file)) {
+			const loaded = await importLayout(file);
+			loadingCache.set(file, loaded ? loaded.component : null);
+		}
+		return loadingCache.get(file) ?? void 0;
+	};
+	const routes = {};
+	const dynamicRoutes = [];
+	const resourceRoutes = [];
+	const generatedRoutes = scanned.filter((r) => r.generated).map((r) => r.path);
+	const layoutChains = {};
+	const layoutBoundaries = {};
+	const loadings = {};
+	for (const r of scanned) {
+		const mod = await import(pathToFileURL(r.file).href);
+		if (r.resource) {
+			const handler = mod.default;
+			if (typeof handler === "function") resourceRoutes.push({
+				pattern: r.path,
+				handler
+			});
+			continue;
+		}
+		const def = routeFromModule(mod);
+		if (!def) continue;
+		const { chain, boundaryIndex, key } = await componentsFor(r.layouts);
+		const loading = await loadingFor(r.loading);
+		if (r.dynamic) {
+			dynamicRoutes.push({
+				pattern: r.path,
+				def
+			});
+			layoutChains[r.path] = chain;
+		} else {
+			routes[r.path] = def;
+			layoutChains[r.path] = chain;
+		}
+		if (boundaryIndex !== null && key !== null) layoutBoundaries[r.path] = {
+			index: boundaryIndex,
+			key
+		};
+		if (loading) loadings[r.path] = loading;
+	}
+	let extra;
+	const extraFile = findMiddlewareFile(appDir);
+	if (extraFile) {
+		const mod = await import(pathToFileURL(extraFile).href);
+		if (typeof mod.default === "function") extra = mod.default;
+	}
+	let agentName;
+	const agentDir = join(appDir, frozen.agent.runtime.dir);
+	if (frozen.agent.runtime.enabled && existsSync(agentDir)) {
+		const cfgFile = join(agentDir, "agent.ts");
+		agentName = (existsSync(cfgFile) ? (await import(pathToFileURL(cfgFile).href)).default : void 0)?.name ?? basename(agentDir);
+	}
+	return {
+		routes,
+		dynamicRoutes,
+		resourceRoutes,
+		...generatedRoutes.length ? { generatedRoutes } : {},
+		layoutChains,
+		layoutBoundaries,
+		loadings,
+		document: frozen.document,
+		agent: frozen.agent,
+		agentName,
+		i18n: frozen.i18n,
+		earlyHints: frozen.earlyHints,
+		extra
+	};
+}
+//#endregion
+export { buildManifest, importLayout };

package/dist/negotiate.d.ts

@@ -1,11 +1,12 @@
 import { RenderTarget } from "@junejs/core/route";
 import { FRAGMENT_ACCEPT, SEGMENT_HEADER, TITLE_HEADER, encodeTitle } from "@junejs/core/nav-protocol";
 //#region src/negotiate.d.ts
-type Negotiated = {
+export declare function acceptTarget(accept: string): RenderTarget | null;
+export type Negotiated = {
   target: RenderTarget;
   pathname: string;
   speculative: boolean;
 };
-declare function negotiate(url: URL, request: Request, basePath?: string): Negotiated;
+export declare function negotiate(url: URL, request: Request, basePath?: string): Negotiated;
 //#endregion
-export { FRAGMENT_ACCEPT, Negotiated, SEGMENT_HEADER, TITLE_HEADER, encodeTitle, negotiate };
+export { FRAGMENT_ACCEPT, SEGMENT_HEADER, TITLE_HEADER, encodeTitle };

package/dist/negotiate.js

@@ -1,14 +1,30 @@
-import { FRAGMENT_ACCEPT, SEGMENT_HEADER, TITLE_HEADER, encodeTitle } from "@junejs/core/nav-protocol";
+import { FRAGMENT_ACCEPT, FRAGMENT_ACCEPT as FRAGMENT_ACCEPT$1, SEGMENT_HEADER, TITLE_HEADER, encodeTitle } from "@junejs/core/nav-protocol";
 //#region src/negotiate.ts
 const EXT_TARGET = {
 	".json": "json",
 	".md": "md"
 };
-const ACCEPT_TARGET = [
-	[/text\/vnd\.june\.fragment\+html/, "fragment"],
-	[/text\/markdown/, "md"],
-	[/application\/json/, "json"]
-];
+const QVALUE = /^(?:0(?:\.\d{0,3})?|1(?:\.0{0,3})?)$/;
+function acceptRanges(accept) {
+	const ranges = /* @__PURE__ */ new Map();
+	for (const part of accept.split(",")) {
+		const [type, ...params] = part.split(";").map((s) => s.trim().toLowerCase());
+		if (!type) continue;
+		const raw = params.find((p) => p.startsWith("q="))?.slice(2).trim();
+		ranges.set(type, raw !== void 0 && QVALUE.test(raw) ? Number(raw) : 1);
+	}
+	return ranges;
+}
+function acceptTarget(accept) {
+	const ranges = acceptRanges(accept);
+	if ((ranges.get(FRAGMENT_ACCEPT$1) ?? 0) > 0) return "fragment";
+	const html = ranges.get("text/html") ?? ranges.get("text/*") ?? ranges.get("*/*") ?? 0;
+	const md = ranges.get("text/markdown") ?? 0;
+	const json = ranges.get("application/json") ?? 0;
+	const best = Math.max(md, json);
+	if (best <= 0 || best < html) return null;
+	return md >= json ? "md" : "json";
+}
 function negotiate(url, request, basePath) {
 	const original = basePath ?? url.pathname;
 	let pathname = original;
@@ -20,13 +36,7 @@ function negotiate(url, request, basePath) {
 	}
 	if (pathname === "/index") pathname = "/";
 	else if (target && pathname === "/") pathname = original;
-	if (!target) {
-		const accept = request.headers.get("accept") ?? "";
-		for (const [re, t] of ACCEPT_TARGET) if (re.test(accept)) {
-			target = t;
-			break;
-		}
-	}
+	if (!target) target = acceptTarget(request.headers.get("accept") ?? "");
 	const purpose = request.headers.get("sec-purpose") ?? "";
 	const speculative = /prefetch|prerender/.test(purpose);
 	return {
@@ -36,4 +46,4 @@ function negotiate(url, request, basePath) {
 	};
 }
 //#endregion
-export { FRAGMENT_ACCEPT, SEGMENT_HEADER, TITLE_HEADER, encodeTitle, negotiate };
+export { FRAGMENT_ACCEPT, SEGMENT_HEADER, TITLE_HEADER, acceptTarget, encodeTitle, negotiate };

package/dist/{pipeline-CCp9idQ4.d.ts → pipeline-BHUjBO0G.d.ts}

@@ -4,6 +4,7 @@ import React from "react";
 import { DocumentConfig } from "@junejs/core/document";
 import { I18nConfig } from "@junejs/core/i18n";
 import { Resources } from "@junejs/core/resources";
+import { Principal, Session } from "@junejs/core/context";
 //#region src/pipeline.d.ts
 type LayoutComponent = React.ComponentType<{
   children: React.ReactNode;
@@ -30,8 +31,16 @@ type PipelineConfig = {
   i18n?: I18nConfig;
   routeList: () => Promise<string[]> | string[];
   resolve: RouteResolver;
+  staticBuild?: boolean;
   resources?: () => Promise<Resources> | Resources;
   services?: () => Promise<unknown> | unknown;
+  identity?: (request: Request) => Promise<{
+    user?: Principal;
+    session?: Session;
+  }> | {
+    user?: Principal;
+    session?: Session;
+  };
   earlyHints?: string[];
   htmlCacheControl?: string;
   notFoundComponent?: React.ComponentType<{
@@ -45,6 +54,9 @@ type ExtraHandler = MiddlewareHandler;
 type Pipeline = {
   fetch(request: Request): Promise<Response>;
 };
+declare function markdownPath(pathname: string, isHome: boolean): string;
+declare function htmlPath(pathname: string, isHome: boolean): string;
+declare function isDecodablePath(pathname: string): boolean;
 declare function createPipeline(cfg: PipelineConfig): Pipeline;
 //#endregion
-export { Pipeline as a, ResolvedResource as c, createPipeline as d, MiddlewareHandler as i, ResourceHandler as l, LayoutComponent as n, PipelineConfig as o, LoadingComponent as r, Resolved as s, ExtraHandler as t, RouteResolver as u };
+export { Pipeline as a, ResolvedResource as c, createPipeline as d, htmlPath as f, MiddlewareHandler as i, ResourceHandler as l, markdownPath as m, LayoutComponent as n, PipelineConfig as o, isDecodablePath as p, LoadingComponent as r, Resolved as s, ExtraHandler as t, RouteResolver as u };

package/dist/pipeline.d.ts

@@ -1,2 +1,2 @@
-import { a as Pipeline, c as ResolvedResource, d as createPipeline, i as MiddlewareHandler, l as ResourceHandler, n as LayoutComponent, o as PipelineConfig, r as LoadingComponent, s as Resolved, t as ExtraHandler, u as RouteResolver } from "./pipeline-CCp9idQ4.js";
-export { ExtraHandler, LayoutComponent, LoadingComponent, MiddlewareHandler, Pipeline, PipelineConfig, Resolved, ResolvedResource, ResourceHandler, RouteResolver, createPipeline };
+import { a as Pipeline, c as ResolvedResource, d as createPipeline, f as htmlPath, i as MiddlewareHandler, l as ResourceHandler, m as markdownPath, n as LayoutComponent, o as PipelineConfig, p as isDecodablePath, r as LoadingComponent, s as Resolved, t as ExtraHandler, u as RouteResolver } from "./pipeline-BHUjBO0G.js";
+export { ExtraHandler, LayoutComponent, LoadingComponent, MiddlewareHandler, Pipeline, PipelineConfig, Resolved, ResolvedResource, ResourceHandler, RouteResolver, createPipeline, htmlPath, isDecodablePath, markdownPath };