angular-odata 0.140.1 → 0.142.0

package/fesm2022/angular-odata.mjs

@@ -502,13 +502,13 @@ const StandardAggregateMethods = {
     min: 'min',
     max: 'max',
     average: 'average',
-    countdistinct: 'countdistinct'
+    countdistinct: 'countdistinct',
 };
 const QueryCustomTypes = {
     Raw: 'Raw',
     Alias: 'Alias',
     Duration: 'Duration',
-    Binary: 'Binary'
+    Binary: 'Binary',
 };
 //https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_QueryOptions
 const raw = (value) => ({
@@ -2986,14 +2986,7 @@ class ODataStructuredType extends ODataParserSchemaElement {
             parserForType: (t) => this.api.parserForType(t),
         });
         if (this.model !== undefined) {
-            this.model.meta = this.api.optionsForType(this.type(), {
-                config: this.model.options,
-                structuredType: this,
-            });
-            if (this.model.meta !== undefined) {
-                // Configure
-                this.model.meta.configure({ options });
-            }
+            this.api.configureModel(this, this.model);
             if (this.collection !== undefined) {
                 this.collection.model = this.model;
             }
@@ -9186,7 +9179,7 @@ class ODataMetadataParser {
         try {
             const parser = new DOMParser();
             this.document = parser.parseFromString(xml, 'text/xml');
-            this.checkVersion(document);
+            this.checkVersion(this.document);
         }
         catch (error) {
             throw new Error('Unable to parse metadata, ' + error);
@@ -9216,9 +9209,9 @@ class ODataMetadataParser {
         ]);
         return new ODataMetadata(version, references, schemas);
     }
-    checkVersion(document) {
+    checkVersion(doc) {
         // check version
-        const attributes = document.documentElement.attributes;
+        const attributes = doc.documentElement.attributes;
         if (!attributes) {
             throw new Error('OData version is not specified in the metadata');
         }
@@ -10577,7 +10570,7 @@ class ODataCollection {
             }
         }
         else if (resource instanceof ODataEntitySetResource) {
-            return model.asEntity((e) => e.destroy(options));
+            return model.asEntity((e) => e.destroy(options)).pipe(map(() => model));
         }
         else {
             return of(model);
@@ -12798,6 +12791,10 @@ class ODataApi {
     parsers;
     // Schemas
     schemas;
+    // Models
+    models = {};
+    // Collections
+    collections = {};
     constructor(config) {
         this.serviceRootUrl = config.serviceRootUrl;
         if (this.serviceRootUrl.includes('?'))
@@ -12817,6 +12814,8 @@ class ODataApi {
         this.errorHandler = config.errorHandler;
         this.parsers = new Map(Object.entries(config.parsers ?? EDM_PARSERS));
         this.schemas = (config.schemas ?? []).map((schema) => new ODataSchema(schema, this));
+        this.models = (config.models ?? {});
+        this.collections = (config.collections ?? {});
     }
     configure(settings = {}) {
         this.requester = settings.requester;
@@ -12825,6 +12824,16 @@ class ODataApi {
                 options: this.options.parserOptions,
             });
         });
+        Object.entries(this.models).forEach(([type, model]) => {
+            const structured = this.findStructuredType(type);
+            if (structured !== undefined) {
+                this.configureModel(structured, model);
+                const collection = this.collections[type];
+                if (collection !== undefined) {
+                    collection.model = model;
+                }
+            }
+        });
     }
     populate(metadata) {
         const config = metadata.toConfig();
@@ -13093,8 +13102,18 @@ class ODataApi {
         return singleton;
     }
     //#endregion
+    configureModel(structured, model) {
+        model.meta = this.optionsForType(structured.type(), {
+            config: model.options,
+            structuredType: structured,
+        });
+        if (model.meta !== undefined) {
+            // Configure
+            model.meta.configure({ options: this.options.parserOptions });
+        }
+    }
     findModel(type) {
-        return this.findStructuredType(type)?.model;
+        return (this.models[type] ?? this.findStructuredType(type)?.model);
     }
     createModel(structured) {
         if (structured.model !== undefined)
@@ -13102,17 +13121,7 @@ class ODataApi {
         // Build Ad-hoc model
         const Model = class extends ODataModel {
         };
-        // Build Meta
-        Model.meta = this.optionsForType(structured.type(), {
-            structuredType: structured,
-        });
-        if (Model.meta !== undefined) {
-            // Configure
-            Model.meta.configure({
-                options: this.options.parserOptions,
-            });
-        }
-        // Store New Model for next time
+        // Store New Model structured for next time
         structured.model = Model;
         return Model;
     }
@@ -13123,20 +13132,23 @@ class ODataApi {
             if (structured === undefined)
                 throw Error(`No structured type for ${type}`);
             Model = this.createModel(structured);
+            this.configureModel(structured, Model);
         }
         return Model;
     }
     findCollection(type) {
-        return this.findStructuredType(type)?.collection;
+        return (this.collections[type] ?? this.findStructuredType(type)?.collection);
     }
     createCollection(structured, model) {
         if (structured.collection !== undefined)
             return structured.collection;
         if (model === undefined)
             model = this.createModel(structured);
+        // Build Ad-hoc collection
         const Collection = class extends ODataCollection {
             static model = model;
         };
+        // Store New Collection structured for next time
         structured.collection = Collection;
         return Collection;
     }
@@ -13535,10 +13547,10 @@ class ODataClient {
     put(resource, body, options = {}) {
         return this.request('PUT', resource, addBody(options, body));
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataClient });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataClient });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataClient, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: ODataConfigLoader }] });
 
@@ -13822,10 +13834,10 @@ class ODataServiceFactory {
         };
         return new Service(this.client, singletonName, apiNameOrEntityType);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataServiceFactory });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataServiceFactory });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataServiceFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: ODataClient }] });
 
@@ -13865,11 +13877,11 @@ class ODataModule {
             ],
         };
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.2.2", ngImport: i0, type: ODataModule, imports: [CommonModule] });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule] });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, imports: [CommonModule] });
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule] });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [CommonModule],
@@ -13922,9 +13934,9 @@ class ODataBaseCache {
     buildEntry(payload, { timeout, tags }) {
         return {
             payload,
-            lastRead: Date.now(),
-            timeout: timeout || this.timeout,
-            tags: tags || [],
+            lastread: Date.now(),
+            timeout: (timeout ?? this.timeout) * 1000,
+            tags: tags ?? [],
         };
     }
     /**
@@ -13945,9 +13957,8 @@ class ODataBaseCache {
      */
     put(name, payload, { timeout, scope, tags } = {}) {
         const entry = this.buildEntry(payload, { timeout, tags });
-        const key = this.buildKey([...(scope || []), name]);
+        const key = this.buildKey([...(scope ?? []), name]);
         this.entries.set(key, entry);
-        this.forget();
     }
     /**
      * Return the payload from the cache if it exists and is not expired
@@ -13958,7 +13969,10 @@ class ODataBaseCache {
     get(name, { scope } = {}) {
         const key = this.buildKey([...(scope || []), name]);
         const entry = this.entries.get(key);
-        return entry !== undefined && !this.isExpired(entry) ? entry.payload : undefined;
+        if (entry === undefined || this.isExpired(entry))
+            return undefined;
+        entry.lastread = Date.now();
+        return entry.payload;
     }
     /**
      * Remove all cache entries that are matching with the given options
@@ -13989,7 +14003,7 @@ class ODataBaseCache {
      * @returns Boolean indicating if the entry is expired
      */
     isExpired(entry) {
-        return entry.lastRead < Date.now() - (entry.timeout || this.timeout) * 1000;
+        return entry.lastread < (Date.now() - entry.timeout);
     }
     /**
      * Using the request, handle the fetching of the response