angular-odata 0.130.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,2177 +219,1975 @@ const DESCRIPTION = /.*Description$/;
 const LONG_DESCRIPTION = /.*LongDescription$/;
 const OPTIONARL_PARAMETER = /.*OptionalParameter$/;
 
-class ODataCache {
-    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 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 });
-    }
-}
-
-const COMPARISON_OPERATORS = ['eq', 'ne', 'gt', 'ge', 'lt', 'le'];
-const LOGICAL_OPERATORS = ['and', 'or', 'not'];
-const COLLECTION_OPERATORS = ['any', 'all'];
-const BOOLEAN_FUNCTIONS = ['startswith', 'endswith', 'contains'];
-const SUPPORTED_EXPAND_PROPERTIES = [
-    'expand',
-    'levels',
-    'select',
-    'top',
-    'count',
-    'orderby',
-    'filter',
-];
-const FUNCTION_REGEX = /\((.*)\)/;
-const INDEXOF_REGEX = /(?!indexof)\((\w+)\)/;
-var StandardAggregateMethods;
-(function (StandardAggregateMethods) {
-    StandardAggregateMethods["sum"] = "sum";
-    StandardAggregateMethods["min"] = "min";
-    StandardAggregateMethods["max"] = "max";
-    StandardAggregateMethods["average"] = "average";
-    StandardAggregateMethods["countdistinct"] = "countdistinct";
-})(StandardAggregateMethods || (StandardAggregateMethods = {}));
-var QueryCustomTypes;
-(function (QueryCustomTypes) {
-    QueryCustomTypes[QueryCustomTypes["Raw"] = 0] = "Raw";
-    QueryCustomTypes[QueryCustomTypes["Alias"] = 1] = "Alias";
-    QueryCustomTypes[QueryCustomTypes["Duration"] = 2] = "Duration";
-    QueryCustomTypes[QueryCustomTypes["Binary"] = 3] = "Binary";
-})(QueryCustomTypes || (QueryCustomTypes = {}));
-//https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_QueryOptions
-const raw = (value) => ({
-    type: QueryCustomTypes.Raw,
-    value,
-});
-const alias = (value, name) => ({
-    type: QueryCustomTypes.Alias,
-    value,
-    name,
-});
-const duration = (value) => ({
-    type: QueryCustomTypes.Duration,
-    value,
-});
-const binary = (value) => ({
-    type: QueryCustomTypes.Binary,
-    value,
-});
-const isQueryCustomType = (value) => typeof value === 'object' &&
-    'type' in value &&
-    value.type in QueryCustomTypes;
-const isRawType = (value) => isQueryCustomType(value) &&
-    value.type === QueryCustomTypes.Raw;
-const ITEM_ROOT = '';
-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,
-        skiptoken,
-        format,
-        top,
-        skip,
-        filter,
-        transform,
-        compute,
-        orderBy,
-        key,
-        count,
-        expand,
-        action,
-        func,
-        aliases,
-        escape,
-    });
-    return buildUrl(path, params);
-}
-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 = {};
-    // key is not (null, undefined)
-    if (key != undefined) {
-        path += `(${normalizeValue(key, { aliases, escape })})`;
-    }
-    // Select
-    if (select) {
-        query.$select = isRawType(select)
-            ? select.value
-            : Array.isArray(select)
-                ? select.join(',')
-                : select;
-    }
-    // Compute
-    if (compute) {
-        query.$compute = isRawType(compute)
-            ? compute.value
-            : Array.isArray(compute)
-                ? compute.join(',')
-                : compute;
-    }
-    // Search
-    if (search) {
-        query.$search = search;
-    }
-    // Skiptoken
-    if (skiptoken) {
-        query.$skiptoken = skiptoken;
-    }
-    // Format
-    if (format) {
-        query.$format = format;
-    }
-    // Filter
-    if (filter || typeof count === 'object') {
-        query.$filter = buildFilter(typeof count === 'object' ? count : filter, {
-            aliases,
-            escape,
-        });
-    }
-    // Transform
-    if (transform) {
-        query.$apply = buildTransforms(transform, { aliases, escape });
-    }
-    // Apply
-    if (apply) {
-        query.$apply = query.$apply
-            ? query.$apply + '/' + buildApply(apply, { aliases, escape })
-            : buildApply(apply, { aliases, escape });
-    }
-    // Expand
-    if (expand) {
-        query.$expand = buildExpand(expand, { aliases, escape });
-    }
-    // OrderBy
-    if (orderBy) {
-        query.$orderby = buildOrderBy(orderBy);
-    }
-    // Count
-    if (isRawType(count)) {
-        query.$count = count.value;
-    }
-    else if (typeof count === 'boolean') {
-        query.$count = true;
-    }
-    else if (count) {
-        path += '/$count';
-    }
-    // Top
-    if (isRawType(top)) {
-        query.$top = top.value;
-    }
-    else if (typeof top === 'number') {
-        query.$top = top;
-    }
-    // Skip
-    if (isRawType(skip)) {
-        query.$top = skip.value;
-    }
-    else if (typeof skip === 'number') {
-        query.$skip = skip;
-    }
-    if (action) {
-        path += `/${action}`;
-    }
-    if (func) {
-        if (typeof func === 'string') {
-            path += `/${func}()`;
-        }
-        else if (typeof func === 'object') {
-            const [funcName] = Object.keys(func);
-            const funcArgs = normalizeValue(func[funcName], {
-                aliases,
-                escape,
-            });
-            path += `/${funcName}(${funcArgs})`;
-        }
-    }
-    if (aliases.length > 0) {
-        Object.assign(query, aliases.reduce((acc, alias) => Object.assign(acc, {
-            [`@${alias.name}`]: normalizeValue(alias.value, {
-                escape,
-            }),
-        }), {}));
-    }
-    // Filter empty values
-    const params = Object.entries(query)
-        .filter(([, value]) => value !== undefined && value !== '')
-        .reduce((acc, [key, value]) => Object.assign(acc, { [key]: value }), {});
-    return [path, params];
-}
-function renderPrimitiveValue(key, val, { aliases, escape, }) {
-    return `${key} eq ${normalizeValue(val, { aliases, escape })}`;
-}
-function buildFilter(filters = {}, { aliases, propPrefix, escape, }) {
-    return (Array.isArray(filters) ? filters : [filters]).reduce((acc, filter) => {
-        if (filter) {
-            const builtFilter = buildFilterCore(filter, {
-                aliases,
-                propPrefix,
-                escape,
-            });
-            if (builtFilter) {
-                acc.push(builtFilter);
-            }
-        }
-        return acc;
-    }, []).join(' and ');
-    function buildFilterCore(filter = {}, { aliases, propPrefix, escape, }) {
-        let filterExpr = '';
-        if (isRawType(filter)) {
-            // Use raw query custom filter string
-            filterExpr = filter.value;
-        }
-        else if (typeof filter === 'string') {
-            // Use raw filter string
-            filterExpr = filter;
-        }
-        else if (filter && typeof filter === 'object') {
-            const filtersArray = Object.keys(filter).reduce((result, filterKey) => {
-                const value = filter[filterKey];
-                let propName = '';
-                if (propPrefix) {
-                    if (filterKey === ITEM_ROOT) {
-                        propName = propPrefix;
-                    }
-                    else if (INDEXOF_REGEX.test(filterKey)) {
-                        propName = filterKey.replace(INDEXOF_REGEX, (_, $1) => $1.trim() === ITEM_ROOT
-                            ? `(${propPrefix})`
-                            : `(${propPrefix}/${$1.trim()})`);
-                    }
-                    else if (FUNCTION_REGEX.test(filterKey)) {
-                        propName = filterKey.replace(FUNCTION_REGEX, (_, $1) => $1.trim() === ITEM_ROOT
-                            ? `(${propPrefix})`
-                            : `(${propPrefix}/${$1.trim()})`);
-                    }
-                    else {
-                        propName = `${propPrefix}/${filterKey}`;
-                    }
-                }
-                else {
-                    propName = filterKey;
-                }
-                if (filterKey === ITEM_ROOT && Array.isArray(value)) {
-                    return result.concat(value.map((arrayValue) => renderPrimitiveValue(propName, arrayValue, { escape, aliases })));
-                }
-                if (['number', 'string', 'boolean'].indexOf(typeof value) !== -1 ||
-                    value instanceof Date ||
-                    value === null) {
-                    // Simple key/value handled as equals operator
-                    result.push(renderPrimitiveValue(propName, value, { aliases, escape }));
-                }
-                else if (Array.isArray(value)) {
-                    const op = filterKey;
-                    const builtFilters = value
-                        .map((v) => buildFilter(v, { aliases, propPrefix, escape }))
-                        .filter((f) => f)
-                        .map((f) => LOGICAL_OPERATORS.indexOf(op) !== -1 ? `(${f})` : f);
-                    if (builtFilters.length) {
-                        if (LOGICAL_OPERATORS.indexOf(op) !== -1) {
-                            if (builtFilters.length) {
-                                if (op === 'not') {
-                                    result.push(parseNot(builtFilters));
-                                }
-                                else {
-                                    result.push(`(${builtFilters.join(` ${op} `)})`);
-                                }
-                            }
-                        }
-                        else {
-                            result.push(builtFilters.join(` ${op} `));
-                        }
-                    }
-                }
-                else if (LOGICAL_OPERATORS.indexOf(propName) !== -1) {
-                    const op = propName;
-                    const builtFilters = Object.keys(value).map((valueKey) => buildFilterCore({ [valueKey]: value[valueKey] }, { aliases, escape }));
-                    if (builtFilters.length) {
-                        if (op === 'not') {
-                            result.push(parseNot(builtFilters));
-                        }
-                        else {
-                            result.push(`${builtFilters.join(` ${op} `)}`);
-                        }
-                    }
-                }
-                else if (typeof value === 'object') {
-                    if ('type' in value) {
-                        result.push(renderPrimitiveValue(propName, value, { aliases, escape }));
-                    }
-                    else {
-                        const operators = Object.keys(value);
-                        operators.forEach((op) => {
-                            if (COMPARISON_OPERATORS.indexOf(op) !== -1) {
-                                result.push(`${propName} ${op} ${normalizeValue(value[op], {
-                                    aliases,
-                                    escape,
-                                })}`);
-                            }
-                            else if (LOGICAL_OPERATORS.indexOf(op) !== -1) {
-                                if (Array.isArray(value[op])) {
-                                    result.push(value[op]
-                                        .map((v) => '(' +
-                                        buildFilterCore(v, {
-                                            aliases,
-                                            propPrefix: propName,
-                                            escape,
-                                        }) +
-                                        ')')
-                                        .join(` ${op} `));
-                                }
-                                else {
-                                    result.push('(' +
-                                        buildFilterCore(value[op], {
-                                            aliases,
-                                            propPrefix: propName,
-                                            escape,
-                                        }) +
-                                        ')');
-                                }
-                            }
-                            else if (COLLECTION_OPERATORS.indexOf(op) !== -1) {
-                                const collectionClause = buildCollectionClause(filterKey.toLowerCase(), value[op], op, propName);
-                                if (collectionClause) {
-                                    result.push(collectionClause);
-                                }
-                            }
-                            else if (op === 'has') {
-                                result.push(`${propName} ${op} ${normalizeValue(value[op], {
-                                    aliases,
-                                    escape,
-                                })}`);
-                            }
-                            else if (op === 'in') {
-                                const resultingValues = Array.isArray(value[op])
-                                    ? value[op]
-                                    : value[op].value.map((typedValue) => ({
-                                        type: value[op].type,
-                                        value: typedValue,
-                                    }));
-                                result.push(propName +
-                                    ' in (' +
-                                    resultingValues
-                                        .map((v) => normalizeValue(v, { aliases, escape }))
-                                        .join(',') +
-                                    ')');
-                            }
-                            else if (BOOLEAN_FUNCTIONS.indexOf(op) !== -1) {
-                                // Simple boolean functions (startswith, endswith, contains)
-                                result.push(`${op}(${propName},${normalizeValue(value[op], {
-                                    aliases,
-                                    escape,
-                                })})`);
-                            }
-                            else {
-                                // Nested property
-                                const filter = buildFilterCore(value, {
-                                    aliases,
-                                    propPrefix: propName,
-                                    escape,
-                                });
-                                if (filter) {
-                                    result.push(filter);
-                                }
-                            }
-                        });
-                    }
-                }
-                else if (value === undefined) {
-                    // Ignore/omit filter if value is `undefined`
-                }
-                else {
-                    throw new Error(`Unexpected value type: ${value}`);
-                }
-                return result;
-            }, []);
-            filterExpr = filtersArray.join(' and ');
-        } /* else {
-            throw new Error(`Unexpected filters type: ${filter}`);
-          } */
-        return filterExpr;
-    }
-    function buildCollectionClause(lambdaParameter, value, op, propName) {
-        let clause = '';
-        if (typeof value === 'string' || value instanceof String) {
-            clause = getStringCollectionClause(lambdaParameter, value, op, propName);
-        }
-        else if (value) {
-            // normalize {any:[{prop1: 1}, {prop2: 1}]} --> {any:{prop1: 1, prop2: 1}}; same for 'all',
-            // simple values collection: {any:[{'': 'simpleVal1'}, {'': 'simpleVal2'}]} --> {any:{'': ['simpleVal1', 'simpleVal2']}}; same for 'all',
-            const filterValue = Array.isArray(value)
-                ? value.reduce((acc, item) => {
-                    if (item.hasOwnProperty(ITEM_ROOT)) {
-                        if (!acc.hasOwnProperty(ITEM_ROOT)) {
-                            acc[ITEM_ROOT] = [];
-                        }
-                        acc[ITEM_ROOT].push(item[ITEM_ROOT]);
-                        return acc;
-                    }
-                    return { ...acc, ...item };
-                }, {})
-                : value;
-            const filter = buildFilterCore(filterValue, {
-                aliases,
-                propPrefix: lambdaParameter,
-                escape,
-            });
-            clause = `${propName}/${op}(${filter ? `${lambdaParameter}:${filter}` : ''})`;
-        }
-        return clause;
-    }
-}
-function getStringCollectionClause(lambdaParameter, value, collectionOperator, propName) {
-    let clause = '';
-    const conditionOperator = collectionOperator == 'all' ? 'ne' : 'eq';
-    clause = `${propName}/${collectionOperator}(${lambdaParameter}: ${lambdaParameter} ${conditionOperator} '${value}')`;
-    return clause;
-}
-function escapeIllegalChars(string) {
-    string = string.replace(/%/g, '%25');
-    string = string.replace(/\+/g, '%2B');
-    string = string.replace(/\//g, '%2F');
-    string = string.replace(/\?/g, '%3F');
-    string = string.replace(/#/g, '%23');
-    string = string.replace(/&/g, '%26');
-    string = string.replace(/'/g, "''");
-    return string;
-}
-function normalizeValue(value, { aliases, escape = false, } = {}) {
-    if (typeof value === 'string') {
-        return escape ? `'${escapeIllegalChars(value)}'` : `'${value}'`;
-    }
-    else if (value instanceof Date) {
-        return value.toISOString();
-    }
-    else if (typeof value === 'number') {
-        return value;
-    }
-    else if (Array.isArray(value)) {
-        return `[${value
-            .map((d) => normalizeValue(d, { aliases, escape }))
-            .join(',')}]`;
-    }
-    else if (value === null) {
-        return value;
-    }
-    else if (typeof value === 'object') {
-        switch (value.type) {
-            case QueryCustomTypes.Raw:
-                return value.value;
-            case QueryCustomTypes.Duration:
-                return `duration'${value.value}'`;
-            case QueryCustomTypes.Binary:
-                return `binary'${value.value}'`;
-            case QueryCustomTypes.Alias:
-                // Store
-                if (Array.isArray(aliases)) {
-                    if (value.name === undefined) {
-                        value.name = `a${aliases.length + 1}`;
-                    }
-                    aliases.push(value);
-                }
-                return `@${value.name}`;
-            default:
-                return Object.entries(value)
-                    .filter(([, v]) => v !== undefined)
-                    .map(([k, v]) => `${k}=${normalizeValue(v, { aliases, escape })}`)
-                    .join(',');
-        }
-    }
-    return value;
-}
-function buildExpand(expands, { aliases, escape = false, }) {
-    if (isRawType(expands)) {
-        return expands.value;
-    }
-    else if (typeof expands === 'number') {
-        return expands;
-    }
-    else if (typeof expands === 'string') {
-        if (expands.indexOf('/') === -1) {
-            return expands;
-        }
-        // Change `Foo/Bar/Baz` to `Foo($expand=Bar($expand=Baz))`
-        return expands
-            .split('/')
-            .reverse()
-            .reduce((results, item, index, arr) => {
-            if (index === 0) {
-                // Inner-most item
-                return `$expand=${item}`;
-            }
-            else if (index === arr.length - 1) {
-                // Outer-most item, don't add `$expand=` prefix (added above)
-                return `${item}(${results})`;
-            }
-            else {
-                // Other items
-                return `$expand=${item}(${results})`;
-            }
-        }, '');
-    }
-    else if (Array.isArray(expands)) {
-        return `${expands
-            .map((e) => buildExpand(e, { aliases, escape }))
-            .join(',')}`;
-    }
-    else if (typeof expands === 'object') {
-        const expandKeys = Object.keys(expands);
-        if (expandKeys.some((key) => SUPPORTED_EXPAND_PROPERTIES.indexOf(key.toLowerCase()) !== -1)) {
-            return expandKeys
-                .map((key) => {
-                let value;
-                switch (key) {
-                    case 'filter':
-                        value = buildFilter(expands[key], {
-                            aliases,
-                            escape,
-                        });
-                        break;
-                    case 'orderBy':
-                        value = buildOrderBy(expands[key]);
-                        break;
-                    case 'levels':
-                    case 'count':
-                    case 'top':
-                    case 'skip':
-                        value = `${expands[key]}`;
-                        if (isRawType(value))
-                            value = value.value;
-                        break;
-                    default:
-                        value = buildExpand(expands[key], { aliases, escape });
-                }
-                return `$${key.toLowerCase()}=${value}`;
-            })
-                .join(';');
-        }
-        else {
-            return expandKeys
-                .map((key) => {
-                const builtExpand = buildExpand(expands[key], { aliases, escape });
-                return builtExpand ? `${key}(${builtExpand})` : key;
-            })
-                .join(',');
-        }
-    }
-    return '';
-}
-function buildTransforms(transforms, { aliases, escape = false, }) {
-    // Wrap single object an array for simplified processing
-    const transformsArray = Array.isArray(transforms) ? transforms : [transforms];
-    const transformsResult = transformsArray.reduce((result, transform) => {
-        const { aggregate, filter, groupBy, ...rest } = transform;
-        // TODO: support as many of the following:
-        //   topcount, topsum, toppercent,
-        //   bottomsum, bottomcount, bottompercent,
-        //   identity, concat, expand, search, compute, isdefined
-        const unsupportedKeys = Object.keys(rest);
-        if (unsupportedKeys.length) {
-            throw new Error(`Unsupported transform(s): ${unsupportedKeys}`);
-        }
-        if (aggregate) {
-            result.push(`aggregate(${buildAggregate(aggregate)})`);
-        }
-        if (filter) {
-            const builtFilter = buildFilter(filter, { aliases, escape });
-            if (builtFilter) {
-                result.push(`filter(${buildFilter(builtFilter, { aliases, escape })})`);
-            }
-        }
-        if (groupBy) {
-            result.push(`groupby(${buildGroupBy(groupBy, { aliases, escape })})`);
-        }
-        return result;
-    }, []);
-    return transformsResult.join('/') || undefined;
-}
-function buildAggregate(aggregate) {
-    // Wrap single object in an array for simplified processing
-    const aggregateArray = Array.isArray(aggregate) ? aggregate : [aggregate];
-    return aggregateArray
-        .map((aggregateItem) => {
-        return typeof aggregateItem === 'string'
-            ? aggregateItem
-            : Object.keys(aggregateItem).map((aggregateKey) => {
-                const aggregateValue = aggregateItem[aggregateKey];
-                // TODO: Are these always required?  Can/should we default them if so?
-                if (!aggregateValue.with) {
-                    throw new Error(`'with' property required for '${aggregateKey}'`);
-                }
-                if (!aggregateValue.as) {
-                    throw new Error(`'as' property required for '${aggregateKey}'`);
-                }
-                return `${aggregateKey} with ${aggregateValue.with} as ${aggregateValue.as}`;
-            });
-    })
-        .join(',');
-}
-function buildGroupBy(groupBy, { aliases, escape = false, }) {
-    if (!groupBy.properties) {
-        throw new Error(`'properties' property required for groupBy`);
-    }
-    let result = `(${groupBy.properties.join(',')})`;
-    if (groupBy.transform) {
-        result += `,${buildTransforms(groupBy.transform, { aliases, escape })}`;
-    }
-    return result;
-}
-function buildOrderBy(orderBy, prefix = '') {
-    if (isRawType(orderBy)) {
-        return orderBy.value;
-    }
-    else if (Array.isArray(orderBy)) {
-        return orderBy
-            .map((value) => Array.isArray(value) &&
-            value.length === 2 &&
-            ['asc', 'desc'].indexOf(value[1]) !== -1
-            ? value.join(' ')
-            : value)
-            .map((v) => `${prefix}${v}`)
-            .join(',');
-    }
-    else if (typeof orderBy === 'object') {
-        return Object.entries(orderBy)
-            .map(([k, v]) => buildOrderBy(v, `${k}/`))
-            .map((v) => `${prefix}${v}`)
-            .join(',');
-    }
-    return `${prefix}${orderBy}`;
-}
-function buildApply(apply, { aliases, escape = false, }) {
-    const applyArray = Array.isArray(apply) ? apply : [apply];
-    return applyArray
-        .map((v) => normalizeValue(v, { aliases, escape }))
-        .join('/');
-}
-function buildUrl(path, params) {
-    // This can be refactored using URL API. But IE does not support it.
-    const queries = Object.entries(params).map(([key, value]) => `${key}=${value}`);
-    return queries.length ? `${path}?${queries.join('&')}` : path;
-}
-function parseNot(builtFilters) {
-    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))/;
-const Dates = {
-    isoStringToDate(value) {
-        if (typeof value === 'string' && value.search(ISO_REGEX) === 0) {
-            return new Date(value);
-        }
-        else if (Array.isArray(value)) {
-            return value.map((v) => this.isoStringToDate(v));
-        }
-        else if (value && value.constructor === Object) {
-            return Object.keys(value)
-                .map((key) => [key, this.isoStringToDate(value[key])])
-                .reduce((acc, v) => Object.assign(acc, { [v[0]]: v[1] }), {});
-        }
-        return value;
-    },
-};
-
-const DURATION_REGEX = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
-const Durations = {
-    toDuration(v) {
-        const matches = DURATION_REGEX.exec(v);
-        if (!matches || v.length < 3) {
-            throw new TypeError(`duration invalid: "${v}". Must be a ISO 8601 duration. See https://en.wikipedia.org/wiki/ISO_8601#Durations`);
-        }
-        let duration = {};
-        duration.sign = matches[1] === '-' ? -1 : 1;
-        return [
-            'years',
-            'months',
-            'weeks',
-            'days',
-            'hours',
-            'minutes',
-            'seconds',
-        ].reduce((acc, name, index) => {
-            const v = parseFloat(matches[index + 2]);
-            if (!Number.isNaN(v))
-                acc[name] = v;
-            return acc;
-        }, duration);
-    },
-    toString(v) {
-        return [
-            v.sign === -1 ? '-' : '',
-            'P',
-            v.years ? v.years + 'Y' : '',
-            v.months ? v.months + 'M' : '',
-            v.weeks ? v.weeks + 'W' : '',
-            v.days ? v.days + 'D' : '',
-            'T',
-            v.hours ? v.hours + 'H' : '',
-            v.minutes ? v.minutes + 'M' : '',
-            v.seconds ? v.seconds + 'S' : '',
-        ].join('');
-    },
-};
-
-const Enums = {
-    names(enums) {
-        return Object.values(enums).filter((v) => typeof v === 'string');
-    },
-    values(enums) {
-        return Object.values(enums).filter((v) => typeof v === 'number');
-    },
-    toValue(enums, value) {
-        if (value in enums)
-            return typeof value === 'string' ? enums[value] : value;
-        return undefined;
-    },
-    toValues(enums, value) {
-        if (typeof value === 'number') {
-            return this.values(enums).filter((v) => (value & v) === v);
-        }
-        if (typeof value === 'string') {
-            value = value.split(',').map((o) => o.trim());
-        }
-        if (Array.isArray(value) && value.every((v) => v in enums)) {
-            return value.map((o) => this.toValue(enums, o));
-        }
-        return [];
-    },
-    toName(enums, value) {
-        if (value in enums)
-            return typeof value === 'number' ? enums[value] : value;
-        return undefined;
-    },
-    toNames(enums, value) {
-        if (typeof value === 'number') {
-            return this.values(enums)
-                .filter((v) => (value & v) === v)
-                .map((v) => this.toName(enums, v));
-        }
-        if (typeof value === 'string') {
-            value = value.split(',').map((o) => o.trim());
-        }
-        if (Array.isArray(value) && value.every((v) => v in enums)) {
-            return value.map((o) => this.toName(enums, o));
-        }
-        return [];
-    },
-    toFlags(enums, value) {
-        if (typeof value === 'number') {
-            return this.values(enums)
-                .filter((v) => v !== 0 && (value & v) === v)
-                .map((v) => this.toName(enums, v));
-        }
-        if (typeof value === 'string') {
-            value = value.split(',').map((o) => o.trim());
-        }
-        if (Array.isArray(value) && value.every((v) => v in enums)) {
-            return value
-                .filter((v) => enums[v])
-                .map((v) => this.toName(enums, v));
-        }
-        return [];
-    },
-};
-
-function cloneSymbol(targe) {
-    return Object(Symbol.prototype.valueOf.call(targe));
-}
-function cloneReg(targe) {
-    const reFlags = /\w*$/;
-    const result = new targe.constructor(targe.source, reFlags.exec(targe));
-    result.lastIndex = targe.lastIndex;
-    return result;
-}
-const Types = {
-    rawType(value) {
-        return Object.prototype.toString.call(value).slice(8, -1);
-    },
-    isObject(value) {
-        return typeof value === 'object' && value !== null;
-    },
-    isPlainObject(value) {
-        if (this.rawType(value) !== 'Object') {
-            return false;
-        }
-        const prototype = Object.getPrototypeOf(value);
-        return prototype === null || prototype === Object.prototype;
-    },
-    isFunction(value) {
-        return typeof value === 'function';
-    },
-    isArray(value) {
-        return Array.isArray(value);
-    },
-    isMap(value) {
-        return this.rawType(value) === 'Map';
-    },
-    isEmpty(value) {
-        return (value === undefined ||
-            value === null ||
-            (typeof value === 'string' && !value.length) ||
-            (value instanceof Date && isNaN(value.valueOf())) ||
-            (Types.isMap(value) && !value.size) ||
-            (Types.isArray(value) && !value.length) ||
-            (Types.isFunction(value.isEmpty) && value.isEmpty()) ||
-            (Types.isArray(value) &&
-                value.every((v) => Types.isEmpty(v))) ||
-            (Types.isPlainObject(value) &&
-                !Object.keys(value).filter((k) => value.hasOwnProperty(k)).length));
-    },
-    isEqual(value1, value2) {
-        function getType(obj) {
-            return Object.prototype.toString.call(obj).slice(8, -1).toLowerCase();
-        }
-        function areDatesEqual() {
-            return value1.getTime() === value2.getTime();
-        }
-        function areArraysBufferEqual() {
-            if (value1.byteLength !== value2.byteLength) {
-                return false;
-            }
-            var view1 = new DataView(value1);
-            var view2 = new DataView(value2);
-            var i = value1.byteLength;
-            while (i--) {
-                if (view1.getUint8(i) !== view2.getUint8(i)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        function areArraysEqual() {
-            // Check length
-            if (value1.length !== value2.length)
-                return false;
-            // Check each item in the array
-            for (let i = 0; i < value1.length; i++) {
-                if (!Types.isEqual(value1[i], value2[i]))
-                    return false;
-            }
-            // If no errors, return true
-            return true;
-        }
-        function areObjectsEqual() {
-            if (Object.keys(value1).length !== Object.keys(value2).length)
-                return false;
-            // Check each item in the object
-            for (let key in value1) {
-                if (Object.prototype.hasOwnProperty.call(value1, key)) {
-                    if (!Types.isEqual(value1[key], value2[key]))
-                        return false;
-                }
-            }
-            // If no errors, return true
-            return true;
-        }
-        function areFunctionsEqual() {
-            return value1.toString() === value2.toString();
-        }
-        function arePrimativesEqual() {
-            return value1 === value2;
-        }
-        // Get the object type
-        let type = getType(value1);
-        // If the two items are not the same type, return false
-        if (type !== getType(value2))
-            return false;
-        // Compare based on type
-        if (type === 'date')
-            return areDatesEqual();
-        if (type === 'arraybuffer')
-            return areArraysBufferEqual();
-        if (type === 'array')
-            return areArraysEqual();
-        if (type === 'object')
-            return areObjectsEqual();
-        if (type === 'function')
-            return areFunctionsEqual();
-        return arePrimativesEqual();
+const COLLECTION = /Collection\(([\w\.]+)\)/;
+const PROPERTY = /([\w\d\-_]+)\(([\'\w\d\-_=]+)\)/;
+const EXPAND = /([\w\d\-_]+)\(([\w\d\,\(\)]+)\)/;
+const ODataVersionBaseHelper = {
+    entity(data) {
+        return data;
     },
-    clone(target) {
-        const constrFun = target.constructor;
-        switch (this.rawType(target)) {
-            case 'Boolean':
-            case 'Number':
-            case 'String':
-            case 'Error':
-            case 'Date':
-                return new constrFun(target);
-            case 'RegExp':
-                return cloneReg(target);
-            case 'Symbol':
-                return cloneSymbol(target);
-            case 'Function':
-                return target;
-            default:
-                return null;
-        }
+    entities(data) {
+        return data[this.VALUE];
     },
-};
-
-const Http = {
-    //Merge Headers
-    mergeHttpHeaders(...values) {
-        let headers = new HttpHeaders();
-        values.forEach((value) => {
-            if (value instanceof HttpHeaders) {
-                value.keys().forEach((key) => {
-                    headers = (value.getAll(key) || []).reduce((acc, v) => acc.append(key, v), headers);
-                });
-            }
-            else if (Types.isPlainObject(value)) {
-                Object.entries(value).forEach(([key, value]) => {
-                    headers = (Array.isArray(value) ? value : [value]).reduce((acc, v) => acc.append(key, v), headers);
-                });
-            }
-        });
-        return headers;
+    property(data) {
+        return this.VALUE in data ? data[this.VALUE] : data;
     },
-    // Merge Params
-    mergeHttpParams(...values) {
-        let params = new HttpParams();
-        values.forEach((value) => {
-            if (value instanceof HttpParams) {
-                value.keys().forEach((key) => {
-                    params = (value.getAll(key) || []).reduce((acc, v) => acc.append(key, v), params);
-                });
-            }
-            else if (Types.isPlainObject(value)) {
-                Object.entries(value).forEach(([key, value]) => {
-                    params = (Array.isArray(value) ? value : [value]).reduce((acc, v) => acc.append(key, v), params);
-                });
-            }
-        });
-        return params;
+    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;
     },
-    // Split Params
-    splitHttpParams(params, keys) {
-        let other = new HttpParams();
-        params.keys().forEach((key) => {
-            if (keys.includes(key)) {
-                other = (params.getAll(key) || []).reduce((acc, v) => acc.append(key, v), other);
-                params = params.delete(key);
-            }
+    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 [params, other];
+        return props;
     },
-    // Without Params
-    withoutHttpParams(params, keys) {
-        return keys.reduce((acc, key) => acc.delete(key), params);
+    id(annots) {
+        return annots instanceof Map
+            ? annots.get(this.ODATA_ID)
+            : annots[this.ODATA_ID];
     },
-    resolveHeaderKey(headers, options) {
-        if (headers instanceof HttpHeaders) {
-            return headers.keys().find((k) => options.indexOf(k) !== -1);
-        }
-        else if (Types.isPlainObject(headers)) {
-            return Object.keys(headers).find((k) => options.indexOf(k) !== -1);
-        }
-        return undefined;
+    etag(annots) {
+        return annots instanceof Map
+            ? annots.get(this.ODATA_ETAG)
+            : annots[this.ODATA_ETAG];
     },
-    headerValue(header) {
-        let res = header.split(';')[0].trim();
-        res = res.split(':')[1].trim();
-        return res;
+    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;
     },
-    parseResponseStatus(line) {
-        const chunks = line.split(' ');
-        return {
-            status: chunks[0],
-            code: parseInt(chunks[1], 10),
-            message: chunks.slice(2).join(' '),
-        };
+    mediaEtag(annots) {
+        return annots.has(this.ODATA_MEDIA_ETAG)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_ETAG))
+            : undefined;
     },
-    boundaryDelimiter(contentType) {
-        const contentTypeParts = contentType.split(';');
-        if (contentTypeParts.length === 2) {
-            const boundary = contentType.split(';')[1].trim();
-            const boundaryDelimiter = BOUNDARY_PREFIX_SUFFIX + boundary.split('=')[1];
-            return boundaryDelimiter;
-        }
-        else {
-            return '';
-        }
+    metadataEtag(annots) {
+        return annots.has(this.ODATA_METADATA_ETAG)
+            ? decodeURIComponent(annots.get(this.ODATA_METADATA_ETAG))
+            : undefined;
     },
-    boundaryEnd(boundaryDelimiter) {
-        if (!boundaryDelimiter.length) {
-            return '';
-        }
-        const boundaryEnd = boundaryDelimiter + BOUNDARY_PREFIX_SUFFIX;
-        return boundaryEnd;
+    count(annots) {
+        return annots.has(this.ODATA_COUNT)
+            ? Number(annots.get(this.ODATA_COUNT))
+            : undefined;
     },
-};
-
-function forEach(array, iteratee) {
-    let index = -1;
-    const length = array.length;
-    while (++index < length) {
-        iteratee(array[index], index);
-    }
-    return array;
-}
-const Objects = {
-    set(obj, path, value) {
-        // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
-        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
-        pathArray.reduce((acc, key, i) => {
-            if (acc[key] === undefined)
-                acc[key] = {};
-            if (i === pathArray.length - 1)
-                acc[key] = value;
-            return acc[key];
-        }, obj);
+    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;
     },
-    get(obj, path, def) {
-        // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
-        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
-        // Find value if exist return otherwise return undefined value;
-        return (pathArray.reduce((prevObj, key) => prevObj && prevObj[key], obj) || def);
+    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] }), {});
     },
-    unset(obj, path) {
-        // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
-        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
-        pathArray.reduce((acc, key, i) => {
-            if (i === pathArray.length - 1)
-                delete acc[key];
-            return acc[key];
-        }, obj);
+    nextLink(annots) {
+        return annots.has(this.ODATA_NEXTLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_NEXTLINK))
+            : undefined;
     },
-    has(obj, path) {
-        // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
-        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
-        return !!pathArray.reduce((prevObj, key) => prevObj && prevObj[key], obj);
+    readLink(annots) {
+        return annots.has(this.ODATA_READLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_READLINK))
+            : undefined;
     },
-    merge(target, source) {
-        const merge = (target, source) => {
-            for (let attr in source) {
-                let value = source[attr];
-                if (value !== null && Types.isPlainObject(value) && attr in target) {
-                    merge(target[attr], value);
-                }
-                else if (target[attr] !== value) {
-                    target[attr] = value;
-                }
-            }
-        };
-        merge(target, source);
-        return target;
+    mediaReadLink(annots) {
+        return annots.has(this.ODATA_MEDIA_READLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_READLINK))
+            : undefined;
     },
-    equal(object1, object2) {
-        const keys1 = Object.keys(object1);
-        const keys2 = Object.keys(object2);
-        if (keys1.length !== keys2.length) {
-            return false;
-        }
-        for (const key of keys1) {
-            const val1 = object1[key];
-            const val2 = object2[key];
-            const areObjects = Types.isPlainObject(val1) && Types.isPlainObject(val2);
-            if ((areObjects && !Objects.equal(val1, val2)) ||
-                (!areObjects && val1 !== val2)) {
-                return false;
-            }
-        }
-        return true;
+    editLink(annots) {
+        return annots.has(this.ODATA_EDITLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_EDITLINK))
+            : undefined;
     },
-    difference(object1, object2) {
-        if (!object2 || !Types.isPlainObject(object2)) {
-            return object1;
-        }
-        var diffs = {};
-        var key;
-        var arraysMatch = function (arr1, arr2) {
-            if (arr1.length !== arr2.length)
-                return false;
-            for (var i = 0; i < arr1.length; i++) {
-                if (arr1[i] !== arr2[i])
-                    return false;
-            }
-            return true;
-        };
-        var compare = function (item1, item2, key) {
-            if (item2 === undefined) {
-                diffs[key] = null;
-                return;
-            }
-            if (typeof item1 !== typeof item2) {
-                diffs[key] = item2;
-                return;
-            }
-            if (Types.isPlainObject(item1)) {
-                var objDiff = Objects.difference(item1, item2);
-                if (Object.keys(objDiff).length > 0) {
-                    diffs[key] = objDiff;
+    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];
                 }
-                return;
-            }
-            if (Array.isArray(item1)) {
-                if (!arraysMatch(item1, item2)) {
-                    diffs[key] = item2;
+                else if (parts[0].indexOf('.') !== -1) {
+                    ctx.type = parts[0];
                 }
-                return;
-            }
-            if (item1 !== item2) {
-                diffs[key] = item2;
-            }
-        };
-        for (key in object1) {
-            if (object1.hasOwnProperty(key)) {
-                compare(object1[key], object2[key], key);
-            }
-        }
-        for (key in object2) {
-            if (object2.hasOwnProperty(key)) {
-                if (!object1[key] && object1[key] !== object2[key]) {
-                    diffs[key] = object2[key];
+                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 diffs;
+            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];
+            }
+            return ctx;
+        },
+        countParam() {
+            return { [$INLINECOUNT]: 'allpages' };
+        },
     },
-    resolveKey(key, { single = true } = {}) {
-        const type = Types.rawType(key);
-        if (['number', 'string'].indexOf(type) !== -1)
-            return key;
-        if (type !== 'Map' && type !== 'Object') {
-            return undefined;
-        }
-        const values = type === 'Map' ? Array.from(key.values()) : Object.values(key);
-        if (values.length === 1 && single) {
-            // Single primitive key value
-            key = values[0];
-            return !Types.isEmpty(key) ? key : undefined;
-        }
-        else if (values.some((v) => v === undefined)) {
-            // Compose key, needs all values
-            return undefined;
-        }
-        else {
-            const obj = type === 'Map' ? Object.fromEntries(key) : key;
-            return !Types.isEmpty(obj) ? obj : undefined;
-        }
+    //#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));
+            }
+            return annots;
+        },
+        context(annots) {
+            let ctx = {};
+            return ctx;
+        },
+        attributes(value, metadata) {
+            return value;
+        },
+        countParam() {
+            return { [$INLINECOUNT]: 'allpages' };
+        },
     },
-    clone(target, map) {
-        if (map === undefined)
-            map = new WeakMap();
-        // clone primitive types
-        if (typeof target != 'object' || target == null) {
-            return target;
-        }
-        if ('clone' in target) {
-            // target is a cloneable object
-            return target.clone();
-        }
-        const type = Types.rawType(target);
-        let cloneTarget = null;
-        if (map.get(target)) {
-            return map.get(target);
-        }
-        map.set(target, cloneTarget);
-        if (type != 'Set' && type != 'Map' && type != 'Array' && type != 'Object') {
-            return Types.clone(target);
+    //#endregion
+};
+
+const COMPARISON_OPERATORS = ['eq', 'ne', 'gt', 'ge', 'lt', 'le'];
+const LOGICAL_OPERATORS = ['and', 'or', 'not'];
+const COLLECTION_OPERATORS = ['any', 'all'];
+const BOOLEAN_FUNCTIONS = ['startswith', 'endswith', 'contains'];
+const SUPPORTED_EXPAND_PROPERTIES = [
+    'expand',
+    'levels',
+    'select',
+    'top',
+    'count',
+    'orderby',
+    'filter',
+];
+const FUNCTION_REGEX = /\((.*)\)/;
+const INDEXOF_REGEX = /(?!indexof)\((\w+)\)/;
+var StandardAggregateMethods;
+(function (StandardAggregateMethods) {
+    StandardAggregateMethods["sum"] = "sum";
+    StandardAggregateMethods["min"] = "min";
+    StandardAggregateMethods["max"] = "max";
+    StandardAggregateMethods["average"] = "average";
+    StandardAggregateMethods["countdistinct"] = "countdistinct";
+})(StandardAggregateMethods || (StandardAggregateMethods = {}));
+var QueryCustomTypes;
+(function (QueryCustomTypes) {
+    QueryCustomTypes[QueryCustomTypes["Raw"] = 0] = "Raw";
+    QueryCustomTypes[QueryCustomTypes["Alias"] = 1] = "Alias";
+    QueryCustomTypes[QueryCustomTypes["Duration"] = 2] = "Duration";
+    QueryCustomTypes[QueryCustomTypes["Binary"] = 3] = "Binary";
+})(QueryCustomTypes || (QueryCustomTypes = {}));
+//https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_QueryOptions
+const raw = (value) => ({
+    type: QueryCustomTypes.Raw,
+    value,
+});
+const alias = (value, name) => ({
+    type: QueryCustomTypes.Alias,
+    value,
+    name,
+});
+const duration = (value) => ({
+    type: QueryCustomTypes.Duration,
+    value,
+});
+const binary = (value) => ({
+    type: QueryCustomTypes.Binary,
+    value,
+});
+const isQueryCustomType = (value) => typeof value === 'object' &&
+    'type' in value &&
+    value.type in QueryCustomTypes;
+const isRawType = (value) => isQueryCustomType(value) &&
+    value.type === QueryCustomTypes.Raw;
+const ITEM_ROOT = '';
+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,
+        skiptoken,
+        format,
+        top,
+        skip,
+        filter,
+        transform,
+        compute,
+        orderBy,
+        key,
+        count,
+        expand,
+        action,
+        func,
+        aliases,
+        escape,
+    });
+    return buildUrl(path, params);
+}
+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 = {};
+    // key is not (null, undefined)
+    if (key != undefined) {
+        path += `(${normalizeValue(key, { aliases, escape })})`;
+    }
+    // Select
+    if (select) {
+        query.$select = isRawType(select)
+            ? select.value
+            : Array.isArray(select)
+                ? select.join(',')
+                : select;
+    }
+    // Compute
+    if (compute) {
+        query.$compute = isRawType(compute)
+            ? compute.value
+            : Array.isArray(compute)
+                ? compute.join(',')
+                : compute;
+    }
+    // Search
+    if (search) {
+        query.$search = search;
+    }
+    // Skiptoken
+    if (skiptoken) {
+        query.$skiptoken = skiptoken;
+    }
+    // Format
+    if (format) {
+        query.$format = format;
+    }
+    // Filter
+    if (filter || typeof count === 'object') {
+        query.$filter = buildFilter(typeof count === 'object' ? count : filter, {
+            aliases,
+            escape,
+        });
+    }
+    // Transform
+    if (transform) {
+        query.$apply = buildTransforms(transform, { aliases, escape });
+    }
+    // Apply
+    if (apply) {
+        query.$apply = query.$apply
+            ? query.$apply + '/' + buildApply(apply, { aliases, escape })
+            : buildApply(apply, { aliases, escape });
+    }
+    // Expand
+    if (expand) {
+        query.$expand = buildExpand(expand, { aliases, escape });
+    }
+    // OrderBy
+    if (orderBy) {
+        query.$orderby = buildOrderBy(orderBy);
+    }
+    // Count
+    if (isRawType(count)) {
+        query.$count = count.value;
+    }
+    else if (typeof count === 'boolean') {
+        query.$count = true;
+    }
+    else if (count) {
+        path += '/$count';
+    }
+    // Top
+    if (isRawType(top)) {
+        query.$top = top.value;
+    }
+    else if (typeof top === 'number') {
+        query.$top = top;
+    }
+    // Skip
+    if (isRawType(skip)) {
+        query.$top = skip.value;
+    }
+    else if (typeof skip === 'number') {
+        query.$skip = skip;
+    }
+    if (action) {
+        path += `/${action}`;
+    }
+    if (func) {
+        if (typeof func === 'string') {
+            path += `/${func}()`;
         }
-        // clone Set
-        if (type == 'Set') {
-            cloneTarget = new Set();
-            target.forEach((value) => {
-                cloneTarget.add(this.clone(value, map));
+        else if (typeof func === 'object') {
+            const [funcName] = Object.keys(func);
+            const funcArgs = normalizeValue(func[funcName], {
+                aliases,
+                escape,
             });
-            return cloneTarget;
+            path += `/${funcName}(${funcArgs})`;
         }
-        // clone Map
-        if (type == 'Map') {
-            cloneTarget = new Map();
-            target.forEach((value, key) => {
-                cloneTarget.set(key, this.clone(value, map));
+    }
+    if (aliases.length > 0) {
+        Object.assign(query, aliases.reduce((acc, alias) => Object.assign(acc, {
+            [`@${alias.name}`]: normalizeValue(alias.value, {
+                escape,
+            }),
+        }), {}));
+    }
+    // Filter empty values
+    const params = Object.entries(query)
+        .filter(([, value]) => value !== undefined && value !== '')
+        .reduce((acc, [key, value]) => Object.assign(acc, { [key]: value }), {});
+    return [path, params];
+}
+function renderPrimitiveValue(key, val, { aliases, escape, }) {
+    return `${key} eq ${normalizeValue(val, { aliases, escape })}`;
+}
+function buildFilter(filters = {}, { aliases, propPrefix, escape, }) {
+    return (Array.isArray(filters) ? filters : [filters]).reduce((acc, filter) => {
+        if (filter) {
+            const builtFilter = buildFilterCore(filter, {
+                aliases,
+                propPrefix,
+                escape,
             });
-            return cloneTarget;
+            if (builtFilter) {
+                acc.push(builtFilter);
+            }
         }
-        // clone Array
-        if (type == 'Array') {
-            cloneTarget = new Array();
-            forEach(target, (value, index) => {
-                cloneTarget[index] = this.clone(value, map);
-            });
+        return acc;
+    }, []).join(' and ');
+    function buildFilterCore(filter = {}, { aliases, propPrefix, escape, }) {
+        let filterExpr = '';
+        if (isRawType(filter)) {
+            // Use raw query custom filter string
+            filterExpr = filter.value;
         }
-        // clone normal Object
-        if (type == 'Object') {
-            cloneTarget = new Object();
-            forEach(Object.keys(target), (key, index) => {
-                cloneTarget[key] = this.clone(target[key], map);
-            });
+        else if (typeof filter === 'string') {
+            // Use raw filter string
+            filterExpr = filter;
         }
-        return cloneTarget;
-    },
-};
-
-const OData = {
-    // Merge callables parameters
-    mergeCallableParameters(callables) {
-        const areEqual = (a, b) => a.name === b.name &&
-            Objects.equal((a.parameters || {})[CALLABLE_BINDING_PARAMETER] || {}, (b.parameters || {})[CALLABLE_BINDING_PARAMETER] || {});
-        return callables.reduce((acc, config) => {
-            if (acc.every((c) => !areEqual(c, config))) {
-                config = callables
-                    .filter((c) => areEqual(c, config))
-                    .reduce((acc, c) => {
-                    acc.parameters = Object.assign(acc.parameters || {}, c.parameters || {});
-                    return acc;
-                }, config);
-                return [...acc, config];
-            }
-            return acc;
-        }, []);
-    },
-};
-
-// From https://github.com/adamhalasz/uniqid
-var glast;
-function now() {
-    let time = Date.now();
-    let last = glast || time;
-    return (glast = time > last ? time : last + 1);
+        else if (filter && typeof filter === 'object') {
+            const filtersArray = Object.keys(filter).reduce((result, filterKey) => {
+                const value = filter[filterKey];
+                let propName = '';
+                if (propPrefix) {
+                    if (filterKey === ITEM_ROOT) {
+                        propName = propPrefix;
+                    }
+                    else if (INDEXOF_REGEX.test(filterKey)) {
+                        propName = filterKey.replace(INDEXOF_REGEX, (_, $1) => $1.trim() === ITEM_ROOT
+                            ? `(${propPrefix})`
+                            : `(${propPrefix}/${$1.trim()})`);
+                    }
+                    else if (FUNCTION_REGEX.test(filterKey)) {
+                        propName = filterKey.replace(FUNCTION_REGEX, (_, $1) => $1.trim() === ITEM_ROOT
+                            ? `(${propPrefix})`
+                            : `(${propPrefix}/${$1.trim()})`);
+                    }
+                    else {
+                        propName = `${propPrefix}/${filterKey}`;
+                    }
+                }
+                else {
+                    propName = filterKey;
+                }
+                if (filterKey === ITEM_ROOT && Array.isArray(value)) {
+                    return result.concat(value.map((arrayValue) => renderPrimitiveValue(propName, arrayValue, { escape, aliases })));
+                }
+                if (['number', 'string', 'boolean'].indexOf(typeof value) !== -1 ||
+                    value instanceof Date ||
+                    value === null) {
+                    // Simple key/value handled as equals operator
+                    result.push(renderPrimitiveValue(propName, value, { aliases, escape }));
+                }
+                else if (Array.isArray(value)) {
+                    const op = filterKey;
+                    const builtFilters = value
+                        .map((v) => buildFilter(v, { aliases, propPrefix, escape }))
+                        .filter((f) => f)
+                        .map((f) => LOGICAL_OPERATORS.indexOf(op) !== -1 ? `(${f})` : f);
+                    if (builtFilters.length) {
+                        if (LOGICAL_OPERATORS.indexOf(op) !== -1) {
+                            if (builtFilters.length) {
+                                if (op === 'not') {
+                                    result.push(parseNot(builtFilters));
+                                }
+                                else {
+                                    result.push(`(${builtFilters.join(` ${op} `)})`);
+                                }
+                            }
+                        }
+                        else {
+                            result.push(builtFilters.join(` ${op} `));
+                        }
+                    }
+                }
+                else if (LOGICAL_OPERATORS.indexOf(propName) !== -1) {
+                    const op = propName;
+                    const builtFilters = Object.keys(value).map((valueKey) => buildFilterCore({ [valueKey]: value[valueKey] }, { aliases, escape }));
+                    if (builtFilters.length) {
+                        if (op === 'not') {
+                            result.push(parseNot(builtFilters));
+                        }
+                        else {
+                            result.push(`${builtFilters.join(` ${op} `)}`);
+                        }
+                    }
+                }
+                else if (typeof value === 'object') {
+                    if ('type' in value) {
+                        result.push(renderPrimitiveValue(propName, value, { aliases, escape }));
+                    }
+                    else {
+                        const operators = Object.keys(value);
+                        operators.forEach((op) => {
+                            if (COMPARISON_OPERATORS.indexOf(op) !== -1) {
+                                result.push(`${propName} ${op} ${normalizeValue(value[op], {
+                                    aliases,
+                                    escape,
+                                })}`);
+                            }
+                            else if (LOGICAL_OPERATORS.indexOf(op) !== -1) {
+                                if (Array.isArray(value[op])) {
+                                    result.push(value[op]
+                                        .map((v) => '(' +
+                                        buildFilterCore(v, {
+                                            aliases,
+                                            propPrefix: propName,
+                                            escape,
+                                        }) +
+                                        ')')
+                                        .join(` ${op} `));
+                                }
+                                else {
+                                    result.push('(' +
+                                        buildFilterCore(value[op], {
+                                            aliases,
+                                            propPrefix: propName,
+                                            escape,
+                                        }) +
+                                        ')');
+                                }
+                            }
+                            else if (COLLECTION_OPERATORS.indexOf(op) !== -1) {
+                                const collectionClause = buildCollectionClause(filterKey.toLowerCase(), value[op], op, propName);
+                                if (collectionClause) {
+                                    result.push(collectionClause);
+                                }
+                            }
+                            else if (op === 'has') {
+                                result.push(`${propName} ${op} ${normalizeValue(value[op], {
+                                    aliases,
+                                    escape,
+                                })}`);
+                            }
+                            else if (op === 'in') {
+                                const resultingValues = Array.isArray(value[op])
+                                    ? value[op]
+                                    : value[op].value.map((typedValue) => ({
+                                        type: value[op].type,
+                                        value: typedValue,
+                                    }));
+                                result.push(propName +
+                                    ' in (' +
+                                    resultingValues
+                                        .map((v) => normalizeValue(v, { aliases, escape }))
+                                        .join(',') +
+                                    ')');
+                            }
+                            else if (BOOLEAN_FUNCTIONS.indexOf(op) !== -1) {
+                                // Simple boolean functions (startswith, endswith, contains)
+                                result.push(`${op}(${propName},${normalizeValue(value[op], {
+                                    aliases,
+                                    escape,
+                                })})`);
+                            }
+                            else {
+                                // Nested property
+                                const filter = buildFilterCore(value, {
+                                    aliases,
+                                    propPrefix: propName,
+                                    escape,
+                                });
+                                if (filter) {
+                                    result.push(filter);
+                                }
+                            }
+                        });
+                    }
+                }
+                else if (value === undefined) {
+                    // Ignore/omit filter if value is `undefined`
+                }
+                else {
+                    throw new Error(`Unexpected value type: ${value}`);
+                }
+                return result;
+            }, []);
+            filterExpr = filtersArray.join(' and ');
+        } /* else {
+            throw new Error(`Unexpected filters type: ${filter}`);
+          } */
+        return filterExpr;
+    }
+    function buildCollectionClause(lambdaParameter, value, op, propName) {
+        let clause = '';
+        if (typeof value === 'string' || value instanceof String) {
+            clause = getStringCollectionClause(lambdaParameter, value, op, propName);
+        }
+        else if (value) {
+            // normalize {any:[{prop1: 1}, {prop2: 1}]} --> {any:{prop1: 1, prop2: 1}}; same for 'all',
+            // simple values collection: {any:[{'': 'simpleVal1'}, {'': 'simpleVal2'}]} --> {any:{'': ['simpleVal1', 'simpleVal2']}}; same for 'all',
+            const filterValue = Array.isArray(value)
+                ? value.reduce((acc, item) => {
+                    if (item.hasOwnProperty(ITEM_ROOT)) {
+                        if (!acc.hasOwnProperty(ITEM_ROOT)) {
+                            acc[ITEM_ROOT] = [];
+                        }
+                        acc[ITEM_ROOT].push(item[ITEM_ROOT]);
+                        return acc;
+                    }
+                    return { ...acc, ...item };
+                }, {})
+                : value;
+            const filter = buildFilterCore(filterValue, {
+                aliases,
+                propPrefix: lambdaParameter,
+                escape,
+            });
+            clause = `${propName}/${op}(${filter ? `${lambdaParameter}:${filter}` : ''})`;
+        }
+        return clause;
+    }
 }
-const Strings = {
-    uniqueId({ prefix, suffix, } = {}) {
-        return (prefix ? prefix : '') + now().toString(36) + (suffix ? suffix : '');
-    },
-    titleCase(text) {
-        const result = text.replace(/([a-z])([A-Z])/g, '$1 $2');
-        return result
-            .split(' ')
-            .map((p) => p.charAt(0).toUpperCase() + p.slice(1))
-            .join(' ');
-    },
-};
-
-const Urls = {
-    parseQueryString(query) {
-        return query.split(PARAM_SEPARATOR).reduce((acc, param) => {
-            let index = param.indexOf(VALUE_SEPARATOR);
-            if (index !== -1)
-                Object.assign(acc, {
-                    [param.substring(0, index)]: param.substring(index + 1),
-                });
-            return acc;
-        }, {});
-    },
-    escapeIllegalChars(string) {
-        string = string.replace(/%/g, '%25');
-        string = string.replace(/\+/g, '%2B');
-        string = string.replace(/\//g, '%2F');
-        string = string.replace(/\?/g, '%3F');
-        string = string.replace(/#/g, '%23');
-        string = string.replace(/&/g, '%26');
-        string = string.replace(/'/g, "''");
-        return string;
-    },
-};
-
-class Expression {
-    _children;
-    constructor({ children, } = {}) {
-        this._children = children || [];
+function getStringCollectionClause(lambdaParameter, value, collectionOperator, propName) {
+    let clause = '';
+    const conditionOperator = collectionOperator == 'all' ? 'ne' : 'eq';
+    clause = `${propName}/${collectionOperator}(${lambdaParameter}: ${lambdaParameter} ${conditionOperator} '${value}')`;
+    return clause;
+}
+function escapeIllegalChars(string) {
+    string = string.replace(/%/g, '%25');
+    string = string.replace(/\+/g, '%2B');
+    string = string.replace(/\//g, '%2F');
+    string = string.replace(/\?/g, '%3F');
+    string = string.replace(/#/g, '%23');
+    string = string.replace(/&/g, '%26');
+    string = string.replace(/'/g, "''");
+    return string;
+}
+function normalizeValue(value, { aliases, escape = false, } = {}) {
+    if (typeof value === 'string') {
+        return escape ? `'${escapeIllegalChars(value)}'` : `'${value}'`;
     }
-    get [Symbol.toStringTag]() {
-        return 'Expression';
+    else if (value instanceof Date) {
+        return value.toISOString();
     }
-    children() {
-        return this._children;
+    else if (typeof value === 'number') {
+        return value;
     }
-    length() {
-        return this._children.length;
+    else if (Array.isArray(value)) {
+        return `[${value
+            .map((d) => normalizeValue(d, { aliases, escape }))
+            .join(',')}]`;
     }
-    toJson() {
-        return {
-            $type: Types.rawType(this),
-            children: this._children.map((c) => c.toJson()),
-        };
+    else if (value === null) {
+        return value;
     }
-    resolve(parser) {
-        return parser;
+    else if (typeof value === 'object') {
+        switch (value.type) {
+            case QueryCustomTypes.Raw:
+                return value.value;
+            case QueryCustomTypes.Duration:
+                return `duration'${value.value}'`;
+            case QueryCustomTypes.Binary:
+                return `binary'${value.value}'`;
+            case QueryCustomTypes.Alias:
+                // Store
+                if (Array.isArray(aliases)) {
+                    if (value.name === undefined) {
+                        value.name = `a${aliases.length + 1}`;
+                    }
+                    aliases.push(value);
+                }
+                return `@${value.name}`;
+            default:
+                return Object.entries(value)
+                    .filter(([, v]) => v !== undefined)
+                    .map(([k, v]) => `${k}=${normalizeValue(v, { aliases, escape })}`)
+                    .join(',');
+        }
     }
+    return value;
 }
-
-class ODataAnnotation {
-    term;
-    string;
-    bool;
-    int;
-    permissions;
-    properties;
-    constructor(annot) {
-        this.term = annot.term;
-        Object.assign(this, annot);
+function buildExpand(expands, { aliases, escape = false, }) {
+    if (isRawType(expands)) {
+        return expands.value;
     }
-}
-class ODataAnnotatable {
-    annotations;
-    constructor(config) {
-        this.annotations = (config.annotations || []).map((annot) => new ODataAnnotation(annot));
+    else if (typeof expands === 'number') {
+        return expands;
     }
-    /**
-     * Find an annotation inside the annotatable.
-     * @param predicate Function that returns true if the annotation match.
-     * @returns The annotation that matches the predicate.
-     */
-    findAnnotation(predicate) {
-        return this.annotations.find(predicate);
+    else if (typeof expands === 'string') {
+        if (expands.indexOf('/') === -1) {
+            return expands;
+        }
+        // Change `Foo/Bar/Baz` to `Foo($expand=Bar($expand=Baz))`
+        return expands
+            .split('/')
+            .reverse()
+            .reduce((results, item, index, arr) => {
+            if (index === 0) {
+                // Inner-most item
+                return `$expand=${item}`;
+            }
+            else if (index === arr.length - 1) {
+                // Outer-most item, don't add `$expand=` prefix (added above)
+                return `${item}(${results})`;
+            }
+            else {
+                // Other items
+                return `$expand=${item}(${results})`;
+            }
+        }, '');
     }
-    /**
-     * Find an annotation inside the annotatable and return its value.
-     * @param term The term of the annotation to find.
-     * @returns The value of the annotation.
-     */
-    annotatedValue(term) {
-        const reg = term instanceof RegExp ? term : new RegExp(`^${term}$`);
-        const annot = this.findAnnotation((a) => reg.test(a.term));
-        if (!annot) {
-            return undefined;
+    else if (Array.isArray(expands)) {
+        return `${expands
+            .map((e) => buildExpand(e, { aliases, escape }))
+            .join(',')}`;
+    }
+    else if (typeof expands === 'object') {
+        const expandKeys = Object.keys(expands);
+        if (expandKeys.some((key) => SUPPORTED_EXPAND_PROPERTIES.indexOf(key.toLowerCase()) !== -1)) {
+            return expandKeys
+                .map((key) => {
+                let value;
+                switch (key) {
+                    case 'filter':
+                        value = buildFilter(expands[key], {
+                            aliases,
+                            escape,
+                        });
+                        break;
+                    case 'orderBy':
+                        value = buildOrderBy(expands[key]);
+                        break;
+                    case 'levels':
+                    case 'count':
+                    case 'top':
+                    case 'skip':
+                        value = `${expands[key]}`;
+                        if (isRawType(value))
+                            value = value.value;
+                        break;
+                    default:
+                        value = buildExpand(expands[key], { aliases, escape });
+                }
+                return `$${key.toLowerCase()}=${value}`;
+            })
+                .join(';');
+        }
+        else {
+            return expandKeys
+                .map((key) => {
+                const builtExpand = buildExpand(expands[key], { aliases, escape });
+                return builtExpand ? `${key}(${builtExpand})` : key;
+            })
+                .join(',');
+        }
+    }
+    return '';
+}
+function buildTransforms(transforms, { aliases, escape = false, }) {
+    // Wrap single object an array for simplified processing
+    const transformsArray = Array.isArray(transforms) ? transforms : [transforms];
+    const transformsResult = transformsArray.reduce((result, transform) => {
+        const { aggregate, filter, groupBy, ...rest } = transform;
+        // TODO: support as many of the following:
+        //   topcount, topsum, toppercent,
+        //   bottomsum, bottomcount, bottompercent,
+        //   identity, concat, expand, search, compute, isdefined
+        const unsupportedKeys = Object.keys(rest);
+        if (unsupportedKeys.length) {
+            throw new Error(`Unsupported transform(s): ${unsupportedKeys}`);
+        }
+        if (aggregate) {
+            result.push(`aggregate(${buildAggregate(aggregate)})`);
+        }
+        if (filter) {
+            const builtFilter = buildFilter(filter, { aliases, escape });
+            if (builtFilter) {
+                result.push(`filter(${buildFilter(builtFilter, { aliases, escape })})`);
+            }
         }
-        return (annot.string ||
-            annot.bool ||
-            annot.int ||
-            annot.permissions ||
-            annot.properties);
-    }
+        if (groupBy) {
+            result.push(`groupby(${buildGroupBy(groupBy, { aliases, escape })})`);
+        }
+        return result;
+    }, []);
+    return transformsResult.join('/') || undefined;
 }
-
-class ODataSchemaElement extends ODataAnnotatable {
-    name;
-    schema;
-    constructor(config, schema) {
-        super(config);
-        this.schema = schema;
-        this.name = config.name;
-    }
-    get api() {
-        return this.schema.api;
-    }
-    /**
-     * Create a nicer looking title.
-     * Titleize is meant for creating pretty output.
-     * @param term The term of the annotation to find.
-     * @returns The titleized string.
-     */
-    titleize(term) {
-        return (term && this.annotatedValue(term)) ?? Strings.titleCase(this.name);
+function buildAggregate(aggregate) {
+    // Wrap single object in an array for simplified processing
+    const aggregateArray = Array.isArray(aggregate) ? aggregate : [aggregate];
+    return aggregateArray
+        .map((aggregateItem) => {
+        return typeof aggregateItem === 'string'
+            ? aggregateItem
+            : Object.keys(aggregateItem).map((aggregateKey) => {
+                const aggregateValue = aggregateItem[aggregateKey];
+                // TODO: Are these always required?  Can/should we default them if so?
+                if (!aggregateValue.with) {
+                    throw new Error(`'with' property required for '${aggregateKey}'`);
+                }
+                if (!aggregateValue.as) {
+                    throw new Error(`'as' property required for '${aggregateKey}'`);
+                }
+                return `${aggregateKey} with ${aggregateValue.with} as ${aggregateValue.as}`;
+            });
+    })
+        .join(',');
+}
+function buildGroupBy(groupBy, { aliases, escape = false, }) {
+    if (!groupBy.properties) {
+        throw new Error(`'properties' property required for groupBy`);
     }
-    /**
-     * Returns a full type of the structured type including the namespace/alias.
-     * @param alias Use the alias of the namespace instead of the namespace.
-     * @returns The string representation of the type.
-     */
-    type({ alias = false } = {}) {
-        return `${alias ? this.schema.alias : this.schema.namespace}.${this.name}`;
+    let result = `(${groupBy.properties.join(',')})`;
+    if (groupBy.transform) {
+        result += `,${buildTransforms(groupBy.transform, { aliases, escape })}`;
     }
-    /**
-     * Returns a boolean indicating if the structured type is of the given type.
-     * @param type String representation of the type
-     * @returns True if the callable is type of the given type
-     */
-    isTypeOf(element) {
-        const names = [`${this.schema.namespace}.${this.name}`];
-        if (this.schema.alias)
-            names.push(`${this.schema.alias}.${this.name}`);
-        return names.includes(element.type());
+    return result;
+}
+function buildOrderBy(orderBy, prefix = '') {
+    if (isRawType(orderBy)) {
+        return orderBy.value;
     }
-    /**
-     * Returns a boolean indicating if the structured type is a subtype of the given type.
-     * @param type String representation of the type
-     * @returns True if the callable is type of the given type
-     */
-    isSubtypeOf(element) {
-        if (this.isTypeOf(element))
-            return true;
-        return false;
+    else if (Array.isArray(orderBy)) {
+        return orderBy
+            .map((value) => Array.isArray(value) &&
+            value.length === 2 &&
+            ['asc', 'desc'].indexOf(value[1]) !== -1
+            ? value.join(' ')
+            : value)
+            .map((v) => `${prefix}${v}`)
+            .join(',');
     }
-    /**
-     * Returns a boolean indicating if the structured type is a supertype of the given type.
-     * @param type String representation of the type
-     * @returns True if the callable is type of the given type
-     */
-    isSupertypeOf(element) {
-        if (this.isTypeOf(element))
-            return true;
-        return false;
+    else if (typeof orderBy === 'object') {
+        return Object.entries(orderBy)
+            .map(([k, v]) => buildOrderBy(v, `${k}/`))
+            .map((v) => `${prefix}${v}`)
+            .join(',');
     }
+    return `${prefix}${orderBy}`;
 }
-class ODataParserSchemaElement extends ODataSchemaElement {
-    parser;
-    constructor(config, schema, parser) {
-        super(config, schema);
-        this.parser = parser;
-    }
+function buildApply(apply, { aliases, escape = false, }) {
+    const applyArray = Array.isArray(apply) ? apply : [apply];
+    return applyArray
+        .map((v) => normalizeValue(v, { aliases, escape }))
+        .join('/');
 }
-
-//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;
+function buildUrl(path, params) {
+    // This can be refactored using URL API. But IE does not support it.
+    const queries = Object.entries(params).map(([key, value]) => `${key}=${value}`);
+    return queries.length ? `${path}?${queries.join('&')}` : path;
 }
-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--;
-            }
+function parseNot(builtFilters) {
+    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))/;
+const Dates = {
+    isoStringToDate(value) {
+        if (typeof value === 'string' && value.search(ISO_REGEX) === 0) {
+            return new Date(value);
         }
-        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);
+        else if (Array.isArray(value)) {
+            return value.map((v) => this.isoStringToDate(v));
+        }
+        else if (value && value.constructor === Object) {
+            return Object.keys(value)
+                .map((key) => [key, this.isoStringToDate(value[key])])
+                .reduce((acc, v) => Object.assign(acc, { [v[0]]: v[1] }), {});
+        }
+        return value;
+    },
+};
+
+const DURATION_REGEX = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
+const Durations = {
+    toDuration(v) {
+        const matches = DURATION_REGEX.exec(v);
+        if (!matches || v.length < 3) {
+            throw new TypeError(`duration invalid: "${v}". Must be a ISO 8601 duration. See https://en.wikipedia.org/wiki/ISO_8601#Durations`);
+        }
+        let duration = {};
+        duration.sign = matches[1] === '-' ? -1 : 1;
+        return [
+            'years',
+            'months',
+            'weeks',
+            'days',
+            'hours',
+            'minutes',
+            'seconds',
+        ].reduce((acc, name, index) => {
+            const v = parseFloat(matches[index + 2]);
+            if (!Number.isNaN(v))
+                acc[name] = v;
+            return acc;
+        }, duration);
+    },
+    toString(v) {
+        return [
+            v.sign === -1 ? '-' : '',
+            'P',
+            v.years ? v.years + 'Y' : '',
+            v.months ? v.months + 'M' : '',
+            v.weeks ? v.weeks + 'W' : '',
+            v.days ? v.days + 'D' : '',
+            'T',
+            v.hours ? v.hours + 'H' : '',
+            v.minutes ? v.minutes + 'M' : '',
+            v.seconds ? v.seconds + 'S' : '',
+        ].join('');
+    },
+};
+
+const Enums = {
+    names(enums) {
+        return Object.values(enums).filter((v) => typeof v === 'string');
+    },
+    values(enums) {
+        return Object.values(enums).filter((v) => typeof v === 'number');
+    },
+    toValue(enums, value) {
+        if (value in enums)
+            return typeof value === 'string' ? enums[value] : value;
+        return undefined;
+    },
+    toValues(enums, value) {
+        if (typeof value === 'number') {
+            return this.values(enums).filter((v) => (value & v) === v);
+        }
+        if (typeof value === 'string') {
+            value = value.split(',').map((o) => o.trim());
+        }
+        if (Array.isArray(value) && value.every((v) => v in enums)) {
+            return value.map((o) => this.toValue(enums, o));
+        }
+        return [];
+    },
+    toName(enums, value) {
+        if (value in enums)
+            return typeof value === 'number' ? enums[value] : value;
+        return undefined;
+    },
+    toNames(enums, value) {
+        if (typeof value === 'number') {
+            return this.values(enums)
+                .filter((v) => (value & v) === v)
+                .map((v) => this.toName(enums, v));
+        }
+        if (typeof value === 'string') {
+            value = value.split(',').map((o) => o.trim());
+        }
+        if (Array.isArray(value) && value.every((v) => v in enums)) {
+            return value.map((o) => this.toName(enums, o));
         }
-        return arraybuffer;
+        return [];
     },
-    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];
+    toFlags(enums, value) {
+        if (typeof value === 'number') {
+            return this.values(enums)
+                .filter((v) => v !== 0 && (value & v) === v)
+                .map((v) => this.toName(enums, v));
         }
-        if (len % 3 === 2) {
-            base64 = base64.substring(0, base64.length - 1) + '=';
+        if (typeof value === 'string') {
+            value = value.split(',').map((o) => o.trim());
         }
-        else if (len % 3 === 1) {
-            base64 = base64.substring(0, base64.length - 2) + '==';
+        if (Array.isArray(value) && value.every((v) => v in enums)) {
+            return value
+                .filter((v) => enums[v])
+                .map((v) => this.toName(enums, v));
         }
-        return base64;
+        return [];
     },
 };
 
-// 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);
+function cloneSymbol(targe) {
+    return Object(Symbol.prototype.valueOf.call(targe));
+}
+function cloneReg(targe) {
+    const reFlags = /\w*$/;
+    const result = new targe.constructor(targe.source, reFlags.exec(targe));
+    result.lastIndex = targe.lastIndex;
+    return result;
+}
+const Types = {
+    rawType(value) {
+        return Object.prototype.toString.call(value).slice(8, -1);
     },
-    encode(value, options) {
-        return Array.isArray(value)
-            ? value.map((v) => (!isRawType(v) ? _e(v, options) : v))
-            : !isRawType(value)
-                ? _e(value, options)
-                : value;
+    isObject(value) {
+        return typeof value === 'object' && value !== null;
     },
-});
-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);
+    isPlainObject(value) {
+        if (this.rawType(value) !== 'Object') {
+            return false;
         }
-        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),
-            ];
+        const prototype = Object.getPrototypeOf(value);
+        return prototype === null || prototype === Object.prototype;
+    },
+    isFunction(value) {
+        return typeof value === 'function';
+    },
+    isArray(value) {
+        return Array.isArray(value);
+    },
+    isMap(value) {
+        return this.rawType(value) === 'Map';
+    },
+    isEmpty(value) {
+        return (value === undefined ||
+            value === null ||
+            (typeof value === 'string' && !value.length) ||
+            (value instanceof Date && isNaN(value.valueOf())) ||
+            (Types.isMap(value) && !value.size) ||
+            (Types.isArray(value) && !value.length) ||
+            (Types.isFunction(value.isEmpty) && value.isEmpty()) ||
+            (Types.isArray(value) &&
+                value.every((v) => Types.isEmpty(v))) ||
+            (Types.isPlainObject(value) &&
+                !Object.keys(value).filter((k) => value.hasOwnProperty(k)).length));
+    },
+    isEqual(value1, value2) {
+        function getType(obj) {
+            return Object.prototype.toString.call(obj).slice(8, -1).toLowerCase();
         }
-        if (typeof namesValue === 'string') {
-            const names = namesValue.split(',').map((o) => o.trim());
-            return this._fields.filter((f) => names.includes(f.name));
+        function areDatesEqual() {
+            return value1.getTime() === value2.getTime();
         }
-        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);
+        function areArraysBufferEqual() {
+            if (value1.byteLength !== value2.byteLength) {
+                return false;
+            }
+            var view1 = new DataView(value1);
+            var view2 = new DataView(value2);
+            var i = value1.byteLength;
+            while (i--) {
+                if (view1.getUint8(i) !== view2.getUint8(i)) {
+                    return false;
+                }
+            }
+            return true;
         }
-        else {
-            return this.field(value)?.value;
+        function areArraysEqual() {
+            // Check length
+            if (value1.length !== value2.length)
+                return false;
+            // Check each item in the array
+            for (let i = 0; i < value1.length; i++) {
+                if (!Types.isEqual(value1[i], value2[i]))
+                    return false;
+            }
+            // If no errors, return true
+            return true;
         }
-    }
-    // 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(', ');
+        function areObjectsEqual() {
+            if (Object.keys(value1).length !== Object.keys(value2).length)
+                return false;
+            // Check each item in the object
+            for (let key in value1) {
+                if (Object.prototype.hasOwnProperty.call(value1, key)) {
+                    if (!Types.isEqual(value1[key], value2[key]))
+                        return false;
+                }
+            }
+            // If no errors, return true
+            return true;
         }
-        else {
-            let name = this.field(value)?.name;
-            if (name === undefined)
-                name = `${value}`;
-            return !parserOptions?.stringAsEnum
-                ? `${this.namespace}.${this.name}'${name}'`
-                : name;
+        function areFunctionsEqual() {
+            return value1.toString() === value2.toString();
         }
-    }
-    //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;
+        function arePrimativesEqual() {
+            return value1 === value2;
         }
-        else {
-            return this.fields(value).length !== 1 ? ['mismatch'] : undefined;
+        // Get the object type
+        let type = getType(value1);
+        // If the two items are not the same type, return false
+        if (type !== getType(value2))
+            return false;
+        // Compare based on type
+        if (type === 'date')
+            return areDatesEqual();
+        if (type === 'arraybuffer')
+            return areArraysBufferEqual();
+        if (type === 'array')
+            return areArraysEqual();
+        if (type === 'object')
+            return areObjectsEqual();
+        if (type === 'function')
+            return areFunctionsEqual();
+        return arePrimativesEqual();
+    },
+    clone(target) {
+        const constrFun = target.constructor;
+        switch (this.rawType(target)) {
+            case 'Boolean':
+            case 'Number':
+            case 'String':
+            case 'Error':
+            case 'Date':
+                return new constrFun(target);
+            case 'RegExp':
+                return cloneReg(target);
+            case 'Symbol':
+                return cloneSymbol(target);
+            case 'Function':
+                return target;
+            default:
+                return null;
         }
-    }
-    unpack(value) {
-        return this.fields(value).map((f) => f.value);
-    }
-    pack(value) {
-        return this.fields(value).reduce((acc, v) => acc | v.value, 0);
-    }
-}
+    },
+};
 
-const COLLECTION = /Collection\(([\w\.]+)\)/;
-const PROPERTY = /([\w\d\-_]+)\(([\'\w\d\-_=]+)\)/;
-const EXPAND = /([\w\d\-_]+)\(([\w\d\,\(\)]+)\)/;
-const ODataVersionBaseHelper = {
-    entity(data) {
-        return data;
+const Http = {
+    //Merge Headers
+    mergeHttpHeaders(...values) {
+        let headers = new HttpHeaders();
+        values.forEach((value) => {
+            if (value instanceof HttpHeaders) {
+                value.keys().forEach((key) => {
+                    headers = (value.getAll(key) || []).reduce((acc, v) => acc.append(key, v), headers);
+                });
+            }
+            else if (Types.isPlainObject(value)) {
+                Object.entries(value).forEach(([key, value]) => {
+                    headers = (Array.isArray(value) ? value : [value]).reduce((acc, v) => acc.append(key, v), headers);
+                });
+            }
+        });
+        return headers;
     },
-    entities(data) {
-        return data[this.VALUE];
+    // Merge Params
+    mergeHttpParams(...values) {
+        let params = new HttpParams();
+        values.forEach((value) => {
+            if (value instanceof HttpParams) {
+                value.keys().forEach((key) => {
+                    params = (value.getAll(key) || []).reduce((acc, v) => acc.append(key, v), params);
+                });
+            }
+            else if (Types.isPlainObject(value)) {
+                Object.entries(value).forEach(([key, value]) => {
+                    params = (Array.isArray(value) ? value : [value]).reduce((acc, v) => acc.append(key, v), params);
+                });
+            }
+        });
+        return params;
     },
-    property(data) {
-        return this.VALUE in data ? data[this.VALUE] : data;
+    // Split Params
+    splitHttpParams(params, keys) {
+        let other = new HttpParams();
+        params.keys().forEach((key) => {
+            if (keys.includes(key)) {
+                other = (params.getAll(key) || []).reduce((acc, v) => acc.append(key, v), other);
+                params = params.delete(key);
+            }
+        });
+        return [params, other];
     },
-    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;
+    // Without Params
+    withoutHttpParams(params, keys) {
+        return keys.reduce((acc, key) => acc.delete(key), params);
     },
-    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;
+    resolveHeaderKey(headers, options) {
+        if (headers instanceof HttpHeaders) {
+            return headers.keys().find((k) => options.indexOf(k) !== -1);
+        }
+        else if (Types.isPlainObject(headers)) {
+            return Object.keys(headers).find((k) => options.indexOf(k) !== -1);
+        }
+        return undefined;
     },
-    id(annots) {
-        return annots instanceof Map
-            ? annots.get(this.ODATA_ID)
-            : annots[this.ODATA_ID];
+    headerValue(header) {
+        let res = header.split(';')[0].trim();
+        res = res.split(':')[1].trim();
+        return res;
     },
-    etag(annots) {
-        return annots instanceof Map
-            ? annots.get(this.ODATA_ETAG)
-            : annots[this.ODATA_ETAG];
+    parseResponseStatus(line) {
+        const chunks = line.split(' ');
+        return {
+            status: chunks[0],
+            code: parseInt(chunks[1], 10),
+            message: chunks.slice(2).join(' '),
+        };
     },
-    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;
+    boundaryDelimiter(contentType) {
+        const contentTypeParts = contentType.split(';');
+        if (contentTypeParts.length === 2) {
+            const boundary = contentType.split(';')[1].trim();
+            const boundaryDelimiter = BOUNDARY_PREFIX_SUFFIX + boundary.split('=')[1];
+            return boundaryDelimiter;
+        }
+        else {
+            return '';
+        }
+    },
+    boundaryEnd(boundaryDelimiter) {
+        if (!boundaryDelimiter.length) {
+            return '';
+        }
+        const boundaryEnd = boundaryDelimiter + BOUNDARY_PREFIX_SUFFIX;
+        return boundaryEnd;
+    },
+};
+
+function forEach(array, iteratee) {
+    let index = -1;
+    const length = array.length;
+    while (++index < length) {
+        iteratee(array[index], index);
+    }
+    return array;
+}
+const Objects = {
+    set(obj, path, value) {
+        // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
+        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
+        pathArray.reduce((acc, key, i) => {
+            if (acc[key] === undefined)
+                acc[key] = {};
+            if (i === pathArray.length - 1)
+                acc[key] = value;
+            return acc[key];
+        }, obj);
     },
-    mediaEtag(annots) {
-        return annots.has(this.ODATA_MEDIA_ETAG)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_ETAG))
-            : undefined;
+    get(obj, path, def) {
+        // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
+        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
+        // Find value if exist return otherwise return undefined value;
+        return (pathArray.reduce((prevObj, key) => prevObj && prevObj[key], obj) || def);
     },
-    metadataEtag(annots) {
-        return annots.has(this.ODATA_METADATA_ETAG)
-            ? decodeURIComponent(annots.get(this.ODATA_METADATA_ETAG))
-            : undefined;
+    unset(obj, path) {
+        // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
+        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
+        pathArray.reduce((acc, key, i) => {
+            if (i === pathArray.length - 1)
+                delete acc[key];
+            return acc[key];
+        }, obj);
     },
-    count(annots) {
-        return annots.has(this.ODATA_COUNT)
-            ? Number(annots.get(this.ODATA_COUNT))
-            : undefined;
+    has(obj, path) {
+        // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
+        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
+        return !!pathArray.reduce((prevObj, key) => prevObj && prevObj[key], obj);
     },
-    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;
+    merge(target, source) {
+        const merge = (target, source) => {
+            for (let attr in source) {
+                let value = source[attr];
+                if (value !== null && Types.isPlainObject(value) && attr in target) {
+                    merge(target[attr], value);
+                }
+                else if (target[attr] !== value) {
+                    target[attr] = value;
+                }
+            }
+        };
+        merge(target, source);
+        return target;
     },
-    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] }), {});
+    equal(object1, object2) {
+        const keys1 = Object.keys(object1);
+        const keys2 = Object.keys(object2);
+        if (keys1.length !== keys2.length) {
+            return false;
+        }
+        for (const key of keys1) {
+            const val1 = object1[key];
+            const val2 = object2[key];
+            const areObjects = Types.isPlainObject(val1) && Types.isPlainObject(val2);
+            if ((areObjects && !Objects.equal(val1, val2)) ||
+                (!areObjects && val1 !== val2)) {
+                return false;
+            }
+        }
+        return true;
     },
-    nextLink(annots) {
-        return annots.has(this.ODATA_NEXTLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_NEXTLINK))
-            : undefined;
+    difference(object1, object2) {
+        if (!object2 || !Types.isPlainObject(object2)) {
+            return object1;
+        }
+        var diffs = {};
+        var key;
+        var arraysMatch = function (arr1, arr2) {
+            if (arr1.length !== arr2.length)
+                return false;
+            for (var i = 0; i < arr1.length; i++) {
+                if (arr1[i] !== arr2[i])
+                    return false;
+            }
+            return true;
+        };
+        var compare = function (item1, item2, key) {
+            if (item2 === undefined) {
+                diffs[key] = null;
+                return;
+            }
+            if (typeof item1 !== typeof item2) {
+                diffs[key] = item2;
+                return;
+            }
+            if (Types.isPlainObject(item1)) {
+                var objDiff = Objects.difference(item1, item2);
+                if (Object.keys(objDiff).length > 0) {
+                    diffs[key] = objDiff;
+                }
+                return;
+            }
+            if (Array.isArray(item1)) {
+                if (!arraysMatch(item1, item2)) {
+                    diffs[key] = item2;
+                }
+                return;
+            }
+            if (item1 !== item2) {
+                diffs[key] = item2;
+            }
+        };
+        for (key in object1) {
+            if (object1.hasOwnProperty(key)) {
+                compare(object1[key], object2[key], key);
+            }
+        }
+        for (key in object2) {
+            if (object2.hasOwnProperty(key)) {
+                if (!object1[key] && object1[key] !== object2[key]) {
+                    diffs[key] = object2[key];
+                }
+            }
+        }
+        return diffs;
     },
-    readLink(annots) {
-        return annots.has(this.ODATA_READLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_READLINK))
-            : undefined;
+    resolveKey(key, { single = true } = {}) {
+        const type = Types.rawType(key);
+        if (['number', 'string'].indexOf(type) !== -1)
+            return key;
+        if (type !== 'Map' && type !== 'Object') {
+            return undefined;
+        }
+        const values = type === 'Map' ? Array.from(key.values()) : Object.values(key);
+        if (values.length === 1 && single) {
+            // Single primitive key value
+            key = values[0];
+            return !Types.isEmpty(key) ? key : undefined;
+        }
+        else if (values.some((v) => v === undefined)) {
+            // Compose key, needs all values
+            return undefined;
+        }
+        else {
+            const obj = type === 'Map' ? Object.fromEntries(key) : key;
+            return !Types.isEmpty(obj) ? obj : undefined;
+        }
     },
-    mediaReadLink(annots) {
-        return annots.has(this.ODATA_MEDIA_READLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_READLINK))
-            : undefined;
+    clone(target, map) {
+        if (map === undefined)
+            map = new WeakMap();
+        // clone primitive types
+        if (typeof target != 'object' || target == null) {
+            return target;
+        }
+        if ('clone' in target) {
+            // target is a cloneable object
+            return target.clone();
+        }
+        const type = Types.rawType(target);
+        let cloneTarget = null;
+        if (map.get(target)) {
+            return map.get(target);
+        }
+        map.set(target, cloneTarget);
+        if (type != 'Set' && type != 'Map' && type != 'Array' && type != 'Object') {
+            return Types.clone(target);
+        }
+        // clone Set
+        if (type == 'Set') {
+            cloneTarget = new Set();
+            target.forEach((value) => {
+                cloneTarget.add(this.clone(value, map));
+            });
+            return cloneTarget;
+        }
+        // clone Map
+        if (type == 'Map') {
+            cloneTarget = new Map();
+            target.forEach((value, key) => {
+                cloneTarget.set(key, this.clone(value, map));
+            });
+            return cloneTarget;
+        }
+        // clone Array
+        if (type == 'Array') {
+            cloneTarget = new Array();
+            forEach(target, (value, index) => {
+                cloneTarget[index] = this.clone(value, map);
+            });
+        }
+        // clone normal Object
+        if (type == 'Object') {
+            cloneTarget = new Object();
+            forEach(Object.keys(target), (key, index) => {
+                cloneTarget[key] = this.clone(target[key], map);
+            });
+        }
+        return cloneTarget;
     },
-    editLink(annots) {
-        return annots.has(this.ODATA_EDITLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_EDITLINK))
-            : undefined;
+};
+
+const OData = {
+    // Merge callables parameters
+    mergeCallableParameters(callables) {
+        const areEqual = (a, b) => a.name === b.name &&
+            Objects.equal((a.parameters || {})[CALLABLE_BINDING_PARAMETER] || {}, (b.parameters || {})[CALLABLE_BINDING_PARAMETER] || {});
+        return callables.reduce((acc, config) => {
+            if (acc.every((c) => !areEqual(c, config))) {
+                config = callables
+                    .filter((c) => areEqual(c, config))
+                    .reduce((acc, c) => {
+                    acc.parameters = Object.assign(acc.parameters || {}, c.parameters || {});
+                    return acc;
+                }, config);
+                return [...acc, config];
+            }
+            return acc;
+        }, []);
     },
-    mediaEditLink(annots) {
-        return annots.has(this.ODATA_MEDIA_EDITLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_EDITLINK))
-            : undefined;
+};
+
+// From https://github.com/adamhalasz/uniqid
+var glast;
+function now() {
+    let time = Date.now();
+    let last = glast || time;
+    return (glast = time > last ? time : last + 1);
+}
+const Strings = {
+    uniqueId({ prefix, suffix, } = {}) {
+        return (prefix ? prefix : '') + now().toString(36) + (suffix ? suffix : '');
     },
-    deltaLink(annots) {
-        return annots.has(this.ODATA_DELTALINK)
-            ? decodeURIComponent(annots.get(this.ODATA_DELTALINK))
-            : undefined;
+    titleCase(text) {
+        const result = text.replace(/([a-z])([A-Z])/g, '$1 $2');
+        return result
+            .split(' ')
+            .map((p) => p.charAt(0).toUpperCase() + p.slice(1))
+            .join(' ');
     },
-    mediaContentType(annots) {
-        return annots.has(this.ODATA_MEDIA_CONTENTTYPE)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_CONTENTTYPE))
-            : undefined;
+};
+
+const Urls = {
+    parseQueryString(query) {
+        return query.split(PARAM_SEPARATOR).reduce((acc, param) => {
+            let index = param.indexOf(VALUE_SEPARATOR);
+            if (index !== -1)
+                Object.assign(acc, {
+                    [param.substring(0, index)]: param.substring(index + 1),
+                });
+            return acc;
+        }, {});
+    },
+    escapeIllegalChars(string) {
+        string = string.replace(/%/g, '%25');
+        string = string.replace(/\+/g, '%2B');
+        string = string.replace(/\//g, '%2F');
+        string = string.replace(/\?/g, '%3F');
+        string = string.replace(/#/g, '%23');
+        string = string.replace(/&/g, '%26');
+        string = string.replace(/'/g, "''");
+        return string;
     },
 };
-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];
-                    }
-                }
+
+class Expression {
+    _children;
+    constructor({ children, } = {}) {
+        this._children = children || [];
+    }
+    get [Symbol.toStringTag]() {
+        return 'Expression';
+    }
+    children() {
+        return [...this._children];
+    }
+    length() {
+        return this._children.length;
+    }
+    toJson() {
+        return {
+            $type: Types.rawType(this),
+            children: this._children.map((c) => c.toJson()),
+        };
+    }
+    resolve(parser) {
+        return parser;
+    }
+}
+
+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));
+    }
+    /**
+     * Find an annotation inside the annotatable.
+     * @param predicate Function that returns true if the annotation match.
+     * @returns The annotation that matches the predicate.
+     */
+    findAnnotation(predicate) {
+        return this.annotations.find(predicate);
+    }
+    /**
+     * Find an annotation inside the annotatable and return its value.
+     * @param term The term of the annotation to find.
+     * @returns The value of the annotation.
+     */
+    annotatedValue(term) {
+        const reg = term instanceof RegExp ? term : new RegExp(`^${term}$`);
+        const annot = this.findAnnotation((a) => reg.test(a.term));
+        if (!annot) {
+            return undefined;
+        }
+        return (annot.string ||
+            annot.bool ||
+            annot.int ||
+            annot.permissions ||
+            annot.properties);
+    }
+}
+
+class ODataSchemaElement extends ODataAnnotatable {
+    name;
+    schema;
+    constructor(config, schema) {
+        super(config);
+        this.schema = schema;
+        this.name = config.name;
+    }
+    get api() {
+        return this.schema.api;
+    }
+    /**
+     * Create a nicer looking title.
+     * Titleize is meant for creating pretty output.
+     * @param term The term of the annotation to find.
+     * @returns The titleized string.
+     */
+    titleize(term) {
+        return (term && this.annotatedValue(term)) ?? Strings.titleCase(this.name);
+    }
+    /**
+     * Returns a full type of the structured type including the namespace/alias.
+     * @param alias Use the alias of the namespace instead of the namespace.
+     * @returns The string representation of the type.
+     */
+    type({ alias = false } = {}) {
+        return `${alias ? this.schema.alias : this.schema.namespace}.${this.name}`;
+    }
+    /**
+     * Returns a boolean indicating if the structured type is of the given type.
+     * @param type String representation of the type
+     * @returns True if the callable is type of the given type
+     */
+    isTypeOf(element) {
+        const names = [`${this.schema.namespace}.${this.name}`];
+        if (this.schema.alias)
+            names.push(`${this.schema.alias}.${this.name}`);
+        return names.includes(element.type());
+    }
+    /**
+     * Returns a boolean indicating if the structured type is a subtype of the given type.
+     * @param type String representation of the type
+     * @returns True if the callable is type of the given type
+     */
+    isSubtypeOf(element) {
+        if (this.isTypeOf(element))
+            return true;
+        return false;
+    }
+    /**
+     * Returns a boolean indicating if the structured type is a supertype of the given type.
+     * @param type String representation of the type
+     * @returns True if the callable is type of the given type
+     */
+    isSupertypeOf(element) {
+        if (this.isTypeOf(element))
+            return true;
+        return false;
+    }
+}
+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--;
             }
-            return ctx;
-        },
-        countParam() {
-            return { [$COUNT]: 'true' };
-        },
+        }
+        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;
     },
-    //#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];
-            }
-            return ctx;
-        },
-        countParam() {
-            return { [$INLINECOUNT]: 'allpages' };
-        },
+    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;
     },
-    //#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));
+};
+
+// 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 {
+    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,
+                },
             }
-            return annots;
-        },
-        context(annots) {
-            let ctx = {};
-            return ctx;
-        },
-        attributes(value, metadata) {
-            return value;
-        },
-        countParam() {
-            return { [$INLINECOUNT]: 'allpages' };
-        },
-    },
-    //#endregion
-};
+            : {
+                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;
@@ -3555,7 +3353,7 @@ class CountExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new CountExpression(),
-        }, current);
+        }, current ?? new CountExpression());
     }
     _add(node) {
         this._children.push(node);
@@ -3597,8 +3395,8 @@ class FilterExpression extends Expression {
     _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';
@@ -3609,7 +3407,7 @@ class FilterExpression extends Expression {
             t: FieldFactory(),
             o: operators,
             f: functions,
-        }, current);
+        }, current ?? new FilterExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -3767,6 +3565,9 @@ 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 {
@@ -3804,8 +3605,8 @@ class SearchExpression extends Expression {
     _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';
@@ -3813,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) {
@@ -3908,6 +3709,9 @@ 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 {
@@ -3915,8 +3719,8 @@ class GroupByTransformations extends Expression {
     aliases;
     constructor({ children, methods, aliases, } = {}) {
         super({ children });
-        this.methods = methods || [];
-        this.aliases = aliases || [];
+        this.methods = methods ?? [];
+        this.aliases = aliases ?? [];
     }
     get [Symbol.toStringTag]() {
         return 'GroupByTransformations';
@@ -3991,7 +3795,7 @@ class ApplyExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new ApplyExpression(),
-        }, current);
+        }, current ?? new ApplyExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -4102,7 +3906,7 @@ class ApplyExpression extends Expression {
     orderBy(
       opts: (
         builder: OrderByExpressionBuilder<T>,
-        current?: OrderByExpression<T>
+        current: OrderByExpression<T>
       ) => OrderByExpression<T>,
       current?: OrderByExpression<T>
     ) {
@@ -4111,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));
     }
@@ -4188,7 +3992,7 @@ class OrderByExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new OrderByExpression(),
-        }, current);
+        }, current ?? new OrderByExpression());
     }
     _add(node) {
         this._children.push(node);
@@ -4220,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 {
@@ -4233,7 +4040,7 @@ class SelectExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new SelectExpression(),
-        }, current);
+        }, current ?? new SelectExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -4267,6 +4074,9 @@ class SelectExpression extends Expression {
         fields.forEach((f) => this._add(f));
         return this;
     }
+    combine(expression) {
+        return this._add(expression);
+    }
 }
 
 class ExpandField {
@@ -4381,7 +4191,7 @@ class ExpandExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new ExpandExpression(),
-        }, current);
+        }, current ?? new ExpandExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -4412,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 }, {
@@ -5177,7 +4990,7 @@ class ComputeExpression extends Expression {
     names;
     constructor({ children, names, } = {}) {
         super({ children });
-        this.names = names || [];
+        this.names = names ?? [];
     }
     get [Symbol.toStringTag]() {
         return 'ComputeExpression';
@@ -5186,7 +4999,7 @@ class ComputeExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new ComputeExpression(),
-        }, current);
+        }, current ?? new ComputeExpression());
     }
     toJson() {
         const json = super.toJson();
@@ -5633,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();
     }
@@ -5642,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
@@ -10380,62 +10310,7 @@ class ODataResponse extends HttpResponse {
             : payload);
         if (value !== null)
             value = this.resource.deserialize(value, options);
-        return value;
-    }
-}
-
-class ODataInStorageCache extends ODataCache {
-    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;
+        return value;
     }
 }
 
@@ -11223,7 +11098,9 @@ class ODataCollection {
             result = 1;
         else if (value1 == null && value2 == null)
             result = 0;
-        else if ((typeof value1 == 'string' || value1 instanceof String) && value1.localeCompare && value1 != 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;
@@ -13159,7 +13036,7 @@ class ODataApi {
             ...config.options,
             version: this.version,
         });
-        this.cache = config.cache ?? new ODataInMemoryCache();
+        this.cache = config.cache;
         this.errorHandler = config.errorHandler;
         this.parsers = new Map(Object.entries(config.parsers ?? EDM_PARSERS));
         this.schemas = (config.schemas ?? []).map((schema) => new ODataSchema(schema, this));
@@ -13304,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) {
@@ -13906,10 +13785,10 @@ class ODataClient {
     put(resource, body, options = {}) {
         return this.request('PUT', resource, addBody(options, body));
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.1.0", 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: "18.1.0", 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 }] });
 
@@ -14193,10 +14072,10 @@ class ODataServiceFactory {
         };
         return new Service(this.client, singletonName, apiNameOrEntityType);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.1.0", 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: "18.1.0", 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 }] });
 
@@ -14236,11 +14115,11 @@ class ODataModule {
             ],
         };
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.1.0", ngImport: i0, type: ODataModule, imports: [CommonModule, HttpClientModule] });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.1.0", 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: "18.1.0", 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],
@@ -14248,6 +14127,263 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", 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
  */
@@ -14256,5 +14392,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", 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, ODataAnnotations, ODataApi, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCache, 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 };
+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