@mantou/gem 1.6.18 → 1.6.19

package/src/lib/history.ts

@@ -50,13 +50,13 @@ function validData(data: any) {
   if ($hasShouldCloseHandle) throw new GemError('`$hasShouldCloseHandle` is not allowed');
 }
 
-function getUrlbarPath(internalPath: string) {
+function getUrlBarPath(internalPath: string) {
   return gemHistory.basePath ? gemHistory.basePath + internalPath : internalPath;
 }
 
-function getInternalPath(urlbarPath: string) {
-  if (urlbarPath === gemHistory.basePath) return '/';
-  return urlbarPath.replace(new RegExp(`^${gemHistory.basePath}/`), '/');
+function getInternalPath(urlBarPath: string) {
+  if (urlBarPath === gemHistory.basePath) return '/';
+  return urlBarPath.replace(new RegExp(`^${gemHistory.basePath}/`), '/');
 }
 
 function normalizeParams(params: UpdateHistoryParams): HistoryParams {
@@ -88,7 +88,7 @@ function updateHistory(p: UpdateHistoryParams, native: typeof nativeHistory.push
   };
   paramsMap.set(state.$key, params);
   updateStore(cleanObject(store), state);
-  const url = getUrlbarPath(path) + new QueryString(query) + hash;
+  const url = getUrlBarPath(path) + new QueryString(query) + hash;
   const prevHash = decodeURIComponent(location.hash);
   native(state, title, url);
   if (prevHash !== hash) window.dispatchEvent(new CustomEvent('hashchange'));
@@ -105,7 +105,7 @@ function updateHistoryByNative(data: any, title: string, originUrl: string, nati
   const params = normalizeParams({ path: pathname, query: new QueryString(search), hash, title, data });
   paramsMap.set(state.$key, params);
   updateStore(cleanObject(store), state);
-  const url = getUrlbarPath(pathname) + params.query + hash;
+  const url = getUrlBarPath(pathname) + params.query + hash;
   const prevHash = location.hash;
   native(state, title, url);
   // `location.hash` 和 `hash` 都已经进行了 url 编码，可以直接进行相等判断
@@ -127,13 +127,13 @@ class GemHistory {
     // 应用初始化的时候设置
     updateStore(gemBasePathStore, { basePath });
     // paramsMap 更新后 ui 才会更新
-    Object.assign(paramsMap.get(store.$key), { path: getInternalPath(location.pathname) });
+    Object.assign(paramsMap.get(store.$key)!, { path: getInternalPath(location.pathname) });
   }
   getParams() {
     return paramsMap.get(store.$key)!;
   }
   updateParams(params: UpdateHistoryParams) {
-    Object.assign(paramsMap.get(store.$key), params);
+    Object.assign(paramsMap.get(store.$key)!, params);
     updateStore(store, {});
   }
   push(params: UpdateHistoryParams) {
@@ -257,8 +257,8 @@ if (!window._GEMHISTORY) {
 
     // url 变化前 historyItem
     const prevState = store;
-
-    if (parseFloat(newState.$key) > parseFloat(prevState.$key) && newState.$hasOpenHandle) {
+    const isForward = parseFloat(newState.$key) > parseFloat(prevState.$key);
+    if (isForward && newState.$hasOpenHandle) {
       // 返回键关闭的 modal 能前进键重新打开
       // 刷新后不能工作：刷新后 historyItem 中只有 url
       // 能在子 app 中工作

package/src/lib/utils.ts

@@ -272,7 +272,7 @@ export function createCSSSheet<T extends StyledKeyValuePair>(rules: T | string,
     style = rules;
   } else {
     Object.keys(rules).forEach((key: keyof T) => {
-      sheet[key] = `${key}-${randomStr()}`;
+      sheet[key] = `${key as string}-${randomStr()}`;
       style += rules[key].styledContent.replace(/&/g, sheet[key]);
     });
   }

package/src/lib/version.ts

@@ -1 +1 @@
-export const version = '1.6.18';
+export const version = '1.6.19';

package/src/test/gem-element/advance.test.ts

@@ -222,19 +222,19 @@ class MemoGemDemo extends GemElement {
   constructor() {
     super();
     this.memo(
-      () => this.memoCount++,
+      () => (this.memoCount += 1),
       () => [this.attr, this.prop],
     );
   }
   willMount() {
     this.memo(
       (_arr) => {
-        this.memoCount++;
+        this.memoCount += 2;
       },
       () => [],
     );
     this.memo(() => {
-      this.memoCount++;
+      this.memoCount += 4;
     });
   }
 }
@@ -242,23 +242,23 @@ customElements.define('memo-gem-demo', MemoGemDemo);
 describe('gem element Memo', () => {
   it('依赖当前值', async () => {
     const el: MemoGemDemo = await fixture(html`<memo-gem-demo></memo-gem-demo>`);
-    expect(el.memoCount).to.equal(3);
+    expect(el.memoCount).to.equal(7);
     el.attr = 'b';
     el.prop = {};
     await nextFrame();
-    expect(el.memoCount).to.equal(5);
+    expect(el.memoCount).to.equal(12);
 
     el.update();
     await Promise.resolve();
-    expect(el.memoCount).to.equal(6);
+    expect(el.memoCount).to.equal(16);
 
     document.body.append(el);
-    expect(el.memoCount).to.equal(6);
+    expect(el.memoCount).to.equal(16);
 
     el.remove();
     await Promise.resolve();
     document.body.append(el);
-    expect(el.memoCount).to.equal(9);
+    expect(el.memoCount).to.equal(22);
   });
 });
 

package/src/test/history.test.ts

@@ -10,7 +10,7 @@ describe('history 测试', () => {
     await aTimeout(10);
     expect(window.location.hash).to.equal('#a');
     history.back();
-    await aTimeout(10);
+    await aTimeout(600);
     expect(window.location.hash).to.equal(hash);
     history.push({ path: '/a', hash: '#b' });
     await aTimeout(10);