@coolon/angular-ui-powerups 0.0.8 → 0.0.10
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 +592 -167
- 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.d.ts +12 -11
- package/coolon-angular-ui-powerups.metadata.json +1 -1
- package/esm2015/coolon-angular-ui-powerups.js +12 -11
- package/esm2015/index.js +2 -2
- package/esm2015/lib/animations/slideDownAndUpAnimation.js +2 -1
- package/esm2015/lib/components/forms/abstract-input.component.js +22 -12
- package/esm2015/lib/directives/command.directive.js +48 -4
- package/esm2015/lib/directives/focus-binding.directive.js +30 -14
- package/esm2015/lib/interaction/services/dialog-interaction.service.js +3 -1
- package/esm2015/lib/place/components/busy-overlay/busy-overlay.component.js +4 -4
- package/esm2015/lib/place/components/nav/nav.component.js +31 -0
- package/esm2015/lib/place/guards/place-route.guard.js +3 -3
- package/esm2015/lib/place/index.js +4 -3
- package/esm2015/lib/place/place.module.js +16 -5
- package/esm2015/lib/place/route/parameter-decorators.js +98 -2
- package/esm2015/lib/place/route/parameter-definition.class.js +4 -2
- package/esm2015/lib/place/route/route-parameter-bindings.js +25 -13
- package/esm2015/lib/place/route/route-parameter-sanitiser.js +206 -74
- package/esm2015/public_api.js +2 -2
- package/esm5/coolon-angular-ui-powerups.js +12 -11
- package/esm5/index.js +2 -2
- package/esm5/lib/animations/slideDownAndUpAnimation.js +2 -1
- package/esm5/lib/components/forms/abstract-input.component.js +26 -12
- package/esm5/lib/directives/command.directive.js +52 -4
- package/esm5/lib/directives/focus-binding.directive.js +34 -14
- package/esm5/lib/interaction/services/dialog-interaction.service.js +3 -1
- package/esm5/lib/place/components/busy-overlay/busy-overlay.component.js +4 -4
- package/esm5/lib/place/components/nav/nav.component.js +36 -0
- package/esm5/lib/place/guards/place-route.guard.js +3 -3
- package/esm5/lib/place/index.js +4 -3
- package/esm5/lib/place/place.module.js +16 -5
- package/esm5/lib/place/route/parameter-decorators.js +98 -2
- package/esm5/lib/place/route/parameter-definition.class.js +4 -2
- package/esm5/lib/place/route/route-parameter-bindings.js +25 -13
- package/esm5/lib/place/route/route-parameter-sanitiser.js +284 -92
- package/esm5/public_api.js +2 -2
- package/fesm2015/coolon-angular-ui-powerups.js +473 -121
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +562 -139
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/components/forms/abstract-input.component.d.ts +9 -8
- package/lib/directives/command.directive.d.ts +6 -3
- package/lib/directives/focus-binding.directive.d.ts +1 -0
- package/lib/place/components/nav/nav.component.d.ts +7 -0
- package/lib/place/index.d.ts +1 -0
- package/lib/place/route/parameter-decorators.d.ts +17 -0
- package/lib/place/route/parameter-definition.class.d.ts +4 -3
- package/lib/place/route/route-parameter-sanitiser.d.ts +33 -6
- package/package.json +2 -2
|
@@ -5,11 +5,16 @@
|
|
|
5
5
|
import { CommonModule } from '@angular/common';
|
|
6
6
|
import { NgModule } from '@angular/core';
|
|
7
7
|
import { MatProgressSpinnerModule } from '@angular/material';
|
|
8
|
+
import { MatListModule } from '@angular/material/list';
|
|
9
|
+
import { MatTabsModule } from '@angular/material/tabs';
|
|
10
|
+
import { MatTooltipModule } from '@angular/material/tooltip';
|
|
11
|
+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
|
8
12
|
import { RouterModule } from '@angular/router';
|
|
9
13
|
import { BusyOverlayComponent } from './components/busy-overlay/busy-overlay.component';
|
|
10
14
|
import { EmptyStateComponent } from './components/empty-state/empty-state.component';
|
|
11
|
-
import {
|
|
15
|
+
import { NavComponent } from './components/nav/nav.component';
|
|
12
16
|
import { PlaceOutletComponent } from './components/place-outlet/place-outlet.component';
|
|
17
|
+
import { PlaceService } from './place.service';
|
|
13
18
|
var PlaceModule = /** @class */ (function () {
|
|
14
19
|
function PlaceModule() {
|
|
15
20
|
}
|
|
@@ -17,19 +22,25 @@ var PlaceModule = /** @class */ (function () {
|
|
|
17
22
|
{ type: NgModule, args: [{
|
|
18
23
|
imports: [
|
|
19
24
|
CommonModule,
|
|
25
|
+
BrowserAnimationsModule,
|
|
20
26
|
MatProgressSpinnerModule,
|
|
21
|
-
RouterModule
|
|
27
|
+
RouterModule,
|
|
28
|
+
MatTabsModule,
|
|
29
|
+
MatListModule,
|
|
30
|
+
MatTooltipModule
|
|
22
31
|
],
|
|
23
32
|
declarations: [
|
|
24
33
|
EmptyStateComponent,
|
|
25
34
|
BusyOverlayComponent,
|
|
26
|
-
PlaceOutletComponent
|
|
35
|
+
PlaceOutletComponent,
|
|
36
|
+
NavComponent
|
|
27
37
|
],
|
|
28
38
|
entryComponents: [BusyOverlayComponent],
|
|
29
39
|
exports: [
|
|
30
40
|
BusyOverlayComponent,
|
|
31
41
|
PlaceOutletComponent,
|
|
32
|
-
EmptyStateComponent
|
|
42
|
+
EmptyStateComponent,
|
|
43
|
+
NavComponent
|
|
33
44
|
],
|
|
34
45
|
providers: [
|
|
35
46
|
PlaceService
|
|
@@ -39,4 +50,4 @@ var PlaceModule = /** @class */ (function () {
|
|
|
39
50
|
return PlaceModule;
|
|
40
51
|
}());
|
|
41
52
|
export { PlaceModule };
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhY2UubW9kdWxlLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL3BsYWNlLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDN0QsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN2RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUMvRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDL0MsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sa0RBQWtELENBQUM7QUFDeEYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sZ0RBQWdELENBQUM7QUFDckYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQzlELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGtEQUFrRCxDQUFDO0FBQ3hGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUvQztJQUFBO0lBNkJBLENBQUM7O2dCQTdCQSxRQUFRLFNBQUM7b0JBQ1IsT0FBTyxFQUFFO3dCQUNQLFlBQVk7d0JBQ1osdUJBQXVCO3dCQUN2Qix3QkFBd0I7d0JBQ3hCLFlBQVk7d0JBQ1osYUFBYTt3QkFDYixhQUFhO3dCQUNiLGdCQUFnQjtxQkFDakI7b0JBQ0QsWUFBWSxFQUFFO3dCQUNaLG1CQUFtQjt3QkFDbkIsb0JBQW9CO3dCQUNwQixvQkFBb0I7d0JBQ3BCLFlBQVk7cUJBQ2I7b0JBQ0QsZUFBZSxFQUFFLENBQUMsb0JBQW9CLENBQUM7b0JBQ3ZDLE9BQU8sRUFBRTt3QkFDUCxvQkFBb0I7d0JBQ3BCLG9CQUFvQjt3QkFDcEIsbUJBQW1CO3dCQUNuQixZQUFZO3FCQUNiO29CQUNELFNBQVMsRUFBRTt3QkFDVCxZQUFZO3FCQUNiO2lCQUNGOztJQUdELGtCQUFDO0NBQUEsQUE3QkQsSUE2QkM7U0FGWSxXQUFXIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tbW9uTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcbmltcG9ydCB7IE5nTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBNYXRQcm9ncmVzc1NwaW5uZXJNb2R1bGUgfSBmcm9tICdAYW5ndWxhci9tYXRlcmlhbCc7XG5pbXBvcnQgeyBNYXRMaXN0TW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvbWF0ZXJpYWwvbGlzdCc7XG5pbXBvcnQgeyBNYXRUYWJzTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvbWF0ZXJpYWwvdGFicyc7XG5pbXBvcnQgeyBNYXRUb29sdGlwTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvbWF0ZXJpYWwvdG9vbHRpcCc7XG5pbXBvcnQgeyBCcm93c2VyQW5pbWF0aW9uc01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL3BsYXRmb3JtLWJyb3dzZXIvYW5pbWF0aW9ucyc7XG5pbXBvcnQgeyBSb3V0ZXJNb2R1bGUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgQnVzeU92ZXJsYXlDb21wb25lbnQgfSBmcm9tICcuL2NvbXBvbmVudHMvYnVzeS1vdmVybGF5L2J1c3ktb3ZlcmxheS5jb21wb25lbnQnO1xuaW1wb3J0IHsgRW1wdHlTdGF0ZUNvbXBvbmVudCB9IGZyb20gJy4vY29tcG9uZW50cy9lbXB0eS1zdGF0ZS9lbXB0eS1zdGF0ZS5jb21wb25lbnQnO1xuaW1wb3J0IHsgTmF2Q29tcG9uZW50IH0gZnJvbSAnLi9jb21wb25lbnRzL25hdi9uYXYuY29tcG9uZW50JztcbmltcG9ydCB7IFBsYWNlT3V0bGV0Q29tcG9uZW50IH0gZnJvbSAnLi9jb21wb25lbnRzL3BsYWNlLW91dGxldC9wbGFjZS1vdXRsZXQuY29tcG9uZW50JztcbmltcG9ydCB7IFBsYWNlU2VydmljZSB9IGZyb20gJy4vcGxhY2Uuc2VydmljZSc7XG5cbkBOZ01vZHVsZSh7XG4gIGltcG9ydHM6IFtcbiAgICBDb21tb25Nb2R1bGUsXG4gICAgQnJvd3NlckFuaW1hdGlvbnNNb2R1bGUsXG4gICAgTWF0UHJvZ3Jlc3NTcGlubmVyTW9kdWxlLFxuICAgIFJvdXRlck1vZHVsZSxcbiAgICBNYXRUYWJzTW9kdWxlLFxuICAgIE1hdExpc3RNb2R1bGUsXG4gICAgTWF0VG9vbHRpcE1vZHVsZVxuICBdLFxuICBkZWNsYXJhdGlvbnM6IFtcbiAgICBFbXB0eVN0YXRlQ29tcG9uZW50LFxuICAgIEJ1c3lPdmVybGF5Q29tcG9uZW50LFxuICAgIFBsYWNlT3V0bGV0Q29tcG9uZW50LFxuICAgIE5hdkNvbXBvbmVudFxuICBdLFxuICBlbnRyeUNvbXBvbmVudHM6IFtCdXN5T3ZlcmxheUNvbXBvbmVudF0sXG4gIGV4cG9ydHM6IFtcbiAgICBCdXN5T3ZlcmxheUNvbXBvbmVudCxcbiAgICBQbGFjZU91dGxldENvbXBvbmVudCxcbiAgICBFbXB0eVN0YXRlQ29tcG9uZW50LFxuICAgIE5hdkNvbXBvbmVudFxuICBdLFxuICBwcm92aWRlcnM6IFtcbiAgICBQbGFjZVNlcnZpY2VcbiAgXVxufSlcbmV4cG9ydCBjbGFzcyBQbGFjZU1vZHVsZSB7XG5cbn1cbiJdfQ==
|
|
@@ -16,6 +16,17 @@ if (false) {
|
|
|
16
16
|
/** @type {?|undefined} */
|
|
17
17
|
ParameterOptions.prototype.sanitiser;
|
|
18
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* @record
|
|
21
|
+
* @template T
|
|
22
|
+
*/
|
|
23
|
+
export function ListParameterOptions() { }
|
|
24
|
+
if (false) {
|
|
25
|
+
/** @type {?|undefined} */
|
|
26
|
+
ListParameterOptions.prototype.as;
|
|
27
|
+
/** @type {?|undefined} */
|
|
28
|
+
ListParameterOptions.prototype.listSanitiser;
|
|
29
|
+
}
|
|
19
30
|
/**
|
|
20
31
|
* @template T
|
|
21
32
|
* @param {?} type
|
|
@@ -37,12 +48,32 @@ export function RouteId(type, options) {
|
|
|
37
48
|
});
|
|
38
49
|
}
|
|
39
50
|
/**
|
|
51
|
+
* @deprecated use RouteParameter instead.
|
|
40
52
|
* @template T
|
|
41
53
|
* @param {?} type
|
|
42
54
|
* @param {?=} options
|
|
43
55
|
* @return {?}
|
|
44
56
|
*/
|
|
45
57
|
export function QueryParameter(type, options) {
|
|
58
|
+
return (/**
|
|
59
|
+
* @param {?} prototype
|
|
60
|
+
* @param {?} propertyKey
|
|
61
|
+
* @return {?}
|
|
62
|
+
*/
|
|
63
|
+
function (prototype, propertyKey) {
|
|
64
|
+
/** @type {?} */
|
|
65
|
+
var param = createDefinition(propertyKey, type, options, false);
|
|
66
|
+
Klass.get(prototype).addToOwnMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY, param);
|
|
67
|
+
UseDelegate()(prototype, propertyKey);
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* @template T
|
|
72
|
+
* @param {?} type
|
|
73
|
+
* @param {?=} options
|
|
74
|
+
* @return {?}
|
|
75
|
+
*/
|
|
76
|
+
export function RouteParameter(type, options) {
|
|
46
77
|
// assert.isTruthy(type.isValid());
|
|
47
78
|
return (/**
|
|
48
79
|
* @param {?} prototype
|
|
@@ -56,6 +87,47 @@ export function QueryParameter(type, options) {
|
|
|
56
87
|
UseDelegate()(prototype, propertyKey);
|
|
57
88
|
});
|
|
58
89
|
}
|
|
90
|
+
/**
|
|
91
|
+
* @deprecated use RouteParameterList instead
|
|
92
|
+
* @template E
|
|
93
|
+
* @param {?} elementType
|
|
94
|
+
* @param {?=} options
|
|
95
|
+
* @return {?}
|
|
96
|
+
*/
|
|
97
|
+
export function QueryParameterList(elementType, options) {
|
|
98
|
+
// assert.isTruthy(type.isValid());
|
|
99
|
+
return (/**
|
|
100
|
+
* @param {?} prototype
|
|
101
|
+
* @param {?} propertyKey
|
|
102
|
+
* @return {?}
|
|
103
|
+
*/
|
|
104
|
+
function (prototype, propertyKey) {
|
|
105
|
+
/** @type {?} */
|
|
106
|
+
var param = createArrayDefinition(propertyKey, elementType, options);
|
|
107
|
+
Klass.get(prototype).addToOwnMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY, param);
|
|
108
|
+
UseDelegate()(prototype, propertyKey);
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* @template E
|
|
113
|
+
* @param {?} elementType
|
|
114
|
+
* @param {?=} options
|
|
115
|
+
* @return {?}
|
|
116
|
+
*/
|
|
117
|
+
export function RouteParameterList(elementType, options) {
|
|
118
|
+
// assert.isTruthy(type.isValid());
|
|
119
|
+
return (/**
|
|
120
|
+
* @param {?} prototype
|
|
121
|
+
* @param {?} propertyKey
|
|
122
|
+
* @return {?}
|
|
123
|
+
*/
|
|
124
|
+
function (prototype, propertyKey) {
|
|
125
|
+
/** @type {?} */
|
|
126
|
+
var param = createArrayDefinition(propertyKey, elementType, options);
|
|
127
|
+
Klass.get(prototype).addToOwnMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY, param);
|
|
128
|
+
UseDelegate()(prototype, propertyKey);
|
|
129
|
+
});
|
|
130
|
+
}
|
|
59
131
|
/**
|
|
60
132
|
* @template T
|
|
61
133
|
* @param {?} propertyName
|
|
@@ -75,8 +147,32 @@ function createDefinition(propertyName, type, options, routeId) {
|
|
|
75
147
|
propertyName: propertyNameAsString,
|
|
76
148
|
type: assert.notNil(type),
|
|
77
149
|
sanitiser: opts.getOptional('sanitiser', null),
|
|
78
|
-
isRouteId: routeId
|
|
150
|
+
isRouteId: routeId,
|
|
151
|
+
isArray: false
|
|
152
|
+
};
|
|
153
|
+
return def;
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* @template T
|
|
157
|
+
* @param {?} propertyName
|
|
158
|
+
* @param {?} type
|
|
159
|
+
* @param {?} options
|
|
160
|
+
* @return {?}
|
|
161
|
+
*/
|
|
162
|
+
function createArrayDefinition(propertyName, type, options) {
|
|
163
|
+
/** @type {?} */
|
|
164
|
+
var opts = Opts.get(options);
|
|
165
|
+
/** @type {?} */
|
|
166
|
+
var propertyNameAsString = assert.notNil(propertyName).toString();
|
|
167
|
+
/** @type {?} */
|
|
168
|
+
var def = {
|
|
169
|
+
name: opts.getOptional('as', propertyNameAsString),
|
|
170
|
+
propertyName: propertyNameAsString,
|
|
171
|
+
type: assert.notNil(type),
|
|
172
|
+
sanitiser: opts.getOptional('listSanitiser', null),
|
|
173
|
+
isRouteId: false,
|
|
174
|
+
isArray: true
|
|
79
175
|
};
|
|
80
176
|
return def;
|
|
81
177
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
178
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"parameter-decorators.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/parameter-decorators.ts"],"names":[],"mappings":"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","sourcesContent":["import { assert, Constructable, UseDelegate } from '@coolon/pectin';\nimport { Klass, Opts } from '@coolon/typescript-utilities';\nimport { ParameterDefinition } from './parameter-definition.class';\nimport { ParameterSanitiser } from './parameter-sanitiser';\nimport { ParameterType } from './parameter-type';\nimport { RouteParameterBindings } from './route-parameter-bindings';\n\nexport interface ParameterOptions<T> {\n  as?: string;\n  sanitiser?: Constructable<ParameterSanitiser<T>>;\n}\n\nexport interface ListParameterOptions<T> {\n  as?: string;\n  listSanitiser?: Constructable<ParameterSanitiser<T[]>>;\n}\n\nexport function RouteId<T extends string | number>(type: ParameterType<T>, options?: ParameterOptions<T>): PropertyDecorator {\n  // assert.isTruthy(type.isValid());\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const param = createDefinition(propertyKey, type, options, true);\n    Klass.get(prototype).addToOwnMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY, param);\n    UseDelegate()(prototype, propertyKey);\n  };\n}\n\n/**\n * @deprecated use RouteParameter instead.\n * @param type\n * @param options\n */\nexport function QueryParameter<T>(type: ParameterType<T>, options?: ParameterOptions<T>): PropertyDecorator {\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const param = createDefinition(propertyKey, type, options, false);\n    Klass.get(prototype).addToOwnMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY, param);\n    UseDelegate()(prototype, propertyKey);\n  };\n}\n\nexport function RouteParameter<T>(type: ParameterType<T>, options?: ParameterOptions<T>): PropertyDecorator {\n  // assert.isTruthy(type.isValid());\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const param = createDefinition(propertyKey, type, options, false);\n    Klass.get(prototype).addToOwnMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY, param);\n    UseDelegate()(prototype, propertyKey);\n  };\n}\n\n/**\n * @deprecated use RouteParameterList instead\n * @param elementType\n * @param options\n */\nexport function QueryParameterList<E>(elementType: ParameterType<E>, options?: ListParameterOptions<E>): PropertyDecorator {\n  // assert.isTruthy(type.isValid());\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const param = createArrayDefinition(propertyKey, elementType, options);\n    Klass.get(prototype).addToOwnMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY, param);\n    UseDelegate()(prototype, propertyKey);\n  };\n}\n\nexport function RouteParameterList<E>(elementType: ParameterType<E>, options?: ListParameterOptions<E>): PropertyDecorator {\n  // assert.isTruthy(type.isValid());\n  return (prototype: Object, propertyKey: string | symbol) => {\n    const param = createArrayDefinition(propertyKey, elementType, options);\n    Klass.get(prototype).addToOwnMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY, param);\n    UseDelegate()(prototype, propertyKey);\n  };\n}\n\nfunction createDefinition<T>(propertyName: symbol | string, type: ParameterType<T>, options: ParameterOptions<T>, routeId: boolean) {\n  const opts = Opts.get(options);\n  const propertyNameAsString = assert.notNil(propertyName).toString();\n  const def: ParameterDefinition<T> = {\n    name: opts.getOptional('as', propertyNameAsString),\n    propertyName: propertyNameAsString,\n    type: assert.notNil(type),\n    sanitiser: opts.getOptional('sanitiser', null),\n    isRouteId: routeId,\n    isArray: false\n  };\n  return def;\n}\n\nfunction createArrayDefinition<T>(propertyName: symbol | string, type: ParameterType<T>, options: ListParameterOptions<T>) {\n  const opts = Opts.get(options);\n  const propertyNameAsString = assert.notNil(propertyName).toString();\n\n  const def: ParameterDefinition<T, T[]> = {\n    name: opts.getOptional('as', propertyNameAsString),\n    propertyName: propertyNameAsString,\n    type: assert.notNil(type),\n    sanitiser: opts.getOptional('listSanitiser', null),\n    isRouteId: false,\n    isArray: true\n  };\n  return def;\n}\n"]}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
/**
|
|
6
6
|
* @record
|
|
7
|
-
* @template
|
|
7
|
+
* @template E, S
|
|
8
8
|
*/
|
|
9
9
|
export function ParameterDefinition() { }
|
|
10
10
|
if (false) {
|
|
@@ -18,5 +18,7 @@ if (false) {
|
|
|
18
18
|
ParameterDefinition.prototype.sanitiser;
|
|
19
19
|
/** @type {?} */
|
|
20
20
|
ParameterDefinition.prototype.isRouteId;
|
|
21
|
+
/** @type {?} */
|
|
22
|
+
ParameterDefinition.prototype.isArray;
|
|
21
23
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1ldGVyLWRlZmluaXRpb24uY2xhc3MuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2Uvcm91dGUvcGFyYW1ldGVyLWRlZmluaXRpb24uY2xhc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7QUFJQSx5Q0FPQzs7O0lBTkMsbUNBQXNCOztJQUN0QiwyQ0FBOEI7O0lBQzlCLG1DQUFnQzs7SUFDaEMsd0NBQXlEOztJQUN6RCx3Q0FBNEI7O0lBQzVCLHNDQUEwQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbnN0cnVjdGFibGUgfSBmcm9tICdAY29vbG9uL3BlY3Rpbic7XG5pbXBvcnQgeyBQYXJhbWV0ZXJTYW5pdGlzZXIgfSBmcm9tICcuL3BhcmFtZXRlci1zYW5pdGlzZXInO1xuaW1wb3J0IHsgUGFyYW1ldGVyVHlwZSB9IGZyb20gJy4vcGFyYW1ldGVyLXR5cGUnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFBhcmFtZXRlckRlZmluaXRpb248RSxTPUU+IHtcbiAgcmVhZG9ubHkgbmFtZTogc3RyaW5nO1xuICByZWFkb25seSBwcm9wZXJ0eU5hbWU6IHN0cmluZztcbiAgcmVhZG9ubHkgdHlwZTogUGFyYW1ldGVyVHlwZTxFPjtcbiAgcmVhZG9ubHkgc2FuaXRpc2VyOiBDb25zdHJ1Y3RhYmxlPFBhcmFtZXRlclNhbml0aXNlcjxTPj47XG4gIHJlYWRvbmx5IGlzUm91dGVJZDogYm9vbGVhbjtcbiAgcmVhZG9ubHkgaXNBcnJheTogYm9vbGVhbjtcbn1cbiJdfQ==
|
|
@@ -13,7 +13,7 @@ import { Klass } from '@coolon/typescript-utilities';
|
|
|
13
13
|
function ResolvedParameter() { }
|
|
14
14
|
if (false) {
|
|
15
15
|
/** @type {?} */
|
|
16
|
-
ResolvedParameter.prototype.
|
|
16
|
+
ResolvedParameter.prototype.parameterDef;
|
|
17
17
|
/** @type {?} */
|
|
18
18
|
ResolvedParameter.prototype.resolvedValue;
|
|
19
19
|
}
|
|
@@ -37,7 +37,7 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
37
37
|
* @param {?} p
|
|
38
38
|
* @return {?}
|
|
39
39
|
*/
|
|
40
|
-
function (p) { return p.
|
|
40
|
+
function (p) { return p.parameterDef === parameter; }));
|
|
41
41
|
return resolved ? resolved.resolvedValue : null;
|
|
42
42
|
};
|
|
43
43
|
/**
|
|
@@ -57,8 +57,8 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
57
57
|
* @param {?} p
|
|
58
58
|
* @return {?}
|
|
59
59
|
*/
|
|
60
|
-
function (p) { return p.
|
|
61
|
-
|
|
60
|
+
function (p) { return p.parameterDef !== parameter; })).concat({
|
|
61
|
+
parameterDef: parameter,
|
|
62
62
|
resolvedValue: value
|
|
63
63
|
}));
|
|
64
64
|
};
|
|
@@ -73,7 +73,7 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
73
73
|
function () {
|
|
74
74
|
/** @type {?} */
|
|
75
75
|
var routeIdParam = this.getRouteIdParam();
|
|
76
|
-
return routeIdParam ? routeIdParam.
|
|
76
|
+
return routeIdParam ? routeIdParam.parameterDef.type.format(routeIdParam.resolvedValue) : null;
|
|
77
77
|
};
|
|
78
78
|
/**
|
|
79
79
|
* @private
|
|
@@ -88,7 +88,7 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
88
88
|
* @param {?} p
|
|
89
89
|
* @return {?}
|
|
90
90
|
*/
|
|
91
|
-
function (p) { return p.
|
|
91
|
+
function (p) { return p.parameterDef.isRouteId; }));
|
|
92
92
|
};
|
|
93
93
|
/**
|
|
94
94
|
* @protected
|
|
@@ -106,12 +106,12 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
106
106
|
* @param {?} p
|
|
107
107
|
* @return {?}
|
|
108
108
|
*/
|
|
109
|
-
function (p) { return !p.
|
|
109
|
+
function (p) { return !p.parameterDef.isRouteId; })).forEach((/**
|
|
110
110
|
* @param {?} p
|
|
111
111
|
* @return {?}
|
|
112
112
|
*/
|
|
113
113
|
function (p) {
|
|
114
|
-
params[p.
|
|
114
|
+
params[p.parameterDef.name] = p.parameterDef.type.format(p.resolvedValue);
|
|
115
115
|
}));
|
|
116
116
|
return params;
|
|
117
117
|
};
|
|
@@ -144,7 +144,7 @@ var ResolvedParameters = /** @class */ (function () {
|
|
|
144
144
|
/** @type {?} */
|
|
145
145
|
var path = routeId ? [relativePath, routeId, this.getFormattedParameters()] : [relativePath, this.getFormattedParameters()];
|
|
146
146
|
router.navigate(path, {
|
|
147
|
-
relativeTo: activatedRoute
|
|
147
|
+
relativeTo: activatedRoute
|
|
148
148
|
});
|
|
149
149
|
};
|
|
150
150
|
tslib_1.__decorate([
|
|
@@ -201,11 +201,23 @@ var RouteParameterBindings = /** @class */ (function (_super) {
|
|
|
201
201
|
/** @type {?} */
|
|
202
202
|
var result = [];
|
|
203
203
|
routeParameterDefs.forEach((/**
|
|
204
|
-
* @param {?}
|
|
204
|
+
* @param {?} parameterDef
|
|
205
205
|
* @return {?}
|
|
206
206
|
*/
|
|
207
|
-
function (
|
|
208
|
-
|
|
207
|
+
function (parameterDef) {
|
|
208
|
+
/** @type {?} */
|
|
209
|
+
var resolvedValue;
|
|
210
|
+
if (parameterDef.isArray) {
|
|
211
|
+
resolvedValue = params.getAll(parameterDef.name).map((/**
|
|
212
|
+
* @param {?} v
|
|
213
|
+
* @return {?}
|
|
214
|
+
*/
|
|
215
|
+
function (v) { return parameterDef.type.parse(v); }));
|
|
216
|
+
}
|
|
217
|
+
else {
|
|
218
|
+
resolvedValue = parameterDef.type.parse(params.get(parameterDef.name));
|
|
219
|
+
}
|
|
220
|
+
result.push({ parameterDef: parameterDef, resolvedValue: resolvedValue });
|
|
209
221
|
}));
|
|
210
222
|
return new ResolvedParameters(result);
|
|
211
223
|
}));
|
|
@@ -324,4 +336,4 @@ if (false) {
|
|
|
324
336
|
(function (RouteParameterBindings) {
|
|
325
337
|
RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');
|
|
326
338
|
})(RouteParameterBindings || (RouteParameterBindings = {}));
|
|
327
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-parameter-bindings.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/route-parameter-bindings.ts"],"names":[],"mappings":"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","sourcesContent":["import { ActivatedRoute, Router } from '@angular/router';\nimport {\n  Binding,\n  Dsl,\n  GarbageCollector,\n  MutableHasValue,\n  MutableValueModel,\n  Trace,\n  TransactionObserver\n} from '@coolon/pectin';\nimport { Klass } from '@coolon/typescript-utilities';\nimport { AbstractPlaceComponent } from '../abstract-place-component';\nimport { ParameterDefinition } from './parameter-definition.class';\n\ninterface ResolvedParameter<T> {\n  parameter: ParameterDefinition<T>;\n  resolvedValue: T;\n}\n\nclass ResolvedParameters {\n  constructor(readonly parameters: ResolvedParameter<any>[]) {\n  }\n\n  get<T>(parameter: ParameterDefinition<T>): T {\n    const resolved = this.parameters.find(p => p.parameter === parameter);\n    return resolved ? resolved.resolvedValue : null;\n  }\n\n  replace<T>(parameter: ParameterDefinition<T>, value: T): ResolvedParameters {\n    return new ResolvedParameters(this.parameters.filter(p => p.parameter !== parameter).concat({\n      parameter,\n      resolvedValue: value\n    }));\n  }\n\n  @Trace()\n  protected getFormattedRouteId() {\n    const routeIdParam = this.getRouteIdParam();\n    return routeIdParam ? routeIdParam.parameter.type.format(routeIdParam.resolvedValue) : null;\n  }\n\n  private getRouteIdParam() {\n    return this.parameters.find(p => p.parameter.isRouteId);\n  }\n\n  @Trace()\n  protected getFormattedParameters() {\n    const params = {};\n    const routeIdParam = this.parameters.filter(p => !p.parameter.isRouteId).forEach(p => {\n      params[p.parameter.name] = p.parameter.type.format(p.resolvedValue);\n    });\n    return params;\n  }\n\n  hasRouteId() {\n    return !!this.getRouteIdParam();\n  }\n\n  @Trace()\n  redirect(previous: ResolvedParameters, router: Router, activatedRoute: ActivatedRoute) {\n    const routeId = this.getFormattedRouteId();\n    const relativePath = !!previous.hasRouteId() ? '..' : '.';\n    const path = routeId ? [relativePath, routeId, this.getFormattedParameters()] : [relativePath, this.getFormattedParameters()];\n    router.navigate(path, {\n      relativeTo: activatedRoute,\n    });\n  }\n}\n\nexport class RouteParameterBindings extends GarbageCollector {\n\n  public readonly _incomingRouteChange = new MutableValueModel<boolean>(false);\n\n  private txo: TransactionObserver;\n\n  private readonly resolvedParameters = new MutableValueModel<ResolvedParameters>();\n\n  constructor(private readonly component: any, private readonly router: Router, private readonly activatedRoute: ActivatedRoute) {\n    super();\n    const { chain, valueOf, before, when, after, observe } = Dsl.disposeWith(this);\n    this.txo = new TransactionObserver();//.onEvent(e => console.log(e.toString()));\n\n    const routeParameterDefs = Klass.get(component).getMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY);\n    routeParameterDefs.forEach(parameter => this.installBinding(parameter));\n\n    const incomingResolvedRouteParameters = observe.valuesFrom(activatedRoute.paramMap)\n      .last()\n      .map(params => {\n        const result: ResolvedParameter<any>[] = [];\n        routeParameterDefs.forEach(parameter => {\n          result.push({ parameter, resolvedValue: parameter.type.parse(params.get(parameter.name)) });\n        });\n        return new ResolvedParameters(result);\n      });\n\n    incomingResolvedRouteParameters.subscribe(resolvedParameters => {\n      this._incomingRouteChange.value = true;\n      this.resolvedParameters.value = resolvedParameters;\n      this._incomingRouteChange.value = false;\n    });\n\n    when.valueOf(this.resolvedParameters).changes((params, previous) => {\n      params.redirect(previous, router, activatedRoute);\n    }, { unless: this.incomingRouteChange });\n\n    this.txo.observe('incomingResolvedRouteParameters', incomingResolvedRouteParameters);\n    this.txo.observe('this.routeIsChanging', this.incomingRouteChange);\n  }\n\n  get incomingRouteChange() {\n    return this._incomingRouteChange.readonly;\n  }\n\n  protected installBinding<T>(parameter: ParameterDefinition<T>) {\n    const model = this.getModelFor(parameter);\n    this.txo.observe(parameter.propertyName, model);\n    this.registerDisposable(new Binding(this.resolvedParameters, model, {\n      toRight(parameters: ResolvedParameters): T {\n        return parameters.get(parameter);\n      },\n      toLeft(value: T, currentParameters?: ResolvedParameters): ResolvedParameters {\n        return currentParameters.replace(parameter, value);\n      }\n    }));\n  }\n\n\n  private getModelFor<T>(parameter: ParameterDefinition<T>): MutableHasValue<T> {\n    return this.component[parameter.propertyName];\n  }\n}\n\nexport namespace RouteParameterBindings {\n  export const ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');\n}\n"]}
|
|
339
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-parameter-bindings.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/route-parameter-bindings.ts"],"names":[],"mappings":"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","sourcesContent":["import { ActivatedRoute, Router } from '@angular/router';\nimport {\n  Binding,\n  Dsl,\n  GarbageCollector,\n  MutableHasValue,\n  MutableValueModel,\n  Trace,\n  TransactionObserver\n} from '@coolon/pectin';\nimport { Klass } from '@coolon/typescript-utilities';\nimport { ParameterDefinition } from './parameter-definition.class';\n\ninterface ResolvedParameter<T> {\n  parameterDef: ParameterDefinition<T>;\n  resolvedValue: T;\n}\n\nclass ResolvedParameters {\n  constructor(readonly parameters: ResolvedParameter<any>[]) {\n  }\n\n  get<T>(parameter: ParameterDefinition<T>): T {\n    const resolved = this.parameters.find(p => p.parameterDef === parameter);\n    return resolved ? resolved.resolvedValue : null;\n  }\n\n  replace<T>(parameter: ParameterDefinition<T>, value: T): ResolvedParameters {\n    return new ResolvedParameters(this.parameters.filter(p => p.parameterDef !== parameter).concat({\n      parameterDef: parameter,\n      resolvedValue: value\n    }));\n  }\n\n  @Trace()\n  protected getFormattedRouteId() {\n    const routeIdParam = this.getRouteIdParam();\n    return routeIdParam ? routeIdParam.parameterDef.type.format(routeIdParam.resolvedValue) : null;\n  }\n\n  private getRouteIdParam() {\n    return this.parameters.find(p => p.parameterDef.isRouteId);\n  }\n\n  @Trace()\n  protected getFormattedParameters() {\n    const params = {};\n    const routeIdParam = this.parameters.filter(p => !p.parameterDef.isRouteId).forEach(p => {\n      params[p.parameterDef.name] = p.parameterDef.type.format(p.resolvedValue);\n    });\n    return params;\n  }\n\n  hasRouteId() {\n    return !!this.getRouteIdParam();\n  }\n\n  @Trace()\n  redirect(previous: ResolvedParameters, router: Router, activatedRoute: ActivatedRoute) {\n    const routeId = this.getFormattedRouteId();\n    const relativePath = !!previous.hasRouteId() ? '..' : '.';\n    const path = routeId ? [relativePath, routeId, this.getFormattedParameters()] : [relativePath, this.getFormattedParameters()];\n    router.navigate(path, {\n      relativeTo: activatedRoute\n    });\n  }\n}\n\nexport class RouteParameterBindings extends GarbageCollector {\n\n  public readonly _incomingRouteChange = new MutableValueModel<boolean>(false);\n\n  private txo: TransactionObserver;\n\n  private readonly resolvedParameters = new MutableValueModel<ResolvedParameters>();\n\n  constructor(private readonly component: any, private readonly router: Router, private readonly activatedRoute: ActivatedRoute) {\n    super();\n    const { chain, valueOf, before, when, after, observe } = Dsl.disposeWith(this);\n    this.txo = new TransactionObserver();//.onEvent(e => console.log(e.toString()));\n\n    const routeParameterDefs: ParameterDefinition<any>[] = Klass.get(component).getMetadataList(RouteParameterBindings.ROUTE_PARAMETER_LIST_KEY);\n    routeParameterDefs.forEach(parameter => this.installBinding(parameter));\n\n    const incomingResolvedRouteParameters = observe.valuesFrom(activatedRoute.paramMap)\n      .last()\n      .map(params => {\n        const result: ResolvedParameter<any>[] = [];\n        routeParameterDefs.forEach(parameterDef => {\n          let resolvedValue;\n          if (parameterDef.isArray) {\n            resolvedValue = params.getAll(parameterDef.name).map(v => parameterDef.type.parse(v));\n          } else {\n            resolvedValue = parameterDef.type.parse(params.get(parameterDef.name));\n          }\n          result.push({ parameterDef: parameterDef, resolvedValue: resolvedValue });\n\n        });\n        return new ResolvedParameters(result);\n      });\n\n    incomingResolvedRouteParameters.subscribe(resolvedParameters => {\n      this._incomingRouteChange.value = true;\n      this.resolvedParameters.value = resolvedParameters;\n      this._incomingRouteChange.value = false;\n    });\n\n    when.valueOf(this.resolvedParameters).changes((params, previous) => {\n      params.redirect(previous, router, activatedRoute);\n    }, { unless: this.incomingRouteChange });\n\n    this.txo.observe('incomingResolvedRouteParameters', incomingResolvedRouteParameters);\n    this.txo.observe('this.routeIsChanging', this.incomingRouteChange);\n  }\n\n  get incomingRouteChange() {\n    return this._incomingRouteChange.readonly;\n  }\n\n  protected installBinding<T>(parameter: ParameterDefinition<T>) {\n    const model = this.getModelFor(parameter);\n    this.txo.observe(parameter.propertyName, model);\n    this.registerDisposable(new Binding(this.resolvedParameters, model, {\n      toRight(parameters: ResolvedParameters): T {\n        return parameters.get(parameter);\n      },\n      toLeft(value: T, currentParameters?: ResolvedParameters): ResolvedParameters {\n        return currentParameters.replace(parameter, value);\n      }\n    }));\n  }\n\n\n  private getModelFor<T>(parameter: ParameterDefinition<T>): MutableHasValue<T> {\n    return this.component[parameter.propertyName];\n  }\n}\n\nexport namespace RouteParameterBindings {\n  export const ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');\n}\n"]}
|