angular-odata 0.151.0 → 0.153.0

package/fesm2022/angular-odata.mjs

@@ -2519,10 +2519,10 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     }
     configure({ options, parserForType, }) {
         this.parserOptions = options;
-        if (this.base) {
-            const parent = parserForType(this.base);
-            parent.children.push(this);
-            this.parent = parent;
+        if (this.base !== undefined) {
+            this.parent = parserForType(this.base);
+            if (this.parent !== undefined)
+                this.parent.children.push(this);
         }
         this._fields.forEach((f) => f.configure({ options, parserForType }));
     }
@@ -2989,12 +2989,10 @@ class ODataStructuredType extends ODataParserSchemaElement {
         this.collection = config.collection;
     }
     configure({ options }) {
-        if (this.base) {
-            const parent = this.api.findStructuredType(this.base);
-            if (parent !== undefined) {
-                parent.children.push(this);
-                this.parent = parent;
-            }
+        if (this.base !== undefined) {
+            this.parent = this.api.findStructuredType(this.base);
+            if (this.parent !== undefined)
+                this.parent.children.push(this);
         }
         this.parser.configure({
             options,
@@ -12099,15 +12097,15 @@ class ODataModelOptions {
         return match;
     }
     configure({ options }) {
-        if (this.base) {
-            const parent = this.api.optionsForType(this.base);
-            parent.children.push(this);
-            this.parent = parent;
+        if (this.base !== undefined) {
+            this.parent = this.api.optionsForType(this.base);
+            if (this.parent !== undefined)
+                this.parent.children.push(this);
         }
         this.entitySet = this.api.findEntitySetForEntityType(this.type());
         let concurrencyFields = [];
         if (this.entitySet !== undefined) {
-            concurrencyFields = this.entitySet.annotatedValue(OPTIMISTIC_CONCURRENCY) || [];
+            concurrencyFields = this.entitySet.annotatedValue(OPTIMISTIC_CONCURRENCY) ?? [];
         }
         this._fields.forEach((field) => {
             const concurrency = concurrencyFields.indexOf(field.field) !== -1;
@@ -12903,9 +12901,9 @@ class ODataApi {
     // Populate from Metadata
     populateFromMetadata;
     // Schemas
-    schemas;
+    schemas = [];
     // References
-    references;
+    references = [];
     // Models
     models = {};
     // Collections
@@ -12916,7 +12914,7 @@ class ODataApi {
             throw new Error("The 'serviceRootUrl' should not contain query string. Please use 'params' to add extra parameters");
         if (!this.serviceRootUrl.endsWith('/'))
             this.serviceRootUrl += '/';
-        this.metadataUrl = config.metadataUrl ?? `${this.serviceRootUrl}$metadata`;
+        this.metadataUrl = config.metadataUrl ?? `${this.serviceRootUrl}${$METADATA}`;
         this.name = config.name;
         this.version = config.version ?? DEFAULT_VERSION;
         this.default = config.default ?? false;
@@ -12929,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,
@@ -12951,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);
@@ -13614,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() {