@coolon/angular-ui-powerups 12.3.1 → 12.4.0-alpha.1

package/esm2015/lib/place/route/parameter-definition.js

@@ -1,6 +1,8 @@
 import { __awaiter } from "tslib";
-import { Opts } from '@coolon/typescript-utilities';
+import { MutableListModel, MutableValueModel } from '@coolon/pectin';
+import { lang, Opts } from '@coolon/typescript-utilities';
 import _ from 'lodash';
+const PARAMETER_DEFINITION_KEY = Symbol("parameterDefinition");
 export class ParameterDefinition {
     constructor(propertyName, options, urlFormat) {
         this.propertyName = propertyName;
@@ -16,6 +18,11 @@ export class ParameterDefinition {
     get isRouteParameter() {
         return !!this.urlFormat;
     }
+    createBackingModel() {
+        const model = this.backingModelFactory();
+        model[PARAMETER_DEFINITION_KEY] = this;
+        return model;
+    }
     getOptionValue(key) {
         return this.options.getOptional(key, null);
     }
@@ -27,7 +34,7 @@ export class ParameterDefinition {
                 if (returningFromSomewhereElse) {
                     const lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);
                     if (this.remember && lastKnownVisit) {
-                        value = lastKnownVisit.getParameter(this.name);
+                        value = lastKnownVisit.getParameterValue(this);
                     }
                     return this.isEmptyValue(value) ? this.defaultValue : value;
                 }
@@ -37,7 +44,7 @@ export class ParameterDefinition {
         });
     }
     isMissingFrom(visit) {
-        return !visit.hasParameter(this.name);
+        return !visit.hasParameter(this);
     }
 }
 (function (ParameterDefinition) {
@@ -46,6 +53,7 @@ export class ParameterDefinition {
             super(...arguments);
             this.isRouteId = true;
             this.isArray = false;
+            this.backingModelFactory = () => new MutableValueModel();
         }
         isEmptyValue(value) {
             return _.isNil(value);
@@ -60,6 +68,7 @@ export class ParameterDefinition {
             super(...arguments);
             this.isRouteId = false;
             this.isArray = false;
+            this.backingModelFactory = () => new MutableValueModel();
         }
         isEmptyValue(value) {
             return _.isNil(value);
@@ -74,6 +83,7 @@ export class ParameterDefinition {
             super(parameterName, options, urlFormat);
             this.isRouteId = false;
             this.isArray = true;
+            this.backingModelFactory = () => new MutableListModel();
         }
         isEmptyValue(value) {
             return _.isNil(value) || value.length < 1;
@@ -83,5 +93,13 @@ export class ParameterDefinition {
         }
     }
     ParameterDefinition.ArrayParameter = ArrayParameter;
+    function get(model) {
+        const parameterDefinition = model[PARAMETER_DEFINITION_KEY];
+        if (!parameterDefinition) {
+            lang.illegalArgument("model hasn't been annotated with @VisitParameter, @VisitParameterList or @RouteId");
+        }
+        return parameterDefinition;
+    }
+    ParameterDefinition.get = get;
 })(ParameterDefinition || (ParameterDefinition = {}));
 //# sourceMappingURL=parameter-definition.js.map

package/esm2015/lib/place/route/parameter-definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameter-definition.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/parameter-definition.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport { Trace } from '@coolon/pectin';\nimport { Opts } from '@coolon/typescript-utilities';\nimport _ from 'lodash';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\nimport { Formatter } from './formatter';\n\nexport abstract class ParameterDefinition<T, E = T> {\n\n  abstract readonly isRouteId: boolean;\n  abstract readonly isArray: boolean;\n\n  readonly remember: boolean;\n  readonly defaultValue: T;\n  private options: Opts<ParameterDefinition.Options<T>>;\n\n  constructor(readonly propertyName: string, options: ParameterDefinition.Options<T>, readonly urlFormat?: Formatter<E>) {\n    this.options = Opts.get(options);\n    this.remember = this.options.getOptional('remember', false);\n    this.defaultValue = this.options.getOptional('defaultValue', null);\n  }\n\n  get name() {\n    return this.options.getOptional('as', this.propertyName);\n  }\n\n  // @Trace()\n  get isRouteParameter(): boolean {\n    return !!this.urlFormat;\n  }\n\n  abstract isEmptyValue(value: T): boolean;\n\n  abstract hasChanged(a: any, b: any): boolean;\n\n  protected getOptionValue<K extends keyof ParameterDefinition.Options<T>>(key: K): ParameterDefinition.Options<T>[K] {\n    return this.options.getOptional(key, null);\n  }\n\n  // @Trace()\n  async sanitise(value:T, visit: Visit, placeHistory: PlaceHistory, injector: Injector, isPopState: boolean) {\n    if (this.isMissingFrom(visit)) {\n      const returningFromSomewhereElse = !placeHistory.lastVisitIncluded(visit.placeDefinition);\n      if (returningFromSomewhereElse) {\n        const lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);\n        if (this.remember && lastKnownVisit) {\n          value = lastKnownVisit.getParameter(this.name);\n        }\n        return this.isEmptyValue(value) ? this.defaultValue : value;\n      }\n    }\n    // todo: add custom sanitiser\n    return value;\n  }\n\n  private isMissingFrom(visit: Visit) {\n    return !visit.hasParameter(this.name);\n  }\n}\n\nexport namespace ParameterDefinition {\n\n  export interface Options<T> {\n    as?: string;\n    optional?: boolean;\n    remember?: boolean;\n    defaultValue?: T;\n    // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser.Options<T>;\n  }\n\n  export class RouteId<T> extends ParameterDefinition<T> {\n    readonly isRouteId = true;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ValueParameter<T> extends ParameterDefinition<T> {\n    readonly isRouteId = false;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ArrayParameter<T> extends ParameterDefinition<T[], T> {\n    readonly isRouteId = false;\n    readonly isArray = true;\n\n    constructor(parameterName: string, options: Options<T[]>, urlFormat: Formatter<T>) {\n      super(parameterName, options, urlFormat);\n    }\n\n    isEmptyValue(value: T[]): boolean {\n      return _.isNil(value) || value.length < 1;\n    }\n\n    hasChanged(a: T[], b: T[]): boolean {\n      return !_.isEqual(a, b);\n    }\n\n  }\n}\n"]}
+{"version":3,"file":"parameter-definition.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/parameter-definition.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport { HasValue, ListModel, MutableListModel, MutableValueModel, ValueModel } from '@coolon/pectin';\nimport { lang, Opts } from '@coolon/typescript-utilities';\nimport _ from 'lodash';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\nimport { Formatter } from './formatter';\n\nconst PARAMETER_DEFINITION_KEY = Symbol(\"parameterDefinition\")\n\nexport abstract class ParameterDefinition<T, E = T> {\n\n  abstract readonly isRouteId: boolean;\n  abstract readonly isArray: boolean;\n\n  readonly remember: boolean;\n  readonly defaultValue: T;\n  private options: Opts<ParameterDefinition.Options<T>>;\n  protected abstract backingModelFactory: () => HasValue<T>;\n\n  constructor(readonly propertyName: string, options: ParameterDefinition.Options<T>, readonly urlFormat?: Formatter<E>) {\n    this.options = Opts.get(options);\n    this.remember = this.options.getOptional('remember', false);\n    this.defaultValue = this.options.getOptional('defaultValue', null);\n  }\n\n  get name() {\n    return this.options.getOptional('as', this.propertyName);\n  }\n\n  // @Trace()\n  get isRouteParameter(): boolean {\n    return !!this.urlFormat;\n  }\n\n  abstract isEmptyValue(value: T): boolean;\n\n  abstract hasChanged(a: any, b: any): boolean;\n\n  createBackingModel(): HasValue<T> {\n    const model = this.backingModelFactory();\n    model[PARAMETER_DEFINITION_KEY] = this;\n    return model;\n  }\n\n  protected getOptionValue<K extends keyof ParameterDefinition.Options<T>>(key: K): ParameterDefinition.Options<T>[K] {\n    return this.options.getOptional(key, null);\n  }\n\n  // @Trace()\n  async sanitise(value: T, visit: Visit, placeHistory: PlaceHistory, injector: Injector, isPopState: boolean) {\n    if (this.isMissingFrom(visit)) {\n      const returningFromSomewhereElse = !placeHistory.lastVisitIncluded(visit.placeDefinition);\n      if (returningFromSomewhereElse) {\n        const lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);\n        if (this.remember && lastKnownVisit) {\n          value = lastKnownVisit.getParameterValue(this);\n        }\n        return this.isEmptyValue(value) ? this.defaultValue : value;\n      }\n    }\n    // todo: add custom sanitiser\n    return value;\n  }\n\n  private isMissingFrom(visit: Visit) {\n    return !visit.hasParameter(this);\n  }\n}\n\nexport namespace ParameterDefinition {\n\n  export interface Options<T> {\n    as?: string;\n    optional?: boolean;\n    remember?: boolean;\n    defaultValue?: T;\n    // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser.Options<T>;\n  }\n\n  export class RouteId<T> extends ParameterDefinition<T> {\n    readonly isRouteId = true;\n    readonly isArray = false;\n    protected backingModelFactory = () => new MutableValueModel<T>();\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n\n  }\n\n  export class ValueParameter<T> extends ParameterDefinition<T> {\n    readonly isRouteId = false;\n    readonly isArray = false;\n    protected backingModelFactory = () => new MutableValueModel<T>();\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ArrayParameter<T> extends ParameterDefinition<T[], T> {\n    readonly isRouteId = false;\n    readonly isArray = true;\n    protected backingModelFactory = () => new MutableListModel<T>();\n\n    constructor(parameterName: string, options: Options<T[]>, urlFormat: Formatter<T>) {\n      super(parameterName, options, urlFormat);\n    }\n\n    isEmptyValue(value: T[]): boolean {\n      return _.isNil(value) || value.length < 1;\n    }\n\n    hasChanged(a: T[], b: T[]): boolean {\n      return !_.isEqual(a, b);\n    }\n\n  }\n\n  export function get<T>(model: ValueModel<T>): ParameterDefinition.ValueParameter<T>\n  export function get<T>(model: ListModel<T>): ParameterDefinition.ArrayParameter<T>\n  export function get<T>(model: ValueModel<T> | ListModel<T>): ParameterDefinition.ValueParameter<T> | ParameterDefinition.ArrayParameter<T> {\n    const parameterDefinition = model[PARAMETER_DEFINITION_KEY];\n    if (!parameterDefinition) {\n      lang.illegalArgument(\"model hasn't been annotated with @VisitParameter, @VisitParameterList or @RouteId\");\n    }\n    return parameterDefinition;\n  }\n\n\n}\n"]}

package/esm2015/lib/place/route/parameter-definition.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ParameterDefinition":{"__symbolic":"class","arity":2,"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"select","expression":{"__symbolic":"reference","name":"ParameterDefinition"},"member":"Options","arguments":[{"__symbolic":"error","message":"Could not resolve type","line":17,"character":82,"context":{"typeName":"T"}}]},{"__symbolic":"reference","module":"./formatter","name":"Formatter","line":17,"character":107,"arguments":[{"__symbolic":"error","message":"Could not resolve type","line":17,"character":117,"context":{"typeName":"E"}}]}]}],"isEmptyValue":[{"__symbolic":"method"}],"hasChanged":[{"__symbolic":"method"}],"getOptionValue":[{"__symbolic":"method"}],"sanitise":[{"__symbolic":"method"}],"isMissingFrom":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ParameterDefinition":{"__symbolic":"class","arity":2,"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"select","expression":{"__symbolic":"reference","name":"ParameterDefinition"},"member":"Options","arguments":[{"__symbolic":"error","message":"Could not resolve type","line":20,"character":82,"context":{"typeName":"T"}}]},{"__symbolic":"reference","module":"./formatter","name":"Formatter","line":20,"character":107,"arguments":[{"__symbolic":"error","message":"Could not resolve type","line":20,"character":117,"context":{"typeName":"E"}}]}]}],"isEmptyValue":[{"__symbolic":"method"}],"hasChanged":[{"__symbolic":"method"}],"createBackingModel":[{"__symbolic":"method"}],"getOptionValue":[{"__symbolic":"method"}],"sanitise":[{"__symbolic":"method"}],"isMissingFrom":[{"__symbolic":"method"}]}}}}]

package/esm2015/lib/place/route/visit-sanitiser.js

@@ -31,7 +31,7 @@ export class VisitSanitiser {
             let sanitisedVisit = visit;
             for (let i = 0; i < parameterDefs.length; i++) {
                 const def = parameterDefs[i];
-                const value = visit.getParameter(def.name);
+                const value = visit.getParameterValue(def);
                 const sanitisedValue = yield def.sanitise(value, sanitisedVisit, this.placeHistory, this.injector, this.navigationSession.isPopState);
                 if (def.hasChanged(value, sanitisedValue)) {
                     sanitisedVisit = sanitisedVisit.replace(def, sanitisedValue);

package/esm2015/lib/place/route/visit-sanitiser.js.map

@@ -1 +1 @@
-{"version":3,"file":"visit-sanitiser.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/visit-sanitiser.ts"],"names":[],"mappings":";AAOA,MAAM,OAAO,cAAc;IACzB,YAAoB,iBAAoC,EAAU,cAAsC,EAAU,MAAc,EAAU,YAA0B,EAAU,QAAkB;QAA5K,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAU,mBAAc,GAAd,cAAc,CAAwB;QAAU,WAAM,GAAN,MAAM,CAAQ;QAAU,iBAAY,GAAZ,YAAY,CAAc;QAAU,aAAQ,GAAR,QAAQ,CAAU;IAEhM,CAAC;IAED,WAAW;IACL,QAAQ,CAAC,KAAY;;YACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC;YACvC,IAAI,QAAQ,CAAC,UAAU,EAAE,EAAE;gBACzB,MAAM,UAAU,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;gBACnC,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBACtI,0CAA0C;gBAC1C,oCAAoC;gBACpC,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE;oBAClD,+DAA+D;oBAC/D,qCAAqC;oBACrC,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;iBAClD;aACF;YAED,2EAA2E;YAC3E,MAAM,aAAa,GAAG,QAAQ,CAAC,qBAAqB,CAAC;gBACnD,sBAAsB,EAAE,IAAI;gBAC5B,yBAAyB,EAAE,IAAI;aAChC,CAAC,CAAC;YACH,IAAI,cAAc,GAAU,KAAK,CAAC;YAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7C,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBACtI,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE;oBACzC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;iBAC9D;aACF;YAED,OAAO,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;QACvE,CAAC;KAAA;CAEF","sourcesContent":["import { Injector } from '@angular/core';\nimport { ActivatedRouteSnapshot, Router } from '@angular/router';\nimport { Trace } from '@coolon/pectin';\nimport { NavigationSession } from '../navigation/session/navigation-session';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\n\nexport class VisitSanitiser {\n  constructor(private navigationSession: NavigationSession, private activatedRoute: ActivatedRouteSnapshot, private router: Router, private placeHistory: PlaceHistory, private injector: Injector) {\n\n  }\n\n  // @Trace()\n  async sanitise(visit: Visit): Promise<Visit> {\n    const placeDef = visit.placeDefinition;\n    if (placeDef.hasRouteId()) {\n      const routeIdDef = placeDef.getRouteIdParameterDef();\n      const routeId = visit.getRouteId();\n      const sanitisedValue = await routeIdDef.sanitise(routeId, visit, this.placeHistory, this.injector, this.navigationSession.isPopState);\n      // console.log({routeId, sanitisedValue});\n      // ###------- EARLY EXIT --------###\n      if (routeIdDef.hasChanged(routeId, sanitisedValue)) {\n        // if the route id has changed we redirect immediately as other\n        // parameter sanitisers might use it.\n        return visit.replace(routeIdDef, sanitisedValue);\n      }\n    }\n\n    // if we didn't replace the routeId we continue the url present parameters.\n    const parameterDefs = placeDef.getVisitParameterDefs({\n      includeRouteParameters: true,\n      includeNonRouteParameters: true\n    });\n    let sanitisedVisit: Visit = visit;\n    for (let i = 0; i < parameterDefs.length; i++) {\n      const def = parameterDefs[i];\n      const value = visit.getParameter(def.name);\n      const sanitisedValue = await def.sanitise(value, sanitisedVisit, this.placeHistory, this.injector, this.navigationSession.isPopState);\n      if (def.hasChanged(value, sanitisedValue)) {\n        sanitisedVisit = sanitisedVisit.replace(def, sanitisedValue);\n      }\n    }\n\n    return sanitisedVisit.hasChangedFrom(visit) ? sanitisedVisit : visit;\n  }\n\n}\n"]}
+{"version":3,"file":"visit-sanitiser.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/visit-sanitiser.ts"],"names":[],"mappings":";AAOA,MAAM,OAAO,cAAc;IACzB,YAAoB,iBAAoC,EAAU,cAAsC,EAAU,MAAc,EAAU,YAA0B,EAAU,QAAkB;QAA5K,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAU,mBAAc,GAAd,cAAc,CAAwB;QAAU,WAAM,GAAN,MAAM,CAAQ;QAAU,iBAAY,GAAZ,YAAY,CAAc;QAAU,aAAQ,GAAR,QAAQ,CAAU;IAEhM,CAAC;IAED,WAAW;IACL,QAAQ,CAAC,KAAY;;YACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC;YACvC,IAAI,QAAQ,CAAC,UAAU,EAAE,EAAE;gBACzB,MAAM,UAAU,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;gBACnC,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBACtI,0CAA0C;gBAC1C,oCAAoC;gBACpC,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE;oBAClD,+DAA+D;oBAC/D,qCAAqC;oBACrC,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;iBAClD;aACF;YAED,2EAA2E;YAC3E,MAAM,aAAa,GAAG,QAAQ,CAAC,qBAAqB,CAAC;gBACnD,sBAAsB,EAAE,IAAI;gBAC5B,yBAAyB,EAAE,IAAI;aAChC,CAAC,CAAC;YACH,IAAI,cAAc,GAAU,KAAK,CAAC;YAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7C,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;gBAC3C,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBACtI,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE;oBACzC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;iBAC9D;aACF;YAED,OAAO,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;QACvE,CAAC;KAAA;CAEF","sourcesContent":["import { Injector } from '@angular/core';\nimport { ActivatedRouteSnapshot, Router } from '@angular/router';\nimport { Trace } from '@coolon/pectin';\nimport { NavigationSession } from '../navigation/session/navigation-session';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\n\nexport class VisitSanitiser {\n  constructor(private navigationSession: NavigationSession, private activatedRoute: ActivatedRouteSnapshot, private router: Router, private placeHistory: PlaceHistory, private injector: Injector) {\n\n  }\n\n  // @Trace()\n  async sanitise(visit: Visit): Promise<Visit> {\n    const placeDef = visit.placeDefinition;\n    if (placeDef.hasRouteId()) {\n      const routeIdDef = placeDef.getRouteIdParameterDef();\n      const routeId = visit.getRouteId();\n      const sanitisedValue = await routeIdDef.sanitise(routeId, visit, this.placeHistory, this.injector, this.navigationSession.isPopState);\n      // console.log({routeId, sanitisedValue});\n      // ###------- EARLY EXIT --------###\n      if (routeIdDef.hasChanged(routeId, sanitisedValue)) {\n        // if the route id has changed we redirect immediately as other\n        // parameter sanitisers might use it.\n        return visit.replace(routeIdDef, sanitisedValue);\n      }\n    }\n\n    // if we didn't replace the routeId we continue the url present parameters.\n    const parameterDefs = placeDef.getVisitParameterDefs({\n      includeRouteParameters: true,\n      includeNonRouteParameters: true\n    });\n    let sanitisedVisit: Visit = visit;\n    for (let i = 0; i < parameterDefs.length; i++) {\n      const def = parameterDefs[i];\n      const value = visit.getParameterValue(def);\n      const sanitisedValue = await def.sanitise(value, sanitisedVisit, this.placeHistory, this.injector, this.navigationSession.isPopState);\n      if (def.hasChanged(value, sanitisedValue)) {\n        sanitisedVisit = sanitisedVisit.replace(def, sanitisedValue);\n      }\n    }\n\n    return sanitisedVisit.hasChangedFrom(visit) ? sanitisedVisit : visit;\n  }\n\n}\n"]}

package/esm2015/lib/place/url-snapshot.js

@@ -1,5 +1,13 @@
+import { __decorate, __metadata } from "tslib";
 import { UrlSegment } from '@angular/router';
+import { Trace } from '@coolon/pectin';
+import { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';
 import _ from 'lodash';
+import { ConsolidatedParameterMap } from './guards/consolidated-param-map';
+import { Visit } from './visit';
+function extractPrimarySegments(urlTree) {
+    return urlTree.root.children.primary.segments;
+}
 export class UrlSnapshot {
     // TODO: Update this accept a url Parser so it can be immutable and generate new trees on mutation using toString() are parseUrl.
     constructor(urlSerializer, url) {
@@ -8,18 +16,18 @@ export class UrlSnapshot {
         this.urlTree = urlSerializer.parse(url);
     }
     updateVisitSegments(visit) {
-        const urlTree = this.urlSerializer.parse(this.url);
+        const newUrlTree = this.urlSerializer.parse(this.url);
         // Ugly, but it works for now.
-        const segments = [...this.getPrimarySegments(urlTree)];
+        const segments = [...extractPrimarySegments(newUrlTree)];
         const visitSegments = this.getSegmentsFor(visit);
         const replaceAt = segments.findIndex(segment => segment.path === visitSegments[0].path);
         // do not use the return value, it's the items that were removed!
         segments.splice(replaceAt, visitSegments.length, ...visitSegments);
-        urlTree.root.children.primary.segments = segments;
-        return new UrlSnapshot(this.urlSerializer, urlTree.toString());
+        newUrlTree.root.children.primary.segments = segments;
+        return new UrlSnapshot(this.urlSerializer, newUrlTree.toString());
     }
-    getPrimarySegments(urlTree) {
-        return this.urlTree.root.children.primary.segments;
+    getPrimarySegments() {
+        return extractPrimarySegments(this.urlTree);
     }
     /**
      * Converts the visit into segments.  Please not that these segments are not e
@@ -40,7 +48,10 @@ export class UrlSnapshot {
                 ];
     }
     includesPathOf(placeDef) {
-        return this.getPrimarySegments(this.urlTree).find(s => s.path === placeDef.path);
+        return this.getPrimarySegments().find(s => s.path === placeDef.path);
+    }
+    createVisitFor(placeDef) {
+        return new Visit(placeDef, new ConsolidatedParameterMap(this.getPrimarySegments()));
     }
     getInteractionIds() {
         const queryParam = this.urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM];
@@ -80,6 +91,18 @@ export class UrlSnapshot {
         return `UrlSnapshot(${this.url})`;
     }
 }
+__decorate([
+    Trace(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Visit]),
+    __metadata("design:returntype", UrlSnapshot)
+], UrlSnapshot.prototype, "updateVisitSegments", null);
+__decorate([
+    Memoize(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Array)
+], UrlSnapshot.prototype, "getPrimarySegments", null);
 (function (UrlSnapshot) {
     UrlSnapshot.INTERACTION_QUERY_PARAM = 'aup-interactions';
     UrlSnapshot.INTERACTION_ID_SEPARATOR = '--';

package/esm2015/lib/place/url-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-snapshot.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/url-snapshot.ts"],"names":[],"mappings":"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","sourcesContent":["import { UrlSegment, UrlSerializer, UrlTree } from '@angular/router';\nimport _ from 'lodash';\nimport { PlaceDefinition } from './place-definition';\nimport { Visit } from './visit';\n\nexport class UrlSnapshot {\n\n  readonly urlTree: UrlTree;\n\n  // TODO: Update this accept a url Parser so it can be immutable and generate new trees on mutation using toString() are parseUrl.\n  constructor(readonly urlSerializer: UrlSerializer, readonly url: string) {\n    this.urlTree = urlSerializer.parse(url);\n  }\n\n  public updateVisitSegments(visit: Visit): UrlSnapshot {\n    const urlTree = this.urlSerializer.parse(this.url);\n    // Ugly, but it works for now.\n    const segments = [...this.getPrimarySegments(urlTree)];\n    const visitSegments = this.getSegmentsFor(visit);\n    const replaceAt = segments.findIndex(segment => segment.path === visitSegments[0].path);\n    // do not use the return value, it's the items that were removed!\n    segments.splice(replaceAt, visitSegments.length, ...visitSegments);\n    urlTree.root.children.primary.segments = segments;\n    return new UrlSnapshot(this.urlSerializer, urlTree.toString());\n  }\n\n  private getPrimarySegments(urlTree: UrlTree) {\n    return this.urlTree.root.children.primary.segments;\n  }\n\n  /**\n   * Converts the visit into segments.  Please not that these segments are not e\n   * @param visit\n   */\n  protected getSegmentsFor(visit: Visit): UrlSegment[] {\n    return visit.placeDefinition.hasRouteId() ?\n      [\n        // NOTE:\n        // It's important to attach the params to the root path and not the id.  If we attach them\n        // to an empty id then the angular router won't match the pattern.\n        new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit)),\n        new UrlSegment(visit.placeDefinition.getFormattedRouteId(visit), {})]\n      :\n      [\n        new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit))\n      ];\n  }\n\n  includesPathOf(placeDef: PlaceDefinition) {\n    return this.getPrimarySegments(this.urlTree).find(s => s.path === placeDef.path);\n  }\n\n  getInteractionIds() {\n    const queryParam = this.urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM];\n    if (queryParam) {\n      return UrlSnapshot.parseInteractionIds(queryParam);\n    } else {\n      return [];\n    }\n  }\n\n  hasInteractions() {\n    return this.getInteractionIds().length > 0;\n  }\n\n  hasInteractionIds(ids: string[]): boolean {\n    return _.isEqual(this.getInteractionIds(), ids);\n  }\n\n  // @Trace()\n  updateInteractionIds(ids: string[]): UrlSnapshot {\n    if (ids.length === 0) {\n      return this.removeInteractionIds();\n    } else {\n      const urlTree = this.urlSerializer.parse(this.url);\n      urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM] = UrlSnapshot.createPathIdFor(ids);\n      return new UrlSnapshot(this.urlSerializer, urlTree.toString());\n    }\n  }\n\n  // @Trace()\n  removeInteractionIds(): UrlSnapshot {\n    const urlTree = this.urlSerializer.parse(this.url);\n    if (urlTree.queryParams && urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM]) {\n      urlTree.queryParams = {};//[UrlSnapshot.INTERACTION_ROUTER_OUTLET]\n    }\n    return new UrlSnapshot(this.urlSerializer, urlTree.toString());\n  }\n\n  toString(): string {\n    return `UrlSnapshot(${this.url})`;\n  }\n\n  // withOptions(options: NavigationExtras) {\n  //   return new UrlSnapshot(this.urlSerializer, this.url, options);\n  // }\n  //\n  // @Trace()\n  // getNavigationExtras(): NavigationExtras {\n  //   return this.options;\n  // }\n\n}\n\nexport namespace UrlSnapshot {\n\n  export const INTERACTION_QUERY_PARAM = 'aup-interactions';\n  export const INTERACTION_ID_SEPARATOR = '--';\n\n  export function parseInteractionIds(path: string) {\n    return path.split(INTERACTION_ID_SEPARATOR);\n  }\n\n  export function createPathIdFor(interactionIds: string[]) {\n    return interactionIds.join(INTERACTION_ID_SEPARATOR);\n  }\n\n  export interface NavigationOptions {\n    replaceUrl?: boolean;\n  }\n}\n"]}
+{"version":3,"file":"url-snapshot.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/url-snapshot.ts"],"names":[],"mappings":"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","sourcesContent":["import { UrlSegment, UrlSerializer, UrlTree } from '@angular/router';\nimport { Trace } from '@coolon/pectin';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport _ from 'lodash';\nimport { ConsolidatedParameterMap } from './guards/consolidated-param-map';\nimport { PlaceDefinition } from './place-definition';\nimport { Visit } from './visit';\n\nfunction extractPrimarySegments(urlTree: UrlTree): UrlSegment[] {\n  return urlTree.root.children.primary.segments;\n}\n\nexport class UrlSnapshot {\n\n  readonly urlTree: UrlTree;\n\n  // TODO: Update this accept a url Parser so it can be immutable and generate new trees on mutation using toString() are parseUrl.\n  constructor(readonly urlSerializer: UrlSerializer, readonly url: string) {\n    this.urlTree = urlSerializer.parse(url);\n  }\n\n  @Trace()\n  public updateVisitSegments(visit: Visit): UrlSnapshot {\n    const newUrlTree = this.urlSerializer.parse(this.url);\n    // Ugly, but it works for now.\n    const segments = [...extractPrimarySegments(newUrlTree)];\n    const visitSegments = this.getSegmentsFor(visit);\n    const replaceAt = segments.findIndex(segment => segment.path === visitSegments[0].path);\n    // do not use the return value, it's the items that were removed!\n    segments.splice(replaceAt, visitSegments.length, ...visitSegments);\n    newUrlTree.root.children.primary.segments = segments;\n    return new UrlSnapshot(this.urlSerializer, newUrlTree.toString());\n  }\n\n  @Memoize()\n  private getPrimarySegments(): UrlSegment[] {\n    return extractPrimarySegments(this.urlTree);\n  }\n\n  /**\n   * Converts the visit into segments.  Please not that these segments are not e\n   * @param visit\n   */\n  protected getSegmentsFor(visit: Visit): UrlSegment[] {\n    return visit.placeDefinition.hasRouteId() ?\n      [\n        // NOTE:\n        // It's important to attach the params to the root path and not the id.  If we attach them\n        // to an empty id then the angular router won't match the pattern.\n        new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit)),\n        new UrlSegment(visit.placeDefinition.getFormattedRouteId(visit), {})]\n      :\n      [\n        new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit))\n      ];\n  }\n\n  includesPathOf(placeDef: PlaceDefinition) {\n    return this.getPrimarySegments().find(s => s.path === placeDef.path);\n  }\n\n  createVisitFor(placeDef: PlaceDefinition) {\n    return new Visit(placeDef, new ConsolidatedParameterMap(this.getPrimarySegments()));\n  }\n\n  getInteractionIds() {\n    const queryParam = this.urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM];\n    if (queryParam) {\n      return UrlSnapshot.parseInteractionIds(queryParam);\n    } else {\n      return [];\n    }\n  }\n\n  hasInteractions() {\n    return this.getInteractionIds().length > 0;\n  }\n\n  hasInteractionIds(ids: string[]): boolean {\n    return _.isEqual(this.getInteractionIds(), ids);\n  }\n\n  // @Trace()\n  updateInteractionIds(ids: string[]): UrlSnapshot {\n    if (ids.length === 0) {\n      return this.removeInteractionIds();\n    } else {\n      const urlTree = this.urlSerializer.parse(this.url);\n      urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM] = UrlSnapshot.createPathIdFor(ids);\n      return new UrlSnapshot(this.urlSerializer, urlTree.toString());\n    }\n  }\n\n  // @Trace()\n  removeInteractionIds(): UrlSnapshot {\n    const urlTree = this.urlSerializer.parse(this.url);\n    if (urlTree.queryParams && urlTree.queryParams[UrlSnapshot.INTERACTION_QUERY_PARAM]) {\n      urlTree.queryParams = {};//[UrlSnapshot.INTERACTION_ROUTER_OUTLET]\n    }\n    return new UrlSnapshot(this.urlSerializer, urlTree.toString());\n  }\n\n  toString(): string {\n    return `UrlSnapshot(${this.url})`;\n  }\n\n  // withOptions(options: NavigationExtras) {\n  //   return new UrlSnapshot(this.urlSerializer, this.url, options);\n  // }\n  //\n  // @Trace()\n  // getNavigationExtras(): NavigationExtras {\n  //   return this.options;\n  // }\n\n}\n\nexport namespace UrlSnapshot {\n\n  export const INTERACTION_QUERY_PARAM = 'aup-interactions';\n  export const INTERACTION_ID_SEPARATOR = '--';\n\n  export function parseInteractionIds(path: string) {\n    return path.split(INTERACTION_ID_SEPARATOR);\n  }\n\n  export function createPathIdFor(interactionIds: string[]) {\n    return interactionIds.join(INTERACTION_ID_SEPARATOR);\n  }\n\n  export interface NavigationOptions {\n    replaceUrl?: boolean;\n  }\n}\n"]}

package/esm2015/lib/place/url-snapshot.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"UrlSnapshot":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/router","name":"UrlSerializer","line":10,"character":38},{"__symbolic":"reference","name":"string"}]}],"updateVisitSegments":[{"__symbolic":"method"}],"getPrimarySegments":[{"__symbolic":"method"}],"getSegmentsFor":[{"__symbolic":"method"}],"includesPathOf":[{"__symbolic":"method"}],"getInteractionIds":[{"__symbolic":"method"}],"hasInteractions":[{"__symbolic":"method"}],"hasInteractionIds":[{"__symbolic":"method"}],"updateInteractionIds":[{"__symbolic":"method"}],"removeInteractionIds":[{"__symbolic":"method"}],"toString":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"UrlSnapshot":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/router","name":"UrlSerializer","line":17,"character":38},{"__symbolic":"reference","name":"string"}]}],"updateVisitSegments":[{"__symbolic":"method","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"Trace","line":21,"character":3}}]}],"getPrimarySegments":[{"__symbolic":"method","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@typescript-plus/fast-memoize-decorator/dist/src","name":"Memoize","line":34,"character":3}}]}],"getSegmentsFor":[{"__symbolic":"method"}],"includesPathOf":[{"__symbolic":"method"}],"createVisitFor":[{"__symbolic":"method"}],"getInteractionIds":[{"__symbolic":"method"}],"hasInteractions":[{"__symbolic":"method"}],"hasInteractionIds":[{"__symbolic":"method"}],"updateInteractionIds":[{"__symbolic":"method"}],"removeInteractionIds":[{"__symbolic":"method"}],"toString":[{"__symbolic":"method"}]}}}}]

package/esm2015/lib/place/visit.js

@@ -16,14 +16,14 @@ export class Visit {
      * 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 parameterName the field name of the property model or the `as` option if specified.
+     * @param parameterDef the visit parameter definition
      */
-    getParameter(parameterName) {
-        return this.visitParameters[parameterName];
+    getParameterValue(parameterDef) {
+        return this.visitParameters[parameterDef.name];
     }
     // @Trace()
-    hasParameter(parameterName) {
-        return Object.keys(this.visitParameters).includes(parameterName);
+    hasParameter(parameterDef) {
+        return Object.keys(this.visitParameters).includes(parameterDef.name);
     }
     replace(parameter, value) {
         return new Visit(this.placeDefinition, Object.assign(Object.assign({}, this.visitParameters), { [parameter.name]: value }));
@@ -41,8 +41,8 @@ export class Visit {
             else {
                 // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the
                 // defaults and remember sanitisation process.
-                const value = this.getParameter(def.name);
-                if (this.hasParameter(def.name)) {
+                const value = this.getParameterValue(def);
+                if (this.hasParameter(def)) {
                     params[def.name] = value;
                 }
             }

package/esm2015/lib/place/visit.js.map

@@ -1 +1 @@
-{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/visit.ts"],"names":[],"mappings":"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","sourcesContent":["import * as _ from 'lodash';\nimport { PlaceDefinition } from './place-definition';\nimport { ParameterDefinition } from './route/parameter-definition';\n\ninterface Params {\n  [p: string]: any\n}\n\n\nexport class Visit {\n\n  constructor(readonly placeDefinition: PlaceDefinition, private readonly visitParameters: Params = {}) {\n  }\n\n  // @Trace()\n  getRouteId(): any {\n    return this.placeDefinition.getRouteIdFrom(this);\n  }\n\n  // @Trace()\n  hasRouteId(): boolean {\n    return !_.isNil(this.getRouteId());\n  }\n\n  /**\n   * Returns the value of the place parameter with the specified name.  The parameter\n   * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the\n   * same as the the ValueModel property name.\n   * @param parameterName the field name of the property model or the `as` option if specified.\n   */\n  getParameter(parameterName: string): any {\n    return this.visitParameters[parameterName];\n  }\n\n  // @Trace()\n  hasParameter(parameterName: string) {\n    return Object.keys(this.visitParameters).includes(parameterName);\n  }\n\n  replace<S>(parameter: ParameterDefinition<any, S>, value: S): Visit {\n    return new Visit(this.placeDefinition, { ...this.visitParameters, [parameter.name]: value });\n  }\n\n  mergeRouteParameters<S>(routeParams: { [p: string]: any }): Visit {\n    // todo: whitelist parameters.\n    const routeParameterKeys = Object.keys(routeParams);\n    const params = {};\n    this.placeDefinition.getVisitParameterDefs().forEach(def => {\n      if (def.isRouteId || def.isRouteParameter) {\n        if (routeParameterKeys.includes(def.name)) {\n          params[def.name] = routeParams[def.name];\n        }\n      } else {\n        // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the\n        // defaults and remember sanitisation process.\n        const value = this.getParameter(def.name);\n        if (this.hasParameter(def.name)) {\n          params[def.name] = value;\n        }\n      }\n    });\n    return new Visit(this.placeDefinition, params);\n  }\n\n  hasRoutingChangedFrom(other: Visit): boolean {\n    const samePlace = other.placeDefinition === this.placeDefinition;\n    const sameRouteParameters = _.isEqual(\n      this.placeDefinition.getFormattedRouteParameters(this, true),\n      this.placeDefinition.getFormattedRouteParameters(other, true)\n    );\n    return !samePlace || !sameRouteParameters;\n  }\n\n  hasChangedFrom(other: Visit) {\n    const sameNonRouteParameters = _.isEqual(\n      this.placeDefinition.getNonRouteParameters(this),\n      this.placeDefinition.getNonRouteParameters(other)\n    );\n    return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);\n  }\n\n  toDebugString() {\n    return Object.keys(this.visitParameters).map(k => `${k}=${this.visitParameters[k]}`).join(',');\n  }\n\n}\n"]}
+{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/visit.ts"],"names":[],"mappings":"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","sourcesContent":["import * as _ from 'lodash';\nimport { PlaceDefinition } from './place-definition';\nimport { ParameterDefinition } from './route/parameter-definition';\n\ninterface Params {\n  [p: string]: any\n}\n\n\nexport class Visit {\n\n  constructor(readonly placeDefinition: PlaceDefinition, private readonly visitParameters: Params = {}) {\n  }\n\n  // @Trace()\n  getRouteId(): any {\n    return this.placeDefinition.getRouteIdFrom(this);\n  }\n\n  // @Trace()\n  hasRouteId(): boolean {\n    return !_.isNil(this.getRouteId());\n  }\n\n  /**\n   * Returns the value of the place parameter with the specified name.  The parameter\n   * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the\n   * same as the the ValueModel property name.\n   * @param parameterDef the visit parameter definition\n   */\n  getParameterValue<T, S>(parameterDef: ParameterDefinition<T, S>): T {\n    return this.visitParameters[parameterDef.name];\n  }\n\n  // @Trace()\n  hasParameter(parameterDef: ParameterDefinition<any>): boolean {\n    return Object.keys(this.visitParameters).includes(parameterDef.name);\n  }\n\n  replace<T>(parameter: ParameterDefinition<T, any>, value: T): Visit {\n    return new Visit(this.placeDefinition, { ...this.visitParameters, [parameter.name]: value });\n  }\n\n  mergeRouteParameters<S>(routeParams: { [p: string]: any }): Visit {\n    // todo: whitelist parameters.\n    const routeParameterKeys = Object.keys(routeParams);\n    const params = {};\n    this.placeDefinition.getVisitParameterDefs().forEach(def => {\n      if (def.isRouteId || def.isRouteParameter) {\n        if (routeParameterKeys.includes(def.name)) {\n          params[def.name] = routeParams[def.name];\n        }\n      } else {\n        // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the\n        // defaults and remember sanitisation process.\n        const value = this.getParameterValue(def);\n        if (this.hasParameter(def)) {\n          params[def.name] = value;\n        }\n      }\n    });\n    return new Visit(this.placeDefinition, params);\n  }\n\n  hasRoutingChangedFrom(other: Visit): boolean {\n    const samePlace = other.placeDefinition === this.placeDefinition;\n    const sameRouteParameters = _.isEqual(\n      this.placeDefinition.getFormattedRouteParameters(this, true),\n      this.placeDefinition.getFormattedRouteParameters(other, true)\n    );\n    return !samePlace || !sameRouteParameters;\n  }\n\n  hasChangedFrom(other: Visit) {\n    const sameNonRouteParameters = _.isEqual(\n      this.placeDefinition.getNonRouteParameters(this),\n      this.placeDefinition.getNonRouteParameters(other)\n    );\n    return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);\n  }\n\n  toDebugString() {\n    return Object.keys(this.visitParameters).map(k => `${k}=${this.visitParameters[k]}`).join(',');\n  }\n\n}\n"]}

package/esm2015/lib/place/visit.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"Visit":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./place-definition","name":"PlaceDefinition","line":11,"character":40},{"__symbolic":"reference","name":"any"}]}],"getRouteId":[{"__symbolic":"method"}],"hasRouteId":[{"__symbolic":"method"}],"getParameter":[{"__symbolic":"method"}],"hasParameter":[{"__symbolic":"method"}],"replace":[{"__symbolic":"method"}],"mergeRouteParameters":[{"__symbolic":"method"}],"hasRoutingChangedFrom":[{"__symbolic":"method"}],"hasChangedFrom":[{"__symbolic":"method"}],"toDebugString":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"Visit":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./place-definition","name":"PlaceDefinition","line":11,"character":40},{"__symbolic":"reference","name":"any"}]}],"getRouteId":[{"__symbolic":"method"}],"hasRouteId":[{"__symbolic":"method"}],"getParameterValue":[{"__symbolic":"method"}],"hasParameter":[{"__symbolic":"method"}],"replace":[{"__symbolic":"method"}],"mergeRouteParameters":[{"__symbolic":"method"}],"hasRoutingChangedFrom":[{"__symbolic":"method"}],"hasChangedFrom":[{"__symbolic":"method"}],"toDebugString":[{"__symbolic":"method"}]}}}}]