weifuwu 0.17.8 → 0.17.9

package/README.md

@@ -1155,19 +1155,19 @@ In-memory page view tracking with a built-in dashboard. Zero extra dependencies.
 ```ts
 import { analytics } from 'weifuwu'
 
-app.use(analytics())  // mounts middleware + /analytics + /__analytics/data
+app.use(analytics())  // mounts middleware + /__analytics + /__analytics/data
 ```
 
 | Endpoint | Description |
 |----------|-------------|
-| `GET /analytics` | Dashboard — PV trend, top pages, referrers, device breakdown |
+| `GET /__analytics` | Dashboard — PV trend, top pages, referrers, device breakdown |
 | `GET /__analytics/data?days=7` | Raw JSON data for custom dashboards |
 
-Excluded paths (not recorded): `/__analytics/*`, `__wfw/*`, `/static/*`, `/analytics`.
+Excluded paths (not recorded): `/__analytics/*`, `/__wfw/*`, `/static/*`.
 
 ### Dashboard
 
-The built-in `/analytics` page renders a server-generated HTML dashboard with:
+The built-in `/__analytics` page renders a server-generated HTML dashboard with:
 
 - **Summary cards** — total PV, unique pages, mobile/desktop ratio
 - **Bar chart** — daily page views for the selected period

package/dist/index.js

@@ -579,7 +579,8 @@ import chokidar from "chokidar";
 
 // tsx-context.ts
 import { useSyncExternalStore, createContext } from "react";
-var _ctx = { params: {}, query: {} };
+var fallbackT = (key, _params, fallback) => fallback ?? key;
+var _ctx = { params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} };
 var _listeners = /* @__PURE__ */ new Set();
 function setCtx(value) {
   _ctx = { ..._ctx, ...value };
@@ -587,7 +588,7 @@ function setCtx(value) {
 }
 function _buildT() {
   const messages2 = typeof window !== "undefined" ? window.__LOCALE_DATA__ : globalThis.__LOCALE_DATA__;
-  if (!messages2) return void 0;
+  if (!messages2) return fallbackT;
   return (key, params, fallback) => {
     const msg = key.split(".").reduce((o, k) => o?.[k], messages2);
     if (msg === void 0 || msg === null) return fallback ?? key;
@@ -610,11 +611,9 @@ function useCtx() {
   );
   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;
+  return { ..._ctx, ...data, t };
 }
-var TsxContext = createContext({ params: {}, query: {} });
+var TsxContext = createContext({ params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} });
 
 // tsx-instance.ts
 var liveReloadClients = /* @__PURE__ */ new Set();
@@ -904,8 +903,6 @@ var TsxInstance = class {
           user: ctx.user,
           parsed: ctx.parsed,
           prefs: ctx.prefs,
-          locale: ctx.locale,
-          theme: ctx.theme,
           t: ctx.t,
           env: ctx.env
         });
@@ -1075,8 +1072,6 @@ ${src}`;
         user: ctx.user,
         parsed: ctx.parsed,
         prefs: ctx.prefs,
-        locale: ctx.locale,
-        theme: ctx.theme,
         t: ctx.t,
         env: ctx.env
       });
@@ -1345,7 +1340,7 @@ function streamResponse(reactStream, opts) {
 function buildHeadPayload(opts) {
   const { ctx, base, compiledTailwindCss } = opts;
   let result = "";
-  if (ctx.theme) {
+  if (ctx.prefs?.theme) {
     result += `<script>!function(){var t=(document.cookie.match(/(?:^|;\\s*)theme=([^;]+)/)||[])[1]||'system';if(t==='system'){t=window.matchMedia('(prefers-color-scheme:dark)').matches?'dark':'light'}document.documentElement.setAttribute('data-theme',t)}()</script>
 `;
   }
@@ -1362,11 +1357,9 @@ function buildHeadPayload(opts) {
     params: ctx.params,
     query: ctx.query,
     user: ctx.user,
-    parsed: ctx.parsed
+    parsed: ctx.parsed,
+    prefs: ctx.prefs
   };
-  if (ctx.prefs) ctxData.prefs = ctx.prefs;
-  if (ctx.locale) ctxData.locale = ctx.locale;
-  if (ctx.theme) ctxData.theme = ctx.theme;
   const publicEnv = {};
   for (const key of Object.keys(process.env)) {
     if (key.startsWith("WEIFUWU_PUBLIC_")) {
@@ -6799,7 +6792,7 @@ function health(options) {
 }
 
 // analytics.ts
-var DEFAULT_EXCLUDED = ["/__analytics", "/__wfw", "/static", "/analytics"];
+var DEFAULT_EXCLUDED = ["/__analytics", "/__wfw", "/static"];
 var MemStore = class {
   days = /* @__PURE__ */ new Map();
   pages = /* @__PURE__ */ new Map();
@@ -6996,7 +6989,7 @@ function analytics(options) {
   const router = () => {
     const r = new Router();
     r.get("/__analytics/data", handler);
-    r.get("/analytics", handler);
+    r.get("/__analytics", handler);
     return r;
   };
   const migrate = async () => {
@@ -7091,8 +7084,6 @@ function preferences(options) {
     const locale = detectLocale(req, localeOpts);
     const theme = detectTheme(req, themeOpts);
     ctx.prefs = { locale, theme };
-    ctx.locale = locale;
-    ctx.theme = theme;
     if (dir) {
       const msgs = await load(locale);
       ctx.t = (key, params, fallback) => translate(msgs, key, params, fallback);

package/dist/react.js

@@ -143,7 +143,8 @@ import { createElement, useCallback as useCallback3, useState as useState3, useE
 
 // tsx-context.ts
 import { useSyncExternalStore, createContext } from "react";
-var _ctx = { params: {}, query: {} };
+var fallbackT = (key, _params, fallback) => fallback ?? key;
+var _ctx = { params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} };
 var _listeners = /* @__PURE__ */ new Set();
 function setCtx(value) {
   _ctx = { ..._ctx, ...value };
@@ -151,7 +152,7 @@ function setCtx(value) {
 }
 function _buildT() {
   const messages = typeof window !== "undefined" ? window.__LOCALE_DATA__ : globalThis.__LOCALE_DATA__;
-  if (!messages) return void 0;
+  if (!messages) return fallbackT;
   return (key, params, fallback) => {
     const msg = key.split(".").reduce((o, k) => o?.[k], messages);
     if (msg === void 0 || msg === null) return fallback ?? key;
@@ -174,11 +175,9 @@ function useCtx() {
   );
   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;
+  return { ..._ctx, ...data, t };
 }
-var TsxContext = createContext({ params: {}, query: {} });
+var TsxContext = createContext({ params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} });
 
 // client-router.ts
 var _navigating = false;
@@ -210,12 +209,10 @@ async function navigate(href) {
       const data = await res.json();
       const ctx = { ...window.__WEIFUWU_CTX || {}, params: {}, query: {} };
       if (data.locale) {
-        ctx.locale = data.locale;
         ctx.prefs = { ...ctx.prefs, locale: data.locale };
         if (data.messages) window.__LOCALE_DATA__ = data.messages;
       }
       if (data.theme) {
-        ctx.theme = data.theme;
         ctx.prefs = { ...ctx.prefs, theme: data.theme };
       }
       ;

package/dist/tsx-context.d.ts

@@ -1,13 +1,13 @@
 export interface CtxValue {
     params: Record<string, string>;
     query: Record<string, string>;
-    user?: unknown;
-    parsed?: Record<string, unknown>;
-    prefs?: Record<string, string>;
-    locale?: string;
-    theme?: string;
-    t?: (key: string, params?: Record<string, string>, fallback?: string) => string;
-    env?: Record<string, string>;
+    user: {
+        id?: string;
+    };
+    parsed: Record<string, unknown>;
+    prefs: Record<string, string>;
+    t: (key: string, params?: Record<string, string>, fallback?: string) => string;
+    env: Record<string, string>;
 }
 export declare function setCtx(value: Partial<CtxValue>): void;
 export declare function useCtx(): CtxValue;

package/package.json

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