angular-odata 0.142.0 → 0.144.0

package/schematics/apigen/angular/model.js

@@ -16,24 +16,24 @@ class ModelField {
         const name = this.edmType.Name;
         return name + (!required ? '?' : '');
     }
-    type() {
+    type(imports) {
         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 = enumType.importedName(imports);
             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}>>`;
+                type = `${collection.importedName(imports)}<${entityType.importedName(imports)}, ${model.importedName(imports)}<${entityType.importedName(imports)}>>`;
             }
             else {
                 const model = pkg.findModel(this.edmType.Type);
-                type = `${model.importedName}<${entityType.importedName}>`;
+                type = `${model.importedName(imports)}<${entityType.importedName(imports)}>`;
             }
         }
         else {
@@ -45,68 +45,67 @@ class ModelField {
         }
         return type;
     }
-    resource() {
+    resource(imports) {
         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}');
+            return `  public ${resourceName}() {
+    return this.navigationProperty<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>('${this.edmType.Name}');
   }
-  `;
+`;
         }
         else {
-            return `public ${resourceName}() {
-    return this.property<${this.type()}>('${this.edmType.Name}');
+            return `  public ${resourceName}() {
+    return this.property<${this.type(imports)}>('${this.edmType.Name}');
   }
-  `;
+`;
         }
     }
-    getter() {
+    getter(imports) {
         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};
+            return `  public ${getterName}() {
+    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)};
   }
-  `;
+`;
         }
         else {
-            return `public ${getterName}() {
-    return this.getAttribute<${this.type()}>('${this.edmType.Name}') as ${this.type()};
+            return `  public ${getterName}() {
+    return this.getAttribute<${this.type(imports)}>('${this.edmType.Name}') as ${this.type(imports)};
   }
-  `;
+`;
         }
     }
-    setter() {
+    setter(imports) {
         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);
+            return `  public ${setterName}(model: ${this.type(imports)} | null, options?: ODataOptions) {
+    return this.setReference<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>('${this.edmType.Name}', model, options);
   }
-  `;
+`;
         }
         else {
-            return `
-  `;
+            return ``;
         }
     }
-    fetch() {
+    fetch(imports) {
         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}>;
+            return `  public ${fetchName}(options?: ODataQueryArgumentsOptions<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>) {
+    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)}>;
   }
 `;
         }
         else {
-            return `public ${fetchName}(options?: ODataQueryArgumentsOptions<${this.type()}>) {
-    return this.fetchAttribute<${this.type()}>('${this.edmType.Name}', options) as Observable<${this.type()}>;
+            return `  public ${fetchName}(options?: ODataQueryArgumentsOptions<${this.type(imports)}>) {
+    return this.fetchAttribute<${this.type(imports)}>('${this.edmType.Name}', options) as Observable<${this.type(imports)}>;
   }
 `;
         }
@@ -114,6 +113,9 @@ class ModelField {
     isGeoSpatial() {
         return (this.edmType.Type.startsWith('Edm.Geography') || this.edmType.Type.startsWith('Edm.Geometry'));
     }
+    isDuration() {
+        return this.edmType.Type.startsWith('Edm.Duration');
+    }
 }
 exports.ModelField = ModelField;
 class Model extends base_1.Base {
@@ -128,7 +130,7 @@ class Model extends base_1.Base {
     template() {
         return (0, schematics_1.url)('./files/model');
     }
-    variables() {
+    variables(imports) {
         var _a;
         return {
             type: this.name() + 'Model',
@@ -136,9 +138,10 @@ class Model extends base_1.Base {
             entity: this.entity,
             fields: this.fields(),
             hasGeoFields: this.hasGeoFields(),
+            hasDurationFields: this.hasDurationFields(),
             geoFields: this.geoFields(),
             callables: (_a = this.callables) !== null && _a !== void 0 ? _a : [],
-            navigations: this.navitations(),
+            navigations: this.navitations(imports),
         };
     }
     name() {
@@ -196,7 +199,7 @@ class Model extends base_1.Base {
         }
         return imports;
     }
-    navitations() {
+    navitations(imports) {
         var _a, _b;
         const pkg = this.getPackage();
         const service = pkg.findEntitySet(this.edmType.fullName());
@@ -215,11 +218,11 @@ class Model extends base_1.Base {
                 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 this.renderNavigationPropertyBindings(bindings, imports);
         }
         return [];
     }
-    renderNavigationPropertyBindings(bindings) {
+    renderNavigationPropertyBindings(bindings, imports) {
         const pkg = this.getPackage();
         let result = [];
         let casts = [];
@@ -234,16 +237,16 @@ class Model extends base_1.Base {
             }
             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}>`;
+                    ? `ODataCollection<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}, ODataModel<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>>`
+                    : `ODataModel<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>`;
                 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}>;
+                result.push(`public ${methodName}(options?: ODataQueryArgumentsOptions<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>) {
+    return this.fetchNavigationProperty<${entity === null || entity === void 0 ? void 0 : entity.importedName(imports)}>('${binding.Path}', '${responseType}', options) as Observable<${returnType}>;
   }`);
             }
         }
@@ -262,6 +265,12 @@ class Model extends base_1.Base {
     hasGeoFields() {
         return this.geoFields().length > 0;
     }
+    durationFields() {
+        return this.fields().filter((p) => p.isDuration());
+    }
+    hasDurationFields() {
+        return this.fields().filter((p) => p.isDuration()).length > 0;
+    }
 }
 exports.Model = Model;
 //# sourceMappingURL=model.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/model.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAE9B,2DAAyD;AAEzD,wFAAiG;AACjG,oCAA4C;AAM5C,MAAa,UAAU;IACrB,YACY,KAAY,EACZ,OAA8C;QAD9C,UAAK,GAAL,KAAK,CAAO;QACZ,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,KAAK,CAAC,UAAU,EAAE,CAAC;QACpC,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,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACzD,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC/C,IAAI,GAAG,GAAG,UAAW,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,UAAW,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,KAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,UAAW,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;YAC7J,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC/C,IAAI,GAAG,GAAG,KAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,UAAW,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC;YACjF,CAAC;QACH,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,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACtD,IAAI,IAAI,SAAS,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,OAAiB;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,IAAI,CAAC,OAAO,YAAY,iDAAsB,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,YAAY,YAAY;qCACA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI;;CAExF,CAAC;QACE,CAAC;aAAM,CAAC;YACN,OAAO,YAAY,YAAY;2BACV,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI;;CAEnE,CAAC;QACE,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAiB;QACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,OAAO,YAAY,iDAAsB,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,YAAY,UAAU;+BACJ,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC;;CAExH,CAAC;QACE,CAAC;aAAM,CAAC;YACN,OAAO,YAAY,UAAU;+BACJ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;;CAElG,CAAC;QACE,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAiB;QACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;QAC5C,IAAI,IAAI,CAAC,OAAO,YAAY,iDAAsB,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,YAAY,UAAU,WAAW,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;+BACjC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI;;CAElF,CAAC;QACE,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAiB;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC;QAC1C,IAAI,IAAI,CAAC,OAAO,YAAY,iDAAsB,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,YAAY,SAAS,yCAAyC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC;iCACvE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,6BAA6B,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC;;CAE9I,CAAC;QACE,CAAC;aAAM,CAAC;YACN,OAAO,YAAY,SAAS,yCAAyC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;iCAC5D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,6BAA6B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;;CAExH,CAAC;QACE,CAAC;IACH,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;AAjHD,gCAiHC;AAED,MAAa,KAAM,SAAQ,WAAI;IAC7B,YACE,GAAY,EACZ,OAAqB,EACX,OAAyC,EACzC,MAAc;QAExB,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAHV,YAAO,GAAP,OAAO,CAAkC;QACzC,WAAM,GAAN,MAAM,CAAQ;IAG1B,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAEe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,eAAe,CAAC,CAAC;IAC9B,CAAC;IACe,SAAS,CAAC,OAAiB;;QACzC,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,OAAO;YAC3B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI;YACxE,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;YACrB,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE;YAC3C,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE;YAC3B,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,mCAAI,EAAE;YAC/B,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;SACvC,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC;IACzD,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,QAAQ,CAAC;IAC3D,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,GAAG,OAAO,CAAC;IAC3C,CAAC;IACe,WAAW;;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC;QAChD,CAAC;QACD,KAAK,IAAI,IAAI,IAAI,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,mCAAI,EAAE,EAAE,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC;gBAClC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;QACH,CAAC;QACD,KAAK,IAAI,IAAI,IAAI,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,kBAAkB,mCAAI,EAAE,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC;gBAClC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;QACH,CAAC;QACD,KAAK,IAAI,QAAQ,IAAI,MAAA,IAAI,CAAC,SAAS,mCAAI,EAAE,EAAE,CAAC;YAC1C,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAA,OAAO,CAAC,yBAAyB,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACtF,OAAO,CAAC,IAAI,CACV,GAAG,CAAC,MAAA,OAAO,CAAC,yBAAyB,mCAAI,EAAE,CAAC;iBACzC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;iBACrF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBAChB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC,QAAQ,EAAE,CAAC,CAC7B,CAAC;YACF,OAAO,CAAC,IAAI,CACV,GAAG,CAAC,MAAA,OAAO,CAAC,yBAAyB,mCAAI,EAAE,CAAC;iBACzC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,6BAA6B,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CACpF;iBACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBAChB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC,IAAI,CAAC,CACvB,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,WAAW,CAAC,OAAiB;;QAClC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,WAAW,GAAa,EAAE,CAAC;YACjC,IAAI,UAAU,GAA6B,EAAE,CAAC;YAC9C,IAAI,MAAM,GAAiD,IAAI,CAAC,OAAO,CAAC;YACxE,OAAO,MAAM,EAAE,CAAC;gBACd,UAAU,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,CAAC;gBACzE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACrB,MAAM;gBACR,CAAC;gBACD,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7D,CAAC;YACD,IAAI,QAAQ,GAAG,MAAA,OAAO,CAAC,yBAAyB,0CAAE,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACnE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrB,MAAM,GAAG,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC,QAAgB,EAAE,EAAE,CACrE,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAC7B,CAAC;gBACF,OAAO,CAAC,CAAC,IAAI,MAAK,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,CAAA,CAAC;YAC9B,CAAC,CAAC,CACH,CAAC;YACF,OAAO,IAAI,CAAC,gCAAgC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,gCAAgC,CAC9B,QAAqD,EACrD,OAAiB;QAEjB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,KAAK,IAAI,OAAO,IAAI,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC,QAAgB,EAAE,EAAE,CACrE,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAC7B,CAAC;YACF,MAAM,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;YAClD,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACjE,MAAM,aAAa,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YAC/D,MAAM,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,QAAgB,EAAE,EAAE,CACtE,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAC7B,CAAC;YAEF,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,cAAc,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,MAAM,UAAU,GAAG,YAAY;oBAC7B,CAAC,CAAC,mBAAmB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC,gBAAgB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC,IAAI;oBACnG,CAAC,CAAC,cAAc,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC;gBACnD,IAAI,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;gBACzD,IAAI,UAAU,GACZ,KAAK,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAE;qBAC3B,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAA;qBACvC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA,CAAC;gBACzB,IAAI,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC,CAAC;gBAElE,aAAa;gBACb,MAAM,CAAC,IAAI,CAAC,UAAU,UAAU,yCAAyC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC;0CACpE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,OAAO,YAAY,6BAA6B,UAAU;IAC/I,CAAC,CAAC;YACA,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACM,MAAM;;QACX,OAAO;YACL,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACpE,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC/E,CAAC;IACJ,CAAC;IACM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IACvD,CAAC;IACM,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IACrC,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;IACrD,CAAC;IAEM,iBAAiB;QACtB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAChE,CAAC;CACF;AAjLD,sBAiLC"}

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

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

package/schematics/apigen/angular/module.js

@@ -13,7 +13,7 @@ class Module extends base_1.Base {
     template() {
         return (0, schematics_1.url)('./files/module');
     }
-    variables() {
+    variables(imports) {
         return {
             services: this.services,
         };

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;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"}
+{"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

@@ -5,11 +5,12 @@ import { CsdlEntitySet } from '../metadata/csdl/csdl-entity-set';
 import { Source } from '@angular-devkit/schematics';
 import { Schema as ApiGenSchema } from '../schema';
 import { Package } from './package';
+import { Import } from './import';
 export declare class Service extends Base {
     protected edmElement: CsdlEntitySet | CsdlEntityContainer | CsdlSingleton;
     constructor(pkg: Package, options: ApiGenSchema, edmElement: CsdlEntitySet | CsdlEntityContainer | CsdlSingleton);
     template(): Source;
-    variables(): {
+    variables(imports: Import[]): {
         [name: string]: any;
     };
     entityType(): string;

package/schematics/apigen/angular/service.js

@@ -18,7 +18,7 @@ class Service extends base_1.Base {
                 ? (0, schematics_1.url)('./files/singleton-service')
                 : (0, schematics_1.url)('./files/entitycontainer-service');
     }
-    variables() {
+    variables(imports) {
         var _a;
         return {
             path: this.edmElement.name(),

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

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/service.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAE9B,oEAAgE;AAChE,sEAAiE;AACjE,2DAAyD;AAKzD,MAAa,OAAQ,SAAQ,WAAI;IAC/B,YACE,GAAY,EACZ,OAAqB,EACX,UAA+D;QAEzE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAFV,eAAU,GAAV,UAAU,CAAqD;IAG3E,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,UAAU,YAAY,+BAAa;YAC7C,CAAC,CAAC,IAAA,gBAAG,EAAC,2BAA2B,CAAC;YAClC,CAAC,CAAC,IAAI,CAAC,UAAU,YAAY,8BAAa;gBACxC,CAAC,CAAC,IAAA,gBAAG,EAAC,2BAA2B,CAAC;gBAClC,CAAC,CAAC,IAAA,gBAAG,EAAC,iCAAiC,CAAC,CAAC;IAC/C,CAAC;IACe,SAAS,CAAC,OAAiB;;QACzC,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;YAC5B,IAAI,EACF,IAAI,CAAC,UAAU,YAAY,+BAAa;gBACtC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU;gBAC5B,CAAC,CAAC,IAAI,CAAC,UAAU,YAAY,8BAAa;oBACxC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI;oBACtB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;YACzB,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,mCAAI,EAAE;SAChC,CAAC;IACJ,CAAC;IACM,UAAU;QACf,OAAO,IAAI,CAAC,UAAU,YAAY,+BAAa;YAC7C,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU;YAC5B,CAAC,CAAC,IAAI,CAAC,UAAU,YAAY,8BAAa;gBACxC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI;gBACtB,CAAC,CAAC,EAAE,CAAC;IACX,CAAC;IAEe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,SAAS,CAAC;IAC9D,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,UAAU,CAAC;IAChE,CAAC;IACe,SAAS;QACvB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzD,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;IACe,WAAW;;QACzB,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,UAAU,YAAY,+BAAa,EAAE,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,YAAY,8BAAa,EAAE,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;QACD,KAAK,IAAI,IAAI,IAAI,MAAA,IAAI,CAAC,SAAS,mCAAI,EAAE,EAAE,CAAC;YACtC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9B,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1D,KAAK,IAAI,KAAK,IAAI,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;gBAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;oBACnC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AApED,0BAoEC"}

package/schematics/apigen/files/api-config/__fileName__.ts

@@ -2,6 +2,8 @@ import { ODataApiConfig, EDM_PARSERS, ODataMetadata, ODataVersion } from 'angula
 import * as json from './metadata.json';<% for (let imp of imports) { %>
 import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
 
+// #region Custom
+// #endregion Custom
 export const <%= classify(name) %> = ODataMetadata.fromJson(json).toConfig({
   serviceRootUrl: '<%= serviceRootUrl %>',
   metadataUrl: '<%= metadataUrl %>',
@@ -10,9 +12,9 @@ export const <%= classify(name) %> = ODataMetadata.fromJson(json).toConfig({
   creation: new Date('<%= creation.toISOString() %>'),
   parsers: EDM_PARSERS,
   models: {<% for(const model of models) { %>
-    '<%= model.entityType() %>': <%= model.importedName %>, <% } %>
+    '<%= model.entityType() %>': <%= model.importedName(imports) %>, <% } %>
   },
   collections: {<% for(const col of collections) { %>
-    '<%= col.entityType() %>': <%= col.importedName %>, <% } %>
+    '<%= col.entityType() %>': <%= col.importedName(imports) %>, <% } %>
   }
 }) as ODataApiConfig;

package/schematics/apigen/files/collection/__fileName__.ts

@@ -12,9 +12,13 @@ import {
 } from 'angular-odata';<% for (let imp of imports) { %>
 import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
 
+// #region Custom
+// #endregion Custom
 export class <%= classify(name) %><E extends <%= entity.name() %>, M extends <%= model.name() %><E>> extends <% if (baseType) { %><%= toTypescriptType(baseType) %><E, M><% } else { %>ODataCollection<E, M><% } %> {
   <% for (let cal of callables) { %>
   // <%= cal.name() %>
   <%= cal.callableMethod() %>
 <% } %>
+// #region Custom
+// #endregion Custom
 }

package/schematics/apigen/files/entity/__fileName__.ts

@@ -1,8 +1,12 @@
-import { Duration } from 'angular-odata';
+<% if (hasDurationProperties) { %>import { Duration } from 'angular-odata';<% } %>
 <% if (hasGeoProperties) { %>import { <% for (let p of geoProperties) { %><%= p.type() %>,<% } %> } from 'geojson';<% } %><% for (let imp of imports) { %>
 import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
 
+// #region Custom
+// #endregion Custom
 export const <%= type %> = '<%= fullName %>';
 export interface <%= classify(name) %><% if (baseType) { %> extends <%= toTypescriptType(baseType) %><% } %> {<% for(let prop of properties) { %>
-  <%= prop.name() %>: <%= prop.type() %>;<% } %>
+  <%= prop.name() %>: <%= prop.type(imports) %>;<% } %>
+// #region Custom
+// #endregion Custom
 }

package/schematics/apigen/files/entitycontainer-service/__fileName__.ts

@@ -10,9 +10,13 @@ import { ODataClient,
   EntityKey } from 'angular-odata';<% for (let imp of imports) { %>
 import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
 
+// #region Custom
+// #endregion Custom
 @Injectable()
 export class <%= classify(name) %> extends ODataBaseService {
   constructor(client: ODataClient) {
     super(client, '<%= path %>', '<%= type %>');
   }
+// #region Custom
+// #endregion Custom
 }

package/schematics/apigen/files/entityset-service/__fileName__.ts

@@ -9,6 +9,8 @@ import { ODataClient,
   EntityKey } from 'angular-odata';<% for (let imp of imports) { %>
 import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
 
+// #region Custom
+// #endregion Custom
 @Injectable()
 export class <%= classify(name) %> extends ODataEntitySetService<<%= toTypescriptType(type) %>> {
   constructor(client: ODataClient) {
@@ -24,4 +26,6 @@ export class <%= classify(name) %> extends ODataEntitySetService<<%= toTypescrip
   <%= cal.resourceFunction() %>
   <%= cal.callableFunction() %>
 <% } %>
+// #region Custom
+// #endregion Custom
 }

package/schematics/apigen/files/enum/__fileName__.ts

@@ -1,4 +1,8 @@
+// #region Custom
+// #endregion Custom
 export const <%= type %> = '<%= fullName %>';
 export enum <%= classify(name) %> {<% for(let value of values) { %>
   <%= value.name() %> = <%= value.value() %>,<% } %>
+// #region Custom
+// #endregion Custom
 }

package/schematics/apigen/files/index/__fileName__.ts

@@ -1,2 +1,4 @@
 <% for (let imp of imports) { %>export * from '<%= imp.path() %>';
 <% } %>
+// #region Custom
+// #endregion Custom

package/schematics/apigen/files/model/__fileName__.ts

@@ -10,17 +10,19 @@ import {
   ODataOptions,
   ODataQueryArgumentsOptions,
   ODataFunctionOptions,
-  ODataActionOptions,
-  Duration,
+  ODataActionOptions,<% if (hasDurationFields) { %>
+  Duration,<% } %>
 } from 'angular-odata';
 <% if (hasGeoFields) { %>import { <% for (let f of geoFields) { %><%= f.type() %>,<% } %> } from 'geojson';<% } %><% for (let imp of imports) { %>
 import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
 
+// #region Custom
+// #endregion Custom
 @Model()
 export class <%= classify(name) %><E extends <%= entity.name() %>> extends <% if (baseType) { %><%= toTypescriptType(baseType) %><E><% } else { %>ODataModel<E><% } %> {
   <% for (let field of fields) { %>@ModelField()
-  declare <%= field.name() %>: <%= field.type() %>;
-  <%= field.resource() %><%= field.getter() %><%= field.setter() %><%= field.fetch() %>
+  declare <%= field.name() %>: <%= field.type(imports) %>;
+  <%= field.resource(imports) %><%= field.getter(imports) %><%= field.setter(imports) %><%= field.fetch(imports) %>
   <% } %>
   <% for (let cal of callables) { %>
   // <%= cal.name() %>
@@ -28,4 +30,6 @@ export class <%= classify(name) %><E extends <%= entity.name() %>> extends <% if
 <% } %>
   <% for (let nav of navigations) { %><%= nav %>
   <% } %>
+// #region Custom
+// #endregion Custom
 }

package/schematics/apigen/files/module/__fileName__.ts

@@ -1,6 +1,8 @@
 import { NgModule } from '@angular/core';<% for (let imp of imports) { %>
 import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
 
+// #region Custom
+// #endregion Custom
 @NgModule({
   providers: [<% for(let service of services) { %>
     <%= service.name() %>,<% } %>

package/schematics/apigen/files/singleton-service/__fileName__.ts

@@ -10,9 +10,13 @@ import { ODataClient,
   EntityKey } from 'angular-odata';<% for (let imp of imports) { %>
 import { <%= imp.resolve().join(", ") %> } from '<%= imp.path() %>';<% } %>
 
+// #region Custom
+// #endregion Custom
 @Injectable()
 export class <%= classify(name) %> extends ODataSingletonService<<%= toTypescriptType(type) %>> {
   constructor(client: ODataClient) {
     super(client, '<%= path %>', '<%= type %>');
   }
+// #region Custom
+// #endregion Custom
 }

package/schematics/apigen/index.js

@@ -20,6 +20,11 @@ const package_1 = require("./angular/package");
 const utils = {
     toTypescriptType: utils_1.toTypescriptType,
 };
+function replaceBefore(s, subString, replacement, index) {
+    const head = s.substring(0, index);
+    const tail = s.substring(index);
+    return head + tail.replace(subString, replacement);
+}
 function apigen(options) {
     return (tree, context) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -49,18 +54,58 @@ function apigen(options) {
             pkg.resolveImports();
             return (0, schematics_1.chain)(pkg
                 .sources()
-                .map((s) => {
-                return (0, schematics_1.apply)(s.template(), [
+                .map((b) => {
+                const imports = b.imports();
+                return (0, schematics_1.apply)(b.template(), [
                     (0, schematics_1.template)(Object.assign(Object.assign(Object.assign({
-                        name: s.name(),
-                        fileName: s.fileName(),
-                        fullName: s.fullName(),
-                        imports: s.imports(),
-                    }, s.variables()), core_1.strings), utils)),
-                    (0, schematics_1.move)((0, core_1.normalize)(`${modulePath}/${s.directory()}`)),
+                        name: b.name(),
+                        fileName: b.fileName(),
+                        fullName: b.fullName(),
+                        imports: imports,
+                    }, b.variables(imports)), core_1.strings), utils)),
+                    (0, schematics_1.move)((0, core_1.normalize)(`${modulePath}/${b.directory()}`)),
+                    (0, schematics_1.forEach)((fileEntry) => {
+                        var _a, _b, _c;
+                        // Example: Overwrite existing files if needed
+                        if (tree.exists(fileEntry.path)) {
+                            let oldContent = (_b = (_a = tree.read(fileEntry.path)) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
+                            let newContent = fileEntry.content.toString();
+                            if (oldContent === newContent) {
+                                return fileEntry; // No changes, skip overwrite
+                            }
+                            // Find and replace al sections between // #region Custom and // #endregion Custom
+                            const customSectionRegex = /\/\/ #region Custom[\s\S]*?\/\/ #endregion Custom/g;
+                            const oldCustomSections = oldContent.matchAll(customSectionRegex);
+                            const newCustomSections = newContent.matchAll(customSectionRegex);
+                            let oldCustomSectionsArray = [...oldCustomSections];
+                            let newCustomSectionsArray = [...newCustomSections];
+                            if (oldCustomSectionsArray.length !== newCustomSectionsArray.length) {
+                                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.`);
+                            }
+                            else {
+                                for (let i = oldCustomSectionsArray.length - 1; i >= 0; i--) {
+                                    const oldSection = oldCustomSectionsArray[i];
+                                    const newSection = newCustomSectionsArray[i];
+                                    if (oldSection && newSection) {
+                                        newContent = replaceBefore(newContent, newSection[0], oldSection[0], (_c = newSection.index) !== null && _c !== void 0 ? _c : 0);
+                                    }
+                                }
+                            }
+                            tree.overwrite(fileEntry.path, newContent);
+                            return null;
+                        }
+                        // Return the fileEntry to be added to the destination tree
+                        return fileEntry;
+                    })
                 ]);
             })
                 .reduce((rules, s) => [...rules, (0, schematics_1.mergeWith)(s, schematics_1.MergeStrategy.Overwrite)], []));
+        })
+            .then((rules) => {
+            for (const rule in rules) {
+                console.log(`Generated rule for ${rule}`);
+            }
+            return rules;
         });
     });
 }

package/schematics/apigen/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../projects/angular-odata/schematics/apigen/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAkCA,wBAqDC;AAvFD,+CAA0D;AAC1D,2DAWoC;AACpC,qEAAwF;AACxF,uEAAmE;AAGnE,8CAAwD;AACxD,mCAA2C;AAU3C,+CAA4C;AAE5C,MAAM,KAAK,GAAG;IACZ,gBAAgB,EAAhB,wBAAgB;CACjB,CAAC;AAEF,SAAgB,MAAM,CAAC,OAAqB;IAC1C,OAAO,CAAO,IAAU,EAAE,OAAyB,EAAE,EAAE;;QACrD,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,OAAO,CAAC,OAAO,GAAG,MAAA,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,mCAAI,EAAE,CAAC;QACjE,CAAC;QACD,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,gCAAmB,CAAC,yBAAyB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,6BAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAiB,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAC/B,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAE/B,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,GAAG,GAAG,GAAG,cAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAExE,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;aAC3B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC3B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,4BAAmB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;aACxD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,CAAC,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;YAC9B,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACpF,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC/B,MAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACvC,GAAG,CAAC,cAAc,EAAE,CAAC;YACrB,OAAO,IAAA,kBAAK,EACV,GAAG;iBACA,OAAO,EAAE;iBACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,OAAO,IAAA,kBAAK,EAAC,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACzB,IAAA,qBAAQ,4CACH;wBACD,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;wBACd,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE;wBACtB,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE;wBACtB,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;qBACrB,EACE,CAAC,CAAC,SAAS,EAAE,GACb,cAAO,GACP,KAAK,EACR;oBACF,IAAA,iBAAI,EAAC,IAAA,gBAAS,EAAC,GAAG,UAAU,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;iBAClD,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,EAAE,IAAA,sBAAS,EAAC,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC,EAAE,EAAY,CAAC,CACzF,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC,CAAA,CAAC;AACJ,CAAC"}
+{"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

@@ -1 +1,4 @@
-export declare const getRandomName: () => string;
+export declare const getRandomName: ({ prefix, suffix }?: {
+    prefix?: string;
+    suffix?: string;
+}) => string;

package/schematics/random.js

@@ -593,12 +593,12 @@ const Right = [
 function getRandomInt(max) {
     return Math.floor(Math.random() * max);
 }
-const getRandomName = () => {
+const getRandomName = ({ prefix = "", suffix = "" } = {}) => {
     let name = '';
     while (name == '' || name == 'BoringWozniak')
         /* Steve Wozniak is not boring */
         name = `${Left[getRandomInt(Left.length)]}${Right[getRandomInt(Right.length)]}`;
-    return name;
+    return `${prefix}${name}${suffix}`;
 };
 exports.getRandomName = getRandomName;
 //# sourceMappingURL=random.js.map