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

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

@@ -2,7 +2,7 @@ import { __awaiter } from "tslib";
 import { MutableListModel, MutableValueModel } from '@coolon/pectin';
 import { lang, Opts } from '@coolon/typescript-utilities';
 import _ from 'lodash';
-const PARAMETER_DEFINITION_KEY = Symbol('parameterDefinition');
+const PARAMETER_DEFINITION_KEY = Symbol("parameterDefinition");
 export class ParameterDefinition {
     constructor(propertyName, options, urlFormat) {
         this.propertyName = propertyName;
@@ -29,42 +29,19 @@ export class ParameterDefinition {
     // @Trace()
     sanitise(value, visit, placeHistory, injector, isPopState) {
         return __awaiter(this, void 0, void 0, function* () {
-            // console.log(`sanitise(${this.propertyName})`)
-            value = yield this.sanitiseMissing(visit, placeHistory, value);
-            value = yield this.runCustomSanitiser(value, visit, placeHistory, injector, isPopState);
-            return value;
-        });
-    }
-    runCustomSanitiser(value, visit, placeHistory, injector, isPopState) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const customSanitiser = this.prepareCustomSanitiser(injector);
-            return customSanitiser ? customSanitiser.sanitise(value, visit, injector) : value;
-        });
-    }
-    sanitiseMissing(visit, placeHistory, value) {
-        if (this.isMissingFrom(visit)) {
-            const returningFromSomewhereElse = !placeHistory.lastVisitIncluded(visit.placeDefinition);
-            if (returningFromSomewhereElse) {
-                const lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);
-                if (this.remember && lastKnownVisit) {
-                    value = lastKnownVisit.getParameterValue(this);
+            if (this.isMissingFrom(visit)) {
+                const returningFromSomewhereElse = !placeHistory.lastVisitIncluded(visit.placeDefinition);
+                if (returningFromSomewhereElse) {
+                    const lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);
+                    if (this.remember && lastKnownVisit) {
+                        value = lastKnownVisit.getParameterValue(this);
+                    }
+                    return this.isEmptyValue(value) ? this.defaultValue : value;
                 }
-                value = this.isEmptyValue(value) ? this.defaultValue : value;
             }
-        }
-        return value;
-    }
-    prepareCustomSanitiser(injector) {
-        const customSanitiser = this.options.getOptional('sanitiser', null);
-        if (_.isFunction(customSanitiser)) {
-            return injector.get(customSanitiser);
-        }
-        if (_.isObject(customSanitiser)) {
-            return _.isFunction(customSanitiser['sanitise']) ?
-                customSanitiser :
-                lang.illegalState(`expected @VisitParameter({sanitiser: ...}) for ${this.propertyName} to be a constructor or instance of ParameterSanitiser, got: ` + customSanitiser);
-        }
-        return undefined;
+            // todo: add custom sanitiser
+            return value;
+        });
     }
     isMissingFrom(visit) {
         return !visit.hasParameter(this);
@@ -119,7 +96,7 @@ export class ParameterDefinition {
     function get(model) {
         const parameterDefinition = model[PARAMETER_DEFINITION_KEY];
         if (!parameterDefinition) {
-            lang.illegalArgument('model hasn\'t been annotated with @VisitParameter, @VisitParameterList or @RouteId');
+            lang.illegalArgument("model hasn't been annotated with @VisitParameter, @VisitParameterList or @RouteId");
         }
         return parameterDefinition;
     }

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 { Constructable, 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';\nimport { ParameterSanitiser } from './parameter-sanitiser';\n\nconst PARAMETER_DEFINITION_KEY = Symbol('parameterDefinition');\n\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): Promise<T> {\n    // console.log(`sanitise(${this.propertyName})`)\n    value = await this.sanitiseMissing(visit, placeHistory, value);\n    value = await this.runCustomSanitiser(value, visit, placeHistory, injector, isPopState);\n    return value;\n  }\n\n  private async runCustomSanitiser(value: T, visit: Visit, placeHistory: PlaceHistory, injector: Injector, isPopState: boolean): Promise<T> {\n    const customSanitiser = this.prepareCustomSanitiser(injector);\n    return customSanitiser ? customSanitiser.sanitise(value, visit, injector) : value;\n  }\n\n  private sanitiseMissing(visit: Visit, placeHistory: PlaceHistory, value: T) {\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        value = this.isEmptyValue(value) ? this.defaultValue : value;\n      }\n    }\n    return value;\n  }\n\n  private prepareCustomSanitiser(injector: Injector): ParameterSanitiser<any> {\n    const customSanitiser = this.options.getOptional('sanitiser', null);\n    if (_.isFunction(customSanitiser)) {\n      return injector.get(customSanitiser);\n    }\n    if (_.isObject(customSanitiser)) {\n      return _.isFunction(customSanitiser['sanitise']) ?\n        customSanitiser as ParameterSanitiser<any> :\n        lang.illegalState(`expected @VisitParameter({sanitiser: ...}) for ${this.propertyName} to be a constructor or instance of ParameterSanitiser, got: ` + customSanitiser);\n    }\n    return undefined;\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<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"]}
+{"version":3,"file":"parameter-definition.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/parameter-definition.ts"],"names":[],"mappings":";AACA,OAAO,EAAuB,gBAAgB,EAAE,iBAAiB,EAAc,MAAM,gBAAgB,CAAC;AACtG,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,CAAC,MAAM,QAAQ,CAAC;AAKvB,MAAM,wBAAwB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAA;AAE9D,MAAM,OAAgB,mBAAmB;IAUvC,YAAqB,YAAoB,EAAE,OAAuC,EAAW,SAAwB;QAAhG,iBAAY,GAAZ,YAAY,CAAQ;QAAoD,cAAS,GAAT,SAAS,CAAe;QACnH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC;IAED,WAAW;IACX,IAAI,gBAAgB;QAClB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAMD,kBAAkB;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzC,KAAK,CAAC,wBAAwB,CAAC,GAAG,IAAI,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;IAES,cAAc,CAAiD,GAAM;QAC7E,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW;IACL,QAAQ,CAAC,KAAQ,EAAE,KAAY,EAAE,YAA0B,EAAE,QAAkB,EAAE,UAAmB;;YACxG,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,0BAA0B,GAAG,CAAC,YAAY,CAAC,iBAAiB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC1F,IAAI,0BAA0B,EAAE;oBAC9B,MAAM,cAAc,GAAG,YAAY,CAAC,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;oBACjF,IAAI,IAAI,CAAC,QAAQ,IAAI,cAAc,EAAE;wBACnC,KAAK,GAAG,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;qBAChD;oBACD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC;iBAC7D;aACF;YACD,6BAA6B;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;KAAA;IAEO,aAAa,CAAC,KAAY;QAChC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CACF;AAED,WAAiB,mBAAmB;IAUlC,MAAa,OAAW,SAAQ,mBAAsB;QAAtD;;YACW,cAAS,GAAG,IAAI,CAAC;YACjB,YAAO,GAAG,KAAK,CAAC;YACf,wBAAmB,GAAG,GAAG,EAAE,CAAC,IAAI,iBAAiB,EAAK,CAAC;QAUnE,CAAC;QARC,YAAY,CAAC,KAAQ;YACnB,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QAED,UAAU,CAAC,CAAM,EAAE,CAAM;YACvB,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;KAEF;IAbY,2BAAO,UAanB,CAAA;IAED,MAAa,cAAkB,SAAQ,mBAAsB;QAA7D;;YACW,cAAS,GAAG,KAAK,CAAC;YAClB,YAAO,GAAG,KAAK,CAAC;YACf,wBAAmB,GAAG,GAAG,EAAE,CAAC,IAAI,iBAAiB,EAAK,CAAC;QASnE,CAAC;QAPC,YAAY,CAAC,KAAQ;YACnB,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QAED,UAAU,CAAC,CAAM,EAAE,CAAM;YACvB,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;KACF;IAZY,kCAAc,iBAY1B,CAAA;IAED,MAAa,cAAkB,SAAQ,mBAA2B;QAKhE,YAAY,aAAqB,EAAE,OAAqB,EAAE,SAAuB;YAC/E,KAAK,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YALlC,cAAS,GAAG,KAAK,CAAC;YAClB,YAAO,GAAG,IAAI,CAAC;YACd,wBAAmB,GAAG,GAAG,EAAE,CAAC,IAAI,gBAAgB,EAAK,CAAC;QAIhE,CAAC;QAED,YAAY,CAAC,KAAU;YACrB,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5C,CAAC;QAED,UAAU,CAAC,CAAM,EAAE,CAAM;YACvB,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1B,CAAC;KAEF;IAjBY,kCAAc,iBAiB1B,CAAA;IAID,SAAgB,GAAG,CAAI,KAAmC;QACxD,MAAM,mBAAmB,GAAG,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5D,IAAI,CAAC,mBAAmB,EAAE;YACxB,IAAI,CAAC,eAAe,CAAC,mFAAmF,CAAC,CAAC;SAC3G;QACD,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IANe,uBAAG,MAMlB,CAAA;AAGH,CAAC,EArEgB,mBAAmB,KAAnB,mBAAmB,QAqEnC","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":22,"character":82,"context":{"typeName":"T"}}]},{"__symbolic":"reference","module":"./formatter","name":"Formatter","line":22,"character":107,"arguments":[{"__symbolic":"error","message":"Could not resolve type","line":22,"character":117,"context":{"typeName":"E"}}]}]}],"isEmptyValue":[{"__symbolic":"method"}],"hasChanged":[{"__symbolic":"method"}],"createBackingModel":[{"__symbolic":"method"}],"getOptionValue":[{"__symbolic":"method"}],"sanitise":[{"__symbolic":"method"}],"runCustomSanitiser":[{"__symbolic":"method"}],"sanitiseMissing":[{"__symbolic":"method"}],"prepareCustomSanitiser":[{"__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/parameter-sanitiser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameter-sanitiser.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/parameter-sanitiser.ts"],"names":[],"mappings":"","sourcesContent":["import { Injector } from '@angular/core';\nimport { Visit } from '../visit';\nimport { ParameterSnapshot } from './parameter-snapshot';\n\nexport interface ParameterSanitiser<T> {\n  sanitise(parameterValue: T, visit?: Visit, injector?: Injector): Promise<T> | T;\n}\n"]}
+{"version":3,"file":"parameter-sanitiser.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/parameter-sanitiser.ts"],"names":[],"mappings":"","sourcesContent":["import { Injector } from '@angular/core';\nimport { Visit } from '../visit';\nimport { ParameterSnapshot } from './parameter-snapshot';\n\nexport interface ParameterSanitiser<S> {\n  sanitise(parameterValue: ParameterSnapshot<S>, visit?: Visit, injector?: Injector): Promise<S> | S;\n}\n"]}

package/esm2015/lib/place/visit.js

@@ -16,10 +16,10 @@ 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 parameter the visit parameter definition
+     * @param parameterDef the visit parameter definition
      */
-    getParameterValue(parameter) {
-        return _.isString(parameter) ? this.visitParameters[parameter] : this.visitParameters[parameter.name];
+    getParameterValue(parameterDef) {
+        return this.visitParameters[parameterDef.name];
     }
     // @Trace()
     hasParameter(parameterDef) {
@@ -49,13 +49,9 @@ export class Visit {
         });
         return new Visit(this.placeDefinition, params);
     }
-    // @Trace()
     hasRoutingChangedFrom(other) {
         const samePlace = other.placeDefinition === this.placeDefinition;
-        const currentParams = this.placeDefinition.getFormattedRouteParameters(this, true);
-        const otherParams = this.placeDefinition.getFormattedRouteParameters(other, true);
-        // console.log({currentParams, otherParams});
-        const sameRouteParameters = _.isEqual(currentParams, otherParams);
+        const sameRouteParameters = _.isEqual(this.placeDefinition.getFormattedRouteParameters(this, true), this.placeDefinition.getFormattedRouteParameters(other, true));
         return !samePlace || !sameRouteParameters;
     }
     hasChangedFrom(other) {

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 { Trace } from '@coolon/pectin';\nimport * 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 parameter the visit parameter definition\n   */\n  getParameterValue<T, S>(parameter: ParameterDefinition<T, S> | string): T {\n    return _.isString(parameter) ? this.visitParameters[parameter] : this.visitParameters[parameter.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  // @Trace()\n  hasRoutingChangedFrom(other: Visit): boolean {\n    const samePlace = other.placeDefinition === this.placeDefinition;\n    const currentParams = this.placeDefinition.getFormattedRouteParameters(this, true);\n    const otherParams = this.placeDefinition.getFormattedRouteParameters(other, true);\n    // console.log({currentParams, otherParams});\n    const sameRouteParameters = _.isEqual(currentParams, otherParams);\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":12,"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"}]}}}}]
+[{"__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"}]}}}}]

package/esm2015/lib/services/exports.js

@@ -2,6 +2,4 @@
  * @file Automatically generated by barrelsby.
  */
 export * from "./visibility-service";
-export * from "./markdown/markdown.service";
-export * from "./markdown/pill-plugin";
 //# sourceMappingURL=exports.js.map

package/esm2015/lib/services/exports.js.map

@@ -1 +1 @@
-{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/services/exports.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./visibility-service\";\nexport * from \"./markdown/markdown.service\";\nexport * from \"./markdown/pill-plugin\";\n"]}
+{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/services/exports.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,sBAAsB,CAAC","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./visibility-service\";\n"]}

package/esm2015/lib/services/exports.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./visibility-service"},{"from":"./markdown/markdown.service"},{"from":"./markdown/pill-plugin"}]}]
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./visibility-service"}]}]