peryl 1.4.49 → 1.4.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peryl",
-  "version": "1.4.49",
+  "version": "1.4.52",
   "description": "PeRyL TypeScript library and tools for rapid web development",
   "keywords": [
     "PeRyL",

package/src/google-analytics.ts

@@ -3,6 +3,28 @@ export class GA {
 
     static ga: GA;
 
+    static init(trackingId: string, dimensions?: Object) {
+        GA.ga = new GA(trackingId, dimensions);
+    }
+
+    static pageview(path: string, title?: string): void {
+        if (GA.ga) {
+            GA.ga.pageview(path, title);
+        }
+    }
+
+    static event(name: string, parameters?: { [k: string]: string }): void {
+        if (GA.ga) {
+            GA.ga.event(name, parameters);
+        }
+    }
+
+    static set(parameters: { [k: string]: string }): void {
+        if (GA.ga) {
+            GA.ga.set(parameters);
+        }
+    }
+
     private _trackingId: string;
 
     constructor(trackingId: string, dimensions?: Object) {
@@ -10,15 +32,25 @@ export class GA {
         this._load();
     }
 
-    pageview(path: string): void {
+    pageview(path: string, title?: string): void {
+        if (this._trackingId) {
+            (self as any).gtag("config", this._trackingId,
+                {
+                    page_path: path,
+                    page_title: title
+                });
+        }
+    }
+
+    event(name: string, parameters?: { [k: string]: string }): void {
         if (this._trackingId) {
-            (self as any).gtag("config", this._trackingId, { page_path: path });
+            (self as any).gtag("event", name, parameters);
         }
     }
 
-    event(eventName: string, eventParameters: { [k: string]: string }): void {
+    set(parameters: { [k: string]: string }): void {
         if (this._trackingId) {
-            (self as any).gtag("event", eventName, eventParameters);
+            (self as any).gtag("set", parameters);
         }
     }
 

package/src/hash.ts

@@ -6,17 +6,17 @@ export interface HashUrlData {
     };
 }
 
-export const hashJsonEncoder = (data: any) => data ? JSON.stringify(data) : "";
-export const hashJsonDecoder = (str: string) => str ? JSON.parse(str) : undefined;
+export const hashJsonEncode = (data: any) => data ? encodeURIComponent(JSON.stringify(data)) : "";
+export const hashJsonDecode = (str: string) => str ? JSON.parse(decodeURIComponent(str)) : undefined;
 
-export const hashUrlEncoder = (data: HashUrlData): string => {
+export const hashUrlEncode = (data: HashUrlData): string => {
     // console.log(data);
     const d = typeof data === "string"
-        ? hashUrlDecoder(data)
+        ? hashUrlDecode(data)
         : data as HashUrlData;
     const dpath = d.path || [];
     const dquery = d.query || {};
-    const path = dpath.join("/");
+    const path = dpath.map(p => encodeURIComponent(p)).join("/");
     // const params = new URLSearchParams();
     const query = Object.entries(dquery)
         .reduce(
@@ -30,16 +30,16 @@ export const hashUrlEncoder = (data: HashUrlData): string => {
             },
             new URLSearchParams())
         .toString();
-    const str = `${path}?${query}`;
+    const str = `${path}${query ? "?" : ""}${query}`;
     // console.log(str);
     return str;
 };
-export const hashUrlDecoder = (str: string): HashUrlData => {
+export const hashUrlDecode = (str: string): HashUrlData => {
     // console.log(str);
     const [pathStr, queryStr] = str.split("?");
     // const pathStr = str.substring(0, str.indexOf("?"));
     // const queryStr = str.substring(str.indexOf("?") + 1);
-    const path = pathStr.split("/");
+    const path = pathStr.split("/").map(p => decodeURIComponent(p));
     const query = {} as any;
     for (const e of new URLSearchParams(queryStr).entries()) {
         const [k, v] = e;
@@ -121,11 +121,11 @@ export class Hash<T = string> {
     }
 
     read(): T {
-        return this._decode(decodeURIComponent(location.hash.slice(1)));
+        return this._decode(location.hash.slice(1));
     }
 
     write(data: T): this {
-        location.hash = "#" + encodeURI(this._encode(data));
+        location.hash = "#" + this._encode(data);
         // location.hash = "#" + this._encode(data);
         if (!this._emitWritten) {
             this._writtenDataJson = JSON.stringify(data);

package/src/hsml-app.ts

@@ -19,7 +19,9 @@ export type HDispatch = (type: HAction["type"],
 
 export type HUpdate = () => void;
 
-export type HDispatcher<STATE> = (action: HAction, state: STATE, dispatch: HDispatch) => Promise<void>;
+export type HRefs<STATE> = HApp<STATE>["refs"];
+
+export type HDispatcher<STATE> = (this: HApp<any>, action: HAction, state: STATE, dispatch: HDispatch, refs: HRefs<STATE>) => Promise<void>;
 
 // export type Class<T = object> = new (...args: any[]) => T;
 
@@ -74,7 +76,7 @@ export class HApp<STATE> implements HHandlerCtx {
         this.state = state;
         this.view = view;
         this.dispatcher = dispatcher || (async (a) => log(msgAction, a.type, a.data));
-        this.dispatch(HAppAction._init).then(() => this.mount(e));
+        this.dispatch(HAppAction._init, this).then(() => this.mount(e));
     }
 
     dispatch: HDispatch =  async (type: string, data?: any, event?: Event): Promise<void> => {
@@ -82,7 +84,7 @@ export class HApp<STATE> implements HHandlerCtx {
             log(msgAction, { type, data, event });
             const t0 = performance.now();
             try {
-                await this.dispatcher({ type, data, event }, this.state, this.dispatch);
+                await this.dispatcher({ type, data, event }, this.state, this.dispatch, this.refs);
                 this.update();
             } catch (e) {
                 err(msgDispatch, e);
@@ -91,7 +93,7 @@ export class HApp<STATE> implements HHandlerCtx {
             log(msgDispatch, `${t1 - t0} ms`, this.state);
         } else {
             try {
-                await this.dispatcher({ type, data, event }, this.state, this.dispatch);
+                await this.dispatcher({ type, data, event }, this.state, this.dispatch, this.refs);
                 this.update();
             } catch (e) {
                 err(msgDispatch, e);