angular-odata 0.152.0 → 0.154.0

package/fesm2022/angular-odata.mjs

@@ -9687,13 +9687,17 @@ class ODataMetadataParser {
     }
     getAttributeValue(attributes, attributeName) {
         const attribute = attributes.getNamedItem(attributeName);
-        return attribute !== null && attribute.nodeValue ? attribute.nodeValue : undefined;
+        return attribute !== null && attribute.nodeValue != null ? attribute.nodeValue : undefined;
     }
     propertyValueToNumber(attributeValue) {
         return attributeValue !== undefined ? Number(attributeValue) : undefined;
     }
     propertyValueToBoolean(attributeValue) {
-        return attributeValue !== undefined ? attributeValue === 'true' : false;
+        return attributeValue !== undefined && attributeValue === 'true'
+            ? true
+            : attributeValue !== undefined && attributeValue === 'false'
+                ? false
+                : undefined;
     }
     propertyValueToDate(attributeValue) {
         return attributeValue !== undefined ? new Date(attributeValue) : undefined;
@@ -11819,31 +11823,37 @@ class ODataModelField {
         }
         else {
             const computed = this.annotatedValue(COMPUTED);
-            const errors = this.parser?.validate(value, { method, navigation }) || [];
+            const errors = this.parser?.validate(value, { method, navigation }) ?? [];
             if (this.required &&
                 (value === null || (value === undefined && method !== 'modify')) && // Is null or undefined without patch?
                 !(computed && method === 'create') // Not (Is Computed field and create) ?
             ) {
-                errors['push'](`required`);
+                if (errors.indexOf('required') === -1)
+                    errors.push(`required`);
             }
             if (this.maxLength !== undefined &&
                 typeof value === 'string' &&
                 value.length > this.maxLength) {
-                errors['push'](`maxlength`);
+                if (errors.indexOf('maxlength') === -1)
+                    errors.push(`maxlength`);
             }
             if (this.minLength !== undefined &&
                 typeof value === 'string' &&
                 value.length < this.minLength) {
-                errors['push'](`minlength`);
+                if (errors.indexOf('minlength') === -1)
+                    errors.push(`minlength`);
             }
             if (this.min !== undefined && typeof value === 'number' && value < this.min) {
-                errors['push'](`min`);
+                if (errors.indexOf('min') === -1)
+                    errors.push(`min`);
             }
             if (this.max !== undefined && typeof value === 'number' && value > this.max) {
-                errors['push'](`max`);
+                if (errors.indexOf('max') === -1)
+                    errors.push(`max`);
             }
             if (this.pattern !== undefined && typeof value === 'string' && !this.pattern.test(value)) {
-                errors['push'](`pattern`);
+                if (errors.indexOf('pattern') === -1)
+                    errors.push(`pattern`);
             }
             return !Types.isEmpty(errors) ? errors : undefined;
         }
@@ -12901,9 +12911,9 @@ class ODataApi {
     // Populate from Metadata
     populateFromMetadata;
     // Schemas
-    schemas;
+    schemas = [];
     // References
-    references;
+    references = [];
     // Models
     models = {};
     // Collections
@@ -12927,13 +12937,17 @@ class ODataApi {
         this.errorHandler = config.errorHandler;
         this.parsers = new Map(Object.entries(config.parsers ?? EDM_PARSERS));
         this.populateFromMetadata = config.populateFromMetadata ?? false;
-        this.schemas = (config.schemas ?? []).map((schema) => new ODataSchema(schema, this));
-        this.references = (config.references ?? []).map((reference) => new ODataReference(reference, this));
-        this.models = (config.models ?? {});
-        this.collections = (config.collections ?? {});
+        this.populate(config);
     }
     initialize(requester) {
         this.requester = requester;
+        return (this.populateFromMetadata
+            ? firstValueFrom(this.metadata()
+                .fetch()
+                .pipe(map((metadata) => this.populate(metadata.toConfig()))))
+            : Promise.resolve()).then(() => this.configure());
+    }
+    configure() {
         this.schemas.forEach((schema) => {
             schema.configure({
                 options: this.options.parserOptions,
@@ -12949,24 +12963,19 @@ class ODataApi {
                 }
             }
         });
-        return this.populateFromMetadata
-            ? firstValueFrom(this.metadata()
-                .fetch()
-                .pipe(map((metadata) => this.populate(metadata))))
-            : Promise.resolve(true);
-    }
-    populate(metadata) {
-        const config = metadata.toConfig();
-        this.version = config.version ?? DEFAULT_VERSION;
-        const schemas = (config.schemas ?? []).map((schema) => new ODataSchema(schema, this));
-        this.schemas = [...this.schemas, ...schemas];
-        schemas.forEach((schema) => {
-            schema.configure({
-                options: this.options.parserOptions,
-            });
-        });
         return true;
     }
+    populate({ schemas, references, models, collections }) {
+        const odataSchemas = (schemas ?? []).map((schema) => new ODataSchema(schema, this));
+        //TODO: Merge duplicates
+        this.schemas = [...this.schemas, ...odataSchemas];
+        const odataReferences = (references ?? []).map((reference) => new ODataReference(reference, this));
+        this.references = [...this.references, ...odataReferences];
+        const odataModels = (models ?? {});
+        this.models = { ...this.models, ...odataModels };
+        const odataCollections = (collections ?? {});
+        this.collections = { ...this.collections, ...odataCollections };
+    }
     fromJson(json) {
         const segments = ODataPathSegments.fromJson(json.segments);
         const query = ODataQueryOptions.fromJson(json.options);
@@ -13612,7 +13621,7 @@ class ODataClient {
         if (value instanceof ODataResource)
             api = this.settings.findApiForTypes(value.types());
         else if (typeof value === 'string')
-            api = this.settings.findApiByName(value) || this.settings.findApiForType(value);
+            api = this.settings.findApiByName(value) ?? this.settings.findApiForType(value);
         return api ?? this.settings.defaultApi();
     }
     defaultApi() {