@coolon/angular-ui-powerups 0.0.68 → 0.0.69
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/coolon-angular-ui-powerups.umd.js +16 -5
- package/bundles/coolon-angular-ui-powerups.umd.js.map +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js.map +1 -1
- package/esm2015/lib/place/place-definition.js +12 -2
- package/esm2015/lib/place/place-router.js +5 -4
- package/esm2015/lib/place/route/parameter-definition.class.js +2 -2
- package/esm5/lib/place/place-definition.js +12 -2
- package/esm5/lib/place/place-router.js +5 -4
- package/esm5/lib/place/route/parameter-definition.class.js +2 -2
- package/fesm2015/coolon-angular-ui-powerups.js +16 -5
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +16 -5
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/package.json +1 -1
|
@@ -212,7 +212,17 @@ export class PlaceDefinition {
|
|
|
212
212
|
v => def.urlFormat.parse(v)));
|
|
213
213
|
}
|
|
214
214
|
else {
|
|
215
|
-
|
|
215
|
+
/** @type {?} */
|
|
216
|
+
const value = def.urlFormat.parse(params.get(def.name));
|
|
217
|
+
// because our id routes redirect if the id isn't pressent we always have a id
|
|
218
|
+
// parameter in our params. This will bugger our remember and defaultvalue sanitisation
|
|
219
|
+
// as it'll see that the id is present (event thought its null). The sanitisation can't
|
|
220
|
+
// check for null as that's a valid value for the id.
|
|
221
|
+
/** @type {?} */
|
|
222
|
+
const isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);
|
|
223
|
+
if (!isEmptyRouteId) {
|
|
224
|
+
result[def.name] = value;
|
|
225
|
+
}
|
|
216
226
|
}
|
|
217
227
|
}
|
|
218
228
|
}));
|
|
@@ -268,4 +278,4 @@ if (false) {
|
|
|
268
278
|
ParameterOptions.prototype.includeNonRouteParameters;
|
|
269
279
|
}
|
|
270
280
|
})(PlaceDefinition || (PlaceDefinition = {}));
|
|
271
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-definition.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["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.class';\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 order: number,\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  /**\n   * Returns angular router commands that specify the route id and any route parameters.  The result does\n   * not include any path information.\n   */\n  // getFormattedRouterCommands(visit: Visit): any[] {\n  //   return this.hasRouteId() ?\n  //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :\n  //     [this.getFormattedRouteParameters(visit)];\n  // }\n\n  getFormattedRouteId(visit: Visit): any {\n    return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;\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);\n          result[def.name] = values.map(v => def.urlFormat.parse(v));\n        } else {\n          result[def.name] = def.urlFormat.parse(params.get(def.name));\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"]}
|
|
281
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-definition.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["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.class';\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 order: number,\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  /**\n   * Returns angular router commands that specify the route id and any route parameters.  The result does\n   * not include any path information.\n   */\n  // getFormattedRouterCommands(visit: Visit): any[] {\n  //   return this.hasRouteId() ?\n  //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :\n  //     [this.getFormattedRouteParameters(visit)];\n  // }\n\n  getFormattedRouteId(visit: Visit): any {\n    return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;\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);\n          result[def.name] = values.map(v => def.urlFormat.parse(v));\n        } else {\n          const value = def.urlFormat.parse(params.get(def.name));\n          // because our id routes redirect if the id isn't pressent 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 null).  The sanitisation can't\n          // check for null as that's a valid value for the id.\n          const isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);\n          if (!isEmptyRouteId) {\n            result[def.name] = 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"]}
|
|
@@ -105,6 +105,9 @@ export class PlaceRouter extends GarbageCollector {
|
|
|
105
105
|
*/
|
|
106
106
|
pushVisitChangesToRoute(activatedRoute, previous, next) {
|
|
107
107
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
108
|
+
// we have to push to history so our remember sanitisers don't pick up the previous value
|
|
109
|
+
// when it's been cleared by the user.
|
|
110
|
+
this.placeHistory.add(next);
|
|
108
111
|
// FIXME: no route id -> route id duplicates route parameters
|
|
109
112
|
if (next.hasRoutingChangedFrom(previous)) {
|
|
110
113
|
return this.doNavigation(next, (/**
|
|
@@ -128,9 +131,6 @@ export class PlaceRouter extends GarbageCollector {
|
|
|
128
131
|
});
|
|
129
132
|
}));
|
|
130
133
|
}
|
|
131
|
-
else {
|
|
132
|
-
this.placeHistory.add(next);
|
|
133
|
-
}
|
|
134
134
|
});
|
|
135
135
|
}
|
|
136
136
|
/**
|
|
@@ -148,6 +148,7 @@ export class PlaceRouter extends GarbageCollector {
|
|
|
148
148
|
else {
|
|
149
149
|
/** @type {?} */
|
|
150
150
|
const def = visit.placeDefinition;
|
|
151
|
+
// @see https://coolon.atlassian.net/browse/AUP-41
|
|
151
152
|
/** @type {?} */
|
|
152
153
|
const parameterCommands = visit.hasRouteId() ?
|
|
153
154
|
[def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
|
|
@@ -265,4 +266,4 @@ if (false) {
|
|
|
265
266
|
/** @type {?} */
|
|
266
267
|
PlaceRouter.prototype.placeHistory;
|
|
267
268
|
}
|
|
268
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["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  NavigationEnd,\n  NavigationError,\n  NavigationStart,\n  Router\n} from '@angular/router';\nimport {\n  BooleanValueModelChain,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  ListModel,\n  MutableListModel,\n  MutableValueModel,\n  Trace,\n  ValueModel\n} from '@coolon/pectin';\nimport _ from 'lodash';\nimport { NavigationSession } from './navigation-session';\nimport { PlaceHistory } from './place-history';\nimport { Visit } from './visit';\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  private firstRoute = true;\n\n  private readonly _navigationSessionModel = new MutableValueModel<NavigationSession>();\n  private readonly _activeVisits = new MutableListModel<Visit>();\n\n  readonly navigationSessionActive: BooleanValueModelChain;\n  readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;\n\n  constructor(private readonly router: Router, readonly angularLocation: Location, readonly placeHistory: PlaceHistory) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');\n\n    angularLocation.onUrlChange(url => {\n      console.log(`location.onUrlChange -> ${url}`);\n    });\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    this.router.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 canceled, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        this.onAngularRouterStarted(event);\n      }\n      if (event instanceof NavigationEnd || event instanceof NavigationError) {\n        this.onAngularRouterFinished();\n      }\n    });\n\n    this.navigationSessionActive = chain(this.navigationSessionModel).isNotNil();\n    this.navigationSessionActive.subscribe(active => {\n      console.log('navigationSessionActive', active);\n    });\n    // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));\n    // txo.observe('this.navigationSessionModel', this.navigationSessionModel);\n  }\n\n  get navigationSession(): NavigationSession {\n    return this._navigationSessionModel.value;\n  }\n\n  get navigationSessionModel(): ValueModel<NavigationSession> {\n    return this._navigationSessionModel.readonly;\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  /**\n   *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));\n   * @param visit\n   */\n  // @Trace()\n  async navigate(visit: Visit) {\n    this.doNavigation(visit);\n  }\n\n  @Trace()\n  async pushVisitChangesToRoute(activatedRoute: ActivatedRoute, previous: Visit, next: Visit) {\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';\n        const def = next.placeDefinition;\n        const params = next.hasRouteId() ?\n          [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :\n          [def.getFormattedRouteParameters(next)];\n        const commands = [relativePath].concat(params, this.getChildPath(activatedRoute.snapshot));\n        console.log('### Redirect', commands);\n        return router.navigate(commands, {\n          relativeTo: activatedRoute\n        });\n      });\n    } else {\n      this.placeHistory.add(next);\n    }\n  }\n\n  async doNavigation(visit: Visit, customNavigation?: (router: Router) => any) {\n    this._navigationSessionModel.value = NavigationSession.createInternal(visit);\n    try {\n      if (customNavigation) {\n        await customNavigation(this.router);\n      } else {\n        const def = visit.placeDefinition;\n        const parameterCommands = visit.hasRouteId() ?\n          [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n          [def.getFormattedRouteParameters(visit)];\n        const commands = [def.path].concat(parameterCommands);\n        console.log('_doNavigation', visit, commands);\n        await this.router.navigate(commands);\n      }\n    } finally {\n      if (this.navigationSession && !this.router.getCurrentNavigation()) {\n        this.onAngularRouterFinished();\n      }\n    }\n  }\n\n  // @Trace()\n  private onAngularRouterStarted(event: NavigationStart) {\n    if (!this.navigationSession) { // We been activated by an external route rather than placeRouter.go(visit)\n      console.log('navigation started', { firstTime: this.firstRoute });\n      const session = NavigationSession.createExternal(this.firstRoute);\n      if (event.navigationTrigger === 'popstate') {\n        session.setPopstateReturn(this.router.routerState.snapshot.url);\n      }\n      this._navigationSessionModel.value = session;\n    }\n    this.firstRoute = false;\n  }\n\n  // @Trace()\n  private onAngularRouterFinished() {\n    const session = this._navigationSessionModel.value;\n    // Update visits before we end the navigation session.  This allows the place out let to\n    // gate ignore changes that occur while the visit is active\n    const visits = session.getVisits();\n    visits.forEach(v => {\n      this.placeHistory.add(v);\n    });\n    this._activeVisits.value = visits;\n\n    this._navigationSessionModel.value = null;\n  }\n\n  getChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n}\n"]}
|
|
269
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["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  NavigationEnd,\n  NavigationError,\n  NavigationStart,\n  Router\n} from '@angular/router';\nimport {\n  BooleanValueModelChain,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  ListModel,\n  MutableListModel,\n  MutableValueModel,\n  Trace,\n  ValueModel\n} from '@coolon/pectin';\nimport _ from 'lodash';\nimport { NavigationSession } from './navigation-session';\nimport { PlaceHistory } from './place-history';\nimport { Visit } from './visit';\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  private firstRoute = true;\n\n  private readonly _navigationSessionModel = new MutableValueModel<NavigationSession>();\n  private readonly _activeVisits = new MutableListModel<Visit>();\n\n  readonly navigationSessionActive: BooleanValueModelChain;\n  readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;\n\n  constructor(private readonly router: Router, readonly angularLocation: Location, readonly placeHistory: PlaceHistory) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');\n\n    angularLocation.onUrlChange(url => {\n      console.log(`location.onUrlChange -> ${url}`);\n    });\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    this.router.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 canceled, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        this.onAngularRouterStarted(event);\n      }\n      if (event instanceof NavigationEnd || event instanceof NavigationError) {\n        this.onAngularRouterFinished();\n      }\n    });\n\n    this.navigationSessionActive = chain(this.navigationSessionModel).isNotNil();\n    this.navigationSessionActive.subscribe(active => {\n      console.log('navigationSessionActive', active);\n    });\n    // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));\n    // txo.observe('this.navigationSessionModel', this.navigationSessionModel);\n  }\n\n  get navigationSession(): NavigationSession {\n    return this._navigationSessionModel.value;\n  }\n\n  get navigationSessionModel(): ValueModel<NavigationSession> {\n    return this._navigationSessionModel.readonly;\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  /**\n   *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));\n   * @param visit\n   */\n  // @Trace()\n  async navigate(visit: Visit) {\n    this.doNavigation(visit);\n  }\n\n  @Trace()\n  async pushVisitChangesToRoute(activatedRoute: ActivatedRoute, previous: Visit, next: Visit) {\n\n    // we have to push to history so our remember sanitisers don't pick up the previous value\n    // when it's been cleared by the user.\n    this.placeHistory.add(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 relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';\n        const def = next.placeDefinition;\n        const params = next.hasRouteId() ?\n          [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :\n          [def.getFormattedRouteParameters(next)];\n        const commands = [relativePath].concat(params, this.getChildPath(activatedRoute.snapshot));\n        console.log('### Redirect', commands);\n        return router.navigate(commands, {\n          relativeTo: activatedRoute\n        });\n      });\n    }\n  }\n\n  async doNavigation(visit: Visit, customNavigation?: (router: Router) => any) {\n    this._navigationSessionModel.value = NavigationSession.createInternal(visit);\n    try {\n      if (customNavigation) {\n        await customNavigation(this.router);\n      } else {\n        const def = visit.placeDefinition;\n        // @see https://coolon.atlassian.net/browse/AUP-41\n        const parameterCommands = visit.hasRouteId() ?\n          [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n          [def.getFormattedRouteParameters(visit)];\n        const commands = [def.path].concat(parameterCommands);\n        console.log('_doNavigation', visit, commands);\n        await this.router.navigate(commands);\n      }\n    } finally {\n      if (this.navigationSession && !this.router.getCurrentNavigation()) {\n        this.onAngularRouterFinished();\n      }\n    }\n  }\n\n  // @Trace()\n  private onAngularRouterStarted(event: NavigationStart) {\n    if (!this.navigationSession) { // We been activated by an external route rather than placeRouter.go(visit)\n      console.log('navigation started', { firstTime: this.firstRoute });\n      const session = NavigationSession.createExternal(this.firstRoute);\n      if (event.navigationTrigger === 'popstate') {\n        session.setPopstateReturn(this.router.routerState.snapshot.url);\n      }\n      this._navigationSessionModel.value = session;\n    }\n    this.firstRoute = false;\n  }\n\n  // @Trace()\n  private onAngularRouterFinished() {\n    const session = this._navigationSessionModel.value;\n    // Update visits before we end the navigation session.  This allows the place out let to\n    // gate ignore changes that occur while the visit is active\n    const visits = session.getVisits();\n    visits.forEach(v => {\n      this.placeHistory.add(v);\n    });\n    this._activeVisits.value = visits;\n\n    this._navigationSessionModel.value = null;\n  }\n\n  getChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n}\n"]}
|
|
@@ -74,7 +74,7 @@ export class ParameterDefinition {
|
|
|
74
74
|
* @return {?}
|
|
75
75
|
*/
|
|
76
76
|
isMissingFrom(visit) {
|
|
77
|
-
return !visit.hasParameter(this.name)
|
|
77
|
+
return !visit.hasParameter(this.name);
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
if (false) {
|
|
@@ -228,4 +228,4 @@ if (false) {
|
|
|
228
228
|
ArrayParameter.prototype.isArray;
|
|
229
229
|
}
|
|
230
230
|
})(ParameterDefinition || (ParameterDefinition = {}));
|
|
231
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
231
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"parameter-definition.class.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/parameter-definition.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport { Trace } from '@coolon/pectin';\nimport { Opts } from '@coolon/typescript-utilities';\nimport _ from 'lodash';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\nimport { Formatter } from './formatter';\n\nexport abstract class ParameterDefinition<T, E = T> {\n\n  abstract readonly isRouteId: boolean;\n  abstract readonly isArray: boolean;\n\n  readonly remember: boolean;\n  readonly defaultValue: T;\n  private options: Opts<ParameterDefinition.Options<T>>;\n\n  constructor(readonly propertyName: string, options: ParameterDefinition.Options<T>, readonly urlFormat?: Formatter<E>) {\n    this.options = Opts.get(options);\n    this.remember = this.options.getOptional('remember', false);\n    this.defaultValue = this.options.getOptional('defaultValue', null);\n  }\n\n  get name() {\n    return this.options.getOptional('as', this.propertyName);\n  }\n\n  // @Trace()\n  get isRouteParameter(): boolean {\n    return !!this.urlFormat;\n  }\n\n  abstract isEmptyValue(value: T): boolean;\n\n  abstract hasChanged(a: any, b: any): boolean;\n\n  protected getOptionValue<K extends keyof ParameterDefinition.Options<T>>(key: K): ParameterDefinition.Options<T>[K] {\n    return this.options.getOptional(key, null);\n  }\n\n  // @Trace()\n  async sanitise(value:T, visit: Visit, placeHistory: PlaceHistory, injector: Injector) {\n    if (this.isMissingFrom(visit)) {\n      const previousVisit = _.first(placeHistory.getHistory(visit.placeDefinition));\n      if (this.remember && previousVisit) {\n        value = previousVisit.getParameter(this.name);\n      }\n      return this.isEmptyValue(value) ? this.defaultValue : value;\n    } else {\n      // todo: add custom sanitiser\n      return value;\n    }\n  }\n\n  private isMissingFrom(visit: Visit) {\n    return !visit.hasParameter(this.name);\n  }\n}\n\nexport namespace ParameterDefinition {\n\n  export interface Options<T> {\n    as?: string;\n    optional?: boolean;\n    remember?: boolean;\n    defaultValue?: T;\n    // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser.Options<T>;\n  }\n\n  export class RouteId<T> extends ParameterDefinition<T> {\n    readonly isRouteId = true;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ValueParameter<T> extends ParameterDefinition<T> {\n    readonly isRouteId = false;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ArrayParameter<T> extends ParameterDefinition<T[], T> {\n    readonly isRouteId = false;\n    readonly isArray = true;\n\n    constructor(parameterName: string, options: Options<T[]>, urlFormat: Formatter<T>) {\n      super(parameterName, options, urlFormat);\n    }\n\n    isEmptyValue(value: T[]): boolean {\n      return _.isNil(value) || value.length < 1;\n    }\n\n    hasChanged(a: T[], b: T[]): boolean {\n      return !_.isEqual(a, b);\n    }\n\n  }\n}\n"]}
|
|
@@ -275,7 +275,17 @@ var PlaceDefinition = /** @class */ (function () {
|
|
|
275
275
|
function (v) { return def.urlFormat.parse(v); }));
|
|
276
276
|
}
|
|
277
277
|
else {
|
|
278
|
-
|
|
278
|
+
/** @type {?} */
|
|
279
|
+
var value = def.urlFormat.parse(params.get(def.name));
|
|
280
|
+
// because our id routes redirect if the id isn't pressent we always have a id
|
|
281
|
+
// parameter in our params. This will bugger our remember and defaultvalue sanitisation
|
|
282
|
+
// as it'll see that the id is present (event thought its null). The sanitisation can't
|
|
283
|
+
// check for null as that's a valid value for the id.
|
|
284
|
+
/** @type {?} */
|
|
285
|
+
var isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);
|
|
286
|
+
if (!isEmptyRouteId) {
|
|
287
|
+
result[def.name] = value;
|
|
288
|
+
}
|
|
279
289
|
}
|
|
280
290
|
}
|
|
281
291
|
}));
|
|
@@ -333,4 +343,4 @@ if (false) {
|
|
|
333
343
|
ParameterOptions.prototype.includeNonRouteParameters;
|
|
334
344
|
}
|
|
335
345
|
})(PlaceDefinition || (PlaceDefinition = {}));
|
|
336
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-definition.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["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.class';\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 order: number,\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  /**\n   * Returns angular router commands that specify the route id and any route parameters.  The result does\n   * not include any path information.\n   */\n  // getFormattedRouterCommands(visit: Visit): any[] {\n  //   return this.hasRouteId() ?\n  //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :\n  //     [this.getFormattedRouteParameters(visit)];\n  // }\n\n  getFormattedRouteId(visit: Visit): any {\n    return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;\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);\n          result[def.name] = values.map(v => def.urlFormat.parse(v));\n        } else {\n          result[def.name] = def.urlFormat.parse(params.get(def.name));\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"]}
|
|
346
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-definition.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["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.class';\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 order: number,\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  /**\n   * Returns angular router commands that specify the route id and any route parameters.  The result does\n   * not include any path information.\n   */\n  // getFormattedRouterCommands(visit: Visit): any[] {\n  //   return this.hasRouteId() ?\n  //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :\n  //     [this.getFormattedRouteParameters(visit)];\n  // }\n\n  getFormattedRouteId(visit: Visit): any {\n    return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;\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);\n          result[def.name] = values.map(v => def.urlFormat.parse(v));\n        } else {\n          const value = def.urlFormat.parse(params.get(def.name));\n          // because our id routes redirect if the id isn't pressent 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 null).  The sanitisation can't\n          // check for null as that's a valid value for the id.\n          const isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);\n          if (!isEmptyRouteId) {\n            result[def.name] = 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"]}
|
|
@@ -136,6 +136,9 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
136
136
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
137
137
|
var _this = this;
|
|
138
138
|
return tslib_1.__generator(this, function (_a) {
|
|
139
|
+
// we have to push to history so our remember sanitisers don't pick up the previous value
|
|
140
|
+
// when it's been cleared by the user.
|
|
141
|
+
this.placeHistory.add(next);
|
|
139
142
|
// FIXME: no route id -> route id duplicates route parameters
|
|
140
143
|
if (next.hasRoutingChangedFrom(previous)) {
|
|
141
144
|
return [2 /*return*/, this.doNavigation(next, (/**
|
|
@@ -159,9 +162,6 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
159
162
|
});
|
|
160
163
|
}))];
|
|
161
164
|
}
|
|
162
|
-
else {
|
|
163
|
-
this.placeHistory.add(next);
|
|
164
|
-
}
|
|
165
165
|
return [2 /*return*/];
|
|
166
166
|
});
|
|
167
167
|
});
|
|
@@ -193,6 +193,7 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
193
193
|
return [3 /*break*/, 5];
|
|
194
194
|
case 3:
|
|
195
195
|
def = visit.placeDefinition;
|
|
196
|
+
// @see https://coolon.atlassian.net/browse/AUP-41
|
|
196
197
|
parameterCommands = visit.hasRouteId() ?
|
|
197
198
|
[def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
|
|
198
199
|
[def.getFormattedRouteParameters(visit)];
|
|
@@ -335,4 +336,4 @@ if (false) {
|
|
|
335
336
|
/** @type {?} */
|
|
336
337
|
PlaceRouter.prototype.placeHistory;
|
|
337
338
|
}
|
|
338
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["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  NavigationEnd,\n  NavigationError,\n  NavigationStart,\n  Router\n} from '@angular/router';\nimport {\n  BooleanValueModelChain,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  ListModel,\n  MutableListModel,\n  MutableValueModel,\n  Trace,\n  ValueModel\n} from '@coolon/pectin';\nimport _ from 'lodash';\nimport { NavigationSession } from './navigation-session';\nimport { PlaceHistory } from './place-history';\nimport { Visit } from './visit';\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  private firstRoute = true;\n\n  private readonly _navigationSessionModel = new MutableValueModel<NavigationSession>();\n  private readonly _activeVisits = new MutableListModel<Visit>();\n\n  readonly navigationSessionActive: BooleanValueModelChain;\n  readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;\n\n  constructor(private readonly router: Router, readonly angularLocation: Location, readonly placeHistory: PlaceHistory) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');\n\n    angularLocation.onUrlChange(url => {\n      console.log(`location.onUrlChange -> ${url}`);\n    });\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    this.router.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 canceled, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        this.onAngularRouterStarted(event);\n      }\n      if (event instanceof NavigationEnd || event instanceof NavigationError) {\n        this.onAngularRouterFinished();\n      }\n    });\n\n    this.navigationSessionActive = chain(this.navigationSessionModel).isNotNil();\n    this.navigationSessionActive.subscribe(active => {\n      console.log('navigationSessionActive', active);\n    });\n    // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));\n    // txo.observe('this.navigationSessionModel', this.navigationSessionModel);\n  }\n\n  get navigationSession(): NavigationSession {\n    return this._navigationSessionModel.value;\n  }\n\n  get navigationSessionModel(): ValueModel<NavigationSession> {\n    return this._navigationSessionModel.readonly;\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  /**\n   *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));\n   * @param visit\n   */\n  // @Trace()\n  async navigate(visit: Visit) {\n    this.doNavigation(visit);\n  }\n\n  @Trace()\n  async pushVisitChangesToRoute(activatedRoute: ActivatedRoute, previous: Visit, next: Visit) {\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';\n        const def = next.placeDefinition;\n        const params = next.hasRouteId() ?\n          [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :\n          [def.getFormattedRouteParameters(next)];\n        const commands = [relativePath].concat(params, this.getChildPath(activatedRoute.snapshot));\n        console.log('### Redirect', commands);\n        return router.navigate(commands, {\n          relativeTo: activatedRoute\n        });\n      });\n    } else {\n      this.placeHistory.add(next);\n    }\n  }\n\n  async doNavigation(visit: Visit, customNavigation?: (router: Router) => any) {\n    this._navigationSessionModel.value = NavigationSession.createInternal(visit);\n    try {\n      if (customNavigation) {\n        await customNavigation(this.router);\n      } else {\n        const def = visit.placeDefinition;\n        const parameterCommands = visit.hasRouteId() ?\n          [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n          [def.getFormattedRouteParameters(visit)];\n        const commands = [def.path].concat(parameterCommands);\n        console.log('_doNavigation', visit, commands);\n        await this.router.navigate(commands);\n      }\n    } finally {\n      if (this.navigationSession && !this.router.getCurrentNavigation()) {\n        this.onAngularRouterFinished();\n      }\n    }\n  }\n\n  // @Trace()\n  private onAngularRouterStarted(event: NavigationStart) {\n    if (!this.navigationSession) { // We been activated by an external route rather than placeRouter.go(visit)\n      console.log('navigation started', { firstTime: this.firstRoute });\n      const session = NavigationSession.createExternal(this.firstRoute);\n      if (event.navigationTrigger === 'popstate') {\n        session.setPopstateReturn(this.router.routerState.snapshot.url);\n      }\n      this._navigationSessionModel.value = session;\n    }\n    this.firstRoute = false;\n  }\n\n  // @Trace()\n  private onAngularRouterFinished() {\n    const session = this._navigationSessionModel.value;\n    // Update visits before we end the navigation session.  This allows the place out let to\n    // gate ignore changes that occur while the visit is active\n    const visits = session.getVisits();\n    visits.forEach(v => {\n      this.placeHistory.add(v);\n    });\n    this._activeVisits.value = visits;\n\n    this._navigationSessionModel.value = null;\n  }\n\n  getChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n}\n"]}
|
|
339
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["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  NavigationEnd,\n  NavigationError,\n  NavigationStart,\n  Router\n} from '@angular/router';\nimport {\n  BooleanValueModelChain,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  ListModel,\n  MutableListModel,\n  MutableValueModel,\n  Trace,\n  ValueModel\n} from '@coolon/pectin';\nimport _ from 'lodash';\nimport { NavigationSession } from './navigation-session';\nimport { PlaceHistory } from './place-history';\nimport { Visit } from './visit';\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  private firstRoute = true;\n\n  private readonly _navigationSessionModel = new MutableValueModel<NavigationSession>();\n  private readonly _activeVisits = new MutableListModel<Visit>();\n\n  readonly navigationSessionActive: BooleanValueModelChain;\n  readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;\n\n  constructor(private readonly router: Router, readonly angularLocation: Location, readonly placeHistory: PlaceHistory) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');\n\n    angularLocation.onUrlChange(url => {\n      console.log(`location.onUrlChange -> ${url}`);\n    });\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    this.router.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 canceled, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        this.onAngularRouterStarted(event);\n      }\n      if (event instanceof NavigationEnd || event instanceof NavigationError) {\n        this.onAngularRouterFinished();\n      }\n    });\n\n    this.navigationSessionActive = chain(this.navigationSessionModel).isNotNil();\n    this.navigationSessionActive.subscribe(active => {\n      console.log('navigationSessionActive', active);\n    });\n    // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));\n    // txo.observe('this.navigationSessionModel', this.navigationSessionModel);\n  }\n\n  get navigationSession(): NavigationSession {\n    return this._navigationSessionModel.value;\n  }\n\n  get navigationSessionModel(): ValueModel<NavigationSession> {\n    return this._navigationSessionModel.readonly;\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  /**\n   *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));\n   * @param visit\n   */\n  // @Trace()\n  async navigate(visit: Visit) {\n    this.doNavigation(visit);\n  }\n\n  @Trace()\n  async pushVisitChangesToRoute(activatedRoute: ActivatedRoute, previous: Visit, next: Visit) {\n\n    // we have to push to history so our remember sanitisers don't pick up the previous value\n    // when it's been cleared by the user.\n    this.placeHistory.add(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 relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';\n        const def = next.placeDefinition;\n        const params = next.hasRouteId() ?\n          [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :\n          [def.getFormattedRouteParameters(next)];\n        const commands = [relativePath].concat(params, this.getChildPath(activatedRoute.snapshot));\n        console.log('### Redirect', commands);\n        return router.navigate(commands, {\n          relativeTo: activatedRoute\n        });\n      });\n    }\n  }\n\n  async doNavigation(visit: Visit, customNavigation?: (router: Router) => any) {\n    this._navigationSessionModel.value = NavigationSession.createInternal(visit);\n    try {\n      if (customNavigation) {\n        await customNavigation(this.router);\n      } else {\n        const def = visit.placeDefinition;\n        // @see https://coolon.atlassian.net/browse/AUP-41\n        const parameterCommands = visit.hasRouteId() ?\n          [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n          [def.getFormattedRouteParameters(visit)];\n        const commands = [def.path].concat(parameterCommands);\n        console.log('_doNavigation', visit, commands);\n        await this.router.navigate(commands);\n      }\n    } finally {\n      if (this.navigationSession && !this.router.getCurrentNavigation()) {\n        this.onAngularRouterFinished();\n      }\n    }\n  }\n\n  // @Trace()\n  private onAngularRouterStarted(event: NavigationStart) {\n    if (!this.navigationSession) { // We been activated by an external route rather than placeRouter.go(visit)\n      console.log('navigation started', { firstTime: this.firstRoute });\n      const session = NavigationSession.createExternal(this.firstRoute);\n      if (event.navigationTrigger === 'popstate') {\n        session.setPopstateReturn(this.router.routerState.snapshot.url);\n      }\n      this._navigationSessionModel.value = session;\n    }\n    this.firstRoute = false;\n  }\n\n  // @Trace()\n  private onAngularRouterFinished() {\n    const session = this._navigationSessionModel.value;\n    // Update visits before we end the navigation session.  This allows the place out let to\n    // gate ignore changes that occur while the visit is active\n    const visits = session.getVisits();\n    visits.forEach(v => {\n      this.placeHistory.add(v);\n    });\n    this._activeVisits.value = visits;\n\n    this._navigationSessionModel.value = null;\n  }\n\n  getChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n}\n"]}
|
|
@@ -107,7 +107,7 @@ ParameterDefinition = /** @class */ (function () {
|
|
|
107
107
|
* @return {?}
|
|
108
108
|
*/
|
|
109
109
|
function (visit) {
|
|
110
|
-
return !visit.hasParameter(this.name)
|
|
110
|
+
return !visit.hasParameter(this.name);
|
|
111
111
|
};
|
|
112
112
|
return ParameterDefinition;
|
|
113
113
|
}());
|
|
@@ -307,4 +307,4 @@ if (false) {
|
|
|
307
307
|
ArrayParameter.prototype.isArray;
|
|
308
308
|
}
|
|
309
309
|
})(ParameterDefinition || (ParameterDefinition = {}));
|
|
310
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
310
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"parameter-definition.class.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/parameter-definition.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport { Trace } from '@coolon/pectin';\nimport { Opts } from '@coolon/typescript-utilities';\nimport _ from 'lodash';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\nimport { Formatter } from './formatter';\n\nexport abstract class ParameterDefinition<T, E = T> {\n\n  abstract readonly isRouteId: boolean;\n  abstract readonly isArray: boolean;\n\n  readonly remember: boolean;\n  readonly defaultValue: T;\n  private options: Opts<ParameterDefinition.Options<T>>;\n\n  constructor(readonly propertyName: string, options: ParameterDefinition.Options<T>, readonly urlFormat?: Formatter<E>) {\n    this.options = Opts.get(options);\n    this.remember = this.options.getOptional('remember', false);\n    this.defaultValue = this.options.getOptional('defaultValue', null);\n  }\n\n  get name() {\n    return this.options.getOptional('as', this.propertyName);\n  }\n\n  // @Trace()\n  get isRouteParameter(): boolean {\n    return !!this.urlFormat;\n  }\n\n  abstract isEmptyValue(value: T): boolean;\n\n  abstract hasChanged(a: any, b: any): boolean;\n\n  protected getOptionValue<K extends keyof ParameterDefinition.Options<T>>(key: K): ParameterDefinition.Options<T>[K] {\n    return this.options.getOptional(key, null);\n  }\n\n  // @Trace()\n  async sanitise(value:T, visit: Visit, placeHistory: PlaceHistory, injector: Injector) {\n    if (this.isMissingFrom(visit)) {\n      const previousVisit = _.first(placeHistory.getHistory(visit.placeDefinition));\n      if (this.remember && previousVisit) {\n        value = previousVisit.getParameter(this.name);\n      }\n      return this.isEmptyValue(value) ? this.defaultValue : value;\n    } else {\n      // todo: add custom sanitiser\n      return value;\n    }\n  }\n\n  private isMissingFrom(visit: Visit) {\n    return !visit.hasParameter(this.name);\n  }\n}\n\nexport namespace ParameterDefinition {\n\n  export interface Options<T> {\n    as?: string;\n    optional?: boolean;\n    remember?: boolean;\n    defaultValue?: T;\n    // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser.Options<T>;\n  }\n\n  export class RouteId<T> extends ParameterDefinition<T> {\n    readonly isRouteId = true;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ValueParameter<T> extends ParameterDefinition<T> {\n    readonly isRouteId = false;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ArrayParameter<T> extends ParameterDefinition<T[], T> {\n    readonly isRouteId = false;\n    readonly isArray = true;\n\n    constructor(parameterName: string, options: Options<T[]>, urlFormat: Formatter<T>) {\n      super(parameterName, options, urlFormat);\n    }\n\n    isEmptyValue(value: T[]): boolean {\n      return _.isNil(value) || value.length < 1;\n    }\n\n    hasChanged(a: T[], b: T[]): boolean {\n      return !_.isEqual(a, b);\n    }\n\n  }\n}\n"]}
|
|
@@ -1935,7 +1935,7 @@ class ParameterDefinition {
|
|
|
1935
1935
|
* @return {?}
|
|
1936
1936
|
*/
|
|
1937
1937
|
isMissingFrom(visit) {
|
|
1938
|
-
return !visit.hasParameter(this.name)
|
|
1938
|
+
return !visit.hasParameter(this.name);
|
|
1939
1939
|
}
|
|
1940
1940
|
}
|
|
1941
1941
|
if (false) {
|
|
@@ -2298,7 +2298,17 @@ class PlaceDefinition {
|
|
|
2298
2298
|
v => def.urlFormat.parse(v)));
|
|
2299
2299
|
}
|
|
2300
2300
|
else {
|
|
2301
|
-
|
|
2301
|
+
/** @type {?} */
|
|
2302
|
+
const value = def.urlFormat.parse(params.get(def.name));
|
|
2303
|
+
// because our id routes redirect if the id isn't pressent we always have a id
|
|
2304
|
+
// parameter in our params. This will bugger our remember and defaultvalue sanitisation
|
|
2305
|
+
// as it'll see that the id is present (event thought its null). The sanitisation can't
|
|
2306
|
+
// check for null as that's a valid value for the id.
|
|
2307
|
+
/** @type {?} */
|
|
2308
|
+
const isEmptyRouteId = def.isRouteId && def.isEmptyValue(value);
|
|
2309
|
+
if (!isEmptyRouteId) {
|
|
2310
|
+
result[def.name] = value;
|
|
2311
|
+
}
|
|
2302
2312
|
}
|
|
2303
2313
|
}
|
|
2304
2314
|
}));
|
|
@@ -3040,6 +3050,9 @@ class PlaceRouter extends GarbageCollector {
|
|
|
3040
3050
|
*/
|
|
3041
3051
|
pushVisitChangesToRoute(activatedRoute, previous, next) {
|
|
3042
3052
|
return __awaiter(this, void 0, void 0, function* () {
|
|
3053
|
+
// we have to push to history so our remember sanitisers don't pick up the previous value
|
|
3054
|
+
// when it's been cleared by the user.
|
|
3055
|
+
this.placeHistory.add(next);
|
|
3043
3056
|
// FIXME: no route id -> route id duplicates route parameters
|
|
3044
3057
|
if (next.hasRoutingChangedFrom(previous)) {
|
|
3045
3058
|
return this.doNavigation(next, (/**
|
|
@@ -3063,9 +3076,6 @@ class PlaceRouter extends GarbageCollector {
|
|
|
3063
3076
|
});
|
|
3064
3077
|
}));
|
|
3065
3078
|
}
|
|
3066
|
-
else {
|
|
3067
|
-
this.placeHistory.add(next);
|
|
3068
|
-
}
|
|
3069
3079
|
});
|
|
3070
3080
|
}
|
|
3071
3081
|
/**
|
|
@@ -3083,6 +3093,7 @@ class PlaceRouter extends GarbageCollector {
|
|
|
3083
3093
|
else {
|
|
3084
3094
|
/** @type {?} */
|
|
3085
3095
|
const def = visit.placeDefinition;
|
|
3096
|
+
// @see https://coolon.atlassian.net/browse/AUP-41
|
|
3086
3097
|
/** @type {?} */
|
|
3087
3098
|
const parameterCommands = visit.hasRouteId() ?
|
|
3088
3099
|
[def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
|