@coolon/angular-ui-powerups 0.0.68 → 0.0.70

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

@@ -2572,7 +2572,7 @@
          * @return {?}
          */
         function (visit) {
-            return !visit.hasParameter(this.name) || (this.isRouteId && !visit.hasRouteId());
+            return !visit.hasParameter(this.name);
         };
         return ParameterDefinition;
     }());
@@ -3039,7 +3039,17 @@
                         function (v) { return def.urlFormat.parse(v); }));
                     }
                     else {
-                        result[def.name] = def.urlFormat.parse(params.get(def.name));
+                        /** @type {?} */
+                        var value = def.urlFormat.parse(params.get(def.name));
+                        // because our id routes redirect if the id isn't pressent we always have a id
+                        // parameter in our params.  This will bugger our remember and defaultvalue sanitisation
+                        // as it'll see that the id is present (event thought its null).  The sanitisation can't
+                        // check for null as that's a valid value for the id.
+                        /** @type {?} */
+                        var isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);
+                        if (!isEmptyRouteId) {
+                            result[def.name] = value;
+                        }
                     }
                 }
             }));
@@ -3969,6 +3979,9 @@
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_a) {
+                    // we have to push to history so our remember sanitisers don't pick up the previous value
+                    // when it's been cleared by the user.
+                    this.placeHistory.add(next);
                     // FIXME: no route id -> route id duplicates route parameters
                     if (next.hasRoutingChangedFrom(previous)) {
                         return [2 /*return*/, this.doNavigation(next, (/**
@@ -3985,16 +3998,13 @@
                                     [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
                                 });
                             }))];
                     }
-                    else {
-                        this.placeHistory.add(next);
-                    }
                     return [2 /*return*/];
                 });
             });
@@ -4106,7 +4116,7 @@
          * @param {?} activatedRoute
          * @return {?}
          */
-        PlaceRouter.prototype.getChildPath = /**
+        PlaceRouter.prototype.extractChildPath = /**
          * @param {?} activatedRoute
          * @return {?}
          */
@@ -5300,6 +5310,8 @@
      * @return {?}
      */
     function VisitParameter(options) {
+        /** @type {?} */
+        var opts = typescriptUtilities.Opts.get(options);
         return (/**
          * @param {?} prototype
          * @param {?} propertyKey
@@ -5307,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);
         });
@@ -5318,6 +5330,8 @@
      * @return {?}
      */
     function VisitParameterList(options) {
+        /** @type {?} */
+        var opts = typescriptUtilities.Opts.get(options);
         return (/**
          * @param {?} prototype
          * @param {?} propertyKey
@@ -5325,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);
         });
@@ -5634,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:
@@ -5647,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,