@coolon/angular-ui-powerups 12.4.0-alpha.87 → 12.4.0-alpha.89

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

@@ -7488,7 +7488,7 @@
                 },] }
     ];
 
-    var PARAMETER_DEFINITION_KEY = Symbol("parameterDefinition");
+    var PARAMETER_DEFINITION_KEY = Symbol('parameterDefinition');
     exports.ParameterDefinition = /** @class */ (function () {
         function ParameterDefinition(propertyName, options, urlFormat) {
             this.propertyName = propertyName;
@@ -7523,23 +7523,54 @@
         // @Trace()
         ParameterDefinition.prototype.sanitise = function (value, visit, placeHistory, injector, isPopState) {
             return __awaiter(this, void 0, void 0, function () {
-                var returningFromSomewhereElse, lastKnownVisit;
                 return __generator(this, function (_a) {
-                    if (this.isMissingFrom(visit)) {
-                        returningFromSomewhereElse = !placeHistory.lastVisitIncluded(visit.placeDefinition);
-                        if (returningFromSomewhereElse) {
-                            lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);
-                            if (this.remember && lastKnownVisit) {
-                                value = lastKnownVisit.getParameterValue(this);
-                            }
-                            return [2 /*return*/, this.isEmptyValue(value) ? this.defaultValue : value];
-                        }
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.sanitiseMissing(visit, placeHistory, value)];
+                        case 1:
+                            // console.log(`sanitise(${this.propertyName})`)
+                            value = _a.sent();
+                            return [4 /*yield*/, this.runCustomSanitiser(value, visit, placeHistory, injector, isPopState)];
+                        case 2:
+                            value = _a.sent();
+                            return [2 /*return*/, value];
                     }
-                    // todo: add custom sanitiser
-                    return [2 /*return*/, value];
                 });
             });
         };
+        ParameterDefinition.prototype.runCustomSanitiser = function (value, visit, placeHistory, injector, isPopState) {
+            return __awaiter(this, void 0, void 0, function () {
+                var customSanitiser;
+                return __generator(this, function (_a) {
+                    customSanitiser = this.prepareCustomSanitiser(injector);
+                    return [2 /*return*/, customSanitiser ? customSanitiser.sanitise(value, visit, injector) : value];
+                });
+            });
+        };
+        ParameterDefinition.prototype.sanitiseMissing = function (visit, placeHistory, value) {
+            if (this.isMissingFrom(visit)) {
+                var returningFromSomewhereElse = !placeHistory.lastVisitIncluded(visit.placeDefinition);
+                if (returningFromSomewhereElse) {
+                    var lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);
+                    if (this.remember && lastKnownVisit) {
+                        value = lastKnownVisit.getParameterValue(this);
+                    }
+                    value = this.isEmptyValue(value) ? this.defaultValue : value;
+                }
+            }
+            return value;
+        };
+        ParameterDefinition.prototype.prepareCustomSanitiser = function (injector) {
+            var customSanitiser = this.options.getOptional('sanitiser', null);
+            if (___default["default"].isFunction(customSanitiser)) {
+                return injector.get(customSanitiser);
+            }
+            if (___default["default"].isObject(customSanitiser)) {
+                return ___default["default"].isFunction(customSanitiser['sanitise']) ?
+                    customSanitiser :
+                    typescriptUtilities.lang.illegalState("expected @VisitParameter({sanitiser: ...}) for " + this.propertyName + " to be a constructor or instance of ParameterSanitiser, got: " + customSanitiser);
+            }
+            return undefined;
+        };
         ParameterDefinition.prototype.isMissingFrom = function (visit) {
             return !visit.hasParameter(this);
         };
@@ -7603,7 +7634,7 @@
         function get(model) {
             var parameterDefinition = model[PARAMETER_DEFINITION_KEY];
             if (!parameterDefinition) {
-                typescriptUtilities.lang.illegalArgument("model hasn't been annotated with @VisitParameter, @VisitParameterList or @RouteId");
+                typescriptUtilities.lang.illegalArgument('model hasn\'t been annotated with @VisitParameter, @VisitParameterList or @RouteId');
             }
             return parameterDefinition;
         }
@@ -9073,10 +9104,10 @@
          * Returns the value of the place parameter with the specified name.  The parameter
          * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the
          * same as the the ValueModel property name.
-         * @param parameterDef the visit parameter definition
+         * @param parameter the visit parameter definition
          */
-        Visit.prototype.getParameterValue = function (parameterDef) {
-            return this.visitParameters[parameterDef.name];
+        Visit.prototype.getParameterValue = function (parameter) {
+            return ___namespace.isString(parameter) ? this.visitParameters[parameter] : this.visitParameters[parameter.name];
         };
         // @Trace()
         Visit.prototype.hasParameter = function (parameterDef) {