@web-atoms/core 2.1.478 → 2.2.0

package/dist/core/Defer.js

@@ -1,47 +1,37 @@
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./types"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    const types_1 = require("./types");
-    /**
-     * Defers execution for given milliseconds. And previous pending
-     * execution is cancelled, so only the last execution will be executed.
-     *
-     * This is important when you want to watch multiple events and avoid multiple refresh
-     * @param n number of milliseconds to defer
-     */
-    function Defer(n = 250) {
-        return (target, key, descriptor) => {
-            // tslint:disable-next-line: ban-types
-            const old = descriptor.value;
-            const k = Symbol.for(`defer_${key}`);
-            descriptor.value = function (...a) {
-                const id = this[k];
-                if (id) {
-                    clearTimeout(id);
-                }
-                this[k] = setTimeout(() => {
-                    this[k] = undefined;
-                    const result = old.apply(this, a);
-                    if (result === null || result === void 0 ? void 0 : result.then) {
-                        result.catch((e) => {
-                            if (types_1.CancelToken.isCancelled(e)) {
-                                return;
-                            }
-                            console.error(e);
-                        });
-                    }
-                }, n);
-            };
-        };
-    }
-    exports.default = Defer;
-});
-//# sourceMappingURL=Defer.js.map
+System.register(["./types"], function (_export, _context) {
+  "use strict";
+
+  var CancelToken;
+  function Defer(n = 250) {
+    return (target, key, descriptor) => {
+      const old = descriptor.value;
+      const k = Symbol.for(`defer_${key}`);
+      descriptor.value = function (...a) {
+        const id = this[k];
+        if (id) {
+          clearTimeout(id);
+        }
+        this[k] = setTimeout(() => {
+          this[k] = undefined;
+          const result = old.apply(this, a);
+          if (result === null || result === void 0 ? void 0 : result.then) {
+            result.catch(e => {
+              if (CancelToken.isCancelled(e)) {
+                return;
+              }
+              console.error(e);
+            });
+          }
+        }, n);
+      };
+    };
+  }
+  _export("default", Defer);
+  return {
+    setters: [function (_types) {
+      CancelToken = _types.CancelToken;
+    }],
+    execute: function () {}
+  };
+});
+//# sourceMappingURL=/home/runner/work/core/core/dist/core/Defer.js.map

package/dist/core/Defer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Defer.js","sourceRoot":"","sources":["../../src/core/Defer.ts"],"names":[],"mappings":";;;;;;;;;;;IAAA,mCAAsC;IAEtC;;;;;;OAMG;IACH,SAAwB,KAAK,CAAC,IAAY,GAAG;QAEzC,OAAO,CAAC,MAAW,EAAE,GAAW,EAAE,UAAe,EAAE,EAAE;YACjD,sCAAsC;YACtC,MAAM,GAAG,GAAG,UAAU,CAAC,KAAiB,CAAC;YACzC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;YACrC,UAAU,CAAC,KAAK,GAAG,UAAS,GAAI,CAAQ;gBACpC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBACnB,IAAI,EAAE,EAAE;oBACJ,YAAY,CAAC,EAAE,CAAC,CAAC;iBACpB;gBACD,IAAI,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE;oBACtB,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;oBACpB,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBAClC,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE;wBACd,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;4BACf,IAAI,mBAAW,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;gCAC5B,OAAO;6BACV;4BACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACrB,CAAC,CAAC,CAAC;qBACN;gBACL,CAAC,EAAE,CAAC,CAAC,CAAC;YACV,CAAC,CAAC;QACN,CAAC,CAAC;IAEN,CAAC;IA1BD,wBA0BC"}
+{"version":3,"mappings":";;;;EASc,SAAUA,KAAK,CAACC,IAAY,GAAG;IAEzC,OAAO,CAACC,MAAW,EAAEC,GAAW,EAAEC,UAAe,KAAI;MAEjD,MAAMC,GAAG,GAAGD,UAAU,CAACE,KAAiB;MACxC,MAAMC,CAAC,GAAGC,MAAM,CAACC,GAAG,CAAC,SAASN,GAAG,EAAE,CAAC;MACpCC,UAAU,CAACE,KAAK,GAAG,UAAS,GAAII,CAAQ;QACpC,MAAMC,EAAE,GAAG,IAAI,CAACJ,CAAC,CAAC;QAClB,IAAII,EAAE,EAAE;UACJC,YAAY,CAACD,EAAE,CAAC;;QAEpB,IAAI,CAACJ,CAAC,CAAC,GAAGM,UAAU,CAAC,MAAK;UACtB,IAAI,CAACN,CAAC,CAAC,GAAGO,SAAS;UACnB,MAAMC,MAAM,GAAGV,GAAG,CAACW,KAAK,CAAC,IAAI,EAAEN,CAAC,CAAC;UACjC,IAAIK,MAAM,aAANA,MAAM,uBAANA,MAAM,CAAEE,IAAI,EAAE;YACdF,MAAM,CAACG,KAAK,CAAEC,CAAC,IAAI;cACf,IAAIC,WAAW,CAACC,WAAW,CAACF,CAAC,CAAC,EAAE;gBAC5B;;cAEJG,OAAO,CAACC,KAAK,CAACJ,CAAC,CAAC;YACpB,CAAC,CAAC;;QAEV,CAAC,EAAElB,CAAC,CAAC;MACT,CAAC;IACL,CAAC;EAEL;EAAC,mBA1BuBD,KAAK;EAAA;IAAA;MATpBoB,WAAW,UAAXA,WAAW;IAAA;IAAA;EAAA;AAAA","names":["Defer","n","target","key","descriptor","old","value","k","Symbol","for","a","id","clearTimeout","setTimeout","undefined","result","apply","then","catch","e","CancelToken","isCancelled","console","error"],"sourceRoot":"","sources":["../../src/core/Defer.ts"],"sourcesContent":[null]}

package/dist/core/EventScope.js

@@ -1,58 +1,61 @@
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "@web-atoms/date-time/dist/DateTime", "./types"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    const DateTime_1 = require("@web-atoms/date-time/dist/DateTime");
-    const types_1 = require("./types");
-    const key = DateTime_1.default.now.msSinceEpoch;
-    let id = 1;
-    class EventScope {
+System.register(["@web-atoms/date-time/dist/DateTime", "./types"], function (_export, _context) {
+  "use strict";
+
+  var DateTime, CancelToken, EventScope, key, id;
+  _export("default", void 0);
+  return {
+    setters: [function (_webAtomsDateTimeDistDateTime) {
+      DateTime = _webAtomsDateTimeDistDateTime.default;
+    }, function (_types) {
+      CancelToken = _types.CancelToken;
+    }],
+    execute: function () {
+      key = DateTime.now.msSinceEpoch;
+      id = 1;
+      _export("default", EventScope = class EventScope {
         static create() {
-            return new EventScope(`eventScopeE${key}${id++}`);
+          return new EventScope(`eventScopeE${key}${id++}`);
         }
         constructor(eventType) {
-            this.eventType = eventType;
+          this.eventType = eventType;
         }
         listen(fx) {
-            const asyncHandler = (ce) => {
-                try {
-                    const p = fx(ce);
-                    if (p === null || p === void 0 ? void 0 : p.catch) {
-                        p.catch((r) => {
-                            if (types_1.CancelToken.isCancelled(r)) {
-                                return;
-                            }
-                            console.error(r);
-                        });
-                    }
-                }
-                catch (e) {
-                    if (types_1.CancelToken.isCancelled(e)) {
-                        return;
-                    }
-                    console.error(e);
-                }
-            };
-            window.addEventListener(this.eventType, asyncHandler);
-            return {
-                dispose: () => {
-                    window.removeEventListener(this.eventType, asyncHandler);
-                }
-            };
+          const asyncHandler = ce => {
+            try {
+              const p = fx(ce);
+              if (p === null || p === void 0 ? void 0 : p.catch) {
+                p.catch(r => {
+                  if (CancelToken.isCancelled(r)) {
+                    return;
+                  }
+                  console.error(r);
+                });
+              }
+            } catch (e) {
+              if (CancelToken.isCancelled(e)) {
+                return;
+              }
+              console.error(e);
+            }
+          };
+          window.addEventListener(this.eventType, asyncHandler);
+          return {
+            dispose: () => {
+              window.removeEventListener(this.eventType, asyncHandler);
+            }
+          };
         }
         dispatchEvent(detail, cancelable = false) {
-            const ce = new CustomEvent(this.eventType, { detail, cancelable, bubbles: false });
-            window.dispatchEvent(ce);
-            return ce;
+          const ce = new CustomEvent(this.eventType, {
+            detail,
+            cancelable,
+            bubbles: false
+          });
+          window.dispatchEvent(ce);
+          return ce;
         }
+      });
     }
-    exports.default = EventScope;
-});
-//# sourceMappingURL=EventScope.js.map
+  };
+});
+//# sourceMappingURL=/home/runner/work/core/core/dist/core/EventScope.js.map

package/dist/core/EventScope.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventScope.js","sourceRoot":"","sources":["../../src/core/EventScope.ts"],"names":[],"mappings":";;;;;;;;;;;IAAA,iEAA0D;IAC1D,mCAAsC;IAEtC,MAAM,GAAG,GAAG,kBAAQ,CAAC,GAAG,CAAC,YAAY,CAAC;IACtC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEX,MAAqB,UAAU;QAEpB,MAAM,CAAC,MAAM;YAChB,OAAO,IAAI,UAAU,CAAK,cAAc,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACzD,CAAC;QAED,YAAoC,SAAiB;YAAjB,cAAS,GAAT,SAAS,CAAQ;QAErD,CAAC;QAEM,MAAM,CAAC,EAA+B;YACzC,MAAM,YAAY,GAAG,CAAC,EAAkB,EAAE,EAAE;gBACxC,IAAI;oBACA,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;oBACjB,IAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,EAAE;wBACV,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;4BACV,IAAG,mBAAW,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;gCAC3B,OAAO;6BACV;4BACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACrB,CAAC,CAAC,CAAC;qBACN;iBACJ;gBAAC,OAAO,CAAC,EAAE;oBACR,IAAI,mBAAW,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;wBAC5B,OAAO;qBACV;oBACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBACpB;YACL,CAAC,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACtD,OAAO;gBACH,OAAO,EAAC,GAAG,EAAE;oBACT,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBAC7D,CAAC;aACJ,CAAC;QACN,CAAC;QAEM,aAAa,CAAC,MAAS,EAAE,aAAsB,KAAK;YACvD,MAAM,EAAE,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YACnF,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACzB,OAAO,EAAE,CAAC;QACd,CAAC;KAEJ;IA3CD,6BA2CC"}
+{"version":3,"mappings":";;;6BAMqBA,UAAU;EAAA;EAAA;IAAA;MANxBC,QAAQ;IAAA;MACNC,WAAW,UAAXA,WAAW;IAAA;IAAA;MAEdC,GAAG,GAAGF,QAAQ,CAACG,GAAG,CAACC,YAAY;MACjCC,EAAE,GAAG,CAAC;MAAA,mBAEWN,UAAU,GAAjB,MAAOA,UAAU;QAEpB,OAAOO,MAAM;UAChB,OAAO,IAAIP,UAAU,CAAK,cAAcG,GAAG,GAAGG,EAAE,EAAE,EAAE,CAAC;QACzD;QAEAE,YAAoCC,SAAiB;UAAjB,cAAS,GAATA,SAAS;QAE7C;QAEOC,MAAM,CAACC,EAA+B;UACzC,MAAMC,YAAY,GAAIC,EAAkB,IAAI;YACxC,IAAI;cACA,MAAMC,CAAC,GAAGH,EAAE,CAACE,EAAE,CAAC;cAChB,IAAIC,CAAC,aAADA,CAAC,uBAADA,CAAC,CAAEC,KAAK,EAAE;gBACVD,CAAC,CAACC,KAAK,CAAEC,CAAC,IAAI;kBACV,IAAGd,WAAW,CAACe,WAAW,CAACD,CAAC,CAAC,EAAE;oBAC3B;;kBAEJE,OAAO,CAACC,KAAK,CAACH,CAAC,CAAC;gBACpB,CAAC,CAAC;;aAET,CAAC,OAAOI,CAAC,EAAE;cACR,IAAIlB,WAAW,CAACe,WAAW,CAACG,CAAC,CAAC,EAAE;gBAC5B;;cAEJF,OAAO,CAACC,KAAK,CAACC,CAAC,CAAC;;UAExB,CAAC;UACDC,MAAM,CAACC,gBAAgB,CAAC,IAAI,CAACb,SAAS,EAAEG,YAAY,CAAC;UACrD,OAAO;YACHW,OAAO,EAAC,MAAK;cACTF,MAAM,CAACG,mBAAmB,CAAC,IAAI,CAACf,SAAS,EAAEG,YAAY,CAAC;YAC5D;WACH;QACL;QAEOa,aAAa,CAACC,MAAS,EAAEC,aAAsB,KAAK;UACvD,MAAMd,EAAE,GAAG,IAAIe,WAAW,CAAC,IAAI,CAACnB,SAAS,EAAE;YAAEiB,MAAM;YAAEC,UAAU;YAAEE,OAAO,EAAE;UAAK,CAAE,CAAC;UAClFR,MAAM,CAACI,aAAa,CAACZ,EAAE,CAAC;UACxB,OAAOA,EAAE;QACb;OAEH;IAAA;EAAA;AAAA","names":["EventScope","DateTime","CancelToken","key","now","msSinceEpoch","id","create","constructor","eventType","listen","fx","asyncHandler","ce","p","catch","r","isCancelled","console","error","e","window","addEventListener","dispose","removeEventListener","dispatchEvent","detail","cancelable","CustomEvent","bubbles"],"sourceRoot":"","sources":["../../src/core/EventScope.ts"],"sourcesContent":[null]}

package/dist/core/ExpressionParser.js

@@ -1,228 +1,164 @@
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var viewModelParseWatchCache, viewModelParseWatchCache2;
+  function trimRegEx(t, r) {
+    const m = r.exec(t);
+    if (m && m.length) {
+      return [true, t.substring(m[0].length).trim(), m[0]];
     }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports"], factory);
+    return [false, t, ""];
+  }
+  function extractTill(text, search, returnOriginal = false) {
+    const index = text.indexOf(search);
+    if (index <= 0) {
+      return returnOriginal ? text : "";
     }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.parsePathLists = exports.parsePath = void 0;
-    const viewModelParseWatchCache = {};
-    function trimRegEx(t, r) {
-        const m = r.exec(t);
-        if (m && m.length) {
-            return [true, t.substring(m[0].length).trim(), m[0]];
-        }
-        return [false, t, ""];
+    return text.substring(0, index);
+  }
+  function parsePath(f, parseThis) {
+    let str = f.toString().trim();
+    str = str.split("\n").filter(s => !/^\/\//.test(s.trim())).join("\n");
+    const key = (parseThis === undefined ? "un:" : parseThis ? "_this:" : "_noThis:") + str;
+    const px1 = viewModelParseWatchCache[key];
+    if (px1) {
+      return px1;
     }
-    function extractTill(text, search, returnOriginal = false) {
-        const index = text.indexOf(search);
-        if (index <= 0) {
-            return returnOriginal ? text : "";
-        }
-        return text.substring(0, index);
+    if (str.endsWith("}")) {
+      str = str.substr(0, str.length - 1);
     }
-    function parsePath(f, parseThis) {
-        let str = f.toString().trim();
-        str = str.split("\n").filter((s) => !/^\/\//.test(s.trim())).join("\n");
-        const key = (parseThis === undefined ? "un:" : (parseThis ? "_this:" : "_noThis:")) + str;
-        const px1 = viewModelParseWatchCache[key];
-        if (px1) {
-            return px1;
-        }
-        if (str.endsWith("}")) {
-            str = str.substr(0, str.length - 1);
+    const functionRegEx = /^\w+\s*\(/;
+    const lambdaRegEx = /^\(?(\w+)?(\s?\,\s?\w+)*\)?\s?\=\>/;
+    let arg = "";
+    const original = str;
+    let [success, remaining] = trimRegEx(str, functionRegEx);
+    if (success) {
+      str = remaining;
+      remaining = extractTill(remaining, ")");
+      str = str.substring(remaining.length);
+      arg = extractTill(remaining, ",", true);
+    } else {
+      [success, str, remaining] = trimRegEx(str, lambdaRegEx);
+      if (success) {
+        remaining = remaining.trim();
+        remaining = remaining.substring(0, remaining.length - 2);
+        remaining = extractTill(remaining, ")", true);
+        arg = extractTill(remaining, ",", true);
+        if (arg.startsWith("(")) {
+          arg = arg.substring(1);
         }
-        const functionRegEx = /^\w+\s*\(/;
-        const lambdaRegEx = /^\(?(\w+)?(\s?\,\s?\w+)*\)?\s?\=\>/;
-        let arg = "";
-        const original = str;
-        // tslint:disable-next-line: prefer-const
-        let [success, remaining] = trimRegEx(str, functionRegEx);
-        if (success) {
-            str = remaining;
-            remaining = extractTill(remaining, ")");
-            str = str.substring(remaining.length);
-            arg = extractTill(remaining, ",", true);
+      } else {
+        if (parseThis !== undefined && parseThis === false) {
+          return [];
+        } else {
+          parseThis = true;
         }
-        else {
-            // this must be a lambda..
-            [success, str, remaining] = trimRegEx(str, lambdaRegEx);
-            if (success) {
-                remaining = remaining.trim();
-                remaining = remaining.substring(0, remaining.length - 2);
-                remaining = extractTill(remaining, ")", true);
-                arg = extractTill(remaining, ",", true);
-                if (arg.startsWith("(")) {
-                    arg = arg.substring(1);
-                }
-            }
-            else {
-                if (parseThis !== undefined && parseThis === false) {
-                    return [];
-                }
-                else {
-                    parseThis = true;
-                }
-            }
+      }
+    }
+    str = str.trim();
+    const isThis = parseThis === undefined ? (arg ? false : true) || parseThis : parseThis;
+    const p = (isThis ? "(\\_this|this)" : arg || "").trim();
+    if (p.length === 0) {
+      const empty = [];
+      viewModelParseWatchCache[key] = empty;
+      return empty;
+    }
+    const regExp = `(?:(\\b${p})(?:(\\.[a-zA-Z_][a-zA-Z_0-9]*)+)\\s?(?:(\\(|\\=\\=\\=|\\=\\=|\\=)?))`;
+    const re = new RegExp(regExp, "gi");
+    let path = [];
+    const ms = str.replace(re, m => {
+      let px = m;
+      if (px.startsWith("this.")) {
+        if (parseThis !== true) {
+          px = px.substr(5);
         }
-        // if (str.startsWith("function (")) {
-        //     str = str.substr("function (".length);
-        // } else if (str.startsWith("function(")) {
-        //     str = str.substr("function(".length);
-        // } else {
-        //     const sb = str.indexOf("(");
-        //     if (sb !== -1) {
-        //         str = str.substr(sb + 1);
-        //     } else {
-        //         if (parseThis !== undefined && parseThis === false) {
-        //             return [];
-        //         } else {
-        //             parseThis = true;
-        //         }
-        //     }
-        // }
-        str = str.trim();
-        // const commaIndex = str.indexOf(",");
-        // if (commaIndex !== -1 && commaIndex < index) {
-        //     index = commaIndex;
-        // }
-        // const lambdaIndex = str.indexOf("=>");
-        // if (lambdaIndex !== -1) {
-        //     index = lambdaIndex;
-        // }
-        const isThis = parseThis === undefined
-            ? ((arg ? false : true) || parseThis)
-            : parseThis;
-        const p = (isThis ? "(\\_this|this)" : (arg || "")).trim();
-        /**
-         * This is the case when there is no parameter to check and there `parseThis` is false
-         */
-        if (p.length === 0) {
-            const empty = [];
-            viewModelParseWatchCache[key] = empty;
-            return empty;
+      } else if (px.startsWith("_this.")) {
+        if (parseThis !== true) {
+          px = px.substr(6);
+        } else {
+          px = px.substr(1);
         }
-        // str = str.substr(index + 1);
-        const regExp = `(?:(\\b${p})(?:(\\.[a-zA-Z_][a-zA-Z_0-9]*)+)\\s?(?:(\\(|\\=\\=\\=|\\=\\=|\\=)?))`;
-        const re = new RegExp(regExp, "gi");
-        let path = [];
-        const ms = str.replace(re, (m) => {
-            // console.log(`m: ${m}`);
-            let px = m;
-            if (px.startsWith("this.")) {
-                if (parseThis !== true) {
-                    px = px.substr(5);
-                }
-            }
-            else if (px.startsWith("_this.")) {
-                if (parseThis !== true) {
-                    px = px.substr(6);
-                }
-                else {
-                    // need to convert _this to this
-                    px = px.substr(1);
-                }
-            }
-            else {
-                px = px.substr(p.length + 1);
-            }
-            px = px.split(".").filter((s) => !s.endsWith("(")).join(".");
-            // console.log(px);
-            if (!path.find((y) => y === px)) {
-                path.push(px);
-            }
-            // path = path.filter( (f1) => f1.endsWith("==") || !(f1.endsWith("(") || f1.endsWith("=") ));
-            // path = path.map(
-            //     (px2) => (px2.endsWith("===") ? px2.substr(0, px2.length - 3) :
-            //         ( px2.endsWith("==") ? px2.substr(0, px2.length - 2) : px2 )).trim() );
-            const filtered = [];
-            for (const iterator of path) {
-                if (iterator.endsWith("==") || !(iterator.endsWith("(") || iterator.endsWith("="))) {
-                    filtered.push((iterator.endsWith("===") ? iterator.substr(0, iterator.length - 3) :
-                        (iterator.endsWith("==") ? iterator.substr(0, iterator.length - 2) : iterator)).trim());
-                }
-            }
-            path = filtered.filter((px11) => {
-                const search = px11 + ".";
-                for (const iterator of filtered) {
-                    if (px11 !== iterator && iterator.indexOf(search) !== -1) {
-                        return false;
-                    }
-                }
-                return true;
-            });
-            return m;
-        });
-        path = path.sort((a, b) => b.localeCompare(a));
-        const duplicates = path;
-        path = [];
-        for (const iterator of duplicates) {
-            if (path.find((px2) => px2 === iterator)) {
-                continue;
-            }
-            path.push(iterator);
+      } else {
+        px = px.substr(p.length + 1);
+      }
+      px = px.split(".").filter(s => !s.endsWith("(")).join(".");
+      if (!path.find(y => y === px)) {
+        path.push(px);
+      }
+      const filtered = [];
+      for (const iterator of path) {
+        if (iterator.endsWith("==") || !(iterator.endsWith("(") || iterator.endsWith("="))) {
+          filtered.push((iterator.endsWith("===") ? iterator.substr(0, iterator.length - 3) : iterator.endsWith("==") ? iterator.substr(0, iterator.length - 2) : iterator).trim());
         }
-        const rp = [];
-        for (const rpItem of path) {
-            if (rp.find((x) => x.startsWith(rpItem))) {
-                continue;
-            }
-            rp.push(rpItem);
+      }
+      path = filtered.filter(px11 => {
+        const search = px11 + ".";
+        for (const iterator of filtered) {
+          if (px11 !== iterator && iterator.indexOf(search) !== -1) {
+            return false;
+          }
         }
-        // tslint:disable-next-line: no-console
-        // console.log(`Watching: ${path.join(", ")}`);
-        const pl = path.filter((p1) => p1).map((p1) => p1.split("."));
-        viewModelParseWatchCache[key] = pl;
-        return pl;
+        return true;
+      });
+      return m;
+    });
+    path = path.sort((a, b) => b.localeCompare(a));
+    const duplicates = path;
+    path = [];
+    for (const iterator of duplicates) {
+      if (path.find(px2 => px2 === iterator)) {
+        continue;
+      }
+      path.push(iterator);
     }
-    exports.parsePath = parsePath;
-    const viewModelParseWatchCache2 = {};
-    function parsePathLists(f) {
-        const str = f.toString().trim();
-        const key = str;
-        const px1 = viewModelParseWatchCache2[key];
-        if (px1) {
-            return px1;
-        }
-        // str = str.split("\n").filter((s) => !/^\/\//.test(s.trim())).join("\n");
-        // if (str.endsWith("}")) {
-        //     str = str.substr(0, str.length - 1);
-        // }
-        // if (str.startsWith("function (")) {
-        //     str = str.substr("function (".length);
-        // }
-        // if (str.startsWith("function(")) {
-        //     str = str.substr("function(".length);
-        // }
-        // str = str.trim();
-        const pl = {
-            pathList: parsePath(str, false),
-            thisPath: parsePath(str, true),
-            combined: []
-        };
-        if (pl.thisPath.length && pl.pathList.length) {
-            // we need to combine this
-            // pl.combinedPathList =
-            pl.combined = pl.thisPath
-                .map((x) => {
-                x[0] = "t";
-                x.splice(0, 0, "this");
-                return x;
-            })
-                .concat(pl.pathList.map((x) => {
-                x.splice(0, 0, "this", "x");
-                return x;
-            }));
-            pl.thisPath = [];
-            pl.pathList = [];
-        }
-        viewModelParseWatchCache2[key] = pl;
-        return pl;
+    const rp = [];
+    for (const rpItem of path) {
+      if (rp.find(x => x.startsWith(rpItem))) {
+        continue;
+      }
+      rp.push(rpItem);
+    }
+    const pl = path.filter(p1 => p1).map(p1 => p1.split("."));
+    viewModelParseWatchCache[key] = pl;
+    return pl;
+  }
+  function parsePathLists(f) {
+    const str = f.toString().trim();
+    const key = str;
+    const px1 = viewModelParseWatchCache2[key];
+    if (px1) {
+      return px1;
+    }
+    const pl = {
+      pathList: parsePath(str, false),
+      thisPath: parsePath(str, true),
+      combined: []
+    };
+    if (pl.thisPath.length && pl.pathList.length) {
+      pl.combined = pl.thisPath.map(x => {
+        x[0] = "t";
+        x.splice(0, 0, "this");
+        return x;
+      }).concat(pl.pathList.map(x => {
+        x.splice(0, 0, "this", "x");
+        return x;
+      }));
+      pl.thisPath = [];
+      pl.pathList = [];
+    }
+    viewModelParseWatchCache2[key] = pl;
+    return pl;
+  }
+  _export({
+    parsePath: parsePath,
+    parsePathLists: parsePathLists
+  });
+  return {
+    setters: [],
+    execute: function () {
+      viewModelParseWatchCache = {};
+      viewModelParseWatchCache2 = {};
     }
-    exports.parsePathLists = parsePathLists;
-});
-//# sourceMappingURL=ExpressionParser.js.map
+  };
+});
+//# sourceMappingURL=/home/runner/work/core/core/dist/core/ExpressionParser.js.map