weifuwu 0.79.0 → 0.80.0

package/dist/index.js

@@ -653,9 +653,9 @@ var Router = class _Router {
   }
   // ── Private: Mount ─────────────────────────────────────────
   _mountRouter(prefix, sub, extraMws = []) {
-    const base = prefix === "/" ? "" : prefix.replace(/\/$/, "");
+    const base2 = prefix === "/" ? "" : prefix.replace(/\/$/, "");
     const mountMw = (req, ctx, next) => {
-      ctx.mountPath = (ctx.mountPath || "") + base;
+      ctx.mountPath = (ctx.mountPath || "") + base2;
       return next(req, ctx);
     };
     const allExtra = extraMws.length === 0 && sub.globalMws.length === 0 ? [mountMw] : [mountMw, ...extraMws, ...sub.globalMws];
@@ -665,12 +665,12 @@ var Router = class _Router {
     const routes = [];
     this._collect(sub.root, "", routes);
     for (const { method, path, handler, middlewares } of routes) {
-      this._routeImpl(method, base + path, [...allExtra, ...middlewares, handler]);
+      this._routeImpl(method, base2 + path, [...allExtra, ...middlewares, handler]);
     }
     const wsRoutes = [];
     this._collectWs(sub.wsRoot, "", wsRoutes);
     for (const { path, handler, middlewares } of wsRoutes) {
-      this.ws(base + path, ...allExtra, ...middlewares, handler);
+      this.ws(base2 + path, ...allExtra, ...middlewares, handler);
     }
   }
   _collect(node, prefix, result) {
@@ -3077,8 +3077,64 @@ var HtmlSafe = class {
 // src/ui-dom/vnode.ts
 var Fragment = /* @__PURE__ */ Symbol("Fragment");
 var Portal = /* @__PURE__ */ Symbol("Portal");
+function isFrag(v) {
+  return v != null && typeof v === "object" && v.type === Fragment;
+}
+function isComp(v) {
+  return v != null && typeof v === "object" && typeof v.type === "function";
+}
+function isPortal(v) {
+  return v != null && typeof v === "object" && v.type === Portal;
+}
+function base(type, props, key = null) {
+  return {
+    type,
+    props,
+    key,
+    _child: null,
+    _parentNode: null,
+    _refNode: null,
+    _id: null,
+    _customId: null,
+    _parentVNode: null,
+    _ctxVersion: null
+  };
+}
+function createVNode(type, props, key = null) {
+  if (type === Fragment) {
+    const v2 = { ...base(type, props, key), type };
+    return v2;
+  }
+  if (type === Portal) {
+    const v2 = { ...base(type, props, key), type, _remoteEl: null, _placement: "remote" };
+    return v2;
+  }
+  if (typeof type === "function") {
+    const v2 = { ...base(type, props, key), type, _render: null, _outputChild: null };
+    return v2;
+  }
+  const v = { ...base(type, props, key), type, el: null };
+  return v;
+}
+
+// src/ui-dom/vdom2/kind.ts
+function classifyKind(v) {
+  if (v == null || typeof v === "boolean") return "hole";
+  if (typeof v === "string" || typeof v === "number") return "text";
+  if (Array.isArray(v)) return "arr";
+  const vn = v;
+  if (isFrag(vn)) return "frag";
+  if (isPortal(vn)) return "portal";
+  if (isComp(vn)) return "comp";
+  return "native";
+}
+
+// src/ui-dom/vdom2/ctx.ts
+function componentName(type) {
+  return typeof type === "function" ? type.name || "anonymous" : "anonymous";
+}
 
-// src/ui-dom/vdom/transform.ts
+// src/ui-dom/vdom2/transform.ts
 function holeDetail(v) {
   if (v === false) return "false";
   if (v === null) return "null";
@@ -3106,24 +3162,19 @@ function holeMarkup(opts) {
   if (opts.fid != null) parts.push(`fid=${quoteIfNeeded(opts.fid)}`);
   return `wf-hole: ${parts.join(" ")}`;
 }
-function isInvalidVNodeType(t) {
-  return typeof t !== "string" && typeof t !== "function" && t !== Fragment && t !== Portal;
-}
 function ensureArrayKeys(children) {
   for (let i = 0; i < children.length; i++) {
     const c = children[i];
     if (c != null && typeof c === "object" && !Array.isArray(c)) {
       const v = c;
-      if (v.key === void 0) v.key = String(i);
+      if (v.key === null) v.key = String(i);
       else v.key = String(v.key);
     }
   }
 }
 var ENUMERATED_VALUE_BASED = /* @__PURE__ */ new Set(["draggable", "contenteditable", "spellcheck", "translate"]);
 
-// src/ui-dom/vdom/ssr.ts
-var VOID_TAGS = /* @__PURE__ */ new Set(["area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "param", "source", "track", "wbr"]);
-var SVG_TAGS = /* @__PURE__ */ new Set(["svg", "path", "circle", "rect", "line", "polyline", "polygon", "g", "text", "defs", "use", "clipPath"]);
+// src/ui-dom/vdom2/x2html.ts
 function escape(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
@@ -3134,61 +3185,71 @@ function classToString(v) {
   return "";
 }
 function styleToString(v) {
-  return Object.entries(v).filter(([, val]) => val != null).map(([k, val]) => {
-    const key = k.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase());
-    const value = typeof val === "number" && val !== 0 ? `${val}px` : String(val);
-    return `${key}:${value}`;
-  }).join(";");
-}
-async function renderSsr(input, ctx) {
-  if (input == null || typeof input === "boolean") return "";
-  if (typeof input === "string" || typeof input === "number") return escape(String(input));
-  if (Array.isArray(input)) {
-    ensureArrayKeys(input);
-    const fidBase = ctx._fidPath;
-    const parts = await Promise.all(input.map(async (c, i) => {
-      const childFid = fidBase != null ? `${fidBase}-${i}` : String(i);
-      if (c == null || typeof c === "boolean") return Promise.resolve(`<!--${holeMarkup({ type: "hole", value: c })}-->`);
-      if (Array.isArray(c)) {
-        const inner = await renderSsr(c, { ...ctx, _fidPath: childFid });
-        return `<!--${holeMarkup({ type: "fragment-start", key: String(i), fid: childFid })}-->${inner}<!--${holeMarkup({ type: "fragment-end", key: String(i), fid: childFid })}-->`;
-      }
-      return renderSsr(c, ctx);
-    }));
-    return parts.join("");
-  }
-  const vnode = input;
-  if (isInvalidVNodeType(vnode.type)) {
-    console.warn(`[weifuwu] children \u9879\u975E\u6CD5\uFF1Atype=${String(vnode.type)}\uFF08${typeof vnode.type}\uFF09\u2014\u2014\u5DF2\u5360\u4F4D\uFF08wf-hole\uFF09`);
-    return `<!--${holeMarkup({ type: "hole", value: input })}-->`;
-  }
-  if (vnode.type === Portal || vnode.type === Fragment) return renderSsr(vnode.props?.children, ctx);
-  if (typeof vnode.type === "function") {
-    const childCtx = Object.create(ctx);
-    delete childCtx._fidPath;
-    const renderFn = await vnode.type(vnode.props ?? {}, childCtx);
-    if (typeof renderFn !== "function") {
-      throw new Error(
-        `Component ${vnode.type.name || "anonymous"} must return a render function. Use (init_props, ctx) => (props) => VNode pattern.`
-      );
-    }
-    const out = await renderFn(vnode.props ?? {});
-    if (vnode.key != null && out != null && typeof out === "object") {
-      if (Array.isArray(out)) {
-        for (const c of out) {
-          if (c != null && typeof c === "object" && !Array.isArray(c)) c.key = vnode.key;
-        }
-      } else {
-        ;
-        out.key = vnode.key;
-      }
+  return Object.entries(v).filter(([, val]) => val != null && val !== false).map(([k, val]) => `${k}:${typeof val === "number" ? val : String(val)}`).join(";");
+}
+var VOID_TAGS = /* @__PURE__ */ new Set(["area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "param", "source", "track", "wbr"]);
+var SVG_TAGS = /* @__PURE__ */ new Set(["svg", "path", "circle", "rect", "line", "polyline", "polygon", "g", "text", "defs", "use", "clipPath"]);
+async function x2html(input, ctx) {
+  return TO_HTML[classifyKind(input)](input, ctx);
+}
+async function holeToHtml(v, ctx) {
+  return "";
+}
+async function textToHtml(v, ctx) {
+  return escape(String(v));
+}
+async function arrToHtml(v, ctx) {
+  const arr = v;
+  ensureArrayKeys(arr);
+  const fidBase = ctx._fidPath;
+  const parts = await Promise.all(arr.map(async (c, i) => {
+    const childFid = fidBase != null ? `${fidBase}-${i}` : String(i);
+    if (c == null || typeof c === "boolean") return `<!--${holeMarkup({ type: "hole", value: c, key: null, id: null, fid: null })}-->`;
+    if (Array.isArray(c)) {
+      const inner = await x2html(c, { ...ctx, _fidPath: childFid });
+      return `<!--${holeMarkup({ type: "fragment-start", key: String(i), id: null, fid: childFid })}-->${inner}<!--${holeMarkup({ type: "fragment-end", key: String(i), id: null, fid: childFid })}-->`;
+    }
+    return x2html(c, ctx);
+  }));
+  return parts.join("");
+}
+async function fragToHtml(v, ctx) {
+  const vnode = v;
+  const fid = ctx._fidPath ?? null;
+  const inner = await x2html(vnode.props?.children, { ...ctx, _fidPath: fid ?? void 0 });
+  return `<!--${holeMarkup({ type: "fragment-start", key: null, id: null, fid })}-->${inner}<!--${holeMarkup({ type: "fragment-end", key: null, id: null, fid })}-->`;
+}
+async function portalToHtml(v, ctx) {
+  const vnode = v;
+  return x2html(vnode.props?.children, ctx);
+}
+async function compToHtml(v, ctx) {
+  const vnode = v;
+  const childCtx = Object.create(ctx);
+  delete childCtx._fidPath;
+  const renderFn = await vnode.type(vnode.props ?? {}, childCtx);
+  if (typeof renderFn !== "function") {
+    throw new Error(
+      `Component ${componentName(vnode.type)} must return a render function. Use (init_props, ctx) => (props) => VNode pattern.`
+    );
+  }
+  const out = await renderFn(vnode.props ?? {});
+  if (vnode.key != null && out != null && typeof out === "object") {
+    if (Array.isArray(out)) {
+      for (const c of out) if (c != null && typeof c === "object" && !Array.isArray(c)) c.key = vnode.key;
+    } else {
+      ;
+      out.key = vnode.key;
     }
-    return renderSsr(out, childCtx);
   }
+  return x2html(out, childCtx);
+}
+async function nativeToHtml(v, ctx) {
+  const vnode = v;
   const tag = vnode.type;
   const props = vnode.props ?? {};
   const attrs = [];
-  let innerHTML;
+  let innerHTML = null;
   if (vnode.key != null) attrs.push(` data-wf-key="${escape(String(vnode.key))}"`);
   for (const [key, value] of Object.entries(props)) {
     if (key === "children" || key === "key") continue;
@@ -3221,98 +3282,39 @@ async function renderSsr(input, ctx) {
   const attrStr = attrs.join("");
   const svgWrap = SVG_TAGS.has(tag);
   if (VOID_TAGS.has(tag)) return `<${tag}${attrStr}>`;
-  if (innerHTML !== void 0) return `<${tag}${attrStr}>${innerHTML}</${tag}>`;
-  const children = await renderSsr(props.children, ctx);
+  if (innerHTML !== null) return `<${tag}${attrStr}>${innerHTML}</${tag}>`;
+  const children = await x2html(props.children, ctx);
   if (svgWrap) return `<${tag}${attrStr}>${children}</${tag}>`;
   return `<${tag}${attrStr}>${children}</${tag}>`;
 }
-function createSsrUi() {
-  const noop = () => () => {
-  };
-  const noopReturn = () => ({});
-  return {
-    _selfId: "_wf_root",
-    render: () => {
-    },
-    selfId: () => {
-    },
-    bumpCtxVersion: () => {
-    },
-    setMounting: () => {
-    },
-    endMounting: () => {
-    },
-    onUnmount: () => void 0,
-    // hooks no-op（组件 SSR 安全——不注册监听/定时器）
-    useChat: () => ({ messages: [], input: "", streaming: false, error: null, usage: null, step: null, send: () => {
-    }, stop: () => {
-    }, retry: () => {
-    }, clear: () => {
-    }, approve: () => {
-    }, subscribe: () => () => {
-    } }),
-    useExternal: (store) => store,
-    useMedia: noop,
-    useBreakpoint: noop,
-    usePopupPosition: () => ({ top: 0, left: 0, refresh: () => {
-    } }),
-    useHoverCapable: () => false,
-    useStableRef: (init) => (el) => {
-      if (el) init?.(el);
-    },
-    useVisualViewport: () => ({ height: 0, offsetTop: 0, keyboardOpen: false }),
-    usePopup: () => ({ open: false, setOpen: () => {
-    }, phase: "closed", sync: (open2) => open2 ? "open" : "closed", wrapProps: {}, portal: (content) => content, refresh: () => {
-    } }),
-    useLongPress: noopReturn,
-    useInView: () => ({ isIn: false, ready: false, observe: () => {
-    }, refresh: () => {
-    }, disconnect: () => {
-    } }),
-    useScrollPosition: () => ({ y: 0, refresh: () => {
-    } }),
-    useAsync: () => ({ data: void 0, loading: true, error: void 0, reload: () => {
-    } }),
-    useControlled: () => ({ value: void 0, setValue: () => {
-    }, controlled: false }),
-    useControlledInput: () => ({ value: void 0, setValue: () => {
-    }, keyword: "", setKeyword: () => {
-    }, selectedLabel: "", setSelectedLabel: () => {
-    }, controlled: false }),
-    useOpen: () => ({ open: false, setOpen: () => {
-    }, triggerProps: {} }),
-    usePresence: () => ({ phase: "closed", ref: () => {
-    }, sync: () => "closed" }),
-    useGlobalKey: () => () => {
-    },
-    useDrag: noopReturn,
-    useDragDrop: () => ({ dropProps: {}, dragProps: {} }),
-    useReducedMotion: () => true,
-    // SSR 无动画——组件直落终值
-    useAnimationEnd: () => () => {
-    },
-    useTween: (t) => {
-      let v = t;
-      return {
-        get value() {
-          return v;
-        },
-        set value(n) {
-          v = n;
-        },
-        reset: (n) => {
-          if (n !== void 0) v = n;
-          return v;
-        }
-      };
-    }
-  };
+var TO_HTML = {
+  hole: holeToHtml,
+  text: textToHtml,
+  arr: arrToHtml,
+  portal: portalToHtml,
+  frag: fragToHtml,
+  comp: compToHtml,
+  native: nativeToHtml
+};
+
+// src/ui-dom/vdom2/ssr.ts
+function serializeData(data) {
+  const json = JSON.stringify(Object.fromEntries(data)).replace(/</g, "\\u003c");
+  return `<script>window.__DATA__=${json};</script>`;
 }
 function createSsrContext(serverCtx, dataStore) {
   const ctx = {
     ...serverCtx,
-    ui: createSsrUi(),
-    browser: void 0
+    browser: null,
+    __registry: null,
+    ui: {
+      _rootVNodeId: null,
+      render: () => Promise.resolve(),
+      setMounting: () => {
+      },
+      endMounting: () => {
+      }
+    }
   };
   const dataCache = /* @__PURE__ */ new Map();
   ctx.data = {
@@ -3339,14 +3341,11 @@ function createSsrContext(serverCtx, dataStore) {
   };
   return ctx;
 }
-function serializeData(data) {
-  const json = JSON.stringify(Object.fromEntries(data)).replace(/</g, "\\u003c");
-  return `<script>window.__DATA__=${json};</script>`;
-}
 async function ssrToString(Comp, props, serverCtx, opts = {}) {
   const dataStore = opts.data ?? /* @__PURE__ */ new Map();
-  const ctx = createSsrContext(serverCtx, dataStore);
-  return renderSsr({ type: Comp, props: props ?? {}, key: void 0 }, ctx);
+  const ctx = createSsrContext(serverCtx ?? {}, dataStore);
+  const vnode = createVNode(Comp, props ?? {});
+  return x2html(vnode, ctx);
 }
 
 // src/ui/index.ts
@@ -4780,8 +4779,8 @@ function compileSelect(q) {
   if (q.where) sql += ` WHERE ${compileWhere(q.where, params)}`;
   for (const s of q.sub ?? []) {
     const sub = compileSelect(s.query);
-    const base = params.length + 1;
-    const subSql = sub.sql.replace(/\$(\d+)/g, (_m, n) => `$${base + Number(n) - 1}`);
+    const base2 = params.length + 1;
+    const subSql = sub.sql.replace(/\$(\d+)/g, (_m, n) => `$${base2 + Number(n) - 1}`);
     params.push(...sub.params);
     const op = s.type === "exists" ? s.not ? "NOT EXISTS" : "EXISTS" : s.not ? "NOT IN" : "IN";
     if (s.type === "exists") {
@@ -4865,8 +4864,8 @@ function isColOps(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v) && !isRaw(v);
 }
 function interpRaw(raw, params) {
-  const base = params.length;
-  const out = raw.__raw.replace(/\$(\d+)/g, (_m, n) => `$${base + Number(n)}`);
+  const base2 = params.length;
+  const out = raw.__raw.replace(/\$(\d+)/g, (_m, n) => `$${base2 + Number(n)}`);
   params.push(...raw.params);
   return out;
 }

package/dist/ui-dom/ai.d.ts

@@ -1,5 +1,5 @@
 /**
- * weifuwu/ui-dom AI 解码器 — 消费 wf: 协议（design/ai-contract.md）
+ * weifuwu/ui-dom AI 解码器 — 消费 wf: 协议（docs/ai-contract.md）
  *
  * 协议的前端参考实现：POST → 解析 SSE → 按事件名分发回调。
  *

package/dist/ui-dom/context.d.ts

@@ -0,0 +1,32 @@
+/**
+ * ui-dom/context — ctx 组装层（vdom2 纯引擎之上）
+ *
+ * 分层（vdom2 方案）：vdom2/ = 纯渲染引擎（改 vdom 不影响其他）；
+ * 本文件 = **context/hooks/中间件的组装**（改 hooks/ctx 不动 vdom 引擎）：
+ * - createVdomContext：组装完整 ctx.ui（render/selfId/onUnmount/bumpCtxVersion +
+ *   hooks 薄转发 + popup tracker + media registry）
+ * - mountRoot：组装入口（context + vdom2 纯引擎挂载）
+ *
+ * hooks 实现已在 src/ui-dom/hooks/（独立模块）——此处仅组装 HookEnv + 转发。
+ */
+import { type Registry, type Renderer, type MountHandle } from './vdom2/mount.ts';
+import type { BrowserEnv } from './types.ts';
+export interface MountOptions {
+    browser: BrowserEnv;
+    root: HTMLElement;
+    registry?: Registry;
+    renderer?: Renderer;
+    onError?: (e: unknown) => void;
+}
+export interface VdomContext {
+    ctx: any;
+    registry: Registry;
+    renderer: Renderer;
+    rootUi: any;
+    destroyPopupListeners: () => void;
+}
+/** 组装 vdom 渲染上下文（ctx.ui 完整能力 + hooks 转发 + popup tracker） */
+export declare function createVdomContext(opts: MountOptions): VdomContext;
+/** 组装入口：createVdomContext + vdom2 纯引擎挂载 */
+export declare function mountRoot(opts: MountOptions): MountHandle;
+export { mountCommand, unmountCommand, createCommandContainer } from './vdom2/mount.ts';

package/dist/ui-dom/index.d.ts

@@ -22,14 +22,14 @@ export type { AuthClient, AuthInjected } from './middleware/auth.ts';
 export { ws } from './middleware/ws.ts';
 export type { WsClient, WsInjected } from './middleware/ws.ts';
 export type { UIRequest, UIResponse, UIHandler, UIMiddleware, UIRouteDef, WfuiContext, } from './types.ts';
-export { uiServe } from './vdom/serve.ts';
-export type { UIServeOptions, UIServeHandle } from './vdom/serve.ts';
-export { patchValue } from './vdom/diff.ts';
-export { hydrateVNode } from './vdom/hydration.ts';
-export { ssrPage, ssrToString, serializeData } from './vdom/ssr.ts';
-export { mountRoot, createVdomContext, mountCommand, unmountCommand, createCommandContainer } from './vdom/mount.ts';
-export { buildVNode } from './vdom/build.ts';
-export { renderValue } from './vdom/render.ts';
-export { createRenderer, type Renderer } from './vdom/mount.ts';
+export { uiServe } from './middleware/serve.ts';
+export type { UIServeOptions, UIServeHandle } from './middleware/serve.ts';
+export { patchValue } from './vdom2/patch.ts';
+export { hydrateVNode } from './vdom2/hydrate.ts';
+export { ssrPage, ssrToString, serializeData, createSsrContext } from './vdom2/ssr.ts';
+export { buildVNode } from './vdom2/build.ts';
+export { renderValue } from './vdom2/render.ts';
+export { createRenderer, type Renderer } from './vdom2/mount.ts';
 export { createStore } from './store.ts';
+export { createVdomContext, mountRoot } from './context.ts';
 export type { ExternalStore } from './store.ts';