@coolon/angular-ui-powerups 0.0.67 → 0.0.69
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 +2723 -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 +207 -5
- package/esm2015/lib/place/place-history.js +3 -2
- package/esm2015/lib/place/place-router.js +184 -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 +263 -5
- package/esm5/lib/place/place-history.js +7 -3
- package/esm5/lib/place/place-router.js +241 -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 +1452 -1108
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +2715 -2281
- 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
|
@@ -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
|
export class PlaceDefinition {
|
|
7
12
|
/**
|
|
8
13
|
* @param {?} component
|
|
@@ -25,8 +30,49 @@ export class PlaceDefinition {
|
|
|
25
30
|
/**
|
|
26
31
|
* @return {?}
|
|
27
32
|
*/
|
|
28
|
-
|
|
29
|
-
return this.
|
|
33
|
+
hasRouteId() {
|
|
34
|
+
return !!this.getRouteIdParameterDef();
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* @return {?}
|
|
38
|
+
*/
|
|
39
|
+
getRouteIdParameterDef() {
|
|
40
|
+
return this.routeParameters.find((/**
|
|
41
|
+
* @param {?} p
|
|
42
|
+
* @return {?}
|
|
43
|
+
*/
|
|
44
|
+
p => p.isRouteId));
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* @param {?=} includeRouteId
|
|
48
|
+
* @return {?}
|
|
49
|
+
*/
|
|
50
|
+
getRouteParameterDefs(includeRouteId = false) {
|
|
51
|
+
return this.getVisitParameterDefs({ includeRouteId, includeRouteParameters: true });
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* @param {?=} include
|
|
55
|
+
* @return {?}
|
|
56
|
+
*/
|
|
57
|
+
getVisitParameterDefs(include) {
|
|
58
|
+
/** @type {?} */
|
|
59
|
+
const opts = Opts.get(include);
|
|
60
|
+
// includes
|
|
61
|
+
/** @type {?} */
|
|
62
|
+
const includeRouteId = !include || opts.getOptional('includeRouteId', false);
|
|
63
|
+
/** @type {?} */
|
|
64
|
+
const includeRouteParameters = !include || opts.getOptional('includeRouteParameters', false);
|
|
65
|
+
/** @type {?} */
|
|
66
|
+
const includeNonRouteParameters = !include || opts.getOptional('includeNonRouteParameters', false);
|
|
67
|
+
return this.routeParameters.filter((/**
|
|
68
|
+
* @param {?} p
|
|
69
|
+
* @return {?}
|
|
70
|
+
*/
|
|
71
|
+
p => {
|
|
72
|
+
return (includeRouteId && p.isRouteId)
|
|
73
|
+
|| (includeRouteParameters && p.isRouteParameter && !p.isRouteId) // route id is included in the line above
|
|
74
|
+
|| (includeNonRouteParameters && !p.isRouteParameter);
|
|
75
|
+
}));
|
|
30
76
|
}
|
|
31
77
|
/**
|
|
32
78
|
* @template T
|
|
@@ -34,7 +80,7 @@ export class PlaceDefinition {
|
|
|
34
80
|
* @param {?=} defaultValue
|
|
35
81
|
* @return {?}
|
|
36
82
|
*/
|
|
37
|
-
|
|
83
|
+
getPlaceData(key, defaultValue) {
|
|
38
84
|
return this.data ?
|
|
39
85
|
_.isNil(this.data[key]) ? defaultValue : this.data[key] :
|
|
40
86
|
defaultValue;
|
|
@@ -45,7 +91,7 @@ export class PlaceDefinition {
|
|
|
45
91
|
* @param {?=} defaultValue
|
|
46
92
|
* @return {?}
|
|
47
93
|
*/
|
|
48
|
-
|
|
94
|
+
searchPlaceData(keys, defaultValue) {
|
|
49
95
|
if (this.data) {
|
|
50
96
|
/** @type {?} */
|
|
51
97
|
const found = keys.find((/**
|
|
@@ -59,7 +105,148 @@ export class PlaceDefinition {
|
|
|
59
105
|
return defaultValue;
|
|
60
106
|
}
|
|
61
107
|
}
|
|
108
|
+
/**
|
|
109
|
+
* @param {?} visit
|
|
110
|
+
* @return {?}
|
|
111
|
+
*/
|
|
112
|
+
getRouteIdFrom(visit) {
|
|
113
|
+
/** @type {?} */
|
|
114
|
+
const routeIdParameterDef = this.getRouteIdParameterDef();
|
|
115
|
+
return routeIdParameterDef ? visit.getParameter(routeIdParameterDef.name) : null;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Returns angular router commands that specify the route id and any route parameters. The result does
|
|
119
|
+
* not include any path information.
|
|
120
|
+
* @param {?} visit
|
|
121
|
+
* @return {?}
|
|
122
|
+
*/
|
|
123
|
+
// getFormattedRouterCommands(visit: Visit): any[] {
|
|
124
|
+
// return this.hasRouteId() ?
|
|
125
|
+
// [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
|
|
126
|
+
// [this.getFormattedRouteParameters(visit)];
|
|
127
|
+
// }
|
|
128
|
+
getFormattedRouteId(visit) {
|
|
129
|
+
return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;
|
|
130
|
+
}
|
|
131
|
+
// @Trace()
|
|
132
|
+
/**
|
|
133
|
+
* @param {?} visit
|
|
134
|
+
* @param {?=} includeRouteId
|
|
135
|
+
* @return {?}
|
|
136
|
+
*/
|
|
137
|
+
getFormattedRouteParameters(visit, includeRouteId = false) {
|
|
138
|
+
/** @type {?} */
|
|
139
|
+
const result = {};
|
|
140
|
+
this.getVisitParameterDefs({
|
|
141
|
+
includeRouteId, includeRouteParameters: true
|
|
142
|
+
}).forEach((/**
|
|
143
|
+
* @param {?} def
|
|
144
|
+
* @return {?}
|
|
145
|
+
*/
|
|
146
|
+
def => {
|
|
147
|
+
/** @type {?} */
|
|
148
|
+
const value = visit.getParameter(def.name);
|
|
149
|
+
if (!def.isEmptyValue(value)) {
|
|
150
|
+
if (def.isArray) {
|
|
151
|
+
assert.isArray(value);
|
|
152
|
+
result[def.name] = value.map((/**
|
|
153
|
+
* @param {?} v
|
|
154
|
+
* @return {?}
|
|
155
|
+
*/
|
|
156
|
+
v => def.urlFormat.format(v)));
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
assert.isFalsey(Array.isArray(value));
|
|
160
|
+
result[def.name] = def.urlFormat.format(value);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}));
|
|
164
|
+
return result;
|
|
165
|
+
}
|
|
166
|
+
/**
|
|
167
|
+
* @param {?} visit
|
|
168
|
+
* @return {?}
|
|
169
|
+
*/
|
|
170
|
+
getNonRouteParameters(visit) {
|
|
171
|
+
/** @type {?} */
|
|
172
|
+
const result = {};
|
|
173
|
+
this.getVisitParameterDefs({ includeNonRouteParameters: true }).forEach((/**
|
|
174
|
+
* @param {?} def
|
|
175
|
+
* @return {?}
|
|
176
|
+
*/
|
|
177
|
+
def => {
|
|
178
|
+
/** @type {?} */
|
|
179
|
+
const value = visit.getParameter(def.name);
|
|
180
|
+
if (!def.isEmptyValue(value)) {
|
|
181
|
+
result[def.name] = value;
|
|
182
|
+
}
|
|
183
|
+
}));
|
|
184
|
+
return result;
|
|
185
|
+
}
|
|
186
|
+
// @Trace()
|
|
187
|
+
/**
|
|
188
|
+
* @param {?} params
|
|
189
|
+
* @return {?}
|
|
190
|
+
*/
|
|
191
|
+
parseRouteParams(params) {
|
|
192
|
+
/** @type {?} */
|
|
193
|
+
const result = {};
|
|
194
|
+
this.getVisitParameterDefs({
|
|
195
|
+
includeRouteId: true,
|
|
196
|
+
includeRouteParameters: true,
|
|
197
|
+
includeNonRouteParameters: false
|
|
198
|
+
}).forEach((/**
|
|
199
|
+
* @param {?} def
|
|
200
|
+
* @return {?}
|
|
201
|
+
*/
|
|
202
|
+
def => {
|
|
203
|
+
// params will return null for non existent names
|
|
204
|
+
if (params.has(def.name)) {
|
|
205
|
+
if (def.isArray) {
|
|
206
|
+
/** @type {?} */
|
|
207
|
+
const values = params.getAll(def.name);
|
|
208
|
+
result[def.name] = values.map((/**
|
|
209
|
+
* @param {?} v
|
|
210
|
+
* @return {?}
|
|
211
|
+
*/
|
|
212
|
+
v => def.urlFormat.parse(v)));
|
|
213
|
+
}
|
|
214
|
+
else {
|
|
215
|
+
/** @type {?} */
|
|
216
|
+
const value = def.urlFormat.parse(params.get(def.name));
|
|
217
|
+
// because our id routes redirect if the id isn't pressent we always have a id
|
|
218
|
+
// parameter in our params. This will bugger our remember and defaultvalue sanitisation
|
|
219
|
+
// as it'll see that the id is present (event thought its null). The sanitisation can't
|
|
220
|
+
// check for null as that's a valid value for the id.
|
|
221
|
+
/** @type {?} */
|
|
222
|
+
const isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);
|
|
223
|
+
if (!isEmptyRouteId) {
|
|
224
|
+
result[def.name] = value;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
}));
|
|
229
|
+
return result;
|
|
230
|
+
}
|
|
62
231
|
}
|
|
232
|
+
tslib_1.__decorate([
|
|
233
|
+
Memoize(),
|
|
234
|
+
tslib_1.__metadata("design:type", Function),
|
|
235
|
+
tslib_1.__metadata("design:paramtypes", []),
|
|
236
|
+
tslib_1.__metadata("design:returntype", ParameterDefinition)
|
|
237
|
+
], PlaceDefinition.prototype, "getRouteIdParameterDef", null);
|
|
238
|
+
tslib_1.__decorate([
|
|
239
|
+
Memoize(),
|
|
240
|
+
tslib_1.__metadata("design:type", Function),
|
|
241
|
+
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
242
|
+
tslib_1.__metadata("design:returntype", Array)
|
|
243
|
+
], PlaceDefinition.prototype, "getRouteParameterDefs", null);
|
|
244
|
+
tslib_1.__decorate([
|
|
245
|
+
Memoize(),
|
|
246
|
+
tslib_1.__metadata("design:type", Function),
|
|
247
|
+
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
248
|
+
tslib_1.__metadata("design:returntype", Array)
|
|
249
|
+
], PlaceDefinition.prototype, "getVisitParameterDefs", null);
|
|
63
250
|
if (false) {
|
|
64
251
|
/** @type {?} */
|
|
65
252
|
PlaceDefinition.prototype.component;
|
|
@@ -76,4 +263,19 @@ if (false) {
|
|
|
76
263
|
/** @type {?} */
|
|
77
264
|
PlaceDefinition.prototype.children;
|
|
78
265
|
}
|
|
79
|
-
|
|
266
|
+
(function (PlaceDefinition) {
|
|
267
|
+
/**
|
|
268
|
+
* @record
|
|
269
|
+
*/
|
|
270
|
+
function ParameterOptions() { }
|
|
271
|
+
PlaceDefinition.ParameterOptions = ParameterOptions;
|
|
272
|
+
if (false) {
|
|
273
|
+
/** @type {?|undefined} */
|
|
274
|
+
ParameterOptions.prototype.includeRouteId;
|
|
275
|
+
/** @type {?|undefined} */
|
|
276
|
+
ParameterOptions.prototype.includeRouteParameters;
|
|
277
|
+
/** @type {?|undefined} */
|
|
278
|
+
ParameterOptions.prototype.includeNonRouteParameters;
|
|
279
|
+
}
|
|
280
|
+
})(PlaceDefinition || (PlaceDefinition = {}));
|
|
281
|
+
//# 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          const value = def.urlFormat.parse(params.get(def.name));\n          // because our id routes redirect if the id isn't pressent we always have a id\n          // parameter in our params.  This will bugger our remember and defaultvalue sanitisation\n          // as it'll see that the id is present (event thought its null).  The sanitisation can't\n          // check for null as that's a valid value for the id.\n          const isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);\n          if (!isEmptyRouteId) {\n            result[def.name] = value;\n          }\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"]}
|
|
@@ -15,6 +15,7 @@ export class PlaceHistory {
|
|
|
15
15
|
this.router = router;
|
|
16
16
|
this._history = new Map();
|
|
17
17
|
}
|
|
18
|
+
// @Trace()
|
|
18
19
|
/**
|
|
19
20
|
* @param {?} state
|
|
20
21
|
* @return {?}
|
|
@@ -24,7 +25,7 @@ export class PlaceHistory {
|
|
|
24
25
|
const history = this.getHistory(state.placeDefinition);
|
|
25
26
|
/** @type {?} */
|
|
26
27
|
const previousState = _.last(history);
|
|
27
|
-
if (!previousState || state.
|
|
28
|
+
if (!previousState || state.hasChangedFrom(previousState)) {
|
|
28
29
|
history.unshift(state); // LIFO
|
|
29
30
|
this.setHistory(state.placeDefinition, history.slice(0, 3)); // limit our history to 4 visits
|
|
30
31
|
}
|
|
@@ -74,4 +75,4 @@ if (false) {
|
|
|
74
75
|
*/
|
|
75
76
|
PlaceHistory.prototype.router;
|
|
76
77
|
}
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhY2UtaGlzdG9yeS5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0Bjb29sb24vYW5ndWxhci11aS1wb3dlcnVwcy8iLCJzb3VyY2VzIjpbImxpYi9wbGFjZS9wbGFjZS1oaXN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV6QyxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7OztBQU92QixNQUFNLE9BQU8sWUFBWTs7OztJQUl2QixZQUE2QixNQUFjO1FBQWQsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUZuQyxhQUFRLEdBQUcsSUFBSSxHQUFHLEVBQTRCLENBQUM7SUFHdkQsQ0FBQzs7Ozs7O0lBR0QsR0FBRyxDQUFDLEtBQVk7O2NBQ1IsT0FBTyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQzs7Y0FDaEQsYUFBYSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ3JDLElBQUksQ0FBQyxhQUFhLElBQUksS0FBSyxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsRUFBRTtZQUN6RCxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTztZQUMvQixJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxlQUFlLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLGdDQUFnQztTQUM5RjtJQUNILENBQUM7Ozs7O0lBRUQsVUFBVSxDQUFDLFFBQXlCOztZQUM5QixPQUFPLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3pDLElBQUksQ0FBQyxPQUFPLEVBQUU7WUFDWixPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUM7U0FDcEM7UUFDRCxPQUFPLE9BQU8sQ0FBQztJQUNqQixDQUFDOzs7Ozs7O0lBRU8sVUFBVSxDQUFDLFFBQXlCLEVBQUUsT0FBZ0I7UUFDNUQsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7OztZQS9CRixVQUFVLFNBQUM7Z0JBQ1YsVUFBVSxFQUFFLE1BQU07YUFDbkI7Ozs7WUFSUSxNQUFNOzs7Ozs7OztJQVdiLGdDQUF1RDs7Ozs7SUFFM0MsOEJBQStCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IFRyYWNlIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IFBsYWNlRGVmaW5pdGlvbiB9IGZyb20gJy4vcGxhY2UtZGVmaW5pdGlvbic7XG5pbXBvcnQgeyBWaXNpdCB9IGZyb20gJy4vdmlzaXQnO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBQbGFjZUhpc3Rvcnkge1xuXG4gIHByaXZhdGUgX2hpc3RvcnkgPSBuZXcgTWFwPFBsYWNlRGVmaW5pdGlvbiwgVmlzaXRbXT4oKTtcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlYWRvbmx5IHJvdXRlcjogUm91dGVyKSB7XG4gIH1cblxuICAvLyBAVHJhY2UoKVxuICBhZGQoc3RhdGU6IFZpc2l0KSB7XG4gICAgY29uc3QgaGlzdG9yeSA9IHRoaXMuZ2V0SGlzdG9yeShzdGF0ZS5wbGFjZURlZmluaXRpb24pO1xuICAgIGNvbnN0IHByZXZpb3VzU3RhdGUgPSBfLmxhc3QoaGlzdG9yeSk7XG4gICAgaWYgKCFwcmV2aW91c1N0YXRlIHx8IHN0YXRlLmhhc0NoYW5nZWRGcm9tKHByZXZpb3VzU3RhdGUpKSB7XG4gICAgICBoaXN0b3J5LnVuc2hpZnQoc3RhdGUpOyAvLyBMSUZPXG4gICAgICB0aGlzLnNldEhpc3Rvcnkoc3RhdGUucGxhY2VEZWZpbml0aW9uLCBoaXN0b3J5LnNsaWNlKDAsIDMpKTsgLy8gbGltaXQgb3VyIGhpc3RvcnkgdG8gNCB2aXNpdHNcbiAgICB9XG4gIH1cblxuICBnZXRIaXN0b3J5KHBsYWNlRGVmOiBQbGFjZURlZmluaXRpb24pOiBWaXNpdFtdIHtcbiAgICBsZXQgaGlzdG9yeSA9IHRoaXMuX2hpc3RvcnkuZ2V0KHBsYWNlRGVmKTtcbiAgICBpZiAoIWhpc3RvcnkpIHtcbiAgICAgIGhpc3RvcnkgPSBbXTtcbiAgICAgIHRoaXMuc2V0SGlzdG9yeShwbGFjZURlZiwgaGlzdG9yeSk7XG4gICAgfVxuICAgIHJldHVybiBoaXN0b3J5O1xuICB9XG5cbiAgcHJpdmF0ZSBzZXRIaXN0b3J5KHBsYWNlRGVmOiBQbGFjZURlZmluaXRpb24sIGhpc3Rvcnk6IFZpc2l0W10pIHtcbiAgICB0aGlzLl9oaXN0b3J5LnNldChwbGFjZURlZiwgaGlzdG9yeSk7XG4gIH1cblxuLy8gcHJldmlvdXNWaXNpdCgpOiBWaXNpdCB7XG4gIC8vICAgcmV0dXJuIF8ubGFzdCh0aGlzLl9oaXN0b3J5KTtcbiAgLy8gfVxuICAvL1xuICAvLyB3aXRoUHJldmlvdXNWaXNpdDxSPihjYWxsYmFjazoocHJldmlvdXNWaXNpdDpWaXNpdCk9PlIsIGRlZmF1bHRWYWx1ZTpSID0gbnVsbCk6UntcbiAgLy8gICBjb25zdCB2aXNpdCA9IHRoaXMucHJldmlvdXNWaXNpdCgpO1xuICAvLyAgIHJldHVybiB2aXNpdCA/IGNhbGxiYWNrKHZpc2l0KSA6IGRlZmF1bHRWYWx1ZTtcbiAgLy8gfVxuICAvL1xuICAvLyBwcmV2aW91c1Zpc2l0VG8ocGxhY2U6IFBsYWNlKTogVmlzaXQge1xuICAvLyAgIHJldHVybiBuZXcgVmlzaXRIaXN0b3J5LlF1ZXJ5KHRoaXMuX2hpc3RvcnkpLnRvKHBsYWNlKS5sYXN0KCk7XG4gIC8vIH1cbn1cblxuZXhwb3J0IG5hbWVzcGFjZSBWaXNpdEhpc3Rvcnkge1xuXG4gIC8vIGV4cG9ydCBjbGFzcyBRdWVyeSB7XG4gIC8vICAgcHJpdmF0ZSBfaGlzdG9yeTogVmlzaXQuU3RhdGVbXTtcbiAgLy8gICBwcml2YXRlIF9wbGFjZXM6IFBsYWNlW107XG4gIC8vICAgcHJpdmF0ZSBfcHJlZGljYXRlOiAodmlzaXQ6IGFueSkgPT4gYm9vbGVhbjtcbiAgLy8gICBwcml2YXRlIF9saW1pdDogbnVtYmVyO1xuICAvL1xuICAvLyAgIGNvbnN0cnVjdG9yKGhpc3RvcnksIGxpbWl0ID0gaGlzdG9yeS5sZW5ndGgpIHtcbiAgLy8gICAgIHRoaXMuX2hpc3RvcnkgPSBoaXN0b3J5O1xuICAvLyAgICAgdGhpcy5fcGxhY2VzID0gW107XG4gIC8vICAgICB0aGlzLl9wcmVkaWNhdGUgPSAodmlzaXQgPT4gdHJ1ZSk7XG4gIC8vICAgICB0aGlzLl9saW1pdCA9IGxpbWl0O1xuICAvLyAgIH1cbiAgLy9cbiAgLy8gICB0byguLi5wbGFjZXM6UGxhY2VbXSk6dGhpcyB7XG4gIC8vICAgICB0aGlzLl9wbGFjZXMgPSBwbGFjZXM7XG4gIC8vICAgICByZXR1cm4gdGhpcztcbiAgLy8gICB9XG4gIC8vXG4gIC8vICAgd2l0aChwYXJhbWV0ZXJzOiB7IFtwYXJhbWV0ZXI6IHN0cmluZ106IGFueSB9KTogdGhpcyB7XG4gIC8vICAgICB0aGlzLm1hdGNoaW5nKHN0YXRlID0+IHtcbiAgLy8gICAgICAgcmV0dXJuIE9iamVjdC5rZXlzKHBhcmFtZXRlcnMpLnJlZHVjZSgoYWNjLCBrZXkpID0+IHtcbiAgLy8gICAgICAgICBjb25zdCBtYXRjaFZhbHVlID0gcGFyYW1ldGVyc1trZXldO1xuICAvLyAgICAgICAgIGNvbnN0IHZpc2l0VmFsdWUgPSBzdGF0ZS5nZXQoa2V5KTtcbiAgLy8gICAgICAgICBjb25zdCBtYXRjaGVkID0gbWF0Y2hWYWx1ZSA9PT0gJyonID8gIV8uaXNOaWwodmlzaXRWYWx1ZSkgOiB2aXNpdFZhbHVlID09IG1hdGNoVmFsdWU7XG4gIC8vICAgICAgICAgLy8gTG9nZ2VyLmdldCh0aGlzKS5pbmZvKGBtYXRjaGVkPSR7bWF0Y2hlZH1gLCBwYXJhbWV0ZXJzLCB2aXNpdFZhbHVlKTtcbiAgLy8gICAgICAgICByZXR1cm4gYWNjICYmIG1hdGNoZWQ7XG4gIC8vICAgICAgIH0sIHRydWUpO1xuICAvLyAgICAgfSk7XG4gIC8vICAgICByZXR1cm4gdGhpcztcbiAgLy8gICB9XG4gIC8vXG4gIC8vICAgbGFzdCgpOiBWaXNpdC5TdGF0ZSB7XG4gIC8vICAgICByZXR1cm4gXy5maW5kTGFzdCh0aGlzLl9oaXN0b3J5LCB2aXNpdCA9PiB0aGlzLl9tYXRjaGVzKHZpc2l0KSlcbiAgLy8gICB9XG4gIC8vXG4gIC8vICAgLy8gQHRyYWNlXG4gIC8vICAgYWxsVGhhdE1hdGNoKCk6IFZpc2l0LlN0YXRlW10ge1xuICAvLyAgICAgcmV0dXJuIF8uZmlsdGVyKHRoaXMuX2hpc3RvcnksIHZpc2l0ID0+IHRoaXMuX21hdGNoZXModmlzaXQpKS5zbGljZSgtdGhpcy5fbGltaXQpO1xuICAvLyAgIH1cbiAgLy9cbiAgLy8gICAvLyBAdHJhY2VcbiAgLy8gICBtb3N0UmVjZW50VmFsdWVPZjxUPWFueT4ocGFyYW06IHN0cmluZywgZGVmYXVsdFZhbHVlOiBUID0gbnVsbCk6IFQge1xuICAvLyAgICAgY29uc3QgbGFzdFN0YXRlV2l0aFBhcmFtID0gXy5maW5kTGFzdCh0aGlzLmFsbFRoYXRNYXRjaCgpLCBzdGF0ZSA9PiAhXy5pc05pbChzdGF0ZS5nZXQocGFyYW0pKSk7XG4gIC8vICAgICByZXR1cm4gXy5pc05pbChsYXN0U3RhdGVXaXRoUGFyYW0pID8gZGVmYXVsdFZhbHVlIDogbGFzdFN0YXRlV2l0aFBhcmFtLmdldChwYXJhbSk7XG4gIC8vICAgfVxuICAvL1xuICAvLyAgIGxpbWl0KGxpbWl0OiBudW1iZXIpOiB0aGlzIHtcbiAgLy8gICAgIHRoaXMuX2xpbWl0ID0gbGltaXQ7XG4gIC8vICAgICByZXR1cm4gdGhpcztcbiAgLy8gICB9XG4gIC8vXG4gIC8vICAgbWF0Y2hpbmcocHJlZGljYXRlOiAodmlzaXQ6IFZpc2l0LlN0YXRlKSA9PiBib29sZWFuKTogdGhpcyB7XG4gIC8vICAgICB0aGlzLl9wcmVkaWNhdGUgPSBwcmVkaWNhdGU7XG4gIC8vICAgICByZXR1cm4gdGhpcztcbiAgLy8gICB9XG4gIC8vXG4gIC8vICAgX21hdGNoZXModmlzaXQ6IFZpc2l0LlN0YXRlKSB7XG4gIC8vICAgICByZXR1cm4gdGhpcy5faXNQbGFjZU1hdGNoKHZpc2l0KSAmJiB0aGlzLl9wcmVkaWNhdGUodmlzaXQpO1xuICAvLyAgIH1cbiAgLy9cbiAgLy8gICBfaXNQbGFjZU1hdGNoKHZpc2l0OiBWaXNpdC5TdGF0ZSkge1xuICAvLyAgICAgcmV0dXJuIHRoaXMuX3BsYWNlcy5sZW5ndGggPCAxIHx8IHRoaXMuX3BsYWNlcy5pbmNsdWRlcyh2aXNpdC5wbGFjZSlcbiAgLy8gICB9XG4gIC8vXG4gIC8vIH1cblxufVxuIl19
|