angular-odata 0.128.0 → 0.131.0

package/fesm2022/angular-odata.mjs

@@ -1,7 +1,7 @@
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType, HttpClientModule } from '@angular/common/http';
-import { of, throwError, Subject, map as map$1, EMPTY, Observable, forkJoin, NEVER } from 'rxjs';
-import { tap, startWith, map, expand, reduce, finalize, defaultIfEmpty, switchMap, catchError } from 'rxjs/operators';
+import { Subject, map as map$1, EMPTY, throwError, Observable, forkJoin, of, NEVER } from 'rxjs';
+import { map, expand, reduce, finalize, defaultIfEmpty, switchMap, catchError, tap, startWith } from 'rxjs/operators';
 import * as i0 from '@angular/core';
 import { EventEmitter, Injectable, InjectionToken, makeEnvironmentProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
@@ -219,205 +219,292 @@ const DESCRIPTION = /.*Description$/;
 const LONG_DESCRIPTION = /.*LongDescription$/;
 const OPTIONARL_PARAMETER = /.*OptionalParameter$/;
 
-class ODataCache {
-    constructor({ timeout = DEFAULT_TIMEOUT }) {
-        this.timeout = timeout;
-        this.entries = new Map();
-    }
-    /**
-     * 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
-     * @returns Array of string to identify the scope of the request
-     */
-    scope(req) {
-        const segments = req.resource.cloneSegments();
-        return segments.segments({ key: true }).reduce((acc, s) => {
-            if (s.name === PathSegment.entitySet)
-                acc = [...acc, s.path()];
-            return acc;
-        }, ['request']);
-    }
-    /**
-     * Using the odata context on the response build an array of string to identify the tags of the response
-     * @param res The response to build the tags
-     * @returns Array of string to identify the tags of the response
-     */
-    tags(res) {
-        const tags = [];
-        const context = res.context;
-        if (context.entitySet) {
-            tags.push(context.key
-                ? `${context.entitySet}(${context.key})`
-                : context.entitySet);
-        }
-        if (context.type)
-            tags.push(context.type);
-        return tags;
-    }
-    /**
-     * Build an entry from a payload and some options
-     * @param payload The payload to store in the cache
-     * @param timeout The timeout for the entry
-     * @param tags The tags for the entry
-     * @returns The entry to store in the cache
-     */
-    buildEntry(payload, { timeout, tags }) {
-        return {
-            payload,
-            lastRead: Date.now(),
-            timeout: timeout || this.timeout,
-            tags: tags || [],
-        };
-    }
-    /**
-     * Build a key from store an entry in the cache
-     * @param names The names of the entry
-     * @returns The key for the entry
-     */
-    buildKey(names) {
-        return names.join(CACHE_KEY_SEPARATOR);
-    }
-    /**
-     * Put some payload in the cache
-     * @param name The name for the entry
-     * @param payload The payload to store in the cache
-     * @param timeout The timeout for the entry
-     * @param scope The scope for the entry
-     * @param tags The tags for the entry
-     */
-    put(name, payload, { timeout, scope, tags, } = {}) {
-        const entry = this.buildEntry(payload, { timeout, tags });
-        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
-     * @param name The name of the entry
-     * @param scope The scope of the entry
-     * @returns The payload of the entry
-     */
-    get(name, { scope } = {}) {
-        const key = this.buildKey([...(scope || []), name]);
-        const entry = this.entries.get(key);
-        return entry !== undefined && !this.isExpired(entry)
-            ? entry.payload
+const COLLECTION = /Collection\(([\w\.]+)\)/;
+const PROPERTY = /([\w\d\-_]+)\(([\'\w\d\-_=]+)\)/;
+const EXPAND = /([\w\d\-_]+)\(([\w\d\,\(\)]+)\)/;
+const ODataVersionBaseHelper = {
+    entity(data) {
+        return data;
+    },
+    entities(data) {
+        return data[this.VALUE];
+    },
+    property(data) {
+        return this.VALUE in data ? data[this.VALUE] : data;
+    },
+    functions(annots) {
+        const funcs = new Map();
+        [...annots.keys()]
+            .filter((key) => key.startsWith(this.ODATA_FUNCTION_PREFIX))
+            .forEach((key) => funcs.set(key.substring(this.ODATA_FUNCTION_PREFIX.length), annots.get(key)));
+        return funcs;
+    },
+    properties(annots) {
+        const props = new Map();
+        [...annots.keys()]
+            .filter((key) => key.indexOf(this.ODATA_ANNOTATION_PREFIX) > 0)
+            .forEach((key) => {
+            let name = key.substring(0, key.indexOf(this.ODATA_ANNOTATION_PREFIX));
+            let prop = props.has(name) ? props.get(name) : new Map();
+            prop.set(key.substring(key.indexOf(this.ODATA_ANNOTATION_PREFIX)), annots.get(key));
+            props.set(name, prop);
+        });
+        return props;
+    },
+    id(annots) {
+        return annots instanceof Map
+            ? annots.get(this.ODATA_ID)
+            : annots[this.ODATA_ID];
+    },
+    etag(annots) {
+        return annots instanceof Map
+            ? annots.get(this.ODATA_ETAG)
+            : annots[this.ODATA_ETAG];
+    },
+    type(annots) {
+        let type = annots instanceof Map
+            ? annots.get(this.ODATA_TYPE)
+            : annots[this.ODATA_TYPE];
+        if (!type)
+            return undefined;
+        type = type.substring(1);
+        const matches = COLLECTION.exec(type);
+        if (matches)
+            return matches[1].indexOf('.') === -1 ? `Edm.${matches[1]}` : matches[1];
+        return type;
+    },
+    mediaEtag(annots) {
+        return annots.has(this.ODATA_MEDIA_ETAG)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_ETAG))
             : undefined;
-    }
-    /**
-     * Remove all cache entries that are matching with the given options
-     * @param options The options to forget
-     */
-    forget({ name, scope = [], tags = [], } = {}) {
-        if (name !== undefined)
-            scope.push(name);
-        const key = scope.length > 0 ? this.buildKey(scope) : undefined;
-        this.entries.forEach((entry, 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.entries.delete(k);
+    },
+    metadataEtag(annots) {
+        return annots.has(this.ODATA_METADATA_ETAG)
+            ? decodeURIComponent(annots.get(this.ODATA_METADATA_ETAG))
+            : undefined;
+    },
+    count(annots) {
+        return annots.has(this.ODATA_COUNT)
+            ? Number(annots.get(this.ODATA_COUNT))
+            : undefined;
+    },
+    annotations(value) {
+        const annots = new Map();
+        Object.entries(value)
+            .filter(([key]) => key.indexOf(this.ODATA_ANNOTATION_PREFIX) !== -1 ||
+            key.startsWith(this.ODATA_FUNCTION_PREFIX))
+            .forEach(([key, value]) => annots.set(key, value));
+        return annots;
+    },
+    attributes(value, metadata) {
+        return Object.entries(value)
+            .filter(([k]) => metadata === 'none' ||
+            (metadata === 'minimal' &&
+                (k.indexOf(this.ODATA_ANNOTATION_PREFIX) === -1 ||
+                    k.startsWith(this.ODATA_ANNOTATION_PREFIX)) &&
+                !k.startsWith(this.ODATA_FUNCTION_PREFIX)) ||
+            (metadata === 'full' &&
+                k.indexOf(this.ODATA_ANNOTATION_PREFIX) === -1 &&
+                !k.startsWith(this.ODATA_FUNCTION_PREFIX)))
+            .reduce((acc, e) => ({ ...acc, [e[0]]: e[1] }), {});
+    },
+    nextLink(annots) {
+        return annots.has(this.ODATA_NEXTLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_NEXTLINK))
+            : undefined;
+    },
+    readLink(annots) {
+        return annots.has(this.ODATA_READLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_READLINK))
+            : undefined;
+    },
+    mediaReadLink(annots) {
+        return annots.has(this.ODATA_MEDIA_READLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_READLINK))
+            : undefined;
+    },
+    editLink(annots) {
+        return annots.has(this.ODATA_EDITLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_EDITLINK))
+            : undefined;
+    },
+    mediaEditLink(annots) {
+        return annots.has(this.ODATA_MEDIA_EDITLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_EDITLINK))
+            : undefined;
+    },
+    deltaLink(annots) {
+        return annots.has(this.ODATA_DELTALINK)
+            ? decodeURIComponent(annots.get(this.ODATA_DELTALINK))
+            : undefined;
+    },
+    mediaContentType(annots) {
+        return annots.has(this.ODATA_MEDIA_CONTENTTYPE)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_CONTENTTYPE))
+            : undefined;
+    },
+};
+const ODataHelper = {
+    //#region Version 4.0
+    [VERSION_4_0]: {
+        ...ODataVersionBaseHelper,
+        VALUE: 'value',
+        ODATA_ANNOTATION_PREFIX: '@odata',
+        ODATA_FUNCTION_PREFIX: '#',
+        //odata.id: the ID of the entity
+        ODATA_ID: '@odata.id',
+        //odata.count: the total count of a collection of entities or collection of entity references, if requested.
+        ODATA_COUNT: '@odata.count',
+        //odata.context: the context URL for a collection, entity, primitive value, or service document.
+        ODATA_CONTEXT: '@odata.context',
+        //odata.etag: the ETag of the entity
+        ODATA_ETAG: '@odata.etag',
+        ODATA_METADATA_ETAG: '@odata.metadataEtag',
+        //odata.type: the type of the containing {[name: string]: any} or targeted property if the type of the {[name: string]: any} or targeted property cannot be heuristically determined
+        ODATA_TYPE: '@odata.type',
+        //odata.delta
+        ODATA_DELTA: '@odata.delta',
+        //odata.remove
+        ODATA_REMOVE: '@odata.remove',
+        //odata.nextLink: the next link of a collection with partial results
+        ODATA_NEXTLINK: '@odata.nextLink',
+        //odata.deltaLink: the delta link for obtaining changes to the result, if requested
+        ODATA_DELTALINK: '@odata.deltaLink',
+        //odata.readLink: the link used to read the entity, if the edit link cannot be used to read the entity
+        ODATA_READLINK: '@odata.readLink',
+        //odata.editLink: the link used to edit/update the entity, if the entity is updatable and the odata.id does not represent a URL that can be used to edit the entity
+        ODATA_EDITLINK: '@odata.editLink',
+        //odata.associationLink: the link used to describe the relationship between this entity and related entities
+        ODATA_ASSOCIATIONLINK: '@odata.associationLink',
+        //odata.navigationLink: the link used to retrieve the values of a navigation property
+        ODATA_NAVIGATIONLINK: '@odata.navigationLink',
+        //Media entities and stream properties may in addition contain the following annotations:
+        //odata.mediaEtag: the ETag of the stream, as appropriate
+        ODATA_MEDIA_ETAG: '@odata.mediaEtag',
+        //odata.mediaContentType: the content type of the stream
+        ODATA_MEDIA_CONTENTTYPE: '@odata.mediaContentType',
+        //odata.mediaReadLink: the link used to read the stream
+        ODATA_MEDIA_READLINK: '@odata.mediaReadLink',
+        //odata.mediaEditLink: the link used to edit/update the stream
+        ODATA_MEDIA_EDITLINK: '@odata.mediaEditLink',
+        //http://nb-mdp-dev01:57970/$metadata#recursos/$entity
+        //http://nb-mdp-dev01:57970/$metadata#categorias
+        //http://nb-mdp-dev01:57970/$metadata#juzgados
+        //http://nb-mdp-dev01:57970/$metadata#Collection(SIU.Recursos.RecursoEntry)
+        //http://nb-mdp-dev01:57970/$metadata#categorias/$entity
+        //http://nb-mdp-dev01:57970/$metadata#categorias(children(children(children(children(children(children(children(children(children(children()))))))))))/$entity
+        //http://nb-mdp-dev01:57970/$metadata#recursos/SIU.Documentos.Documento/$entity
+        //http://nb-mdp-dev01:57970/$metadata#SIU.Api.Infrastructure.Storage.Backend.SiuUrls
+        context(annots) {
+            let ctx = {};
+            const str = annots instanceof Map
+                ? annots.get(this.ODATA_CONTEXT)
+                : annots[this.ODATA_CONTEXT];
+            if (typeof str === 'string') {
+                let index = str.indexOf('$metadata');
+                ctx.serviceRootUrl = str.substring(0, index);
+                index = str.indexOf('#');
+                ctx.metadataUrl = str.substring(0, index);
+                const parts = str.substring(index + 1).split('/');
+                const col = COLLECTION.exec(parts[0]);
+                if (col) {
+                    ctx.type = col[1];
+                }
+                else if (parts[0].indexOf('.') !== -1) {
+                    ctx.type = parts[0];
+                }
+                else {
+                    const property = parts[0].match(PROPERTY);
+                    const expand = parts[0].match(EXPAND);
+                    ctx.entity = parts[1] === '$entity';
+                    if (property) {
+                        ctx.entitySet = property[1];
+                        ctx.key = property[2];
+                        ctx.property = parts[1];
+                    }
+                    else if (expand) {
+                        ctx.entitySet = expand[1];
+                        ctx.expand = expand[2];
+                    }
+                    else {
+                        ctx.entitySet = parts[0];
+                    }
+                }
             }
-        });
-    }
-    /**
-     * Remove all cache entries
-     */
-    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.lastRead < Date.now() - (entry.timeout || this.timeout) * 1000;
-    }
-    /**
-     * Using the request, handle the fetching of the response
-     * @param req The request to fetch
-     * @param res$ Observable of the response
-     * @returns
-     */
-    handleRequest(req, res$) {
-        return req.isFetch()
-            ? this.handleFetch(req, res$)
-            : req.isMutate()
-                ? this.handleMutate(req, res$)
-                : res$;
-    }
-    handleFetch(req, res$) {
-        const policy = req.fetchPolicy;
-        const cached = this.getResponse(req);
-        if (policy === 'no-cache') {
-            return res$;
-        }
-        if (policy === 'cache-only') {
-            if (cached) {
-                return of(cached);
+            return ctx;
+        },
+        countParam() {
+            return { [$COUNT]: 'true' };
+        },
+    },
+    //#endregion
+    //#region Version 3.0
+    [VERSION_3_0]: {
+        ...ODataVersionBaseHelper,
+        ODATA_ANNOTATION_PREFIX: 'odata.',
+        ODATA_FUNCTION_PREFIX: '',
+        ODATA_ID: 'odata.id',
+        ODATA_DELTA: 'odata.delta',
+        ODATA_REMOVE: 'odata.remove',
+        ODATA_ETAG: 'odata.etag',
+        ODATA_CONTEXT: 'odata.metadata',
+        ODATA_NEXTLINK: 'odata.nextLink',
+        ODATA_TYPE: 'odata.type',
+        ODATA_COUNT: 'odata.count',
+        VALUE: 'value',
+        context(annots) {
+            let ctx = {};
+            const str = annots instanceof Map
+                ? annots.get(this.ODATA_CONTEXT)
+                : annots[this.ODATA_CONTEXT];
+            if (typeof str === 'string') {
+                let index = str.indexOf('$metadata');
+                ctx.serviceRootUrl = str.substring(0, index);
+                index = str.indexOf('#');
+                ctx.metadataUrl = str.substring(0, index);
+                const parts = str.substring(index + 1).split('/');
+                ctx.entitySet = parts[0];
             }
-            else {
-                return throwError(() => new Error('No Cached'));
+            return ctx;
+        },
+        countParam() {
+            return { [$INLINECOUNT]: 'allpages' };
+        },
+    },
+    //#endregion
+    //#region Version 2.0
+    [VERSION_2_0]: {
+        ...ODataVersionBaseHelper,
+        ODATA_ID: 'id',
+        ODATA_DELTA: 'delta',
+        ODATA_REMOVE: 'remove',
+        ODATA_ETAG: 'etag',
+        ODATA_ANNOTATION: '__metadata',
+        ODATA_NEXTLINK: '__next',
+        ODATA_COUNT: '__count',
+        ODATA_DEFERRED: '__deferred',
+        ODATA_TYPE: 'type',
+        VALUE: 'results',
+        annotations(value) {
+            const annots = new Map();
+            if (this.ODATA_ANNOTATION in value) {
+                Object.entries(value[this.ODATA_ANNOTATION]).forEach(([key, value]) => annots.set(key, value));
             }
-        }
-        if (policy === 'cache-first' ||
-            policy === 'cache-and-network' ||
-            policy === 'network-only') {
-            res$ = res$.pipe(tap((res) => {
-                if (res.options.cacheability !== 'no-store')
-                    this.putResponse(req, res);
-            }));
-        }
-        return cached !== undefined && policy !== 'network-only'
-            ? policy === 'cache-and-network'
-                ? res$.pipe(startWith(cached))
-                : of(cached)
-            : res$;
-    }
-    handleMutate(req, res$) {
-        const requests = req.isBatch()
-            ? req.resource
-                .requests()
-                .filter((r) => r.isMutate())
-            : [req];
-        for (var r of requests) {
-            const scope = this.scope(r);
-            this.forget({ scope });
-        }
-        return res$;
-    }
-}
-
-class ODataInMemoryCache extends ODataCache {
-    constructor({ timeout } = {}) {
-        super({ timeout });
-    }
-    /**
-     * 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, {
-            timeout: 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 });
-    }
-}
+            return annots;
+        },
+        context(annots) {
+            let ctx = {};
+            return ctx;
+        },
+        attributes(value, metadata) {
+            return value;
+        },
+        countParam() {
+            return { [$INLINECOUNT]: 'allpages' };
+        },
+    },
+    //#endregion
+};
 
 const COMPARISON_OPERATORS = ['eq', 'ne', 'gt', 'ge', 'lt', 'le'];
 const LOGICAL_OPERATORS = ['and', 'or', 'not'];
@@ -473,7 +560,7 @@ const isQueryCustomType = (value) => typeof value === 'object' &&
 const isRawType = (value) => isQueryCustomType(value) &&
     value.type === QueryCustomTypes.Raw;
 const ITEM_ROOT = '';
-function builder ({ select, search, skiptoken, format, top, skip, filter, transform, orderBy, key, count, expand, action, func, aliases, escape, } = {}) {
+function builder ({ select, search, skiptoken, format, top, skip, filter, transform, compute, orderBy, key, count, expand, action, func, aliases, escape, } = {}) {
     const [path, params] = buildPathAndQuery({
         select,
         search,
@@ -483,6 +570,7 @@ function builder ({ select, search, skiptoken, format, top, skip, filter, transf
         skip,
         filter,
         transform,
+        compute,
         orderBy,
         key,
         count,
@@ -494,7 +582,7 @@ function builder ({ select, search, skiptoken, format, top, skip, filter, transf
     });
     return buildUrl(path, params);
 }
-function buildPathAndQuery({ select, search, skiptoken, format, top, skip, filter, apply, transform, orderBy, key, count, expand, action, func, aliases, escape, } = {}) {
+function buildPathAndQuery({ select, search, skiptoken, format, top, skip, filter, apply, transform, compute, orderBy, key, count, expand, action, func, aliases, escape, } = {}) {
     let path = '';
     aliases = aliases || [];
     const query = {};
@@ -510,6 +598,14 @@ function buildPathAndQuery({ select, search, skiptoken, format, top, skip, filte
                 ? select.join(',')
                 : select;
     }
+    // Compute
+    if (compute) {
+        query.$compute = isRawType(compute)
+            ? compute.value
+            : Array.isArray(compute)
+                ? compute.join(',')
+                : compute;
+    }
     // Search
     if (search) {
         query.$search = search;
@@ -1052,7 +1148,7 @@ function buildUrl(path, params) {
     return queries.length ? `${path}?${queries.join('&')}` : path;
 }
 function parseNot(builtFilters) {
-    return `not(${builtFilters.join(' and ')})`;
+    return `not (${builtFilters.join(' and ')})`;
 }
 
 const ISO_REGEX = /(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))/;
@@ -1669,6 +1765,7 @@ const Urls = {
 };
 
 class Expression {
+    _children;
     constructor({ children, } = {}) {
         this._children = children || [];
     }
@@ -1676,7 +1773,7 @@ class Expression {
         return 'Expression';
     }
     children() {
-        return this._children;
+        return [...this._children];
     }
     length() {
         return this._children.length;
@@ -1693,12 +1790,19 @@ class Expression {
 }
 
 class ODataAnnotation {
+    term;
+    string;
+    bool;
+    int;
+    permissions;
+    properties;
     constructor(annot) {
         this.term = annot.term;
         Object.assign(this, annot);
     }
 }
 class ODataAnnotatable {
+    annotations;
     constructor(config) {
         this.annotations = (config.annotations || []).map((annot) => new ODataAnnotation(annot));
     }
@@ -1730,6 +1834,8 @@ class ODataAnnotatable {
 }
 
 class ODataSchemaElement extends ODataAnnotatable {
+    name;
+    schema;
     constructor(config, schema) {
         super(config);
         this.schema = schema;
@@ -1788,573 +1894,331 @@ class ODataSchemaElement extends ODataAnnotatable {
     }
 }
 class ODataParserSchemaElement extends ODataSchemaElement {
+    parser;
     constructor(config, schema, parser) {
         super(config, schema);
         this.parser = parser;
     }
 }
 
-//https://github.com/niklasvh/base64-arraybuffer
-const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-// Use a lookup table to find the index.
-const lookup = new Uint8Array(256);
-for (var i = 0; i < chars.length; i++) {
-    lookup[chars.charCodeAt(i)] = i;
-}
-const ArrayBuffers = {
-    toArrayBuffer(v) {
-        var bufferLength = v.length * 0.75, len = v.length, i, p = 0, encoded1, encoded2, encoded3, encoded4;
-        if (v[v.length - 1] === '=') {
-            bufferLength--;
-            if (v[v.length - 2] === '=') {
-                bufferLength--;
-            }
-        }
-        var arraybuffer = new ArrayBuffer(bufferLength), bytes = new Uint8Array(arraybuffer);
-        for (i = 0; i < len; i += 4) {
-            encoded1 = lookup[v.charCodeAt(i)];
-            encoded2 = lookup[v.charCodeAt(i + 1)];
-            encoded3 = lookup[v.charCodeAt(i + 2)];
-            encoded4 = lookup[v.charCodeAt(i + 3)];
-            bytes[p++] = (encoded1 << 2) | (encoded2 >> 4);
-            bytes[p++] = ((encoded2 & 15) << 4) | (encoded3 >> 2);
-            bytes[p++] = ((encoded3 & 3) << 6) | (encoded4 & 63);
-        }
-        return arraybuffer;
-    },
-    toString(v) {
-        var bytes = new Uint8Array(v), i, len = bytes.length, base64 = '';
-        for (i = 0; i < len; i += 3) {
-            base64 += chars[bytes[i] >> 2];
-            base64 += chars[((bytes[i] & 3) << 4) | (bytes[i + 1] >> 4)];
-            base64 += chars[((bytes[i + 1] & 15) << 2) | (bytes[i + 2] >> 6)];
-            base64 += chars[bytes[i + 2] & 63];
-        }
-        if (len % 3 === 2) {
-            base64 = base64.substring(0, base64.length - 1) + '=';
-        }
-        else if (len % 3 === 1) {
-            base64 = base64.substring(0, base64.length - 2) + '==';
-        }
-        return base64;
-    },
-};
-
-// Core EdmTypeParserBuilder
-const EdmParser = (_d, _s, _e) => ({
-    deserialize(value, options) {
-        return Array.isArray(value)
-            ? value.map((v) => _d(v, options))
-            : _d(value, options);
-    },
-    serialize(value, options) {
-        return Array.isArray(value)
-            ? value.map((v) => _s(v, options))
-            : _s(value, options);
-    },
-    encode(value, options) {
-        return Array.isArray(value)
-            ? value.map((v) => (!isRawType(v) ? _e(v, options) : v))
-            : !isRawType(value)
-                ? _e(value, options)
-                : value;
-    },
-});
-const Identity = (v) => v;
-const toNumber = (v) => Number(v);
-const toString = (v) => v.toString();
-const toBoolean = (v) => Boolean(v);
-const toDate = (v) => new Date(v);
-const EDM_PARSERS = {
-    //Edm.Guid 16-byte (128-bit) unique identifier
-    [EdmType.Guid]: EdmParser(Identity, Identity, (v) => raw(v)),
-    //Edm.Int16 Signed 16-bit integer
-    [EdmType.Int16]: EdmParser(toNumber, toNumber, toNumber),
-    //Edm.String Sequence of UTF-8 characters
-    [EdmType.String]: EdmParser(toString, toString, toString),
-    //Edm.Boolean Binary-valued logic
-    [EdmType.Boolean]: EdmParser(toBoolean, toBoolean, toBoolean),
-    //Edm.Byte Unsigned 8-bit integer
-    [EdmType.Byte]: EdmParser(toNumber, toNumber, toNumber),
-    //Edm.SByte Signed 8-bit integer
-    [EdmType.SByte]: EdmParser(toNumber, toNumber, toNumber),
-    //Edm.Int32 Signed 16-bit integer
-    [EdmType.Int32]: EdmParser(toNumber, toNumber, toNumber),
-    //Edm.Int64 Signed 16-bit integer
-    [EdmType.Int64]: EdmParser(toNumber, toNumber, toNumber),
-    //Edm.Date Date without a time-zone offset
-    [EdmType.Date]: EdmParser((v) => new Date(`${v}T00:00:00.000Z`), (v) => toDate(v).toISOString().substring(0, 10), (v) => raw(toDate(v).toISOString().substring(0, 10))),
-    //Edm.TimeOfDay Clock time 00:00-23:59:59.999999999999
-    [EdmType.TimeOfDay]: EdmParser((v) => new Date(`1970-01-01T${v}Z`), (v) => toDate(v).toISOString().substring(11, 23), (v) => raw(toDate(v).toISOString().substring(11, 23))),
-    //Edm.DateTimeOffset Date and time with a time-zone offset, no leap seconds
-    [EdmType.DateTimeOffset]: EdmParser(toDate, (v) => toDate(v).toISOString(), (v) => raw(toDate(v).toISOString())),
-    //Edm.Duration Signed duration in days, hours, minutes, and (sub)seconds
-    [EdmType.Duration]: EdmParser((v) => Durations.toDuration(v), (v) => Durations.toString(v), (v) => raw(Durations.toString(v))),
-    //Edm.Decimal Numeric values with fixed precision and scale
-    [EdmType.Decimal]: EdmParser(toNumber, (v, o) => {
-        if (o.ieee754Compatible) {
-            let vstr = v.toPrecision(o.field.precision);
-            if (typeof o.field.scale === 'number') {
-                vstr = parseFloat(vstr).toFixed(o.field.scale);
-            }
-            return vstr;
-        }
-        return v;
-    }, (v, o) => {
-        if (o.ieee754Compatible) {
-            let vstr = v.toPrecision(o.field.precision);
-            if (typeof o.field.scale === 'number') {
-                vstr = parseFloat(vstr).toFixed(o.field.scale);
-            }
-            return raw(vstr);
-        }
-        return v;
-    }),
-    //Edm.Double IEEE 754 binary64 floating-point number (15-17 decimal digits)
-    [EdmType.Double]: EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw(v === Infinity ? 'INF' : v.toString())),
-    //Edm.Single IEEE 754 binary32 floating-point number (6-9 decimal digits)
-    [EdmType.Single]: EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw(v === Infinity ? 'INF' : v.toString())),
-    //Edm.Binary Binary data
-    [EdmType.Binary]: EdmParser((v) => ArrayBuffers.toArrayBuffer(v), (v) => ArrayBuffers.toString(v), (v) => raw(ArrayBuffers.toString(v))),
-};
-/*
-Edm.Stream Binary data stream
-Edm.Geography Abstract base type for all Geography types
-Edm.GeographyPoint A point in a round-earth coordinate system
-Edm.GeographyLineString Line string in a round-earth coordinate system
-Edm.GeographyPolygon Polygon in a round-earth coordinate system
-Edm.GeographyMultiPoint Collection of points in a round-earth coordinate system
-Edm.GeographyMultiLineString Collection of line strings in a round-earth coordinate system
-Edm.GeographyMultiPolygon Collection of polygons in a round-earth coordinate system
-Edm.GeographyCollection Collection of arbitrary Geography values
-Edm.Geometry Abstract base type for all Geometry types
-Edm.GeometryPoint Point in a flat-earth coordinate system
-Edm.GeometryLineString Line string in a flat-earth coordinate system
-Edm.GeometryPolygon Polygon in a flat-earth coordinate system
-Edm.GeometryMultiPoint Collection of points in a flat-earth coordinate system
-Edm.GeometryMultiLineString Collection of line strings in a flat-earth coordinate system
-Edm.GeometryMultiPolygon Collection of polygons in a flat-earth coordinate system
-Edm.GeometryCollection Collection of arbitrary Geometry values
-*/
-
-class ODataEnumTypeFieldParser extends ODataAnnotatable {
-    constructor(name, field) {
-        super(field);
-        this.name = name;
-        this.value = field.value;
-    }
-    titleize(term) {
-        return (term && this.annotatedValue(term)) || this.name;
-    }
-}
-class ODataEnumTypeParser extends ODataAnnotatable {
-    constructor(config, namespace, alias) {
-        super(config);
-        this.name = config.name;
-        this.namespace = namespace;
-        this.alias = alias;
-        this.flags = config.flags;
-        this.members = config.members;
-        this._fields = Object.entries(config.fields).map(([name, f]) => new ODataEnumTypeFieldParser(name, f));
-    }
-    configure({ options }) {
-        this.parserOptions = options;
-    }
-    isTypeOf(type) {
-        var names = [`${this.namespace}.${this.name}`];
-        if (this.alias)
-            names.push(`${this.alias}.${this.name}`);
-        return names.indexOf(type) !== -1;
-    }
-    fields(value) {
-        return [
-            ...this._fields.filter((f) => value === undefined || Boolean(f.value & value)),
-        ];
-    }
-    field(nameValue) {
-        let field = this.fields().find((f) => f.name === nameValue || f.value === nameValue);
-        //Throw error if not found
-        if (field === undefined)
-            throw new Error(`${this.name} has no field named ${String(name)}`);
-        return field;
-    }
-    /**
-     * Map the fields of the enum type.
-     * @param mapper Function that maps the value to the new value
-     * @returns The fields mapped by the mapper
-     */
-    mapFields(mapper) {
-        return this.fields().map(mapper);
-    }
-    // Deserialize
-    deserialize(value, options) {
-        // string -> number
-        const parserOptions = { ...this.parserOptions, ...options };
-        if (this.flags) {
-            return Enums.toValues(this.members, value).reduce((acc, v) => acc | v, 0);
-        }
-        else {
-            return Enums.toValue(this.members, value);
-        }
-    }
-    // Serialize
-    serialize(value, options) {
-        // Enum are string | number
-        // string | number -> string
-        const parserOptions = { ...this.parserOptions, ...options };
-        if (this.flags) {
-            let names = Enums.toFlags(this.members, value);
-            if (names.length === 0)
-                names = [`${value}`];
-            return !parserOptions?.stringAsEnum
-                ? `${this.namespace}.${this.name}'${names.join(', ')}'`
-                : names.join(', ');
-        }
-        else {
-            let name = Enums.toName(this.members, value);
-            if (name === undefined)
-                name = `${value}`;
-            return !parserOptions?.stringAsEnum
-                ? `${this.namespace}.${this.name}'${name}'`
-                : name;
-        }
-    }
-    //Encode
-    encode(value, options) {
-        const parserOptions = { ...this.parserOptions, ...options };
-        const serialized = this.serialize(value, parserOptions);
-        if (serialized === undefined)
-            return undefined;
-        return parserOptions?.stringAsEnum
-            ? raw(`'${serialized}'`)
-            : raw(serialized);
-    }
-    // Json Schema
-    toJsonSchema() {
-        return this.flags
-            ? {
-                title: this.name,
-                type: JsonType.array,
-                items: {
-                    type: JsonType.integer,
-                },
-            }
-            : {
-                type: JsonType.integer,
-                enum: this._fields.map((f) => f.value),
-            };
-    }
-    validate(member, { method, navigation = false, } = {}) {
-        if (this.flags) {
-            let members = Enums.toValues(this.members, member);
-            return members.some((member) => !(member in this.members))
-                ? ['mismatch']
-                : undefined;
-        }
-        else {
-            return !(member in this.members) ? ['mismatch'] : undefined;
-        }
-    }
-    unpack(value) {
-        return Enums.toValues(this.members, value);
-    }
-    pack(value) {
-        return Enums.toValues(this.members, value).reduce((acc, v) => acc | v, 0);
-    }
-}
-
-const COLLECTION = /Collection\(([\w\.]+)\)/;
-const PROPERTY = /([\w\d\-_]+)\(([\'\w\d\-_=]+)\)/;
-const EXPAND = /([\w\d\-_]+)\(([\w\d\,\(\)]+)\)/;
-const ODataVersionBaseHelper = {
-    entity(data) {
-        return data;
-    },
-    entities(data) {
-        return data[this.VALUE];
-    },
-    property(data) {
-        return this.VALUE in data ? data[this.VALUE] : data;
-    },
-    functions(annots) {
-        const funcs = new Map();
-        [...annots.keys()]
-            .filter((key) => key.startsWith(this.ODATA_FUNCTION_PREFIX))
-            .forEach((key) => funcs.set(key.substring(this.ODATA_FUNCTION_PREFIX.length), annots.get(key)));
-        return funcs;
-    },
-    properties(annots) {
-        const props = new Map();
-        [...annots.keys()]
-            .filter((key) => key.indexOf(this.ODATA_ANNOTATION_PREFIX) > 0)
-            .forEach((key) => {
-            let name = key.substring(0, key.indexOf(this.ODATA_ANNOTATION_PREFIX));
-            let prop = props.has(name) ? props.get(name) : new Map();
-            prop.set(key.substring(key.indexOf(this.ODATA_ANNOTATION_PREFIX)), annots.get(key));
-            props.set(name, prop);
-        });
-        return props;
-    },
-    id(annots) {
-        return annots instanceof Map
-            ? annots.get(this.ODATA_ID)
-            : annots[this.ODATA_ID];
-    },
-    etag(annots) {
-        return annots instanceof Map
-            ? annots.get(this.ODATA_ETAG)
-            : annots[this.ODATA_ETAG];
-    },
-    type(annots) {
-        let type = annots instanceof Map
-            ? annots.get(this.ODATA_TYPE)
-            : annots[this.ODATA_TYPE];
-        if (!type)
-            return undefined;
-        type = type.substring(1);
-        const matches = COLLECTION.exec(type);
-        if (matches)
-            return matches[1].indexOf('.') === -1 ? `Edm.${matches[1]}` : matches[1];
-        return type;
-    },
-    mediaEtag(annots) {
-        return annots.has(this.ODATA_MEDIA_ETAG)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_ETAG))
-            : undefined;
-    },
-    metadataEtag(annots) {
-        return annots.has(this.ODATA_METADATA_ETAG)
-            ? decodeURIComponent(annots.get(this.ODATA_METADATA_ETAG))
-            : undefined;
-    },
-    count(annots) {
-        return annots.has(this.ODATA_COUNT)
-            ? Number(annots.get(this.ODATA_COUNT))
-            : undefined;
-    },
-    annotations(value) {
-        const annots = new Map();
-        Object.entries(value)
-            .filter(([key]) => key.indexOf(this.ODATA_ANNOTATION_PREFIX) !== -1 ||
-            key.startsWith(this.ODATA_FUNCTION_PREFIX))
-            .forEach(([key, value]) => annots.set(key, value));
-        return annots;
-    },
-    attributes(value, metadata) {
-        return Object.entries(value)
-            .filter(([k]) => metadata === 'none' ||
-            (metadata === 'minimal' &&
-                (k.indexOf(this.ODATA_ANNOTATION_PREFIX) === -1 ||
-                    k.startsWith(this.ODATA_ANNOTATION_PREFIX)) &&
-                !k.startsWith(this.ODATA_FUNCTION_PREFIX)) ||
-            (metadata === 'full' &&
-                k.indexOf(this.ODATA_ANNOTATION_PREFIX) === -1 &&
-                !k.startsWith(this.ODATA_FUNCTION_PREFIX)))
-            .reduce((acc, e) => ({ ...acc, [e[0]]: e[1] }), {});
-    },
-    nextLink(annots) {
-        return annots.has(this.ODATA_NEXTLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_NEXTLINK))
-            : undefined;
-    },
-    readLink(annots) {
-        return annots.has(this.ODATA_READLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_READLINK))
-            : undefined;
-    },
-    mediaReadLink(annots) {
-        return annots.has(this.ODATA_MEDIA_READLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_READLINK))
-            : undefined;
-    },
-    editLink(annots) {
-        return annots.has(this.ODATA_EDITLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_EDITLINK))
-            : undefined;
-    },
-    mediaEditLink(annots) {
-        return annots.has(this.ODATA_MEDIA_EDITLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_EDITLINK))
-            : undefined;
-    },
-    deltaLink(annots) {
-        return annots.has(this.ODATA_DELTALINK)
-            ? decodeURIComponent(annots.get(this.ODATA_DELTALINK))
-            : undefined;
+//https://github.com/niklasvh/base64-arraybuffer
+const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+// Use a lookup table to find the index.
+const lookup = new Uint8Array(256);
+for (var i = 0; i < chars.length; i++) {
+    lookup[chars.charCodeAt(i)] = i;
+}
+const ArrayBuffers = {
+    toArrayBuffer(v) {
+        var bufferLength = v.length * 0.75, len = v.length, i, p = 0, encoded1, encoded2, encoded3, encoded4;
+        if (v[v.length - 1] === '=') {
+            bufferLength--;
+            if (v[v.length - 2] === '=') {
+                bufferLength--;
+            }
+        }
+        var arraybuffer = new ArrayBuffer(bufferLength), bytes = new Uint8Array(arraybuffer);
+        for (i = 0; i < len; i += 4) {
+            encoded1 = lookup[v.charCodeAt(i)];
+            encoded2 = lookup[v.charCodeAt(i + 1)];
+            encoded3 = lookup[v.charCodeAt(i + 2)];
+            encoded4 = lookup[v.charCodeAt(i + 3)];
+            bytes[p++] = (encoded1 << 2) | (encoded2 >> 4);
+            bytes[p++] = ((encoded2 & 15) << 4) | (encoded3 >> 2);
+            bytes[p++] = ((encoded3 & 3) << 6) | (encoded4 & 63);
+        }
+        return arraybuffer;
     },
-    mediaContentType(annots) {
-        return annots.has(this.ODATA_MEDIA_CONTENTTYPE)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_CONTENTTYPE))
-            : undefined;
+    toString(v) {
+        var bytes = new Uint8Array(v), i, len = bytes.length, base64 = '';
+        for (i = 0; i < len; i += 3) {
+            base64 += chars[bytes[i] >> 2];
+            base64 += chars[((bytes[i] & 3) << 4) | (bytes[i + 1] >> 4)];
+            base64 += chars[((bytes[i + 1] & 15) << 2) | (bytes[i + 2] >> 6)];
+            base64 += chars[bytes[i + 2] & 63];
+        }
+        if (len % 3 === 2) {
+            base64 = base64.substring(0, base64.length - 1) + '=';
+        }
+        else if (len % 3 === 1) {
+            base64 = base64.substring(0, base64.length - 2) + '==';
+        }
+        return base64;
     },
 };
-const ODataHelper = {
-    //#region Version 4.0
-    [VERSION_4_0]: {
-        ...ODataVersionBaseHelper,
-        VALUE: 'value',
-        ODATA_ANNOTATION_PREFIX: '@odata',
-        ODATA_FUNCTION_PREFIX: '#',
-        //odata.id: the ID of the entity
-        ODATA_ID: '@odata.id',
-        //odata.count: the total count of a collection of entities or collection of entity references, if requested.
-        ODATA_COUNT: '@odata.count',
-        //odata.context: the context URL for a collection, entity, primitive value, or service document.
-        ODATA_CONTEXT: '@odata.context',
-        //odata.etag: the ETag of the entity
-        ODATA_ETAG: '@odata.etag',
-        ODATA_METADATA_ETAG: '@odata.metadataEtag',
-        //odata.type: the type of the containing {[name: string]: any} or targeted property if the type of the {[name: string]: any} or targeted property cannot be heuristically determined
-        ODATA_TYPE: '@odata.type',
-        //odata.nextLink: the next link of a collection with partial results
-        ODATA_NEXTLINK: '@odata.nextLink',
-        //odata.deltaLink: the delta link for obtaining changes to the result, if requested
-        ODATA_DELTALINK: '@odata.deltaLink',
-        //odata.readLink: the link used to read the entity, if the edit link cannot be used to read the entity
-        ODATA_READLINK: '@odata.readLink',
-        //odata.editLink: the link used to edit/update the entity, if the entity is updatable and the odata.id does not represent a URL that can be used to edit the entity
-        ODATA_EDITLINK: '@odata.editLink',
-        //odata.associationLink: the link used to describe the relationship between this entity and related entities
-        ODATA_ASSOCIATIONLINK: '@odata.associationLink',
-        //odata.navigationLink: the link used to retrieve the values of a navigation property
-        ODATA_NAVIGATIONLINK: '@odata.navigationLink',
-        //Media entities and stream properties may in addition contain the following annotations:
-        //odata.mediaEtag: the ETag of the stream, as appropriate
-        ODATA_MEDIA_ETAG: '@odata.mediaEtag',
-        //odata.mediaContentType: the content type of the stream
-        ODATA_MEDIA_CONTENTTYPE: '@odata.mediaContentType',
-        //odata.mediaReadLink: the link used to read the stream
-        ODATA_MEDIA_READLINK: '@odata.mediaReadLink',
-        //odata.mediaEditLink: the link used to edit/update the stream
-        ODATA_MEDIA_EDITLINK: '@odata.mediaEditLink',
-        //http://nb-mdp-dev01:57970/$metadata#recursos/$entity
-        //http://nb-mdp-dev01:57970/$metadata#categorias
-        //http://nb-mdp-dev01:57970/$metadata#juzgados
-        //http://nb-mdp-dev01:57970/$metadata#Collection(SIU.Recursos.RecursoEntry)
-        //http://nb-mdp-dev01:57970/$metadata#categorias/$entity
-        //http://nb-mdp-dev01:57970/$metadata#categorias(children(children(children(children(children(children(children(children(children(children()))))))))))/$entity
-        //http://nb-mdp-dev01:57970/$metadata#recursos/SIU.Documentos.Documento/$entity
-        //http://nb-mdp-dev01:57970/$metadata#SIU.Api.Infrastructure.Storage.Backend.SiuUrls
-        context(annots) {
-            let ctx = {};
-            const str = annots instanceof Map
-                ? annots.get(this.ODATA_CONTEXT)
-                : annots[this.ODATA_CONTEXT];
-            if (typeof str === 'string') {
-                let index = str.indexOf('$metadata');
-                ctx.serviceRootUrl = str.substring(0, index);
-                index = str.indexOf('#');
-                ctx.metadataUrl = str.substring(0, index);
-                const parts = str.substring(index + 1).split('/');
-                const col = COLLECTION.exec(parts[0]);
-                if (col) {
-                    ctx.type = col[1];
-                }
-                else if (parts[0].indexOf('.') !== -1) {
-                    ctx.type = parts[0];
-                }
-                else {
-                    const property = parts[0].match(PROPERTY);
-                    const expand = parts[0].match(EXPAND);
-                    ctx.entity = parts[1] === '$entity';
-                    if (property) {
-                        ctx.entitySet = property[1];
-                        ctx.key = property[2];
-                        ctx.property = parts[1];
-                    }
-                    else if (expand) {
-                        ctx.entitySet = expand[1];
-                        ctx.expand = expand[2];
-                    }
-                    else {
-                        ctx.entitySet = parts[0];
-                    }
-                }
-            }
-            return ctx;
-        },
-        countParam() {
-            return { [$COUNT]: 'true' };
-        },
+
+// Core EdmTypeParserBuilder
+const EdmParser = (_d, _s, _e) => ({
+    deserialize(value, options) {
+        return Array.isArray(value)
+            ? value.map((v) => _d(v, options))
+            : _d(value, options);
     },
-    //#endregion
-    //#region Version 3.0
-    [VERSION_3_0]: {
-        ...ODataVersionBaseHelper,
-        ODATA_ANNOTATION_PREFIX: 'odata.',
-        ODATA_FUNCTION_PREFIX: '',
-        ODATA_ID: 'odata.id',
-        ODATA_ETAG: 'odata.etag',
-        ODATA_CONTEXT: 'odata.metadata',
-        ODATA_NEXTLINK: 'odata.nextLink',
-        ODATA_TYPE: 'odata.type',
-        ODATA_COUNT: 'odata.count',
-        VALUE: 'value',
-        context(annots) {
-            let ctx = {};
-            const str = annots instanceof Map
-                ? annots.get(this.ODATA_CONTEXT)
-                : annots[this.ODATA_CONTEXT];
-            if (typeof str === 'string') {
-                let index = str.indexOf('$metadata');
-                ctx.serviceRootUrl = str.substring(0, index);
-                index = str.indexOf('#');
-                ctx.metadataUrl = str.substring(0, index);
-                const parts = str.substring(index + 1).split('/');
-                ctx.entitySet = parts[0];
-            }
-            return ctx;
-        },
-        countParam() {
-            return { [$INLINECOUNT]: 'allpages' };
-        },
+    serialize(value, options) {
+        return Array.isArray(value)
+            ? value.map((v) => _s(v, options))
+            : _s(value, options);
     },
-    //#endregion
-    //#region Version 2.0
-    [VERSION_2_0]: {
-        ...ODataVersionBaseHelper,
-        ODATA_ID: 'id',
-        ODATA_ETAG: 'etag',
-        ODATA_ANNOTATION: '__metadata',
-        ODATA_NEXTLINK: '__next',
-        ODATA_COUNT: '__count',
-        ODATA_DEFERRED: '__deferred',
-        ODATA_TYPE: 'type',
-        VALUE: 'results',
-        annotations(value) {
-            const annots = new Map();
-            if (this.ODATA_ANNOTATION in value) {
-                Object.entries(value[this.ODATA_ANNOTATION]).forEach(([key, value]) => annots.set(key, value));
-            }
-            return annots;
-        },
-        context(annots) {
-            let ctx = {};
-            return ctx;
-        },
-        attributes(value, metadata) {
-            return value;
-        },
-        countParam() {
-            return { [$INLINECOUNT]: 'allpages' };
-        },
+    encode(value, options) {
+        return Array.isArray(value)
+            ? value.map((v) => (!isRawType(v) ? _e(v, options) : v))
+            : !isRawType(value)
+                ? _e(value, options)
+                : value;
     },
-    //#endregion
+});
+const Identity = (v) => v;
+const toNumber = (v) => Number(v);
+const toString = (v) => v.toString();
+const toBoolean = (v) => Boolean(v);
+const toDate = (v) => new Date(v);
+const EDM_PARSERS = {
+    //Edm.Guid 16-byte (128-bit) unique identifier
+    [EdmType.Guid]: EdmParser(Identity, Identity, (v) => raw(v)),
+    //Edm.Int16 Signed 16-bit integer
+    [EdmType.Int16]: EdmParser(toNumber, toNumber, toNumber),
+    //Edm.String Sequence of UTF-8 characters
+    [EdmType.String]: EdmParser(toString, toString, toString),
+    //Edm.Boolean Binary-valued logic
+    [EdmType.Boolean]: EdmParser(toBoolean, toBoolean, toBoolean),
+    //Edm.Byte Unsigned 8-bit integer
+    [EdmType.Byte]: EdmParser(toNumber, toNumber, toNumber),
+    //Edm.SByte Signed 8-bit integer
+    [EdmType.SByte]: EdmParser(toNumber, toNumber, toNumber),
+    //Edm.Int32 Signed 16-bit integer
+    [EdmType.Int32]: EdmParser(toNumber, toNumber, toNumber),
+    //Edm.Int64 Signed 16-bit integer
+    [EdmType.Int64]: EdmParser(toNumber, toNumber, toNumber),
+    //Edm.Date Date without a time-zone offset
+    [EdmType.Date]: EdmParser((v) => new Date(`${v}T00:00:00.000Z`), (v) => toDate(v).toISOString().substring(0, 10), (v) => raw(toDate(v).toISOString().substring(0, 10))),
+    //Edm.TimeOfDay Clock time 00:00-23:59:59.999999999999
+    [EdmType.TimeOfDay]: EdmParser((v) => new Date(`1970-01-01T${v}Z`), (v) => toDate(v).toISOString().substring(11, 23), (v) => raw(toDate(v).toISOString().substring(11, 23))),
+    //Edm.DateTimeOffset Date and time with a time-zone offset, no leap seconds
+    [EdmType.DateTimeOffset]: EdmParser(toDate, (v) => toDate(v).toISOString(), (v) => raw(toDate(v).toISOString())),
+    //Edm.Duration Signed duration in days, hours, minutes, and (sub)seconds
+    [EdmType.Duration]: EdmParser((v) => Durations.toDuration(v), (v) => Durations.toString(v), (v) => raw(Durations.toString(v))),
+    //Edm.Decimal Numeric values with fixed precision and scale
+    [EdmType.Decimal]: EdmParser(toNumber, (v, o) => {
+        if (o.ieee754Compatible) {
+            let vstr = v.toPrecision(o.field.precision);
+            if (typeof o.field.scale === 'number') {
+                vstr = parseFloat(vstr).toFixed(o.field.scale);
+            }
+            return vstr;
+        }
+        return v;
+    }, (v, o) => {
+        if (o.ieee754Compatible) {
+            let vstr = v.toPrecision(o.field.precision);
+            if (typeof o.field.scale === 'number') {
+                vstr = parseFloat(vstr).toFixed(o.field.scale);
+            }
+            return raw(vstr);
+        }
+        return v;
+    }),
+    //Edm.Double IEEE 754 binary64 floating-point number (15-17 decimal digits)
+    [EdmType.Double]: EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw(v === Infinity ? 'INF' : v.toString())),
+    //Edm.Single IEEE 754 binary32 floating-point number (6-9 decimal digits)
+    [EdmType.Single]: EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw(v === Infinity ? 'INF' : v.toString())),
+    //Edm.Binary Binary data
+    [EdmType.Binary]: EdmParser((v) => ArrayBuffers.toArrayBuffer(v), (v) => ArrayBuffers.toString(v), (v) => raw(ArrayBuffers.toString(v))),
 };
+/*
+Edm.Stream Binary data stream
+Edm.Geography Abstract base type for all Geography types
+Edm.GeographyPoint A point in a round-earth coordinate system
+Edm.GeographyLineString Line string in a round-earth coordinate system
+Edm.GeographyPolygon Polygon in a round-earth coordinate system
+Edm.GeographyMultiPoint Collection of points in a round-earth coordinate system
+Edm.GeographyMultiLineString Collection of line strings in a round-earth coordinate system
+Edm.GeographyMultiPolygon Collection of polygons in a round-earth coordinate system
+Edm.GeographyCollection Collection of arbitrary Geography values
+Edm.Geometry Abstract base type for all Geometry types
+Edm.GeometryPoint Point in a flat-earth coordinate system
+Edm.GeometryLineString Line string in a flat-earth coordinate system
+Edm.GeometryPolygon Polygon in a flat-earth coordinate system
+Edm.GeometryMultiPoint Collection of points in a flat-earth coordinate system
+Edm.GeometryMultiLineString Collection of line strings in a flat-earth coordinate system
+Edm.GeometryMultiPolygon Collection of polygons in a flat-earth coordinate system
+Edm.GeometryCollection Collection of arbitrary Geometry values
+*/
+
+class ODataEnumTypeFieldParser extends ODataAnnotatable {
+    name;
+    value;
+    constructor(name, field) {
+        super(field);
+        this.name = name;
+        this.value = field.value;
+    }
+    titleize(term) {
+        return (term && this.annotatedValue(term)) || this.name;
+    }
+}
+class ODataEnumTypeParser extends ODataAnnotatable {
+    name;
+    namespace;
+    alias;
+    flags;
+    members;
+    _fields;
+    parserOptions;
+    constructor(config, namespace, alias) {
+        super(config);
+        this.name = config.name;
+        this.namespace = namespace;
+        this.alias = alias;
+        this.flags = config.flags;
+        this.members = config.members;
+        this._fields = Object.entries(config.fields).map(([name, f]) => new ODataEnumTypeFieldParser(name, f));
+    }
+    configure({ options }) {
+        this.parserOptions = options;
+    }
+    isTypeOf(type) {
+        var names = [`${this.namespace}.${this.name}`];
+        if (this.alias)
+            names.push(`${this.alias}.${this.name}`);
+        return names.indexOf(type) !== -1;
+    }
+    fields(namesValue) {
+        if (namesValue === undefined)
+            return [...this._fields];
+        if (Array.isArray(namesValue))
+            return [...this._fields.filter((f) => namesValue.includes(f.value))];
+        if (typeof namesValue === 'number') {
+            return [
+                ...this._fields.filter((f) => (this.flags && Boolean(f.value & namesValue)) ||
+                    f.value === namesValue),
+            ];
+        }
+        if (typeof namesValue === 'string') {
+            const names = namesValue.split(',').map((o) => o.trim());
+            return this._fields.filter((f) => names.includes(f.name));
+        }
+        return [];
+    }
+    field(nameValue) {
+        const field = this.fields().find((f) => f.name === nameValue || f.value === nameValue);
+        //Throw error if not found
+        //if (field === undefined)
+        //  throw new Error(`${this.name} has no field for ${nameValue}`);
+        return field;
+    }
+    /**
+     * Map the fields of the enum type.
+     * @param mapper Function that maps the value to the new value
+     * @returns The fields mapped by the mapper
+     */
+    mapFields(mapper) {
+        return this.fields().map(mapper);
+    }
+    // Deserialize
+    deserialize(value, options) {
+        // string -> number
+        const parserOptions = { ...this.parserOptions, ...options };
+        if (this.flags) {
+            return this.fields(value).reduce((acc, f) => acc | f.value, 0);
+        }
+        else {
+            return this.field(value)?.value;
+        }
+    }
+    // Serialize
+    serialize(value, options) {
+        // Enum are string | number
+        // string | number -> string
+        const parserOptions = { ...this.parserOptions, ...options };
+        if (this.flags) {
+            let names = this.fields(value).map((f) => f.name);
+            if (names.length === 0)
+                names = [`${value}`];
+            return !parserOptions?.stringAsEnum
+                ? `${this.namespace}.${this.name}'${names.join(', ')}'`
+                : names.join(', ');
+        }
+        else {
+            let name = this.field(value)?.name;
+            if (name === undefined)
+                name = `${value}`;
+            return !parserOptions?.stringAsEnum
+                ? `${this.namespace}.${this.name}'${name}'`
+                : name;
+        }
+    }
+    //Encode
+    encode(value, options) {
+        const parserOptions = { ...this.parserOptions, ...options };
+        const serialized = this.serialize(value, parserOptions);
+        if (serialized === undefined)
+            return undefined;
+        return parserOptions?.stringAsEnum
+            ? raw(`'${serialized}'`)
+            : raw(serialized);
+    }
+    // Json Schema
+    toJsonSchema() {
+        return this.flags
+            ? {
+                title: this.name,
+                type: JsonType.array,
+                items: {
+                    type: JsonType.integer,
+                },
+            }
+            : {
+                type: JsonType.integer,
+                enum: this._fields.map((f) => f.value),
+            };
+    }
+    validate(value, { method, navigation = false, } = {}) {
+        if (this.flags) {
+            let fields = this.fields(value);
+            return value && fields.length === 0 ? ['mismatch'] : undefined;
+        }
+        else {
+            return this.fields(value).length !== 1 ? ['mismatch'] : undefined;
+        }
+    }
+    unpack(value) {
+        return this.fields(value).map((f) => f.value);
+    }
+    pack(value) {
+        return this.fields(value).reduce((acc, v) => acc | v.value, 0);
+    }
+}
 
 class ODataEntityTypeKey {
+    name;
+    alias;
     constructor({ name, alias }) {
         this.name = name;
         this.alias = alias;
     }
 }
 class ODataReferential {
+    property;
+    referencedProperty;
     constructor({ property, referencedProperty, }) {
         this.property = property;
         this.referencedProperty = referencedProperty;
     }
 }
 class ODataStructuredTypeFieldParser extends ODataAnnotatable {
+    name;
+    structured;
+    type;
+    parser;
+    collection;
+    navigation;
+    nullable;
+    default;
+    maxLength;
+    precision;
+    scale;
+    referentials;
+    parserOptions;
     constructor(name, structured, field) {
         super(field);
         this.name = name;
@@ -2543,9 +2407,9 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     }
     //#endregion
     isKey() {
-        return (this.structured
+        return this.structured
             .keys({ include_parents: true })
-            ?.find((k) => k.name === this.name) !== undefined);
+            .some((k) => k.name === this.name);
     }
     hasReferentials() {
         return this.referentials.length !== 0;
@@ -2576,10 +2440,18 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     }
 }
 class ODataStructuredTypeParser extends ODataAnnotatable {
+    name;
+    namespace;
+    open;
+    children = [];
+    alias;
+    base;
+    parent;
+    _keys;
+    _fields = [];
+    parserOptions;
     constructor(config, namespace, alias) {
         super(config);
-        this.children = [];
-        this._fields = [];
         this.name = config.name;
         this.base = config.base;
         this.open = config.open || false;
@@ -2741,14 +2613,23 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
      * @param include_etag Include the etag field
      * @returns The picked fields
      */
-    pick(attrs, { include_parents = true, include_navigation = false, include_etag = true, options, } = {}) {
-        const parserOptions = options || this.parserOptions;
-        const names = this.fields({ include_parents, include_navigation }).map((f) => f.name);
+    pick(attrs, { include_id = true, include_key = true, include_parents = true, include_navigation = false, include_computed = false, include_etag = true, options, } = {}) {
+        const parserOptions = options ?? this.parserOptions;
+        let fields = this.fields({ include_parents, include_navigation });
+        if (!include_key) {
+            fields = fields.filter((f) => !f.isKey());
+        }
+        if (!include_computed) {
+            fields = fields.filter((f) => !f.annotatedValue(COMPUTED) || (f.isKey() && include_key));
+        }
         return Object.keys(attrs)
-            .filter((key) => names.indexOf(key) !== -1 ||
+            .filter((key) => fields.some((f) => f.name === key) ||
             (key ==
                 ODataHelper[parserOptions?.version || DEFAULT_VERSION].ODATA_ETAG &&
-                include_etag))
+                include_etag) ||
+            (key ==
+                ODataHelper[parserOptions?.version || DEFAULT_VERSION].ODATA_ID &&
+                include_id))
             .reduce((acc, key) => Object.assign(acc, { [key]: attrs[key] }), {});
     }
     resolveKey(value, { resolve = true, single = true, } = {}) {
@@ -2850,6 +2731,12 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
 }
 
 class ODataParameterParser {
+    name;
+    type;
+    parser;
+    collection;
+    nullable;
+    parserOptions;
     constructor(name, parameter) {
         this.name = name;
         this.type = parameter.type;
@@ -2900,6 +2787,13 @@ class ODataParameterParser {
     }
 }
 class ODataCallableParser {
+    name;
+    namespace;
+    alias;
+    return;
+    parser;
+    parameters;
+    parserOptions;
     constructor(config, namespace, alias) {
         this.name = config.name;
         this.namespace = namespace;
@@ -2956,6 +2850,9 @@ class ODataCallableParser {
 }
 
 class ODataCallable extends ODataParserSchemaElement {
+    entitySetPath;
+    bound;
+    composable;
     constructor(config, schema) {
         super(config, schema, new ODataCallableParser(config, schema.namespace, schema.alias));
         this.entitySetPath = config.entitySetPath;
@@ -3020,6 +2917,8 @@ class ODataCallable extends ODataParserSchemaElement {
 }
 
 class ODataEntitySet extends ODataSchemaElement {
+    entityType;
+    service;
     constructor(config, schema) {
         super(config, schema);
         this.entityType = config.entityType;
@@ -3028,6 +2927,8 @@ class ODataEntitySet extends ODataSchemaElement {
 }
 
 class ODataSingleton extends ODataSchemaElement {
+    singletonType;
+    service;
     constructor(config, schema) {
         super(config, schema);
         this.singletonType = config.type;
@@ -3036,6 +2937,8 @@ class ODataSingleton extends ODataSchemaElement {
 }
 
 class ODataEntityContainer extends ODataSchemaElement {
+    entitySets;
+    singletons;
     constructor(config, schema) {
         super(config, schema);
         this.entitySets = (config.entitySets ?? []).map((config) => new ODataEntitySet(config, schema));
@@ -3044,6 +2947,7 @@ class ODataEntityContainer extends ODataSchemaElement {
 }
 
 class ODataEnumType extends ODataParserSchemaElement {
+    members;
     constructor(config, schema) {
         super(config, schema, new ODataEnumTypeParser(config, schema.namespace, schema.alias));
         this.members = config.members;
@@ -3055,16 +2959,16 @@ class ODataEnumType extends ODataParserSchemaElement {
      * Returns the fields of the enum type.
      * @returns The fields of the enum type.
      */
-    fields(value) {
-        return this.parser.fields(value);
+    fields(namesValue) {
+        return this.parser.fields(namesValue);
     }
     /**
      * Find a field by name or value.
      * @param enu The name or value of the field
      * @returns The field with the given name or value
      */
-    field(enu) {
-        return this.parser.field(enu);
+    field(nameValue) {
+        return this.parser.field(nameValue);
     }
     /**
      * Map the fields of the enum type.
@@ -3110,9 +3014,13 @@ class ODataEnumType extends ODataParserSchemaElement {
 }
 
 class ODataStructuredType extends ODataParserSchemaElement {
+    base;
+    parent;
+    children = [];
+    model;
+    collection;
     constructor(config, schema) {
         super(config, schema, new ODataStructuredTypeParser(config, schema.namespace, schema.alias));
-        this.children = [];
         this.base = config.base;
         this.model = config.model;
         this.collection = config.collection;
@@ -3234,10 +3142,13 @@ class ODataStructuredType extends ODataParserSchemaElement {
      * @param include_etag Include the etag field
      * @returns The picked fields
      */
-    pick(attrs, { include_parents = true, include_navigation = false, include_etag = true, } = {}) {
+    pick(attrs, { include_id = true, include_key = true, include_parents = true, include_navigation = false, include_computed = false, include_etag = true, } = {}) {
         return this.parser.pick(attrs, {
+            include_id,
+            include_key,
             include_etag,
             include_navigation,
+            include_computed,
             include_parents,
             options: this.api.options,
         });
@@ -3321,6 +3232,13 @@ class ODataStructuredType extends ODataParserSchemaElement {
 }
 
 class ODataSchema extends ODataAnnotatable {
+    api;
+    namespace;
+    alias;
+    enums;
+    entities;
+    callables;
+    containers;
     constructor(config, api) {
         super(config);
         this.api = api;
@@ -3360,6 +3278,8 @@ class ODataSchema extends ODataAnnotatable {
 }
 
 class CountField {
+    field;
+    values;
     constructor(field, values = {}) {
         this.field = field;
         this.values = values;
@@ -3433,7 +3353,7 @@ class CountExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new CountExpression(),
-        }, current);
+        }, current ?? new CountExpression());
     }
     _add(node) {
         this._children.push(node);
@@ -3471,10 +3391,12 @@ class CountExpression extends Expression {
 }
 
 class FilterExpression extends Expression {
+    _connector;
+    _negated;
     constructor({ children, connector, negated, } = {}) {
         super({ children });
-        this._connector = connector || 'and';
-        this._negated = negated || false;
+        this._connector = connector ?? 'and';
+        this._negated = negated ?? false;
     }
     get [Symbol.toStringTag]() {
         return 'FilterExpression';
@@ -3485,7 +3407,7 @@ class FilterExpression extends Expression {
             t: FieldFactory(),
             o: operators,
             f: functions,
-        }, current);
+        }, current ?? new FilterExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -3643,9 +3565,13 @@ class FilterExpression extends Expression {
     isof(left, type) {
         return this._add(syntax.isof(left, type));
     }
+    combine(exp, connector = 'and') {
+        return this._add(exp, connector);
+    }
 }
 
 class SearchTerm {
+    value;
     constructor(value) {
         this.value = value;
     }
@@ -3675,10 +3601,12 @@ class SearchTerm {
     }
 }
 class SearchExpression extends Expression {
+    _connector;
+    _negated;
     constructor({ children, connector, negated, } = {}) {
         super({ children });
-        this._connector = connector || 'AND';
-        this._negated = negated || false;
+        this._connector = connector ?? 'AND';
+        this._negated = negated ?? false;
     }
     get [Symbol.toStringTag]() {
         return 'SearchExpression';
@@ -3686,7 +3614,7 @@ class SearchExpression extends Expression {
     static factory(opts, current) {
         return opts({
             e: (connector = 'AND') => new SearchExpression({ connector }),
-        }, current);
+        }, current ?? new SearchExpression());
     }
     _add(node, connector) {
         if (connector !== undefined && this._connector !== connector) {
@@ -3781,13 +3709,18 @@ class SearchExpression extends Expression {
     term(value) {
         return this._add(new SearchTerm(value));
     }
+    combine(expression, connector = 'AND') {
+        return this._add(expression, connector);
+    }
 }
 
 class GroupByTransformations extends Expression {
+    methods;
+    aliases;
     constructor({ children, methods, aliases, } = {}) {
         super({ children });
-        this.methods = methods || [];
-        this.aliases = aliases || [];
+        this.methods = methods ?? [];
+        this.aliases = aliases ?? [];
     }
     get [Symbol.toStringTag]() {
         return 'GroupByTransformations';
@@ -3862,7 +3795,7 @@ class ApplyExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new ApplyExpression(),
-        }, current);
+        }, current ?? new ApplyExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -3973,7 +3906,7 @@ class ApplyExpression extends Expression {
     orderBy(
       opts: (
         builder: OrderByExpressionBuilder<T>,
-        current?: OrderByExpression<T>
+        current: OrderByExpression<T>
       ) => OrderByExpression<T>,
       current?: OrderByExpression<T>
     ) {
@@ -3982,7 +3915,7 @@ class ApplyExpression extends Expression {
           t: FieldFactory<Required<T>>(),
           e: () => new OrderByExpression<T>(),
         },
-        current
+        current ?? new OrderByExpression<T>()
       ) as OrderByExpression<T>;
       return this._add(transformations.orderby(exp));
     }
@@ -4016,6 +3949,8 @@ class ApplyExpression extends Expression {
 }
 
 class OrderByField {
+    field;
+    order;
     constructor(field, order) {
         this.field = field;
         this.order = order;
@@ -4057,7 +3992,7 @@ class OrderByExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new OrderByExpression(),
-        }, current);
+        }, current ?? new OrderByExpression());
     }
     _add(node) {
         this._children.push(node);
@@ -4089,6 +4024,9 @@ class OrderByExpression extends Expression {
     descending(field) {
         return this._add(new OrderByField(field, 'desc'));
     }
+    combine(expression) {
+        return this._add(expression);
+    }
 }
 
 class SelectExpression extends Expression {
@@ -4102,7 +4040,7 @@ class SelectExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new SelectExpression(),
-        }, current);
+        }, current ?? new SelectExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -4115,7 +4053,9 @@ class SelectExpression extends Expression {
     }
     render({ aliases, escape, prefix, parser, options, } = {}) {
         return this._children
-            .map((n) => n.render({ aliases, escape, prefix, parser, options }))
+            .map((n) => typeof n === 'string'
+            ? n
+            : n.render({ aliases, escape, prefix, parser, options }))
             .join(',');
     }
     clone() {
@@ -4134,9 +4074,14 @@ class SelectExpression extends Expression {
         fields.forEach((f) => this._add(f));
         return this;
     }
+    combine(expression) {
+        return this._add(expression);
+    }
 }
 
 class ExpandField {
+    field;
+    values;
     constructor(field, values = {}) {
         this.field = field;
         this.values = values;
@@ -4157,6 +4102,7 @@ class ExpandField {
             QueryOption.filter,
             QueryOption.search,
             QueryOption.orderBy,
+            QueryOption.compute,
             QueryOption.skip,
             QueryOption.top,
             QueryOption.count,
@@ -4212,6 +4158,9 @@ class ExpandField {
     orderBy(opts) {
         return this.option(QueryOption.orderBy, OrderByExpression.factory(opts, this.values[QueryOption.orderBy]));
     }
+    compute(opts) {
+        return this.option(QueryOption.compute, ComputeExpression.factory(opts, this.values[QueryOption.compute]));
+    }
     skip(n) {
         return this.option(QueryOption.skip, n);
     }
@@ -4242,7 +4191,7 @@ class ExpandExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new ExpandExpression(),
-        }, current);
+        }, current ?? new ExpandExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -4273,6 +4222,9 @@ class ExpandExpression extends Expression {
             opts(node);
         return this._add(node);
     }
+    combine(expression) {
+        return this._add(expression);
+    }
 }
 
 const FieldFactory = (names = []) => new Proxy({ _names: names }, {
@@ -4413,6 +4365,10 @@ function encode(values, parser, options) {
     return values;
 }
 class Function {
+    name;
+    values;
+    normalize;
+    escape;
     constructor(name, values, normalize, escape = false) {
         this.name = name;
         this.values = values;
@@ -4599,6 +4555,9 @@ class ConditionalFunctions {
     }
 }
 class Operator {
+    op;
+    values;
+    normalize;
     constructor(op, values, normalize) {
         this.op = op;
         this.values = values;
@@ -4718,6 +4677,7 @@ class ArithmeticOperators {
     }
 }
 class Grouping {
+    group;
     constructor(group) {
         this.group = group;
     }
@@ -4758,6 +4718,9 @@ class GroupingOperators {
     }
 }
 class Aggregate {
+    value;
+    method;
+    alias;
     constructor(value, method, alias) {
         this.value = value;
         this.method = method;
@@ -4794,6 +4757,8 @@ class Aggregate {
     }
 }
 class GroupBy {
+    properties;
+    transformations;
     constructor(properties, transformations) {
         this.properties = properties;
         this.transformations = transformations;
@@ -4885,6 +4850,9 @@ class Transformations {
     }
 }
 class Type {
+    name;
+    type;
+    value;
     constructor(name, type, value) {
         this.name = name;
         this.type = type;
@@ -4928,6 +4896,9 @@ class Type {
     }
 }
 class Lambda {
+    op;
+    values;
+    alias;
     constructor(op, values, alias) {
         this.op = op;
         this.values = values;
@@ -5016,9 +4987,10 @@ applyMixins(ODataSyntax, [
 const syntax = new ODataSyntax();
 
 class ComputeExpression extends Expression {
+    names;
     constructor({ children, names, } = {}) {
         super({ children });
-        this.names = names || [];
+        this.names = names ?? [];
     }
     get [Symbol.toStringTag]() {
         return 'ComputeExpression';
@@ -5027,7 +4999,7 @@ class ComputeExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new ComputeExpression(),
-        }, current);
+        }, current ?? new ComputeExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -5042,7 +5014,7 @@ class ComputeExpression extends Expression {
         });
     }
     render({ aliases, escape, prefix, parser, options, } = {}) {
-        let children = this._children.map((n) => n.render({ aliases, escape, prefix, parser, options }));
+        const children = this._children.map((n) => n.render({ aliases, escape, prefix, parser, options }));
         return this.names
             .map((name, index) => `${children[index]} as ${name}`)
             .join(',');
@@ -5068,6 +5040,8 @@ class ComputeExpression extends Expression {
 }
 
 class ODataQueryOptionHandler {
+    o;
+    n;
     constructor(o, n) {
         this.o = o;
         this.n = n;
@@ -5223,6 +5197,7 @@ class ODataQueryOptionHandler {
     }
 }
 class ODataQueryOptionsHandler {
+    options;
     constructor(options) {
         this.options = options;
     }
@@ -5471,6 +5446,116 @@ class ODataQueryOptionsHandler {
         }
         this.paging(options);
     }
+    /**
+     * Combine the given query options with the current query.
+     * @param options The query to be combined.
+     */
+    combine(options) {
+        if (options.select !== undefined) {
+            if (options.select instanceof SelectExpression) {
+                const current = this.options.expression(QueryOption.select);
+                if (current === undefined) {
+                    this.options.expression(QueryOption.select, options.select);
+                }
+                else {
+                    current.combine(options.select);
+                }
+            }
+            else if (options.select !== null) {
+                const current = this.options.option(QueryOption.select);
+                if (current === undefined) {
+                    this.options.option(QueryOption.select, options.select);
+                }
+                else {
+                    this.options.option(QueryOption.select, [current, options.select]);
+                }
+            }
+            else {
+                this.options.remove(QueryOption.select);
+            }
+        }
+        if (options.expand !== undefined) {
+            if (options.expand instanceof ExpandExpression) {
+                const current = this.options.expression(QueryOption.expand);
+                if (current === undefined) {
+                    this.options.expression(QueryOption.expand, options.expand);
+                }
+                else {
+                    current.combine(options.expand);
+                }
+            }
+            else if (options.expand !== null) {
+                const current = this.options.option(QueryOption.expand);
+                if (current === undefined) {
+                    this.options.option(QueryOption.expand, options.expand);
+                }
+            }
+            else {
+                this.options.remove(QueryOption.expand);
+            }
+        }
+        if (options.search !== undefined) {
+            if (options.search instanceof SearchExpression) {
+                const current = this.options.expression(QueryOption.search);
+                if (current === undefined) {
+                    this.options.expression(QueryOption.search, options.search);
+                }
+                else {
+                    current.combine(options.search);
+                }
+            }
+            else if (options.search !== null) {
+                const current = this.options.option(QueryOption.search);
+                if (current === undefined) {
+                    this.options.option(QueryOption.search, options.search);
+                }
+            }
+            else {
+                this.options.remove(QueryOption.search);
+            }
+        }
+        if (options.filter !== undefined) {
+            if (options.filter instanceof FilterExpression) {
+                const current = this.options.expression(QueryOption.filter);
+                if (current === undefined) {
+                    this.options.expression(QueryOption.filter, options.filter);
+                }
+                else {
+                    current.combine(options.filter);
+                }
+            }
+            else if (options.filter !== null) {
+                const current = this.options.option(QueryOption.filter);
+                if (current === undefined) {
+                    this.options.option(QueryOption.filter, options.filter);
+                }
+            }
+            else {
+                this.options.remove(QueryOption.filter);
+            }
+        }
+        if (options.orderBy !== undefined) {
+            if (options.orderBy instanceof OrderByExpression) {
+                const current = this.options.expression(QueryOption.orderBy);
+                if (current === undefined) {
+                    this.options.expression(QueryOption.orderBy, options.orderBy);
+                }
+                else {
+                    current.combine(options.orderBy);
+                }
+            }
+            else if (options.orderBy !== null) {
+                const current = this.options.option(QueryOption.filter);
+                if (current === undefined) {
+                    this.options.option(QueryOption.orderBy, options.orderBy);
+                }
+            }
+            else {
+                this.options.remove(QueryOption.orderBy);
+            }
+        }
+        this.paging(options);
+    }
     toJson() {
         return this.options.toJson();
     }
@@ -5480,6 +5565,13 @@ class ODataQueryOptionsHandler {
     toString({ escape, parser, } = {}) {
         return this.options.toString({ escape, parser });
     }
+    pathAndParams({ escape, parser, options, } = {}) {
+        return this.options.pathAndParams({
+            escape,
+            parser,
+            options,
+        });
+    }
 }
 
 // Create a path and params tuple from the query options
@@ -5523,6 +5615,7 @@ const pathAndParamsFromQueryOptions = (values, { escape, parser, options, } = {}
     return buildPathAndQuery({ ...queryOptions, aliases, escape });
 };
 class ODataQueryOptions {
+    _values;
     constructor(values) {
         this._values = values ?? new Map();
     }
@@ -5617,6 +5710,7 @@ class ODataQueryOptions {
 }
 
 class SegmentHandler {
+    segment;
     constructor(segment) {
         this.segment = segment;
     }
@@ -5667,6 +5761,7 @@ class SegmentHandler {
     }
 }
 class ODataPathSegmentsHandler {
+    segments;
     constructor(segments) {
         this.segments = segments;
     }
@@ -5733,6 +5828,7 @@ const pathAndParamsFromSegments = (segments, { escape, parser, options, } = {})
     return [result.paths.join(PATH_SEPARATOR), result.params];
 };
 class ODataPathSegments {
+    _segments;
     constructor(segments) {
         this._segments = segments || [];
     }
@@ -5837,6 +5933,20 @@ class ODataPathSegments {
 }
 
 class ODataRequest {
+    api;
+    observe;
+    context;
+    reportProgress;
+    withCredentials;
+    bodyQueryOptions;
+    fetchPolicy;
+    resource;
+    _responseType;
+    _method;
+    _body;
+    _headers;
+    _params;
+    _path;
     constructor(init) {
         this._method = init.method;
         this.resource = init.resource;
@@ -6031,6 +6141,10 @@ class ODataRequest {
 }
 
 class ODataResource {
+    // VARIABLES
+    api;
+    pathSegments;
+    queryOptions;
     constructor(api, { segments, query, } = {}) {
         this.api = api;
         this.pathSegments = segments ?? new ODataPathSegments();
@@ -6084,9 +6198,8 @@ class ODataResource {
     clearKey() {
         return this.pathSegments.last({ key: true })?.clearKey();
     }
-    //#region Models
-    asModel(entity, { annots, ModelType, } = {}) {
-        const reset = annots !== undefined;
+    asModel(entity, { reset, annots, ModelType, } = {}) {
+        reset ??= annots !== undefined;
         let resource = this;
         const type = annots?.type ?? this.incomingType();
         if (type === undefined)
@@ -6100,8 +6213,8 @@ class ODataResource {
         }
         return new ModelType(entity, { resource, annots, reset });
     }
-    asCollection(entities, { annots, CollectionType, } = {}) {
-        const reset = annots !== undefined;
+    asCollection(entities, { reset, annots, CollectionType, } = {}) {
+        reset ??= annots !== undefined;
         let resource = this;
         const type = annots?.type ?? this.incomingType();
         if (type === undefined)
@@ -6204,8 +6317,9 @@ class ODataResource {
     }
     deserialize(value, options) {
         const resourceType = this.incomingType();
+        const bindingType = this.bindingType();
         const _d = (value, options) => {
-            const parser = this.__parser(value, options, resourceType);
+            const parser = this.__parser(value, options, resourceType, bindingType);
             return parser !== undefined ? parser.deserialize(value, options) : value;
         };
         return Array.isArray(value)
@@ -6225,8 +6339,9 @@ class ODataResource {
     }
     encode(value, options) {
         const resourceType = this.outgoingType();
+        const bindingType = this.bindingType();
         const _e = (value, options) => {
-            const parser = this.__parser(value, options, resourceType);
+            const parser = this.__parser(value, options, resourceType, bindingType);
             return parser !== undefined ? parser.encode(value, options) : value;
         };
         return Array.isArray(value)
@@ -6353,12 +6468,14 @@ class ODataActionResource extends ODataResource {
     static fromResource(resource, path) {
         const baseType = resource.outgoingType();
         const callable = resource.api.findCallable(path, baseType);
+        const outgoingType = callable?.type();
         const bindingType = callable?.binding()?.type;
+        const incomingType = callable?.returnType();
         const action = ODataActionResource.factory(resource.api, {
             path,
-            outgoingType: callable?.type(),
-            incomingType: callable?.returnType(),
-            bindingType: bindingType,
+            outgoingType,
+            bindingType,
+            incomingType,
             segments: resource.cloneSegments(),
         });
         // Switch entitySet to binding type if available
@@ -6457,6 +6574,9 @@ const Arrays = {
 };
 
 class ODataBatchRequest extends Subject {
+    request;
+    id;
+    group;
     constructor(request) {
         super();
         this.request = request;
@@ -6533,15 +6653,12 @@ class ODataBatchRequest extends Subject {
  * https://www.odata.org/getting-started/advanced-tutorial/#batch
  */
 class ODataBatchResource extends ODataResource {
-    constructor() {
-        super(...arguments);
-        // VARIABLES
-        this._requests = [];
-        this._responses = null;
-    }
+    // VARIABLES
+    _requests = [];
     requests() {
         return this._requests.map((r) => r.request);
     }
+    _responses = null;
     responses() {
         return this._responses;
     }
@@ -6924,11 +7041,14 @@ class ODataFunctionResource extends ODataResource {
     static fromResource(resource, path) {
         const baseType = resource.outgoingType();
         const callable = resource.api.findCallable(path, baseType);
+        const outgoingType = callable?.type();
         const bindingType = callable?.binding()?.type;
+        const incomingType = callable?.returnType();
         const func = ODataFunctionResource.factory(resource.api, {
             path,
-            outgoingType: callable?.type(),
-            incomingType: callable?.returnType(),
+            outgoingType,
+            bindingType,
+            incomingType,
             segments: resource.cloneSegments(),
         });
         // Switch entitySet to binding type if available
@@ -7249,11 +7369,6 @@ class ODataPropertyResource extends ODataResource {
     fetchEntity(options = {}) {
         return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity }) => entity));
     }
-    /**
-     * Fetch the entity and return as model
-     * @param options Options for the request
-     * @returns The model
-     */
     fetchModel(options = {}) {
         return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity, annots }) => entity
             ? this.asModel(entity, { annots, ModelType: options?.ModelType })
@@ -7267,11 +7382,6 @@ class ODataPropertyResource extends ODataResource {
     fetchEntities(options = {}) {
         return this.fetch({ responseType: 'entities', ...options }).pipe(map(({ entities }) => entities));
     }
-    /**
-     * Fetch the entities and return as collection
-     * @param options Options for the request
-     * @returns The collection
-     */
     fetchCollection(options = {}) {
         return this.fetch({ responseType: 'entities', ...options }).pipe(map(({ entities, annots }) => entities
             ? this.asCollection(entities, {
@@ -7579,11 +7689,6 @@ class ODataNavigationPropertyResource extends ODataResource {
     fetchEntity(options = {}) {
         return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity }) => entity));
     }
-    /**
-     * Fetch the entity and return as model
-     * @param options Options for the request
-     * @returns The model
-     */
     fetchModel(options = {}) {
         return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity, annots }) => entity
             ? this.asModel(entity, { annots, ModelType: options?.ModelType })
@@ -7597,11 +7702,6 @@ class ODataNavigationPropertyResource extends ODataResource {
     fetchEntities(options = {}) {
         return this.fetch({ responseType: 'entities', ...options }).pipe(map(({ entities }) => entities));
     }
-    /**
-     * Fetch entities and return as collection
-     * @param options Options for the request
-     * @returns The collection
-     */
     fetchCollection(options = {}) {
         return this.fetch({ responseType: 'entities', ...options }).pipe(map(({ entities, annots }) => entities
             ? this.asCollection(entities, {
@@ -7879,45 +7979,88 @@ class ODataEntitySetResource extends ODataResource {
     }
 }
 
-class ODataMetadata {
-    constructor(Version, References, Schemas) {
-        this.Version = Version;
-        this.References = References;
-        this.Schemas = Schemas;
-    }
-    toConfig(base) {
-        return Object.assign({
-            version: this.Version,
-            schemas: this.Schemas.map((s) => s.toConfig()),
-        }, base ?? {});
-    }
-}
-
 class CsdlAnnotable {
+    Annotation;
     constructor({ Annotation }) {
         this.Annotation = Annotation?.map((a) => new CsdlAnnotation(a));
     }
+    toJson() {
+        const json = {};
+        if (Array.isArray(this.Annotation) && this.Annotation.length > 0) {
+            json['Annotation'] = this.Annotation.map((a) => a.toJson());
+        }
+        return json;
+    }
+    toConfig() {
+        const config = {};
+        if (this.Annotation) {
+            config['annotations'] = this.Annotation.map((a) => a.toConfig());
+        }
+        return config;
+    }
 }
 class CsdlAnnotations extends CsdlAnnotable {
+    schema;
+    Target;
+    Qualifier;
     constructor(schema, { Target, Qualifier, Annotation, }) {
         super({ Annotation });
         this.schema = schema;
         this.Target = Target;
         this.Qualifier = Qualifier;
     }
+    toJson() {
+        const json = {
+            ...super.toJson(),
+            Target: this.Target,
+        };
+        if (this.Qualifier !== undefined) {
+            json['Qualifier'] = this.Qualifier;
+        }
+        return json;
+    }
     toConfig() {
         return (this.Annotation ?? []).map((a) => a.toConfig());
     }
 }
 class CsdlAnnotation {
-    constructor({ Term, String, Bool, Int, Collection, Record, Members, }) {
+    Term;
+    String;
+    Bool;
+    Int;
+    Collection;
+    Record;
+    EnumMember;
+    constructor({ Term, String, Bool, Int, Collection, Record, EnumMember, }) {
         this.Term = Term;
         this.String = String;
         this.Bool = Bool;
         this.Int = Int;
-        this.Collection = Collection;
-        this.Record = Record;
-        this.Members = Members;
+        this.Collection = Collection?.map((a) => new CsdlCollection(a));
+        this.Record = Record?.map((a) => new CsdlRecord(a));
+        this.EnumMember = EnumMember?.map((a) => new CsdlEnumMember(a));
+    }
+    toJson() {
+        const json = { Term: this.Term };
+        if (this.String !== undefined) {
+            json['String'] = this.String;
+        }
+        if (this.Bool !== undefined) {
+            json['Bool'] = this.Bool;
+        }
+        if (this.Int !== undefined) {
+            json['Int'] = this.Int;
+        }
+        if (Array.isArray(this.Collection) && this.Collection.length > 0) {
+            json['Collection'] = this.Collection.map((m) => m.toJson());
+        }
+        if (Array.isArray(this.Record) && this.Record.length > 0) {
+            json['Record'] = this.Record.map((m) => m.toJson());
+        }
+        if (Array.isArray(this.EnumMember) && this.EnumMember.length > 0) {
+            json['EnumMember'] = this.EnumMember.map((m) => m.toJson());
+        }
+        return json;
     }
     toConfig() {
         return {
@@ -7929,6 +8072,20 @@ class CsdlAnnotation {
     }
 }
 class CsdlTerm {
+    schema;
+    Name;
+    Type;
+    BaseTerm;
+    DefaultValue;
+    AppliesTo;
+    Nullable;
+    MaxLength;
+    Precision;
+    Scale;
+    SRID;
+    String;
+    Bool;
+    Int;
     constructor(schema, { Name, Type, BaseTerm, DefaultValue, AppliesTo, Nullable, MaxLength, Precision, Scale, SRID, String, Bool, Int, }) {
         this.schema = schema;
         this.Name = Name;
@@ -7945,72 +8102,240 @@ class CsdlTerm {
         this.Bool = Bool;
         this.Int = Int;
     }
+    toJson() {
+        const json = { Name: this.Name, Type: this.Type };
+        if (this.BaseTerm !== undefined) {
+            json['BaseTerm'] = this.BaseTerm;
+        }
+        if (this.DefaultValue !== undefined) {
+            json['DefaultValue'] = this.DefaultValue;
+        }
+        if (this.AppliesTo !== undefined) {
+            json['AppliesTo'] = this.AppliesTo;
+        }
+        if (this.Nullable !== undefined) {
+            json['Nullable'] = this.Nullable;
+        }
+        if (this.MaxLength !== undefined) {
+            json['MaxLength'] = this.MaxLength;
+        }
+        if (this.Precision !== undefined) {
+            json['Precision'] = this.Precision;
+        }
+        if (this.Scale !== undefined) {
+            json['Scale'] = this.Scale;
+        }
+        if (this.SRID !== undefined) {
+            json['SRID'] = this.SRID;
+        }
+        if (this.String !== undefined) {
+            json['String'] = this.String;
+        }
+        if (this.Bool !== undefined) {
+            json['Bool'] = this.Bool;
+        }
+        if (this.Int !== undefined) {
+            json['Int'] = this.Int;
+        }
+        return json;
+    }
 }
 class CsdlCollection {
-    constructor({ Strings, Records, PropertyPaths, NavigationPropertyPaths, }) {
-        this.Strings = Strings;
-        this.Records = Records;
-        this.PropertyPaths = PropertyPaths;
-        this.NavigationPropertyPaths = NavigationPropertyPaths;
+    String;
+    Record;
+    PropertyPath;
+    NavigationPropertyPath;
+    constructor({ String, Record, PropertyPath, NavigationPropertyPath, }) {
+        this.String = String?.map((a) => new CsdlString(a));
+        this.Record = Record?.map((a) => new CsdlRecord(a));
+        this.PropertyPath = PropertyPath?.map((a) => new CsdlPropertyPath(a));
+        this.NavigationPropertyPath = NavigationPropertyPath?.map((a) => new CsdlNavigationPropertyPath(a));
+    }
+    toJson() {
+        const json = {};
+        if (Array.isArray(this.String) && this.String.length > 0) {
+            json['String'] = this.String.map((s) => s.toJson());
+        }
+        if (Array.isArray(this.Record) && this.Record.length > 0) {
+            json['Record'] = this.Record.map((r) => r.toJson());
+        }
+        if (Array.isArray(this.PropertyPath) && this.PropertyPath.length > 0) {
+            json['PropertyPath'] = this.PropertyPath.map((p) => p.toJson());
+        }
+        if (Array.isArray(this.NavigationPropertyPath) &&
+            this.NavigationPropertyPath.length > 0) {
+            json['NavigationPropertyPath'] = this.NavigationPropertyPath.map((p) => p.toJson());
+        }
+        return json;
     }
 }
 class CsdlRecord {
-    constructor({ Properties }) {
-        this.Properties = Properties;
+    PropertyValue;
+    constructor({ PropertyValue }) {
+        this.PropertyValue = PropertyValue?.map((a) => new CsdlPropertyValue(a));
+    }
+    toJson() {
+        const json = {};
+        if (Array.isArray(this.PropertyValue) && this.PropertyValue.length > 0) {
+            json['PropertyValue'] = this.PropertyValue.map((p) => p.toJson());
+        }
+        return json;
     }
 }
 class CsdlPropertyValue {
-    constructor({ Name, String, Date, Members, }) {
+    Name;
+    String;
+    Date;
+    EnumMember;
+    constructor({ Name, String, Date, EnumMember, }) {
         this.Name = Name;
         this.String = String;
         this.Date = Date;
-        this.Members = Members;
+        this.EnumMember = EnumMember?.map((a) => new CsdlEnumMember(a));
+    }
+    toJson() {
+        const json = { Name: this.Name };
+        if (this.String !== undefined) {
+            json['String'] = this.String;
+        }
+        if (this.Date !== undefined) {
+            json['Date'] = this.Date;
+        }
+        if (Array.isArray(this.EnumMember) && this.EnumMember.length > 0) {
+            json['EnumMember'] = this.EnumMember.map((m) => m.toJson());
+        }
+        return json;
     }
 }
 class CsdlEnumMember {
+    TextContent;
     constructor({ TextContent }) {
         this.TextContent = TextContent;
     }
+    toJson() {
+        return {
+            TextContent: this.TextContent,
+        };
+    }
 }
 class CsdlString {
+    TextContent;
     constructor({ TextContent }) {
         this.TextContent = TextContent;
     }
+    toJson() {
+        return {
+            TextContent: this.TextContent,
+        };
+    }
 }
 class CsdlPropertyPath {
+    TextContent;
     constructor({ TextContent }) {
         this.TextContent = TextContent;
     }
+    toJson() {
+        return {
+            TextContent: this.TextContent,
+        };
+    }
 }
 class CsdlNavigationPropertyPath {
+    TextContent;
     constructor({ TextContent }) {
         this.TextContent = TextContent;
     }
+    toJson() {
+        return {
+            TextContent: this.TextContent,
+        };
+    }
 }
 
 class CsdlReference extends CsdlAnnotable {
-    constructor({ Uri, Includes, IncludeAnnotations, Annotation, }) {
+    Uri;
+    Include;
+    IncludeAnnotations;
+    constructor({ Uri, Include, IncludeAnnotations, Annotation, }) {
         super({ Annotation });
         this.Uri = Uri;
-        this.Includes = Includes?.map((i) => new CsdlInclude(i));
+        this.Include = Include?.map((i) => new CsdlInclude(i));
         this.IncludeAnnotations = IncludeAnnotations?.map((i) => new CsdlIncludeAnnotations(i));
     }
+    toJson() {
+        const json = { ...super.toJson(), Uri: this.Uri };
+        if (Array.isArray(this.Include) && this.Include.length > 0) {
+            json['Include'] = this.Include.map((i) => i.toJson());
+        }
+        if (Array.isArray(this.IncludeAnnotations) &&
+            this.IncludeAnnotations.length > 0) {
+            json['IncludeAnnotations'] = this.IncludeAnnotations.map((i) => i.toJson());
+        }
+        return json;
+    }
+    toConfig(base) {
+        return {
+            ...super.toConfig(),
+            uri: this.Uri,
+            includes: this.Include?.map((i) => i.toConfig()),
+            includeAnnotations: this.IncludeAnnotations?.map((i) => i.toConfig()),
+        };
+    }
 }
 class CsdlInclude {
+    Namespace;
+    Alias;
     constructor({ Namespace, Alias }) {
         this.Namespace = Namespace;
         this.Alias = Alias;
     }
+    toJson() {
+        return {
+            Namespace: this.Namespace,
+            Alias: this.Alias,
+        };
+    }
+    toConfig() {
+        return {
+            namespace: this.Namespace,
+            alias: this.Alias,
+        };
+    }
 }
 class CsdlIncludeAnnotations {
+    TermNamespace;
+    Qualifier;
+    TargetNamespace;
     constructor({ TermNamespace, Qualifier, TargetNamespace, }) {
         this.TermNamespace = TermNamespace;
         this.Qualifier = Qualifier;
         this.TargetNamespace = TargetNamespace;
     }
+    toJson() {
+        return {
+            TermNamespace: this.TermNamespace,
+            Qualifier: this.Qualifier,
+            TargetNamespace: this.TargetNamespace,
+        };
+    }
+    toConfig() {
+        return {
+            termNamespace: this.TermNamespace,
+            qualifier: this.Qualifier,
+            targetNamespace: this.TargetNamespace,
+        };
+    }
 }
 
 class CsdlTypeDefinition extends CsdlAnnotable {
+    schema;
+    Name;
+    UnderlayingType;
+    MaxLength;
+    Precision;
+    Scale;
+    Unicode;
+    SRID;
     constructor(schema, { Name, UnderlayingType, MaxLength, Precision, Scale, Unicode, SRID, Annotation, }) {
         super({ Annotation });
         this.schema = schema;
@@ -8022,9 +8347,37 @@ class CsdlTypeDefinition extends CsdlAnnotable {
         this.Unicode = Unicode;
         this.SRID = SRID;
     }
+    toJson() {
+        const json = {
+            ...super.toJson(),
+            Name: this.Name,
+            UnderlayingType: this.UnderlayingType,
+        };
+        if (this.MaxLength !== undefined) {
+            json['MaxLength'] = this.MaxLength;
+        }
+        if (this.Precision !== undefined) {
+            json['Precision'] = this.Precision;
+        }
+        if (this.Scale !== undefined) {
+            json['Scale'] = this.Scale;
+        }
+        if (this.Unicode !== undefined) {
+            json['Unicode'] = this.Unicode;
+        }
+        if (this.SRID !== undefined) {
+            json['SRID'] = this.SRID;
+        }
+        return json;
+    }
 }
 
 class CsdlEnumType extends CsdlAnnotable {
+    schema;
+    Name;
+    Member;
+    UnderlyingType;
+    IsFlags;
     constructor(schema, { Name, Member, UnderlyingType, IsFlags, Annotation, }) {
         super({ Annotation });
         this.schema = schema;
@@ -8033,34 +8386,70 @@ class CsdlEnumType extends CsdlAnnotable {
         this.UnderlyingType = UnderlyingType;
         this.IsFlags = IsFlags;
     }
+    toJson() {
+        const json = {
+            ...super.toJson(),
+            Name: this.Name,
+            Member: this.Member.map((m) => m.toJson()),
+        };
+        if (this.UnderlyingType !== undefined) {
+            json['UnderlyingType'] = this.UnderlyingType;
+        }
+        if (this.IsFlags !== undefined) {
+            json['IsFlags'] = this.IsFlags;
+        }
+        return json;
+    }
+    name() {
+        return `${this.Name}`;
+    }
+    namespace() {
+        return `${this.schema.Namespace}`;
+    }
     fullName() {
         return `${this.schema.Namespace}.${this.Name}`;
     }
-    toConfig() {
+    toConfig(base) {
         return {
+            ...super.toConfig(),
             name: this.Name,
-            annotations: this.Annotation?.map((a) => a.toConfig()),
-            members: this.Member.map((m) => m.toConfig()),
-            fields: {},
+            fields: this.Member.reduce((acc, m) => ({
+                ...acc,
+                [m.Name]: m.toConfig(),
+            }), {}),
             flags: this.IsFlags,
         };
     }
 }
 class CsdlMember extends CsdlAnnotable {
+    Name;
+    Value;
     constructor({ Name, Value, Annotation, }) {
         super({ Annotation });
         this.Name = Name;
         this.Value = Value;
     }
-    toConfig() {
-        return {
+    toJson() {
+        const json = { ...super.toJson(), Name: this.Name };
+        if (this.Value !== undefined) {
+            json['Value'] = this.Value;
+        }
+        return json;
+    }
+    toConfig(base) {
+        const config = {
+            ...super.toConfig(),
             value: this.Value,
-            annotations: this.Annotation?.map((a) => a.toConfig()),
         };
+        return config;
     }
 }
 
 class CsdlStructuralProperty extends CsdlAnnotable {
+    Name;
+    Type;
+    Collection;
+    Nullable;
     constructor({ Name, Type, Nullable, Annotation, }) {
         super({ Annotation });
         this.Name = Name;
@@ -8068,8 +8457,22 @@ class CsdlStructuralProperty extends CsdlAnnotable {
         this.Collection = Type.startsWith('Collection(');
         this.Type = this.Collection ? Type.substring(11, Type.length - 1) : Type;
     }
+    toJson() {
+        return {
+            ...super.toJson(),
+            Name: this.Name,
+            Type: this.Collection ? `Collection(${this.Type})` : this.Type,
+            Nullable: this.Nullable,
+        };
+    }
 }
 class CsdlProperty extends CsdlStructuralProperty {
+    MaxLength;
+    Precision;
+    Scale;
+    Unicode;
+    SRID;
+    DefaultValue;
     constructor({ Name, Type, Nullable, MaxLength, Precision, Scale, Unicode, SRID, DefaultValue, Annotation, }) {
         super({ Name, Type, Nullable, Annotation });
         this.MaxLength = MaxLength;
@@ -8079,8 +8482,31 @@ class CsdlProperty extends CsdlStructuralProperty {
         this.SRID = SRID;
         this.DefaultValue = DefaultValue;
     }
+    toJson() {
+        const json = { ...super.toJson() };
+        if (this.MaxLength !== undefined) {
+            json['MaxLength'] = this.MaxLength;
+        }
+        if (this.Precision !== undefined) {
+            json['Precision'] = this.Precision;
+        }
+        if (this.Scale !== undefined) {
+            json['Scale'] = this.Scale;
+        }
+        if (this.Unicode !== undefined) {
+            json['Unicode'] = this.Unicode;
+        }
+        if (this.SRID !== undefined) {
+            json['SRID'] = this.SRID;
+        }
+        if (this.DefaultValue !== undefined) {
+            json['DefaultValue'] = this.DefaultValue;
+        }
+        return json;
+    }
     toConfig() {
         return {
+            ...super.toConfig(),
             name: this.Name,
             type: this.Type,
             default: this.DefaultValue,
@@ -8090,11 +8516,14 @@ class CsdlProperty extends CsdlStructuralProperty {
             navigation: false,
             precision: this.Precision,
             scale: this.Scale,
-            annotations: this.Annotation?.map((a) => a.toConfig()),
         };
     }
 }
 class CsdlNavigationProperty extends CsdlStructuralProperty {
+    Partner;
+    ContainsTarget;
+    ReferentialConstraints;
+    OnDelete;
     constructor({ Name, Type, Nullable, Partner, ContainsTarget, ReferentialConstraints, OnDelete, Annotation, }) {
         super({ Name, Type, Nullable, Annotation });
         this.Partner = Partner;
@@ -8102,14 +8531,31 @@ class CsdlNavigationProperty extends CsdlStructuralProperty {
         this.ReferentialConstraints = ReferentialConstraints?.map((r) => new CsdlReferentialConstraint(r));
         this.OnDelete = OnDelete ? new CsdlOnDelete(OnDelete) : undefined;
     }
+    toJson() {
+        const json = { ...super.toJson() };
+        if (this.Partner !== undefined) {
+            json['Partner'] = this.Partner;
+        }
+        if (this.ContainsTarget !== undefined) {
+            json['ContainsTarget'] = this.ContainsTarget;
+        }
+        if (Array.isArray(this.ReferentialConstraints) &&
+            this.ReferentialConstraints.length > 0) {
+            json['ReferentialConstraints'] = this.ReferentialConstraints.map((r) => r.toJson());
+        }
+        if (this.OnDelete !== undefined) {
+            json['OnDelete'] = this.OnDelete;
+        }
+        return json;
+    }
     toConfig() {
         return {
+            ...super.toConfig(),
             name: this.Name,
             type: this.Type,
             collection: this.Collection,
             nullable: this.Nullable,
             navigation: true,
-            annotations: this.Annotation?.map((a) => a.toConfig()),
             referentials: this.ReferentialConstraints?.map((r) => ({
                 property: r.Property,
                 referencedProperty: r.ReferencedProperty,
@@ -8118,18 +8564,39 @@ class CsdlNavigationProperty extends CsdlStructuralProperty {
     }
 }
 class CsdlReferentialConstraint {
+    Property;
+    ReferencedProperty;
     constructor({ Property, ReferencedProperty, }) {
         this.Property = Property;
         this.ReferencedProperty = ReferencedProperty;
     }
+    toJson() {
+        return {
+            Property: this.Property,
+            ReferencedProperty: this.ReferencedProperty,
+        };
+    }
 }
 class CsdlOnDelete {
+    Action;
     constructor({ Action }) {
         this.Action = Action;
     }
+    toJson() {
+        return {
+            Action: this.Action,
+        };
+    }
 }
 
 class CsdlStructuredType extends CsdlAnnotable {
+    schema;
+    Name;
+    Property;
+    NavigationProperty;
+    BaseType;
+    OpenType;
+    Abstract;
     constructor(schema, { Name, Property, NavigationProperty, BaseType, OpenType, Abstract, Annotation, }) {
         super({ Annotation });
         this.schema = schema;
@@ -8140,6 +8607,32 @@ class CsdlStructuredType extends CsdlAnnotable {
         this.OpenType = OpenType;
         this.Abstract = Abstract;
     }
+    toJson() {
+        const json = { ...super.toJson(), Name: this.Name };
+        if (Array.isArray(this.Property) && this.Property.length > 0) {
+            json['Property'] = this.Property.map((p) => p.toJson());
+        }
+        if (Array.isArray(this.NavigationProperty) &&
+            this.NavigationProperty.length > 0) {
+            json['NavigationProperty'] = this.NavigationProperty.map((n) => n.toJson());
+        }
+        if (this.BaseType !== undefined) {
+            json['BaseType'] = this.BaseType;
+        }
+        if (this.OpenType !== undefined) {
+            json['OpenType'] = this.OpenType;
+        }
+        if (this.Abstract !== undefined) {
+            json['Abstract'] = this.Abstract;
+        }
+        return json;
+    }
+    name() {
+        return `${this.Name}`;
+    }
+    namespace() {
+        return `${this.schema.Namespace}`;
+    }
     fullName() {
         return `${this.schema.Namespace}.${this.Name}`;
     }
@@ -8156,13 +8649,19 @@ class CsdlComplexType extends CsdlStructuredType {
             Annotation,
         });
     }
-    toConfig() {
-        const fields = {};
+    toJson() {
+        return {
+            ...super.toJson(),
+        };
+    }
+    toConfig(base) {
         return {
+            ...super.toConfig(),
             name: this.Name,
             base: this.BaseType,
-            open: this.OpenType,
-            annotations: this.Annotation?.map((t) => t.toConfig()),
+            open: base?.open ?? this.OpenType,
+            model: base?.model,
+            collection: base?.collection,
             fields: [
                 ...(this.Property ?? []).map((t) => t.toConfig()),
                 ...(this.NavigationProperty ?? []).map((t) => t.toConfig()),
@@ -8171,6 +8670,8 @@ class CsdlComplexType extends CsdlStructuredType {
     }
 }
 class CsdlEntityType extends CsdlStructuredType {
+    Key;
+    HasStream;
     constructor(schema, { Name, Key, Property, NavigationProperty, BaseType, OpenType, Abstract, HasStream, Annotation, }) {
         super(schema, {
             Name,
@@ -8184,12 +8685,24 @@ class CsdlEntityType extends CsdlStructuredType {
         this.Key = Key ? new CsdlKey(Key) : undefined;
         this.HasStream = HasStream;
     }
-    toConfig() {
+    toJson() {
+        const json = { ...super.toJson() };
+        if (this.Key !== undefined) {
+            json['Key'] = this.Key.toJson();
+        }
+        if (this.HasStream !== undefined) {
+            json['HasStream'] = this.HasStream;
+        }
+        return json;
+    }
+    toConfig(base) {
         return {
+            ...super.toConfig(),
             name: this.Name,
             base: this.BaseType,
-            open: this.OpenType,
-            annotations: this.Annotation?.map((t) => t.toConfig()),
+            open: base?.open ?? this.OpenType,
+            model: base?.model,
+            collection: base?.collection,
             keys: this.Key?.toConfig(),
             fields: [
                 ...(this.Property ?? []).map((t) => t.toConfig()),
@@ -8199,18 +8712,32 @@ class CsdlEntityType extends CsdlStructuredType {
     }
 }
 class CsdlKey {
-    constructor({ PropertyRefs }) {
-        this.PropertyRefs = PropertyRefs?.map((p) => new CsdlPropertyRef(p));
+    PropertyRef;
+    constructor({ PropertyRef }) {
+        this.PropertyRef = PropertyRef?.map((p) => new CsdlPropertyRef(p));
+    }
+    toJson() {
+        return {
+            PropertyRef: this.PropertyRef?.map((p) => p.toJson()),
+        };
     }
     toConfig() {
-        return this.PropertyRefs.map((t) => t.toConfig());
+        return this.PropertyRef?.map((t) => t.toConfig());
     }
 }
 class CsdlPropertyRef {
+    Name;
+    Alias;
     constructor({ Name, Alias }) {
         this.Name = Name;
         this.Alias = Alias;
     }
+    toJson() {
+        return {
+            Name: this.Name,
+            Alias: this.Alias,
+        };
+    }
     toConfig() {
         return {
             name: this.Name,
@@ -8219,47 +8746,98 @@ class CsdlPropertyRef {
     }
 }
 
+const BINDING_PARAMETER_NAME = 'bindingParameter';
 class CsdlCallable {
-    constructor(schema, { Name, ReturnType, IsBound, EntitySetPath, Parameters, }) {
+    schema;
+    Name;
+    ReturnType;
+    IsBound;
+    EntitySetPath;
+    Parameter;
+    constructor(schema, { Name, ReturnType, IsBound, EntitySetPath, Parameter, }) {
         this.schema = schema;
         this.Name = Name;
         this.ReturnType = ReturnType ? new CsdlReturnType(ReturnType) : undefined;
         this.IsBound = IsBound;
         this.EntitySetPath = EntitySetPath;
-        this.Parameters = Parameters?.map((p) => new CsdlParameter(p));
+        this.Parameter = Parameter?.map((p) => new CsdlParameter(p));
+    }
+    toJson() {
+        const json = {
+            Name: this.Name,
+        };
+        if (this.ReturnType !== undefined) {
+            json['ReturnType'] = this.ReturnType.toJson();
+        }
+        if (this.IsBound !== undefined) {
+            json['IsBound'] = this.IsBound;
+        }
+        if (this.EntitySetPath !== undefined) {
+            json['EntitySetPath'] = this.EntitySetPath;
+        }
+        if (Array.isArray(this.Parameter) && this.Parameter.length > 0) {
+            json['Parameter'] = this.Parameter.map((p) => p.toJson());
+        }
+        return json;
+    }
+    name() {
+        return `${this.Name}`;
+    }
+    namespace() {
+        return `${this.schema.Namespace}`;
+    }
+    fullName() {
+        return `${this.namespace()}.${this.Name}`;
     }
 }
 class CsdlFunction extends CsdlCallable {
-    constructor(schema, { Name, ReturnType, IsBound, EntitySetPath, IsComposable, Parameters, }) {
-        super(schema, { Name, ReturnType, IsBound, EntitySetPath, Parameters });
+    IsComposable;
+    constructor(schema, { Name, ReturnType, IsBound, EntitySetPath, IsComposable, Parameter, }) {
+        super(schema, { Name, ReturnType, IsBound, EntitySetPath, Parameter });
         this.IsComposable = IsComposable;
     }
-    toConfig() {
+    toJson() {
+        return {
+            ...super.toJson(),
+            IsComposable: this.IsComposable,
+        };
+    }
+    toConfig(base) {
         return {
             name: this.Name,
             entitySetPath: this.EntitySetPath,
             bound: this.IsBound,
             composable: this.IsComposable,
-            parameters: this.Parameters?.map((p) => p.toConfig()),
+            parameters: this.Parameter?.map((p) => p.toConfig()),
             return: this.ReturnType?.toConfig(),
         };
     }
 }
 class CsdlAction extends CsdlCallable {
-    constructor(schema, { Name, ReturnType, IsBound, EntitySetPath, Parameters, }) {
-        super(schema, { Name, ReturnType, IsBound, EntitySetPath, Parameters });
+    constructor(schema, { Name, ReturnType, IsBound, EntitySetPath, Parameter, }) {
+        super(schema, { Name, ReturnType, IsBound, EntitySetPath, Parameter });
     }
-    toConfig() {
+    toJson() {
+        return {
+            ...super.toJson(),
+        };
+    }
+    toConfig(base) {
         return {
             name: this.Name,
             entitySetPath: this.EntitySetPath,
             bound: this.IsBound,
-            parameters: this.Parameters?.map((p) => p.toConfig()),
+            parameters: this.Parameter?.map((p) => p.toConfig()),
             return: this.ReturnType?.toConfig(),
         };
     }
 }
 class CsdlFunctionImport {
+    container;
+    Name;
+    FunctionName;
+    EntitySet;
+    IncludeInServiceDocument;
     constructor(container, { Name, FunctionName, EntitySet, IncludeInServiceDocument, }) {
         this.container = container;
         this.Name = Name;
@@ -8267,28 +8845,69 @@ class CsdlFunctionImport {
         this.EntitySet = EntitySet;
         this.IncludeInServiceDocument = IncludeInServiceDocument;
     }
+    toJson() {
+        return {
+            Name: this.Name,
+            FunctionName: this.FunctionName,
+            EntitySet: this.EntitySet,
+            IncludeInServiceDocument: this.IncludeInServiceDocument,
+        };
+    }
 }
 class CsdlActionImport {
+    container;
+    Name;
+    Action;
+    EntitySet;
     constructor(container, { Name, Action, EntitySet, }) {
         this.container = container;
         this.Name = Name;
         this.Action = Action;
         this.EntitySet = EntitySet;
     }
+    toJson() {
+        return {
+            Name: this.Name,
+            Action: this.Action,
+            EntitySet: this.EntitySet,
+        };
+    }
 }
 class CsdlParameter extends CsdlAnnotable {
+    Name;
+    Type;
+    Collection;
+    Nullable;
+    MaxLength;
+    Precision;
+    Scale;
+    SRID;
     constructor({ Name, Type, Nullable, MaxLength, Precision, Scale, SRID, Annotation, }) {
         super({ Annotation });
         this.Name = Name;
-        this.Type = Type;
+        this.Collection = Type.startsWith('Collection(');
+        this.Type = this.Collection ? Type.substring(11, Type.length - 1) : Type;
         this.Nullable = Nullable;
         this.MaxLength = MaxLength;
         this.Precision = Precision;
         this.Scale = Scale;
         this.SRID = SRID;
     }
+    toJson() {
+        return {
+            ...super.toJson(),
+            Name: this.Name,
+            Type: this.Collection ? `Collection(${this.Type})` : this.Type,
+            Nullable: this.Nullable,
+            MaxLength: this.MaxLength,
+            Precision: this.Precision,
+            Scale: this.Scale,
+            SRID: this.SRID,
+        };
+    }
     toConfig() {
         return {
+            ...super.toConfig(),
             type: this.Type,
             nullable: this.Nullable,
             collection: false,
@@ -8296,14 +8915,32 @@ class CsdlParameter extends CsdlAnnotable {
     }
 }
 class CsdlReturnType {
+    Type;
+    Collection;
+    Nullable;
+    MaxLength;
+    Precision;
+    Scale;
+    SRID;
     constructor({ Type, Nullable, MaxLength, Precision, Scale, SRID, }) {
-        this.Type = Type;
+        this.Collection = Type.startsWith('Collection(');
+        this.Type = this.Collection ? Type.substring(11, Type.length - 1) : Type;
         this.Nullable = Nullable;
         this.MaxLength = MaxLength;
         this.Precision = Precision;
         this.Scale = Scale;
         this.SRID = SRID;
     }
+    toJson() {
+        return {
+            Type: this.Collection ? `Collection(${this.Type})` : this.Type,
+            Nullable: this.Nullable,
+            MaxLength: this.MaxLength,
+            Precision: this.Precision,
+            Scale: this.Scale,
+            SRID: this.SRID,
+        };
+    }
     toConfig() {
         return {
             type: this.Type,
@@ -8313,13 +8950,26 @@ class CsdlReturnType {
 }
 
 class CsdlNavigationPropertyBinding {
+    Path;
+    Target;
     constructor({ Path, Target }) {
         this.Path = Path;
         this.Target = Target;
     }
+    toJson() {
+        return {
+            Path: this.Path,
+            Target: this.Target,
+        };
+    }
 }
 
 class CsdlEntitySet extends CsdlAnnotable {
+    container;
+    Name;
+    EntityType;
+    NavigationPropertyBinding;
+    IncludeInServiceDocument;
     constructor(container, { Name, EntityType, NavigationPropertyBinding, IncludeInServiceDocument, Annotation, }) {
         super({ Annotation });
         this.container = container;
@@ -8328,20 +8978,45 @@ class CsdlEntitySet extends CsdlAnnotable {
         this.NavigationPropertyBinding = NavigationPropertyBinding?.map((n) => new CsdlNavigationPropertyBinding(n));
         this.IncludeInServiceDocument = IncludeInServiceDocument;
     }
+    toJson() {
+        const json = {
+            ...super.toJson(),
+            Name: this.Name,
+            EntityType: this.EntityType,
+        };
+        if (Array.isArray(this.NavigationPropertyBinding) &&
+            this.NavigationPropertyBinding.length > 0) {
+            json['NavigationPropertyBinding'] = this.NavigationPropertyBinding.map((n) => n.toJson());
+        }
+        if (this.IncludeInServiceDocument !== undefined) {
+            json['IncludeInServiceDocument'] = this.IncludeInServiceDocument;
+        }
+        return json;
+    }
+    name() {
+        return `${this.Name}`;
+    }
+    namespace() {
+        return `${this.container.namespace()}`;
+    }
     fullName() {
-        return `${this.container.Namespace}.${this.Name}`;
+        return `${this.container.namespace()}.${this.Name}`;
     }
     toConfig() {
         return {
+            ...super.toConfig(),
             name: this.Name,
             entityType: this.EntityType,
             service: {},
-            annotations: this.Annotation?.map((t) => t.toConfig()),
         };
     }
 }
 
 class CsdlSingleton extends CsdlAnnotable {
+    container;
+    Name;
+    Type;
+    NavigationPropertyBindings;
     constructor(container, { Name, Type, NavigationPropertyBindings, Annotation, }) {
         super({ Annotation });
         this.container = container;
@@ -8349,12 +9024,37 @@ class CsdlSingleton extends CsdlAnnotable {
         this.Type = Type;
         this.NavigationPropertyBindings = NavigationPropertyBindings?.map((n) => new CsdlNavigationPropertyBinding(n));
     }
+    toJson() {
+        const json = {
+            ...super.toJson(),
+            Name: this.Name,
+            Type: this.Type,
+        };
+        if (Array.isArray(this.NavigationPropertyBindings) &&
+            this.NavigationPropertyBindings.length > 0) {
+            json['NavigationPropertyBindings'] = this.NavigationPropertyBindings.map((n) => n.toJson());
+        }
+        return json;
+    }
+    name() {
+        return `${this.Name}`;
+    }
+    namespace() {
+        return `${this.container.namespace()}`;
+    }
     fullName() {
-        return `${this.container.Namespace}.${this.Name}`;
+        return `${this.container.namespace()}.${this.Name}`;
     }
 }
 
 class CsdlEntityContainer extends CsdlAnnotable {
+    schema;
+    Name;
+    Extend;
+    EntitySet;
+    Singleton;
+    FunctionImport;
+    ActionImport;
     constructor(schema, { Name, Extend, EntitySet, Singleton, FunctionImport, ActionImport, Annotation, }) {
         super({ Annotation });
         this.schema = schema;
@@ -8365,19 +9065,55 @@ class CsdlEntityContainer extends CsdlAnnotable {
         this.FunctionImport = FunctionImport?.map((f) => new CsdlFunctionImport(this, f));
         this.ActionImport = ActionImport?.map((a) => new CsdlActionImport(this, a));
     }
-    get Namespace() {
-        return this.schema.Namespace;
+    toJson() {
+        const json = { ...super.toJson() };
+        if (this.Extend !== undefined) {
+            json['Extend'] = this.Extend;
+        }
+        if (Array.isArray(this.EntitySet) && this.EntitySet.length > 0) {
+            json['EntitySet'] = this.EntitySet.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.Singleton) && this.Singleton.length > 0) {
+            json['Singleton'] = this.Singleton.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.FunctionImport) && this.FunctionImport.length > 0) {
+            json['FunctionImport'] = this.FunctionImport.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.ActionImport) && this.ActionImport.length > 0) {
+            json['ActionImport'] = this.ActionImport.map((a) => a.toJson());
+        }
+        return json;
+    }
+    name() {
+        return `${this.Name}`;
     }
-    toConfig() {
+    namespace() {
+        return `${this.schema.Namespace}`;
+    }
+    fullName() {
+        return `${this.schema.Namespace}.${this.Name}`;
+    }
+    toConfig(base) {
         return {
+            ...super.toConfig(),
             name: this.Name,
-            annotations: this.Annotation?.map((t) => t.toConfig()),
             entitySets: this.EntitySet?.map((t) => t.toConfig()),
         };
     }
 }
 
 class CsdlSchema {
+    Namespace;
+    Alias;
+    EnumType;
+    ComplexType;
+    EntityType;
+    Function;
+    Action;
+    EntityContainer;
+    TypeDefinition;
+    Term;
+    Annotations;
     constructor({ Namespace, Alias, EnumType, ComplexType, EntityType, Function, Action, EntityContainer, TypeDefinition, Term, Annotations, }) {
         this.Namespace = Namespace;
         this.Alias = Alias;
@@ -8391,23 +9127,99 @@ class CsdlSchema {
         this.Term = Term?.map((t) => new CsdlTerm(this, t));
         this.Annotations = Annotations?.map((a) => new CsdlAnnotations(this, a));
     }
-    toConfig() {
+    toJson() {
+        const json = {
+            Namespace: this.Namespace,
+        };
+        if (this.Alias !== undefined) {
+            json['Alias'] = this.Alias;
+        }
+        if (Array.isArray(this.EntityContainer) &&
+            this.EntityContainer.length > 0) {
+            json['EntityContainer'] = this.EntityContainer.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.EntityType) && this.EntityType.length > 0) {
+            json['EntityType'] = this.EntityType.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.ComplexType) && this.ComplexType.length > 0) {
+            json['ComplexType'] = this.ComplexType.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.EnumType) && this.EnumType.length > 0) {
+            json['EnumType'] = this.EnumType.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.TypeDefinition) && this.TypeDefinition.length > 0) {
+            json['TypeDefinition'] = this.TypeDefinition.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.Term) && this.Term.length > 0) {
+            json['Term'] = this.Term.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.Annotations) && this.Annotations.length > 0) {
+            json['Annotations'] = this.Annotations.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.Action) && this.Action.length > 0) {
+            json['Action'] = this.Action.map((a) => a.toJson());
+        }
+        if (Array.isArray(this.Function) && this.Function.length > 0) {
+            json['Function'] = this.Function.map((a) => a.toJson());
+        }
+        return json;
+    }
+    toConfig(base) {
         return {
             namespace: this.Namespace,
-            alias: this.Alias,
+            alias: base?.alias ?? this.Alias,
             annotations: this.Annotations?.map((t) => t.toConfig()),
-            enums: this.EntityType?.map((t) => t.toConfig()),
+            enums: this.EnumType?.map((t) => t.toConfig(base?.enums?.find((cs) => cs.name === t.Name))),
             entities: [
-                ...(this.ComplexType ?? []).map((t) => t.toConfig()),
-                ...(this.EntityType ?? []).map((t) => t.toConfig()),
+                ...(this.ComplexType ?? []).map((t) => t.toConfig(base?.entities?.find((cs) => cs.name === t.Name))),
+                ...(this.EntityType ?? []).map((t) => t.toConfig(base?.entities?.find((cs) => cs.name === t.Name))),
             ],
             callables: [
-                ...(this.Function ?? []).map((t) => t.toConfig()),
-                ...(this.Action ?? []).map((t) => t.toConfig()),
+                ...(this.Function ?? []).map((t) => t.toConfig(base?.callables?.find((cs) => cs.name === t.Name))),
+                ...(this.Action ?? []).map((t) => t.toConfig(base?.callables?.find((cs) => cs.name === t.Name))),
             ],
-            containers: this.EntityContainer?.map((t) => t.toConfig()),
+            containers: this.EntityContainer?.map((t) => t.toConfig(base?.containers?.find((cs) => cs.name === t.Name))),
+        };
+    }
+}
+
+class ODataMetadata {
+    Version;
+    References;
+    Schemas;
+    constructor(Version, References, Schemas) {
+        this.Version = Version;
+        this.References = References?.map((r) => new CsdlReference(r));
+        this.Schemas = Schemas?.map((s) => new CsdlSchema(s));
+    }
+    toConfig(base) {
+        return {
+            ...base,
+            version: base?.version ?? this.Version,
+            schemas: (this.Schemas ?? []).map((ms) => ms.toConfig(base?.schemas?.find((cs) => cs.namespace === ms.Namespace))),
+            references: (this.References ?? []).map((mr) => mr.toConfig(base?.references?.find((cs) => cs.uri === mr.Uri))),
+        };
+    }
+    toJson() {
+        return {
+            Version: this.Version,
+            References: this.References.map((r) => r.toJson()),
+            Schemas: this.Schemas.map((s) => s.toJson()),
         };
     }
+    functions() {
+        return this.Schemas.reduce((acc, s) => {
+            return [...acc, ...(s.Function ?? [])];
+        }, []);
+    }
+    actions() {
+        return this.Schemas.reduce((acc, s) => {
+            return [...acc, ...(s.Action ?? [])];
+        }, []);
+    }
+    static fromJson(json) {
+        return new ODataMetadata(json.Version, json.References, json.Schemas);
+    }
 }
 
 var FieldType;
@@ -8416,6 +9228,8 @@ var FieldType;
     FieldType[FieldType["TAG"] = 1] = "TAG";
 })(FieldType || (FieldType = {}));
 class Field {
+    name;
+    fieldType;
     constructor(name, fieldType) {
         this.name = name;
         this.fieldType = fieldType;
@@ -8423,89 +9237,90 @@ class Field {
 }
 class ODataMetadataParser {
     // TAGS
-    static { this.TAG_EDMX = 'edmx:Edmx'; }
-    static { this.TAG_DATA_SERVICES = 'edmx:DataServices'; }
-    static { this.TAG_REFERENCE = 'edmx:Reference'; }
-    static { this.TAG_INCLUDE = 'edmx:Include'; }
-    static { this.TAG_INCLUDE_ANNOTATIONS = 'edmx:IncludeAnnotations'; }
-    static { this.TAG_TERM = 'Term'; }
-    static { this.TAG_ANNOTATIONS = 'Annotations'; }
-    static { this.TAG_ANNOTATION = 'Annotation'; }
-    static { this.TAG_SCHEMA = 'Schema'; }
-    static { this.TAG_ENUM_TYPE = 'EnumType'; }
-    static { this.TAG_MEMBER = 'Member'; }
-    static { this.TAG_COMPLEX_TYPE = 'ComplexType'; }
-    static { this.TAG_ENTITY_TYPE = 'EntityType'; }
-    static { this.TAG_PROPERTY = 'Property'; }
-    static { this.TAG_KEY = 'Key'; }
-    static { this.TAG_PROPERTY_REF = 'PropertyRef'; }
-    static { this.TAG_NAVIGATION_PROPERTY = 'NavigationProperty'; }
-    static { this.TAG_REFERENTIAL_CONSTRAINT = 'ReferentialConstraint'; }
-    static { this.TAG_ON_DELETE = 'OnDelete'; }
-    static { this.TAG_FUNCTION = 'Function'; }
-    static { this.TAG_RETURN_TYPE = 'ReturnType'; }
-    static { this.TAG_PARAMETER = 'Parameter'; }
-    static { this.TAG_ACTION = 'Action'; }
-    static { this.TAG_ENTITY_CONTAINER = 'EntityContainer'; }
-    static { this.TAG_ENTITY_SET = 'EntitySet'; }
-    static { this.TAG_SINGLETON = 'Singleton'; }
-    static { this.TAG_COLLECTION = 'Collection'; }
-    static { this.TAG_RECORD = 'Record'; }
-    static { this.TAG_STRING = 'String'; }
-    static { this.TAG_ENUM_MEMBER = 'EnumMember'; }
-    static { this.TAG_PROPERTY_VALUE = 'PropertyValue'; }
-    static { this.TAG_PROPERTY_PATH = 'PropertyPath'; }
-    static { this.TAG_NAVIGATION_PROPERTY_PATH = 'NavigationPropertyPath'; }
-    static { this.TAG_FUNCTION_IMPORT = 'FunctionImport'; }
-    static { this.TAG_ACTION_IMPORT = 'ActionImport'; }
-    static { this.TAG_NAVIGATION_PROPERTY_BINDING = 'NavigationPropertyBinding'; }
-    static { this.TAG_TYPE_DEFINITION = 'TypeDefinition'; }
+    static TAG_EDMX = 'edmx:Edmx';
+    static TAG_DATA_SERVICES = 'edmx:DataServices';
+    static TAG_REFERENCE = 'edmx:Reference';
+    static TAG_INCLUDE = 'edmx:Include';
+    static TAG_INCLUDE_ANNOTATIONS = 'edmx:IncludeAnnotations';
+    static TAG_TERM = 'Term';
+    static TAG_ANNOTATIONS = 'Annotations';
+    static TAG_ANNOTATION = 'Annotation';
+    static TAG_SCHEMA = 'Schema';
+    static TAG_ENUM_TYPE = 'EnumType';
+    static TAG_MEMBER = 'Member';
+    static TAG_COMPLEX_TYPE = 'ComplexType';
+    static TAG_ENTITY_TYPE = 'EntityType';
+    static TAG_PROPERTY = 'Property';
+    static TAG_KEY = 'Key';
+    static TAG_PROPERTY_REF = 'PropertyRef';
+    static TAG_NAVIGATION_PROPERTY = 'NavigationProperty';
+    static TAG_REFERENTIAL_CONSTRAINT = 'ReferentialConstraint';
+    static TAG_ON_DELETE = 'OnDelete';
+    static TAG_FUNCTION = 'Function';
+    static TAG_RETURN_TYPE = 'ReturnType';
+    static TAG_PARAMETER = 'Parameter';
+    static TAG_ACTION = 'Action';
+    static TAG_ENTITY_CONTAINER = 'EntityContainer';
+    static TAG_ENTITY_SET = 'EntitySet';
+    static TAG_SINGLETON = 'Singleton';
+    static TAG_COLLECTION = 'Collection';
+    static TAG_RECORD = 'Record';
+    static TAG_STRING = 'String';
+    static TAG_ENUM_MEMBER = 'EnumMember';
+    static TAG_PROPERTY_VALUE = 'PropertyValue';
+    static TAG_PROPERTY_PATH = 'PropertyPath';
+    static TAG_NAVIGATION_PROPERTY_PATH = 'NavigationPropertyPath';
+    static TAG_FUNCTION_IMPORT = 'FunctionImport';
+    static TAG_ACTION_IMPORT = 'ActionImport';
+    static TAG_NAVIGATION_PROPERTY_BINDING = 'NavigationPropertyBinding';
+    static TAG_TYPE_DEFINITION = 'TypeDefinition';
     // ATTRIBUTES
-    static { this.ATTRIBUTE_VERSION = 'Version'; }
-    static { this.ATTRIBUTE_URI = 'Uri'; }
-    static { this.ATTRIBUTE_ALIAS = 'Alias'; }
-    static { this.ATTRIBUTE_NAMESPACE = 'Namespace'; }
-    static { this.ATTRIBUTE_TERM_NAMESPACE = 'TermNamespace'; }
-    static { this.ATTRIBUTE_QUALIFIER = 'Qualifier'; }
-    static { this.ATTRIBUTE_STRING = 'String'; }
-    static { this.ATTRIBUTE_DATE = 'Date'; }
-    static { this.ATTRIBUTE_BOOL = 'Bool'; }
-    static { this.ATTRIBUTE_INT = 'Int'; }
-    static { this.ATTRIBUTE_TARGET_NAMESPACE = 'TargetNamespace'; }
-    static { this.ATTRIBUTE_TERM = 'Term'; }
-    static { this.ATTRIBUTE_NAME = 'Name'; }
-    static { this.ATTRIBUTE_VALUE = 'Value'; }
-    static { this.ATTRIBUTE_BASE_TYPE = 'BaseType'; }
-    static { this.ATTRIBUTE_OPEN_TYPE = 'OpenType'; }
-    static { this.ATTRIBUTE_TYPE = 'Type'; }
-    static { this.ATTRIBUTE_NULLABLE = 'Nullable'; }
-    static { this.ATTRIBUTE_MAX_LENGTH = 'MaxLength'; }
-    static { this.ATTRIBUTE_PRECISION = 'Precision'; }
-    static { this.ATTRIBUTE_SCALE = 'Scale'; }
-    static { this.ATTRIBUTE_UNICODE = 'Unicode'; }
-    static { this.ATTRIBUTE_SRID = 'SRID'; }
-    static { this.ATTRIBUTE_DEFAULT_VALUE = 'DefaultValue'; }
-    static { this.ATTRIBUTE_PARTNER = 'Partner'; }
-    static { this.ATTRIBUTE_PROPERTY = 'Property'; }
-    static { this.ATTRIBUTE_REFERENCED_PROPERTY = 'ReferencedProperty'; }
-    static { this.ATTRIBUTE_HAS_STREAM = 'HasStream'; }
-    static { this.ATTRIBUTE_CONTAINS_TARGET = 'ContainsTarget'; }
-    static { this.ATTRIBUTE_IS_BOUND = 'IsBound'; }
-    static { this.ATTRIBUTE_ENTITY_SET_PATH = 'EntitySetPath'; }
-    static { this.ATTRIBUTE_IS_COMPOSABLE = 'IsComposable'; }
-    static { this.ATTRIBUTE_ENTITY_TYPE = 'EntityType'; }
-    static { this.ATTRIBUTE_PATH = 'Path'; }
-    static { this.ATTRIBUTE_TARGET = 'Target'; }
-    static { this.ATTRIBUTE_FUNCTION = 'Function'; }
-    static { this.ATTRIBUTE_ACTION = 'Action'; }
-    static { this.ATTRIBUTE_ENTITY_SET = 'EntitySet'; }
-    static { this.ATTRIBUTE_INCLUDE_IN_SERVICE_DOCUMENT = 'IncludeInServiceDocument'; }
-    static { this.ATTRIBUTE_ABSTRACT = 'Abstract'; }
-    static { this.ATTRIBUTE_UNDERLYING_TYPE = 'UnderlyingType'; }
-    static { this.ATTRIBUTE_IS_FLAGS = 'IsFlags'; }
-    static { this.ATTRIBUTE_EXTENDS = 'Extends'; }
-    static { this.ATTRIBUTE_BASE_TERM = 'BaseTerm'; }
-    static { this.ATTRIBUTE_APPLIES_TO = 'AppliesTo'; }
+    static ATTRIBUTE_VERSION = 'Version';
+    static ATTRIBUTE_URI = 'Uri';
+    static ATTRIBUTE_ALIAS = 'Alias';
+    static ATTRIBUTE_NAMESPACE = 'Namespace';
+    static ATTRIBUTE_TERM_NAMESPACE = 'TermNamespace';
+    static ATTRIBUTE_QUALIFIER = 'Qualifier';
+    static ATTRIBUTE_STRING = 'String';
+    static ATTRIBUTE_DATE = 'Date';
+    static ATTRIBUTE_BOOL = 'Bool';
+    static ATTRIBUTE_INT = 'Int';
+    static ATTRIBUTE_TARGET_NAMESPACE = 'TargetNamespace';
+    static ATTRIBUTE_TERM = 'Term';
+    static ATTRIBUTE_NAME = 'Name';
+    static ATTRIBUTE_VALUE = 'Value';
+    static ATTRIBUTE_BASE_TYPE = 'BaseType';
+    static ATTRIBUTE_OPEN_TYPE = 'OpenType';
+    static ATTRIBUTE_TYPE = 'Type';
+    static ATTRIBUTE_NULLABLE = 'Nullable';
+    static ATTRIBUTE_MAX_LENGTH = 'MaxLength';
+    static ATTRIBUTE_PRECISION = 'Precision';
+    static ATTRIBUTE_SCALE = 'Scale';
+    static ATTRIBUTE_UNICODE = 'Unicode';
+    static ATTRIBUTE_SRID = 'SRID';
+    static ATTRIBUTE_DEFAULT_VALUE = 'DefaultValue';
+    static ATTRIBUTE_PARTNER = 'Partner';
+    static ATTRIBUTE_PROPERTY = 'Property';
+    static ATTRIBUTE_REFERENCED_PROPERTY = 'ReferencedProperty';
+    static ATTRIBUTE_HAS_STREAM = 'HasStream';
+    static ATTRIBUTE_CONTAINS_TARGET = 'ContainsTarget';
+    static ATTRIBUTE_IS_BOUND = 'IsBound';
+    static ATTRIBUTE_ENTITY_SET_PATH = 'EntitySetPath';
+    static ATTRIBUTE_IS_COMPOSABLE = 'IsComposable';
+    static ATTRIBUTE_ENTITY_TYPE = 'EntityType';
+    static ATTRIBUTE_PATH = 'Path';
+    static ATTRIBUTE_TARGET = 'Target';
+    static ATTRIBUTE_FUNCTION = 'Function';
+    static ATTRIBUTE_ACTION = 'Action';
+    static ATTRIBUTE_ENTITY_SET = 'EntitySet';
+    static ATTRIBUTE_INCLUDE_IN_SERVICE_DOCUMENT = 'IncludeInServiceDocument';
+    static ATTRIBUTE_ABSTRACT = 'Abstract';
+    static ATTRIBUTE_UNDERLYING_TYPE = 'UnderlyingType';
+    static ATTRIBUTE_IS_FLAGS = 'IsFlags';
+    static ATTRIBUTE_EXTENDS = 'Extends';
+    static ATTRIBUTE_BASE_TERM = 'BaseTerm';
+    static ATTRIBUTE_APPLIES_TO = 'AppliesTo';
+    document;
     constructor(xml) {
         try {
             const parser = new DOMParser();
@@ -8523,7 +9338,7 @@ class ODataMetadataParser {
             new Field(ODataMetadataParser.TAG_INCLUDE, FieldType.TAG),
             new Field(ODataMetadataParser.TAG_INCLUDE_ANNOTATIONS, FieldType.TAG),
             new Field(ODataMetadataParser.TAG_ANNOTATION, FieldType.TAG),
-        ]).map((t) => new CsdlReference(t));
+        ]);
         const dataServices = this.document.documentElement.getElementsByTagName(ODataMetadataParser.TAG_DATA_SERVICES)[0];
         const schemas = this.getObjects(dataServices, ODataMetadataParser.TAG_SCHEMA, [
             new Field(ODataMetadataParser.ATTRIBUTE_NAMESPACE, FieldType.ATTRIBUTE),
@@ -8537,7 +9352,7 @@ class ODataMetadataParser {
             new Field(ODataMetadataParser.TAG_TYPE_DEFINITION, FieldType.TAG),
             new Field(ODataMetadataParser.TAG_TERM, FieldType.TAG),
             new Field(ODataMetadataParser.TAG_ANNOTATIONS, FieldType.TAG),
-        ]).map((s) => new CsdlSchema(s));
+        ]);
         return new ODataMetadata(version, references, schemas);
     }
     checkVersion(document) {
@@ -9108,11 +9923,6 @@ class ODataSingletonResource extends ODataResource {
     fetchEntity(options) {
         return this.fetch(options).pipe(map(({ entity }) => entity));
     }
-    /**
-     * Fetch an existing entity and return a model.
-     * @param options The options for the request.
-     * @returns Observable of the entity.
-     */
     fetchModel(options) {
         return this.fetch(options).pipe(map(({ entity, annots }) => entity
             ? this.asModel(entity, { annots, ModelType: options?.ModelType })
@@ -9121,6 +9931,9 @@ class ODataSingletonResource extends ODataResource {
 }
 
 class ODataAnnotations {
+    helper;
+    annotations;
+    context;
     constructor(helper, annotations = new Map(), context) {
         this.helper = helper;
         this.annotations = annotations;
@@ -9190,6 +10003,7 @@ class ODataEntityAnnotations extends ODataAnnotations {
     get mediaContentType() {
         return this.helper.mediaContentType(this.annotations);
     }
+    _properties;
     get properties() {
         if (this._properties === undefined) {
             this._properties = this.helper.properties(this.annotations);
@@ -9202,6 +10016,7 @@ class ODataEntityAnnotations extends ODataAnnotations {
             ? new ODataEntitiesAnnotations(this.helper, props)
             : new ODataEntityAnnotations(this.helper, props);
     }
+    _functions;
     get functions() {
         if (this._functions === undefined) {
             this._functions = this.helper.functions(this.annotations);
@@ -9246,6 +10061,7 @@ class ODataEntitiesAnnotations extends ODataAnnotations {
         let match = (this.nextLink || '').match(/[&?]{1}\$skiptoken=([\d\w\s'\-]+)/);
         return match !== null ? match[1] : undefined;
     }
+    _functions;
     get functions() {
         if (this._functions === undefined) {
             this._functions = this.helper.functions(this.annotations);
@@ -9261,6 +10077,16 @@ class ODataEntitiesAnnotations extends ODataAnnotations {
 }
 
 class ODataResponseOptions {
+    version;
+    streaming;
+    // OData
+    metadata;
+    ieee754Compatible;
+    // Location
+    location;
+    // Cache
+    cacheability;
+    maxAge;
     constructor(config) {
         this.version = config.version || DEFAULT_VERSION;
     }
@@ -9318,6 +10144,8 @@ class ODataResponseOptions {
  * OData Response
  */
 class ODataResponse extends HttpResponse {
+    api;
+    resource;
     constructor(init) {
         super(init);
         this.api = init.api;
@@ -9357,6 +10185,7 @@ class ODataResponse extends HttpResponse {
             url: this.url,
         };
     }
+    _options;
     get options() {
         if (this._options === undefined) {
             this._options = new ODataResponseOptions(this.api.options.parserOptions);
@@ -9387,6 +10216,7 @@ class ODataResponse extends HttpResponse {
         }
         return this._options;
     }
+    _payload;
     get payload() {
         if (this._payload === undefined) {
             this._payload =
@@ -9396,12 +10226,14 @@ class ODataResponse extends HttpResponse {
         }
         return this._payload;
     }
+    _context;
     get context() {
         if (this._context === undefined) {
             this._context = this.options.helper.context(Types.isPlainObject(this.payload) ? this.payload : {});
         }
         return this._context;
     }
+    _annotations;
     get annotations() {
         if (this._annotations === undefined) {
             const options = this.options;
@@ -9482,61 +10314,14 @@ class ODataResponse extends HttpResponse {
     }
 }
 
-class ODataInStorageCache extends ODataCache {
-    constructor({ name, storage = sessionStorage, timeout, }) {
-        super({ timeout });
-        this.name = name;
-        this.storage = storage;
-        this.restore();
-        window.addEventListener('beforeunload', () => this.store());
-    }
-    /**
-     * Store the cache in the storage
-     */
-    store() {
-        this.storage.setItem(this.name, JSON.stringify(Array.from(this.entries.entries())));
-    }
-    /**
-     * Restore the cache from the storage
-     */
-    restore() {
-        this.entries = new Map(JSON.parse(this.storage.getItem(this.name) || '[]'));
-    }
-    /**
-     * Flush the cache and clean the storage
-     */
-    flush() {
-        super.flush();
-        this.store();
-    }
-    /**
-     * 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.toJson(), {
-            timeout: 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 !== undefined ? ODataResponse.fromJson(req, data) : undefined;
-    }
-}
-
 class ODataCollection {
-    static { this.model = null; }
+    static model = null;
+    _parent = null;
+    _resource = null;
+    _resources = [];
+    _annotations;
+    _entries = [];
+    _model;
     models() {
         return this._entries
             .filter((e) => e.state !== ODataModelState.Removed)
@@ -9545,12 +10330,9 @@ class ODataCollection {
     get length() {
         return this.models().length;
     }
+    //Events
+    events$;
     constructor(entities = [], { parent, resource, annots, model, reset = false, } = {}) {
-        this._parent = null;
-        this._resource = null;
-        this._resources = [];
-        this._entries = [];
-        this._sortBy = null;
         const Klass = this.constructor;
         if (!model && Klass.model !== null)
             model = Klass.model;
@@ -10316,19 +11098,20 @@ class ODataCollection {
             result = 1;
         else if (value1 == null && value2 == null)
             result = 0;
-        else if (typeof value1 == 'string' || value1 instanceof String) {
-            if (value1.localeCompare && value1 != value2) {
-                return (by[index].order || 1) * value1.localeCompare(value2);
-            }
-        }
+        else if ((typeof value1 == 'string' || value1 instanceof String) &&
+            value1.localeCompare &&
+            value1 != value2)
+            result = value1.localeCompare(value2);
+        else if (value1 == value2)
+            return by.length - 1 > index ? this._compare(e1, e2, by, index + 1) : 0;
+        else if (by[index].comparator !== undefined)
+            result = by[index].comparator(value1, value2);
         else {
             result = value1 < value2 ? -1 : 1;
         }
-        if (value1 == value2) {
-            return by.length - 1 > index ? this._compare(e1, e2, by, index + 1) : 0;
-        }
-        return (by[index].order || 1) * result;
+        return (by[index].order ?? 1) * result;
     }
+    _sortBy = null;
     isSorted() {
         return this._sortBy !== null;
     }
@@ -10342,6 +11125,18 @@ class ODataCollection {
 }
 
 class ODataModel {
+    // Properties
+    static options;
+    static meta;
+    // Parent
+    _parent = null;
+    _resource = null;
+    _resources = [];
+    _attributes = new Map();
+    _annotations;
+    _meta;
+    // Events
+    events$;
     static buildMetaOptions({ config, structuredType, }) {
         if (config === undefined) {
             const fields = structuredType
@@ -10367,11 +11162,6 @@ class ODataModel {
         return new ODataModelOptions({ config, structuredType });
     }
     constructor(data = {}, { parent, resource, annots, reset = false, } = {}) {
-        // Parent
-        this._parent = null;
-        this._resource = null;
-        this._resources = [];
-        this._attributes = new Map();
         const Klass = this.constructor;
         if (Klass.meta === undefined)
             throw new Error(`Model: Can't create model without metadata`);
@@ -10429,7 +11219,7 @@ class ODataModel {
         return field.resourceFactory(resource);
     }
     attach(resource) {
-        return this._meta.attach(this, resource);
+        this._meta.attach(this, resource);
     }
     //#endregion
     schema() {
@@ -10460,6 +11250,8 @@ class ODataModel {
             resolve,
         });
     }
+    // Validation
+    _errors;
     validate({ method, navigation = false, } = {}) {
         return this._meta.validate(this, { method, navigation });
     }
@@ -10658,7 +11450,7 @@ class ODataModel {
      */
     query(ctx) {
         const resource = this.resource();
-        return (resource ? this._meta.query(this, resource, ctx) : this);
+        return resource ? this._meta.query(this, resource, ctx) : this;
     }
     /**
      * Perform a check on the internal state of the model and return true if the model is changed.
@@ -10730,8 +11522,6 @@ class ODataModel {
                 return this._request(action.call(params, { responseType, ...options }), (resp) => resp);
         }
     }
-    //#endregion
-    // Cast
     cast(type, ModelType) {
         //: ODataModel<S> {
         const resource = this.resource();
@@ -10783,6 +11573,23 @@ class ODataModel {
             });
         }
     }
+    /*
+    getAttribute<P>(
+      name: keyof T,
+    ): (P extends (infer U)[] ? ODataCollection<U, ODataModel<U> & ModelInterface<U>> :
+        P extends ArrayBufferLike ? ArrayBuffer :
+        P extends Date ? Date :
+        P extends object ? ODataModel<P> & ModelInterface<P> : P ) | null;
+    getAttribute<M extends ODataModel<keyof T>>(
+      name: keyof T,
+    ): M | null;
+    getAttribute<C extends ODataCollection<keyof T, ODataModel<keyof T>>>(
+      name: keyof T,
+    ): C | null;
+    getAttribute<P>(
+      name: keyof T,
+    ) {
+    */
     getAttribute(name) {
         const field = this._meta.findField(name);
         if (!field)
@@ -10903,6 +11710,10 @@ var ODataModelEventType;
     ODataModelEventType["Attach"] = "attach";
 })(ODataModelEventType || (ODataModelEventType = {}));
 class ODataModelEvent {
+    type;
+    value;
+    previous;
+    options;
     constructor(type, { model, collection, previous, value, attr, options, bubbles, chain, } = {}) {
         this.type = type;
         this.model = model;
@@ -10918,6 +11729,7 @@ class ODataModelEvent {
         ];
         this.bubbles = bubbles ?? BUBBLES.indexOf(this.type) !== -1;
     }
+    chain;
     push(model, attr) {
         return new ODataModelEvent(this.type, {
             model: this.model ?? (model instanceof ODataModel ? model : undefined),
@@ -10935,6 +11747,7 @@ class ODataModelEvent {
             chain: [[model, attr], ...this.chain],
         });
     }
+    bubbles;
     stopPropagation() {
         this.bubbles = false;
     }
@@ -10956,11 +11769,15 @@ class ODataModelEvent {
                 : '')
             .join('');
     }
+    //Reference to the model which the event was dispatched
+    model;
     //Identifies the current model for the event
     get currentModel() {
         const link = this.chain.find((c) => ODataModelOptions.isModel(c[0]));
         return link !== undefined ? link[0] : undefined;
     }
+    //Reference to the collection which the event was dispatched
+    collection;
     //Identifies the current collection for the event
     get currentCollection() {
         const link = this.chain.find((c) => ODataModelOptions.isCollection(c[0]));
@@ -10970,6 +11787,8 @@ class ODataModelEvent {
     }
 }
 class ODataModelEventEmitter extends EventEmitter {
+    model;
+    collection;
     constructor({ model, collection, } = {}) {
         super();
         this.model = model;
@@ -11018,7 +11837,8 @@ var ODataModelState;
 (function (ODataModelState) {
     ODataModelState[ODataModelState["Added"] = 0] = "Added";
     ODataModelState[ODataModelState["Removed"] = 1] = "Removed";
-    ODataModelState[ODataModelState["Unchanged"] = 2] = "Unchanged";
+    ODataModelState[ODataModelState["Changed"] = 2] = "Changed";
+    ODataModelState[ODataModelState["Unchanged"] = 3] = "Unchanged";
 })(ODataModelState || (ODataModelState = {}));
 function Model({ cid = CID_FIELD_NAME } = {}) {
     return (constructor) => {
@@ -11043,6 +11863,24 @@ function ModelField({ name, ...options } = {}) {
     };
 }
 class ODataModelField {
+    name;
+    field;
+    parser;
+    options;
+    optionsForType;
+    modelForType;
+    collectionForType;
+    enumForType;
+    structuredForType;
+    default;
+    required;
+    concurrency;
+    maxLength;
+    minLength;
+    min;
+    max;
+    pattern;
+    parserOptions;
     constructor(options, { name, field, parser, ...opts }) {
         this.options = options;
         this.name = name;
@@ -11231,10 +12069,16 @@ class ODataModelField {
     }
 }
 class ODataModelAttribute {
+    _model;
+    _field;
+    state = ODataModelState.Unchanged;
+    value;
+    change;
+    subscription;
+    events$ = new ODataModelEventEmitter();
     constructor(_model, _field) {
         this._model = _model;
         this._field = _field;
-        this.events$ = new ODataModelEventEmitter();
     }
     get type() {
         return this._field.type;
@@ -11261,7 +12105,7 @@ class ODataModelAttribute {
         return this._field.field;
     }
     get() {
-        return this.change !== undefined ? this.change : this.value;
+        return this.state === ODataModelState.Changed ? this.change : this.value;
     }
     set(value, reset = false, reparent = false) {
         const current = this.get();
@@ -11276,13 +12120,14 @@ class ODataModelAttribute {
                 : !Types.isEqual(current, value);
         if (reset) {
             this.value = value;
-            this.change = undefined;
+            this.state = ODataModelState.Unchanged;
         }
         else if (Types.isEqual(value, this.value)) {
-            this.change = undefined;
+            this.state = ODataModelState.Unchanged;
         }
         else if (changed) {
             this.change = value;
+            this.state = ODataModelState.Changed;
         }
         if (ODataModelOptions.isModel(value) ||
             ODataModelOptions.isCollection(value)) {
@@ -11292,7 +12137,7 @@ class ODataModelAttribute {
     }
     isChanged({ include_navigation = false, } = {}) {
         const current = this.get();
-        return (this.change !== undefined ||
+        return (this.state === ODataModelState.Changed ||
             ((ODataModelOptions.isModel(current) ||
                 ODataModelOptions.isCollection(current)) &&
                 current.hasChanged({ include_navigation })));
@@ -11301,7 +12146,7 @@ class ODataModelAttribute {
         if (ODataModelOptions.isModel(this.change) ||
             ODataModelOptions.isCollection(this.change))
             this.unlink(this.change);
-        this.change = undefined;
+        this.state = ODataModelState.Unchanged;
         if (ODataModelOptions.isModel(this.value) ||
             ODataModelOptions.isCollection(this.value))
             this.link(this.value);
@@ -11321,16 +12166,17 @@ class ODataModelAttribute {
     }
 }
 class ODataModelOptions {
+    name;
+    cid;
+    base;
+    _fields = [];
+    structuredType;
+    entitySet;
+    // Hierarchy
+    parent;
+    children = [];
+    events$ = new ODataModelEventEmitter();
     constructor({ config, structuredType, }) {
-        this._fields = [];
-        this.children = [];
-        this.events$ = new ODataModelEventEmitter();
-        this.tsToEdm = {
-            string: EdmType.String,
-            number: EdmType.Int32,
-            bigint: EdmType.Int64,
-            boolean: EdmType.Boolean,
-        };
         this.name = structuredType.name;
         this.base = structuredType.base;
         this.structuredType = structuredType;
@@ -11441,6 +12287,12 @@ class ODataModelOptions {
         this._fields.push(modelField);
         return modelField;
     }
+    tsToEdm = {
+        string: EdmType.String,
+        number: EdmType.Int32,
+        bigint: EdmType.Int64,
+        boolean: EdmType.Boolean,
+    };
     modelFieldFactory(self, name, type) {
         const structuredFieldParser = this.structuredType.addField(name, {
             type,
@@ -11694,8 +12546,7 @@ class ODataModelOptions {
     hasChanged(self, { include_navigation = false } = {}) {
         return [...self._attributes.values()]
             .filter((attr) => !attr.navigation || include_navigation)
-            .some((attr) => (!include_navigation || attr.navigation) &&
-            attr.isChanged({ include_navigation }));
+            .some((attr) => attr.isChanged({ include_navigation }));
     }
     hasKey(self) {
         return this.resolveKey(self) !== undefined;
@@ -11908,7 +12759,9 @@ class ODataModelOptions {
             if ((attr.navigation && value === null) ||
                 ODataModelOptions.isModel(value)) {
                 // Check for reference
-                const referenced = this.resolveReferenced(self, attr);
+                const referenced = this.resolveReferenced(self, attr, {
+                    resolve: false,
+                });
                 if (value !== null && referenced !== null && referenced !== undefined) {
                     value.assign(referenced, {
                         silent: true,
@@ -12018,7 +12871,9 @@ class ODataModelOptions {
             // Resolve referentials
             if (!ODataModelOptions.isCollection(attr.get())) {
                 const meta = this.api.optionsForType(modelField.type);
-                const ref = meta?.resolveReferential(attr.get(), attr);
+                const ref = meta?.resolveReferential(attr.get(), attr, {
+                    resolve: false,
+                });
                 if (ref !== null && ref !== undefined) {
                     Object.assign(self, ref);
                 }
@@ -12057,8 +12912,63 @@ class ODataModelOptions {
 }
 
 class ODataApiOptions {
+    /**
+     * Default OData version
+     */
+    version;
+    /**
+     * Send enum as string in the request
+     */
+    stringAsEnum;
+    /**
+     * Delete reference by path or by id
+     */
+    deleteRefBy;
+    /**
+     * No use parenthesis for empty parameters functions
+     */
+    nonParenthesisForEmptyParameterFunction;
+    /**
+     * Strip metadata from the response
+     */
+    stripMetadata;
+    /**
+     * Use JSON Batch Format
+     */
+    jsonBatchFormat;
+    /**
+     * Relative urls
+     * http://docs.oasis-open.org/odata/odata-json-format/v4.0/cs01/odata-json-format-v4.0-cs01.html#_Toc365464682
+     */
+    relativeUrls;
+    /**
+     * Cache fetch policy
+     */
+    fetchPolicy;
+    /**
+     * Extra params to be sent in the request
+     */
+    params;
+    /**
+     * Extra headers to be sent in the request
+     */
+    headers;
+    /**
+     * Http request with credentials
+     */
+    withCredentials;
+    /**
+     * Send query options in the request body
+     */
+    bodyQueryOptions;
+    /**
+     * Customize accept header with OData options
+     * @link http://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html#sec_RequestingtheJSONFormat
+     */
+    accept;
+    etag = { ifMatch: true, ifNoneMatch: false };
+    prefer;
     constructor(config) {
-        this.etag = { ifMatch: true, ifNoneMatch: false };
         this.version = config.version || DEFAULT_VERSION;
         this.stringAsEnum = config.stringAsEnum || false;
         this.params = config.params || {};
@@ -12094,32 +13004,41 @@ class ODataApiOptions {
  * Api abstraction for consuming OData services.
  */
 class ODataApi {
+    requester;
+    serviceRootUrl;
+    metadataUrl;
+    name;
+    version;
+    default;
+    creation;
+    // Options
+    options;
+    // Cache
+    cache;
+    // Error Handler
+    errorHandler;
+    // Base Parsers
+    parsers;
+    // Schemas
+    schemas;
     constructor(config) {
-        //# region Find by Type
-        // Memoize
-        this.memo = {
-            enumTypes: new Map(),
-            structuredTypes: new Map(),
-            callables: new Map(),
-            entitySets: new Map(),
-            singletons: new Map(),
-            parsers: new Map(),
-            options: new Map(),
-        };
         this.serviceRootUrl = config.serviceRootUrl;
-        if (this.serviceRootUrl.indexOf('?') != -1)
+        if (this.serviceRootUrl.includes('?'))
             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 = `${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;
         this.creation = config.creation ?? new Date();
-        this.options = new ODataApiOptions(Object.assign({ version: this.version }, config.options || {}));
-        this.cache = config.cache || new ODataInMemoryCache();
+        this.options = new ODataApiOptions({
+            ...config.options,
+            version: this.version,
+        });
+        this.cache = config.cache;
         this.errorHandler = config.errorHandler;
-        this.parsers = new Map(Object.entries(config.parsers || EDM_PARSERS));
+        this.parsers = new Map(Object.entries(config.parsers ?? EDM_PARSERS));
         this.schemas = (config.schemas ?? []).map((schema) => new ODataSchema(schema, this));
     }
     configure(settings = {}) {
@@ -12262,7 +13181,9 @@ class ODataApi {
         if (options.observe === 'events') {
             return res$;
         }
-        res$ = this.cache.handleRequest(req, res$);
+        if (this.cache !== undefined) {
+            res$ = this.cache.handleRequest(req, res$);
+        }
         switch (options.observe || 'body') {
             case 'body':
                 switch (options.responseType) {
@@ -12286,6 +13207,17 @@ class ODataApi {
                 throw new Error(`Unreachable: unhandled observe type ${options.observe}}`);
         }
     }
+    //# region Find by Type
+    // Memoize
+    memo = {
+        enumTypes: new Map(),
+        structuredTypes: new Map(),
+        callables: new Map(),
+        entitySets: new Map(),
+        singletons: new Map(),
+        parsers: new Map(),
+        options: new Map(),
+    };
     createSchema(config) {
         const schema = new ODataSchema(config, this);
         schema.configure({
@@ -12433,7 +13365,7 @@ class ODataApi {
         if (model === undefined)
             model = this.createModel(structured);
         const Collection = class extends ODataCollection {
-            static { this.model = model; }
+            static model = model;
         };
         structured.collection = Collection;
         return Collection;
@@ -12500,6 +13432,7 @@ class ODataApi {
 }
 
 class ODataSettings {
+    apis;
     constructor(configs) {
         this.apis = configs.map((config) => new ODataApi(config));
         if (this.apis.length > 1) {
@@ -12613,6 +13546,7 @@ class ODataSettings {
 class ODataConfigLoader {
 }
 class ODataConfigSyncLoader {
+    passedConfigs;
     constructor(passedConfigs) {
         this.passedConfigs = passedConfigs;
     }
@@ -12623,6 +13557,7 @@ class ODataConfigSyncLoader {
     }
 }
 class ODataConfigAsyncLoader {
+    configs$;
     constructor(configs$) {
         this.configs$ = configs$;
     }
@@ -12635,6 +13570,8 @@ class ODataConfigAsyncLoader {
     }
 }
 class ODataMetadataLoader {
+    sources$;
+    baseConfigs;
     constructor(sources$, baseConfigs) {
         this.sources$ = sources$;
         this.baseConfigs = baseConfigs;
@@ -12661,6 +13598,9 @@ function addBody(options, body) {
     };
 }
 class ODataClient {
+    http;
+    loader;
+    settings;
     constructor(http, loader) {
         this.http = http;
         this.loader = loader;
@@ -12845,14 +13785,17 @@ class ODataClient {
     put(resource, body, options = {}) {
         return this.request('PUT', resource, addBody(options, body));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataClient }); }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataClient });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataClient, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: ODataConfigLoader }] });
 
 class ODataBaseService {
+    client;
+    name;
+    apiNameOrEntityType;
     constructor(client, name, apiNameOrEntityType) {
         this.client = client;
         this.name = name;
@@ -12893,15 +13836,21 @@ class ODataEntityService extends ODataBaseService {
 }
 
 class ODataEntitySetService extends ODataEntityService {
-    model(entity) {
+    static Model;
+    static Collection;
+    model(entity, reset) {
         const Service = this.constructor;
-        return this.entity().asModel(entity, {
+        return this.entity().asModel((entity ?? {}), {
+            reset,
             ModelType: Service.Model,
         });
     }
-    collection(entities) {
+    collection(entities, reset) {
         const Service = this.constructor;
-        return this.entities().asCollection(entities, { CollectionType: Service.Collection });
+        return this.entities().asCollection((entities ?? []), {
+            reset,
+            CollectionType: Service.Collection,
+        });
     }
     /**
      * Get the entity set resource for this service.
@@ -13047,9 +13996,10 @@ class ODataEntitySetService extends ODataEntityService {
  * www.odata.org/getting-started/advanced-tutorial/#singleton
  */
 class ODataSingletonService extends ODataEntityService {
+    static Model;
     model(entity) {
         const Service = this.constructor;
-        return this.entity().asModel(entity, {
+        return this.entity().asModel((entity ?? {}), {
             ModelType: Service.Model,
         });
     }
@@ -13096,6 +14046,7 @@ class ODataSingletonService extends ODataEntityService {
 }
 
 class ODataServiceFactory {
+    client;
     constructor(client) {
         this.client = client;
     }
@@ -13106,11 +14057,8 @@ class ODataServiceFactory {
      */
     entitySet(entitySetName, apiNameOrEntityType, options = {}) {
         const Service = class extends ODataEntitySetService {
-            constructor() {
-                super(...arguments);
-                this.Model = options?.Model;
-                this.Collection = options?.Collection;
-            }
+            Model = options?.Model;
+            Collection = options?.Collection;
         };
         return new Service(this.client, entitySetName, apiNameOrEntityType);
     }
@@ -13120,17 +14068,14 @@ class ODataServiceFactory {
      */
     singleton(singletonName, apiNameOrEntityType, options = {}) {
         const Service = class extends ODataSingletonService {
-            constructor() {
-                super(...arguments);
-                this.Model = options?.Model;
-            }
+            Model = options?.Model;
         };
         return new Service(this.client, singletonName, apiNameOrEntityType);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataServiceFactory }); }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataServiceFactory });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataServiceFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: ODataClient }] });
 
@@ -13170,11 +14115,11 @@ class ODataModule {
             ],
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.7", ngImport: i0, type: ODataModule, imports: [CommonModule, HttpClientModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule, HttpClientModule] }); }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.12", ngImport: i0, type: ODataModule, imports: [CommonModule, HttpClientModule] });
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule, HttpClientModule] });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.7", ngImport: i0, type: ODataModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [CommonModule, HttpClientModule],
@@ -13182,6 +14127,263 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.7", ngImpor
                 }]
         }] });
 
+class ODataBaseCache {
+    timeout;
+    entries;
+    constructor({ timeout = DEFAULT_TIMEOUT }) {
+        this.timeout = timeout;
+        this.entries = new Map();
+    }
+    /**
+     * 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
+     * @returns Array of string to identify the scope of the request
+     */
+    scope(req) {
+        const segments = req.resource.cloneSegments();
+        return segments.segments({ key: true }).reduce((acc, s) => {
+            if (s.name === PathSegment.entitySet)
+                acc = [...acc, s.path()];
+            return acc;
+        }, ['request']);
+    }
+    /**
+     * Using the odata context on the response build an array of string to identify the tags of the response
+     * @param res The response to build the tags
+     * @returns Array of string to identify the tags of the response
+     */
+    tags(res) {
+        const tags = [];
+        const context = res.context;
+        if (context.entitySet) {
+            tags.push(context.key
+                ? `${context.entitySet}(${context.key})`
+                : context.entitySet);
+        }
+        if (context.type)
+            tags.push(context.type);
+        return tags;
+    }
+    /**
+     * Build an entry from a payload and some options
+     * @param payload The payload to store in the cache
+     * @param timeout The timeout for the entry
+     * @param tags The tags for the entry
+     * @returns The entry to store in the cache
+     */
+    buildEntry(payload, { timeout, tags }) {
+        return {
+            payload,
+            lastRead: Date.now(),
+            timeout: timeout || this.timeout,
+            tags: tags || [],
+        };
+    }
+    /**
+     * Build a key from store an entry in the cache
+     * @param names The names of the entry
+     * @returns The key for the entry
+     */
+    buildKey(names) {
+        return names.join(CACHE_KEY_SEPARATOR);
+    }
+    /**
+     * Put some payload in the cache
+     * @param name The name for the entry
+     * @param payload The payload to store in the cache
+     * @param timeout The timeout for the entry
+     * @param scope The scope for the entry
+     * @param tags The tags for the entry
+     */
+    put(name, payload, { timeout, scope, tags, } = {}) {
+        const entry = this.buildEntry(payload, { timeout, tags });
+        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
+     * @param name The name of the entry
+     * @param scope The scope of the entry
+     * @returns The payload of the entry
+     */
+    get(name, { scope } = {}) {
+        const key = this.buildKey([...(scope || []), name]);
+        const entry = this.entries.get(key);
+        return entry !== undefined && !this.isExpired(entry)
+            ? entry.payload
+            : undefined;
+    }
+    /**
+     * Remove all cache entries that are matching with the given options
+     * @param options The options to forget
+     */
+    forget({ name, scope = [], tags = [], } = {}) {
+        if (name !== undefined)
+            scope.push(name);
+        const key = scope.length > 0 ? this.buildKey(scope) : undefined;
+        this.entries.forEach((entry, 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.entries.delete(k);
+            }
+        });
+    }
+    /**
+     * Remove all cache entries
+     */
+    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.lastRead < Date.now() - (entry.timeout || this.timeout) * 1000;
+    }
+    /**
+     * Using the request, handle the fetching of the response
+     * @param req The request to fetch
+     * @param res$ Observable of the response
+     * @returns
+     */
+    handleRequest(req, res$) {
+        return req.isFetch()
+            ? this.handleFetch(req, res$)
+            : req.isMutate()
+                ? this.handleMutate(req, res$)
+                : res$;
+    }
+    handleFetch(req, res$) {
+        const policy = req.fetchPolicy;
+        const cached = this.getResponse(req);
+        if (policy === 'no-cache') {
+            return res$;
+        }
+        if (policy === 'cache-only') {
+            if (cached) {
+                return of(cached);
+            }
+            else {
+                return throwError(() => new Error('No Cached'));
+            }
+        }
+        if (policy === 'cache-first' ||
+            policy === 'cache-and-network' ||
+            policy === 'network-only') {
+            res$ = res$.pipe(tap((res) => {
+                if (res.options.cacheability !== 'no-store')
+                    this.putResponse(req, res);
+            }));
+        }
+        return cached !== undefined && policy !== 'network-only'
+            ? policy === 'cache-and-network'
+                ? res$.pipe(startWith(cached))
+                : of(cached)
+            : res$;
+    }
+    handleMutate(req, res$) {
+        const requests = req.isBatch()
+            ? req.resource
+                .requests()
+                .filter((r) => r.isMutate())
+            : [req];
+        for (var r of requests) {
+            const scope = this.scope(r);
+            this.forget({ scope });
+        }
+        return res$;
+    }
+}
+
+class ODataInMemoryCache extends ODataBaseCache {
+    constructor({ timeout } = {}) {
+        super({ timeout });
+    }
+    /**
+     * 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, {
+            timeout: 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 });
+    }
+}
+
+class ODataInStorageCache extends ODataBaseCache {
+    name;
+    storage;
+    constructor({ name, storage = sessionStorage, timeout, }) {
+        super({ timeout });
+        this.name = name;
+        this.storage = storage;
+        this.restore();
+        window.addEventListener('beforeunload', () => this.store());
+    }
+    /**
+     * Store the cache in the storage
+     */
+    store() {
+        this.storage.setItem(this.name, JSON.stringify(Array.from(this.entries.entries())));
+    }
+    /**
+     * Restore the cache from the storage
+     */
+    restore() {
+        this.entries = new Map(JSON.parse(this.storage.getItem(this.name) || '[]'));
+    }
+    /**
+     * Flush the cache and clean the storage
+     */
+    flush() {
+        super.flush();
+        this.store();
+    }
+    /**
+     * 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.toJson(), {
+            timeout: 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 !== undefined ? ODataResponse.fromJson(req, data) : undefined;
+    }
+}
+
 /*
  * Public API Surface of angular-odata
  */
@@ -13190,5 +14392,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.7", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, 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, JsonType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataApi, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCache, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, 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, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingleton, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataSyntax, 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, syntax, transformations };
+export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, 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, JsonType, 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, ODataSyntax, 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, syntax, transformations };
 //# sourceMappingURL=angular-odata.mjs.map