angular-odata 0.152.0 → 0.153.0

package/fesm2022/angular-odata.mjs

@@ -12901,9 +12901,9 @@ class ODataApi {
     // Populate from Metadata
     populateFromMetadata;
     // Schemas
-    schemas;
+    schemas = [];
     // References
-    references;
+    references = [];
     // Models
     models = {};
     // Collections
@@ -12927,13 +12927,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 +12953,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 +13611,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() {