@ubean/pages 0.2.1 → 0.3.0

package/dist/index.d.ts

@@ -27,6 +27,15 @@ interface PageRenderContext {
   locale?: string;
   localeDir?: 'ltr' | 'rtl';
   messages?: Record<string, unknown>;
+  fallbackLocale?: string;
+  fallbackMessages?: Record<string, unknown>;
+  routing?: {
+    defaultLocale: string;
+    locales: string[];
+    strategy: 'prefix' | 'prefix_except_default' | 'prefix_and_default' | 'no_prefix';
+  };
+  cookieName?: string;
+  baseUrl?: string;
   /** All registered locales (metadata only, no messages) — sent to the
    *  client so it can register every available locale during hydration,
    *  preventing `availableLocales` hydration mismatches. */
@@ -50,7 +59,7 @@ type PageRenderFn = (pageObj: PageObject, shellHtml: string, assetTags: PageAsse
  * 流式渲染函数:返回一个 `ReadableStream<Uint8Array>`,将完整 HTML 文档
  * 分块流式输出(头部先发送,app HTML 边渲染边输出,state 在尾部注入)。
  *
- * 由 `@ubean/ssr` 的 `createVueRenderer` 实现。当 renderer 提供此方法且
+ * 由 `@ubean/client/ssr` 的 `createVueRenderer` 实现。当 renderer 提供此方法且
  * 应用配置启用了 `streaming` 时,页面处理器会优先使用流式渲染,显著改善
  * TTFB/LCP(浏览器可在 app 渲染期间提前加载 CSS/JS)。
  */
@@ -252,6 +261,30 @@ interface StreamHelper {
 declare function createStreamResponse(init?: ResponseInit, onStart?: (stream: StreamHelper) => void | Promise<void>): Response;
 declare function createSseStream(onStart?: (stream: StreamHelper) => void | Promise<void>): Response;
 //#endregion
+//#region src/fetch.d.ts
+type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
+interface FetchClient {
+  get?: <T>(url: string, options?: {
+    query?: Record<string, unknown>;
+  }) => Promise<T>;
+  request?: <T>(options: {
+    url: string;
+    method?: string;
+    data?: unknown;
+    query?: Record<string, unknown>;
+  }) => Promise<T>;
+}
+interface UseFetchOptions<T> extends UseAsyncDataOptions {
+  method?: HttpMethod;
+  query?: Record<string, unknown>;
+  body?: unknown;
+  request?: FetchClient;
+  transform?: (data: T) => T;
+}
+declare function setDefaultFetch(request: FetchClient | undefined): void;
+declare function getDefaultFetch(): FetchClient | undefined;
+declare function useFetch<T>(key: string, url: string, options?: UseFetchOptions<T>, context?: object): Promise<DataResult<T>>;
+//#endregion
 //#region src/defer.d.ts
 /**
  * `__UBEAN_DEFERRED__` script 标签 ID — SSR 流式渲染完成后,延迟数据
@@ -350,4 +383,4 @@ interface UseDeferredDataResult<T> {
  */
 declare function useDeferredData<T>(key: string, deferred: DeferredValue<T>): UseDeferredDataResult<T>;
 //#endregion
-export { DATA_PAYLOAD_ID, DEFERRED_DATA_ID, type DataCacheEntry, type DataKey, type DataPayloadEntry, type DataResult, type DataStatus, type DeferredValue, type DependencyDeclaration, type InternalFetchOptions, LOCALE_DATA_ID, type LocaleMetaInfo, PAGE_DATA_ID, PAGE_REQUEST_HEADER, type PageAssetTags, type PageHead, type PageHeadMeta, type PageObject, type PageRenderContext, type PageRenderFn, type PageRenderResult, type PageRenderer, type PageStreamRenderFn, SSR_CONTENT_MARKER, STATE_DATA_ID, STATE_MARKER, type StreamHelper, type UseAsyncDataOptions, type UseDataOptions, type UseDeferredDataResult, __clearDataPayload, __clearDeferred, __registerDataPayload, __registerDeferred, __resetDataPayloadCache, __resetDeferredCache, __resolveDataPayload, __resolveDeferred, __serializeDataPayload, __serializeDeferred, buildClientOnlyShell, buildPageShell, clearPageData, createInternalFetch, createSseStream, createStreamResponse, declareDependencies, defer, defineDataKey, getInvalidatedKeysForAction, hasData, insertSsrContent, insertStateContent, invalidateAll, invalidateData, isDeferredValue, isPagesRequest, pageJsonResponse, renderFaviconLink, renderPage, renderPageToStream, safeJsonStringify, serializePageData, useAsyncData, useData, useDeferredData, withDependencies };
+export { DATA_PAYLOAD_ID, DEFERRED_DATA_ID, type DataCacheEntry, type DataKey, type DataPayloadEntry, type DataResult, type DataStatus, type DeferredValue, type DependencyDeclaration, type FetchClient, type InternalFetchOptions, LOCALE_DATA_ID, type LocaleMetaInfo, PAGE_DATA_ID, PAGE_REQUEST_HEADER, type PageAssetTags, type PageHead, type PageHeadMeta, type PageObject, type PageRenderContext, type PageRenderFn, type PageRenderResult, type PageRenderer, type PageStreamRenderFn, SSR_CONTENT_MARKER, STATE_DATA_ID, STATE_MARKER, type StreamHelper, type UseAsyncDataOptions, type UseDataOptions, type UseDeferredDataResult, type UseFetchOptions, __clearDataPayload, __clearDeferred, __registerDataPayload, __registerDeferred, __resetDataPayloadCache, __resetDeferredCache, __resolveDataPayload, __resolveDeferred, __serializeDataPayload, __serializeDeferred, buildClientOnlyShell, buildPageShell, clearPageData, createInternalFetch, createSseStream, createStreamResponse, declareDependencies, defer, defineDataKey, getDefaultFetch, getInvalidatedKeysForAction, hasData, insertSsrContent, insertStateContent, invalidateAll, invalidateData, isDeferredValue, isPagesRequest, pageJsonResponse, renderFaviconLink, renderPage, renderPageToStream, safeJsonStringify, serializePageData, setDefaultFetch, useAsyncData, useData, useDeferredData, useFetch, withDependencies };

package/dist/index.js

@@ -97,6 +97,11 @@ function buildPageShell(pageObj, assetTags, preambleScript = "", appId = "app",
 		locale,
 		dir: localeDir,
 		...messages ? { messages } : {},
+		...renderContext?.fallbackLocale ? { fallbackLocale: renderContext.fallbackLocale } : {},
+		...renderContext?.fallbackMessages ? { fallbackMessages: renderContext.fallbackMessages } : {},
+		...renderContext?.routing ? { routing: renderContext.routing } : {},
+		...renderContext?.cookieName ? { cookieName: renderContext.cookieName } : {},
+		...renderContext?.baseUrl ? { baseUrl: renderContext.baseUrl } : {},
 		...availableLocales?.length ? { availableLocales } : {}
 	})}<\/script>` : "";
 	const { headTags, htmlAttrsStr, bodyAttrsStr } = renderHeadTags(pageObj.head);
@@ -151,6 +156,11 @@ function buildClientOnlyShell(pageObj, assetTags, preambleScript = "", appId = "
 		locale,
 		dir: localeDir,
 		...messages ? { messages } : {},
+		...renderContext?.fallbackLocale ? { fallbackLocale: renderContext.fallbackLocale } : {},
+		...renderContext?.fallbackMessages ? { fallbackMessages: renderContext.fallbackMessages } : {},
+		...renderContext?.routing ? { routing: renderContext.routing } : {},
+		...renderContext?.cookieName ? { cookieName: renderContext.cookieName } : {},
+		...renderContext?.baseUrl ? { baseUrl: renderContext.baseUrl } : {},
 		...availableLocales?.length ? { availableLocales } : {}
 	})}<\/script>` : "";
 	const { headTags, htmlAttrsStr: pageHtmlAttrsStr, bodyAttrsStr } = renderHeadTags(pageObj.head);
@@ -675,6 +685,62 @@ function createSseStream(onStart) {
 	} });
 }
 //#endregion
+//#region src/fetch.ts
+/**
+* `useFetch` — Nuxt-style wrapper around `useAsyncData`.
+*
+* Does not invent an HTTP client. Pass a `@soybeanjs/fetch` `createRequest()`
+* instance (or any duck-typed client) via `setDefaultFetch` / `options.request`.
+* Without a client, falls back to global `fetch` + JSON.
+*/
+const FETCH_KEY = "__UBEAN_DEFAULT_FETCH__";
+function setDefaultFetch(request) {
+	globalThis[FETCH_KEY] = request;
+}
+function getDefaultFetch() {
+	return globalThis[FETCH_KEY];
+}
+async function nativeJson(url, options) {
+	const method = options.method ?? "GET";
+	const target = new URL(url, "http://ubean.local");
+	if (options.query) {
+		for (const [key, value] of Object.entries(options.query)) if (value !== void 0 && value !== null) target.searchParams.set(key, String(value));
+	}
+	const init = { method };
+	if (method !== "GET" && method !== "DELETE" && options.body !== void 0) {
+		init.headers = { "Content-Type": "application/json" };
+		init.body = JSON.stringify(options.body);
+	}
+	const href = url.startsWith("http") ? target.toString() : `${target.pathname}${target.search}`;
+	const res = await fetch(href, init);
+	if (!res.ok) throw new Error(`useFetch ${method} ${href} failed: ${res.status}`);
+	return await res.json();
+}
+async function runFetch(url, options) {
+	const client = options.request ?? getDefaultFetch();
+	const method = options.method ?? "GET";
+	let data;
+	if (client?.get && method === "GET") data = await client.get(url, { query: options.query });
+	else if (client?.request) data = await client.request({
+		url,
+		method,
+		data: options.body,
+		query: options.query
+	});
+	else data = await nativeJson(url, options);
+	return options.transform ? options.transform(data) : data;
+}
+async function useFetch(key, url, options = {}, context) {
+	const { method, query, body, request, transform, ...asyncOpts } = options;
+	return useAsyncData(key, () => runFetch(url, {
+		method,
+		query,
+		body,
+		request,
+		transform
+	}), asyncOpts, context);
+}
+//#endregion
 //#region src/defer.ts
 /**
 * `__UBEAN_DEFERRED__` script 标签 ID — SSR 流式渲染完成后,延迟数据
@@ -840,4 +906,4 @@ function useDeferredData(key, deferred) {
 	};
 }
 //#endregion
-export { DATA_PAYLOAD_ID, DEFERRED_DATA_ID, LOCALE_DATA_ID, PAGE_DATA_ID, PAGE_REQUEST_HEADER, SSR_CONTENT_MARKER, STATE_DATA_ID, STATE_MARKER, __clearDataPayload, __clearDeferred, __registerDataPayload, __registerDeferred, __resetDataPayloadCache, __resetDeferredCache, __resolveDataPayload, __resolveDeferred, __serializeDataPayload, __serializeDeferred, buildClientOnlyShell, buildPageShell, clearPageData, createInternalFetch, createSseStream, createStreamResponse, declareDependencies, defer, defineDataKey, getInvalidatedKeysForAction, hasData, insertSsrContent, insertStateContent, invalidateAll, invalidateData, isDeferredValue, isPagesRequest, pageJsonResponse, renderFaviconLink, renderPage, renderPageToStream, safeJsonStringify, serializePageData, useAsyncData, useData, useDeferredData, withDependencies };
+export { DATA_PAYLOAD_ID, DEFERRED_DATA_ID, LOCALE_DATA_ID, PAGE_DATA_ID, PAGE_REQUEST_HEADER, SSR_CONTENT_MARKER, STATE_DATA_ID, STATE_MARKER, __clearDataPayload, __clearDeferred, __registerDataPayload, __registerDeferred, __resetDataPayloadCache, __resetDeferredCache, __resolveDataPayload, __resolveDeferred, __serializeDataPayload, __serializeDeferred, buildClientOnlyShell, buildPageShell, clearPageData, createInternalFetch, createSseStream, createStreamResponse, declareDependencies, defer, defineDataKey, getDefaultFetch, getInvalidatedKeysForAction, hasData, insertSsrContent, insertStateContent, invalidateAll, invalidateData, isDeferredValue, isPagesRequest, pageJsonResponse, renderFaviconLink, renderPage, renderPageToStream, safeJsonStringify, serializePageData, setDefaultFetch, useAsyncData, useData, useDeferredData, useFetch, withDependencies };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/pages",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Page data protocol and isomorphic data layer for ubean (PageObject, useData, invalidateData)",
   "files": [
     "dist"
@@ -16,7 +16,7 @@
     }
   },
   "dependencies": {
-    "@ubean/shared": "0.2.1"
+    "@ubean/shared": "0.3.0"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",