angular-odata 0.145.0 → 0.146.1

package/fesm2022/angular-odata.mjs

@@ -2138,8 +2138,8 @@ class ODataEnumTypeParser extends ODataAnnotatable {
                 title: this.name,
                 uniqueItems: true,
                 items: {
-                    type: JsonSchemaType.string,
-                    enum: this._fields.map((f) => f.name),
+                    type: JsonSchemaType.integer,
+                    enum: this._fields.map((f) => f.value),
                 },
             }
             : {
@@ -12241,7 +12241,7 @@ class ODataModelOptions {
         let resource = null;
         let prevField = null;
         for (const [model, field] of ODataModelOptions.chain(child)) {
-            resource = resource || model._resource;
+            resource = resource || model._resource?.clone();
             if (resource === null)
                 break;
             if (ODataModelOptions.isModel(model) && (prevField === null || prevField.collection)) {
@@ -12443,10 +12443,8 @@ class ODataModelOptions {
         }
     }
     asEntity(self, ctx) {
-        // Clone query from him or parent
-        let query = self._resource?.cloneQuery();
-        if (query === undefined && self._parent && self._parent[0] instanceof ODataCollection)
-            query = self._parent[0]._resource?.cloneQuery();
+        // Clone query from resource
+        let query = self.resource()?.cloneQuery();
         // Build new resource
         const resource = this.modelResourceFactory(query);
         return this.withResource(self, resource, ctx);
@@ -14054,10 +14052,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.5", ngImpor
 
 class ODataBaseCache {
     maxAge;
-    entries;
     constructor({ maxAge = DEFAULT_MAXAGE }) {
         this.maxAge = maxAge;
-        this.entries = new Map();
+    }
+    /**
+     * Check if the entry is expired
+     * @param entry The cache entry
+     * @returns Boolean indicating if the entry is expired
+     */
+    isExpired(entry) {
+        return entry.date < (Date.now() - entry.maxAge);
     }
     /**
      * Using the resource on the request build an array of string to identify the scope of the request
@@ -14110,6 +14114,14 @@ class ODataBaseCache {
     buildKey(names) {
         return names.join(CACHE_KEY_SEPARATOR);
     }
+}
+
+class ODataInMemoryCache extends ODataBaseCache {
+    entries;
+    constructor({ maxAge } = {}) {
+        super({ maxAge });
+        this.entries = new Map();
+    }
     /**
      * Put some payload in the cache
      * @param name The name for the entry
@@ -14134,12 +14146,35 @@ class ODataBaseCache {
         const entry = this.entries.get(key);
         return entry !== undefined && !this.isExpired(entry) ? entry.payload : undefined;
     }
+    /**
+     * Store the response in the cache
+     * @param req The request with the resource to store the response
+     * @param res The response to store in the cache
+     */
+    putResponse(req, res) {
+        let scope = this.scope(req);
+        let tags = this.tags(res);
+        this.put(req.cacheKey, res, {
+            maxAge: req.maxAge ?? res.options.maxAge,
+            scope,
+            tags,
+        });
+    }
+    /**
+     * Restore the response from the cache
+     * @param req The request with the resource to get the response
+     * @returns The response from the cache
+     */
+    getResponse(req) {
+        let scope = this.scope(req);
+        return this.get(req.cacheKey, { scope });
+    }
     /**
      * Remove all cache entries that are matching with the given options
      * @param options The options to forget
      */
     forget({ name, scope = [], tags = [], } = {}) {
-        if (name !== undefined)
+        if (name)
             scope.push(name);
         const key = scope.length > 0 ? this.buildKey(scope) : undefined;
         this.entries.forEach((entry, k) => {
@@ -14157,19 +14192,53 @@ class ODataBaseCache {
     flush() {
         this.entries = new Map();
     }
-    /**
-     * Check if the entry is expired
-     * @param entry The cache entry
-     * @returns Boolean indicating if the entry is expired
-     */
-    isExpired(entry) {
-        return entry.date < Date.now() - entry.maxAge;
+    size() {
+        return this.entries.size;
     }
 }
 
-class ODataInMemoryCache extends ODataBaseCache {
-    constructor({ maxAge } = {}) {
+class ODataInStorageCache extends ODataBaseCache {
+    prefix;
+    storage;
+    constructor({ prefix, storage = sessionStorage, maxAge, }) {
         super({ maxAge });
+        this.prefix = prefix;
+        this.storage = storage;
+    }
+    buildKey(names) {
+        return super.buildKey([this.prefix, ...names]);
+    }
+    put(name, payload, { maxAge, scope, tags } = {}) {
+        const entry = this.buildEntry(payload, { maxAge, tags });
+        const key = this.buildKey([...(scope ?? []), name]);
+        this.storage.setItem(key, JSON.stringify(entry));
+    }
+    get(name, { scope } = {}) {
+        const key = this.buildKey([...(scope || []), name]);
+        const entry = JSON.parse(this.storage.getItem(key) ?? "{}");
+        return entry !== undefined && !this.isExpired(entry) ? entry.payload : undefined;
+    }
+    forget({ name, scope = [], tags = [], }) {
+        if (name)
+            scope.push(name);
+        const key = scope.length > 0 ? this.buildKey(scope) : undefined;
+        Object.keys(this.storage).filter(k => k.startsWith(this.prefix)).forEach(k => {
+            const entry = JSON.parse(this.storage.getItem(k) ?? "{}");
+            if (this.isExpired(entry) || // Expired
+                (key !== undefined && k.startsWith(key)) || // Key
+                (tags.length > 0 && tags.some((t) => entry.tags.indexOf(t) !== -1)) // Tags
+            ) {
+                this.storage.removeItem(k);
+            }
+        });
+    }
+    /**
+     * Flush the cache and clean the storage
+     */
+    flush() {
+        Object.keys(this.storage).filter(k => k.startsWith(this.prefix)).forEach(k => {
+            this.storage.removeItem(k);
+        });
     }
     /**
      * Store the response in the cache
@@ -14177,9 +14246,9 @@ class ODataInMemoryCache extends ODataBaseCache {
      * @param res The response to store in the cache
      */
     putResponse(req, res) {
-        let scope = this.scope(req);
-        let tags = this.tags(res);
-        this.put(req.cacheKey, res, {
+        const scope = this.scope(req);
+        const tags = this.tags(res);
+        this.put(req.cacheKey, res.toJson(), {
             maxAge: req.maxAge ?? res.options.maxAge,
             scope,
             tags,
@@ -14191,73 +14260,144 @@ class ODataInMemoryCache extends ODataBaseCache {
      * @returns The response from the cache
      */
     getResponse(req) {
-        let scope = this.scope(req);
-        return this.get(req.cacheKey, { scope });
+        const scope = this.scope(req);
+        const data = this.get(req.cacheKey, { scope });
+        return data !== undefined ? ODataResponse.fromJson(req, data) : undefined;
+    }
+    size() {
+        return Object.keys(this.storage).filter(k => k.startsWith(this.prefix)).length;
     }
 }
 
-class ODataInStorageCache extends ODataBaseCache {
+class ODataIndexedDBCache extends ODataBaseCache {
     name;
-    storage;
-    constructor({ name, storage = sessionStorage, maxAge, }) {
+    version;
+    store;
+    entries;
+    _db;
+    constructor({ name = 'ODataCache', store = 'cache', version = 1, maxAge, } = {}) {
         super({ maxAge });
         this.name = name;
-        this.storage = storage;
-        this.restore();
-        window.addEventListener('beforeunload', () => this.store());
+        this.store = store;
+        this.version = version;
+        this.entries = new Map();
+        this._db = this.initDb();
+    }
+    initDb() {
+        return new Promise((resolve, reject) => {
+            const request = indexedDB.open(this.name, this.version);
+            request.onupgradeneeded = (event) => {
+                const db = event.target.result;
+                if (!db.objectStoreNames.contains(this.store)) {
+                    db.createObjectStore(this.store);
+                }
+            };
+            request.onsuccess = async (event) => {
+                const db = event.target.result;
+                await this.loadFromDb(db);
+                resolve(db);
+            };
+            request.onerror = (event) => {
+                reject(event.target.error);
+            };
+        });
     }
-    /**
-     * Store the cache in the storage
-     */
-    store() {
-        this.storage.setItem(this.name, JSON.stringify(Array.from(this.entries.entries()).map(([key, entry]) => [
-            key,
-            {
-                ...entry,
-                payload: entry.payload instanceof ODataResponse ? entry.payload.toJson() : entry.payload,
-            },
-        ])));
+    loadFromDb(db) {
+        return new Promise((resolve, reject) => {
+            const transaction = db.transaction(this.store, 'readonly');
+            const store = transaction.objectStore(this.store);
+            const request = store.openCursor();
+            request.onsuccess = (event) => {
+                const cursor = event.target.result;
+                if (cursor) {
+                    this.entries.set(cursor.key, cursor.value);
+                    cursor.continue();
+                }
+                else {
+                    resolve();
+                }
+            };
+            request.onerror = (event) => {
+                reject(event.target.error);
+            };
+        });
     }
-    /**
-     * Restore the cache from the storage
-     */
-    restore() {
-        this.entries = new Map(JSON.parse(this.storage.getItem(this.name) || '[]'));
+    async withDb(fn) {
+        const db = await this._db;
+        return fn(db);
     }
-    /**
-     * Flush the cache and clean the storage
-     */
-    flush() {
-        super.flush();
-        this.store();
+    put(name, payload, { maxAge, scope, tags } = {}) {
+        const entry = this.buildEntry(payload, { maxAge, tags });
+        const key = this.buildKey([...(scope ?? []), name]);
+        this.entries.set(key, entry);
+        this.withDb((db) => {
+            return new Promise((resolve, reject) => {
+                const transaction = db.transaction(this.store, 'readwrite');
+                const store = transaction.objectStore(this.store);
+                store.put(entry, key);
+                transaction.oncomplete = () => resolve();
+                transaction.onerror = (event) => reject(event.target.error);
+            });
+        });
+    }
+    get(name, { scope } = {}) {
+        const key = this.buildKey([...(scope || []), name]);
+        const entry = this.entries.get(key);
+        return entry !== undefined && !this.isExpired(entry) ? entry.payload : undefined;
     }
-    /**
-     * Store the response in the cache
-     * @param req The request with the resource to store the response
-     * @param res The response to store in the cache
-     */
     putResponse(req, res) {
         const scope = this.scope(req);
         const tags = this.tags(res);
-        this.put(req.cacheKey, res, {
+        this.put(req.cacheKey, res.toJson(), {
             maxAge: req.maxAge ?? res.options.maxAge,
             scope,
             tags,
         });
     }
-    /**
-     * Restore the response from the cache
-     * @param req The request with the resource to get the response
-     * @returns The response from the cache
-     */
     getResponse(req) {
         const scope = this.scope(req);
         const data = this.get(req.cacheKey, { scope });
-        return data instanceof ODataResponse
-            ? data
-            : data !== undefined
-                ? ODataResponse.fromJson(req, data)
-                : undefined;
+        return data !== undefined ? ODataResponse.fromJson(req, data) : undefined;
+    }
+    forget({ name, scope = [], tags = [], } = {}) {
+        if (name)
+            scope.push(name);
+        const key = scope.length > 0 ? this.buildKey(scope) : undefined;
+        const keysToDelete = [];
+        this.entries.forEach((entry, k) => {
+            if (this.isExpired(entry) ||
+                (key !== undefined && k.startsWith(key)) ||
+                (tags.length > 0 && tags.some((t) => entry.tags.indexOf(t) !== -1))) {
+                keysToDelete.push(k);
+            }
+        });
+        keysToDelete.forEach((k) => this.entries.delete(k));
+        if (keysToDelete.length > 0) {
+            this.withDb((db) => {
+                return new Promise((resolve, reject) => {
+                    const transaction = db.transaction(this.store, 'readwrite');
+                    const store = transaction.objectStore(this.store);
+                    keysToDelete.forEach((k) => store.delete(k));
+                    transaction.oncomplete = () => resolve();
+                    transaction.onerror = (event) => reject(event.target.error);
+                });
+            });
+        }
+    }
+    flush() {
+        this.entries = new Map();
+        this.withDb((db) => {
+            return new Promise((resolve, reject) => {
+                const transaction = db.transaction(this.store, 'readwrite');
+                const store = transaction.objectStore(this.store);
+                store.clear();
+                transaction.oncomplete = () => resolve();
+                transaction.onerror = (event) => reject(event.target.error);
+            });
+        });
+    }
+    size() {
+        return this.entries.size;
     }
 }
 
@@ -14269,5 +14409,5 @@ class ODataInStorageCache extends ODataBaseCache {
  * Generated bundle index. Do not edit.
  */
 
-export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, Casting, CastingOperators, CollectionFunctions, ComputeExpression, ConditionalFunctions, DateAndTimeFunctions, Dates, Durations, EDM_PARSERS, EdmType, Enums, ExpandExpression, ExpandField, Expression, FieldFactory, FilterExpression, Function, GeoFunctions, GroupBy, GroupByTransformations, Grouping, GroupingOperators, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, JsonSchemaType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseCache, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataFunctions, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataLoader, ODataMetadataParser, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventEmitter, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataOperators, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingleton, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataTransformations, ODataValueResource, Objects, Operator, OrderByExpression, OrderByField, PathSegment, QueryCustomTypes, QueryOption, RenderableFactory, SearchExpression, SearchTerm, SegmentHandler, SelectExpression, StandardAggregateMethods, StringAndCollectionFunctions, StringFunctions, Strings, Transformations, Type, TypeFunctions, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, encode, functions, isQueryCustomType, isRawType, normalizeValue, operators, pathAndParamsFromQueryOptions, pathAndParamsFromSegments, provideODataClient, raw, render, resolve, transformations };
+export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, Casting, CastingOperators, CollectionFunctions, ComputeExpression, ConditionalFunctions, DateAndTimeFunctions, Dates, Durations, EDM_PARSERS, EdmType, Enums, ExpandExpression, ExpandField, Expression, FieldFactory, FilterExpression, Function, GeoFunctions, GroupBy, GroupByTransformations, Grouping, GroupingOperators, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, JsonSchemaType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseCache, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataFunctions, ODataInMemoryCache, ODataInStorageCache, ODataIndexedDBCache, ODataMediaResource, ODataMetadata, ODataMetadataLoader, ODataMetadataParser, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventEmitter, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataOperators, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingleton, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataTransformations, ODataValueResource, Objects, Operator, OrderByExpression, OrderByField, PathSegment, QueryCustomTypes, QueryOption, RenderableFactory, SearchExpression, SearchTerm, SegmentHandler, SelectExpression, StandardAggregateMethods, StringAndCollectionFunctions, StringFunctions, Strings, Transformations, Type, TypeFunctions, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, encode, functions, isQueryCustomType, isRawType, normalizeValue, operators, pathAndParamsFromQueryOptions, pathAndParamsFromSegments, provideODataClient, raw, render, resolve, transformations };
 //# sourceMappingURL=angular-odata.mjs.map