@coolon/angular-ui-powerups 0.0.89 → 0.0.90
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 +208 -127
- 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/coolon-angular-ui-powerups.metadata.json +1 -1
- package/esm2015/lib/interaction/components/activity-container/activity-container.component.js +2 -2
- package/esm2015/lib/interaction/components/inplace-interaction-context/inplace-interaction-context.component.js +2 -2
- package/esm2015/lib/interaction/interaction-context.js +18 -2
- package/esm2015/lib/interaction/services/dialog-interaction.service.js +2 -2
- package/esm2015/lib/place/place-definition.js +16 -19
- package/esm2015/lib/place/place-router.js +122 -18
- package/esm2015/lib/place/route/guards/enter-place-guard.service.js +3 -38
- package/esm2015/lib/place/visit.js +4 -11
- package/esm5/lib/interaction/components/activity-container/activity-container.component.js +2 -2
- package/esm5/lib/interaction/components/inplace-interaction-context/inplace-interaction-context.component.js +2 -2
- package/esm5/lib/interaction/interaction-context.js +29 -2
- package/esm5/lib/interaction/services/dialog-interaction.service.js +2 -2
- package/esm5/lib/place/place-definition.js +17 -39
- package/esm5/lib/place/place-router.js +143 -16
- package/esm5/lib/place/route/guards/enter-place-guard.service.js +3 -44
- package/esm5/lib/place/visit.js +4 -14
- package/fesm2015/coolon-angular-ui-powerups.js +160 -85
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +195 -113
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/interaction/components/activity-container/activity-container.component.d.ts +1 -1
- package/lib/interaction/components/inplace-interaction-context/inplace-interaction-context.component.d.ts +1 -1
- package/lib/interaction/interaction-context.d.ts +2 -1
- package/lib/interaction/services/dialog-interaction.service.d.ts +1 -1
- package/lib/place/place-definition.d.ts +0 -4
- package/lib/place/place-router.d.ts +18 -2
- package/lib/place/route/guards/enter-place-guard.service.d.ts +0 -1
- package/lib/place/visit.d.ts +0 -2
- package/package.json +1 -1
|
@@ -137,49 +137,25 @@ var PlaceDefinition = /** @class */ (function () {
|
|
|
137
137
|
return routeIdParameterDef ? visit.getParameter(routeIdParameterDef.name) : null;
|
|
138
138
|
};
|
|
139
139
|
/**
|
|
140
|
-
* Returns angular router commands that specify the route id and any route parameters. The result does
|
|
141
|
-
* not include any path information.
|
|
142
|
-
*/
|
|
143
|
-
// getFormattedRouterCommands(visit: Visit): any[] {
|
|
144
|
-
// return this.hasRouteId() ?
|
|
145
|
-
// [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
|
|
146
|
-
// [this.getFormattedRouteParameters(visit)];
|
|
147
|
-
// }
|
|
148
|
-
/**
|
|
149
|
-
* Returns angular router commands that specify the route id and any route parameters. The result does
|
|
150
|
-
* not include any path information.
|
|
151
140
|
* @param {?} visit
|
|
152
141
|
* @return {?}
|
|
153
142
|
*/
|
|
154
|
-
// getFormattedRouterCommands(visit: Visit): any[] {
|
|
155
|
-
// return this.hasRouteId() ?
|
|
156
|
-
// [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
|
|
157
|
-
// [this.getFormattedRouteParameters(visit)];
|
|
158
|
-
// }
|
|
159
143
|
PlaceDefinition.prototype.getFormattedRouteId = /**
|
|
160
|
-
* Returns angular router commands that specify the route id and any route parameters. The result does
|
|
161
|
-
* not include any path information.
|
|
162
144
|
* @param {?} visit
|
|
163
145
|
* @return {?}
|
|
164
146
|
*/
|
|
165
|
-
// getFormattedRouterCommands(visit: Visit): any[] {
|
|
166
|
-
// return this.hasRouteId() ?
|
|
167
|
-
// [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
|
|
168
|
-
// [this.getFormattedRouteParameters(visit)];
|
|
169
|
-
// }
|
|
170
147
|
function (visit) {
|
|
171
|
-
|
|
148
|
+
// Note: RouteIds are always present in the url and are just empty strings when not defined. This is
|
|
149
|
+
// mandated by the fact that redirects from <path> to <path>/:id always include the id parameter as
|
|
150
|
+
// an empty string.
|
|
151
|
+
return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : "";
|
|
172
152
|
};
|
|
173
|
-
// @Trace()
|
|
174
|
-
// @Trace()
|
|
175
153
|
/**
|
|
176
154
|
* @param {?} visit
|
|
177
155
|
* @param {?=} includeRouteId
|
|
178
156
|
* @return {?}
|
|
179
157
|
*/
|
|
180
|
-
PlaceDefinition.prototype.getFormattedRouteParameters =
|
|
181
|
-
// @Trace()
|
|
182
|
-
/**
|
|
158
|
+
PlaceDefinition.prototype.getFormattedRouteParameters = /**
|
|
183
159
|
* @param {?} visit
|
|
184
160
|
* @param {?=} includeRouteId
|
|
185
161
|
* @return {?}
|
|
@@ -275,15 +251,17 @@ var PlaceDefinition = /** @class */ (function () {
|
|
|
275
251
|
}
|
|
276
252
|
else {
|
|
277
253
|
/** @type {?} */
|
|
278
|
-
var value =
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
254
|
+
var value = params.get(def.name);
|
|
255
|
+
if (def.isRouteId) { // TODO: Move this to parameter def so it's a strategy pattern
|
|
256
|
+
// because our id routes redirect if the id isn't present we always have a id
|
|
257
|
+
// parameter in our params. This will bugger our remember and defaultvalue sanitisation
|
|
258
|
+
// as it'll see that the id is present (event thought its a blank string).
|
|
259
|
+
if (!_.isEmpty(value)) {
|
|
260
|
+
result[def.name] = def.urlFormat.parse(value);
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
else {
|
|
264
|
+
result[def.name] = def.urlFormat.parse(value);
|
|
287
265
|
}
|
|
288
266
|
}
|
|
289
267
|
}
|
|
@@ -340,4 +318,4 @@ if (false) {
|
|
|
340
318
|
ParameterOptions.prototype.includeNonRouteParameters;
|
|
341
319
|
}
|
|
342
320
|
})(PlaceDefinition || (PlaceDefinition = {}));
|
|
343
|
-
//# 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 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"]}
|
|
321
|
+
//# 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 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  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 = 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"]}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import * as tslib_1 from "tslib";
|
|
6
6
|
import { Location } from '@angular/common';
|
|
7
7
|
import { Injectable } from '@angular/core';
|
|
8
|
-
import { NavigationEnd, NavigationError, NavigationStart, Router } from '@angular/router';
|
|
8
|
+
import { NavigationEnd, NavigationError, NavigationStart, Router, UrlSegment, UrlSerializer } from '@angular/router';
|
|
9
9
|
import { Dsl, GarbageCollector, MutableListModel, MutableValueModel, Trace } from '@coolon/pectin';
|
|
10
10
|
import _ from 'lodash';
|
|
11
11
|
import { NavigationSession } from './navigation-session';
|
|
@@ -17,9 +17,10 @@ import * as i2 from "@angular/common";
|
|
|
17
17
|
import * as i3 from "./place-history";
|
|
18
18
|
var PlaceRouter = /** @class */ (function (_super) {
|
|
19
19
|
tslib_1.__extends(PlaceRouter, _super);
|
|
20
|
-
function PlaceRouter(router, angularLocation, placeHistory) {
|
|
20
|
+
function PlaceRouter(router, urlSerializer, angularLocation, placeHistory) {
|
|
21
21
|
var _this = _super.call(this) || this;
|
|
22
22
|
_this.router = router;
|
|
23
|
+
_this.urlSerializer = urlSerializer;
|
|
23
24
|
_this.angularLocation = angularLocation;
|
|
24
25
|
_this.placeHistory = placeHistory;
|
|
25
26
|
_this.firstRoute = true;
|
|
@@ -170,19 +171,19 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
170
171
|
* @return {?}
|
|
171
172
|
*/
|
|
172
173
|
function (router) {
|
|
173
|
-
// we have to to use the definition for route id as our redirection always includes
|
|
174
|
-
// the id in the url segements (but leaves it blank when there's no id). I.e. in the
|
|
175
|
-
// no id case we're doing the following redirect [<placePath>, ""] -> ["..", <id>]
|
|
176
174
|
/** @type {?} */
|
|
177
|
-
var
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
175
|
+
var commands = _this.createUrlManipulator(_this.router.routerState.snapshot).createRedirectCommandsFor(next);
|
|
176
|
+
// // we have to to use the definition for route id as our redirection always includes
|
|
177
|
+
// // the id in the url segements (but leaves it blank when there's no id). I.e. in the
|
|
178
|
+
// // no id case we're doing the following redirect [<placePath>, ""] -> ["..", <id>]
|
|
179
|
+
// const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';
|
|
180
|
+
// const commands = [
|
|
181
|
+
// relativePath,
|
|
182
|
+
// ...this.createRouteParameters(next),
|
|
183
|
+
// ...this.extractChildPath(activatedRoute.snapshot)
|
|
184
|
+
// ];
|
|
185
|
+
console.log('### Push Changes to route Redirect', { commands: commands });
|
|
186
|
+
return router.navigate(commands);
|
|
186
187
|
}))];
|
|
187
188
|
}
|
|
188
189
|
return [2 /*return*/];
|
|
@@ -310,6 +311,17 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
310
311
|
*/
|
|
311
312
|
function (child) { return child.url; })));
|
|
312
313
|
};
|
|
314
|
+
/**
|
|
315
|
+
* @param {?} snapshot
|
|
316
|
+
* @return {?}
|
|
317
|
+
*/
|
|
318
|
+
PlaceRouter.prototype.createUrlManipulator = /**
|
|
319
|
+
* @param {?} snapshot
|
|
320
|
+
* @return {?}
|
|
321
|
+
*/
|
|
322
|
+
function (snapshot) {
|
|
323
|
+
return new PlaceRouter.UrlManipulator(this.urlSerializer.parse(snapshot.url));
|
|
324
|
+
};
|
|
313
325
|
PlaceRouter.decorators = [
|
|
314
326
|
{ type: Injectable, args: [{
|
|
315
327
|
providedIn: 'root'
|
|
@@ -318,10 +330,11 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
318
330
|
/** @nocollapse */
|
|
319
331
|
PlaceRouter.ctorParameters = function () { return [
|
|
320
332
|
{ type: Router },
|
|
333
|
+
{ type: UrlSerializer },
|
|
321
334
|
{ type: Location },
|
|
322
335
|
{ type: PlaceHistory }
|
|
323
336
|
]; };
|
|
324
|
-
/** @nocollapse */ PlaceRouter.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i2.Location), i0.ɵɵinject(i3.PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
|
|
337
|
+
/** @nocollapse */ PlaceRouter.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i1.UrlSerializer), i0.ɵɵinject(i2.Location), i0.ɵɵinject(i3.PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
|
|
325
338
|
tslib_1.__decorate([
|
|
326
339
|
Trace(),
|
|
327
340
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -356,9 +369,123 @@ if (false) {
|
|
|
356
369
|
* @private
|
|
357
370
|
*/
|
|
358
371
|
PlaceRouter.prototype.router;
|
|
372
|
+
/**
|
|
373
|
+
* @type {?}
|
|
374
|
+
* @private
|
|
375
|
+
*/
|
|
376
|
+
PlaceRouter.prototype.urlSerializer;
|
|
359
377
|
/** @type {?} */
|
|
360
378
|
PlaceRouter.prototype.angularLocation;
|
|
361
379
|
/** @type {?} */
|
|
362
380
|
PlaceRouter.prototype.placeHistory;
|
|
363
381
|
}
|
|
364
|
-
//# 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, options?: { relativeTo: ActivatedRoute }) {\n    this.doNavigation(visit, async router => {\n      const commands = [\n        visit.placeDefinition.path,\n        ...this.createRouteParameters(visit)\n      ];\n      await this.router.navigate(commands, {\n        relativeTo: options ? options.relativeTo : null\n      });\n    });\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        // we have to to use the definition for route id as our redirection always includes\n        // the id in the url segements (but leaves it blank when there's no id). I.e. in the\n        // no id case we're doing the following redirect [<placePath>, \"\"] -> [\"..\", <id>]\n        const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';\n        const commands = [\n          relativePath,\n          ...this.createRouteParameters(next),\n          ...this.extractChildPath(activatedRoute.snapshot)\n        ];\n        console.log('### Push Changes to route Redirect', { commands, relativeTo: activatedRoute.snapshot.url });\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      await customNavigation(this.router);\n    } finally {\n      if (this.navigationSession && !this.router.getCurrentNavigation()) {\n        this.onAngularRouterFinished();\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  // @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  extractChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n}\n"]}
|
|
382
|
+
(function (PlaceRouter) {
|
|
383
|
+
var UrlManipulator = /** @class */ (function () {
|
|
384
|
+
function UrlManipulator(urlTree) {
|
|
385
|
+
this.urlTree = urlTree;
|
|
386
|
+
console.log({ segments: this.urlTree.root.children.primary.segments });
|
|
387
|
+
}
|
|
388
|
+
/**
|
|
389
|
+
* @return {?}
|
|
390
|
+
*/
|
|
391
|
+
UrlManipulator.prototype.cloneUrlSegmentList = /**
|
|
392
|
+
* @return {?}
|
|
393
|
+
*/
|
|
394
|
+
function () {
|
|
395
|
+
return tslib_1.__spread(this.urlTree.root.children.primary.segments);
|
|
396
|
+
};
|
|
397
|
+
/**
|
|
398
|
+
* @param {?} visit
|
|
399
|
+
* @return {?}
|
|
400
|
+
*/
|
|
401
|
+
UrlManipulator.prototype.updateVisitSegments = /**
|
|
402
|
+
* @param {?} visit
|
|
403
|
+
* @return {?}
|
|
404
|
+
*/
|
|
405
|
+
function (visit) {
|
|
406
|
+
// Ugly, but it works for now.
|
|
407
|
+
/** @type {?} */
|
|
408
|
+
var segments = this.cloneUrlSegmentList();
|
|
409
|
+
/** @type {?} */
|
|
410
|
+
var visitSegments = this.convertToUrlSegments(visit);
|
|
411
|
+
/** @type {?} */
|
|
412
|
+
var replaceAt = segments.findIndex((/**
|
|
413
|
+
* @param {?} segment
|
|
414
|
+
* @return {?}
|
|
415
|
+
*/
|
|
416
|
+
function (segment) { return segment.path === visitSegments[0].path; }));
|
|
417
|
+
// do not use the return value, it's the items that were removed!
|
|
418
|
+
segments.splice.apply(segments, tslib_1.__spread([replaceAt, visitSegments.length], visitSegments));
|
|
419
|
+
return segments;
|
|
420
|
+
};
|
|
421
|
+
/**
|
|
422
|
+
* Converts the visit into segments. Please not that these segments are not e
|
|
423
|
+
* @param visit
|
|
424
|
+
*/
|
|
425
|
+
/**
|
|
426
|
+
* Converts the visit into segments. Please not that these segments are not e
|
|
427
|
+
* @param {?} visit
|
|
428
|
+
* @return {?}
|
|
429
|
+
*/
|
|
430
|
+
UrlManipulator.prototype.convertToUrlSegments = /**
|
|
431
|
+
* Converts the visit into segments. Please not that these segments are not e
|
|
432
|
+
* @param {?} visit
|
|
433
|
+
* @return {?}
|
|
434
|
+
*/
|
|
435
|
+
function (visit) {
|
|
436
|
+
return visit.placeDefinition.hasRouteId() ?
|
|
437
|
+
[
|
|
438
|
+
// NOTE:
|
|
439
|
+
// It's important to attach the params to the root path and not the id. If we attach them
|
|
440
|
+
// to an empty id then the angular router won't match the pattern.
|
|
441
|
+
new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit)),
|
|
442
|
+
new UrlSegment(visit.placeDefinition.getFormattedRouteId(visit), {})
|
|
443
|
+
]
|
|
444
|
+
:
|
|
445
|
+
[
|
|
446
|
+
new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit))
|
|
447
|
+
];
|
|
448
|
+
};
|
|
449
|
+
/**
|
|
450
|
+
* @param {?} visit
|
|
451
|
+
* @return {?}
|
|
452
|
+
*/
|
|
453
|
+
UrlManipulator.prototype.createRedirectCommandsFor = /**
|
|
454
|
+
* @param {?} visit
|
|
455
|
+
* @return {?}
|
|
456
|
+
*/
|
|
457
|
+
function (visit) {
|
|
458
|
+
/** @type {?} */
|
|
459
|
+
var segments = this.updateVisitSegments(visit);
|
|
460
|
+
/** @type {?} */
|
|
461
|
+
var commands = [];
|
|
462
|
+
segments.forEach((/**
|
|
463
|
+
* @param {?} s
|
|
464
|
+
* @return {?}
|
|
465
|
+
*/
|
|
466
|
+
function (s) {
|
|
467
|
+
commands.push(s.path);
|
|
468
|
+
if (s.parameterMap.keys.length > 0) {
|
|
469
|
+
commands.push(s.parameters);
|
|
470
|
+
}
|
|
471
|
+
}));
|
|
472
|
+
return commands;
|
|
473
|
+
};
|
|
474
|
+
tslib_1.__decorate([
|
|
475
|
+
Trace(),
|
|
476
|
+
tslib_1.__metadata("design:type", Function),
|
|
477
|
+
tslib_1.__metadata("design:paramtypes", [Visit]),
|
|
478
|
+
tslib_1.__metadata("design:returntype", Array)
|
|
479
|
+
], UrlManipulator.prototype, "createRedirectCommandsFor", null);
|
|
480
|
+
return UrlManipulator;
|
|
481
|
+
}());
|
|
482
|
+
PlaceRouter.UrlManipulator = UrlManipulator;
|
|
483
|
+
if (false) {
|
|
484
|
+
/**
|
|
485
|
+
* @type {?}
|
|
486
|
+
* @private
|
|
487
|
+
*/
|
|
488
|
+
UrlManipulator.prototype.urlTree;
|
|
489
|
+
}
|
|
490
|
+
})(PlaceRouter || (PlaceRouter = {}));
|
|
491
|
+
//# 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  RouterStateSnapshot,\n  UrlSegment,\n  UrlSerializer,\n  UrlTree\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,\n              private readonly urlSerializer: UrlSerializer,\n              readonly angularLocation: Location,\n              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, options?: { relativeTo: ActivatedRoute }) {\n    this.doNavigation(visit, async router => {\n      const commands = [\n        visit.placeDefinition.path,\n        ...this.createRouteParameters(visit)\n      ];\n      await this.router.navigate(commands, {\n        relativeTo: options ? options.relativeTo : null\n      });\n    });\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 commands = this.createUrlManipulator(this.router.routerState.snapshot).createRedirectCommandsFor(next);\n        // // we have to to use the definition for route id as our redirection always includes\n        // // the id in the url segements (but leaves it blank when there's no id). I.e. in the\n        // // no id case we're doing the following redirect [<placePath>, \"\"] -> [\"..\", <id>]\n        // const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';\n        // const commands = [\n        //   relativePath,\n        //   ...this.createRouteParameters(next),\n        //   ...this.extractChildPath(activatedRoute.snapshot)\n        // ];\n        console.log('### Push Changes to route Redirect', { commands });\n        return router.navigate(commands);\n      });\n    }\n  }\n\n  async doNavigation(visit: Visit, customNavigation: (router: Router) => any) {\n    this._navigationSessionModel.value = NavigationSession.createInternal(visit);\n    try {\n      await customNavigation(this.router);\n    } finally {\n      if (this.navigationSession && !this.router.getCurrentNavigation()) {\n        this.onAngularRouterFinished();\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  // @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  extractChildPath(activatedRoute: ActivatedRouteSnapshot): any[] {\n    return _.flatten(activatedRoute.children.map(child => child.url));\n  }\n\n  createUrlManipulator(snapshot: RouterStateSnapshot): PlaceRouter.UrlManipulator {\n    return new PlaceRouter.UrlManipulator(this.urlSerializer.parse(snapshot.url));\n  }\n\n}\n\nexport namespace PlaceRouter {\n\n\n  export class UrlManipulator {\n\n    constructor(private urlTree: UrlTree) {\n      console.log({ segments: this.urlTree.root.children.primary.segments });\n    }\n\n    cloneUrlSegmentList(): UrlSegment[] {\n      return [...this.urlTree.root.children.primary.segments];\n    }\n\n    updateVisitSegments(visit: Visit): UrlSegment[] {\n      // Ugly, but it works for now.\n      const segments = this.cloneUrlSegmentList();\n      const visitSegments = this.convertToUrlSegments(visit);\n      const replaceAt = segments.findIndex(segment => segment.path === visitSegments[0].path);\n      // do not use the return value, it's the items that were removed!\n      segments.splice(replaceAt, visitSegments.length, ...visitSegments);\n      return segments;\n    }\n\n    /**\n     * Converts the visit into segments.  Please not that these segments are not e\n     * @param visit\n     */\n    convertToUrlSegments(visit: Visit): UrlSegment[] {\n      return visit.placeDefinition.hasRouteId() ?\n        [\n          // NOTE:\n          // It's important to attach the params to the root path and not the id.  If we attach them\n          // to an empty id then the angular router won't match the pattern.\n          new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit)),\n          new UrlSegment(visit.placeDefinition.getFormattedRouteId(visit), {})]\n        :\n        [\n          new UrlSegment(visit.placeDefinition.path, visit.placeDefinition.getFormattedRouteParameters(visit))\n        ];\n    }\n\n\n    @Trace()\n    createRedirectCommandsFor(visit: Visit): any[] {\n\n      const segments = this.updateVisitSegments(visit);\n      const commands = [];\n      segments.forEach(s => {\n        commands.push(s.path);\n        if (s.parameterMap.keys.length > 0) {\n          commands.push(s.parameters);\n        }\n      });\n      return commands;\n    }\n\n  }\n}\n"]}
|
|
@@ -40,7 +40,7 @@ var EnterPlaceGuard = /** @class */ (function () {
|
|
|
40
40
|
*/
|
|
41
41
|
function (activatedRoute, state) {
|
|
42
42
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
43
|
-
var placeDefinition, params, parsedParams, initialVisit, sanitiser, sanitisedVisit,
|
|
43
|
+
var placeDefinition, params, parsedParams, initialVisit, sanitiser, sanitisedVisit, commands;
|
|
44
44
|
return tslib_1.__generator(this, function (_a) {
|
|
45
45
|
switch (_a.label) {
|
|
46
46
|
case 0:
|
|
@@ -57,9 +57,8 @@ var EnterPlaceGuard = /** @class */ (function () {
|
|
|
57
57
|
// Save the visit with any updated parameters. We need to save it so we remember any non route parameters
|
|
58
58
|
this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
|
|
59
59
|
if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
|
|
60
|
-
routerStateUrlTree = this.urlSerializer.parse(state.url);
|
|
61
60
|
// Regenerate the url
|
|
62
|
-
commands = this.
|
|
61
|
+
commands = this.placeRouter.createUrlManipulator(state).createRedirectCommandsFor(sanitisedVisit);
|
|
63
62
|
console.log('##### Place Guard Redirect', commands);
|
|
64
63
|
return [2 /*return*/, this.router.createUrlTree(commands, {
|
|
65
64
|
replaceUrl: true,
|
|
@@ -76,46 +75,6 @@ var EnterPlaceGuard = /** @class */ (function () {
|
|
|
76
75
|
});
|
|
77
76
|
});
|
|
78
77
|
};
|
|
79
|
-
/**
|
|
80
|
-
* @private
|
|
81
|
-
* @param {?} sanitisedVisit
|
|
82
|
-
* @param {?} path
|
|
83
|
-
* @return {?}
|
|
84
|
-
*/
|
|
85
|
-
EnterPlaceGuard.prototype.createRedirectCommands = /**
|
|
86
|
-
* @private
|
|
87
|
-
* @param {?} sanitisedVisit
|
|
88
|
-
* @param {?} path
|
|
89
|
-
* @return {?}
|
|
90
|
-
*/
|
|
91
|
-
function (sanitisedVisit, path) {
|
|
92
|
-
// Ugly, but it works for now.
|
|
93
|
-
/** @type {?} */
|
|
94
|
-
var newSegments = sanitisedVisit.getUrlSegments();
|
|
95
|
-
/** @type {?} */
|
|
96
|
-
var replaceAt = path.findIndex((/**
|
|
97
|
-
* @param {?} segment
|
|
98
|
-
* @return {?}
|
|
99
|
-
*/
|
|
100
|
-
function (segment) { return segment.path === newSegments[0].path; }));
|
|
101
|
-
/** @type {?} */
|
|
102
|
-
var newPath = tslib_1.__spread(path);
|
|
103
|
-
newPath.splice.apply(newPath, tslib_1.__spread([replaceAt, newSegments.length], newSegments)); // do not use the return value, it's the items that were removed!
|
|
104
|
-
// do not use the return value, it's the items that were removed!
|
|
105
|
-
/** @type {?} */
|
|
106
|
-
var commands = [];
|
|
107
|
-
newPath.forEach((/**
|
|
108
|
-
* @param {?} s
|
|
109
|
-
* @return {?}
|
|
110
|
-
*/
|
|
111
|
-
function (s) {
|
|
112
|
-
commands.push(s.path);
|
|
113
|
-
if (s.parameterMap.keys.length > 0) {
|
|
114
|
-
commands.push(s.parameters);
|
|
115
|
-
}
|
|
116
|
-
}));
|
|
117
|
-
return { newPath: newPath, commands: commands };
|
|
118
|
-
};
|
|
119
78
|
EnterPlaceGuard.decorators = [
|
|
120
79
|
{ type: Injectable, args: [{
|
|
121
80
|
providedIn: 'root'
|
|
@@ -316,4 +275,4 @@ if (false) {
|
|
|
316
275
|
ParamMapAdapter.prototype.params;
|
|
317
276
|
}
|
|
318
277
|
})(EnterPlaceGuard || (EnterPlaceGuard = {}));
|
|
319
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enter-place-guard.service.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/guards/enter-place-guard.service.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAIL,MAAM,EAGN,aAAa,EAEd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,kDAAkD,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;;;;;AAEpD;IAKE,yBAA6B,MAAc,EACvB,aAA4B,EACnB,WAAwB,EACxB,YAA0B,EAC1B,QAAkB;QAJlB,WAAM,GAAN,MAAM,CAAQ;QACvB,kBAAa,GAAb,aAAa,CAAe;QACnB,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,aAAQ,GAAR,QAAQ,CAAU;IAC/C,CAAC;IAED,WAAW;;;;;;;IACL,qCAAW;;;;;;;IAAjB,UAAkB,cAAsC,EAAE,KAA0B;;;;;;6BAC9E,cAAc,CAAC,2BAA2B,CAAC,cAAc,CAAC,SAAS,CAAC,EAApE,wBAAoE;wBAChE,eAAe,GAAG,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC;;wBAExE,MAAM,GAAG,IAAI,eAAe,CAAC,wBAAwB,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC;wBAClG,YAAY,GAAG,eAAe,CAAC,gBAAgB,CAAC,MAAM,CAAC;wBAEvD,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,IAAI,KAAK,CAAC,eAAe,EAAE,YAAY,CAAC;wBAC1H,SAAS,GAAG,IAAI,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC;wBAC5E,qBAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,EAAA;;wBAA1F,cAAc,GAAG,SAAyE;wBAEhG,0GAA0G;wBAC1G,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;wBAC9D,IAAI,YAAY,CAAC,qBAAqB,CAAC,cAAc,CAAC,EAAE;4BAChD,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;;4BAGtD,QAAQ,GAAK,IAAI,CAAC,sBAAsB,CAAC,cAAc,mBAAM,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAxG;4BAEhB,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAC;4BACpD,sBAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE;oCACzC,UAAU,EAAE,IAAI;oCAChB,kBAAkB,EAAE,KAAK;iCAC1B,CAAC,EAAC;yBACJ;6BAAM;4BACL,sBAAO,IAAI,EAAC;yBACb;;4BAED,sBAAO,IAAI,CAAC,YAAY,CAAC,iEAA+D,cAAc,CAAC,SAAW,CAAC,EAAC;;;;;KAEvH;;;;;;;IAEO,gDAAsB;;;;;;IAA9B,UAA+B,cAAc,EAAE,IAAI;;;YAE3C,WAAW,GAAG,cAAc,CAAC,cAAc,EAAE;;YAC7C,SAAS,GAAG,IAAI,CAAC,SAAS;;;;QAAC,UAAA,OAAO,IAAI,OAAA,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAApC,CAAoC,EAAC;;YAC3E,OAAO,oBAAO,IAAI,CAAC;QACzB,OAAO,CAAC,MAAM,OAAd,OAAO,oBAAQ,SAAS,EAAE,WAAW,CAAC,MAAM,GAAK,WAAW,GAAE,CAAC,iEAAiE;;;YAE1H,QAAQ,GAAG,EAAE;QACnB,OAAO,CAAC,OAAO;;;;QAAC,UAAA,CAAC;YACf,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;aAC7B;QACH,CAAC,EAAC,CAAC;QACH,OAAO,EAAE,OAAO,SAAA,EAAE,QAAQ,UAAA,EAAE,CAAC;IAC/B,CAAC;;gBA5DF,UAAU,SAAC;oBACV,UAAU,EAAE,MAAM;iBACnB;;;;gBAhBC,MAAM;gBAGN,aAAa;gBAON,WAAW;gBADX,YAAY;gBAdA,QAAQ;;;0BAA7B;CAiFC,AA9DD,IA8DC;SA3DY,eAAe;;;;;;IAEd,iCAA+B;;;;;IAC/B,wCAAoC;;;;;IACpC,sCAAyC;;;;;IACzC,uCAA2C;;;;;IAC3C,mCAAmC;;AAuDjD,WAAiB,eAAe;;;;;;IAM9B;QAIE,kCAAY,QAAkB,EAAE,WAAyB;YACvD,IAAI,CAAC,SAAS,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAChC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG;;;;YAAC,UAAA,CAAC,IAAI,OAAA,IAAI,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,EAAjC,CAAiC,EAAC,CAChE,CAAC,MAAM;;;;YAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAC,EAAH,CAAG,EAAC,CAAC,CAAC,4CAA4C;QAClE,CAAC;;;;;QAED,sCAAG;;;;QAAH,UAAI,IAAY;;gBACR,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI;;;;YAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAX,CAAW,EAAC;YACtD,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;;;;;QAED,yCAAM;;;;QAAN,UAAO,IAAY;;gBACX,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI;;;;YAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAX,CAAW,EAAC;YACtD,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;;;;;QAED,sCAAG;;;;QAAH,UAAI,IAAY;YACd,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI;;;;YAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAX,CAAW,EAAC,CAAC;QACjD,CAAC;QAGD,sBAAI,0CAAI;;;;YAAR;gBACE,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM;;;;;gBAAC,UAAC,MAAM,EAAE,MAAM,IAAK,OAAA,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAA1B,CAA0B,GAAE,EAAE,CAAC,CAAC;YACnF,CAAC;;;WAAA;QAFD;YADC,OAAO,EAAE;;;4DAGT;QACH,+BAAC;KAAA,AA5BD,IA4BC;IA5BY,wCAAwB,2BA4BpC,CAAA;;;;;;QA1BC,6CAA8B;;IA4BhC;QACE,yBAA6B,MAA+B;YAA/B,WAAM,GAAN,MAAM,CAAyB;QAC5D,CAAC;;;;;QAED,6BAAG;;;;QAAH,UAAI,IAAY;YACd,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;;;;;QAED,gCAAM;;;;QAAN,UAAO,IAAY;;gBACX,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAC5B,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;;;;;QAED,6BAAG;;;;QAAH,UAAI,IAAY;YACd,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;QAED,sBAAI,iCAAI;;;;YAAR;gBACE,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;;;WAAA;QAEH,sBAAC;IAAD,CAAC,AArBD,IAqBC;;;;;;QApBa,iCAAgD;;AAqBhE,CAAC,EA1DgB,eAAe,KAAf,eAAe,QA0D/B","sourcesContent":["import { Injectable, Injector } from '@angular/core';\nimport {\n  ActivatedRouteSnapshot,\n  CanActivate,\n  ParamMap,\n  Router,\n  RouterStateSnapshot,\n  UrlSegment,\n  UrlSerializer,\n  UrlTree\n} from '@angular/router';\nimport { lang } from '@coolon/pectin';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport { PlaceComponent } from '../../place-component';\nimport { PlaceHistory } from '../../place-history';\nimport { PlaceRouter } from '../../place-router';\nimport { Visit } from '../../visit';\nimport { VisitSanitiser } from '../visit-sanitiser';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class EnterPlaceGuard implements CanActivate {\n\n  constructor(private readonly router: Router,\n              private urlSerializer: UrlSerializer,\n              private readonly placeRouter: PlaceRouter,\n              private readonly placeHistory: PlaceHistory,\n              private readonly injector: Injector) {\n  }\n\n  // @Trace()\n  async canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {\n      const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);\n      // Parse our route params.\n      const params = new EnterPlaceGuard.ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);\n      const parsedParams = placeDefinition.parseRouteParams(params);\n\n      const initialVisit = this.placeRouter.navigationSession.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);\n      const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);\n      const sanitisedVisit = await sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));\n\n      // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters\n      this.placeRouter.navigationSession.storeVisit(sanitisedVisit);\n      if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {\n        const routerStateUrlTree = this.urlSerializer.parse(state.url);\n\n        // Regenerate the url\n        const { commands } = this.createRedirectCommands(sanitisedVisit, [...routerStateUrlTree.root.children.primary.segments]);\n\n        console.log('##### Place Guard Redirect', commands);\n        return this.router.createUrlTree(commands, {\n          replaceUrl: true,\n          skipLocationChange: false\n        });\n      } else {\n        return true;\n      }\n    } else {\n      return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);\n    }\n  }\n\n  private createRedirectCommands(sanitisedVisit, path) {\n    // Ugly, but it works for now.\n    const newSegments = sanitisedVisit.getUrlSegments();\n    const replaceAt = path.findIndex(segment => segment.path === newSegments[0].path);\n    const newPath = [...path];\n    newPath.splice(replaceAt, newSegments.length, ...newSegments); // do not use the return value, it's the items that were removed!\n\n    const commands = [];\n    newPath.forEach(s => {\n      commands.push(s.path);\n      if (s.parameterMap.keys.length > 0) {\n        commands.push(s.parameters);\n      }\n    });\n    return { newPath, commands };\n  }\n\n}\n\nexport namespace EnterPlaceGuard {\n  /**\n   * This a work around for the fact that an activated route with multiple segments doesn't\n   * include the segment params in the paramMap as well as each segment returns an empty\n   * param map even when `parameter`s has content.\n   */\n  export class ConsolidatedParameterMap implements ParamMap {\n\n    private paramMaps: ParamMap[];\n\n    constructor(paramMap: ParamMap, urlSegments: UrlSegment[]) {\n      this.paramMaps = [paramMap].concat(\n        (urlSegments || []).map(s => new ParamMapAdapter(s.parameters))\n      ).filter(m => !!m); // the activated route param map can be null\n    }\n\n    get(name: string): string | null {\n      const paramMap = this.paramMaps.find(m => m.has(name));\n      return paramMap.get(name);\n    }\n\n    getAll(name: string): string[] {\n      const paramMap = this.paramMaps.find(m => m.has(name));\n      return paramMap.getAll(name);\n    }\n\n    has(name: string): boolean {\n      return !!this.paramMaps.find(m => m.has(name));\n    }\n\n    @Memoize()\n    get keys(): string[] {\n      return this.paramMaps.reduce((result, params) => result.concat(params.keys), []);\n    }\n  }\n\n  class ParamMapAdapter implements ParamMap {\n    constructor(private readonly params: { [p: string]: string }) {\n    }\n\n    get(name: string): string | null {\n      return this.params[name];\n    }\n\n    getAll(name: string): string[] {\n      const value = this.get(name);\n      return Array.isArray(value) ? value : [value];\n    }\n\n    has(name: string): boolean {\n      return this.keys.includes(name);\n    }\n\n    get keys(): string[] {\n      return Object.keys(this.params);\n    }\n\n  }\n}\n"]}
|
|
278
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enter-place-guard.service.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/guards/enter-place-guard.service.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAIL,MAAM,EAGN,aAAa,EAEd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,kDAAkD,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;;;;;AAEpD;IAKE,yBAA6B,MAAc,EACvB,aAA4B,EACnB,WAAwB,EACxB,YAA0B,EAC1B,QAAkB;QAJlB,WAAM,GAAN,MAAM,CAAQ;QACvB,kBAAa,GAAb,aAAa,CAAe;QACnB,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,aAAQ,GAAR,QAAQ,CAAU;IAC/C,CAAC;IAED,WAAW;;;;;;;IACL,qCAAW;;;;;;;IAAjB,UAAkB,cAAsC,EAAE,KAA0B;;;;;;6BAC9E,cAAc,CAAC,2BAA2B,CAAC,cAAc,CAAC,SAAS,CAAC,EAApE,wBAAoE;wBAChE,eAAe,GAAG,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC;;wBAExE,MAAM,GAAG,IAAI,eAAe,CAAC,wBAAwB,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC;wBAClG,YAAY,GAAG,eAAe,CAAC,gBAAgB,CAAC,MAAM,CAAC;wBAEvD,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,IAAI,KAAK,CAAC,eAAe,EAAE,YAAY,CAAC;wBAC1H,SAAS,GAAG,IAAI,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC;wBAC5E,qBAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,EAAA;;wBAA1F,cAAc,GAAG,SAAyE;wBAEhG,0GAA0G;wBAC1G,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;wBAC9D,IAAI,YAAY,CAAC,qBAAqB,CAAC,cAAc,CAAC,EAAE;;4BAEhD,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,yBAAyB,CAAC,cAAc,CAAC;4BACvG,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAC;4BACpD,sBAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE;oCACzC,UAAU,EAAE,IAAI;oCAChB,kBAAkB,EAAE,KAAK;iCAC1B,CAAC,EAAC;yBACJ;6BAAM;4BACL,sBAAO,IAAI,EAAC;yBACb;;4BAED,sBAAO,IAAI,CAAC,YAAY,CAAC,iEAA+D,cAAc,CAAC,SAAW,CAAC,EAAC;;;;;KAEvH;;gBAxCF,UAAU,SAAC;oBACV,UAAU,EAAE,MAAM;iBACnB;;;;gBAhBC,MAAM;gBAGN,aAAa;gBAON,WAAW;gBADX,YAAY;gBAdA,QAAQ;;;0BAA7B;CA4DC,AAzCD,IAyCC;SAtCY,eAAe;;;;;;IAEd,iCAA+B;;;;;IAC/B,wCAAoC;;;;;IACpC,sCAAyC;;;;;IACzC,uCAA2C;;;;;IAC3C,mCAAmC;;AAkCjD,WAAiB,eAAe;;;;;;IAM9B;QAIE,kCAAY,QAAkB,EAAE,WAAyB;YACvD,IAAI,CAAC,SAAS,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAChC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG;;;;YAAC,UAAA,CAAC,IAAI,OAAA,IAAI,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,EAAjC,CAAiC,EAAC,CAChE,CAAC,MAAM;;;;YAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAC,EAAH,CAAG,EAAC,CAAC,CAAC,4CAA4C;QAClE,CAAC;;;;;QAED,sCAAG;;;;QAAH,UAAI,IAAY;;gBACR,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI;;;;YAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAX,CAAW,EAAC;YACtD,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;;;;;QAED,yCAAM;;;;QAAN,UAAO,IAAY;;gBACX,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI;;;;YAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAX,CAAW,EAAC;YACtD,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;;;;;QAED,sCAAG;;;;QAAH,UAAI,IAAY;YACd,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI;;;;YAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAX,CAAW,EAAC,CAAC;QACjD,CAAC;QAGD,sBAAI,0CAAI;;;;YAAR;gBACE,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM;;;;;gBAAC,UAAC,MAAM,EAAE,MAAM,IAAK,OAAA,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAA1B,CAA0B,GAAE,EAAE,CAAC,CAAC;YACnF,CAAC;;;WAAA;QAFD;YADC,OAAO,EAAE;;;4DAGT;QACH,+BAAC;KAAA,AA5BD,IA4BC;IA5BY,wCAAwB,2BA4BpC,CAAA;;;;;;QA1BC,6CAA8B;;IA4BhC;QACE,yBAA6B,MAA+B;YAA/B,WAAM,GAAN,MAAM,CAAyB;QAC5D,CAAC;;;;;QAED,6BAAG;;;;QAAH,UAAI,IAAY;YACd,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;;;;;QAED,gCAAM;;;;QAAN,UAAO,IAAY;;gBACX,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAC5B,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;;;;;QAED,6BAAG;;;;QAAH,UAAI,IAAY;YACd,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;QAED,sBAAI,iCAAI;;;;YAAR;gBACE,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;;;WAAA;QAEH,sBAAC;IAAD,CAAC,AArBD,IAqBC;;;;;;QApBa,iCAAgD;;AAqBhE,CAAC,EA1DgB,eAAe,KAAf,eAAe,QA0D/B","sourcesContent":["import { Injectable, Injector } from '@angular/core';\nimport {\n  ActivatedRouteSnapshot,\n  CanActivate,\n  ParamMap,\n  Router,\n  RouterStateSnapshot,\n  UrlSegment,\n  UrlSerializer,\n  UrlTree\n} from '@angular/router';\nimport { lang } from '@coolon/pectin';\nimport { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';\nimport { PlaceComponent } from '../../place-component';\nimport { PlaceHistory } from '../../place-history';\nimport { PlaceRouter } from '../../place-router';\nimport { Visit } from '../../visit';\nimport { VisitSanitiser } from '../visit-sanitiser';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class EnterPlaceGuard implements CanActivate {\n\n  constructor(private readonly router: Router,\n              private urlSerializer: UrlSerializer,\n              private readonly placeRouter: PlaceRouter,\n              private readonly placeHistory: PlaceHistory,\n              private readonly injector: Injector) {\n  }\n\n  // @Trace()\n  async canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {\n      const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);\n      // Parse our route params.\n      const params = new EnterPlaceGuard.ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);\n      const parsedParams = placeDefinition.parseRouteParams(params);\n\n      const initialVisit = this.placeRouter.navigationSession.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);\n      const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);\n      const sanitisedVisit = await sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));\n\n      // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters\n      this.placeRouter.navigationSession.storeVisit(sanitisedVisit);\n      if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {\n        // Regenerate the url\n        const commands = this.placeRouter.createUrlManipulator(state).createRedirectCommandsFor(sanitisedVisit);\n        console.log('##### Place Guard Redirect', commands);\n        return this.router.createUrlTree(commands, {\n          replaceUrl: true,\n          skipLocationChange: false\n        });\n      } else {\n        return true;\n      }\n    } else {\n      return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);\n    }\n  }\n}\n\nexport namespace EnterPlaceGuard {\n  /**\n   * This a work around for the fact that an activated route with multiple segments doesn't\n   * include the segment params in the paramMap as well as each segment returns an empty\n   * param map even when `parameter`s has content.\n   */\n  export class ConsolidatedParameterMap implements ParamMap {\n\n    private paramMaps: ParamMap[];\n\n    constructor(paramMap: ParamMap, urlSegments: UrlSegment[]) {\n      this.paramMaps = [paramMap].concat(\n        (urlSegments || []).map(s => new ParamMapAdapter(s.parameters))\n      ).filter(m => !!m); // the activated route param map can be null\n    }\n\n    get(name: string): string | null {\n      const paramMap = this.paramMaps.find(m => m.has(name));\n      return paramMap.get(name);\n    }\n\n    getAll(name: string): string[] {\n      const paramMap = this.paramMaps.find(m => m.has(name));\n      return paramMap.getAll(name);\n    }\n\n    has(name: string): boolean {\n      return !!this.paramMaps.find(m => m.has(name));\n    }\n\n    @Memoize()\n    get keys(): string[] {\n      return this.paramMaps.reduce((result, params) => result.concat(params.keys), []);\n    }\n  }\n\n  class ParamMapAdapter implements ParamMap {\n    constructor(private readonly params: { [p: string]: string }) {\n    }\n\n    get(name: string): string | null {\n      return this.params[name];\n    }\n\n    getAll(name: string): string[] {\n      const value = this.get(name);\n      return Array.isArray(value) ? value : [value];\n    }\n\n    has(name: string): boolean {\n      return this.keys.includes(name);\n    }\n\n    get keys(): string[] {\n      return Object.keys(this.params);\n    }\n\n  }\n}\n"]}
|