@coolon/angular-ui-powerups 0.0.69 → 0.0.70

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.
@@ -3,7 +3,7 @@
3
3
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
4
4
  */
5
5
  import { UseDelegate } from '@coolon/pectin';
6
- import { Klass } from '@coolon/typescript-utilities';
6
+ import { Klass, Opts } from '@coolon/typescript-utilities';
7
7
  import { ROUTE_PARAMETER_LIST_KEY } from '../place-component';
8
8
  import { ParameterDefinition } from './parameter-definition.class';
9
9
  /**
@@ -80,6 +80,8 @@ export function RouteId(type, options) {
80
80
  * @return {?}
81
81
  */
82
82
  export function VisitParameter(options) {
83
+ /** @type {?} */
84
+ const opts = Opts.get(options);
83
85
  return (/**
84
86
  * @param {?} prototype
85
87
  * @param {?} propertyKey
@@ -87,7 +89,7 @@ export function VisitParameter(options) {
87
89
  */
88
90
  (prototype, propertyKey) => {
89
91
  /** @type {?} */
90
- const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
92
+ const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
91
93
  Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
92
94
  UseDelegate()(prototype, propertyKey);
93
95
  });
@@ -98,6 +100,8 @@ export function VisitParameter(options) {
98
100
  * @return {?}
99
101
  */
100
102
  export function VisitParameterList(options) {
103
+ /** @type {?} */
104
+ const opts = Opts.get(options);
101
105
  return (/**
102
106
  * @param {?} prototype
103
107
  * @param {?} propertyKey
@@ -105,9 +109,9 @@ export function VisitParameterList(options) {
105
109
  */
106
110
  (prototype, propertyKey) => {
107
111
  /** @type {?} */
108
- const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
112
+ const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
109
113
  Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
110
114
  UseDelegate()(prototype, propertyKey);
111
115
  });
112
116
  }
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=
117
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLWRlY29yYXRvcnMuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2Uvcm91dGUvcGFyYW1ldGVyLWRlY29yYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUM3QyxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDOzs7OztBQUluRSxvQ0FNQzs7O0lBTEMsNEJBQVk7O0lBQ1osa0NBQW1COztJQUNuQixrQ0FBbUI7O0lBQ25CLHNDQUFpQjs7Ozs7O0FBSW5CLDJDQU9DOzs7SUFOQyxtQ0FBWTs7SUFDWix5Q0FBbUI7O0lBQ25CLHlDQUFtQjs7SUFDbkIsNkNBQWlCOztJQUNqQiwyQ0FBeUI7Ozs7OztBQUkzQiwrQ0FPQzs7O0lBTkMsdUNBQVk7O0lBQ1osNkNBQW1COztJQUNuQiw2Q0FBbUI7O0lBQ25CLGlEQUFtQjs7SUFDbkIsK0NBQXlCOzs7Ozs7OztBQUkzQixNQUFNLFVBQVUsT0FBTyxDQUE0QixJQUFrQixFQUFFLE9BQTJCO0lBQ2hHOzs7OztJQUFPLENBQUMsU0FBaUIsRUFBRSxXQUE0QixFQUFFLEVBQUU7O2NBQ25ELEtBQUssR0FBRyxJQUFJLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQztRQUNwRixLQUFLLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLHdCQUF3QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzNFLFdBQVcsRUFBRSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUN4QyxDQUFDLEVBQUM7QUFDSixDQUFDOzs7Ozs7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFJLE9BQWtDOztVQUM1RCxJQUFJLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7SUFDOUI7Ozs7O0lBQU8sQ0FBQyxTQUFpQixFQUFFLFdBQTRCLEVBQUUsRUFBRTs7Y0FDbkQsS0FBSyxHQUFHLElBQUksbUJBQW1CLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDM0gsS0FBSyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUMzRSxXQUFXLEVBQUUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDeEMsQ0FBQyxFQUFDO0FBQ0osQ0FBQzs7Ozs7O0FBRUQsTUFBTSxVQUFVLGtCQUFrQixDQUFJLE9BQXNDOztVQUNwRSxJQUFJLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7SUFDOUI7Ozs7O0lBQU8sQ0FBQyxTQUFpQixFQUFFLFdBQTRCLEVBQUUsRUFBRTs7Y0FDbkQsS0FBSyxHQUFHLElBQUksbUJBQW1CLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDM0gsS0FBSyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUMzRSxXQUFXLEVBQUUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDeEMsQ0FBQyxFQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFVzZURlbGVnYXRlIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgS2xhc3MsIE9wdHMgfSBmcm9tICdAY29vbG9uL3R5cGVzY3JpcHQtdXRpbGl0aWVzJztcbmltcG9ydCB7IFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSB9IGZyb20gJy4uL3BsYWNlLWNvbXBvbmVudCc7XG5pbXBvcnQgeyBQYXJhbWV0ZXJEZWZpbml0aW9uIH0gZnJvbSAnLi9wYXJhbWV0ZXItZGVmaW5pdGlvbi5jbGFzcyc7XG5pbXBvcnQgeyBGb3JtYXR0ZXIgfSBmcm9tICcuL2Zvcm1hdHRlcic7XG5cblxuZXhwb3J0IGludGVyZmFjZSBSb3V0ZUlkT3B0aW9uczxUPiB7XG4gIGFzPzogc3RyaW5nO1xuICBvcHRpb25hbD86IGJvb2xlYW47XG4gIHJlbWVtYmVyPzogYm9vbGVhbjtcbiAgZGVmYXVsdFZhbHVlPzogVDtcbiAgLy8gc2FuaXRpc2VyPzogQ29uc3RydWN0YWJsZTxQYXJhbWV0ZXJTYW5pdGlzZXI8VD4+IHwgUGFyYW1ldGVyU2FuaXRpc2VyPFQ+O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlUGFyYW1ldGVyT3B0aW9uczxUPiB7XG4gIGFzPzogc3RyaW5nO1xuICBvcHRpb25hbD86IGJvb2xlYW47XG4gIHJlbWVtYmVyPzogYm9vbGVhbjtcbiAgZGVmYXVsdFZhbHVlPzogVDtcbiAgc3RvcmVJblVybD86IEZvcm1hdHRlcjxUPlxuICAvLyBzYW5pdGlzZXI/OiBDb25zdHJ1Y3RhYmxlPFBhcmFtZXRlclNhbml0aXNlcjxUPj4gfCBQYXJhbWV0ZXJTYW5pdGlzZXI8VD47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUm91dGVMaXN0UGFyYW1ldGVyT3B0aW9uczxUPiB7XG4gIGFzPzogc3RyaW5nO1xuICBvcHRpb25hbD86IGJvb2xlYW47XG4gIHJlbWVtYmVyPzogYm9vbGVhbjtcbiAgZGVmYXVsdFZhbHVlPzogVFtdO1xuICBzdG9yZUluVXJsPzogRm9ybWF0dGVyPFQ+XG4gIC8vIHNhbml0aXNlcj86IENvbnN0cnVjdGFibGU8UGFyYW1ldGVyU2FuaXRpc2VyPFRbXT4+IHwgUGFyYW1ldGVyU2FuaXRpc2VyPFRbXT47XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBSb3V0ZUlkPFQgZXh0ZW5kcyBzdHJpbmcgfCBudW1iZXI+KHR5cGU6IEZvcm1hdHRlcjxUPiwgb3B0aW9ucz86IFJvdXRlSWRPcHRpb25zPFQ+KTogUHJvcGVydHlEZWNvcmF0b3Ige1xuICByZXR1cm4gKHByb3RvdHlwZTogT2JqZWN0LCBwcm9wZXJ0eUtleTogc3RyaW5nIHwgc3ltYm9sKSA9PiB7XG4gICAgY29uc3QgcGFyYW0gPSBuZXcgUGFyYW1ldGVyRGVmaW5pdGlvbi5Sb3V0ZUlkKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIG9wdGlvbnMsIHR5cGUpO1xuICAgIEtsYXNzLmdldChwcm90b3R5cGUpLmFkZFRvT3duTWV0YWRhdGFMaXN0KFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSwgcGFyYW0pO1xuICAgIFVzZURlbGVnYXRlKCkocHJvdG90eXBlLCBwcm9wZXJ0eUtleSk7XG4gIH07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBWaXNpdFBhcmFtZXRlcjxUPihvcHRpb25zPzogUm91dGVQYXJhbWV0ZXJPcHRpb25zPFQ+KTogUHJvcGVydHlEZWNvcmF0b3Ige1xuICBjb25zdCBvcHRzID0gT3B0cy5nZXQob3B0aW9ucyk7XG4gIHJldHVybiAocHJvdG90eXBlOiBPYmplY3QsIHByb3BlcnR5S2V5OiBzdHJpbmcgfCBzeW1ib2wpID0+IHtcbiAgICBjb25zdCBwYXJhbSA9IG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLlZhbHVlUGFyYW1ldGVyKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIG9wdGlvbnMsIG9wdHMuZ2V0T3B0aW9uYWwoXCJzdG9yZUluVXJsXCIsIG51bGwpKTtcbiAgICBLbGFzcy5nZXQocHJvdG90eXBlKS5hZGRUb093bk1ldGFkYXRhTGlzdChST1VURV9QQVJBTUVURVJfTElTVF9LRVksIHBhcmFtKTtcbiAgICBVc2VEZWxlZ2F0ZSgpKHByb3RvdHlwZSwgcHJvcGVydHlLZXkpO1xuICB9O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gVmlzaXRQYXJhbWV0ZXJMaXN0PEU+KG9wdGlvbnM/OiBSb3V0ZUxpc3RQYXJhbWV0ZXJPcHRpb25zPEU+KTogUHJvcGVydHlEZWNvcmF0b3Ige1xuICBjb25zdCBvcHRzID0gT3B0cy5nZXQob3B0aW9ucyk7XG4gIHJldHVybiAocHJvdG90eXBlOiBPYmplY3QsIHByb3BlcnR5S2V5OiBzdHJpbmcgfCBzeW1ib2wpID0+IHtcbiAgICBjb25zdCBwYXJhbSA9IG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLkFycmF5UGFyYW1ldGVyKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIG9wdGlvbnMsIG9wdHMuZ2V0T3B0aW9uYWwoXCJzdG9yZUluVXJsXCIsIG51bGwpKTtcbiAgICBLbGFzcy5nZXQocHJvdG90eXBlKS5hZGRUb093bk1ldGFkYXRhTGlzdChST1VURV9QQVJBTUVURVJfTElTVF9LRVksIHBhcmFtKTtcbiAgICBVc2VEZWxlZ2F0ZSgpKHByb3RvdHlwZSwgcHJvcGVydHlLZXkpO1xuICB9O1xufVxuXG4vLyBleHBvcnQgZnVuY3Rpb24gUm91dGVQYXJhbWV0ZXI8VD4odHlwZTogUGFyYW1ldGVyVHlwZTxUPiwgb3B0aW9ucz86IFJvdXRlUGFyYW1ldGVyT3B0aW9uczxUPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbi8vICAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuLy8gICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uVmFsdWVQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgdHlwZSk7XG4vLyAgICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4vLyAgICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbi8vICAgfTtcbi8vIH1cbi8vXG4vLyBleHBvcnQgZnVuY3Rpb24gUm91dGVQYXJhbWV0ZXJMaXN0PEU+KGVsZW1lbnRUeXBlOiBQYXJhbWV0ZXJUeXBlPEU+LCBvcHRpb25zPzogUm91dGVMaXN0UGFyYW1ldGVyT3B0aW9uczxFPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbi8vICAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuLy8gICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uQXJyYXlQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgZWxlbWVudFR5cGUpO1xuLy8gICAgIEtsYXNzLmdldChwcm90b3R5cGUpLmFkZFRvT3duTWV0YWRhdGFMaXN0KFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSwgcGFyYW0pO1xuLy8gICAgIFVzZURlbGVnYXRlKCkocHJvdG90eXBlLCBwcm9wZXJ0eUtleSk7XG4vLyAgIH07XG4vLyB9XG4iXX0=
@@ -155,7 +155,7 @@ var PlaceRouter = /** @class */ (function (_super) {
155
155
  [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :
156
156
  [def.getFormattedRouteParameters(next)];
157
157
  /** @type {?} */
158
- var commands = [relativePath].concat(params, _this.getChildPath(activatedRoute.snapshot));
158
+ var commands = [relativePath].concat(params, _this.extractChildPath(activatedRoute.snapshot));
159
159
  console.log('### Redirect', commands);
160
160
  return router.navigate(commands, {
161
161
  relativeTo: activatedRoute
@@ -193,7 +193,6 @@ var PlaceRouter = /** @class */ (function (_super) {
193
193
  return [3 /*break*/, 5];
194
194
  case 3:
195
195
  def = visit.placeDefinition;
196
- // @see https://coolon.atlassian.net/browse/AUP-41
197
196
  parameterCommands = visit.hasRouteId() ?
198
197
  [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
199
198
  [def.getFormattedRouteParameters(visit)];
@@ -274,7 +273,7 @@ var PlaceRouter = /** @class */ (function (_super) {
274
273
  * @param {?} activatedRoute
275
274
  * @return {?}
276
275
  */
277
- PlaceRouter.prototype.getChildPath = /**
276
+ PlaceRouter.prototype.extractChildPath = /**
278
277
  * @param {?} activatedRoute
279
278
  * @return {?}
280
279
  */
@@ -336,4 +335,4 @@ if (false) {
336
335
  /** @type {?} */
337
336
  PlaceRouter.prototype.placeHistory;
338
337
  }
339
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  ActivatedRouteSnapshot,\n  NavigationEnd,\n  NavigationError,\n  NavigationStart,\n  Router\n} from '@angular/router';\nimport {\n  BooleanValueModelChain,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  ListModel,\n  MutableListModel,\n  MutableValueModel,\n  Trace,\n  ValueModel\n} from '@coolon/pectin';\nimport _ from 'lodash';\nimport { NavigationSession } from './navigation-session';\nimport { PlaceHistory } from './place-history';\nimport { Visit } from './visit';\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  private firstRoute = true;\n\n  private readonly _navigationSessionModel = new MutableValueModel<NavigationSession>();\n  private readonly _activeVisits = new MutableListModel<Visit>();\n\n  readonly navigationSessionActive: BooleanValueModelChain;\n  readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;\n\n  constructor(private readonly router: Router, readonly angularLocation: Location, readonly placeHistory: PlaceHistory) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');\n\n    angularLocation.onUrlChange(url => {\n      console.log(`location.onUrlChange -> ${url}`);\n    });\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    this.router.events.subscribe(event => {\n      // Routing event sequence\n      // ======================\n      // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session\n      // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.\n      // NavigationStart -> .... -> NavigationError --> navigation canceled, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        this.onAngularRouterStarted(event);\n      }\n      if (event instanceof NavigationEnd || event instanceof NavigationError) {\n        this.onAngularRouterFinished();\n      }\n    });\n\n    this.navigationSessionActive = chain(this.navigationSessionModel).isNotNil();\n    this.navigationSessionActive.subscribe(active => {\n      console.log('navigationSessionActive', active);\n    });\n    // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));\n    // txo.observe('this.navigationSessionModel', this.navigationSessionModel);\n  }\n\n  get navigationSession(): NavigationSession {\n    return this._navigationSessionModel.value;\n  }\n\n  get navigationSessionModel(): ValueModel<NavigationSession> {\n    return this._navigationSessionModel.readonly;\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  /**\n   *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));\n   * @param visit\n   */\n  // @Trace()\n  async navigate(visit: Visit) {\n    this.doNavigation(visit);\n  }\n\n  @Trace()\n  async pushVisitChangesToRoute(activatedRoute: ActivatedRoute, previous: Visit, next: Visit) {\n\n    // we have to push to history so our remember sanitisers don't pick up the previous value\n    // when it's been cleared by the user.\n    this.placeHistory.add(next);\n\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';\n        const def = next.placeDefinition;\n        const params = next.hasRouteId() ?\n          [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :\n          [def.getFormattedRouteParameters(next)];\n        const commands = [relativePath].concat(params, this.getChildPath(activatedRoute.snapshot));\n        console.log('### Redirect', commands);\n        return router.navigate(commands, {\n          relativeTo: activatedRoute\n        });\n      });\n    }\n  }\n\n  async doNavigation(visit: Visit, customNavigation?: (router: Router) => any) {\n    this._navigationSessionModel.value = NavigationSession.createInternal(visit);\n    try {\n      if (customNavigation) {\n        await customNavigation(this.router);\n      } else {\n        const def = visit.placeDefinition;\n        // @see https://coolon.atlassian.net/browse/AUP-41\n        const parameterCommands = visit.hasRouteId() ?\n          [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n          [def.getFormattedRouteParameters(visit)];\n        const commands = [def.path].concat(parameterCommands);\n        console.log('_doNavigation', visit, commands);\n        await this.router.navigate(commands);\n      }\n    } finally {\n      if (this.navigationSession && !this.router.getCurrentNavigation()) {\n        this.onAngularRouterFinished();\n      }\n    }\n  }\n\n  // @Trace()\n  private onAngularRouterStarted(event: NavigationStart) {\n    if (!this.navigationSession) { // We been activated by an external route rather than placeRouter.go(visit)\n      console.log('navigation started', { firstTime: this.firstRoute });\n      const session = NavigationSession.createExternal(this.firstRoute);\n      if (event.navigationTrigger === 'popstate') {\n        session.setPopstateReturn(this.router.routerState.snapshot.url);\n      }\n      this._navigationSessionModel.value = session;\n    }\n    this.firstRoute = false;\n  }\n\n  // @Trace()\n  private onAngularRouterFinished() {\n    const session = this._navigationSessionModel.value;\n    // Update visits before we end the navigation session.  This allows the place out let to\n    // gate ignore changes that occur while the visit is active\n    const visits = session.getVisits();\n    visits.forEach(v => {\n      this.placeHistory.add(v);\n    });\n    this._activeVisits.value = visits;\n\n    this._navigationSessionModel.value = null;\n  }\n\n  getChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n}\n"]}
338
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-router.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,cAAc,EAEd,aAAa,EACb,eAAe,EACf,eAAe,EACf,MAAM,EACP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,GAAG,EACH,gBAAgB,EAGhB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,EAEN,MAAM,gBAAgB,CAAC;AACxB,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;;;;;AAGhC;IAGiC,uCAAgB;IAU/C,qBAA6B,MAAc,EAAW,eAAyB,EAAW,YAA0B;QAApH,YACE,iBAAO,SA8BR;QA/B4B,YAAM,GAAN,MAAM,CAAQ;QAAW,qBAAe,GAAf,eAAe,CAAU;QAAW,kBAAY,GAAZ,YAAY,CAAc;QAR5G,gBAAU,GAAG,IAAI,CAAC;QAET,6BAAuB,GAAG,IAAI,iBAAiB,EAAqB,CAAC;QACrE,mBAAa,GAAG,IAAI,gBAAgB,EAAS,CAAC;QAOvD,IAAA,2BAAkF,EAAhF,gBAAK,EAAE,oBAAO,EAAE,kBAAM,EAAE,cAAI,EAAE,gBAAK,EAAE,oBAAO,EAAE,sBAAkC;QACxF,KAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,KAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAE7E,eAAe,CAAC,WAAW;;;;QAAC,UAAA,GAAG;YAC7B,OAAO,CAAC,GAAG,CAAC,6BAA2B,GAAK,CAAC,CAAC;QAChD,CAAC,EAAC,CAAC;QAEH,oFAAoF;QACpF,KAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS;;;;QAAC,UAAA,KAAK;YAChC,yBAAyB;YACzB,yBAAyB;YACzB,gGAAgG;YAChG,iFAAiF;YACjF,mFAAmF;YACnF,0BAA0B;YAC1B,IAAI,KAAK,YAAY,eAAe,EAAE;gBACpC,KAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;aACpC;YACD,IAAI,KAAK,YAAY,aAAa,IAAI,KAAK,YAAY,eAAe,EAAE;gBACtE,KAAI,CAAC,uBAAuB,EAAE,CAAC;aAChC;QACH,CAAC,EAAC,CAAC;QAEH,KAAI,CAAC,uBAAuB,GAAG,KAAK,CAAC,KAAI,CAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7E,KAAI,CAAC,uBAAuB,CAAC,SAAS;;;;QAAC,UAAA,MAAM;YAC3C,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC,EAAC,CAAC;;QACH,iFAAiF;QACjF,2EAA2E;IAC7E,CAAC;IAED,sBAAI,0CAAiB;;;;QAArB;YACE,OAAO,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;QAC5C,CAAC;;;OAAA;IAED,sBAAI,+CAAsB;;;;QAA1B;YACE,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC;QAC/C,CAAC;;;OAAA;IAED,sBAAI,qCAAY;;;;QAAhB;YACE,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QACrC,CAAC;;;OAAA;IAED;;;OAGG;IACH,WAAW;;;;;;;IACL,8BAAQ;;;;;;IAAd,UAAe,KAAY;;;gBACzB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;;;;KAC1B;;;;;;;IAGK,6CAAuB;;;;;;IAA7B,UAA8B,cAA8B,EAAE,QAAe,EAAE,IAAW;;;;gBAExF,yFAAyF;gBACzF,sCAAsC;gBACtC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE5B,6DAA6D;gBAC7D,IAAI,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE;oBACxC,sBAAO,IAAI,CAAC,YAAY,CAAC,IAAI;;;;wBAAE,UAAA,MAAM;;gCAC7B,YAAY,GAAG,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;;gCACnE,GAAG,GAAG,IAAI,CAAC,eAAe;;gCAC1B,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gCAChC,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gCACxE,CAAC,GAAG,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;;gCACnC,QAAQ,GAAG,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,KAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;4BAC9F,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;4BACtC,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE;gCAC/B,UAAU,EAAE,cAAc;6BAC3B,CAAC,CAAC;wBACL,CAAC,EAAC,EAAC;iBACJ;;;;KACF;;;;;;IAEK,kCAAY;;;;;IAAlB,UAAmB,KAAY,EAAE,gBAA0C;;;;;;wBACzE,IAAI,CAAC,uBAAuB,CAAC,KAAK,GAAG,iBAAiB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;;;;6BAEvE,gBAAgB,EAAhB,wBAAgB;wBAClB,qBAAM,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAA;;wBAAnC,SAAmC,CAAC;;;wBAE9B,GAAG,GAAG,KAAK,CAAC,eAAe;wBAC3B,iBAAiB,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;4BAC5C,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;4BAC1E,CAAC,GAAG,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;wBACpC,QAAQ,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC;wBACrD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;wBAC9C,qBAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAA;;wBAApC,SAAoC,CAAC;;;;wBAGvC,IAAI,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,EAAE;4BACjE,IAAI,CAAC,uBAAuB,EAAE,CAAC;yBAChC;;;;;;KAEJ;IAED,WAAW;;;;;;;IACH,4CAAsB;;;;;;;IAA9B,UAA+B,KAAsB;QACnD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,2EAA2E;YACxG,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;;gBAC5D,OAAO,GAAG,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC;YACjE,IAAI,KAAK,CAAC,iBAAiB,KAAK,UAAU,EAAE;gBAC1C,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aACjE;YACD,IAAI,CAAC,uBAAuB,CAAC,KAAK,GAAG,OAAO,CAAC;SAC9C;QACD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,WAAW;;;;;;IACH,6CAAuB;;;;;;IAA/B;QAAA,iBAWC;;YAVO,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,KAAK;;;;YAG5C,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;QAClC,MAAM,CAAC,OAAO;;;;QAAC,UAAA,CAAC;YACd,KAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC,EAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,KAAK,GAAG,MAAM,CAAC;QAElC,IAAI,CAAC,uBAAuB,CAAC,KAAK,GAAG,IAAI,CAAC;IAC5C,CAAC;;;;;IAED,sCAAgB;;;;IAAhB,UAAiB,cAAsC;QACrD,OAAO,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG;;;;QAAC,UAAA,KAAK,IAAI,OAAA,KAAK,CAAC,GAAG,EAAT,CAAS,EAAC,CAAC,CAAC;IACpE,CAAC;;gBA7IF,UAAU,SAAC;oBACV,UAAU,EAAE,MAAM;iBACnB;;;;gBArBC,MAAM;gBARC,QAAQ;gBAuBR,YAAY;;;IAwEnB;QADC,KAAK,EAAE;;iDACsC,cAAc,EAAY,KAAK,EAAQ,KAAK;;8DAqBzF;sBApHH;CAyKC,AA9ID,CAGiC,gBAAgB,GA2IhD;SA3IY,WAAW;;;;;;IAEtB,iCAA0B;;;;;IAE1B,8CAAsF;;;;;IACtF,oCAA+D;;IAE/D,8CAAyD;;IACzD,uCAAsE;;;;;IAE1D,6BAA+B;;IAAE,sCAAkC;;IAAE,mCAAmC","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  ActivatedRouteSnapshot,\n  NavigationEnd,\n  NavigationError,\n  NavigationStart,\n  Router\n} from '@angular/router';\nimport {\n  BooleanValueModelChain,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  ListModel,\n  MutableListModel,\n  MutableValueModel,\n  Trace,\n  ValueModel\n} from '@coolon/pectin';\nimport _ from 'lodash';\nimport { NavigationSession } from './navigation-session';\nimport { PlaceHistory } from './place-history';\nimport { Visit } from './visit';\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  private firstRoute = true;\n\n  private readonly _navigationSessionModel = new MutableValueModel<NavigationSession>();\n  private readonly _activeVisits = new MutableListModel<Visit>();\n\n  readonly navigationSessionActive: BooleanValueModelChain;\n  readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;\n\n  constructor(private readonly router: Router, readonly angularLocation: Location, readonly placeHistory: PlaceHistory) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');\n\n    angularLocation.onUrlChange(url => {\n      console.log(`location.onUrlChange -> ${url}`);\n    });\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    this.router.events.subscribe(event => {\n      // Routing event sequence\n      // ======================\n      // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session\n      // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.\n      // NavigationStart -> .... -> NavigationError --> navigation canceled, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        this.onAngularRouterStarted(event);\n      }\n      if (event instanceof NavigationEnd || event instanceof NavigationError) {\n        this.onAngularRouterFinished();\n      }\n    });\n\n    this.navigationSessionActive = chain(this.navigationSessionModel).isNotNil();\n    this.navigationSessionActive.subscribe(active => {\n      console.log('navigationSessionActive', active);\n    });\n    // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));\n    // txo.observe('this.navigationSessionModel', this.navigationSessionModel);\n  }\n\n  get navigationSession(): NavigationSession {\n    return this._navigationSessionModel.value;\n  }\n\n  get navigationSessionModel(): ValueModel<NavigationSession> {\n    return this._navigationSessionModel.readonly;\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  /**\n   *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));\n   * @param visit\n   */\n  // @Trace()\n  async navigate(visit: Visit) {\n    this.doNavigation(visit);\n  }\n\n  @Trace()\n  async pushVisitChangesToRoute(activatedRoute: ActivatedRoute, previous: Visit, next: Visit) {\n\n    // we have to push to history so our remember sanitisers don't pick up the previous value\n    // when it's been cleared by the user.\n    this.placeHistory.add(next);\n\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';\n        const def = next.placeDefinition;\n        const params = next.hasRouteId() ?\n          [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :\n          [def.getFormattedRouteParameters(next)];\n        const commands = [relativePath].concat(params, this.extractChildPath(activatedRoute.snapshot));\n        console.log('### Redirect', commands);\n        return router.navigate(commands, {\n          relativeTo: activatedRoute\n        });\n      });\n    }\n  }\n\n  async doNavigation(visit: Visit, customNavigation?: (router: Router) => any) {\n    this._navigationSessionModel.value = NavigationSession.createInternal(visit);\n    try {\n      if (customNavigation) {\n        await customNavigation(this.router);\n      } else {\n        const def = visit.placeDefinition;\n        const parameterCommands = visit.hasRouteId() ?\n          [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n          [def.getFormattedRouteParameters(visit)];\n        const commands = [def.path].concat(parameterCommands);\n        console.log('_doNavigation', visit, commands);\n        await this.router.navigate(commands);\n      }\n    } finally {\n      if (this.navigationSession && !this.router.getCurrentNavigation()) {\n        this.onAngularRouterFinished();\n      }\n    }\n  }\n\n  // @Trace()\n  private onAngularRouterStarted(event: NavigationStart) {\n    if (!this.navigationSession) { // We been activated by an external route rather than placeRouter.go(visit)\n      console.log('navigation started', { firstTime: this.firstRoute });\n      const session = NavigationSession.createExternal(this.firstRoute);\n      if (event.navigationTrigger === 'popstate') {\n        session.setPopstateReturn(this.router.routerState.snapshot.url);\n      }\n      this._navigationSessionModel.value = session;\n    }\n    this.firstRoute = false;\n  }\n\n  // @Trace()\n  private onAngularRouterFinished() {\n    const session = this._navigationSessionModel.value;\n    // Update visits before we end the navigation session.  This allows the place out let to\n    // gate ignore changes that occur while the visit is active\n    const visits = session.getVisits();\n    visits.forEach(v => {\n      this.placeHistory.add(v);\n    });\n    this._activeVisits.value = visits;\n\n    this._navigationSessionModel.value = null;\n  }\n\n  extractChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n}\n"]}
@@ -39,7 +39,7 @@ var PlaceRouteGuard = /** @class */ (function () {
39
39
  */
40
40
  function (activatedRoute, state) {
41
41
  return tslib_1.__awaiter(this, void 0, void 0, function () {
42
- var placeDefinition, params, parsedParams, initialVisit, sanitiser, updatedVisit, parameterCommands, commands;
42
+ var placeDefinition, params, parsedParams, initialVisit, sanitiser, sanitisedVisit, parameterCommands, commands;
43
43
  return tslib_1.__generator(this, function (_a) {
44
44
  switch (_a.label) {
45
45
  case 0:
@@ -52,14 +52,14 @@ var PlaceRouteGuard = /** @class */ (function () {
52
52
  sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
53
53
  return [4 /*yield*/, sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams))];
54
54
  case 1:
55
- updatedVisit = _a.sent();
55
+ sanitisedVisit = _a.sent();
56
56
  // Save the visit with any updated parameters. We need to save it so we remember any non route parameters
57
- this.placeRouter.navigationSession.storeVisit(updatedVisit);
58
- if (initialVisit.hasRoutingChangedFrom(updatedVisit)) {
59
- parameterCommands = updatedVisit.hasRouteId() ?
60
- [placeDefinition.getFormattedRouteId(updatedVisit), placeDefinition.getFormattedRouteParameters(updatedVisit)] :
61
- [placeDefinition.getFormattedRouteParameters(updatedVisit)];
62
- commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.getChildPath(activatedRoute));
57
+ this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
58
+ if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
59
+ parameterCommands = sanitisedVisit.hasRouteId() ?
60
+ [placeDefinition.getFormattedRouteId(sanitisedVisit), placeDefinition.getFormattedRouteParameters(sanitisedVisit)] :
61
+ [placeDefinition.getFormattedRouteParameters(sanitisedVisit)];
62
+ commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.extractChildPath(activatedRoute));
63
63
  console.log('##### Redirect', commands);
64
64
  return [2 /*return*/, this.router.createUrlTree(commands, {
65
65
  replaceUrl: true,
@@ -270,4 +270,4 @@ if (false) {
270
270
  ParamMapAdapter.prototype.params;
271
271
  }
272
272
  })(PlaceRouteGuard || (PlaceRouteGuard = {}));
273
- //# 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"]}
273
+ //# 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 sanitisedVisit = 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(sanitisedVisit);\n      if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {\n        const parameterCommands = sanitisedVisit.hasRouteId() ?\n          [placeDefinition.getFormattedRouteId(sanitisedVisit), placeDefinition.getFormattedRouteParameters(sanitisedVisit)] :\n          [placeDefinition.getFormattedRouteParameters(sanitisedVisit)];\n\n        const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.extractChildPath(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\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"]}
@@ -3,7 +3,7 @@
3
3
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
4
4
  */
5
5
  import { UseDelegate } from '@coolon/pectin';
6
- import { Klass } from '@coolon/typescript-utilities';
6
+ import { Klass, Opts } from '@coolon/typescript-utilities';
7
7
  import { ROUTE_PARAMETER_LIST_KEY } from '../place-component';
8
8
  import { ParameterDefinition } from './parameter-definition.class';
9
9
  /**
@@ -80,6 +80,8 @@ export function RouteId(type, options) {
80
80
  * @return {?}
81
81
  */
82
82
  export function VisitParameter(options) {
83
+ /** @type {?} */
84
+ var opts = Opts.get(options);
83
85
  return (/**
84
86
  * @param {?} prototype
85
87
  * @param {?} propertyKey
@@ -87,7 +89,7 @@ export function VisitParameter(options) {
87
89
  */
88
90
  function (prototype, propertyKey) {
89
91
  /** @type {?} */
90
- var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
92
+ var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
91
93
  Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
92
94
  UseDelegate()(prototype, propertyKey);
93
95
  });
@@ -98,6 +100,8 @@ export function VisitParameter(options) {
98
100
  * @return {?}
99
101
  */
100
102
  export function VisitParameterList(options) {
103
+ /** @type {?} */
104
+ var opts = Opts.get(options);
101
105
  return (/**
102
106
  * @param {?} prototype
103
107
  * @param {?} propertyKey
@@ -105,9 +109,9 @@ export function VisitParameterList(options) {
105
109
  */
106
110
  function (prototype, propertyKey) {
107
111
  /** @type {?} */
108
- var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
112
+ var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
109
113
  Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
110
114
  UseDelegate()(prototype, propertyKey);
111
115
  });
112
116
  }
113
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLWRlY29yYXRvcnMuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2Uvcm91dGUvcGFyYW1ldGVyLWRlY29yYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUM3QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sOEJBQThCLENBQUM7Ozs7O0FBSW5FLG9DQU1DOzs7SUFMQyw0QkFBWTs7SUFDWixrQ0FBbUI7O0lBQ25CLGtDQUFtQjs7SUFDbkIsc0NBQWlCOzs7Ozs7QUFJbkIsMkNBT0M7OztJQU5DLG1DQUFZOztJQUNaLHlDQUFtQjs7SUFDbkIseUNBQW1COztJQUNuQiw2Q0FBaUI7O0lBQ2pCLDJDQUF5Qjs7Ozs7O0FBSTNCLCtDQU9DOzs7SUFOQyx1Q0FBWTs7SUFDWiw2Q0FBbUI7O0lBQ25CLDZDQUFtQjs7SUFDbkIsaURBQW1COztJQUNuQiwrQ0FBeUI7Ozs7Ozs7O0FBSTNCLE1BQU0sVUFBVSxPQUFPLENBQTRCLElBQWtCLEVBQUUsT0FBMkI7SUFDaEc7Ozs7O0lBQU8sVUFBQyxTQUFpQixFQUFFLFdBQTRCOztZQUMvQyxLQUFLLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRSxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUM7UUFDcEYsS0FBSyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUMzRSxXQUFXLEVBQUUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDeEMsQ0FBQyxFQUFDO0FBQ0osQ0FBQzs7Ozs7O0FBRUQsTUFBTSxVQUFVLGNBQWMsQ0FBSSxPQUFrQztJQUNsRTs7Ozs7SUFBTyxVQUFDLFNBQWlCLEVBQUUsV0FBNEI7O1lBQy9DLEtBQUssR0FBRyxJQUFJLG1CQUFtQixDQUFDLGNBQWMsQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxVQUFVLENBQUM7UUFDekcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUMzRSxXQUFXLEVBQUUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDeEMsQ0FBQyxFQUFDO0FBQ0osQ0FBQzs7Ozs7O0FBRUQsTUFBTSxVQUFVLGtCQUFrQixDQUFJLE9BQXNDO0lBQzFFOzs7OztJQUFPLFVBQUMsU0FBaUIsRUFBRSxXQUE0Qjs7WUFDL0MsS0FBSyxHQUFHLElBQUksbUJBQW1CLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQztRQUN6RyxLQUFLLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLHdCQUF3QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzNFLFdBQVcsRUFBRSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUN4QyxDQUFDLEVBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVXNlRGVsZWdhdGUgfSBmcm9tICdAY29vbG9uL3BlY3Rpbic7XG5pbXBvcnQgeyBLbGFzcyB9IGZyb20gJ0Bjb29sb24vdHlwZXNjcmlwdC11dGlsaXRpZXMnO1xuaW1wb3J0IHsgUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZIH0gZnJvbSAnLi4vcGxhY2UtY29tcG9uZW50JztcbmltcG9ydCB7IFBhcmFtZXRlckRlZmluaXRpb24gfSBmcm9tICcuL3BhcmFtZXRlci1kZWZpbml0aW9uLmNsYXNzJztcbmltcG9ydCB7IEZvcm1hdHRlciB9IGZyb20gJy4vZm9ybWF0dGVyJztcblxuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlSWRPcHRpb25zPFQ+IHtcbiAgYXM/OiBzdHJpbmc7XG4gIG9wdGlvbmFsPzogYm9vbGVhbjtcbiAgcmVtZW1iZXI/OiBib29sZWFuO1xuICBkZWZhdWx0VmFsdWU/OiBUO1xuICAvLyBzYW5pdGlzZXI/OiBDb25zdHJ1Y3RhYmxlPFBhcmFtZXRlclNhbml0aXNlcjxUPj4gfCBQYXJhbWV0ZXJTYW5pdGlzZXI8VD47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUm91dGVQYXJhbWV0ZXJPcHRpb25zPFQ+IHtcbiAgYXM/OiBzdHJpbmc7XG4gIG9wdGlvbmFsPzogYm9vbGVhbjtcbiAgcmVtZW1iZXI/OiBib29sZWFuO1xuICBkZWZhdWx0VmFsdWU/OiBUO1xuICBzdG9yZUluVXJsPzogRm9ybWF0dGVyPFQ+XG4gIC8vIHNhbml0aXNlcj86IENvbnN0cnVjdGFibGU8UGFyYW1ldGVyU2FuaXRpc2VyPFQ+PiB8IFBhcmFtZXRlclNhbml0aXNlcjxUPjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSb3V0ZUxpc3RQYXJhbWV0ZXJPcHRpb25zPFQ+IHtcbiAgYXM/OiBzdHJpbmc7XG4gIG9wdGlvbmFsPzogYm9vbGVhbjtcbiAgcmVtZW1iZXI/OiBib29sZWFuO1xuICBkZWZhdWx0VmFsdWU/OiBUW107XG4gIHN0b3JlSW5Vcmw/OiBGb3JtYXR0ZXI8VD5cbiAgLy8gc2FuaXRpc2VyPzogQ29uc3RydWN0YWJsZTxQYXJhbWV0ZXJTYW5pdGlzZXI8VFtdPj4gfCBQYXJhbWV0ZXJTYW5pdGlzZXI8VFtdPjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIFJvdXRlSWQ8VCBleHRlbmRzIHN0cmluZyB8IG51bWJlcj4odHlwZTogRm9ybWF0dGVyPFQ+LCBvcHRpb25zPzogUm91dGVJZE9wdGlvbnM8VD4pOiBQcm9wZXJ0eURlY29yYXRvciB7XG4gIHJldHVybiAocHJvdG90eXBlOiBPYmplY3QsIHByb3BlcnR5S2V5OiBzdHJpbmcgfCBzeW1ib2wpID0+IHtcbiAgICBjb25zdCBwYXJhbSA9IG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLlJvdXRlSWQocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgdHlwZSk7XG4gICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4gICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIFZpc2l0UGFyYW1ldGVyPFQ+KG9wdGlvbnM/OiBSb3V0ZVBhcmFtZXRlck9wdGlvbnM8VD4pOiBQcm9wZXJ0eURlY29yYXRvciB7XG4gIHJldHVybiAocHJvdG90eXBlOiBPYmplY3QsIHByb3BlcnR5S2V5OiBzdHJpbmcgfCBzeW1ib2wpID0+IHtcbiAgICBjb25zdCBwYXJhbSA9IG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLlZhbHVlUGFyYW1ldGVyKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIG9wdGlvbnMsIG9wdGlvbnMuc3RvcmVJblVybCk7XG4gICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4gICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIFZpc2l0UGFyYW1ldGVyTGlzdDxFPihvcHRpb25zPzogUm91dGVMaXN0UGFyYW1ldGVyT3B0aW9uczxFPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbiAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uQXJyYXlQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgb3B0aW9ucy5zdG9yZUluVXJsKTtcbiAgICBLbGFzcy5nZXQocHJvdG90eXBlKS5hZGRUb093bk1ldGFkYXRhTGlzdChST1VURV9QQVJBTUVURVJfTElTVF9LRVksIHBhcmFtKTtcbiAgICBVc2VEZWxlZ2F0ZSgpKHByb3RvdHlwZSwgcHJvcGVydHlLZXkpO1xuICB9O1xufVxuXG4vLyBleHBvcnQgZnVuY3Rpb24gUm91dGVQYXJhbWV0ZXI8VD4odHlwZTogUGFyYW1ldGVyVHlwZTxUPiwgb3B0aW9ucz86IFJvdXRlUGFyYW1ldGVyT3B0aW9uczxUPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbi8vICAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuLy8gICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uVmFsdWVQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgdHlwZSk7XG4vLyAgICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4vLyAgICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbi8vICAgfTtcbi8vIH1cbi8vXG4vLyBleHBvcnQgZnVuY3Rpb24gUm91dGVQYXJhbWV0ZXJMaXN0PEU+KGVsZW1lbnRUeXBlOiBQYXJhbWV0ZXJUeXBlPEU+LCBvcHRpb25zPzogUm91dGVMaXN0UGFyYW1ldGVyT3B0aW9uczxFPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbi8vICAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuLy8gICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uQXJyYXlQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgZWxlbWVudFR5cGUpO1xuLy8gICAgIEtsYXNzLmdldChwcm90b3R5cGUpLmFkZFRvT3duTWV0YWRhdGFMaXN0KFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSwgcGFyYW0pO1xuLy8gICAgIFVzZURlbGVnYXRlKCkocHJvdG90eXBlLCBwcm9wZXJ0eUtleSk7XG4vLyAgIH07XG4vLyB9XG4iXX0=
117
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLWRlY29yYXRvcnMuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2Uvcm91dGUvcGFyYW1ldGVyLWRlY29yYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUM3QyxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDOzs7OztBQUluRSxvQ0FNQzs7O0lBTEMsNEJBQVk7O0lBQ1osa0NBQW1COztJQUNuQixrQ0FBbUI7O0lBQ25CLHNDQUFpQjs7Ozs7O0FBSW5CLDJDQU9DOzs7SUFOQyxtQ0FBWTs7SUFDWix5Q0FBbUI7O0lBQ25CLHlDQUFtQjs7SUFDbkIsNkNBQWlCOztJQUNqQiwyQ0FBeUI7Ozs7OztBQUkzQiwrQ0FPQzs7O0lBTkMsdUNBQVk7O0lBQ1osNkNBQW1COztJQUNuQiw2Q0FBbUI7O0lBQ25CLGlEQUFtQjs7SUFDbkIsK0NBQXlCOzs7Ozs7OztBQUkzQixNQUFNLFVBQVUsT0FBTyxDQUE0QixJQUFrQixFQUFFLE9BQTJCO0lBQ2hHOzs7OztJQUFPLFVBQUMsU0FBaUIsRUFBRSxXQUE0Qjs7WUFDL0MsS0FBSyxHQUFHLElBQUksbUJBQW1CLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDO1FBQ3BGLEtBQUssQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsb0JBQW9CLENBQUMsd0JBQXdCLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDM0UsV0FBVyxFQUFFLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3hDLENBQUMsRUFBQztBQUNKLENBQUM7Ozs7OztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUksT0FBa0M7O1FBQzVELElBQUksR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQztJQUM5Qjs7Ozs7SUFBTyxVQUFDLFNBQWlCLEVBQUUsV0FBNEI7O1lBQy9DLEtBQUssR0FBRyxJQUFJLG1CQUFtQixDQUFDLGNBQWMsQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzNILEtBQUssQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsb0JBQW9CLENBQUMsd0JBQXdCLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDM0UsV0FBVyxFQUFFLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3hDLENBQUMsRUFBQztBQUNKLENBQUM7Ozs7OztBQUVELE1BQU0sVUFBVSxrQkFBa0IsQ0FBSSxPQUFzQzs7UUFDcEUsSUFBSSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDO0lBQzlCOzs7OztJQUFPLFVBQUMsU0FBaUIsRUFBRSxXQUE0Qjs7WUFDL0MsS0FBSyxHQUFHLElBQUksbUJBQW1CLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDM0gsS0FBSyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUMzRSxXQUFXLEVBQUUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDeEMsQ0FBQyxFQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFVzZURlbGVnYXRlIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgS2xhc3MsIE9wdHMgfSBmcm9tICdAY29vbG9uL3R5cGVzY3JpcHQtdXRpbGl0aWVzJztcbmltcG9ydCB7IFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSB9IGZyb20gJy4uL3BsYWNlLWNvbXBvbmVudCc7XG5pbXBvcnQgeyBQYXJhbWV0ZXJEZWZpbml0aW9uIH0gZnJvbSAnLi9wYXJhbWV0ZXItZGVmaW5pdGlvbi5jbGFzcyc7XG5pbXBvcnQgeyBGb3JtYXR0ZXIgfSBmcm9tICcuL2Zvcm1hdHRlcic7XG5cblxuZXhwb3J0IGludGVyZmFjZSBSb3V0ZUlkT3B0aW9uczxUPiB7XG4gIGFzPzogc3RyaW5nO1xuICBvcHRpb25hbD86IGJvb2xlYW47XG4gIHJlbWVtYmVyPzogYm9vbGVhbjtcbiAgZGVmYXVsdFZhbHVlPzogVDtcbiAgLy8gc2FuaXRpc2VyPzogQ29uc3RydWN0YWJsZTxQYXJhbWV0ZXJTYW5pdGlzZXI8VD4+IHwgUGFyYW1ldGVyU2FuaXRpc2VyPFQ+O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlUGFyYW1ldGVyT3B0aW9uczxUPiB7XG4gIGFzPzogc3RyaW5nO1xuICBvcHRpb25hbD86IGJvb2xlYW47XG4gIHJlbWVtYmVyPzogYm9vbGVhbjtcbiAgZGVmYXVsdFZhbHVlPzogVDtcbiAgc3RvcmVJblVybD86IEZvcm1hdHRlcjxUPlxuICAvLyBzYW5pdGlzZXI/OiBDb25zdHJ1Y3RhYmxlPFBhcmFtZXRlclNhbml0aXNlcjxUPj4gfCBQYXJhbWV0ZXJTYW5pdGlzZXI8VD47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUm91dGVMaXN0UGFyYW1ldGVyT3B0aW9uczxUPiB7XG4gIGFzPzogc3RyaW5nO1xuICBvcHRpb25hbD86IGJvb2xlYW47XG4gIHJlbWVtYmVyPzogYm9vbGVhbjtcbiAgZGVmYXVsdFZhbHVlPzogVFtdO1xuICBzdG9yZUluVXJsPzogRm9ybWF0dGVyPFQ+XG4gIC8vIHNhbml0aXNlcj86IENvbnN0cnVjdGFibGU8UGFyYW1ldGVyU2FuaXRpc2VyPFRbXT4+IHwgUGFyYW1ldGVyU2FuaXRpc2VyPFRbXT47XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBSb3V0ZUlkPFQgZXh0ZW5kcyBzdHJpbmcgfCBudW1iZXI+KHR5cGU6IEZvcm1hdHRlcjxUPiwgb3B0aW9ucz86IFJvdXRlSWRPcHRpb25zPFQ+KTogUHJvcGVydHlEZWNvcmF0b3Ige1xuICByZXR1cm4gKHByb3RvdHlwZTogT2JqZWN0LCBwcm9wZXJ0eUtleTogc3RyaW5nIHwgc3ltYm9sKSA9PiB7XG4gICAgY29uc3QgcGFyYW0gPSBuZXcgUGFyYW1ldGVyRGVmaW5pdGlvbi5Sb3V0ZUlkKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIG9wdGlvbnMsIHR5cGUpO1xuICAgIEtsYXNzLmdldChwcm90b3R5cGUpLmFkZFRvT3duTWV0YWRhdGFMaXN0KFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSwgcGFyYW0pO1xuICAgIFVzZURlbGVnYXRlKCkocHJvdG90eXBlLCBwcm9wZXJ0eUtleSk7XG4gIH07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBWaXNpdFBhcmFtZXRlcjxUPihvcHRpb25zPzogUm91dGVQYXJhbWV0ZXJPcHRpb25zPFQ+KTogUHJvcGVydHlEZWNvcmF0b3Ige1xuICBjb25zdCBvcHRzID0gT3B0cy5nZXQob3B0aW9ucyk7XG4gIHJldHVybiAocHJvdG90eXBlOiBPYmplY3QsIHByb3BlcnR5S2V5OiBzdHJpbmcgfCBzeW1ib2wpID0+IHtcbiAgICBjb25zdCBwYXJhbSA9IG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLlZhbHVlUGFyYW1ldGVyKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIG9wdGlvbnMsIG9wdHMuZ2V0T3B0aW9uYWwoXCJzdG9yZUluVXJsXCIsIG51bGwpKTtcbiAgICBLbGFzcy5nZXQocHJvdG90eXBlKS5hZGRUb093bk1ldGFkYXRhTGlzdChST1VURV9QQVJBTUVURVJfTElTVF9LRVksIHBhcmFtKTtcbiAgICBVc2VEZWxlZ2F0ZSgpKHByb3RvdHlwZSwgcHJvcGVydHlLZXkpO1xuICB9O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gVmlzaXRQYXJhbWV0ZXJMaXN0PEU+KG9wdGlvbnM/OiBSb3V0ZUxpc3RQYXJhbWV0ZXJPcHRpb25zPEU+KTogUHJvcGVydHlEZWNvcmF0b3Ige1xuICBjb25zdCBvcHRzID0gT3B0cy5nZXQob3B0aW9ucyk7XG4gIHJldHVybiAocHJvdG90eXBlOiBPYmplY3QsIHByb3BlcnR5S2V5OiBzdHJpbmcgfCBzeW1ib2wpID0+IHtcbiAgICBjb25zdCBwYXJhbSA9IG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLkFycmF5UGFyYW1ldGVyKHByb3BlcnR5S2V5LnRvU3RyaW5nKCksIG9wdGlvbnMsIG9wdHMuZ2V0T3B0aW9uYWwoXCJzdG9yZUluVXJsXCIsIG51bGwpKTtcbiAgICBLbGFzcy5nZXQocHJvdG90eXBlKS5hZGRUb093bk1ldGFkYXRhTGlzdChST1VURV9QQVJBTUVURVJfTElTVF9LRVksIHBhcmFtKTtcbiAgICBVc2VEZWxlZ2F0ZSgpKHByb3RvdHlwZSwgcHJvcGVydHlLZXkpO1xuICB9O1xufVxuXG4vLyBleHBvcnQgZnVuY3Rpb24gUm91dGVQYXJhbWV0ZXI8VD4odHlwZTogUGFyYW1ldGVyVHlwZTxUPiwgb3B0aW9ucz86IFJvdXRlUGFyYW1ldGVyT3B0aW9uczxUPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbi8vICAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuLy8gICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uVmFsdWVQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgdHlwZSk7XG4vLyAgICAgS2xhc3MuZ2V0KHByb3RvdHlwZSkuYWRkVG9Pd25NZXRhZGF0YUxpc3QoUk9VVEVfUEFSQU1FVEVSX0xJU1RfS0VZLCBwYXJhbSk7XG4vLyAgICAgVXNlRGVsZWdhdGUoKShwcm90b3R5cGUsIHByb3BlcnR5S2V5KTtcbi8vICAgfTtcbi8vIH1cbi8vXG4vLyBleHBvcnQgZnVuY3Rpb24gUm91dGVQYXJhbWV0ZXJMaXN0PEU+KGVsZW1lbnRUeXBlOiBQYXJhbWV0ZXJUeXBlPEU+LCBvcHRpb25zPzogUm91dGVMaXN0UGFyYW1ldGVyT3B0aW9uczxFPik6IFByb3BlcnR5RGVjb3JhdG9yIHtcbi8vICAgcmV0dXJuIChwcm90b3R5cGU6IE9iamVjdCwgcHJvcGVydHlLZXk6IHN0cmluZyB8IHN5bWJvbCkgPT4ge1xuLy8gICAgIGNvbnN0IHBhcmFtID0gbmV3IFBhcmFtZXRlckRlZmluaXRpb24uQXJyYXlQYXJhbWV0ZXIocHJvcGVydHlLZXkudG9TdHJpbmcoKSwgb3B0aW9ucywgZWxlbWVudFR5cGUpO1xuLy8gICAgIEtsYXNzLmdldChwcm90b3R5cGUpLmFkZFRvT3duTWV0YWRhdGFMaXN0KFJPVVRFX1BBUkFNRVRFUl9MSVNUX0tFWSwgcGFyYW0pO1xuLy8gICAgIFVzZURlbGVnYXRlKCkocHJvdG90eXBlLCBwcm9wZXJ0eUtleSk7XG4vLyAgIH07XG4vLyB9XG4iXX0=
@@ -3069,7 +3069,7 @@ class PlaceRouter extends GarbageCollector {
3069
3069
  [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :
3070
3070
  [def.getFormattedRouteParameters(next)];
3071
3071
  /** @type {?} */
3072
- const commands = [relativePath].concat(params, this.getChildPath(activatedRoute.snapshot));
3072
+ const commands = [relativePath].concat(params, this.extractChildPath(activatedRoute.snapshot));
3073
3073
  console.log('### Redirect', commands);
3074
3074
  return router.navigate(commands, {
3075
3075
  relativeTo: activatedRoute
@@ -3093,7 +3093,6 @@ class PlaceRouter extends GarbageCollector {
3093
3093
  else {
3094
3094
  /** @type {?} */
3095
3095
  const def = visit.placeDefinition;
3096
- // @see https://coolon.atlassian.net/browse/AUP-41
3097
3096
  /** @type {?} */
3098
3097
  const parameterCommands = visit.hasRouteId() ?
3099
3098
  [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
@@ -3155,7 +3154,7 @@ class PlaceRouter extends GarbageCollector {
3155
3154
  * @param {?} activatedRoute
3156
3155
  * @return {?}
3157
3156
  */
3158
- getChildPath(activatedRoute) {
3157
+ extractChildPath(activatedRoute) {
3159
3158
  return ___default.flatten(activatedRoute.children.map((/**
3160
3159
  * @param {?} child
3161
3160
  * @return {?}
@@ -4232,6 +4231,8 @@ function RouteId(type, options) {
4232
4231
  * @return {?}
4233
4232
  */
4234
4233
  function VisitParameter(options) {
4234
+ /** @type {?} */
4235
+ const opts = Opts.get(options);
4235
4236
  return (/**
4236
4237
  * @param {?} prototype
4237
4238
  * @param {?} propertyKey
@@ -4239,7 +4240,7 @@ function VisitParameter(options) {
4239
4240
  */
4240
4241
  (prototype, propertyKey) => {
4241
4242
  /** @type {?} */
4242
- const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
4243
+ const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
4243
4244
  Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
4244
4245
  UseDelegate()(prototype, propertyKey);
4245
4246
  });
@@ -4250,6 +4251,8 @@ function VisitParameter(options) {
4250
4251
  * @return {?}
4251
4252
  */
4252
4253
  function VisitParameterList(options) {
4254
+ /** @type {?} */
4255
+ const opts = Opts.get(options);
4253
4256
  return (/**
4254
4257
  * @param {?} prototype
4255
4258
  * @param {?} propertyKey
@@ -4257,7 +4260,7 @@ function VisitParameterList(options) {
4257
4260
  */
4258
4261
  (prototype, propertyKey) => {
4259
4262
  /** @type {?} */
4260
- const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
4263
+ const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
4261
4264
  Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
4262
4265
  UseDelegate()(prototype, propertyKey);
4263
4266
  });
@@ -4609,16 +4612,16 @@ class PlaceRouteGuard {
4609
4612
  /** @type {?} */
4610
4613
  const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
4611
4614
  /** @type {?} */
4612
- const updatedVisit = yield sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));
4615
+ const sanitisedVisit = yield sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));
4613
4616
  // Save the visit with any updated parameters. We need to save it so we remember any non route parameters
4614
- this.placeRouter.navigationSession.storeVisit(updatedVisit);
4615
- if (initialVisit.hasRoutingChangedFrom(updatedVisit)) {
4617
+ this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
4618
+ if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
4616
4619
  /** @type {?} */
4617
- const parameterCommands = updatedVisit.hasRouteId() ?
4618
- [placeDefinition.getFormattedRouteId(updatedVisit), placeDefinition.getFormattedRouteParameters(updatedVisit)] :
4619
- [placeDefinition.getFormattedRouteParameters(updatedVisit)];
4620
+ const parameterCommands = sanitisedVisit.hasRouteId() ?
4621
+ [placeDefinition.getFormattedRouteId(sanitisedVisit), placeDefinition.getFormattedRouteParameters(sanitisedVisit)] :
4622
+ [placeDefinition.getFormattedRouteParameters(sanitisedVisit)];
4620
4623
  /** @type {?} */
4621
- const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.getChildPath(activatedRoute));
4624
+ const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.extractChildPath(activatedRoute));
4622
4625
  console.log('##### Redirect', commands);
4623
4626
  return this.router.createUrlTree(commands, {
4624
4627
  replaceUrl: true,