zek 17.3.34 → 17.3.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/components/base.component.mjs +1 -1
- package/esm2022/lib/components/core-ui.component.mjs +5 -5
- package/esm2022/lib/components/core.component.mjs +1 -1
- package/esm2022/lib/components/edit-base.component.mjs +17 -17
- package/esm2022/lib/components/list-base.component.mjs +18 -18
- package/esm2022/lib/modules/age/age.pipe.mjs +2 -2
- package/esm2022/lib/modules/alert/toast/toast.mjs +3 -3
- package/esm2022/lib/modules/bb/bb.component.mjs +2 -2
- package/esm2022/lib/modules/card/card/card.mjs +1 -1
- package/esm2022/lib/modules/datepicker/date-value-accessor.mjs +6 -6
- package/esm2022/lib/modules/file-viewer/file-viewer.mjs +2 -2
- package/esm2022/lib/modules/google-login-button/google-login-button.mjs +2 -2
- package/esm2022/lib/modules/google-login-button/loader.mjs +1 -1
- package/esm2022/lib/modules/modal/modal/modal.component.mjs +5 -5
- package/esm2022/lib/modules/numeric/numeric.directive.mjs +6 -6
- package/esm2022/lib/modules/pager/pager/pager.mjs +1 -1
- package/esm2022/lib/modules/progress/progress.mjs +3 -3
- package/esm2022/lib/modules/radio/radio.mjs +2 -2
- package/esm2022/lib/modules/recaptcha/loader.mjs +3 -3
- package/esm2022/lib/modules/select/select.mjs +5 -5
- package/esm2022/lib/modules/select2/select2.mjs +2 -2
- package/esm2022/lib/modules/select2-multiple/select2-multiple.mjs +3 -3
- package/esm2022/lib/modules/validators/validator.mjs +4 -4
- package/esm2022/lib/modules/wizard/wizard/wizard.mjs +2 -2
- package/esm2022/lib/services/alert.service.mjs +2 -2
- package/esm2022/lib/services/auth-guard.service.mjs +17 -2
- package/esm2022/lib/services/auth.service.mjs +10 -10
- package/esm2022/lib/services/http-error-handler.service.mjs +3 -3
- package/esm2022/lib/services/web.api.mjs +2 -2
- package/esm2022/lib/utils/array-helper.mjs +8 -8
- package/esm2022/lib/utils/bootstrap.helper.mjs +1 -1
- package/esm2022/lib/utils/convert.mjs +2 -2
- package/esm2022/lib/utils/css-helper.mjs +6 -6
- package/esm2022/lib/utils/date-helper.mjs +32 -47
- package/esm2022/lib/utils/error-helper.mjs +3 -3
- package/esm2022/lib/utils/excel-helper.mjs +2 -2
- package/esm2022/lib/utils/file.helper.mjs +4 -4
- package/esm2022/lib/utils/filter-helper.mjs +2 -2
- package/esm2022/lib/utils/handler.mjs +5 -5
- package/esm2022/lib/utils/html-helper.mjs +4 -4
- package/esm2022/lib/utils/jwt-helper.mjs +4 -4
- package/esm2022/lib/utils/math-helper.mjs +1 -3
- package/esm2022/lib/utils/object-helper.mjs +3 -5
- package/esm2022/lib/utils/overlap-helper.mjs +4 -4
- package/esm2022/lib/utils/storage-helper.mjs +3 -3
- package/esm2022/lib/utils/string-helper.mjs +6 -5
- package/esm2022/lib/utils/thenBy.mjs +9 -9
- package/esm2022/lib/utils/time-helper.mjs +12 -13
- package/esm2022/lib/utils/tmp-helper.mjs +2 -2
- package/esm2022/lib/utils/url-helper.mjs +6 -6
- package/fesm2022/zek.mjs +200 -206
- package/fesm2022/zek.mjs.map +1 -1
- package/lib/services/alert.service.d.ts +2 -2
- package/lib/services/auth-guard.service.d.ts +2 -1
- package/lib/utils/bootstrap.helper.d.ts +1 -1
- package/lib/utils/handler.d.ts +1 -1
- package/lib/utils/thenBy.d.ts +1 -1
- package/package.json +1 -1
|
@@ -18,8 +18,8 @@ export class ObjectHelper {
|
|
|
18
18
|
return true;
|
|
19
19
|
// if (typeof obj === 'undefined' || obj === null)
|
|
20
20
|
// return true;
|
|
21
|
-
for (
|
|
22
|
-
|
|
21
|
+
for (const prop in obj) {
|
|
22
|
+
const v = obj[prop];
|
|
23
23
|
if (!this.isEmptyValue(v))
|
|
24
24
|
return false;
|
|
25
25
|
// if (typeof (obj[prop]) !== undefined && obj[prop] !== null && obj[prop] !== '') {
|
|
@@ -34,7 +34,6 @@ export class ObjectHelper {
|
|
|
34
34
|
static deleteNullKeys(val) {
|
|
35
35
|
this.deleteNullFields(val);
|
|
36
36
|
}
|
|
37
|
-
;
|
|
38
37
|
static deleteNullFields(val) {
|
|
39
38
|
if (!val)
|
|
40
39
|
return;
|
|
@@ -46,7 +45,6 @@ export class ObjectHelper {
|
|
|
46
45
|
}
|
|
47
46
|
return val;
|
|
48
47
|
}
|
|
49
|
-
;
|
|
50
48
|
static assignFields(target, source) {
|
|
51
49
|
let t = target;
|
|
52
50
|
let s = source;
|
|
@@ -79,4 +77,4 @@ export class ObjectHelper {
|
|
|
79
77
|
return output;
|
|
80
78
|
}
|
|
81
79
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JqZWN0LWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3play9zcmMvbGliL3V0aWxzL29iamVjdC1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsTUFBTSxPQUFPLFlBQVk7SUFDckIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFVO1FBQ3ZCLE9BQU8sT0FBTyxLQUFLLEtBQUssV0FBVyxJQUFJLEtBQUssS0FBSyxJQUFJLENBQUM7SUFDMUQsQ0FBQztJQUVELE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBVTtRQUN0QixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxDQUFDO0lBQzlELENBQUM7SUFHRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFlBQVksQ0FBQyxLQUFVO1FBQzFCLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDakgsQ0FBQztJQUdELE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBUTtRQUNuQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUM7WUFDcEIsT0FBTyxJQUFJLENBQUM7UUFDaEIsa0RBQWtEO1FBQ2xELG1CQUFtQjtRQUNuQixLQUFLLE1BQU0sSUFBSSxJQUFJLEdBQUcsRUFBRSxDQUFDO1lBQ3JCLE1BQU0sQ0FBQyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNwQixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7Z0JBQ3JCLE9BQU8sS0FBSyxDQUFDO1lBQ2pCLG9GQUFvRjtZQUNwRixvQkFBb0I7WUFDcEIsSUFBSTtRQUNSLENBQUM7UUFFRCxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBR0Q7O09BRUc7SUFDSCxNQUFNLENBQUMsY0FBYyxDQUFDLEdBQVE7UUFDMUIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFRCxNQUFNLENBQUMsZ0JBQWdCLENBQWUsR0FBTTtRQUN4QyxJQUFJLENBQUMsR0FBRztZQUFFLE9BQU87UUFDakIsS0FBSyxJQUFJLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNsQixJQUFJLEdBQUcsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDbkIsSUFBSSxHQUFHLEtBQUssU0FBUyxJQUFJLEdBQUcsS0FBSyxJQUFJLEVBQUUsQ0FBQztnQkFDcEMsT0FBTyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDcEIsQ0FBQztRQUNMLENBQUM7UUFDRCxPQUFPLEdBQUcsQ0FBQTtJQUNkLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUE2QixNQUFTLEVBQUUsTUFBUztRQUNoRSxJQUFJLENBQUMsR0FBUSxNQUFNLENBQUM7UUFDcEIsSUFBSSxDQUFDLEdBQVEsTUFBTSxDQUFDO1FBQ3BCLEtBQUssTUFBTSxHQUFHLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1lBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNmLElBQUksT0FBTyxDQUFDLEtBQUssV0FBVyxFQUFFLENBQUM7Z0JBQzNCLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDZixDQUFDO1FBQ0wsQ0FBQztRQUNELE9BQU8sTUFBTSxDQUFDO0lBQ2xCLENBQUM7SUFJRCxNQUFNLENBQUMsUUFBUSxDQUFVLEtBQVU7UUFDL0IsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDO1lBQ3JCLE9BQU8sS0FBSyxDQUFDO1FBRWpCLElBQUksTUFBTSxHQUFRLEVBQUUsQ0FBQztRQUNyQixJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUN2QixNQUFNLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUM5QyxDQUFDO2FBQ0ksQ0FBQztZQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBUSxFQUFFLEVBQUU7Z0JBQ3BDLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFFckIsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7b0JBQ25CLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUVuQyxDQUFDO3FCQUFNLENBQUM7b0JBQ0osTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3hDLENBQUM7WUFDTCxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7UUFFRCxPQUFPLE1BQVcsQ0FBQztJQUN2QixDQUFDO0NBRUoiLCJzb3VyY2VzQ29udGVudCI6WyJcclxuZXhwb3J0IGNsYXNzIE9iamVjdEhlbHBlciB7XHJcbiAgICBzdGF0aWMgaXNEZWZpbmVkKHZhbHVlOiBhbnkpIHtcclxuICAgICAgICByZXR1cm4gdHlwZW9mIHZhbHVlICE9PSAndW5kZWZpbmVkJyAmJiB2YWx1ZSAhPT0gbnVsbDtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgaXNPYmplY3QodmFsdWU6IGFueSkge1xyXG4gICAgICAgIHJldHVybiB0aGlzLmlzRGVmaW5lZCh2YWx1ZSkgJiYgdHlwZW9mIHZhbHVlID09PSAnb2JqZWN0JztcclxuICAgIH1cclxuXHJcblxyXG4gICAgLyoqXHJcbiAgICAgKiBDaGVjayBpZiB0aGUgb2JqZWN0IGlzIGEgc3RyaW5nIG9yIGFycmF5IGJlZm9yZSBldmFsdWF0aW5nIHRoZSBsZW5ndGggYXR0cmlidXRlLlxyXG4gICAgICogVGhpcyBhdm9pZHMgZmFsc2VseSByZWplY3Rpbmcgb2JqZWN0cyB0aGF0IGNvbnRhaW4gYSBjdXN0b20gbGVuZ3RoIGF0dHJpYnV0ZS5cclxuICAgICAqIEZvciBleGFtcGxlLCB0aGUgb2JqZWN0IHtpZDogMSwgbGVuZ3RoOiAwLCB3aWR0aDogMH0gc2hvdWxkIG5vdCBiZSByZXR1cm5lZCBhcyBlbXB0eS5cclxuICAgICAqL1xyXG4gICAgc3RhdGljIGlzRW1wdHlWYWx1ZSh2YWx1ZTogYW55KTogYm9vbGVhbiB7XHJcbiAgICAgICAgcmV0dXJuICF0aGlzLmlzRGVmaW5lZCh2YWx1ZSkgfHwgKCh0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnIHx8IEFycmF5LmlzQXJyYXkodmFsdWUpKSAmJiB2YWx1ZS5sZW5ndGggPT09IDApO1xyXG4gICAgfVxyXG5cclxuXHJcbiAgICBzdGF0aWMgaXNFbXB0eShvYmo6IGFueSkge1xyXG4gICAgICAgIGlmICghdGhpcy5pc0RlZmluZWQob2JqKSlcclxuICAgICAgICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICAgICAgLy8gaWYgKHR5cGVvZiBvYmogPT09ICd1bmRlZmluZWQnIHx8IG9iaiA9PT0gbnVsbClcclxuICAgICAgICAvLyAgICAgcmV0dXJuIHRydWU7XHJcbiAgICAgICAgZm9yIChjb25zdCBwcm9wIGluIG9iaikge1xyXG4gICAgICAgICAgICBjb25zdCB2ID0gb2JqW3Byb3BdO1xyXG4gICAgICAgICAgICBpZiAoIXRoaXMuaXNFbXB0eVZhbHVlKHYpKVxyXG4gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlO1xyXG4gICAgICAgICAgICAvLyBpZiAodHlwZW9mIChvYmpbcHJvcF0pICE9PSB1bmRlZmluZWQgJiYgb2JqW3Byb3BdICE9PSBudWxsICYmIG9ialtwcm9wXSAhPT0gJycpIHtcclxuICAgICAgICAgICAgLy8gICAgIHJldHVybiBmYWxzZTtcclxuICAgICAgICAgICAgLy8gfVxyXG4gICAgICAgIH1cclxuXHJcbiAgICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICB9XHJcblxyXG5cclxuICAgIC8qKlxyXG4gICAgICogQGRlcHJlY2F0ZWQgVGhlIG1ldGhvZCBzaG91bGQgbm90IGJlIHVzZWQuIHBsZWFzZSB1c2UgZGVsZXRlTnVsbEZpZWxkc1xyXG4gICAgICovXHJcbiAgICBzdGF0aWMgZGVsZXRlTnVsbEtleXModmFsOiBhbnkpIHtcclxuICAgICAgICB0aGlzLmRlbGV0ZU51bGxGaWVsZHModmFsKTtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgZGVsZXRlTnVsbEZpZWxkczxUIGV4dGVuZHMge30+KHZhbDogVCkge1xyXG4gICAgICAgIGlmICghdmFsKSByZXR1cm47XHJcbiAgICAgICAgZm9yIChsZXQga2V5IGluIHZhbCkge1xyXG4gICAgICAgICAgICBsZXQgdG1wID0gdmFsW2tleV07XHJcbiAgICAgICAgICAgIGlmICh0bXAgPT09IHVuZGVmaW5lZCB8fCB0bXAgPT09IG51bGwpIHtcclxuICAgICAgICAgICAgICAgIGRlbGV0ZSB2YWxba2V5XTtcclxuICAgICAgICAgICAgfVxyXG4gICAgICAgIH1cclxuICAgICAgICByZXR1cm4gdmFsXHJcbiAgICB9XHJcblxyXG4gICAgc3RhdGljIGFzc2lnbkZpZWxkczxUIGV4dGVuZHMge30sIFUgZXh0ZW5kcyB7fT4odGFyZ2V0OiBULCBzb3VyY2U6IFUpOiBUIHtcclxuICAgICAgICBsZXQgdDogYW55ID0gdGFyZ2V0O1xyXG4gICAgICAgIGxldCBzOiBhbnkgPSBzb3VyY2U7XHJcbiAgICAgICAgZm9yIChjb25zdCBrZXkgb2YgT2JqZWN0LmtleXModGFyZ2V0KSkge1xyXG4gICAgICAgICAgICBsZXQgdiA9IHNba2V5XTtcclxuICAgICAgICAgICAgaWYgKHR5cGVvZiB2ICE9PSAndW5kZWZpbmVkJykge1xyXG4gICAgICAgICAgICAgICAgdFtrZXldID0gdjtcclxuICAgICAgICAgICAgfVxyXG4gICAgICAgIH1cclxuICAgICAgICByZXR1cm4gdGFyZ2V0O1xyXG4gICAgfVxyXG5cclxuXHJcblxyXG4gICAgc3RhdGljIGRlZXBDb3B5PFQgPSBhbnk+KHZhbHVlOiBhbnkpOiBUIHtcclxuICAgICAgICBpZiAoIXRoaXMuaXNPYmplY3QodmFsdWUpKVxyXG4gICAgICAgICAgICByZXR1cm4gdmFsdWU7XHJcblxyXG4gICAgICAgIGxldCBvdXRwdXQ6IGFueSA9IHt9O1xyXG4gICAgICAgIGlmIChBcnJheS5pc0FycmF5KHZhbHVlKSkge1xyXG4gICAgICAgICAgICBvdXRwdXQgPSB2YWx1ZS5tYXAoeCA9PiB0aGlzLmRlZXBDb3B5KHgpKTtcclxuICAgICAgICB9XHJcbiAgICAgICAgZWxzZSB7XHJcbiAgICAgICAgICAgIE9iamVjdC5rZXlzKHZhbHVlKS5mb3JFYWNoKChrZXk6IGFueSkgPT4ge1xyXG4gICAgICAgICAgICAgICAgY29uc3QgdiA9IHZhbHVlW2tleV07XHJcblxyXG4gICAgICAgICAgICAgICAgaWYgKHRoaXMuaXNPYmplY3QodikpIHtcclxuICAgICAgICAgICAgICAgICAgICBvdXRwdXRba2V5XSA9IHRoaXMuZGVlcENvcHkodik7XHJcblxyXG4gICAgICAgICAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgICAgICAgICBPYmplY3QuYXNzaWduKG91dHB1dCwgeyBba2V5XTogdiB9KTtcclxuICAgICAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gb3V0cHV0IGFzIFQ7XHJcbiAgICB9XHJcblxyXG59Il19
|
|
@@ -37,8 +37,8 @@ export class OverlapHelper {
|
|
|
37
37
|
}
|
|
38
38
|
return end2 == end1 ? PeriodRelation.EnclosingEndTouching : PeriodRelation.Enclosing;
|
|
39
39
|
}
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
const periodContainsMyStart = this.hasInside(start2, end2, start1);
|
|
41
|
+
const periodContainsMyEnd = this.hasInside(start2, end2, end1);
|
|
42
42
|
if (periodContainsMyStart && periodContainsMyEnd) {
|
|
43
43
|
if (start2 == start1) {
|
|
44
44
|
return PeriodRelation.InsideStartTouching;
|
|
@@ -63,11 +63,11 @@ export class OverlapHelper {
|
|
|
63
63
|
return this.hasInside(start1, end1, start2) || this.hasInside(start1, end1, end2) || (start2 < start1 && end2 > end1);
|
|
64
64
|
}
|
|
65
65
|
static overlaps(start1, end1, start2, end2) {
|
|
66
|
-
|
|
66
|
+
const relation = this.getRelation(start1, end1, start2, end2);
|
|
67
67
|
return relation != PeriodRelation.After &&
|
|
68
68
|
relation != PeriodRelation.StartTouching &&
|
|
69
69
|
relation != PeriodRelation.EndTouching &&
|
|
70
70
|
relation != PeriodRelation.Before;
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3ZlcmxhcC1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy96ZWsvc3JjL2xpYi91dGlscy9vdmVybGFwLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQU4sSUFBWSxjQWNYO0FBZEQsV0FBWSxjQUFjO0lBQ3RCLHFEQUFLLENBQUE7SUFDTCxxRUFBYSxDQUFBO0lBQ2IsaUVBQVcsQ0FBQTtJQUNYLGlGQUFtQixDQUFBO0lBQ25CLHVGQUFzQixDQUFBO0lBQ3RCLDZEQUFTLENBQUE7SUFDVCxtRkFBb0IsQ0FBQTtJQUNwQiwrREFBVSxDQUFBO0lBQ1YsdURBQU0sQ0FBQTtJQUNOLDZFQUFpQixDQUFBO0lBQ2pCLDhEQUFTLENBQUE7SUFDVCxrRUFBVyxDQUFBO0lBQ1gsd0RBQU0sQ0FBQTtBQUNWLENBQUMsRUFkVyxjQUFjLEtBQWQsY0FBYyxRQWN6QjtBQUVELE1BQU0sT0FBTyxhQUFhO0lBR3RCLE1BQU0sQ0FBQyxXQUFXLENBQUMsTUFBWSxFQUFFLElBQVUsRUFBRSxNQUFZLEVBQUUsSUFBVTtRQUNqRSxJQUFJLElBQUksR0FBRyxNQUFNLEVBQUUsQ0FBQztZQUNoQixPQUFPLGNBQWMsQ0FBQyxLQUFLLENBQUM7UUFDaEMsQ0FBQztRQUNELElBQUksTUFBTSxHQUFHLElBQUksRUFBRSxDQUFDO1lBQ2hCLE9BQU8sY0FBYyxDQUFDLE1BQU0sQ0FBQztRQUNqQyxDQUFDO1FBQ0QsSUFBSSxNQUFNLElBQUksTUFBTSxJQUFJLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUNuQyxPQUFPLGNBQWMsQ0FBQyxVQUFVLENBQUM7UUFDckMsQ0FBQztRQUNELElBQUksSUFBSSxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ2pCLE9BQU8sY0FBYyxDQUFDLGFBQWEsQ0FBQztRQUN4QyxDQUFDO1FBQ0QsSUFBSSxNQUFNLElBQUksSUFBSSxFQUFFLENBQUM7WUFDakIsT0FB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bnRlbnQiOlsiZXhwb3J0IGVudW0gUGVyaW9kUmVsYXRpb24ge1xyXG4gICAgQWZ0ZXIsXHJcbiAgICBTdGFydFRvdWNoaW5nLFxyXG4gICAgU3RhcnRJbnNpZGUsXHJcbiAgICBJbnNpZGVTdGFydFRvdWNoaW5nLFxyXG4gICAgRW5jbG9zaW5nU3RhcnRUb3VjaGluZyxcclxuICAgIEVuY2xvc2luZyxcclxuICAgIEVuY2xvc2luZ0VuZFRvdWNoaW5nLFxyXG4gICAgRXhhY3RNYXRjaCxcclxuICAgIEluc2lkZSxcclxuICAgIEluc2lkZUVuZFRvdWNoaW5nLFxyXG4gICAgRW5kSW5zaWRlLFxyXG4gICAgRW5kVG91Y2hpbmcsXHJcbiAgICBCZWZvcmUsXHJcbn1cclxuXHJcbmV4cG9ydCBjbGFzcyBPdmVybGFwSGVscGVyIHtcclxuXHJcblxyXG4gICAgc3RhdGljIGdldFJlbGF0aW9uKHN0YXJ0MTogRGF0ZSwgZW5kMTogRGF0ZSwgc3RhcnQyOiBEYXRlLCBlbmQyOiBEYXRlKTogUGVyaW9kUmVsYXRpb24ge1xyXG4gICAgICAgIGlmIChlbmQyIDwgc3RhcnQxKSB7XHJcbiAgICAgICAgICAgIHJldHVybiBQZXJpb2RSZWxhdGlvbi5BZnRlcjtcclxuICAgICAgICB9XHJcbiAgICAgICAgaWYgKHN0YXJ0MiA+IGVuZDEpIHtcclxuICAgICAgICAgICAgcmV0dXJuIFBlcmlvZFJlbGF0aW9uLkJlZm9yZTtcclxuICAgICAgICB9XHJcbiAgICAgICAgaWYgKHN0YXJ0MiA9PSBzdGFydDEgJiYgZW5kMiA9PSBlbmQxKSB7XHJcbiAgICAgICAgICAgIHJldHVybiBQZXJpb2RSZWxhdGlvbi5FeGFjdE1hdGNoO1xyXG4gICAgICAgIH1cclxuICAgICAgICBpZiAoZW5kMiA9PSBzdGFydDEpIHtcclxuICAgICAgICAgICAgcmV0dXJuIFBlcmlvZFJlbGF0aW9uLlN0YXJ0VG91Y2hpbmc7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIGlmIChzdGFydDIgPT0gZW5kMSkge1xyXG4gICAgICAgICAgICByZXR1cm4gUGVyaW9kUmVsYXRpb24uRW5kVG91Y2hpbmc7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIGlmICh0aGlzLmhhc0luc2lkZTIoc3RhcnQxLCBlbmQxLCBzdGFydDIsIGVuZDIpKSB7XHJcbiAgICAgICAgICAgIGlmIChzdGFydDIgPT0gc3RhcnQxKSB7XHJcbiAgICAgICAgICAgICAgICByZXR1cm4gUGVyaW9kUmVsYXRpb24uRW5jbG9zaW5nU3RhcnRUb3VjaGluZztcclxuICAgICAgICAgICAgfVxyXG4gICAgICAgICAgICByZXR1cm4gZW5kMiA9PSBlbmQxID8gUGVyaW9kUmVsYXRpb24uRW5jbG9zaW5nRW5kVG91Y2hpbmcgOiBQZXJpb2RSZWxhdGlvbi5FbmNsb3Npbmc7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIGNvbnN0IHBlcmlvZENvbnRhaW5zTXlTdGFydCA9IHRoaXMuaGFzSW5zaWRlKHN0YXJ0MiwgZW5kMiwgc3RhcnQxKTtcclxuICAgICAgICBjb25zdCBwZXJpb2RDb250YWluc015RW5kID0gdGhpcy5oYXNJbnNpZGUoc3RhcnQyLCBlbmQyLCBlbmQxKTtcclxuICAgICAgICBpZiAocGVyaW9kQ29udGFpbnNNeVN0YXJ0ICYmIHBlcmlvZENvbnRhaW5zTXlFbmQpIHtcclxuICAgICAgICAgICAgaWYgKHN0YXJ0MiA9PSBzdGFydDEpIHtcclxuICAgICAgICAgICAgICAgIHJldHVybiBQZXJpb2RSZWxhdGlvbi5JbnNpZGVTdGFydFRvdWNoaW5nO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgICAgIHJldHVybiBlbmQyID09IGVuZDEgPyBQZXJpb2RSZWxhdGlvbi5JbnNpZGVFbmRUb3VjaGluZyA6IFBlcmlvZFJlbGF0aW9uLkluc2lkZTtcclxuICAgICAgICB9XHJcbiAgICAgICAgaWYgKHBlcmlvZENvbnRhaW5zTXlTdGFydCkge1xyXG4gICAgICAgICAgICByZXR1cm4gUGVyaW9kUmVsYXRpb24uU3RhcnRJbnNpZGU7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIGlmIChwZXJpb2RDb250YWluc015RW5kKSB7XHJcbiAgICAgICAgICAgIHJldHVybiBQZXJpb2RSZWxhdGlvbi5FbmRJbnNpZGU7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoXCJpbnZhbGlkIHBlcmlvZCByZWxhdGlvbiBvZiAnXCIgKyBzdGFydDEgKyBcIi1cIiArIGVuZDEgKyBcIicgYW5kICdcIiArIHN0YXJ0MiArIFwiLVwiICsgZW5kMiArIFwiJ1wiKTtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgaGFzSW5zaWRlKHN0YXJ0OiBEYXRlLCBlbmQ6IERhdGUsIGRhdGU6IERhdGUpOiBib29sZWFuIHtcclxuICAgICAgICByZXR1cm4gZGF0ZSA+PSBzdGFydCAmJiBkYXRlIDw9IGVuZDtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgaGFzSW5zaWRlMihzdGFydDE6IERhdGUsIGVuZDE6IERhdGUsIHN0YXJ0MjogRGF0ZSwgZW5kMjogRGF0ZSk6IGJvb2xlYW4ge1xyXG4gICAgICAgIHJldHVybiB0aGlzLmhhc0luc2lkZShzdGFydDEsIGVuZDEsIHN0YXJ0MikgJiYgdGhpcy5oYXNJbnNpZGUoc3RhcnQxLCBlbmQxLCBlbmQyKTtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgaW50ZXJzZWN0cyhzdGFydDE6IERhdGUsIGVuZDE6IERhdGUsIHN0YXJ0MjogRGF0ZSwgZW5kMjogRGF0ZSk6IGJvb2xlYW4ge1xyXG4gICAgICAgIHJldHVybiB0aGlzLmhhc0luc2lkZShzdGFydDEsIGVuZDEsIHN0YXJ0MikgfHwgdGhpcy5oYXNJbnNpZGUoc3RhcnQxLCBlbmQxLCBlbmQyKSB8fCAoc3RhcnQyIDwgc3RhcnQxICYmIGVuZDIgPiBlbmQxKTtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgb3ZlcmxhcHMoc3RhcnQxOiBEYXRlLCBlbmQxOiBEYXRlLCBzdGFydDI6IERhdGUsIGVuZDI6IERhdGUpOiBib29sZWFuIHtcclxuICAgICAgICBjb25zdCByZWxhdGlvbiA9IHRoaXMuZ2V0UmVsYXRpb24oc3RhcnQxLCBlbmQxLCBzdGFydDIsIGVuZDIpO1xyXG4gICAgICAgIHJldHVybiByZWxhdGlvbiAhPSBQZXJpb2RSZWxhdGlvbi5BZnRlciAmJlxyXG4gICAgICAgICAgICByZWxhdGlvbiAhPSBQZXJpb2RSZWxhdGlvbi5TdGFydFRvdWNoaW5nICYmXHJcbiAgICAgICAgICAgIHJlbGF0aW9uICE9IFBlcmlvZFJlbGF0aW9uLkVuZFRvdWNoaW5nICYmXHJcbiAgICAgICAgICAgIHJlbGF0aW9uICE9IFBlcmlvZFJlbGF0aW9uLkJlZm9yZTtcclxuICAgIH1cclxuXHJcblxyXG59Il19
|
|
@@ -13,16 +13,16 @@ export class StorageHelper {
|
|
|
13
13
|
localStorage.setItem(key, value);
|
|
14
14
|
}
|
|
15
15
|
static get(key) {
|
|
16
|
-
|
|
16
|
+
const str = localStorage.getItem(key);
|
|
17
17
|
if (!str) {
|
|
18
18
|
return null;
|
|
19
19
|
}
|
|
20
20
|
// assume it is an object that has been stringified
|
|
21
21
|
if (str[0] === '{') {
|
|
22
|
-
|
|
22
|
+
const v = JSON.parse(str);
|
|
23
23
|
return v;
|
|
24
24
|
}
|
|
25
25
|
return str;
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy96ZWsvc3JjL2xpYi91dGlscy9zdG9yYWdlLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLE9BQU8sYUFBYTtJQUN0QixNQUFNLENBQUMsR0FBRyxDQUFDLEdBQVcsRUFBRSxLQUFVO1FBQzlCLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUFDLE9BQU87UUFBQyxDQUFDO1FBRXJCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNULFlBQVksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDN0IsT0FBTztRQUNYLENBQUM7UUFFRCxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQzVCLEtBQUssR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2xDLENBQUM7UUFDRCxZQUFZLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBR0QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFXO1FBQ2xCLE1BQU0sR0FBRyxHQUFHLFlBQVksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdEMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQUMsT0FBTyxJQUFJLENBQUM7UUFBQyxDQUFDO1FBRTFCLG1EQUFtRDtRQUNuRCxJQUFJLEdBQUcsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztZQUNqQixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQzFCLE9BQU8sQ0FBQyxDQUFDO1FBQ2IsQ0FBQztRQUVELE9BQU8sR0FBRyxDQUFDO0lBQ2YsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIFN0b3JhZ2VIZWxwZXIge1xyXG4gICAgc3RhdGljIHNldChrZXk6IHN0cmluZywgdmFsdWU6IGFueSkge1xyXG4gICAgICAgIGlmICgha2V5KSB7IHJldHVybjsgfVxyXG5cclxuICAgICAgICBpZiAoIXZhbHVlKSB7XHJcbiAgICAgICAgICAgIGxvY2FsU3RvcmFnZS5yZW1vdmVJdGVtKGtleSk7XHJcbiAgICAgICAgICAgIHJldHVybjtcclxuICAgICAgICB9XHJcblxyXG4gICAgICAgIGlmICh0eXBlb2YgdmFsdWUgPT09IFwib2JqZWN0XCIpIHtcclxuICAgICAgICAgICAgdmFsdWUgPSBKU09OLnN0cmluZ2lmeSh2YWx1ZSk7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIGxvY2FsU3RvcmFnZS5zZXRJdGVtKGtleSwgdmFsdWUpO1xyXG4gICAgfVxyXG5cclxuXHJcbiAgICBzdGF0aWMgZ2V0KGtleTogc3RyaW5nKSB7XHJcbiAgICAgICAgY29uc3Qgc3RyID0gbG9jYWxTdG9yYWdlLmdldEl0ZW0oa2V5KTtcclxuICAgICAgICBpZiAoIXN0cikgeyByZXR1cm4gbnVsbDsgfVxyXG4gICAgXHJcbiAgICAgICAgLy8gYXNzdW1lIGl0IGlzIGFuIG9iamVjdCB0aGF0IGhhcyBiZWVuIHN0cmluZ2lmaWVkXHJcbiAgICAgICAgaWYgKHN0clswXSA9PT0gJ3snKSB7XHJcbiAgICAgICAgICAgIGNvbnN0IHYgPSBKU09OLnBhcnNlKHN0cik7XHJcbiAgICAgICAgICAgIHJldHVybiB2O1xyXG4gICAgICAgIH1cclxuICAgIFxyXG4gICAgICAgIHJldHVybiBzdHI7XHJcbiAgICB9XHJcbn0iXX0=
|
|
@@ -30,7 +30,7 @@ export class StringHelper {
|
|
|
30
30
|
static trim(val, ch) {
|
|
31
31
|
if (!val || !ch)
|
|
32
32
|
return val;
|
|
33
|
-
|
|
33
|
+
let start = 0, end = val.length;
|
|
34
34
|
while (start < end && val[start] === ch)
|
|
35
35
|
++start;
|
|
36
36
|
while (end > start && val[end - 1] === ch)
|
|
@@ -40,7 +40,8 @@ export class StringHelper {
|
|
|
40
40
|
static trimStart(val, ch) {
|
|
41
41
|
if (!val || !ch)
|
|
42
42
|
return val;
|
|
43
|
-
|
|
43
|
+
let start = 0;
|
|
44
|
+
const end = val.length;
|
|
44
45
|
while (start < end && val[start] === ch)
|
|
45
46
|
++start;
|
|
46
47
|
return (start > 0) ? val.substring(start, end) : val;
|
|
@@ -48,7 +49,7 @@ export class StringHelper {
|
|
|
48
49
|
static trimEnd(val, ch) {
|
|
49
50
|
if (!val || !ch)
|
|
50
51
|
return val;
|
|
51
|
-
|
|
52
|
+
let start = 0, end = val.length;
|
|
52
53
|
while (end > start && val[end - 1] === ch)
|
|
53
54
|
--end;
|
|
54
55
|
return (end < val.length) ? val.substring(start, end) : val;
|
|
@@ -62,7 +63,7 @@ export class StringHelper {
|
|
|
62
63
|
static trimAny(val, chars) {
|
|
63
64
|
if (!val || !chars)
|
|
64
65
|
return val;
|
|
65
|
-
|
|
66
|
+
let start = 0, end = val.length;
|
|
66
67
|
while (start < end && chars.indexOf(val[start]) >= 0)
|
|
67
68
|
++start;
|
|
68
69
|
while (end > start && chars.indexOf(val[end - 1]) >= 0)
|
|
@@ -70,4 +71,4 @@ export class StringHelper {
|
|
|
70
71
|
return (start > 0 || end < val.length) ? val.substring(start, end) : val;
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RyaW5nLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3play9zcmMvbGliL3V0aWxzL3N0cmluZy1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLFlBQVk7SUFDckIsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFpQjtRQUMvQixJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQztZQUNsQixPQUFPLENBQUMsQ0FBQztRQUViLE9BQU8sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFRCxNQUFNLENBQUMsYUFBYSxDQUFDLEtBQXFCO1FBQ3RDLE9BQU8sT0FBTyxLQUFLLEtBQUssV0FBVyxJQUFJLEtBQUssSUFBSSxJQUFJLElBQUksQ0FBQyxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsQ0FBQyxJQUFJLEtBQUssQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDaEgsQ0FBQztJQUNELE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxLQUFxQjtRQUMzQyxPQUFPLE9BQU8sS0FBSyxLQUFLLFdBQVcsSUFBSSxLQUFLLElBQUksSUFBSSxJQUFJLENBQUMsQ0FBQyxPQUFPLEtBQUssS0FBSyxRQUFRLENBQUMsSUFBSSxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3ZILENBQUM7SUFDRCxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQThCO1FBQ3pDLElBQUksQ0FBQyxHQUFHO1lBQ0osT0FBTyxHQUFHLENBQUM7UUFDZixPQUFPLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN0QixDQUFDO0lBQ0QsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFxQjtRQUNwQyxPQUFPLE9BQU8sS0FBSyxLQUFLLFdBQVcsSUFBSSxLQUFLLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztJQUN0RSxDQUFDO0lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUE4QixFQUFFLFNBQWlCLEVBQUUsSUFBK0I7UUFDMUYsSUFBSSxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDMUIsT0FBTyxJQUFJLENBQUM7UUFDaEIsQ0FBQztRQUNELElBQUksSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQzNCLE9BQU8sR0FBRyxDQUFDO1FBQ2YsQ0FBQztRQUVELE9BQU8sR0FBRyxHQUFHLFNBQVMsR0FBRyxJQUFJLENBQUM7SUFDbEMsQ0FBQztJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBa0IsRUFBRSxFQUFVO1FBQ3RDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxFQUFFO1lBQ1gsT0FBTyxHQUFHLENBQUM7UUFFZixJQUFJLEtBQUssR0FBRyxDQUFDLEVBQ1QsR0FBRyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUM7UUFFckIsT0FBTyxLQUFLLEdBQUcsR0FBRyxJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFO1lBQ25DLEVBQUUsS0FBSyxDQUFDO1FBRVosT0FBTyxHQUFHLEdBQUcsS0FBSyxJQUFJLEdBQUcsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRTtZQUNyQyxFQUFFLEdBQUcsQ0FBQztRQUVWLE9BQU8sQ0FBQyxLQUFLLEdBQUcsQ0FBQyxJQUFJLEdBQUcsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7SUFDN0UsQ0FBQztJQUNELE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBa0IsRUFBRSxFQUFVO1FBQzNDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxFQUFFO1lBQ1gsT0FBTyxHQUFHLENBQUM7UUFFZixJQUFJLEtBQUssR0FBRyxDQUFDLENBQUE7UUFDYixNQUFNLEdBQUcsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDO1FBRXZCLE9BQU8sS0FBSyxHQUFHLEdBQUcsSUFBSSxHQUFHLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRTtZQUNuQyxFQUFFLEtBQUssQ0FBQztRQUVaLE9BQU8sQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7SUFDekQsQ0FBQztJQUNELE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBa0IsRUFBRSxFQUFVO1FBQ3pDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxFQUFFO1lBQ1gsT0FBTyxHQUFHLENBQUM7UUFFZixJQUFJLEtBQUssR0FBRyxDQUFDLEVBQ1QsR0FBRyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUM7UUFFckIsT0FBTyxHQUFHLEdBQUcsS0FBSyxJQUFJLEdBQUcsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRTtZQUNyQyxFQUFFLEdBQUcsQ0FBQztRQUVWLE9BQU8sQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDO0lBQ2hFLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNILE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBa0IsRUFBRSxLQUFhO1FBQzVDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLO1lBQ2QsT0FBTyxHQUFHLENBQUM7UUFFZixJQUFJLEtBQUssR0FBRyxDQUFDLEVBQ1QsR0FBRyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUM7UUFFckIsT0FBTyxLQUFLLEdBQUcsR0FBRyxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FBQztZQUNoRCxFQUFFLEtBQUssQ0FBQztRQUVaLE9BQU8sR0FBRyxHQUFHLEtBQUssSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ2xELEVBQUUsR0FBRyxDQUFDO1FBRVYsT0FBTyxDQUFDLEtBQUssR0FBRyxDQUFDLElBQUksR0FBRyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztJQUM3RSxDQUFDO0NBRUoiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY2xhc3MgU3RyaW5nSGVscGVyIHtcclxuICAgIHN0YXRpYyBmaXJzdFVwcGVyKHY/OiBzdHJpbmcgfCBudWxsKSB7XHJcbiAgICAgICAgaWYgKCF2IHx8IHYubGVuZ3RoIDwgMSlcclxuICAgICAgICAgICAgcmV0dXJuIHY7XHJcblxyXG4gICAgICAgIHJldHVybiB2LmNoYXJBdCgwKS50b1VwcGVyQ2FzZSgpICsgdi5zbGljZSgxKTtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgaXNOdWxsT3JFbXB0eSh2YWx1ZT86IHN0cmluZyB8IG51bGwpIHtcclxuICAgICAgICByZXR1cm4gdHlwZW9mIHZhbHVlID09PSAndW5kZWZpbmVkJyB8fCB2YWx1ZSA9PSBudWxsIHx8ICgodHlwZW9mIHZhbHVlID09PSAnc3RyaW5nJykgJiYgdmFsdWUubGVuZ3RoID09PSAwKTtcclxuICAgIH1cclxuICAgIHN0YXRpYyBpc051bGxPcldoaXRlU3BhY2UodmFsdWU/OiBzdHJpbmcgfCBudWxsKSB7XHJcbiAgICAgICAgcmV0dXJuIHR5cGVvZiB2YWx1ZSA9PT0gJ3VuZGVmaW5lZCcgfHwgdmFsdWUgPT0gbnVsbCB8fCAoKHR5cGVvZiB2YWx1ZSA9PT0gJ3N0cmluZycpICYmIHZhbHVlLnRyaW0oKS5sZW5ndGggPT09IDApO1xyXG4gICAgfVxyXG4gICAgc3RhdGljIHRyeVRyaW0odmFsOiBzdHJpbmcgfCB1bmRlZmluZWQgfCBudWxsKSB7XHJcbiAgICAgICAgaWYgKCF2YWwpXHJcbiAgICAgICAgICAgIHJldHVybiB2YWw7XHJcbiAgICAgICAgcmV0dXJuIHZhbC50cmltKCk7XHJcbiAgICB9XHJcbiAgICBzdGF0aWMgaWZOdWxsRW1wdHkodmFsdWU/OiBzdHJpbmcgfCBudWxsKSB7XHJcbiAgICAgICAgcmV0dXJuIHR5cGVvZiB2YWx1ZSA9PT0gJ3VuZGVmaW5lZCcgfHwgdmFsdWUgPT0gbnVsbCA/ICcnIDogdmFsdWU7XHJcbiAgICB9XHJcbiAgICBzdGF0aWMgam9pbih2YWw6IHN0cmluZyB8IHVuZGVmaW5lZCB8IG51bGwsIHNlcGFyYXRvcjogc3RyaW5nLCBwYXJ0OiBzdHJpbmcgfCB1bmRlZmluZWQgfCBudWxsKSB7XHJcbiAgICAgICAgaWYgKHRoaXMuaXNOdWxsT3JFbXB0eSh2YWwpKSB7XHJcbiAgICAgICAgICAgIHJldHVybiBwYXJ0O1xyXG4gICAgICAgIH1cclxuICAgICAgICBpZiAodGhpcy5pc051bGxPckVtcHR5KHBhcnQpKSB7XHJcbiAgICAgICAgICAgIHJldHVybiB2YWw7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gdmFsICsgc2VwYXJhdG9yICsgcGFydDtcclxuICAgIH1cclxuICAgIHN0YXRpYyB0cmltKHZhbDogc3RyaW5nIHwgbnVsbCwgY2g6IHN0cmluZykge1xyXG4gICAgICAgIGlmICghdmFsIHx8ICFjaClcclxuICAgICAgICAgICAgcmV0dXJuIHZhbDtcclxuXHJcbiAgICAgICAgbGV0IHN0YXJ0ID0gMCxcclxuICAgICAgICAgICAgZW5kID0gdmFsLmxlbmd0aDtcclxuXHJcbiAgICAgICAgd2hpbGUgKHN0YXJ0IDwgZW5kICYmIHZhbFtzdGFydF0gPT09IGNoKVxyXG4gICAgICAgICAgICArK3N0YXJ0O1xyXG5cclxuICAgICAgICB3aGlsZSAoZW5kID4gc3RhcnQgJiYgdmFsW2VuZCAtIDFdID09PSBjaClcclxuICAgICAgICAgICAgLS1lbmQ7XHJcblxyXG4gICAgICAgIHJldHVybiAoc3RhcnQgPiAwIHx8IGVuZCA8IHZhbC5sZW5ndGgpID8gdmFsLnN1YnN0cmluZyhzdGFydCwgZW5kKSA6IHZhbDtcclxuICAgIH1cclxuICAgIHN0YXRpYyB0cmltU3RhcnQodmFsOiBzdHJpbmcgfCBudWxsLCBjaDogc3RyaW5nKSB7XHJcbiAgICAgICAgaWYgKCF2YWwgfHwgIWNoKVxyXG4gICAgICAgICAgICByZXR1cm4gdmFsO1xyXG5cclxuICAgICAgICBsZXQgc3RhcnQgPSAwXHJcbiAgICAgICAgY29uc3QgZW5kID0gdmFsLmxlbmd0aDtcclxuXHJcbiAgICAgICAgd2hpbGUgKHN0YXJ0IDwgZW5kICYmIHZhbFtzdGFydF0gPT09IGNoKVxyXG4gICAgICAgICAgICArK3N0YXJ0O1xyXG5cclxuICAgICAgICByZXR1cm4gKHN0YXJ0ID4gMCkgPyB2YWwuc3Vic3RyaW5nKHN0YXJ0LCBlbmQpIDogdmFsO1xyXG4gICAgfVxyXG4gICAgc3RhdGljIHRyaW1FbmQodmFsOiBzdHJpbmcgfCBudWxsLCBjaDogc3RyaW5nKSB7XHJcbiAgICAgICAgaWYgKCF2YWwgfHwgIWNoKVxyXG4gICAgICAgICAgICByZXR1cm4gdmFsO1xyXG5cclxuICAgICAgICBsZXQgc3RhcnQgPSAwLFxyXG4gICAgICAgICAgICBlbmQgPSB2YWwubGVuZ3RoO1xyXG5cclxuICAgICAgICB3aGlsZSAoZW5kID4gc3RhcnQgJiYgdmFsW2VuZCAtIDFdID09PSBjaClcclxuICAgICAgICAgICAgLS1lbmQ7XHJcblxyXG4gICAgICAgIHJldHVybiAoZW5kIDwgdmFsLmxlbmd0aCkgPyB2YWwuc3Vic3RyaW5nKHN0YXJ0LCBlbmQpIDogdmFsO1xyXG4gICAgfVxyXG5cclxuICAgIC8qKlxyXG4gICAgICogXHJcbiAgICAgKiBAcGFyYW0gdmFsIHNvdXJjZSBzdHJpbmdcclxuICAgICAqIEBwYXJhbSBjaGFycyB0cmltIGFueSBjaGFyYWN0ZXJcclxuICAgICAqIEByZXR1cm5zIFxyXG4gICAgICovXHJcbiAgICBzdGF0aWMgdHJpbUFueSh2YWw6IHN0cmluZyB8IG51bGwsIGNoYXJzOiBzdHJpbmcpIHtcclxuICAgICAgICBpZiAoIXZhbCB8fCAhY2hhcnMpXHJcbiAgICAgICAgICAgIHJldHVybiB2YWw7XHJcblxyXG4gICAgICAgIGxldCBzdGFydCA9IDAsXHJcbiAgICAgICAgICAgIGVuZCA9IHZhbC5sZW5ndGg7XHJcblxyXG4gICAgICAgIHdoaWxlIChzdGFydCA8IGVuZCAmJiBjaGFycy5pbmRleE9mKHZhbFtzdGFydF0pID49IDApXHJcbiAgICAgICAgICAgICsrc3RhcnQ7XHJcblxyXG4gICAgICAgIHdoaWxlIChlbmQgPiBzdGFydCAmJiBjaGFycy5pbmRleE9mKHZhbFtlbmQgLSAxXSkgPj0gMClcclxuICAgICAgICAgICAgLS1lbmQ7XHJcblxyXG4gICAgICAgIHJldHVybiAoc3RhcnQgPiAwIHx8IGVuZCA8IHZhbC5sZW5ndGgpID8gdmFsLnN1YnN0cmluZyhzdGFydCwgZW5kKSA6IHZhbDtcclxuICAgIH1cclxuXHJcbn0iXX0=
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
export
|
|
1
|
+
export const firstBy = (function () {
|
|
2
2
|
function identity(v) { return v; }
|
|
3
3
|
function ignoreCase(v) { return typeof (v) === "string" ? v.toLowerCase() : v; }
|
|
4
4
|
function makeCompareFunction(f, opt) {
|
|
5
5
|
opt = typeof (opt) === "number" ? { direction: opt } : opt || {};
|
|
6
6
|
if (typeof (f) != "function") {
|
|
7
|
-
|
|
7
|
+
const prop = f;
|
|
8
8
|
// make unary function
|
|
9
9
|
f = function (v1) { return !!v1[prop] ? v1[prop] : ""; };
|
|
10
10
|
}
|
|
11
11
|
if (f.length === 1) {
|
|
12
12
|
// f is a unary function mapping a single item to its sort score
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
const uf = f;
|
|
14
|
+
const preprocess = opt.ignoreCase ? ignoreCase : identity;
|
|
15
|
+
const cmp = opt.cmp || function (v1, v2) { return v1 < v2 ? -1 : v1 > v2 ? 1 : 0; };
|
|
16
16
|
f = function (v1, v2) { return cmp(preprocess(uf(v1)), preprocess(uf(v2))); };
|
|
17
17
|
}
|
|
18
18
|
if (opt.direction === -1)
|
|
@@ -26,9 +26,9 @@ export var firstBy = (function () {
|
|
|
26
26
|
/* should get value false for the first call. This can be done by calling the
|
|
27
27
|
exported function, or the firstBy property on it (for es6 module compatibility)
|
|
28
28
|
*/
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
const x = (typeof (this) == "function" && !this.firstBy) ? this : false;
|
|
30
|
+
const y = makeCompareFunction(func, opt);
|
|
31
|
+
const f = x ? function (a, b) {
|
|
32
32
|
return x(a, b) || y(a, b);
|
|
33
33
|
}
|
|
34
34
|
: y;
|
|
@@ -38,4 +38,4 @@ export var firstBy = (function () {
|
|
|
38
38
|
tb.firstBy = tb;
|
|
39
39
|
return tb;
|
|
40
40
|
})();
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGhlbkJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvemVrL3NyYy9saWIvdXRpbHMvdGhlbkJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxDQUFDO0lBRXBCLFNBQVMsUUFBUSxDQUFDLENBQU0sSUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFBLENBQUM7SUFFcEMsU0FBUyxVQUFVLENBQUMsQ0FBTSxJQUFFLE9BQU8sT0FBTSxDQUFDLENBQUMsQ0FBQyxLQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFDO0lBRS9FLFNBQVMsbUJBQW1CLENBQUMsQ0FBTSxFQUFFLEdBQVE7UUFDekMsR0FBRyxHQUFHLE9BQU0sQ0FBQyxHQUFHLENBQUMsS0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUMsU0FBUyxFQUFDLEdBQUcsRUFBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUUsRUFBRSxDQUFDO1FBQ3pELElBQUcsT0FBTSxDQUFDLENBQUMsQ0FBQyxJQUFFLFVBQVUsRUFBQyxDQUFDO1lBQ3RCLE1BQU0sSUFBSSxHQUFHLENBQUMsQ0FBQztZQUNmLHNCQUFzQjtZQUN0QixDQUFDLEdBQUcsVUFBUyxFQUFPLElBQUUsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQTtRQUM3RCxDQUFDO1FBQ0QsSUFBRyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ2hCLGdFQUFnRTtZQUNoRSxNQUFNLEVBQUUsR0FBRyxDQUFDLENBQUM7WUFDYixNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsVUFBVSxDQUFBLENBQUMsQ0FBQSxVQUFVLENBQUEsQ0FBQyxDQUFBLFFBQVEsQ0FBQztZQUN0RCxNQUFNLEdBQUcsR0FBRyxHQUFHLENBQUMsR0FBRyxJQUFJLFVBQVMsRUFBTyxFQUFDLEVBQU8sSUFBRyxPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUMsQ0FBQTtZQUN6RixDQUFDLEdBQUcsVUFBUyxFQUFPLEVBQUMsRUFBTyxJQUFHLE9BQU8sR0FBRyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUMsQ0FBQTtRQUN2RixDQUFDO1FBQ0QsSUFBRyxHQUFHLENBQUMsU0FBUyxLQUFLLENBQUMsQ0FBQztZQUFFLE9BQU8sVUFBUyxFQUFPLEVBQUMsRUFBTyxJQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUEsQ0FBQyxDQUFDO1FBQzVFLE9BQU8sQ0FBQyxDQUFDO0lBQ2IsQ0FBQztJQUVEOzs2RUFFeUU7SUFDekUsU0FBUyxFQUFFLENBQVksSUFBUyxFQUFFLEdBQVE7UUFDdEM7O1VBRUU7UUFDRixNQUFNLENBQUMsR0FBRyxDQUFDLE9BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxVQUFVLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1FBQ3ZFLE1BQU0sQ0FBQyxHQUFHLG1CQUFtQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztRQUN6QyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVMsQ0FBTSxFQUFFLENBQU07WUFDckIsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUMsQ0FBQyxDQUFDLENBQUM7UUFDNUIsQ0FBQztZQUNILENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDZCxDQUFDLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQztRQUNkLE9BQU8sQ0FBQyxDQUFDO0lBQ2IsQ0FBQztJQUNELEVBQUUsQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLE9BQU8sRUFBRSxDQUFDO0FBQ2QsQ0FBQyxDQUFDLEVBQUUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBjb25zdCBmaXJzdEJ5ID0gKGZ1bmN0aW9uKCkge1xyXG5cclxuICAgIGZ1bmN0aW9uIGlkZW50aXR5KHY6IGFueSl7cmV0dXJuIHY7fVxyXG5cclxuICAgIGZ1bmN0aW9uIGlnbm9yZUNhc2UodjogYW55KXtyZXR1cm4gdHlwZW9mKHYpPT09XCJzdHJpbmdcIiA/IHYudG9Mb3dlckNhc2UoKSA6IHY7fVxyXG5cclxuICAgIGZ1bmN0aW9uIG1ha2VDb21wYXJlRnVuY3Rpb24oZjogYW55LCBvcHQ6IGFueSl7XHJcbiAgICAgICAgb3B0ID0gdHlwZW9mKG9wdCk9PT1cIm51bWJlclwiID8ge2RpcmVjdGlvbjpvcHR9IDogb3B0fHx7fTtcclxuICAgICAgICBpZih0eXBlb2YoZikhPVwiZnVuY3Rpb25cIil7XHJcbiAgICAgICAgICAgIGNvbnN0IHByb3AgPSBmO1xyXG4gICAgICAgICAgICAvLyBtYWtlIHVuYXJ5IGZ1bmN0aW9uXHJcbiAgICAgICAgICAgIGYgPSBmdW5jdGlvbih2MTogYW55KXtyZXR1cm4gISF2MVtwcm9wXSA/IHYxW3Byb3BdIDogXCJcIjt9XHJcbiAgICAgICAgfVxyXG4gICAgICAgIGlmKGYubGVuZ3RoID09PSAxKSB7XHJcbiAgICAgICAgICAgIC8vIGYgaXMgYSB1bmFyeSBmdW5jdGlvbiBtYXBwaW5nIGEgc2luZ2xlIGl0ZW0gdG8gaXRzIHNvcnQgc2NvcmVcclxuICAgICAgICAgICAgY29uc3QgdWYgPSBmO1xyXG4gICAgICAgICAgICBjb25zdCBwcmVwcm9jZXNzID0gb3B0Lmlnbm9yZUNhc2U/aWdub3JlQ2FzZTppZGVudGl0eTtcclxuICAgICAgICAgICAgY29uc3QgY21wID0gb3B0LmNtcCB8fCBmdW5jdGlvbih2MTogYW55LHYyOiBhbnkpIHtyZXR1cm4gdjEgPCB2MiA/IC0xIDogdjEgPiB2MiA/IDEgOiAwO31cclxuICAgICAgICAgICAgZiA9IGZ1bmN0aW9uKHYxOiBhbnksdjI6IGFueSkge3JldHVybiBjbXAocHJlcHJvY2Vzcyh1Zih2MSkpLCBwcmVwcm9jZXNzKHVmKHYyKSkpO31cclxuICAgICAgICB9XHJcbiAgICAgICAgaWYob3B0LmRpcmVjdGlvbiA9PT0gLTEpIHJldHVybiBmdW5jdGlvbih2MTogYW55LHYyOiBhbnkpe3JldHVybiAtZih2MSx2Mil9O1xyXG4gICAgICAgIHJldHVybiBmO1xyXG4gICAgfVxyXG5cclxuICAgIC8qIGFkZHMgYSBzZWNvbmRhcnkgY29tcGFyZSBmdW5jdGlvbiB0byB0aGUgdGFyZ2V0IGZ1bmN0aW9uIChgdGhpc2AgY29udGV4dClcclxuICAgICAgIHdoaWNoIGlzIGFwcGxpZWQgaW4gY2FzZSB0aGUgZmlyc3Qgb25lIHJldHVybnMgMCAoZXF1YWwpXHJcbiAgICAgICByZXR1cm5zIGEgbmV3IGNvbXBhcmUgZnVuY3Rpb24sIHdoaWNoIGhhcyBhIGB0aGVuQnlgIG1ldGhvZCBhcyB3ZWxsICovXHJcbiAgICBmdW5jdGlvbiB0Yih0aGlzOiBhbnksIGZ1bmM6IGFueSwgb3B0OiBhbnkpIHtcclxuICAgICAgICAvKiBzaG91bGQgZ2V0IHZhbHVlIGZhbHNlIGZvciB0aGUgZmlyc3QgY2FsbC4gVGhpcyBjYW4gYmUgZG9uZSBieSBjYWxsaW5nIHRoZSBcclxuICAgICAgICBleHBvcnRlZCBmdW5jdGlvbiwgb3IgdGhlIGZpcnN0QnkgcHJvcGVydHkgb24gaXQgKGZvciBlczYgbW9kdWxlIGNvbXBhdGliaWxpdHkpXHJcbiAgICAgICAgKi9cclxuICAgICAgICBjb25zdCB4ID0gKHR5cGVvZih0aGlzKSA9PSBcImZ1bmN0aW9uXCIgJiYgIXRoaXMuZmlyc3RCeSkgPyB0aGlzIDogZmFsc2U7XHJcbiAgICAgICAgY29uc3QgeSA9IG1ha2VDb21wYXJlRnVuY3Rpb24oZnVuYywgb3B0KTtcclxuICAgICAgICBjb25zdCBmID0geCA/IGZ1bmN0aW9uKGE6IGFueSwgYjogYW55KSB7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB4KGEsYikgfHwgeShhLGIpO1xyXG4gICAgICAgICAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgICAgICAgOiB5O1xyXG4gICAgICAgIGYudGhlbkJ5ID0gdGI7XHJcbiAgICAgICAgcmV0dXJuIGY7XHJcbiAgICB9XHJcbiAgICB0Yi5maXJzdEJ5ID0gdGI7XHJcbiAgICByZXR1cm4gdGI7XHJcbn0pKCk7Il19
|
|
@@ -20,28 +20,27 @@ export class TimeHelper {
|
|
|
20
20
|
return '';
|
|
21
21
|
}
|
|
22
22
|
static toDate(time) {
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const date = new Date(0);
|
|
24
|
+
const tmp = this.parseTime(time);
|
|
25
25
|
if (!tmp)
|
|
26
26
|
return date;
|
|
27
|
-
|
|
27
|
+
const timeDate = new Date('1970-01-01T' + time + 'Z');
|
|
28
28
|
date.setTime(date.getTime() + timeDate.getTime());
|
|
29
29
|
return date;
|
|
30
30
|
}
|
|
31
|
-
;
|
|
32
31
|
static intersects(start1, end1, start2, end2) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
32
|
+
const startDate1 = this.toDate(start1);
|
|
33
|
+
const endDate1 = this.toDate(end1);
|
|
34
|
+
const startDate2 = this.toDate(start2);
|
|
35
|
+
const endDate2 = this.toDate(end2);
|
|
37
36
|
return OverlapHelper.intersects(startDate1, endDate1, startDate2, endDate2);
|
|
38
37
|
}
|
|
39
38
|
static overlaps(start1, end1, start2, end2) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
39
|
+
const startDate1 = this.toDate(start1);
|
|
40
|
+
const endDate1 = this.toDate(end1);
|
|
41
|
+
const startDate2 = this.toDate(start2);
|
|
42
|
+
const endDate2 = this.toDate(end2);
|
|
44
43
|
return OverlapHelper.overlaps(startDate1, endDate1, startDate2, endDate2);
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZS1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy96ZWsvc3JjL2xpYi91dGlscy90aW1lLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFakQsTUFBTSxPQUFPLFVBQVU7SUFDbkIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFVO1FBQ3ZCLElBQUksT0FBTyxLQUFLLEtBQUssV0FBVyxJQUFJLEtBQUssSUFBSSxJQUFJLElBQUksS0FBSyxLQUFLLEVBQUU7WUFBRSxPQUFPLElBQUksQ0FBQztRQUMvRSxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUNELE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBYTtRQUN2QixJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQzVCLEtBQUssR0FBRyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUM7WUFFckIsSUFBSSxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDcEMsTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFDM0QsT0FBTyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLEtBQUssQ0FBQztZQUNsRSxDQUFDO2lCQUFNLElBQUksNkJBQTZCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQ25ELE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUM5RCxPQUFPLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUN4RixDQUFDO1FBQ0wsQ0FBQztRQUNELE9BQU8sRUFBRSxDQUFDO0lBQ2QsQ0FBQztJQUdELE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBK0I7UUFDekMsTUFBTSxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFekIsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqQyxJQUFJLENBQUMsR0FBRztZQUFFLE9BQU8sSUFBSSxDQUFDO1FBRXRCLE1BQU0sUUFBUSxHQUFHLElBQUksSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLEdBQUcsR0FBRyxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEdBQUcsUUFBUSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDbEQsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUdELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBYyxFQUFFLElBQVksRUFBRSxNQUFjLEVBQUUsSUFBWTtRQUN4RSxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbkMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN2QyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRW5DLE9BQU8sYUFBYSxDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNoRixDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFjLEVBQUUsSUFBWSxFQUFFLE1BQWMsRUFBRSxJQUFZO1FBQ3RFLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDdkMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuQyxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFbkMsT0FBTyxhQUFhLENBQUMsUUFBUSxDQUFDLFVBQVUsRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQzlFLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE92ZXJsYXBIZWxwZXIgfSBmcm9tIFwiLi9vdmVybGFwLWhlbHBlclwiO1xyXG5cclxuZXhwb3J0IGNsYXNzIFRpbWVIZWxwZXIge1xyXG4gICAgc3RhdGljIHBhcnNlVGltZSh2YWx1ZTogYW55KTogc3RyaW5nIHwgbnVsbCB7XHJcbiAgICAgICAgaWYgKHR5cGVvZiB2YWx1ZSA9PT0gJ3VuZGVmaW5lZCcgfHwgdmFsdWUgPT0gbnVsbCB8fCB2YWx1ZSA9PT0gJycpIHJldHVybiBudWxsO1xyXG4gICAgICAgIHJldHVybiB0aGlzLnRvVGltZSh2YWx1ZSk7XHJcbiAgICB9XHJcbiAgICBzdGF0aWMgdG9UaW1lKHZhbHVlOiBzdHJpbmcpOiBzdHJpbmcge1xyXG4gICAgICAgIGlmICh0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnKSB7XHJcbiAgICAgICAgICAgIHZhbHVlID0gdmFsdWUudHJpbSgpO1xyXG5cclxuICAgICAgICAgICAgaWYgKC9eKFxcZHsxLDJ9OlxcZHsxLDJ9KSQvLnRlc3QodmFsdWUpKSB7XHJcbiAgICAgICAgICAgICAgICBjb25zdCBbaCwgbV0gPSB2YWx1ZS5zcGxpdCgnOicpLm1hcCgodmFsOiBzdHJpbmcpID0+ICt2YWwpO1xyXG4gICAgICAgICAgICAgICAgcmV0dXJuIGAke2ggPCAxMCA/ICcwJyA6ICcnfSR7aH06JHttIDwgMTAgPyAnMCcgOiAnJ30ke219OjAwYDtcclxuICAgICAgICAgICAgfSBlbHNlIGlmICgvXihcXGR7MSwyfTpcXGR7MSwyfTpcXGR7MSwyfSkkLy50ZXN0KHZhbHVlKSkge1xyXG4gICAgICAgICAgICAgICAgY29uc3QgW2gsIG0sIHNdID0gdmFsdWUuc3BsaXQoJzonKS5tYXAoKHZhbDogc3RyaW5nKSA9PiArdmFsKTtcclxuICAgICAgICAgICAgICAgIHJldHVybiBgJHtoIDwgMTAgPyAnMCcgOiAnJ30ke2h9OiR7bSA8IDEwID8gJzAnIDogJyd9JHttfToke3MgPCAxMCA/ICcwJyA6ICcnfSR7c31gO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgfVxyXG4gICAgICAgIHJldHVybiAnJztcclxuICAgIH1cclxuXHJcblxyXG4gICAgc3RhdGljIHRvRGF0ZSh0aW1lOiBzdHJpbmcgfCB1bmRlZmluZWQgfCBudWxsKTogRGF0ZSB7XHJcbiAgICAgICAgY29uc3QgZGF0ZSA9IG5ldyBEYXRlKDApO1xyXG5cclxuICAgICAgICBjb25zdCB0bXAgPSB0aGlzLnBhcnNlVGltZSh0aW1lKTtcclxuICAgICAgICBpZiAoIXRtcCkgcmV0dXJuIGRhdGU7XHJcblxyXG4gICAgICAgIGNvbnN0IHRpbWVEYXRlID0gbmV3IERhdGUoJzE5NzAtMDEtMDFUJyArIHRpbWUgKyAnWicpO1xyXG4gICAgICAgIGRhdGUuc2V0VGltZShkYXRlLmdldFRpbWUoKSArIHRpbWVEYXRlLmdldFRpbWUoKSk7XHJcbiAgICAgICAgcmV0dXJuIGRhdGU7XHJcbiAgICB9XHJcblxyXG5cclxuICAgIHN0YXRpYyBpbnRlcnNlY3RzKHN0YXJ0MTogc3RyaW5nLCBlbmQxOiBzdHJpbmcsIHN0YXJ0Mjogc3RyaW5nLCBlbmQyOiBzdHJpbmcpOiBib29sZWFuIHtcclxuICAgICAgICBjb25zdCBzdGFydERhdGUxID0gdGhpcy50b0RhdGUoc3RhcnQxKTtcclxuICAgICAgICBjb25zdCBlbmREYXRlMSA9IHRoaXMudG9EYXRlKGVuZDEpO1xyXG4gICAgICAgIGNvbnN0IHN0YXJ0RGF0ZTIgPSB0aGlzLnRvRGF0ZShzdGFydDIpO1xyXG4gICAgICAgIGNvbnN0IGVuZERhdGUyID0gdGhpcy50b0RhdGUoZW5kMik7XHJcblxyXG4gICAgICAgIHJldHVybiBPdmVybGFwSGVscGVyLmludGVyc2VjdHMoc3RhcnREYXRlMSwgZW5kRGF0ZTEsIHN0YXJ0RGF0ZTIsIGVuZERhdGUyKTtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgb3ZlcmxhcHMoc3RhcnQxOiBzdHJpbmcsIGVuZDE6IHN0cmluZywgc3RhcnQyOiBzdHJpbmcsIGVuZDI6IHN0cmluZyk6IGJvb2xlYW4ge1xyXG4gICAgICAgIGNvbnN0IHN0YXJ0RGF0ZTEgPSB0aGlzLnRvRGF0ZShzdGFydDEpO1xyXG4gICAgICAgIGNvbnN0IGVuZERhdGUxID0gdGhpcy50b0RhdGUoZW5kMSk7XHJcbiAgICAgICAgY29uc3Qgc3RhcnREYXRlMiA9IHRoaXMudG9EYXRlKHN0YXJ0Mik7XHJcbiAgICAgICAgY29uc3QgZW5kRGF0ZTIgPSB0aGlzLnRvRGF0ZShlbmQyKTtcclxuXHJcbiAgICAgICAgcmV0dXJuIE92ZXJsYXBIZWxwZXIub3ZlcmxhcHMoc3RhcnREYXRlMSwgZW5kRGF0ZTEsIHN0YXJ0RGF0ZTIsIGVuZERhdGUyKTtcclxuICAgIH1cclxufSJdfQ==
|
|
@@ -3,7 +3,7 @@ export class TmpHelper {
|
|
|
3
3
|
static get(key, remove = true) {
|
|
4
4
|
if (!key)
|
|
5
5
|
return;
|
|
6
|
-
|
|
6
|
+
const v = this._obj[key];
|
|
7
7
|
if (remove)
|
|
8
8
|
this.remove(key);
|
|
9
9
|
return v;
|
|
@@ -22,4 +22,4 @@ export class TmpHelper {
|
|
|
22
22
|
delete this._obj[key];
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG1wLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3play9zcmMvbGliL3V0aWxzL3RtcC1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLFNBQVM7YUFDSCxTQUFJLEdBQVEsRUFBRSxDQUFDO0lBRTlCLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBVyxFQUFFLE1BQU0sR0FBRyxJQUFJO1FBQ2pDLElBQUksQ0FBQyxHQUFHO1lBQUUsT0FBTztRQUNqQixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pCLElBQUksTUFBTTtZQUNOLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckIsT0FBTyxDQUFDLENBQUM7SUFDYixDQUFDO0lBRUQsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFXLEVBQUUsS0FBVTtRQUM5QixJQUFJLENBQUMsR0FBRztZQUFFLE9BQU87UUFDakIsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUM7SUFDM0IsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLO1FBQ1IsSUFBSSxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7SUFDbkIsQ0FBQztJQUNELE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBVztRQUNyQixJQUFJLENBQUMsR0FBRztZQUFFLE9BQU87UUFDakIsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3pCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY2xhc3MgVG1wSGVscGVyIHtcclxuICAgIHByaXZhdGUgc3RhdGljIF9vYmo6IGFueSA9IHt9O1xyXG5cclxuICAgIHN0YXRpYyBnZXQoa2V5OiBzdHJpbmcsIHJlbW92ZSA9IHRydWUpOiBhbnkge1xyXG4gICAgICAgIGlmICgha2V5KSByZXR1cm47XHJcbiAgICAgICAgY29uc3QgdiA9IHRoaXMuX29ialtrZXldO1xyXG4gICAgICAgIGlmIChyZW1vdmUpXHJcbiAgICAgICAgICAgIHRoaXMucmVtb3ZlKGtleSk7XHJcbiAgICAgICAgcmV0dXJuIHY7XHJcbiAgICB9XHJcbiAgXHJcbiAgICBzdGF0aWMgc2V0KGtleTogc3RyaW5nLCB2YWx1ZTogYW55KSB7XHJcbiAgICAgICAgaWYgKCFrZXkpIHJldHVybjtcclxuICAgICAgICB0aGlzLl9vYmpba2V5XSA9IHZhbHVlO1xyXG4gICAgfVxyXG4gIFxyXG4gICAgc3RhdGljIGNsZWFyKCkge1xyXG4gICAgICAgIHRoaXMuX29iaiA9IHt9O1xyXG4gICAgfVxyXG4gICAgc3RhdGljIHJlbW92ZShrZXk6IHN0cmluZykge1xyXG4gICAgICAgIGlmICgha2V5KSByZXR1cm47XHJcbiAgICAgICAgZGVsZXRlIHRoaXMuX29ialtrZXldXHJcbiAgICB9XHJcbn0iXX0=
|
|
@@ -4,16 +4,16 @@ export class UrlHelper {
|
|
|
4
4
|
return url.substring(0, url.lastIndexOf('/') + 1);
|
|
5
5
|
}
|
|
6
6
|
static getAction(url) {
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
const action = url.substring(url.lastIndexOf('/') + 1);
|
|
8
|
+
const i = action.indexOf(';');
|
|
9
9
|
return i === -1 ? action : action.substring(0, i);
|
|
10
10
|
}
|
|
11
11
|
static getNoParam(url) {
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
const i1 = url.indexOf('?');
|
|
13
|
+
const i2 = url.indexOf(';');
|
|
14
14
|
if (i1 !== -1) {
|
|
15
15
|
if (i2 !== -1) {
|
|
16
|
-
|
|
16
|
+
const min = i1 < i2 ? i1 : i2;
|
|
17
17
|
return url.substring(0, min);
|
|
18
18
|
}
|
|
19
19
|
return url.substring(0, i1);
|
|
@@ -41,4 +41,4 @@ export class UrlHelper {
|
|
|
41
41
|
return StringHelper.trimEnd(a, separator) + separator + StringHelper.trimStart(b, separator);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXJsLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3play9zcmMvbGliL3V0aWxzL3VybC1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRS9DLE1BQU0sT0FBTyxTQUFTO0lBQ2xCLE1BQU0sQ0FBQyxhQUFhLENBQUMsR0FBVztRQUM1QixPQUFPLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBVztRQUN4QixNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdkQsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM5QixPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFXO1FBQ3pCLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDNUIsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM1QixJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQ1osSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDWixNQUFNLEdBQUcsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDOUIsT0FBTyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQTtZQUNoQyxDQUFDO1lBQ0QsT0FBTyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUMvQixDQUFDO1FBQ0QsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUNaLE9BQU8sR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDL0IsQ0FBQztRQUNELE9BQU8sR0FBRyxDQUFDO0lBQ2YsQ0FBQztJQUVELE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxLQUFZO1FBQzFCLElBQUksTUFBTSxHQUFHLEVBQUUsQ0FBQztRQUNoQixLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ3ZCLElBQUksT0FBTyxJQUFJLEtBQUssV0FBVyxJQUFJLElBQUksS0FBSyxJQUFJO2dCQUM1QyxTQUFTO1lBQ2IsTUFBTSxHQUFHLEdBQUcsR0FBRyxJQUFJLEVBQUUsQ0FBQztZQUN0QixNQUFNLEdBQUcsSUFBSSxDQUFDLDRCQUE0QixDQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDakUsQ0FBQztRQUNELE9BQU8sTUFBTSxDQUFDO0lBQ2xCLENBQUM7SUFFTyxNQUFNLENBQUMsNEJBQTRCLENBQUMsQ0FBUyxFQUFFLENBQVMsRUFBRSxZQUFvQixFQUFFO1FBQ3BGLElBQUksQ0FBQyxDQUFDO1lBQUUsT0FBTyxDQUFDLENBQUM7UUFDakIsSUFBSSxDQUFDLENBQUM7WUFBRSxPQUFPLENBQUMsQ0FBQztRQUNqQixPQUFPLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxHQUFHLFNBQVMsR0FBRyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNqRyxDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTdHJpbmdIZWxwZXIgfSBmcm9tIFwiLi9zdHJpbmctaGVscGVyXCI7XHJcblxyXG5leHBvcnQgY2xhc3MgVXJsSGVscGVyIHtcclxuICAgIHN0YXRpYyBnZXRDb250cm9sbGVyKHVybDogc3RyaW5nKSB7XHJcbiAgICAgICAgcmV0dXJuIHVybC5zdWJzdHJpbmcoMCwgdXJsLmxhc3RJbmRleE9mKCcvJykgKyAxKTtcclxuICAgIH1cclxuXHJcbiAgICBzdGF0aWMgZ2V0QWN0aW9uKHVybDogc3RyaW5nKSB7XHJcbiAgICAgICAgY29uc3QgYWN0aW9uID0gdXJsLnN1YnN0cmluZyh1cmwubGFzdEluZGV4T2YoJy8nKSArIDEpO1xyXG4gICAgICAgIGNvbnN0IGkgPSBhY3Rpb24uaW5kZXhPZignOycpO1xyXG4gICAgICAgIHJldHVybiBpID09PSAtMSA/IGFjdGlvbiA6IGFjdGlvbi5zdWJzdHJpbmcoMCwgaSk7XHJcbiAgICB9XHJcblxyXG4gICAgc3RhdGljIGdldE5vUGFyYW0odXJsOiBzdHJpbmcpIHtcclxuICAgICAgICBjb25zdCBpMSA9IHVybC5pbmRleE9mKCc/Jyk7XHJcbiAgICAgICAgY29uc3QgaTIgPSB1cmwuaW5kZXhPZignOycpO1xyXG4gICAgICAgIGlmIChpMSAhPT0gLTEpIHtcclxuICAgICAgICAgICAgaWYgKGkyICE9PSAtMSkge1xyXG4gICAgICAgICAgICAgICAgY29uc3QgbWluID0gaTEgPCBpMiA/IGkxIDogaTI7XHJcbiAgICAgICAgICAgICAgICByZXR1cm4gdXJsLnN1YnN0cmluZygwLCBtaW4pXHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgcmV0dXJuIHVybC5zdWJzdHJpbmcoMCwgaTEpXHJcbiAgICAgICAgfVxyXG4gICAgICAgIGlmIChpMiAhPT0gLTEpIHtcclxuICAgICAgICAgICAgcmV0dXJuIHVybC5zdWJzdHJpbmcoMCwgaTIpXHJcbiAgICAgICAgfVxyXG4gICAgICAgIHJldHVybiB1cmw7XHJcbiAgICB9XHJcblxyXG4gICAgc3RhdGljIGNvbWJpbmUoLi4ucGFydHM6IGFueVtdKSB7XHJcbiAgICAgICAgbGV0IHJlc3VsdCA9ICcnO1xyXG4gICAgICAgIGZvciAoY29uc3QgcGFydCBvZiBwYXJ0cykge1xyXG4gICAgICAgICAgICBpZiAodHlwZW9mIHBhcnQgPT09ICd1bmRlZmluZWQnICYmIHBhcnQgPT09IG51bGwpXHJcbiAgICAgICAgICAgICAgICBjb250aW51ZTtcclxuICAgICAgICAgICAgY29uc3Qgc3RyID0gYCR7cGFydH1gO1xyXG4gICAgICAgICAgICByZXN1bHQgPSB0aGlzLmNvbWJpbmVFbnN1cmVTaW5nbGVTZXBhcmF0b3IocmVzdWx0LCBzdHIsICcvJyk7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIHJldHVybiByZXN1bHQ7XHJcbiAgICB9XHJcblxyXG4gICAgcHJpdmF0ZSBzdGF0aWMgY29tYmluZUVuc3VyZVNpbmdsZVNlcGFyYXRvcihhOiBzdHJpbmcsIGI6IHN0cmluZywgc2VwYXJhdG9yOiBzdHJpbmcgPSAnJykge1xyXG4gICAgICAgIGlmICghYSkgcmV0dXJuIGI7XHJcbiAgICAgICAgaWYgKCFiKSByZXR1cm4gYTtcclxuICAgICAgICByZXR1cm4gU3RyaW5nSGVscGVyLnRyaW1FbmQoYSwgc2VwYXJhdG9yKSArIHNlcGFyYXRvciArIFN0cmluZ0hlbHBlci50cmltU3RhcnQoYiwgc2VwYXJhdG9yKTtcclxuICAgIH1cclxufSJdfQ==
|