bruce-models 0.9.0 → 0.9.1

package/dist/lib/util/encrypt-utils.js

@@ -4,10 +4,9 @@ exports.EncryptUtils = void 0;
 var EncryptUtils;
 (function (EncryptUtils) {
     // https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
-    function Cyrb53Hash(str, seed) {
-        if (seed === void 0) { seed = 0; }
-        var h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
-        for (var i = 0, ch = void 0; i < str.length; i++) {
+    function Cyrb53Hash(str, seed = 0) {
+        let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+        for (let i = 0, ch; i < str.length; i++) {
             ch = str.charCodeAt(i);
             h1 = Math.imul(h1 ^ ch, 2654435761);
             h2 = Math.imul(h2 ^ ch, 1597334677);

package/dist/lib/util/encrypt-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"encrypt-utils.js","sourceRoot":"","sources":["../../../src/util/encrypt-utils.ts"],"names":[],"mappings":";;;AAAA,IAAiB,YAAY,CAa5B;AAbD,WAAiB,YAAY;IACzB,wFAAwF;IACxF,SAAgB,UAAU,CAAC,GAAW,EAAE,IAAgB;QAAhB,qBAAA,EAAA,QAAgB;QACpD,IAAI,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC;QACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAA,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,EAAE,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACvB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;YACpC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;SACvC;QACD,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAG,EAAE,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAG,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;QACnF,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAG,EAAE,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAG,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;QACnF,OAAO,CAAC,UAAU,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAG,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAVe,uBAAU,aAUzB,CAAA;AACL,CAAC,EAbgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAa5B"}
+{"version":3,"file":"encrypt-utils.js","sourceRoot":"","sources":["../../../src/util/encrypt-utils.ts"],"names":[],"mappings":";;;AAAA,IAAiB,YAAY,CAa5B;AAbD,WAAiB,YAAY;IACzB,wFAAwF;IACxF,SAAgB,UAAU,CAAC,GAAW,EAAE,OAAe,CAAC;QACpD,IAAI,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC;QACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,EAAE,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACvB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;YACpC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;SACvC;QACD,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAG,EAAE,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAG,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;QACnF,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAG,EAAE,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAG,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;QACnF,OAAO,CAAC,UAAU,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAG,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAVe,uBAAU,aAUzB,CAAA;AACL,CAAC,EAbgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAa5B"}

package/dist/lib/util/math-utils.js

@@ -9,16 +9,15 @@ var MathUtils;
      * @param decimals
      * @returns
      */
-    function Round(num, decimals) {
-        if (decimals === void 0) { decimals = 0; }
+    function Round(num, decimals = 0) {
         if (decimals <= 0) {
             return Math.round(num);
         }
-        var tmp = "1";
-        for (var i = 0; i < decimals; i++) {
+        let tmp = "1";
+        for (let i = 0; i < decimals; i++) {
             tmp += "0";
         }
-        var d = parseFloat(tmp);
+        const d = parseFloat(tmp);
         return Math.round((num + Number.EPSILON) * d) / d;
     }
     MathUtils.Round = Round;

package/dist/lib/util/math-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"math-utils.js","sourceRoot":"","sources":["../../../src/util/math-utils.ts"],"names":[],"mappings":";;;AAAA,IAAiB,SAAS,CAkCzB;AAlCD,WAAiB,SAAS;IACtB;;;;;OAKG;IACH,SAAgB,KAAK,CAAC,GAAW,EAAE,QAAoB;QAApB,yBAAA,EAAA,YAAoB;QACnD,IAAI,QAAQ,IAAI,CAAC,EAAE;YACf,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC1B;QACD,IAAI,GAAG,GAAG,GAAG,CAAC;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC/B,GAAG,IAAI,GAAG,CAAC;SACd;QACD,IAAM,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IAVe,eAAK,QAUpB,CAAA;IAED;;;;;OAKG;IACH,SAAgB,OAAO,CAAC,GAAW,EAAE,GAAW;QAC5C,IAAI,GAAG,IAAI,GAAG,EAAE;YACZ,OAAO,GAAG,CAAC;SACd;aACI,IAAI,GAAG,GAAG,GAAG,EAAE;YAChB,MAAK,CAAC,0BAA0B,CAAC,CAAC;SACrC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;IAC7D,CAAC;IARe,iBAAO,UAQtB,CAAA;AACL,CAAC,EAlCgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAkCzB"}
+{"version":3,"file":"math-utils.js","sourceRoot":"","sources":["../../../src/util/math-utils.ts"],"names":[],"mappings":";;;AAAA,IAAiB,SAAS,CAkCzB;AAlCD,WAAiB,SAAS;IACtB;;;;;OAKG;IACH,SAAgB,KAAK,CAAC,GAAW,EAAE,WAAmB,CAAC;QACnD,IAAI,QAAQ,IAAI,CAAC,EAAE;YACf,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC1B;QACD,IAAI,GAAG,GAAG,GAAG,CAAC;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC/B,GAAG,IAAI,GAAG,CAAC;SACd;QACD,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IAVe,eAAK,QAUpB,CAAA;IAED;;;;;OAKG;IACH,SAAgB,OAAO,CAAC,GAAW,EAAE,GAAW;QAC5C,IAAI,GAAG,IAAI,GAAG,EAAE;YACZ,OAAO,GAAG,CAAC;SACd;aACI,IAAI,GAAG,GAAG,GAAG,EAAE;YAChB,MAAK,CAAC,0BAA0B,CAAC,CAAC;SACrC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;IAC7D,CAAC;IARe,iBAAO,UAQtB,CAAA;AACL,CAAC,EAlCgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAkCzB"}

package/dist/lib/util/object-utils.js

@@ -9,7 +9,7 @@ var ObjectUtils;
      */
     function UId() {
         return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
-            var r = Math.random() * 16 | 0, v = c == "x" ? r : (r & 0x3 | 0x8);
+            const r = Math.random() * 16 | 0, v = c == "x" ? r : (r & 0x3 | 0x8);
             return v.toString(16);
         });
     }

package/dist/lib/util/object-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"object-utils.js","sourceRoot":"","sources":["../../../src/util/object-utils.ts"],"names":[],"mappings":";;;AAAA,IAAiB,WAAW,CAW3B;AAXD,WAAiB,WAAW;IACxB;;;OAGG;IACH,SAAgB,GAAG;QACf,OAAO,sCAAsC,CAAC,OAAO,CAAC,OAAO,EAAE,UAAS,CAAC;YACrE,IAAM,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IALe,eAAG,MAKlB,CAAA;AACL,CAAC,EAXgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAW3B"}
+{"version":3,"file":"object-utils.js","sourceRoot":"","sources":["../../../src/util/object-utils.ts"],"names":[],"mappings":";;;AAAA,IAAiB,WAAW,CAW3B;AAXD,WAAiB,WAAW;IACxB;;;OAGG;IACH,SAAgB,GAAG;QACf,OAAO,sCAAsC,CAAC,OAAO,CAAC,OAAO,EAAE,UAAS,CAAC;YACrE,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IALe,eAAG,MAKlB,CAAA;AACL,CAAC,EAXgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAW3B"}

package/dist/lib/util/path-utils.js

@@ -10,17 +10,17 @@ var PathUtils;
         if (!str) {
             return [];
         }
-        var broken = str.split("\"/\"");
+        const broken = str.split("\"/\"");
         if (broken.length > 0) {
-            var top_1 = broken[0];
-            if (top_1.length > 0) {
-                if (top_1.charAt(0) == "\"") {
-                    top_1 = top_1.substring(1);
+            let top = broken[0];
+            if (top.length > 0) {
+                if (top.charAt(0) == "\"") {
+                    top = top.substring(1);
                 }
-                broken[0] = top_1;
+                broken[0] = top;
             }
-            var endIndex = broken.length - 1;
-            var bot = broken[endIndex];
+            const endIndex = broken.length - 1;
+            let bot = broken[endIndex];
             if (bot.length > 0) {
                 if (bot.charAt(bot.length - 1) == "\"") {
                     bot = bot.substring(0, bot.length - 1);
@@ -32,9 +32,9 @@ var PathUtils;
     }
     PathUtils.Parse = Parse;
     function Wrap(path) {
-        var tmp = "\"";
-        for (var i = 0; i < path.length; i++) {
-            var section = path[i];
+        let tmp = "\"";
+        for (let i = 0; i < path.length; i++) {
+            let section = path[i];
             tmp += section;
             if (i < path.length - 1) {
                 tmp += "\"/\"";
@@ -45,9 +45,9 @@ var PathUtils;
     }
     PathUtils.Wrap = Wrap;
     function ParseLegacy(str) {
-        var broken = str.split(".");
-        for (var i = 0; i < broken.length; i++) {
-            var piece = broken[0];
+        const broken = str.split(".");
+        for (let i = 0; i < broken.length; i++) {
+            let piece = broken[0];
             if (piece.charAt(0) == "\"") {
                 piece = broken[0] = piece.substring(1);
             }

package/dist/lib/util/path-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"path-utils.js","sourceRoot":"","sources":["../../../src/util/path-utils.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAiB,SAAS,CAoDzB;AApDD,WAAiB,SAAS;IACtB,SAAgB,KAAK,CAAC,GAAW;QAC7B,IAAI,CAAC,GAAG,EAAE;YACN,OAAO,EAAE,CAAC;SACb;QACD,IAAM,MAAM,GAAa,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,IAAI,KAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,KAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChB,IAAI,KAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;oBACvB,KAAG,GAAG,KAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;iBAC1B;gBACD,MAAM,CAAC,CAAC,CAAC,GAAG,KAAG,CAAC;aACnB;YACD,IAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;YACnC,IAAI,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC3B,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChB,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE;oBACpC,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;iBAC1C;gBACD,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;aAC1B;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAvBe,eAAK,QAuBpB,CAAA;IAED,SAAgB,IAAI,CAAC,IAAc;QAC/B,IAAI,GAAG,GAAW,IAAI,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACtB,GAAG,IAAI,OAAO,CAAC;YACf,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,GAAG,IAAI,OAAO,CAAC;aAClB;SACJ;QACD,GAAG,IAAI,IAAI,CAAC;QACZ,OAAO,GAAG,CAAC;IACf,CAAC;IAXe,cAAI,OAWnB,CAAA;IAED,SAAgB,WAAW,CAAC,GAAW;QACnC,IAAM,MAAM,GAAa,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,IAAI,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;gBACzB,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;aAC1C;YACD,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE;gBACxC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;aACpD;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAZe,qBAAW,cAY1B,CAAA;AACL,CAAC,EApDgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAoDzB"}
+{"version":3,"file":"path-utils.js","sourceRoot":"","sources":["../../../src/util/path-utils.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAiB,SAAS,CAoDzB;AApDD,WAAiB,SAAS;IACtB,SAAgB,KAAK,CAAC,GAAW;QAC7B,IAAI,CAAC,GAAG,EAAE;YACN,OAAO,EAAE,CAAC;SACb;QACD,MAAM,MAAM,GAAa,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,IAAI,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChB,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;oBACvB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;iBAC1B;gBACD,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;aACnB;YACD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;YACnC,IAAI,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC3B,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChB,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE;oBACpC,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;iBAC1C;gBACD,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;aAC1B;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAvBe,eAAK,QAuBpB,CAAA;IAED,SAAgB,IAAI,CAAC,IAAc;QAC/B,IAAI,GAAG,GAAW,IAAI,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACtB,GAAG,IAAI,OAAO,CAAC;YACf,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,GAAG,IAAI,OAAO,CAAC;aAClB;SACJ;QACD,GAAG,IAAI,IAAI,CAAC;QACZ,OAAO,GAAG,CAAC;IACf,CAAC;IAXe,cAAI,OAWnB,CAAA;IAED,SAAgB,WAAW,CAAC,GAAW;QACnC,MAAM,MAAM,GAAa,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,IAAI,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;gBACzB,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;aAC1C;YACD,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE;gBACxC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;aACpD;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAZe,qBAAW,cAY1B,CAAA;AACL,CAAC,EApDgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAoDzB"}

package/dist/lib/util/url-utils.js

@@ -7,13 +7,13 @@ exports.UrlUtils = void 0;
 var UrlUtils;
 (function (UrlUtils) {
     function GetQueryString(doc) {
-        var qs = {};
-        var p0 = doc.location.href.indexOf("?");
+        const qs = {};
+        const p0 = doc.location.href.indexOf("?");
         if (p0 >= 0) {
-            var str = doc.location.href.substring(p0 + 1);
-            var tokens = str.split("&");
-            tokens.forEach(function (token) {
-                var p = token.split("=");
+            const str = doc.location.href.substring(p0 + 1);
+            const tokens = str.split("&");
+            tokens.forEach(token => {
+                const p = token.split("=");
                 if (p.length == 2) {
                     qs[p[0]] = p[1];
                 }
@@ -25,72 +25,60 @@ var UrlUtils;
     /**
      * Helper to get and set url params for a given window.
      */
-    var Handler = /** @class */ (function () {
-        function Handler(window, allowedKeys) {
+    class Handler {
+        constructor(window, allowedKeys) {
             this._allowedKeys = null;
             this._window = window;
             this._allowedKeys = allowedKeys;
         }
-        Object.defineProperty(Handler.prototype, "window", {
-            get: function () {
-                return this._window;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Handler.prototype, "document", {
-            get: function () {
-                var _a;
-                return (_a = this.window) === null || _a === void 0 ? void 0 : _a.document;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Handler.prototype, "allowedKeys", {
-            get: function () {
-                return this._allowedKeys;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Handler.prototype.UpdateAllowedKeys = function (allowedKeys) {
+        get window() {
+            return this._window;
+        }
+        get document() {
+            var _a;
+            return (_a = this.window) === null || _a === void 0 ? void 0 : _a.document;
+        }
+        get allowedKeys() {
+            return this._allowedKeys;
+        }
+        UpdateAllowedKeys(allowedKeys) {
             this._allowedKeys = allowedKeys;
-            var params = this.GetParams();
+            let params = this.GetParams();
             this.refresh(params);
-        };
-        Handler.prototype.UpdateParam = function (key, value) {
-            var params = this.GetParams();
+        }
+        UpdateParam(key, value) {
+            let params = this.GetParams();
             params[key + ""] = value + "";
             this.refresh(params);
-        };
-        Handler.prototype.RemoveParam = function (key) {
-            var params = this.GetParams();
+        }
+        RemoveParam(key) {
+            let params = this.GetParams();
             params[key + ""] = null;
             this.refresh(params);
-        };
-        Handler.prototype.GetParamKeys = function () {
-            var params = GetQueryString(this.document);
+        }
+        GetParamKeys() {
+            let params = GetQueryString(this.document);
             return Object.keys(params);
-        };
-        Handler.prototype.GetParams = function () {
+        }
+        GetParams() {
             return GetQueryString(this.document);
-        };
-        Handler.prototype.GetParam = function (key) {
-            var params = this.GetParams();
+        }
+        GetParam(key) {
+            let params = this.GetParams();
             return params[key + ""];
-        };
-        Handler.prototype.Clear = function () {
+        }
+        Clear() {
             this.refresh({});
-        };
-        Handler.prototype.refresh = function (data) {
-            var params = [];
-            var keys = Object.keys(data);
-            for (var i = 0; i < keys.length; i++) {
-                var key = keys[i];
+        }
+        refresh(data) {
+            const params = [];
+            const keys = Object.keys(data);
+            for (let i = 0; i < keys.length; i++) {
+                const key = keys[i];
                 if (this._allowedKeys == null || this._allowedKeys.includes(key)) {
-                    var val = data[key];
+                    const val = data[key];
                     if (!!val || val == 0) {
-                        params.push(key + "=" + val);
+                        params.push(`${key}=${val}`);
                     }
                 }
             }
@@ -100,9 +88,8 @@ var UrlUtils;
             else {
                 this.window.history.replaceState({}, null, "");
             }
-        };
-        return Handler;
-    }());
+        }
+    }
     UrlUtils.Handler = Handler;
 })(UrlUtils = exports.UrlUtils || (exports.UrlUtils = {}));
 //# sourceMappingURL=url-utils.js.map

package/dist/lib/util/url-utils.js.map

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

package/dist/types/markup/markup.d.ts

@@ -11,13 +11,19 @@ export declare namespace Markup {
         height?: number;
         defaultCameraPos?: any;
     }
+    interface IElement {
+        id: string;
+        name?: string;
+        visible?: boolean;
+        screenWidth?: number;
+        screenHeight?: number;
+    }
     namespace Div {
         enum EType {
             Default = "default",
             Callout = "callout"
         }
-        interface IDiv {
-            id: string;
+        interface IDiv extends IElement {
             type?: EType;
             contentRows: IRow[];
             boxShadow?: IBoxShadow;
@@ -29,8 +35,6 @@ export declare namespace Markup {
             y: number;
             width: number;
             height: number;
-            screenWidth?: number;
-            screenHeight?: number;
         }
         interface IBoxShadow {
             horizontal: number;
@@ -113,7 +117,7 @@ export declare namespace Markup {
             Arrow = "ARROW"
         }
         namespace Line {
-            interface ILine {
+            interface ILine extends IElement {
                 pathType: "LINE";
                 path: string;
                 transform: string;
@@ -121,8 +125,6 @@ export declare namespace Markup {
                 brushColor?: string;
                 brushSize?: number;
                 angled?: boolean;
-                screenHeight?: number;
-                screenWidth?: number;
                 brushHead?: EHeadStyle;
                 outlineColor?: string;
             }
@@ -157,7 +159,7 @@ export declare namespace Markup {
             const DEFAULT: ILine;
         }
         namespace FreePaint {
-            interface IPaint {
+            interface IPaint extends IElement {
                 pathType: "PLAIN";
                 path: string;
                 transform: string;
@@ -165,8 +167,6 @@ export declare namespace Markup {
                 brushSize?: number;
                 brushHead?: EHeadStyle;
                 outlineColor?: string;
-                screenHeight?: number;
-                screenWidth?: number;
             }
             const DEFAULT: IPaint;
         }
@@ -178,9 +178,8 @@ export declare namespace Markup {
                 Both = "BOTH",
                 Terrain = "TERRAIN"
             }
-            interface IPolygon {
+            interface IPolygon extends IElement {
                 type: "POLYGON";
-                id: any;
                 positions: Cartes.ICartes3[];
                 color?: string;
                 outlineColor?: string;
@@ -192,9 +191,8 @@ export declare namespace Markup {
             const DEFAULT: IPolygon;
         }
         namespace Polyline {
-            interface IPolyline {
+            interface IPolyline extends IElement {
                 type: "POLYLINE";
-                id: string;
                 positions: Cartes.ICartes3[];
                 color?: string;
                 outlineWidth?: number;
@@ -203,9 +201,8 @@ export declare namespace Markup {
             const DEFAULT: IPolyline;
         }
         namespace Circle {
-            interface ICircle {
+            interface ICircle extends IElement {
                 type: "CIRCLE";
-                id: string;
                 position: Cartes.ICartes3;
                 radius: number;
                 color?: string;
@@ -217,9 +214,8 @@ export declare namespace Markup {
             const DEFAULT: ICircle;
         }
         namespace Walkscore {
-            interface IWalkscore {
+            interface IWalkscore extends IElement {
                 type: "WALKSCORE";
-                id: string;
                 cartesian: Cartes.ICartes3;
                 details: number;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bruce-models",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "",
   "keywords": [],
   "main": "dist/bruce-models.umd.js",