angular-odata 0.159.0 → 0.160.0

package/fesm2022/angular-odata.mjs

@@ -1779,11 +1779,13 @@ class ODataAnnotation {
     string;
     bool;
     int;
-    permissions;
-    properties;
+    values;
     constructor(annot) {
         this.term = annot.term;
-        Object.assign(this, annot);
+        this.string = annot.string;
+        this.bool = annot.bool;
+        this.int = annot.int;
+        this.values = annot.values;
     }
 }
 class ODataAnnotatable {
@@ -1813,8 +1815,7 @@ class ODataAnnotatable {
         return (annot.string ||
             annot.bool ||
             annot.int ||
-            annot.permissions ||
-            annot.properties);
+            annot.values);
     }
 }
 
@@ -5987,7 +5988,8 @@ class ODataRequest {
         if (apiOptions.prefer?.maxPageSize !== undefined && ['GET'].indexOf(this._method) !== -1)
             prefer.push(`odata.maxpagesize=${apiOptions.prefer?.maxPageSize}`);
         // Annotations
-        if (apiOptions.prefer?.includeAnnotations !== undefined && ['GET'].indexOf(this._method) !== -1)
+        if (apiOptions.prefer?.includeAnnotations !== undefined &&
+            ['GET'].indexOf(this._method) !== -1)
             prefer.push(`odata.include-annotations=${apiOptions.prefer?.includeAnnotations}`);
         // Omit Null Values
         if (apiOptions.prefer?.omitNullValues === true && ['GET'].indexOf(this._method) !== -1)
@@ -7985,11 +7987,22 @@ class CsdlAnnotation {
         return json;
     }
     toConfig() {
+        var items = undefined;
+        if (Array.isArray(this.Collection) && this.Collection.length > 0) {
+            items = this.Collection.map((m) => m.toConfig()).flat();
+        }
+        else if (Array.isArray(this.Record) && this.Record.length > 0) {
+            items = this.Record.map((m) => m.toConfig()).flat();
+        }
+        else if (Array.isArray(this.EnumMember) && this.EnumMember.length > 0) {
+            items = this.EnumMember.map((m) => m.toConfig());
+        }
         return {
             term: this.Term,
             string: this.String,
             bool: this.Bool,
             int: this.Int,
+            values: items,
         };
     }
 }
@@ -8089,6 +8102,21 @@ class CsdlCollection {
         }
         return json;
     }
+    toConfig() {
+        if (Array.isArray(this.String) && this.String.length > 0) {
+            return this.String.map((s) => s.toConfig());
+        }
+        if (Array.isArray(this.Record) && this.Record.length > 0) {
+            return this.Record.map((r) => r.toConfig()).flat();
+        }
+        if (Array.isArray(this.PropertyPath) && this.PropertyPath.length > 0) {
+            return this.PropertyPath.map((p) => p.toConfig());
+        }
+        if (Array.isArray(this.NavigationPropertyPath) && this.NavigationPropertyPath.length > 0) {
+            return this.NavigationPropertyPath.map((p) => p.toConfig());
+        }
+        return [];
+    }
 }
 class CsdlRecord {
     PropertyValue;
@@ -8102,6 +8130,12 @@ class CsdlRecord {
         }
         return json;
     }
+    toConfig() {
+        if (Array.isArray(this.PropertyValue) && this.PropertyValue.length > 0) {
+            return this.PropertyValue.map((p) => p.toConfig());
+        }
+        return [];
+    }
 }
 class CsdlPropertyValue {
     Name;
@@ -8127,6 +8161,19 @@ class CsdlPropertyValue {
         }
         return json;
     }
+    toConfig() {
+        const config = { name: this.Name };
+        if (this.String !== undefined) {
+            config['string'] = this.String;
+        }
+        if (this.Date !== undefined) {
+            config['date'] = this.Date;
+        }
+        if (Array.isArray(this.EnumMember) && this.EnumMember.length > 0) {
+            config['enumMembers'] = this.EnumMember.map((m) => m.toConfig());
+        }
+        return config;
+    }
 }
 class CsdlEnumMember {
     TextContent;
@@ -8138,6 +8185,9 @@ class CsdlEnumMember {
             TextContent: this.TextContent,
         };
     }
+    toConfig() {
+        return this.TextContent;
+    }
 }
 class CsdlString {
     TextContent;
@@ -8149,6 +8199,9 @@ class CsdlString {
             TextContent: this.TextContent,
         };
     }
+    toConfig() {
+        return this.TextContent;
+    }
 }
 class CsdlPropertyPath {
     TextContent;
@@ -8160,6 +8213,9 @@ class CsdlPropertyPath {
             TextContent: this.TextContent,
         };
     }
+    toConfig() {
+        return this.TextContent;
+    }
 }
 class CsdlNavigationPropertyPath {
     TextContent;
@@ -8171,6 +8227,9 @@ class CsdlNavigationPropertyPath {
             TextContent: this.TextContent,
         };
     }
+    toConfig() {
+        return this.TextContent;
+    }
 }
 
 class CsdlReference extends CsdlAnnotable {
@@ -9085,7 +9144,7 @@ class CsdlSchema {
         return {
             namespace: this.Namespace,
             alias: base?.alias ?? this.Alias,
-            annotations: this.Annotations?.map((t) => t.toConfig()),
+            annotations: this.Annotations?.flatMap((t) => t.toConfig()),
             enums: this.EnumType?.map((t) => t.toConfig(base?.enums?.find((cs) => cs.name === t.Name))),
             entities: [
                 ...(this.ComplexType ?? []).map((t) => t.toConfig(base?.entities?.find((cs) => cs.name === t.Name))),
@@ -12977,7 +13036,7 @@ class ODataApi {
         });
         return true;
     }
-    populate({ schemas, references, models, collections, }) {
+    populate({ schemas, references, models, collections }) {
         const odataSchemas = (schemas ?? []).map((schema) => new ODataSchema(schema, this));
         //TODO: Merge duplicates
         this.schemas = [...this.schemas, ...odataSchemas];