@coolon/angular-ui-powerups 0.0.67 → 0.0.68
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 +2712 -2285
- 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.d.ts +24 -22
- package/coolon-angular-ui-powerups.metadata.json +1 -1
- package/esm2015/coolon-angular-ui-powerups.js +24 -22
- package/esm2015/index.js +2 -2
- package/esm2015/lib/angular-ui-powerups.module.js +6 -3
- package/esm2015/lib/components/index.js +2 -1
- package/esm2015/lib/components/noop/noop.component.js +19 -0
- package/esm2015/lib/interaction/components/alert-dialog/alert-dialog.component.js +2 -2
- package/esm2015/lib/interaction/components/confirm-then-dialog/confirm-then-dialog.component.js +2 -2
- package/esm2015/lib/interaction/components/confirmation-dialog/confirmation-dialog.component.js +2 -2
- package/esm2015/lib/interaction/components/interaction-outlet/interaction-outlet.component.js +19 -0
- package/esm2015/lib/interaction/guards/interaction-guard.service.js +85 -0
- package/esm2015/lib/interaction/index.js +3 -2
- package/esm2015/lib/interaction/interaction.module.js +8 -3
- package/esm2015/lib/interaction/services/dialog-interaction.service.js +30 -5
- package/esm2015/lib/place/components/abstract-place-navigation.component.js +5 -5
- package/esm2015/lib/place/components/list-place-nav/list-place-nav.component.js +2 -2
- package/esm2015/lib/place/components/place-outlet/place-outlet.component.js +60 -66
- package/esm2015/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.js +2 -2
- package/esm2015/lib/place/index.js +9 -8
- package/esm2015/lib/place/navigation-session.js +147 -0
- package/esm2015/lib/place/place-component.js +18 -14
- package/esm2015/lib/place/place-definition.js +197 -5
- package/esm2015/lib/place/place-history.js +3 -2
- package/esm2015/lib/place/place-router.js +183 -89
- package/esm2015/lib/place/route/formatter.js +63 -0
- package/esm2015/lib/place/route/guards/leave-place.guard.js +193 -0
- package/esm2015/lib/place/route/guards/place-route.guard.js +243 -0
- package/esm2015/lib/place/route/parameter-decorators.js +35 -18
- package/esm2015/lib/place/route/parameter-definition.class.js +123 -67
- package/esm2015/lib/place/route/parameter-sanitiser.js +4 -3
- package/esm2015/lib/place/route/parameter-snapshot.js +11 -388
- package/esm2015/lib/place/route/visit-sanitiser.js +88 -0
- package/esm2015/lib/place/visit.js +107 -8
- package/esm2015/public_api.js +4 -4
- package/esm5/coolon-angular-ui-powerups.js +24 -22
- package/esm5/index.js +2 -2
- package/esm5/lib/angular-ui-powerups.module.js +6 -3
- package/esm5/lib/components/index.js +2 -1
- package/esm5/lib/components/noop/noop.component.js +21 -0
- package/esm5/lib/interaction/components/alert-dialog/alert-dialog.component.js +2 -2
- package/esm5/lib/interaction/components/confirm-then-dialog/confirm-then-dialog.component.js +2 -2
- package/esm5/lib/interaction/components/confirmation-dialog/confirmation-dialog.component.js +2 -2
- package/esm5/lib/interaction/components/interaction-outlet/interaction-outlet.component.js +21 -0
- package/esm5/lib/interaction/guards/interaction-guard.service.js +94 -0
- package/esm5/lib/interaction/index.js +3 -2
- package/esm5/lib/interaction/interaction.module.js +8 -3
- package/esm5/lib/interaction/services/dialog-interaction.service.js +28 -5
- package/esm5/lib/place/components/abstract-place-navigation.component.js +5 -5
- package/esm5/lib/place/components/list-place-nav/list-place-nav.component.js +2 -2
- package/esm5/lib/place/components/place-outlet/place-outlet.component.js +70 -82
- package/esm5/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.js +2 -2
- package/esm5/lib/place/index.js +9 -8
- package/esm5/lib/place/navigation-session.js +193 -0
- package/esm5/lib/place/place-component.js +19 -15
- package/esm5/lib/place/place-definition.js +253 -5
- package/esm5/lib/place/place-history.js +7 -3
- package/esm5/lib/place/place-router.js +240 -108
- package/esm5/lib/place/route/formatter.js +96 -0
- package/esm5/lib/place/route/guards/leave-place.guard.js +152 -0
- package/esm5/lib/place/route/guards/place-route.guard.js +273 -0
- package/esm5/lib/place/route/parameter-decorators.js +35 -18
- package/esm5/lib/place/route/parameter-definition.class.js +179 -76
- package/esm5/lib/place/route/parameter-sanitiser.js +4 -3
- package/esm5/lib/place/route/parameter-snapshot.js +11 -480
- package/esm5/lib/place/route/visit-sanitiser.js +99 -0
- package/esm5/lib/place/visit.js +160 -8
- package/esm5/public_api.js +4 -4
- package/fesm2015/coolon-angular-ui-powerups.js +1441 -1108
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +2705 -2282
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/components/index.d.ts +1 -0
- package/lib/components/noop/noop.component.d.ts +3 -0
- package/lib/interaction/components/interaction-outlet/interaction-outlet.component.d.ts +3 -0
- package/lib/interaction/guards/interaction-guard.service.d.ts +13 -0
- package/lib/interaction/index.d.ts +2 -1
- package/lib/interaction/services/dialog-interaction.service.d.ts +5 -1
- package/lib/place/components/place-outlet/place-outlet.component.d.ts +12 -12
- package/lib/place/index.d.ts +5 -4
- package/lib/place/navigation-session.d.ts +26 -0
- package/lib/place/place-component.d.ts +3 -3
- package/lib/place/place-definition.d.ts +30 -3
- package/lib/place/place-history.d.ts +3 -3
- package/lib/place/place-router.d.ts +25 -19
- package/lib/place/route/{parameter-type.d.ts → formatter.d.ts} +5 -5
- package/lib/place/{guards → route/guards}/leave-place.guard.d.ts +3 -3
- package/lib/place/route/guards/place-route.guard.d.ts +27 -0
- package/lib/place/route/parameter-decorators.d.ts +14 -6
- package/lib/place/route/parameter-definition.class.d.ts +21 -17
- package/lib/place/route/parameter-sanitiser.d.ts +3 -2
- package/lib/place/route/parameter-snapshot.d.ts +4 -26
- package/lib/place/route/visit-sanitiser.d.ts +12 -0
- package/lib/place/visit.d.ts +24 -3
- package/package.json +1 -1
- package/schematics/place-routes/place-class-scanner.d.ts +2 -2
- package/schematics/place-routes/place-class-scanner.js +7 -7
- package/schematics/place-routes/place-class-scanner.js.map +1 -1
- package/schematics/place-routes/place-def.d.ts +3 -2
- package/schematics/place-routes/place-def.js +21 -12
- package/schematics/place-routes/place-def.js.map +1 -1
- package/schematics/place-routes/templates/place-destinations.ts.template +5 -3
- package/schematics/place-routes/templates/place-routes.ts.template +10 -1
- package/schematics/place-routes/templates/place-visits.ts.template +21 -0
- package/esm2015/lib/interaction/guards/close-interaction.guard.js +0 -62
- package/esm2015/lib/place/guards/leave-place.guard.js +0 -194
- package/esm2015/lib/place/guards/place-route.guard.js +0 -74
- package/esm2015/lib/place/route/parameter-type.js +0 -61
- package/esm2015/lib/place/route/route-parameter-value.js +0 -230
- package/esm5/lib/interaction/guards/close-interaction.guard.js +0 -66
- package/esm5/lib/place/guards/leave-place.guard.js +0 -159
- package/esm5/lib/place/guards/place-route.guard.js +0 -78
- package/esm5/lib/place/route/parameter-type.js +0 -94
- package/esm5/lib/place/route/route-parameter-value.js +0 -316
- package/lib/interaction/guards/close-interaction.guard.d.ts +0 -12
- package/lib/place/guards/place-route.guard.d.ts +0 -10
- package/lib/place/route/route-parameter-value.d.ts +0 -42
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @fileoverview added by tsickle
|
|
3
|
+
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
4
|
+
*/
|
|
5
|
+
import * as tslib_1 from "tslib";
|
|
6
|
+
/**
|
|
7
|
+
* @abstract
|
|
8
|
+
*/
|
|
9
|
+
var /**
|
|
10
|
+
* @abstract
|
|
11
|
+
*/
|
|
12
|
+
NavigationSession = /** @class */ (function () {
|
|
13
|
+
function NavigationSession(firstNavigation) {
|
|
14
|
+
this.firstNavigation = firstNavigation;
|
|
15
|
+
this._alreadyAccepted = [];
|
|
16
|
+
this._visits = new Map();
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* @param {?} visit
|
|
20
|
+
* @return {?}
|
|
21
|
+
*/
|
|
22
|
+
NavigationSession.prototype.storeVisit = /**
|
|
23
|
+
* @param {?} visit
|
|
24
|
+
* @return {?}
|
|
25
|
+
*/
|
|
26
|
+
function (visit) {
|
|
27
|
+
this._visits.set(visit.placeDefinition, visit);
|
|
28
|
+
};
|
|
29
|
+
/**
|
|
30
|
+
* @param {?} placeDef
|
|
31
|
+
* @return {?}
|
|
32
|
+
*/
|
|
33
|
+
NavigationSession.prototype.getVisitFor = /**
|
|
34
|
+
* @param {?} placeDef
|
|
35
|
+
* @return {?}
|
|
36
|
+
*/
|
|
37
|
+
function (placeDef) {
|
|
38
|
+
return this._visits.get(placeDef);
|
|
39
|
+
};
|
|
40
|
+
/**
|
|
41
|
+
* @param {?} params
|
|
42
|
+
* @return {?}
|
|
43
|
+
*/
|
|
44
|
+
NavigationSession.prototype.mergePrivatePlaceParameters = /**
|
|
45
|
+
* @param {?} params
|
|
46
|
+
* @return {?}
|
|
47
|
+
*/
|
|
48
|
+
function (params) {
|
|
49
|
+
return null;
|
|
50
|
+
};
|
|
51
|
+
// @Trace()
|
|
52
|
+
// @Trace()
|
|
53
|
+
/**
|
|
54
|
+
* @param {?} placeComponent
|
|
55
|
+
* @return {?}
|
|
56
|
+
*/
|
|
57
|
+
NavigationSession.prototype.alreadyAccepted =
|
|
58
|
+
// @Trace()
|
|
59
|
+
/**
|
|
60
|
+
* @param {?} placeComponent
|
|
61
|
+
* @return {?}
|
|
62
|
+
*/
|
|
63
|
+
function (placeComponent) {
|
|
64
|
+
return this._alreadyAccepted.includes(placeComponent);
|
|
65
|
+
};
|
|
66
|
+
// @Trace()
|
|
67
|
+
// @Trace()
|
|
68
|
+
/**
|
|
69
|
+
* @param {?} component
|
|
70
|
+
* @return {?}
|
|
71
|
+
*/
|
|
72
|
+
NavigationSession.prototype.rememberAcceptanceOf =
|
|
73
|
+
// @Trace()
|
|
74
|
+
/**
|
|
75
|
+
* @param {?} component
|
|
76
|
+
* @return {?}
|
|
77
|
+
*/
|
|
78
|
+
function (component) {
|
|
79
|
+
this._alreadyAccepted.push(component);
|
|
80
|
+
};
|
|
81
|
+
/**
|
|
82
|
+
* @param {?} url
|
|
83
|
+
* @return {?}
|
|
84
|
+
*/
|
|
85
|
+
NavigationSession.prototype.setPopstateReturn = /**
|
|
86
|
+
* @param {?} url
|
|
87
|
+
* @return {?}
|
|
88
|
+
*/
|
|
89
|
+
function (url) {
|
|
90
|
+
this._popStateReturnUrl = url;
|
|
91
|
+
};
|
|
92
|
+
Object.defineProperty(NavigationSession.prototype, "isPopState", {
|
|
93
|
+
get: /**
|
|
94
|
+
* @return {?}
|
|
95
|
+
*/
|
|
96
|
+
function () {
|
|
97
|
+
return !!this._popStateReturnUrl;
|
|
98
|
+
},
|
|
99
|
+
enumerable: true,
|
|
100
|
+
configurable: true
|
|
101
|
+
});
|
|
102
|
+
Object.defineProperty(NavigationSession.prototype, "popStateReturnUrl", {
|
|
103
|
+
get: /**
|
|
104
|
+
* @return {?}
|
|
105
|
+
*/
|
|
106
|
+
function () {
|
|
107
|
+
return this._popStateReturnUrl;
|
|
108
|
+
},
|
|
109
|
+
enumerable: true,
|
|
110
|
+
configurable: true
|
|
111
|
+
});
|
|
112
|
+
/**
|
|
113
|
+
* @return {?}
|
|
114
|
+
*/
|
|
115
|
+
NavigationSession.prototype.getVisits = /**
|
|
116
|
+
* @return {?}
|
|
117
|
+
*/
|
|
118
|
+
function () {
|
|
119
|
+
return Array.from(this._visits.values());
|
|
120
|
+
};
|
|
121
|
+
return NavigationSession;
|
|
122
|
+
}());
|
|
123
|
+
/**
|
|
124
|
+
* @abstract
|
|
125
|
+
*/
|
|
126
|
+
export { NavigationSession };
|
|
127
|
+
if (false) {
|
|
128
|
+
/**
|
|
129
|
+
* @type {?}
|
|
130
|
+
* @private
|
|
131
|
+
*/
|
|
132
|
+
NavigationSession.prototype._alreadyAccepted;
|
|
133
|
+
/**
|
|
134
|
+
* @type {?}
|
|
135
|
+
* @private
|
|
136
|
+
*/
|
|
137
|
+
NavigationSession.prototype._visits;
|
|
138
|
+
/**
|
|
139
|
+
* @type {?}
|
|
140
|
+
* @private
|
|
141
|
+
*/
|
|
142
|
+
NavigationSession.prototype._popStateReturnUrl;
|
|
143
|
+
/** @type {?} */
|
|
144
|
+
NavigationSession.prototype.isExternal;
|
|
145
|
+
/** @type {?} */
|
|
146
|
+
NavigationSession.prototype.firstNavigation;
|
|
147
|
+
}
|
|
148
|
+
(function (NavigationSession) {
|
|
149
|
+
var External = /** @class */ (function (_super) {
|
|
150
|
+
tslib_1.__extends(External, _super);
|
|
151
|
+
function External(isFirstTime) {
|
|
152
|
+
var _this = _super.call(this, isFirstTime) || this;
|
|
153
|
+
_this.isExternal = true;
|
|
154
|
+
return _this;
|
|
155
|
+
}
|
|
156
|
+
return External;
|
|
157
|
+
}(NavigationSession));
|
|
158
|
+
if (false) {
|
|
159
|
+
/** @type {?} */
|
|
160
|
+
External.prototype.isExternal;
|
|
161
|
+
}
|
|
162
|
+
var Internal = /** @class */ (function (_super) {
|
|
163
|
+
tslib_1.__extends(Internal, _super);
|
|
164
|
+
function Internal(visit) {
|
|
165
|
+
var _this = _super.call(this, false) || this;
|
|
166
|
+
_this.isExternal = false;
|
|
167
|
+
_this.storeVisit(visit);
|
|
168
|
+
return _this;
|
|
169
|
+
}
|
|
170
|
+
return Internal;
|
|
171
|
+
}(NavigationSession));
|
|
172
|
+
if (false) {
|
|
173
|
+
/** @type {?} */
|
|
174
|
+
Internal.prototype.isExternal;
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* @param {?} visit
|
|
178
|
+
* @return {?}
|
|
179
|
+
*/
|
|
180
|
+
function createInternal(visit) {
|
|
181
|
+
return new Internal(visit);
|
|
182
|
+
}
|
|
183
|
+
NavigationSession.createInternal = createInternal;
|
|
184
|
+
/**
|
|
185
|
+
* @param {?} firstTimeRoute
|
|
186
|
+
* @return {?}
|
|
187
|
+
*/
|
|
188
|
+
function createExternal(firstTimeRoute) {
|
|
189
|
+
return new External(firstTimeRoute);
|
|
190
|
+
}
|
|
191
|
+
NavigationSession.createExternal = createExternal;
|
|
192
|
+
})(NavigationSession || (NavigationSession = {}));
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF2aWdhdGlvbi1zZXNzaW9uLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL25hdmlnYXRpb24tc2Vzc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUtBOzs7O0lBU0UsMkJBQStCLGVBQXdCO1FBQXhCLG9CQUFlLEdBQWYsZUFBZSxDQUFTO1FBUC9DLHFCQUFnQixHQUFxQixFQUFFLENBQUM7UUFFeEMsWUFBTyxHQUFHLElBQUksR0FBRyxFQUEwQixDQUFDO0lBTXBELENBQUM7Ozs7O0lBRUQsc0NBQVU7Ozs7SUFBVixVQUFXLEtBQVk7UUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLGVBQWUsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNqRCxDQUFDOzs7OztJQUVELHVDQUFXOzs7O0lBQVgsVUFBWSxRQUF5QjtRQUNuQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7Ozs7O0lBRUQsdURBQTJCOzs7O0lBQTNCLFVBQTRCLE1BQTRCO1FBQ3RELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELFdBQVc7Ozs7OztJQUNYLDJDQUFlOzs7Ozs7SUFBZixVQUFnQixjQUE4QjtRQUM1QyxPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDeEQsQ0FBQztJQUVELFdBQVc7Ozs7OztJQUNYLGdEQUFvQjs7Ozs7O0lBQXBCLFVBQXFCLFNBQXlCO1FBQzVDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDeEMsQ0FBQzs7Ozs7SUFFRCw2Q0FBaUI7Ozs7SUFBakIsVUFBa0IsR0FBVztRQUMzQixJQUFJLENBQUMsa0JBQWtCLEdBQUcsR0FBRyxDQUFDO0lBQ2hDLENBQUM7SUFFRCxzQkFBSSx5Q0FBVTs7OztRQUFkO1lBQ0UsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDO1FBQ25DLENBQUM7OztPQUFBO0lBRUQsc0JBQUksZ0RBQWlCOzs7O1FBQXJCO1lBQ0UsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUM7UUFDakMsQ0FBQzs7O09BQUE7Ozs7SUFFRCxxQ0FBUzs7O0lBQVQ7UUFDRSxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFDSCx3QkFBQztBQUFELENBQUMsQUFqREQsSUFpREM7Ozs7Ozs7Ozs7SUEvQ0MsNkNBQWdEOzs7OztJQUVoRCxvQ0FBb0Q7Ozs7O0lBQ3BELCtDQUFtQzs7SUFFbkMsdUNBQXNDOztJQUVoQiw0Q0FBaUM7O0FBMEN6RCxXQUFpQixpQkFBaUI7SUFFaEM7UUFBdUIsb0NBQWlCO1FBR3RDLGtCQUFZLFdBQW9CO1lBQWhDLFlBQ0Usa0JBQU0sV0FBVyxDQUFDLFNBQ25CO1lBSlEsZ0JBQVUsR0FBRyxJQUFJLENBQUM7O1FBSTNCLENBQUM7UUFDSCxlQUFDO0lBQUQsQ0FBQyxBQU5ELENBQXVCLGlCQUFpQixHQU12Qzs7O1FBTEMsOEJBQTJCOztJQU83QjtRQUF1QixvQ0FBaUI7UUFHdEMsa0JBQVksS0FBWTtZQUF4QixZQUNFLGtCQUFNLEtBQUssQ0FBQyxTQUViO1lBTFEsZ0JBQVUsR0FBRyxLQUFLLENBQUM7WUFJMUIsS0FBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQzs7UUFDekIsQ0FBQztRQUNILGVBQUM7SUFBRCxDQUFDLEFBUEQsQ0FBdUIsaUJBQWlCLEdBT3ZDOzs7UUFOQyw4QkFBNEI7Ozs7OztJQVE5QixTQUFnQixjQUFjLENBQUMsS0FBWTtRQUN6QyxPQUFPLElBQUksUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFGZSxnQ0FBYyxpQkFFN0IsQ0FBQTs7Ozs7SUFFRCxTQUFnQixjQUFjLENBQUMsY0FBdUI7UUFDcEQsT0FBTyxJQUFJLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRmUsZ0NBQWMsaUJBRTdCLENBQUE7QUFHSCxDQUFDLEVBNUJnQixpQkFBaUIsS0FBakIsaUJBQWlCLFFBNEJqQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRyYWNlIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgUGxhY2VDb21wb25lbnQgfSBmcm9tICcuL3BsYWNlLWNvbXBvbmVudCc7XG5pbXBvcnQgeyBQbGFjZURlZmluaXRpb24gfSBmcm9tICcuL3BsYWNlLWRlZmluaXRpb24nO1xuaW1wb3J0IHsgVmlzaXQgfSBmcm9tICcuL3Zpc2l0JztcblxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIE5hdmlnYXRpb25TZXNzaW9uIHtcblxuICBwcml2YXRlIF9hbHJlYWR5QWNjZXB0ZWQ6IFBsYWNlQ29tcG9uZW50W10gPSBbXTtcblxuICBwcml2YXRlIF92aXNpdHMgPSBuZXcgTWFwPFBsYWNlRGVmaW5pdGlvbiwgVmlzaXQ+KCk7XG4gIHByaXZhdGUgX3BvcFN0YXRlUmV0dXJuVXJsOiBzdHJpbmc7XG5cbiAgYWJzdHJhY3QgcmVhZG9ubHkgaXNFeHRlcm5hbDogYm9vbGVhbjtcblxuICBwcm90ZWN0ZWQgY29uc3RydWN0b3IocmVhZG9ubHkgZmlyc3ROYXZpZ2F0aW9uOiBib29sZWFuKSB7XG4gIH1cblxuICBzdG9yZVZpc2l0KHZpc2l0OiBWaXNpdCkge1xuICAgIHRoaXMuX3Zpc2l0cy5zZXQodmlzaXQucGxhY2VEZWZpbml0aW9uLCB2aXNpdCk7XG4gIH1cblxuICBnZXRWaXNpdEZvcihwbGFjZURlZjogUGxhY2VEZWZpbml0aW9uKSB7XG4gICAgcmV0dXJuIHRoaXMuX3Zpc2l0cy5nZXQocGxhY2VEZWYpO1xuICB9XG5cbiAgbWVyZ2VQcml2YXRlUGxhY2VQYXJhbWV0ZXJzKHBhcmFtczogeyBbcDogc3RyaW5nXTogYW55IH0pOiBOYXZpZ2F0aW9uU2Vzc2lvbiB7XG4gICAgcmV0dXJuIG51bGw7XG4gIH1cblxuICAvLyBAVHJhY2UoKVxuICBhbHJlYWR5QWNjZXB0ZWQocGxhY2VDb21wb25lbnQ6IFBsYWNlQ29tcG9uZW50KTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHRoaXMuX2FscmVhZHlBY2NlcHRlZC5pbmNsdWRlcyhwbGFjZUNvbXBvbmVudCk7XG4gIH1cblxuICAvLyBAVHJhY2UoKVxuICByZW1lbWJlckFjY2VwdGFuY2VPZihjb21wb25lbnQ6IFBsYWNlQ29tcG9uZW50KSB7XG4gICAgdGhpcy5fYWxyZWFkeUFjY2VwdGVkLnB1c2goY29tcG9uZW50KTtcbiAgfVxuXG4gIHNldFBvcHN0YXRlUmV0dXJuKHVybDogc3RyaW5nKSB7XG4gICAgdGhpcy5fcG9wU3RhdGVSZXR1cm5VcmwgPSB1cmw7XG4gIH1cblxuICBnZXQgaXNQb3BTdGF0ZSgpOiBib29sZWFuIHtcbiAgICByZXR1cm4gISF0aGlzLl9wb3BTdGF0ZVJldHVyblVybDtcbiAgfVxuXG4gIGdldCBwb3BTdGF0ZVJldHVyblVybCgpIHtcbiAgICByZXR1cm4gdGhpcy5fcG9wU3RhdGVSZXR1cm5Vcmw7XG4gIH1cblxuICBnZXRWaXNpdHMoKTogVmlzaXRbXSB7XG4gICAgcmV0dXJuIEFycmF5LmZyb20odGhpcy5fdmlzaXRzLnZhbHVlcygpKTtcbiAgfVxufVxuXG5leHBvcnQgbmFtZXNwYWNlIE5hdmlnYXRpb25TZXNzaW9uIHtcblxuICBjbGFzcyBFeHRlcm5hbCBleHRlbmRzIE5hdmlnYXRpb25TZXNzaW9uIHtcbiAgICByZWFkb25seSBpc0V4dGVybmFsID0gdHJ1ZTtcblxuICAgIGNvbnN0cnVjdG9yKGlzRmlyc3RUaW1lOiBib29sZWFuKSB7XG4gICAgICBzdXBlcihpc0ZpcnN0VGltZSk7XG4gICAgfVxuICB9XG5cbiAgY2xhc3MgSW50ZXJuYWwgZXh0ZW5kcyBOYXZpZ2F0aW9uU2Vzc2lvbiB7XG4gICAgcmVhZG9ubHkgaXNFeHRlcm5hbCA9IGZhbHNlO1xuXG4gICAgY29uc3RydWN0b3IodmlzaXQ6IFZpc2l0KSB7XG4gICAgICBzdXBlcihmYWxzZSk7XG4gICAgICB0aGlzLnN0b3JlVmlzaXQodmlzaXQpO1xuICAgIH1cbiAgfVxuXG4gIGV4cG9ydCBmdW5jdGlvbiBjcmVhdGVJbnRlcm5hbCh2aXNpdDogVmlzaXQpOiBOYXZpZ2F0aW9uU2Vzc2lvbiB7XG4gICAgcmV0dXJuIG5ldyBJbnRlcm5hbCh2aXNpdCk7XG4gIH1cblxuICBleHBvcnQgZnVuY3Rpb24gY3JlYXRlRXh0ZXJuYWwoZmlyc3RUaW1lUm91dGU6IGJvb2xlYW4pOiBOYXZpZ2F0aW9uU2Vzc2lvbiB7XG4gICAgcmV0dXJuIG5ldyBFeHRlcm5hbChmaXJzdFRpbWVSb3V0ZSk7XG4gIH1cblxuXG59XG5cbiJdfQ==
|
|
@@ -21,18 +21,18 @@ var PlaceComponent = /** @class */ (function (_super) {
|
|
|
21
21
|
return _super.call(this) || this;
|
|
22
22
|
}
|
|
23
23
|
/**
|
|
24
|
-
* @param {?}
|
|
24
|
+
* @param {?} visit
|
|
25
25
|
* @return {?}
|
|
26
26
|
*/
|
|
27
27
|
PlaceComponent.prototype.initialiseBindings = /**
|
|
28
|
-
* @param {?}
|
|
28
|
+
* @param {?} visit
|
|
29
29
|
* @return {?}
|
|
30
30
|
*/
|
|
31
|
-
function (
|
|
31
|
+
function (visit) {
|
|
32
32
|
var _this = this;
|
|
33
|
-
assert.isNil(this.
|
|
34
|
-
this.
|
|
35
|
-
this.placeDefinition.
|
|
33
|
+
assert.isNil(this.visit);
|
|
34
|
+
this.visit = visit;
|
|
35
|
+
this.placeDefinition.getVisitParameterDefs().forEach((/**
|
|
36
36
|
* @param {?} parameterDef
|
|
37
37
|
* @return {?}
|
|
38
38
|
*/
|
|
@@ -56,21 +56,25 @@ var PlaceComponent = /** @class */ (function (_super) {
|
|
|
56
56
|
/** @type {?} */
|
|
57
57
|
var model = (/** @type {?} */ (this[parameterDef.propertyName]));
|
|
58
58
|
// this.txo.observe(parameterDef.propertyName, model);
|
|
59
|
-
this.registerDisposable(new Binding(this.
|
|
59
|
+
this.registerDisposable(new Binding(this.visit, model, {
|
|
60
60
|
toRight: /**
|
|
61
|
-
* @param {?}
|
|
61
|
+
* @param {?} visit
|
|
62
62
|
* @return {?}
|
|
63
63
|
*/
|
|
64
|
-
function (
|
|
65
|
-
|
|
64
|
+
function (visit) {
|
|
65
|
+
/** @type {?} */
|
|
66
|
+
var value = visit.getParameter(parameterDef.name);
|
|
67
|
+
// console.log('push to component', {name:parameterDef.name, value, visit});
|
|
68
|
+
return value;
|
|
66
69
|
},
|
|
67
70
|
toLeft: /**
|
|
68
71
|
* @param {?} value
|
|
69
|
-
* @param {?=}
|
|
72
|
+
* @param {?=} currentVisit
|
|
70
73
|
* @return {?}
|
|
71
74
|
*/
|
|
72
|
-
function (value,
|
|
73
|
-
|
|
75
|
+
function (value, currentVisit) {
|
|
76
|
+
console.log('push to route', { name: parameterDef.name, value: value, currentVisit: currentVisit });
|
|
77
|
+
return currentVisit.replace(parameterDef, value);
|
|
74
78
|
}
|
|
75
79
|
}));
|
|
76
80
|
};
|
|
@@ -128,7 +132,7 @@ if (false) {
|
|
|
128
132
|
* @type {?}
|
|
129
133
|
* @private
|
|
130
134
|
*/
|
|
131
|
-
PlaceComponent.prototype.
|
|
135
|
+
PlaceComponent.prototype.visit;
|
|
132
136
|
}
|
|
133
137
|
(function (PlaceComponent) {
|
|
134
138
|
/**
|
|
@@ -165,4 +169,4 @@ if (false) {
|
|
|
165
169
|
}
|
|
166
170
|
PlaceComponent.injectDefinition = injectDefinition;
|
|
167
171
|
})(PlaceComponent || (PlaceComponent = {}));
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
172
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhY2UtY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL3BsYWNlLWNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFtQyxJQUFJLEVBQWMsTUFBTSxnQkFBZ0IsQ0FBQztBQUNwRyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2xFLE9BQU8sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDekUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG9CQUFvQixDQUFDOzs7QUFLckQsTUFBTSxLQUFPLHdCQUF3QixHQUFHLDBCQUEwQjs7O0FBRWxFLE1BQU0sS0FBTyx3QkFBd0IsR0FBRyxNQUFNLENBQUMsd0JBQXdCLENBQUM7QUFFeEU7SUFBb0MsMENBQW1CO0lBSXJEO2VBQ0UsaUJBQU87SUFDVCxDQUFDOzs7OztJQUVNLDJDQUFrQjs7OztJQUF6QixVQUEwQixLQUF3QjtRQUFsRCxpQkFNQztRQUxDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxlQUFlLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxPQUFPOzs7O1FBQUMsVUFBQSxZQUFZO1lBQy9ELEtBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDcEMsQ0FBQyxFQUFDLENBQUM7SUFDTCxDQUFDOzs7Ozs7O0lBRU8sdUNBQWM7Ozs7OztJQUF0QixVQUE2QixZQUF1Qzs7WUFDNUQsS0FBSyxHQUFHLG1CQUFBLElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLEVBQXVCO1FBQ3BFLHNEQUFzRDtRQUN0RCxJQUFJLENBQUMsa0JBQWtCLENBQUMsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUU7WUFDckQsT0FBTzs7OztZQUFQLFVBQVEsS0FBWTs7b0JBQ1osS0FBSyxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQztnQkFDbkQsNEVBQTRFO2dCQUM1RSxPQUFPLEtBQUssQ0FBQztZQUNmLENBQUM7WUFDRCxNQUFNOzs7OztZQUFOLFVBQU8sS0FBUSxFQUFFLFlBQW9CO2dCQUNuQyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsRUFBRSxFQUFDLElBQUksRUFBQyxZQUFZLENBQUMsSUFBSSxFQUFFLEtBQUssT0FBQSxFQUFFLFlBQVksY0FBQSxFQUFDLENBQUMsQ0FBQztnQkFDNUUsT0FBTyxZQUFZLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxLQUFLLENBQUMsQ0FBQztZQUNuRCxDQUFDO1NBQ0YsQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDO0lBR0Qsc0JBQUksMkNBQWU7Ozs7UUFBbkI7WUFDRSxPQUFPLGNBQWMsQ0FBQyxhQUFhLENBQUMsbUJBQUEsbUJBQUEsSUFBSSxDQUFDLFdBQVcsRUFBTyxFQUFpQyxDQUFDLENBQUM7UUFDaEcsQ0FBQzs7O09BQUE7SUFFRCxzQkFBSSx1Q0FBVzs7OztRQUFmO1lBQ0UsT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FBQyxHQUFHOzs7O1lBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxDQUFDLENBQUMsU0FBUyxFQUFYLENBQVcsRUFBQyxDQUFDO1FBQzdELENBQUM7OztPQUFBOzs7O0lBRUQsc0NBQWE7OztJQUFiO1FBQ0UsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDOzs7O0lBRUQscUNBQVk7OztJQUFaO0lBQ0EsQ0FBQztJQWJEO1FBREMsT0FBTyxFQUFFOzBDQUNhLGVBQWU7O3lEQUVyQztJQWFILHFCQUFDO0NBQUEsQUFoREQsQ0FBb0MsbUJBQW1CLEdBZ0R0RDtTQWhEWSxjQUFjOzs7Ozs7SUFFekIsK0JBQWlDOztBQWdEbkMsV0FBaUIsY0FBYzs7Ozs7SUFFN0IsU0FBZ0IsMkJBQTJCLENBQUMsTUFBVztRQUNyRCxPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxtQkFBQSxNQUFNLEVBQXNCLENBQUMsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDdEYsQ0FBQztJQUZlLDBDQUEyQiw4QkFFMUMsQ0FBQTs7Ozs7SUFFRCxTQUFnQixrQkFBa0IsQ0FBQyxLQUFvQztRQUNyRSxPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsZUFBZSxDQUFDLHdCQUF3QixDQUFDLENBQUM7SUFDcEUsQ0FBQztJQUZlLGlDQUFrQixxQkFFakMsQ0FBQTs7Ozs7SUFFRCxTQUFnQixhQUFhLENBQUMsS0FBb0M7UUFDaEUsT0FBTyxPQUFPLENBQUMsV0FBVyxDQUFDLHdCQUF3QixFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzlELENBQUM7SUFGZSw0QkFBYSxnQkFFNUIsQ0FBQTs7Ozs7O0lBRUQsU0FBZ0IsZ0JBQWdCLENBQUMsS0FBb0MsRUFBRSxVQUEyQjtRQUNoRyxPQUFPLENBQUMsY0FBYyxDQUFDLHdCQUF3QixFQUFFLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN0RSxDQUFDO0lBRmUsK0JBQWdCLG1CQUUvQixDQUFBO0FBRUgsQ0FBQyxFQWxCZ0IsY0FBYyxLQUFkLGNBQWMsUUFrQjlCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgYXNzZXJ0LCBCaW5kaW5nLCBDb25zdHJ1Y3RhYmxlLCBJTXV0YWJsZUhhc1ZhbHVlLCBsYW5nLCBWYWx1ZU1vZGVsIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgS2xhc3MgfSBmcm9tICdAY29vbG9uL3R5cGVzY3JpcHQtdXRpbGl0aWVzJztcbmltcG9ydCB7IE1lbW9pemUgfSBmcm9tICdAdHlwZXNjcmlwdC1wbHVzL2Zhc3QtbWVtb2l6ZS1kZWNvcmF0b3InO1xuaW1wb3J0ICdyZWZsZWN0LW1ldGFkYXRhJztcbmltcG9ydCB7IERpc3Bvc2FibGVDb21wb25lbnQgfSBmcm9tICcuLi9jb21wb25lbnRzL2Rpc3Bvc2FibGUtY29tcG9uZW50JztcbmltcG9ydCB7IFBsYWNlRGVmaW5pdGlvbiB9IGZyb20gJy4vcGxhY2UtZGVmaW5pdGlvbic7XG5pbXBvcnQgeyBQYXJhbWV0ZXJEZWZpbml0aW9uIH0gZnJvbSAnLi9yb3V0ZS9wYXJhbWV0ZXItZGVmaW5pdGlvbi5jbGFzcyc7XG5pbXBvcnQgeyBWaXNpdCB9IGZyb20gJy4vdmlzaXQnO1xuXG4vLyBSQUtFOiBtYWtpbmcgdGhpcyBTeW1ib2woLi4uKSBicm9rZSB0aGluZ3MuXG5leHBvcnQgY29uc3QgREVGSU5JVElPTl9NRVRBX0RBVEFfS0VZID0gJ1BMQUNFX0RFRklOSVRJT05fT1BUSU9OUyc7XG4vLyB0aGlzIG9uZSBzZWVtcyBvay5cbmV4cG9ydCBjb25zdCBST1VURV9QQVJBTUVURVJfTElTVF9LRVkgPSBTeW1ib2woJ3BsYWNlOnJvdXRlOnBhcmFtZXRlcnMnKTtcblxuZXhwb3J0IGNsYXNzIFBsYWNlQ29tcG9uZW50IGV4dGVuZHMgRGlzcG9zYWJsZUNvbXBvbmVudCB7XG5cbiAgcHJpdmF0ZSB2aXNpdDogVmFsdWVNb2RlbDxWaXNpdD47XG5cbiAgY29uc3RydWN0b3IoKSB7XG4gICAgc3VwZXIoKTtcbiAgfVxuXG4gIHB1YmxpYyBpbml0aWFsaXNlQmluZGluZ3ModmlzaXQ6IFZhbHVlTW9kZWw8VmlzaXQ+KSB7XG4gICAgYXNzZXJ0LmlzTmlsKHRoaXMudmlzaXQpO1xuICAgIHRoaXMudmlzaXQgPSB2aXNpdDtcbiAgICB0aGlzLnBsYWNlRGVmaW5pdGlvbi5nZXRWaXNpdFBhcmFtZXRlckRlZnMoKS5mb3JFYWNoKHBhcmFtZXRlckRlZiA9PiB7XG4gICAgICB0aGlzLmluc3RhbGxCaW5kaW5nKHBhcmFtZXRlckRlZik7XG4gICAgfSk7XG4gIH1cblxuICBwcml2YXRlIGluc3RhbGxCaW5kaW5nPFQsIFM+KHBhcmFtZXRlckRlZjogUGFyYW1ldGVyRGVmaW5pdGlvbjxULCBTPikge1xuICAgIGNvbnN0IG1vZGVsID0gdGhpc1twYXJhbWV0ZXJEZWYucHJvcGVydHlOYW1lXSBhcyBJTXV0YWJsZUhhc1ZhbHVlPFM+O1xuICAgIC8vIHRoaXMudHhvLm9ic2VydmUocGFyYW1ldGVyRGVmLnByb3BlcnR5TmFtZSwgbW9kZWwpO1xuICAgIHRoaXMucmVnaXN0ZXJEaXNwb3NhYmxlKG5ldyBCaW5kaW5nKHRoaXMudmlzaXQsIG1vZGVsLCB7XG4gICAgICB0b1JpZ2h0KHZpc2l0OiBWaXNpdCk6IFMge1xuICAgICAgICBjb25zdCB2YWx1ZSA9IHZpc2l0LmdldFBhcmFtZXRlcihwYXJhbWV0ZXJEZWYubmFtZSk7XG4gICAgICAgIC8vIGNvbnNvbGUubG9nKCdwdXNoIHRvIGNvbXBvbmVudCcsIHtuYW1lOnBhcmFtZXRlckRlZi5uYW1lLCB2YWx1ZSwgdmlzaXR9KTtcbiAgICAgICAgcmV0dXJuIHZhbHVlO1xuICAgICAgfSxcbiAgICAgIHRvTGVmdCh2YWx1ZTogUywgY3VycmVudFZpc2l0PzogVmlzaXQpOiBWaXNpdCB7XG4gICAgICAgIGNvbnNvbGUubG9nKCdwdXNoIHRvIHJvdXRlJywge25hbWU6cGFyYW1ldGVyRGVmLm5hbWUsIHZhbHVlLCBjdXJyZW50VmlzaXR9KTtcbiAgICAgICAgcmV0dXJuIGN1cnJlbnRWaXNpdC5yZXBsYWNlKHBhcmFtZXRlckRlZiwgdmFsdWUpO1xuICAgICAgfVxuICAgIH0pKTtcbiAgfVxuXG4gIEBNZW1vaXplKClcbiAgZ2V0IHBsYWNlRGVmaW5pdGlvbigpOiBQbGFjZURlZmluaXRpb24ge1xuICAgIHJldHVybiBQbGFjZUNvbXBvbmVudC5nZXREZWZpbml0aW9uKHRoaXMuY29uc3RydWN0b3IgYXMgYW55IGFzIENvbnN0cnVjdGFibGU8UGxhY2VDb21wb25lbnQ+KTtcbiAgfVxuXG4gIGdldCBjaGlsZFBsYWNlcygpOiBDb25zdHJ1Y3RhYmxlPFBsYWNlQ29tcG9uZW50PltdIHtcbiAgICByZXR1cm4gdGhpcy5wbGFjZURlZmluaXRpb24uY2hpbGRyZW4ubWFwKGQgPT4gZC5jb21wb25lbnQpO1xuICB9XG5cbiAgY2FuRGVhY3RpdmF0ZSgpOiBib29sZWFuIHwgUHJvbWlzZTxib29sZWFuPiB7XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cblxuICBvblBsYWNlUmVhZHkoKSB7XG4gIH1cblxufVxuXG5leHBvcnQgbmFtZXNwYWNlIFBsYWNlQ29tcG9uZW50IHtcblxuICBleHBvcnQgZnVuY3Rpb24gaXNQbGFjZUNvbXBvbmVudENvbnN0cnVjdG9yKHRhcmdldDogYW55KTogdGFyZ2V0IGlzIENvbnN0cnVjdGFibGU8UGxhY2VDb21wb25lbnQ+IHtcbiAgICByZXR1cm4gbGFuZy5jb25zdHJ1Y3RvckNoYWluKHRhcmdldCBhcyBDb25zdHJ1Y3RhYmxlPGFueT4pLmluY2x1ZGVzKFBsYWNlQ29tcG9uZW50KTtcbiAgfVxuXG4gIGV4cG9ydCBmdW5jdGlvbiBnZXRSb3V0ZVBhcmFtZXRlcnMoa2xhc3M6IENvbnN0cnVjdGFibGU8UGxhY2VDb21wb25lbnQ+KTogUGFyYW1ldGVyRGVmaW5pdGlvbjxhbnk+W10ge1xuICAgIHJldHVybiBLbGFzcy5nZXQoa2xhc3MpLmdldE1ldGFkYXRhTGlzdChST1VURV9QQVJBTUVURVJfTElTVF9LRVkpO1xuICB9XG5cbiAgZXhwb3J0IGZ1bmN0aW9uIGdldERlZmluaXRpb24oa2xhc3M6IENvbnN0cnVjdGFibGU8UGxhY2VDb21wb25lbnQ+KTogUGxhY2VEZWZpbml0aW9uIHtcbiAgICByZXR1cm4gUmVmbGVjdC5nZXRNZXRhZGF0YShERUZJTklUSU9OX01FVEFfREFUQV9LRVksIGtsYXNzKTtcbiAgfVxuXG4gIGV4cG9ydCBmdW5jdGlvbiBpbmplY3REZWZpbml0aW9uKGtsYXNzOiBDb25zdHJ1Y3RhYmxlPFBsYWNlQ29tcG9uZW50PiwgZGVmaW5pdGlvbjogUGxhY2VEZWZpbml0aW9uKSB7XG4gICAgUmVmbGVjdC5kZWZpbmVNZXRhZGF0YShERUZJTklUSU9OX01FVEFfREFUQV9LRVksIGRlZmluaXRpb24sIGtsYXNzKTtcbiAgfVxuXG59XG4iXX0=
|
|
@@ -2,7 +2,12 @@
|
|
|
2
2
|
* @fileoverview added by tsickle
|
|
3
3
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
4
4
|
*/
|
|
5
|
+
import * as tslib_1 from "tslib";
|
|
6
|
+
import { assert } from '@coolon/pectin';
|
|
7
|
+
import { Opts } from '@coolon/typescript-utilities';
|
|
8
|
+
import { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';
|
|
5
9
|
import _ from 'lodash';
|
|
10
|
+
import { ParameterDefinition } from './route/parameter-definition.class';
|
|
6
11
|
var PlaceDefinition = /** @class */ (function () {
|
|
7
12
|
function PlaceDefinition(component, path, authenticate, order, data, routeParameters, children) {
|
|
8
13
|
this.component = component;
|
|
@@ -16,11 +21,64 @@ var PlaceDefinition = /** @class */ (function () {
|
|
|
16
21
|
/**
|
|
17
22
|
* @return {?}
|
|
18
23
|
*/
|
|
19
|
-
PlaceDefinition.prototype.
|
|
24
|
+
PlaceDefinition.prototype.hasRouteId = /**
|
|
20
25
|
* @return {?}
|
|
21
26
|
*/
|
|
22
27
|
function () {
|
|
23
|
-
return this.
|
|
28
|
+
return !!this.getRouteIdParameterDef();
|
|
29
|
+
};
|
|
30
|
+
/**
|
|
31
|
+
* @return {?}
|
|
32
|
+
*/
|
|
33
|
+
PlaceDefinition.prototype.getRouteIdParameterDef = /**
|
|
34
|
+
* @return {?}
|
|
35
|
+
*/
|
|
36
|
+
function () {
|
|
37
|
+
return this.routeParameters.find((/**
|
|
38
|
+
* @param {?} p
|
|
39
|
+
* @return {?}
|
|
40
|
+
*/
|
|
41
|
+
function (p) { return p.isRouteId; }));
|
|
42
|
+
};
|
|
43
|
+
/**
|
|
44
|
+
* @param {?=} includeRouteId
|
|
45
|
+
* @return {?}
|
|
46
|
+
*/
|
|
47
|
+
PlaceDefinition.prototype.getRouteParameterDefs = /**
|
|
48
|
+
* @param {?=} includeRouteId
|
|
49
|
+
* @return {?}
|
|
50
|
+
*/
|
|
51
|
+
function (includeRouteId) {
|
|
52
|
+
if (includeRouteId === void 0) { includeRouteId = false; }
|
|
53
|
+
return this.getVisitParameterDefs({ includeRouteId: includeRouteId, includeRouteParameters: true });
|
|
54
|
+
};
|
|
55
|
+
/**
|
|
56
|
+
* @param {?=} include
|
|
57
|
+
* @return {?}
|
|
58
|
+
*/
|
|
59
|
+
PlaceDefinition.prototype.getVisitParameterDefs = /**
|
|
60
|
+
* @param {?=} include
|
|
61
|
+
* @return {?}
|
|
62
|
+
*/
|
|
63
|
+
function (include) {
|
|
64
|
+
/** @type {?} */
|
|
65
|
+
var opts = Opts.get(include);
|
|
66
|
+
// includes
|
|
67
|
+
/** @type {?} */
|
|
68
|
+
var includeRouteId = !include || opts.getOptional('includeRouteId', false);
|
|
69
|
+
/** @type {?} */
|
|
70
|
+
var includeRouteParameters = !include || opts.getOptional('includeRouteParameters', false);
|
|
71
|
+
/** @type {?} */
|
|
72
|
+
var includeNonRouteParameters = !include || opts.getOptional('includeNonRouteParameters', false);
|
|
73
|
+
return this.routeParameters.filter((/**
|
|
74
|
+
* @param {?} p
|
|
75
|
+
* @return {?}
|
|
76
|
+
*/
|
|
77
|
+
function (p) {
|
|
78
|
+
return (includeRouteId && p.isRouteId)
|
|
79
|
+
|| (includeRouteParameters && p.isRouteParameter && !p.isRouteId) // route id is included in the line above
|
|
80
|
+
|| (includeNonRouteParameters && !p.isRouteParameter);
|
|
81
|
+
}));
|
|
24
82
|
};
|
|
25
83
|
/**
|
|
26
84
|
* @template T
|
|
@@ -28,7 +86,7 @@ var PlaceDefinition = /** @class */ (function () {
|
|
|
28
86
|
* @param {?=} defaultValue
|
|
29
87
|
* @return {?}
|
|
30
88
|
*/
|
|
31
|
-
PlaceDefinition.prototype.
|
|
89
|
+
PlaceDefinition.prototype.getPlaceData = /**
|
|
32
90
|
* @template T
|
|
33
91
|
* @param {?} key
|
|
34
92
|
* @param {?=} defaultValue
|
|
@@ -45,7 +103,7 @@ var PlaceDefinition = /** @class */ (function () {
|
|
|
45
103
|
* @param {?=} defaultValue
|
|
46
104
|
* @return {?}
|
|
47
105
|
*/
|
|
48
|
-
PlaceDefinition.prototype.
|
|
106
|
+
PlaceDefinition.prototype.searchPlaceData = /**
|
|
49
107
|
* @template T
|
|
50
108
|
* @param {?} keys
|
|
51
109
|
* @param {?=} defaultValue
|
|
@@ -66,6 +124,181 @@ var PlaceDefinition = /** @class */ (function () {
|
|
|
66
124
|
return defaultValue;
|
|
67
125
|
}
|
|
68
126
|
};
|
|
127
|
+
/**
|
|
128
|
+
* @param {?} visit
|
|
129
|
+
* @return {?}
|
|
130
|
+
*/
|
|
131
|
+
PlaceDefinition.prototype.getRouteIdFrom = /**
|
|
132
|
+
* @param {?} visit
|
|
133
|
+
* @return {?}
|
|
134
|
+
*/
|
|
135
|
+
function (visit) {
|
|
136
|
+
/** @type {?} */
|
|
137
|
+
var routeIdParameterDef = this.getRouteIdParameterDef();
|
|
138
|
+
return routeIdParameterDef ? visit.getParameter(routeIdParameterDef.name) : null;
|
|
139
|
+
};
|
|
140
|
+
/**
|
|
141
|
+
* Returns angular router commands that specify the route id and any route parameters. The result does
|
|
142
|
+
* not include any path information.
|
|
143
|
+
*/
|
|
144
|
+
// getFormattedRouterCommands(visit: Visit): any[] {
|
|
145
|
+
// return this.hasRouteId() ?
|
|
146
|
+
// [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
|
|
147
|
+
// [this.getFormattedRouteParameters(visit)];
|
|
148
|
+
// }
|
|
149
|
+
/**
|
|
150
|
+
* Returns angular router commands that specify the route id and any route parameters. The result does
|
|
151
|
+
* not include any path information.
|
|
152
|
+
* @param {?} visit
|
|
153
|
+
* @return {?}
|
|
154
|
+
*/
|
|
155
|
+
// getFormattedRouterCommands(visit: Visit): any[] {
|
|
156
|
+
// return this.hasRouteId() ?
|
|
157
|
+
// [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
|
|
158
|
+
// [this.getFormattedRouteParameters(visit)];
|
|
159
|
+
// }
|
|
160
|
+
PlaceDefinition.prototype.getFormattedRouteId = /**
|
|
161
|
+
* Returns angular router commands that specify the route id and any route parameters. The result does
|
|
162
|
+
* not include any path information.
|
|
163
|
+
* @param {?} visit
|
|
164
|
+
* @return {?}
|
|
165
|
+
*/
|
|
166
|
+
// getFormattedRouterCommands(visit: Visit): any[] {
|
|
167
|
+
// return this.hasRouteId() ?
|
|
168
|
+
// [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
|
|
169
|
+
// [this.getFormattedRouteParameters(visit)];
|
|
170
|
+
// }
|
|
171
|
+
function (visit) {
|
|
172
|
+
return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;
|
|
173
|
+
};
|
|
174
|
+
// @Trace()
|
|
175
|
+
// @Trace()
|
|
176
|
+
/**
|
|
177
|
+
* @param {?} visit
|
|
178
|
+
* @param {?=} includeRouteId
|
|
179
|
+
* @return {?}
|
|
180
|
+
*/
|
|
181
|
+
PlaceDefinition.prototype.getFormattedRouteParameters =
|
|
182
|
+
// @Trace()
|
|
183
|
+
/**
|
|
184
|
+
* @param {?} visit
|
|
185
|
+
* @param {?=} includeRouteId
|
|
186
|
+
* @return {?}
|
|
187
|
+
*/
|
|
188
|
+
function (visit, includeRouteId) {
|
|
189
|
+
if (includeRouteId === void 0) { includeRouteId = false; }
|
|
190
|
+
/** @type {?} */
|
|
191
|
+
var result = {};
|
|
192
|
+
this.getVisitParameterDefs({
|
|
193
|
+
includeRouteId: includeRouteId, includeRouteParameters: true
|
|
194
|
+
}).forEach((/**
|
|
195
|
+
* @param {?} def
|
|
196
|
+
* @return {?}
|
|
197
|
+
*/
|
|
198
|
+
function (def) {
|
|
199
|
+
/** @type {?} */
|
|
200
|
+
var value = visit.getParameter(def.name);
|
|
201
|
+
if (!def.isEmptyValue(value)) {
|
|
202
|
+
if (def.isArray) {
|
|
203
|
+
assert.isArray(value);
|
|
204
|
+
result[def.name] = value.map((/**
|
|
205
|
+
* @param {?} v
|
|
206
|
+
* @return {?}
|
|
207
|
+
*/
|
|
208
|
+
function (v) { return def.urlFormat.format(v); }));
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
assert.isFalsey(Array.isArray(value));
|
|
212
|
+
result[def.name] = def.urlFormat.format(value);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}));
|
|
216
|
+
return result;
|
|
217
|
+
};
|
|
218
|
+
/**
|
|
219
|
+
* @param {?} visit
|
|
220
|
+
* @return {?}
|
|
221
|
+
*/
|
|
222
|
+
PlaceDefinition.prototype.getNonRouteParameters = /**
|
|
223
|
+
* @param {?} visit
|
|
224
|
+
* @return {?}
|
|
225
|
+
*/
|
|
226
|
+
function (visit) {
|
|
227
|
+
/** @type {?} */
|
|
228
|
+
var result = {};
|
|
229
|
+
this.getVisitParameterDefs({ includeNonRouteParameters: true }).forEach((/**
|
|
230
|
+
* @param {?} def
|
|
231
|
+
* @return {?}
|
|
232
|
+
*/
|
|
233
|
+
function (def) {
|
|
234
|
+
/** @type {?} */
|
|
235
|
+
var value = visit.getParameter(def.name);
|
|
236
|
+
if (!def.isEmptyValue(value)) {
|
|
237
|
+
result[def.name] = value;
|
|
238
|
+
}
|
|
239
|
+
}));
|
|
240
|
+
return result;
|
|
241
|
+
};
|
|
242
|
+
// @Trace()
|
|
243
|
+
// @Trace()
|
|
244
|
+
/**
|
|
245
|
+
* @param {?} params
|
|
246
|
+
* @return {?}
|
|
247
|
+
*/
|
|
248
|
+
PlaceDefinition.prototype.parseRouteParams =
|
|
249
|
+
// @Trace()
|
|
250
|
+
/**
|
|
251
|
+
* @param {?} params
|
|
252
|
+
* @return {?}
|
|
253
|
+
*/
|
|
254
|
+
function (params) {
|
|
255
|
+
/** @type {?} */
|
|
256
|
+
var result = {};
|
|
257
|
+
this.getVisitParameterDefs({
|
|
258
|
+
includeRouteId: true,
|
|
259
|
+
includeRouteParameters: true,
|
|
260
|
+
includeNonRouteParameters: false
|
|
261
|
+
}).forEach((/**
|
|
262
|
+
* @param {?} def
|
|
263
|
+
* @return {?}
|
|
264
|
+
*/
|
|
265
|
+
function (def) {
|
|
266
|
+
// params will return null for non existent names
|
|
267
|
+
if (params.has(def.name)) {
|
|
268
|
+
if (def.isArray) {
|
|
269
|
+
/** @type {?} */
|
|
270
|
+
var values = params.getAll(def.name);
|
|
271
|
+
result[def.name] = values.map((/**
|
|
272
|
+
* @param {?} v
|
|
273
|
+
* @return {?}
|
|
274
|
+
*/
|
|
275
|
+
function (v) { return def.urlFormat.parse(v); }));
|
|
276
|
+
}
|
|
277
|
+
else {
|
|
278
|
+
result[def.name] = def.urlFormat.parse(params.get(def.name));
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
}));
|
|
282
|
+
return result;
|
|
283
|
+
};
|
|
284
|
+
tslib_1.__decorate([
|
|
285
|
+
Memoize(),
|
|
286
|
+
tslib_1.__metadata("design:type", Function),
|
|
287
|
+
tslib_1.__metadata("design:paramtypes", []),
|
|
288
|
+
tslib_1.__metadata("design:returntype", ParameterDefinition)
|
|
289
|
+
], PlaceDefinition.prototype, "getRouteIdParameterDef", null);
|
|
290
|
+
tslib_1.__decorate([
|
|
291
|
+
Memoize(),
|
|
292
|
+
tslib_1.__metadata("design:type", Function),
|
|
293
|
+
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
294
|
+
tslib_1.__metadata("design:returntype", Array)
|
|
295
|
+
], PlaceDefinition.prototype, "getRouteParameterDefs", null);
|
|
296
|
+
tslib_1.__decorate([
|
|
297
|
+
Memoize(),
|
|
298
|
+
tslib_1.__metadata("design:type", Function),
|
|
299
|
+
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
300
|
+
tslib_1.__metadata("design:returntype", Array)
|
|
301
|
+
], PlaceDefinition.prototype, "getVisitParameterDefs", null);
|
|
69
302
|
return PlaceDefinition;
|
|
70
303
|
}());
|
|
71
304
|
export { PlaceDefinition };
|
|
@@ -85,4 +318,19 @@ if (false) {
|
|
|
85
318
|
/** @type {?} */
|
|
86
319
|
PlaceDefinition.prototype.children;
|
|
87
320
|
}
|
|
88
|
-
|
|
321
|
+
(function (PlaceDefinition) {
|
|
322
|
+
/**
|
|
323
|
+
* @record
|
|
324
|
+
*/
|
|
325
|
+
function ParameterOptions() { }
|
|
326
|
+
PlaceDefinition.ParameterOptions = ParameterOptions;
|
|
327
|
+
if (false) {
|
|
328
|
+
/** @type {?|undefined} */
|
|
329
|
+
ParameterOptions.prototype.includeRouteId;
|
|
330
|
+
/** @type {?|undefined} */
|
|
331
|
+
ParameterOptions.prototype.includeRouteParameters;
|
|
332
|
+
/** @type {?|undefined} */
|
|
333
|
+
ParameterOptions.prototype.includeNonRouteParameters;
|
|
334
|
+
}
|
|
335
|
+
})(PlaceDefinition || (PlaceDefinition = {}));
|
|
336
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-definition.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-definition.ts"],"names":[],"mappings":"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","sourcesContent":["import { ParamMap } from '@angular/router';\nimport { assert, Constructable, Trace } from '@coolon/pectin';\nimport { Opts } from '@coolon/typescript-utilities';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport _ from 'lodash';\nimport { PlaceComponent } from './place-component';\nimport { ParameterDefinition } from './route/parameter-definition.class';\nimport { Visit } from './visit';\n\nexport class PlaceDefinition {\n\n  constructor(readonly component: Constructable<PlaceComponent>,\n              readonly path: string,\n              readonly authenticate: boolean,\n              readonly order: number,\n              readonly data: { [key: string]: any },\n              readonly routeParameters: ParameterDefinition<any>[],\n              readonly children: PlaceDefinition[]) {\n  }\n\n  hasRouteId() {\n    return !!this.getRouteIdParameterDef();\n  }\n\n  @Memoize()\n  getRouteIdParameterDef(): ParameterDefinition<any> {\n    return this.routeParameters.find(p => p.isRouteId);\n  }\n\n  @Memoize()\n  getRouteParameterDefs(includeRouteId = false): ParameterDefinition<any>[] {\n    return this.getVisitParameterDefs({ includeRouteId, includeRouteParameters: true });\n  }\n\n  @Memoize()\n  getVisitParameterDefs(include?: PlaceDefinition.ParameterOptions): ParameterDefinition<any>[] {\n    const opts = Opts.get(include);\n    // includes\n    const includeRouteId = !include || opts.getOptional('includeRouteId', false);\n    const includeRouteParameters = !include || opts.getOptional('includeRouteParameters', false);\n    const includeNonRouteParameters = !include || opts.getOptional('includeNonRouteParameters', false);\n    return this.routeParameters.filter(p => {\n      return (includeRouteId && p.isRouteId)\n        || (includeRouteParameters && p.isRouteParameter && !p.isRouteId) // route id is included in the line above\n        || (includeNonRouteParameters && !p.isRouteParameter);\n    });\n  }\n\n  getPlaceData<T>(key: string, defaultValue?: T): T {\n    return this.data ?\n      _.isNil(this.data[key]) ? defaultValue : this.data[key] :\n      defaultValue;\n  }\n\n  searchPlaceData<T>(keys: string[], defaultValue?: T): T {\n    if (this.data) {\n      const found = keys.find(key => !_.isNil(this.data[key]));\n      return found ? this.data[found] : defaultValue;\n    } else {\n      return defaultValue;\n    }\n  }\n\n  getRouteIdFrom(visit: Visit) {\n    const routeIdParameterDef = this.getRouteIdParameterDef();\n    return routeIdParameterDef ? visit.getParameter(routeIdParameterDef.name) : null;\n  }\n\n  /**\n   * Returns angular router commands that specify the route id and any route parameters.  The result does\n   * not include any path information.\n   */\n  // getFormattedRouterCommands(visit: Visit): any[] {\n  //   return this.hasRouteId() ?\n  //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :\n  //     [this.getFormattedRouteParameters(visit)];\n  // }\n\n  getFormattedRouteId(visit: Visit): any {\n    return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;\n  }\n\n  // @Trace()\n  getFormattedRouteParameters(visit: Visit, includeRouteId = false): { [p: string]: string } {\n    const result: { [p: string]: string } = {};\n    this.getVisitParameterDefs({\n      includeRouteId, includeRouteParameters: true\n    }).forEach(def => {\n      const value = visit.getParameter(def.name);\n      if (!def.isEmptyValue(value)) {\n        if (def.isArray) {\n          assert.isArray(value);\n          result[def.name] = value.map(v => def.urlFormat.format(v));\n        } else {\n          assert.isFalsey(Array.isArray(value));\n          result[def.name] = def.urlFormat.format(value);\n        }\n      }\n    });\n    return result;\n  }\n\n  getNonRouteParameters(visit: Visit): { [p: string]: string } {\n    const result: { [p: string]: string } = {};\n    this.getVisitParameterDefs({ includeNonRouteParameters: true }).forEach(def => {\n      const value = visit.getParameter(def.name);\n      if (!def.isEmptyValue(value)) {\n          result[def.name] = value;\n      }\n    });\n    return result;\n  }\n\n  // @Trace()\n  parseRouteParams(params: ParamMap): { [p: string]: any } {\n    const result: { [p: string]: any } = {};\n    this.getVisitParameterDefs({\n      includeRouteId: true,\n      includeRouteParameters: true,\n      includeNonRouteParameters: false\n    }).forEach(def => {\n      // params will return null for non existent names\n      if (params.has(def.name)) {\n        if (def.isArray) {\n          const values = params.getAll(def.name);\n          result[def.name] = values.map(v => def.urlFormat.parse(v));\n        } else {\n          result[def.name] = def.urlFormat.parse(params.get(def.name));\n        }\n      }\n    });\n    return result;\n  }\n\n}\n\nexport namespace PlaceDefinition {\n  export interface ParameterOptions {\n    includeRouteId?: boolean;\n    includeRouteParameters?: boolean;\n    includeNonRouteParameters?: boolean;\n  }\n}\n"]}
|