Fix remove collection model

Author: diegomvh

package-lock.json

@@ -59,6 +59,7 @@
     "@angular/platform-browser": "^20.2.0",
     "@angular/router": "^20.2.0",
     "@schematics/angular": "^20.3.7",
+    "prettier": "^3.6.2",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0"
   },
@@ -77,7 +78,6 @@
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
     "ng-packagr": "^20.2.0",
-    "prettier": "^3.6.2",
     "typescript": "~5.9.2"
   }
 }

package.json

@@ -19,7 +19,7 @@ export class ApiConfig extends Base {
       version: this.options.version,
       creation: this.options.creation,
       models: this.pkg.models,
-      collections: this.pkg.collections
+      collections: this.pkg.collections,
     };
   }
   public override name() {
@@ -36,8 +36,8 @@ export class ApiConfig extends Base {
   }
   public override importTypes(): string[] {
     const imports = [
-      ...this.pkg.models.map(m => m.fullName()),
-      ...this.pkg.collections.map(c => c.fullName())
+      ...this.pkg.models.map((m) => m.fullName()),
+      ...this.pkg.collections.map((c) => c.fullName()),
     ];
     return imports;
   }

projects/angular-odata/schematics/apigen/angular/api-config.ts

@@ -176,7 +176,9 @@ export class Callable {
     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 callableNamespaceQualifiedName = this.callable.IsBound
+      ? this.callable.fullName()
+      : this.callable.Name;
 
     const methodName = strings.camelize(this.callable.Name);
     const responseType =
@@ -219,7 +221,7 @@ export class Callable {
 
     let types = 'null';
     if (parameters.length > 0) {
-      types = `{${args.join(', ')}}`; 
+      types = `{${args.join(', ')}}`;
     }
 
     // Render
@@ -232,7 +234,8 @@ export class Callable {
 export abstract class Base {
   constructor(
     protected pkg: Package,
-    protected options: ApiGenSchema) {}
+    protected options: ApiGenSchema,
+  ) {}
 
   public abstract name(): string;
   public abstract fileName(): string;
@@ -366,7 +369,7 @@ export class Metadata extends Base {
   findEntityType(fullName: string) {
     return this.meta.findEntityType(fullName);
   }
-  
+
   findComplexType(fullName: string) {
     return this.meta.findComplexType(fullName);
   }

projects/angular-odata/schematics/apigen/angular/base.ts

@@ -13,7 +13,7 @@ export class Collection extends Base {
     options: ApiGenSchema,
     protected edmType: CsdlEntityType | CsdlComplexType,
     protected entity: Entity,
-    protected model: Model
+    protected model: Model,
   ) {
     super(pkg, options);
   }
@@ -36,22 +36,19 @@ export class Collection extends Base {
     };
   }
   public override name() {
-    return strings.classify(this.edmType.name()) + "Collection";
+    return strings.classify(this.edmType.name()) + 'Collection';
   }
   public override fileName() {
-    return (strings.dasherize(this.edmType.name()) + '.collection');
+    return strings.dasherize(this.edmType.name()) + '.collection';
   }
   public override directory() {
     return this.edmType.namespace().replace(/\./g, '/');
   }
   public override fullName() {
-    return this.edmType.fullName() + "Collection";
+    return this.edmType.fullName() + 'Collection';
   }
   public override importTypes(): string[] {
-    const imports = [
-      this.entity.fullName(),
-      this.model.fullName()
-    ];
+    const imports = [this.entity.fullName(), this.model.fullName()];
     if (this.edmType.BaseType) {
       imports.push(this.edmType.BaseType);
       imports.push(this.edmType.BaseType + 'Collection');

projects/angular-odata/schematics/apigen/angular/collection.ts

@@ -8,7 +8,10 @@ import { toTypescriptType } from '../utils';
 import { Package } from './package';
 
 export class EntityProperty {
-  constructor(protected entity: Entity, protected edmType: CsdlProperty | CsdlNavigationProperty) {}
+  constructor(
+    protected entity: Entity,
+    protected edmType: CsdlProperty | CsdlNavigationProperty,
+  ) {}
 
   name() {
     const required = !(this.edmType instanceof CsdlNavigationProperty || this.edmType.Nullable);
@@ -20,9 +23,8 @@ export class EntityProperty {
     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)
-    {
+    let type = 'any';
+    if (enumType !== undefined) {
       type = enumType.importedName!;
       type += this.edmType.Collection ? '[]' : '';
     } else if (entityType !== undefined) {
@@ -36,7 +38,9 @@ export class EntityProperty {
   }
 
   isGeoSpatial(): boolean {
-    return this.edmType.Type.startsWith('Edm.Geography') || this.edmType.Type.startsWith('Edm.Geometry');
+    return (
+      this.edmType.Type.startsWith('Edm.Geography') || this.edmType.Type.startsWith('Edm.Geometry')
+    );
   }
 }