@fragno-dev/core 0.1.10 → 0.2.0

package/dist/api/fragment-instantiator.js

@@ -1,5 +1,5 @@
-import { resolveRouteFactories } from "./route.js";
 import { instantiatedFragmentFakeSymbol } from "../internal/symbols.js";
+import { resolveRouteFactories } from "./route.js";
 import { FragnoApiError } from "./error.js";
 import { getMountRoute } from "./internal/route.js";
 import { RequestInputContext } from "./request-input-context.js";
@@ -9,14 +9,66 @@ import { RequestMiddlewareInputContext, RequestMiddlewareOutputContext } from ".
 import { parseFragnoResponse } from "./fragno-response.js";
 import { RequestContextStorage } from "./request-context-storage.js";
 import { bindServicesToContext } from "./bind-services.js";
+import { recordTraceEvent } from "../internal/trace-context.js";
 import { addRoute, createRouter, findRoute } from "rou3";
 
 //#region src/api/fragment-instantiator.ts
+const serializeHeadersForTrace = (headers) => Array.from(headers.entries()).sort(([a], [b]) => a.localeCompare(b));
+const serializeQueryForTrace = (query) => Array.from(query.entries()).sort(([a], [b]) => a.localeCompare(b));
+const serializeBodyForTrace = (body) => {
+	if (body instanceof FormData) return {
+		type: "form-data",
+		entries: Array.from(body.entries()).map(([key, value]) => {
+			if (value instanceof Blob) return [key, {
+				type: "blob",
+				size: value.size,
+				mime: value.type
+			}];
+			return [key, value];
+		})
+	};
+	if (body instanceof Blob) return {
+		type: "blob",
+		size: body.size,
+		mime: body.type
+	};
+	if (body instanceof ReadableStream) return { type: "stream" };
+	return body;
+};
+const INTERNAL_LINKED_FRAGMENT_NAME = "_fragno_internal";
+const INTERNAL_ROUTE_PREFIX = "/_internal";
+function normalizeRoutePrefix(prefix) {
+	if (!prefix.startsWith("/")) prefix = `/${prefix}`;
+	return prefix.endsWith("/") && prefix.length > 1 ? prefix.slice(0, -1) : prefix;
+}
+function joinRoutePath(prefix, path) {
+	const normalizedPrefix = normalizeRoutePrefix(prefix);
+	if (!path || path === "/") return normalizedPrefix;
+	return `${normalizedPrefix}${path.startsWith("/") ? path : `/${path}`}`;
+}
+function collectLinkedFragmentRoutes(linkedFragments) {
+	const linkedRoutes = [];
+	for (const [name, fragment] of Object.entries(linkedFragments)) {
+		if (name !== INTERNAL_LINKED_FRAGMENT_NAME) continue;
+		const internalRoutes = fragment.routes ?? [];
+		if (internalRoutes.length === 0) continue;
+		for (const route of internalRoutes) linkedRoutes.push({
+			...route,
+			path: joinRoutePath(INTERNAL_ROUTE_PREFIX, route.path),
+			__internal: {
+				fragment,
+				originalPath: route.path,
+				routes: internalRoutes
+			}
+		});
+	}
+	return linkedRoutes;
+}
 /**
 * Instantiated fragment class with encapsulated state.
 * Provides the same public API as the old FragnoInstantiatedFragment but with better encapsulation.
 */
-var FragnoInstantiatedFragment = class {
+var FragnoInstantiatedFragment = class FragnoInstantiatedFragment {
 	[instantiatedFragmentFakeSymbol] = instantiatedFragmentFakeSymbol;
 	#name;
 	#routes;
@@ -31,6 +83,7 @@ var FragnoInstantiatedFragment = class {
 	#createRequestStorage;
 	#options;
 	#linkedFragments;
+	#internalData;
 	constructor(params) {
 		this.#name = params.name;
 		this.#routes = params.routes;
@@ -43,6 +96,7 @@ var FragnoInstantiatedFragment = class {
 		this.#createRequestStorage = params.createRequestStorage;
 		this.#options = params.options;
 		this.#linkedFragments = params.linkedFragments ?? {};
+		this.#internalData = params.internalData ?? {};
 		this.#router = createRouter();
 		for (const routeConfig of this.#routes) addRoute(this.#router, routeConfig.method.toUpperCase(), routeConfig.path, routeConfig);
 		this.handler = this.handler.bind(this);
@@ -66,7 +120,8 @@ var FragnoInstantiatedFragment = class {
 		return {
 			deps: this.#deps,
 			options: this.#options,
-			linkedFragments: this.#linkedFragments
+			linkedFragments: this.#linkedFragments,
+			...this.#internalData
 		};
 	}
 	/**
@@ -160,26 +215,65 @@ var FragnoInstantiatedFragment = class {
 			error: `Fragno: Route for '${this.#name}' not found`,
 			code: "ROUTE_NOT_FOUND"
 		}, { status: 404 });
+		const routeConfig = route.data;
+		const expectedContentType = routeConfig.contentType ?? "application/json";
 		let requestBody = void 0;
 		let rawBody = void 0;
 		if (req.body instanceof ReadableStream) {
-			rawBody = await req.clone().text();
-			if (rawBody) try {
-				requestBody = JSON.parse(rawBody);
-			} catch {
-				requestBody = void 0;
+			const requestContentType = (req.headers.get("content-type") ?? "").toLowerCase();
+			if (expectedContentType === "multipart/form-data") {
+				if (!requestContentType.includes("multipart/form-data")) return Response.json({
+					error: `This endpoint expects multipart/form-data, but received: ${requestContentType || "no content-type"}`,
+					code: "UNSUPPORTED_MEDIA_TYPE"
+				}, { status: 415 });
+				try {
+					requestBody = await req.formData();
+				} catch {
+					return Response.json({
+						error: "Failed to parse multipart form data",
+						code: "INVALID_REQUEST_BODY"
+					}, { status: 400 });
+				}
+			} else if (expectedContentType === "application/octet-stream") {
+				if (!requestContentType.includes("application/octet-stream")) return Response.json({
+					error: `This endpoint expects application/octet-stream, but received: ${requestContentType || "no content-type"}`,
+					code: "UNSUPPORTED_MEDIA_TYPE"
+				}, { status: 415 });
+				requestBody = req.body ?? new ReadableStream();
+			} else {
+				if (requestContentType.includes("multipart/form-data")) return Response.json({
+					error: `This endpoint expects JSON, but received multipart/form-data. Use a route with contentType: "multipart/form-data" for file uploads.`,
+					code: "UNSUPPORTED_MEDIA_TYPE"
+				}, { status: 415 });
+				rawBody = await req.clone().text();
+				if (rawBody) try {
+					requestBody = JSON.parse(rawBody);
+				} catch {
+					requestBody = void 0;
+				}
 			}
 		}
+		const decodedRouteParams = {};
+		for (const [key, value] of Object.entries(route.params ?? {})) decodedRouteParams[key] = decodeURIComponent(value);
 		const requestState = new MutableRequestState({
-			pathParams: route.params ?? {},
+			pathParams: decodedRouteParams,
 			searchParams: url.searchParams,
 			body: requestBody,
 			headers: new Headers(req.headers)
 		});
 		const executeRequest = async () => {
-			if (this.#middlewareHandler) {
-				const middlewareResult = await this.#executeMiddleware(req, route, requestState);
-				if (middlewareResult !== void 0) return middlewareResult;
+			const middlewareResult = await this.#executeMiddleware(req, route, requestState);
+			if (middlewareResult !== void 0) return middlewareResult;
+			const internalMeta = routeConfig.__internal;
+			if (internalMeta) {
+				const internalResult = await FragnoInstantiatedFragment.#runMiddlewareForFragment(internalMeta.fragment, {
+					req,
+					method: routeConfig.method,
+					path: internalMeta.originalPath,
+					requestState,
+					routes: internalMeta.routes
+				});
+				if (internalResult !== void 0) return internalResult;
 			}
 			return this.#executeHandler(req, route, requestState, rawBody);
 		};
@@ -215,6 +309,15 @@ var FragnoInstantiatedFragment = class {
 			inputSchema: route.inputSchema,
 			shouldValidateInput: true
 		});
+		recordTraceEvent({
+			type: "route-input",
+			method: route.method,
+			path: route.path,
+			pathParams: pathParams ?? {},
+			queryParams: serializeQueryForTrace(searchParams),
+			headers: serializeHeadersForTrace(requestHeaders),
+			body: serializeBodyForTrace(body)
+		});
 		const outputContext = new RequestOutputContext(route.outputSchema);
 		const executeHandler = async () => {
 			try {
@@ -236,20 +339,43 @@ var FragnoInstantiatedFragment = class {
 	* Returns undefined if middleware allows the request to continue to the handler.
 	*/
 	async #executeMiddleware(req, route, requestState) {
-		if (!this.#middlewareHandler || !route) return;
+		if (!route) return;
 		const { path } = route.data;
-		const middlewareInputContext = new RequestMiddlewareInputContext(this.#routes, {
+		return FragnoInstantiatedFragment.#runMiddlewareForFragment(this, {
+			req,
 			method: req.method,
 			path,
-			request: req,
-			state: requestState
+			requestState
 		});
-		const middlewareOutputContext = new RequestMiddlewareOutputContext(this.#deps, this.#services);
+	}
+	static async #runMiddlewareForFragment(fragment, options) {
+		if (!fragment.#middlewareHandler) return;
+		const middlewareInputContext = new RequestMiddlewareInputContext(options.routes ?? fragment.#routes, {
+			method: options.method,
+			path: options.path,
+			request: options.req,
+			state: options.requestState
+		});
+		const middlewareOutputContext = new RequestMiddlewareOutputContext(fragment.#deps, fragment.#services);
 		try {
-			const middlewareResult = await this.#middlewareHandler(middlewareInputContext, middlewareOutputContext);
+			const middlewareResult = await fragment.#middlewareHandler(middlewareInputContext, middlewareOutputContext);
+			recordTraceEvent({
+				type: "middleware-decision",
+				method: options.method,
+				path: options.path,
+				outcome: middlewareResult ? "deny" : "allow",
+				status: middlewareResult?.status
+			});
 			if (middlewareResult !== void 0) return middlewareResult;
 		} catch (error) {
 			console.error("Error in middleware", error);
+			recordTraceEvent({
+				type: "middleware-decision",
+				method: options.method,
+				path: options.path,
+				outcome: "deny",
+				status: error instanceof FragnoApiError ? error.status : 500
+			});
 			if (error instanceof FragnoApiError) return error.toResponse();
 			return Response.json({
 				error: "Internal server error",
@@ -275,6 +401,15 @@ var FragnoInstantiatedFragment = class {
 			state: requestState,
 			rawBody
 		});
+		recordTraceEvent({
+			type: "route-input",
+			method: req.method,
+			path,
+			pathParams: inputContext.pathParams,
+			queryParams: serializeQueryForTrace(requestState.searchParams),
+			headers: serializeHeadersForTrace(requestState.headers),
+			body: serializeBodyForTrace(requestState.body)
+		});
 		const outputContext = new RequestOutputContext(outputSchema);
 		try {
 			const contextForHandler = this.#handlerThisContext ?? {};
@@ -293,17 +428,26 @@ var FragnoInstantiatedFragment = class {
 * Core instantiation function that creates a fragment instance from a definition.
 * This function validates dependencies, calls all callbacks, and wires everything together.
 */
-function instantiateFragment(definition, config, routesOrFactories, options, serviceImplementations) {
+function instantiateFragment(definition, config, routesOrFactories, options, serviceImplementations, instantiationOptions) {
+	const { dryRun = false } = instantiationOptions ?? {};
 	const serviceDependencies = definition.serviceDependencies;
 	if (serviceDependencies) for (const [serviceName, meta] of Object.entries(serviceDependencies)) {
 		const metadata = meta;
 		const implementation = serviceImplementations?.[serviceName];
 		if (metadata.required && !implementation) throw new Error(`Fragment '${definition.name}' requires service '${metadata.name}' but it was not provided`);
 	}
-	const deps = definition.dependencies?.({
-		config,
-		options
-	}) ?? {};
+	let deps;
+	try {
+		deps = definition.dependencies?.({
+			config,
+			options
+		}) ?? {};
+	} catch (error) {
+		if (dryRun) {
+			console.warn("Warning: Failed to initialize dependencies in dry run mode:", error instanceof Error ? error.message : String(error));
+			deps = {};
+		} else throw error;
+	}
 	const linkedFragmentInstances = {};
 	const linkedFragmentServices = {};
 	if (definition.linkedFragments) for (const [name, callback] of Object.entries(definition.linkedFragments)) {
@@ -318,31 +462,59 @@ function instantiateFragment(definition, config, routesOrFactories, options, ser
 	}
 	const defineService = (services$1) => services$1;
 	const privateServices = { ...linkedFragmentServices };
-	if (definition.privateServices) for (const [serviceName, factory] of Object.entries(definition.privateServices)) privateServices[serviceName] = factory({
-		config,
-		options,
-		deps,
-		serviceDeps: serviceImplementations ?? {},
-		privateServices,
-		defineService
-	});
-	const baseServices = definition.baseServices?.({
-		config,
-		options,
-		deps,
-		serviceDeps: serviceImplementations ?? {},
-		privateServices,
-		defineService
-	}) ?? {};
+	if (definition.privateServices) for (const [serviceName, factory] of Object.entries(definition.privateServices)) {
+		const serviceFactory = factory;
+		try {
+			privateServices[serviceName] = serviceFactory({
+				config,
+				options,
+				deps,
+				serviceDeps: serviceImplementations ?? {},
+				privateServices,
+				defineService
+			});
+		} catch (error) {
+			if (dryRun) {
+				console.warn(`Warning: Failed to initialize private service '${serviceName}' in dry run mode:`, error instanceof Error ? error.message : String(error));
+				privateServices[serviceName] = {};
+			} else throw error;
+		}
+	}
+	let baseServices;
+	try {
+		baseServices = definition.baseServices?.({
+			config,
+			options,
+			deps,
+			serviceDeps: serviceImplementations ?? {},
+			privateServices,
+			defineService
+		}) ?? {};
+	} catch (error) {
+		if (dryRun) {
+			console.warn("Warning: Failed to initialize base services in dry run mode:", error instanceof Error ? error.message : String(error));
+			baseServices = {};
+		} else throw error;
+	}
 	const namedServices = {};
-	if (definition.namedServices) for (const [serviceName, factory] of Object.entries(definition.namedServices)) namedServices[serviceName] = factory({
-		config,
-		options,
-		deps,
-		serviceDeps: serviceImplementations ?? {},
-		privateServices,
-		defineService
-	});
+	if (definition.namedServices) for (const [serviceName, factory] of Object.entries(definition.namedServices)) {
+		const serviceFactory = factory;
+		try {
+			namedServices[serviceName] = serviceFactory({
+				config,
+				options,
+				deps,
+				serviceDeps: serviceImplementations ?? {},
+				privateServices,
+				defineService
+			});
+		} catch (error) {
+			if (dryRun) {
+				console.warn(`Warning: Failed to initialize service '${serviceName}' in dry run mode:`, error instanceof Error ? error.message : String(error));
+				namedServices[serviceName] = {};
+			} else throw error;
+		}
+	}
 	const services = {
 		...baseServices,
 		...namedServices
@@ -360,6 +532,12 @@ function instantiateFragment(definition, config, routesOrFactories, options, ser
 	});
 	const serviceContext = contexts?.serviceContext;
 	const handlerContext = contexts?.handlerContext;
+	const internalData = definition.internalDataFactory?.({
+		config,
+		options,
+		deps,
+		linkedFragments: linkedFragmentInstances
+	}) ?? {};
 	const boundServices = serviceContext ? bindServicesToContext(services, serviceContext) : services;
 	const routes = resolveRouteFactories({
 		config,
@@ -367,6 +545,8 @@ function instantiateFragment(definition, config, routesOrFactories, options, ser
 		services: boundServices,
 		serviceDeps: serviceImplementations ?? {}
 	}, routesOrFactories);
+	const linkedRoutes = collectLinkedFragmentRoutes(linkedFragmentInstances);
+	const finalRoutes = linkedRoutes.length > 0 ? [...routes, ...linkedRoutes] : routes;
 	const mountRoute = getMountRoute({
 		name: definition.name,
 		mountRoute: options.mountRoute
@@ -378,7 +558,7 @@ function instantiateFragment(definition, config, routesOrFactories, options, ser
 	}) : void 0;
 	return new FragnoInstantiatedFragment({
 		name: definition.name,
-		routes,
+		routes: finalRoutes,
 		deps,
 		services: boundServices,
 		mountRoute,
@@ -387,7 +567,8 @@ function instantiateFragment(definition, config, routesOrFactories, options, ser
 		storage,
 		createRequestStorage: createRequestStorageWithContext,
 		options,
-		linkedFragments: linkedFragmentInstances
+		linkedFragments: linkedFragmentInstances,
+		internalData
 	});
 }
 /**
@@ -463,7 +644,8 @@ var FragmentInstantiationBuilder = class FragmentInstantiationBuilder {
 	* Build and return the instantiated fragment
 	*/
 	build() {
-		return instantiateFragment(this.#definition, this.#config ?? {}, this.#routes ?? [], this.#options ?? {}, this.#services);
+		const dryRun = process.env["FRAGNO_INIT_DRY_RUN"] === "true";
+		return instantiateFragment(this.#definition, this.#config ?? {}, this.#routes ?? [], this.#options ?? {}, this.#services, { dryRun });
 	}
 };
 /**