angular-odata 0.140.1 → 0.142.0

package/schematics/apigen/angular/enum.d.ts

@@ -2,6 +2,7 @@ import { CsdlEnumType, CsdlMember } from '../metadata/csdl/csdl-enum-type';
 import { Base } from './base';
 import { Source } from '@angular-devkit/schematics';
 import { Schema as ApiGenSchema } from '../schema';
+import { Package } from './package';
 export declare class EnumValue {
     private edmType;
     constructor(edmType: CsdlMember);
@@ -10,7 +11,7 @@ export declare class EnumValue {
 }
 export declare class Enum extends Base {
     protected edmType: CsdlEnumType;
-    constructor(options: ApiGenSchema, edmType: CsdlEnumType);
+    constructor(pkg: Package, options: ApiGenSchema, edmType: CsdlEnumType);
     template(): Source;
     variables(): {
         [name: string]: any;

package/schematics/apigen/angular/enum.js

@@ -17,8 +17,8 @@ class EnumValue {
 }
 exports.EnumValue = EnumValue;
 class Enum extends base_1.Base {
-    constructor(options, edmType) {
-        super(options);
+    constructor(pkg, options, edmType) {
+        super(pkg, options);
         this.edmType = edmType;
     }
     template() {

package/schematics/apigen/angular/enum.js.map

@@ -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;AAGzD,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,OAAqB,EACX,OAAqB;QAE/B,KAAK,CAAC,OAAO,CAAC,CAAC;QAFL,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;AArCD,oBAqCC"}
+{"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"}

package/schematics/apigen/angular/import.d.ts

@@ -1,6 +1,8 @@
 export declare class Import {
     names: string[];
+    aliases: string[];
     from: string;
-    constructor(names: string[], from: string);
+    constructor(names: string[], aliases: string[], from: string);
     path(): string;
+    resolve(): string[];
 }

package/schematics/apigen/angular/import.js

@@ -2,17 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Import = void 0;
 class Import {
-    constructor(names, from) {
+    constructor(names, aliases, from) {
         this.names = [];
+        this.aliases = [];
         this.names = names;
+        this.aliases = aliases;
         this.from = from;
     }
     path() {
-        var path = this.from.toString();
+        let path = this.from.toString();
         if (!path.startsWith('../'))
             path = `./${path}`;
         return path;
     }
+    resolve() {
+        let names = [];
+        for (let i = 0; i < this.names.length; i++) {
+            if (this.names[i] !== this.aliases[i]) {
+                names.push(`${this.names[i]} as ${this.aliases[i]}`);
+            }
+            else {
+                names.push(this.names[i]);
+            }
+        }
+        return names;
+    }
 }
 exports.Import = Import;
 //# sourceMappingURL=import.js.map

package/schematics/apigen/angular/import.js.map

@@ -1 +1 @@
-{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/import.ts"],"names":[],"mappings":";;;AAAA,MAAa,MAAM;IAGjB,YAAmB,KAAe,EAAE,IAAY;QAFzC,UAAK,GAAa,EAAE,CAAC;QAG1B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,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;CACF;AAbD,wBAaC"}
+{"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"}

package/schematics/apigen/angular/model.d.ts

@@ -0,0 +1,40 @@
+import { Base } from './base';
+import { CsdlComplexType, CsdlEntityType } from '../metadata/csdl/csdl-structured-type';
+import { Source } from '@angular-devkit/schematics';
+import { Schema as ApiGenSchema } from '../schema';
+import { CsdlNavigationProperty, CsdlProperty } from '../metadata/csdl/csdl-structural-property';
+import { Entity } from './entity';
+import { Package } from './package';
+import { CsdlNavigationPropertyBinding } from '../metadata/csdl/csdl-navigation-property-binding';
+export declare class ModelField {
+    protected model: Model;
+    protected edmType: CsdlProperty | CsdlNavigationProperty;
+    constructor(model: Model, edmType: CsdlProperty | CsdlNavigationProperty);
+    name(): string;
+    type(): string;
+    resource(): string;
+    getter(): string;
+    setter(): string;
+    fetch(): string;
+    isGeoSpatial(): boolean;
+}
+export declare class Model extends Base {
+    protected edmType: CsdlEntityType | CsdlComplexType;
+    protected entity: Entity;
+    constructor(pkg: Package, options: ApiGenSchema, edmType: CsdlEntityType | CsdlComplexType, entity: Entity);
+    entityType(): string;
+    template(): Source;
+    variables(): {
+        [name: string]: any;
+    };
+    name(): string;
+    fileName(): string;
+    directory(): string;
+    fullName(): string;
+    importTypes(): string[];
+    navitations(): string[];
+    renderNavigationPropertyBindings(bindings: CsdlNavigationPropertyBinding[] | undefined): string[];
+    fields(): ModelField[];
+    geoFields(): ModelField[];
+    hasGeoFields(): boolean;
+}

package/schematics/apigen/angular/model.js

@@ -0,0 +1,267 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Model = exports.ModelField = void 0;
+const core_1 = require("@angular-devkit/core");
+const base_1 = require("./base");
+const schematics_1 = require("@angular-devkit/schematics");
+const csdl_structural_property_1 = require("../metadata/csdl/csdl-structural-property");
+const utils_1 = require("../utils");
+class ModelField {
+    constructor(model, edmType) {
+        this.model = model;
+        this.edmType = edmType;
+    }
+    name() {
+        const required = !(this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty || this.edmType.Nullable);
+        const name = this.edmType.Name;
+        return name + (!required ? '?' : '');
+    }
+    type() {
+        const pkg = this.model.getPackage();
+        const enumType = pkg.findEnum(this.edmType.Type);
+        const entityType = pkg.findEntity(this.edmType.Type);
+        let type = 'any';
+        if (enumType !== undefined) {
+            type = enumType.importedName;
+            type += this.edmType.Collection ? '[]' : '';
+        }
+        else if (entityType !== undefined) {
+            if (this.edmType.Collection) {
+                const collection = pkg.findCollection(this.edmType.Type);
+                const model = pkg.findModel(this.edmType.Type);
+                type = `${collection.importedName}<${entityType.importedName}, ${model.importedName}<${entityType.importedName}>>`;
+            }
+            else {
+                const model = pkg.findModel(this.edmType.Type);
+                type = `${model.importedName}<${entityType.importedName}>`;
+            }
+        }
+        else {
+            type = (0, utils_1.toTypescriptType)(this.edmType.Type);
+            type += this.edmType.Collection ? '[]' : '';
+        }
+        if (this.edmType.Nullable && !this.edmType.Collection) {
+            type += ' | null';
+        }
+        return type;
+    }
+    resource() {
+        const pkg = this.model.getPackage();
+        const resourceName = `$$${this.edmType.Name}`;
+        if (this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty) {
+            const entity = pkg.findEntity(this.edmType.Type);
+            return `public ${resourceName}() {
+    return this.navigationProperty<${entity === null || entity === void 0 ? void 0 : entity.importedName}>('${this.edmType.Name}');
+  }
+  `;
+        }
+        else {
+            return `public ${resourceName}() {
+    return this.property<${this.type()}>('${this.edmType.Name}');
+  }
+  `;
+        }
+    }
+    getter() {
+        const pkg = this.model.getPackage();
+        const getterName = `$${this.edmType.Name}`;
+        if (this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty) {
+            const entity = pkg.findEntity(this.edmType.Type);
+            return `public ${getterName}() {
+    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};
+  }
+  `;
+        }
+        else {
+            return `public ${getterName}() {
+    return this.getAttribute<${this.type()}>('${this.edmType.Name}') as ${this.type()};
+  }
+  `;
+        }
+    }
+    setter() {
+        const pkg = this.model.getPackage();
+        const setterName = `${this.edmType.Name}$$`;
+        if (this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty) {
+            const entity = pkg.findEntity(this.edmType.Type);
+            return `public ${setterName}(model: ${this.type()} | null, options?: ODataOptions) {
+    return this.setReference<${entity === null || entity === void 0 ? void 0 : entity.importedName}>('${this.edmType.Name}', model, options);
+  }
+  `;
+        }
+        else {
+            return `
+  `;
+        }
+    }
+    fetch() {
+        const pkg = this.model.getPackage();
+        const fetchName = `${this.edmType.Name}$`;
+        if (this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty) {
+            const entity = pkg.findEntity(this.edmType.Type);
+            return `public ${fetchName}(options?: ODataQueryArgumentsOptions<${entity === null || entity === void 0 ? void 0 : entity.importedName}>) {
+    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}>;
+  }
+`;
+        }
+        else {
+            return `public ${fetchName}(options?: ODataQueryArgumentsOptions<${this.type()}>) {
+    return this.fetchAttribute<${this.type()}>('${this.edmType.Name}', options) as Observable<${this.type()}>;
+  }
+`;
+        }
+    }
+    isGeoSpatial() {
+        return (this.edmType.Type.startsWith('Edm.Geography') || this.edmType.Type.startsWith('Edm.Geometry'));
+    }
+}
+exports.ModelField = ModelField;
+class Model extends base_1.Base {
+    constructor(pkg, options, edmType, entity) {
+        super(pkg, options);
+        this.edmType = edmType;
+        this.entity = entity;
+    }
+    entityType() {
+        return this.edmType.fullName();
+    }
+    template() {
+        return (0, schematics_1.url)('./files/model');
+    }
+    variables() {
+        var _a;
+        return {
+            type: this.name() + 'Model',
+            baseType: this.edmType.BaseType ? this.edmType.BaseType + 'Model' : null,
+            entity: this.entity,
+            fields: this.fields(),
+            hasGeoFields: this.hasGeoFields(),
+            geoFields: this.geoFields(),
+            callables: (_a = this.callables) !== null && _a !== void 0 ? _a : [],
+            navigations: this.navitations(),
+        };
+    }
+    name() {
+        return core_1.strings.classify(this.edmType.name()) + 'Model';
+    }
+    fileName() {
+        return core_1.strings.dasherize(this.edmType.name()) + '.model';
+    }
+    directory() {
+        return this.edmType.namespace().replace(/\./g, '/');
+    }
+    fullName() {
+        return this.edmType.fullName() + 'Model';
+    }
+    importTypes() {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const pkg = this.getPackage();
+        const imports = [this.entity.fullName()];
+        if (this.edmType.BaseType) {
+            imports.push(this.edmType.BaseType);
+            imports.push(this.edmType.BaseType + 'Model');
+        }
+        for (let prop of (_b = (_a = this.edmType) === null || _a === void 0 ? void 0 : _a.Property) !== null && _b !== void 0 ? _b : []) {
+            if (!prop.Type.startsWith('Edm.')) {
+                imports.push(prop.Type);
+                imports.push(prop.Type + 'Model');
+                if (prop.Collection) {
+                    imports.push(prop.Type + 'Collection');
+                }
+            }
+        }
+        for (let prop of (_d = (_c = this.edmType) === null || _c === void 0 ? void 0 : _c.NavigationProperty) !== null && _d !== void 0 ? _d : []) {
+            if (!prop.Type.startsWith('Edm.')) {
+                imports.push(prop.Type);
+                imports.push(prop.Type + 'Model');
+                if (prop.Collection) {
+                    imports.push(prop.Type + 'Collection');
+                }
+            }
+        }
+        for (let callable of (_e = this.callables) !== null && _e !== void 0 ? _e : []) {
+            imports.push(...callable.importTypes());
+        }
+        const service = pkg.findEntitySet(this.edmType.fullName());
+        if (service) {
+            imports.push(...((_f = service.NavigationPropertyBinding) !== null && _f !== void 0 ? _f : []).map((b) => b.entityType()));
+            imports.push(...((_g = service.NavigationPropertyBinding) !== null && _g !== void 0 ? _g : [])
+                .map((b) => b.resolvePropertyType((fullName) => pkg.findEntityType(fullName)))
+                .filter((e) => e)
+                .map((e) => e.fullName()));
+            imports.push(...((_h = service.NavigationPropertyBinding) !== null && _h !== void 0 ? _h : [])
+                .map((b) => b.resolveNavigationPropertyType((fullName) => pkg.findEntityType(fullName)))
+                .filter((e) => e)
+                .map((e) => e.Type));
+        }
+        return imports;
+    }
+    navitations() {
+        var _a, _b;
+        const pkg = this.getPackage();
+        const service = pkg.findEntitySet(this.edmType.fullName());
+        if (service) {
+            const navigations = [];
+            let properties = [];
+            let entity = this.edmType;
+            while (entity) {
+                properties = [...properties, ...((_a = this.edmType.NavigationProperty) !== null && _a !== void 0 ? _a : [])];
+                if (!entity.BaseType) {
+                    break;
+                }
+                entity = this.getPackage().findEntityType(entity.BaseType);
+            }
+            let bindings = (_b = service.NavigationPropertyBinding) === null || _b === void 0 ? void 0 : _b.filter((binding) => properties.every((p) => {
+                const nav = binding.resolveNavigationPropertyType((fullName) => pkg.findEntityType(fullName));
+                return p.Name !== (nav === null || nav === void 0 ? void 0 : nav.Name);
+            }));
+            return this.renderNavigationPropertyBindings(bindings);
+        }
+        return [];
+    }
+    renderNavigationPropertyBindings(bindings) {
+        const pkg = this.getPackage();
+        let result = [];
+        let casts = [];
+        for (let binding of bindings !== null && bindings !== void 0 ? bindings : []) {
+            const nav = binding.resolveNavigationPropertyType((fullName) => pkg.findEntityType(fullName));
+            const isCollection = nav ? nav.Collection : false;
+            const navEntity = nav ? pkg.findEntityType(nav.Type) : undefined;
+            const bindingEntity = pkg.findEntityType(binding.entityType());
+            const propertyEntity = binding.resolvePropertyType((fullName) => pkg.findEntityType(fullName));
+            const entity = pkg.findEntity((navEntity === null || navEntity === void 0 ? void 0 : navEntity.fullName()) || '');
+            if (propertyEntity && bindingEntity && false) {
+            }
+            else {
+                const returnType = isCollection
+                    ? `ODataCollection<${entity === null || entity === void 0 ? void 0 : entity.importedName}, ODataModel<${entity === null || entity === void 0 ? void 0 : entity.importedName}>>`
+                    : `ODataModel<${entity === null || entity === void 0 ? void 0 : entity.importedName}>`;
+                var responseType = isCollection ? 'collection' : 'model';
+                var methodName = `as${propertyEntity === null || propertyEntity === void 0 ? void 0 : propertyEntity.Name}` +
+                    (nav === null || nav === void 0 ? void 0 : nav.Name.substring(0, 1).toUpperCase()) +
+                    (nav === null || nav === void 0 ? void 0 : nav.Name.substring(1));
+                var castEntity = pkg.findEntity((propertyEntity === null || propertyEntity === void 0 ? void 0 : propertyEntity.fullName()) || '');
+                // Navigation
+                result.push(`public ${methodName}(options?: ODataQueryArgumentsOptions<${entity === null || entity === void 0 ? void 0 : entity.importedName}>) {
+    return this.fetchNavigationProperty<${entity === null || entity === void 0 ? void 0 : entity.importedName}>('${binding.Path}', '${responseType}', options) as Observable<${returnType}>;
+  }`);
+            }
+        }
+        return result;
+    }
+    fields() {
+        var _a, _b;
+        return [
+            ...((_a = this.edmType.Property) !== null && _a !== void 0 ? _a : []).map((p) => new ModelField(this, p)),
+            ...((_b = this.edmType.NavigationProperty) !== null && _b !== void 0 ? _b : []).map((p) => new ModelField(this, p)),
+        ];
+    }
+    geoFields() {
+        return this.fields().filter((p) => p.isGeoSpatial());
+    }
+    hasGeoFields() {
+        return this.geoFields().length > 0;
+    }
+}
+exports.Model = Model;
+//# sourceMappingURL=model.js.map

package/schematics/apigen/angular/model.js.map

@@ -0,0 +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

@@ -2,9 +2,11 @@ import { Base } from './base';
 import { Source } from '@angular-devkit/schematics';
 import { Schema as ApiGenSchema } from '../schema';
 import { Service } from './service';
+import { Package } from './package';
 export declare class Module extends Base {
+    protected pkg: Package;
     services: Service[];
-    constructor(options: ApiGenSchema);
+    constructor(pkg: Package, options: ApiGenSchema);
     template(): Source;
     variables(): {
         [name: string]: any;

package/schematics/apigen/angular/module.js

@@ -5,8 +5,9 @@ const core_1 = require("@angular-devkit/core");
 const base_1 = require("./base");
 const schematics_1 = require("@angular-devkit/schematics");
 class Module extends base_1.Base {
-    constructor(options) {
-        super(options);
+    constructor(pkg, options) {
+        super(pkg, options);
+        this.pkg = pkg;
         this.services = [];
     }
     template() {

package/schematics/apigen/angular/module.js.map

@@ -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;AAIzD,MAAa,MAAO,SAAQ,WAAI;IAE9B,YAAY,OAAqB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;QAFjB,aAAQ,GAAc,EAAE,CAAC;IAGzB,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;AAhCD,wBAgCC"}
+{"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"}

package/schematics/apigen/angular/package.d.ts

@@ -0,0 +1,38 @@
+import { Base, Callable, Index, Metadata } from './base';
+import { Schema as ApiGenSchema } from '../schema';
+import { Module } from './module';
+import { ApiConfig } from './api-config';
+import { ODataMetadata } from '../metadata';
+import { Enum } from './enum';
+import { Entity } from './entity';
+import { Model } from './model';
+import { Collection } from './collection';
+import { Service } from './service';
+import { CsdlEnumType } from '../metadata/csdl/csdl-enum-type';
+import { CsdlComplexType, CsdlEntityType } from '../metadata/csdl/csdl-structured-type';
+import { CsdlEntitySet } from '../metadata/csdl/csdl-entity-set';
+export declare class Package {
+    protected options: ApiGenSchema;
+    metadata: Metadata;
+    module: Module;
+    config: ApiConfig;
+    index: Index;
+    enums: Enum[];
+    entities: Entity[];
+    services: Service[];
+    models: Model[];
+    collections: Collection[];
+    functions: Callable[];
+    actions: Callable[];
+    constructor(options: ApiGenSchema, meta: ODataMetadata);
+    resolveImports(): void;
+    sources(): Base[];
+    findEnum(fullName: string): Enum | undefined;
+    findEnumType(fullName: string): CsdlEnumType | undefined;
+    findEntity(fullName: string): Entity | undefined;
+    findEntityType(fullName: string): CsdlEntityType | undefined;
+    findEntitySet(fullName: string): CsdlEntitySet | undefined;
+    findComplexType(fullName: string): CsdlComplexType | undefined;
+    findModel(fullName: string): Model | undefined;
+    findCollection(fullName: string): Collection | undefined;
+}

package/schematics/apigen/angular/package.js

@@ -0,0 +1,166 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Package = void 0;
+const base_1 = require("./base");
+const module_1 = require("./module");
+const api_config_1 = require("./api-config");
+const enum_1 = require("./enum");
+const entity_1 = require("./entity");
+const model_1 = require("./model");
+const collection_1 = require("./collection");
+const service_1 = require("./service");
+class Package {
+    constructor(options, meta) {
+        var _a, _b, _c, _d, _e, _f;
+        this.options = options;
+        this.enums = [];
+        this.entities = [];
+        this.services = [];
+        this.models = [];
+        this.collections = [];
+        this.functions = [];
+        this.actions = [];
+        this.metadata = new base_1.Metadata(this, options, meta);
+        this.module = new module_1.Module(this, options);
+        this.config = new api_config_1.ApiConfig(this, options);
+        this.index = new base_1.Index(this, options);
+        this.index.addDependency(this.module);
+        this.index.addDependency(this.config);
+        for (let s of meta.Schemas) {
+            const namespace = s.Namespace;
+            // Enum
+            for (const enumType of (_a = s.EnumType) !== null && _a !== void 0 ? _a : []) {
+                const enu = new enum_1.Enum(this, options, enumType);
+                this.enums.push(enu);
+                this.index.addDependency(enu);
+            }
+            // Entity
+            for (let entityType of (_b = s.EntityType) !== null && _b !== void 0 ? _b : []) {
+                const entity = new entity_1.Entity(this, options, entityType);
+                this.entities.push(entity);
+                this.index.addDependency(entity);
+                if (options.models) {
+                    const model = new model_1.Model(this, options, entityType, entity);
+                    this.index.addDependency(model);
+                    this.models.push(model);
+                    const collection = new collection_1.Collection(this, options, entityType, entity, model);
+                    this.index.addDependency(collection);
+                    this.collections.push(collection);
+                }
+            }
+            // Complex
+            for (let complexType of (_c = s.ComplexType) !== null && _c !== void 0 ? _c : []) {
+                const entity = new entity_1.Entity(this, options, complexType);
+                this.index.addDependency(entity);
+                this.entities.push(entity);
+                if (options.models) {
+                    const model = new model_1.Model(this, options, complexType, entity);
+                    this.index.addDependency(model);
+                    this.models.push(model);
+                    const collection = new collection_1.Collection(this, options, complexType, entity, model);
+                    this.index.addDependency(collection);
+                    this.collections.push(collection);
+                }
+            }
+            // Container
+            for (let entityContainer of (_d = s.EntityContainer) !== null && _d !== void 0 ? _d : []) {
+                const service = new service_1.Service(this, options, entityContainer);
+                this.module.addService(service);
+                this.index.addDependency(service);
+                this.services.push(service);
+                for (let entitySet of (_e = entityContainer.EntitySet) !== null && _e !== void 0 ? _e : []) {
+                    const service = new service_1.Service(this, options, entitySet);
+                    this.module.addService(service);
+                    this.index.addDependency(service);
+                    this.services.push(service);
+                }
+                for (let singleton of (_f = entityContainer.Singleton) !== null && _f !== void 0 ? _f : []) {
+                    const service = new service_1.Service(this, options, singleton);
+                    this.module.addService(service);
+                    this.index.addDependency(service);
+                    this.services.push(service);
+                }
+            }
+        }
+        this.functions = meta.functions().reduce((callables, f) => {
+            const callable = callables.find((c) => c.name() == f.Name);
+            if (callable !== undefined) {
+                callable.addOverload(f);
+            }
+            else {
+                callables.push(new base_1.Callable(f));
+            }
+            return callables;
+        }, []);
+        this.actions = meta.actions().reduce((callables, a) => {
+            const callable = callables.find((c) => c.name() == a.Name);
+            if (callable !== undefined) {
+                callable.addOverload(a);
+            }
+            else {
+                callables.push(new base_1.Callable(a));
+            }
+            return callables;
+        }, []);
+        this.services.forEach((s) => {
+            s.addCallables(this.functions.filter((f) => { var _a; return f.isBound() && ((_a = f.bindingParameter()) === null || _a === void 0 ? void 0 : _a.Type) === s.entityType(); }));
+            s.addCallables(this.actions.filter((f) => { var _a; return f.isBound() && ((_a = f.bindingParameter()) === null || _a === void 0 ? void 0 : _a.Type) === s.entityType(); }));
+        });
+        this.models.forEach((m) => {
+            m.addCallables(this.functions.filter((f) => { var _a; return f.isBound() && ((_a = f.bindingParameter()) === null || _a === void 0 ? void 0 : _a.Type) === m.entityType(); }));
+            m.addCallables(this.actions.filter((f) => { var _a; return f.isBound() && ((_a = f.bindingParameter()) === null || _a === void 0 ? void 0 : _a.Type) === m.entityType(); }));
+        });
+        this.collections.forEach((c) => {
+            c.addCallables(this.functions.filter((f) => { var _a; return f.isBound() && ((_a = f.bindingParameter()) === null || _a === void 0 ? void 0 : _a.Type) === c.entityType(); }));
+            c.addCallables(this.actions.filter((f) => { var _a; return f.isBound() && ((_a = f.bindingParameter()) === null || _a === void 0 ? void 0 : _a.Type) === c.entityType(); }));
+        });
+    }
+    resolveImports() {
+        const sources = this.sources();
+        for (let s of sources) {
+            for (let t of s.importTypes()) {
+                s.addDependencies(sources.filter((s) => s.fullName() === t));
+            }
+        }
+    }
+    sources() {
+        const sources = [
+            ...this.enums,
+            ...this.entities,
+            ...this.models,
+            ...this.collections,
+            ...this.services,
+            this.metadata,
+            this.index,
+            this.module,
+            this.config,
+        ];
+        return sources;
+    }
+    findEnum(fullName) {
+        return this.enums.find((e) => e.fullName() === fullName);
+    }
+    findEnumType(fullName) {
+        return this.metadata.findEnumType(fullName);
+    }
+    findEntity(fullName) {
+        return this.entities.find((e) => e.fullName() === fullName);
+    }
+    findEntityType(fullName) {
+        return this.metadata.findEntityType(fullName);
+    }
+    findEntitySet(fullName) {
+        return this.metadata.findEntitySet(fullName);
+    }
+    findComplexType(fullName) {
+        return this.metadata.findComplexType(fullName);
+    }
+    findModel(fullName) {
+        return this.models.find((m) => m.entityType() === fullName);
+    }
+    findCollection(fullName) {
+        return this.collections.find((c) => c.entityType() === fullName);
+    }
+}
+exports.Package = Package;
+//# sourceMappingURL=package.js.map