npm - weifuwu - Versions diffs - 0.17.22 → 0.17.24 - Mend

weifuwu 0.17.22 → 0.17.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -578,25 +578,38 @@ import chokidar from "chokidar";
 import { useSyncExternalStore, createContext } from "react";
 var fallbackT = (key, _params, fallback) => fallback ?? key;
 var DEFAULT_CTX = { params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} };
-var _ctx = DEFAULT_CTX;
-var _snapshot = { params: _ctx.params, query: _ctx.query, user: _ctx.user, parsed: _ctx.parsed, prefs: _ctx.prefs, env: _ctx.env };
-var _listeners = /* @__PURE__ */ new Set();
+var KEY = "__WEIFUWU_CTX";
+function getStore() {
+  if (typeof globalThis !== "undefined" && globalThis[KEY]) {
+    return globalThis[KEY];
+  }
+  const s = {
+    _ctx: DEFAULT_CTX,
+    _snapshot: { params: DEFAULT_CTX.params, query: DEFAULT_CTX.query, user: DEFAULT_CTX.user, parsed: DEFAULT_CTX.parsed, prefs: DEFAULT_CTX.prefs, env: DEFAULT_CTX.env },
+    _listeners: /* @__PURE__ */ new Set(),
+    _alsGetStore: null
+  };
+  if (typeof globalThis !== "undefined") {
+    globalThis[KEY] = s;
+  }
+  return s;
+}
+var store = getStore();
 var subscribe = (cb) => {
-  _listeners.add(cb);
+  store._listeners.add(cb);
   return () => {
-    _listeners.delete(cb);
+    store._listeners.delete(cb);
   };
 };
-var getSnapshot = () => _snapshot;
+var getSnapshot = () => store._snapshot;
 var getServerSnapshot = getSnapshot;
-var _alsGetStore = null;
-function __registerAls(getStore) {
-  _alsGetStore = getStore;
+function __registerAls(getStore2) {
+  store._alsGetStore = getStore2;
 }
 function setCtx(value) {
-  _ctx = { ..._ctx, ...value };
-  _snapshot = { params: _ctx.params, query: _ctx.query, user: _ctx.user, parsed: _ctx.parsed, prefs: _ctx.prefs, env: _ctx.env };
-  _listeners.forEach((fn) => fn());
+  store._ctx = { ...store._ctx, ...value };
+  store._snapshot = { params: store._ctx.params, query: store._ctx.query, user: store._ctx.user, parsed: store._ctx.parsed, prefs: store._ctx.prefs, env: store._ctx.env };
+  store._listeners.forEach((fn) => fn());
 }
 function _buildT() {
   const messages2 = typeof window !== "undefined" ? window.__LOCALE_DATA__ : globalThis.__LOCALE_DATA__;
@@ -611,8 +624,8 @@ function _buildT() {
   };
 }
 function _readCtx() {
-  const alsStore = _alsGetStore?.();
-  const base = alsStore ?? _ctx;
+  const alsStore = store._alsGetStore?.();
+  const base = alsStore ?? store._ctx;
   const data = typeof window !== "undefined" ? window.__WEIFUWU_CTX : null;
   return { ...base, ...data, t: _buildT() };
 }
@@ -1018,7 +1031,9 @@ ${src}`;
   // ── client bundle ─────────────────────────────────────────────────────────
   async buildClientBundle(entryPath, layoutPaths, pagesDir) {
     try {
+      const layoutImports = layoutPaths.map((p) => `import${JSON.stringify(p)};`).join("");
       const code = [
+        layoutImports,
         `import{hydrateRoot}from'react-dom/client';`,
         `import{createElement,useState,useEffect}from'react';`,
         `import{TsxContext}from'weifuwu/react';`,
@@ -3280,7 +3295,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, _ctx2) {
+  async function authorizeHandler(req, _ctx) {
     const url = new URL(req.url);
     const clientId = url.searchParams.get("client_id") || "";
     const redirectUri = url.searchParams.get("redirect_uri") || "";
@@ -4688,23 +4703,23 @@ function buildGraphQLHandler(sql2) {
     });
     return Response.json(result, { status: result.errors ? 400 : 200 });
   });
-  r.get("/", async (req, _ctx2) => {
+  r.get("/", async (req, _ctx) => {
     const url = new URL(req.url);
     if (url.searchParams.has("query")) {
-      return handleGET(req, _ctx2);
+      return handleGET(req, _ctx);
     }
     return new Response("GraphQL endpoint. Send POST /graphql with { query, variables }", {
       status: 200,
       headers: { "Content-Type": "text/plain" }
     });
   });
-  async function handleGET(req, _ctx2) {
+  async function handleGET(req, _ctx) {
     const tables = await sql2`
       SELECT * FROM "_user_tables"
-      WHERE tenant_id = ${_ctx2.tenant.id}
+      WHERE tenant_id = ${_ctx.tenant.id}
       ORDER BY created_at ASC
     `;
-    const buildCtx = { sql: sql2, tenantId: _ctx2.tenant.id, tables, typeCache: /* @__PURE__ */ new Map() };
+    const buildCtx = { sql: sql2, tenantId: _ctx.tenant.id, tables, typeCache: /* @__PURE__ */ new Map() };
     const schema = new GraphQLSchema({
       query: new GraphQLObjectType({
         name: "Query",
@@ -4724,7 +4739,7 @@ function buildGraphQLHandler(sql2) {
       source: query,
       variableValues: variables,
       operationName: url.searchParams.get("operationName") || void 0,
-      contextValue: _ctx2
+      contextValue: _ctx
     });
     return Response.json(result, { status: result.errors ? 400 : 200 });
   }
@@ -6742,7 +6757,7 @@ function createWSHandler2(deps) {
         clients.delete(ws);
       }
     },
-    error(ws, _ctx2, _err) {
+    error(ws, _ctx, _err) {
       const client = clients.get(ws);
       if (client) {
         client.abortController?.abort();
@@ -7084,7 +7099,7 @@ ${referrers.length ? `<div class="section"><h2>Referrers</h2><table><thead><tr><
 function analytics(options) {
   const excluded = options?.excluded ?? DEFAULT_EXCLUDED;
   const pg = options?.pg;
-  const store = pg ? null : new MemStore();
+  const store2 = pg ? null : new MemStore();
   const middleware = () => {
     const m = async (req, ctx, next) => {
       const path2 = new URL(req.url).pathname;
@@ -7097,7 +7112,7 @@ function analytics(options) {
       } else {
         const ref = req.headers.get("referer") || "";
         const refDomain = ref ? new URL(ref).hostname.replace(/^www\./, "") : "";
-        store.record(path2, date, refDomain, mobile);
+        store2.record(path2, date, refDomain, mobile);
       }
       return next(req, ctx);
     };
@@ -7106,7 +7121,7 @@ function analytics(options) {
   const handler = async (req) => {
     const url = new URL(req.url);
     const days = Math.min(Math.max(Number(url.searchParams.get("days")) || 7, 1), 365);
-    const data = pg ? await queryPg(pg.sql, days) : store.query(days);
+    const data = pg ? await queryPg(pg.sql, days) : store2.query(days);
     if (url.pathname === "/__analytics/data") return Response.json(data);
     return new Response(renderDashboard(days, data), {
       headers: { "content-type": "text/html; charset=utf-8" }
@@ -7698,33 +7713,33 @@ function applyOps(value, ops) {
   return current;
 }
 function createMemoryStore(channels) {
-  const store = /* @__PURE__ */ new Map();
+  const store2 = /* @__PURE__ */ new Map();
   function key(stream, group, item) {
     return `${stream}:${group}:${item}`;
   }
   return {
     async set(stream, group, item, data) {
       const k = key(stream, group, item);
-      const old = store.get(k) ?? null;
-      store.set(k, deepClone(data));
+      const old = store2.get(k) ?? null;
+      store2.set(k, deepClone(data));
       notify(channels, stream, group, item, "set", data);
       return { old_value: old, new_value: deepClone(data) };
     },
     async get(stream, group, item) {
-      const v = store.get(key(stream, group, item)) ?? null;
+      const v = store2.get(key(stream, group, item)) ?? null;
       return { value: deepClone(v) };
     },
     async delete(stream, group, item) {
       const k = key(stream, group, item);
-      const old = store.get(k) ?? null;
-      store.delete(k);
+      const old = store2.get(k) ?? null;
+      store2.delete(k);
       notify(channels, stream, group, item, "delete", null);
       return { old_value: old };
     },
     async list(stream, group) {
       const items = [];
       const prefix = `${stream}:${group}:`;
-      for (const [k, v] of store) {
+      for (const [k, v] of store2) {
         if (k.startsWith(prefix) && !k.slice(prefix.length).includes(":")) {
           items.push({ item_id: k.slice(prefix.length), data: deepClone(v) });
         }
@@ -7734,7 +7749,7 @@ function createMemoryStore(channels) {
     async list_groups(stream) {
       const groups = /* @__PURE__ */ new Set();
       const prefix = `${stream}:`;
-      for (const k of store.keys()) {
+      for (const k of store2.keys()) {
         if (k.startsWith(prefix)) {
           const rest = k.slice(prefix.length);
           const g = rest.split(":")[0];
@@ -7745,7 +7760,7 @@ function createMemoryStore(channels) {
     },
     async list_all() {
       const streamMap = /* @__PURE__ */ new Map();
-      for (const k of store.keys()) {
+      for (const k of store2.keys()) {
         const parts = k.split(":");
         const s = parts[0];
         const g = parts[1];
@@ -7766,9 +7781,9 @@ function createMemoryStore(channels) {
     },
     async update(stream, group, item, ops) {
       const k = key(stream, group, item);
-      const old = deepClone(store.get(k) ?? null);
+      const old = deepClone(store2.get(k) ?? null);
       const newVal = applyOps(old, ops);
-      store.set(k, deepClone(newVal));
+      store2.set(k, deepClone(newVal));
       notify(channels, stream, group, item, "update", newVal);
       return { old_value: old, new_value: deepClone(newVal) };
     }
@@ -7957,7 +7972,7 @@ function createRedisStore(channels, redis2, ttl) {
 }
 function createStream(opts) {
   const channels = /* @__PURE__ */ new Map();
-  const store = opts?.pg ? createPgStore(channels, opts.pg) : opts?.redis ? createRedisStore(channels, opts.redis, opts.streamTTL ?? 3600) : createMemoryStore(channels);
+  const store2 = opts?.pg ? createPgStore(channels, opts.pg) : opts?.redis ? createRedisStore(channels, opts.redis, opts.streamTTL ?? 3600) : createMemoryStore(channels);
   let redisSub = null;
   if (opts?.redis) {
     redisSub = opts.redis.duplicate();
@@ -7976,7 +7991,7 @@ function createStream(opts) {
     });
   }
   return {
-    ...store,
+    ...store2,
     subscribe(ws, sub) {
       const key = sub.item_id ? `${sub.stream_name}:${sub.group_id}:${sub.item_id}` : sub.group_id ? `${sub.stream_name}:${sub.group_id}` : sub.stream_name;
       if (!channels.has(key)) channels.set(key, /* @__PURE__ */ new Set());
@@ -8017,7 +8032,7 @@ function createWsHandler(deps) {
     return wsToWorkerId.get(ws) || "";
   }
   return {
-    open(_ws, _ctx2) {
+    open(_ws, _ctx) {
     },
     async message(ws, ctx, data) {
       let msg;

package/dist/react.js CHANGED Viewed

@@ -334,22 +334,35 @@ async function prefetchPage(href) {
 import { useSyncExternalStore, createContext } from "react";
 var fallbackT = (key, _params, fallback) => fallback ?? key;
 var DEFAULT_CTX = { params: {}, query: {}, parsed: {}, prefs: {}, env: {}, t: fallbackT, user: {} };
-var _ctx = DEFAULT_CTX;
-var _snapshot = { params: _ctx.params, query: _ctx.query, user: _ctx.user, parsed: _ctx.parsed, prefs: _ctx.prefs, env: _ctx.env };
-var _listeners2 = /* @__PURE__ */ new Set();
+var KEY = "__WEIFUWU_CTX";
+function getStore() {
+  if (typeof globalThis !== "undefined" && globalThis[KEY]) {
+    return globalThis[KEY];
+  }
+  const s = {
+    _ctx: DEFAULT_CTX,
+    _snapshot: { params: DEFAULT_CTX.params, query: DEFAULT_CTX.query, user: DEFAULT_CTX.user, parsed: DEFAULT_CTX.parsed, prefs: DEFAULT_CTX.prefs, env: DEFAULT_CTX.env },
+    _listeners: /* @__PURE__ */ new Set(),
+    _alsGetStore: null
+  };
+  if (typeof globalThis !== "undefined") {
+    globalThis[KEY] = s;
+  }
+  return s;
+}
+var store = getStore();
 var subscribe = (cb) => {
-  _listeners2.add(cb);
+  store._listeners.add(cb);
   return () => {
-    _listeners2.delete(cb);
+    store._listeners.delete(cb);
   };
 };
-var getSnapshot = () => _snapshot;
+var getSnapshot = () => store._snapshot;
 var getServerSnapshot = getSnapshot;
-var _alsGetStore = null;
 function setCtx(value) {
-  _ctx = { ..._ctx, ...value };
-  _snapshot = { params: _ctx.params, query: _ctx.query, user: _ctx.user, parsed: _ctx.parsed, prefs: _ctx.prefs, env: _ctx.env };
-  _listeners2.forEach((fn) => fn());
+  store._ctx = { ...store._ctx, ...value };
+  store._snapshot = { params: store._ctx.params, query: store._ctx.query, user: store._ctx.user, parsed: store._ctx.parsed, prefs: store._ctx.prefs, env: store._ctx.env };
+  store._listeners.forEach((fn) => fn());
 }
 function _buildT() {
   const messages = typeof window !== "undefined" ? window.__LOCALE_DATA__ : globalThis.__LOCALE_DATA__;
@@ -364,8 +377,8 @@ function _buildT() {
   };
 }
 function _readCtx() {
-  const alsStore = _alsGetStore?.();
-  const base = alsStore ?? _ctx;
+  const alsStore = store._alsGetStore?.();
+  const base = alsStore ?? store._ctx;
   const data = typeof window !== "undefined" ? window.__WEIFUWU_CTX : null;
   return { ...base, ...data, t: _buildT() };
 }
@@ -544,7 +557,8 @@ function useLocale() {
 // client-theme.ts
 function resolveTheme(theme) {
-  if (theme === "system" && typeof window !== "undefined") {
+  if (theme === "system") {
+    if (typeof window === "undefined") return "light";
     return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
   }
   return theme;

package/package.json CHANGED Viewed

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