@coolon/angular-ui-powerups 0.0.68 → 0.0.70

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

@@ -2389,7 +2389,7 @@ ParameterDefinition = /** @class */ (function () {
      * @return {?}
      */
     function (visit) {
-        return !visit.hasParameter(this.name) || (this.isRouteId && !visit.hasRouteId());
+        return !visit.hasParameter(this.name);
     };
     return ParameterDefinition;
 }());
@@ -2856,7 +2856,17 @@ var PlaceDefinition = /** @class */ (function () {
                     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;
+                    }
                 }
             }
         }));
@@ -3786,6 +3796,9 @@ var PlaceRouter = /** @class */ (function (_super) {
         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, (/**
@@ -3802,16 +3815,13 @@ 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
                             });
                         }))];
                 }
-                else {
-                    this.placeHistory.add(next);
-                }
                 return [2 /*return*/];
             });
         });
@@ -3923,7 +3933,7 @@ var PlaceRouter = /** @class */ (function (_super) {
      * @param {?} activatedRoute
      * @return {?}
      */
-    PlaceRouter.prototype.getChildPath = /**
+    PlaceRouter.prototype.extractChildPath = /**
      * @param {?} activatedRoute
      * @return {?}
      */
@@ -5117,6 +5127,8 @@ function RouteId(type, options) {
  * @return {?}
  */
 function VisitParameter(options) {
+    /** @type {?} */
+    var opts = Opts.get(options);
     return (/**
      * @param {?} prototype
      * @param {?} propertyKey
@@ -5124,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);
     });
@@ -5135,6 +5147,8 @@ function VisitParameter(options) {
  * @return {?}
  */
 function VisitParameterList(options) {
+    /** @type {?} */
+    var opts = Opts.get(options);
     return (/**
      * @param {?} prototype
      * @param {?} propertyKey
@@ -5142,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);
     });
@@ -5451,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:
@@ -5464,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,