@coolon/angular-ui-powerups 0.0.53 → 0.0.54
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 +198 -205
- 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/esm2015/lib/place/route/parameter-definition.class.js +2 -15
- package/esm5/lib/place/route/parameter-definition.class.js +6 -15
- package/fesm2015/coolon-angular-ui-powerups.js +172 -182
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +198 -205
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,12 +2,9 @@
|
|
|
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 { Trace } from '@coolon/pectin';
|
|
7
5
|
import { Opts } from '@coolon/typescript-utilities';
|
|
8
6
|
import _ from 'lodash';
|
|
9
7
|
import { PlaceHistory } from '../place-history';
|
|
10
|
-
import { RouteParameterValue } from './route-parameter-value';
|
|
11
8
|
/**
|
|
12
9
|
* @abstract
|
|
13
10
|
* @template T, S
|
|
@@ -158,23 +155,13 @@ if (false) {
|
|
|
158
155
|
if (this.remember && previousVisit) {
|
|
159
156
|
value = previousVisit.getValueOf(parameter.definition);
|
|
160
157
|
}
|
|
161
|
-
|
|
162
|
-
const s = parameter.isEmptyValue(value) ? this.defaultValue : value;
|
|
163
|
-
console.log(`missing -> ${parameter.definition.name}, returning ${s}`);
|
|
164
|
-
return s;
|
|
158
|
+
return parameter.isEmptyValue(value) ? this.defaultValue : value;
|
|
165
159
|
}
|
|
166
160
|
else {
|
|
167
|
-
console.log(`not missing -> ${parameter.definition.name}`);
|
|
168
161
|
return value;
|
|
169
162
|
}
|
|
170
163
|
}
|
|
171
164
|
}
|
|
172
|
-
tslib_1.__decorate([
|
|
173
|
-
Trace(),
|
|
174
|
-
tslib_1.__metadata("design:type", Function),
|
|
175
|
-
tslib_1.__metadata("design:paramtypes", [RouteParameterValue, Object]),
|
|
176
|
-
tslib_1.__metadata("design:returntype", Object)
|
|
177
|
-
], DefaultParameterSanitiser.prototype, "sanitise", null);
|
|
178
165
|
ParameterDefinition.DefaultParameterSanitiser = DefaultParameterSanitiser;
|
|
179
166
|
if (false) {
|
|
180
167
|
/** @type {?} */
|
|
@@ -185,4 +172,4 @@ if (false) {
|
|
|
185
172
|
DefaultParameterSanitiser.prototype.placeHistory;
|
|
186
173
|
}
|
|
187
174
|
})(ParameterDefinition || (ParameterDefinition = {}));
|
|
188
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
175
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLWRlZmluaXRpb24uY2xhc3MuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2Uvcm91dGUvcGFyYW1ldGVyLWRlZmluaXRpb24uY2xhc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUVBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNwRCxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFDdkIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDOzs7OztBQU9oRCxNQUFNLE9BQWdCLG1CQUFtQjs7Ozs7O0lBUXZDLFlBQXFCLFlBQW9CLEVBQVcsSUFBc0IsRUFBRSxPQUF1QztRQUE5RixpQkFBWSxHQUFaLFlBQVksQ0FBUTtRQUFXLFNBQUksR0FBSixJQUFJLENBQWtCOztjQUNsRSxJQUFJLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxZQUFZLENBQUMsQ0FBQztRQUNqRCxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDN0QsQ0FBQzs7Ozs7SUFFRCxZQUFZLENBQUMsUUFBa0I7UUFDN0IsSUFBSSxJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQUU7WUFDaEQsT0FBTyxJQUFJLG1CQUFtQixDQUFDLHlCQUF5QixDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7U0FDeEg7YUFBTTtZQUNMLE9BQU8sSUFBSSxDQUFDO1NBQ2I7SUFDSCxDQUFDO0NBQ0Y7OztJQXJCQyx3Q0FBcUM7O0lBQ3JDLHNDQUFtQzs7SUFFbkMsbUNBQXNCOzs7OztJQUN0Qix1Q0FBMEI7Ozs7O0lBQzFCLDJDQUF3Qjs7SUFFWiwyQ0FBNkI7O0lBQUUsbUNBQStCOztBQWdCNUUsV0FBaUIsbUJBQW1COzs7OztJQUVsQyxzQkFNQzs7OztRQUxDLHFCQUFZOztRQUNaLDJCQUFtQjs7UUFDbkIsMkJBQW1COztRQUNuQiwrQkFBaUI7Ozs7O0lBSW5CLE1BQWEsT0FBVyxTQUFRLG1CQUFzQjtRQUF0RDs7WUFDVyxjQUFTLEdBQUcsSUFBSSxDQUFDO1lBQ2pCLFlBQU8sR0FBRyxLQUFLLENBQUM7UUFDM0IsQ0FBQztLQUFBO0lBSFksMkJBQU8sVUFHbkIsQ0FBQTs7O1FBRkMsNEJBQTBCOztRQUMxQiwwQkFBeUI7Ozs7O0lBRzNCLE1BQWEsY0FBa0IsU0FBUSxtQkFBc0I7UUFBN0Q7O1lBQ1csY0FBUyxHQUFHLEtBQUssQ0FBQztZQUNsQixZQUFPLEdBQUcsS0FBSyxDQUFDO1FBQzNCLENBQUM7S0FBQTtJQUhZLGtDQUFjLGlCQUcxQixDQUFBOzs7UUFGQyxtQ0FBMkI7O1FBQzNCLGlDQUF5Qjs7Ozs7SUFHM0IsTUFBYSxjQUFrQixTQUFRLG1CQUEyQjtRQUFsRTs7WUFDVyxjQUFTLEdBQUcsS0FBSyxDQUFDO1lBQ2xCLFlBQU8sR0FBRyxJQUFJLENBQUM7UUFDMUIsQ0FBQztLQUFBO0lBSFksa0NBQWMsaUJBRzFCLENBQUE7OztRQUZDLG1DQUEyQjs7UUFDM0IsaUNBQXdCOzs7OztJQUkxQixNQUFhLHlCQUF5Qjs7Ozs7O1FBRXBDLFlBQXFCLFFBQWlCLEVBQVcsWUFBZSxFQUFXLFlBQTBCO1lBQWhGLGFBQVEsR0FBUixRQUFRLENBQVM7WUFBVyxpQkFBWSxHQUFaLFlBQVksQ0FBRztZQUFXLGlCQUFZLEdBQVosWUFBWSxDQUFjO1FBQ3JHLENBQUM7Ozs7OztRQUVELFFBQVEsQ0FBQyxTQUEyQyxFQUFFLEtBQWE7O2dCQUM3RCxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUs7WUFDM0IsSUFBSSxTQUFTLENBQUMsU0FBUyxFQUFFLEVBQUU7O3NCQUNuQixhQUFhLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7Z0JBQ2xGLElBQUksSUFBSSxDQUFDLFFBQVEsSUFBSSxhQUFhLEVBQUU7b0JBQ2xDLEtBQUssR0FBRyxhQUFhLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsQ0FBQztpQkFDeEQ7Z0JBQ0QsT0FBTyxTQUFTLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7YUFDbEU7aUJBQU07Z0JBQ0wsT0FBTyxLQUFLLENBQUM7YUFDZDtRQUNILENBQUM7S0FDRjtJQWpCWSw2Q0FBeUIsNEJBaUJyQyxDQUFBOzs7UUFmYSw2Q0FBMEI7O1FBQUUsaURBQXdCOztRQUFFLGlEQUFtQzs7QUFpQnpHLENBQUMsRUE3Q2dCLG1CQUFtQixLQUFuQixtQkFBbUIsUUE2Q25DIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0b3IgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFRyYWNlIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgT3B0cyB9IGZyb20gJ0Bjb29sb24vdHlwZXNjcmlwdC11dGlsaXRpZXMnO1xuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IFBsYWNlSGlzdG9yeSB9IGZyb20gJy4uL3BsYWNlLWhpc3RvcnknO1xuaW1wb3J0IHsgVmlzaXQgfSBmcm9tICcuLi92aXNpdCc7XG5pbXBvcnQgeyBQYXJhbWV0ZXJTYW5pdGlzZXIgfSBmcm9tICcuL3BhcmFtZXRlci1zYW5pdGlzZXInO1xuaW1wb3J0IHsgUGFyYW1ldGVyVHlwZSB9IGZyb20gJy4vcGFyYW1ldGVyLXR5cGUnO1xuaW1wb3J0IHsgUm91dGVQYXJhbWV0ZXJWYWx1ZSB9IGZyb20gJy4vcm91dGUtcGFyYW1ldGVyLXZhbHVlJztcblxuXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgUGFyYW1ldGVyRGVmaW5pdGlvbjxULCBTID0gVD4ge1xuICBhYnN0cmFjdCByZWFkb25seSBpc1JvdXRlSWQ6IGJvb2xlYW47XG4gIGFic3RyYWN0IHJlYWRvbmx5IGlzQXJyYXk6IGJvb2xlYW47XG5cbiAgcmVhZG9ubHkgbmFtZTogc3RyaW5nO1xuICBwcml2YXRlIHJlbWVtYmVyOiBib29sZWFuO1xuICBwcml2YXRlIGRlZmF1bHRWYWx1ZTogUztcblxuICBjb25zdHJ1Y3RvcihyZWFkb25seSBwcm9wZXJ0eU5hbWU6IHN0cmluZywgcmVhZG9ubHkgdHlwZTogUGFyYW1ldGVyVHlwZTxUPiwgb3B0aW9uczogUGFyYW1ldGVyRGVmaW5pdGlvbi5PcHRpb25zPFM+KSB7XG4gICAgY29uc3Qgb3B0cyA9IE9wdHMuZ2V0KG9wdGlvbnMpO1xuICAgIHRoaXMubmFtZSA9IG9wdHMuZ2V0T3B0aW9uYWwoJ2FzJywgcHJvcGVydHlOYW1lKTtcbiAgICB0aGlzLnJlbWVtYmVyID0gb3B0cy5nZXRPcHRpb25hbCgncmVtZW1iZXInLCBmYWxzZSk7XG4gICAgdGhpcy5kZWZhdWx0VmFsdWUgPSBvcHRzLmdldE9wdGlvbmFsKCdkZWZhdWx0VmFsdWUnLCBudWxsKTtcbiAgfVxuXG4gIGdldFNhbml0aXNlcihpbmplY3RvcjogSW5qZWN0b3IpOiBQYXJhbWV0ZXJTYW5pdGlzZXI8Uz4ge1xuICAgIGlmICh0aGlzLnJlbWVtYmVyIHx8ICFfLmlzTmlsKHRoaXMuZGVmYXVsdFZhbHVlKSkge1xuICAgICAgcmV0dXJuIG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLkRlZmF1bHRQYXJhbWV0ZXJTYW5pdGlzZXIodGhpcy5yZW1lbWJlciwgdGhpcy5kZWZhdWx0VmFsdWUsIGluamVjdG9yLmdldChQbGFjZUhpc3RvcnkpKTtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfVxuICB9XG59XG5cbmV4cG9ydCBuYW1lc3BhY2UgUGFyYW1ldGVyRGVmaW5pdGlvbiB7XG5cbiAgZXhwb3J0IGludGVyZmFjZSBPcHRpb25zPFQ+IHtcbiAgICBhcz86IHN0cmluZztcbiAgICBvcHRpb25hbD86IGJvb2xlYW47XG4gICAgcmVtZW1iZXI/OiBib29sZWFuO1xuICAgIGRlZmF1bHRWYWx1ZT86IFQ7XG4gICAgLy8gc2FuaXRpc2VyPzogQ29uc3RydWN0YWJsZTxQYXJhbWV0ZXJTYW5pdGlzZXI8VD4+IHwgUGFyYW1ldGVyU2FuaXRpc2VyLk9wdGlvbnM8VD47XG4gIH1cblxuICBleHBvcnQgY2xhc3MgUm91dGVJZDxUPiBleHRlbmRzIFBhcmFtZXRlckRlZmluaXRpb248VD4ge1xuICAgIHJlYWRvbmx5IGlzUm91dGVJZCA9IHRydWU7XG4gICAgcmVhZG9ubHkgaXNBcnJheSA9IGZhbHNlO1xuICB9XG5cbiAgZXhwb3J0IGNsYXNzIFZhbHVlUGFyYW1ldGVyPFQ+IGV4dGVuZHMgUGFyYW1ldGVyRGVmaW5pdGlvbjxUPiB7XG4gICAgcmVhZG9ubHkgaXNSb3V0ZUlkID0gZmFsc2U7XG4gICAgcmVhZG9ubHkgaXNBcnJheSA9IGZhbHNlO1xuICB9XG5cbiAgZXhwb3J0IGNsYXNzIEFycmF5UGFyYW1ldGVyPFQ+IGV4dGVuZHMgUGFyYW1ldGVyRGVmaW5pdGlvbjxULCBUW10+IHtcbiAgICByZWFkb25seSBpc1JvdXRlSWQgPSBmYWxzZTtcbiAgICByZWFkb25seSBpc0FycmF5ID0gdHJ1ZTtcbiAgfVxuXG5cbiAgZXhwb3J0IGNsYXNzIERlZmF1bHRQYXJhbWV0ZXJTYW5pdGlzZXI8VCwgUz4gaW1wbGVtZW50cyBQYXJhbWV0ZXJTYW5pdGlzZXI8Uz4ge1xuXG4gICAgY29uc3RydWN0b3IocmVhZG9ubHkgcmVtZW1iZXI6IGJvb2xlYW4sIHJlYWRvbmx5IGRlZmF1bHRWYWx1ZTogUywgcmVhZG9ubHkgcGxhY2VIaXN0b3J5OiBQbGFjZUhpc3RvcnkpIHtcbiAgICB9XG5cbiAgICBzYW5pdGlzZShwYXJhbWV0ZXI6IFJvdXRlUGFyYW1ldGVyVmFsdWU8UywgYW55LCBhbnk+LCB2aXNpdD86IFZpc2l0KTogUHJvbWlzZTxTPiB8IFMge1xuICAgICAgbGV0IHZhbHVlID0gcGFyYW1ldGVyLnZhbHVlO1xuICAgICAgaWYgKHBhcmFtZXRlci5pc01pc3NpbmcoKSkge1xuICAgICAgICBjb25zdCBwcmV2aW91c1Zpc2l0ID0gXy5maXJzdCh0aGlzLnBsYWNlSGlzdG9yeS5nZXRIaXN0b3J5KHZpc2l0LnBsYWNlRGVmaW5pdGlvbikpO1xuICAgICAgICBpZiAodGhpcy5yZW1lbWJlciAmJiBwcmV2aW91c1Zpc2l0KSB7XG4gICAgICAgICAgdmFsdWUgPSBwcmV2aW91c1Zpc2l0LmdldFZhbHVlT2YocGFyYW1ldGVyLmRlZmluaXRpb24pO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiBwYXJhbWV0ZXIuaXNFbXB0eVZhbHVlKHZhbHVlKSA/IHRoaXMuZGVmYXVsdFZhbHVlIDogdmFsdWU7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gdmFsdWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbn1cbiJdfQ==
|
|
@@ -3,11 +3,9 @@
|
|
|
3
3
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
4
4
|
*/
|
|
5
5
|
import * as tslib_1 from "tslib";
|
|
6
|
-
import { Trace } from '@coolon/pectin';
|
|
7
6
|
import { Opts } from '@coolon/typescript-utilities';
|
|
8
7
|
import _ from 'lodash';
|
|
9
8
|
import { PlaceHistory } from '../place-history';
|
|
10
|
-
import { RouteParameterValue } from './route-parameter-value';
|
|
11
9
|
/**
|
|
12
10
|
* @abstract
|
|
13
11
|
* @template T, S
|
|
@@ -160,7 +158,10 @@ if (false) {
|
|
|
160
158
|
/**
|
|
161
159
|
* @template T, S
|
|
162
160
|
*/
|
|
163
|
-
var
|
|
161
|
+
var /**
|
|
162
|
+
* @template T, S
|
|
163
|
+
*/
|
|
164
|
+
DefaultParameterSanitiser = /** @class */ (function () {
|
|
164
165
|
function DefaultParameterSanitiser(remember, defaultValue, placeHistory) {
|
|
165
166
|
this.remember = remember;
|
|
166
167
|
this.defaultValue = defaultValue;
|
|
@@ -185,22 +186,12 @@ if (false) {
|
|
|
185
186
|
if (this.remember && previousVisit) {
|
|
186
187
|
value = previousVisit.getValueOf(parameter.definition);
|
|
187
188
|
}
|
|
188
|
-
|
|
189
|
-
var s = parameter.isEmptyValue(value) ? this.defaultValue : value;
|
|
190
|
-
console.log("missing -> " + parameter.definition.name + ", returning " + s);
|
|
191
|
-
return s;
|
|
189
|
+
return parameter.isEmptyValue(value) ? this.defaultValue : value;
|
|
192
190
|
}
|
|
193
191
|
else {
|
|
194
|
-
console.log("not missing -> " + parameter.definition.name);
|
|
195
192
|
return value;
|
|
196
193
|
}
|
|
197
194
|
};
|
|
198
|
-
tslib_1.__decorate([
|
|
199
|
-
Trace(),
|
|
200
|
-
tslib_1.__metadata("design:type", Function),
|
|
201
|
-
tslib_1.__metadata("design:paramtypes", [RouteParameterValue, Object]),
|
|
202
|
-
tslib_1.__metadata("design:returntype", Object)
|
|
203
|
-
], DefaultParameterSanitiser.prototype, "sanitise", null);
|
|
204
195
|
return DefaultParameterSanitiser;
|
|
205
196
|
}());
|
|
206
197
|
ParameterDefinition.DefaultParameterSanitiser = DefaultParameterSanitiser;
|
|
@@ -213,4 +204,4 @@ if (false) {
|
|
|
213
204
|
DefaultParameterSanitiser.prototype.placeHistory;
|
|
214
205
|
}
|
|
215
206
|
})(ParameterDefinition || (ParameterDefinition = {}));
|
|
216
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
207
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLWRlZmluaXRpb24uY2xhc3MuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2Uvcm91dGUvcGFyYW1ldGVyLWRlZmluaXRpb24uY2xhc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDcEQsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBQ3ZCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQzs7Ozs7QUFPaEQ7Ozs7O0lBUUUsNkJBQXFCLFlBQW9CLEVBQVcsSUFBc0IsRUFBRSxPQUF1QztRQUE5RixpQkFBWSxHQUFaLFlBQVksQ0FBUTtRQUFXLFNBQUksR0FBSixJQUFJLENBQWtCOztZQUNsRSxJQUFJLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxZQUFZLENBQUMsQ0FBQztRQUNqRCxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDN0QsQ0FBQzs7Ozs7SUFFRCwwQ0FBWTs7OztJQUFaLFVBQWEsUUFBa0I7UUFDN0IsSUFBSSxJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQUU7WUFDaEQsT0FBTyxJQUFJLG1CQUFtQixDQUFDLHlCQUF5QixDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7U0FDeEg7YUFBTTtZQUNMLE9BQU8sSUFBSSxDQUFDO1NBQ2I7SUFDSCxDQUFDO0lBQ0gsMEJBQUM7QUFBRCxDQUFDLEFBdEJELElBc0JDOzs7Ozs7OztJQXJCQyx3Q0FBcUM7O0lBQ3JDLHNDQUFtQzs7SUFFbkMsbUNBQXNCOzs7OztJQUN0Qix1Q0FBMEI7Ozs7O0lBQzFCLDJDQUF3Qjs7SUFFWiwyQ0FBNkI7O0lBQUUsbUNBQStCOztBQWdCNUUsV0FBaUIsbUJBQW1COzs7OztJQUVsQyxzQkFNQzs7OztRQUxDLHFCQUFZOztRQUNaLDJCQUFtQjs7UUFDbkIsMkJBQW1COztRQUNuQiwrQkFBaUI7Ozs7O0lBSW5COzs7O1FBQWdDLG1DQUFzQjtRQUF0RDtZQUFBLHFFQUdDO1lBRlUsZUFBUyxHQUFHLElBQUksQ0FBQztZQUNqQixhQUFPLEdBQUcsS0FBSyxDQUFDOztRQUMzQixDQUFDO1FBQUQsY0FBQztJQUFELENBQUMsQUFIRCxDQUFnQyxtQkFBbUIsR0FHbEQ7SUFIWSwyQkFBTyxVQUduQixDQUFBOzs7UUFGQyw0QkFBMEI7O1FBQzFCLDBCQUF5Qjs7Ozs7SUFHM0I7Ozs7UUFBdUMsMENBQXNCO1FBQTdEO1lBQUEscUVBR0M7WUFGVSxlQUFTLEdBQUcsS0FBSyxDQUFDO1lBQ2xCLGFBQU8sR0FBRyxLQUFLLENBQUM7O1FBQzNCLENBQUM7UUFBRCxxQkFBQztJQUFELENBQUMsQUFIRCxDQUF1QyxtQkFBbUIsR0FHekQ7SUFIWSxrQ0FBYyxpQkFHMUIsQ0FBQTs7O1FBRkMsbUNBQTJCOztRQUMzQixpQ0FBeUI7Ozs7O0lBRzNCOzs7O1FBQXVDLDBDQUEyQjtRQUFsRTtZQUFBLHFFQUdDO1lBRlUsZUFBUyxHQUFHLEtBQUssQ0FBQztZQUNsQixhQUFPLEdBQUcsSUFBSSxDQUFDOztRQUMxQixDQUFDO1FBQUQscUJBQUM7SUFBRCxDQUFDLEFBSEQsQ0FBdUMsbUJBQW1CLEdBR3pEO0lBSFksa0NBQWMsaUJBRzFCLENBQUE7OztRQUZDLG1DQUEyQjs7UUFDM0IsaUNBQXdCOzs7OztJQUkxQjs7OztRQUVFLG1DQUFxQixRQUFpQixFQUFXLFlBQWUsRUFBVyxZQUEwQjtZQUFoRixhQUFRLEdBQVIsUUFBUSxDQUFTO1lBQVcsaUJBQVksR0FBWixZQUFZLENBQUc7WUFBVyxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUNyRyxDQUFDOzs7Ozs7UUFFRCw0Q0FBUTs7Ozs7UUFBUixVQUFTLFNBQTJDLEVBQUUsS0FBYTs7Z0JBQzdELEtBQUssR0FBRyxTQUFTLENBQUMsS0FBSztZQUMzQixJQUFJLFNBQVMsQ0FBQyxTQUFTLEVBQUUsRUFBRTs7b0JBQ25CLGFBQWEsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztnQkFDbEYsSUFBSSxJQUFJLENBQUMsUUFBUSxJQUFJLGFBQWEsRUFBRTtvQkFDbEMsS0FBSyxHQUFHLGFBQWEsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDO2lCQUN4RDtnQkFDRCxPQUFPLFNBQVMsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQzthQUNsRTtpQkFBTTtnQkFDTCxPQUFPLEtBQUssQ0FBQzthQUNkO1FBQ0gsQ0FBQztRQUNILGdDQUFDO0lBQUQsQ0FBQyxBQWpCRCxJQWlCQztJQWpCWSw2Q0FBeUIsNEJBaUJyQyxDQUFBOzs7UUFmYSw2Q0FBMEI7O1FBQUUsaURBQXdCOztRQUFFLGlEQUFtQzs7QUFpQnpHLENBQUMsRUE3Q2dCLG1CQUFtQixLQUFuQixtQkFBbUIsUUE2Q25DIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0b3IgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFRyYWNlIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgT3B0cyB9IGZyb20gJ0Bjb29sb24vdHlwZXNjcmlwdC11dGlsaXRpZXMnO1xuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IFBsYWNlSGlzdG9yeSB9IGZyb20gJy4uL3BsYWNlLWhpc3RvcnknO1xuaW1wb3J0IHsgVmlzaXQgfSBmcm9tICcuLi92aXNpdCc7XG5pbXBvcnQgeyBQYXJhbWV0ZXJTYW5pdGlzZXIgfSBmcm9tICcuL3BhcmFtZXRlci1zYW5pdGlzZXInO1xuaW1wb3J0IHsgUGFyYW1ldGVyVHlwZSB9IGZyb20gJy4vcGFyYW1ldGVyLXR5cGUnO1xuaW1wb3J0IHsgUm91dGVQYXJhbWV0ZXJWYWx1ZSB9IGZyb20gJy4vcm91dGUtcGFyYW1ldGVyLXZhbHVlJztcblxuXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgUGFyYW1ldGVyRGVmaW5pdGlvbjxULCBTID0gVD4ge1xuICBhYnN0cmFjdCByZWFkb25seSBpc1JvdXRlSWQ6IGJvb2xlYW47XG4gIGFic3RyYWN0IHJlYWRvbmx5IGlzQXJyYXk6IGJvb2xlYW47XG5cbiAgcmVhZG9ubHkgbmFtZTogc3RyaW5nO1xuICBwcml2YXRlIHJlbWVtYmVyOiBib29sZWFuO1xuICBwcml2YXRlIGRlZmF1bHRWYWx1ZTogUztcblxuICBjb25zdHJ1Y3RvcihyZWFkb25seSBwcm9wZXJ0eU5hbWU6IHN0cmluZywgcmVhZG9ubHkgdHlwZTogUGFyYW1ldGVyVHlwZTxUPiwgb3B0aW9uczogUGFyYW1ldGVyRGVmaW5pdGlvbi5PcHRpb25zPFM+KSB7XG4gICAgY29uc3Qgb3B0cyA9IE9wdHMuZ2V0KG9wdGlvbnMpO1xuICAgIHRoaXMubmFtZSA9IG9wdHMuZ2V0T3B0aW9uYWwoJ2FzJywgcHJvcGVydHlOYW1lKTtcbiAgICB0aGlzLnJlbWVtYmVyID0gb3B0cy5nZXRPcHRpb25hbCgncmVtZW1iZXInLCBmYWxzZSk7XG4gICAgdGhpcy5kZWZhdWx0VmFsdWUgPSBvcHRzLmdldE9wdGlvbmFsKCdkZWZhdWx0VmFsdWUnLCBudWxsKTtcbiAgfVxuXG4gIGdldFNhbml0aXNlcihpbmplY3RvcjogSW5qZWN0b3IpOiBQYXJhbWV0ZXJTYW5pdGlzZXI8Uz4ge1xuICAgIGlmICh0aGlzLnJlbWVtYmVyIHx8ICFfLmlzTmlsKHRoaXMuZGVmYXVsdFZhbHVlKSkge1xuICAgICAgcmV0dXJuIG5ldyBQYXJhbWV0ZXJEZWZpbml0aW9uLkRlZmF1bHRQYXJhbWV0ZXJTYW5pdGlzZXIodGhpcy5yZW1lbWJlciwgdGhpcy5kZWZhdWx0VmFsdWUsIGluamVjdG9yLmdldChQbGFjZUhpc3RvcnkpKTtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfVxuICB9XG59XG5cbmV4cG9ydCBuYW1lc3BhY2UgUGFyYW1ldGVyRGVmaW5pdGlvbiB7XG5cbiAgZXhwb3J0IGludGVyZmFjZSBPcHRpb25zPFQ+IHtcbiAgICBhcz86IHN0cmluZztcbiAgICBvcHRpb25hbD86IGJvb2xlYW47XG4gICAgcmVtZW1iZXI/OiBib29sZWFuO1xuICAgIGRlZmF1bHRWYWx1ZT86IFQ7XG4gICAgLy8gc2FuaXRpc2VyPzogQ29uc3RydWN0YWJsZTxQYXJhbWV0ZXJTYW5pdGlzZXI8VD4+IHwgUGFyYW1ldGVyU2FuaXRpc2VyLk9wdGlvbnM8VD47XG4gIH1cblxuICBleHBvcnQgY2xhc3MgUm91dGVJZDxUPiBleHRlbmRzIFBhcmFtZXRlckRlZmluaXRpb248VD4ge1xuICAgIHJlYWRvbmx5IGlzUm91dGVJZCA9IHRydWU7XG4gICAgcmVhZG9ubHkgaXNBcnJheSA9IGZhbHNlO1xuICB9XG5cbiAgZXhwb3J0IGNsYXNzIFZhbHVlUGFyYW1ldGVyPFQ+IGV4dGVuZHMgUGFyYW1ldGVyRGVmaW5pdGlvbjxUPiB7XG4gICAgcmVhZG9ubHkgaXNSb3V0ZUlkID0gZmFsc2U7XG4gICAgcmVhZG9ubHkgaXNBcnJheSA9IGZhbHNlO1xuICB9XG5cbiAgZXhwb3J0IGNsYXNzIEFycmF5UGFyYW1ldGVyPFQ+IGV4dGVuZHMgUGFyYW1ldGVyRGVmaW5pdGlvbjxULCBUW10+IHtcbiAgICByZWFkb25seSBpc1JvdXRlSWQgPSBmYWxzZTtcbiAgICByZWFkb25seSBpc0FycmF5ID0gdHJ1ZTtcbiAgfVxuXG5cbiAgZXhwb3J0IGNsYXNzIERlZmF1bHRQYXJhbWV0ZXJTYW5pdGlzZXI8VCwgUz4gaW1wbGVtZW50cyBQYXJhbWV0ZXJTYW5pdGlzZXI8Uz4ge1xuXG4gICAgY29uc3RydWN0b3IocmVhZG9ubHkgcmVtZW1iZXI6IGJvb2xlYW4sIHJlYWRvbmx5IGRlZmF1bHRWYWx1ZTogUywgcmVhZG9ubHkgcGxhY2VIaXN0b3J5OiBQbGFjZUhpc3RvcnkpIHtcbiAgICB9XG5cbiAgICBzYW5pdGlzZShwYXJhbWV0ZXI6IFJvdXRlUGFyYW1ldGVyVmFsdWU8UywgYW55LCBhbnk+LCB2aXNpdD86IFZpc2l0KTogUHJvbWlzZTxTPiB8IFMge1xuICAgICAgbGV0IHZhbHVlID0gcGFyYW1ldGVyLnZhbHVlO1xuICAgICAgaWYgKHBhcmFtZXRlci5pc01pc3NpbmcoKSkge1xuICAgICAgICBjb25zdCBwcmV2aW91c1Zpc2l0ID0gXy5maXJzdCh0aGlzLnBsYWNlSGlzdG9yeS5nZXRIaXN0b3J5KHZpc2l0LnBsYWNlRGVmaW5pdGlvbikpO1xuICAgICAgICBpZiAodGhpcy5yZW1lbWJlciAmJiBwcmV2aW91c1Zpc2l0KSB7XG4gICAgICAgICAgdmFsdWUgPSBwcmV2aW91c1Zpc2l0LmdldFZhbHVlT2YocGFyYW1ldGVyLmRlZmluaXRpb24pO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiBwYXJhbWV0ZXIuaXNFbXB0eVZhbHVlKHZhbHVlKSA/IHRoaXMuZGVmYXVsdFZhbHVlIDogdmFsdWU7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gdmFsdWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbn1cbiJdfQ==
|
|
@@ -1932,6 +1932,178 @@ if (false) {
|
|
|
1932
1932
|
PlaceRouter.prototype.router;
|
|
1933
1933
|
}
|
|
1934
1934
|
|
|
1935
|
+
/**
|
|
1936
|
+
* @fileoverview added by tsickle
|
|
1937
|
+
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
1938
|
+
*/
|
|
1939
|
+
/**
|
|
1940
|
+
* @abstract
|
|
1941
|
+
* @template T, S
|
|
1942
|
+
*/
|
|
1943
|
+
class ParameterDefinition {
|
|
1944
|
+
/**
|
|
1945
|
+
* @param {?} propertyName
|
|
1946
|
+
* @param {?} type
|
|
1947
|
+
* @param {?} options
|
|
1948
|
+
*/
|
|
1949
|
+
constructor(propertyName, type, options) {
|
|
1950
|
+
this.propertyName = propertyName;
|
|
1951
|
+
this.type = type;
|
|
1952
|
+
/** @type {?} */
|
|
1953
|
+
const opts = Opts.get(options);
|
|
1954
|
+
this.name = opts.getOptional('as', propertyName);
|
|
1955
|
+
this.remember = opts.getOptional('remember', false);
|
|
1956
|
+
this.defaultValue = opts.getOptional('defaultValue', null);
|
|
1957
|
+
}
|
|
1958
|
+
/**
|
|
1959
|
+
* @param {?} injector
|
|
1960
|
+
* @return {?}
|
|
1961
|
+
*/
|
|
1962
|
+
getSanitiser(injector) {
|
|
1963
|
+
if (this.remember || !___default.isNil(this.defaultValue)) {
|
|
1964
|
+
return new ParameterDefinition.DefaultParameterSanitiser(this.remember, this.defaultValue, injector.get(PlaceHistory));
|
|
1965
|
+
}
|
|
1966
|
+
else {
|
|
1967
|
+
return null;
|
|
1968
|
+
}
|
|
1969
|
+
}
|
|
1970
|
+
}
|
|
1971
|
+
if (false) {
|
|
1972
|
+
/** @type {?} */
|
|
1973
|
+
ParameterDefinition.prototype.isRouteId;
|
|
1974
|
+
/** @type {?} */
|
|
1975
|
+
ParameterDefinition.prototype.isArray;
|
|
1976
|
+
/** @type {?} */
|
|
1977
|
+
ParameterDefinition.prototype.name;
|
|
1978
|
+
/**
|
|
1979
|
+
* @type {?}
|
|
1980
|
+
* @private
|
|
1981
|
+
*/
|
|
1982
|
+
ParameterDefinition.prototype.remember;
|
|
1983
|
+
/**
|
|
1984
|
+
* @type {?}
|
|
1985
|
+
* @private
|
|
1986
|
+
*/
|
|
1987
|
+
ParameterDefinition.prototype.defaultValue;
|
|
1988
|
+
/** @type {?} */
|
|
1989
|
+
ParameterDefinition.prototype.propertyName;
|
|
1990
|
+
/** @type {?} */
|
|
1991
|
+
ParameterDefinition.prototype.type;
|
|
1992
|
+
}
|
|
1993
|
+
(function (ParameterDefinition) {
|
|
1994
|
+
/**
|
|
1995
|
+
* @record
|
|
1996
|
+
* @template T
|
|
1997
|
+
*/
|
|
1998
|
+
function Options() { }
|
|
1999
|
+
ParameterDefinition.Options = Options;
|
|
2000
|
+
if (false) {
|
|
2001
|
+
/** @type {?|undefined} */
|
|
2002
|
+
Options.prototype.as;
|
|
2003
|
+
/** @type {?|undefined} */
|
|
2004
|
+
Options.prototype.optional;
|
|
2005
|
+
/** @type {?|undefined} */
|
|
2006
|
+
Options.prototype.remember;
|
|
2007
|
+
/** @type {?|undefined} */
|
|
2008
|
+
Options.prototype.defaultValue;
|
|
2009
|
+
}
|
|
2010
|
+
/**
|
|
2011
|
+
* @template T
|
|
2012
|
+
*/
|
|
2013
|
+
class RouteId extends ParameterDefinition {
|
|
2014
|
+
constructor() {
|
|
2015
|
+
super(...arguments);
|
|
2016
|
+
this.isRouteId = true;
|
|
2017
|
+
this.isArray = false;
|
|
2018
|
+
}
|
|
2019
|
+
}
|
|
2020
|
+
ParameterDefinition.RouteId = RouteId;
|
|
2021
|
+
if (false) {
|
|
2022
|
+
/** @type {?} */
|
|
2023
|
+
RouteId.prototype.isRouteId;
|
|
2024
|
+
/** @type {?} */
|
|
2025
|
+
RouteId.prototype.isArray;
|
|
2026
|
+
}
|
|
2027
|
+
/**
|
|
2028
|
+
* @template T
|
|
2029
|
+
*/
|
|
2030
|
+
class ValueParameter extends ParameterDefinition {
|
|
2031
|
+
constructor() {
|
|
2032
|
+
super(...arguments);
|
|
2033
|
+
this.isRouteId = false;
|
|
2034
|
+
this.isArray = false;
|
|
2035
|
+
}
|
|
2036
|
+
}
|
|
2037
|
+
ParameterDefinition.ValueParameter = ValueParameter;
|
|
2038
|
+
if (false) {
|
|
2039
|
+
/** @type {?} */
|
|
2040
|
+
ValueParameter.prototype.isRouteId;
|
|
2041
|
+
/** @type {?} */
|
|
2042
|
+
ValueParameter.prototype.isArray;
|
|
2043
|
+
}
|
|
2044
|
+
/**
|
|
2045
|
+
* @template T
|
|
2046
|
+
*/
|
|
2047
|
+
class ArrayParameter extends ParameterDefinition {
|
|
2048
|
+
constructor() {
|
|
2049
|
+
super(...arguments);
|
|
2050
|
+
this.isRouteId = false;
|
|
2051
|
+
this.isArray = true;
|
|
2052
|
+
}
|
|
2053
|
+
}
|
|
2054
|
+
ParameterDefinition.ArrayParameter = ArrayParameter;
|
|
2055
|
+
if (false) {
|
|
2056
|
+
/** @type {?} */
|
|
2057
|
+
ArrayParameter.prototype.isRouteId;
|
|
2058
|
+
/** @type {?} */
|
|
2059
|
+
ArrayParameter.prototype.isArray;
|
|
2060
|
+
}
|
|
2061
|
+
/**
|
|
2062
|
+
* @template T, S
|
|
2063
|
+
*/
|
|
2064
|
+
class DefaultParameterSanitiser {
|
|
2065
|
+
/**
|
|
2066
|
+
* @param {?} remember
|
|
2067
|
+
* @param {?} defaultValue
|
|
2068
|
+
* @param {?} placeHistory
|
|
2069
|
+
*/
|
|
2070
|
+
constructor(remember, defaultValue, placeHistory) {
|
|
2071
|
+
this.remember = remember;
|
|
2072
|
+
this.defaultValue = defaultValue;
|
|
2073
|
+
this.placeHistory = placeHistory;
|
|
2074
|
+
}
|
|
2075
|
+
/**
|
|
2076
|
+
* @param {?} parameter
|
|
2077
|
+
* @param {?=} visit
|
|
2078
|
+
* @return {?}
|
|
2079
|
+
*/
|
|
2080
|
+
sanitise(parameter, visit) {
|
|
2081
|
+
/** @type {?} */
|
|
2082
|
+
let value = parameter.value;
|
|
2083
|
+
if (parameter.isMissing()) {
|
|
2084
|
+
/** @type {?} */
|
|
2085
|
+
const previousVisit = ___default.first(this.placeHistory.getHistory(visit.placeDefinition));
|
|
2086
|
+
if (this.remember && previousVisit) {
|
|
2087
|
+
value = previousVisit.getValueOf(parameter.definition);
|
|
2088
|
+
}
|
|
2089
|
+
return parameter.isEmptyValue(value) ? this.defaultValue : value;
|
|
2090
|
+
}
|
|
2091
|
+
else {
|
|
2092
|
+
return value;
|
|
2093
|
+
}
|
|
2094
|
+
}
|
|
2095
|
+
}
|
|
2096
|
+
ParameterDefinition.DefaultParameterSanitiser = DefaultParameterSanitiser;
|
|
2097
|
+
if (false) {
|
|
2098
|
+
/** @type {?} */
|
|
2099
|
+
DefaultParameterSanitiser.prototype.remember;
|
|
2100
|
+
/** @type {?} */
|
|
2101
|
+
DefaultParameterSanitiser.prototype.defaultValue;
|
|
2102
|
+
/** @type {?} */
|
|
2103
|
+
DefaultParameterSanitiser.prototype.placeHistory;
|
|
2104
|
+
}
|
|
2105
|
+
})(ParameterDefinition || (ParameterDefinition = {}));
|
|
2106
|
+
|
|
1935
2107
|
/**
|
|
1936
2108
|
* @fileoverview added by tsickle
|
|
1937
2109
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
@@ -2152,188 +2324,6 @@ if (false) {
|
|
|
2152
2324
|
RouteParameterValue.Array = Array;
|
|
2153
2325
|
})(RouteParameterValue || (RouteParameterValue = {}));
|
|
2154
2326
|
|
|
2155
|
-
/**
|
|
2156
|
-
* @fileoverview added by tsickle
|
|
2157
|
-
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
2158
|
-
*/
|
|
2159
|
-
/**
|
|
2160
|
-
* @abstract
|
|
2161
|
-
* @template T, S
|
|
2162
|
-
*/
|
|
2163
|
-
class ParameterDefinition {
|
|
2164
|
-
/**
|
|
2165
|
-
* @param {?} propertyName
|
|
2166
|
-
* @param {?} type
|
|
2167
|
-
* @param {?} options
|
|
2168
|
-
*/
|
|
2169
|
-
constructor(propertyName, type, options) {
|
|
2170
|
-
this.propertyName = propertyName;
|
|
2171
|
-
this.type = type;
|
|
2172
|
-
/** @type {?} */
|
|
2173
|
-
const opts = Opts.get(options);
|
|
2174
|
-
this.name = opts.getOptional('as', propertyName);
|
|
2175
|
-
this.remember = opts.getOptional('remember', false);
|
|
2176
|
-
this.defaultValue = opts.getOptional('defaultValue', null);
|
|
2177
|
-
}
|
|
2178
|
-
/**
|
|
2179
|
-
* @param {?} injector
|
|
2180
|
-
* @return {?}
|
|
2181
|
-
*/
|
|
2182
|
-
getSanitiser(injector) {
|
|
2183
|
-
if (this.remember || !___default.isNil(this.defaultValue)) {
|
|
2184
|
-
return new ParameterDefinition.DefaultParameterSanitiser(this.remember, this.defaultValue, injector.get(PlaceHistory));
|
|
2185
|
-
}
|
|
2186
|
-
else {
|
|
2187
|
-
return null;
|
|
2188
|
-
}
|
|
2189
|
-
}
|
|
2190
|
-
}
|
|
2191
|
-
if (false) {
|
|
2192
|
-
/** @type {?} */
|
|
2193
|
-
ParameterDefinition.prototype.isRouteId;
|
|
2194
|
-
/** @type {?} */
|
|
2195
|
-
ParameterDefinition.prototype.isArray;
|
|
2196
|
-
/** @type {?} */
|
|
2197
|
-
ParameterDefinition.prototype.name;
|
|
2198
|
-
/**
|
|
2199
|
-
* @type {?}
|
|
2200
|
-
* @private
|
|
2201
|
-
*/
|
|
2202
|
-
ParameterDefinition.prototype.remember;
|
|
2203
|
-
/**
|
|
2204
|
-
* @type {?}
|
|
2205
|
-
* @private
|
|
2206
|
-
*/
|
|
2207
|
-
ParameterDefinition.prototype.defaultValue;
|
|
2208
|
-
/** @type {?} */
|
|
2209
|
-
ParameterDefinition.prototype.propertyName;
|
|
2210
|
-
/** @type {?} */
|
|
2211
|
-
ParameterDefinition.prototype.type;
|
|
2212
|
-
}
|
|
2213
|
-
(function (ParameterDefinition) {
|
|
2214
|
-
/**
|
|
2215
|
-
* @record
|
|
2216
|
-
* @template T
|
|
2217
|
-
*/
|
|
2218
|
-
function Options() { }
|
|
2219
|
-
ParameterDefinition.Options = Options;
|
|
2220
|
-
if (false) {
|
|
2221
|
-
/** @type {?|undefined} */
|
|
2222
|
-
Options.prototype.as;
|
|
2223
|
-
/** @type {?|undefined} */
|
|
2224
|
-
Options.prototype.optional;
|
|
2225
|
-
/** @type {?|undefined} */
|
|
2226
|
-
Options.prototype.remember;
|
|
2227
|
-
/** @type {?|undefined} */
|
|
2228
|
-
Options.prototype.defaultValue;
|
|
2229
|
-
}
|
|
2230
|
-
/**
|
|
2231
|
-
* @template T
|
|
2232
|
-
*/
|
|
2233
|
-
class RouteId extends ParameterDefinition {
|
|
2234
|
-
constructor() {
|
|
2235
|
-
super(...arguments);
|
|
2236
|
-
this.isRouteId = true;
|
|
2237
|
-
this.isArray = false;
|
|
2238
|
-
}
|
|
2239
|
-
}
|
|
2240
|
-
ParameterDefinition.RouteId = RouteId;
|
|
2241
|
-
if (false) {
|
|
2242
|
-
/** @type {?} */
|
|
2243
|
-
RouteId.prototype.isRouteId;
|
|
2244
|
-
/** @type {?} */
|
|
2245
|
-
RouteId.prototype.isArray;
|
|
2246
|
-
}
|
|
2247
|
-
/**
|
|
2248
|
-
* @template T
|
|
2249
|
-
*/
|
|
2250
|
-
class ValueParameter extends ParameterDefinition {
|
|
2251
|
-
constructor() {
|
|
2252
|
-
super(...arguments);
|
|
2253
|
-
this.isRouteId = false;
|
|
2254
|
-
this.isArray = false;
|
|
2255
|
-
}
|
|
2256
|
-
}
|
|
2257
|
-
ParameterDefinition.ValueParameter = ValueParameter;
|
|
2258
|
-
if (false) {
|
|
2259
|
-
/** @type {?} */
|
|
2260
|
-
ValueParameter.prototype.isRouteId;
|
|
2261
|
-
/** @type {?} */
|
|
2262
|
-
ValueParameter.prototype.isArray;
|
|
2263
|
-
}
|
|
2264
|
-
/**
|
|
2265
|
-
* @template T
|
|
2266
|
-
*/
|
|
2267
|
-
class ArrayParameter extends ParameterDefinition {
|
|
2268
|
-
constructor() {
|
|
2269
|
-
super(...arguments);
|
|
2270
|
-
this.isRouteId = false;
|
|
2271
|
-
this.isArray = true;
|
|
2272
|
-
}
|
|
2273
|
-
}
|
|
2274
|
-
ParameterDefinition.ArrayParameter = ArrayParameter;
|
|
2275
|
-
if (false) {
|
|
2276
|
-
/** @type {?} */
|
|
2277
|
-
ArrayParameter.prototype.isRouteId;
|
|
2278
|
-
/** @type {?} */
|
|
2279
|
-
ArrayParameter.prototype.isArray;
|
|
2280
|
-
}
|
|
2281
|
-
/**
|
|
2282
|
-
* @template T, S
|
|
2283
|
-
*/
|
|
2284
|
-
class DefaultParameterSanitiser {
|
|
2285
|
-
/**
|
|
2286
|
-
* @param {?} remember
|
|
2287
|
-
* @param {?} defaultValue
|
|
2288
|
-
* @param {?} placeHistory
|
|
2289
|
-
*/
|
|
2290
|
-
constructor(remember, defaultValue, placeHistory) {
|
|
2291
|
-
this.remember = remember;
|
|
2292
|
-
this.defaultValue = defaultValue;
|
|
2293
|
-
this.placeHistory = placeHistory;
|
|
2294
|
-
}
|
|
2295
|
-
/**
|
|
2296
|
-
* @param {?} parameter
|
|
2297
|
-
* @param {?=} visit
|
|
2298
|
-
* @return {?}
|
|
2299
|
-
*/
|
|
2300
|
-
sanitise(parameter, visit) {
|
|
2301
|
-
/** @type {?} */
|
|
2302
|
-
let value = parameter.value;
|
|
2303
|
-
if (parameter.isMissing()) {
|
|
2304
|
-
/** @type {?} */
|
|
2305
|
-
const previousVisit = ___default.first(this.placeHistory.getHistory(visit.placeDefinition));
|
|
2306
|
-
if (this.remember && previousVisit) {
|
|
2307
|
-
value = previousVisit.getValueOf(parameter.definition);
|
|
2308
|
-
}
|
|
2309
|
-
/** @type {?} */
|
|
2310
|
-
const s = parameter.isEmptyValue(value) ? this.defaultValue : value;
|
|
2311
|
-
console.log(`missing -> ${parameter.definition.name}, returning ${s}`);
|
|
2312
|
-
return s;
|
|
2313
|
-
}
|
|
2314
|
-
else {
|
|
2315
|
-
console.log(`not missing -> ${parameter.definition.name}`);
|
|
2316
|
-
return value;
|
|
2317
|
-
}
|
|
2318
|
-
}
|
|
2319
|
-
}
|
|
2320
|
-
__decorate([
|
|
2321
|
-
Trace(),
|
|
2322
|
-
__metadata("design:type", Function),
|
|
2323
|
-
__metadata("design:paramtypes", [RouteParameterValue, Object]),
|
|
2324
|
-
__metadata("design:returntype", Object)
|
|
2325
|
-
], DefaultParameterSanitiser.prototype, "sanitise", null);
|
|
2326
|
-
ParameterDefinition.DefaultParameterSanitiser = DefaultParameterSanitiser;
|
|
2327
|
-
if (false) {
|
|
2328
|
-
/** @type {?} */
|
|
2329
|
-
DefaultParameterSanitiser.prototype.remember;
|
|
2330
|
-
/** @type {?} */
|
|
2331
|
-
DefaultParameterSanitiser.prototype.defaultValue;
|
|
2332
|
-
/** @type {?} */
|
|
2333
|
-
DefaultParameterSanitiser.prototype.placeHistory;
|
|
2334
|
-
}
|
|
2335
|
-
})(ParameterDefinition || (ParameterDefinition = {}));
|
|
2336
|
-
|
|
2337
2327
|
var _a;
|
|
2338
2328
|
class ParameterSnapshot {
|
|
2339
2329
|
/**
|