weifuwu 0.17.3 → 0.17.4

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export { serve, createTestServer } from './serve.ts';
 export type { ServeOptions, Server } from './serve.ts';
 export { Router } from './router.ts';
 export type { WebSocketHandler } from './router.ts';
-export { tsx, TsxContext, useCtx } from './tsx.ts';
+export { tsx, TsxContext, useCtx, setCtx } from './tsx.ts';
 export type { TsxOptions } from './tsx.ts';
 export { auth, cors, logger } from './middleware.ts';
 export type { AuthOptions, CORSOptions, LoggerOptions } from './middleware.ts';

package/dist/index.js

@@ -578,26 +578,43 @@ import { createRequire } from "node:module";
 import chokidar from "chokidar";
 
 // tsx-context.ts
-import { createContext, useContext } from "react";
-var TsxContext = createContext({ params: {}, query: {} });
+import { useSyncExternalStore, createContext } from "react";
+var _ctx = { params: {}, query: {} };
+var _listeners = /* @__PURE__ */ new Set();
+function setCtx(value) {
+  _ctx = { ..._ctx, ...value };
+  _listeners.forEach((fn) => fn());
+}
+function _buildT() {
+  const messages2 = typeof window !== "undefined" ? window.__LOCALE_DATA__ : globalThis.__LOCALE_DATA__;
+  if (!messages2) return void 0;
+  return (key, params, fallback) => {
+    const msg = key.split(".").reduce((o, k) => o?.[k], messages2);
+    if (msg === void 0 || msg === null) return fallback ?? key;
+    if (!params) return String(msg);
+    let result = String(msg);
+    for (const [k, v] of Object.entries(params)) result = result.replace(`{${k}}`, v);
+    return result;
+  };
+}
 function useCtx() {
-  const wc = typeof window !== "undefined" ? window.__WEIFUWU_CTX : globalThis.__WEIFUWU_CTX;
-  if (wc) {
-    const messages2 = typeof window !== "undefined" ? window.__LOCALE_DATA__ : globalThis.__LOCALE_DATA__;
-    if (messages2 && typeof wc.t !== "function") {
-      wc.t = (key, params) => {
-        const msg = key.split(".").reduce((o, k) => o?.[k], messages2);
-        if (msg === void 0 || msg === null) return key;
-        if (!params) return String(msg);
-        let result = String(msg);
-        for (const [k, v] of Object.entries(params)) result = result.replace(`{${k}}`, v);
-        return result;
+  useSyncExternalStore(
+    (cb) => {
+      _listeners.add(cb);
+      return () => {
+        _listeners.delete(cb);
       };
-    }
-    return wc;
-  }
-  return useContext(TsxContext);
+    },
+    () => _ctx,
+    () => _ctx
+  );
+  const data = typeof window !== "undefined" ? window.__WEIFUWU_CTX : null;
+  const t = data?.t ?? _ctx.t ?? _buildT();
+  const result = { ..._ctx, ...data };
+  if (t) result.t = t;
+  return result;
 }
+var TsxContext = createContext({ params: {}, query: {} });
 
 // tsx-instance.ts
 var liveReloadClients = /* @__PURE__ */ new Set();
@@ -881,25 +898,23 @@ var TsxInstance = class {
         const nfMod = this.pageModules.get(nfPath);
         if (!nfMod) return new Response("Not Found", { status: 404 });
         const NfComponent = nfMod.default;
-        let element = createElement(TsxContext.Provider, {
-          value: {
-            params: ctx.params,
-            query: ctx.query,
-            user: ctx.user,
-            parsed: ctx.parsed,
-            prefs: ctx.prefs,
-            locale: ctx.locale,
-            theme: ctx.theme,
-            t: ctx.t,
-            env: ctx.env
-          }
-        }, createElement(NfComponent, { params: ctx.params, query: ctx.query }));
+        setCtx({
+          params: ctx.params,
+          query: ctx.query,
+          user: ctx.user,
+          parsed: ctx.parsed,
+          prefs: ctx.prefs,
+          locale: ctx.locale,
+          theme: ctx.theme,
+          t: ctx.t,
+          env: ctx.env
+        });
+        let element = createElement(NfComponent, { params: ctx.params, query: ctx.query });
         for (let i = rootLayouts.length - 1; i >= 0; i--) {
           const LMod = this.layoutModules.get(rootLayouts[i]);
           if (!LMod) continue;
           element = createElement(LMod.default, { children: element });
         }
-        setGlobalCtx(ctx);
         const stream = await renderToReadableStream(element);
         return streamResponse(stream, {
           ctx,
@@ -1054,22 +1069,21 @@ ${src}`;
       const loadFn = loadMod?.default;
       const loadProps = loadFn ? await loadFn({ params: ctx.params, query: ctx.query }) : {};
       const allProps = { ...loadProps, params: ctx.params, query: ctx.query };
+      setCtx({
+        params: ctx.params,
+        query: ctx.query,
+        user: ctx.user,
+        parsed: ctx.parsed,
+        prefs: ctx.prefs,
+        locale: ctx.locale,
+        theme: ctx.theme,
+        t: ctx.t,
+        env: ctx.env
+      });
       let element = createElement(
         "div",
         { id: "__weifuwu_root" },
-        createElement(TsxContext.Provider, {
-          value: {
-            params: ctx.params,
-            query: ctx.query,
-            user: ctx.user,
-            parsed: ctx.parsed,
-            prefs: ctx.prefs,
-            locale: ctx.locale,
-            theme: ctx.theme,
-            t: ctx.t,
-            env: ctx.env
-          }
-        }, createElement(Component, allProps))
+        createElement(Component, allProps)
       );
       if (layoutPaths.length === 0) {
         element = createElement(
@@ -1093,12 +1107,11 @@ ${src}`;
           const isRoot = i === 0;
           element = createElement(
             Layout,
-            isRoot ? { children: element, req, ctx } : { children: element }
+            isRoot ? { children: element, req } : { children: element }
           );
         }
       }
       const bundle = await this.getOrBuildClientBundle(entryPath, layoutPaths, this.pagesDir);
-      setGlobalCtx(ctx);
       const stream = await renderToReadableStream(element);
       return streamResponse(stream, {
         ctx,
@@ -1272,18 +1285,6 @@ ${src}`;
     }
   }
 };
-function setGlobalCtx(ctx) {
-  ;
-  globalThis.__WEIFUWU_CTX = {
-    params: ctx.params,
-    query: ctx.query,
-    user: ctx.user,
-    parsed: ctx.parsed,
-    prefs: ctx.prefs,
-    locale: ctx.locale,
-    theme: ctx.theme
-  };
-}
 function streamResponse(reactStream, opts) {
   const decoder = new TextDecoder();
   const encoder2 = new TextEncoder();
@@ -3208,7 +3209,7 @@ h2{color:#dc2626}.desc{color:#555}</style>
 <body><h2>${error}</h2>${description ? `<p class="desc">${description}</p>` : ""}</body>
 </html>`, { status: 400, headers: { "Content-Type": "text/html; charset=utf-8" } });
   }
-  async function authorizeHandler(req, _ctx) {
+  async function authorizeHandler(req, _ctx2) {
     const url = new URL(req.url);
     const clientId = url.searchParams.get("client_id") || "";
     const redirectUri = url.searchParams.get("redirect_uri") || "";
@@ -4593,23 +4594,23 @@ function buildGraphQLHandler(sql2) {
     });
     return Response.json(result, { status: result.errors ? 400 : 200 });
   });
-  r.get("/", async (req, _ctx) => {
+  r.get("/", async (req, _ctx2) => {
     const url = new URL(req.url);
     if (url.searchParams.has("query")) {
-      return handleGET(req, _ctx);
+      return handleGET(req, _ctx2);
     }
     return new Response("GraphQL endpoint. Send POST /graphql with { query, variables }", {
       status: 200,
       headers: { "Content-Type": "text/plain" }
     });
   });
-  async function handleGET(req, _ctx) {
+  async function handleGET(req, _ctx2) {
     const tables = await sql2`
       SELECT * FROM "_user_tables"
-      WHERE tenant_id = ${_ctx.tenant.id}
+      WHERE tenant_id = ${_ctx2.tenant.id}
       ORDER BY created_at ASC
     `;
-    const buildCtx = { sql: sql2, tenantId: _ctx.tenant.id, tables };
+    const buildCtx = { sql: sql2, tenantId: _ctx2.tenant.id, tables };
     const schema = new GraphQLSchema({
       query: new GraphQLObjectType({
         name: "Query",
@@ -4629,7 +4630,7 @@ function buildGraphQLHandler(sql2) {
       source: query,
       variableValues: variables,
       operationName: url.searchParams.get("operationName") || void 0,
-      contextValue: _ctx
+      contextValue: _ctx2
     });
     return Response.json(result, { status: result.errors ? 400 : 200 });
   }
@@ -6633,7 +6634,7 @@ function createWSHandler2(deps) {
         clients.delete(ws);
       }
     },
-    error(ws, _ctx, _err) {
+    error(ws, _ctx2, _err) {
       const client = clients.get(ws);
       if (client) {
         client.abortController?.abort();
@@ -6805,9 +6806,9 @@ var defaults = {
   locale: { default: "en", cookie: "locale", fromAcceptLanguage: true },
   theme: { default: "system", cookie: "theme" }
 };
-function translate(msgs, key, params) {
+function translate(msgs, key, params, fallback) {
   const msg = key.split(".").reduce((o, k) => o?.[k], msgs);
-  if (msg === void 0 || msg === null) return key;
+  if (msg === void 0 || msg === null) return fallback ?? key;
   if (!params) return String(msg);
   let result = String(msg);
   for (const [k, v] of Object.entries(params)) {
@@ -6852,7 +6853,7 @@ function preferences(options) {
     ctx.theme = theme;
     if (dir) {
       const msgs = await load(locale);
-      ctx.t = (key, params) => translate(msgs, key, params);
+      ctx.t = (key, params, fallback) => translate(msgs, key, params, fallback);
       globalThis.__LOCALE_DATA__ = msgs;
     }
     ctx.setPref = (name, value) => {
@@ -7659,7 +7660,7 @@ function createWsHandler(deps) {
     return wsToWorkerId.get(ws) || "";
   }
   return {
-    open(_ws, _ctx) {
+    open(_ws, _ctx2) {
     },
     async message(ws, ctx, data) {
       let msg;
@@ -8315,6 +8316,7 @@ export {
   serve,
   serveStatic,
   setCookie,
+  setCtx,
   smoothStream,
   streamObject,
   streamText,

package/dist/react.d.ts

@@ -3,7 +3,7 @@ export type { UseWebsocketOptions, UseWebsocketReturn } from './use-websocket.ts
 export { useAction } from './use-action.ts';
 export type { UseActionOptions, UseActionReturn } from './use-action.ts';
 export { Link, useNavigate, navigate, useNavigating } from './client-router.ts';
-export { TsxContext, useCtx } from './tsx-context.ts';
+export { TsxContext, useCtx, setCtx } from './tsx-context.ts';
 export { Head } from './head.tsx';
 export { createStore, useData, useQueryState } from './client-state.ts';
 export type { StoreApi } from './client-state.ts';

package/dist/react.js

@@ -316,26 +316,43 @@ async function prefetchPage(href) {
 }
 
 // tsx-context.ts
-import { createContext, useContext } from "react";
-var TsxContext = createContext({ params: {}, query: {} });
+import { useSyncExternalStore, createContext } from "react";
+var _ctx = { params: {}, query: {} };
+var _listeners2 = /* @__PURE__ */ new Set();
+function setCtx(value) {
+  _ctx = { ..._ctx, ...value };
+  _listeners2.forEach((fn) => fn());
+}
+function _buildT() {
+  const messages = typeof window !== "undefined" ? window.__LOCALE_DATA__ : globalThis.__LOCALE_DATA__;
+  if (!messages) return void 0;
+  return (key, params, fallback) => {
+    const msg = key.split(".").reduce((o, k) => o?.[k], messages);
+    if (msg === void 0 || msg === null) return fallback ?? key;
+    if (!params) return String(msg);
+    let result = String(msg);
+    for (const [k, v] of Object.entries(params)) result = result.replace(`{${k}}`, v);
+    return result;
+  };
+}
 function useCtx() {
-  const wc = typeof window !== "undefined" ? window.__WEIFUWU_CTX : globalThis.__WEIFUWU_CTX;
-  if (wc) {
-    const messages = typeof window !== "undefined" ? window.__LOCALE_DATA__ : globalThis.__LOCALE_DATA__;
-    if (messages && typeof wc.t !== "function") {
-      wc.t = (key, params) => {
-        const msg = key.split(".").reduce((o, k) => o?.[k], messages);
-        if (msg === void 0 || msg === null) return key;
-        if (!params) return String(msg);
-        let result = String(msg);
-        for (const [k, v] of Object.entries(params)) result = result.replace(`{${k}}`, v);
-        return result;
+  useSyncExternalStore(
+    (cb) => {
+      _listeners2.add(cb);
+      return () => {
+        _listeners2.delete(cb);
       };
-    }
-    return wc;
-  }
-  return useContext(TsxContext);
+    },
+    () => _ctx,
+    () => _ctx
+  );
+  const data = typeof window !== "undefined" ? window.__WEIFUWU_CTX : null;
+  const t = data?.t ?? _ctx.t ?? _buildT();
+  const result = { ..._ctx, ...data };
+  if (t) result.t = t;
+  return result;
 }
+var TsxContext = createContext({ params: {}, query: {} });
 
 // head.tsx
 import { createElement as createElement2 } from "react";
@@ -344,7 +361,7 @@ function Head({ children }) {
 }
 
 // client-state.ts
-import { useSyncExternalStore, useCallback as useCallback4, useEffect as useEffect3, useRef as useRef3, useState as useState4 } from "react";
+import { useSyncExternalStore as useSyncExternalStore2, useCallback as useCallback4, useEffect as useEffect3, useRef as useRef3, useState as useState4 } from "react";
 function createStore(initial) {
   let state = { ...initial };
   const listeners = /* @__PURE__ */ new Set();
@@ -360,7 +377,7 @@ function createStore(initial) {
       listeners.delete(listener);
     };
   };
-  const useStore = ((selector) => useSyncExternalStore(
+  const useStore = ((selector) => useSyncExternalStore2(
     subscribe,
     () => selector ? selector(state) : state
   ));
@@ -451,7 +468,7 @@ function useQueryState(key, defaultValue = "") {
     const params = new URLSearchParams(window.location.search);
     return params.get(key) ?? defaultValue;
   }
-  const value = useSyncExternalStore(
+  const value = useSyncExternalStore2(
     (cb) => {
       if (typeof window === "undefined") return () => {
       };
@@ -481,6 +498,7 @@ export {
   TsxContext,
   createStore,
   navigate,
+  setCtx,
   useAction,
   useCtx,
   useData,

package/dist/tsx-context.d.ts

@@ -1,4 +1,4 @@
-export declare const TsxContext: import("react").Context<{
+export interface CtxValue {
     params: Record<string, string>;
     query: Record<string, string>;
     user?: unknown;
@@ -6,7 +6,9 @@ export declare const TsxContext: import("react").Context<{
     prefs?: Record<string, string>;
     locale?: string;
     theme?: string;
-    t?: (key: string, params?: Record<string, string>) => string;
+    t?: (key: string, params?: Record<string, string>, fallback?: string) => string;
     env?: Record<string, string>;
-}>;
-export declare function useCtx(): any;
+}
+export declare function setCtx(value: Partial<CtxValue>): void;
+export declare function useCtx(): CtxValue;
+export declare const TsxContext: import("react").Context<CtxValue>;

package/dist/tsx-instance.d.ts

@@ -1,6 +1,6 @@
 import { Router } from './router.ts';
-import { TsxContext, useCtx } from './tsx-context.ts';
-export { TsxContext, useCtx };
+import { TsxContext, useCtx, setCtx } from './tsx-context.ts';
+export { TsxContext, useCtx, setCtx };
 export interface TsxOptions {
     dir: string;
 }

package/dist/tsx.d.ts

@@ -1,6 +1,6 @@
-import { TsxContext, useCtx } from './tsx-instance.ts';
+import { TsxContext, useCtx, setCtx } from './tsx-instance.ts';
 import type { TsxOptions } from './tsx-instance.ts';
 import type { Router } from './router.ts';
-export { TsxContext, useCtx };
+export { TsxContext, useCtx, setCtx };
 export type { TsxOptions };
 export declare function tsx(options: TsxOptions): Promise<Router>;

package/dist/types.d.ts

@@ -5,7 +5,7 @@ export interface Context {
     parsed?: Record<string, unknown>;
     mountPath?: string;
     locale?: string;
-    t?: (key: string, params?: Record<string, string>) => string;
+    t?: (key: string, params?: Record<string, string>, fallback?: string) => string;
     requestId?: string;
     prefs?: Record<string, string>;
     theme?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weifuwu",
-  "version": "0.17.3",
+  "version": "0.17.4",
   "description": "Web-standard HTTP framework for Node.js — (req, ctx) => Response",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",