@mantou/gem 2.2.15 → 2.3.1

package/lib/store.d.ts

@@ -1,10 +1,5 @@
 import { type Updater } from './utils';
 export type Store<T = any> = Updater<T>;
-/** SSR 时当前请求中更新过的有 key 的 store，供 `@mantou/gem-ssr` 使用 */
-export declare const _getUpdatedStores: () => Map<any, any>;
-declare let restoreStore: ((key: string) => object | undefined) | undefined;
-/** 设置客户端恢复 store 的方法，供 `@mantou/gem-ssr` 使用 */
-export declare function _setStoreRestorer(restorer: typeof restoreStore): void;
 /**
  * 创建 store，`key` 用来在 SSR 时同步服务端的值，`swc-plugin-gem` 的 `ssr` 选项会为模块顶层的 store 自动添加
  */
@@ -22,5 +17,4 @@ export declare function createStore<T = any>(originStore: T, key?: string): ((va
     [Symbol.metadata]: never;
 }, keyof T> & T;
 export declare function connect(store: Store<any>, func: () => void): () => boolean | undefined;
-export {};
 //# sourceMappingURL=store.d.ts.map

package/lib/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/lib/store.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAEjF,MAAM,MAAM,KAAK,CAAC,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AAUxC,yDAAyD;AACzD,eAAO,MAAM,iBAAiB,qBAAwD,CAAC;AAGvF,QAAA,IAAI,YAAY,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;AAEpE,+CAA+C;AAC/C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,YAAY,QAE9D;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,CAAC,GAAG,GAAG,EAAE,WAAW,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,aAIzB,OAAO,CAAC,CAAC,CAAC;;;;;;;;;;;;gBAcjD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,IAAI,6BAK1D"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/lib/store.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAEjF,MAAM,MAAM,KAAK,CAAC,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AAOxC;;GAEG;AACH,wBAAgB,WAAW,CAAC,CAAC,GAAG,GAAG,EAAE,WAAW,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,aAIzB,OAAO,CAAC,CAAC,CAAC;;;;;;;;;;;;gBAYjD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,IAAI,6BAK1D"}

package/lib/store.js

@@ -1,18 +1,8 @@
-import { getRequestValue, isolate, isServer } from './server';
+import { getRequestValue, isolate, isServer, ssrHooks } from './server';
 import { addMicrotask, assignState, createUpdater } from './utils';
 /**@internal */
 export const _StoreListenerMap = new WeakMap();
 const createListeners = () => new Set();
-// SSR 时当前请求中更新过的有 key 的 store，渲染后输出到页面中
-const updatedStores = new Map();
-/** SSR 时当前请求中更新过的有 key 的 store，供 `@mantou/gem-ssr` 使用 */
-export const _getUpdatedStores = () => getRequestValue(updatedStores, () => new Map());
-// 客户端读取服务端渲染时 store 的值
-let restoreStore;
-/** 设置客户端恢复 store 的方法，供 `@mantou/gem-ssr` 使用 */
-export function _setStoreRestorer(restorer) {
-    restoreStore = restorer;
-}
 /**
  * 创建 store，`key` 用来在 SSR 时同步服务端的值，`swc-plugin-gem` 的 `ssr` 选项会为模块顶层的 store 自动添加
  */
@@ -26,13 +16,11 @@ export function createStore(originStore, key) {
             return;
         // SSR 时请求中添加的监听器只属于当前请求，其他请求更新 store 时不会触发
         getRequestValue(listeners, createListeners).forEach(addMicrotask);
-        const updated = _getUpdatedStores();
-        // 不在请求中时更新的是全局的值，客户端也一样
-        if (key && updated !== updatedStores)
-            updated.set(key, store);
+        if (key)
+            ssrHooks.updateStore?.(key, store);
     }));
-    if (key && restoreStore)
-        assignState(store, restoreStore(key));
+    if (key)
+        assignState(store, ssrHooks.createStore?.(key));
     _StoreListenerMap.set(store, listeners);
     return store;
 }

package/lib/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/lib/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAgB,MAAM,SAAS,CAAC;AAIjF,eAAe;AACf,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,OAAO,EAA+B,CAAC;AAE5E,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,IAAI,GAAG,EAAc,CAAC;AAEpD,wCAAwC;AACxC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAsB,CAAC;AAEpD,yDAAyD;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;AAEvF,uBAAuB;AACvB,IAAI,YAA+D,CAAC;AAEpE,+CAA+C;AAC/C,MAAM,UAAU,iBAAiB,CAAC,QAA6B;IAC7D,YAAY,GAAG,QAAQ,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CAAU,WAAc,EAAE,GAAY;IAC/D,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC;IACpC,kBAAkB;IAClB,MAAM,KAAK,GAAG,OAAO,CACnB,aAAa,CAAC,WAAW,EAAE,CAAC,KAAkB,EAAE,EAAE;QAChD,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1B,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,2CAA2C;QAC3C,eAAe,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;QACpC,wBAAwB;QACxB,IAAI,GAAG,IAAI,OAAO,KAAK,aAAa;YAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC,CAAC,CACH,CAAC;IACF,IAAI,GAAG,IAAI,YAAY;QAAE,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,KAAiB,EAAE,IAAgB;IACzD,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,cAAc,IAAI,eAAe,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IACrF,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IACrB,OAAO,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/lib/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAgB,MAAM,SAAS,CAAC;AAIjF,eAAe;AACf,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,OAAO,EAA+B,CAAC;AAE5E,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,IAAI,GAAG,EAAc,CAAC;AAEpD;;GAEG;AACH,MAAM,UAAU,WAAW,CAAU,WAAc,EAAE,GAAY;IAC/D,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC;IACpC,kBAAkB;IAClB,MAAM,KAAK,GAAG,OAAO,CACnB,aAAa,CAAC,WAAW,EAAE,CAAC,KAAkB,EAAE,EAAE;QAChD,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1B,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,2CAA2C;QAC3C,eAAe,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAClE,IAAI,GAAG;YAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC,CACH,CAAC;IACF,IAAI,GAAG;QAAE,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,KAAiB,EAAE,IAAgB;IACzD,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,cAAc,IAAI,eAAe,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IACrF,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IACrB,OAAO,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC"}

package/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/lib/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/lib/utils.ts"],"names":[],"mappings":"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"}

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "2.2.15";
+export declare const version = "2.3.1";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/lib/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/lib/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAC"}

package/lib/version.js

@@ -1,2 +1,2 @@
-export const version = '2.2.15';
+export const version = '2.3.1';
 //# sourceMappingURL=version.js.map

package/lib/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/lib/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/lib/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mantou/gem",
-  "version": "2.2.15",
-  "description": "💎 使用自定义元素的轻量级 WebApp 开发框架",
+  "version": "2.3.1",
+  "description": "💎 Build reusable custom elements and web apps on Web Components",
   "keywords": [
     "frontend",
     "web components",
@@ -31,17 +31,16 @@
   ],
   "typings": "index.d.ts",
   "scripts": {
-    "docs": "cross-env GEM_BOOK_REPLACE=true gem-book docs",
-    "docs:remote": "pnpm run docs",
-    "build:docs": "pnpm run docs --build",
-    "build:module": "tsc -p tsconfig.build.json",
+    "docs": "gem-book docs",
+    "build:docs": "gem-book build docs",
+    "build:module": "tsrs -p tsconfig.build.json",
     "build:lib": "rslib build",
     "build": "pnpm build:module && pnpm build:lib",
     "start": "pnpm build:module --watch",
     "test": "cross-env wtr"
   },
   "devDependencies": {
-    "@gemjs/config": "^2.1.3",
+    "@gemjs/config": "^2.1.4",
     "@rslib/core": "^0.23.0",
     "@swc/helpers": "^0.5.23",
     "@types/chai": "^5.0.0",
@@ -51,7 +50,7 @@
     "@web/test-runner": "^0.18.1",
     "chai": "^5.1.1",
     "rimraf": "^3.0.2",
-    "typescript": "^5.6.2"
+    "tsrs": "^0.18.0-ts7.1.0-dev.20260929"
   },
   "author": "mantou132",
   "license": "MIT",

package/src/elements/base/modal-factory.ts

@@ -1,9 +1,27 @@
 import { aria, mounted, shadow } from '../../lib/decorators';
 import { history } from '../../lib/history';
 import { GemElement } from '../../lib/reactive';
+import type { Store } from '../../lib/store';
 import { connect, createStore } from '../../lib/store';
 
 const open = Symbol('open mark');
+// 静态方法返回不可伪造的值，防止子类覆盖
+const final = Symbol();
+
+type ModalElement = GemElement & { label: string };
+
+export interface ModalClass<T> extends Omit<typeof GemElement, 'prototype'> {
+  new (): ModalElement;
+  prototype: ModalElement;
+  inertStore: HTMLElement[];
+  instance: GemElement | null;
+  store: Store<{ [open]: boolean } & T>;
+  readonly isOpen: boolean;
+  open(opts: T): typeof final;
+  close(): typeof final;
+  closeHandle(): typeof final;
+  shouldClose(): boolean;
+}
 
 /**
  * 需要使用范型，所以导出一个函数，用来*创建*类似 Confirm 元素的基类;
@@ -13,9 +31,7 @@ const open = Symbol('open mark');
  * 使用 `mounted`/`unmounted` 定义 `open`/`close` 回调;
  * 模拟 top layer：https://github.com/whatwg/html/issues/4633.
  */
-export function createModalClass<T extends Record<string, unknown>>(options: T) {
-  const final = Symbol();
-
+export function createModalClass<T extends Record<string, unknown>>(options: T): ModalClass<T> {
   @shadow()
   @aria({ role: 'alertdialog', ariaModal: 'true' })
   class ModalElement extends GemElement {
@@ -40,7 +56,7 @@ export function createModalClass<T extends Record<string, unknown>>(options: T)
      * 自带 100ms 延迟，以允许在其他 Dialog 的 `shouldClose` 中调用此方法;
      * 浏览器 history 为异步 API，需要设置较长延迟;
      */
-    static open(opts: T) {
+    static open(opts: T): typeof final {
       const instance = new this();
       this.instance = instance;
       this.inertStore = ([...document.body.children] as HTMLElement[]).filter((e) => !e.inert);
@@ -63,7 +79,7 @@ export function createModalClass<T extends Record<string, unknown>>(options: T)
      * @final
      * UI 中执行关闭
      */
-    static close() {
+    static close(): typeof final {
       history.back();
       return final;
     }
@@ -72,7 +88,7 @@ export function createModalClass<T extends Record<string, unknown>>(options: T)
      * @final
      * history 中自动调用
      */
-    static closeHandle() {
+    static closeHandle(): typeof final {
       this.inertStore.forEach((e) => (e.inert = false));
       this.instance?.remove();
       this.store({ [open]: false, ...options });

package/src/elements/base/reflect.ts

@@ -1,9 +1,8 @@
 /**
- * - 预渲染可能造成重复的元素，在序列化时可以用正则移除 GemReflectElement 渲染的从开始到结束连续的元素
- * - `replaceAll(/<!--gem-reflect-start-->.*?<!--gem-reflect-end-->/gs, '')`
+ * 把子节点移动到 `target`（默认 `document.head`）中，用开始和结束注释标记这些节点，
+ * 修改 `target` 或者卸载时一起移动或移除
  *
- * 不能在在顶级代码块中清除这些元素，因为重复加载该代码时会把正常 reflect 元素清除，
- * 比如 duoyun-ui 文档站加载示例元素时把 GemReflectElement 渲染的元素清除
+ * 服务端渲染时不执行 effect，客户端水合后才移动，使用 `getLogicalParent` 从被移动的节点找到 reflect 元素
  */
 
 import { attribute, effect, property, willMount } from '../../lib/decorators';
@@ -25,6 +24,31 @@ const getReflectFragment = (startNode: Comment) => {
   return result;
 };
 
+// 移动到的目标元素和片段开始注释对应的 reflect 元素，向上查找元素时跨越 reflect
+const targets = new WeakSet<Node>();
+const startNodes = new WeakMap<Node, GemReflectElement>();
+
+// 向前查找片段的开始注释，遇到其他片段的结束注释时不在片段中
+const getReflectElement = (node: Node) => {
+  for (let n = node.previousSibling; n; n = n.previousSibling) {
+    const ele = startNodes.get(n);
+    if (ele) return ele;
+    if (n.nodeValue === END) return;
+  }
+};
+
+/**
+ * 节点的逻辑父元素：被 reflect 移动的节点是 reflect 元素，ShadowRoot 中顶层的节点是宿主，其他是父元素
+ */
+export function getLogicalParent(node: Node): Element | null {
+  const parent = node.parentNode;
+  if (parent && targets.has(parent)) {
+    const ele = getReflectElement(node);
+    if (ele) return ele;
+  }
+  return parent instanceof ShadowRoot ? parent.host : node.parentElement;
+}
+
 export class GemReflectElement extends GemElement {
   @attribute method: 'prepend' | 'append';
 
@@ -45,6 +69,8 @@ export class GemReflectElement extends GemElement {
 
   @effect((i) => [i.target])
   #changeTarget = () => {
+    targets.add(this.target);
+    startNodes.set(this.#startNode, this);
     (this.#childNodes || [this.#startNode, ...this.childNodes, this.#endNode]).forEach((node, index, arr) => {
       const prev = arr[index - 1];
       if (prev) {

package/src/elements/base/route.ts

@@ -9,32 +9,54 @@ import { connect, createStore } from '../../lib/store';
 import type { QueryString } from '../../lib/utils';
 import { addListener } from '../../lib/utils';
 
+type Params = Record<string, string>;
+type Matcher = (path: string) => Params | null | undefined;
+
 const UNNAMED_PARAM_PREFIX = '_';
 
-// '/test/:a' /^\/test\/(?<a>[^/]+)$/i
-// '/test/:a/b' /^\/test\/?<a>([^/]+)\/b$/i
-// '/test/*' /^\/test\/(?<_0>.*)$/i
-// '/test/:a/*' /^\/test\/(?<a>[^/]+)\/(?<_0>.*)$/i
-// '/test/*/:b /^\/test\/(?<_0>.*)\/(?<a>[^/]+)$/i
-class ParamsRegExp extends RegExp {
-  constructor(pattern: string) {
-    let i = 0;
-    super(
-      `^${pattern.replace(/((:[^/$]+)|(\*))/g, (_m, name: string) => {
-        if (name === '*') return `(?<${UNNAMED_PARAM_PREFIX}${i++}>.*)`;
-        return `(?<${name.slice(1)}>[^/]+)`;
-      })}$`,
-    );
-  }
+// 不支持 `URLPattern` 时转换成正则
+// '/test/:a' /^\/test\/(?<a>[^/]+)$/
+// '/test/:a/b' /^\/test\/(?<a>[^/]+)\/b$/
+// '/test/*' /^\/test\/(?<_0>.*)$/
+// '/test/:a/*' /^\/test\/(?<a>[^/]+)\/(?<_0>.*)$/
+// '/test/*/:b' /^\/test\/(?<_0>.*)\/(?<b>[^/]+)$/
+function createRegExpMatcher(pattern: string): Matcher {
+  let i = 0;
+  const source = pattern.replace(/:[^/$]+|\*/g, (name) =>
+    name === '*' ? `(?<${UNNAMED_PARAM_PREFIX}${i++}>.*)` : `(?<${name.slice(1)}>[^/]+)`,
+  );
+  const reg = new RegExp(`^${source}$`);
+  return (path) => {
+    const result = path.match(reg);
+    if (!result) return null;
+    const params: Params = {};
+    for (const key in result.groups) {
+      params[key.startsWith(UNNAMED_PARAM_PREFIX) ? key.slice(1) : key] = result.groups[key];
+    }
+    return params;
+  };
 }
 
-type Params = Record<string, string>;
-declare global {
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=1731418
-  // https://github.com/WebKit/standards-positions/issues/61
-  var URLPattern: any;
+// pattern 开头不含参数和特殊字符的部分
+const LITERAL_PREFIX = /^[\w\-./~]*/;
+
+// `URLPattern` 的创建和 `exec` 都比较慢，不含参数时直接比较，否则先检查固定的开头
+function createMatcher(pattern: string): Matcher {
+  const literal = LITERAL_PREFIX.exec(pattern)![0];
+  if (literal === pattern) return (path) => (path === pattern ? {} : null);
+  // 根 layout 的 pattern
+  if (pattern === '*') return (path) => ({ 0: path });
+  if (!globalThis.URLPattern) return createRegExpMatcher(pattern);
+  const urlPattern = new URLPattern({ pathname: pattern });
+  // 参数前的 `/` 可能是可选的，例如 `/a/:b?` 匹配 `/a`
+  const prefix = literal.replace(/\/$/, '');
+  return (path) =>
+    path.startsWith(prefix) ? (urlPattern.exec({ pathname: path })?.pathname.groups as Params | undefined) : null;
 }
 
+// pattern 来自路由定义，数量有限
+const matchers = new Map<string, Matcher>();
+
 /**
  * - 大小写敏感
  * - 匹配成功时返回 params
@@ -49,22 +71,9 @@ declare global {
  * ```
  */
 export function matchPath(pattern: string, path: string) {
-  if (globalThis.URLPattern) {
-    const urLPattern = new URLPattern({ pathname: pattern });
-    const matchResult = urLPattern.exec({ pathname: path }) || urLPattern.exec({ pathname: `${path}/` });
-    if (!matchResult) return null;
-    return matchResult.pathname.groups as Params;
-  }
-  const reg = new ParamsRegExp(pattern);
-  const matchResult = path.match(reg) || `${path}/`.match(reg);
-  if (!matchResult) return null;
-  const params: Params = {};
-  if (matchResult.groups) {
-    Object.entries(matchResult.groups).forEach(([key, value]) => {
-      params[key.startsWith(UNNAMED_PARAM_PREFIX) ? key.slice(1) : key] = value;
-    });
-  }
-  return params;
+  let match = matchers.get(pattern);
+  if (!match) matchers.set(pattern, (match = createMatcher(pattern)));
+  return match(path) || match(`${path}/`) || null;
 }
 
 export interface RouteItem<T = unknown> {
@@ -79,7 +88,7 @@ export interface RouteItem<T = unknown> {
   getContent?: (
     params: Params,
     renderRoot: DocumentFragment | GemLightRouteElement,
-  ) => TemplateResult | Promise<TemplateResult> | undefined | Promise<undefined>;
+  ) => TemplateResult | undefined | Promise<TemplateResult | undefined>;
   title?: string;
   // 用来传递数据
   data?: T;
@@ -130,6 +139,9 @@ export type RouteTrigger = {
 
 const scrollPositionMap = new Map<string, number>();
 
+// 导航到了新的历史记录，前进、后退和页面加载时为 `false`
+let pushed = false;
+
 @light({ penetrable: true })
 export class GemLightRouteElement extends GemElement {
   @boolattribute transition: boolean;
@@ -148,8 +160,13 @@ export class GemLightRouteElement extends GemElement {
   @emitter routechange: Emitter<RouteItem | null>; // path 改变或者 key 改变，包含初始渲染
   @emitter error: Emitter<any>;
 
-  /**自动让滚动容器恢复滚动位置 */
-  @property scrollContainer?: HTMLElement | (() => HTMLElement);
+  /**
+   * 自动让滚动容器恢复滚动位置，导航到新的历史记录时滚动到顶部，
+   * 函数返回空值时不处理当前路由，例如只有子路由渲染后才需要滚动
+   */
+  @property scrollContainer?: Element | (() => Element | null | undefined);
+  /**恢复滚动位置前等待，例如等待异步加载的内容撑开滚动容器 */
+  @property scrollWait?: () => Promise<unknown>;
   /**默认当有 `hash` 时不进行滚动 */
   @property scrollIgnoreHash?: boolean;
 
@@ -205,14 +222,24 @@ export class GemLightRouteElement extends GemElement {
     });
   };
 
-  #updateScrollContainerPosition = () => {
-    if (!this.#scrollContainer) return;
-    const scrollTop = scrollPositionMap.get(history.currentKey);
-    if (scrollTop) {
-      this.#scrollContainer.scroll(0, scrollTop);
-    } else if (this.scrollIgnoreHash || !history.getParams().hash) {
-      this.#scrollContainer.scroll(0, 0);
+  // 已经处理过滚动的历史记录，同一条历史记录重新渲染时保持滚动位置
+  #scrolledKey?: string;
+
+  #updateScrollContainerPosition = async () => {
+    const container = this.#scrollContainer;
+    const key = history.currentKey;
+    if (!container || key === this.#scrolledKey) return;
+    this.#scrolledKey = key;
+    const scrollTop = scrollPositionMap.get(key);
+    if (!pushed && scrollTop !== undefined) {
+      await this.scrollWait?.();
+      // 等待时可能已经导航
+      if (key === history.currentKey) container.scroll(0, scrollTop);
+      return;
     }
+    // 前进、后退或者页面加载时位置未知（例如刷新后），保持浏览器恢复的位置，浏览器只恢复文档的滚动位置
+    if (!pushed && container === document.scrollingElement) return;
+    if (this.scrollIgnoreHash || !history.getParams().hash) container.scroll(0, 0);
   };
 
   #lastLoader?: TemplateResult | Promise<TemplateResult | undefined>;
@@ -239,10 +266,13 @@ export class GemLightRouteElement extends GemElement {
 
   @effect((i) => [i.scrollContainer])
   #rememberScrollPosition = () => {
-    if (!this.#scrollContainer) return;
-    return addListener(history, 'beforechange', () =>
-      scrollPositionMap.set(history.currentKey, this.#scrollContainer!.scrollTop),
-    );
+    if (!this.scrollContainer) return;
+    return addListener(history, 'beforechange', () => {
+      // 前进和后退时浏览器的历史记录已经改变，Gem 的还没有改变
+      pushed = globalThis.history.state?.$key === history.currentKey;
+      const container = this.#scrollContainer;
+      if (container) scrollPositionMap.set(history.currentKey, container.scrollTop);
+    });
   };
 
   // history or i18n