@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
|
+
import { Location } from '@angular/common';
|
|
7
|
+
import { Injectable, Injector } from '@angular/core';
|
|
8
|
+
import { Router } from '@angular/router';
|
|
9
|
+
import { InteractionContext } from '../../../interaction/interaction-context';
|
|
10
|
+
import { PlaceRouter } from '../../place-router';
|
|
11
|
+
import * as i0 from "@angular/core";
|
|
12
|
+
import * as i1 from "@angular/router";
|
|
13
|
+
import * as i2 from "../../place-router";
|
|
14
|
+
import * as i3 from "../../../interaction/interaction-context";
|
|
15
|
+
import * as i4 from "@angular/common";
|
|
16
|
+
export class LeavePlaceGuard {
|
|
17
|
+
/**
|
|
18
|
+
* @param {?} router
|
|
19
|
+
* @param {?} injector
|
|
20
|
+
* @param {?} placeRouter
|
|
21
|
+
* @param {?} interactionContext
|
|
22
|
+
* @param {?} angularLocation
|
|
23
|
+
*/
|
|
24
|
+
constructor(router, injector, placeRouter, interactionContext, angularLocation) {
|
|
25
|
+
this.router = router;
|
|
26
|
+
this.injector = injector;
|
|
27
|
+
this.placeRouter = placeRouter;
|
|
28
|
+
this.interactionContext = interactionContext;
|
|
29
|
+
this.angularLocation = angularLocation;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* @private
|
|
33
|
+
* @param {?} nextState
|
|
34
|
+
* @param {?} placeDefinitionPath
|
|
35
|
+
* @return {?}
|
|
36
|
+
*/
|
|
37
|
+
isLeavingTheCurrentPlace(nextState, placeDefinitionPath) {
|
|
38
|
+
// TODO: this will break with child routes... need to examine the router states properly.
|
|
39
|
+
return !nextState.url.startsWith(placeDefinitionPath);
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* @param {?} component
|
|
43
|
+
* @param {?} currentRoute
|
|
44
|
+
* @param {?} currentState
|
|
45
|
+
* @param {?=} nextState
|
|
46
|
+
* @return {?}
|
|
47
|
+
*/
|
|
48
|
+
canDeactivate(component, currentRoute, currentState, nextState) {
|
|
49
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
/** @type {?} */
|
|
51
|
+
const placeDefinitionPath = `/${component.placeDefinition.path}`;
|
|
52
|
+
// console.log('canDeactivate', {
|
|
53
|
+
// staticPath: placeDefinitionPath,
|
|
54
|
+
// currentStateUrl: currentState.url,
|
|
55
|
+
// nextStateUrl: nextState.url
|
|
56
|
+
// // alreadyDeclined: this._alreadyAccepted
|
|
57
|
+
// });
|
|
58
|
+
// Example of the above when navigating to a different child route.
|
|
59
|
+
// canDeactivate {staticPath: "/hero-details",
|
|
60
|
+
// currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-details",
|
|
61
|
+
// nextStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats"
|
|
62
|
+
// }
|
|
63
|
+
// Example clicking on router tab of the parent component (de-activates the parent due to route param changes)
|
|
64
|
+
// canDeactivate {
|
|
65
|
+
// staticPath: "/hero-stats",
|
|
66
|
+
// currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
|
|
67
|
+
// nextStateUrl: "/route-parameters/"
|
|
68
|
+
// }
|
|
69
|
+
// canDeactivate {
|
|
70
|
+
// staticPath: "/route-parameters",
|
|
71
|
+
// currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
|
|
72
|
+
// nextStateUrl: "/route-parameters/"
|
|
73
|
+
// }
|
|
74
|
+
// logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: undefined, dl: Array(0), …}
|
|
75
|
+
// parameter-snapshot.ts:20 {name: "idModel", mine: -1, theirs: null}
|
|
76
|
+
// place-router.ts:28 redirect path (3) ["route-parameters", "-1", {…}]
|
|
77
|
+
// canDeactivate {
|
|
78
|
+
// staticPath: "/hero-stats",
|
|
79
|
+
// currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
|
|
80
|
+
// nextStateUrl: "/route-parameters/-1"
|
|
81
|
+
// }
|
|
82
|
+
// canDeactivate {
|
|
83
|
+
// staticPath: "/route-parameters",
|
|
84
|
+
// currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
|
|
85
|
+
// nextStateUrl: "/route-parameters/-1"
|
|
86
|
+
// }
|
|
87
|
+
// logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: "A", dl: Array(3), …}
|
|
88
|
+
// parameter-snapshot.ts:20 {name: "dv", mine: "A", theirs: undefined}
|
|
89
|
+
// place-router.ts:28 redirect path (3) ["route-parameters", "-1", {…}]
|
|
90
|
+
// canDeactivate {
|
|
91
|
+
// staticPath: "/hero-stats",
|
|
92
|
+
// currentStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats",
|
|
93
|
+
// nextStateUrl: "/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c"
|
|
94
|
+
// }
|
|
95
|
+
// TODO: Add tests
|
|
96
|
+
if (this.placeRouter.navigationSession.alreadyAccepted(component)) {
|
|
97
|
+
// We'll get called multiple times if there's any parameter sanitisation so
|
|
98
|
+
// we always return true if we accepted on a previous cycle of the current
|
|
99
|
+
// navigation session.
|
|
100
|
+
return true;
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
/** @type {?} */
|
|
104
|
+
const self = this;
|
|
105
|
+
/** @type {?} */
|
|
106
|
+
let canLeave = true;
|
|
107
|
+
if (this.isLeavingTheCurrentPlace(nextState, placeDefinitionPath)) {
|
|
108
|
+
// we check the interaction first, so that components that don't need to check if they're in an
|
|
109
|
+
// interaction during the canDeactivate cycle.
|
|
110
|
+
// TODO: Add tests: show dialog -> hit back -> same route
|
|
111
|
+
if (this.interactionContext.isActive()) {
|
|
112
|
+
canLeave = false;
|
|
113
|
+
console.log('cancelling', { activity: this.interactionContext.currentActivity });
|
|
114
|
+
this.interactionContext.currentActivity.cancel(null);
|
|
115
|
+
}
|
|
116
|
+
// No interaction in progress, so ask the component .
|
|
117
|
+
// This may start an interaction, hence checking the interaction context above. I.e. if the place pops up the dialog, and
|
|
118
|
+
// the user clicks back again, we'll re-enter here and go bang when the component tries to open another
|
|
119
|
+
// dialog.
|
|
120
|
+
if (canLeave) {
|
|
121
|
+
// TODO: Add tests: hit back -> confirm leave dialog -> hit back -> close dialog -> hit back -> confirm leave dialog.
|
|
122
|
+
canLeave = yield component.canDeactivate();
|
|
123
|
+
}
|
|
124
|
+
// We also block back button parameter changes while the dialog is open.
|
|
125
|
+
// NOTE: Now that I'm catching parameter changes I could possibly retry using a fragment or
|
|
126
|
+
// query parameter to track the dialog being open. Previously I was just checking this on
|
|
127
|
+
// path changes... if that worked it'd fix the case where the back button breaks with an activity
|
|
128
|
+
// open on the first page: https://coolon.atlassian.net/browse/AUP-33
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
if (this.interactionContext.isActive()) {
|
|
132
|
+
console.log('cancelling', { activity: this.interactionContext.currentActivity });
|
|
133
|
+
this.interactionContext.currentActivity.cancel(null);
|
|
134
|
+
canLeave = false;
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
canLeave = true;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
if (canLeave) {
|
|
141
|
+
// We'll get called multiple times if there's any parameter sanitisation so
|
|
142
|
+
// we remember the acceptance for the duration of the current navigation session.
|
|
143
|
+
self.placeRouter.navigationSession.rememberAcceptanceOf(component);
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
// Angular doesn't preserve the url when a guard cancels the back button.
|
|
147
|
+
// See https://github.com/angular/angular/issues/13586#issuecomment-432795720
|
|
148
|
+
if (this.placeRouter.navigationSession.isPopState) {
|
|
149
|
+
console.log('cancelled during popstate');
|
|
150
|
+
this.angularLocation.go(this.placeRouter.navigationSession.popStateReturnUrl);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return canLeave;
|
|
154
|
+
}
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
LeavePlaceGuard.decorators = [
|
|
159
|
+
{ type: Injectable, args: [{
|
|
160
|
+
providedIn: 'root'
|
|
161
|
+
},] }
|
|
162
|
+
];
|
|
163
|
+
/** @nocollapse */
|
|
164
|
+
LeavePlaceGuard.ctorParameters = () => [
|
|
165
|
+
{ type: Router },
|
|
166
|
+
{ type: Injector },
|
|
167
|
+
{ type: PlaceRouter },
|
|
168
|
+
{ type: InteractionContext },
|
|
169
|
+
{ type: Location }
|
|
170
|
+
];
|
|
171
|
+
/** @nocollapse */ LeavePlaceGuard.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function LeavePlaceGuard_Factory() { return new LeavePlaceGuard(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(i2.PlaceRouter), i0.ɵɵinject(i3.InteractionContext), i0.ɵɵinject(i4.Location)); }, token: LeavePlaceGuard, providedIn: "root" });
|
|
172
|
+
if (false) {
|
|
173
|
+
/**
|
|
174
|
+
* @type {?}
|
|
175
|
+
* @private
|
|
176
|
+
*/
|
|
177
|
+
LeavePlaceGuard.prototype.router;
|
|
178
|
+
/**
|
|
179
|
+
* @type {?}
|
|
180
|
+
* @private
|
|
181
|
+
*/
|
|
182
|
+
LeavePlaceGuard.prototype.injector;
|
|
183
|
+
/**
|
|
184
|
+
* @type {?}
|
|
185
|
+
* @private
|
|
186
|
+
*/
|
|
187
|
+
LeavePlaceGuard.prototype.placeRouter;
|
|
188
|
+
/** @type {?} */
|
|
189
|
+
LeavePlaceGuard.prototype.interactionContext;
|
|
190
|
+
/** @type {?} */
|
|
191
|
+
LeavePlaceGuard.prototype.angularLocation;
|
|
192
|
+
}
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"leave-place.guard.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/guards/leave-place.guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable, Injector } from '@angular/core';\nimport { ActivatedRouteSnapshot, CanDeactivate, Router, RouterStateSnapshot } from '@angular/router';\nimport { InteractionContext } from '../../../interaction/interaction-context';\nimport { PlaceComponent } from '../../place-component';\nimport { PlaceRouter } from '../../place-router';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class LeavePlaceGuard implements CanDeactivate<PlaceComponent> {\n\n  constructor(private router: Router,\n              private injector: Injector,\n              private placeRouter: PlaceRouter,\n              readonly interactionContext: InteractionContext, readonly angularLocation: Location) {\n  }\n\n  private isLeavingTheCurrentPlace(nextState: RouterStateSnapshot, placeDefinitionPath: string) {\n    // TODO: this will break with child routes... need to examine the router states properly.\n    return !nextState.url.startsWith(placeDefinitionPath);\n  }\n\n  async canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean> {\n    const placeDefinitionPath = `/${component.placeDefinition.path}`;\n    // console.log('canDeactivate', {\n    //   staticPath: placeDefinitionPath,\n    //   currentStateUrl: currentState.url,\n    //   nextStateUrl: nextState.url\n    //   // alreadyDeclined: this._alreadyAccepted\n    // });\n    // Example of the above when navigating to a different child route.\n    // canDeactivate {staticPath: \"/hero-details\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-details\",\n    //    nextStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\"\n    // }\n\n    // Example clicking on router tab of the parent component (de-activates the parent due to route param changes)\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/\"\n    // }\n    // canDeactivate {\n    //    staticPath: \"/route-parameters\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/\"\n    // }\n    // logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: undefined, dl: Array(0), …}\n    // parameter-snapshot.ts:20 {name: \"idModel\", mine: -1, theirs: null}\n    // place-router.ts:28 redirect path (3) [\"route-parameters\", \"-1\", {…}]\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1\"\n    // }\n    // canDeactivate {\n    //    staticPath: \"/route-parameters\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1\"\n    // }\n    // logger.class.js:54 ParameterSnapshot.sanitise -> {idModel: -1, pv: undefined, pl: Array(0), dv: \"A\", dl: Array(3), …}\n    // parameter-snapshot.ts:20 {name: \"dv\", mine: \"A\", theirs: undefined}\n    // place-router.ts:28 redirect path (3) [\"route-parameters\", \"-1\", {…}]\n    // canDeactivate {\n    //    staticPath: \"/hero-stats\",\n    //    currentStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c/hero-stats\",\n    //    nextStateUrl: \"/route-parameters/-1;dv=A;dl=a,b,c;rdv=A;rdl=a,b,c\"\n    // }\n\n\n    // TODO: Add tests\n    if (this.placeRouter.navigationSession.alreadyAccepted(component)) {\n      // We'll get called multiple times if there's any parameter sanitisation so\n      // we always return true if we accepted on a previous cycle of the current\n      // navigation session.\n      return true;\n    } else {\n      const self = this;\n      let canLeave = true;\n\n      if (this.isLeavingTheCurrentPlace(nextState, placeDefinitionPath)) {\n        // we check the interaction first, so that components that don't need to check if they're in an\n        // interaction during the canDeactivate cycle.\n        // TODO: Add tests: show dialog -> hit back -> same route\n        if (this.interactionContext.isActive()) {\n          canLeave = false;\n          console.log('cancelling', { activity: this.interactionContext.currentActivity });\n          this.interactionContext.currentActivity.cancel(null);\n        }\n        // No interaction in progress, so ask the component .\n        // This may start an interaction, hence checking the interaction context above. I.e. if the place pops up the dialog, and\n        // the user clicks back again, we'll re-enter here and go bang when the component tries to open another\n        // dialog.\n        if (canLeave) {\n          // TODO: Add tests: hit back -> confirm leave dialog -> hit back -> close dialog ->  hit back -> confirm leave dialog.\n          canLeave = await component.canDeactivate();\n        }\n\n\n        // We also block back button parameter changes while the dialog is open.\n        // NOTE: Now that I'm catching parameter changes I could possibly retry using a fragment or\n        // query parameter to track the dialog being open.  Previously I was just checking this on\n        // path changes... if that worked it'd fix the case where the back button breaks with an activity\n        // open on the first page: https://coolon.atlassian.net/browse/AUP-33\n      } else {\n        if (this.interactionContext.isActive()) {\n          console.log('cancelling', { activity: this.interactionContext.currentActivity });\n          this.interactionContext.currentActivity.cancel(null);\n          canLeave = false;\n        } else {\n          canLeave = true;\n        }\n      }\n\n      if (canLeave) {\n        // We'll get called multiple times if there's any parameter sanitisation so\n        // we remember the acceptance for the duration of the current navigation session.\n        self.placeRouter.navigationSession.rememberAcceptanceOf(component);\n      } else {\n        // Angular doesn't preserve the url when a guard cancels the back button.\n        // See https://github.com/angular/angular/issues/13586#issuecomment-432795720\n        if (this.placeRouter.navigationSession.isPopState) {\n          console.log('cancelled during popstate');\n          this.angularLocation.go(this.placeRouter.navigationSession.popStateReturnUrl);\n        }\n      }\n\n      return canLeave;\n    }\n  }\n}\n"]}
|
|
@@ -0,0 +1,243 @@
|
|
|
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
|
+
import { Injectable, Injector } from '@angular/core';
|
|
7
|
+
import { Router } from '@angular/router';
|
|
8
|
+
import { lang } from '@coolon/pectin';
|
|
9
|
+
import { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';
|
|
10
|
+
import { PlaceComponent } from '../../place-component';
|
|
11
|
+
import { PlaceHistory } from '../../place-history';
|
|
12
|
+
import { PlaceRouter } from '../../place-router';
|
|
13
|
+
import { Visit } from '../../visit';
|
|
14
|
+
import { VisitSanitiser } from '../visit-sanitiser';
|
|
15
|
+
import * as i0 from "@angular/core";
|
|
16
|
+
import * as i1 from "@angular/router";
|
|
17
|
+
import * as i2 from "../../place-router";
|
|
18
|
+
import * as i3 from "../../place-history";
|
|
19
|
+
export class PlaceRouteGuard {
|
|
20
|
+
/**
|
|
21
|
+
* @param {?} router
|
|
22
|
+
* @param {?} placeRouter
|
|
23
|
+
* @param {?} placeHistory
|
|
24
|
+
* @param {?} injector
|
|
25
|
+
*/
|
|
26
|
+
constructor(router, placeRouter, placeHistory, injector) {
|
|
27
|
+
this.router = router;
|
|
28
|
+
this.placeRouter = placeRouter;
|
|
29
|
+
this.placeHistory = placeHistory;
|
|
30
|
+
this.injector = injector;
|
|
31
|
+
}
|
|
32
|
+
// @Trace()
|
|
33
|
+
/**
|
|
34
|
+
* @param {?} activatedRoute
|
|
35
|
+
* @param {?} state
|
|
36
|
+
* @return {?}
|
|
37
|
+
*/
|
|
38
|
+
canActivate(activatedRoute, state) {
|
|
39
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
40
|
+
if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {
|
|
41
|
+
/** @type {?} */
|
|
42
|
+
const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);
|
|
43
|
+
// Parse our route params.
|
|
44
|
+
/** @type {?} */
|
|
45
|
+
const params = new PlaceRouteGuard.ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);
|
|
46
|
+
/** @type {?} */
|
|
47
|
+
const parsedParams = placeDefinition.parseRouteParams(params);
|
|
48
|
+
/** @type {?} */
|
|
49
|
+
const initialVisit = this.placeRouter.navigationSession.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);
|
|
50
|
+
/** @type {?} */
|
|
51
|
+
const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
|
|
52
|
+
/** @type {?} */
|
|
53
|
+
const updatedVisit = yield sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));
|
|
54
|
+
// Save the visit with any updated parameters. We need to save it so we remember any non route parameters
|
|
55
|
+
this.placeRouter.navigationSession.storeVisit(updatedVisit);
|
|
56
|
+
if (initialVisit.hasRoutingChangedFrom(updatedVisit)) {
|
|
57
|
+
/** @type {?} */
|
|
58
|
+
const parameterCommands = updatedVisit.hasRouteId() ?
|
|
59
|
+
[placeDefinition.getFormattedRouteId(updatedVisit), placeDefinition.getFormattedRouteParameters(updatedVisit)] :
|
|
60
|
+
[placeDefinition.getFormattedRouteParameters(updatedVisit)];
|
|
61
|
+
/** @type {?} */
|
|
62
|
+
const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.getChildPath(activatedRoute));
|
|
63
|
+
console.log('##### Redirect', commands);
|
|
64
|
+
return this.router.createUrlTree(commands, {
|
|
65
|
+
replaceUrl: true,
|
|
66
|
+
skipLocationChange: false
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
PlaceRouteGuard.decorators = [
|
|
80
|
+
{ type: Injectable, args: [{
|
|
81
|
+
providedIn: 'root'
|
|
82
|
+
},] }
|
|
83
|
+
];
|
|
84
|
+
/** @nocollapse */
|
|
85
|
+
PlaceRouteGuard.ctorParameters = () => [
|
|
86
|
+
{ type: Router },
|
|
87
|
+
{ type: PlaceRouter },
|
|
88
|
+
{ type: PlaceHistory },
|
|
89
|
+
{ type: Injector }
|
|
90
|
+
];
|
|
91
|
+
/** @nocollapse */ PlaceRouteGuard.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function PlaceRouteGuard_Factory() { return new PlaceRouteGuard(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i2.PlaceRouter), i0.ɵɵinject(i3.PlaceHistory), i0.ɵɵinject(i0.INJECTOR)); }, token: PlaceRouteGuard, providedIn: "root" });
|
|
92
|
+
if (false) {
|
|
93
|
+
/**
|
|
94
|
+
* @type {?}
|
|
95
|
+
* @private
|
|
96
|
+
*/
|
|
97
|
+
PlaceRouteGuard.prototype.router;
|
|
98
|
+
/**
|
|
99
|
+
* @type {?}
|
|
100
|
+
* @private
|
|
101
|
+
*/
|
|
102
|
+
PlaceRouteGuard.prototype.placeRouter;
|
|
103
|
+
/**
|
|
104
|
+
* @type {?}
|
|
105
|
+
* @private
|
|
106
|
+
*/
|
|
107
|
+
PlaceRouteGuard.prototype.placeHistory;
|
|
108
|
+
/**
|
|
109
|
+
* @type {?}
|
|
110
|
+
* @private
|
|
111
|
+
*/
|
|
112
|
+
PlaceRouteGuard.prototype.injector;
|
|
113
|
+
}
|
|
114
|
+
(function (PlaceRouteGuard) {
|
|
115
|
+
/**
|
|
116
|
+
* This a work around for the fact that an activated route with multiple segments doesn't
|
|
117
|
+
* include the segment params in the paramMap as well as each segment returns an empty
|
|
118
|
+
* param map even when `parameter`s has content.
|
|
119
|
+
*/
|
|
120
|
+
class ConsolidatedParameterMap {
|
|
121
|
+
/**
|
|
122
|
+
* @param {?} paramMap
|
|
123
|
+
* @param {?} urlSegments
|
|
124
|
+
*/
|
|
125
|
+
constructor(paramMap, urlSegments) {
|
|
126
|
+
this.paramMaps = [paramMap].concat((urlSegments || []).map((/**
|
|
127
|
+
* @param {?} s
|
|
128
|
+
* @return {?}
|
|
129
|
+
*/
|
|
130
|
+
s => new ParamMapAdapter(s.parameters)))).filter((/**
|
|
131
|
+
* @param {?} m
|
|
132
|
+
* @return {?}
|
|
133
|
+
*/
|
|
134
|
+
m => !!m)); // the activated route param map can be null
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* @param {?} name
|
|
138
|
+
* @return {?}
|
|
139
|
+
*/
|
|
140
|
+
get(name) {
|
|
141
|
+
/** @type {?} */
|
|
142
|
+
const paramMap = this.paramMaps.find((/**
|
|
143
|
+
* @param {?} m
|
|
144
|
+
* @return {?}
|
|
145
|
+
*/
|
|
146
|
+
m => m.has(name)));
|
|
147
|
+
return paramMap.get(name);
|
|
148
|
+
}
|
|
149
|
+
/**
|
|
150
|
+
* @param {?} name
|
|
151
|
+
* @return {?}
|
|
152
|
+
*/
|
|
153
|
+
getAll(name) {
|
|
154
|
+
/** @type {?} */
|
|
155
|
+
const paramMap = this.paramMaps.find((/**
|
|
156
|
+
* @param {?} m
|
|
157
|
+
* @return {?}
|
|
158
|
+
*/
|
|
159
|
+
m => m.has(name)));
|
|
160
|
+
return paramMap.getAll(name);
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* @param {?} name
|
|
164
|
+
* @return {?}
|
|
165
|
+
*/
|
|
166
|
+
has(name) {
|
|
167
|
+
return !!this.paramMaps.find((/**
|
|
168
|
+
* @param {?} m
|
|
169
|
+
* @return {?}
|
|
170
|
+
*/
|
|
171
|
+
m => m.has(name)));
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* @return {?}
|
|
175
|
+
*/
|
|
176
|
+
get keys() {
|
|
177
|
+
return this.paramMaps.reduce((/**
|
|
178
|
+
* @param {?} result
|
|
179
|
+
* @param {?} params
|
|
180
|
+
* @return {?}
|
|
181
|
+
*/
|
|
182
|
+
(result, params) => result.concat(params.keys)), []);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
tslib_1.__decorate([
|
|
186
|
+
Memoize(),
|
|
187
|
+
tslib_1.__metadata("design:type", Array),
|
|
188
|
+
tslib_1.__metadata("design:paramtypes", [])
|
|
189
|
+
], ConsolidatedParameterMap.prototype, "keys", null);
|
|
190
|
+
PlaceRouteGuard.ConsolidatedParameterMap = ConsolidatedParameterMap;
|
|
191
|
+
if (false) {
|
|
192
|
+
/**
|
|
193
|
+
* @type {?}
|
|
194
|
+
* @private
|
|
195
|
+
*/
|
|
196
|
+
ConsolidatedParameterMap.prototype.paramMaps;
|
|
197
|
+
}
|
|
198
|
+
class ParamMapAdapter {
|
|
199
|
+
/**
|
|
200
|
+
* @param {?} params
|
|
201
|
+
*/
|
|
202
|
+
constructor(params) {
|
|
203
|
+
this.params = params;
|
|
204
|
+
}
|
|
205
|
+
/**
|
|
206
|
+
* @param {?} name
|
|
207
|
+
* @return {?}
|
|
208
|
+
*/
|
|
209
|
+
get(name) {
|
|
210
|
+
return this.params[name];
|
|
211
|
+
}
|
|
212
|
+
/**
|
|
213
|
+
* @param {?} name
|
|
214
|
+
* @return {?}
|
|
215
|
+
*/
|
|
216
|
+
getAll(name) {
|
|
217
|
+
/** @type {?} */
|
|
218
|
+
const value = this.get(name);
|
|
219
|
+
return Array.isArray(value) ? value : [value];
|
|
220
|
+
}
|
|
221
|
+
/**
|
|
222
|
+
* @param {?} name
|
|
223
|
+
* @return {?}
|
|
224
|
+
*/
|
|
225
|
+
has(name) {
|
|
226
|
+
return this.keys.includes(name);
|
|
227
|
+
}
|
|
228
|
+
/**
|
|
229
|
+
* @return {?}
|
|
230
|
+
*/
|
|
231
|
+
get keys() {
|
|
232
|
+
return Object.keys(this.params);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
if (false) {
|
|
236
|
+
/**
|
|
237
|
+
* @type {?}
|
|
238
|
+
* @private
|
|
239
|
+
*/
|
|
240
|
+
ParamMapAdapter.prototype.params;
|
|
241
|
+
}
|
|
242
|
+
})(PlaceRouteGuard || (PlaceRouteGuard = {}));
|
|
243
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-route.guard.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/guards/place-route.guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Injector } from '@angular/core';\nimport {\n  ActivatedRouteSnapshot,\n  CanActivate,\n  ParamMap,\n  Router,\n  RouterStateSnapshot,\n  UrlSegment,\n  UrlTree\n} from '@angular/router';\nimport { lang, Trace } from '@coolon/pectin';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport { PlaceComponent } from '../../place-component';\nimport { PlaceHistory } from '../../place-history';\nimport { PlaceRouter } from '../../place-router';\nimport { Visit } from '../../visit';\nimport { VisitSanitiser } from '../visit-sanitiser';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouteGuard implements CanActivate {\n\n  constructor(private readonly router: Router,\n              private readonly placeRouter: PlaceRouter,\n              private readonly placeHistory: PlaceHistory,\n              private readonly injector: Injector) {\n  }\n\n  // @Trace()\n  async canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {\n      const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);\n      // Parse our route params.\n      const params = new PlaceRouteGuard.ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);\n      const parsedParams = placeDefinition.parseRouteParams(params);\n\n      const initialVisit = this.placeRouter.navigationSession.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);\n      const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);\n      const updatedVisit = await sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));\n\n      // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters\n      this.placeRouter.navigationSession.storeVisit(updatedVisit);\n      if (initialVisit.hasRoutingChangedFrom(updatedVisit)) {\n        const parameterCommands = updatedVisit.hasRouteId() ?\n          [placeDefinition.getFormattedRouteId(updatedVisit), placeDefinition.getFormattedRouteParameters(updatedVisit)] :\n          [placeDefinition.getFormattedRouteParameters(updatedVisit)];\n\n        const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.getChildPath(activatedRoute));\n        console.log('##### Redirect', commands);\n        return this.router.createUrlTree(commands, {\n          replaceUrl: true,\n          skipLocationChange: false\n        });\n      } else {\n        return true;\n      }\n    } else {\n      return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);\n    }\n  }\n\n  // createVisitFrom(placeDef: PlaceDefinition, activatedRoute: ActivatedRouteSnapshot): Visit {\n  //   const paramMap = new ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);\n  //   const resolvedParameters = placeDef.getAllParameterDefs().map(def => RouteParameterRecord.create(def, paramMap));\n  //   return new PlaceParameterSnapshot(placeDef, resolvedParameters);\n  // }\n\n  // createRedirect(activatedRoute: ActivatedRouteSnapshot, snapshot: Visit): UrlTree | true {\n  //   // We have to save the our private state in our session the router ignores a bunch of routing extras\n  //   // when used in route guards.\n  //   // @see https://github.com/angular/angular/issues/27148\n  //   if (snapshot.hasChangedPrivateParameters()) {\n  //     this._navigationSession.value = this._navigationSession.value.mergePrivatePlaceParameters(snapshot.getPrivatePlaceParameters());\n  //   }\n  //   return snapshot.hasChangedRouteParameters(true) ?\n  //     this.router.createUrlTree(this.createRouteCommands(activatedRoute, snapshot), {\n  //       replaceUrl: snapshot.hasChangedRouteParameters(true),\n  //       skipLocationChange: snapshot.hasChangedRouteParameters(true)\n  //     }) :\n  //     true;\n// }\n\n// private createRouteCommands(activatedRoute: ActivatedRouteSnapshot, snapshot: Visit) {\n//   const urlSegments = activatedRoute.url;\n//   const weHaveARouteId = snapshot.hasRouteId() && snapshot.getFormattedRouteId();\n//   return (weHaveARouteId) ?\n//     [urlSegments[0].path, snapshot.getFormattedRouteId(), snapshot.getFormattedRouteParameters()] :\n//     [urlSegments[0].path, snapshot.getFormattedRouteParameters()];\n// }\n\n}\n\nexport namespace PlaceRouteGuard {\n  /**\n   * This a work around for the fact that an activated route with multiple segments doesn't\n   * include the segment params in the paramMap as well as each segment returns an empty\n   * param map even when `parameter`s has content.\n   */\n  export class ConsolidatedParameterMap implements ParamMap {\n\n    private paramMaps: ParamMap[];\n\n    constructor(paramMap: ParamMap, urlSegments: UrlSegment[]) {\n      this.paramMaps = [paramMap].concat(\n        (urlSegments || []).map(s => new ParamMapAdapter(s.parameters))\n      ).filter(m => !!m); // the activated route param map can be null\n    }\n\n    get(name: string): string | null {\n      const paramMap = this.paramMaps.find(m => m.has(name));\n      return paramMap.get(name);\n    }\n\n    getAll(name: string): string[] {\n      const paramMap = this.paramMaps.find(m => m.has(name));\n      return paramMap.getAll(name);\n    }\n\n    has(name: string): boolean {\n      return !!this.paramMaps.find(m => m.has(name));\n    }\n\n    @Memoize()\n    get keys(): string[] {\n      return this.paramMaps.reduce((result, params) => result.concat(params.keys), []);\n    }\n  }\n\n  class ParamMapAdapter implements ParamMap {\n    constructor(private readonly params: { [p: string]: string }) {\n    }\n\n    get(name: string): string | null {\n      return this.params[name];\n    }\n\n    getAll(name: string): string[] {\n      const value = this.get(name);\n      return Array.isArray(value) ? value : [value];\n    }\n\n    has(name: string): boolean {\n      return this.keys.includes(name);\n    }\n\n    get keys(): string[] {\n      return Object.keys(this.params);\n    }\n\n  }\n}\n"]}
|
|
@@ -10,31 +10,50 @@ import { ParameterDefinition } from './parameter-definition.class';
|
|
|
10
10
|
* @record
|
|
11
11
|
* @template T
|
|
12
12
|
*/
|
|
13
|
-
export function
|
|
13
|
+
export function RouteIdOptions() { }
|
|
14
14
|
if (false) {
|
|
15
15
|
/** @type {?|undefined} */
|
|
16
|
-
|
|
16
|
+
RouteIdOptions.prototype.as;
|
|
17
17
|
/** @type {?|undefined} */
|
|
18
|
-
|
|
18
|
+
RouteIdOptions.prototype.optional;
|
|
19
19
|
/** @type {?|undefined} */
|
|
20
|
-
|
|
20
|
+
RouteIdOptions.prototype.remember;
|
|
21
21
|
/** @type {?|undefined} */
|
|
22
|
-
|
|
22
|
+
RouteIdOptions.prototype.defaultValue;
|
|
23
23
|
}
|
|
24
24
|
/**
|
|
25
25
|
* @record
|
|
26
26
|
* @template T
|
|
27
27
|
*/
|
|
28
|
-
export function
|
|
28
|
+
export function RouteParameterOptions() { }
|
|
29
29
|
if (false) {
|
|
30
30
|
/** @type {?|undefined} */
|
|
31
|
-
|
|
31
|
+
RouteParameterOptions.prototype.as;
|
|
32
32
|
/** @type {?|undefined} */
|
|
33
|
-
|
|
33
|
+
RouteParameterOptions.prototype.optional;
|
|
34
34
|
/** @type {?|undefined} */
|
|
35
|
-
|
|
35
|
+
RouteParameterOptions.prototype.remember;
|
|
36
36
|
/** @type {?|undefined} */
|
|
37
|
-
|
|
37
|
+
RouteParameterOptions.prototype.defaultValue;
|
|
38
|
+
/** @type {?|undefined} */
|
|
39
|
+
RouteParameterOptions.prototype.storeInUrl;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* @record
|
|
43
|
+
* @template T
|
|
44
|
+
*/
|
|
45
|
+
export function RouteListParameterOptions() { }
|
|
46
|
+
if (false) {
|
|
47
|
+
/** @type {?|undefined} */
|
|
48
|
+
RouteListParameterOptions.prototype.as;
|
|
49
|
+
/** @type {?|undefined} */
|
|
50
|
+
RouteListParameterOptions.prototype.optional;
|
|
51
|
+
/** @type {?|undefined} */
|
|
52
|
+
RouteListParameterOptions.prototype.remember;
|
|
53
|
+
/** @type {?|undefined} */
|
|
54
|
+
RouteListParameterOptions.prototype.defaultValue;
|
|
55
|
+
/** @type {?|undefined} */
|
|
56
|
+
RouteListParameterOptions.prototype.storeInUrl;
|
|
38
57
|
}
|
|
39
58
|
/**
|
|
40
59
|
* @template T
|
|
@@ -50,18 +69,17 @@ export function RouteId(type, options) {
|
|
|
50
69
|
*/
|
|
51
70
|
(prototype, propertyKey) => {
|
|
52
71
|
/** @type {?} */
|
|
53
|
-
const param = new ParameterDefinition.RouteId(propertyKey.toString(),
|
|
72
|
+
const param = new ParameterDefinition.RouteId(propertyKey.toString(), options, type);
|
|
54
73
|
Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
|
|
55
74
|
UseDelegate()(prototype, propertyKey);
|
|
56
75
|
});
|
|
57
76
|
}
|
|
58
77
|
/**
|
|
59
78
|
* @template T
|
|
60
|
-
* @param {?} type
|
|
61
79
|
* @param {?=} options
|
|
62
80
|
* @return {?}
|
|
63
81
|
*/
|
|
64
|
-
export function
|
|
82
|
+
export function VisitParameter(options) {
|
|
65
83
|
return (/**
|
|
66
84
|
* @param {?} prototype
|
|
67
85
|
* @param {?} propertyKey
|
|
@@ -69,18 +87,17 @@ export function RouteParameter(type, options) {
|
|
|
69
87
|
*/
|
|
70
88
|
(prototype, propertyKey) => {
|
|
71
89
|
/** @type {?} */
|
|
72
|
-
const param = new ParameterDefinition.ValueParameter(propertyKey.toString(),
|
|
90
|
+
const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
|
|
73
91
|
Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
|
|
74
92
|
UseDelegate()(prototype, propertyKey);
|
|
75
93
|
});
|
|
76
94
|
}
|
|
77
95
|
/**
|
|
78
96
|
* @template E
|
|
79
|
-
* @param {?} elementType
|
|
80
97
|
* @param {?=} options
|
|
81
98
|
* @return {?}
|
|
82
99
|
*/
|
|
83
|
-
export function
|
|
100
|
+
export function VisitParameterList(options) {
|
|
84
101
|
return (/**
|
|
85
102
|
* @param {?} prototype
|
|
86
103
|
* @param {?} propertyKey
|
|
@@ -88,9 +105,9 @@ export function RouteParameterList(elementType, options) {
|
|
|
88
105
|
*/
|
|
89
106
|
(prototype, propertyKey) => {
|
|
90
107
|
/** @type {?} */
|
|
91
|
-
const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(),
|
|
108
|
+
const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
|
|
92
109
|
Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
|
|
93
110
|
UseDelegate()(prototype, propertyKey);
|
|
94
111
|
});
|
|
95
112
|
}
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLWRlY29yYXRvcnMuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2Uvcm91dGUvcGFyYW1ldGVyLWRlY29yYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUM3QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sOEJBQThCLENBQUM7Ozs7O0FBSW5FLG9DQU1DOzs7SUFMQyw0QkFBWTs7SUFDWixrQ0FBbUI7O0lBQ25CLGtDQUFtQjs7SUFDbkIsc0NBQWlCOzs7Ozs7QUFJbkIsMkNBT0M7OztJQU5DLG1DQUFZOztJQUNaLHlDQUFtQjs7SUFDbkIseUNBQW1COztJQUNuQiw2Q0FBaUI7O0lBQ2pCLDJDQUF5Qjs7Ozs7O0FBSTNCLCtDQU9DOzs7SUFOQyx1Q0FBWTs7SUFDWiw2Q0FBbUI7O0lBQ25CLDZDQUFtQjs7SUFDbkIsaURBQW1COztJQUNuQiwrQ0FBeUI7Ozs7Ozs7O0FBSTNCLE1BQU0sVUFBVSxPQUFPLENBQTRCLElBQWtCLEVBQUUsT0FBMkI7SUFDaEc7Ozs7O0lBQU8sQ0FBQyxTQUFpQixFQUFFLFdBQTRCLEVBQUUsRUFBRTs7Y0FDbkQsS0FBSyxHQUFHLElBQUksbUJBQW1CLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDO1FBQ3BGLEtBQUssQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsb0JBQW9CLENBQUMsd0JBQXdCLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDM0UsV0FBVyxFQUFFLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3hDLENBQUMsRUFBQztBQUNKLENBQUM7Ozs7OztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUksT0FBa0M7SUFDbEU7Ozs7O0lBQU8sQ0FBQyxTQUFpQixFQUFFLFdBQTRCLEVBQUUsRUFBRTs7Y0FDbkQsS0FBSyxHQUFHLElBQUksbUJBQW1CLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQztRQUN6RyxLQUFLLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLHdCQUF3QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzNFLFdBQVcsRUFBRSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUN4QyxDQUFDLEVBQUM7QUFDSixDQUFDOzs7Ozs7QUFFRCxNQUFNLFVBQVUsa0JBQWtCLENBQUksT0FBc0M7SUFDMUU7Ozs7O0lBQU8sQ0FBQyxTQUFpQixFQUFFLFdBQTRCLEVBQUUsRUFBRTs7Y0FDbkQsS0FBSyxHQUFHLElBQUksbUJBQW1CLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQztRQUN6RyxLQUFLLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLHdCQUF3QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzNFLFdBQVcsRUFBRSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUN4QyxDQUFDLEVBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVXNlRGVsZWdhdGUgfSBmcm9tICdAY29vbG9uL3BlY3Rpbic7XG5pbXBvcnQgeyBLbGFzcyB9IGZyb20gJ0Bjb29sb24vdHlwZXNjcmlwdC11dGlsaXRpZXMnO1xuaW1wb3J0IHsgUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZIH0gZnJvbSAnLi4vcGxhY2UtY29tcG9uZW50JztcbmltcG9ydCB7IFBhcmFtZXRlckRlZmluaXRpb24gfSBmcm9tICcuL3BhcmFtZXRlci1kZWZpbml0aW9uLmNsYXNzJztcbmltcG9ydCB7IEZvcm1hdHRlciB9IGZyb20gJy4vZm9ybWF0dGVyJztcblxuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlSWRPcHRpb25zPFQ+IHtcbiAgYXM/OiBzdHJpbmc7XG4gIG9wdGlvbmFsPzogYm9vbGVhbjtcbiAgcmVtZW1iZXI/OiBib29sZWFuO1xuICBkZWZhdWx0VmFsdWU/OiBUO1xuICAvLyBzYW5pdGlzZXI/OiBDb25zdHJ1Y3RhYmxlPFBhcmFtZXRlclNhbml0aXNlcjxUPj4gfCBQYXJhbWV0ZXJTYW5pdGlzZXI8VD47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUm91dGVQYXJhbWV0ZXJPcHRpb25zPFQ+IHtcbiAgYXM/OiBzdHJpbmc7XG4gIG9wdGlvbmFsPzogYm9vbGVhbjtcbiAgcmVtZW1iZXI/OiBib29sZWFuO1xuICBkZWZhdWx0VmFsdWU/OiBUO1xuICBzdG9yZUluVXJsPzogRm9ybWF0dGVyPFQ+XG4gIC8vIHNhbml0aXNlcj86IENvbnN0cnVjdGFibGU8UGFyYW1ldGVyU2FuaXRpc2VyPFQ+PiB8IFBhcmFtZXRlclNhbml0aXNlcjxUPjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSb3V0ZUxpc3RQYXJhbWV0ZXJPcHRpb25zPFQ+IHtcbiAgYXM/OiBzdHJpbmc7XG4gIG9wdGlvbmFsPzogYm9vbGVhbjtcbiAgcmVtZW1iZXI/OiBib29sZWFuO1xuICBkZWZhdWx0VmFsdWU/OiBUW107XG4gIHN0b3JlSW5Vcmw/OiBGb3JtYXR0ZXI8VD5cbiAgLy8gc2FuaXRpc2VyPzogQ29uc3RydWN0YWJsZTxQYXJhbWV0ZXJTYW5pdGlzZXI8VFtdPj4gfCBQYXJhbWV0ZXJTYW5pdGlzZXI8VFtdPjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIFJvdXRlSWQ8VCBleHRlbmRzIHN0cmluZyB8IG51bWJlcj4odHlwZTogRm9ybWF0dGVyPFQ+LCBvcHRpb25zPzogUm91dGVJZE9wdGlvbnM8VD4pOiBQcm9wZXJ0eURlY29yYXRvciB7XG4gIHJldHVybiAocHJvdG90eXBlOiBPYmplY3QsIHByb3BlcnR5S2V5OiBzdHJpbmcgfCBzeW1ib2wpID0+IHtcbiAgICBjb25zdCBwYXJhbSA9IG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLlJvdXRlSWQocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgdHlwZSk7XG4gICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4gICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIFZpc2l0UGFyYW1ldGVyPFQ+KG9wdGlvbnM/OiBSb3V0ZVBhcmFtZXRlck9wdGlvbnM8VD4pOiBQcm9wZXJ0eURlY29yYXRvciB7XG4gIHJldHVybiAocHJvdG90eXBlOiBPYmplY3QsIHByb3BlcnR5S2V5OiBzdHJpbmcgfCBzeW1ib2wpID0+IHtcbiAgICBjb25zdCBwYXJhbSA9IG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLlZhbHVlUGFyYW1ldGVyKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIG9wdGlvbnMsIG9wdGlvbnMuc3RvcmVJblVybCk7XG4gICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4gICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIFZpc2l0UGFyYW1ldGVyTGlzdDxFPihvcHRpb25zPzogUm91dGVMaXN0UGFyYW1ldGVyT3B0aW9uczxFPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbiAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uQXJyYXlQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgb3B0aW9ucy5zdG9yZUluVXJsKTtcbiAgICBLbGFzcy5nZXQocHJvdG90eXBlKS5hZGRUb093bk1ldGFkYXRhTGlzdChST1VURV9QQVJBTUVURVJfTElTVF9LRVksIHBhcmFtKTtcbiAgICBVc2VEZWxlZ2F0ZSgpKHByb3RvdHlwZSwgcHJvcGVydHlLZXkpO1xuICB9O1xufVxuXG4vLyBleHBvcnQgZnVuY3Rpb24gUm91dGVQYXJhbWV0ZXI8VD4odHlwZTogUGFyYW1ldGVyVHlwZTxUPiwgb3B0aW9ucz86IFJvdXRlUGFyYW1ldGVyT3B0aW9uczxUPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbi8vICAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuLy8gICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uVmFsdWVQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgdHlwZSk7XG4vLyAgICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4vLyAgICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbi8vICAgfTtcbi8vIH1cbi8vXG4vLyBleHBvcnQgZnVuY3Rpb24gUm91dGVQYXJhbWV0ZXJMaXN0PEU+KGVsZW1lbnRUeXBlOiBQYXJhbWV0ZXJUeXBlPEU+LCBvcHRpb25zPzogUm91dGVMaXN0UGFyYW1ldGVyT3B0aW9uczxFPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbi8vICAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuLy8gICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uQXJyYXlQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgZWxlbWVudFR5cGUpO1xuLy8gICAgIEtsYXNzLmdldChwcm90b3R5cGUpLmFkZFRvT3duTWV0YWRhdGFMaXN0KFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSwgcGFyYW0pO1xuLy8gICAgIFVzZURlbGVnYXRlKCkocHJvdG90eXBlLCBwcm9wZXJ0eUtleSk7XG4vLyAgIH07XG4vLyB9XG4iXX0=
|