@coolon/angular-ui-powerups 0.0.7 → 0.0.9
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 +552 -159
- package/bundles/coolon-angular-ui-powerups.umd.js.map +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js.map +1 -1
- package/coolon-angular-ui-powerups.d.ts +12 -11
- package/coolon-angular-ui-powerups.metadata.json +1 -1
- package/esm2015/coolon-angular-ui-powerups.js +12 -11
- package/esm2015/index.js +2 -2
- package/esm2015/lib/components/forms/abstract-input.component.js +8 -3
- package/esm2015/lib/directives/command.directive.js +48 -4
- package/esm2015/lib/directives/focus-binding.directive.js +30 -14
- package/esm2015/lib/interaction/components/alert-dialog/alert-dialog.component.js +1 -1
- package/esm2015/lib/interaction/components/confirmation-dialog/confirmation-dialog.component.js +1 -1
- package/esm2015/lib/place/components/empty-state/empty-state.component.js +1 -1
- package/esm2015/lib/place/components/nav/nav.component.js +31 -0
- package/esm2015/lib/place/guards/place-route.guard.js +3 -3
- package/esm2015/lib/place/index.js +4 -3
- package/esm2015/lib/place/place.module.js +16 -5
- package/esm2015/lib/place/route/parameter-decorators.js +77 -2
- package/esm2015/lib/place/route/parameter-definition.class.js +4 -2
- package/esm2015/lib/place/route/route-parameter-bindings.js +25 -13
- package/esm2015/lib/place/route/route-parameter-sanitiser.js +206 -74
- package/esm2015/public_api.js +2 -2
- package/esm5/coolon-angular-ui-powerups.js +12 -11
- package/esm5/index.js +2 -2
- package/esm5/lib/components/forms/abstract-input.component.js +8 -3
- package/esm5/lib/directives/command.directive.js +52 -4
- package/esm5/lib/directives/focus-binding.directive.js +34 -14
- package/esm5/lib/interaction/components/alert-dialog/alert-dialog.component.js +1 -1
- package/esm5/lib/interaction/components/confirmation-dialog/confirmation-dialog.component.js +1 -1
- package/esm5/lib/place/components/empty-state/empty-state.component.js +1 -1
- package/esm5/lib/place/components/nav/nav.component.js +36 -0
- package/esm5/lib/place/guards/place-route.guard.js +3 -3
- package/esm5/lib/place/index.js +4 -3
- package/esm5/lib/place/place.module.js +16 -5
- package/esm5/lib/place/route/parameter-decorators.js +77 -2
- package/esm5/lib/place/route/parameter-definition.class.js +4 -2
- package/esm5/lib/place/route/route-parameter-bindings.js +25 -13
- package/esm5/lib/place/route/route-parameter-sanitiser.js +284 -92
- package/esm5/public_api.js +2 -2
- package/fesm2015/coolon-angular-ui-powerups.js +436 -112
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +521 -130
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/components/forms/abstract-input.component.d.ts +7 -7
- package/lib/directives/command.directive.d.ts +6 -3
- package/lib/directives/focus-binding.directive.d.ts +1 -0
- package/lib/place/components/nav/nav.component.d.ts +7 -0
- package/lib/place/index.d.ts +1 -0
- package/lib/place/route/parameter-decorators.d.ts +17 -0
- package/lib/place/route/parameter-definition.class.d.ts +4 -3
- package/lib/place/route/route-parameter-sanitiser.d.ts +33 -6
- package/package.json +2 -2
- package/styles/styles.scss +15 -0
|
@@ -13,7 +13,7 @@ import { Klass } from '@coolon/typescript-utilities';
|
|
|
13
13
|
function ResolvedParameter() { }
|
|
14
14
|
if (false) {
|
|
15
15
|
/** @type {?} */
|
|
16
|
-
ResolvedParameter.prototype.
|
|
16
|
+
ResolvedParameter.prototype.parameterDef;
|
|
17
17
|
/** @type {?} */
|
|
18
18
|
ResolvedParameter.prototype.resolvedValue;
|
|
19
19
|
}
|
|
@@ -37,7 +37,7 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
37
37
|
* @param {?} p
|
|
38
38
|
* @return {?}
|
|
39
39
|
*/
|
|
40
|
-
function (p) { return p.
|
|
40
|
+
function (p) { return p.parameterDef === parameter; }));
|
|
41
41
|
return resolved ? resolved.resolvedValue : null;
|
|
42
42
|
};
|
|
43
43
|
/**
|
|
@@ -57,8 +57,8 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
57
57
|
* @param {?} p
|
|
58
58
|
* @return {?}
|
|
59
59
|
*/
|
|
60
|
-
function (p) { return p.
|
|
61
|
-
|
|
60
|
+
function (p) { return p.parameterDef !== parameter; })).concat({
|
|
61
|
+
parameterDef: parameter,
|
|
62
62
|
resolvedValue: value
|
|
63
63
|
}));
|
|
64
64
|
};
|
|
@@ -73,7 +73,7 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
73
73
|
function () {
|
|
74
74
|
/** @type {?} */
|
|
75
75
|
var routeIdParam = this.getRouteIdParam();
|
|
76
|
-
return routeIdParam ? routeIdParam.
|
|
76
|
+
return routeIdParam ? routeIdParam.parameterDef.type.format(routeIdParam.resolvedValue) : null;
|
|
77
77
|
};
|
|
78
78
|
/**
|
|
79
79
|
* @private
|
|
@@ -88,7 +88,7 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
88
88
|
* @param {?} p
|
|
89
89
|
* @return {?}
|
|
90
90
|
*/
|
|
91
|
-
function (p) { return p.
|
|
91
|
+
function (p) { return p.parameterDef.isRouteId; }));
|
|
92
92
|
};
|
|
93
93
|
/**
|
|
94
94
|
* @protected
|
|
@@ -106,12 +106,12 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
106
106
|
* @param {?} p
|
|
107
107
|
* @return {?}
|
|
108
108
|
*/
|
|
109
|
-
function (p) { return !p.
|
|
109
|
+
function (p) { return !p.parameterDef.isRouteId; })).forEach((/**
|
|
110
110
|
* @param {?} p
|
|
111
111
|
* @return {?}
|
|
112
112
|
*/
|
|
113
113
|
function (p) {
|
|
114
|
-
params[p.
|
|
114
|
+
params[p.parameterDef.name] = p.parameterDef.type.format(p.resolvedValue);
|
|
115
115
|
}));
|
|
116
116
|
return params;
|
|
117
117
|
};
|
|
@@ -144,7 +144,7 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
144
144
|
/** @type {?} */
|
|
145
145
|
var path = routeId ? [relativePath, routeId, this.getFormattedParameters()] : [relativePath, this.getFormattedParameters()];
|
|
146
146
|
router.navigate(path, {
|
|
147
|
-
relativeTo: activatedRoute
|
|
147
|
+
relativeTo: activatedRoute
|
|
148
148
|
});
|
|
149
149
|
};
|
|
150
150
|
tslib_1.__decorate([
|
|
@@ -201,11 +201,23 @@ var RouteParameterBindings = /** @class */ (function (_super) {
|
|
|
201
201
|
/** @type {?} */
|
|
202
202
|
var result = [];
|
|
203
203
|
routeParameterDefs.forEach((/**
|
|
204
|
-
* @param {?}
|
|
204
|
+
* @param {?} parameterDef
|
|
205
205
|
* @return {?}
|
|
206
206
|
*/
|
|
207
|
-
function (
|
|
208
|
-
|
|
207
|
+
function (parameterDef) {
|
|
208
|
+
/** @type {?} */
|
|
209
|
+
var resolvedValue;
|
|
210
|
+
if (parameterDef.isArray) {
|
|
211
|
+
resolvedValue = params.getAll(parameterDef.name).map((/**
|
|
212
|
+
* @param {?} v
|
|
213
|
+
* @return {?}
|
|
214
|
+
*/
|
|
215
|
+
function (v) { return parameterDef.type.parse(v); }));
|
|
216
|
+
}
|
|
217
|
+
else {
|
|
218
|
+
resolvedValue = parameterDef.type.parse(params.get(parameterDef.name));
|
|
219
|
+
}
|
|
220
|
+
result.push({ parameterDef: parameterDef, resolvedValue: resolvedValue });
|
|
209
221
|
}));
|
|
210
222
|
return new ResolvedParameters(result);
|
|
211
223
|
}));
|
|
@@ -324,4 +336,4 @@ if (false) {
|
|
|
324
336
|
(function (RouteParameterBindings) {
|
|
325
337
|
RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');
|
|
326
338
|
})(RouteParameterBindings || (RouteParameterBindings = {}));
|
|
327
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-parameter-bindings.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/route-parameter-bindings.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EACL,OAAO,EACP,GAAG,EACH,gBAAgB,EAEhB,iBAAiB,EACjB,KAAK,EACL,mBAAmB,EACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;;;;;AAIrD,gCAGC;;;IAFC,sCAAkC;;IAClC,0CAAiB;;AAGnB;IACE,4BAAqB,UAAoC;QAApC,eAAU,GAAV,UAAU,CAA0B;IACzD,CAAC;;;;;;IAED,gCAAG;;;;;IAAH,UAAO,SAAiC;;YAChC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI;;;;QAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,SAAS,KAAK,SAAS,EAAzB,CAAyB,EAAC;QACrE,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;IAClD,CAAC;;;;;;;IAED,oCAAO;;;;;;IAAP,UAAW,SAAiC,EAAE,KAAQ;QACpD,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM;;;;QAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,SAAS,KAAK,SAAS,EAAzB,CAAyB,EAAC,CAAC,MAAM,CAAC;YAC1F,SAAS,WAAA;YACT,aAAa,EAAE,KAAK;SACrB,CAAC,CAAC,CAAC;IACN,CAAC;;;;;IAGS,gDAAmB;;;;IAA7B;;YACQ,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE;QAC3C,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9F,CAAC;;;;;IAEO,4CAAe;;;;IAAvB;QACE,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI;;;;QAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,SAAS,CAAC,SAAS,EAArB,CAAqB,EAAC,CAAC;IAC1D,CAAC;;;;;IAGS,mDAAsB;;;;IAAhC;;YACQ,MAAM,GAAG,EAAE;;YACX,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM;;;;QAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,EAAtB,CAAsB,EAAC,CAAC,OAAO;;;;QAAC,UAAA,CAAC;YAChF,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QACtE,CAAC,EAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;;;;IAED,uCAAU;;;IAAV;QACE,OAAO,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;IAClC,CAAC;;;;;;;IAGD,qCAAQ;;;;;;IAAR,UAAS,QAA4B,EAAE,MAAc,EAAE,cAA8B;;YAC7E,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE;;YACpC,YAAY,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;;YACnD,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC7H,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE;YACpB,UAAU,EAAE,cAAc;SAC3B,CAAC,CAAC;IACL,CAAC;IA9BD;QADC,KAAK,EAAE;;;;iEAIP;IAOD;QADC,KAAK,EAAE;;;;oEAOP;IAOD;QADC,KAAK,EAAE;;iDACW,kBAAkB,EAAU,MAAM,EAAkB,cAAc;;sDAOpF;IACH,yBAAC;CAAA,AAhDD,IAgDC;;;IA/Ca,wCAA6C;;AAiD3D;IAA4C,kDAAgB;IAQ1D,gCAA6B,SAAc,EAAmB,MAAc,EAAmB,cAA8B;QAA7H,YACE,iBAAO,SA6BR;QA9B4B,eAAS,GAAT,SAAS,CAAK;QAAmB,YAAM,GAAN,MAAM,CAAQ;QAAmB,oBAAc,GAAd,cAAc,CAAgB;QAN7G,0BAAoB,GAAG,IAAI,iBAAiB,CAAU,KAAK,CAAC,CAAC;QAI5D,wBAAkB,GAAG,IAAI,iBAAiB,EAAsB,CAAC;QAI1E,IAAA,2BAAwE,EAAtE,gBAAK,EAAE,oBAAO,EAAE,kBAAM,EAAE,cAAI,EAAE,gBAAK,EAAE,oBAAiC;QAC9E,KAAI,CAAC,GAAG,GAAG,IAAI,mBAAmB,EAAE,CAAC,CAAA,2CAA2C;;;YAE1E,kBAAkB,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC,sBAAsB,CAAC,wBAAwB,CAAC;QAChH,kBAAkB,CAAC,OAAO;;;;QAAC,UAAA,SAAS,IAAI,OAAA,KAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAA9B,CAA8B,EAAC,CAAC;;YAElE,+BAA+B,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;aAChF,IAAI,EAAE;aACN,GAAG;;;;QAAC,UAAA,MAAM;;gBACH,MAAM,GAA6B,EAAE;YAC3C,kBAAkB,CAAC,OAAO;;;;YAAC,UAAA,SAAS;gBAClC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,WAAA,EAAE,aAAa,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;YAC9F,CAAC,EAAC,CAAC;YACH,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,EAAC;QAEJ,+BAA+B,CAAC,SAAS;;;;QAAC,UAAA,kBAAkB;YAC1D,KAAI,CAAC,oBAAoB,CAAC,KAAK,GAAG,IAAI,CAAC;YACvC,KAAI,CAAC,kBAAkB,CAAC,KAAK,GAAG,kBAAkB,CAAC;YACnD,KAAI,CAAC,oBAAoB,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1C,CAAC,EAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,KAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO;;;;;QAAC,UAAC,MAAM,EAAE,QAAQ;YAC7D,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QACpD,CAAC,GAAE,EAAE,MAAM,EAAE,KAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAEzC,KAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iCAAiC,EAAE,+BAA+B,CAAC,CAAC;QACrF,KAAI,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,EAAE,KAAI,CAAC,mBAAmB,CAAC,CAAC;;IACrE,CAAC;IAED,sBAAI,uDAAmB;;;;QAAvB;YACE,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;QAC5C,CAAC;;;OAAA;;;;;;;IAES,+CAAc;;;;;;IAAxB,UAA4B,SAAiC;;YACrD,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,kBAAkB,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,EAAE;YAClE,OAAO;;;;YAAP,UAAQ,UAA8B;gBACpC,OAAO,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACnC,CAAC;YACD,MAAM;;;;;YAAN,UAAO,KAAQ,EAAE,iBAAsC;gBACrD,OAAO,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;SACF,CAAC,CAAC,CAAC;IACN,CAAC;;;;;;;IAGO,4CAAW;;;;;;IAAnB,UAAuB,SAAiC;QACtD,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IACH,6BAAC;AAAD,CAAC,AA7DD,CAA4C,gBAAgB,GA6D3D;;;;IA3DC,sDAA6E;;;;;IAE7E,qCAAiC;;;;;IAEjC,oDAAkF;;;;;IAEtE,2CAA+B;;;;;IAAE,wCAA+B;;;;;IAAE,gDAA+C;;AAuD/H,WAAiB,sBAAsB;IACxB,+CAAwB,GAAG,MAAM,CAAC,wBAAwB,CAAC;AAC1E,CAAC,EAFgB,sBAAsB,KAAtB,sBAAsB,QAEtC","sourcesContent":["import { ActivatedRoute, Router } from '@angular/router';\nimport {\n  Binding,\n  Dsl,\n  GarbageCollector,\n  MutableHasValue,\n  MutableValueModel,\n  Trace,\n  TransactionObserver\n} from '@coolon/pectin';\nimport { Klass } from '@coolon/typescript-utilities';\nimport { AbstractPlaceComponent } from '../abstract-place-component';\nimport { ParameterDefinition } from './parameter-definition.class';\n\ninterface ResolvedParameter<T> {\n  parameter: ParameterDefinition<T>;\n  resolvedValue: T;\n}\n\nclass ResolvedParameters {\n  constructor(readonly parameters: ResolvedParameter<any>[]) {\n  }\n\n  get<T>(parameter: ParameterDefinition<T>): T {\n    const resolved = this.parameters.find(p => p.parameter === parameter);\n    return resolved ? resolved.resolvedValue : null;\n  }\n\n  replace<T>(parameter: ParameterDefinition<T>, value: T): ResolvedParameters {\n    return new ResolvedParameters(this.parameters.filter(p => p.parameter !== parameter).concat({\n      parameter,\n      resolvedValue: value\n    }));\n  }\n\n  @Trace()\n  protected getFormattedRouteId() {\n    const routeIdParam = this.getRouteIdParam();\n    return routeIdParam ? routeIdParam.parameter.type.format(routeIdParam.resolvedValue) : null;\n  }\n\n  private getRouteIdParam() {\n    return this.parameters.find(p => p.parameter.isRouteId);\n  }\n\n  @Trace()\n  protected getFormattedParameters() {\n    const params = {};\n    const routeIdParam = this.parameters.filter(p => !p.parameter.isRouteId).forEach(p => {\n      params[p.parameter.name] = p.parameter.type.format(p.resolvedValue);\n    });\n    return params;\n  }\n\n  hasRouteId() {\n    return !!this.getRouteIdParam();\n  }\n\n  @Trace()\n  redirect(previous: ResolvedParameters, router: Router, activatedRoute: ActivatedRoute) {\n    const routeId = this.getFormattedRouteId();\n    const relativePath = !!previous.hasRouteId() ? '..' : '.';\n    const path = routeId ? [relativePath, routeId, this.getFormattedParameters()] : [relativePath, this.getFormattedParameters()];\n    router.navigate(path, {\n      relativeTo: activatedRoute,\n    });\n  }\n}\n\nexport class RouteParameterBindings extends GarbageCollector {\n\n  public readonly _incomingRouteChange = new MutableValueModel<boolean>(false);\n\n  private txo: TransactionObserver;\n\n  private readonly resolvedParameters = new MutableValueModel<ResolvedParameters>();\n\n  constructor(private readonly component: any, private readonly router: Router, private readonly activatedRoute: ActivatedRoute) {\n    super();\n    const { chain, valueOf, before, when, after, observe } = Dsl.disposeWith(this);\n    this.txo = new TransactionObserver();//.onEvent(e => console.log(e.toString()));\n\n    const routeParameterDefs = Klass.get(component).getMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY);\n    routeParameterDefs.forEach(parameter => this.installBinding(parameter));\n\n    const incomingResolvedRouteParameters = observe.valuesFrom(activatedRoute.paramMap)\n      .last()\n      .map(params => {\n        const result: ResolvedParameter<any>[] = [];\n        routeParameterDefs.forEach(parameter => {\n          result.push({ parameter, resolvedValue: parameter.type.parse(params.get(parameter.name)) });\n        });\n        return new ResolvedParameters(result);\n      });\n\n    incomingResolvedRouteParameters.subscribe(resolvedParameters => {\n      this._incomingRouteChange.value = true;\n      this.resolvedParameters.value = resolvedParameters;\n      this._incomingRouteChange.value = false;\n    });\n\n    when.valueOf(this.resolvedParameters).changes((params, previous) => {\n      params.redirect(previous, router, activatedRoute);\n    }, { unless: this.incomingRouteChange });\n\n    this.txo.observe('incomingResolvedRouteParameters', incomingResolvedRouteParameters);\n    this.txo.observe('this.routeIsChanging', this.incomingRouteChange);\n  }\n\n  get incomingRouteChange() {\n    return this._incomingRouteChange.readonly;\n  }\n\n  protected installBinding<T>(parameter: ParameterDefinition<T>) {\n    const model = this.getModelFor(parameter);\n    this.txo.observe(parameter.propertyName, model);\n    this.registerDisposable(new Binding(this.resolvedParameters, model, {\n      toRight(parameters: ResolvedParameters): T {\n        return parameters.get(parameter);\n      },\n      toLeft(value: T, currentParameters?: ResolvedParameters): ResolvedParameters {\n        return currentParameters.replace(parameter, value);\n      }\n    }));\n  }\n\n\n  private getModelFor<T>(parameter: ParameterDefinition<T>): MutableHasValue<T> {\n    return this.component[parameter.propertyName];\n  }\n}\n\nexport namespace RouteParameterBindings {\n  export const ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');\n}\n"]}
|
|
339
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-parameter-bindings.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/route-parameter-bindings.ts"],"names":[],"mappings":"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","sourcesContent":["import { ActivatedRoute, Router } from '@angular/router';\nimport {\n  Binding,\n  Dsl,\n  GarbageCollector,\n  MutableHasValue,\n  MutableValueModel,\n  Trace,\n  TransactionObserver\n} from '@coolon/pectin';\nimport { Klass } from '@coolon/typescript-utilities';\nimport { ParameterDefinition } from './parameter-definition.class';\n\ninterface ResolvedParameter<T> {\n  parameterDef: ParameterDefinition<T>;\n  resolvedValue: T;\n}\n\nclass ResolvedParameters {\n  constructor(readonly parameters: ResolvedParameter<any>[]) {\n  }\n\n  get<T>(parameter: ParameterDefinition<T>): T {\n    const resolved = this.parameters.find(p => p.parameterDef === parameter);\n    return resolved ? resolved.resolvedValue : null;\n  }\n\n  replace<T>(parameter: ParameterDefinition<T>, value: T): ResolvedParameters {\n    return new ResolvedParameters(this.parameters.filter(p => p.parameterDef !== parameter).concat({\n      parameterDef: parameter,\n      resolvedValue: value\n    }));\n  }\n\n  @Trace()\n  protected getFormattedRouteId() {\n    const routeIdParam = this.getRouteIdParam();\n    return routeIdParam ? routeIdParam.parameterDef.type.format(routeIdParam.resolvedValue) : null;\n  }\n\n  private getRouteIdParam() {\n    return this.parameters.find(p => p.parameterDef.isRouteId);\n  }\n\n  @Trace()\n  protected getFormattedParameters() {\n    const params = {};\n    const routeIdParam = this.parameters.filter(p => !p.parameterDef.isRouteId).forEach(p => {\n      params[p.parameterDef.name] = p.parameterDef.type.format(p.resolvedValue);\n    });\n    return params;\n  }\n\n  hasRouteId() {\n    return !!this.getRouteIdParam();\n  }\n\n  @Trace()\n  redirect(previous: ResolvedParameters, router: Router, activatedRoute: ActivatedRoute) {\n    const routeId = this.getFormattedRouteId();\n    const relativePath = !!previous.hasRouteId() ? '..' : '.';\n    const path = routeId ? [relativePath, routeId, this.getFormattedParameters()] : [relativePath, this.getFormattedParameters()];\n    router.navigate(path, {\n      relativeTo: activatedRoute\n    });\n  }\n}\n\nexport class RouteParameterBindings extends GarbageCollector {\n\n  public readonly _incomingRouteChange = new MutableValueModel<boolean>(false);\n\n  private txo: TransactionObserver;\n\n  private readonly resolvedParameters = new MutableValueModel<ResolvedParameters>();\n\n  constructor(private readonly component: any, private readonly router: Router, private readonly activatedRoute: ActivatedRoute) {\n    super();\n    const { chain, valueOf, before, when, after, observe } = Dsl.disposeWith(this);\n    this.txo = new TransactionObserver();//.onEvent(e => console.log(e.toString()));\n\n    const routeParameterDefs: ParameterDefinition<any>[] = Klass.get(component).getMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY);\n    routeParameterDefs.forEach(parameter => this.installBinding(parameter));\n\n    const incomingResolvedRouteParameters = observe.valuesFrom(activatedRoute.paramMap)\n      .last()\n      .map(params => {\n        const result: ResolvedParameter<any>[] = [];\n        routeParameterDefs.forEach(parameterDef => {\n          let resolvedValue;\n          if (parameterDef.isArray) {\n            resolvedValue = params.getAll(parameterDef.name).map(v => parameterDef.type.parse(v));\n          } else {\n            resolvedValue = parameterDef.type.parse(params.get(parameterDef.name));\n          }\n          result.push({ parameterDef: parameterDef, resolvedValue: resolvedValue });\n\n        });\n        return new ResolvedParameters(result);\n      });\n\n    incomingResolvedRouteParameters.subscribe(resolvedParameters => {\n      this._incomingRouteChange.value = true;\n      this.resolvedParameters.value = resolvedParameters;\n      this._incomingRouteChange.value = false;\n    });\n\n    when.valueOf(this.resolvedParameters).changes((params, previous) => {\n      params.redirect(previous, router, activatedRoute);\n    }, { unless: this.incomingRouteChange });\n\n    this.txo.observe('incomingResolvedRouteParameters', incomingResolvedRouteParameters);\n    this.txo.observe('this.routeIsChanging', this.incomingRouteChange);\n  }\n\n  get incomingRouteChange() {\n    return this._incomingRouteChange.readonly;\n  }\n\n  protected installBinding<T>(parameter: ParameterDefinition<T>) {\n    const model = this.getModelFor(parameter);\n    this.txo.observe(parameter.propertyName, model);\n    this.registerDisposable(new Binding(this.resolvedParameters, model, {\n      toRight(parameters: ResolvedParameters): T {\n        return parameters.get(parameter);\n      },\n      toLeft(value: T, currentParameters?: ResolvedParameters): ResolvedParameters {\n        return currentParameters.replace(parameter, value);\n      }\n    }));\n  }\n\n\n  private getModelFor<T>(parameter: ParameterDefinition<T>): MutableHasValue<T> {\n    return this.component[parameter.propertyName];\n  }\n}\n\nexport namespace RouteParameterBindings {\n  export const ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');\n}\n"]}
|
|
@@ -3,43 +3,170 @@
|
|
|
3
3
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
4
4
|
*/
|
|
5
5
|
import * as tslib_1 from "tslib";
|
|
6
|
-
import { assert
|
|
6
|
+
import { assert } from '@coolon/pectin';
|
|
7
7
|
import { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';
|
|
8
|
+
import * as _ from 'lodash';
|
|
9
|
+
/**
|
|
10
|
+
* @abstract
|
|
11
|
+
* @template T, S
|
|
12
|
+
*/
|
|
13
|
+
var /**
|
|
14
|
+
* @abstract
|
|
15
|
+
* @template T, S
|
|
16
|
+
*/
|
|
17
|
+
Sanitiser = /** @class */ (function () {
|
|
18
|
+
function Sanitiser(parameterDef, snapshot, sanitiser) {
|
|
19
|
+
this.parameterDef = parameterDef;
|
|
20
|
+
this.snapshot = snapshot;
|
|
21
|
+
this.sanitiser = sanitiser;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* @return {?}
|
|
25
|
+
*/
|
|
26
|
+
Sanitiser.prototype.isRouteId = /**
|
|
27
|
+
* @return {?}
|
|
28
|
+
*/
|
|
29
|
+
function () {
|
|
30
|
+
return this.parameterDef.isRouteId;
|
|
31
|
+
};
|
|
32
|
+
Object.defineProperty(Sanitiser.prototype, "valueChanged", {
|
|
33
|
+
get: /**
|
|
34
|
+
* @return {?}
|
|
35
|
+
*/
|
|
36
|
+
function () {
|
|
37
|
+
return !_.isNil(this.initialValue) && this.hasChanged(this.initialValue, this.sanitisedValue);
|
|
38
|
+
},
|
|
39
|
+
enumerable: true,
|
|
40
|
+
configurable: true
|
|
41
|
+
});
|
|
42
|
+
Object.defineProperty(Sanitiser.prototype, "sanitisedValue", {
|
|
43
|
+
get: /**
|
|
44
|
+
* @return {?}
|
|
45
|
+
*/
|
|
46
|
+
function () {
|
|
47
|
+
return this._sanitisedValue;
|
|
48
|
+
},
|
|
49
|
+
enumerable: true,
|
|
50
|
+
configurable: true
|
|
51
|
+
});
|
|
52
|
+
/**
|
|
53
|
+
* @return {?}
|
|
54
|
+
*/
|
|
55
|
+
Sanitiser.prototype.sanitize = /**
|
|
56
|
+
* @return {?}
|
|
57
|
+
*/
|
|
58
|
+
function () {
|
|
59
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
60
|
+
var _a;
|
|
61
|
+
return tslib_1.__generator(this, function (_b) {
|
|
62
|
+
switch (_b.label) {
|
|
63
|
+
case 0:
|
|
64
|
+
if (!this.sanitiser) return [3 /*break*/, 2];
|
|
65
|
+
this.initialValue = this.readFrom(this.snapshot);
|
|
66
|
+
_a = this;
|
|
67
|
+
return [4 /*yield*/, this.sanitiser.sanitise(this.initialValue)];
|
|
68
|
+
case 1:
|
|
69
|
+
_a._sanitisedValue = _b.sent();
|
|
70
|
+
if (this.initialValue !== this._sanitisedValue) {
|
|
71
|
+
return [2 /*return*/, false];
|
|
72
|
+
}
|
|
73
|
+
_b.label = 2;
|
|
74
|
+
case 2: return [2 /*return*/, true];
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
};
|
|
79
|
+
return Sanitiser;
|
|
80
|
+
}());
|
|
81
|
+
/**
|
|
82
|
+
* @abstract
|
|
83
|
+
* @template T, S
|
|
84
|
+
*/
|
|
85
|
+
export { Sanitiser };
|
|
86
|
+
if (false) {
|
|
87
|
+
/**
|
|
88
|
+
* @type {?}
|
|
89
|
+
* @private
|
|
90
|
+
*/
|
|
91
|
+
Sanitiser.prototype.initialValue;
|
|
92
|
+
/**
|
|
93
|
+
* @type {?}
|
|
94
|
+
* @private
|
|
95
|
+
*/
|
|
96
|
+
Sanitiser.prototype._sanitisedValue;
|
|
97
|
+
/** @type {?} */
|
|
98
|
+
Sanitiser.prototype.parameterDef;
|
|
99
|
+
/** @type {?} */
|
|
100
|
+
Sanitiser.prototype.snapshot;
|
|
101
|
+
/** @type {?} */
|
|
102
|
+
Sanitiser.prototype.sanitiser;
|
|
103
|
+
/**
|
|
104
|
+
* @abstract
|
|
105
|
+
* @protected
|
|
106
|
+
* @param {?} snapshot
|
|
107
|
+
* @return {?}
|
|
108
|
+
*/
|
|
109
|
+
Sanitiser.prototype.readFrom = function (snapshot) { };
|
|
110
|
+
/**
|
|
111
|
+
* @abstract
|
|
112
|
+
* @protected
|
|
113
|
+
* @param {?} initialValue
|
|
114
|
+
* @param {?} sanitisedValue
|
|
115
|
+
* @return {?}
|
|
116
|
+
*/
|
|
117
|
+
Sanitiser.prototype.hasChanged = function (initialValue, sanitisedValue) { };
|
|
118
|
+
/**
|
|
119
|
+
* @abstract
|
|
120
|
+
* @param {?} dest
|
|
121
|
+
* @return {?}
|
|
122
|
+
*/
|
|
123
|
+
Sanitiser.prototype.injectRouteParam = function (dest) { };
|
|
124
|
+
}
|
|
8
125
|
var RouteParameterSanitiser = /** @class */ (function () {
|
|
9
|
-
function RouteParameterSanitiser(parameterDefs, injector) {
|
|
126
|
+
function RouteParameterSanitiser(parameterDefs, snapshot, injector) {
|
|
127
|
+
var _this = this;
|
|
10
128
|
this.parameterDefs = parameterDefs;
|
|
129
|
+
this.snapshot = snapshot;
|
|
11
130
|
this.injector = injector;
|
|
12
|
-
this.
|
|
13
|
-
|
|
131
|
+
this.parameterSanitisers = [];
|
|
132
|
+
/** @type {?} */
|
|
133
|
+
var sanitisers = parameterDefs.map((/**
|
|
134
|
+
* @param {?} def
|
|
135
|
+
* @return {?}
|
|
136
|
+
*/
|
|
137
|
+
function (def) {
|
|
138
|
+
return def.isArray ?
|
|
139
|
+
new Sanitiser.Array(def, snapshot, _this.getSanitiser(def)) :
|
|
140
|
+
new Sanitiser.Value(def, snapshot, _this.getSanitiser(def));
|
|
141
|
+
}));
|
|
142
|
+
this.routeIdSanitiser = sanitisers.find((/**
|
|
14
143
|
* @param {?} p
|
|
15
144
|
* @return {?}
|
|
16
145
|
*/
|
|
17
|
-
function (p) { return p.isRouteId; }));
|
|
18
|
-
this.
|
|
146
|
+
function (p) { return p.isRouteId(); }));
|
|
147
|
+
this.parameterSanitisers = sanitisers.filter((/**
|
|
19
148
|
* @param {?} p
|
|
20
149
|
* @return {?}
|
|
21
150
|
*/
|
|
22
|
-
function (p) { return !p.isRouteId; }));
|
|
151
|
+
function (p) { return !p.isRouteId(); }));
|
|
23
152
|
}
|
|
24
153
|
/**
|
|
25
|
-
* @param {?} snapshot
|
|
26
154
|
* @return {?}
|
|
27
155
|
*/
|
|
28
156
|
RouteParameterSanitiser.prototype.sanitise = /**
|
|
29
|
-
* @param {?} snapshot
|
|
30
157
|
* @return {?}
|
|
31
158
|
*/
|
|
32
|
-
function (
|
|
159
|
+
function () {
|
|
33
160
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
34
|
-
var e_1, _a,
|
|
161
|
+
var e_1, _a, _b, _c, sanitiser, e_1_1;
|
|
35
162
|
return tslib_1.__generator(this, function (_d) {
|
|
36
163
|
switch (_d.label) {
|
|
37
164
|
case 0:
|
|
38
|
-
if (!this.
|
|
39
|
-
return [4 /*yield*/, this.
|
|
165
|
+
if (!this.routeIdSanitiser) return [3 /*break*/, 2];
|
|
166
|
+
return [4 /*yield*/, this.routeIdSanitiser.sanitize()];
|
|
40
167
|
case 1:
|
|
41
|
-
|
|
42
|
-
if (
|
|
168
|
+
_d.sent();
|
|
169
|
+
if (this.routeIdSanitiser.valueChanged) {
|
|
43
170
|
// if the route id isn't ok we redirect immediately as the query params may need to be sanitised in the
|
|
44
171
|
// context of the route id.
|
|
45
172
|
return [2 /*return*/, false];
|
|
@@ -47,12 +174,12 @@ var RouteParameterSanitiser = /** @class */ (function () {
|
|
|
47
174
|
_d.label = 2;
|
|
48
175
|
case 2:
|
|
49
176
|
_d.trys.push([2, 7, 8, 9]);
|
|
50
|
-
_b = tslib_1.__values(this.
|
|
177
|
+
_b = tslib_1.__values(this.parameterSanitisers), _c = _b.next();
|
|
51
178
|
_d.label = 3;
|
|
52
179
|
case 3:
|
|
53
180
|
if (!!_c.done) return [3 /*break*/, 6];
|
|
54
|
-
|
|
55
|
-
return [4 /*yield*/,
|
|
181
|
+
sanitiser = _c.value;
|
|
182
|
+
return [4 /*yield*/, sanitiser.sanitize()];
|
|
56
183
|
case 4:
|
|
57
184
|
_d.sent();
|
|
58
185
|
_d.label = 5;
|
|
@@ -70,42 +197,11 @@ var RouteParameterSanitiser = /** @class */ (function () {
|
|
|
70
197
|
}
|
|
71
198
|
finally { if (e_1) throw e_1.error; }
|
|
72
199
|
return [7 /*endfinally*/];
|
|
73
|
-
case 9: return [2 /*return*/, this.
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
/**
|
|
79
|
-
* @template T
|
|
80
|
-
* @param {?} def
|
|
81
|
-
* @param {?} formattedInitialValue
|
|
82
|
-
* @return {?}
|
|
83
|
-
*/
|
|
84
|
-
RouteParameterSanitiser.prototype.sanitiseParameter = /**
|
|
85
|
-
* @template T
|
|
86
|
-
* @param {?} def
|
|
87
|
-
* @param {?} formattedInitialValue
|
|
88
|
-
* @return {?}
|
|
89
|
-
*/
|
|
90
|
-
function (def, formattedInitialValue) {
|
|
91
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
92
|
-
var sanitiser, initialValue, sanitisedValue;
|
|
93
|
-
return tslib_1.__generator(this, function (_a) {
|
|
94
|
-
switch (_a.label) {
|
|
95
|
-
case 0:
|
|
96
|
-
if (!def) return [3 /*break*/, 2];
|
|
97
|
-
sanitiser = this.getSanitiser(def);
|
|
98
|
-
if (!sanitiser) return [3 /*break*/, 2];
|
|
99
|
-
initialValue = def.type.parse(formattedInitialValue);
|
|
100
|
-
return [4 /*yield*/, sanitiser.sanitise(initialValue)];
|
|
101
|
-
case 1:
|
|
102
|
-
sanitisedValue = _a.sent();
|
|
103
|
-
if (initialValue !== sanitisedValue) {
|
|
104
|
-
this.sanitisedParameters.push({ def: def, value: def.type.format(sanitisedValue) });
|
|
105
|
-
return [2 /*return*/, false];
|
|
106
|
-
}
|
|
107
|
-
_a.label = 2;
|
|
108
|
-
case 2: return [2 /*return*/, true];
|
|
200
|
+
case 9: return [2 /*return*/, !this.parameterSanitisers.find((/**
|
|
201
|
+
* @param {?} s
|
|
202
|
+
* @return {?}
|
|
203
|
+
*/
|
|
204
|
+
function (s) { return s.valueChanged; }))];
|
|
109
205
|
}
|
|
110
206
|
});
|
|
111
207
|
});
|
|
@@ -119,57 +215,36 @@ var RouteParameterSanitiser = /** @class */ (function () {
|
|
|
119
215
|
* @return {?}
|
|
120
216
|
*/
|
|
121
217
|
function (router) {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
var sanitisedRouteId = this.sanitisedParameters.find((/**
|
|
126
|
-
* @param {?} s
|
|
127
|
-
* @return {?}
|
|
128
|
-
*/
|
|
129
|
-
function (s) { return s.def === _this.routeParameter; }));
|
|
130
|
-
if (sanitisedRouteId) {
|
|
131
|
-
return router.navigate(['..', sanitisedRouteId.value]);
|
|
218
|
+
assert.isTruthy(this.parameterSanitisers.length !== 0);
|
|
219
|
+
if (this.routeIdSanitiser.valueChanged) {
|
|
220
|
+
return router.navigate(['..', this.routeIdSanitiser.sanitisedValue]);
|
|
132
221
|
}
|
|
133
222
|
else {
|
|
134
223
|
/** @type {?} */
|
|
135
|
-
var
|
|
224
|
+
var routeParams_1 = {};
|
|
225
|
+
this.parameterSanitisers.forEach((/**
|
|
136
226
|
* @param {?} s
|
|
137
227
|
* @return {?}
|
|
138
228
|
*/
|
|
139
|
-
function (s) { return s.
|
|
140
|
-
|
|
141
|
-
* @param {?} params
|
|
142
|
-
* @param {?} item
|
|
143
|
-
* @return {?}
|
|
144
|
-
*/
|
|
145
|
-
function (params, item) {
|
|
146
|
-
var _a;
|
|
147
|
-
return (tslib_1.__assign({}, params, (_a = {}, _a[item.def.name] = item.value, _a)));
|
|
148
|
-
}), {});
|
|
149
|
-
return router.navigate(['.', queryParams]);
|
|
229
|
+
function (s) { return s.injectRouteParam(routeParams_1); }));
|
|
230
|
+
return router.navigate(['.', routeParams_1]);
|
|
150
231
|
}
|
|
151
232
|
};
|
|
152
233
|
/**
|
|
153
234
|
* @private
|
|
154
|
-
* @template T
|
|
235
|
+
* @template T, S
|
|
155
236
|
* @param {?} def
|
|
156
237
|
* @return {?}
|
|
157
238
|
*/
|
|
158
239
|
RouteParameterSanitiser.prototype.getSanitiser = /**
|
|
159
240
|
* @private
|
|
160
|
-
* @template T
|
|
241
|
+
* @template T, S
|
|
161
242
|
* @param {?} def
|
|
162
243
|
* @return {?}
|
|
163
244
|
*/
|
|
164
245
|
function (def) {
|
|
165
246
|
return def.sanitiser ? this.injector.get(def.sanitiser, new def.sanitiser()) : null;
|
|
166
247
|
};
|
|
167
|
-
tslib_1.__decorate([
|
|
168
|
-
Trace(),
|
|
169
|
-
tslib_1.__metadata("design:type", Function),
|
|
170
|
-
tslib_1.__metadata("design:paramtypes", [Object, String]),
|
|
171
|
-
tslib_1.__metadata("design:returntype", Promise)
|
|
172
|
-
], RouteParameterSanitiser.prototype, "sanitiseParameter", null);
|
|
173
248
|
tslib_1.__decorate([
|
|
174
249
|
Memoize(),
|
|
175
250
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -184,20 +259,137 @@ if (false) {
|
|
|
184
259
|
* @type {?}
|
|
185
260
|
* @private
|
|
186
261
|
*/
|
|
187
|
-
RouteParameterSanitiser.prototype.
|
|
262
|
+
RouteParameterSanitiser.prototype.routeIdSanitiser;
|
|
188
263
|
/**
|
|
189
264
|
* @type {?}
|
|
190
265
|
* @private
|
|
191
266
|
*/
|
|
192
|
-
RouteParameterSanitiser.prototype.
|
|
193
|
-
/**
|
|
194
|
-
* @type {?}
|
|
195
|
-
* @private
|
|
196
|
-
*/
|
|
197
|
-
RouteParameterSanitiser.prototype.sanitisedParameters;
|
|
267
|
+
RouteParameterSanitiser.prototype.parameterSanitisers;
|
|
198
268
|
/** @type {?} */
|
|
199
269
|
RouteParameterSanitiser.prototype.parameterDefs;
|
|
200
270
|
/** @type {?} */
|
|
271
|
+
RouteParameterSanitiser.prototype.snapshot;
|
|
272
|
+
/** @type {?} */
|
|
201
273
|
RouteParameterSanitiser.prototype.injector;
|
|
202
274
|
}
|
|
203
|
-
|
|
275
|
+
(function (Sanitiser) {
|
|
276
|
+
/**
|
|
277
|
+
* @template T
|
|
278
|
+
*/
|
|
279
|
+
var /**
|
|
280
|
+
* @template T
|
|
281
|
+
*/
|
|
282
|
+
Value = /** @class */ (function (_super) {
|
|
283
|
+
tslib_1.__extends(Value, _super);
|
|
284
|
+
function Value() {
|
|
285
|
+
return _super !== null && _super.apply(this, arguments) || this;
|
|
286
|
+
}
|
|
287
|
+
/**
|
|
288
|
+
* @param {?} snapshot
|
|
289
|
+
* @return {?}
|
|
290
|
+
*/
|
|
291
|
+
Value.prototype.readFrom = /**
|
|
292
|
+
* @param {?} snapshot
|
|
293
|
+
* @return {?}
|
|
294
|
+
*/
|
|
295
|
+
function (snapshot) {
|
|
296
|
+
/** @type {?} */
|
|
297
|
+
var rawValue = this.parameterDef.isRouteId ?
|
|
298
|
+
snapshot.paramMap.get(this.parameterDef.name) :
|
|
299
|
+
snapshot.queryParamMap.get(this.parameterDef.name);
|
|
300
|
+
return this.parameterDef.type.parse(rawValue);
|
|
301
|
+
};
|
|
302
|
+
/**
|
|
303
|
+
* @protected
|
|
304
|
+
* @param {?} initialValue
|
|
305
|
+
* @param {?} sanitisedValue
|
|
306
|
+
* @return {?}
|
|
307
|
+
*/
|
|
308
|
+
Value.prototype.hasChanged = /**
|
|
309
|
+
* @protected
|
|
310
|
+
* @param {?} initialValue
|
|
311
|
+
* @param {?} sanitisedValue
|
|
312
|
+
* @return {?}
|
|
313
|
+
*/
|
|
314
|
+
function (initialValue, sanitisedValue) {
|
|
315
|
+
return initialValue !== sanitisedValue;
|
|
316
|
+
};
|
|
317
|
+
/**
|
|
318
|
+
* @param {?} dest
|
|
319
|
+
* @return {?}
|
|
320
|
+
*/
|
|
321
|
+
Value.prototype.injectRouteParam = /**
|
|
322
|
+
* @param {?} dest
|
|
323
|
+
* @return {?}
|
|
324
|
+
*/
|
|
325
|
+
function (dest) {
|
|
326
|
+
dest[this.parameterDef.name] = this.parameterDef.type.format(this.sanitisedValue);
|
|
327
|
+
};
|
|
328
|
+
return Value;
|
|
329
|
+
}(Sanitiser));
|
|
330
|
+
Sanitiser.Value = Value;
|
|
331
|
+
/**
|
|
332
|
+
* @template T
|
|
333
|
+
*/
|
|
334
|
+
var /**
|
|
335
|
+
* @template T
|
|
336
|
+
*/
|
|
337
|
+
Array = /** @class */ (function (_super) {
|
|
338
|
+
tslib_1.__extends(Array, _super);
|
|
339
|
+
function Array() {
|
|
340
|
+
return _super !== null && _super.apply(this, arguments) || this;
|
|
341
|
+
}
|
|
342
|
+
/**
|
|
343
|
+
* @param {?} snapshot
|
|
344
|
+
* @return {?}
|
|
345
|
+
*/
|
|
346
|
+
Array.prototype.readFrom = /**
|
|
347
|
+
* @param {?} snapshot
|
|
348
|
+
* @return {?}
|
|
349
|
+
*/
|
|
350
|
+
function (snapshot) {
|
|
351
|
+
var _this = this;
|
|
352
|
+
/** @type {?} */
|
|
353
|
+
var rawValues = snapshot.queryParamMap.getAll(this.parameterDef.name);
|
|
354
|
+
return rawValues.map((/**
|
|
355
|
+
* @param {?} value
|
|
356
|
+
* @return {?}
|
|
357
|
+
*/
|
|
358
|
+
function (value) { return _this.parameterDef.type.parse(value); }));
|
|
359
|
+
};
|
|
360
|
+
/**
|
|
361
|
+
* @protected
|
|
362
|
+
* @param {?} initialValue
|
|
363
|
+
* @param {?} sanitisedValue
|
|
364
|
+
* @return {?}
|
|
365
|
+
*/
|
|
366
|
+
Array.prototype.hasChanged = /**
|
|
367
|
+
* @protected
|
|
368
|
+
* @param {?} initialValue
|
|
369
|
+
* @param {?} sanitisedValue
|
|
370
|
+
* @return {?}
|
|
371
|
+
*/
|
|
372
|
+
function (initialValue, sanitisedValue) {
|
|
373
|
+
return initialValue !== sanitisedValue;
|
|
374
|
+
};
|
|
375
|
+
/**
|
|
376
|
+
* @param {?} dest
|
|
377
|
+
* @return {?}
|
|
378
|
+
*/
|
|
379
|
+
Array.prototype.injectRouteParam = /**
|
|
380
|
+
* @param {?} dest
|
|
381
|
+
* @return {?}
|
|
382
|
+
*/
|
|
383
|
+
function (dest) {
|
|
384
|
+
var _this = this;
|
|
385
|
+
dest[this.parameterDef.name] = this.sanitisedValue.map((/**
|
|
386
|
+
* @param {?} v
|
|
387
|
+
* @return {?}
|
|
388
|
+
*/
|
|
389
|
+
function (v) { return _this.parameterDef.type.format(v); }));
|
|
390
|
+
};
|
|
391
|
+
return Array;
|
|
392
|
+
}(Sanitiser));
|
|
393
|
+
Sanitiser.Array = Array;
|
|
394
|
+
})(Sanitiser || (Sanitiser = {}));
|
|
395
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-parameter-sanitiser.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/route-parameter-sanitiser.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport { ActivatedRouteSnapshot, Router } from '@angular/router';\nimport { assert } from '@coolon/pectin';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport { ParameterDefinition } from './parameter-definition.class';\nimport { ParameterSanitiser } from './parameter-sanitiser';\nimport * as _ from 'lodash';\n\nexport abstract class Sanitiser<T, S> {\n\n  private initialValue: S;\n  private _sanitisedValue: S;\n\n  constructor(readonly parameterDef: ParameterDefinition<T>, readonly snapshot:ActivatedRouteSnapshot, readonly sanitiser: ParameterSanitiser<S>) {\n  }\n\n  isRouteId(): boolean {\n    return this.parameterDef.isRouteId;\n  }\n\n  get valueChanged():boolean {\n    return !_.isNil(this.initialValue) && this.hasChanged(this.initialValue, this.sanitisedValue);\n  }\n\n  get sanitisedValue():S {\n    return this._sanitisedValue;\n  }\n\n  protected abstract readFrom(snapshot: ActivatedRouteSnapshot): S;\n  protected abstract hasChanged(initialValue:S, sanitisedValue:S): boolean;\n\n  abstract injectRouteParam(dest: {});\n\n  async sanitize(): Promise<boolean> {\n    if (this.sanitiser) {\n      this.initialValue = this.readFrom(this.snapshot);\n      this._sanitisedValue = await this.sanitiser.sanitise(this.initialValue);\n      if (this.initialValue !== this._sanitisedValue) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n\n\nexport class RouteParameterSanitiser {\n\n  private readonly routeIdSanitiser: Sanitiser<any, any>;\n  private readonly parameterSanitisers: Sanitiser<any, any>[] = [];\n\n  constructor(readonly parameterDefs: ParameterDefinition<any>[], readonly snapshot: ActivatedRouteSnapshot, readonly injector: Injector) {\n    const sanitisers = parameterDefs.map(def => {\n      return def.isArray ?\n        new Sanitiser.Array(def, snapshot, this.getSanitiser(def)) :\n        new Sanitiser.Value(def, snapshot, this.getSanitiser(def));\n    });\n    this.routeIdSanitiser = sanitisers.find(p => p.isRouteId());\n    this.parameterSanitisers = sanitisers.filter(p => !p.isRouteId());\n  }\n\n  async sanitise(): Promise<boolean> {\n    if (this.routeIdSanitiser) {\n      await this.routeIdSanitiser.sanitize();\n      if (this.routeIdSanitiser.valueChanged) {\n        // if the route id isn't ok we redirect immediately as the query params may need to be sanitised in the\n        // context of the route id.\n        return false;\n      }\n    }\n    for (const sanitiser of this.parameterSanitisers) {\n        await sanitiser.sanitize();\n    }\n    return !this.parameterSanitisers.find(s => s.valueChanged);\n  }\n\n  redirect(router: Router) {\n    assert.isTruthy(this.parameterSanitisers.length !== 0);\n    if (this.routeIdSanitiser.valueChanged) {\n      return router.navigate(['..', this.routeIdSanitiser.sanitisedValue]);\n    } else {\n      const routeParams = {};\n      this.parameterSanitisers.forEach(s => s.injectRouteParam(routeParams));\n      return router.navigate(['.', routeParams]);\n    }\n  }\n\n  @Memoize()\n  private getSanitiser<T, S>(def: ParameterDefinition<T, S>): ParameterSanitiser<S> {\n    return def.sanitiser ? this.injector.get<ParameterSanitiser<S>>(def.sanitiser, new def.sanitiser()) : null;\n  }\n}\n\nexport namespace Sanitiser {\n\n  export class Value<T> extends Sanitiser<T, T> {\n\n    readFrom(snapshot: ActivatedRouteSnapshot): T {\n      const rawValue = this.parameterDef.isRouteId ?\n        snapshot.paramMap.get(this.parameterDef.name) :\n        snapshot.queryParamMap.get(this.parameterDef.name);\n\n      return this.parameterDef.type.parse(rawValue);\n    }\n\n    protected hasChanged(initialValue: T, sanitisedValue: T): boolean {\n      return initialValue !== sanitisedValue;\n    }\n\n    injectRouteParam(dest: {}) {\n      dest[this.parameterDef.name] = this.parameterDef.type.format(this.sanitisedValue);\n    }\n\n  }\n\n  export class Array<T> extends Sanitiser<T, T[]> {\n\n    readFrom(snapshot: ActivatedRouteSnapshot): T[] {\n      const rawValues = snapshot.queryParamMap.getAll(this.parameterDef.name);\n      return rawValues.map(value => this.parameterDef.type.parse(value));\n    }\n\n    protected hasChanged(initialValue: T[], sanitisedValue: T[]): boolean {\n      return initialValue !== sanitisedValue;\n    }\n\n\n    injectRouteParam(dest: {}) {\n      dest[this.parameterDef.name] = this.sanitisedValue.map(v => this.parameterDef.type.format(v));\n    }\n\n\n  }\n\n}\n"]}
|