angular-odata 0.144.1 → 0.144.2

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 (7) hide show
  1. package/package.json +1 -1
  2. package/schematics/apigen/angular/package.js +8 -0
  3. package/schematics/apigen/angular/package.js.map +1 -1
  4. package/schematics/apigen/angular/service.d.ts +6 -0
  5. package/schematics/apigen/angular/service.js +10 -0
  6. package/schematics/apigen/angular/service.js.map +1 -1
  7. package/schematics/apigen/files/entityset-service/__fileName__.ts +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "angular-odata",
3
- "version": "0.144.1",
3
+ "version": "0.144.2",
4
4
  "license": "MIT",
5
5
  "description": "Client side OData typescript library for Angular",
6
6
  "repository": {
package/schematics/apigen/angular/package.js CHANGED
@@ -70,6 +70,14 @@ class Package {
70
70
  this.services.push(service);
71
71
  for (let entitySet of (_e = entityContainer.EntitySet) !== null && _e !== void 0 ? _e : []) {
72
72
  const service = new service_1.Service(this, options, entitySet);
73
+ const model = this.models.find(m => m.entityType() === service.entityType());
74
+ if (model !== undefined) {
75
+ service.setModel(model);
76
+ }
77
+ const collection = this.collections.find(c => c.entityType() === service.entityType());
78
+ if (collection !== undefined) {
79
+ service.setCollection(collection);
80
+ }
73
81
  this.module.addService(service);
74
82
  this.index.addDependency(service);
75
83
  this.services.push(service);
package/schematics/apigen/angular/package.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/package.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/package.ts"],"names":[],"mappings":"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"}
package/schematics/apigen/angular/service.d.ts CHANGED
@@ -6,14 +6,20 @@ import { Source } from '@angular-devkit/schematics';
6
6
  import { Schema as ApiGenSchema } from '../schema';
7
7
  import { Package } from './package';
8
8
  import { Import } from './import';
9
+ import { Collection } from './collection';
10
+ import { Model } from './model';
9
11
  export declare class Service extends Base {
10
12
  protected edmElement: CsdlEntitySet | CsdlEntityContainer | CsdlSingleton;
13
+ model?: Model;
14
+ collection?: Collection;
11
15
  constructor(pkg: Package, options: ApiGenSchema, edmElement: CsdlEntitySet | CsdlEntityContainer | CsdlSingleton);
12
16
  template(): Source;
13
17
  variables(imports: Import[]): {
14
18
  [name: string]: any;
15
19
  };
16
20
  entityType(): string;
21
+ setModel(model: Model): void;
22
+ setCollection(collection: Collection): void;
17
23
  name(): string;
18
24
  fileName(): string;
19
25
  directory(): string;
package/schematics/apigen/angular/service.js CHANGED
@@ -27,6 +27,8 @@ class Service extends base_1.Base {
27
27
  : this.edmElement instanceof csdl_singleton_1.CsdlSingleton
28
28
  ? this.edmElement.Type
29
29
  : this.options.name,
30
+ model: this.model,
31
+ collection: this.collection,
30
32
  callables: (_a = this.callables) !== null && _a !== void 0 ? _a : [],
31
33
  };
32
34
  }
@@ -37,6 +39,14 @@ class Service extends base_1.Base {
37
39
  ? this.edmElement.Type
38
40
  : '';
39
41
  }
42
+ setModel(model) {
43
+ this.model = model;
44
+ this.addDependency(model);
45
+ }
46
+ setCollection(collection) {
47
+ this.collection = collection;
48
+ this.addDependency(collection);
49
+ }
40
50
  name() {
41
51
  return core_1.strings.classify(this.edmElement.name()) + 'Service';
42
52
  }
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/entityset-service/__fileName__.ts CHANGED
@@ -17,10 +17,10 @@ export class <%= classify(name) %> extends ODataEntitySetService<<%= toTypescrip
17
17
  super(client, '<%= path %>', '<%= type %>');
18
18
  }
19
19
  <%= camelize(toTypescriptType(type)) %>Model(entity?: Partial<<%= toTypescriptType(type) %>>) {
20
- return this.model(entity);
20
+ return this.model<<%= model.importedName(imports) %><<%= toTypescriptType(type) %>>>(entity);
21
21
  }
22
22
  <%= camelize(toTypescriptType(type)) %>Collection(entities?: Partial<<%= toTypescriptType(type) %>>[]) {
23
- return this.collection(entities);
23
+ return this.collection<<%= model.importedName(imports) %><<%= toTypescriptType(type) %>>, <%= collection.importedName(imports) %><<%= toTypescriptType(type) %>, <%= model.importedName(imports) %><<%= toTypescriptType(type) %>>>>(entities);
24
24
  }<% for (let cal of callables) { %>
25
25
  // <%= cal.name() %>
26
26
  <%= cal.resourceFunction() %>