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

package/esm2015/lib/place/place-component.js

@@ -1,4 +1,4 @@
-import { __decorate, __metadata } from "tslib";
+import { __awaiter, __decorate, __metadata } from "tslib";
 import { Directive } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
 import { assert, Binding, DebugContext, Dsl, Guard, lang, MutableValueModel } from '@coolon/pectin';
@@ -7,18 +7,30 @@ import { Memoize } from '@typescript-plus/fast-memoize-decorator';
 import 'reflect-metadata';
 import { DisposableComponent } from '../components/disposable-component';
 import { PlaceDefinition } from './place-definition';
+import { ParameterDefinition } from './route/parameter-definition';
 // RAKE: making this Symbol(...) broke things.
 export const DEFINITION_META_DATA_KEY = 'PLACE_DEFINITION_OPTIONS';
 // this one seems ok.
 export const ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');
+class ParameterChangeInterceptor {
+    constructor(parameterDef, model, callback, options) {
+    }
+    canProceed(nextState, interactionContext) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return true;
+        });
+    }
+}
 export class PlaceComponent extends DisposableComponent {
     constructor() {
         super();
+        this._placeReadyCallbacks = [];
         this.visitModel = new MutableValueModel();
         this._inVisitUpdate = new Guard();
         this._active = new MutableValueModel(false);
+        this._parameterChangeInterceptors = [];
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
-        when(this._active).becomesTruthy(() => this.onPlaceReady());
+        when(this._active).becomesTruthy(() => this._notifyPlaceReady());
         this.childPlaces = this.placeDefinition.children.map(d => d.component);
     }
     // @Trace()
@@ -48,7 +60,7 @@ export class PlaceComponent extends DisposableComponent {
         DebugContext.tag(model, `${this.placeDefinition.component.name}.${parameterDef.propertyName}`);
         const binding = this.registerDisposable(new Binding(this.visitModel, model, {
             toRight(visit) {
-                const value = visit.getParameter(parameterDef.name);
+                const value = visit.getParameterValue(parameterDef);
                 // console.log('push to component', { name: parameterDef.name, value, visit });
                 return value;
             },
@@ -60,18 +72,68 @@ export class PlaceComponent extends DisposableComponent {
         binding.writeRight();
     }
     get placeDefinition() {
-        return PlaceComponent.getDefinition(this.constructor);
+        const definition = PlaceComponent.getDefinition(this.constructor);
+        if (!definition) {
+            lang.illegalState(`${this.constructor.name} extends PlaceComponent but doesn't have @Place({..}) decorator.`);
+        }
+        return definition;
     }
     get active() {
         return this._active.readonly;
     }
+    /**
+     * Called by the router to see if this component can deactivate.  This isn't called for route parameter changes.
+     * @param interactionContext
+     */
+    _canLeavePlace(interactionContext) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.canDeactivate ? this.canDeactivate(interactionContext) : true;
+        });
+    }
+    /**
+     * Called by the router to see if this component can deactivate.  This isn't called for route parameter changes.
+     * @param interactionContext
+     * @param nextState
+     */
+    _canChangeRouteParameters(interactionContext, nextState) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._parameterChangeInterceptors.length > 0) {
+                const visit = nextState.createVisitFor(this.placeDefinition);
+                for (let i = 0; i < this._parameterChangeInterceptors.length; i++) {
+                    const interceptor = this._parameterChangeInterceptors[i];
+                    const keepGoing = yield interceptor.canProceed(visit, interactionContext);
+                    if (!keepGoing) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        });
+    }
     /**
      * Called by the router when the place is ready to interact after any animations have run.
      */
     _notifyActive(active) {
         this._active.value = active;
     }
-    onPlaceReady() {
+    /**
+     * Called by the router when the place is ready to interact after any animations have run.
+     */
+    _notifyPlaceReady() {
+        if (this.onPlaceReady.length === 1) {
+            this._placeReadyCallbacks.forEach(callback => callback());
+        }
+        else {
+            console.warn('Overriding PlaceComponent.onPlaceReady has been deprecated.  Use PlaceComponent.onPlaceReady(() => {... do stuff...}) instead.');
+            this.onPlaceReady(undefined);
+        }
+    }
+    onPlaceReady(callback) {
+        this._placeReadyCallbacks.push(callback);
+    }
+    interceptVisitParameterChange(model, callback, options) {
+        const parameterDef = ParameterDefinition.get(model);
+        this._parameterChangeInterceptors.push(new ParameterChangeInterceptor(parameterDef, model, callback, options));
     }
 }
 PlaceComponent.decorators = [

package/esm2015/lib/place/place-component.js.map

@@ -1 +1 @@
-{"version":3,"file":"place-component.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/place-component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Directive } from '@angular/core';\nimport { ActivatedRouteSnapshot } from '@angular/router';\nimport {\n  assert,\n  Binding,\n  Constructable,\n  DebugContext,\n  Dsl,\n  Guard,\n  IMutableHasValue,\n  lang,\n  MutableValueModel, Trace\n} from '@coolon/pectin';\nimport { Klass } from '@coolon/typescript-utilities';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator';\nimport 'reflect-metadata';\nimport { DisposableComponent } from '../components/disposable-component';\nimport { InteractionContext } from '../interaction/interaction-context';\nimport { PlaceDefinition } from './place-definition';\nimport { ParameterDefinition } from './route/parameter-definition';\nimport { Visit } from './visit';\n\n// RAKE: making this Symbol(...) broke things.\nexport const DEFINITION_META_DATA_KEY = 'PLACE_DEFINITION_OPTIONS';\n// this one seems ok.\nexport const ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');\n\n@Directive()\nexport class PlaceComponent extends DisposableComponent {\n\n  private visitModel = new MutableValueModel<Visit>();\n  private _inVisitUpdate = new Guard();\n  private _active = new MutableValueModel<boolean>(false);\n\n  interactionContext?: InteractionContext;\n  readonly childPlaces: ReadonlyArray<Constructable<PlaceComponent>>;\n\n  canDeactivate?(interactionContext: InteractionContext): boolean | Promise<boolean>;\n\n  constructor() {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    when(this._active).becomesTruthy(() => this.onPlaceReady());\n    this.childPlaces = this.placeDefinition.children.map(d => d.component);\n  }\n\n  // @Trace()\n  public initialiseVisit(visit: Visit, notifyVisitChanged: (current: Visit, previous: Visit) => void) {\n    assert.isNil(this.visitModel.value);\n\n    const { when } = Dsl.disposeWith(this);\n\n    this.visitModel.value = visit;\n    DebugContext.getOrCreate(this.visitModel).tag(`${this.placeDefinition.component.name}.visitModel`);\n    this.placeDefinition.getVisitParameterDefs().forEach(parameterDef => this.installBinding(parameterDef));\n    when(this.visitModel).changes((current, previous) => {\n      notifyVisitChanged(current, previous);\n    }, { unless: this._inVisitUpdate });\n  }\n\n  public updateVisit(visit: Visit) {\n    assert.isTruthy(this.isInitialised());\n    assert.notNil(visit);\n    this._inVisitUpdate.whileTrue(() => {\n      this.visitModel.value = visit;\n    });\n  }\n\n  isInitialised() {\n    return !!this.visitModel.value;\n  }\n\n  // @Trace()\n  private installBinding<T, S>(parameterDef: ParameterDefinition<T, S>) {\n    const model = this[parameterDef.propertyName] as IMutableHasValue<S>;\n    DebugContext.tag(model, `${this.placeDefinition.component.name}.${parameterDef.propertyName}`);\n    const binding = this.registerDisposable(new Binding(this.visitModel, model, {\n      toRight(visit: Visit): S {\n        const value = visit.getParameter(parameterDef.name);\n        // console.log('push to component', { name: parameterDef.name, value, visit });\n        return value;\n      },\n      toLeft(value: S, currentVisit?: Visit): Visit {\n        // console.log('push to route', { name: parameterDef.name, value, currentVisit });\n        return currentVisit.replace(parameterDef, value);\n      }\n    }));\n\n    binding.writeRight();\n  }\n\n  @Memoize()\n  get placeDefinition(): PlaceDefinition {\n    return PlaceComponent.getDefinition(this.constructor as any as Constructable<PlaceComponent>);\n  }\n\n  get active() {\n    return this._active.readonly;\n  }\n\n  /**\n   * Called by the router when the place is ready to interact after any animations have run.\n   */\n  _notifyActive(active: boolean) {\n    this._active.value = active;\n  }\n\n  onPlaceReady() {\n  }\n\n}\n\nexport namespace PlaceComponent {\n\n  export function isPlaceComponentConstructor(target: any): target is Constructable<PlaceComponent> {\n    return lang.constructorChain(target as Constructable<any>).includes(PlaceComponent);\n  }\n\n  export function getRouteParameters(klass: Constructable<PlaceComponent>): ParameterDefinition<any>[] {\n    return Klass.get(klass).getMetadataList(ROUTE_PARAMETER_LIST_KEY) as ParameterDefinition<any>[];\n  }\n\n  export function getDefinition(snapshotOrConstructor: ActivatedRouteSnapshot | Constructable<PlaceComponent>): PlaceDefinition {\n    if (snapshotOrConstructor instanceof ActivatedRouteSnapshot) {\n      const component = snapshotOrConstructor.component;\n      if (!isPlaceComponentConstructor(component)) {\n        throw new Error(`ActivatedRouteSnapshot component is not a PlaceComponent, got ${component}`);\n      }\n      return Reflect.getMetadata(DEFINITION_META_DATA_KEY, component)\n    } else {\n      return Reflect.getMetadata(DEFINITION_META_DATA_KEY, snapshotOrConstructor);\n    }\n  }\n\n  export function injectDefinition(klass: Constructable<PlaceComponent>, definition: PlaceDefinition) {\n    Reflect.defineMetadata(DEFINITION_META_DATA_KEY, definition, klass);\n  }\n\n}\n"]}
+{"version":3,"file":"place-component.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/place-component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Directive } from '@angular/core';\nimport { ActivatedRouteSnapshot } from '@angular/router';\nimport {\n  assert,\n  Binding,\n  Constructable,\n  DebugContext,\n  Dsl,\n  Guard,\n  IMutableHasValue,\n  lang,\n  MutableValueModel,\n  ValueModel\n} from '@coolon/pectin';\nimport { Klass } from '@coolon/typescript-utilities';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator';\nimport 'reflect-metadata';\nimport { DisposableComponent } from '../components/disposable-component';\nimport { InteractionContext } from '../interaction/interaction-context';\nimport { PlaceDefinition } from './place-definition';\nimport { ParameterDefinition } from './route/parameter-definition';\nimport { UrlSnapshot } from './url-snapshot';\nimport { Visit } from './visit';\n\n// RAKE: making this Symbol(...) broke things.\nexport const DEFINITION_META_DATA_KEY = 'PLACE_DEFINITION_OPTIONS';\n// this one seems ok.\nexport const ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');\n\n\nclass ParameterChangeInterceptor<T> {\n  constructor(parameterDef: ParameterDefinition<T>, model: ValueModel<T>, callback: PlaceComponent.InterceptCallback<T>, options: PlaceComponent.InterceptOptions) {\n  }\n\n  async canProceed(nextState: Visit, interactionContext: InteractionContext) {\n    return true;\n  }\n}\n\n@Directive()\nexport class PlaceComponent extends DisposableComponent {\n\n  private readonly _placeReadyCallbacks: Function[] = [];\n  private visitModel = new MutableValueModel<Visit>();\n  private _inVisitUpdate = new Guard();\n  private _active = new MutableValueModel<boolean>(false);\n\n  interactionContext?: InteractionContext;\n  readonly childPlaces: ReadonlyArray<Constructable<PlaceComponent>>;\n  private readonly _parameterChangeInterceptors: ParameterChangeInterceptor<any>[] = [];\n\n  canDeactivate?(interactionContext: InteractionContext): boolean | Promise<boolean>;\n\n  constructor() {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    when(this._active).becomesTruthy(() => this._notifyPlaceReady());\n    this.childPlaces = this.placeDefinition.children.map(d => d.component);\n  }\n\n  // @Trace()\n  public initialiseVisit(visit: Visit, notifyVisitChanged: (current: Visit, previous: Visit) => void) {\n    assert.isNil(this.visitModel.value);\n\n    const { when } = Dsl.disposeWith(this);\n\n    this.visitModel.value = visit;\n    DebugContext.getOrCreate(this.visitModel).tag(`${this.placeDefinition.component.name}.visitModel`);\n    this.placeDefinition.getVisitParameterDefs().forEach(parameterDef => this.installBinding(parameterDef));\n    when(this.visitModel).changes((current, previous) => {\n      notifyVisitChanged(current, previous);\n    }, { unless: this._inVisitUpdate });\n  }\n\n  public updateVisit(visit: Visit) {\n    assert.isTruthy(this.isInitialised());\n    assert.notNil(visit);\n    this._inVisitUpdate.whileTrue(() => {\n      this.visitModel.value = visit;\n    });\n  }\n\n  isInitialised() {\n    return !!this.visitModel.value;\n  }\n\n  // @Trace()\n  private installBinding<T, S>(parameterDef: ParameterDefinition<T, S>) {\n    const model = this[parameterDef.propertyName] as IMutableHasValue<T>;\n    DebugContext.tag(model, `${this.placeDefinition.component.name}.${parameterDef.propertyName}`);\n    const binding = this.registerDisposable(new Binding(this.visitModel, model, {\n      toRight(visit: Visit): T {\n        const value = visit.getParameterValue(parameterDef);\n        // console.log('push to component', { name: parameterDef.name, value, visit });\n        return value;\n      },\n      toLeft(value: T, currentVisit?: Visit): Visit {\n        // console.log('push to route', { name: parameterDef.name, value, currentVisit });\n        return currentVisit.replace(parameterDef, value);\n      }\n    }));\n\n    binding.writeRight();\n  }\n\n  @Memoize()\n  get placeDefinition(): PlaceDefinition {\n    const definition = PlaceComponent.getDefinition(this.constructor as any as Constructable<PlaceComponent>);\n    if (!definition) {\n      lang.illegalState(`${this.constructor.name} extends PlaceComponent but doesn't have @Place({..}) decorator.`)\n    }\n    return definition;\n  }\n\n  get active() {\n    return this._active.readonly;\n  }\n\n  /**\n   * Called by the router to see if this component can deactivate.  This isn't called for route parameter changes.\n   * @param interactionContext\n   */\n  async _canLeavePlace(interactionContext: InteractionContext): Promise<boolean> {\n    return this.canDeactivate ? this.canDeactivate(interactionContext) : true;\n  }\n\n  /**\n   * Called by the router to see if this component can deactivate.  This isn't called for route parameter changes.\n   * @param interactionContext\n   * @param nextState\n   */\n  async _canChangeRouteParameters(interactionContext: InteractionContext, nextState: UrlSnapshot): Promise<boolean> {\n    if (this._parameterChangeInterceptors.length > 0) {\n      const visit = nextState.createVisitFor(this.placeDefinition);\n      for (let i = 0; i < this._parameterChangeInterceptors.length; i++) {\n        const interceptor = this._parameterChangeInterceptors[i];\n        const keepGoing = await interceptor.canProceed(visit, interactionContext);\n        if (!keepGoing) {\n          return false;\n        }\n      }\n    }\n    return true;\n  }\n\n\n  /**\n   * Called by the router when the place is ready to interact after any animations have run.\n   */\n  _notifyActive(active: boolean) {\n    this._active.value = active;\n  }\n\n  /**\n   * Called by the router when the place is ready to interact after any animations have run.\n   */\n  _notifyPlaceReady() {\n    if (this.onPlaceReady.length === 1) {\n      this._placeReadyCallbacks.forEach(callback => callback());\n    } else {\n      console.warn('Overriding PlaceComponent.onPlaceReady has been deprecated.  Use PlaceComponent.onPlaceReady(() => {... do stuff...}) instead.');\n      this.onPlaceReady(undefined);\n    }\n  }\n\n  onPlaceReady(callback: () => void) {\n    this._placeReadyCallbacks.push(callback);\n  }\n\n  interceptVisitParameterChange<T>(model: ValueModel<T>, callback: PlaceComponent.InterceptCallback<T>, options?: PlaceComponent.InterceptOptions) {\n    const parameterDef = ParameterDefinition.get(model);\n    this._parameterChangeInterceptors.push(new ParameterChangeInterceptor(parameterDef, model, callback, options));\n  }\n\n}\n\nexport namespace PlaceComponent {\n\n  export function isPlaceComponentConstructor(target: any): target is Constructable<PlaceComponent> {\n    return lang.constructorChain(target as Constructable<any>).includes(PlaceComponent);\n  }\n\n  export function getRouteParameters(klass: Constructable<PlaceComponent>): ParameterDefinition<any>[] {\n    return Klass.get(klass).getMetadataList(ROUTE_PARAMETER_LIST_KEY) as ParameterDefinition<any>[];\n  }\n\n  export function getDefinition(snapshotOrConstructor: ActivatedRouteSnapshot | Constructable<PlaceComponent>): PlaceDefinition {\n    if (snapshotOrConstructor instanceof ActivatedRouteSnapshot) {\n      const component = snapshotOrConstructor.component;\n      if (!isPlaceComponentConstructor(component)) {\n        throw new Error(`ActivatedRouteSnapshot component is not a PlaceComponent, got ${component}`);\n      }\n      return Reflect.getMetadata(DEFINITION_META_DATA_KEY, component);\n    } else {\n      return Reflect.getMetadata(DEFINITION_META_DATA_KEY, snapshotOrConstructor);\n    }\n  }\n\n  export function injectDefinition(klass: Constructable<PlaceComponent>, definition: PlaceDefinition) {\n    Reflect.defineMetadata(DEFINITION_META_DATA_KEY, definition, klass);\n  }\n\n  export type InterceptCallback<T> = (is: T, was: T, interactionContext: InteractionContext) => boolean | Promise<boolean>;\n\n  export interface InterceptOptions {\n    initialValue: 'evaluationUnlessNil' | 'evaluate'\n  }\n\n\n}\n"]}

package/esm2015/lib/place/place-component.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"DEFINITION_META_DATA_KEY":"PLACE_DEFINITION_OPTIONS","ROUTE_PARAMETER_LIST_KEY":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"Symbol"},"arguments":["place:route:parameters"]},"PlaceComponent":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../components/disposable-component","name":"DisposableComponent","line":28,"character":36},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Directive","line":27,"character":1}}],"members":{"canDeactivate":[{"__symbolic":"method"}],"__ctor__":[{"__symbolic":"constructor"}],"initialiseVisit":[{"__symbolic":"method"}],"updateVisit":[{"__symbolic":"method"}],"isInitialised":[{"__symbolic":"method"}],"installBinding":[{"__symbolic":"method"}],"placeDefinition":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@typescript-plus/fast-memoize-decorator","name":"Memoize","line":91,"character":3}}]}],"_notifyActive":[{"__symbolic":"method"}],"onPlaceReady":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"DEFINITION_META_DATA_KEY":"PLACE_DEFINITION_OPTIONS","ROUTE_PARAMETER_LIST_KEY":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"Symbol"},"arguments":["place:route:parameters"]},"PlaceComponent":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../components/disposable-component","name":"DisposableComponent","line":40,"character":36},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Directive","line":39,"character":1}}],"members":{"canDeactivate":[{"__symbolic":"method"}],"__ctor__":[{"__symbolic":"constructor"}],"initialiseVisit":[{"__symbolic":"method"}],"updateVisit":[{"__symbolic":"method"}],"isInitialised":[{"__symbolic":"method"}],"installBinding":[{"__symbolic":"method"}],"placeDefinition":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@typescript-plus/fast-memoize-decorator","name":"Memoize","line":105,"character":3}}]}],"_canLeavePlace":[{"__symbolic":"method"}],"_canChangeRouteParameters":[{"__symbolic":"method"}],"_notifyActive":[{"__symbolic":"method"}],"_notifyPlaceReady":[{"__symbolic":"method"}],"onPlaceReady":[{"__symbolic":"method"}],"interceptVisitParameterChange":[{"__symbolic":"method"}]}}}}]

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

@@ -51,7 +51,7 @@ export class PlaceDefinition {
     }
     getRouteIdFrom(visit) {
         const routeIdParameterDef = this.getRouteIdParameterDef();
-        return routeIdParameterDef ? visit.getParameter(routeIdParameterDef.name) : null;
+        return routeIdParameterDef ? visit.getParameterValue(routeIdParameterDef) : null;
     }
     getFormattedRouteId(visit) {
         // Note: RouteIds are always present in the url and are just empty strings when not defined.  This is
@@ -65,7 +65,7 @@ export class PlaceDefinition {
         this.getVisitParameterDefs({
             includeRouteId, includeRouteParameters: true
         }).forEach(def => {
-            const value = visit.getParameter(def.name);
+            const value = visit.getParameterValue(def);
             if (!def.isEmptyValue(value)) {
                 if (def.isArray) {
                     assert.isArray(value);
@@ -82,7 +82,7 @@ export class PlaceDefinition {
     getNonRouteParameters(visit) {
         const result = {};
         this.getVisitParameterDefs({ includeNonRouteParameters: true }).forEach(def => {
-            const value = visit.getParameter(def.name);
+            const value = visit.getParameterValue(def);
             if (!def.isEmptyValue(value)) {
                 result[def.name] = value;
             }

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

@@ -1 +1 @@
-{"version":3,"file":"place-definition.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/place-definition.ts"],"names":[],"mappings":"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","sourcesContent":["import { ParamMap } from '@angular/router';\nimport { assert, Constructable, Trace } from '@coolon/pectin';\nimport { Opts } from '@coolon/typescript-utilities';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport _ from 'lodash';\nimport { PlaceComponent } from './place-component';\nimport { ParameterDefinition } from './route/parameter-definition';\nimport { Visit } from './visit';\n\nexport class PlaceDefinition {\n\n  constructor(readonly component: Constructable<PlaceComponent>,\n              readonly path: string,\n              readonly authenticate: boolean,\n              readonly role: any,\n              readonly data: { [key: string]: any },\n              readonly routeParameters: ParameterDefinition<any>[],\n              readonly children: PlaceDefinition[]) {\n  }\n\n  hasRouteId() {\n    return !!this.getRouteIdParameterDef();\n  }\n\n  @Memoize()\n  getRouteIdParameterDef(): ParameterDefinition<any> {\n    return this.routeParameters.find(p => p.isRouteId);\n  }\n\n  @Memoize()\n  getRouteParameterDefs(includeRouteId = false): ParameterDefinition<any>[] {\n    return this.getVisitParameterDefs({ includeRouteId, includeRouteParameters: true });\n  }\n\n  @Memoize()\n  getVisitParameterDefs(include?: PlaceDefinition.ParameterOptions): ParameterDefinition<any>[] {\n    const opts = Opts.get(include);\n    // includes\n    const includeRouteId = !include || opts.getOptional('includeRouteId', false);\n    const includeRouteParameters = !include || opts.getOptional('includeRouteParameters', false);\n    const includeNonRouteParameters = !include || opts.getOptional('includeNonRouteParameters', false);\n    return this.routeParameters.filter(p => {\n      return (includeRouteId && p.isRouteId)\n        || (includeRouteParameters && p.isRouteParameter && !p.isRouteId) // route id is included in the line above\n        || (includeNonRouteParameters && !p.isRouteParameter);\n    });\n  }\n\n  getPlaceData<T>(key: string, defaultValue?: T): T {\n    return this.data ?\n      _.isNil(this.data[key]) ? defaultValue : this.data[key] :\n      defaultValue;\n  }\n\n  searchPlaceData<T>(keys: string[], defaultValue?: T): T {\n    if (this.data) {\n      const found = keys.find(key => !_.isNil(this.data[key]));\n      return found ? this.data[found] : defaultValue;\n    } else {\n      return defaultValue;\n    }\n  }\n\n  getRouteIdFrom(visit: Visit) {\n    const routeIdParameterDef = this.getRouteIdParameterDef();\n    return routeIdParameterDef ? visit.getParameter(routeIdParameterDef.name) : null;\n  }\n\n  getFormattedRouteId(visit: Visit): any {\n    // Note: RouteIds are always present in the url and are just empty strings when not defined.  This is\n    // mandated by the fact that redirects from <path> to <path>/:id always include the id parameter as\n    // an empty string.\n    return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : \"\";\n  }\n\n  // @Trace()\n  getFormattedRouteParameters(visit: Visit, includeRouteId = false): { [p: string]: string } {\n    const result: { [p: string]: string } = {};\n    this.getVisitParameterDefs({\n      includeRouteId, includeRouteParameters: true\n    }).forEach(def => {\n      const value = visit.getParameter(def.name);\n      if (!def.isEmptyValue(value)) {\n        if (def.isArray) {\n          assert.isArray(value);\n          result[def.name] = value.map(v => def.urlFormat.format(v));\n        } else {\n          assert.isFalsey(Array.isArray(value));\n          result[def.name] = def.urlFormat.format(value);\n        }\n      }\n    });\n    return result;\n  }\n\n  getNonRouteParameters(visit: Visit): { [p: string]: string } {\n    const result: { [p: string]: string } = {};\n    this.getVisitParameterDefs({ includeNonRouteParameters: true }).forEach(def => {\n      const value = visit.getParameter(def.name);\n      if (!def.isEmptyValue(value)) {\n          result[def.name] = value;\n      }\n    });\n    return result;\n  }\n\n  // @Trace()\n  parseRouteParams(params: ParamMap): { [p: string]: any } {\n    const result: { [p: string]: any } = {};\n    this.getVisitParameterDefs({\n      includeRouteId: true,\n      includeRouteParameters: true,\n      includeNonRouteParameters: false\n    }).forEach(def => {\n      // params will return null for non existent names\n      if (params.has(def.name)) {\n        if (def.isArray) {\n          // const values = params.getAll(def.name); // TODO: EEEK getAll is returning [\"1,2,3,4\"] when we gave it [\"1\",\"2\",\"3\",\"4\"].\n          const values = params.get(def.name).split(',').map(s => s.trim());\n          result[def.name] = values.map(v => def.urlFormat.parse(v));\n        } else {\n          const value = params.get(def.name);\n          if (def.isRouteId) { // TODO: Move this to parameter def so it's a strategy pattern\n            // because our id routes redirect if the id isn't present we always have a id\n            // parameter in our params.  This will bugger our remember and defaultvalue sanitisation\n            // as it'll see that the id is present (event thought its a blank string).\n            if (!_.isEmpty(value)) {\n              result[def.name] = def.urlFormat.parse(value);\n            }\n          } else {\n            result[def.name] = def.urlFormat.parse(value);\n          }\n        }\n      }\n    });\n    return result;\n  }\n\n}\n\nexport namespace PlaceDefinition {\n  export interface ParameterOptions {\n    includeRouteId?: boolean;\n    includeRouteParameters?: boolean;\n    includeNonRouteParameters?: boolean;\n  }\n}\n"]}
+{"version":3,"file":"place-definition.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/place-definition.ts"],"names":[],"mappings":"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","sourcesContent":["import { ParamMap } from '@angular/router';\nimport { assert, Constructable, Trace } from '@coolon/pectin';\nimport { Opts } from '@coolon/typescript-utilities';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport _ from 'lodash';\nimport { PlaceComponent } from './place-component';\nimport { ParameterDefinition } from './route/parameter-definition';\nimport { Visit } from './visit';\n\nexport class PlaceDefinition {\n\n  constructor(readonly component: Constructable<PlaceComponent>,\n              readonly path: string,\n              readonly authenticate: boolean,\n              readonly role: any,\n              readonly data: { [key: string]: any },\n              readonly routeParameters: ParameterDefinition<any>[],\n              readonly children: PlaceDefinition[]) {\n  }\n\n  hasRouteId() {\n    return !!this.getRouteIdParameterDef();\n  }\n\n  @Memoize()\n  getRouteIdParameterDef(): ParameterDefinition<any> {\n    return this.routeParameters.find(p => p.isRouteId);\n  }\n\n  @Memoize()\n  getRouteParameterDefs(includeRouteId = false): ParameterDefinition<any>[] {\n    return this.getVisitParameterDefs({ includeRouteId, includeRouteParameters: true });\n  }\n\n  @Memoize()\n  getVisitParameterDefs(include?: PlaceDefinition.ParameterOptions): ParameterDefinition<any>[] {\n    const opts = Opts.get(include);\n    // includes\n    const includeRouteId = !include || opts.getOptional('includeRouteId', false);\n    const includeRouteParameters = !include || opts.getOptional('includeRouteParameters', false);\n    const includeNonRouteParameters = !include || opts.getOptional('includeNonRouteParameters', false);\n    return this.routeParameters.filter(p => {\n      return (includeRouteId && p.isRouteId)\n        || (includeRouteParameters && p.isRouteParameter && !p.isRouteId) // route id is included in the line above\n        || (includeNonRouteParameters && !p.isRouteParameter);\n    });\n  }\n\n  getPlaceData<T>(key: string, defaultValue?: T): T {\n    return this.data ?\n      _.isNil(this.data[key]) ? defaultValue : this.data[key] :\n      defaultValue;\n  }\n\n  searchPlaceData<T>(keys: string[], defaultValue?: T): T {\n    if (this.data) {\n      const found = keys.find(key => !_.isNil(this.data[key]));\n      return found ? this.data[found] : defaultValue;\n    } else {\n      return defaultValue;\n    }\n  }\n\n  getRouteIdFrom(visit: Visit) {\n    const routeIdParameterDef = this.getRouteIdParameterDef();\n    return routeIdParameterDef ? visit.getParameterValue(routeIdParameterDef) : null;\n  }\n\n  getFormattedRouteId(visit: Visit): any {\n    // Note: RouteIds are always present in the url and are just empty strings when not defined.  This is\n    // mandated by the fact that redirects from <path> to <path>/:id always include the id parameter as\n    // an empty string.\n    return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : \"\";\n  }\n\n  // @Trace()\n  getFormattedRouteParameters(visit: Visit, includeRouteId = false): { [p: string]: string } {\n    const result: { [p: string]: string } = {};\n    this.getVisitParameterDefs({\n      includeRouteId, includeRouteParameters: true\n    }).forEach(def => {\n      const value = visit.getParameterValue(def);\n      if (!def.isEmptyValue(value)) {\n        if (def.isArray) {\n          assert.isArray(value);\n          result[def.name] = value.map(v => def.urlFormat.format(v));\n        } else {\n          assert.isFalsey(Array.isArray(value));\n          result[def.name] = def.urlFormat.format(value);\n        }\n      }\n    });\n    return result;\n  }\n\n  getNonRouteParameters(visit: Visit): { [p: string]: string } {\n    const result: { [p: string]: string } = {};\n    this.getVisitParameterDefs({ includeNonRouteParameters: true }).forEach(def => {\n      const value = visit.getParameterValue(def);\n      if (!def.isEmptyValue(value)) {\n          result[def.name] = value;\n      }\n    });\n    return result;\n  }\n\n  // @Trace()\n  parseRouteParams(params: ParamMap): { [p: string]: any } {\n    const result: { [p: string]: any } = {};\n    this.getVisitParameterDefs({\n      includeRouteId: true,\n      includeRouteParameters: true,\n      includeNonRouteParameters: false\n    }).forEach(def => {\n      // params will return null for non existent names\n      if (params.has(def.name)) {\n        if (def.isArray) {\n          // const values = params.getAll(def.name); // TODO: EEEK getAll is returning [\"1,2,3,4\"] when we gave it [\"1\",\"2\",\"3\",\"4\"].\n          const values = params.get(def.name).split(',').map(s => s.trim());\n          result[def.name] = values.map(v => def.urlFormat.parse(v));\n        } else {\n          const value = params.get(def.name);\n          if (def.isRouteId) { // TODO: Move this to parameter def so it's a strategy pattern\n            // because our id routes redirect if the id isn't present we always have a id\n            // parameter in our params.  This will bugger our remember and defaultvalue sanitisation\n            // as it'll see that the id is present (event thought its a blank string).\n            if (!_.isEmpty(value)) {\n              result[def.name] = def.urlFormat.parse(value);\n            }\n          } else {\n            result[def.name] = def.urlFormat.parse(value);\n          }\n        }\n      }\n    });\n    return result;\n  }\n\n}\n\nexport namespace PlaceDefinition {\n  export interface ParameterOptions {\n    includeRouteId?: boolean;\n    includeRouteParameters?: boolean;\n    includeNonRouteParameters?: boolean;\n  }\n}\n"]}

package/esm2015/lib/place/place-router.js

@@ -1,8 +1,8 @@
-import { __awaiter } from "tslib";
+import { __awaiter, __decorate, __metadata } from "tslib";
 import { Location } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router } from '@angular/router';
-import { assert, Binding, DebugContext, DelegatingValueModel, Dsl, GarbageCollector, lang, MutableListModel, MutableValueModel } from '@coolon/pectin';
+import { assert, Binding, DebugContext, DelegatingValueModel, Dsl, GarbageCollector, lang, MutableListModel, MutableValueModel, Trace } from '@coolon/pectin';
 import { InteractionService } from '../interaction/services/interaction.service';
 import { NavigatingDuringInteraction } from './navigation/session/interactions/navigating-during-interaction';
 import { PopStateDuringInteractionNavigation } from './navigation/session/interactions/pop-state-during-interaction-navigation';
@@ -214,7 +214,7 @@ export class PlaceRouter extends GarbageCollector {
         });
     }
     navigateByUrl(urlSnapshot, navigationExtras) {
-        // console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);
+        console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);
         return this.angularRouter.navigateByUrl(urlSnapshot.urlTree, navigationExtras);
     }
     get activeVisits() {
@@ -280,7 +280,6 @@ export class PlaceRouter extends GarbageCollector {
      * to be able to capture the back button on the first page.  If we don't then the back click will exit
      * the app directly and we don't get to ask.
      */
-    // @Trace()
     syncInteractionContextIdsWithRouter() {
         if (this.navigationSession) {
             // console.log(`Navigation active -> ${this.navigationSession.toString()}, sync delayed until finished.`);
@@ -322,6 +321,12 @@ PlaceRouter.ctorParameters = () => [
     { type: UrlService },
     { type: PlaceHistory }
 ];
+__decorate([
+    Trace(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], PlaceRouter.prototype, "syncInteractionContextIdsWithRouter", null);
 (function (PlaceRouter) {
     class State {
         constructor(activeVisits) {

package/esm2015/lib/place/place-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"place-router.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/place-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  ActivatedRouteSnapshot,\n  NavigationCancel,\n  NavigationEnd,\n  NavigationError,\n  NavigationExtras,\n  NavigationStart,\n  Router,\n  RouterStateSnapshot\n} from '@angular/router';\nimport {\n  assert,\n  Binding,\n  DebugContext,\n  DelegatingValueModel,\n  Dsl,\n  GarbageCollector,\n  lang,\n  ListModel,\n  MapModelChain,\n  MutableListModel,\n  MutableValueModel,\n  ValueModel,\n  ValueModelChain\n} from '@coolon/pectin';\nimport { InteractionServiceRoutingAdapter } from '../interaction/services/interaction-service-routing-adapter';\nimport { InteractionService } from '../interaction/services/interaction.service';\nimport { NavigatingDuringInteraction } from './navigation/session/interactions/navigating-during-interaction';\nimport { PopStateDuringInteractionNavigation } from './navigation/session/interactions/pop-state-during-interaction-navigation';\nimport { SynchroniseInteractionContextIdsWithRoute } from './navigation/session/interactions/synchronise-interaction-context-ids-with-route';\nimport { Navigating } from './navigation/session/navigating';\nimport { NavigationContext } from './navigation/session/navigation-context';\nimport { NavigationSession } from './navigation/session/navigation-session';\nimport { PopStateNavigation } from './navigation/session/pop-state-navigation';\nimport { PlaceAccessGuard } from './place-access-guard';\nimport { PlaceDefinition } from './place-definition';\nimport { PlaceHistory } from './place-history';\nimport { UrlService } from './url-service';\nimport { UrlSnapshot } from './url-snapshot';\nimport { Visit } from './visit';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  readonly navigationSessionModel = new MutableValueModel<NavigationSession>();\n  readonly navigationInProgress: ValueModelChain<boolean>;\n  readonly navigationSessionName: ValueModelChain<string>; // used by tests\n\n  private readonly navigationContext: NavigationContext.Impl;\n\n  private readonly _activeVisits = new MutableListModel<Visit>();\n  private readonly routerInteractionAdapter: InteractionServiceRoutingAdapter;\n  private sessionFinishedJobs: (() => void)[] = [];\n\n  public readonly state: ValueModel<PlaceRouter.State>;\n\n  /**\n   * An observable model containing the authoriser function.  This allows places to react to changes\n   * in permissions when any underlying auth logic changes, e.g. a role being removed from a user.\n   */\n  private readonly _accessGuard = new DelegatingValueModel<PlaceAccessGuard>().withDefault(new PlaceAccessGuard.NoAuth());\n  private redirections: PlaceRouter.Redirections;\n\n  constructor(private readonly angularRouter: Router,\n              private readonly angularLocation: Location,\n              private readonly interactionService: InteractionService,\n              private readonly urlService: UrlService,\n              private readonly placeHistory: PlaceHistory) {\n    super();\n\n    if (window['Cypress']) {\n      window['aup.PlaceRouter'] = this;\n    }\n\n    this.routerInteractionAdapter = interactionService.registerPlaceRouter(this);\n\n    // TODO: Make this an interface and use 'this' instead.\n    this.navigationContext = new NavigationContext.Impl(\n      this.urlService,\n      this.routerInteractionAdapter,\n      (urlSnapshot: UrlSnapshot, options: { replaceUrl: boolean }) => {\n        return this.navigateByUrl(urlSnapshot, options);\n      },\n      state => {\n        this.transitionTo(state);\n      },\n      visits => {\n        this.routingSessionFinished(visits);\n      });\n\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.navigationInProgress = chain(this.navigationSessionModel).isNotNil();\n\n    const idleStateName = chain(this.interactionService.active).map(active => active ? 'IdleDuringInteraction' : 'Idle');\n    this.navigationSessionName = chain(this.navigationSessionModel)\n      .pluck('name')\n      .otherwise(idleStateName);\n\n    DebugContext.tag(this._activeVisits, 'PlaceRouter.activeVisits');\n    this.state = chain(this._activeVisits).reduce(visits => new PlaceRouter.State(visits));\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    angularRouter.events.subscribe(event => {\n      // Routing event sequence\n      // ======================\n      // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session\n      // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.\n      // NavigationStart -> .... -> NavigationError --> navigation aborted, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        // console.log(`---> NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);\n        if (event.navigationTrigger === 'popstate') {\n          this.onPopState(event);\n        } else {\n          this.onRouterStarted(event);\n        }\n        // console.log(`<--- NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);\n      }\n      if (event instanceof NavigationEnd) {\n        // console.log(`---> NavigationEnd[${event.id}]: ${event.url}`);\n        this.onRouterEnd(event);\n        // console.log(`<--- NavigationEnd[${event.id}]: ${event.url}`);\n      }\n      if (event instanceof NavigationError) {\n        // console.log(`---> NavigationError[${event.id}]: ${event.url}`);\n        this.onRouterError(event);\n        // console.log(`<--- NavigationError[${event.id}]: ${event.url}`);\n      }\n      if (event instanceof NavigationCancel) {\n        // console.log(`---> NavigationCancel[${event.id}]: ${event.url}`);\n        this.onRouterCancelled(event);\n        // console.log(`<--- NavigationCancel[${event.id}]: ${event.url}`);\n      }\n    });\n\n    // The router needs to know about url changes and in some cases they are the only way the router can know if\n    // the back button was clicked.\n    angularLocation.onUrlChange(url => this.onUrlChanged(url));\n\n  }\n\n  get accessGuard(): ValueModel<PlaceAccessGuard> {\n    return this._accessGuard.readonly;\n  }\n\n  // @Trace()\n  configureAuth(accessGrant: ValueModel<PlaceAccessGuard>, redirections: PlaceRouter.Redirections) {\n    // We need a shitty mutable model until setDelegate is clever enough to work with readonly models.\n    const hackyMutableModel = new MutableValueModel<PlaceAccessGuard>();\n    const binding = new Binding(hackyMutableModel, accessGrant, {\n      toRight(leftValue: PlaceAccessGuard) {\n        return lang.illegalState('hackyMutableModel is read only');\n      },\n      toLeft: (rightValue: PlaceAccessGuard) => rightValue\n    });\n    binding.writeLeft();\n    this._accessGuard.setDelegate(hackyMutableModel);\n    this.redirections = redirections;\n  }\n\n  getAuthenticationFailureRedirect(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Visit {\n    return this.redirections.onAuthenticationFailure(activatedRoute, state);\n  }\n\n  get navigationSession() {\n    return this.navigationSessionModel.value;\n  }\n\n  get currentSession() {\n    return this.navigationSessionModel.value;\n  }\n\n  isNavigating(): boolean {\n    return this.navigationInProgress.value;\n  }\n\n  waitUntilIdle(): Promise<this> {\n    const { when } = Dsl.disposeWith(this);\n    return new Promise<this>(resolve => {\n      when(this.navigationInProgress).becomesFalsey(() => resolve(this), {\n        initialValue: 'evaluate',\n        once: true\n      });\n    });\n  }\n\n  // @Trace()\n  onPopState(event: NavigationStart) {\n    assert.isTruthy(event.navigationTrigger === 'popstate');\n    if (this.currentSession) {\n      this.currentSession.onPopState(event);\n    } else {\n      const poppedHistoryUrl = event.url;\n      const currentRouterUrl = this.urlService.getCurrentRouterUrl();\n      const session = this.interactionService.isActive() ?\n        new PopStateDuringInteractionNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl) :\n        new PopStateNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl);\n      this.transitionTo(session);\n    }\n  }\n\n  // @Trace()\n  onRouterStarted(event: NavigationStart) {\n    assert.isFalsey(event.navigationTrigger === 'popstate');\n    const inInteraction = this.interactionService.isActive();\n    if (this.currentSession) {\n      this.currentSession.onRouterStarted(event);\n    } else {\n      this.transitionTo(this.createNavigationSession(this.urlService.getCurrentRouterUrl()));\n    }\n  }\n\n  // @Trace()\n  onUrlChanged(newUrl: string) {\n    // the back button can trigger a url change without a navigation session in progress so we\n    // console.log(`---> Url Changed ${newUrl}`);\n    if (this.currentSession) {\n      this.currentSession.onUrlChange(newUrl);\n    } else {\n      console.log('FYI: url changed without a navigation session in progress');\n    }\n    // console.log(`<--- Url Changed`);\n  }\n\n  // @Trace()\n  onRouterCancelled(event: NavigationCancel) {\n    this.currentSession.onRouterCancelled(event);\n  }\n\n  // @Trace()\n  onRouterError(event: NavigationError) {\n    this.currentSession.onRouterError(event);\n  }\n\n  // @Trace()\n  onRouterEnd(event: NavigationEnd) {\n    this.currentSession.onRouterEnd(event);\n  }\n\n  navigate(visit: Visit, options?: { relativeTo: ActivatedRoute }) {\n    return this.doNavigation(visit, async router => {\n      const commands = [\n        visit.placeDefinition.path,\n        ...this.createRouteParameters(visit)\n      ];\n      await this.angularRouter.navigate(commands, {\n        relativeTo: options ? options.relativeTo : null\n      });\n    });\n  }\n\n  // @Trace()\n  async doNavigation(visit: Visit, runNavigationCommands: (router: Router) => any) {\n    if (this.navigationInProgress.value) {\n      lang.illegalState('Navigation already in progress');\n    }\n    const navigation = this.createNavigationSession(this.urlService.getCurrentRouterUrl());\n    navigation.storeVisit(visit);\n    this.transitionTo(navigation);\n    try {\n      await runNavigationCommands(this.angularRouter);\n    } finally {\n      // Check if the router has finished (in the case where no router change required) and we're still in  a\n      // transient state and finish of the transition.\n      if (!this.angularRouter.getCurrentNavigation() && this.currentSession) {\n        this.currentSession.onRouterEnd(new NavigationEnd(-1, '', ''));\n      }\n    }\n  }\n\n  navigateByUrl(urlSnapshot: UrlSnapshot, navigationExtras?: NavigationExtras) {\n    // console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);\n    return this.angularRouter.navigateByUrl(urlSnapshot.urlTree, navigationExtras);\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  // @Trace()\n  async pushVisitChangesToRoute(previous: Visit, next: Visit): Promise<void> {\n    this.placeHistory.updateVisit(next);\n\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const urlSnapshot = this.urlService.parseUrl(this.angularRouter.routerState.snapshot.url).updateVisitSegments(next);\n        // console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });\n        return this.navigateByUrl(urlSnapshot);\n      });\n    }\n  }\n\n\n  private createNavigationSession(currentRouterUrl: string): NavigationSession {\n    const inInteraction = this.interactionService.isActive();\n    return inInteraction ?\n      new NavigatingDuringInteraction(this.navigationContext, currentRouterUrl) :\n      new Navigating(this.navigationContext, currentRouterUrl);\n  }\n\n  // @Trace()\n  protected transitionTo(next: NavigationSession) {\n    const previous = this.navigationSessionModel.value;\n    if (!previous) {\n      this.placeHistory.notifyNavigationStarted();\n    }\n    assert.isTruthy(next !== previous);\n    // Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);\n    this.navigationSessionModel.value = next;\n    if (!!previous) {\n      previous.dispose();\n    }\n    next.notifyActive();\n  }\n\n  // @Trace()\n  private routingSessionFinished(visits: Visit[]) {\n    if (visits && visits.length > 0) {\n      assert.isTruthy(this.navigationInProgress.value);\n      this.placeHistory.notifyNavigationFinished(visits);\n      // We update the active visits before we finish the session so the\n      // place outlets can ignore the incoming changes until things are\n      // settled. TODO: can we removed the event'ness here and just do a push?\n      this._activeVisits.value = visits;\n    }\n    const session = this.currentSession;\n    session.dispose();\n    this.navigationSessionModel.value = null;\n    // console.log(`### Router Session Finished (was ${session.toString()})`);\n    this.sessionFinishedJobs.forEach(job => job());\n    this.sessionFinishedJobs = [];\n  }\n\n  private runAfterRoutingSessionFinishes(func: () => void) {\n    assert.isTruthy(this.navigationInProgress);\n    this.sessionFinishedJobs.push(func);\n  }\n\n\n  /**\n   * Sync's the current interaction state with the URL.  We need to push something in the URL in order\n   * to be able to capture the back button on the first page.  If we don't then the back click will exit\n   * the app directly and we don't get to ask.\n   */\n  // @Trace()\n  syncInteractionContextIdsWithRouter(): Promise<void> {\n    if (this.navigationSession) {\n      // console.log(`Navigation active -> ${this.navigationSession.toString()}, sync delayed until finished.`);\n      const session = this.navigationSession;\n      return new Promise<void>((resolve, reject) => {\n        this.runAfterRoutingSessionFinishes(() => {\n          this.runAfterRoutingSessionFinishes(resolve);\n          const syncSession = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);\n          this.transitionTo(syncSession);\n        });\n      });\n    } else {\n      return new Promise<void>(((resolve, reject) => {\n        // console.log(`No navigation in progress, starting synchronisation job`);\n        this.runAfterRoutingSessionFinishes(resolve);\n        const session = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);\n        this.transitionTo(session);\n      }));\n\n    }\n  }\n\n\n  private createRouteParameters(visit: Visit) {\n    const def = visit.placeDefinition;\n    return visit.hasRouteId() ?\n      [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n      [def.getFormattedRouteParameters(visit)];\n  }\n\n}\n\nexport namespace PlaceRouter {\n\n  export interface Redirections {\n    onAuthenticationFailure(activatedRoute?: ActivatedRouteSnapshot, state?: RouterStateSnapshot): Visit;\n  }\n\n  export class State {\n    constructor(private readonly activeVisits: Visit[]) {\n    }\n\n    isPlaceActive(placeDefinition: PlaceDefinition): boolean {\n      return !!this.getVisitFor(placeDefinition);\n    }\n\n    getVisitFor(placeDefinition: PlaceDefinition): Visit {\n      return this.activeVisits.find(v => v.placeDefinition === placeDefinition);\n    }\n  }\n\n}\n"]}
+{"version":3,"file":"place-router.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/place/place-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  ActivatedRouteSnapshot,\n  NavigationCancel,\n  NavigationEnd,\n  NavigationError,\n  NavigationExtras,\n  NavigationStart,\n  Router,\n  RouterStateSnapshot\n} from '@angular/router';\nimport {\n  assert,\n  Binding,\n  DebugContext,\n  DelegatingValueModel,\n  Dsl,\n  GarbageCollector,\n  lang,\n  ListModel,\n  MutableListModel,\n  MutableValueModel,\n  Trace,\n  ValueModel,\n  ValueModelChain\n} from '@coolon/pectin';\nimport { InteractionServiceRoutingAdapter } from '../interaction/services/interaction-service-routing-adapter';\nimport { InteractionService } from '../interaction/services/interaction.service';\nimport { NavigatingDuringInteraction } from './navigation/session/interactions/navigating-during-interaction';\nimport { PopStateDuringInteractionNavigation } from './navigation/session/interactions/pop-state-during-interaction-navigation';\nimport { SynchroniseInteractionContextIdsWithRoute } from './navigation/session/interactions/synchronise-interaction-context-ids-with-route';\nimport { Navigating } from './navigation/session/navigating';\nimport { NavigationContext } from './navigation/session/navigation-context';\nimport { NavigationSession } from './navigation/session/navigation-session';\nimport { PopStateNavigation } from './navigation/session/pop-state-navigation';\nimport { PlaceAccessGuard } from './place-access-guard';\nimport { PlaceDefinition } from './place-definition';\nimport { PlaceHistory } from './place-history';\nimport { UrlService } from './url-service';\nimport { UrlSnapshot } from './url-snapshot';\nimport { Visit } from './visit';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  readonly navigationSessionModel = new MutableValueModel<NavigationSession>();\n  readonly navigationInProgress: ValueModelChain<boolean>;\n  readonly navigationSessionName: ValueModelChain<string>; // used by tests\n\n  private readonly navigationContext: NavigationContext.Impl;\n\n  private readonly _activeVisits = new MutableListModel<Visit>();\n  private readonly routerInteractionAdapter: InteractionServiceRoutingAdapter;\n  private sessionFinishedJobs: (() => void)[] = [];\n\n  public readonly state: ValueModel<PlaceRouter.State>;\n\n  /**\n   * An observable model containing the authoriser function.  This allows places to react to changes\n   * in permissions when any underlying auth logic changes, e.g. a role being removed from a user.\n   */\n  private readonly _accessGuard = new DelegatingValueModel<PlaceAccessGuard>().withDefault(new PlaceAccessGuard.NoAuth());\n  private redirections: PlaceRouter.Redirections;\n\n  constructor(private readonly angularRouter: Router,\n              private readonly angularLocation: Location,\n              private readonly interactionService: InteractionService,\n              private readonly urlService: UrlService,\n              private readonly placeHistory: PlaceHistory) {\n    super();\n\n    if (window['Cypress']) {\n      window['aup.PlaceRouter'] = this;\n    }\n\n    this.routerInteractionAdapter = interactionService.registerPlaceRouter(this);\n\n    // TODO: Make this an interface and use 'this' instead.\n    this.navigationContext = new NavigationContext.Impl(\n      this.urlService,\n      this.routerInteractionAdapter,\n      (urlSnapshot: UrlSnapshot, options: { replaceUrl: boolean }) => {\n        return this.navigateByUrl(urlSnapshot, options);\n      },\n      state => {\n        this.transitionTo(state);\n      },\n      visits => {\n        this.routingSessionFinished(visits);\n      });\n\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.navigationInProgress = chain(this.navigationSessionModel).isNotNil();\n\n    const idleStateName = chain(this.interactionService.active).map(active => active ? 'IdleDuringInteraction' : 'Idle');\n    this.navigationSessionName = chain(this.navigationSessionModel)\n      .pluck('name')\n      .otherwise(idleStateName);\n\n    DebugContext.tag(this._activeVisits, 'PlaceRouter.activeVisits');\n    this.state = chain(this._activeVisits).reduce(visits => new PlaceRouter.State(visits));\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    angularRouter.events.subscribe(event => {\n      // Routing event sequence\n      // ======================\n      // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session\n      // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.\n      // NavigationStart -> .... -> NavigationError --> navigation aborted, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        // console.log(`---> NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);\n        if (event.navigationTrigger === 'popstate') {\n          this.onPopState(event);\n        } else {\n          this.onRouterStarted(event);\n        }\n        // console.log(`<--- NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);\n      }\n      if (event instanceof NavigationEnd) {\n        // console.log(`---> NavigationEnd[${event.id}]: ${event.url}`);\n        this.onRouterEnd(event);\n        // console.log(`<--- NavigationEnd[${event.id}]: ${event.url}`);\n      }\n      if (event instanceof NavigationError) {\n        // console.log(`---> NavigationError[${event.id}]: ${event.url}`);\n        this.onRouterError(event);\n        // console.log(`<--- NavigationError[${event.id}]: ${event.url}`);\n      }\n      if (event instanceof NavigationCancel) {\n        // console.log(`---> NavigationCancel[${event.id}]: ${event.url}`);\n        this.onRouterCancelled(event);\n        // console.log(`<--- NavigationCancel[${event.id}]: ${event.url}`);\n      }\n    });\n\n    // The router needs to know about url changes and in some cases they are the only way the router can know if\n    // the back button was clicked.\n    angularLocation.onUrlChange(url => this.onUrlChanged(url));\n\n  }\n\n  get accessGuard(): ValueModel<PlaceAccessGuard> {\n    return this._accessGuard.readonly;\n  }\n\n  // @Trace()\n  configureAuth(accessGrant: ValueModel<PlaceAccessGuard>, redirections: PlaceRouter.Redirections) {\n    // We need a shitty mutable model until setDelegate is clever enough to work with readonly models.\n    const hackyMutableModel = new MutableValueModel<PlaceAccessGuard>();\n    const binding = new Binding(hackyMutableModel, accessGrant, {\n      toRight(leftValue: PlaceAccessGuard) {\n        return lang.illegalState('hackyMutableModel is read only');\n      },\n      toLeft: (rightValue: PlaceAccessGuard) => rightValue\n    });\n    binding.writeLeft();\n    this._accessGuard.setDelegate(hackyMutableModel);\n    this.redirections = redirections;\n  }\n\n  getAuthenticationFailureRedirect(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Visit {\n    return this.redirections.onAuthenticationFailure(activatedRoute, state);\n  }\n\n  get navigationSession() {\n    return this.navigationSessionModel.value;\n  }\n\n  get currentSession() {\n    return this.navigationSessionModel.value;\n  }\n\n  isNavigating(): boolean {\n    return this.navigationInProgress.value;\n  }\n\n  waitUntilIdle(): Promise<this> {\n    const { when } = Dsl.disposeWith(this);\n    return new Promise<this>(resolve => {\n      when(this.navigationInProgress).becomesFalsey(() => resolve(this), {\n        initialValue: 'evaluate',\n        once: true\n      });\n    });\n  }\n\n  // @Trace()\n  onPopState(event: NavigationStart) {\n    assert.isTruthy(event.navigationTrigger === 'popstate');\n    if (this.currentSession) {\n      this.currentSession.onPopState(event);\n    } else {\n      const poppedHistoryUrl = event.url;\n      const currentRouterUrl = this.urlService.getCurrentRouterUrl();\n      const session = this.interactionService.isActive() ?\n        new PopStateDuringInteractionNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl) :\n        new PopStateNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl);\n      this.transitionTo(session);\n    }\n  }\n\n  // @Trace()\n  onRouterStarted(event: NavigationStart) {\n    assert.isFalsey(event.navigationTrigger === 'popstate');\n    const inInteraction = this.interactionService.isActive();\n    if (this.currentSession) {\n      this.currentSession.onRouterStarted(event);\n    } else {\n      this.transitionTo(this.createNavigationSession(this.urlService.getCurrentRouterUrl()));\n    }\n  }\n\n  // @Trace()\n  onUrlChanged(newUrl: string) {\n    // the back button can trigger a url change without a navigation session in progress so we\n    // console.log(`---> Url Changed ${newUrl}`);\n    if (this.currentSession) {\n      this.currentSession.onUrlChange(newUrl);\n    } else {\n      console.log('FYI: url changed without a navigation session in progress');\n    }\n    // console.log(`<--- Url Changed`);\n  }\n\n  // @Trace()\n  onRouterCancelled(event: NavigationCancel) {\n    this.currentSession.onRouterCancelled(event);\n  }\n\n  // @Trace()\n  onRouterError(event: NavigationError) {\n    this.currentSession.onRouterError(event);\n  }\n\n  // @Trace()\n  onRouterEnd(event: NavigationEnd) {\n    this.currentSession.onRouterEnd(event);\n  }\n\n  navigate(visit: Visit, options?: { relativeTo: ActivatedRoute }) {\n    return this.doNavigation(visit, async router => {\n      const commands = [\n        visit.placeDefinition.path,\n        ...this.createRouteParameters(visit)\n      ];\n      await this.angularRouter.navigate(commands, {\n        relativeTo: options ? options.relativeTo : null\n      });\n    });\n  }\n\n  // @Trace()\n  async doNavigation(visit: Visit, runNavigationCommands: (router: Router) => any) {\n    if (this.navigationInProgress.value) {\n      lang.illegalState('Navigation already in progress');\n    }\n    const navigation = this.createNavigationSession(this.urlService.getCurrentRouterUrl());\n    navigation.storeVisit(visit);\n    this.transitionTo(navigation);\n    try {\n      await runNavigationCommands(this.angularRouter);\n    } finally {\n      // Check if the router has finished (in the case where no router change required) and we're still in  a\n      // transient state and finish of the transition.\n      if (!this.angularRouter.getCurrentNavigation() && this.currentSession) {\n        this.currentSession.onRouterEnd(new NavigationEnd(-1, '', ''));\n      }\n    }\n  }\n\n  navigateByUrl(urlSnapshot: UrlSnapshot, navigationExtras?: NavigationExtras): Promise<boolean> {\n    console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);\n    return this.angularRouter.navigateByUrl(urlSnapshot.urlTree, navigationExtras);\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  // @Trace()\n  async pushVisitChangesToRoute(previous: Visit, next: Visit): Promise<void> {\n    this.placeHistory.updateVisit(next);\n\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const urlSnapshot = this.urlService.parseUrl(this.angularRouter.routerState.snapshot.url).updateVisitSegments(next);\n        // console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });\n        return this.navigateByUrl(urlSnapshot);\n      });\n    }\n  }\n\n\n  private createNavigationSession(currentRouterUrl: string): NavigationSession {\n    const inInteraction = this.interactionService.isActive();\n    return inInteraction ?\n      new NavigatingDuringInteraction(this.navigationContext, currentRouterUrl) :\n      new Navigating(this.navigationContext, currentRouterUrl);\n  }\n\n  // @Trace()\n  protected transitionTo(next: NavigationSession) {\n    const previous = this.navigationSessionModel.value;\n    if (!previous) {\n      this.placeHistory.notifyNavigationStarted();\n    }\n    assert.isTruthy(next !== previous);\n    // Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);\n    this.navigationSessionModel.value = next;\n    if (!!previous) {\n      previous.dispose();\n    }\n    next.notifyActive();\n  }\n\n  // @Trace()\n  private routingSessionFinished(visits: Visit[]) {\n    if (visits && visits.length > 0) {\n      assert.isTruthy(this.navigationInProgress.value);\n      this.placeHistory.notifyNavigationFinished(visits);\n      // We update the active visits before we finish the session so the\n      // place outlets can ignore the incoming changes until things are\n      // settled. TODO: can we removed the event'ness here and just do a push?\n      this._activeVisits.value = visits;\n    }\n    const session = this.currentSession;\n    session.dispose();\n    this.navigationSessionModel.value = null;\n    // console.log(`### Router Session Finished (was ${session.toString()})`);\n    this.sessionFinishedJobs.forEach(job => job());\n    this.sessionFinishedJobs = [];\n  }\n\n  private runAfterRoutingSessionFinishes(func: () => void) {\n    assert.isTruthy(this.navigationInProgress);\n    this.sessionFinishedJobs.push(func);\n  }\n\n\n  /**\n   * Sync's the current interaction state with the URL.  We need to push something in the URL in order\n   * to be able to capture the back button on the first page.  If we don't then the back click will exit\n   * the app directly and we don't get to ask.\n   */\n  @Trace()\n  syncInteractionContextIdsWithRouter(): Promise<void> {\n    if (this.navigationSession) {\n      // console.log(`Navigation active -> ${this.navigationSession.toString()}, sync delayed until finished.`);\n      const session = this.navigationSession;\n      return new Promise<void>((resolve, reject) => {\n        this.runAfterRoutingSessionFinishes(() => {\n          this.runAfterRoutingSessionFinishes(resolve);\n          const syncSession = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);\n          this.transitionTo(syncSession);\n        });\n      });\n    } else {\n      return new Promise<void>(((resolve, reject) => {\n        // console.log(`No navigation in progress, starting synchronisation job`);\n        this.runAfterRoutingSessionFinishes(resolve);\n        const session = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);\n        this.transitionTo(session);\n      }));\n\n    }\n  }\n\n\n  private createRouteParameters(visit: Visit) {\n    const def = visit.placeDefinition;\n    return visit.hasRouteId() ?\n      [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n      [def.getFormattedRouteParameters(visit)];\n  }\n\n}\n\nexport namespace PlaceRouter {\n\n  export interface Redirections {\n    onAuthenticationFailure(activatedRoute?: ActivatedRouteSnapshot, state?: RouterStateSnapshot): Visit;\n  }\n\n  export class State {\n    constructor(private readonly activeVisits: Visit[]) {\n    }\n\n    isPlaceActive(placeDefinition: PlaceDefinition): boolean {\n      return !!this.getVisitFor(placeDefinition);\n    }\n\n    getVisitFor(placeDefinition: PlaceDefinition): Visit {\n      return this.activeVisits.find(v => v.placeDefinition === placeDefinition);\n    }\n  }\n\n}\n"]}

package/esm2015/lib/place/place-router.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"PlaceRouter":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"@coolon/pectin","name":"GarbageCollector","line":47,"character":33},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable","line":44,"character":1},"arguments":[{"providedIn":"root"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/router","name":"Router","line":68,"character":46},{"__symbolic":"reference","module":"@angular/common","name":"Location","line":69,"character":48},{"__symbolic":"reference","module":"../interaction/services/interaction.service","name":"InteractionService","line":70,"character":51},{"__symbolic":"reference","module":"./url-service","name":"UrlService","line":71,"character":43},{"__symbolic":"reference","module":"./place-history","name":"PlaceHistory","line":72,"character":45}]}],"configureAuth":[{"__symbolic":"method"}],"getAuthenticationFailureRedirect":[{"__symbolic":"method"}],"isNavigating":[{"__symbolic":"method"}],"waitUntilIdle":[{"__symbolic":"method"}],"onPopState":[{"__symbolic":"method"}],"onRouterStarted":[{"__symbolic":"method"}],"onUrlChanged":[{"__symbolic":"method"}],"onRouterCancelled":[{"__symbolic":"method"}],"onRouterError":[{"__symbolic":"method"}],"onRouterEnd":[{"__symbolic":"method"}],"navigate":[{"__symbolic":"method"}],"doNavigation":[{"__symbolic":"method"}],"navigateByUrl":[{"__symbolic":"method"}],"pushVisitChangesToRoute":[{"__symbolic":"method"}],"createNavigationSession":[{"__symbolic":"method"}],"transitionTo":[{"__symbolic":"method"}],"routingSessionFinished":[{"__symbolic":"method"}],"runAfterRoutingSessionFinishes":[{"__symbolic":"method"}],"syncInteractionContextIdsWithRouter":[{"__symbolic":"method"}],"createRouteParameters":[{"__symbolic":"method"}]},"statics":{"ɵprov":{}}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"PlaceRouter":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"@coolon/pectin","name":"GarbageCollector","line":47,"character":33},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable","line":44,"character":1},"arguments":[{"providedIn":"root"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/router","name":"Router","line":68,"character":46},{"__symbolic":"reference","module":"@angular/common","name":"Location","line":69,"character":48},{"__symbolic":"reference","module":"../interaction/services/interaction.service","name":"InteractionService","line":70,"character":51},{"__symbolic":"reference","module":"./url-service","name":"UrlService","line":71,"character":43},{"__symbolic":"reference","module":"./place-history","name":"PlaceHistory","line":72,"character":45}]}],"configureAuth":[{"__symbolic":"method"}],"getAuthenticationFailureRedirect":[{"__symbolic":"method"}],"isNavigating":[{"__symbolic":"method"}],"waitUntilIdle":[{"__symbolic":"method"}],"onPopState":[{"__symbolic":"method"}],"onRouterStarted":[{"__symbolic":"method"}],"onUrlChanged":[{"__symbolic":"method"}],"onRouterCancelled":[{"__symbolic":"method"}],"onRouterError":[{"__symbolic":"method"}],"onRouterEnd":[{"__symbolic":"method"}],"navigate":[{"__symbolic":"method"}],"doNavigation":[{"__symbolic":"method"}],"navigateByUrl":[{"__symbolic":"method"}],"pushVisitChangesToRoute":[{"__symbolic":"method"}],"createNavigationSession":[{"__symbolic":"method"}],"transitionTo":[{"__symbolic":"method"}],"routingSessionFinished":[{"__symbolic":"method"}],"runAfterRoutingSessionFinishes":[{"__symbolic":"method"}],"syncInteractionContextIdsWithRouter":[{"__symbolic":"method","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"Trace","line":350,"character":3}}]}],"createRouteParameters":[{"__symbolic":"method"}]},"statics":{"ɵprov":{}}}}}]

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

@@ -1,13 +1,15 @@
-import { Binding, DebugContext, Functions, MutableListModel, MutableValueModel } from '@coolon/pectin';
+import { Binding, DebugContext, Functions } from '@coolon/pectin';
 import { Klass, Opts } from '@coolon/typescript-utilities';
 import { ROUTE_PARAMETER_LIST_KEY } from '../place-component';
 import { ParameterDefinition } from './parameter-definition';
-function installMechanics(prototype, propertyKey, backingModelFactory, tagPrefix, isEmpty) {
+function installMechanics(parameterDef, prototype, propertyKey, tagPrefix) {
+    Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, parameterDef);
     function getMechanics(instance, propertyName) {
         const key = `__mechanics_${propertyName.toString()}`;
         if (!instance[key]) {
+            const backingModel = parameterDef.createBackingModel();
             instance[key] = {
-                backingModel: backingModelFactory(),
+                backingModel: backingModel,
                 binding: null
             };
             const tag = `${tagPrefix}(${prototype.constructor.name}.${propertyKey.toString()})`;
@@ -31,12 +33,12 @@ function installMechanics(prototype, propertyKey, backingModelFactory, tagPrefix
                     toLeft: Functions.identity,
                     toRight: Functions.identity
                 });
-                if (isEmpty(userModel)) {
+                if (parameterDef.isEmptyValue(userModel.value)) {
                     // console.log(`Push visit to model for ${tag}`, {value: mechanics.backingModel.value});
                     mechanics.binding.writeRight(); // push the visit into the user model;
                 }
                 else {
-                    if (!isEmpty(mechanics.backingModel)) {
+                    if (!parameterDef.isEmptyValue(mechanics.backingModel.value)) {
                         console.warn('Assigning a visit model with an existing value to a visit parameter with an existing value.  Visit parameter will be overridden');
                     }
                     mechanics.binding.writeLeft(); // push the user model into the visit
@@ -47,25 +49,22 @@ function installMechanics(prototype, propertyKey, backingModelFactory, tagPrefix
 }
 export function RouteId(type, options) {
     return (prototype, propertyKey) => {
-        const param = new ParameterDefinition.RouteId(propertyKey.toString(), options, type);
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
-        installMechanics(prototype, propertyKey, () => new MutableValueModel(), '@RouteId', m => m.query().isNil());
+        const parameterDef = new ParameterDefinition.RouteId(propertyKey.toString(), options, type);
+        installMechanics(parameterDef, prototype, propertyKey, '@RouteId');
     };
 }
 export function VisitParameter(options) {
     const opts = Opts.get(options);
     return (prototype, propertyKey) => {
-        const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
-        installMechanics(prototype, propertyKey, () => new MutableValueModel(), '@VisitParameter', m => m.query().isNil());
+        const parameterDef = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));
+        installMechanics(parameterDef, prototype, propertyKey, '@VisitParameter');
     };
 }
 export function VisitParameterList(options) {
     const opts = Opts.get(options);
     return (prototype, propertyKey) => {
-        const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
-        installMechanics(prototype, propertyKey, () => new MutableListModel(), '@VisitParameterList', m => m.query().isEmpty());
+        const parameterDef = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));
+        installMechanics(parameterDef, prototype, propertyKey, '@VisitParameterList');
     };
 }
 //# sourceMappingURL=parameter-decorators.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"parameter-decorators.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/parameter-decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,YAAY,EACZ,SAAS,EAGT,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AA8B7D,SAAS,gBAAgB,CAA0B,SAAiB,EAAE,WAA4B,EAAE,mBAA4B,EAAE,SAAiB,EAAE,OAA6B;IAChL,SAAS,YAAY,CAAC,QAAW,EAAE,YAA6B;QAC9D,MAAM,GAAG,GAAG,eAAe,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAClB,QAAQ,CAAC,GAAG,CAAC,GAAG;gBACd,YAAY,EAAE,mBAAmB,EAAE;gBACnC,OAAO,EAAE,IAAyB;aACnC,CAAC;YACF,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC;YACpF,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC/D;QACD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE;QAC5C,GAAG,EAAE;YACH,OAAO,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,YAAY,CAAC;QACtD,CAAC;QACD,GAAG,EAAE,UAAS,SAAY;YACxB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAClD,iGAAiG;YACjG,yBAAyB;YACzB,IAAI,SAAS,CAAC,OAAO,EAAE;gBACrB,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;aAC7B;YACD,IAAI,SAAS,EAAE;gBACb,SAAS,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,EAAE;oBACjE,MAAM,EAAE,SAAS,CAAC,QAAQ;oBAC1B,OAAO,EAAE,SAAS,CAAC,QAAQ;iBAC5B,CAAC,CAAC;gBACH,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;oBACtB,wFAAwF;oBACxF,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,sCAAsC;iBACvE;qBAAM;oBACL,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;wBACpC,OAAO,CAAC,IAAI,CAAC,iIAAiI,CAAC,CAAC;qBACjJ;oBACD,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,qCAAqC;iBACrE;aACF;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,OAAO,CAA4B,IAAkB,EAAE,OAA2B;IAChG,OAAO,CAAC,SAAiB,EAAE,WAA4B,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,IAAI,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACrF,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAC3E,gBAAgB,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,iBAAiB,EAAK,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACjH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAI,OAAkC;IAClE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,SAAiB,EAAE,WAA4B,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,IAAI,mBAAmB,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5H,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAC3E,gBAAgB,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,iBAAiB,EAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACxH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAI,OAAsC;IAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,SAAiB,EAAE,WAA4B,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,IAAI,mBAAmB,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5H,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAC3E,gBAAgB,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,gBAAgB,EAAK,EAAE,qBAAqB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7H,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import {\n  Binding,\n  DebugContext,\n  Functions,\n  HasValue,\n  Logger,\n  MutableListModel,\n  MutableValueModel\n} from '@coolon/pectin';\nimport { Klass, Opts } from '@coolon/typescript-utilities';\nimport { ROUTE_PARAMETER_LIST_KEY } from '../place-component';\nimport { Formatter } from './formatter';\nimport { ParameterDefinition } from './parameter-definition';\n\n\nexport interface RouteIdOptions<T> {\n  as?: string;\n  optional?: boolean;\n  remember?: boolean;\n  defaultValue?: T;\n  // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser<T>;\n}\n\nexport interface RouteParameterOptions<T> {\n  as?: string;\n  optional?: boolean;\n  remember?: boolean;\n  defaultValue?: T;\n  storeInUrl?: Formatter<T>\n  // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser<T>;\n}\n\nexport interface RouteListParameterOptions<T> {\n  as?: string;\n  optional?: boolean;\n  remember?: boolean;\n  defaultValue?: T[];\n  storeInUrl?: Formatter<T>\n  // sanitiser?: Constructable<ParameterSanitiser<T[]>> | ParameterSanitiser<T[]>;\n}\n\n\nfunction installMechanics<M extends HasValue<any>>(prototype: Object, propertyKey: string | symbol, backingModelFactory: () => M, tagPrefix: string, isEmpty: (mode: M) => boolean) {\n  function getMechanics(instance: M, propertyName: string | symbol) {\n    const key = `__mechanics_${propertyName.toString()}`;\n    if (!instance[key]) {\n      instance[key] = {\n        backingModel: backingModelFactory(),\n        binding: null as Binding<any, any>\n      };\n      const tag = `${tagPrefix}(${prototype.constructor.name}.${propertyKey.toString()})`;\n      DebugContext.getOrCreate(instance[key].backingModel).tag(tag);\n    }\n    return instance[key];\n  }\n  Object.defineProperty(prototype, propertyKey, {\n    get: function() {\n      return getMechanics(this, propertyKey).backingModel;\n    },\n    set: function(userModel: M) {\n      const mechanics = getMechanics(this, propertyKey);\n      // This handles the scenario where we want to push an existing value model (such as a form model)\n      // to and from the route.\n      if (mechanics.binding) {\n        mechanics.binding.dispose();\n      }\n      if (userModel) {\n        mechanics.binding = new Binding(mechanics.backingModel, userModel, {\n          toLeft: Functions.identity,\n          toRight: Functions.identity\n        });\n        if (isEmpty(userModel)) {\n          // console.log(`Push visit to model for ${tag}`, {value: mechanics.backingModel.value});\n          mechanics.binding.writeRight(); // push the visit into the user model;\n        } else {\n          if (!isEmpty(mechanics.backingModel)) {\n            console.warn('Assigning a visit model with an existing value to a visit parameter with an existing value.  Visit parameter will be overridden');\n          }\n          mechanics.binding.writeLeft(); // push the user model into the visit\n        }\n      }\n    }\n  });\n}\n\nexport function RouteId<T extends string | number>(type: Formatter<T>, options?: RouteIdOptions<T>): PropertyDecorator {\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const param = new ParameterDefinition.RouteId(propertyKey.toString(), options, type);\n    Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);\n    installMechanics(prototype, propertyKey, () => new MutableValueModel<T>(), '@RouteId', m => m.query().isNil());\n  };\n}\n\nexport function VisitParameter<T>(options?: RouteParameterOptions<T>): PropertyDecorator {\n  const opts = Opts.get(options);\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));\n    Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);\n    installMechanics(prototype, propertyKey, () => new MutableValueModel<T>(), '@VisitParameter', m => m.query().isNil());\n  };\n}\n\nexport function VisitParameterList<E>(options?: RouteListParameterOptions<E>): PropertyDecorator {\n  const opts = Opts.get(options);\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));\n    Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);\n    installMechanics(prototype, propertyKey, () => new MutableListModel<E>(), '@VisitParameterList', m => m.query().isEmpty());\n  };\n}\n"]}
+{"version":3,"file":"parameter-decorators.js","sourceRoot":"","sources":["../../../../../../../libs/angular-ui-powerups/src/lib/place/route/parameter-decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAY,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AA8B7D,SAAS,gBAAgB,CAA0B,YAAsC,EAAE,SAAiB,EAAE,WAA4B,EAAE,SAAiB;IAE3J,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,wBAAwB,EAAE,YAAY,CAAC,CAAC;IAElF,SAAS,YAAY,CAAC,QAAW,EAAE,YAA6B;QAC9D,MAAM,GAAG,GAAG,eAAe,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAClB,MAAM,YAAY,GAAG,YAAY,CAAC,kBAAkB,EAAE,CAAC;YACvD,QAAQ,CAAC,GAAG,CAAC,GAAG;gBACd,YAAY,EAAE,YAAY;gBAC1B,OAAO,EAAE,IAAyB;aACnC,CAAC;YACF,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC;YACpF,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC/D;QACD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE;QAC5C,GAAG,EAAE;YACH,OAAO,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,YAAY,CAAC;QACtD,CAAC;QACD,GAAG,EAAE,UAAS,SAAY;YACxB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAClD,iGAAiG;YACjG,yBAAyB;YACzB,IAAI,SAAS,CAAC,OAAO,EAAE;gBACrB,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;aAC7B;YACD,IAAI,SAAS,EAAE;gBACb,SAAS,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,EAAE;oBACjE,MAAM,EAAE,SAAS,CAAC,QAAQ;oBAC1B,OAAO,EAAE,SAAS,CAAC,QAAQ;iBAC5B,CAAC,CAAC;gBACH,IAAI,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBAC9C,wFAAwF;oBACxF,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,sCAAsC;iBACvE;qBAAM;oBACL,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;wBAC5D,OAAO,CAAC,IAAI,CAAC,iIAAiI,CAAC,CAAC;qBACjJ;oBACD,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,qCAAqC;iBACrE;aACF;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,OAAO,CAA4B,IAAkB,EAAE,OAA2B;IAChG,OAAO,CAAC,SAAiB,EAAE,WAA4B,EAAE,EAAE;QACzD,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC5F,gBAAgB,CAAC,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACrE,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAI,OAAkC;IAClE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,SAAiB,EAAE,WAA4B,EAAE,EAAE;QACzD,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;QACnI,gBAAgB,CAAC,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAI,OAAsC;IAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,SAAiB,EAAE,WAA4B,EAAE,EAAE;QACzD,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;QACnI,gBAAgB,CAAC,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,qBAAqB,CAAC,CAAC;IAChF,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { Binding, DebugContext, Functions, HasValue } from '@coolon/pectin';\nimport { Klass, Opts } from '@coolon/typescript-utilities';\nimport { ROUTE_PARAMETER_LIST_KEY } from '../place-component';\nimport { Formatter } from './formatter';\nimport { ParameterDefinition } from './parameter-definition';\n\n\nexport interface RouteIdOptions<T> {\n  as?: string;\n  optional?: boolean;\n  remember?: boolean;\n  defaultValue?: T;\n  // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser<T>;\n}\n\nexport interface RouteParameterOptions<T> {\n  as?: string;\n  optional?: boolean;\n  remember?: boolean;\n  defaultValue?: T;\n  storeInUrl?: Formatter<T>\n  // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser<T>;\n}\n\nexport interface RouteListParameterOptions<T> {\n  as?: string;\n  optional?: boolean;\n  remember?: boolean;\n  defaultValue?: T[];\n  storeInUrl?: Formatter<T>\n  // sanitiser?: Constructable<ParameterSanitiser<T[]>> | ParameterSanitiser<T[]>;\n}\n\n\nfunction installMechanics<M extends HasValue<any>>(parameterDef: ParameterDefinition<any>, prototype: Object, propertyKey: string | symbol, tagPrefix: string) {\n\n  Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, parameterDef);\n\n  function getMechanics(instance: M, propertyName: string | symbol) {\n    const key = `__mechanics_${propertyName.toString()}`;\n    if (!instance[key]) {\n      const backingModel = parameterDef.createBackingModel();\n      instance[key] = {\n        backingModel: backingModel,\n        binding: null as Binding<any, any>\n      };\n      const tag = `${tagPrefix}(${prototype.constructor.name}.${propertyKey.toString()})`;\n      DebugContext.getOrCreate(instance[key].backingModel).tag(tag);\n    }\n    return instance[key];\n  }\n\n  Object.defineProperty(prototype, propertyKey, {\n    get: function() {\n      return getMechanics(this, propertyKey).backingModel;\n    },\n    set: function(userModel: M) {\n      const mechanics = getMechanics(this, propertyKey);\n      // This handles the scenario where we want to push an existing value model (such as a form model)\n      // to and from the route.\n      if (mechanics.binding) {\n        mechanics.binding.dispose();\n      }\n      if (userModel) {\n        mechanics.binding = new Binding(mechanics.backingModel, userModel, {\n          toLeft: Functions.identity,\n          toRight: Functions.identity\n        });\n        if (parameterDef.isEmptyValue(userModel.value)) {\n          // console.log(`Push visit to model for ${tag}`, {value: mechanics.backingModel.value});\n          mechanics.binding.writeRight(); // push the visit into the user model;\n        } else {\n          if (!parameterDef.isEmptyValue(mechanics.backingModel.value)) {\n            console.warn('Assigning a visit model with an existing value to a visit parameter with an existing value.  Visit parameter will be overridden');\n          }\n          mechanics.binding.writeLeft(); // push the user model into the visit\n        }\n      }\n    }\n  });\n}\n\nexport function RouteId<T extends string | number>(type: Formatter<T>, options?: RouteIdOptions<T>): PropertyDecorator {\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const parameterDef = new ParameterDefinition.RouteId(propertyKey.toString(), options, type);\n    installMechanics(parameterDef, prototype, propertyKey, '@RouteId');\n  };\n}\n\nexport function VisitParameter<T>(options?: RouteParameterOptions<T>): PropertyDecorator {\n  const opts = Opts.get(options);\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const parameterDef = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));\n    installMechanics(parameterDef, prototype, propertyKey, '@VisitParameter');\n  };\n}\n\nexport function VisitParameterList<E>(options?: RouteListParameterOptions<E>): PropertyDecorator {\n  const opts = Opts.get(options);\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const parameterDef = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));\n    installMechanics(parameterDef, prototype, propertyKey, '@VisitParameterList');\n  };\n}\n"]}

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RouteIdOptions":{"__symbolic":"interface"},"RouteParameterOptions":{"__symbolic":"interface"},"RouteListParameterOptions":{"__symbolic":"interface"},"RouteId":{"__symbolic":"function","parameters":["type","options"],"value":{"__symbolic":"error","message":"Lambda not supported","line":86,"character":9}},"VisitParameter":{"__symbolic":"function"},"VisitParameterList":{"__symbolic":"function"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RouteIdOptions":{"__symbolic":"interface"},"RouteParameterOptions":{"__symbolic":"interface"},"RouteListParameterOptions":{"__symbolic":"interface"},"RouteId":{"__symbolic":"function","parameters":["type","options"],"value":{"__symbolic":"error","message":"Lambda not supported","line":83,"character":9}},"VisitParameter":{"__symbolic":"function"},"VisitParameterList":{"__symbolic":"function"}}}]