npm - angular-odata - Versions diffs - 0.145.0 → 0.146.1 - Mend

angular-odata 0.145.0 → 0.146.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/fesm2022/angular-odata.mjs +209 -69
package/fesm2022/angular-odata.mjs.map +1 -1
package/package.json +1 -1
package/schematics/apigen/angular/entity.js +3 -0
package/schematics/apigen/angular/entity.js.map +1 -1
package/schematics/apigen/angular/enum.d.ts +2 -1
package/schematics/apigen/angular/enum.js +4 -1
package/schematics/apigen/angular/enum.js.map +1 -1
package/schematics/apigen/angular/model.js +3 -0
package/schematics/apigen/angular/model.js.map +1 -1
package/schematics/apigen/metadata/csdl/csdl-structural-property.js +5 -1
package/schematics/apigen/metadata/csdl/csdl-structural-property.js.map +1 -1
package/schematics/apigen/metadata/parser.d.ts +1 -1
package/schematics/apigen/metadata/parser.js +4 -2
package/schematics/apigen/metadata/parser.js.map +1 -1
package/types/angular-odata.d.ts +97 -39

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "angular-odata",
-  "version": "0.145.0",
+  "version": "0.146.1",
   "license": "MIT",
   "description": "Client side OData typescript library for Angular",
   "repository": {

package/schematics/apigen/angular/entity.js CHANGED Viewed

@@ -25,6 +25,9 @@ class EntityProperty {
         if (enumType !== undefined) {
             type = enumType.importedName(imports);
             type += this.edmType.Collection ? '[]' : '';
+            if (!this.edmType.Collection && enumType.isFlags() && !enumType.hasValue(0)) {
+                type += ' | 0';
+            }
         }
         else if (entityType !== undefined) {
             type = entityType.importedName(imports);

package/schematics/apigen/angular/entity.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/entity.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAC9B,gFAAwF;AACxF,2DAAyD;AAEzD,wFAAiG;AACjG,oCAA4C;AAI5C,MAAa,cAAc;IACzB,YACY,MAAc,EACd,OAA8C;QAD9C,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAuC;IACvD,CAAC;IAEJ,IAAI;QACF,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,YAAY,iDAAsB,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5F,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/B,OAAO,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC,OAAiB;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAE,CAAC;YACvC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;~~QAC9C~~,CAAC;aAAM,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAE,CAAC;YACzC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY;QACV,OAAO,CACL,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAC9F,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IACtD,CAAC;CACF;~~AAvCD~~,~~wCAuCC~~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"}
1	+ {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/entity.ts"],"names":[],"mappings":"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"}

package/schematics/apigen/angular/enum.d.ts CHANGED Viewed

@@ -22,6 +22,7 @@ export declare class Enum extends Base {
     directory(): string;
     fullName(): string;
     members(): string[];
-    flags(): boolean | undefined;
+    isFlags(): boolean | undefined;
+    hasValue(value: number): boolean;
     importTypes(): string[];
 }

package/schematics/apigen/angular/enum.js CHANGED Viewed

@@ -46,9 +46,12 @@ class Enum extends base_1.Base {
     members() {
         return this.edmType.Member.map((m) => `${m.Name} = ${m.Value}`);
     }
-    flags() {
+    isFlags() {
         return this.edmType.IsFlags;
     }
+    hasValue(value) {
+        return this.edmType.Member.some(m => m.Value === value);
+    }
     importTypes() {
         return [];
     }

package/schematics/apigen/angular/enum.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/enum.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,iCAA8B;AAE9B,2DAAyD;AAIzD,MAAa,SAAS;IACpB,YAAoB,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;IAAG,CAAC;IACpC,IAAI;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IACM,KAAK;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;CACF;AARD,8BAQC;AACD,MAAa,IAAK,SAAQ,WAAI;IAC5B,YACE,GAAY,EACZ,OAAqB,EACX,OAAqB;QAE/B,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAFV,YAAO,GAAP,OAAO,CAAc;IAGjC,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,cAAc,CAAC,CAAC;IAC7B,CAAC;IACe,SAAS,CAAC,OAAiB;;QACzC,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,UAAU;YAC9B,MAAM,EAAE,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;SACjE,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IACM,OAAO;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAClE,CAAC;IACM,~~KAAK~~;~~QACV~~,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IACe,WAAW;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;~~AAtCD~~,~~oBAsCC~~"}
1	+ {"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/enum.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,iCAA8B;AAE9B,2DAAyD;AAIzD,MAAa,SAAS;IACpB,YAAoB,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;IAAG,CAAC;IACpC,IAAI;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IACM,KAAK;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;CACF;AARD,8BAQC;AACD,MAAa,IAAK,SAAQ,WAAI;IAC5B,YACE,GAAY,EACZ,OAAqB,EACX,OAAqB;QAE/B,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAFV,YAAO,GAAP,OAAO,CAAc;IAGjC,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,cAAc,CAAC,CAAC;IAC7B,CAAC;IACe,SAAS,CAAC,OAAiB;;QACzC,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,UAAU;YAC9B,MAAM,EAAE,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;SACjE,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IACM,OAAO;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAClE,CAAC;IACM,OAAO;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IACM,QAAQ,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;IAC1D,CAAC;IACe,WAAW;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAzCD,oBAyCC"}

package/schematics/apigen/angular/model.js CHANGED Viewed

@@ -24,6 +24,9 @@ class ModelField {
         if (enumType !== undefined) {
             type = enumType.importedName(imports);
             type += this.edmType.Collection ? '[]' : '';
+            if (!this.edmType.Collection && enumType.isFlags() && !enumType.hasValue(0)) {
+                type += ' | 0';
+            }
         }
         else if (entityType !== undefined) {
             if (this.edmType.Collection) {

package/schematics/apigen/angular/model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/model.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/model.ts"],"names":[],"mappings":"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"}

package/schematics/apigen/metadata/csdl/csdl-structural-property.js CHANGED Viewed

@@ -12,7 +12,11 @@ class CsdlStructuralProperty extends csdl_annotation_1.CsdlAnnotable {
         this.Type = this.Collection ? Type.substring(11, Type.length - 1) : Type;
     }
     toJson() {
-        return Object.assign(Object.assign({}, super.toJson()), { Name: this.Name, Type: this.Collection ? `Collection(${this.Type})` : this.Type, Nullable: this.Nullable });
+        const json = Object.assign(Object.assign({}, super.toJson()), { Name: this.Name, Type: this.Collection ? `Collection(${this.Type})` : this.Type, Nullable: this.Nullable });
+        if (this.Nullable !== undefined) {
+            json['Nullable'] = this.Nullable;
+        }
+        return json;
     }
     isEdmType() {
         return this.Type.startsWith('Edm.');

package/schematics/apigen/metadata/csdl/csdl-structural-property.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"csdl-structural-property.js","sourceRoot":"","sources":["../../../../../../projects/angular-odata/schematics/apigen/metadata/csdl/csdl-structural-property.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAGlD,MAAsB,sBAAuB,SAAQ,+BAAa;IAMhE,YACY,IAAwB,EAClC,EACE,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,UAAU,GAMX;QAED,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAbZ,SAAI,GAAJ,IAAI,CAAoB;QAclC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;IAEQ,MAAM;QACb,~~OAAO~~,~~gCACF~~,KAAK,CAAC,MAAM,EAAE,KACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAC9D,QAAQ,EAAE,IAAI,CAAC,QAAQ,~~GACE~~,CAAC;~~IAC9B~~,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;CACF;~~AAvCD~~,~~wDAuCC~~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"}
1	+ {"version":3,"file":"csdl-structural-property.js","sourceRoot":"","sources":["../../../../../../projects/angular-odata/schematics/apigen/metadata/csdl/csdl-structural-property.ts"],"names":[],"mappings":"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"}

package/schematics/apigen/metadata/parser.d.ts CHANGED Viewed

@@ -104,7 +104,7 @@ export declare class ODataMetadataParser {
     protected getFieldValueByTag(field: Field, element: Element): any[];
     protected getAttributeValue(attributes: NamedNodeMap, attributeName: string): string | undefined;
     protected propertyValueToNumber(attributeValue?: string): number | undefined;
-    protected propertyValueToBoolean(attributeValue?: string): boolean;
+    protected propertyValueToBoolean(attributeValue?: string): boolean | undefined;
     protected propertyValueToDate(attributeValue?: string): Date | undefined;
 }
 export {};

package/schematics/apigen/metadata/parser.js CHANGED Viewed

@@ -466,13 +466,15 @@ 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;

package/schematics/apigen/metadata/parser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/metadata/parser.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/metadata/parser.ts"],"names":[],"mappings":"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"}

package/types/angular-odata.d.ts CHANGED Viewed

@@ -5071,6 +5071,7 @@ interface ODataCache {
     }): void;
     scope(obj: ODataRequest<any>): string[];
     tags(obj: ODataResponse<any>): string[];
+    size(): number;
 }
 interface ODataApiConfigOptions {
     version?: ODataVersion;
@@ -6277,12 +6278,15 @@ interface ODataCacheEntry<T> {
 }
 declare abstract class ODataBaseCache implements ODataCache {
     maxAge: number;
-    entries: Map<string, ODataCacheEntry<any>>;
     constructor({ maxAge }: {
         maxAge?: number;
     });
-    abstract getResponse(req: ODataRequest<any>): ODataResponse<any> | undefined;
-    abstract putResponse(req: ODataRequest<any>, res: ODataResponse<any>): void;
+    /**
+     * Check if the entry is expired
+     * @param entry The cache entry
+     * @returns Boolean indicating if the entry is expired
+     */
+    isExpired(entry: ODataCacheEntry<any>): boolean;
     /**
      * Using the resource on the request build an array of string to identify the scope of the request
      * @param req The request with the resource to build the scope
@@ -6312,6 +6316,30 @@ declare abstract class ODataBaseCache implements ODataCache {
      * @returns The key for the entry
      */
     buildKey(names: string[]): string;
+    abstract put<T>(name: string, payload: T, { maxAge, scope, tags }: {
+        maxAge?: number;
+        scope?: string[];
+        tags?: string[];
+    }): void;
+    abstract get<T>(name: string, { scope }: {
+        scope?: string[];
+    }): T | undefined;
+    abstract getResponse(req: ODataRequest<any>): ODataResponse<any> | undefined;
+    abstract putResponse(req: ODataRequest<any>, res: ODataResponse<any>): void;
+    abstract forget({ name, scope, tags }: {
+        name?: string;
+        scope?: string[];
+        tags?: string[];
+    }): void;
+    abstract flush(): void;
+    abstract size(): number;
+}
+declare class ODataInMemoryCache extends ODataBaseCache {
+    entries: Map<string, ODataCacheEntry<any>>;
+    constructor({ maxAge }?: {
+        maxAge?: number;
+    });
     /**
      * Put some payload in the cache
      * @param name The name for the entry
@@ -6334,6 +6362,18 @@ declare abstract class ODataBaseCache implements ODataCache {
     get<T>(name: string, { scope }?: {
         scope?: string[];
     }): T | 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: ODataRequest<any>, res: ODataResponse<any>): void;
+    /**
+     * 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: ODataRequest<any>): ODataResponse<any> | undefined;
     /**
      * Remove all cache entries that are matching with the given options
      * @param options The options to forget
@@ -6347,48 +6387,31 @@ declare abstract class ODataBaseCache implements ODataCache {
      * Remove all cache entries
      */
     flush(): void;
-    /**
-     * Check if the entry is expired
-     * @param entry The cache entry
-     * @returns Boolean indicating if the entry is expired
-     */
-    isExpired(entry: ODataCacheEntry<any>): boolean;
-}
-declare class ODataInMemoryCache extends ODataBaseCache {
-    constructor({ maxAge }?: {
-        maxAge?: number;
-    });
-    /**
-     * 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: ODataRequest<any>, res: ODataResponse<any>): void;
-    /**
-     * 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: ODataRequest<any>): ODataResponse<any> | undefined;
+    size(): number;
 }
 declare class ODataInStorageCache extends ODataBaseCache {
-    name: string;
+    prefix: string;
     storage: Storage;
-    constructor({ name, storage, maxAge, }: {
+    constructor({ prefix, storage, maxAge, }: {
         maxAge?: number;
-        name: string;
+        prefix: string;
         storage?: Storage;
     });
-    /**
-     * Store the cache in the storage
-     */
-    store(): void;
-    /**
-     * Restore the cache from the storage
-     */
-    restore(): void;
+    buildKey(names: string[]): string;
+    put<T>(name: string, payload: T, { maxAge, scope, tags }?: {
+        maxAge?: number;
+        scope?: string[];
+        tags?: string[];
+    }): void;
+    get<T>(name: string, { scope }?: {
+        scope?: string[];
+    }): T | undefined;
+    forget({ name, scope, tags, }: {
+        name?: string;
+        scope?: string[];
+        tags?: string[];
+    }): void;
     /**
      * Flush the cache and clean the storage
      */
@@ -6405,6 +6428,41 @@ declare class ODataInStorageCache extends ODataBaseCache {
      * @returns The response from the cache
      */
     getResponse(req: ODataRequest<any>): ODataResponse<any> | undefined;
+    size(): number;
+}
+declare class ODataIndexedDBCache extends ODataBaseCache {
+    private name;
+    private version;
+    private store;
+    private entries;
+    private _db;
+    constructor({ name, store, version, maxAge, }?: {
+        name?: string;
+        store?: string;
+        version?: number;
+        maxAge?: number;
+    });
+    private initDb;
+    private loadFromDb;
+    private withDb;
+    put<T>(name: string, payload: T, { maxAge, scope, tags }?: {
+        maxAge?: number;
+        scope?: string[];
+        tags?: string[];
+    }): void;
+    get<T>(name: string, { scope }?: {
+        scope?: string[];
+    }): T | undefined;
+    putResponse(req: ODataRequest<any>, res: ODataResponse<any>): void;
+    getResponse(req: ODataRequest<any>): ODataResponse<any> | undefined;
+    forget({ name, scope, tags, }?: {
+        name?: string;
+        scope?: string[];
+        tags?: string[];
+    }): void;
+    flush(): void;
+    size(): number;
 }
 declare enum FieldType {
@@ -6516,5 +6574,5 @@ declare class ODataMetadataParser {
     protected propertyValueToDate(attributeValue?: string): Date | undefined;
 }
-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 };
 export type { AggregateMethod, AggregateType, ApplyExpressionBuilder, CacheCacheability, ComputeExpressionBuilder, Duration, EntityKey, Expand, ExpandExpressionBuilder, ExpandObject, ExpandOptions, ExpandType, FetchPolicy, FieldParser, Filter, FilterConnector, FilterExpressionBuilder, FilterType, GroupByType, JsonSchemaCustom, JsonSchemaExpand, JsonSchemaFieldOptions, JsonSchemaOptions, JsonSchemaRequired, JsonSchemaSelect, LooseUnion, ModelFieldOptions, ModelInterface, ModelOptions, NestedExpandOptions, NestedOrderBy, Normalize, ODataActionOptions, ODataAnnotationConfig, ODataApiConfig, ODataApiConfigOptions, ODataCache, ODataCacheEntry, ODataCallableConfig, ODataEntities, ODataEntitiesOptions, ODataEntity, ODataEntityContainerConfig, ODataEntityOptions, ODataEntitySetConfig, ODataEnumTypeConfig, ODataEnumTypeFieldConfig, ODataFunctionOptions, ODataMetadataType, ODataModelEntry, ODataModelFieldOptions, ODataOptions, ODataParameterConfig, ODataProperty, ODataPropertyOptions, ODataQueryArguments, ODataQueryArgumentsOptions, ODataReferenceConfig, ODataResponseJson, ODataSchemaConfig, ODataSegment, ODataSingletonConfig, ODataStructuredTypeConfig, ODataStructuredTypeFieldConfig, ODataVersion, ObjectValues, OrderAttribute, OrderBy, OrderByExpressionBuilder, OrderByObject, OrderByType, Parser, ParserOptions, PassedInitialConfig, QueryCustomType, QueryOptions, Renderable, ResponseOptions, SearchConnector, SearchExpressionBuilder, Select, SelectExpressionBuilder, SelectType, StructuredTypeFieldOptions, Transform, Unpacked, Value };