@finesoft/front 0.1.56 → 0.1.58

package/dist/index.mjs

@@ -231,6 +231,61 @@ function resolveLocaleFromUrl(url, supportedLocales) {
 	};
 }
 //#endregion
+//#region ../core/src/i18n/generated-loader.ts
+async function resolveGeneratedMessages(locale, context) {
+	if (!locale || !context) return;
+	const loader = await getGeneratedMessagesLoader();
+	if (!loader) return;
+	return loader(locale, context);
+}
+async function getGeneratedMessagesLoader() {
+	if (typeof globalThis.__FINESOFT_I18N_LOADER__ === "function") return globalThis.__FINESOFT_I18N_LOADER__;
+	if (typeof __FINESOFT_I18N_LOADER_IMPORTER__ !== "function") return;
+	try {
+		const imported = await __FINESOFT_I18N_LOADER_IMPORTER__();
+		const loader = typeof imported === "function" ? imported : typeof imported?.loadMessages === "function" ? imported.loadMessages : void 0;
+		if (!loader) return;
+		globalThis.__FINESOFT_I18N_LOADER__ = loader;
+		return loader;
+	} catch {
+		return;
+	}
+}
+//#endregion
+//#region ../core/src/i18n/messages.ts
+/**
+* i18n message helpers shared by SSR and browser startup.
+*/
+/**
+* Resolve the effective translation source for a locale.
+*/
+async function resolveConfiguredMessages(options) {
+	const { locale, loadMessages, context } = options;
+	if (!locale || !context) return;
+	if (loadMessages) return loadMessages(locale, context);
+	return resolveGeneratedMessages(locale, context);
+}
+/**
+* Resolve `TranslationMessages` into the flat map consumed by
+* `SimpleTranslator`.
+*/
+function resolveMessages(messages, locale) {
+	const entries = Object.entries(messages);
+	if (entries.length === 0) return void 0;
+	if (typeof entries[0][1] === "string") return messages;
+	const localeMessages = messages[locale];
+	if (!localeMessages) return void 0;
+	const flat = {};
+	for (const [key, value] of Object.entries(localeMessages)) {
+		if (typeof value === "string") {
+			flat[key] = value;
+			continue;
+		}
+		for (const [suffix, text] of Object.entries(value)) flat[`${key}.${suffix}`] = text;
+	}
+	return flat;
+}
+//#endregion
 //#region ../core/src/i18n/interpolate.ts
 /**
 * ICU 消息格式插值
@@ -594,25 +649,9 @@ var ConsoleMetrics = class {
 		});
 	}
 };
-/**
-* 从 TranslationMessages 中解析出 SimpleTranslator 所需的扁平 Record<string, string>
-*
-* - 扁平格式：直接返回
-* - 嵌套格式：提取 locale 对应子表并展平复数 key（`{key}.{plural}` 拼接）
-*/
-function resolveMessages(messages, locale) {
-	const entries = Object.entries(messages);
-	if (entries.length === 0) return void 0;
-	if (typeof entries[0][1] === "string") return messages;
-	const localeMsgs = messages[locale];
-	if (!localeMsgs) return void 0;
-	const flat = {};
-	for (const [key, value] of Object.entries(localeMsgs)) if (typeof value === "string") flat[key] = value;
-	else for (const [suffix, text] of Object.entries(value)) flat[`${key}.${suffix}`] = text;
-	return flat;
-}
 function makeDependencies(container, options = {}) {
-	const { fetch: fetchFn = globalThis.fetch?.bind(globalThis), featureFlags = {}, featureFlagsProviders = [], reportCallback, eventRecorder, locale, platform, messages } = options;
+	const { _resolvedMessages: messages } = options;
+	const { fetch: fetchFn = globalThis.fetch?.bind(globalThis), featureFlags = {}, featureFlagsProviders = [], reportCallback, eventRecorder, locale, platform } = options;
 	const consoleFactory = new ConsoleLoggerFactory();
 	const loggerFactory = reportCallback ? new CompositeLoggerFactory([consoleFactory, new ReportingLoggerFactory({ report: reportCallback })]) : consoleFactory;
 	container.register(DEP_KEYS.LOGGER_FACTORY, () => loggerFactory);
@@ -875,7 +914,7 @@ var Framework = class Framework {
 	getLocale() {
 		return this.container.has(DEP_KEYS.LOCALE) ? this.container.resolve(DEP_KEYS.LOCALE) : void 0;
 	}
-	/** 获取翻译器（如果已通过 messages + locale 配置） */
+	/** 获取翻译器（如果当前 locale 已经初始化了翻译字典） */
 	getTranslator() {
 		return this.container.has(DEP_KEYS.TRANSLATOR) ? this.container.resolve(DEP_KEYS.TRANSLATOR) : void 0;
 	}
@@ -1110,6 +1149,17 @@ function mapEach(mapper) {
 	return (items) => items.map(mapper);
 }
 //#endregion
+//#region ../core/src/bootstrap/define-bootstrap.ts
+const BOOTSTRAP_CONFIG = Symbol.for("@finesoft/bootstrap-config");
+function defineBootstrap(config, bootstrap) {
+	const configuredBootstrap = bootstrap;
+	configuredBootstrap[BOOTSTRAP_CONFIG] = config;
+	return configuredBootstrap;
+}
+function getBootstrapConfig(bootstrap) {
+	return bootstrap[BOOTSTRAP_CONFIG] ?? {};
+}
+//#endregion
 //#region ../core/src/bootstrap/define-routes.ts
 /**
 * 声明式注册路由和 Controller
@@ -1876,21 +1926,40 @@ function createPrefetchedIntentsFromDom() {
 * 自动执行 hydration 全流程。
 */
 async function startBrowserApp(config) {
-	const { bootstrap, mountId = "app", mount, callbacks, onBeforeStart, onAfterStart, frameworkConfig } = config;
+	const { bootstrap, mountId = "app", mount, callbacks, onBeforeStart, onAfterStart, frameworkConfig, loadMessages } = config;
+	const bootstrapConfig = getBootstrapConfig(bootstrap);
+	const resolvedFrameworkConfig = {
+		...bootstrapConfig.frameworkConfig,
+		...frameworkConfig
+	};
+	const resolvedLoadMessages = loadMessages ?? bootstrapConfig.loadMessages;
 	const prefetchedIntents = createPrefetchedIntentsFromDom();
+	const initialUrl = window.location.pathname + window.location.search;
+	const locale = resolveBrowserLocale(resolvedFrameworkConfig.locale);
+	const resolvedMessages = await resolveConfiguredMessages({
+		locale,
+		loadMessages: resolvedLoadMessages,
+		context: locale ? {
+			runtime: "browser",
+			fetch: getBrowserFetch(resolvedFrameworkConfig.fetch),
+			url: initialUrl
+		} : void 0
+	});
 	const framework = Framework.create({
-		...frameworkConfig,
+		...resolvedFrameworkConfig,
+		locale,
+		_resolvedMessages: resolvedMessages,
 		prefetchedIntents
 	});
 	bootstrap(framework);
 	const log = framework.container.resolve(DEP_KEYS.LOGGER_FACTORY).loggerFor("browser");
-	const locale = framework.getLocale();
-	if (locale) {
-		setHtmlLocaleAttributes(locale);
-		log.debug("[startBrowserApp] Applied locale attributes:", locale);
+	const resolvedLocale = framework.getLocale();
+	if (resolvedLocale) {
+		setHtmlLocaleAttributes(resolvedLocale);
+		log.debug("[startBrowserApp] Applied locale attributes:", resolvedLocale);
 	}
 	await onBeforeStart?.(framework);
-	const initialAction = framework.routeUrl(window.location.pathname + window.location.search);
+	const initialAction = framework.routeUrl(initialUrl);
 	const target = document.getElementById(mountId);
 	if (!target) throw new Error(`[startBrowserApp] Mount target not found: #${mountId}. Ensure your HTML has <div id="${mountId}"></div>.`);
 	const updateApp = mount(target, { framework });
@@ -1908,6 +1977,17 @@ async function startBrowserApp(config) {
 	});
 	await onAfterStart?.(framework);
 }
+function resolveBrowserLocale(locale) {
+	if (locale) return locale;
+	return document.documentElement.lang.trim() || void 0;
+}
+function getBrowserFetch(fetchFn) {
+	const resolvedFetch = fetchFn ?? globalThis.fetch?.bind(globalThis);
+	if (resolvedFetch) return resolvedFetch;
+	return (() => {
+		throw new Error("[startBrowserApp] loadMessages requires a fetch implementation.");
+	});
+}
 //#endregion
 //#region ../ssr/src/render.ts
 /**
@@ -1919,21 +1999,40 @@ async function startBrowserApp(config) {
 * 4. 调用应用层提供的渲染函数
 */
 async function ssrRender(options) {
-	const { url, frameworkConfig, bootstrap, getErrorPage, renderApp, ssrContext, resolveLocale } = options;
+	const { url, frameworkConfig, bootstrap, getErrorPage, renderApp, ssrContext, resolveLocale, loadMessages } = options;
+	const bootstrapConfig = getBootstrapConfig(bootstrap);
+	const resolvedFrameworkConfig = {
+		...bootstrapConfig.frameworkConfig,
+		...frameworkConfig
+	};
+	const resolvedLoadMessages = loadMessages ?? bootstrapConfig.loadMessages;
+	const parsed = new URL(url, "http://localhost");
+	const fullPath = parsed.pathname + parsed.search;
 	const resolvedLocale = resolveLocale?.(url, ssrContext?.request);
 	const effectiveConfig = resolvedLocale ? {
-		...frameworkConfig,
+		...resolvedFrameworkConfig,
 		locale: resolvedLocale.lang
-	} : frameworkConfig;
-	const mergedConfig = ssrContext?.fetch ? {
+	} : resolvedFrameworkConfig;
+	const resolvedMessages = await resolveConfiguredMessages({
+		locale: effectiveConfig.locale,
+		loadMessages: resolvedLoadMessages,
+		context: effectiveConfig.locale ? {
+			runtime: "server",
+			fetch: getSSRFetch(ssrContext?.fetch ?? effectiveConfig.fetch),
+			url: fullPath,
+			request: ssrContext?.request
+		} : void 0
+	});
+	const mergedConfig = {
 		...effectiveConfig,
-		fetch: ssrContext.fetch
-	} : effectiveConfig;
-	const framework = Framework.create(mergedConfig);
+		fetch: ssrContext?.fetch ?? effectiveConfig.fetch
+	};
+	const framework = Framework.create({
+		...mergedConfig,
+		_resolvedMessages: resolvedMessages
+	});
 	bootstrap(framework);
 	try {
-		const parsed = new URL(url, "http://localhost");
-		const fullPath = parsed.pathname + parsed.search;
 		const match = framework.routeUrl(fullPath);
 		if (match?.renderMode === "csr") return {
 			html: "",
@@ -1991,6 +2090,13 @@ async function ssrRender(options) {
 		framework.dispose();
 	}
 }
+function getSSRFetch(fetchFn) {
+	const resolvedFetch = fetchFn ?? globalThis.fetch?.bind(globalThis);
+	if (resolvedFetch) return resolvedFetch;
+	return (() => {
+		throw new Error("[ssrRender] loadMessages requires a fetch implementation.");
+	});
+}
 /**
 * 将中间件结果转换为 SSRRenderResult（如果需要短路返回）。
 * 返回 null 表示继续正常流程。
@@ -2038,7 +2144,7 @@ async function handleMiddlewareResult(result, getErrorPage, renderApp, framework
 * @returns `render(url, ssrContext?)` — 供 @finesoft/server SSRModule 使用
 */
 function createSSRRender(config) {
-	const { bootstrap, getErrorPage, renderApp, frameworkConfig, resolveLocale } = config;
+	const { bootstrap, getErrorPage, renderApp, frameworkConfig, resolveLocale, loadMessages } = config;
 	return (url, ssrContext) => ssrRender({
 		url,
 		frameworkConfig: frameworkConfig ?? {},
@@ -2046,7 +2152,8 @@ function createSSRRender(config) {
 		getErrorPage,
 		renderApp: (page, framework) => renderApp(page, framework),
 		ssrContext,
-		resolveLocale
+		resolveLocale,
+		loadMessages
 	});
 }
 //#endregion
@@ -3329,6 +3436,8 @@ function parseAcceptLanguage(header, supported, fallback) {
 * 支持多平台 adapter: "vercel" | "cloudflare" | "netlify" | "node" | "static" | "auto"
 * 或自定义 Adapter 对象。
 */
+const GENERATED_I18N_LOADER_ID = "virtual:finesoft-front/i18n-loader";
+const RESOLVED_GENERATED_I18N_LOADER_ID = `\0${GENERATED_I18N_LOADER_ID}`;
 /**
 * 从 setup 模块中查找 setup 函数：优先 default，其次 setup 命名导出。
 */
@@ -3351,6 +3460,18 @@ function matchRenderModeConfig(url, renderModes) {
 	}
 	return null;
 }
+function normalizePathForGlob(pathname) {
+	return pathname.replace(/\\/g, "/");
+}
+async function resolveMessagesDir(root, messagesDir) {
+	const { existsSync } = await dynamicImport("node:fs");
+	const { isAbsolute, relative, resolve } = await dynamicImport("node:path");
+	const absoluteDir = isAbsolute(messagesDir) ? messagesDir : resolve(root, messagesDir);
+	if (!existsSync(absoluteDir)) throw new Error(`[finesoftFrontViteConfig] i18n.messagesDir not found: ${messagesDir}`);
+	const relativeDir = normalizePathForGlob(relative(root, absoluteDir));
+	if (!relativeDir || relativeDir.startsWith("..")) throw new Error(`[finesoftFrontViteConfig] i18n.messagesDir must stay inside the project root: ${messagesDir}`);
+	return relativeDir.replace(/^\.\/+/, "");
+}
 function finesoftFrontViteConfig(options = {}) {
 	const ssrEntry = options.ssr?.entry ?? "src/ssr.ts";
 	let root = process.cwd();
@@ -3361,7 +3482,10 @@ function finesoftFrontViteConfig(options = {}) {
 	return {
 		name: "finesoft-front",
 		config(userConfig) {
-			const overrides = { appType: "custom" };
+			const overrides = {
+				appType: "custom",
+				define: { __FINESOFT_I18N_LOADER_IMPORTER__: options.i18n?.messagesDir ? `async () => import(${JSON.stringify(GENERATED_I18N_LOADER_ID)})` : "undefined" }
+			};
 			if (!process.env.__FINESOFT_SUB_BUILD__) overrides.build = { outDir: userConfig.build?.outDir ?? "dist/client" };
 			return overrides;
 		},
@@ -3371,6 +3495,26 @@ function finesoftFrontViteConfig(options = {}) {
 			resolvedCss = config.css;
 			root = config.root;
 		},
+		resolveId(id) {
+			if (id === GENERATED_I18N_LOADER_ID && options.i18n?.messagesDir) return RESOLVED_GENERATED_I18N_LOADER_ID;
+			return null;
+		},
+		async load(id) {
+			if (id !== RESOLVED_GENERATED_I18N_LOADER_ID || !options.i18n?.messagesDir) return null;
+			const baseDir = `/${await resolveMessagesDir(root, options.i18n.messagesDir)}`;
+			const globPattern = `${baseDir}/*.json`;
+			const filePrefix = `${baseDir}/`;
+			return `
+const localeModules = import.meta.glob(${JSON.stringify(globPattern)}, { import: "default" });
+
+export async function loadMessages(locale) {
+  const loader = localeModules[${JSON.stringify(filePrefix)} + locale + ".json"];
+  if (!loader) return undefined;
+  const messages = await loader();
+  return messages ?? undefined;
+}
+`;
+		},
 		transformIndexHtml: {
 			order: "pre",
 			async handler(html, ctx) {
@@ -3569,6 +3713,6 @@ function finesoftFrontViteConfig(options = {}) {
 	};
 }
 //#endregion
-export { ACTION_KINDS, ActionDispatcher, BaseController, BaseLogger, CompositeEventRecorder, CompositeLogger, CompositeLoggerFactory, ConsoleEventRecorder, ConsoleLogger, ConsoleLoggerFactory, Container, DEP_KEYS, Framework, History, HttpClient, HttpError, IntentDispatcher, IntersectionImpressionObserver, LruMap, PrefetchedIntents, ReportingLogger, ReportingLoggerFactory, Router, SSR_PLACEHOLDERS, SimpleTranslator, VoidEventRecorder, WithFieldsRecorder, autoAdapter, buildUrl, cloudflareAdapter, createBrowserContext, createPrefetchedIntentsFromDom, createSSRApp, createSSRRender, createServer, createServerContext, defineRoutes, deny, deserializeServerData, detectPlatform, detectRuntime, englishPlural, finesoftFrontViteConfig, generateProxyCode, generateUuid, getBaseUrl, getLocaleAttributes, getPWADisplayMode, getTextDirection, injectCSRShell, injectSSRContent, interpolate, isCompoundAction, isExternalUrlAction, isFlowAction, isNone, isRtl, isSome, makeDependencies, makeExternalUrlAction, makeFlowAction, makeLocaleInfo, mapEach, netlifyAdapter, next, nodeAdapter, parseAcceptLanguage, pipe, pipeAsync, redirect, registerActionHandlers, registerExternalUrlHandler, registerFlowActionHandler, registerProxyRoutes, removeHost, removeQueryParams, removeScheme, resetFilterCache, resolveAdapter, resolveLocaleFromUrl, resolvePluralKey, resolveRoot, rewrite, runAfterLoadGuards, runBeforeLoadGuards, serializeServerData, setHtmlLocaleAttributes, shouldLog, ssrRender, stableStringify, startBrowserApp, startServer, staticAdapter, tryScroll, vercelAdapter };
+export { ACTION_KINDS, ActionDispatcher, BaseController, BaseLogger, CompositeEventRecorder, CompositeLogger, CompositeLoggerFactory, ConsoleEventRecorder, ConsoleLogger, ConsoleLoggerFactory, Container, DEP_KEYS, Framework, History, HttpClient, HttpError, IntentDispatcher, IntersectionImpressionObserver, LruMap, PrefetchedIntents, ReportingLogger, ReportingLoggerFactory, Router, SSR_PLACEHOLDERS, SimpleTranslator, VoidEventRecorder, WithFieldsRecorder, autoAdapter, buildUrl, cloudflareAdapter, createBrowserContext, createPrefetchedIntentsFromDom, createSSRApp, createSSRRender, createServer, createServerContext, defineBootstrap, defineRoutes, deny, deserializeServerData, detectPlatform, detectRuntime, englishPlural, finesoftFrontViteConfig, generateProxyCode, generateUuid, getBaseUrl, getBootstrapConfig, getLocaleAttributes, getPWADisplayMode, getTextDirection, injectCSRShell, injectSSRContent, interpolate, isCompoundAction, isExternalUrlAction, isFlowAction, isNone, isRtl, isSome, makeDependencies, makeExternalUrlAction, makeFlowAction, makeLocaleInfo, mapEach, netlifyAdapter, next, nodeAdapter, parseAcceptLanguage, pipe, pipeAsync, redirect, registerActionHandlers, registerExternalUrlHandler, registerFlowActionHandler, registerProxyRoutes, removeHost, removeQueryParams, removeScheme, resetFilterCache, resolveAdapter, resolveConfiguredMessages, resolveLocaleFromUrl, resolveMessages, resolvePluralKey, resolveRoot, rewrite, runAfterLoadGuards, runBeforeLoadGuards, serializeServerData, setHtmlLocaleAttributes, shouldLog, ssrRender, stableStringify, startBrowserApp, startServer, staticAdapter, tryScroll, vercelAdapter };
 
 //# sourceMappingURL=index.mjs.map