@coolon/angular-ui-powerups 0.0.50 → 0.0.53

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.
Files changed (38) hide show
  1. package/bundles/coolon-angular-ui-powerups.umd.js +392 -745
  2. package/bundles/coolon-angular-ui-powerups.umd.js.map +1 -1
  3. package/bundles/coolon-angular-ui-powerups.umd.min.js +1 -1
  4. package/bundles/coolon-angular-ui-powerups.umd.min.js.map +1 -1
  5. package/coolon-angular-ui-powerups.metadata.json +1 -1
  6. package/esm2015/coolon-angular-ui-powerups.js +2 -2
  7. package/esm2015/index.js +2 -2
  8. package/esm2015/lib/place/components/place-outlet/place-outlet.component.js +2 -2
  9. package/esm2015/lib/place/guards/place-route.guard.js +2 -2
  10. package/esm2015/lib/place/index.js +2 -2
  11. package/esm2015/lib/place/route/parameter-definition.class.js +17 -36
  12. package/esm2015/lib/place/route/parameter-sanitiser.js +3 -4
  13. package/esm2015/lib/place/route/parameter-snapshot.js +66 -208
  14. package/esm2015/lib/place/route/route-parameter-value.js +223 -0
  15. package/esm2015/public_api.js +2 -2
  16. package/esm5/coolon-angular-ui-powerups.js +2 -2
  17. package/esm5/index.js +2 -2
  18. package/esm5/lib/place/components/place-outlet/place-outlet.component.js +2 -2
  19. package/esm5/lib/place/guards/place-route.guard.js +2 -2
  20. package/esm5/lib/place/index.js +2 -2
  21. package/esm5/lib/place/route/parameter-definition.class.js +18 -45
  22. package/esm5/lib/place/route/parameter-sanitiser.js +3 -4
  23. package/esm5/lib/place/route/parameter-snapshot.js +73 -273
  24. package/esm5/lib/place/route/route-parameter-value.js +309 -0
  25. package/esm5/public_api.js +2 -2
  26. package/fesm2015/coolon-angular-ui-powerups.js +304 -537
  27. package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
  28. package/fesm5/coolon-angular-ui-powerups.js +394 -746
  29. package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
  30. package/lib/place/index.d.ts +1 -1
  31. package/lib/place/route/parameter-definition.class.d.ts +2 -2
  32. package/lib/place/route/parameter-sanitiser.d.ts +2 -2
  33. package/lib/place/route/parameter-snapshot.d.ts +6 -27
  34. package/lib/place/route/route-parameter-value.d.ts +42 -0
  35. package/package.json +1 -1
  36. package/esm2015/lib/place/route/route-parameter-sanitiser.js +0 -296
  37. package/esm5/lib/place/route/route-parameter-sanitiser.js +0 -435
  38. package/lib/place/route/route-parameter-sanitiser.d.ts +0 -44
@@ -24,4 +24,4 @@ export * from "./route/parameter-definition.class";
24
24
  export * from "./route/parameter-sanitiser";
25
25
  export * from "./route/parameter-snapshot";
26
26
  export * from "./route/parameter-type";
27
- export * from "./route/route-parameter-sanitiser";
27
+ export * from "./route/route-parameter-value";
@@ -3,6 +3,7 @@ import { PlaceHistory } from '../place-history';
3
3
  import { Visit } from '../visit';
4
4
  import { ParameterSanitiser } from './parameter-sanitiser';
5
5
  import { ParameterType } from './parameter-type';
6
+ import { RouteParameterValue } from './route-parameter-value';
6
7
  export declare abstract class ParameterDefinition<T, S = T> {
7
8
  readonly propertyName: string;
8
9
  readonly type: ParameterType<T>;
@@ -38,7 +39,6 @@ export declare namespace ParameterDefinition {
38
39
  readonly defaultValue: S;
39
40
  readonly placeHistory: PlaceHistory;
40
41
  constructor(remember: boolean, defaultValue: S, placeHistory: PlaceHistory);
41
- sanitise(parameterDef: ParameterDefinition<T, S>, value: S, visit?: Visit): Promise<S> | S;
42
- private isBlank;
42
+ sanitise(parameter: RouteParameterValue<S, any, any>, visit?: Visit): Promise<S> | S;
43
43
  }
44
44
  }
@@ -1,5 +1,5 @@
1
1
  import { Visit } from '../visit';
2
- import { ParameterDefinition } from './parameter-definition.class';
2
+ import { RouteParameterValue } from './route-parameter-value';
3
3
  export interface ParameterSanitiser<S> {
4
- sanitise(parameterDef: ParameterDefinition<any, S>, value: S, visit?: Visit): Promise<S> | S;
4
+ sanitise(paramter: RouteParameterValue<S, any, any>, visit?: Visit): Promise<S> | S;
5
5
  }
@@ -3,12 +3,13 @@ import { ParamMap, UrlSegment } from '@angular/router';
3
3
  import { PlaceDefinition } from '../place-definition';
4
4
  import { Visit } from '../visit';
5
5
  import { ParameterDefinition } from './parameter-definition.class';
6
+ import { RouteParameterValue } from './route-parameter-value';
6
7
  export declare class ParameterSnapshot implements Visit {
7
8
  readonly placeDefinition: PlaceDefinition;
8
- private readonly resolved;
9
- constructor(placeDefinition: PlaceDefinition, resolved: ParameterSnapshot.ResolvedParameter<any, any>[]);
9
+ private readonly parameters;
10
+ constructor(placeDefinition: PlaceDefinition, parameters: RouteParameterValue<any, any, any>[]);
10
11
  hasChanged(other: ParameterSnapshot, debug?: boolean): boolean;
11
- getParameter<T, S>(parameterDef: ParameterDefinition<T, S>): ParameterSnapshot.ResolvedParameter<T, S>;
12
+ getParameter<T, S>(parameterDef: ParameterDefinition<T, S>): RouteParameterValue<S, T, any>;
12
13
  getValueOf<T, S>(parameterDef: ParameterDefinition<T, S>): S;
13
14
  getRouteIdValue(): any;
14
15
  getParameterValue(name: string): any;
@@ -16,34 +17,12 @@ export declare class ParameterSnapshot implements Visit {
16
17
  private getRouteParameters;
17
18
  hasRouteId(): boolean;
18
19
  getFormattedRouteId(): string;
20
+ getNonEmptyParameters(): RouteParameterValue<any, any, any>[];
19
21
  getFormattedParameters(): {};
20
- getAllFormattedParameters(): {};
22
+ getAllParameters(): {};
21
23
  replace<T, S>(parameter: ParameterDefinition<T, S>, value: S): ParameterSnapshot;
22
24
  sanitise(injector: Injector): Promise<ParameterSnapshot>;
23
25
  }
24
26
  export declare namespace ParameterSnapshot {
25
27
  function create(placeDef: PlaceDefinition, params: ParamMap, urlSegments: UrlSegment[]): ParameterSnapshot;
26
- abstract class ResolvedParameter<T, S = T> {
27
- readonly parameterDef: ParameterDefinition<T, S>;
28
- readonly value: S;
29
- constructor(parameterDef: ParameterDefinition<T, S>, value: S);
30
- abstract injectRouteParam(dest: {}): void;
31
- abstract isSame(otherValue: S): boolean;
32
- isRouteId(): boolean;
33
- abstract formattedValue(): string | string[];
34
- abstract replace(value: S): ResolvedParameter<T, S>;
35
- sanitise(visit: Visit, injector: Injector): Promise<S>;
36
- }
37
- class ResolvedValueParameter<T> extends ResolvedParameter<T, T> {
38
- isSame(otherValue: T): boolean;
39
- injectRouteParam(dest: {}): void;
40
- replace(value: T): ParameterSnapshot.ResolvedParameter<T, T>;
41
- formattedValue(): string;
42
- }
43
- class ResolvedArrayParameter<T> extends ResolvedParameter<T, T[]> {
44
- isSame(otherValue: T[]): boolean;
45
- injectRouteParam(dest: {}): void;
46
- replace(value: T[]): ParameterSnapshot.ResolvedParameter<T, T[]>;
47
- formattedValue(): string[];
48
- }
49
28
  }
@@ -0,0 +1,42 @@
1
+ import { Injector } from '@angular/core';
2
+ import { ParamMap } from '@angular/router';
3
+ import { Visit } from '../visit';
4
+ import { ParameterDefinition } from './parameter-definition.class';
5
+ export declare abstract class RouteParameterValue<S, T, R extends string | string[]> {
6
+ readonly definition: ParameterDefinition<T, S>;
7
+ protected readonly rawValue: R;
8
+ constructor(definition: ParameterDefinition<T, S>, rawValue: R);
9
+ abstract readonly value: S;
10
+ isRouteId(): boolean;
11
+ hasChanged(otherValue: S): boolean;
12
+ /**
13
+ * Return's true if the current value is empty.
14
+ */
15
+ isEmpty(): boolean;
16
+ /**
17
+ * Returns true if the rawValue is undefined. This
18
+ */
19
+ isMissing(): boolean;
20
+ abstract isSameValue(otherValue: S): boolean;
21
+ abstract formattedValue(): string | string[];
22
+ abstract replace(value: S): RouteParameterValue<S, T, any>;
23
+ abstract isEmptyValue(value: S): boolean;
24
+ sanitise(visit: Visit, injector: Injector): Promise<S>;
25
+ }
26
+ export declare namespace RouteParameterValue {
27
+ function create<T>(def: ParameterDefinition<T, any>, paramMap: ParamMap): RouteParameterValue<any, any, any>;
28
+ class Scalar<T> extends RouteParameterValue<T, T, string> {
29
+ readonly value: T;
30
+ isSameValue(otherValue: T): boolean;
31
+ replace(value: T): RouteParameterValue<T, T, string>;
32
+ formattedValue(): string;
33
+ isEmptyValue(value: T): boolean;
34
+ }
35
+ class Array<T> extends RouteParameterValue<T[], T, string[]> {
36
+ readonly value: T[];
37
+ isSameValue(otherValue: T[]): boolean;
38
+ replace(value: T[]): RouteParameterValue<T[], T, string[]>;
39
+ formattedValue(): string[];
40
+ isEmptyValue(value: T[]): boolean;
41
+ }
42
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@coolon/angular-ui-powerups",
3
- "version": "0.0.50",
3
+ "version": "0.0.53",
4
4
  "schematics": "./schematics/collection.json",
5
5
  "dependencies": {
6
6
  "ts-morph": "^3.1.3",
@@ -1,296 +0,0 @@
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 { assert, lang } from '@coolon/pectin';
7
- import { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';
8
- import _ from 'lodash';
9
- import { ParameterDefinition } from './parameter-definition.class';
10
- /**
11
- * @template T, S
12
- */
13
- export class Sanitiser {
14
- /**
15
- * @param {?} parameterDef
16
- * @param {?} snapshot
17
- * @param {?} sanitiser
18
- */
19
- constructor(parameterDef, snapshot, sanitiser) {
20
- this.parameterDef = parameterDef;
21
- this.snapshot = snapshot;
22
- this.sanitiser = sanitiser;
23
- }
24
- /**
25
- * @return {?}
26
- */
27
- isRouteId() {
28
- return this.parameterDef.isRouteId;
29
- }
30
- /**
31
- * @return {?}
32
- */
33
- get valueChanged() {
34
- return !_.isNil(this.initialValue) && this.hasChanged(this.initialValue, this.sanitisedValue);
35
- }
36
- /**
37
- * @return {?}
38
- */
39
- get sanitisedValue() {
40
- return this._sanitisedValue;
41
- }
42
- /**
43
- * @protected
44
- * @param {?} snapshot
45
- * @return {?}
46
- */
47
- readFrom(snapshot) {
48
- return lang.abstractMethod(this.constructor);
49
- }
50
- /**
51
- * @protected
52
- * @param {?} initialValue
53
- * @param {?} sanitisedValue
54
- * @return {?}
55
- */
56
- hasChanged(initialValue, sanitisedValue) {
57
- return lang.abstractMethod(this.constructor);
58
- }
59
- /**
60
- * @param {?} dest
61
- * @return {?}
62
- */
63
- injectRouteParam(dest) {
64
- lang.abstractMethod(this.constructor);
65
- }
66
- /**
67
- * @return {?}
68
- */
69
- sanitize() {
70
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
71
- if (this.sanitiser) {
72
- this.initialValue = this.readFrom(this.snapshot);
73
- this._sanitisedValue = yield this.sanitiser.sanitise(null, this.initialValue);
74
- if (this.initialValue !== this._sanitisedValue) {
75
- return false;
76
- }
77
- }
78
- return true;
79
- });
80
- }
81
- }
82
- if (false) {
83
- /**
84
- * @type {?}
85
- * @private
86
- */
87
- Sanitiser.prototype.initialValue;
88
- /**
89
- * @type {?}
90
- * @private
91
- */
92
- Sanitiser.prototype._sanitisedValue;
93
- /** @type {?} */
94
- Sanitiser.prototype.parameterDef;
95
- /** @type {?} */
96
- Sanitiser.prototype.snapshot;
97
- /** @type {?} */
98
- Sanitiser.prototype.sanitiser;
99
- }
100
- export class RouteParameterSanitiser {
101
- /**
102
- * @param {?} parameterDefs
103
- * @param {?} snapshot
104
- * @param {?} injector
105
- */
106
- constructor(parameterDefs, snapshot, injector) {
107
- this.parameterDefs = parameterDefs;
108
- this.snapshot = snapshot;
109
- this.injector = injector;
110
- this.parameterSanitisers = [];
111
- /** @type {?} */
112
- const sanitisers = parameterDefs.map((/**
113
- * @param {?} def
114
- * @return {?}
115
- */
116
- def => {
117
- return def.isArray ?
118
- new Sanitiser.Array(def, snapshot, this.getSanitiser(def)) :
119
- new Sanitiser.Value(def, snapshot, this.getSanitiser(def));
120
- }));
121
- this.routeIdSanitiser = sanitisers.find((/**
122
- * @param {?} p
123
- * @return {?}
124
- */
125
- p => p.isRouteId()));
126
- this.parameterSanitisers = sanitisers.filter((/**
127
- * @param {?} p
128
- * @return {?}
129
- */
130
- p => !p.isRouteId()));
131
- }
132
- /**
133
- * @return {?}
134
- */
135
- sanitise() {
136
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
137
- if (this.routeIdSanitiser) {
138
- yield this.routeIdSanitiser.sanitize();
139
- if (this.routeIdSanitiser.valueChanged) {
140
- // if the route id isn't ok we redirect immediately as the query params may need to be sanitised in the
141
- // context of the route id.
142
- return false;
143
- }
144
- }
145
- for (const sanitiser of this.parameterSanitisers) {
146
- yield sanitiser.sanitize();
147
- }
148
- return !this.parameterSanitisers.find((/**
149
- * @param {?} s
150
- * @return {?}
151
- */
152
- s => s.valueChanged));
153
- });
154
- }
155
- /**
156
- * @private
157
- * @template T, S
158
- * @param {?} def
159
- * @return {?}
160
- */
161
- getSanitiser(def) {
162
- return def.getSanitiser(this.injector);
163
- }
164
- /**
165
- * @return {?}
166
- */
167
- routeIdHasChanged() {
168
- assert.isTruthy(this.parameterSanitisers.length !== 0);
169
- return this.routeIdSanitiser && this.routeIdSanitiser.valueChanged;
170
- }
171
- // @Trace()
172
- /**
173
- * @return {?}
174
- */
175
- getRedirectParams() {
176
- if (this.routeIdHasChanged()) {
177
- return [this.routeIdSanitiser.sanitisedValue];
178
- }
179
- else {
180
- /** @type {?} */
181
- const routeParams = {};
182
- this.parameterSanitisers.forEach((/**
183
- * @param {?} s
184
- * @return {?}
185
- */
186
- s => s.injectRouteParam(routeParams)));
187
- return [routeParams];
188
- }
189
- }
190
- /**
191
- * @private
192
- * @template S
193
- * @param {?} value
194
- * @return {?}
195
- */
196
- isSanitiserContructor(value) {
197
- return _.isFunction(value) && lang.constructorChain((/** @type {?} */ ((/** @type {?} */ (value))))).includes(Sanitiser);
198
- }
199
- }
200
- tslib_1.__decorate([
201
- Memoize(),
202
- tslib_1.__metadata("design:type", Function),
203
- tslib_1.__metadata("design:paramtypes", [ParameterDefinition]),
204
- tslib_1.__metadata("design:returntype", Object)
205
- ], RouteParameterSanitiser.prototype, "getSanitiser", null);
206
- if (false) {
207
- /**
208
- * @type {?}
209
- * @private
210
- */
211
- RouteParameterSanitiser.prototype.routeIdSanitiser;
212
- /**
213
- * @type {?}
214
- * @private
215
- */
216
- RouteParameterSanitiser.prototype.parameterSanitisers;
217
- /** @type {?} */
218
- RouteParameterSanitiser.prototype.parameterDefs;
219
- /** @type {?} */
220
- RouteParameterSanitiser.prototype.snapshot;
221
- /** @type {?} */
222
- RouteParameterSanitiser.prototype.injector;
223
- }
224
- (function (Sanitiser) {
225
- /**
226
- * @template T
227
- */
228
- class Value extends Sanitiser {
229
- /**
230
- * @param {?} snapshot
231
- * @return {?}
232
- */
233
- readFrom(snapshot) {
234
- /** @type {?} */
235
- const rawValue = snapshot.paramMap.get(this.parameterDef.name);
236
- return this.parameterDef.type.parse(rawValue);
237
- }
238
- /**
239
- * @protected
240
- * @param {?} initialValue
241
- * @param {?} sanitisedValue
242
- * @return {?}
243
- */
244
- hasChanged(initialValue, sanitisedValue) {
245
- return initialValue !== sanitisedValue;
246
- }
247
- /**
248
- * @param {?} dest
249
- * @return {?}
250
- */
251
- injectRouteParam(dest) {
252
- dest[this.parameterDef.name] = this.parameterDef.type.format(this.sanitisedValue);
253
- }
254
- }
255
- Sanitiser.Value = Value;
256
- /**
257
- * @template T
258
- */
259
- class Array extends Sanitiser {
260
- /**
261
- * @param {?} snapshot
262
- * @return {?}
263
- */
264
- readFrom(snapshot) {
265
- /** @type {?} */
266
- const rawValues = snapshot.paramMap.getAll(this.parameterDef.name);
267
- return rawValues.map((/**
268
- * @param {?} value
269
- * @return {?}
270
- */
271
- value => this.parameterDef.type.parse(value)));
272
- }
273
- /**
274
- * @protected
275
- * @param {?} initialValue
276
- * @param {?} sanitisedValue
277
- * @return {?}
278
- */
279
- hasChanged(initialValue, sanitisedValue) {
280
- return initialValue !== sanitisedValue;
281
- }
282
- /**
283
- * @param {?} dest
284
- * @return {?}
285
- */
286
- injectRouteParam(dest) {
287
- dest[this.parameterDef.name] = this.sanitisedValue.map((/**
288
- * @param {?} v
289
- * @return {?}
290
- */
291
- v => this.parameterDef.type.format(v)));
292
- }
293
- }
294
- Sanitiser.Array = Array;
295
- })(Sanitiser || (Sanitiser = {}));
296
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-parameter-sanitiser.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/route-parameter-sanitiser.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector, Type } from '@angular/core';\nimport { ActivatedRouteSnapshot } from '@angular/router';\nimport { assert, Constructable, lang, Trace } from '@coolon/pectin';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport _ from 'lodash';\nimport { ParameterDefinition } from './parameter-definition.class';\nimport { ParameterSanitiser } from './parameter-sanitiser';\n\nexport class Sanitiser<T, S> {\n\n  private initialValue: S;\n  private _sanitisedValue: S;\n\n  constructor(readonly parameterDef: ParameterDefinition<T, S>, readonly snapshot: ActivatedRouteSnapshot, readonly sanitiser: ParameterSanitiser<S>) {\n  }\n\n  isRouteId(): boolean {\n    return this.parameterDef.isRouteId;\n  }\n\n  get valueChanged(): boolean {\n    return !_.isNil(this.initialValue) && this.hasChanged(this.initialValue, this.sanitisedValue);\n  }\n\n  get sanitisedValue(): S {\n    return this._sanitisedValue;\n  }\n\n  protected readFrom(snapshot: ActivatedRouteSnapshot): S {\n    return lang.abstractMethod(this.constructor);\n  }\n\n  protected hasChanged(initialValue: S, sanitisedValue: S): boolean {\n    return lang.abstractMethod(this.constructor);\n  }\n\n  injectRouteParam(dest: {}) {\n    lang.abstractMethod(this.constructor);\n  }\n\n  async sanitize(): Promise<boolean> {\n    if (this.sanitiser) {\n      this.initialValue = this.readFrom(this.snapshot);\n      this._sanitisedValue = await this.sanitiser.sanitise(null, this.initialValue);\n      if (this.initialValue !== this._sanitisedValue) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n\n\nexport class RouteParameterSanitiser {\n\n  private readonly routeIdSanitiser: Sanitiser<any, any>;\n  private readonly parameterSanitisers: Sanitiser<any, any>[] = [];\n\n  constructor(readonly parameterDefs: ParameterDefinition<any>[],\n              readonly snapshot: ActivatedRouteSnapshot,\n              readonly injector: Injector) {\n    const sanitisers = parameterDefs.map(def => {\n      return def.isArray ?\n        new Sanitiser.Array(def, snapshot, this.getSanitiser(def)) :\n        new Sanitiser.Value(def, snapshot, this.getSanitiser(def));\n    });\n    this.routeIdSanitiser = sanitisers.find(p => p.isRouteId());\n    this.parameterSanitisers = sanitisers.filter(p => !p.isRouteId());\n  }\n\n  async sanitise(): Promise<boolean> {\n    if (this.routeIdSanitiser) {\n      await this.routeIdSanitiser.sanitize();\n      if (this.routeIdSanitiser.valueChanged) {\n        // if the route id isn't ok we redirect immediately as the query params may need to be sanitised in the\n        // context of the route id.\n        return false;\n      }\n    }\n    for (const sanitiser of this.parameterSanitisers) {\n      await sanitiser.sanitize();\n    }\n    return !this.parameterSanitisers.find(s => s.valueChanged);\n  }\n\n  @Memoize()\n  private getSanitiser<T, S>(def: ParameterDefinition<T, S>): ParameterSanitiser<S> {\n    return def.getSanitiser(this.injector);\n  }\n\n  routeIdHasChanged(): boolean {\n    assert.isTruthy(this.parameterSanitisers.length !== 0);\n    return this.routeIdSanitiser && this.routeIdSanitiser.valueChanged;\n  }\n\n  // @Trace()\n  getRedirectParams(): any[] {\n    if (this.routeIdHasChanged()) {\n      return [this.routeIdSanitiser.sanitisedValue];\n    } else {\n      const routeParams = {};\n      this.parameterSanitisers.forEach(s => s.injectRouteParam(routeParams));\n      return [routeParams];\n    }\n  }\n\n  private isSanitiserContructor<S>(value: any): value is Type<ParameterSanitiser<S>> {\n    return _.isFunction(value) && lang.constructorChain(value as unknown as Constructable<any>).includes(Sanitiser);\n  }\n}\n\nexport namespace Sanitiser {\n\n  export class Value<T> extends Sanitiser<T, T> {\n\n    readFrom(snapshot: ActivatedRouteSnapshot): T {\n      const rawValue = snapshot.paramMap.get(this.parameterDef.name);\n      return this.parameterDef.type.parse(rawValue);\n    }\n\n    protected hasChanged(initialValue: T, sanitisedValue: T): boolean {\n      return initialValue !== sanitisedValue;\n    }\n\n    injectRouteParam(dest: {}) {\n      dest[this.parameterDef.name] = this.parameterDef.type.format(this.sanitisedValue);\n    }\n\n  }\n\n  export class Array<T> extends Sanitiser<T, T[]> {\n\n    readFrom(snapshot: ActivatedRouteSnapshot): T[] {\n      const rawValues = snapshot.paramMap.getAll(this.parameterDef.name);\n      return rawValues.map(value => this.parameterDef.type.parse(value));\n    }\n\n    protected hasChanged(initialValue: T[], sanitisedValue: T[]): boolean {\n      return initialValue !== sanitisedValue;\n    }\n\n    injectRouteParam(dest: {}) {\n      dest[this.parameterDef.name] = this.sanitisedValue.map(v => this.parameterDef.type.format(v));\n    }\n\n\n  }\n\n}\n"]}