@coolon/angular-ui-powerups 0.0.36 → 0.0.38

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.
Files changed (116) hide show
  1. package/bundles/coolon-angular-ui-powerups.umd.js +1428 -809
  2. package/bundles/coolon-angular-ui-powerups.umd.js.map +1 -1
  3. package/bundles/coolon-angular-ui-powerups.umd.min.js +1 -1
  4. package/bundles/coolon-angular-ui-powerups.umd.min.js.map +1 -1
  5. package/coolon-angular-ui-powerups.d.ts +16 -14
  6. package/coolon-angular-ui-powerups.metadata.json +1 -1
  7. package/esm2015/coolon-angular-ui-powerups.js +16 -14
  8. package/esm2015/index.js +2 -2
  9. package/esm2015/lib/angular-ui-powerups.module.js +6 -8
  10. package/esm2015/lib/interaction/components/activity-container/activity-container.component.js +2 -3
  11. package/esm2015/lib/interaction/components/confirmation-dialog/confirmation-dialog.component.js +1 -2
  12. package/esm2015/lib/place/components/abstract-place-navigation.component.js +75 -0
  13. package/esm2015/lib/place/components/list-place-nav/list-place-nav.component.js +47 -0
  14. package/esm2015/lib/place/components/place-outlet/route-animations.js +12 -5
  15. package/esm2015/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.js +5 -39
  16. package/esm2015/lib/place/guards/leave-place.guard.js +11 -2
  17. package/esm2015/lib/place/guards/place-route.guard.js +29 -37
  18. package/esm2015/lib/place/index.js +11 -9
  19. package/esm2015/lib/place/nav-item.js +23 -0
  20. package/esm2015/lib/place/place-component-like.js +17 -0
  21. package/esm2015/lib/place/place-component.js +118 -14
  22. package/esm2015/lib/place/place-updates-service.js +16 -0
  23. package/esm2015/lib/place/place.decorator.js +1 -1
  24. package/esm2015/lib/place/place.module.js +6 -3
  25. package/esm2015/lib/place/place.service.js +30 -6
  26. package/esm2015/lib/place/route/default-parameter-sanitiser.js +78 -0
  27. package/esm2015/lib/place/route/parameter-decorators.js +15 -7
  28. package/esm2015/lib/place/route/parameter-definition.class.js +2 -2
  29. package/esm2015/lib/place/route/parameter-sanitiser.js +17 -2
  30. package/esm2015/lib/place/route/parameter-snapshot.js +382 -0
  31. package/esm2015/lib/place/route/parameter-type.js +3 -2
  32. package/esm2015/lib/place/route/route-parameter-sanitiser.js +73 -38
  33. package/esm2015/lib/place/visit.js +22 -0
  34. package/esm2015/public_api.js +2 -2
  35. package/esm5/coolon-angular-ui-powerups.js +16 -14
  36. package/esm5/index.js +2 -2
  37. package/esm5/lib/angular-ui-powerups.module.js +6 -8
  38. package/esm5/lib/interaction/components/activity-container/activity-container.component.js +2 -3
  39. package/esm5/lib/interaction/components/confirmation-dialog/confirmation-dialog.component.js +1 -2
  40. package/esm5/lib/place/components/abstract-place-navigation.component.js +86 -0
  41. package/esm5/lib/place/components/list-place-nav/list-place-nav.component.js +61 -0
  42. package/esm5/lib/place/components/place-outlet/route-animations.js +12 -5
  43. package/esm5/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.js +6 -43
  44. package/esm5/lib/place/guards/leave-place.guard.js +11 -2
  45. package/esm5/lib/place/guards/place-route.guard.js +28 -37
  46. package/esm5/lib/place/index.js +11 -9
  47. package/esm5/lib/place/nav-item.js +23 -0
  48. package/esm5/lib/place/place-component-like.js +17 -0
  49. package/esm5/lib/place/place-component.js +132 -15
  50. package/esm5/lib/place/place-updates-service.js +16 -0
  51. package/esm5/lib/place/place.decorator.js +1 -1
  52. package/esm5/lib/place/place.module.js +6 -3
  53. package/esm5/lib/place/place.service.js +35 -6
  54. package/esm5/lib/place/route/default-parameter-sanitiser.js +85 -0
  55. package/esm5/lib/place/route/parameter-decorators.js +15 -7
  56. package/esm5/lib/place/route/parameter-definition.class.js +2 -2
  57. package/esm5/lib/place/route/parameter-sanitiser.js +17 -2
  58. package/esm5/lib/place/route/parameter-snapshot.js +474 -0
  59. package/esm5/lib/place/route/parameter-type.js +3 -2
  60. package/esm5/lib/place/route/route-parameter-sanitiser.js +100 -45
  61. package/esm5/lib/place/visit.js +22 -0
  62. package/esm5/public_api.js +2 -2
  63. package/fesm2015/coolon-angular-ui-powerups.js +1146 -651
  64. package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
  65. package/fesm5/coolon-angular-ui-powerups.js +1391 -779
  66. package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
  67. package/lib/place/components/abstract-place-navigation.component.d.ts +13 -0
  68. package/lib/place/components/list-place-nav/list-place-nav.component.d.ts +8 -0
  69. package/lib/place/components/place-outlet/route-animations.d.ts +1 -0
  70. package/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.d.ts +2 -9
  71. package/lib/place/guards/place-route.guard.d.ts +4 -4
  72. package/lib/place/index.d.ts +8 -6
  73. package/lib/place/nav-item.d.ts +5 -0
  74. package/lib/place/{i-place-component.d.ts → place-component-like.d.ts} +1 -1
  75. package/lib/place/place-component.d.ts +19 -8
  76. package/lib/place/place-updates-service.d.ts +10 -0
  77. package/lib/place/place.service.d.ts +11 -8
  78. package/lib/place/route/default-parameter-sanitiser.d.ts +13 -0
  79. package/lib/place/route/parameter-decorators.d.ts +6 -2
  80. package/lib/place/route/parameter-definition.class.d.ts +3 -3
  81. package/lib/place/route/parameter-sanitiser.d.ts +8 -1
  82. package/lib/place/route/parameter-snapshot.d.ts +46 -0
  83. package/lib/place/route/route-parameter-sanitiser.d.ts +13 -9
  84. package/lib/place/visit.d.ts +6 -0
  85. package/package.json +1 -1
  86. package/schematics/place-routes/index.js +8 -95
  87. package/schematics/place-routes/index.js.map +1 -1
  88. package/schematics/place-routes/place-builder.d.ts +19 -0
  89. package/schematics/place-routes/place-builder.js +109 -0
  90. package/schematics/place-routes/place-builder.js.map +1 -0
  91. package/schematics/place-routes/{scanner.d.ts → place-class-scanner.d.ts} +10 -6
  92. package/schematics/place-routes/{scanner.js → place-class-scanner.js} +43 -18
  93. package/schematics/place-routes/place-class-scanner.js.map +1 -0
  94. package/schematics/place-routes/place-def.d.ts +19 -4
  95. package/schematics/place-routes/place-def.js +54 -4
  96. package/schematics/place-routes/place-def.js.map +1 -1
  97. package/schematics/place-routes/templates/{place-routes.ts.template → places.ts.template} +14 -11
  98. package/esm2015/lib/place/i-place-component.js +0 -17
  99. package/esm2015/lib/place/i-place-service.js +0 -16
  100. package/esm2015/lib/place/route/resolved-parameter.js +0 -16
  101. package/esm2015/lib/place/route/resolved-route-parameter-snapshot.js +0 -106
  102. package/esm2015/lib/place/route/route-parameter-bindings.js +0 -150
  103. package/esm2015/lib/place/route/visit-snapshot.js +0 -7
  104. package/esm5/lib/place/i-place-component.js +0 -17
  105. package/esm5/lib/place/i-place-service.js +0 -16
  106. package/esm5/lib/place/route/resolved-parameter.js +0 -16
  107. package/esm5/lib/place/route/resolved-route-parameter-snapshot.js +0 -129
  108. package/esm5/lib/place/route/route-parameter-bindings.js +0 -167
  109. package/esm5/lib/place/route/visit-snapshot.js +0 -11
  110. package/lib/place/i-place-service.d.ts +0 -10
  111. package/lib/place/route/resolved-parameter.d.ts +0 -5
  112. package/lib/place/route/resolved-route-parameter-snapshot.d.ts +0 -12
  113. package/lib/place/route/route-parameter-bindings.d.ts +0 -17
  114. package/lib/place/route/visit-snapshot.d.ts +0 -2
  115. package/schematics/place-routes/scanner.js.map +0 -1
  116. package/schematics/place-routes/templates/place-router.ts.template +0 -33
@@ -1,16 +1,20 @@
1
1
  import { SchematicContext } from '@angular-devkit/schematics';
2
- import { ClassDeclaration, Decorator, ObjectLiteralExpression, PropertyDeclaration } from 'ts-morph';
2
+ import { ClassDeclaration, Decorator, ObjectLiteralExpression, PropertyDeclaration, SourceFile } from 'ts-morph';
3
3
  import { PlaceDef } from './place-def';
4
- export declare class Scanner {
4
+ export declare class PlaceClassScanner {
5
+ private readonly sourceFile;
5
6
  private readonly classDecl;
6
7
  readonly context: SchematicContext;
7
8
  private placeAnnotation;
8
- constructor(classDecl: ClassDeclaration, context: SchematicContext);
9
+ constructor(sourceFile: SourceFile, classDecl: ClassDeclaration, context: SchematicContext);
9
10
  isPlace(): boolean;
10
- onMatch(callback: (scan: Scanner) => void): void;
11
+ onMatch(callback: (scan: PlaceClassScanner) => void): void;
11
12
  createDefinition(moduleImportPath: string): PlaceDef;
12
13
  protected getPlaceOptions(): PlaceDef.Options;
13
- protected getRouteIdParameter(): Scanner.RouteParameterInfo;
14
+ protected getChildren(): PlaceDef.ChildRef[];
15
+ getChildRefFor(componentClassName: string): PlaceDef.ChildRef;
16
+ private extractChildComponentClassNames;
17
+ protected getRouteIdParameter(): PlaceClassScanner.RouteParameterInfo;
14
18
  protected getRouteParameters(): PlaceDef.Parameter[];
15
19
  private getValueModelRouteProperties;
16
20
  private getListModelRouteProperties;
@@ -19,7 +23,7 @@ export declare class Scanner {
19
23
  property: PropertyDeclaration;
20
24
  }[];
21
25
  }
22
- export declare namespace Scanner {
26
+ export declare namespace PlaceClassScanner {
23
27
  function getObjectLiteralArgument(annotation: Decorator, position: number): ObjectLiteralExpression;
24
28
  function getOptionsArg<T extends {}>(annotation: Decorator, defaults: T, options?: {
25
29
  position: number;
@@ -13,8 +13,9 @@ function isDecoratorNode(node, name) {
13
13
  return node.getKind() === ts_morph_1.SyntaxKind.Decorator && node.getText().startsWith(`${name}(`); // NOTE: I'm only supporting the @Decorator(...) style of usage (i.e. decorator factories).
14
14
  }
15
15
  const ROUTE_PROPERTY_REGEX = /.*(ListModel|ValueModel)<(.*)>/;
16
- class Scanner {
17
- constructor(classDecl, context) {
16
+ class PlaceClassScanner {
17
+ constructor(sourceFile, classDecl, context) {
18
+ this.sourceFile = sourceFile;
18
19
  this.classDecl = classDecl;
19
20
  this.context = context;
20
21
  classDecl.forEachChild((node) => {
@@ -34,15 +35,14 @@ class Scanner {
34
35
  }
35
36
  }
36
37
  createDefinition(moduleImportPath) {
37
- this.getRouteIdParameter();
38
- return new place_def_1.PlaceDef(moduleImportPath, this.classDecl.getName(), this.getPlaceOptions(), this.getRouteIdParameter(), this.getRouteParameters());
38
+ return new place_def_1.PlaceDef(this.sourceFile.getFilePath(), moduleImportPath, this.classDecl.getName(), this.getPlaceOptions(), this.getRouteIdParameter(), this.getRouteParameters(), this.getChildren());
39
39
  }
40
40
  getPlaceOptions() {
41
41
  // const args = this.placeAnnotation.getArguments();
42
42
  // if (args.length !== 1) {
43
43
  // console.error('@Place() accepts a single Options argument. got', args);
44
44
  // }
45
- return Scanner.getOptionsArg(this.placeAnnotation, {
45
+ return PlaceClassScanner.getOptionsArg(this.placeAnnotation, {
46
46
  title: '',
47
47
  path: '',
48
48
  order: -1,
@@ -53,15 +53,40 @@ class Scanner {
53
53
  required: true
54
54
  });
55
55
  }
56
+ getChildren() {
57
+ const literal = PlaceClassScanner.getObjectLiteralArgument(this.placeAnnotation, 0);
58
+ const children = literal.getProperty('children');
59
+ if (children) {
60
+ const initialiser = children.getStructure().initializer;
61
+ const componentClassNames = this.extractChildComponentClassNames(initialiser);
62
+ return componentClassNames.map(componentClassName => this.getChildRefFor(componentClassName));
63
+ }
64
+ else {
65
+ return [];
66
+ }
67
+ }
68
+ getChildRefFor(componentClassName) {
69
+ const importDecl = this.sourceFile.getImportDeclarations().find(d => {
70
+ return d.getNamedImports().map(i => i.getText()).includes(componentClassName);
71
+ });
72
+ return new place_def_1.PlaceDef.ChildRef(importDecl.getModuleSpecifierSourceFile().getFilePath(), componentClassName);
73
+ }
74
+ extractChildComponentClassNames(initialiser) {
75
+ return initialiser.replace('[', '')
76
+ .replace(']', '')
77
+ .trim()
78
+ .split(',')
79
+ .map(s => s.trim());
80
+ }
56
81
  getRouteIdParameter() {
57
82
  const routeProperties = this.getDecoratedProperties('@RouteId');
58
83
  if (routeProperties.length === 1) {
59
84
  const route = routeProperties[0];
60
- const routeOptions = Scanner.getOptionsArg(route.decorator, { as: '' }, {
85
+ const routeOptions = PlaceClassScanner.getOptionsArg(route.decorator, { as: '' }, {
61
86
  position: 1,
62
87
  required: false
63
88
  });
64
- return new Scanner.RouteParameterInfo(routeOptions.as, route.property);
89
+ return new PlaceClassScanner.RouteParameterInfo(routeOptions.as, route.property);
65
90
  }
66
91
  else if (routeProperties.length > 1) {
67
92
  this.context.logger.error(`There an only be one @RouteId(), got ${routeProperties.length}`);
@@ -74,21 +99,21 @@ class Scanner {
74
99
  getValueModelRouteProperties() {
75
100
  return this.getDecoratedProperties('@RouteParameter')
76
101
  .map(p => {
77
- const routeOptions = Scanner.getOptionsArg(p.decorator, { as: p.property.getName() }, {
102
+ const routeOptions = PlaceClassScanner.getOptionsArg(p.decorator, { as: p.property.getName() }, {
78
103
  position: 1,
79
104
  required: false
80
105
  });
81
- return new Scanner.RouteParameterInfo(routeOptions.as, p.property);
106
+ return new PlaceClassScanner.RouteParameterInfo(routeOptions.as, p.property);
82
107
  });
83
108
  }
84
109
  getListModelRouteProperties() {
85
110
  return this.getDecoratedProperties('@RouteParameterList')
86
111
  .map(p => {
87
- const routeOptions = Scanner.getOptionsArg(p.decorator, { as: p.property.getName() }, {
112
+ const routeOptions = PlaceClassScanner.getOptionsArg(p.decorator, { as: p.property.getName() }, {
88
113
  position: 1,
89
114
  required: false
90
115
  });
91
- return new Scanner.RouteParameterInfo(routeOptions.as, p.property);
116
+ return new PlaceClassScanner.RouteParameterInfo(routeOptions.as, p.property);
92
117
  });
93
118
  }
94
119
  getDecoratedProperties(annotation) {
@@ -108,8 +133,8 @@ class Scanner {
108
133
  }).filter(r => !!r);
109
134
  }
110
135
  }
111
- exports.Scanner = Scanner;
112
- (function (Scanner) {
136
+ exports.PlaceClassScanner = PlaceClassScanner;
137
+ (function (PlaceClassScanner) {
113
138
  function getObjectLiteralArgument(annotation, position) {
114
139
  const args = annotation.getArguments();
115
140
  if (args.length > position && args[position] instanceof ts_morph_1.ObjectLiteralExpression) {
@@ -117,7 +142,7 @@ exports.Scanner = Scanner;
117
142
  }
118
143
  return null;
119
144
  }
120
- Scanner.getObjectLiteralArgument = getObjectLiteralArgument;
145
+ PlaceClassScanner.getObjectLiteralArgument = getObjectLiteralArgument;
121
146
  function getOptionsArg(annotation, defaults, options = {
122
147
  position: 0,
123
148
  required: true
@@ -136,7 +161,7 @@ exports.Scanner = Scanner;
136
161
  }, Object.assign({}, defaults));
137
162
  }
138
163
  }
139
- Scanner.getOptionsArg = getOptionsArg;
164
+ PlaceClassScanner.getOptionsArg = getOptionsArg;
140
165
  class RouteParameterInfo {
141
166
  constructor(as, property) {
142
167
  this.as = as;
@@ -165,6 +190,6 @@ exports.Scanner = Scanner;
165
190
  __decorate([
166
191
  src_1.Memoize()
167
192
  ], RouteParameterInfo.prototype, "modelName", null);
168
- Scanner.RouteParameterInfo = RouteParameterInfo;
169
- })(Scanner = exports.Scanner || (exports.Scanner = {}));
170
- //# sourceMappingURL=scanner.js.map
193
+ PlaceClassScanner.RouteParameterInfo = RouteParameterInfo;
194
+ })(PlaceClassScanner = exports.PlaceClassScanner || (exports.PlaceClassScanner = {}));
195
+ //# sourceMappingURL=place-class-scanner.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"place-class-scanner.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-class-scanner.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,16 @@
1
1
  import { SchematicContext } from '@angular-devkit/schematics';
2
- import { ClassDeclaration } from 'ts-morph';
3
- import { Scanner } from './scanner';
2
+ import { ClassDeclaration, SourceFile } from 'ts-morph';
3
+ import { PlaceClassScanner } from './place-class-scanner';
4
4
  export declare class PlaceDef {
5
+ readonly sourceFilePath: string;
5
6
  readonly importPath: string;
6
7
  readonly componentClass: string;
7
8
  readonly properties: PlaceDef.Options;
8
9
  readonly routeDef: PlaceDef.Parameter;
9
10
  readonly routeParameters: PlaceDef.Parameter[];
10
- constructor(importPath: string, componentClass: string, properties: PlaceDef.Options, routeDef: PlaceDef.Parameter, routeParameters: PlaceDef.Parameter[]);
11
+ readonly childRefs: PlaceDef.ChildRef[];
12
+ private parent;
13
+ constructor(sourceFilePath: string, importPath: string, componentClass: string, properties: PlaceDef.Options, routeDef: PlaceDef.Parameter, routeParameters: PlaceDef.Parameter[], childRefs: PlaceDef.ChildRef[]);
11
14
  readonly path: string;
12
15
  readonly routeIdentifier: PlaceDef.Parameter;
13
16
  readonly fullPath: string;
@@ -15,10 +18,14 @@ export declare class PlaceDef {
15
18
  getPlaceRouterGoRouteParams(): string;
16
19
  readonly placeName: string;
17
20
  readonly order: number;
21
+ setParent(placeDef: PlaceDef): void;
22
+ isChild(): boolean;
18
23
  readonly activateGuardNames: string[];
19
24
  private requiresRouteGuard;
20
25
  readonly routeModelName: string;
21
26
  readonly authenticate: boolean;
27
+ readonly children: PlaceDef[];
28
+ getRouteTemplate(): string;
22
29
  }
23
30
  export declare namespace PlaceDef {
24
31
  interface Options {
@@ -32,6 +39,14 @@ export declare namespace PlaceDef {
32
39
  modelName: string;
33
40
  typeName: string;
34
41
  }
35
- function scan(classDecl: ClassDeclaration, context: SchematicContext): Scanner;
42
+ function scan(sourceFile: SourceFile, classDecl: ClassDeclaration, context: SchematicContext): PlaceClassScanner;
36
43
  function stripEnclosingQuotes(value: string): string;
44
+ class ChildRef {
45
+ readonly filePath: string;
46
+ readonly componentClass: string;
47
+ private _placeDef;
48
+ constructor(filePath: string, componentClass: string);
49
+ readonly placeDef: PlaceDef;
50
+ resolve(placeDefs: PlaceDef[]): PlaceDef;
51
+ }
37
52
  }
@@ -7,14 +7,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
7
7
  };
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  const src_1 = require("@typescript-plus/fast-memoize-decorator/dist/src");
10
- const scanner_1 = require("./scanner");
10
+ const place_class_scanner_1 = require("./place-class-scanner");
11
11
  class PlaceDef {
12
- constructor(importPath, componentClass, properties, routeDef, routeParameters) {
12
+ constructor(sourceFilePath, importPath, componentClass, properties, routeDef, routeParameters, childRefs) {
13
+ this.sourceFilePath = sourceFilePath;
13
14
  this.importPath = importPath;
14
15
  this.componentClass = componentClass;
15
16
  this.properties = properties;
16
17
  this.routeDef = routeDef;
17
18
  this.routeParameters = routeParameters;
19
+ this.childRefs = childRefs;
18
20
  }
19
21
  get path() {
20
22
  return PlaceDef.stripEnclosingQuotes(this.properties.path);
@@ -60,6 +62,12 @@ class PlaceDef {
60
62
  get order() {
61
63
  return this.properties.order;
62
64
  }
65
+ setParent(placeDef) {
66
+ this.parent = placeDef;
67
+ }
68
+ isChild() {
69
+ return !!this.parent;
70
+ }
63
71
  get activateGuardNames() {
64
72
  const activateGuards = [];
65
73
  if (this.authenticate) {
@@ -79,6 +87,34 @@ class PlaceDef {
79
87
  get authenticate() {
80
88
  return this.properties.authenticate === 'true';
81
89
  }
90
+ get children() {
91
+ return this.childRefs.map(cr => cr.placeDef);
92
+ }
93
+ getRouteTemplate() {
94
+ return this.routeIdentifier ? `{
95
+ path: "${this.path}",
96
+ redirectTo: "${this.path}/"
97
+ },
98
+ {
99
+ path: "${this.fullPath}",
100
+ component: ${this.componentClass},
101
+ canActivate: [${this.activateGuardNames.join(', ')}],
102
+ canDeactivate: [LeavePlaceGuard],
103
+ children:[
104
+ ${this.children.map(c => c.getRouteTemplate()).join(',\n')}
105
+ ],
106
+ data: { placeOrder: ${this.order} }
107
+ }` : `{
108
+ path: "${this.fullPath}",
109
+ component: ${this.componentClass},
110
+ canActivate: [${this.activateGuardNames.join(', ')}],
111
+ canDeactivate: [LeavePlaceGuard],
112
+ children:[
113
+ ${this.children.map(c => c.getRouteTemplate()).join(',\n')}
114
+ ],
115
+ data: { placeOrder: ${this.order} }
116
+ }`;
117
+ }
82
118
  }
83
119
  __decorate([
84
120
  src_1.Memoize()
@@ -94,8 +130,8 @@ __decorate([
94
130
  ], PlaceDef.prototype, "routeModelName", null);
95
131
  exports.PlaceDef = PlaceDef;
96
132
  (function (PlaceDef) {
97
- function scan(classDecl, context) {
98
- return new scanner_1.Scanner(classDecl, context);
133
+ function scan(sourceFile, classDecl, context) {
134
+ return new place_class_scanner_1.PlaceClassScanner(sourceFile, classDecl, context);
99
135
  }
100
136
  PlaceDef.scan = scan;
101
137
  function stripEnclosingQuotes(value) {
@@ -104,5 +140,19 @@ exports.PlaceDef = PlaceDef;
104
140
  return cooked;
105
141
  }
106
142
  PlaceDef.stripEnclosingQuotes = stripEnclosingQuotes;
143
+ class ChildRef {
144
+ constructor(filePath, componentClass) {
145
+ this.filePath = filePath;
146
+ this.componentClass = componentClass;
147
+ }
148
+ get placeDef() {
149
+ return this._placeDef;
150
+ }
151
+ resolve(placeDefs) {
152
+ this._placeDef = placeDefs.find(d => d.sourceFilePath === this.filePath && d.componentClass === this.componentClass);
153
+ return this._placeDef;
154
+ }
155
+ }
156
+ PlaceDef.ChildRef = ChildRef;
107
157
  })(PlaceDef = exports.PlaceDef || (exports.PlaceDef = {}));
108
158
  //# sourceMappingURL=place-def.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":"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"}
@@ -17,16 +17,19 @@ import { <%= config.authGuard.className %> } from '<%= config.authGuard.importPa
17
17
  <% placeDefs.forEach(def => { %>import {<%= def.componentClass %>} from "<%= def.importPath %>";
18
18
  <% }); %>
19
19
 
20
- export const routes = [<% placeDefs.forEach(def => { %>
21
- <% if (def.routeIdentifier) { %>{
22
- path: '<%= def.path %>',
23
- redirectTo: '<%= def.path %>/'
24
- },<% } %> {
25
- path: '<%= def.fullPath %>',
26
- component: <%= def.componentClass %>,
27
- canActivate: [<%= def.activateGuardNames.join(", ")%>],
28
- canDeactivate: [LeavePlaceGuard],
29
- data: { placeOrder: <%= def.order %> }
30
- },
20
+ export const ROUTES = [<% placeDefs.filter(def=> !def.isChild()).forEach(def => { %>
21
+ <%= def.getRouteTemplate() %>,
31
22
  <% }) %>
32
23
  ];
24
+
25
+ export const ROUTE_PARAMS = {
26
+ <% placeDefs.forEach(def => { %>
27
+ <%= def.placeName %>: {
28
+ component: <%= def.componentClass %>,
29
+ routeParams(<%=def.getPlaceRouterGoArgs()%>) {
30
+ return <%=def.getPlaceRouterGoRouteParams()%>;
31
+ }
32
+ },
33
+ <% }) %>
34
+ };
35
+
@@ -1,17 +0,0 @@
1
- /**
2
- * @fileoverview added by tsickle
3
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
4
- */
5
- /**
6
- * @record
7
- */
8
- export function IPlaceComponent() { }
9
- if (false) {
10
- /** @type {?} */
11
- IPlaceComponent.prototype.activatedRoute;
12
- /**
13
- * @return {?}
14
- */
15
- IPlaceComponent.prototype.onPlaceReady = function () { };
16
- }
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaS1wbGFjZS1jb21wb25lbnQuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2UvaS1wbGFjZS1jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUVBLHFDQUdDOzs7SUFGQyx5Q0FBd0M7Ozs7SUFDeEMseURBQWUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZSB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSVBsYWNlQ29tcG9uZW50IHtcbiAgcmVhZG9ubHkgYWN0aXZhdGVkUm91dGU6IEFjdGl2YXRlZFJvdXRlO1xuICBvblBsYWNlUmVhZHkoKTtcbn1cbiJdfQ==
@@ -1,16 +0,0 @@
1
- /**
2
- * @fileoverview added by tsickle
3
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
4
- */
5
- /**
6
- * @record
7
- */
8
- export function IPlaceService() { }
9
- if (false) {
10
- /**
11
- * @param {?} params
12
- * @return {?}
13
- */
14
- IPlaceService.prototype.notifyRouteParametersChanged = function (params) { };
15
- }
16
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaS1wbGFjZS1zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL2ktcGxhY2Utc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBR0EsbUNBT0M7Ozs7OztJQU5DLDZFQUtHIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSVBsYWNlQ29tcG9uZW50IH0gZnJvbSAnLi9pLXBsYWNlLWNvbXBvbmVudCc7XG5pbXBvcnQgeyBSZXNvbHZlZFJvdXRlUGFyYW1ldGVyU25hcHNob3QgfSBmcm9tICcuL3JvdXRlL3Jlc29sdmVkLXJvdXRlLXBhcmFtZXRlci1zbmFwc2hvdCc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSVBsYWNlU2VydmljZSB7XG4gIG5vdGlmeVJvdXRlUGFyYW1ldGVyc0NoYW5nZWQocGFyYW1zOiB7XG4gICAgcGxhY2VDb21wb25lbnQ6IElQbGFjZUNvbXBvbmVudCxcbiAgICBuZXh0OiBSZXNvbHZlZFJvdXRlUGFyYW1ldGVyU25hcHNob3QsXG4gICAgcHJldmlvdXM6IFJlc29sdmVkUm91dGVQYXJhbWV0ZXJTbmFwc2hvdCxcbiAgICB1cGRhdGVSb3V0ZTogYm9vbGVhblxuICB9KTtcbn1cbiJdfQ==
@@ -1,16 +0,0 @@
1
- /**
2
- * @fileoverview added by tsickle
3
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
4
- */
5
- /**
6
- * @record
7
- * @template T
8
- */
9
- export function ResolvedParameter() { }
10
- if (false) {
11
- /** @type {?} */
12
- ResolvedParameter.prototype.parameterDef;
13
- /** @type {?} */
14
- ResolvedParameter.prototype.resolvedValue;
15
- }
16
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZWQtcGFyYW1ldGVyLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL3JvdXRlL3Jlc29sdmVkLXBhcmFtZXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUVBLHVDQUdDOzs7SUFGQyx5Q0FBcUM7O0lBQ3JDLDBDQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFBhcmFtZXRlckRlZmluaXRpb24gfSBmcm9tICcuL3BhcmFtZXRlci1kZWZpbml0aW9uLmNsYXNzJztcblxuZXhwb3J0IGludGVyZmFjZSBSZXNvbHZlZFBhcmFtZXRlcjxUPiB7XG4gIHBhcmFtZXRlckRlZjogUGFyYW1ldGVyRGVmaW5pdGlvbjxUPjtcbiAgcmVzb2x2ZWRWYWx1ZTogVDtcbn1cbiJdfQ==
@@ -1,106 +0,0 @@
1
- /**
2
- * @fileoverview added by tsickle
3
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
4
- */
5
- import * as tslib_1 from "tslib";
6
- import { Trace } from '@coolon/pectin';
7
- export class ResolvedRouteParameterSnapshot {
8
- /**
9
- * @param {?} parameters
10
- */
11
- constructor(parameters) {
12
- this.parameters = parameters;
13
- }
14
- /**
15
- * @template T
16
- * @param {?} parameter
17
- * @return {?}
18
- */
19
- get(parameter) {
20
- /** @type {?} */
21
- const resolved = this.parameters.find((/**
22
- * @param {?} p
23
- * @return {?}
24
- */
25
- p => p.parameterDef === parameter));
26
- return resolved ? resolved.resolvedValue : null;
27
- }
28
- /**
29
- * @template T
30
- * @param {?} parameter
31
- * @param {?} value
32
- * @return {?}
33
- */
34
- replace(parameter, value) {
35
- return new ResolvedRouteParameterSnapshot(this.parameters.filter((/**
36
- * @param {?} p
37
- * @return {?}
38
- */
39
- p => p.parameterDef !== parameter)).concat({
40
- parameterDef: parameter,
41
- resolvedValue: value
42
- }));
43
- }
44
- /**
45
- * @return {?}
46
- */
47
- getFormattedRouteId() {
48
- /** @type {?} */
49
- const routeIdParam = this.getRouteIdParam();
50
- return routeIdParam ? routeIdParam.parameterDef.type.format(routeIdParam.resolvedValue) : null;
51
- }
52
- /**
53
- * @private
54
- * @return {?}
55
- */
56
- getRouteIdParam() {
57
- return this.parameters.find((/**
58
- * @param {?} p
59
- * @return {?}
60
- */
61
- p => p.parameterDef.isRouteId));
62
- }
63
- /**
64
- * @return {?}
65
- */
66
- getFormattedParameters() {
67
- /** @type {?} */
68
- const params = {};
69
- /** @type {?} */
70
- const routeIdParam = this.parameters.filter((/**
71
- * @param {?} p
72
- * @return {?}
73
- */
74
- p => !p.parameterDef.isRouteId)).forEach((/**
75
- * @param {?} p
76
- * @return {?}
77
- */
78
- p => {
79
- params[p.parameterDef.name] = p.parameterDef.type.format(p.resolvedValue);
80
- }));
81
- return params;
82
- }
83
- /**
84
- * @return {?}
85
- */
86
- hasRouteId() {
87
- return !!this.getRouteIdParam();
88
- }
89
- }
90
- tslib_1.__decorate([
91
- Trace(),
92
- tslib_1.__metadata("design:type", Function),
93
- tslib_1.__metadata("design:paramtypes", []),
94
- tslib_1.__metadata("design:returntype", void 0)
95
- ], ResolvedRouteParameterSnapshot.prototype, "getFormattedRouteId", null);
96
- tslib_1.__decorate([
97
- Trace(),
98
- tslib_1.__metadata("design:type", Function),
99
- tslib_1.__metadata("design:paramtypes", []),
100
- tslib_1.__metadata("design:returntype", void 0)
101
- ], ResolvedRouteParameterSnapshot.prototype, "getFormattedParameters", null);
102
- if (false) {
103
- /** @type {?} */
104
- ResolvedRouteParameterSnapshot.prototype.parameters;
105
- }
106
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZWQtcm91dGUtcGFyYW1ldGVyLXNuYXBzaG90LmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL3JvdXRlL3Jlc29sdmVkLXJvdXRlLXBhcmFtZXRlci1zbmFwc2hvdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUl2QyxNQUFNLE9BQU8sOEJBQThCOzs7O0lBQ3pDLFlBQXFCLFVBQW9DO1FBQXBDLGVBQVUsR0FBVixVQUFVLENBQTBCO0lBQ3pELENBQUM7Ozs7OztJQUVELEdBQUcsQ0FBSSxTQUFpQzs7Y0FDaEMsUUFBUSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSTs7OztRQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFlBQVksS0FBSyxTQUFTLEVBQUM7UUFDeEUsT0FBTyxRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztJQUNsRCxDQUFDOzs7Ozs7O0lBRUQsT0FBTyxDQUFJLFNBQWlDLEVBQUUsS0FBUTtRQUNwRCxPQUFPLElBQUksOEJBQThCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNOzs7O1FBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsWUFBWSxLQUFLLFNBQVMsRUFBQyxDQUFDLE1BQU0sQ0FBQztZQUN6RyxZQUFZLEVBQUUsU0FBUztZQUN2QixhQUFhLEVBQUUsS0FBSztTQUNyQixDQUFDLENBQUMsQ0FBQztJQUNOLENBQUM7Ozs7SUFHQSxtQkFBbUI7O2NBQ1osWUFBWSxHQUFHLElBQUksQ0FBQyxlQUFlLEVBQUU7UUFDM0MsT0FBTyxZQUFZLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztJQUNqRyxDQUFDOzs7OztJQUVPLGVBQWU7UUFDckIsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUk7Ozs7UUFBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFDLENBQUM7SUFDN0QsQ0FBQzs7OztJQUdELHNCQUFzQjs7Y0FDZCxNQUFNLEdBQUcsRUFBRTs7Y0FDWCxZQUFZLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNOzs7O1FBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFDLENBQUMsT0FBTzs7OztRQUFDLENBQUMsQ0FBQyxFQUFFO1lBQ3RGLE1BQU0sQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDNUUsQ0FBQyxFQUFDO1FBQ0YsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQzs7OztJQUVELFVBQVU7UUFDUixPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDbEMsQ0FBQztDQUNGO0FBckJFO0lBREEsS0FBSyxFQUFFOzs7O3lFQUlQO0FBT0Q7SUFEQyxLQUFLLEVBQUU7Ozs7NEVBT1A7OztJQWhDVyxvREFBNkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZSwgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IFRyYWNlIH0gZnJvbSAnQGNvb2xvbi9wZWN0aW4nO1xuaW1wb3J0IHsgUGFyYW1ldGVyRGVmaW5pdGlvbiB9IGZyb20gJy4vcGFyYW1ldGVyLWRlZmluaXRpb24uY2xhc3MnO1xuaW1wb3J0IHsgUmVzb2x2ZWRQYXJhbWV0ZXIgfSBmcm9tICcuL3Jlc29sdmVkLXBhcmFtZXRlcic7XG5cbmV4cG9ydCBjbGFzcyBSZXNvbHZlZFJvdXRlUGFyYW1ldGVyU25hcHNob3Qge1xuICBjb25zdHJ1Y3RvcihyZWFkb25seSBwYXJhbWV0ZXJzOiBSZXNvbHZlZFBhcmFtZXRlcjxhbnk+W10pIHtcbiAgfVxuXG4gIGdldDxUPihwYXJhbWV0ZXI6IFBhcmFtZXRlckRlZmluaXRpb248VD4pOiBUIHtcbiAgICBjb25zdCByZXNvbHZlZCA9IHRoaXMucGFyYW1ldGVycy5maW5kKHAgPT4gcC5wYXJhbWV0ZXJEZWYgPT09IHBhcmFtZXRlcik7XG4gICAgcmV0dXJuIHJlc29sdmVkID8gcmVzb2x2ZWQucmVzb2x2ZWRWYWx1ZSA6IG51bGw7XG4gIH1cblxuICByZXBsYWNlPFQ+KHBhcmFtZXRlcjogUGFyYW1ldGVyRGVmaW5pdGlvbjxUPiwgdmFsdWU6IFQpOiBSZXNvbHZlZFJvdXRlUGFyYW1ldGVyU25hcHNob3Qge1xuICAgIHJldHVybiBuZXcgUmVzb2x2ZWRSb3V0ZVBhcmFtZXRlclNuYXBzaG90KHRoaXMucGFyYW1ldGVycy5maWx0ZXIocCA9PiBwLnBhcmFtZXRlckRlZiAhPT0gcGFyYW1ldGVyKS5jb25jYXQoe1xuICAgICAgcGFyYW1ldGVyRGVmOiBwYXJhbWV0ZXIsXG4gICAgICByZXNvbHZlZFZhbHVlOiB2YWx1ZVxuICAgIH0pKTtcbiAgfVxuXG4gIEBUcmFjZSgpXG4gICBnZXRGb3JtYXR0ZWRSb3V0ZUlkKCkge1xuICAgIGNvbnN0IHJvdXRlSWRQYXJhbSA9IHRoaXMuZ2V0Um91dGVJZFBhcmFtKCk7XG4gICAgcmV0dXJuIHJvdXRlSWRQYXJhbSA/IHJvdXRlSWRQYXJhbS5wYXJhbWV0ZXJEZWYudHlwZS5mb3JtYXQocm91dGVJZFBhcmFtLnJlc29sdmVkVmFsdWUpIDogbnVsbDtcbiAgfVxuXG4gIHByaXZhdGUgZ2V0Um91dGVJZFBhcmFtKCkge1xuICAgIHJldHVybiB0aGlzLnBhcmFtZXRlcnMuZmluZChwID0+IHAucGFyYW1ldGVyRGVmLmlzUm91dGVJZCk7XG4gIH1cblxuICBAVHJhY2UoKVxuICBnZXRGb3JtYXR0ZWRQYXJhbWV0ZXJzKCkge1xuICAgIGNvbnN0IHBhcmFtcyA9IHt9O1xuICAgIGNvbnN0IHJvdXRlSWRQYXJhbSA9IHRoaXMucGFyYW1ldGVycy5maWx0ZXIocCA9PiAhcC5wYXJhbWV0ZXJEZWYuaXNSb3V0ZUlkKS5mb3JFYWNoKHAgPT4ge1xuICAgICAgcGFyYW1zW3AucGFyYW1ldGVyRGVmLm5hbWVdID0gcC5wYXJhbWV0ZXJEZWYudHlwZS5mb3JtYXQocC5yZXNvbHZlZFZhbHVlKTtcbiAgICB9KTtcbiAgICByZXR1cm4gcGFyYW1zO1xuICB9XG5cbiAgaGFzUm91dGVJZCgpIHtcbiAgICByZXR1cm4gISF0aGlzLmdldFJvdXRlSWRQYXJhbSgpO1xuICB9XG59XG4iXX0=