weifuwu 0.33.0 → 0.33.1

package/dist/index.js

@@ -225,14 +225,14 @@ function serve(router, options) {
     if (!server.listening) return;
     server.close();
     server.closeIdleConnections();
-    return new Promise((resolve6) => {
+    return new Promise((resolve5) => {
       const timer = setTimeout(() => {
         server.closeAllConnections();
-        resolve6();
+        resolve5();
       }, timeoutMs);
       server.on("close", () => {
         clearTimeout(timer);
-        resolve6();
+        resolve5();
       });
     });
   }
@@ -277,7 +277,7 @@ function createHub(opts) {
       }
     });
   }
-  function join4(key, ws) {
+  function join3(key, ws) {
     if (!channels.has(key)) {
       channels.set(key, /* @__PURE__ */ new Set());
       redisSub?.subscribe(`${prefix}${key}`);
@@ -339,7 +339,7 @@ function createHub(opts) {
     redisPub = void 0;
     redisSub = null;
   }
-  return { join: join4, leave, broadcast, close };
+  return { join: join3, leave, broadcast, close };
 }
 
 // src/core/ws.ts
@@ -1296,90 +1296,22 @@ ${String(err)}`;
   }
   async function compile(entry) {
     const esbuild = await getEsbuild();
-    const isClientRouter = !!entry.clientRouter;
-    let entryAbs;
-    let buildOpts;
-    if (isClientRouter) {
-      const cr = entry.clientRouter;
-      const virtualModule = "weifuwu:client-entry";
-      entryAbs = virtualModule;
-      const layoutImport = `import * as _layout from '${cr.layout}'
-const _lx = Object.entries(_layout).filter(([,v]) => typeof v === 'function')
-const Layout = _layout.default || (_lx[0]?.[1])`;
-      let routesCode;
-      if (cr.pages) {
-        const entries2 = Object.entries(cr.pages).map(
-          ([path, component]) => `  '${path}': () => import('${component}'),`
-        );
-        routesCode = `const routes = {
-${entries2.join("\n")}
-}`;
-      } else if (cr.routes) {
-        routesCode = `import { routes } from '${cr.routes}'`;
-      } else {
-        routesCode = "const routes = {}";
-      }
-      const fallbackLine = cr.fallback ? `const fallback = () => import('${cr.fallback}')` : "";
-      const fallbackOpt = cr.fallback ? "  fallback," : "";
-      const generatedCode = [
-        `import { createBrowserRouter } from 'weifuwu/react/client'`,
-        layoutImport,
-        routesCode,
-        fallbackLine,
-        "",
-        "createBrowserRouter({",
-        "  layout: Layout,",
-        "  routes,",
-        fallbackOpt,
-        "})"
-      ].filter(Boolean).join("\n");
-      buildOpts = {
-        entryPoints: [virtualModule],
-        bundle: entry.bundle ?? true,
-        external: entry.external ?? [],
-        minify: entry.minify ?? true,
-        platform: entry.platform ?? "browser",
-        format: entry.format ?? "esm",
-        sourcemap: entry.sourcemap ?? false,
-        splitting: entry.splitting ?? false,
-        ...entry.splitting ? { outdir: resolve3(".weifuwu-esbuild-out") } : {},
-        define: entry.define,
-        loader: entry.loader,
-        write: false,
-        logLevel: "silent",
-        plugins: [{
-          name: "weifuwu-client-router",
-          setup(build) {
-            build.onResolve({ filter: new RegExp(`^${virtualModule.replace(/:/g, "\\:")}$`) }, () => ({
-              path: virtualModule,
-              namespace: "weifuwu-client"
-            }));
-            build.onLoad({ filter: /.*/, namespace: "weifuwu-client" }, () => ({
-              contents: generatedCode,
-              loader: "ts",
-              resolveDir: process.cwd()
-            }));
-          }
-        }]
-      };
-    } else {
-      entryAbs = resolve3(entry.entry);
-      buildOpts = {
-        entryPoints: [entryAbs],
-        bundle: entry.bundle ?? true,
-        external: entry.external ?? [],
-        minify: entry.minify ?? true,
-        platform: entry.platform ?? "browser",
-        format: entry.format ?? "esm",
-        sourcemap: entry.sourcemap ?? false,
-        splitting: entry.splitting ?? false,
-        ...entry.splitting ? { outdir: dirname(entryAbs) } : {},
-        define: entry.define,
-        loader: entry.loader,
-        write: false,
-        logLevel: "silent"
-      };
-    }
+    const entryAbs = resolve3(entry.entry);
+    const buildOpts = {
+      entryPoints: [entryAbs],
+      bundle: entry.bundle ?? true,
+      external: entry.external ?? [],
+      minify: entry.minify ?? true,
+      platform: entry.platform ?? "browser",
+      format: entry.format ?? "esm",
+      sourcemap: entry.sourcemap ?? false,
+      splitting: entry.splitting ?? false,
+      ...entry.splitting ? { outdir: dirname(entryAbs) } : {},
+      define: entry.define,
+      loader: entry.loader,
+      write: false,
+      logLevel: "silent"
+    };
     const result = await esbuild.build(buildOpts);
     const msgs = [];
     for (const w of result.warnings) {
@@ -1479,8 +1411,7 @@ ${entries2.join("\n")}
         }
       }
       const { code, etag, chunks } = await compile(config);
-      const depEntry = config.clientRouter?.routes ?? (config.clientRouter?.pages ? Object.values(config.clientRouter.pages)[0] : void 0) ?? config.entry;
-      const deps = await collectDeps(resolve3(depEntry));
+      const deps = await collectDeps(resolve3(config.entry));
       if (cache === "memory") {
         cacheStore.set(pathname, { code, etag, files: deps, chunks });
         if (chunks) {
@@ -2490,379 +2421,6 @@ function queue(opts) {
   return q2;
 }
 
-// src/react/index.ts
-import { createElement as createElement2 } from "react";
-import { renderToReadableStream } from "react-dom/server";
-
-// src/react/compile.ts
-import { mkdir as mkdir3, writeFile as writeFile3, readFile as readFile4 } from "node:fs/promises";
-import { resolve as resolve5, join as join3, dirname as dirname2 } from "node:path";
-import { createHash } from "node:crypto";
-import { existsSync } from "node:fs";
-var EXTERNAL_PKGS = [
-  "react",
-  "react/jsx-runtime",
-  "react-dom",
-  "react-dom/server",
-  "react-dom/client",
-  "weifuwu",
-  "weifuwu/react"
-];
-var FRAMEWORK_IMPORTS = [
-  "react",
-  "react/jsx-runtime",
-  "react-dom",
-  "react-dom/server",
-  "react-dom/client",
-  "weifuwu",
-  "weifuwu/react"
-];
-var memCache = /* @__PURE__ */ new Map();
-function buildResolveMap() {
-  const map = {};
-  for (const spec of FRAMEWORK_IMPORTS) {
-    try {
-      map[spec] = import.meta.resolve(spec);
-    } catch {
-    }
-  }
-  return map;
-}
-var _resolveMap = null;
-function resolveMap() {
-  if (!_resolveMap) _resolveMap = buildResolveMap();
-  return _resolveMap;
-}
-function rewriteImports(code) {
-  const map = resolveMap();
-  let result = code;
-  for (const [spec, url] of Object.entries(map)) {
-    const quoted = JSON.stringify(spec);
-    const escaped = quoted.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    result = result.replace(new RegExp(`(from\\s+)${escaped}`, "g"), `$1${JSON.stringify(url)}`).replace(new RegExp(`(import\\s+)${escaped}(\\s*;)`, "g"), `$1${JSON.stringify(url)}$2`).replace(new RegExp(`(export\\s+.*?from\\s+)${escaped}`, "g"), `$1${JSON.stringify(url)}`);
-  }
-  return result;
-}
-var _cacheDir = null;
-function setReactCacheDir(dir) {
-  _cacheDir = dir;
-}
-function getCacheDir() {
-  if (_cacheDir) return _cacheDir;
-  _cacheDir = join3(process.cwd(), "node_modules", ".weifuwu", "react");
-  return _cacheDir;
-}
-async function loadTsxModule(entryPath) {
-  const abs = resolve5(entryPath);
-  let source;
-  try {
-    source = await readFile4(abs, "utf-8");
-  } catch {
-    throw new Error(`Cannot read file: ${entryPath}`);
-  }
-  const sourceHash = createHash("sha256").update(source).digest("hex").slice(0, 16);
-  const memCached = memCache.get(abs);
-  if (memCached && memCached.sourceHash === sourceHash) {
-    return memCached.mod;
-  }
-  const tmpDir = getCacheDir();
-  const tmpFile = join3(tmpDir, `${sourceHash}.mjs`);
-  if (existsSync(tmpFile)) {
-    try {
-      const mod2 = await import(tmpFile + "?" + sourceHash);
-      memCache.set(abs, { sourceHash, mod: mod2 });
-      return mod2;
-    } catch {
-    }
-  }
-  const esbuild = await import("esbuild");
-  const result = await esbuild.build({
-    entryPoints: [abs],
-    bundle: true,
-    write: false,
-    format: "esm",
-    platform: "node",
-    jsx: "automatic",
-    external: EXTERNAL_PKGS,
-    logLevel: "silent"
-  });
-  let code = result.outputFiles[0]?.text ?? "";
-  if (!code) throw new Error(`esbuild produced empty output for ${entryPath}`);
-  code = rewriteImports(code);
-  await mkdir3(dirname2(tmpFile), { recursive: true });
-  await writeFile3(tmpFile, code);
-  const mod = await import(tmpFile + "?" + sourceHash);
-  memCache.set(abs, { sourceHash, mod });
-  return mod;
-}
-async function loadTsxComponent(entryPath) {
-  const mod = await loadTsxModule(entryPath);
-  if (mod.default && typeof mod.default === "function") return mod.default;
-  for (const [, val] of Object.entries(mod)) {
-    if (typeof val === "function") return val;
-  }
-  throw new Error(`No component export found in ${entryPath}. Export a default or named component function.`);
-}
-
-// src/react/context.ts
-import { createContext } from "react";
-var CTX_KEY = /* @__PURE__ */ Symbol.for("weifuwu.react.ServerDataContext");
-function getServerDataContext() {
-  const globalStore = globalThis;
-  if (globalStore[CTX_KEY]) return globalStore[CTX_KEY];
-  const ctx = createContext({});
-  ctx.displayName = "ServerData";
-  globalStore[CTX_KEY] = ctx;
-  return ctx;
-}
-var ServerDataContext = getServerDataContext();
-
-// src/react/error-boundary.ts
-import { createElement, Component } from "react";
-var ErrorBoundary = class extends Component {
-  state = { hasError: false, error: null };
-  static getDerivedStateFromError(error) {
-    return { hasError: true, error };
-  }
-  componentDidCatch(error) {
-    this.props.onError?.(error);
-  }
-  render() {
-    if (this.state.hasError) {
-      if (this.props.fallback) return this.props.fallback;
-      return createElement(
-        "div",
-        { style: { padding: "2rem", textAlign: "center" } },
-        createElement("h1", null, "Something went wrong"),
-        createElement("p", null, this.state.error?.message ?? "Unknown error")
-      );
-    }
-    return this.props.children;
-  }
-};
-
-// src/react/hooks.ts
-import { useContext } from "react";
-function useServerData() {
-  return useContext(ServerDataContext);
-}
-
-// src/react/index.ts
-function HtmlShell({ children, importMap, stylesheets, data }) {
-  const headChildren = [
-    createElement2("meta", { charSet: "utf-8", key: "charset" }),
-    createElement2("meta", { name: "viewport", content: "width=device-width, initial-scale=1", key: "viewport" })
-  ];
-  if (stylesheets) {
-    for (const href of stylesheets) {
-      headChildren.push(
-        createElement2("link", { rel: "stylesheet", href, key: `css-${href}` })
-      );
-    }
-  }
-  if (importMap) {
-    headChildren.push(
-      createElement2("script", {
-        type: "importmap",
-        key: "importmap",
-        dangerouslySetInnerHTML: { __html: JSON.stringify(importMap) }
-      })
-    );
-  }
-  const bodyChildren = [
-    createElement2("div", { id: "root", key: "root" }, children)
-  ];
-  if (data && Object.keys(data).length > 0) {
-    bodyChildren.push(
-      createElement2("script", {
-        id: "__WEIFUWU_DATA__",
-        type: "application/json",
-        key: "weifuwu-data",
-        dangerouslySetInnerHTML: { __html: JSON.stringify(data).replace(/</g, "\\u003c") }
-      })
-    );
-  }
-  return createElement2(
-    "html",
-    { lang: "en" },
-    createElement2("head", null, ...headChildren),
-    createElement2("body", null, ...bodyChildren)
-  );
-}
-async function renderComponent(Component2, data, layout, renderOpts) {
-  let element = createElement2(Component2, renderOpts.props ?? {});
-  if (layout) {
-    element = createElement2(layout, { children: element });
-  }
-  element = createElement2(ServerDataContext.Provider, { value: data }, element);
-  const page = createElement2(HtmlShell, {
-    children: element,
-    importMap: renderOpts.importMap,
-    stylesheets: renderOpts.stylesheets,
-    data: Object.keys(data).length > 0 ? data : void 0
-  });
-  const rstream = await renderToReadableStream(page, {
-    bootstrapScripts: renderOpts.bootstrapScripts,
-    bootstrapModules: renderOpts.bootstrapModules
-  });
-  if (renderOpts.stream === false) {
-    await rstream.allReady;
-  }
-  return new Response(rstream, {
-    status: renderOpts.status ?? 200,
-    headers: { "content-type": "text/html; charset=utf-8", ...renderOpts.headers }
-  });
-}
-function react(opts) {
-  if (opts && "pages" in opts) {
-    return (app) => createFullReactApp(app, opts);
-  }
-  if (opts?.cacheDir) setReactCacheDir(opts.cacheDir);
-  let LayoutComponent = null;
-  let layoutLoaded = false;
-  let layoutLoadError = null;
-  async function getLayout() {
-    if (!opts?.layout) return null;
-    if (layoutLoaded) {
-      if (layoutLoadError) throw layoutLoadError;
-      return LayoutComponent;
-    }
-    try {
-      LayoutComponent = await loadTsxComponent(opts.layout);
-      layoutLoaded = true;
-      return LayoutComponent;
-    } catch (err) {
-      layoutLoadError = err instanceof Error ? err : new Error(String(err));
-      layoutLoaded = true;
-      throw layoutLoadError;
-    }
-  }
-  return async (_req, ctx, next) => {
-    ctx.render = async (path, renderOpts) => {
-      let data = renderOpts?.data ?? {};
-      if (renderOpts?.loader) {
-        const loaderData = await renderOpts.loader(ctx);
-        data = { ...data, ...loaderData };
-      }
-      const Component2 = await loadTsxComponent(path);
-      const layout = await getLayout();
-      return renderComponent(Component2, data, layout, renderOpts ?? {});
-    };
-    return next(_req, ctx);
-  };
-}
-async function resolveLoader(modulePath) {
-  const mod = await loadTsxModule(modulePath);
-  return typeof mod.loader === "function" ? mod.loader : null;
-}
-async function callLoader(loader, ctx, data, rethrow = true) {
-  if (!loader) return data;
-  try {
-    return { ...data, ...await loader(ctx) };
-  } catch (err) {
-    if (rethrow) throw err;
-    return data;
-  }
-}
-function createFullReactApp(app, opts) {
-  const stylesheets = [...opts.stylesheets ?? []];
-  if (opts.tailwind) {
-    const twPath = opts.tailwind.path ?? "/assets/tailwind.css";
-    const twEntry = opts.tailwind.entry ?? "./styles/input.css";
-    app.use(tailwindDev({ entries: { [twPath]: { entry: twEntry } } }));
-    if (!stylesheets.includes(twPath)) stylesheets.push(twPath);
-  }
-  app.use(react({ layout: opts.layout, cacheDir: opts.cacheDir }));
-  const layoutLoaderP = resolveLoader(opts.layout);
-  const notFoundLoaderP = opts.notFound ? resolveLoader(opts.notFound) : Promise.resolve(null);
-  const clientCfg = typeof opts.client === "object" ? opts.client : {};
-  const clientPath = clientCfg.path ?? "/assets/client.js";
-  const bootstrapModules = [...opts.bootstrapModules ?? []];
-  if (opts.client !== false && !bootstrapModules.includes(clientPath)) {
-    bootstrapModules.push(clientPath);
-  }
-  const renderOpts = {
-    stylesheets: stylesheets.length > 0 ? stylesheets : void 0,
-    bootstrapModules: bootstrapModules.length > 0 ? bootstrapModules : void 0,
-    stream: opts.stream
-  };
-  for (const [path, component] of Object.entries(opts.pages)) {
-    app.get(path, async (_req, ctx) => {
-      let data = {};
-      data = await callLoader(await layoutLoaderP, ctx, data);
-      const pageLoader = opts.loaders?.[path] ?? await resolveLoader(component);
-      data = await callLoader(pageLoader, ctx, data);
-      return ctx.render(component, { ...renderOpts, data });
-    });
-  }
-  if (opts.notFound) {
-    const notFoundPath = opts.notFound;
-    app.onError(async (err, _req, ctx) => {
-      const status = typeof err === "object" && err !== null && "status" in err ? err.status : 500;
-      if (ctx.render) {
-        let data = { error: String(err) };
-        data = await callLoader(await layoutLoaderP, ctx, data, false);
-        data = await callLoader(await notFoundLoaderP, ctx, data, false);
-        return ctx.render(notFoundPath, { ...renderOpts, status, data });
-      }
-      return new Response("Internal Server Error", { status });
-    });
-  }
-  if (opts.client !== false) {
-    app.use(esbuildDev({
-      entries: {
-        [clientPath]: {
-          clientRouter: {
-            pages: opts.pages,
-            layout: opts.layout,
-            fallback: opts.notFound
-          },
-          bundle: true,
-          splitting: clientCfg.splitting ?? true,
-          minify: clientCfg.minify ?? false
-        }
-      }
-    }));
-  }
-}
-function extractImportPath(fn) {
-  const src = fn.toString();
-  const m = src.match(/import\s*\(\s*['"]([^'"]+)['"]\s*\)/);
-  if (!m) throw new Error(`Cannot extract import path from: ${src}`);
-  return m[1];
-}
-function reactRouter(app, routes, opts = {}) {
-  let LayoutComponent = null;
-  let layoutPromise = null;
-  async function getLayout() {
-    if (!opts.layout) return null;
-    if (LayoutComponent) return LayoutComponent;
-    if (!layoutPromise) {
-      layoutPromise = loadTsxComponent(opts.layout).then((c) => {
-        LayoutComponent = c;
-        return c;
-      });
-    }
-    return layoutPromise;
-  }
-  for (const [path, importer] of Object.entries(routes)) {
-    app.get(path, async (_req, ctx) => {
-      const cmpPath = extractImportPath(importer);
-      const Component2 = await loadTsxComponent(cmpPath);
-      const layout = await getLayout();
-      let data = {};
-      const loader = opts.loaders?.[path];
-      if (loader) {
-        data = await loader(ctx);
-      }
-      return renderComponent(Component2, data, layout, opts);
-    });
-  }
-}
-function Link({ href, children, ...props }) {
-  return createElement2("a", { href, ...props }, children);
-}
-
 // src/ai/index.ts
 function ai(opts) {
   let aiModule = null;
@@ -5224,14 +4782,11 @@ export {
   Base,
   CMS,
   DEFAULT_MAX_BODY,
-  ErrorBoundary,
   HttpError,
   KB,
-  Link,
   MIGRATIONS_TABLE,
   Messager,
   Router,
-  ServerDataContext,
   UserModule,
   agent,
   ai,
@@ -5251,8 +4806,6 @@ export {
   postgres,
   queue,
   rateLimit,
-  react,
-  reactRouter,
   redis,
   requireRole,
   runWithTrace,
@@ -5263,6 +4816,5 @@ export {
   trace,
   traceElapsed,
   upload,
-  useServerData,
   user
 };

package/dist/middleware/esbuild-dev.d.ts

@@ -19,22 +19,8 @@
  */
 import type { Middleware, Context } from '../types.ts';
 export interface EsbuildDevEntry {
-    /** Source entry point relative to cwd or absolute. Ignored when `clientRouter` is set. */
+    /** Source entry point relative to cwd or absolute. */
     entry?: string;
-    /**
-     * Auto-generate a client entry from route config — eliminates client.ts.
-     * The generated entry imports routes + layout, calls createBrowserRouter().
-     */
-    clientRouter?: {
-        /** Path to the shared routes file (relative to cwd). Overridden by `pages`. */
-        routes?: string;
-        /** Inline page definitions — alternative to a separate routes.ts file. */
-        pages?: Record<string, string>;
-        /** Layout component import path (relative to cwd). */
-        layout: string;
-        /** Fallback 404 component import path (relative to cwd). */
-        fallback?: string;
-    };
     /** Bundle all dependencies (default: true). */
     bundle?: boolean;
     /** Packages to leave external (not bundled). */