@mantou/gem 1.3.6 → 1.5.1

package/elements/route.js

@@ -15,8 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _GemRouteElement_href, _GemRouteElement_key, _GemRouteElement_redirect, _GemRouteElement_isLight, _GemRouteElement_initPage, _GemRouteElement_callback;
-import { html, GemElement, customElement, connectStore, property, emitter, history, titleStore, updateStore, addMicrotaskToStack, } from '../';
+var _GemRouteElement_lastLoader, _GemRouteElement_updateLocationStore, _GemRouteElement_setContent;
+var GemRouteElement_1;
+import { html, GemElement, customElement, connectStore, property, emitter, history, titleStore, updateStore, createStore, } from '../';
+// TODO: use `URLPattern`
 class ParamsRegExp extends RegExp {
     constructor(pattern) {
         const namePosition = {};
@@ -30,13 +32,13 @@ class ParamsRegExp extends RegExp {
         this.namePosition = namePosition;
     }
 }
-function getReg(pattern) {
-    return new ParamsRegExp(pattern);
-}
 // `/a/b/:c/:d` `/a/b/1/2`
-function getParams(pattern, path) {
-    const reg = getReg(pattern);
-    const matchResult = path.match(reg);
+// 匹配成功时返回 params
+export function matchPath(pattern, path) {
+    const reg = new ParamsRegExp(pattern);
+    const matchResult = path.match(reg) || `${path}/`.match(reg);
+    if (!matchResult)
+        return null;
     const params = {};
     if (matchResult) {
         Object.keys(reg.namePosition).forEach((name) => {
@@ -45,9 +47,6 @@ function getParams(pattern, path) {
     }
     return params;
 }
-export function isMatch(pattern, path) {
-    return !!path.match(getReg(pattern)) || !!`${path}/`.match(getReg(pattern));
-}
 // 从路由创建路径
 // 不包含 basePath
 export function createPath(route, options) {
@@ -66,119 +65,141 @@ export function createHistoryParams(route, options) {
 }
 /**
  * @customElement gem-route
+ * @attr inert 暂停路由更新
  * @fires change
+ * @fires error
+ * @fires loading
  */
-let GemRouteElement = class GemRouteElement extends GemElement {
+let GemRouteElement = GemRouteElement_1 = class GemRouteElement extends GemElement {
     constructor({ isLight, routes } = {}) {
         super({ isLight });
-        _GemRouteElement_href.set(this, void 0); // 用于内部比较
-        _GemRouteElement_key.set(this, void 0); // 用于内部比较
-        _GemRouteElement_redirect.set(this, void 0);
-        _GemRouteElement_isLight.set(this, void 0);
-        _GemRouteElement_initPage.set(this, () => {
-            var _a;
-            const title = (_a = this.currentRoute) === null || _a === void 0 ? void 0 : _a.title;
-            if (title) {
-                updateStore(titleStore, { title });
+        // 当前匹配的路由的 params
+        this.currentParams = {};
+        _GemRouteElement_lastLoader.set(this, void 0);
+        this.state = {
+            content: undefined,
+        };
+        _GemRouteElement_updateLocationStore.set(this, () => {
+            if (this.locationStore) {
+                const { path, query, data } = history.getParams();
+                updateStore(this.locationStore, {
+                    path,
+                    params: this.currentParams,
+                    query,
+                    data,
+                });
             }
         });
-        _GemRouteElement_callback.set(this, () => {
-            this.currentRoute = null;
-            return html ``;
+        _GemRouteElement_setContent.set(this, (route, params, content) => {
+            __classPrivateFieldSet(this, _GemRouteElement_lastLoader, undefined, "f");
+            this.currentRoute = route;
+            this.currentParams = params;
+            this.setState({ content });
+            this.change(this.currentRoute);
+            const title = route === null || route === void 0 ? void 0 : route.title;
+            if (title)
+                updateStore(titleStore, { title });
+            __classPrivateFieldGet(this, _GemRouteElement_updateLocationStore, "f").call(this);
         });
-        __classPrivateFieldSet(this, _GemRouteElement_isLight, isLight, "f");
         this.routes = routes;
-        const { path, query } = history.getParams();
-        __classPrivateFieldSet(this, _GemRouteElement_href, path + query, "f");
     }
-    // 获取当前匹配的路由的 params
-    getParams() {
-        return this.currentRoute ? getParams(this.currentRoute.pattern, history.getParams().path) : {};
+    mounted() {
+        this.effect(([_, path]) => {
+            const { route, params = {} } = GemRouteElement_1.findRoute(this.routes, path);
+            const { redirect, content, getContent } = route || {};
+            if (redirect) {
+                history.replace({ path: redirect });
+                return;
+            }
+            const contentOrLoader = content || (getContent === null || getContent === void 0 ? void 0 : getContent(params));
+            if (contentOrLoader instanceof Promise) {
+                this.loading(route);
+                __classPrivateFieldSet(this, _GemRouteElement_lastLoader, contentOrLoader, "f");
+                const isSomeLoader = () => __classPrivateFieldGet(this, _GemRouteElement_lastLoader, "f") === contentOrLoader;
+                contentOrLoader
+                    .then((content) => {
+                    if (isSomeLoader())
+                        __classPrivateFieldGet(this, _GemRouteElement_setContent, "f").call(this, route, params, content);
+                })
+                    .catch((err) => {
+                    if (isSomeLoader())
+                        this.error(err);
+                });
+                return;
+            }
+            __classPrivateFieldGet(this, _GemRouteElement_setContent, "f").call(this, route, params, contentOrLoader);
+        }, () => {
+            const { path } = history.getParams();
+            return [this.key, path];
+        });
+        this.effect(__classPrivateFieldGet(this, _GemRouteElement_updateLocationStore, "f"), () => [location.search]);
     }
     shouldUpdate() {
         if (this.inert)
             return false;
-        const { path, query } = history.getParams();
-        const href = path + query;
-        if (href !== __classPrivateFieldGet(this, _GemRouteElement_href, "f") || this.key !== __classPrivateFieldGet(this, _GemRouteElement_key, "f")) {
-            __classPrivateFieldSet(this, _GemRouteElement_href, href, "f");
-            __classPrivateFieldSet(this, _GemRouteElement_key, this.key, "f");
-            return true;
-        }
-        return false;
+        return true;
     }
     render() {
-        if (!this.routes)
-            return __classPrivateFieldGet(this, _GemRouteElement_callback, "f").call(this);
-        const { path } = history.getParams();
-        this.currentRoute = null;
-        let defaultRoute = null;
-        let routes;
-        if (this.routes instanceof Array) {
-            routes = this.routes;
-        }
-        else {
-            routes = Object.values(this.routes);
-        }
-        for (const item of routes) {
-            const { pattern } = item;
-            if ('*' === pattern) {
-                defaultRoute = item;
-            }
-            else if (isMatch(pattern, path)) {
-                this.currentRoute = item;
-                break;
-            }
-        }
-        if (!this.currentRoute) {
-            this.currentRoute = defaultRoute;
-        }
-        if (!this.currentRoute)
-            return __classPrivateFieldGet(this, _GemRouteElement_callback, "f").call(this);
-        const { redirect, content, getContent } = this.currentRoute;
-        if (redirect) {
-            __classPrivateFieldSet(this, _GemRouteElement_redirect, true, "f");
-            history.replace({ path: redirect });
-            // 不要渲染空内容，等待重定向结果
-            return undefined;
-        }
-        __classPrivateFieldSet(this, _GemRouteElement_redirect, false, "f");
+        const { content } = this.state;
+        if (!this.shadowRoot)
+            return html `${content}`;
         return html `
-      ${__classPrivateFieldGet(this, _GemRouteElement_isLight, "f")
-            ? ''
-            : html `
-            <style>
-              :host,
-              :not(:defined) {
-                display: contents;
-              }
-            </style>
-          `}
-      ${content || (getContent === null || getContent === void 0 ? void 0 : getContent(this.getParams()))}
+      <style>
+        :host,
+        :not(:defined) {
+          display: contents;
+        }
+      </style>
+      ${content}
     `;
     }
-    mounted() {
-        __classPrivateFieldSet(this, _GemRouteElement_key, this.key, "f");
-        addMicrotaskToStack(__classPrivateFieldGet(this, _GemRouteElement_initPage, "f"));
+};
+_GemRouteElement_lastLoader = new WeakMap(), _GemRouteElement_updateLocationStore = new WeakMap(), _GemRouteElement_setContent = new WeakMap();
+GemRouteElement.createLocationStore = () => {
+    const { path, query, data } = history.getParams();
+    return createStore({ path, query, data, params: {} });
+};
+GemRouteElement.findRoute = (target = [], path) => {
+    let defaultRoute = null;
+    let routes;
+    if (target instanceof Array) {
+        routes = target;
     }
-    updated() {
-        __classPrivateFieldGet(this, _GemRouteElement_initPage, "f").call(this);
-        if (!__classPrivateFieldGet(this, _GemRouteElement_redirect, "f")) {
-            this.change(this.currentRoute);
+    else {
+        routes = Object.values(target);
+    }
+    for (const route of routes) {
+        if ('*' === route.pattern) {
+            defaultRoute = route;
+        }
+        else {
+            const params = matchPath(route.pattern, path);
+            if (params) {
+                return { route, params };
+            }
         }
     }
+    return { route: defaultRoute };
 };
-_GemRouteElement_href = new WeakMap(), _GemRouteElement_key = new WeakMap(), _GemRouteElement_redirect = new WeakMap(), _GemRouteElement_isLight = new WeakMap(), _GemRouteElement_initPage = new WeakMap(), _GemRouteElement_callback = new WeakMap();
 __decorate([
     property
 ], GemRouteElement.prototype, "routes", void 0);
+__decorate([
+    property
+], GemRouteElement.prototype, "locationStore", void 0);
 __decorate([
     property
 ], GemRouteElement.prototype, "key", void 0);
 __decorate([
     emitter
 ], GemRouteElement.prototype, "change", void 0);
-GemRouteElement = __decorate([
+__decorate([
+    emitter
+], GemRouteElement.prototype, "loading", void 0);
+__decorate([
+    emitter
+], GemRouteElement.prototype, "error", void 0);
+GemRouteElement = GemRouteElement_1 = __decorate([
     connectStore(history.store),
     customElement('gem-route')
 ], GemRouteElement);

package/elements/route.js.map

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

package/elements/use.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../src/elements/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA4C,MAAM,KAAK,CAAC;AAE3E;;;;;;;;;GASG;AACH,qBACa,aAAc,SAAQ,UAAU;IAChC,QAAQ,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,OAAO,CAAC;IAExD,OAAO,CAAC,UAAU;IAalB,MAAM;CAkBP"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../src/elements/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA4C,MAAM,KAAK,CAAC;AAG3E;;;;;;;;;GASG;AACH,qBACa,aAAc,SAAQ,UAAU;IAChC,QAAQ,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,OAAO,CAAC;IAExD,OAAO,CAAC,UAAU;IAiBlB,MAAM;CAmBP"}

package/elements/use.js

@@ -5,6 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { GemElement, html, attribute, property, customElement } from '../';
+const eleCache = new Map();
 /**
  * svg 中的 `<use>` 不能穿透 ShadowDOM,
  * 此元素用来模拟 `<use>`,
@@ -18,13 +19,17 @@ import { GemElement, html, attribute, property, customElement } from '../';
 let GemUseElement = class GemUseElement extends GemElement {
     getContent() {
         const ele = this.element || (this.selector ? (this.root || document).querySelector(this.selector) : null);
-        if (ele instanceof HTMLTemplateElement) {
-            return ele.content.cloneNode(true);
+        if (typeof ele === 'string') {
+            let temp = eleCache.get(ele);
+            if (!temp) {
+                temp = document.createElement('template');
+                temp.innerHTML = ele;
+                eleCache.set(ele, temp);
+            }
+            return temp.content.cloneNode(true);
         }
-        else if (typeof ele === 'string') {
-            const temp = document.createElement('template');
-            temp.innerHTML = ele;
-            return temp.content;
+        else if (ele instanceof HTMLTemplateElement) {
+            return ele.content.cloneNode(true);
         }
         else {
             return ele === null || ele === void 0 ? void 0 : ele.cloneNode(true);
@@ -38,6 +43,7 @@ let GemUseElement = class GemUseElement extends GemElement {
         }
         :host(:not([hidden])) {
           display: inline-flex;
+          align-items: center;
         }
         svg {
           width: 100%;

package/elements/use.js.map

@@ -1 +1 @@
-{"version":3,"file":"use.js","sourceRoot":"","sources":["../src/elements/use.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAE3E;;;;;;;;;GASG;AAEH,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,UAAU;IAKnC,UAAU;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1G,IAAI,GAAG,YAAY,mBAAmB,EAAE;YACtC,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACpC;aAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAClC,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;YACrB,OAAO,IAAI,CAAC,OAAO,CAAC;SACrB;aAAM;YACL,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS,CAAC,IAAI,CAAC,CAAC;SAC7B;IACH,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAA;;;;;;;;;;;;;QAaP,IAAI,CAAC,UAAU,EAAE;;KAEpB,CAAC;IACJ,CAAC;CACF,CAAA;AAnCY;IAAV,SAAS;+CAAkB;AAClB;IAAT,QAAQ;2CAA4C;AAC3C;IAAT,QAAQ;8CAA+C;AAH7C,aAAa;IADzB,aAAa,CAAC,SAAS,CAAC;GACZ,aAAa,CAoCzB;SApCY,aAAa"}
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../src/elements/use.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAE3E,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;AACxD;;;;;;;;;GASG;AAEH,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,UAAU;IAKnC,UAAU;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1G,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,IAAI,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,CAAC,IAAI,EAAE;gBACT,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC1C,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;gBACrB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;aACzB;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACrC;aAAM,IAAI,GAAG,YAAY,mBAAmB,EAAE;YAC7C,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACpC;aAAM;YACL,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS,CAAC,IAAI,CAAC,CAAC;SAC7B;IACH,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAA;;;;;;;;;;;;;;QAcP,IAAI,CAAC,UAAU,EAAE;;KAEpB,CAAC;IACJ,CAAC;CACF,CAAA;AAxCY;IAAV,SAAS;+CAAkB;AAClB;IAAT,QAAQ;2CAA4C;AAC3C;IAAT,QAAQ;8CAA+C;AAH7C,aAAa;IADzB,aAAa,CAAC,SAAS,CAAC;GACZ,aAAa,CAyCzB;SAzCY,aAAa"}

package/helper/i18n.d.ts

@@ -52,7 +52,7 @@ export declare class I18n<T = Record<string, Msg>> {
      *
      * html`
      *  <gem-reflect>
-     *    <script type="gem-i18n">${JSON.stringify(i18n)}</script>
+     *    <script type="${i18n.cachePrefix}">${JSON.stringify(i18n)}</script>
      *  </gem-reflect>
      * `
      */

package/helper/i18n.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../src/helper/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAQ,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAUtD,aAAK,GAAG,GACJ;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,GACD,MAAM,CAAC;AAEX,oBAAY,QAAQ,CAAC,CAAC,IAAI;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CACjC,CAAC;AAEF,UAAU,SAAS,CAAC,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;CACpC;AAED,UAAU,OAAO,CAAC,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IAEzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,aAAa,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,GAAG,MAAM,CAAC;IAC1D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAED,qBAAa,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACvC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3B,WAAW,SAAc;IACzB,aAAa,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,GAAG,MAAM,CAAC;IAC1D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,IAAI,CAAC;IAE7C,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAElB,IAAI,eAAe,WAElB;IAED,IAAI,aAAa,uBAchB;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAIpB;gBAEW,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IA6B/B,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,cAAc,CAAC,GAAG,MAAM,CAAC,EAAE;IAmBrE,cAAc;IAUR,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqDhD,aAAa;IASb,QAAQ;IAIR;;;;;;;;;;OAUG;IACH,MAAM;;;;CAMP"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../src/helper/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAQ,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAUtD,aAAK,GAAG,GACJ;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,GACD,MAAM,CAAC;AAEX,oBAAY,QAAQ,CAAC,CAAC,IAAI;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CACjC,CAAC;AAEF,UAAU,SAAS,CAAC,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;CACpC;AAED,UAAU,OAAO,CAAC,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IAEzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAG3B,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,aAAa,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,GAAG,MAAM,CAAC;IAC1D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAED,qBAAa,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACvC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3B,WAAW,SAAc;IACzB,aAAa,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,GAAG,MAAM,CAAC;IAC1D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,IAAI,CAAC;IAE7C,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAElB,IAAI,eAAe,WAElB;IAED,IAAI,aAAa,uBAchB;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAIpB;gBAEW,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IA6B/B,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,cAAc,CAAC,GAAG,MAAM,CAAC,EAAE;IAmBrE,cAAc;IAUR,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqDhD,aAAa;IASb,QAAQ;IAIR;;;;;;;;;;OAUG;IACH,MAAM;;;;CAMP"}

package/helper/i18n.js

@@ -18,14 +18,14 @@ const matchReg = /\$(\d)(<([^>]*)>)?/g;
 const matchStrIndex = 3;
 export class I18n {
     constructor(options) {
-        this.cachePrefix = 'gem@i18n';
+        this.cachePrefix = 'gem-i18n';
         if (!options.resources[options.fallbackLanguage]) {
             throw new GemError('i18n: fallbackLanguage invalid');
         }
         this.store = createStore(this);
         Object.assign(this, options);
         let currentLanguage = this.urlParamsLang || this.currentLanguage || this.cacheLang;
-        const ele = document.querySelector('[type*=gem-i18n]');
+        const ele = document.querySelector(`[type*=${this.cachePrefix}]`);
         if (ele) {
             try {
                 const prerenderData = JSON.parse(ele.textContent || '');
@@ -109,16 +109,16 @@ export class I18n {
                 return this.resetLanguage();
             }
             if (typeof data === 'string') {
-                const { href, origin, pathname } = new URL(data, location.href);
-                const localKey = `${this.cachePrefix}:${href}`;
+                const prefix = `${this.cachePrefix}:`;
+                const localKey = `${prefix}${data}`;
                 const localPackString = localStorage.getItem(localKey);
                 const fetchPack = () => __awaiter(this, void 0, void 0, function* () {
                     const pack = yield (yield fetch(data)).json();
                     if (this.cache) {
-                        // 移除之前的版本缓存，只有使用 querystring 标记版本才有效
+                        // 移除之前的版本缓存
                         for (let i = 0; i < localStorage.length; i++) {
                             const key = localStorage.key(i);
-                            if (key.startsWith(`${this.cachePrefix}:${origin}${pathname}?`)) {
+                            if (key.startsWith(prefix)) {
                                 localStorage.removeItem(key);
                             }
                         }
@@ -171,7 +171,7 @@ export class I18n {
      *
      * html`
      *  <gem-reflect>
-     *    <script type="gem-i18n">${JSON.stringify(i18n)}</script>
+     *    <script type="${i18n.cachePrefix}">${JSON.stringify(i18n)}</script>
      *  </gem-reflect>
      * `
      */

package/helper/i18n.js.map

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

package/lib/element.d.ts

@@ -22,6 +22,11 @@ declare global {
     }
 }
 declare type EffectCallback<T> = (depValues: T, oldDepValues?: T) => any;
+interface GemElementOptions {
+    isLight?: boolean;
+    isAsync?: boolean;
+    delegatesFocus?: boolean;
+}
 export declare abstract class GemElement<T = Record<string, unknown>> extends HTMLElement {
     #private;
     static observedAttributes?: string[];
@@ -37,10 +42,7 @@ export declare abstract class GemElement<T = Record<string, unknown>> extends HT
     static defineSlots?: string[];
     static rootElement?: string;
     readonly state?: T;
-    constructor(options?: {
-        isLight?: boolean;
-        isAsync?: boolean;
-    });
+    constructor({ isAsync, isLight, delegatesFocus }?: GemElementOptions);
     get internals(): ElementInternals;
     /**
      * @helper
@@ -69,6 +71,21 @@ export declare abstract class GemElement<T = Record<string, unknown>> extends HT
      * ```
      * */
     effect: <T_1 = any[] | undefined>(callback: EffectCallback<T_1>, getDep?: (T_1 extends any[] ? () => [...T_1] : undefined) | undefined) => void;
+    /**
+     * @helper
+     * 在 `render` 前执行回调，和 `effect` 一样接受依赖数组参数，在 `constructor`/`willMount` 中使用
+     *
+     * ```js
+     * class App extends GemElement {
+     *   willMount() {
+     *     this.memo(() => {
+     *       this.a = exec(this.attrName);
+     *     }), () => [this.attrName]);
+     *   }
+     * }
+     * ```
+     * */
+    memo: <T_1 = any[] | undefined>(callback: EffectCallback<T_1>, getDep?: (T_1 extends any[] ? () => [...T_1] : undefined) | undefined) => void;
     /**@lifecycle */
     willMount?(): void | Promise<void>;
     /**
@@ -81,7 +98,10 @@ export declare abstract class GemElement<T = Record<string, unknown>> extends HT
     mounted?(): void | (() => void) | Promise<void>;
     /**@lifecycle */
     shouldUpdate?(): boolean;
-    /**@helper */
+    /**
+     * @helper
+     * async
+     */
     update: () => void;
     /**@lifecycle */
     updated?(): void | Promise<void>;

package/lib/element.d.ts.map

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