angular-odata 0.142.0 → 0.143.0

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 (44) hide show
  1. package/README.md +1 -1
  2. package/package.json +1 -1
  3. package/schematics/apigen/angular/api-config.d.ts +2 -1
  4. package/schematics/apigen/angular/api-config.js +1 -1
  5. package/schematics/apigen/angular/api-config.js.map +1 -1
  6. package/schematics/apigen/angular/base.d.ts +4 -5
  7. package/schematics/apigen/angular/base.js +12 -8
  8. package/schematics/apigen/angular/base.js.map +1 -1
  9. package/schematics/apigen/angular/collection.d.ts +2 -1
  10. package/schematics/apigen/angular/collection.js +1 -1
  11. package/schematics/apigen/angular/collection.js.map +1 -1
  12. package/schematics/apigen/angular/entity.d.ts +6 -2
  13. package/schematics/apigen/angular/entity.js +15 -5
  14. package/schematics/apigen/angular/entity.js.map +1 -1
  15. package/schematics/apigen/angular/enum.d.ts +2 -1
  16. package/schematics/apigen/angular/enum.js +1 -1
  17. package/schematics/apigen/angular/enum.js.map +1 -1
  18. package/schematics/apigen/angular/import.d.ts +3 -2
  19. package/schematics/apigen/angular/import.js +4 -3
  20. package/schematics/apigen/angular/import.js.map +1 -1
  21. package/schematics/apigen/angular/model.d.ts +12 -8
  22. package/schematics/apigen/angular/model.js +47 -38
  23. package/schematics/apigen/angular/model.js.map +1 -1
  24. package/schematics/apigen/angular/module.d.ts +2 -1
  25. package/schematics/apigen/angular/module.js +1 -1
  26. package/schematics/apigen/angular/module.js.map +1 -1
  27. package/schematics/apigen/angular/service.d.ts +2 -1
  28. package/schematics/apigen/angular/service.js +1 -1
  29. package/schematics/apigen/angular/service.js.map +1 -1
  30. package/schematics/apigen/files/api-config/__fileName__.ts +4 -2
  31. package/schematics/apigen/files/collection/__fileName__.ts +4 -0
  32. package/schematics/apigen/files/entity/__fileName__.ts +6 -2
  33. package/schematics/apigen/files/entitycontainer-service/__fileName__.ts +4 -0
  34. package/schematics/apigen/files/entityset-service/__fileName__.ts +4 -0
  35. package/schematics/apigen/files/enum/__fileName__.ts +4 -0
  36. package/schematics/apigen/files/index/__fileName__.ts +2 -0
  37. package/schematics/apigen/files/model/__fileName__.ts +8 -4
  38. package/schematics/apigen/files/module/__fileName__.ts +2 -0
  39. package/schematics/apigen/files/singleton-service/__fileName__.ts +4 -0
  40. package/schematics/apigen/index.js +53 -8
  41. package/schematics/apigen/index.js.map +1 -1
  42. package/schematics/random.d.ts +4 -1
  43. package/schematics/random.js +2 -2
  44. package/schematics/random.js.map +1 -1
package/README.md CHANGED
@@ -8,7 +8,7 @@
8
8
  <p align="center">
9
9
  <a href="CONTRIBUTING.md">Contributing</a>
10
10
  ·
11
- <a href="./docs/README.md">Documentation</a>
11
+ <a href="./docs/api/index.html">Documentation</a>
12
12
  ·
13
13
  <a href="https://github.com/diegomvh/AngularODataEntity">Demo</a>
14
14
  <br>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "angular-odata",
3
- "version": "0.142.0",
3
+ "version": "0.143.0",
4
4
  "license": "MIT",
5
5
  "description": "Client side OData typescript library for Angular",
6
6
  "repository": {
package/schematics/apigen/angular/api-config.d.ts CHANGED
@@ -2,10 +2,11 @@ import { Base } from './base';
2
2
  import { Source } from '@angular-devkit/schematics';
3
3
  import { Schema as ApiGenSchema } from '../schema';
4
4
  import { Package } from './package';
5
+ import { Import } from './import';
5
6
  export declare class ApiConfig extends Base {
6
7
  constructor(pkg: Package, options: ApiGenSchema);
7
8
  template(): Source;
8
- variables(): {
9
+ variables(imports: Import[]): {
9
10
  [name: string]: any;
10
11
  };
11
12
  name(): string;
package/schematics/apigen/angular/api-config.js CHANGED
@@ -11,7 +11,7 @@ class ApiConfig extends base_1.Base {
11
11
  template() {
12
12
  return (0, schematics_1.url)('./files/api-config');
13
13
  }
14
- variables() {
14
+ variables(imports) {
15
15
  return {
16
16
  serviceRootUrl: this.options.serviceRootUrl,
17
17
  metadataUrl: this.options.metadata,
package/schematics/apigen/angular/api-config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api-config.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/api-config.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAC9B,2DAAyD;AAIzD,MAAa,SAAU,SAAQ,WAAI;IACjC,YAAY,GAAY,EAAE,OAAqB;QAC7C,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,oBAAoB,CAAC,CAAC;IACnC,CAAC;IACe,SAAS;QACvB,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;YAC3C,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAClC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC7B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM;YACvB,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW;SAClC,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IACxD,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IACe,WAAW;QACzB,MAAM,OAAO,GAAG;YACd,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;SACjD,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AArCD,8BAqCC"}
1
+ {"version":3,"file":"api-config.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/api-config.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAC9B,2DAAyD;AAKzD,MAAa,SAAU,SAAQ,WAAI;IACjC,YAAY,GAAY,EAAE,OAAqB;QAC7C,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,oBAAoB,CAAC,CAAC;IACnC,CAAC;IACe,SAAS,CAAC,OAAiB;QACzC,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;YAC3C,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAClC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC7B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM;YACvB,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW;SAClC,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IACxD,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IACe,WAAW;QACzB,MAAM,OAAO,GAAG;YACd,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;SACjD,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AArCD,8BAqCC"}
package/schematics/apigen/angular/base.d.ts CHANGED
@@ -34,13 +34,12 @@ export declare abstract class Base {
34
34
  abstract directory(): string;
35
35
  abstract importTypes(): string[];
36
36
  abstract template(): Source;
37
- abstract variables(): {
37
+ abstract variables(imports: Import[]): {
38
38
  [name: string]: any;
39
39
  };
40
40
  path(): string;
41
41
  imports(): Import[];
42
- importedName?: string;
43
- cleanImportedNames(): void;
42
+ importedName(imports: Import[]): string;
44
43
  protected dependencies: [string, string, Base][];
45
44
  addDependency(renderable: Base): void;
46
45
  addDependencies(renderables: Base[]): void;
@@ -52,7 +51,7 @@ export declare abstract class Base {
52
51
  export declare class Index extends Base {
53
52
  constructor(pkg: Package, options: ApiGenSchema);
54
53
  template(): Source;
55
- variables(): {
54
+ variables(imports: Import[]): {
56
55
  [name: string]: any;
57
56
  };
58
57
  name(): string;
@@ -65,7 +64,7 @@ export declare class Metadata extends Base {
65
64
  private meta;
66
65
  constructor(pkg: Package, options: ApiGenSchema, meta: ODataMetadata);
67
66
  template(): Source;
68
- variables(): {
67
+ variables(imports: Import[]): {
69
68
  [name: string]: any;
70
69
  };
71
70
  name(): string;
package/schematics/apigen/angular/base.js CHANGED
@@ -209,7 +209,6 @@ class Base {
209
209
  return directory !== '' ? directory + `/${filename}` : filename;
210
210
  }
211
211
  imports() {
212
- this.cleanImportedNames();
213
212
  const groups = this.dependencies
214
213
  .filter((a) => a[2].path() != this.path())
215
214
  .reduce((acc, i) => {
@@ -223,21 +222,26 @@ class Base {
223
222
  const imports = Object.entries(groups).map(([path, items]) => {
224
223
  const names = items.reduce((acc, i) => [...acc, i[0]], []);
225
224
  const aliases = items.reduce((acc, i) => [...acc, i[1]], []);
226
- return new import_1.Import(names, aliases, path);
225
+ return new import_1.Import(names, aliases, items[0][2].path(), path);
227
226
  });
228
227
  return imports;
229
228
  }
230
- cleanImportedNames() {
231
- for (let d of this.dependencies) {
232
- d[2].importedName = d[1];
229
+ importedName(imports) {
230
+ const imp = imports.find((i) => i.absPath === this.path());
231
+ if (imp !== undefined) {
232
+ const index = imp.names.findIndex((n) => n === this.name());
233
+ if (index !== -1) {
234
+ return imp.aliases[index];
235
+ }
233
236
  }
237
+ return this.name();
234
238
  }
235
239
  addDependency(renderable) {
236
240
  if (this.dependencies.every((d) => d[2] != renderable)) {
237
241
  const name = renderable.name();
238
242
  let alias = name;
239
243
  while (this.dependencies.some((d) => d[1] === alias)) {
240
- alias = (0, random_1.getRandomName)();
244
+ alias = (0, random_1.getRandomName)({ suffix: name });
241
245
  }
242
246
  this.dependencies.push([name, alias, renderable]);
243
247
  }
@@ -263,7 +267,7 @@ class Index extends Base {
263
267
  template() {
264
268
  return (0, schematics_1.url)('./files/index');
265
269
  }
266
- variables() {
270
+ variables(imports) {
267
271
  return Object.assign({}, this.options);
268
272
  }
269
273
  name() {
@@ -291,7 +295,7 @@ class Metadata extends Base {
291
295
  template() {
292
296
  return (0, schematics_1.url)('./files/metadata');
293
297
  }
294
- variables() {
298
+ variables(imports) {
295
299
  return { content: JSON.stringify(this.meta.toJson(), null, 2) };
296
300
  }
297
301
  name() {
package/schematics/apigen/angular/base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/base.ts"],"names":[],"mappings":"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"}
package/schematics/apigen/angular/collection.d.ts CHANGED
@@ -5,6 +5,7 @@ import { Schema as ApiGenSchema } from '../schema';
5
5
  import { Model } from './model';
6
6
  import { Entity } from './entity';
7
7
  import { Package } from './package';
8
+ import { Import } from './import';
8
9
  export declare class Collection extends Base {
9
10
  protected edmType: CsdlEntityType | CsdlComplexType;
10
11
  protected entity: Entity;
@@ -12,7 +13,7 @@ export declare class Collection extends Base {
12
13
  constructor(pkg: Package, options: ApiGenSchema, edmType: CsdlEntityType | CsdlComplexType, entity: Entity, model: Model);
13
14
  entityType(): string;
14
15
  template(): Source;
15
- variables(): {
16
+ variables(imports: Import[]): {
16
17
  [name: string]: any;
17
18
  };
18
19
  name(): string;
package/schematics/apigen/angular/collection.js CHANGED
@@ -17,7 +17,7 @@ class Collection extends base_1.Base {
17
17
  template() {
18
18
  return (0, schematics_1.url)('./files/collection');
19
19
  }
20
- variables() {
20
+ variables(imports) {
21
21
  var _a;
22
22
  return {
23
23
  type: this.name() + 'Collection',
package/schematics/apigen/angular/collection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/collection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/collection.ts"],"names":[],"mappings":"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"}
package/schematics/apigen/angular/entity.d.ts CHANGED
@@ -4,19 +4,21 @@ import { Source } from '@angular-devkit/schematics';
4
4
  import { Schema as ApiGenSchema } from '../schema';
5
5
  import { CsdlNavigationProperty, CsdlProperty } from '../metadata/csdl/csdl-structural-property';
6
6
  import { Package } from './package';
7
+ import { Import } from './import';
7
8
  export declare class EntityProperty {
8
9
  protected entity: Entity;
9
10
  protected edmType: CsdlProperty | CsdlNavigationProperty;
10
11
  constructor(entity: Entity, edmType: CsdlProperty | CsdlNavigationProperty);
11
12
  name(): string;
12
- type(): string;
13
+ type(imports: Import[]): string;
13
14
  isGeoSpatial(): boolean;
15
+ isDuration(): boolean;
14
16
  }
15
17
  export declare class Entity extends Base {
16
18
  protected edmType: CsdlEntityType | CsdlComplexType;
17
19
  constructor(pkg: Package, options: ApiGenSchema, edmType: CsdlEntityType | CsdlComplexType);
18
20
  template(): Source;
19
- variables(): {
21
+ variables(imports: Import[]): {
20
22
  [name: string]: any;
21
23
  };
22
24
  name(): string;
@@ -27,4 +29,6 @@ export declare class Entity extends Base {
27
29
  properties(): EntityProperty[];
28
30
  geoProperties(): EntityProperty[];
29
31
  hasGeoProperties(): boolean;
32
+ durationProperties(): EntityProperty[];
33
+ hasDurationProperties(): boolean;
30
34
  }
package/schematics/apigen/angular/entity.js CHANGED
@@ -17,17 +17,17 @@ class EntityProperty {
17
17
  const name = this.edmType.Name;
18
18
  return name + (!required ? '?' : '');
19
19
  }
20
- type() {
20
+ type(imports) {
21
21
  const pkg = this.entity.getPackage();
22
22
  const enumType = pkg.findEnum(this.edmType.Type);
23
23
  const entityType = pkg.findEntity(this.edmType.Type);
24
24
  let type = 'any';
25
25
  if (enumType !== undefined) {
26
- type = enumType.importedName;
26
+ type = enumType.importedName(imports);
27
27
  type += this.edmType.Collection ? '[]' : '';
28
28
  }
29
29
  else if (entityType !== undefined) {
30
- type = entityType.importedName;
30
+ type = entityType.importedName(imports);
31
31
  type += this.edmType.Collection ? '[]' : '';
32
32
  }
33
33
  else {
@@ -39,6 +39,9 @@ class EntityProperty {
39
39
  isGeoSpatial() {
40
40
  return (this.edmType.Type.startsWith('Edm.Geography') || this.edmType.Type.startsWith('Edm.Geometry'));
41
41
  }
42
+ isDuration() {
43
+ return this.edmType.Type.startsWith('Edm.Duration');
44
+ }
42
45
  }
43
46
  exports.EntityProperty = EntityProperty;
44
47
  class Entity extends base_1.Base {
@@ -49,13 +52,14 @@ class Entity extends base_1.Base {
49
52
  template() {
50
53
  return (0, schematics_1.url)('./files/entity');
51
54
  }
52
- variables() {
55
+ variables(imports) {
53
56
  return {
54
57
  type: this.name() + (this.edmType instanceof csdl_structured_type_1.CsdlEntityType ? 'EntityType' : 'ComplexType'),
55
58
  baseType: this.edmType.BaseType,
56
59
  properties: this.properties(),
57
- geoProperties: this.geoProperties(),
58
60
  hasGeoProperties: this.hasGeoProperties(),
61
+ geoProperties: this.geoProperties(),
62
+ hasDurationProperties: this.hasDurationProperties(),
59
63
  };
60
64
  }
61
65
  name() {
@@ -102,6 +106,12 @@ class Entity extends base_1.Base {
102
106
  hasGeoProperties() {
103
107
  return this.geoProperties().length > 0;
104
108
  }
109
+ durationProperties() {
110
+ return this.properties().filter((p) => p.isDuration());
111
+ }
112
+ hasDurationProperties() {
113
+ return this.durationProperties().length > 0;
114
+ }
105
115
  }
106
116
  exports.Entity = Entity;
107
117
  //# sourceMappingURL=entity.js.map
package/schematics/apigen/angular/entity.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/entity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/entity.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAC9B,gFAAwF;AACxF,2DAAyD;AAEzD,wFAAiG;AACjG,oCAA4C;AAI5C,MAAa,cAAc;IACzB,YACY,MAAc,EACd,OAA8C;QAD9C,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAuC;IACvD,CAAC;IAEJ,IAAI;QACF,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,YAAY,iDAAsB,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5F,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/B,OAAO,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC,OAAiB;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAE,CAAC;YACvC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,CAAC;aAAM,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAE,CAAC;YACzC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY;QACV,OAAO,CACL,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAC9F,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IACtD,CAAC;CACF;AAvCD,wCAuCC;AAED,MAAa,MAAO,SAAQ,WAAI;IAC9B,YACE,GAAY,EACZ,OAAqB,EACX,OAAyC;QAEnD,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAFV,YAAO,GAAP,OAAO,CAAkC;IAGrD,CAAC;IAEe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,gBAAgB,CAAC,CAAC;IAC/B,CAAC;IACe,SAAS,CAAC,OAAiB;QACzC,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,YAAY,qCAAc,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC;YAC3F,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;YAC7B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE;YACzC,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE;YACnC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EAAE;SACpD,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IACe,QAAQ;QACtB,OAAO,CACL,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACtC,CAAC,IAAI,CAAC,OAAO,YAAY,qCAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAClE,CAAC;IACJ,CAAC;IACe,SAAS;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IACe,WAAW;;QACzB,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,IAAI,IAAI,IAAI,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,mCAAI,EAAE,EAAE,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,KAAK,IAAI,IAAI,IAAI,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,kBAAkB,mCAAI,EAAE,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IACM,UAAU;;QACf,OAAO;YACL,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACxE,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SACnF,CAAC;IACJ,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAC3D,CAAC;IACM,gBAAgB;QACrB,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IACzC,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;IACzD,CAAC;IAEM,qBAAqB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IAC9C,CAAC;CACF;AA3ED,wBA2EC"}
package/schematics/apigen/angular/enum.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { CsdlEnumType, CsdlMember } from '../metadata/csdl/csdl-enum-type';
2
2
  import { Base } from './base';
3
+ import { Import } from './import';
3
4
  import { Source } from '@angular-devkit/schematics';
4
5
  import { Schema as ApiGenSchema } from '../schema';
5
6
  import { Package } from './package';
@@ -13,7 +14,7 @@ export declare class Enum extends Base {
13
14
  protected edmType: CsdlEnumType;
14
15
  constructor(pkg: Package, options: ApiGenSchema, edmType: CsdlEnumType);
15
16
  template(): Source;
16
- variables(): {
17
+ variables(imports: Import[]): {
17
18
  [name: string]: any;
18
19
  };
19
20
  name(): string;
package/schematics/apigen/angular/enum.js CHANGED
@@ -24,7 +24,7 @@ class Enum extends base_1.Base {
24
24
  template() {
25
25
  return (0, schematics_1.url)('./files/enum');
26
26
  }
27
- variables() {
27
+ variables(imports) {
28
28
  var _a;
29
29
  return {
30
30
  type: this.name() + 'EnumType',
package/schematics/apigen/angular/enum.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/enum.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,iCAA8B;AAE9B,2DAAyD;AAIzD,MAAa,SAAS;IACpB,YAAoB,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;IAAG,CAAC;IACpC,IAAI;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IACM,KAAK;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;CACF;AARD,8BAQC;AACD,MAAa,IAAK,SAAQ,WAAI;IAC5B,YACE,GAAY,EACZ,OAAqB,EACX,OAAqB;QAE/B,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAFV,YAAO,GAAP,OAAO,CAAc;IAGjC,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,cAAc,CAAC,CAAC;IAC7B,CAAC;IACe,SAAS;;QACvB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,UAAU;YAC9B,MAAM,EAAE,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;SACjE,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IACM,OAAO;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAClE,CAAC;IACM,KAAK;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IACe,WAAW;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAtCD,oBAsCC"}
1
+ {"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/enum.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,iCAA8B;AAE9B,2DAAyD;AAIzD,MAAa,SAAS;IACpB,YAAoB,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;IAAG,CAAC;IACpC,IAAI;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IACM,KAAK;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;CACF;AARD,8BAQC;AACD,MAAa,IAAK,SAAQ,WAAI;IAC5B,YACE,GAAY,EACZ,OAAqB,EACX,OAAqB;QAE/B,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAFV,YAAO,GAAP,OAAO,CAAc;IAGjC,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,cAAc,CAAC,CAAC;IAC7B,CAAC;IACe,SAAS,CAAC,OAAiB;;QACzC,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,UAAU;YAC9B,MAAM,EAAE,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;SACjE,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IACM,OAAO;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAClE,CAAC;IACM,KAAK;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IACe,WAAW;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAtCD,oBAsCC"}
package/schematics/apigen/angular/import.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  export declare class Import {
2
2
  names: string[];
3
3
  aliases: string[];
4
- from: string;
5
- constructor(names: string[], aliases: string[], from: string);
4
+ absPath: string;
5
+ relPath: string;
6
+ constructor(names: string[], aliases: string[], absPath: string, relPath: string);
6
7
  path(): string;
7
8
  resolve(): string[];
8
9
  }
package/schematics/apigen/angular/import.js CHANGED
@@ -2,15 +2,16 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Import = void 0;
4
4
  class Import {
5
- constructor(names, aliases, from) {
5
+ constructor(names, aliases, absPath, relPath) {
6
6
  this.names = [];
7
7
  this.aliases = [];
8
8
  this.names = names;
9
9
  this.aliases = aliases;
10
- this.from = from;
10
+ this.absPath = absPath;
11
+ this.relPath = relPath;
11
12
  }
12
13
  path() {
13
- let path = this.from.toString();
14
+ let path = this.relPath.toString();
14
15
  if (!path.startsWith('../'))
15
16
  path = `./${path}`;
16
17
  return path;
package/schematics/apigen/angular/import.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/import.ts"],"names":[],"mappings":";;;AAAA,MAAa,MAAM;IAIjB,YAAmB,KAAe,EAAE,OAAiB,EAAE,IAAY;QAH5D,UAAK,GAAa,EAAE,CAAC;QACrB,YAAO,GAAa,EAAE,CAAC;QAG5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,IAAI;QACT,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YAAE,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO;QACZ,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA3BD,wBA2BC"}
1
+ {"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/import.ts"],"names":[],"mappings":";;;AAAA,MAAa,MAAM;IAKjB,YAAmB,KAAe,EAAE,OAAiB,EAAE,OAAe,EAAE,OAAe;QAJhF,UAAK,GAAa,EAAE,CAAC;QACrB,YAAO,GAAa,EAAE,CAAC;QAI5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,IAAI;QACT,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YAAE,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO;QACZ,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA7BD,wBA6BC"}
package/schematics/apigen/angular/model.d.ts CHANGED
@@ -6,17 +6,19 @@ import { CsdlNavigationProperty, CsdlProperty } from '../metadata/csdl/csdl-stru
6
6
  import { Entity } from './entity';
7
7
  import { Package } from './package';
8
8
  import { CsdlNavigationPropertyBinding } from '../metadata/csdl/csdl-navigation-property-binding';
9
+ import { Import } from './import';
9
10
  export declare class ModelField {
10
11
  protected model: Model;
11
12
  protected edmType: CsdlProperty | CsdlNavigationProperty;
12
13
  constructor(model: Model, edmType: CsdlProperty | CsdlNavigationProperty);
13
14
  name(): string;
14
- type(): string;
15
- resource(): string;
16
- getter(): string;
17
- setter(): string;
18
- fetch(): string;
15
+ type(imports: Import[]): string;
16
+ resource(imports: Import[]): string;
17
+ getter(imports: Import[]): string;
18
+ setter(imports: Import[]): string;
19
+ fetch(imports: Import[]): string;
19
20
  isGeoSpatial(): boolean;
21
+ isDuration(): boolean;
20
22
  }
21
23
  export declare class Model extends Base {
22
24
  protected edmType: CsdlEntityType | CsdlComplexType;
@@ -24,7 +26,7 @@ export declare class Model extends Base {
24
26
  constructor(pkg: Package, options: ApiGenSchema, edmType: CsdlEntityType | CsdlComplexType, entity: Entity);
25
27
  entityType(): string;
26
28
  template(): Source;
27
- variables(): {
29
+ variables(imports: Import[]): {
28
30
  [name: string]: any;
29
31
  };
30
32
  name(): string;
@@ -32,9 +34,11 @@ export declare class Model extends Base {
32
34
  directory(): string;
33
35
  fullName(): string;
34
36
  importTypes(): string[];
35
- navitations(): string[];
36
- renderNavigationPropertyBindings(bindings: CsdlNavigationPropertyBinding[] | undefined): string[];
37
+ navitations(imports: Import[]): string[];
38
+ renderNavigationPropertyBindings(bindings: CsdlNavigationPropertyBinding[] | undefined, imports: Import[]): string[];
37
39
  fields(): ModelField[];
38
40
  geoFields(): ModelField[];
39
41
  hasGeoFields(): boolean;
42
+ durationFields(): ModelField[];
43
+ hasDurationFields(): boolean;
40
44
  }
package/schematics/apigen/angular/model.js CHANGED
@@ -16,24 +16,24 @@ class ModelField {
16
16
  const name = this.edmType.Name;
17
17
  return name + (!required ? '?' : '');
18
18
  }
19
- type() {
19
+ type(imports) {
20
20
  const pkg = this.model.getPackage();
21
21
  const enumType = pkg.findEnum(this.edmType.Type);
22
22
  const entityType = pkg.findEntity(this.edmType.Type);
23
23
  let type = 'any';
24
24
  if (enumType !== undefined) {
25
- type = enumType.importedName;
25
+ type = enumType.importedName(imports);
26
26
  type += this.edmType.Collection ? '[]' : '';
27
27
  }
28
28
  else if (entityType !== undefined) {
29
29
  if (this.edmType.Collection) {
30
30
  const collection = pkg.findCollection(this.edmType.Type);
31
31
  const model = pkg.findModel(this.edmType.Type);
32
- type = `${collection.importedName}<${entityType.importedName}, ${model.importedName}<${entityType.importedName}>>`;
32
+ type = `${collection.importedName(imports)}<${entityType.importedName(imports)}, ${model.importedName(imports)}<${entityType.importedName(imports)}>>`;
33
33
  }
34
34
  else {
35
35
  const model = pkg.findModel(this.edmType.Type);
36
- type = `${model.importedName}<${entityType.importedName}>`;
36
+ type = `${model.importedName(imports)}<${entityType.importedName(imports)}>`;
37
37
  }
38
38
  }
39
39
  else {
@@ -45,68 +45,67 @@ class ModelField {
45
45
  }
46
46
  return type;
47
47
  }
48
- resource() {
48
+ resource(imports) {
49
49
  const pkg = this.model.getPackage();
50
50
  const resourceName = `$$${this.edmType.Name}`;
51
51
  if (this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty) {
52
52
  const entity = pkg.findEntity(this.edmType.Type);
53
- return `public ${resourceName}() {
54
- return this.navigationProperty<${entity === null || entity === void 0 ? void 0 : entity.importedName}>('${this.edmType.Name}');
53
+ return ` public ${resourceName}() {
54
+ return this.navigationProperty<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>('${this.edmType.Name}');
55
55
  }
56
- `;
56
+ `;
57
57
  }
58
58
  else {
59
- return `public ${resourceName}() {
60
- return this.property<${this.type()}>('${this.edmType.Name}');
59
+ return ` public ${resourceName}() {
60
+ return this.property<${this.type(imports)}>('${this.edmType.Name}');
61
61
  }
62
- `;
62
+ `;
63
63
  }
64
64
  }
65
- getter() {
65
+ getter(imports) {
66
66
  const pkg = this.model.getPackage();
67
67
  const getterName = `$${this.edmType.Name}`;
68
68
  if (this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty) {
69
69
  const entity = pkg.findEntity(this.edmType.Type);
70
- return `public ${getterName}() {
71
- return this.getAttribute<${entity === null || entity === void 0 ? void 0 : entity.importedName}>('${this.edmType.Name}') as ${entity === null || entity === void 0 ? void 0 : entity.importedName};
70
+ return ` public ${getterName}() {
71
+ return this.getAttribute<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>('${this.edmType.Name}') as ${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)};
72
72
  }
73
- `;
73
+ `;
74
74
  }
75
75
  else {
76
- return `public ${getterName}() {
77
- return this.getAttribute<${this.type()}>('${this.edmType.Name}') as ${this.type()};
76
+ return ` public ${getterName}() {
77
+ return this.getAttribute<${this.type(imports)}>('${this.edmType.Name}') as ${this.type(imports)};
78
78
  }
79
- `;
79
+ `;
80
80
  }
81
81
  }
82
- setter() {
82
+ setter(imports) {
83
83
  const pkg = this.model.getPackage();
84
84
  const setterName = `${this.edmType.Name}$$`;
85
85
  if (this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty) {
86
86
  const entity = pkg.findEntity(this.edmType.Type);
87
- return `public ${setterName}(model: ${this.type()} | null, options?: ODataOptions) {
88
- return this.setReference<${entity === null || entity === void 0 ? void 0 : entity.importedName}>('${this.edmType.Name}', model, options);
87
+ return ` public ${setterName}(model: ${this.type(imports)} | null, options?: ODataOptions) {
88
+ return this.setReference<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>('${this.edmType.Name}', model, options);
89
89
  }
90
- `;
90
+ `;
91
91
  }
92
92
  else {
93
- return `
94
- `;
93
+ return ``;
95
94
  }
96
95
  }
97
- fetch() {
96
+ fetch(imports) {
98
97
  const pkg = this.model.getPackage();
99
98
  const fetchName = `${this.edmType.Name}$`;
100
99
  if (this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty) {
101
100
  const entity = pkg.findEntity(this.edmType.Type);
102
- return `public ${fetchName}(options?: ODataQueryArgumentsOptions<${entity === null || entity === void 0 ? void 0 : entity.importedName}>) {
103
- return this.fetchAttribute<${entity === null || entity === void 0 ? void 0 : entity.importedName}>('${this.edmType.Name}', options) as Observable<${entity === null || entity === void 0 ? void 0 : entity.importedName}>;
101
+ return ` public ${fetchName}(options?: ODataQueryArgumentsOptions<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>) {
102
+ return this.fetchAttribute<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>('${this.edmType.Name}', options) as Observable<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>;
104
103
  }
105
104
  `;
106
105
  }
107
106
  else {
108
- return `public ${fetchName}(options?: ODataQueryArgumentsOptions<${this.type()}>) {
109
- return this.fetchAttribute<${this.type()}>('${this.edmType.Name}', options) as Observable<${this.type()}>;
107
+ return ` public ${fetchName}(options?: ODataQueryArgumentsOptions<${this.type(imports)}>) {
108
+ return this.fetchAttribute<${this.type(imports)}>('${this.edmType.Name}', options) as Observable<${this.type(imports)}>;
110
109
  }
111
110
  `;
112
111
  }
@@ -114,6 +113,9 @@ class ModelField {
114
113
  isGeoSpatial() {
115
114
  return (this.edmType.Type.startsWith('Edm.Geography') || this.edmType.Type.startsWith('Edm.Geometry'));
116
115
  }
116
+ isDuration() {
117
+ return this.edmType.Type.startsWith('Edm.Duration');
118
+ }
117
119
  }
118
120
  exports.ModelField = ModelField;
119
121
  class Model extends base_1.Base {
@@ -128,7 +130,7 @@ class Model extends base_1.Base {
128
130
  template() {
129
131
  return (0, schematics_1.url)('./files/model');
130
132
  }
131
- variables() {
133
+ variables(imports) {
132
134
  var _a;
133
135
  return {
134
136
  type: this.name() + 'Model',
@@ -136,9 +138,10 @@ class Model extends base_1.Base {
136
138
  entity: this.entity,
137
139
  fields: this.fields(),
138
140
  hasGeoFields: this.hasGeoFields(),
141
+ hasDurationFields: this.hasDurationFields(),
139
142
  geoFields: this.geoFields(),
140
143
  callables: (_a = this.callables) !== null && _a !== void 0 ? _a : [],
141
- navigations: this.navitations(),
144
+ navigations: this.navitations(imports),
142
145
  };
143
146
  }
144
147
  name() {
@@ -196,7 +199,7 @@ class Model extends base_1.Base {
196
199
  }
197
200
  return imports;
198
201
  }
199
- navitations() {
202
+ navitations(imports) {
200
203
  var _a, _b;
201
204
  const pkg = this.getPackage();
202
205
  const service = pkg.findEntitySet(this.edmType.fullName());
@@ -215,11 +218,11 @@ class Model extends base_1.Base {
215
218
  const nav = binding.resolveNavigationPropertyType((fullName) => pkg.findEntityType(fullName));
216
219
  return p.Name !== (nav === null || nav === void 0 ? void 0 : nav.Name);
217
220
  }));
218
- return this.renderNavigationPropertyBindings(bindings);
221
+ return this.renderNavigationPropertyBindings(bindings, imports);
219
222
  }
220
223
  return [];
221
224
  }
222
- renderNavigationPropertyBindings(bindings) {
225
+ renderNavigationPropertyBindings(bindings, imports) {
223
226
  const pkg = this.getPackage();
224
227
  let result = [];
225
228
  let casts = [];
@@ -234,16 +237,16 @@ class Model extends base_1.Base {
234
237
  }
235
238
  else {
236
239
  const returnType = isCollection
237
- ? `ODataCollection<${entity === null || entity === void 0 ? void 0 : entity.importedName}, ODataModel<${entity === null || entity === void 0 ? void 0 : entity.importedName}>>`
238
- : `ODataModel<${entity === null || entity === void 0 ? void 0 : entity.importedName}>`;
240
+ ? `ODataCollection<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}, ODataModel<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>>`
241
+ : `ODataModel<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>`;
239
242
  var responseType = isCollection ? 'collection' : 'model';
240
243
  var methodName = `as${propertyEntity === null || propertyEntity === void 0 ? void 0 : propertyEntity.Name}` +
241
244
  (nav === null || nav === void 0 ? void 0 : nav.Name.substring(0, 1).toUpperCase()) +
242
245
  (nav === null || nav === void 0 ? void 0 : nav.Name.substring(1));
243
246
  var castEntity = pkg.findEntity((propertyEntity === null || propertyEntity === void 0 ? void 0 : propertyEntity.fullName()) || '');
244
247
  // Navigation
245
- result.push(`public ${methodName}(options?: ODataQueryArgumentsOptions<${entity === null || entity === void 0 ? void 0 : entity.importedName}>) {
246
- return this.fetchNavigationProperty<${entity === null || entity === void 0 ? void 0 : entity.importedName}>('${binding.Path}', '${responseType}', options) as Observable<${returnType}>;
248
+ result.push(`public ${methodName}(options?: ODataQueryArgumentsOptions<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>) {
249
+ return this.fetchNavigationProperty<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>('${binding.Path}', '${responseType}', options) as Observable<${returnType}>;
247
250
  }`);
248
251
  }
249
252
  }
@@ -262,6 +265,12 @@ class Model extends base_1.Base {
262
265
  hasGeoFields() {
263
266
  return this.geoFields().length > 0;
264
267
  }
268
+ durationFields() {
269
+ return this.fields().filter((p) => p.isDuration());
270
+ }
271
+ hasDurationFields() {
272
+ return this.fields().filter((p) => p.isDuration()).length > 0;
273
+ }
265
274
  }
266
275
  exports.Model = Model;
267
276
  //# sourceMappingURL=model.js.map
package/schematics/apigen/angular/model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/model.ts"],"names":[],"mappings":"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"}
package/schematics/apigen/angular/module.d.ts CHANGED
@@ -3,12 +3,13 @@ import { Source } from '@angular-devkit/schematics';
3
3
  import { Schema as ApiGenSchema } from '../schema';
4
4
  import { Service } from './service';
5
5
  import { Package } from './package';
6
+ import { Import } from './import';
6
7
  export declare class Module extends Base {
7
8
  protected pkg: Package;
8
9
  services: Service[];
9
10
  constructor(pkg: Package, options: ApiGenSchema);
10
11
  template(): Source;
11
- variables(): {
12
+ variables(imports: Import[]): {
12
13
  [name: string]: any;
13
14
  };
14
15
  addService(service: Service): void;
package/schematics/apigen/angular/module.js CHANGED
@@ -13,7 +13,7 @@ class Module extends base_1.Base {
13
13
  template() {
14
14
  return (0, schematics_1.url)('./files/module');
15
15
  }
16
- variables() {
16
+ variables(imports) {
17
17
  return {
18
18
  services: this.services,
19
19
  };
package/schematics/apigen/angular/module.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/module.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAC9B,2DAAyD;AAKzD,MAAa,MAAO,SAAQ,WAAI;IAE9B,YACY,GAAY,EACtB,OAAqB;QAErB,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAHV,QAAG,GAAH,GAAG,CAAS;QAFxB,aAAQ,GAAc,EAAE,CAAC;IAMzB,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,gBAAgB,CAAC,CAAC;IAC/B,CAAC;IACe,SAAS;QACvB,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IACM,UAAU,CAAC,OAAgB;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IACxD,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IACe,WAAW;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAnCD,wBAmCC"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/module.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAC9B,2DAAyD;AAMzD,MAAa,MAAO,SAAQ,WAAI;IAE9B,YACY,GAAY,EACtB,OAAqB;QAErB,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAHV,QAAG,GAAH,GAAG,CAAS;QAFxB,aAAQ,GAAc,EAAE,CAAC;IAMzB,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,gBAAgB,CAAC,CAAC;IAC/B,CAAC;IACe,SAAS,CAAC,OAAiB;QACzC,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IACM,UAAU,CAAC,OAAgB;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IACxD,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IACe,WAAW;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAnCD,wBAmCC"}
package/schematics/apigen/angular/service.d.ts CHANGED
@@ -5,11 +5,12 @@ import { CsdlEntitySet } from '../metadata/csdl/csdl-entity-set';
5
5
  import { Source } from '@angular-devkit/schematics';
6
6
  import { Schema as ApiGenSchema } from '../schema';
7
7
  import { Package } from './package';
8
+ import { Import } from './import';
8
9
  export declare class Service extends Base {
9
10
  protected edmElement: CsdlEntitySet | CsdlEntityContainer | CsdlSingleton;
10
11
  constructor(pkg: Package, options: ApiGenSchema, edmElement: CsdlEntitySet | CsdlEntityContainer | CsdlSingleton);
11
12
  template(): Source;
12
- variables(): {
13
+ variables(imports: Import[]): {
13
14
  [name: string]: any;
14
15
  };
15
16
  entityType(): string;
package/schematics/apigen/angular/service.js CHANGED
@@ -18,7 +18,7 @@ class Service extends base_1.Base {
18
18
  ? (0, schematics_1.url)('./files/singleton-service')
19
19
  : (0, schematics_1.url)('./files/entitycontainer-service');
20
20
  }
21
- variables() {
21
+ variables(imports) {
22
22
  var _a;
23
23
  return {
24
24
  path: this.edmElement.name(),
package/schematics/apigen/angular/service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/service.ts"],"names":[],"mappings":"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"}
package/schematics/apigen/files/api-config/__fileName__.ts CHANGED
@@ -2,6 +2,8 @@ import { ODataApiConfig, EDM_PARSERS, ODataMetadata, ODataVersion } from 'angula
2
2
  import * as json from './metadata.json';<% for (let imp of imports) { %>
3
3
  import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
4
4
 
5
+ // #region Custom
6
+ // #endregion Custom
5
7
  export const <%= classify(name) %> = ODataMetadata.fromJson(json).toConfig({
6
8
  serviceRootUrl: '<%= serviceRootUrl %>',
7
9
  metadataUrl: '<%= metadataUrl %>',
@@ -10,9 +12,9 @@ export const <%= classify(name) %> = ODataMetadata.fromJson(json).toConfig({
10
12
  creation: new Date('<%= creation.toISOString() %>'),
11
13
  parsers: EDM_PARSERS,
12
14
  models: {<% for(const model of models) { %>
13
- '<%= model.entityType() %>': <%= model.importedName %>, <% } %>
15
+ '<%= model.entityType() %>': <%= model.importedName(imports) %>, <% } %>
14
16
  },
15
17
  collections: {<% for(const col of collections) { %>
16
- '<%= col.entityType() %>': <%= col.importedName %>, <% } %>
18
+ '<%= col.entityType() %>': <%= col.importedName(imports) %>, <% } %>
17
19
  }
18
20
  }) as ODataApiConfig;
package/schematics/apigen/files/collection/__fileName__.ts CHANGED
@@ -12,9 +12,13 @@ import {
12
12
  } from 'angular-odata';<% for (let imp of imports) { %>
13
13
  import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
14
14
 
15
+ // #region Custom
16
+ // #endregion Custom
15
17
  export class <%= classify(name) %><E extends <%= entity.name() %>, M extends <%= model.name() %><E>> extends <% if (baseType) { %><%= toTypescriptType(baseType) %><E, M><% } else { %>ODataCollection<E, M><% } %> {
16
18
  <% for (let cal of callables) { %>
17
19
  // <%= cal.name() %>
18
20
  <%= cal.callableMethod() %>
19
21
  <% } %>
22
+ // #region Custom
23
+ // #endregion Custom
20
24
  }
package/schematics/apigen/files/entity/__fileName__.ts CHANGED
@@ -1,8 +1,12 @@
1
- import { Duration } from 'angular-odata';
1
+ <% if (hasDurationProperties) { %>import { Duration } from 'angular-odata';<% } %>
2
2
  <% if (hasGeoProperties) { %>import { <% for (let p of geoProperties) { %><%= p.type() %>,<% } %> } from 'geojson';<% } %><% for (let imp of imports) { %>
3
3
  import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
4
4
 
5
+ // #region Custom
6
+ // #endregion Custom
5
7
  export const <%= type %> = '<%= fullName %>';
6
8
  export interface <%= classify(name) %><% if (baseType) { %> extends <%= toTypescriptType(baseType) %><% } %> {<% for(let prop of properties) { %>
7
- <%= prop.name() %>: <%= prop.type() %>;<% } %>
9
+ <%= prop.name() %>: <%= prop.type(imports) %>;<% } %>
10
+ // #region Custom
11
+ // #endregion Custom
8
12
  }
package/schematics/apigen/files/entitycontainer-service/__fileName__.ts CHANGED
@@ -10,9 +10,13 @@ import { ODataClient,
10
10
  EntityKey } from 'angular-odata';<% for (let imp of imports) { %>
11
11
  import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
12
12
 
13
+ // #region Custom
14
+ // #endregion Custom
13
15
  @Injectable()
14
16
  export class <%= classify(name) %> extends ODataBaseService {
15
17
  constructor(client: ODataClient) {
16
18
  super(client, '<%= path %>', '<%= type %>');
17
19
  }
20
+ // #region Custom
21
+ // #endregion Custom
18
22
  }
package/schematics/apigen/files/entityset-service/__fileName__.ts CHANGED
@@ -9,6 +9,8 @@ import { ODataClient,
9
9
  EntityKey } from 'angular-odata';<% for (let imp of imports) { %>
10
10
  import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
11
11
 
12
+ // #region Custom
13
+ // #endregion Custom
12
14
  @Injectable()
13
15
  export class <%= classify(name) %> extends ODataEntitySetService<<%= toTypescriptType(type) %>> {
14
16
  constructor(client: ODataClient) {
@@ -24,4 +26,6 @@ export class <%= classify(name) %> extends ODataEntitySetService<<%= toTypescrip
24
26
  <%= cal.resourceFunction() %>
25
27
  <%= cal.callableFunction() %>
26
28
  <% } %>
29
+ // #region Custom
30
+ // #endregion Custom
27
31
  }
package/schematics/apigen/files/enum/__fileName__.ts CHANGED
@@ -1,4 +1,8 @@
1
+ // #region Custom
2
+ // #endregion Custom
1
3
  export const <%= type %> = '<%= fullName %>';
2
4
  export enum <%= classify(name) %> {<% for(let value of values) { %>
3
5
  <%= value.name() %> = <%= value.value() %>,<% } %>
6
+ // #region Custom
7
+ // #endregion Custom
4
8
  }
package/schematics/apigen/files/index/__fileName__.ts CHANGED
@@ -1,2 +1,4 @@
1
1
  <% for (let imp of imports) { %>export * from '<%= imp.path() %>';
2
2
  <% } %>
3
+ // #region Custom
4
+ // #endregion Custom
package/schematics/apigen/files/model/__fileName__.ts CHANGED
@@ -10,17 +10,19 @@ import {
10
10
  ODataOptions,
11
11
  ODataQueryArgumentsOptions,
12
12
  ODataFunctionOptions,
13
- ODataActionOptions,
14
- Duration,
13
+ ODataActionOptions,<% if (hasDurationFields) { %>
14
+ Duration,<% } %>
15
15
  } from 'angular-odata';
16
16
  <% if (hasGeoFields) { %>import { <% for (let f of geoFields) { %><%= f.type() %>,<% } %> } from 'geojson';<% } %><% for (let imp of imports) { %>
17
17
  import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
18
18
 
19
+ // #region Custom
20
+ // #endregion Custom
19
21
  @Model()
20
22
  export class <%= classify(name) %><E extends <%= entity.name() %>> extends <% if (baseType) { %><%= toTypescriptType(baseType) %><E><% } else { %>ODataModel<E><% } %> {
21
23
  <% for (let field of fields) { %>@ModelField()
22
- declare <%= field.name() %>: <%= field.type() %>;
23
- <%= field.resource() %><%= field.getter() %><%= field.setter() %><%= field.fetch() %>
24
+ declare <%= field.name() %>: <%= field.type(imports) %>;
25
+ <%= field.resource(imports) %><%= field.getter(imports) %><%= field.setter(imports) %><%= field.fetch(imports) %>
24
26
  <% } %>
25
27
  <% for (let cal of callables) { %>
26
28
  // <%= cal.name() %>
@@ -28,4 +30,6 @@ export class <%= classify(name) %><E extends <%= entity.name() %>> extends <% if
28
30
  <% } %>
29
31
  <% for (let nav of navigations) { %><%= nav %>
30
32
  <% } %>
33
+ // #region Custom
34
+ // #endregion Custom
31
35
  }
package/schematics/apigen/files/module/__fileName__.ts CHANGED
@@ -1,6 +1,8 @@
1
1
  import { NgModule } from '@angular/core';<% for (let imp of imports) { %>
2
2
  import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
3
3
 
4
+ // #region Custom
5
+ // #endregion Custom
4
6
  @NgModule({
5
7
  providers: [<% for(let service of services) { %>
6
8
  <%= service.name() %>,<% } %>
package/schematics/apigen/files/singleton-service/__fileName__.ts CHANGED
@@ -10,9 +10,13 @@ import { ODataClient,
10
10
  EntityKey } from 'angular-odata';<% for (let imp of imports) { %>
11
11
  import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
12
12
 
13
+ // #region Custom
14
+ // #endregion Custom
13
15
  @Injectable()
14
16
  export class <%= classify(name) %> extends ODataSingletonService<<%= toTypescriptType(type) %>> {
15
17
  constructor(client: ODataClient) {
16
18
  super(client, '<%= path %>', '<%= type %>');
17
19
  }
20
+ // #region Custom
21
+ // #endregion Custom
18
22
  }
package/schematics/apigen/index.js CHANGED
@@ -20,6 +20,11 @@ const package_1 = require("./angular/package");
20
20
  const utils = {
21
21
  toTypescriptType: utils_1.toTypescriptType,
22
22
  };
23
+ function replaceBefore(s, subString, replacement, index) {
24
+ const head = s.substring(0, index);
25
+ const tail = s.substring(index);
26
+ return head + tail.replace(subString, replacement);
27
+ }
23
28
  function apigen(options) {
24
29
  return (tree, context) => __awaiter(this, void 0, void 0, function* () {
25
30
  var _a;
@@ -49,18 +54,58 @@ function apigen(options) {
49
54
  pkg.resolveImports();
50
55
  return (0, schematics_1.chain)(pkg
51
56
  .sources()
52
- .map((s) => {
53
- return (0, schematics_1.apply)(s.template(), [
57
+ .map((b) => {
58
+ const imports = b.imports();
59
+ return (0, schematics_1.apply)(b.template(), [
54
60
  (0, schematics_1.template)(Object.assign(Object.assign(Object.assign({
55
- name: s.name(),
56
- fileName: s.fileName(),
57
- fullName: s.fullName(),
58
- imports: s.imports(),
59
- }, s.variables()), core_1.strings), utils)),
60
- (0, schematics_1.move)((0, core_1.normalize)(`${modulePath}/${s.directory()}`)),
61
+ name: b.name(),
62
+ fileName: b.fileName(),
63
+ fullName: b.fullName(),
64
+ imports: imports,
65
+ }, b.variables(imports)), core_1.strings), utils)),
66
+ (0, schematics_1.move)((0, core_1.normalize)(`${modulePath}/${b.directory()}`)),
67
+ (0, schematics_1.forEach)((fileEntry) => {
68
+ var _a, _b, _c;
69
+ // Example: Overwrite existing files if needed
70
+ if (tree.exists(fileEntry.path)) {
71
+ let oldContent = (_b = (_a = tree.read(fileEntry.path)) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
72
+ let newContent = fileEntry.content.toString();
73
+ if (oldContent === newContent) {
74
+ return fileEntry; // No changes, skip overwrite
75
+ }
76
+ // Find and replace al sections between // #region Custom and // #endregion Custom
77
+ const customSectionRegex = /\/\/ #region Custom[\s\S]*?\/\/ #endregion Custom/g;
78
+ const oldCustomSections = oldContent.matchAll(customSectionRegex);
79
+ const newCustomSections = newContent.matchAll(customSectionRegex);
80
+ let oldCustomSectionsArray = [...oldCustomSections];
81
+ let newCustomSectionsArray = [...newCustomSections];
82
+ if (oldCustomSectionsArray.length !== newCustomSectionsArray.length) {
83
+ console.warn(`Warning: The number of custom sections in the old and new content does not match for file ${fileEntry.path}. Custom sections will not be preserved.`);
84
+ }
85
+ else {
86
+ for (let i = oldCustomSectionsArray.length - 1; i >= 0; i--) {
87
+ const oldSection = oldCustomSectionsArray[i];
88
+ const newSection = newCustomSectionsArray[i];
89
+ if (oldSection && newSection) {
90
+ newContent = replaceBefore(newContent, newSection[0], oldSection[0], (_c = newSection.index) !== null && _c !== void 0 ? _c : 0);
91
+ }
92
+ }
93
+ }
94
+ tree.overwrite(fileEntry.path, newContent);
95
+ return null;
96
+ }
97
+ // Return the fileEntry to be added to the destination tree
98
+ return fileEntry;
99
+ })
61
100
  ]);
62
101
  })
63
102
  .reduce((rules, s) => [...rules, (0, schematics_1.mergeWith)(s, schematics_1.MergeStrategy.Overwrite)], []));
103
+ })
104
+ .then((rules) => {
105
+ for (const rule in rules) {
106
+ console.log(`Generated rule for ${rule}`);
107
+ }
108
+ return rules;
64
109
  });
65
110
  });
66
111
  }
package/schematics/apigen/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/angular-odata/schematics/apigen/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/angular-odata/schematics/apigen/index.ts"],"names":[],"mappings":"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"}
package/schematics/random.d.ts CHANGED
@@ -1 +1,4 @@
1
- export declare const getRandomName: () => string;
1
+ export declare const getRandomName: ({ prefix, suffix }?: {
2
+ prefix?: string;
3
+ suffix?: string;
4
+ }) => string;
package/schematics/random.js CHANGED
@@ -593,12 +593,12 @@ const Right = [
593
593
  function getRandomInt(max) {
594
594
  return Math.floor(Math.random() * max);
595
595
  }
596
- const getRandomName = () => {
596
+ const getRandomName = ({ prefix = "", suffix = "" } = {}) => {
597
597
  let name = '';
598
598
  while (name == '' || name == 'BoringWozniak')
599
599
  /* Steve Wozniak is not boring */
600
600
  name = `${Left[getRandomInt(Left.length)]}${Right[getRandomInt(Right.length)]}`;
601
- return name;
601
+ return `${prefix}${name}${suffix}`;
602
602
  };
603
603
  exports.getRandomName = getRandomName;
604
604
  //# sourceMappingURL=random.js.map
package/schematics/random.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"random.js","sourceRoot":"","sources":["../../../projects/angular-odata/schematics/random.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"random.js","sourceRoot":"","sources":["../../../projects/angular-odata/schematics/random.ts"],"names":[],"mappings":"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"}