@coolon/angular-ui-powerups 0.0.68 → 0.0.70
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 +31 -17
- 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/place/place-definition.js +12 -2
- package/esm2015/lib/place/place-router.js +6 -6
- package/esm2015/lib/place/route/guards/place-route.guard.js +8 -8
- package/esm2015/lib/place/route/parameter-decorators.js +8 -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 +6 -6
- package/esm5/lib/place/route/guards/place-route.guard.js +9 -9
- package/esm5/lib/place/route/parameter-decorators.js +8 -4
- package/esm5/lib/place/route/parameter-definition.class.js +2 -2
- package/fesm2015/coolon-angular-ui-powerups.js +30 -16
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +31 -17
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/place/place-router.d.ts +1 -1
- package/package.json +1 -1
|
@@ -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, (/**
|
|
@@ -3056,16 +3069,13 @@ class PlaceRouter extends GarbageCollector {
|
|
|
3056
3069
|
[def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :
|
|
3057
3070
|
[def.getFormattedRouteParameters(next)];
|
|
3058
3071
|
/** @type {?} */
|
|
3059
|
-
const commands = [relativePath].concat(params, this.
|
|
3072
|
+
const commands = [relativePath].concat(params, this.extractChildPath(activatedRoute.snapshot));
|
|
3060
3073
|
console.log('### Redirect', commands);
|
|
3061
3074
|
return router.navigate(commands, {
|
|
3062
3075
|
relativeTo: activatedRoute
|
|
3063
3076
|
});
|
|
3064
3077
|
}));
|
|
3065
3078
|
}
|
|
3066
|
-
else {
|
|
3067
|
-
this.placeHistory.add(next);
|
|
3068
|
-
}
|
|
3069
3079
|
});
|
|
3070
3080
|
}
|
|
3071
3081
|
/**
|
|
@@ -3144,7 +3154,7 @@ class PlaceRouter extends GarbageCollector {
|
|
|
3144
3154
|
* @param {?} activatedRoute
|
|
3145
3155
|
* @return {?}
|
|
3146
3156
|
*/
|
|
3147
|
-
|
|
3157
|
+
extractChildPath(activatedRoute) {
|
|
3148
3158
|
return ___default.flatten(activatedRoute.children.map((/**
|
|
3149
3159
|
* @param {?} child
|
|
3150
3160
|
* @return {?}
|
|
@@ -4221,6 +4231,8 @@ function RouteId(type, options) {
|
|
|
4221
4231
|
* @return {?}
|
|
4222
4232
|
*/
|
|
4223
4233
|
function VisitParameter(options) {
|
|
4234
|
+
/** @type {?} */
|
|
4235
|
+
const opts = Opts.get(options);
|
|
4224
4236
|
return (/**
|
|
4225
4237
|
* @param {?} prototype
|
|
4226
4238
|
* @param {?} propertyKey
|
|
@@ -4228,7 +4240,7 @@ function VisitParameter(options) {
|
|
|
4228
4240
|
*/
|
|
4229
4241
|
(prototype, propertyKey) => {
|
|
4230
4242
|
/** @type {?} */
|
|
4231
|
-
const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options,
|
|
4243
|
+
const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
|
|
4232
4244
|
Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
|
|
4233
4245
|
UseDelegate()(prototype, propertyKey);
|
|
4234
4246
|
});
|
|
@@ -4239,6 +4251,8 @@ function VisitParameter(options) {
|
|
|
4239
4251
|
* @return {?}
|
|
4240
4252
|
*/
|
|
4241
4253
|
function VisitParameterList(options) {
|
|
4254
|
+
/** @type {?} */
|
|
4255
|
+
const opts = Opts.get(options);
|
|
4242
4256
|
return (/**
|
|
4243
4257
|
* @param {?} prototype
|
|
4244
4258
|
* @param {?} propertyKey
|
|
@@ -4246,7 +4260,7 @@ function VisitParameterList(options) {
|
|
|
4246
4260
|
*/
|
|
4247
4261
|
(prototype, propertyKey) => {
|
|
4248
4262
|
/** @type {?} */
|
|
4249
|
-
const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options,
|
|
4263
|
+
const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
|
|
4250
4264
|
Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
|
|
4251
4265
|
UseDelegate()(prototype, propertyKey);
|
|
4252
4266
|
});
|
|
@@ -4598,16 +4612,16 @@ class PlaceRouteGuard {
|
|
|
4598
4612
|
/** @type {?} */
|
|
4599
4613
|
const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
|
|
4600
4614
|
/** @type {?} */
|
|
4601
|
-
const
|
|
4615
|
+
const sanitisedVisit = yield sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));
|
|
4602
4616
|
// Save the visit with any updated parameters. We need to save it so we remember any non route parameters
|
|
4603
|
-
this.placeRouter.navigationSession.storeVisit(
|
|
4604
|
-
if (initialVisit.hasRoutingChangedFrom(
|
|
4617
|
+
this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
|
|
4618
|
+
if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
|
|
4605
4619
|
/** @type {?} */
|
|
4606
|
-
const parameterCommands =
|
|
4607
|
-
[placeDefinition.getFormattedRouteId(
|
|
4608
|
-
[placeDefinition.getFormattedRouteParameters(
|
|
4620
|
+
const parameterCommands = sanitisedVisit.hasRouteId() ?
|
|
4621
|
+
[placeDefinition.getFormattedRouteId(sanitisedVisit), placeDefinition.getFormattedRouteParameters(sanitisedVisit)] :
|
|
4622
|
+
[placeDefinition.getFormattedRouteParameters(sanitisedVisit)];
|
|
4609
4623
|
/** @type {?} */
|
|
4610
|
-
const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.
|
|
4624
|
+
const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.extractChildPath(activatedRoute));
|
|
4611
4625
|
console.log('##### Redirect', commands);
|
|
4612
4626
|
return this.router.createUrlTree(commands, {
|
|
4613
4627
|
replaceUrl: true,
|