weifuwu 0.17.11 → 0.17.13

package/dist/index.js

@@ -578,6 +578,14 @@ import { useSyncExternalStore, createContext } from "react";
 var fallbackT = (key, _params, fallback) => fallback ?? key;
 var _ctx = { params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} };
 var _listeners = /* @__PURE__ */ new Set();
+var subscribe = (cb) => {
+  _listeners.add(cb);
+  return () => {
+    _listeners.delete(cb);
+  };
+};
+var getSnapshot = () => ({ params: _ctx.params, query: _ctx.query, user: _ctx.user, parsed: _ctx.parsed, prefs: _ctx.prefs, env: _ctx.env });
+var getServerSnapshot = getSnapshot;
 function setCtx(value) {
   _ctx = { ..._ctx, ...value };
   _listeners.forEach((fn) => fn());
@@ -595,18 +603,9 @@ function _buildT() {
   };
 }
 function useCtx() {
-  useSyncExternalStore(
-    (cb) => {
-      _listeners.add(cb);
-      return () => {
-        _listeners.delete(cb);
-      };
-    },
-    () => _ctx,
-    () => _ctx
-  );
+  useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);
   const data = typeof window !== "undefined" ? window.__WEIFUWU_CTX : null;
-  const t = data?.t ?? (_ctx.t !== fallbackT ? _ctx.t : _buildT());
+  const t = _ctx.t !== fallbackT ? _ctx.t : _buildT();
   return { ..._ctx, ...data, t };
 }
 var TsxContext = createContext({ params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} });
@@ -919,6 +918,12 @@ var TsxInstance = class {
       };
       this.router.all("/*", handler);
     }
+    for (const p of pages) {
+      if (p.entryPath) {
+        const rootLayouts = resolveLayouts(this.pagesDir, this.pagesDir);
+        this.registerClientBundleRoute(p.entryPath, p.layouts.length > 0 ? p.layouts : rootLayouts, this.pagesDir);
+      }
+    }
     await this.setupTailwind();
     if (isDev) {
       this.router.ws("/__weifuwu/livereload", {
@@ -1022,15 +1027,21 @@ ${src}`;
     }
   }
   async getOrBuildClientBundle(entryPath, layoutPaths, pagesDir) {
+    const key = id(entryPath);
+    const url = `/__wfw/client/${key}.js`;
+    this.clientBuildParams.set(key, { entryPath, layoutPaths, pagesDir });
+    if (!this.clientBundleCache.has(key)) {
+      const buf = await this.buildClientBundle(entryPath, layoutPaths, pagesDir);
+      if (!buf) return null;
+      this.clientBundleCache.set(key, buf);
+    }
+    return { url };
+  }
+  registerClientBundleRoute(entryPath, layoutPaths, pagesDir) {
     const key = id(entryPath);
     const url = `/__wfw/client/${key}.js`;
     this.clientBuildParams.set(key, { entryPath, layoutPaths, pagesDir });
     if (!this.clientRouteLog.has(url)) {
-      if (!this.clientBundleCache.has(key)) {
-        const buf = await this.buildClientBundle(entryPath, layoutPaths, pagesDir);
-        if (!buf) return null;
-        this.clientBundleCache.set(key, buf);
-      }
       this.router.get(url, async () => {
         let buf = this.clientBundleCache.get(key);
         if (!buf) {
@@ -1049,7 +1060,6 @@ ${src}`;
       });
       this.clientRouteLog.add(url);
     }
-    return { url };
   }
   // ── SSR handler ───────────────────────────────────────────────────────────
   makeSsrHandler(entryPath, layoutPaths, loadPath) {

package/dist/react.js

@@ -146,6 +146,14 @@ import { useSyncExternalStore, createContext } from "react";
 var fallbackT = (key, _params, fallback) => fallback ?? key;
 var _ctx = { params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} };
 var _listeners = /* @__PURE__ */ new Set();
+var subscribe = (cb) => {
+  _listeners.add(cb);
+  return () => {
+    _listeners.delete(cb);
+  };
+};
+var getSnapshot = () => ({ params: _ctx.params, query: _ctx.query, user: _ctx.user, parsed: _ctx.parsed, prefs: _ctx.prefs, env: _ctx.env });
+var getServerSnapshot = getSnapshot;
 function setCtx(value) {
   _ctx = { ..._ctx, ...value };
   _listeners.forEach((fn) => fn());
@@ -163,18 +171,9 @@ function _buildT() {
   };
 }
 function useCtx() {
-  useSyncExternalStore(
-    (cb) => {
-      _listeners.add(cb);
-      return () => {
-        _listeners.delete(cb);
-      };
-    },
-    () => _ctx,
-    () => _ctx
-  );
+  useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);
   const data = typeof window !== "undefined" ? window.__WEIFUWU_CTX : null;
-  const t = data?.t ?? (_ctx.t !== fallbackT ? _ctx.t : _buildT());
+  const t = _ctx.t !== fallbackT ? _ctx.t : _buildT();
   return { ..._ctx, ...data, t };
 }
 var TsxContext = createContext({ params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} });
@@ -396,19 +395,19 @@ function createStore(initial) {
     state = { ...state, ...next };
     listeners.forEach((fn) => fn());
   };
-  const subscribe = (listener) => {
+  const subscribe2 = (listener) => {
     listeners.add(listener);
     return () => {
       listeners.delete(listener);
     };
   };
   const useStore = ((selector) => useSyncExternalStore2(
-    subscribe,
+    subscribe2,
     () => selector ? selector(state) : state
   ));
   useStore.getState = getState;
   useStore.setState = setState;
-  useStore.subscribe = subscribe;
+  useStore.subscribe = subscribe2;
   return useStore;
 }
 var dataCache = /* @__PURE__ */ new Map();
@@ -488,7 +487,7 @@ function notifyQueryListeners() {
   window.dispatchEvent(new PopStateEvent("popstate"));
 }
 function useQueryState(key, defaultValue = "") {
-  function getSnapshot() {
+  function getSnapshot2() {
     if (typeof window === "undefined") return defaultValue;
     const params = new URLSearchParams(window.location.search);
     return params.get(key) ?? defaultValue;
@@ -500,12 +499,12 @@ function useQueryState(key, defaultValue = "") {
       window.addEventListener("popstate", cb);
       return () => window.removeEventListener("popstate", cb);
     },
-    getSnapshot,
+    getSnapshot2,
     () => defaultValue
   );
   const setValue = useCallback4((val) => {
     if (typeof window === "undefined") return;
-    const resolved = typeof val === "function" ? val(getSnapshot()) : val;
+    const resolved = typeof val === "function" ? val(getSnapshot2()) : val;
     const url = new URL(window.location.href);
     if (resolved === defaultValue || resolved === "") {
       url.searchParams.delete(key);

package/dist/tsx-instance.d.ts

@@ -25,6 +25,7 @@ export declare class TsxInstance {
     private setupTailwind;
     private buildClientBundle;
     private getOrBuildClientBundle;
+    private registerClientBundleRoute;
     private makeSsrHandler;
     private startFileWatcher;
     private recompileAndSwap;

package/package.json

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