@coolon/angular-ui-powerups 0.0.44 → 0.0.47
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/bundles/coolon-angular-ui-powerups.umd.js +489 -167
- package/bundles/coolon-angular-ui-powerups.umd.js.map +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js.map +1 -1
- package/coolon-angular-ui-powerups.metadata.json +1 -1
- package/esm2015/coolon-angular-ui-powerups.js +2 -2
- package/esm2015/index.js +2 -2
- package/esm2015/lib/interaction/abstract-activity.js +3 -9
- package/esm2015/lib/place/components/place-outlet/place-outlet.component.js +17 -12
- package/esm2015/lib/place/guards/place-route.guard.js +4 -4
- package/esm2015/lib/place/index.js +1 -2
- package/esm2015/lib/place/place-component.js +2 -2
- package/esm2015/lib/place/place-history.js +29 -6
- package/esm2015/lib/place/place-router.js +29 -22
- package/esm2015/lib/place/route/parameter-decorators.js +1 -1
- package/esm2015/lib/place/route/parameter-definition.class.js +92 -9
- package/esm2015/lib/place/route/parameter-sanitiser.js +4 -3
- package/esm2015/lib/place/route/parameter-snapshot.js +214 -23
- package/esm2015/lib/place/route/route-parameter-sanitiser.js +4 -9
- package/esm2015/lib/place/visit.js +3 -3
- package/esm2015/public_api.js +2 -2
- package/esm5/coolon-angular-ui-powerups.js +2 -2
- package/esm5/index.js +2 -2
- package/esm5/lib/interaction/abstract-activity.js +14 -10
- package/esm5/lib/place/components/place-outlet/place-outlet.component.js +17 -12
- package/esm5/lib/place/guards/place-route.guard.js +4 -4
- package/esm5/lib/place/index.js +1 -2
- package/esm5/lib/place/place-component.js +2 -2
- package/esm5/lib/place/place-history.js +39 -6
- package/esm5/lib/place/place-router.js +39 -27
- package/esm5/lib/place/route/parameter-decorators.js +1 -1
- package/esm5/lib/place/route/parameter-definition.class.js +104 -9
- package/esm5/lib/place/route/parameter-sanitiser.js +4 -3
- package/esm5/lib/place/route/parameter-snapshot.js +273 -24
- package/esm5/lib/place/route/route-parameter-sanitiser.js +8 -10
- package/esm5/lib/place/visit.js +3 -3
- package/esm5/public_api.js +2 -2
- package/fesm2015/coolon-angular-ui-powerups.js +388 -153
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +491 -168
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/place/components/place-outlet/place-outlet.component.d.ts +0 -1
- package/lib/place/index.d.ts +0 -1
- package/lib/place/place-history.d.ts +3 -0
- package/lib/place/place-router.d.ts +4 -3
- package/lib/place/route/parameter-definition.class.d.ts +12 -2
- package/lib/place/route/parameter-sanitiser.d.ts +3 -2
- package/lib/place/route/parameter-snapshot.d.ts +11 -8
- package/lib/place/visit.d.ts +2 -2
- package/package.json +1 -1
- package/esm2015/lib/place/route/default-parameter-sanitiser.js +0 -66
- package/esm5/lib/place/route/default-parameter-sanitiser.js +0 -73
- package/lib/place/route/default-parameter-sanitiser.d.ts +0 -11
|
@@ -3,12 +3,15 @@
|
|
|
3
3
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
4
4
|
*/
|
|
5
5
|
import * as tslib_1 from "tslib";
|
|
6
|
-
import { DelegatingValueModel, EventListenerList
|
|
6
|
+
import { DelegatingValueModel, EventListenerList } from '@coolon/pectin';
|
|
7
7
|
import { DisposableComponent } from '../components/disposable-component';
|
|
8
8
|
/**
|
|
9
9
|
* @template D, R, E
|
|
10
10
|
*/
|
|
11
|
-
var
|
|
11
|
+
var /**
|
|
12
|
+
* @template D, R, E
|
|
13
|
+
*/
|
|
14
|
+
AbstractActivity = /** @class */ (function (_super) {
|
|
12
15
|
tslib_1.__extends(AbstractActivity, _super);
|
|
13
16
|
function AbstractActivity() {
|
|
14
17
|
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -82,10 +85,14 @@ var AbstractActivity = /** @class */ (function (_super) {
|
|
|
82
85
|
*/
|
|
83
86
|
function () { return _this.finalizeAndDispose(); }));
|
|
84
87
|
};
|
|
88
|
+
// @Trace()
|
|
89
|
+
// @Trace()
|
|
85
90
|
/**
|
|
86
91
|
* @return {?}
|
|
87
92
|
*/
|
|
88
|
-
AbstractActivity.prototype.onActivityReady =
|
|
93
|
+
AbstractActivity.prototype.onActivityReady =
|
|
94
|
+
// @Trace()
|
|
95
|
+
/**
|
|
89
96
|
* @return {?}
|
|
90
97
|
*/
|
|
91
98
|
function () {
|
|
@@ -147,14 +154,11 @@ var AbstractActivity = /** @class */ (function (_super) {
|
|
|
147
154
|
function () {
|
|
148
155
|
return this._busyModel.value;
|
|
149
156
|
};
|
|
150
|
-
tslib_1.__decorate([
|
|
151
|
-
Trace(),
|
|
152
|
-
tslib_1.__metadata("design:type", Function),
|
|
153
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
154
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
155
|
-
], AbstractActivity.prototype, "onActivityReady", null);
|
|
156
157
|
return AbstractActivity;
|
|
157
158
|
}(DisposableComponent));
|
|
159
|
+
/**
|
|
160
|
+
* @template D, R, E
|
|
161
|
+
*/
|
|
158
162
|
export { AbstractActivity };
|
|
159
163
|
if (false) {
|
|
160
164
|
/**
|
|
@@ -178,4 +182,4 @@ if (false) {
|
|
|
178
182
|
*/
|
|
179
183
|
AbstractActivity.prototype._busyModel;
|
|
180
184
|
}
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJzdHJhY3QtYWN0aXZpdHkuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvaW50ZXJhY3Rpb24vYWJzdHJhY3QtYWN0aXZpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsaUJBQWlCLEVBQXFCLE1BQU0sZ0JBQWdCLENBQUM7QUFDNUYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7Ozs7QUFHekU7Ozs7SUFBcUQsNENBQW1CO0lBQXhFO1FBQUEscUVBd0RDO1FBdERrQixvQkFBYyxHQUFHLElBQUksaUJBQWlCLEVBQXdCLENBQUM7UUFDL0Qsc0JBQWdCLEdBQUcsSUFBSSxpQkFBaUIsRUFBd0IsQ0FBQztRQUNqRSxzQkFBZ0IsR0FBRyxJQUFJLGlCQUFpQixFQUFjLENBQUM7UUFFdkQsZ0JBQVUsR0FBRyxJQUFJLG9CQUFvQixFQUFXLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDOztJQWtEdkYsQ0FBQzs7Ozs7SUFoREMsaUNBQU07Ozs7SUFBTixVQUFPLFFBQThCO1FBQ25DLElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7Ozs7O0lBRUQsbUNBQVE7Ozs7SUFBUixVQUFTLFFBQThCO1FBQ3JDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdEMsQ0FBQzs7Ozs7SUFFRCwrQkFBSTs7OztJQUFKLFVBQUssTUFBVTtRQUFmLGlCQUlDO1FBSEMsT0FBTyxJQUFJLENBQUMsY0FBYzthQUN2QixXQUFXOzs7O1FBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQVQsQ0FBUyxFQUFDO2FBQzNCLE9BQU87OztRQUFDLGNBQU0sT0FBQSxLQUFJLENBQUMsa0JBQWtCLEVBQUUsRUFBekIsQ0FBeUIsRUFBQyxDQUFDO0lBQzlDLENBQUM7Ozs7O0lBRUQsaUNBQU07Ozs7SUFBTixVQUFPLEtBQVM7UUFBaEIsaUJBSUM7UUFIQyxPQUFPLElBQUksQ0FBQyxnQkFBZ0I7YUFDekIsV0FBVzs7OztRQUFDLFVBQUEsQ0FBQyxJQUFJLE9BQUEsQ0FBQyxDQUFDLEtBQUssQ0FBQyxFQUFSLENBQVEsRUFBQzthQUMxQixPQUFPOzs7UUFBQyxjQUFNLE9BQUEsS0FBSSxDQUFDLGtCQUFrQixFQUFFLEVBQXpCLENBQXlCLEVBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRUQsV0FBVzs7Ozs7SUFDWCwwQ0FBZTs7Ozs7SUFBZjtJQUNBLENBQUM7Ozs7O0lBRU8sNkNBQWtCOzs7O0lBQTFCO1FBQ0UsbUNBQW1DO1FBQ25DLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJOzs7O1FBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxDQUFDLEVBQUUsRUFBSCxDQUFHLEVBQUMsQ0FBQztRQUNyQyxtQ0FBbUM7UUFDbkMsNkJBQTZCO1FBQzdCO1lBQ0UsSUFBSSxDQUFDLGdCQUFnQjtZQUNyQixJQUFJLENBQUMsY0FBYztZQUNuQixJQUFJLENBQUMsZ0JBQWdCO1NBQ3RCLENBQUMsT0FBTzs7OztRQUFDLFVBQUEsQ0FBQyxJQUFJLE9BQUEsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFYLENBQVcsRUFBQyxDQUFDO0lBQzlCLENBQUM7SUFHRCxzQkFBSSxrQ0FBSTs7OztRQUFSO1lBQ0UsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUNsQyxDQUFDOzs7T0FBQTs7Ozs7SUFFRCxvQ0FBUzs7OztJQUFULFVBQVUsU0FBOEI7UUFDdEMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDekMsQ0FBQzs7OztJQUVELGlDQUFNOzs7SUFBTjtRQUNFLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUM7SUFDL0IsQ0FBQztJQUNILHVCQUFDO0FBQUQsQ0FBQyxBQXhERCxDQUFxRCxtQkFBbUIsR0F3RHZFOzs7Ozs7Ozs7O0lBdERDLDBDQUFnRjs7Ozs7SUFDaEYsNENBQWtGOzs7OztJQUNsRiw0Q0FBd0U7Ozs7O0lBRXhFLHNDQUFxRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERlbGVnYXRpbmdWYWx1ZU1vZGVsLCBFdmVudExpc3RlbmVyTGlzdCwgVHJhY2UsIFZhbHVlTW9kZWwgfSBmcm9tICdAY29vbG9uL3BlY3Rpbic7XG5pbXBvcnQgeyBEaXNwb3NhYmxlQ29tcG9uZW50IH0gZnJvbSAnLi4vY29tcG9uZW50cy9kaXNwb3NhYmxlLWNvbXBvbmVudCc7XG5pbXBvcnQgeyBBY3Rpdml0eSB9IGZyb20gJy4vYWN0aXZpdHknO1xuXG5leHBvcnQgY2xhc3MgQWJzdHJhY3RBY3Rpdml0eTxELCBSLCBFID0gYW55PiBleHRlbmRzIERpc3Bvc2FibGVDb21wb25lbnQgaW1wbGVtZW50cyBBY3Rpdml0eTxELCBSLCBFPiB7XG5cbiAgcHJpdmF0ZSByZWFkb25seSBfZG9uZUxpc3RlbmVycyA9IG5ldyBFdmVudExpc3RlbmVyTGlzdDxBY3Rpdml0eS5DYWxsQmFjazxSPj4oKTtcbiAgcHJpdmF0ZSByZWFkb25seSBfY2FuY2VsTGlzdGVuZXJzID0gbmV3IEV2ZW50TGlzdGVuZXJMaXN0PEFjdGl2aXR5LkNhbGxCYWNrPEU+PigpO1xuICBwcml2YXRlIHJlYWRvbmx5IF9maW5pc2hMaXN0ZW5lcnMgPSBuZXcgRXZlbnRMaXN0ZW5lckxpc3Q8KCkgPT4gdm9pZD4oKTtcblxuICBwcml2YXRlIHJlYWRvbmx5IF9idXN5TW9kZWwgPSBuZXcgRGVsZWdhdGluZ1ZhbHVlTW9kZWw8Ym9vbGVhbj4oKS53aXRoRGVmYXVsdChmYWxzZSk7XG5cbiAgb25Eb25lKGNhbGxiYWNrOiBBY3Rpdml0eS5DYWxsQmFjazxSPikge1xuICAgIHRoaXMuX2RvbmVMaXN0ZW5lcnMuYWRkKGNhbGxiYWNrKTtcbiAgfVxuXG4gIG9uQ2FuY2VsKGNhbGxiYWNrOiBBY3Rpdml0eS5DYWxsQmFjazxFPikge1xuICAgIHRoaXMuX2NhbmNlbExpc3RlbmVycy5hZGQoY2FsbGJhY2spO1xuICB9XG5cbiAgZG9uZShyZXN1bHQ/OiBSKTogUHJvbWlzZTxhbnk+IHtcbiAgICByZXR1cm4gdGhpcy5fZG9uZUxpc3RlbmVyc1xuICAgICAgLmZpcmVBbmRXYWl0KGwgPT4gbChyZXN1bHQpKVxuICAgICAgLmZpbmFsbHkoKCkgPT4gdGhpcy5maW5hbGl6ZUFuZERpc3Bvc2UoKSk7XG4gIH1cblxuICBjYW5jZWwoZXJyb3I/OiBFKTogUHJvbWlzZTxhbnk+IHtcbiAgICByZXR1cm4gdGhpcy5fY2FuY2VsTGlzdGVuZXJzXG4gICAgICAuZmlyZUFuZFdhaXQobCA9PiBsKGVycm9yKSlcbiAgICAgIC5maW5hbGx5KCgpID0+IHRoaXMuZmluYWxpemVBbmREaXNwb3NlKCkpO1xuICB9XG5cbiAgLy8gQFRyYWNlKClcbiAgb25BY3Rpdml0eVJlYWR5KCkge1xuICB9XG5cbiAgcHJpdmF0ZSBmaW5hbGl6ZUFuZERpc3Bvc2UoKSB7XG4gICAgLy8gdGhpcy5fYWN0aXZlTW9kZWwudmFsdWUgPSBmYWxzZTtcbiAgICB0aGlzLl9maW5pc2hMaXN0ZW5lcnMuZmlyZShsID0+IGwoKSk7XG4gICAgLy8gdGhpcy5faW50ZXJhY3Rpb25Db250ZXh0ID0gbnVsbDtcbiAgICAvLyB0aGlzLl9pbml0aWFsaXplZCA9IGZhbHNlO1xuICAgIFtcbiAgICAgIHRoaXMuX2ZpbmlzaExpc3RlbmVycyxcbiAgICAgIHRoaXMuX2RvbmVMaXN0ZW5lcnMsXG4gICAgICB0aGlzLl9jYW5jZWxMaXN0ZW5lcnNcbiAgICBdLmZvckVhY2gobCA9PiBsLmRpc3Bvc2UoKSk7XG4gIH1cblxuXG4gIGdldCBidXN5KCk6IFZhbHVlTW9kZWw8Ym9vbGVhbj4ge1xuICAgIHJldHVybiB0aGlzLl9idXN5TW9kZWwucmVhZG9ubHk7XG4gIH1cblxuICBidXN5V2hpbGUoYnVzeU1vZGVsOiBWYWx1ZU1vZGVsPGJvb2xlYW4+KSB7XG4gICAgdGhpcy5fYnVzeU1vZGVsLnNldERlbGVnYXRlKGJ1c3lNb2RlbCk7XG4gIH1cblxuICBpc0J1c3koKSB7XG4gICAgcmV0dXJuIHRoaXMuX2J1c3lNb2RlbC52YWx1ZTtcbiAgfVxufVxuIl19
|
|
@@ -41,19 +41,25 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
|
|
|
41
41
|
_this._placeDefinition = new MutableValueModel();
|
|
42
42
|
_this._resolvedParameters = new MutableValueModel();
|
|
43
43
|
var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
|
|
44
|
-
|
|
44
|
+
/** @type {?} */
|
|
45
|
+
var paramMap = chain(_this._activatedRouteModel).pullObservableValue((/**
|
|
45
46
|
* @param {?} ar
|
|
46
47
|
* @return {?}
|
|
47
48
|
*/
|
|
48
49
|
function (ar) { return ar.paramMap; }));
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
* @param {?}
|
|
50
|
+
/** @type {?} */
|
|
51
|
+
var urls = chain(_this._activatedRouteModel).pullObservableValue((/**
|
|
52
|
+
* @param {?} ar
|
|
53
|
+
* @return {?}
|
|
54
|
+
*/
|
|
55
|
+
function (ar) { return ar.url; }));
|
|
56
|
+
_this.placeConfigured = valueOf.all(chain(_this._inOutletUpdate).isFalsey(), _this._placeDefinition, paramMap, urls).areTruthy();
|
|
57
|
+
when.anyOf(paramMap, urls).changes((/**
|
|
52
58
|
* @return {?}
|
|
53
59
|
*/
|
|
54
|
-
function (
|
|
60
|
+
function () {
|
|
55
61
|
/** @type {?} */
|
|
56
|
-
var snapshot = ParameterSnapshot.create(_this._placeDefinition.value,
|
|
62
|
+
var snapshot = ParameterSnapshot.create(_this._placeDefinition.value, paramMap.value, urls.value);
|
|
57
63
|
_this._incomingRouteChange.whileTrue((/**
|
|
58
64
|
* @return {?}
|
|
59
65
|
*/
|
|
@@ -76,6 +82,10 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
|
|
|
76
82
|
unless: _this.incomingRouteChange
|
|
77
83
|
});
|
|
78
84
|
return _this;
|
|
85
|
+
// const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));
|
|
86
|
+
// txo.observe('paramMap', paramMap);
|
|
87
|
+
// txo.observe('urls', urls);
|
|
88
|
+
// txo.observe('this._resolvedParameters', this._resolvedParameters);
|
|
79
89
|
}
|
|
80
90
|
Object.defineProperty(PlaceOutletComponent.prototype, "incomingRouteChange", {
|
|
81
91
|
get: /**
|
|
@@ -247,11 +257,6 @@ if (false) {
|
|
|
247
257
|
* @private
|
|
248
258
|
*/
|
|
249
259
|
PlaceOutletComponent.prototype._placeDefinition;
|
|
250
|
-
/**
|
|
251
|
-
* @type {?}
|
|
252
|
-
* @private
|
|
253
|
-
*/
|
|
254
|
-
PlaceOutletComponent.prototype._paramMap;
|
|
255
260
|
/** @type {?} */
|
|
256
261
|
PlaceOutletComponent.prototype._resolvedParameters;
|
|
257
262
|
/**
|
|
@@ -270,4 +275,4 @@ if (false) {
|
|
|
270
275
|
*/
|
|
271
276
|
PlaceOutletComponent.prototype.placeHistory;
|
|
272
277
|
}
|
|
273
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-outlet.component.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/components/place-outlet/place-outlet.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, Input, OnInit, ViewChild } from '@angular/core';\nimport { ActivatedRoute, ParamMap, RouterOutlet } from '@angular/router';\nimport { BooleanValueModelChain, Dsl, Guard, MutableValueModel, ValueModel, ValueModelChain } from '@coolon/pectin';\nimport { DisposableComponent } from '../../../components/disposable-component';\nimport { PlaceDefinition } from '../../place-definition';\nimport { PlaceHistory } from '../../place-history';\nimport { PlaceRouter } from '../../place-router';\n\nimport { ParameterSnapshot } from '../../route/parameter-snapshot';\nimport { LEFT_RIGHT_PLACE_ANIMATION } from './route-animations';\n\n// Quick hack to avoid circular references between this and PlaceComponents.\ninterface PlaceRef {\n  readonly placeDefinition: PlaceDefinition\n\n  initialiseBindings(param: ValueModel<ParameterSnapshot>): void;\n\n  onPlaceReady(): void;\n}\n\n@Component({\n  selector: 'angular-ui-powerups-place-outlet',\n  templateUrl: './place-outlet.component.html',\n  styleUrls: ['./place-outlet.component.scss'],\n  animations: [LEFT_RIGHT_PLACE_ANIMATION]\n})\nexport class PlaceOutletComponent extends DisposableComponent implements OnInit {\n\n  @Input()\n  animate = true;\n\n  @ViewChild('routeOutlet', { static: true })\n  routerOut: RouterOutlet;\n\n  private _currentPlace: PlaceRef;\n\n  private readonly _incomingRouteChange = new Guard();\n  private readonly _inOutletUpdate = new Guard();\n  private readonly _activatedRouteModel = new MutableValueModel<ActivatedRoute>();\n  private readonly _placeDefinition = new MutableValueModel<PlaceDefinition>();\n  private readonly _paramMap: ValueModelChain<ParamMap>;\n\n  readonly _resolvedParameters = new MutableValueModel<ParameterSnapshot>();\n  private placeConfigured: BooleanValueModelChain;\n\n  constructor(private readonly router: PlaceRouter, private readonly placeHistory: PlaceHistory) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n\n    this._paramMap = chain(this._activatedRouteModel).pullObservableValue(ar => ar.paramMap);\n\n    this.placeConfigured = valueOf.all(\n      chain(this._inOutletUpdate).isFalsey(),\n      this._placeDefinition,\n      this._paramMap\n    ).areTruthy();\n\n    when.valueOf(this._paramMap).changes((params) => {\n      const snapshot = ParameterSnapshot.create(this._placeDefinition.value, params);\n      this._incomingRouteChange.whileTrue(() => {\n        this._resolvedParameters.value = snapshot;\n        this.placeHistory.add(snapshot);\n      });\n    }, {\n      postponeUntil: this.placeConfigured\n    });\n\n    when.valueOf(this._resolvedParameters).changes((next, previous) => {\n      this.pushChangesToRoute(next, previous);\n      this.placeHistory.add(next); // the above route change doesn't seem to propagate back in, so I'm add the state to the history manually for now.\n    }, {\n      unless: this.incomingRouteChange\n    });\n  }\n\n  get incomingRouteChange(): ValueModel<boolean> {\n    return this._incomingRouteChange;\n  }\n\n  ngOnInit() {\n  }\n\n  onOutletActivated(routerOutlet: RouterOutlet, place: PlaceRef) {\n    this._inOutletUpdate.whileTrue(() => {\n      try {\n        this._currentPlace = place;\n        this._activatedRouteModel.value = routerOutlet.activatedRoute;\n        this._placeDefinition.value = place.placeDefinition;\n        place.initialiseBindings(this._resolvedParameters);\n      } catch (error) {\n        console.error(error);\n      }\n    });\n    if (!this.animate) {\n      // we're not animating so trigger any post animation callbacks now.\n      this.animationDone();\n    }\n  }\n\n  onOutletDeactivated(routerOutlet: RouterOutlet, $event: PlaceRef) {\n    this._inOutletUpdate.whileTrue(() => {\n      this._currentPlace = null;\n      this._activatedRouteModel.value = null;\n      this._placeDefinition.value = null;\n    });\n  }\n\n  getPlaceOrder(outlet: RouterOutlet) {\n    return this.animate && outlet && outlet.activatedRouteData && outlet.activatedRouteData['placeOrder'];\n  }\n\n  animationDone() {\n    if (this._currentPlace) {\n      this._currentPlace.onPlaceReady();\n    }\n  }\n\n  pushChangesToRoute(next: ParameterSnapshot, previous: ParameterSnapshot) {\n    const activatedRoute = this._activatedRouteModel.value;\n    this.router.pushParameterChangesToRoute(activatedRoute, previous, next);\n  }\n\n  sanitise(snapshot: ParameterSnapshot, callback: (sanitised: ParameterSnapshot) => void) {\n    return snapshot;\n  }\n\n\n}\n"]}
|
|
278
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-outlet.component.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/components/place-outlet/place-outlet.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, Input, OnInit, ViewChild } from '@angular/core';\nimport { ActivatedRoute, RouterOutlet } from '@angular/router';\nimport { BooleanValueModelChain, Dsl, Guard, MutableValueModel, ValueModel } from '@coolon/pectin';\nimport { DisposableComponent } from '../../../components/disposable-component';\nimport { PlaceDefinition } from '../../place-definition';\nimport { PlaceHistory } from '../../place-history';\nimport { PlaceRouter } from '../../place-router';\n\nimport { ParameterSnapshot } from '../../route/parameter-snapshot';\nimport { LEFT_RIGHT_PLACE_ANIMATION } from './route-animations';\n\n// Quick hack to avoid circular references between this and PlaceComponents.\ninterface PlaceRef {\n  readonly placeDefinition: PlaceDefinition\n\n  initialiseBindings(param: ValueModel<ParameterSnapshot>): void;\n\n  onPlaceReady(): void;\n}\n\n@Component({\n  selector: 'angular-ui-powerups-place-outlet',\n  templateUrl: './place-outlet.component.html',\n  styleUrls: ['./place-outlet.component.scss'],\n  animations: [LEFT_RIGHT_PLACE_ANIMATION]\n})\nexport class PlaceOutletComponent extends DisposableComponent implements OnInit {\n\n  @Input()\n  animate = true;\n\n  @ViewChild('routeOutlet', { static: true })\n  routerOut: RouterOutlet;\n\n  private _currentPlace: PlaceRef;\n\n  private readonly _incomingRouteChange = new Guard();\n  private readonly _inOutletUpdate = new Guard();\n  private readonly _activatedRouteModel = new MutableValueModel<ActivatedRoute>();\n  private readonly _placeDefinition = new MutableValueModel<PlaceDefinition>();\n\n  readonly _resolvedParameters = new MutableValueModel<ParameterSnapshot>();\n  private placeConfigured: BooleanValueModelChain;\n\n  constructor(private readonly router: PlaceRouter, private readonly placeHistory: PlaceHistory) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n\n    const paramMap = chain(this._activatedRouteModel).pullObservableValue(ar => ar.paramMap);\n    const urls = chain(this._activatedRouteModel).pullObservableValue(ar => ar.url);\n\n    this.placeConfigured = valueOf.all(\n      chain(this._inOutletUpdate).isFalsey(),\n      this._placeDefinition,\n      paramMap,\n      urls\n    ).areTruthy();\n\n    when.anyOf(paramMap, urls).changes(() => {\n      const snapshot = ParameterSnapshot.create(this._placeDefinition.value, paramMap.value, urls.value);\n      this._incomingRouteChange.whileTrue(() => {\n        this._resolvedParameters.value = snapshot;\n        this.placeHistory.add(snapshot);\n      });\n    }, {\n      postponeUntil: this.placeConfigured\n    });\n\n    when.valueOf(this._resolvedParameters).changes((next, previous) => {\n      this.pushChangesToRoute(next, previous);\n      this.placeHistory.add(next); // the above route change doesn't seem to propagate back in, so I'm add the state to the history manually for now.\n    }, {\n      unless: this.incomingRouteChange\n    });\n\n    // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));\n    // txo.observe('paramMap', paramMap);\n    // txo.observe('urls', urls);\n    // txo.observe('this._resolvedParameters', this._resolvedParameters);\n  }\n\n  get incomingRouteChange(): ValueModel<boolean> {\n    return this._incomingRouteChange;\n  }\n\n  ngOnInit() {\n  }\n\n  onOutletActivated(routerOutlet: RouterOutlet, place: PlaceRef) {\n    this._inOutletUpdate.whileTrue(() => {\n      try {\n        this._currentPlace = place;\n        this._activatedRouteModel.value = routerOutlet.activatedRoute;\n        this._placeDefinition.value = place.placeDefinition;\n        place.initialiseBindings(this._resolvedParameters);\n      } catch (error) {\n        console.error(error);\n      }\n    });\n    if (!this.animate) {\n      // we're not animating so trigger any post animation callbacks now.\n      this.animationDone();\n    }\n  }\n\n  onOutletDeactivated(routerOutlet: RouterOutlet, $event: PlaceRef) {\n    this._inOutletUpdate.whileTrue(() => {\n      this._currentPlace = null;\n      this._activatedRouteModel.value = null;\n      this._placeDefinition.value = null;\n    });\n  }\n\n  getPlaceOrder(outlet: RouterOutlet) {\n    return this.animate && outlet && outlet.activatedRouteData && outlet.activatedRouteData['placeOrder'];\n  }\n\n  animationDone() {\n    if (this._currentPlace) {\n      this._currentPlace.onPlaceReady();\n    }\n  }\n\n  pushChangesToRoute(next: ParameterSnapshot, previous: ParameterSnapshot) {\n    const activatedRoute = this._activatedRouteModel.value;\n    this.router.pushParameterChangesToRoute(activatedRoute, previous, next);\n  }\n\n  sanitise(snapshot: ParameterSnapshot, callback: (sanitised: ParameterSnapshot) => void) {\n    return snapshot;\n  }\n\n\n}\n"]}
|
|
@@ -30,14 +30,14 @@ var PlaceRouteGuard = /** @class */ (function () {
|
|
|
30
30
|
/** @type {?} */
|
|
31
31
|
var placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);
|
|
32
32
|
/** @type {?} */
|
|
33
|
-
var snapshot_1 = ParameterSnapshot.create(placeDefinition, activatedRoute.paramMap);
|
|
33
|
+
var snapshot_1 = ParameterSnapshot.create(placeDefinition, activatedRoute.paramMap, activatedRoute.url);
|
|
34
34
|
return snapshot_1.sanitise(this.injector).then((/**
|
|
35
35
|
* @param {?} sanitised
|
|
36
36
|
* @return {?}
|
|
37
37
|
*/
|
|
38
38
|
function (sanitised) {
|
|
39
|
-
if (sanitised.hasChanged(snapshot_1)) {
|
|
40
|
-
return _this.placeRouter.
|
|
39
|
+
if (sanitised.hasChanged(snapshot_1, true)) {
|
|
40
|
+
return _this.placeRouter.getRedirectUrlTree(activatedRoute, sanitised);
|
|
41
41
|
}
|
|
42
42
|
else {
|
|
43
43
|
return true;
|
|
@@ -74,4 +74,4 @@ if (false) {
|
|
|
74
74
|
*/
|
|
75
75
|
PlaceRouteGuard.prototype.injector;
|
|
76
76
|
}
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhY2Utcm91dGUuZ3VhcmQuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2UvZ3VhcmRzL3BsYWNlLXJvdXRlLmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUVyRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFdEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQzs7O0FBRWhFO0lBS0UseUJBQTZCLFdBQXdCLEVBQW1CLFFBQWtCO1FBQTdELGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBQW1CLGFBQVEsR0FBUixRQUFRLENBQVU7SUFDMUYsQ0FBQzs7Ozs7O0lBRUQscUNBQVc7Ozs7O0lBQVgsVUFBWSxjQUFzQyxFQUFFLEtBQTBCO1FBQTlFLGlCQWNDO1FBYkMsSUFBSSxjQUFjLENBQUMsMkJBQTJCLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQyxFQUFFOztnQkFDbEUsZUFBZSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQzs7Z0JBQ3hFLFVBQVEsR0FBRyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsZUFBZSxFQUFFLGNBQWMsQ0FBQyxRQUFRLEVBQUUsY0FBYyxDQUFDLEdBQUcsQ0FBQztZQUN2RyxPQUFPLFVBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUk7Ozs7WUFBQyxVQUFBLFNBQVM7Z0JBQ3BELElBQUksU0FBUyxDQUFDLFVBQVUsQ0FBQyxVQUFRLEVBQUUsSUFBSSxDQUFDLEVBQUU7b0JBQ3hDLE9BQU8sS0FBSSxDQUFDLFdBQVcsQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEVBQUUsU0FBUyxDQUFDLENBQUM7aUJBQ3ZFO3FCQUFNO29CQUNMLE9BQU8sSUFBSSxDQUFDO2lCQUNiO1lBQ0gsQ0FBQyxFQUFDLENBQUM7U0FDSjthQUFNO1lBQ0wsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGlFQUErRCxjQUFjLENBQUMsU0FBVyxDQUFDLENBQUM7U0FDckg7SUFDSCxDQUFDOztnQkF0QkYsVUFBVSxTQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjs7OztnQkFMUSxXQUFXO2dCQUxDLFFBQVE7OzswQkFBN0I7Q0FnQ0MsQUF4QkQsSUF3QkM7U0FyQlksZUFBZTs7Ozs7O0lBRWQsc0NBQXlDOzs7OztJQUFFLG1DQUFtQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUsIEluamVjdG9yIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBDYW5BY3RpdmF0ZSwgUm91dGVyU3RhdGVTbmFwc2hvdCwgVXJsVHJlZSB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBsYW5nIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgUGxhY2VDb21wb25lbnQgfSBmcm9tICcuLi9wbGFjZS1jb21wb25lbnQnO1xuaW1wb3J0IHsgUGxhY2VSb3V0ZXIgfSBmcm9tICcuLi9wbGFjZS1yb3V0ZXInO1xuaW1wb3J0IHsgUGFyYW1ldGVyU25hcHNob3QgfSBmcm9tICcuLi9yb3V0ZS9wYXJhbWV0ZXItc25hcHNob3QnO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBQbGFjZVJvdXRlR3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSByZWFkb25seSBwbGFjZVJvdXRlcjogUGxhY2VSb3V0ZXIsIHByaXZhdGUgcmVhZG9ubHkgaW5qZWN0b3I6IEluamVjdG9yKSB7XG4gIH1cblxuICBjYW5BY3RpdmF0ZShhY3RpdmF0ZWRSb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4gfCBVcmxUcmVlPiB8IFByb21pc2U8Ym9vbGVhbiB8IFVybFRyZWU+IHwgYm9vbGVhbiB8IFVybFRyZWUge1xuICAgIGlmIChQbGFjZUNvbXBvbmVudC5pc1BsYWNlQ29tcG9uZW50Q29uc3RydWN0b3IoYWN0aXZhdGVkUm91dGUuY29tcG9uZW50KSkge1xuICAgICAgY29uc3QgcGxhY2VEZWZpbml0aW9uID0gUGxhY2VDb21wb25lbnQuZ2V0RGVmaW5pdGlvbihhY3RpdmF0ZWRSb3V0ZS5jb21wb25lbnQpO1xuICAgICAgY29uc3Qgc25hcHNob3QgPSBQYXJhbWV0ZXJTbmFwc2hvdC5jcmVhdGUocGxhY2VEZWZpbml0aW9uLCBhY3RpdmF0ZWRSb3V0ZS5wYXJhbU1hcCwgYWN0aXZhdGVkUm91dGUudXJsKTtcbiAgICAgIHJldHVybiBzbmFwc2hvdC5zYW5pdGlzZSh0aGlzLmluamVjdG9yKS50aGVuKHNhbml0aXNlZCA9PiB7XG4gICAgICAgIGlmIChzYW5pdGlzZWQuaGFzQ2hhbmdlZChzbmFwc2hvdCwgdHJ1ZSkpIHtcbiAgICAgICAgICByZXR1cm4gdGhpcy5wbGFjZVJvdXRlci5nZXRSZWRpcmVjdFVybFRyZWUoYWN0aXZhdGVkUm91dGUsIHNhbml0aXNlZCk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm4gbGFuZy5pbGxlZ2FsU3RhdGUoYGV4cGVjdGVkIGNvbXBvbmVudCB0byBiZSBhbiBpbnN0YW5jZSBvZiBQbGFjZUNvbXBvbmVudCwgZ290ICR7YWN0aXZhdGVkUm91dGUuY29tcG9uZW50fWApO1xuICAgIH1cbiAgfVxuXG59XG4iXX0=
|
package/esm5/lib/place/index.js
CHANGED
|
@@ -22,7 +22,6 @@ export { leftRightPlaceAnimation, LEFT_RIGHT_PLACE_ANIMATION } from "./component
|
|
|
22
22
|
export { TabbedPlaceNavigationComponent } from "./components/tabbed-place-navigation/tabbed-place-navigation.component";
|
|
23
23
|
export { LeavePlaceGuard } from "./guards/leave-place.guard";
|
|
24
24
|
export { PlaceRouteGuard } from "./guards/place-route.guard";
|
|
25
|
-
export { DefaultParameterSanitiser } from "./route/default-parameter-sanitiser";
|
|
26
25
|
export {} from "./route/json-types";
|
|
27
26
|
export { RouteId, RouteParameter, RouteParameterList } from "./route/parameter-decorators";
|
|
28
27
|
export { ParameterDefinition } from "./route/parameter-definition.class";
|
|
@@ -30,4 +29,4 @@ export {} from "./route/parameter-sanitiser";
|
|
|
30
29
|
export { ParameterSnapshot } from "./route/parameter-snapshot";
|
|
31
30
|
export { ParameterType } from "./route/parameter-type";
|
|
32
31
|
export { Sanitiser, RouteParameterSanitiser } from "./route/route-parameter-sanitiser";
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2UvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUlBLGVBQWMsWUFBWSxDQUFDO0FBQzNCLG1GQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGdDQUFjLG9CQUFvQixDQUFDO0FBQ25DLDZCQUFjLGlCQUFpQixDQUFDO0FBQ2hDLDRCQUFjLGdCQUFnQixDQUFDO0FBQy9CLHNCQUFjLG1CQUFtQixDQUFDO0FBQ2xDLDRCQUFjLGdCQUFnQixDQUFDO0FBQy9CLGVBQWMsU0FBUyxDQUFDO0FBQ3hCLGlEQUFjLGtEQUFrRCxDQUFDO0FBQ2pFLHFDQUFjLGtEQUFrRCxDQUFDO0FBQ2pFLG9DQUFjLGdEQUFnRCxDQUFDO0FBQy9ELHNDQUFjLHNEQUFzRCxDQUFDO0FBQ3JFLHFDQUFjLGtEQUFrRCxDQUFDO0FBQ2pFLG9FQUFjLDRDQUE0QyxDQUFDO0FBQzNELCtDQUFjLHdFQUF3RSxDQUFDO0FBQ3ZGLGdDQUFjLDRCQUE0QixDQUFDO0FBQzNDLGdDQUFjLDRCQUE0QixDQUFDO0FBQzNDLGVBQWMsb0JBQW9CLENBQUM7QUFDbkMsNERBQWMsOEJBQThCLENBQUM7QUFDN0Msb0NBQWMsb0NBQW9DLENBQUM7QUFDbkQsZUFBYyw2QkFBNkIsQ0FBQztBQUM1QyxrQ0FBYyw0QkFBNEIsQ0FBQztBQUMzQyw4QkFBYyx3QkFBd0IsQ0FBQztBQUN2QyxtREFBYyxtQ0FBbUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGZpbGUgQXV0b21hdGljYWxseSBnZW5lcmF0ZWQgYnkgYmFycmVsc2J5LlxuICovXG5cbmV4cG9ydCAqIGZyb20gXCIuL25hdi1pdGVtXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9wbGFjZS1jb21wb25lbnRcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3BsYWNlLWRlZmluaXRpb25cIjtcbmV4cG9ydCAqIGZyb20gXCIuL3BsYWNlLWhpc3RvcnlcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3BsYWNlLXJvdXRlclwiO1xuZXhwb3J0ICogZnJvbSBcIi4vcGxhY2UuZGVjb3JhdG9yXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9wbGFjZS5tb2R1bGVcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3Zpc2l0XCI7XG5leHBvcnQgKiBmcm9tIFwiLi9jb21wb25lbnRzL2Fic3RyYWN0LXBsYWNlLW5hdmlnYXRpb24uY29tcG9uZW50XCI7XG5leHBvcnQgKiBmcm9tIFwiLi9jb21wb25lbnRzL2J1c3ktb3ZlcmxheS9idXN5LW92ZXJsYXkuY29tcG9uZW50XCI7XG5leHBvcnQgKiBmcm9tIFwiLi9jb21wb25lbnRzL2VtcHR5LXN0YXRlL2VtcHR5LXN0YXRlLmNvbXBvbmVudFwiO1xuZXhwb3J0ICogZnJvbSBcIi4vY29tcG9uZW50cy9saXN0LXBsYWNlLW5hdi9saXN0LXBsYWNlLW5hdi5jb21wb25lbnRcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2NvbXBvbmVudHMvcGxhY2Utb3V0bGV0L3BsYWNlLW91dGxldC5jb21wb25lbnRcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2NvbXBvbmVudHMvcGxhY2Utb3V0bGV0L3JvdXRlLWFuaW1hdGlvbnNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2NvbXBvbmVudHMvdGFiYmVkLXBsYWNlLW5hdmlnYXRpb24vdGFiYmVkLXBsYWNlLW5hdmlnYXRpb24uY29tcG9uZW50XCI7XG5leHBvcnQgKiBmcm9tIFwiLi9ndWFyZHMvbGVhdmUtcGxhY2UuZ3VhcmRcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2d1YXJkcy9wbGFjZS1yb3V0ZS5ndWFyZFwiO1xuZXhwb3J0ICogZnJvbSBcIi4vcm91dGUvanNvbi10eXBlc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vcm91dGUvcGFyYW1ldGVyLWRlY29yYXRvcnNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3JvdXRlL3BhcmFtZXRlci1kZWZpbml0aW9uLmNsYXNzXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9yb3V0ZS9wYXJhbWV0ZXItc2FuaXRpc2VyXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9yb3V0ZS9wYXJhbWV0ZXItc25hcHNob3RcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3JvdXRlL3BhcmFtZXRlci10eXBlXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9yb3V0ZS9yb3V0ZS1wYXJhbWV0ZXItc2FuaXRpc2VyXCI7XG4iXX0=
|
|
@@ -62,7 +62,7 @@ var PlaceComponent = /** @class */ (function (_super) {
|
|
|
62
62
|
* @return {?}
|
|
63
63
|
*/
|
|
64
64
|
function (parameters) {
|
|
65
|
-
return parameters.
|
|
65
|
+
return parameters.getValueOf(parameterDef);
|
|
66
66
|
},
|
|
67
67
|
toLeft: /**
|
|
68
68
|
* @param {?} value
|
|
@@ -165,4 +165,4 @@ if (false) {
|
|
|
165
165
|
}
|
|
166
166
|
PlaceComponent.injectDefinition = injectDefinition;
|
|
167
167
|
})(PlaceComponent || (PlaceComponent = {}));
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhY2UtY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL3BsYWNlLWNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFtQyxJQUFJLEVBQWMsTUFBTSxnQkFBZ0IsQ0FBQztBQUNwRyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2xFLE9BQU8sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDekUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG9CQUFvQixDQUFDOzs7QUFLckQsTUFBTSxLQUFPLHdCQUF3QixHQUFHLDBCQUEwQjs7O0FBRWxFLE1BQU0sS0FBTyx3QkFBd0IsR0FBRyxNQUFNLENBQUMsd0JBQXdCLENBQUM7QUFFeEU7SUFBb0MsMENBQW1CO0lBSXJEO2VBQ0UsaUJBQU87SUFDVCxDQUFDOzs7OztJQUVNLDJDQUFrQjs7OztJQUF6QixVQUEwQixrQkFBaUQ7UUFBM0UsaUJBTUM7UUFMQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQ3RDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsZUFBZSxDQUFDLGtCQUFrQixFQUFFLENBQUMsT0FBTzs7OztRQUFDLFVBQUEsWUFBWTtZQUM1RCxLQUFJLENBQUMsY0FBYyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3BDLENBQUMsRUFBQyxDQUFDO0lBQ0wsQ0FBQzs7Ozs7OztJQUVPLHVDQUFjOzs7Ozs7SUFBdEIsVUFBNkIsWUFBdUM7O1lBQzVELEtBQUssR0FBRyxtQkFBQSxJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksQ0FBQyxFQUF1QjtRQUNwRSxzREFBc0Q7UUFDdEQsSUFBSSxDQUFDLGtCQUFrQixDQUFDLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxLQUFLLEVBQUU7WUFDbEUsT0FBTzs7OztZQUFQLFVBQVEsVUFBNkI7Z0JBQ25DLE9BQU8sVUFBVSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUM3QyxDQUFDO1lBQ0QsTUFBTTs7Ozs7WUFBTixVQUFPLEtBQVEsRUFBRSxpQkFBcUM7Z0JBQ3BELE9BQU8saUJBQWlCLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN4RCxDQUFDO1NBQ0YsQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDO0lBR0Qsc0JBQUksMkNBQWU7Ozs7UUFBbkI7WUFDRSxPQUFPLGNBQWMsQ0FBQyxhQUFhLENBQUMsbUJBQUEsbUJBQUEsSUFBSSxDQUFDLFdBQVcsRUFBTyxFQUFpQyxDQUFDLENBQUM7UUFDaEcsQ0FBQzs7O09BQUE7SUFFRCxzQkFBSSx1Q0FBVzs7OztRQUFmO1lBQ0UsT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FBQyxHQUFHOzs7O1lBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxDQUFDLENBQUMsU0FBUyxFQUFYLENBQVcsRUFBQyxDQUFDO1FBQzdELENBQUM7OztPQUFBOzs7O0lBRUQsc0NBQWE7OztJQUFiO1FBQ0UsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDOzs7O0lBRUQscUNBQVk7OztJQUFaO0lBQ0EsQ0FBQztJQWJEO1FBREMsT0FBTyxFQUFFOzBDQUNhLGVBQWU7O3lEQUVyQztJQWFILHFCQUFDO0NBQUEsQUE3Q0QsQ0FBb0MsbUJBQW1CLEdBNkN0RDtTQTdDWSxjQUFjOzs7Ozs7SUFFekIsNENBQTBEOztBQTZDNUQsV0FBaUIsY0FBYzs7Ozs7SUFFN0IsU0FBZ0IsMkJBQTJCLENBQUMsTUFBVztRQUNyRCxPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxtQkFBQSxNQUFNLEVBQXNCLENBQUMsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDdEYsQ0FBQztJQUZlLDBDQUEyQiw4QkFFMUMsQ0FBQTs7Ozs7SUFFRCxTQUFnQixrQkFBa0IsQ0FBQyxLQUFvQztRQUNyRSxPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsZUFBZSxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDcEUsQ0FBQztJQUZlLGlDQUFrQixxQkFFakMsQ0FBQTs7Ozs7SUFFRCxTQUFnQixhQUFhLENBQUMsS0FBb0M7UUFDaEUsT0FBTyxPQUFPLENBQUMsV0FBVyxDQUFDLHdCQUF3QixFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzlELENBQUM7SUFGZSw0QkFBYSxnQkFFNUIsQ0FBQTs7Ozs7O0lBRUQsU0FBZ0IsZ0JBQWdCLENBQUMsS0FBb0MsRUFBRSxVQUEyQjtRQUNoRyxPQUFPLENBQUMsY0FBYyxDQUFDLHdCQUF3QixFQUFFLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN0RSxDQUFDO0lBRmUsK0JBQWdCLG1CQUUvQixDQUFBO0FBRUgsQ0FBQyxFQWxCZ0IsY0FBYyxLQUFkLGNBQWMsUUFrQjlCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgYXNzZXJ0LCBCaW5kaW5nLCBDb25zdHJ1Y3RhYmxlLCBJTXV0YWJsZUhhc1ZhbHVlLCBsYW5nLCBWYWx1ZU1vZGVsIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgS2xhc3MgfSBmcm9tICdAY29vbG9uL3R5cGVzY3JpcHQtdXRpbGl0aWVzJztcbmltcG9ydCB7IE1lbW9pemUgfSBmcm9tICdAdHlwZXNjcmlwdC1wbHVzL2Zhc3QtbWVtb2l6ZS1kZWNvcmF0b3InO1xuaW1wb3J0ICdyZWZsZWN0LW1ldGFkYXRhJztcbmltcG9ydCB7IERpc3Bvc2FibGVDb21wb25lbnQgfSBmcm9tICcuLi9jb21wb25lbnRzL2Rpc3Bvc2FibGUtY29tcG9uZW50JztcbmltcG9ydCB7IFBsYWNlRGVmaW5pdGlvbiB9IGZyb20gJy4vcGxhY2UtZGVmaW5pdGlvbic7XG5pbXBvcnQgeyBQYXJhbWV0ZXJEZWZpbml0aW9uIH0gZnJvbSAnLi9yb3V0ZS9wYXJhbWV0ZXItZGVmaW5pdGlvbi5jbGFzcyc7XG5pbXBvcnQgeyBQYXJhbWV0ZXJTbmFwc2hvdCB9IGZyb20gJy4vcm91dGUvcGFyYW1ldGVyLXNuYXBzaG90JztcblxuLy8gUkFLRTogbWFraW5nIHRoaXMgU3ltYm9sKC4uLikgYnJva2UgdGhpbmdzLlxuZXhwb3J0IGNvbnN0IERFRklOSVRJT05fTUVUQV9EQVRBX0tFWSA9ICdQTEFDRV9ERUZJTklUSU9OX09QVElPTlMnO1xuLy8gdGhpcyBvbmUgc2VlbXMgb2suXG5leHBvcnQgY29uc3QgUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZID0gU3ltYm9sKCdwbGFjZTpyb3V0ZTpwYXJhbWV0ZXJzJyk7XG5cbmV4cG9ydCBjbGFzcyBQbGFjZUNvbXBvbmVudCBleHRlbmRzIERpc3Bvc2FibGVDb21wb25lbnQge1xuXG4gIHByaXZhdGUgcmVzb2x2ZWRQYXJhbWV0ZXJzOiBWYWx1ZU1vZGVsPFBhcmFtZXRlclNuYXBzaG90PjtcblxuICBjb25zdHJ1Y3RvcigpIHtcbiAgICBzdXBlcigpO1xuICB9XG5cbiAgcHVibGljIGluaXRpYWxpc2VCaW5kaW5ncyhyZXNvbHZlZFBhcmFtZXRlcnM6IFZhbHVlTW9kZWw8UGFyYW1ldGVyU25hcHNob3Q+KSB7XG4gICAgYXNzZXJ0LmlzTmlsKHRoaXMucmVzb2x2ZWRQYXJhbWV0ZXJzKTtcbiAgICB0aGlzLnJlc29sdmVkUGFyYW1ldGVycyA9IHJlc29sdmVkUGFyYW1ldGVycztcbiAgICB0aGlzLnBsYWNlRGVmaW5pdGlvbi5nZXRSb3V0ZVBhcmFtZXRlcnMoKS5mb3JFYWNoKHBhcmFtZXRlckRlZiA9PiB7XG4gICAgICB0aGlzLmluc3RhbGxCaW5kaW5nKHBhcmFtZXRlckRlZik7XG4gICAgfSk7XG4gIH1cblxuICBwcml2YXRlIGluc3RhbGxCaW5kaW5nPFQsIFM+KHBhcmFtZXRlckRlZjogUGFyYW1ldGVyRGVmaW5pdGlvbjxULCBTPikge1xuICAgIGNvbnN0IG1vZGVsID0gdGhpc1twYXJhbWV0ZXJEZWYucHJvcGVydHlOYW1lXSBhcyBJTXV0YWJsZUhhc1ZhbHVlPFM+O1xuICAgIC8vIHRoaXMudHhvLm9ic2VydmUocGFyYW1ldGVyRGVmLnByb3BlcnR5TmFtZSwgbW9kZWwpO1xuICAgIHRoaXMucmVnaXN0ZXJEaXNwb3NhYmxlKG5ldyBCaW5kaW5nKHRoaXMucmVzb2x2ZWRQYXJhbWV0ZXJzLCBtb2RlbCwge1xuICAgICAgdG9SaWdodChwYXJhbWV0ZXJzOiBQYXJhbWV0ZXJTbmFwc2hvdCk6IFMge1xuICAgICAgICByZXR1cm4gcGFyYW1ldGVycy5nZXRWYWx1ZU9mKHBhcmFtZXRlckRlZik7XG4gICAgICB9LFxuICAgICAgdG9MZWZ0KHZhbHVlOiBTLCBjdXJyZW50UGFyYW1ldGVycz86IFBhcmFtZXRlclNuYXBzaG90KTogUGFyYW1ldGVyU25hcHNob3Qge1xuICAgICAgICByZXR1cm4gY3VycmVudFBhcmFtZXRlcnMucmVwbGFjZShwYXJhbWV0ZXJEZWYsIHZhbHVlKTtcbiAgICAgIH1cbiAgICB9KSk7XG4gIH1cblxuICBATWVtb2l6ZSgpXG4gIGdldCBwbGFjZURlZmluaXRpb24oKTogUGxhY2VEZWZpbml0aW9uIHtcbiAgICByZXR1cm4gUGxhY2VDb21wb25lbnQuZ2V0RGVmaW5pdGlvbih0aGlzLmNvbnN0cnVjdG9yIGFzIGFueSBhcyBDb25zdHJ1Y3RhYmxlPFBsYWNlQ29tcG9uZW50Pik7XG4gIH1cblxuICBnZXQgY2hpbGRQbGFjZXMoKTogQ29uc3RydWN0YWJsZTxQbGFjZUNvbXBvbmVudD5bXSB7XG4gICAgcmV0dXJuIHRoaXMucGxhY2VEZWZpbml0aW9uLmNoaWxkcmVuLm1hcChkID0+IGQuY29tcG9uZW50KTtcbiAgfVxuXG4gIGNhbkRlYWN0aXZhdGUoKTogYm9vbGVhbiB8IFByb21pc2U8Ym9vbGVhbj4ge1xuICAgIHJldHVybiB0cnVlO1xuICB9XG5cbiAgb25QbGFjZVJlYWR5KCkge1xuICB9XG5cbn1cblxuZXhwb3J0IG5hbWVzcGFjZSBQbGFjZUNvbXBvbmVudCB7XG5cbiAgZXhwb3J0IGZ1bmN0aW9uIGlzUGxhY2VDb21wb25lbnRDb25zdHJ1Y3Rvcih0YXJnZXQ6IGFueSk6IHRhcmdldCBpcyBDb25zdHJ1Y3RhYmxlPFBsYWNlQ29tcG9uZW50PiB7XG4gICAgcmV0dXJuIGxhbmcuY29uc3RydWN0b3JDaGFpbih0YXJnZXQgYXMgQ29uc3RydWN0YWJsZTxhbnk+KS5pbmNsdWRlcyhQbGFjZUNvbXBvbmVudCk7XG4gIH1cblxuICBleHBvcnQgZnVuY3Rpb24gZ2V0Um91dGVQYXJhbWV0ZXJzKGtsYXNzOiBDb25zdHJ1Y3RhYmxlPFBsYWNlQ29tcG9uZW50Pik6IFBhcmFtZXRlckRlZmluaXRpb248YW55PltdIHtcbiAgICByZXR1cm4gS2xhc3MuZ2V0KGtsYXNzKS5nZXRNZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZKTtcbiAgfVxuXG4gIGV4cG9ydCBmdW5jdGlvbiBnZXREZWZpbml0aW9uKGtsYXNzOiBDb25zdHJ1Y3RhYmxlPFBsYWNlQ29tcG9uZW50Pik6IFBsYWNlRGVmaW5pdGlvbiB7XG4gICAgcmV0dXJuIFJlZmxlY3QuZ2V0TWV0YWRhdGEoREVGSU5JVElPTl9NRVRBX0RBVEFfS0VZLCBrbGFzcyk7XG4gIH1cblxuICBleHBvcnQgZnVuY3Rpb24gaW5qZWN0RGVmaW5pdGlvbihrbGFzczogQ29uc3RydWN0YWJsZTxQbGFjZUNvbXBvbmVudD4sIGRlZmluaXRpb246IFBsYWNlRGVmaW5pdGlvbikge1xuICAgIFJlZmxlY3QuZGVmaW5lTWV0YWRhdGEoREVGSU5JVElPTl9NRVRBX0RBVEFfS0VZLCBkZWZpbml0aW9uLCBrbGFzcyk7XG4gIH1cblxufVxuIl19
|
|
@@ -10,7 +10,7 @@ import * as i1 from "@angular/router";
|
|
|
10
10
|
var PlaceHistory = /** @class */ (function () {
|
|
11
11
|
function PlaceHistory(router) {
|
|
12
12
|
this.router = router;
|
|
13
|
-
this._history =
|
|
13
|
+
this._history = new Map();
|
|
14
14
|
}
|
|
15
15
|
/**
|
|
16
16
|
* @param {?} state
|
|
@@ -22,12 +22,45 @@ var PlaceHistory = /** @class */ (function () {
|
|
|
22
22
|
*/
|
|
23
23
|
function (state) {
|
|
24
24
|
/** @type {?} */
|
|
25
|
-
var
|
|
25
|
+
var history = this.getHistory(state.placeDefinition);
|
|
26
|
+
/** @type {?} */
|
|
27
|
+
var previousState = _.last(history);
|
|
26
28
|
if (!previousState || state.hasChanged(previousState)) {
|
|
27
|
-
|
|
28
|
-
// limit our history to
|
|
29
|
-
|
|
29
|
+
history.unshift(state); // LIFO
|
|
30
|
+
this.setHistory(state.placeDefinition, history.slice(-3)); // limit our history to 3 visits
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
/**
|
|
34
|
+
* @param {?} placeDef
|
|
35
|
+
* @return {?}
|
|
36
|
+
*/
|
|
37
|
+
PlaceHistory.prototype.getHistory = /**
|
|
38
|
+
* @param {?} placeDef
|
|
39
|
+
* @return {?}
|
|
40
|
+
*/
|
|
41
|
+
function (placeDef) {
|
|
42
|
+
/** @type {?} */
|
|
43
|
+
var history = this._history.get(placeDef);
|
|
44
|
+
if (!history) {
|
|
45
|
+
history = [];
|
|
46
|
+
this.setHistory(placeDef, history);
|
|
30
47
|
}
|
|
48
|
+
return history;
|
|
49
|
+
};
|
|
50
|
+
/**
|
|
51
|
+
* @private
|
|
52
|
+
* @param {?} placeDef
|
|
53
|
+
* @param {?} history
|
|
54
|
+
* @return {?}
|
|
55
|
+
*/
|
|
56
|
+
PlaceHistory.prototype.setHistory = /**
|
|
57
|
+
* @private
|
|
58
|
+
* @param {?} placeDef
|
|
59
|
+
* @param {?} history
|
|
60
|
+
* @return {?}
|
|
61
|
+
*/
|
|
62
|
+
function (placeDef, history) {
|
|
63
|
+
this._history.set(placeDef, history);
|
|
31
64
|
};
|
|
32
65
|
PlaceHistory.decorators = [
|
|
33
66
|
{ type: Injectable, args: [{
|
|
@@ -54,4 +87,4 @@ if (false) {
|
|
|
54
87
|
*/
|
|
55
88
|
PlaceHistory.prototype.router;
|
|
56
89
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhY2UtaGlzdG9yeS5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0Bjb29sb24vYW5ndWxhci11aS1wb3dlcnVwcy8iLCJzb3VyY2VzIjpbImxpYi9wbGFjZS9wbGFjZS1oaXN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7OztBQUl2QjtJQU9FLHNCQUE2QixNQUFjO1FBQWQsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUZuQyxhQUFRLEdBQUcsSUFBSSxHQUFHLEVBQXdDLENBQUM7SUFHbkUsQ0FBQzs7Ozs7SUFFRCwwQkFBRzs7OztJQUFILFVBQUksS0FBd0I7O1lBQ3BCLE9BQU8sR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxlQUFlLENBQUM7O1lBQ2hELGFBQWEsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUNyQyxJQUFJLENBQUMsYUFBYSxJQUFJLEtBQUssQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUU7WUFDckQsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE9BQU87WUFDL0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsZ0NBQWdDO1NBQzVGO0lBQ0gsQ0FBQzs7Ozs7SUFFRCxpQ0FBVTs7OztJQUFWLFVBQVcsUUFBeUI7O1lBQzlCLE9BQU8sR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7UUFDekMsSUFBSSxDQUFDLE9BQU8sRUFBRTtZQUNaLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztTQUNwQztRQUNELE9BQU8sT0FBTyxDQUFDO0lBQ2pCLENBQUM7Ozs7Ozs7SUFFTyxpQ0FBVTs7Ozs7O0lBQWxCLFVBQW1CLFFBQXlCLEVBQUUsT0FBNEI7UUFDeEUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7O2dCQTlCRixVQUFVLFNBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25COzs7O2dCQVBRLE1BQU07Ozt1QkFEZjtDQWtEQyxBQTVDRCxJQTRDQztTQXpDWSxZQUFZOzs7Ozs7SUFFdkIsZ0NBQW1FOzs7OztJQUV2RCw4QkFBK0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBSb3V0ZXIgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IFBsYWNlRGVmaW5pdGlvbiB9IGZyb20gJy4vcGxhY2UtZGVmaW5pdGlvbic7XG5pbXBvcnQgeyBQYXJhbWV0ZXJTbmFwc2hvdCB9IGZyb20gJy4vcm91dGUvcGFyYW1ldGVyLXNuYXBzaG90JztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgUGxhY2VIaXN0b3J5IHtcblxuICBwcml2YXRlIF9oaXN0b3J5ID0gbmV3IE1hcDxQbGFjZURlZmluaXRpb24sIFBhcmFtZXRlclNuYXBzaG90W10+KCk7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSByZWFkb25seSByb3V0ZXI6IFJvdXRlcikge1xuICB9XG5cbiAgYWRkKHN0YXRlOiBQYXJhbWV0ZXJTbmFwc2hvdCkge1xuICAgIGNvbnN0IGhpc3RvcnkgPSB0aGlzLmdldEhpc3Rvcnkoc3RhdGUucGxhY2VEZWZpbml0aW9uKTtcbiAgICBjb25zdCBwcmV2aW91c1N0YXRlID0gXy5sYXN0KGhpc3RvcnkpO1xuICAgIGlmICghcHJldmlvdXNTdGF0ZSB8fCBzdGF0ZS5oYXNDaGFuZ2VkKHByZXZpb3VzU3RhdGUpKSB7XG4gICAgICBoaXN0b3J5LnVuc2hpZnQoc3RhdGUpOyAvLyBMSUZPXG4gICAgICB0aGlzLnNldEhpc3Rvcnkoc3RhdGUucGxhY2VEZWZpbml0aW9uLCBoaXN0b3J5LnNsaWNlKC0zKSk7IC8vIGxpbWl0IG91ciBoaXN0b3J5IHRvIDMgdmlzaXRzXG4gICAgfVxuICB9XG5cbiAgZ2V0SGlzdG9yeShwbGFjZURlZjogUGxhY2VEZWZpbml0aW9uKTogUGFyYW1ldGVyU25hcHNob3RbXSB7XG4gICAgbGV0IGhpc3RvcnkgPSB0aGlzLl9oaXN0b3J5LmdldChwbGFjZURlZik7XG4gICAgaWYgKCFoaXN0b3J5KSB7XG4gICAgICBoaXN0b3J5ID0gW107XG4gICAgICB0aGlzLnNldEhpc3RvcnkocGxhY2VEZWYsIGhpc3RvcnkpO1xuICAgIH1cbiAgICByZXR1cm4gaGlzdG9yeTtcbiAgfVxuXG4gIHByaXZhdGUgc2V0SGlzdG9yeShwbGFjZURlZjogUGxhY2VEZWZpbml0aW9uLCBoaXN0b3J5OiBQYXJhbWV0ZXJTbmFwc2hvdFtdKSB7XG4gICAgdGhpcy5faGlzdG9yeS5zZXQocGxhY2VEZWYsIGhpc3RvcnkpO1xuICB9XG5cbi8vIHByZXZpb3VzVmlzaXQoKTogVmlzaXQge1xuICAvLyAgIHJldHVybiBfLmxhc3QodGhpcy5faGlzdG9yeSk7XG4gIC8vIH1cbiAgLy9cbiAgLy8gd2l0aFByZXZpb3VzVmlzaXQ8Uj4oY2FsbGJhY2s6KHByZXZpb3VzVmlzaXQ6VmlzaXQpPT5SLCBkZWZhdWx0VmFsdWU6UiA9IG51bGwpOlJ7XG4gIC8vICAgY29uc3QgdmlzaXQgPSB0aGlzLnByZXZpb3VzVmlzaXQoKTtcbiAgLy8gICByZXR1cm4gdmlzaXQgPyBjYWxsYmFjayh2aXNpdCkgOiBkZWZhdWx0VmFsdWU7XG4gIC8vIH1cbiAgLy9cbiAgLy8gcHJldmlvdXNWaXNpdFRvKHBsYWNlOiBQbGFjZSk6IFZpc2l0IHtcbiAgLy8gICByZXR1cm4gbmV3IFZpc2l0SGlzdG9yeS5RdWVyeSh0aGlzLl9oaXN0b3J5KS50byhwbGFjZSkubGFzdCgpO1xuICAvLyB9XG59XG5cbmV4cG9ydCBuYW1lc3BhY2UgVmlzaXRIaXN0b3J5IHtcblxuICAvLyBleHBvcnQgY2xhc3MgUXVlcnkge1xuICAvLyAgIHByaXZhdGUgX2hpc3Rvcnk6IFZpc2l0LlN0YXRlW107XG4gIC8vICAgcHJpdmF0ZSBfcGxhY2VzOiBQbGFjZVtdO1xuICAvLyAgIHByaXZhdGUgX3ByZWRpY2F0ZTogKHZpc2l0OiBhbnkpID0+IGJvb2xlYW47XG4gIC8vICAgcHJpdmF0ZSBfbGltaXQ6IG51bWJlcjtcbiAgLy9cbiAgLy8gICBjb25zdHJ1Y3RvcihoaXN0b3J5LCBsaW1pdCA9IGhpc3RvcnkubGVuZ3RoKSB7XG4gIC8vICAgICB0aGlzLl9oaXN0b3J5ID0gaGlzdG9yeTtcbiAgLy8gICAgIHRoaXMuX3BsYWNlcyA9IFtdO1xuICAvLyAgICAgdGhpcy5fcHJlZGljYXRlID0gKHZpc2l0ID0+IHRydWUpO1xuICAvLyAgICAgdGhpcy5fbGltaXQgPSBsaW1pdDtcbiAgLy8gICB9XG4gIC8vXG4gIC8vICAgdG8oLi4ucGxhY2VzOlBsYWNlW10pOnRoaXMge1xuICAvLyAgICAgdGhpcy5fcGxhY2VzID0gcGxhY2VzO1xuICAvLyAgICAgcmV0dXJuIHRoaXM7XG4gIC8vICAgfVxuICAvL1xuICAvLyAgIHdpdGgocGFyYW1ldGVyczogeyBbcGFyYW1ldGVyOiBzdHJpbmddOiBhbnkgfSk6IHRoaXMge1xuICAvLyAgICAgdGhpcy5tYXRjaGluZyhzdGF0ZSA9PiB7XG4gIC8vICAgICAgIHJldHVybiBPYmplY3Qua2V5cyhwYXJhbWV0ZXJzKS5yZWR1Y2UoKGFjYywga2V5KSA9PiB7XG4gIC8vICAgICAgICAgY29uc3QgbWF0Y2hWYWx1ZSA9IHBhcmFtZXRlcnNba2V5XTtcbiAgLy8gICAgICAgICBjb25zdCB2aXNpdFZhbHVlID0gc3RhdGUuZ2V0KGtleSk7XG4gIC8vICAgICAgICAgY29uc3QgbWF0Y2hlZCA9IG1hdGNoVmFsdWUgPT09ICcqJyA/ICFfLmlzTmlsKHZpc2l0VmFsdWUpIDogdmlzaXRWYWx1ZSA9PSBtYXRjaFZhbHVlO1xuICAvLyAgICAgICAgIC8vIExvZ2dlci5nZXQodGhpcykuaW5mbyhgbWF0Y2hlZD0ke21hdGNoZWR9YCwgcGFyYW1ldGVycywgdmlzaXRWYWx1ZSk7XG4gIC8vICAgICAgICAgcmV0dXJuIGFjYyAmJiBtYXRjaGVkO1xuICAvLyAgICAgICB9LCB0cnVlKTtcbiAgLy8gICAgIH0pO1xuICAvLyAgICAgcmV0dXJuIHRoaXM7XG4gIC8vICAgfVxuICAvL1xuICAvLyAgIGxhc3QoKTogVmlzaXQuU3RhdGUge1xuICAvLyAgICAgcmV0dXJuIF8uZmluZExhc3QodGhpcy5faGlzdG9yeSwgdmlzaXQgPT4gdGhpcy5fbWF0Y2hlcyh2aXNpdCkpXG4gIC8vICAgfVxuICAvL1xuICAvLyAgIC8vIEB0cmFjZVxuICAvLyAgIGFsbFRoYXRNYXRjaCgpOiBWaXNpdC5TdGF0ZVtdIHtcbiAgLy8gICAgIHJldHVybiBfLmZpbHRlcih0aGlzLl9oaXN0b3J5LCB2aXNpdCA9PiB0aGlzLl9tYXRjaGVzKHZpc2l0KSkuc2xpY2UoLXRoaXMuX2xpbWl0KTtcbiAgLy8gICB9XG4gIC8vXG4gIC8vICAgLy8gQHRyYWNlXG4gIC8vICAgbW9zdFJlY2VudFZhbHVlT2Y8VD1hbnk+KHBhcmFtOiBzdHJpbmcsIGRlZmF1bHRWYWx1ZTogVCA9IG51bGwpOiBUIHtcbiAgLy8gICAgIGNvbnN0IGxhc3RTdGF0ZVdpdGhQYXJhbSA9IF8uZmluZExhc3QodGhpcy5hbGxUaGF0TWF0Y2goKSwgc3RhdGUgPT4gIV8uaXNOaWwoc3RhdGUuZ2V0KHBhcmFtKSkpO1xuICAvLyAgICAgcmV0dXJuIF8uaXNOaWwobGFzdFN0YXRlV2l0aFBhcmFtKSA/IGRlZmF1bHRWYWx1ZSA6IGxhc3RTdGF0ZVdpdGhQYXJhbS5nZXQocGFyYW0pO1xuICAvLyAgIH1cbiAgLy9cbiAgLy8gICBsaW1pdChsaW1pdDogbnVtYmVyKTogdGhpcyB7XG4gIC8vICAgICB0aGlzLl9saW1pdCA9IGxpbWl0O1xuICAvLyAgICAgcmV0dXJuIHRoaXM7XG4gIC8vICAgfVxuICAvL1xuICAvLyAgIG1hdGNoaW5nKHByZWRpY2F0ZTogKHZpc2l0OiBWaXNpdC5TdGF0ZSkgPT4gYm9vbGVhbik6IHRoaXMge1xuICAvLyAgICAgdGhpcy5fcHJlZGljYXRlID0gcHJlZGljYXRlO1xuICAvLyAgICAgcmV0dXJuIHRoaXM7XG4gIC8vICAgfVxuICAvL1xuICAvLyAgIF9tYXRjaGVzKHZpc2l0OiBWaXNpdC5TdGF0ZSkge1xuICAvLyAgICAgcmV0dXJuIHRoaXMuX2lzUGxhY2VNYXRjaCh2aXNpdCkgJiYgdGhpcy5fcHJlZGljYXRlKHZpc2l0KTtcbiAgLy8gICB9XG4gIC8vXG4gIC8vICAgX2lzUGxhY2VNYXRjaCh2aXNpdDogVmlzaXQuU3RhdGUpIHtcbiAgLy8gICAgIHJldHVybiB0aGlzLl9wbGFjZXMubGVuZ3RoIDwgMSB8fCB0aGlzLl9wbGFjZXMuaW5jbHVkZXModmlzaXQucGxhY2UpXG4gIC8vICAgfVxuICAvL1xuICAvLyB9XG5cbn1cbiJdfQ==
|
|
@@ -24,59 +24,71 @@ var PlaceRouter = /** @class */ (function () {
|
|
|
24
24
|
* @return {?}
|
|
25
25
|
*/
|
|
26
26
|
function (activatedRoute, previous, next) {
|
|
27
|
-
|
|
27
|
+
/** @type {?} */
|
|
28
|
+
var relativePath = !!previous.hasRouteId() ? '..' : '.';
|
|
29
|
+
this.router.navigate([relativePath].concat(this.createRouteParameters(next), this.getChildPath(activatedRoute.snapshot)), {
|
|
28
30
|
relativeTo: activatedRoute
|
|
29
31
|
});
|
|
30
32
|
};
|
|
33
|
+
// @Trace()
|
|
34
|
+
// @Trace()
|
|
31
35
|
/**
|
|
32
36
|
* @param {?} activatedRoute
|
|
33
37
|
* @param {?} sanitised
|
|
34
|
-
* @param {?} snapshot
|
|
35
38
|
* @return {?}
|
|
36
39
|
*/
|
|
37
|
-
PlaceRouter.prototype.
|
|
40
|
+
PlaceRouter.prototype.getRedirectUrlTree =
|
|
41
|
+
// @Trace()
|
|
42
|
+
/**
|
|
38
43
|
* @param {?} activatedRoute
|
|
39
44
|
* @param {?} sanitised
|
|
40
|
-
* @param {?} snapshot
|
|
41
45
|
* @return {?}
|
|
42
46
|
*/
|
|
43
|
-
function (activatedRoute, sanitised
|
|
44
|
-
|
|
47
|
+
function (activatedRoute, sanitised) {
|
|
48
|
+
/** @type {?} */
|
|
49
|
+
var urlSegments = activatedRoute.url;
|
|
50
|
+
/** @type {?} */
|
|
51
|
+
var weHaveARouteId = sanitised.hasRouteId() && sanitised.getFormattedRouteId();
|
|
52
|
+
/** @type {?} */
|
|
53
|
+
var commands = (weHaveARouteId) ?
|
|
54
|
+
[urlSegments[0].path, sanitised.getFormattedRouteId(), sanitised.getFormattedParameters()] :
|
|
55
|
+
[urlSegments[0].path, sanitised.getFormattedParameters()];
|
|
56
|
+
console.log("redirect path", commands);
|
|
57
|
+
return this.router.createUrlTree(commands);
|
|
45
58
|
};
|
|
46
59
|
/**
|
|
47
60
|
* @protected
|
|
48
61
|
* @param {?} activatedRoute
|
|
49
|
-
* @param {?} previous
|
|
50
|
-
* @param {?} next
|
|
51
62
|
* @return {?}
|
|
52
63
|
*/
|
|
53
|
-
PlaceRouter.prototype.
|
|
64
|
+
PlaceRouter.prototype.getChildPath = /**
|
|
54
65
|
* @protected
|
|
55
66
|
* @param {?} activatedRoute
|
|
56
|
-
* @param {?} previous
|
|
57
|
-
* @param {?} next
|
|
58
67
|
* @return {?}
|
|
59
68
|
*/
|
|
60
|
-
function (activatedRoute
|
|
61
|
-
/**
|
|
62
|
-
var childSegments = _.flatten(activatedRoute.children.map((/**
|
|
69
|
+
function (activatedRoute) {
|
|
70
|
+
return _.flatten(activatedRoute.children.map((/**
|
|
63
71
|
* @param {?} child
|
|
64
72
|
* @return {?}
|
|
65
73
|
*/
|
|
66
74
|
function (child) { return child.url; })));
|
|
75
|
+
};
|
|
76
|
+
/**
|
|
77
|
+
* @protected
|
|
78
|
+
* @param {?} parameters
|
|
79
|
+
* @return {?}
|
|
80
|
+
*/
|
|
81
|
+
PlaceRouter.prototype.createRouteParameters = /**
|
|
82
|
+
* @protected
|
|
83
|
+
* @param {?} parameters
|
|
84
|
+
* @return {?}
|
|
85
|
+
*/
|
|
86
|
+
function (parameters) {
|
|
67
87
|
/** @type {?} */
|
|
68
|
-
var
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
var path = routeId ?
|
|
73
|
-
[relativePath, routeId, next.getFormattedParameters()] :
|
|
74
|
-
[relativePath, next.getFormattedParameters()];
|
|
75
|
-
return path.concat(childSegments.map((/**
|
|
76
|
-
* @param {?} s
|
|
77
|
-
* @return {?}
|
|
78
|
-
*/
|
|
79
|
-
function (s) { return s.path; })));
|
|
88
|
+
var routeId = parameters.getFormattedRouteId();
|
|
89
|
+
return routeId ?
|
|
90
|
+
[routeId, parameters.getFormattedParameters()] :
|
|
91
|
+
[parameters.getFormattedParameters()];
|
|
80
92
|
};
|
|
81
93
|
PlaceRouter.decorators = [
|
|
82
94
|
{ type: Injectable, args: [{
|
|
@@ -98,4 +110,4 @@ if (false) {
|
|
|
98
110
|
*/
|
|
99
111
|
PlaceRouter.prototype.router;
|
|
100
112
|
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhY2Utcm91dGVyLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL3BsYWNlLXJvdXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQTBDLE1BQU0sRUFBVyxNQUFNLGlCQUFpQixDQUFDO0FBRTFGLE9BQU8sQ0FBQyxNQUFNLFFBQVEsQ0FBQzs7O0FBR3ZCO0lBSUUscUJBQTZCLE1BQWM7UUFBZCxXQUFNLEdBQU4sTUFBTSxDQUFRO0lBQzNDLENBQUM7Ozs7Ozs7SUFFRCxpREFBMkI7Ozs7OztJQUEzQixVQUE0QixjQUE4QixFQUFFLFFBQTJCLEVBQUUsSUFBdUI7O1lBQ3hHLFlBQVksR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUc7UUFDekQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLElBQUksQ0FBQyxFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUU7WUFDeEgsVUFBVSxFQUFFLGNBQWM7U0FDM0IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELFdBQVc7Ozs7Ozs7SUFDWCx3Q0FBa0I7Ozs7Ozs7SUFBbEIsVUFBbUIsY0FBc0MsRUFBRSxTQUE0Qjs7WUFDL0UsV0FBVyxHQUFHLGNBQWMsQ0FBQyxHQUFHOztZQUNoQyxjQUFjLEdBQUcsU0FBUyxDQUFDLFVBQVUsRUFBRSxJQUFJLFNBQVMsQ0FBQyxtQkFBbUIsRUFBRTs7WUFDMUUsUUFBUSxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUNqQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLG1CQUFtQixFQUFFLEVBQUUsU0FBUyxDQUFDLHNCQUFzQixFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzVGLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztRQUMzRCxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN2QyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzdDLENBQUM7Ozs7OztJQUVTLGtDQUFZOzs7OztJQUF0QixVQUF1QixjQUFzQztRQUMzRCxPQUFPLENBQUMsQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxHQUFHOzs7O1FBQUMsVUFBQSxLQUFLLElBQUksT0FBQSxLQUFLLENBQUMsR0FBRyxFQUFULENBQVMsRUFBQyxDQUFDLENBQUM7SUFDcEUsQ0FBQzs7Ozs7O0lBRVMsMkNBQXFCOzs7OztJQUEvQixVQUFnQyxVQUE2Qjs7WUFDckQsT0FBTyxHQUFHLFVBQVUsQ0FBQyxtQkFBbUIsRUFBRTtRQUNoRCxPQUFPLE9BQU8sQ0FBQyxDQUFDO1lBQ2QsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLHNCQUFzQixFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQ2hELENBQUMsVUFBVSxDQUFDLHNCQUFzQixFQUFFLENBQUMsQ0FBQztJQUMxQyxDQUFDOztnQkFsQ0YsVUFBVSxTQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjs7OztnQkFQZ0QsTUFBTTs7O3NCQUR2RDtDQTBDQyxBQXBDRCxJQW9DQztTQWpDWSxXQUFXOzs7Ozs7SUFDViw2QkFBK0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZSwgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgUm91dGVyLCBVcmxUcmVlIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IFRyYWNlIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IFBhcmFtZXRlclNuYXBzaG90IH0gZnJvbSAnLi9yb3V0ZS9wYXJhbWV0ZXItc25hcHNob3QnO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBQbGFjZVJvdXRlciB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgcm91dGVyOiBSb3V0ZXIpIHtcbiAgfVxuXG4gIHB1c2hQYXJhbWV0ZXJDaGFuZ2VzVG9Sb3V0ZShhY3RpdmF0ZWRSb3V0ZTogQWN0aXZhdGVkUm91dGUsIHByZXZpb3VzOiBQYXJhbWV0ZXJTbmFwc2hvdCwgbmV4dDogUGFyYW1ldGVyU25hcHNob3QpIHtcbiAgICBjb25zdCByZWxhdGl2ZVBhdGggPSAhIXByZXZpb3VzLmhhc1JvdXRlSWQoKSA/ICcuLicgOiAnLic7XG4gICAgdGhpcy5yb3V0ZXIubmF2aWdhdGUoW3JlbGF0aXZlUGF0aF0uY29uY2F0KHRoaXMuY3JlYXRlUm91dGVQYXJhbWV0ZXJzKG5leHQpLCB0aGlzLmdldENoaWxkUGF0aChhY3RpdmF0ZWRSb3V0ZS5zbmFwc2hvdCkpLCB7XG4gICAgICByZWxhdGl2ZVRvOiBhY3RpdmF0ZWRSb3V0ZVxuICAgIH0pO1xuICB9XG5cbiAgLy8gQFRyYWNlKClcbiAgZ2V0UmVkaXJlY3RVcmxUcmVlKGFjdGl2YXRlZFJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBzYW5pdGlzZWQ6IFBhcmFtZXRlclNuYXBzaG90KTogVXJsVHJlZSB7XG4gICAgY29uc3QgdXJsU2VnbWVudHMgPSBhY3RpdmF0ZWRSb3V0ZS51cmw7XG4gICAgY29uc3Qgd2VIYXZlQVJvdXRlSWQgPSBzYW5pdGlzZWQuaGFzUm91dGVJZCgpICYmIHNhbml0aXNlZC5nZXRGb3JtYXR0ZWRSb3V0ZUlkKCk7XG4gICAgY29uc3QgY29tbWFuZHMgPSAod2VIYXZlQVJvdXRlSWQpID9cbiAgICAgIFt1cmxTZWdtZW50c1swXS5wYXRoLCBzYW5pdGlzZWQuZ2V0Rm9ybWF0dGVkUm91dGVJZCgpLCBzYW5pdGlzZWQuZ2V0Rm9ybWF0dGVkUGFyYW1ldGVycygpXSA6XG4gICAgICBbdXJsU2VnbWVudHNbMF0ucGF0aCwgc2FuaXRpc2VkLmdldEZvcm1hdHRlZFBhcmFtZXRlcnMoKV07XG4gICAgY29uc29sZS5sb2coXCJyZWRpcmVjdCBwYXRoXCIsIGNvbW1hbmRzKTtcbiAgICByZXR1cm4gdGhpcy5yb3V0ZXIuY3JlYXRlVXJsVHJlZShjb21tYW5kcyk7XG4gIH1cblxuICBwcm90ZWN0ZWQgZ2V0Q2hpbGRQYXRoKGFjdGl2YXRlZFJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90KTogYW55W10ge1xuICAgIHJldHVybiBfLmZsYXR0ZW4oYWN0aXZhdGVkUm91dGUuY2hpbGRyZW4ubWFwKGNoaWxkID0+IGNoaWxkLnVybCkpO1xuICB9XG5cbiAgcHJvdGVjdGVkIGNyZWF0ZVJvdXRlUGFyYW1ldGVycyhwYXJhbWV0ZXJzOiBQYXJhbWV0ZXJTbmFwc2hvdCk6IGFueVtdIHtcbiAgICBjb25zdCByb3V0ZUlkID0gcGFyYW1ldGVycy5nZXRGb3JtYXR0ZWRSb3V0ZUlkKCk7XG4gICAgcmV0dXJuIHJvdXRlSWQgP1xuICAgICAgW3JvdXRlSWQsIHBhcmFtZXRlcnMuZ2V0Rm9ybWF0dGVkUGFyYW1ldGVycygpXSA6XG4gICAgICBbcGFyYW1ldGVycy5nZXRGb3JtYXR0ZWRQYXJhbWV0ZXJzKCldO1xuICB9XG5cbn1cbiJdfQ==
|
|
@@ -93,4 +93,4 @@ export function RouteParameterList(elementType, options) {
|
|
|
93
93
|
UseDelegate()(prototype, propertyKey);
|
|
94
94
|
});
|
|
95
95
|
}
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLWRlY29yYXRvcnMuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2Uvcm91dGUvcGFyYW1ldGVyLWRlY29yYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLE9BQU8sRUFBVSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsS0FBSyxFQUFRLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sOEJBQThCLENBQUM7Ozs7O0FBR25FLHNDQU1DOzs7SUFMQyw4QkFBWTs7SUFDWixvQ0FBbUI7O0lBQ25CLG9DQUFtQjs7SUFDbkIsd0NBQWlCOzs7Ozs7QUFJbkIsMENBTUM7OztJQUxDLGtDQUFZOztJQUNaLHdDQUFtQjs7SUFDbkIsd0NBQW1COztJQUNuQiw0Q0FBbUI7Ozs7Ozs7O0FBSXJCLE1BQU0sVUFBVSxPQUFPLENBQTRCLElBQXNCLEVBQUUsT0FBNkI7SUFDdEc7Ozs7O0lBQU8sVUFBQyxTQUFpQixFQUFFLFdBQTRCOztZQUMvQyxLQUFLLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxPQUFPLENBQUM7UUFDcEYsS0FBSyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUMzRSxXQUFXLEVBQUUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDeEMsQ0FBQyxFQUFDO0FBQ0osQ0FBQzs7Ozs7OztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUksSUFBc0IsRUFBRSxPQUE2QjtJQUNyRjs7Ozs7SUFBTyxVQUFDLFNBQWlCLEVBQUUsV0FBNEI7O1lBQy9DLEtBQUssR0FBRyxJQUFJLG1CQUFtQixDQUFDLGNBQWMsQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQztRQUMzRixLQUFLLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLHdCQUF3QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzNFLFdBQVcsRUFBRSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUN4QyxDQUFDLEVBQUM7QUFDSixDQUFDOzs7Ozs7O0FBRUQsTUFBTSxVQUFVLGtCQUFrQixDQUFJLFdBQTZCLEVBQUUsT0FBaUM7SUFDcEc7Ozs7O0lBQU8sVUFBQyxTQUFpQixFQUFFLFdBQTRCOztZQUMvQyxLQUFLLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxjQUFjLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRSxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUM7UUFDbEcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUMzRSxXQUFXLEVBQUUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDeEMsQ0FBQyxFQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGFzc2VydCwgVXNlRGVsZWdhdGUgfSBmcm9tICdAY29vbG9uL3BlY3Rpbic7XG5pbXBvcnQgeyBLbGFzcywgT3B0cyB9IGZyb20gJ0Bjb29sb24vdHlwZXNjcmlwdC11dGlsaXRpZXMnO1xuaW1wb3J0IHsgUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZIH0gZnJvbSAnLi4vcGxhY2UtY29tcG9uZW50JztcbmltcG9ydCB7IFBhcmFtZXRlckRlZmluaXRpb24gfSBmcm9tICcuL3BhcmFtZXRlci1kZWZpbml0aW9uLmNsYXNzJztcbmltcG9ydCB7IFBhcmFtZXRlclR5cGUgfSBmcm9tICcuL3BhcmFtZXRlci10eXBlJztcblxuZXhwb3J0IGludGVyZmFjZSBQYXJhbWV0ZXJPcHRpb25zPFQ+IHtcbiAgYXM/OiBzdHJpbmc7XG4gIG9wdGlvbmFsPzogYm9vbGVhbjtcbiAgcmVtZW1iZXI/OiBib29sZWFuO1xuICBkZWZhdWx0VmFsdWU/OiBUO1xuICAvLyBzYW5pdGlzZXI/OiBDb25zdHJ1Y3RhYmxlPFBhcmFtZXRlclNhbml0aXNlcjxUPj4gfCBQYXJhbWV0ZXJTYW5pdGlzZXIuT3B0aW9uczxUPjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBMaXN0UGFyYW1ldGVyT3B0aW9uczxUPiB7XG4gIGFzPzogc3RyaW5nO1xuICBvcHRpb25hbD86IGJvb2xlYW47XG4gIHJlbWVtYmVyPzogYm9vbGVhbjtcbiAgZGVmYXVsdFZhbHVlPzogVFtdO1xuICAvLyBzYW5pdGlzZXI/OiBDb25zdHJ1Y3RhYmxlPFBhcmFtZXRlclNhbml0aXNlcjxUW10+PiB8IFBhcmFtZXRlclNhbml0aXNlci5PcHRpb25zPFRbXT47XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBSb3V0ZUlkPFQgZXh0ZW5kcyBzdHJpbmcgfCBudW1iZXI+KHR5cGU6IFBhcmFtZXRlclR5cGU8VD4sIG9wdGlvbnM/OiBQYXJhbWV0ZXJPcHRpb25zPFQ+KTogUHJvcGVydHlEZWNvcmF0b3Ige1xuICByZXR1cm4gKHByb3RvdHlwZTogT2JqZWN0LCBwcm9wZXJ0eUtleTogc3RyaW5nIHwgc3ltYm9sKSA9PiB7XG4gICAgY29uc3QgcGFyYW0gPSBuZXcgUGFyYW1ldGVyRGVmaW5pdGlvbi5Sb3V0ZUlkKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIHR5cGUsIG9wdGlvbnMpO1xuICAgIEtsYXNzLmdldChwcm90b3R5cGUpLmFkZFRvT3duTWV0YWRhdGFMaXN0KFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSwgcGFyYW0pO1xuICAgIFVzZURlbGVnYXRlKCkocHJvdG90eXBlLCBwcm9wZXJ0eUtleSk7XG4gIH07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBSb3V0ZVBhcmFtZXRlcjxUPih0eXBlOiBQYXJhbWV0ZXJUeXBlPFQ+LCBvcHRpb25zPzogUGFyYW1ldGVyT3B0aW9uczxUPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbiAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uVmFsdWVQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgdHlwZSwgb3B0aW9ucyk7XG4gICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4gICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIFJvdXRlUGFyYW1ldGVyTGlzdDxFPihlbGVtZW50VHlwZTogUGFyYW1ldGVyVHlwZTxFPiwgb3B0aW9ucz86IExpc3RQYXJhbWV0ZXJPcHRpb25zPEU+KTogUHJvcGVydHlEZWNvcmF0b3Ige1xuICByZXR1cm4gKHByb3RvdHlwZTogT2JqZWN0LCBwcm9wZXJ0eUtleTogc3RyaW5nIHwgc3ltYm9sKSA9PiB7XG4gICAgY29uc3QgcGFyYW0gPSBuZXcgUGFyYW1ldGVyRGVmaW5pdGlvbi5BcnJheVBhcmFtZXRlcihwcm9wZXJ0eUtleS50b1N0cmluZygpLCBlbGVtZW50VHlwZSwgb3B0aW9ucyk7XG4gICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4gICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbiAgfTtcbn1cbiJdfQ==
|