@coolon/angular-ui-powerups 0.0.69 → 0.0.70

package/bundles/coolon-angular-ui-powerups.umd.js

@@ -3998,7 +3998,7 @@
                                     [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
@@ -4036,7 +4036,6 @@
                             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)];
@@ -4117,7 +4116,7 @@
          * @param {?} activatedRoute
          * @return {?}
          */
-        PlaceRouter.prototype.getChildPath = /**
+        PlaceRouter.prototype.extractChildPath = /**
          * @param {?} activatedRoute
          * @return {?}
          */
@@ -5311,6 +5310,8 @@
      * @return {?}
      */
     function VisitParameter(options) {
+        /** @type {?} */
+        var opts = typescriptUtilities.Opts.get(options);
         return (/**
          * @param {?} prototype
          * @param {?} propertyKey
@@ -5318,7 +5319,7 @@
          */
         function (prototype, propertyKey) {
             /** @type {?} */
-            var param = new exports.ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
+            var param = new exports.ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
             typescriptUtilities.Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
             pectin.UseDelegate()(prototype, propertyKey);
         });
@@ -5329,6 +5330,8 @@
      * @return {?}
      */
     function VisitParameterList(options) {
+        /** @type {?} */
+        var opts = typescriptUtilities.Opts.get(options);
         return (/**
          * @param {?} prototype
          * @param {?} propertyKey
@@ -5336,7 +5339,7 @@
          */
         function (prototype, propertyKey) {
             /** @type {?} */
-            var param = new exports.ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
+            var param = new exports.ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
             typescriptUtilities.Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
             pectin.UseDelegate()(prototype, propertyKey);
         });
@@ -5645,7 +5648,7 @@
          */
         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:
@@ -5658,14 +5661,14 @@
                             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,