angular-odata 0.140.0 → 0.141.0

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

@@ -3,6 +3,7 @@ import { Source } from '@angular-devkit/schematics';
 import { Schema as ApiGenSchema } from '../schema';
 import { CsdlCallable, CsdlParameter } from '../metadata/csdl/csdl-function-action';
 import { ODataMetadata } from '../metadata';
+import { Package } from './package';
 export declare class Callable {
     protected callable: CsdlCallable;
     callables: CsdlCallable[];
@@ -10,6 +11,7 @@ export declare class Callable {
     addOverload(callable: CsdlCallable): void;
     name(): string;
     isBound(): boolean;
+    importTypes(): string[];
     bindingParameter(): CsdlParameter | undefined;
     parameters(): {
         binding: CsdlParameter | undefined;
@@ -20,10 +22,12 @@ export declare class Callable {
     fullName(): string;
     resourceFunction(): string;
     callableFunction(): string;
+    callableMethod(): string;
 }
 export declare abstract class Base {
+    protected pkg: Package;
     protected options: ApiGenSchema;
-    constructor(options: ApiGenSchema);
+    constructor(pkg: Package, options: ApiGenSchema);
     abstract name(): string;
     abstract fileName(): string;
     abstract fullName(): string;
@@ -43,9 +47,10 @@ export declare abstract class Base {
     protected callables: Callable[];
     addCallable(callable: Callable): void;
     addCallables(callables: Callable[]): void;
+    getPackage(): Package;
 }
 export declare class Index extends Base {
-    constructor(options: ApiGenSchema);
+    constructor(pkg: Package, options: ApiGenSchema);
     template(): Source;
     variables(): {
         [name: string]: any;
@@ -58,7 +63,7 @@ export declare class Index extends Base {
 }
 export declare class Metadata extends Base {
     private meta;
-    constructor(options: ApiGenSchema, meta: ODataMetadata);
+    constructor(pkg: Package, options: ApiGenSchema, meta: ODataMetadata);
     template(): Source;
     variables(): {
         [name: string]: any;
@@ -68,4 +73,8 @@ export declare class Metadata extends Base {
     directory(): string;
     fullName(): string;
     importTypes(): string[];
+    findEnumType(fullName: string): import("../metadata/csdl/csdl-enum-type").CsdlEnumType | undefined;
+    findEntityType(fullName: string): import("../metadata/csdl/csdl-structured-type").CsdlEntityType | undefined;
+    findComplexType(fullName: string): import("../metadata/csdl/csdl-structured-type").CsdlComplexType | undefined;
+    findEntitySet(fullName: string): import("../metadata/csdl/csdl-entity-set").CsdlEntitySet | undefined;
 }

package/schematics/apigen/angular/base.js

@@ -23,6 +23,24 @@ class Callable {
         var _a;
         return (_a = this.callable.IsBound) !== null && _a !== void 0 ? _a : false;
     }
+    importTypes() {
+        var _a;
+        const imports = [];
+        for (let c of this.callables) {
+            if (c.ReturnType && !c.ReturnType.Type.startsWith('Edm.')) {
+                imports.push(c.ReturnType.Type);
+            }
+            if (c.bindingParameter() && !c.bindingParameter().Type.startsWith('Edm.')) {
+                imports.push(c.bindingParameter().Type);
+            }
+            for (let p of (_a = c.Parameter) !== null && _a !== void 0 ? _a : []) {
+                if (!p.Type.startsWith('Edm.')) {
+                    imports.push(p.Type);
+                }
+            }
+        }
+        return imports;
+    }
     bindingParameter() {
         var _a;
         return (_a = this.callable.Parameter) === null || _a === void 0 ? void 0 : _a.find((p) => p.Name === csdl_function_action_1.BINDING_PARAMETER_NAME);
@@ -126,10 +144,59 @@ class Callable {
     return this.${baseMethod}(${parametersCall}, this.${methodResourceName}(${key}), '${responseType}', options);
   }`;
     }
+    callableMethod() {
+        const isFunction = this.callable instanceof csdl_function_action_1.CsdlFunction;
+        const { required, optional } = this.parameters();
+        const parameters = [...required, ...optional];
+        const returnType = this.returnType();
+        const callableNamespaceQualifiedName = this.callable.IsBound ? this.callable.fullName() : this.callable.Name;
+        const methodName = core_1.strings.camelize(this.callable.Name);
+        const responseType = returnType === undefined
+            ? 'none'
+            : (returnType === null || returnType === void 0 ? void 0 : returnType.Collection)
+                ? 'collection'
+                : (returnType === null || returnType === void 0 ? void 0 : returnType.Type.startsWith('Edm.'))
+                    ? 'property'
+                    : 'model';
+        const retType = returnType === undefined ? 'null' : (0, utils_1.toTypescriptType)(returnType.Type);
+        const baseMethod = isFunction ? 'callFunction' : 'callAction';
+        const parametersCall = parameters.length === 0 ? 'null' : `{${parameters.map((p) => p.Name).join(', ')}}`;
+        // Method arguments
+        let args = [];
+        args = [
+            ...args,
+            ...(required.length === 0
+                ? []
+                : required.map((p) => `${p.Name}: ${(0, utils_1.toTypescriptType)(p.Type)}`)),
+        ];
+        args = [
+            ...args,
+            ...(optional.length === 0
+                ? []
+                : optional.map((p) => `${p.Name}?: ${(0, utils_1.toTypescriptType)(p.Type)}`)),
+        ];
+        const optionsType = returnType !== undefined && returnType.Type.startsWith('Edm.')
+            ? isFunction
+                ? 'ODataOptions & {alias?: boolean}'
+                : 'ODataOptions'
+            : isFunction
+                ? `ODataFunctionOptions<${retType}>`
+                : `ODataActionOptions<${retType}>`;
+        const fargs = [...args, `options?: ${optionsType}`];
+        let types = 'null';
+        if (parameters.length > 0) {
+            types = `{${args.join(', ')}}`;
+        }
+        // Render
+        return `public ${methodName}(${fargs.join(', ')}) {
+    return this.${baseMethod}<${types}, ${retType}>('${callableNamespaceQualifiedName}', ${parametersCall}, '${responseType}', options);
+  }`;
+    }
 }
 exports.Callable = Callable;
 class Base {
-    constructor(options) {
+    constructor(pkg, options) {
+        this.pkg = pkg;
         this.options = options;
         this.dependencies = [];
         this.callables = [];
@@ -176,11 +243,14 @@ class Base {
     addCallables(callables) {
         callables.forEach((r) => this.addCallable(r));
     }
+    getPackage() {
+        return this.pkg;
+    }
 }
 exports.Base = Base;
 class Index extends Base {
-    constructor(options) {
-        super(options);
+    constructor(pkg, options) {
+        super(pkg, options);
     }
     template() {
         return (0, schematics_1.url)('./files/index');
@@ -206,8 +276,8 @@ class Index extends Base {
 }
 exports.Index = Index;
 class Metadata extends Base {
-    constructor(options, meta) {
-        super(options);
+    constructor(pkg, options, meta) {
+        super(pkg, options);
         this.meta = meta;
     }
     template() {
@@ -231,6 +301,18 @@ class Metadata extends Base {
     importTypes() {
         return [];
     }
+    findEnumType(fullName) {
+        return this.meta.findEnumType(fullName);
+    }
+    findEntityType(fullName) {
+        return this.meta.findEntityType(fullName);
+    }
+    findComplexType(fullName) {
+        return this.meta.findComplexType(fullName);
+    }
+    findEntitySet(fullName) {
+        return this.meta.findEntitySet(fullName);
+    }
 }
 exports.Metadata = Metadata;
 //# sourceMappingURL=base.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/base.ts"],"names":[],"mappings":"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"}
+{"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

@@ -0,0 +1,23 @@
+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 { Model } from './model';
+import { Entity } from './entity';
+import { Package } from './package';
+export declare class Collection extends Base {
+    protected edmType: CsdlEntityType | CsdlComplexType;
+    protected entity: Entity;
+    protected model: Model;
+    constructor(pkg: Package, options: ApiGenSchema, edmType: CsdlEntityType | CsdlComplexType, entity: Entity, model: Model);
+    entityType(): string;
+    template(): Source;
+    variables(): {
+        [name: string]: any;
+    };
+    name(): string;
+    fileName(): string;
+    directory(): string;
+    fullName(): string;
+    importTypes(): string[];
+}

package/schematics/apigen/angular/collection.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Collection = void 0;
+const core_1 = require("@angular-devkit/core");
+const base_1 = require("./base");
+const schematics_1 = require("@angular-devkit/schematics");
+class Collection extends base_1.Base {
+    constructor(pkg, options, edmType, entity, model) {
+        super(pkg, options);
+        this.edmType = edmType;
+        this.entity = entity;
+        this.model = model;
+    }
+    entityType() {
+        return this.edmType.fullName();
+    }
+    template() {
+        return (0, schematics_1.url)('./files/collection');
+    }
+    variables() {
+        var _a;
+        return {
+            type: this.name() + 'Collection',
+            baseType: this.edmType.BaseType ? this.edmType.BaseType + 'Collection' : null,
+            entity: this.entity,
+            model: this.model,
+            callables: (_a = this.callables) !== null && _a !== void 0 ? _a : [],
+            functions: [],
+        };
+    }
+    name() {
+        return core_1.strings.classify(this.edmType.name()) + "Collection";
+    }
+    fileName() {
+        return (core_1.strings.dasherize(this.edmType.name()) + '.collection');
+    }
+    directory() {
+        return this.edmType.namespace().replace(/\./g, '/');
+    }
+    fullName() {
+        return this.edmType.fullName() + "Collection";
+    }
+    importTypes() {
+        var _a, _b, _c, _d, _e;
+        const imports = [
+            this.entity.fullName(),
+            this.model.fullName()
+        ];
+        if (this.edmType.BaseType) {
+            imports.push(this.edmType.BaseType);
+            imports.push(this.edmType.BaseType + 'Collection');
+            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());
+        }
+        return imports;
+    }
+}
+exports.Collection = Collection;
+//# sourceMappingURL=collection.js.map

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

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

@@ -3,15 +3,18 @@ import { CsdlComplexType, CsdlEntityType } from '../metadata/csdl/csdl-structure
 import { Source } from '@angular-devkit/schematics';
 import { Schema as ApiGenSchema } from '../schema';
 import { CsdlNavigationProperty, CsdlProperty } from '../metadata/csdl/csdl-structural-property';
+import { Package } from './package';
 export declare class EntityProperty {
+    protected entity: Entity;
     protected edmType: CsdlProperty | CsdlNavigationProperty;
-    constructor(edmType: CsdlProperty | CsdlNavigationProperty);
+    constructor(entity: Entity, edmType: CsdlProperty | CsdlNavigationProperty);
     name(): string;
     type(): string;
+    isGeoSpatial(): boolean;
 }
 export declare class Entity extends Base {
     protected edmType: CsdlEntityType | CsdlComplexType;
-    constructor(options: ApiGenSchema, edmType: CsdlEntityType | CsdlComplexType);
+    constructor(pkg: Package, options: ApiGenSchema, edmType: CsdlEntityType | CsdlComplexType);
     template(): Source;
     variables(): {
         [name: string]: any;
@@ -21,4 +24,7 @@ export declare class Entity extends Base {
     directory(): string;
     fullName(): string;
     importTypes(): string[];
+    properties(): EntityProperty[];
+    geoProperties(): EntityProperty[];
+    hasGeoProperties(): boolean;
 }

package/schematics/apigen/angular/entity.js

@@ -5,39 +5,57 @@ const core_1 = require("@angular-devkit/core");
 const base_1 = require("./base");
 const csdl_structured_type_1 = require("../metadata/csdl/csdl-structured-type");
 const schematics_1 = require("@angular-devkit/schematics");
+const csdl_structural_property_1 = require("../metadata/csdl/csdl-structural-property");
 const utils_1 = require("../utils");
 class EntityProperty {
-    constructor(edmType) {
+    constructor(entity, edmType) {
+        this.entity = entity;
         this.edmType = edmType;
     }
     name() {
-        return this.edmType.Name;
+        const required = !(this.edmType instanceof csdl_structural_property_1.CsdlNavigationProperty || this.edmType.Nullable);
+        const name = this.edmType.Name;
+        return name + (!required ? '?' : '');
     }
     type() {
-        let type = (0, utils_1.toTypescriptType)(this.edmType.Type);
-        type += this.edmType.Collection ? '[]' : '';
-        type += this.edmType.Nullable ? ' | null' : '';
+        const pkg = this.entity.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) {
+            type = entityType.importedName;
+            type += this.edmType.Collection ? '[]' : '';
+        }
+        else {
+            type = (0, utils_1.toTypescriptType)(this.edmType.Type);
+            type += this.edmType.Collection ? '[]' : '';
+        }
         return type;
     }
+    isGeoSpatial() {
+        return this.edmType.Type.startsWith('Edm.Geography') || this.edmType.Type.startsWith('Edm.Geometry');
+    }
 }
 exports.EntityProperty = EntityProperty;
 class Entity extends base_1.Base {
-    constructor(options, edmType) {
-        super(options);
+    constructor(pkg, options, edmType) {
+        super(pkg, options);
         this.edmType = edmType;
     }
     template() {
         return (0, schematics_1.url)('./files/entity');
     }
     variables() {
-        var _a, _b;
         return {
             type: this.name() + (this.edmType instanceof csdl_structured_type_1.CsdlEntityType ? 'EntityType' : 'ComplexType'),
             baseType: this.edmType.BaseType,
-            properties: [
-                ...((_a = this.edmType.Property) !== null && _a !== void 0 ? _a : []).map((p) => new EntityProperty(p)),
-                ...((_b = this.edmType.NavigationProperty) !== null && _b !== void 0 ? _b : []).map((p) => new EntityProperty(p)),
-            ],
+            properties: this.properties(),
+            geoProperties: this.geoProperties(),
+            hasGeoProperties: this.hasGeoProperties(),
         };
     }
     name() {
@@ -60,17 +78,30 @@ class Entity extends base_1.Base {
             imports.push(this.edmType.BaseType);
         }
         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.')) {
+            if (!prop.isEdmType()) {
                 imports.push(prop.Type);
             }
         }
         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.')) {
+            if (!prop.isEdmType()) {
                 imports.push(prop.Type);
             }
         }
         return imports;
     }
+    properties() {
+        var _a, _b;
+        return [
+            ...((_a = this.edmType.Property) !== null && _a !== void 0 ? _a : []).map((p) => new EntityProperty(this, p)),
+            ...((_b = this.edmType.NavigationProperty) !== null && _b !== void 0 ? _b : []).map((p) => new EntityProperty(this, p)),
+        ];
+    }
+    geoProperties() {
+        return this.properties().filter((p) => p.isGeoSpatial());
+    }
+    hasGeoProperties() {
+        return this.geoProperties().length > 0;
+    }
 }
 exports.Entity = Entity;
 //# sourceMappingURL=entity.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/entity.ts"],"names":[],"mappings":"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"}

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/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;
+}