peryl 1.5.33 → 1.5.35

package/demo/hsml-app-test_demo.ts

@@ -31,10 +31,9 @@ const counterDispatcher: HDispatcher<CounterState, CounterActions> = async funct
     switch (action.type) {
 
         case HAppActions.mount:
-            this.addEventListener(
+            this.eventListener(
                 Actions.xXx,
-                (event: Event) => {
-                    const data = (event as CustomEvent).detail;
+                (data: any) => {
                     dispatch(CounterActions.dec, data);
                 });
             break;

package/dist/browser-esmodule/hsml-app.js

@@ -19,81 +19,58 @@ const $a15669afd069c056$export$4442f9d5f627adc8 = "\xa0";
 const $a15669afd069c056$export$3027455780d8394 = " ";
 const $a15669afd069c056$export$76bbc0cf5037aeea = " ";
 const $a15669afd069c056$export$480ed2f7fd18b4a2 = " ";
+const $a15669afd069c056$var$headRegex = /^([^#.~]*)(?:#([^.~]*))?(?:\.([^~]*))?(?:~(.*))?$/;
 function $a15669afd069c056$export$8f4ee6ea2853750b(hml, handler, ctx) {
     if (hml === undefined || hml === null) return;
-    switch(hml.constructor){
-        case Array:
-            hsmlTag(hml, handler, ctx);
-            break;
-        case Function:
-            handler.fnc(hml, ctx);
-            break;
-        case String:
-            handler.text(hml, ctx);
-            break;
-        case Boolean:
-            handler.text("" + hml, ctx);
-            break;
-        case Number:
-            const n = hml;
-            const ns = n.toLocaleString ? n.toLocaleString() : n.toString();
-            handler.text(ns, ctx);
-            break;
-        case Date:
-            const d = hml;
-            const ds = d.toLocaleString ? d.toLocaleString() : d.toString();
-            handler.text(ds, ctx);
-            break;
-        default:
-            handler.obj(hml, ctx);
-    }
+    if (Array.isArray(hml)) hsmlTag(hml, handler, ctx);
+    else if (typeof hml === "function") handler.fnc(hml, ctx);
+    else if (typeof hml === "string") handler.text(hml, ctx);
+    else if (typeof hml === "boolean") handler.text("" + hml, ctx);
+    else if (typeof hml === "number") {
+        const n = hml;
+        const ns = n.toLocaleString ? n.toLocaleString() : n.toString();
+        handler.text(ns, ctx);
+    } else if (hml instanceof Date) {
+        const d = hml;
+        const ds = d.toLocaleString ? d.toLocaleString() : d.toString();
+        handler.text(ds, ctx);
+    } else if (typeof hml === "object") handler.obj(hml, ctx);
+    else console.warn("hsml: unexpected element type:", hml);
     function hsmlTag(hmlTag, handler, ctx) {
-        var _a;
         if (typeof hmlTag[0] !== "string") {
-            console.error("HSML tag head not string:", hmlTag);
+            console.error("hsml: tag head is not a string:", hmlTag);
             return;
         }
         const head = hmlTag[0];
         const attrsObj = hmlTag[1];
-        const hasAttrs = attrsObj && attrsObj.constructor === Object;
+        const hasAttrs = attrsObj !== null && attrsObj !== undefined && !Array.isArray(attrsObj) && typeof attrsObj === "object" && !(attrsObj instanceof Date);
         const childIdx = hasAttrs ? 2 : 1;
         let children = [];
         let hFnc;
         let hObj;
         const htc = hmlTag[childIdx];
-        switch(htc != null && htc.constructor){
-            case Array:
-                children = htc;
-                break;
-            case Function:
-                hFnc = htc;
-                break;
-            case String:
-            case Boolean:
-            case Number:
-            case Date:
-                children = [
-                    htc
-                ];
-                break;
-            default:
-                hObj = htc;
-                break;
+        if (htc != null) {
+            if (Array.isArray(htc)) children = htc;
+            else if (typeof htc === "function") hFnc = htc;
+            else if (typeof htc === "string" || typeof htc === "boolean" || typeof htc === "number" || htc instanceof Date) children = [
+                htc
+            ];
+            else hObj = htc;
         }
-        const refSplit = head.split("~");
-        const ref = refSplit[1];
-        const dotSplit = refSplit[0].split(".");
-        const hashSplit = dotSplit[0].split("#");
-        const tag = (_a = hashSplit[0]) !== null && _a !== void 0 ? _a : "div";
-        const id = hashSplit[1];
-        const classes = dotSplit.slice(1);
-        let attrs;
-        if (hasAttrs) attrs = attrsObj;
-        else attrs = {};
-        if (id) attrs._id = id;
-        if (classes.length) attrs._classes = classes;
-        if (ref) attrs._ref = ref;
-        if (hObj) attrs._hObj = hObj;
+        const match = head.match($a15669afd069c056$var$headRegex);
+        const tag = match[1] || "div";
+        const id = match[2];
+        const classes = match[3] ? match[3].split(".") : [];
+        const ref = match[4];
+        const attrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, hasAttrs ? attrsObj : {}), id && {
+            _id: id
+        }), classes.length && {
+            _classes: classes
+        }), ref && {
+            _ref: ref
+        }), hObj && {
+            _hObj: hObj
+        });
         const skip = handler.open(tag, attrs, children, ctx);
         if (hFnc) handler.fnc(hFnc, ctx);
         if (!skip) children.forEach((jml)=>$a15669afd069c056$export$8f4ee6ea2853750b(jml, handler, ctx));
@@ -101,6 +78,7 @@ function $a15669afd069c056$export$8f4ee6ea2853750b(hml, handler, ctx) {
     }
 }
 function $a15669afd069c056$export$7427c8b17ccb408c(hsmls, sep) {
+    if (hsmls.length === 0) return [];
     const r = hsmls.reduce((p, c)=>(p.push(c, sep), p), []);
     r.splice(-1);
     return r;
@@ -986,8 +964,26 @@ var $9adf8bc2f1ba310f$export$3dcd9fad60135c2c;
     HAppActions["umount"] = "happ-umount";
     HAppActions["attribute"] = "happ-attribute";
 })($9adf8bc2f1ba310f$export$3dcd9fad60135c2c || ($9adf8bc2f1ba310f$export$3dcd9fad60135c2c = {}));
-const $9adf8bc2f1ba310f$var$schedule = (callback)=>window.requestAnimationFrame(callback);
-const $9adf8bc2f1ba310f$var$unschedule = (handle)=>window.cancelAnimationFrame(handle);
+const $9adf8bc2f1ba310f$var$scheduledCallbacks = new Map();
+let $9adf8bc2f1ba310f$var$scheduleId = 0;
+const $9adf8bc2f1ba310f$var$scheduleChannel = new MessageChannel();
+$9adf8bc2f1ba310f$var$scheduleChannel.port2.onmessage = ()=>{
+    const cbs = [
+        ...$9adf8bc2f1ba310f$var$scheduledCallbacks.values()
+    ];
+    $9adf8bc2f1ba310f$var$scheduledCallbacks.clear();
+    cbs.forEach((cb)=>cb());
+};
+const $9adf8bc2f1ba310f$var$schedule = (callback)=>{
+    const id = ++$9adf8bc2f1ba310f$var$scheduleId;
+    const wasEmpty = $9adf8bc2f1ba310f$var$scheduledCallbacks.size === 0;
+    $9adf8bc2f1ba310f$var$scheduledCallbacks.set(id, callback);
+    if (wasEmpty) $9adf8bc2f1ba310f$var$scheduleChannel.port1.postMessage(null);
+    return id;
+};
+const $9adf8bc2f1ba310f$var$unschedule = (handle)=>{
+    $9adf8bc2f1ba310f$var$scheduledCallbacks.delete(handle);
+};
 const $9adf8bc2f1ba310f$var$msgAction = "action:";
 const $9adf8bc2f1ba310f$var$msgDispatch = "dispatch:";
 const $9adf8bc2f1ba310f$var$msgRender = "render:";
@@ -1202,10 +1198,10 @@ class $9adf8bc2f1ba310f$export$8cfef5dc37c46888 {
             }
         });
     }
-    addEventListener(type, listener, element = window) {
+    eventListener(type, listener, element = window) {
         var _a;
         if (!this._abortController) this._abortController = new AbortController();
-        element.addEventListener(type, listener, {
+        element.addEventListener(type, (e)=>listener("detail" in e ? e.detail : undefined, e), {
             signal: (_a = this._abortController) === null || _a === void 0 ? void 0 : _a.signal
         });
     }
@@ -1232,12 +1228,12 @@ function $9adf8bc2f1ba310f$var$arrayBufferToBase64(buffer) {
     return btoa(binary);
 }
 function $9adf8bc2f1ba310f$var$formData(e) {
+    var _a;
     return $9adf8bc2f1ba310f$var$__awaiter(this, void 0, void 0, function*() {
         const el = e.target;
         switch(el.nodeName){
             case "FORM":
-                if (e instanceof SubmitEvent) e.preventDefault();
-                e.preventDefault();
+                (_a = e.preventDefault) === null || _a === void 0 || _a.call(e);
                 const form = {
                     data: {},
                     validation: {},