@coolon/angular-ui-powerups 0.0.69 → 0.0.70

package/fesm5/coolon-angular-ui-powerups.js

@@ -3815,7 +3815,7 @@ var PlaceRouter = /** @class */ (function (_super) {
                                 [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :
                                 [def.getFormattedRouteParameters(next)];
                             /** @type {?} */
-                            var commands = [relativePath].concat(params, _this.getChildPath(activatedRoute.snapshot));
+                            var commands = [relativePath].concat(params, _this.extractChildPath(activatedRoute.snapshot));
                             console.log('### Redirect', commands);
                             return router.navigate(commands, {
                                 relativeTo: activatedRoute
@@ -3853,7 +3853,6 @@ var PlaceRouter = /** @class */ (function (_super) {
                         return [3 /*break*/, 5];
                     case 3:
                         def = visit.placeDefinition;
-                        // @see https://coolon.atlassian.net/browse/AUP-41
                         parameterCommands = visit.hasRouteId() ?
                             [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
                             [def.getFormattedRouteParameters(visit)];
@@ -3934,7 +3933,7 @@ var PlaceRouter = /** @class */ (function (_super) {
      * @param {?} activatedRoute
      * @return {?}
      */
-    PlaceRouter.prototype.getChildPath = /**
+    PlaceRouter.prototype.extractChildPath = /**
      * @param {?} activatedRoute
      * @return {?}
      */
@@ -5128,6 +5127,8 @@ function RouteId(type, options) {
  * @return {?}
  */
 function VisitParameter(options) {
+    /** @type {?} */
+    var opts = Opts.get(options);
     return (/**
      * @param {?} prototype
      * @param {?} propertyKey
@@ -5135,7 +5136,7 @@ function VisitParameter(options) {
      */
     function (prototype, propertyKey) {
         /** @type {?} */
-        var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
+        var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
         UseDelegate()(prototype, propertyKey);
     });
@@ -5146,6 +5147,8 @@ function VisitParameter(options) {
  * @return {?}
  */
 function VisitParameterList(options) {
+    /** @type {?} */
+    var opts = Opts.get(options);
     return (/**
      * @param {?} prototype
      * @param {?} propertyKey
@@ -5153,7 +5156,7 @@ function VisitParameterList(options) {
      */
     function (prototype, propertyKey) {
         /** @type {?} */
-        var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
+        var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
         UseDelegate()(prototype, propertyKey);
     });
@@ -5462,7 +5465,7 @@ var PlaceRouteGuard = /** @class */ (function () {
      */
     function (activatedRoute, state) {
         return __awaiter(this, void 0, void 0, function () {
-            var placeDefinition, params, parsedParams, initialVisit, sanitiser, updatedVisit, parameterCommands, commands;
+            var placeDefinition, params, parsedParams, initialVisit, sanitiser, sanitisedVisit, parameterCommands, commands;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5475,14 +5478,14 @@ var PlaceRouteGuard = /** @class */ (function () {
                         sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
                         return [4 /*yield*/, sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams))];
                     case 1:
-                        updatedVisit = _a.sent();
+                        sanitisedVisit = _a.sent();
                         // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters
-                        this.placeRouter.navigationSession.storeVisit(updatedVisit);
-                        if (initialVisit.hasRoutingChangedFrom(updatedVisit)) {
-                            parameterCommands = updatedVisit.hasRouteId() ?
-                                [placeDefinition.getFormattedRouteId(updatedVisit), placeDefinition.getFormattedRouteParameters(updatedVisit)] :
-                                [placeDefinition.getFormattedRouteParameters(updatedVisit)];
-                            commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.getChildPath(activatedRoute));
+                        this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
+                        if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
+                            parameterCommands = sanitisedVisit.hasRouteId() ?
+                                [placeDefinition.getFormattedRouteId(sanitisedVisit), placeDefinition.getFormattedRouteParameters(sanitisedVisit)] :
+                                [placeDefinition.getFormattedRouteParameters(sanitisedVisit)];
+                            commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.extractChildPath(activatedRoute));
                             console.log('##### Redirect', commands);
                             return [2 /*return*/, this.router.createUrlTree(commands, {
                                     replaceUrl: true,