angular-odata 0.146.2 → 0.148.0

package/fesm2022/angular-odata.mjs

@@ -1,9 +1,8 @@
-import * as i1 from '@angular/common/http';
-import { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType } from '@angular/common/http';
-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 { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType, provideHttpClient, HttpClient } from '@angular/common/http';
+import { Subject, map as map$1, EMPTY, throwError, Observable, forkJoin, of, NEVER, firstValueFrom } from 'rxjs';
+import { map, expand, reduce, finalize, defaultIfEmpty, switchMap, catchError, startWith, tap } from 'rxjs/operators';
 import * as i0 from '@angular/core';
-import { EventEmitter, Injectable, InjectionToken, makeEnvironmentProviders, NgModule } from '@angular/core';
+import { EventEmitter, Injectable, InjectionToken, provideAppInitializer, inject, makeEnvironmentProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 var PathSegment;
@@ -528,7 +527,11 @@ const binary = (value) => ({
     type: QueryCustomTypes.Binary,
     value,
 });
-const isQueryCustomType = (value) => typeof value === 'object' && 'type' in value && value.type in QueryCustomTypes;
+const isQueryCustomType = (value) => value !== null &&
+    value !== undefined &&
+    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, } = {}) {
@@ -1849,10 +1852,7 @@ class ODataSchemaElement extends ODataAnnotatable {
      * @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 this.type() === element.type();
     }
     /**
      * Returns a boolean indicating if the structured type is a subtype of the given type.
@@ -1946,10 +1946,10 @@ const EdmParser = (_d, _s, _e) => ({
     },
 });
 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 toNumber = (v) => v && Number(v);
+const toString = (v) => v && v.toString();
+const toBoolean = (v) => v && Boolean(v);
+const toDate = (v) => v && new Date(v);
 const EDM_PARSERS = {
     //Edm.Guid 16-byte (128-bit) unique identifier
     [EdmType.Guid]: EdmParser(Identity, Identity, (v) => raw(v)),
@@ -2112,8 +2112,8 @@ class ODataEnumTypeParser extends ODataAnnotatable {
             if (names.length === 0)
                 names = [`${value}`];
             return !parserOptions?.stringAsEnum
-                ? `${this.namespace}.${this.name}'${names.join(', ')}'`
-                : names.join(', ');
+                ? `${this.namespace}.${this.name}'${names.join(',')}'`
+                : names.join(',');
         }
         else {
             let name = this.field(value)?.name;
@@ -2991,8 +2991,10 @@ class ODataStructuredType extends ODataParserSchemaElement {
     configure({ options }) {
         if (this.base) {
             const parent = this.api.findStructuredType(this.base);
-            parent.children.push(this);
-            this.parent = parent;
+            if (parent !== undefined) {
+                parent.children.push(this);
+                this.parent = parent;
+            }
         }
         this.parser.configure({
             options,
@@ -3067,6 +3069,15 @@ class ODataStructuredType extends ODataParserSchemaElement {
             return undefined;
         return this.parent.findParentSchema(predicate);
     }
+    /**
+     * Find a parent schema of the structured type for the given field.
+     * @param field Field that belongs to the structured type
+     * @returns The schema of the field
+     */
+    findParentSchemaForField(field) {
+        return this.findParentSchema((p) => p.fields({ include_parents: false, include_navigation: true }).find((f) => f === field) !==
+            undefined);
+    }
     findChildSchema(predicate) {
         if (predicate(this))
             return this;
@@ -3078,15 +3089,6 @@ class ODataStructuredType extends ODataParserSchemaElement {
         }
         return match;
     }
-    /**
-     * Find a parent schema of the structured type for the given field.
-     * @param field Field that belongs to the structured type
-     * @returns The schema of the field
-     */
-    findParentSchemaForField(field) {
-        return this.findParentSchema((p) => p.fields({ include_parents: false, include_navigation: true }).find((f) => f === field) !==
-            undefined);
-    }
     /**
      * Picks the fields from attributes.
      * @param attrs
@@ -5638,7 +5640,7 @@ class ODataQueryOptions {
         return new ODataQueryOptions(new Map(entries));
     }
     toQueryArguments() {
-        return {
+        return Objects.clone({
             select: this._values.get(QueryOption.select) ?? null,
             expand: this._values.get(QueryOption.expand) ?? null,
             transform: this._values.get(QueryOption.transform) ?? null,
@@ -5652,7 +5654,7 @@ class ODataQueryOptions {
             skiptoken: this._values.get(QueryOption.skiptoken) ?? null,
             levels: this._values.get(QueryOption.levels) ?? null,
             count: this._values.get(QueryOption.count) ?? null,
-        };
+        });
     }
     clone() {
         return new ODataQueryOptions(Objects.clone(this._values));
@@ -6174,6 +6176,7 @@ class ODataResource {
             resource.query((q) => q.restore(this.queryOptions.toQueryArguments()));
         }
         return ModelType.factory(entity, {
+            parent: null,
             resource: resource,
             annots,
             reset,
@@ -6193,6 +6196,7 @@ class ODataResource {
             resource.query((q) => q.restore(this.queryOptions.toQueryArguments()));
         }
         return CollectionType.factory(entities, {
+            parent: null,
             resource: resource,
             annots,
             reset,
@@ -6257,12 +6261,15 @@ class ODataResource {
     }
     toString({ escape, ...options } = {
         escape: false,
+        params: true,
     }) {
-        let [path, params] = this.pathAndParams({ escape, ...options });
-        let queryString = Object.entries(params)
+        let [rpath, rparams] = this.pathAndParams({ escape, ...options });
+        if (!options.params)
+            return rpath;
+        let queryString = Object.entries(rparams)
             .map((e) => `${e[0]}${VALUE_SEPARATOR}${e[1]}`)
             .join(PARAM_SEPARATOR);
-        return queryString ? `${path}${QUERY_SEPARATOR}${queryString}` : path;
+        return queryString ? `${rpath}${QUERY_SEPARATOR}${queryString}` : rpath;
     }
     clone() {
         const Ctor = this.constructor;
@@ -6271,6 +6278,20 @@ class ODataResource {
             query: this.cloneQuery(),
         });
     }
+    cast(type) {
+        const Ctor = this.constructor;
+        const thisType = this.incomingType();
+        const baseSchema = thisType !== undefined ? this.api.structuredType(thisType) : undefined;
+        const castSchema = this.api.findStructuredType(type);
+        if (castSchema !== undefined && baseSchema !== undefined && !castSchema.isSubtypeOf(baseSchema))
+            throw new Error(`cast: Cannot cast to ${type}`);
+        const segments = this.cloneSegments();
+        segments.add(PathSegment.type, type).incomingType(type);
+        return new Ctor(this.api, {
+            segments,
+            query: this.cloneQuery(),
+        });
+    }
     __parser(value, options, resourceType, bindingType) {
         const dataType = options !== undefined && Types.isPlainObject(value)
             ? ODataHelper[options.version ?? DEFAULT_VERSION].type(value)
@@ -7551,17 +7572,7 @@ class ODataNavigationPropertyResource extends ODataResource {
         });
     }
     cast(type) {
-        const thisType = this.incomingType();
-        const baseSchema = thisType !== undefined ? this.api.structuredType(thisType) : undefined;
-        const castSchema = this.api.findStructuredType(type);
-        if (castSchema !== undefined && baseSchema !== undefined && !castSchema.isSubtypeOf(baseSchema))
-            throw new Error(`Cannot cast to ${type}`);
-        const segments = this.cloneSegments();
-        segments.add(PathSegment.type, type).incomingType(type);
-        return new ODataNavigationPropertyResource(this.api, {
-            segments,
-            query: this.cloneQuery(),
-        });
+        return super.cast(type);
     }
     //#region Requests
     post(attrs, options = {}) {
@@ -7735,18 +7746,7 @@ class ODataEntityResource extends ODataResource {
         return ODataFunctionResource.fromResource(this, path);
     }
     cast(type) {
-        const thisType = this.incomingType();
-        const baseSchema = thisType !== undefined ? this.api.structuredType(thisType) : undefined;
-        // Downcast
-        const castSchema = baseSchema?.findChildSchema((s) => s.type() === type);
-        if (castSchema !== undefined && baseSchema !== undefined && !castSchema.isSubtypeOf(baseSchema))
-            throw new Error(`cast: Cannot cast to ${type}`);
-        const segments = this.cloneSegments();
-        segments.add(PathSegment.type, type).incomingType(type);
-        return new ODataEntityResource(this.api, {
-            segments,
-            query: this.cloneQuery(),
-        });
+        return super.cast(type);
     }
     //#region Requests
     post(attrs, options = {}) {
@@ -7835,17 +7835,7 @@ class ODataEntitySetResource extends ODataResource {
         });
     }
     cast(type) {
-        const thisType = this.incomingType();
-        const baseSchema = thisType !== undefined ? this.api.structuredType(thisType) : undefined;
-        const castSchema = this.api.findStructuredType(type);
-        if (castSchema !== undefined && baseSchema !== undefined && !castSchema.isSubtypeOf(baseSchema))
-            throw new Error(`cast: Cannot cast to ${type}`);
-        const segments = this.cloneSegments();
-        segments.add(PathSegment.type, type).incomingType(type);
-        return new ODataEntitySetResource(this.api, {
-            segments,
-            query: this.cloneQuery(),
-        });
+        return super.cast(type);
     }
     //#region Requests
     post(attrs, options) {
@@ -8452,13 +8442,13 @@ class CsdlProperty extends CsdlStructuralProperty {
 class CsdlNavigationProperty extends CsdlStructuralProperty {
     Partner;
     ContainsTarget;
-    ReferentialConstraints;
+    ReferentialConstraint;
     OnDelete;
-    constructor({ Name, Type, Nullable, Partner, ContainsTarget, ReferentialConstraints, OnDelete, Annotation, }) {
+    constructor({ Name, Type, Nullable, Partner, ContainsTarget, ReferentialConstraint, OnDelete, Annotation, }) {
         super({ Name, Type, Nullable, Annotation });
         this.Partner = Partner;
         this.ContainsTarget = ContainsTarget;
-        this.ReferentialConstraints = ReferentialConstraints?.map((r) => new CsdlReferentialConstraint(r));
+        this.ReferentialConstraint = ReferentialConstraint?.map((r) => new CsdlReferentialConstraint(r));
         this.OnDelete = OnDelete ? new CsdlOnDelete(OnDelete) : undefined;
     }
     toJson() {
@@ -8469,8 +8459,8 @@ class CsdlNavigationProperty extends CsdlStructuralProperty {
         if (this.ContainsTarget !== undefined) {
             json['ContainsTarget'] = this.ContainsTarget;
         }
-        if (Array.isArray(this.ReferentialConstraints) && this.ReferentialConstraints.length > 0) {
-            json['ReferentialConstraints'] = this.ReferentialConstraints.map((r) => r.toJson());
+        if (Array.isArray(this.ReferentialConstraint) && this.ReferentialConstraint.length > 0) {
+            json['ReferentialConstraint'] = this.ReferentialConstraint.map((r) => r.toJson());
         }
         if (this.OnDelete !== undefined) {
             json['OnDelete'] = this.OnDelete;
@@ -8485,7 +8475,7 @@ class CsdlNavigationProperty extends CsdlStructuralProperty {
             collection: this.Collection,
             nullable: this.Nullable,
             navigation: true,
-            referentials: this.ReferentialConstraints?.map((r) => ({
+            referentials: this.ReferentialConstraint?.map((r) => ({
                 property: r.Property,
                 referencedProperty: r.ReferencedProperty,
             })),
@@ -10392,6 +10382,7 @@ class ODataCollection {
     }
     clone() {
         return new this.constructor(this.toEntities(INCLUDE_DEEP), {
+            parent: this._parent,
             resource: this.resource()?.clone(),
             annots: this.annots().clone(),
         });
@@ -11239,6 +11230,7 @@ class ODataModel {
     }
     clone() {
         return new this.constructor(this.toEntity(INCLUDE_DEEP), {
+            parent: this._parent,
             resource: this.resource()?.clone(),
             annots: this.annots().clone(),
         });
@@ -11409,7 +11401,6 @@ class ODataModel {
         }
     }
     cast(type, ModelType) {
-        //: ODataModel<S> {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource))
             throw new Error(`cast: Can't cast to derived model without ODataEntityResource`);
@@ -11743,11 +11734,6 @@ class ODataModelField {
     field;
     parser;
     options;
-    optionsForType;
-    modelForType;
-    collectionForType;
-    enumForType;
-    structuredForType;
     default;
     required;
     concurrency;
@@ -11783,12 +11769,7 @@ class ODataModelField {
     annotatedValue(term) {
         return this.parser.annotatedValue(term);
     }
-    configure({ optionsForType, modelForType, collectionForType, enumForType, structuredForType, concurrency, options, }) {
-        this.optionsForType = optionsForType;
-        this.modelForType = modelForType;
-        this.collectionForType = collectionForType;
-        this.enumForType = enumForType;
-        this.structuredForType = structuredForType;
+    configure({ concurrency, options }) {
         this.parserOptions = options;
         if (concurrency)
             this.concurrency = concurrency;
@@ -11808,7 +11789,7 @@ class ODataModelField {
         return this.parser.isStructuredType();
     }
     structuredType() {
-        const structuredType = this.structuredForType ? this.structuredForType(this.type) : undefined;
+        const structuredType = this.options.api.findStructuredType(this.type);
         //Throw error if not found
         if (!structuredType)
             throw new Error(`Could not find structured type for ${this.parser.type}`);
@@ -11821,7 +11802,7 @@ class ODataModelField {
         return this.parser.isEdmType();
     }
     enumType() {
-        const enumType = this.enumForType ? this.enumForType(this.type) : undefined;
+        const enumType = this.options.api.findEnumType(this.type);
         //Throw error if not found
         if (!enumType)
             throw new Error(`Could not find enum type for ${this.parser.type}`);
@@ -11868,7 +11849,7 @@ class ODataModelField {
         }
     }
     defaults() {
-        const meta = this.optionsForType && this.isStructuredType() ? this.optionsForType(this.type) : undefined;
+        const meta = this.isStructuredType() ? this.options.api.optionsForType(this.type) : undefined;
         return meta !== undefined ? meta.defaults() : this.default;
     }
     deserialize(value, options) {
@@ -11900,7 +11881,7 @@ class ODataModelField {
     modelFactory({ parent, value, reset, }) {
         // Model
         const annots = this.annotationsFactory(parent.annots());
-        let Model = this.modelForType ? this.modelForType(this.type) : undefined;
+        let Model = this.options.api.modelForType(this.type);
         if (Model === undefined)
             throw Error(`No Model type for ${this.name}`);
         if (value !== undefined) {
@@ -11921,7 +11902,7 @@ class ODataModelField {
     collectionFactory({ parent, value, reset, }) {
         // Collection Factory
         const annots = this.annotationsFactory(parent.annots());
-        const Collection = this.collectionForType ? this.collectionForType(this.type) : undefined;
+        const Collection = this.options.api.collectionForType(this.type);
         if (Collection === undefined)
             throw Error(`No Collection type for ${this.name}`);
         return Collection.factory((value || []), {
@@ -12129,11 +12110,6 @@ class ODataModelOptions {
         this._fields.forEach((field) => {
             const concurrency = concurrencyFields.indexOf(field.field) !== -1;
             field.configure({
-                optionsForType: (t) => this.api.optionsForType(t),
-                modelForType: (t) => this.api.modelForType(t),
-                collectionForType: (t) => this.api.collectionForType(t),
-                enumForType: (t) => this.api.findEnumType(t),
-                structuredForType: (t) => this.api.findStructuredType(t),
                 concurrency,
                 options,
             });
@@ -12195,11 +12171,6 @@ class ODataModelOptions {
             parser: structuredFieldParser,
         });
         modelField.configure({
-            optionsForType: (t) => this.api.optionsForType(t),
-            modelForType: (t) => this.api.modelForType(t),
-            collectionForType: (t) => this.api.collectionForType(t),
-            enumForType: (t) => this.api.findEnumType(t),
-            structuredForType: (t) => this.api.findStructuredType(t),
             options: this.api.options,
             concurrency: false,
         });
@@ -12241,38 +12212,40 @@ class ODataModelOptions {
         let resource = null;
         let prevField = null;
         for (const [model, field] of ODataModelOptions.chain(child)) {
-            resource = resource || model._resource?.clone();
+            resource = resource ?? model._resource?.clone();
+            // Break if no resource
             if (resource === null)
                 break;
-            if (ODataModelOptions.isModel(model) && (prevField === null || prevField.collection)) {
-                const m = model;
-                // Resolve subtype if collection not is from field
-                // FIXME
-                /*
-                if (field === null) {
-                  const r = m._meta.modelResourceFactory(resource.cloneQuery<T>());
-                  if (r !== null && !r.isTypeOf(resource) && r.isSubtypeOf(resource)) {
-                    resource = r;
-                  }
-                }
-                */
-                // Resolve key
-                const mKey = m.key({ field_mapping: true });
-                if (mKey !== undefined) {
+            // Resolve Key
+            if ((prevField === null || prevField.collection) &&
+                ODataModelOptions.isModel(model) &&
+                model._meta.isEntityType()) {
+                const key = model.key({ field_mapping: true });
+                if (key !== undefined) {
                     resource =
                         resource instanceof ODataEntitySetResource
-                            ? resource.entity(mKey)
-                            : resource.key(mKey);
+                            ? resource.entity(key)
+                            : resource.key(key);
                 }
             }
-            prevField = field;
-            if (field === null && model._resource !== null) {
-                // Apply the query from model to new resource
-                model._resource.query((qs) => resource?.query((qd) => qd.restore(qs.store())));
-            }
-            else if (field !== null) {
+            if (field !== null) {
+                // Resolve Structured Type Cast
+                const resourceType = resource.structuredType();
+                const fieldType = field.options.structuredType;
+                if (resourceType !== undefined &&
+                    fieldType !== undefined &&
+                    fieldType !== resourceType &&
+                    fieldType.isSubtypeOf(resourceType)) {
+                    resource = resource.cast(fieldType.type());
+                }
+                // Build Resource from field
                 resource = field.resourceFactory(resource);
             }
+            else if (model._resource !== null) {
+                // Apply parameters from model._resource to new resource
+                model._resource.query((qs) => resource?.query((qd) => qd.restore(qs.store())));
+            }
+            prevField = field;
         }
         return resource;
     }
@@ -12861,6 +12834,50 @@ class ODataApiOptions {
     }
 }
 
+class ODataInclude {
+    namespace;
+    alias;
+    reference;
+    constructor(config, reference) {
+        this.namespace = config.namespace;
+        this.alias = config.alias;
+        this.reference = reference;
+    }
+    configure({ options }) { }
+}
+class ODataIncludeAnnotation {
+    termNamespace;
+    qualifier;
+    targetNamespace;
+    reference;
+    constructor(config, reference) {
+        this.termNamespace = config.termNamespace;
+        this.qualifier = config.qualifier;
+        this.targetNamespace = config.targetNamespace;
+        this.reference = reference;
+    }
+    configure({ options }) { }
+}
+class ODataReference extends ODataAnnotatable {
+    api;
+    uri;
+    includes;
+    includeAnnotations;
+    constructor(config, api) {
+        super(config);
+        this.api = api;
+        this.uri = config.uri;
+        this.includes = (config.includes ?? []).map((config) => new ODataInclude(config, this));
+        this.includeAnnotations = (config.includeAnnotations ?? []).map((config) => new ODataIncludeAnnotation(config, this));
+    }
+    configure({ options }) {
+        // Configure Includes
+        this.includes.forEach((include) => include.configure({ options }));
+        // Configure IncludeAnnotations
+        this.includeAnnotations.forEach((includeAnnotation) => includeAnnotation.configure({ options }));
+    }
+}
+
 const RESERVED_FIELD_NAMES = Object.getOwnPropertyNames(ODataModel.prototype);
 /**
  * Api abstraction for consuming OData services.
@@ -12881,8 +12898,12 @@ class ODataApi {
     errorHandler;
     // Base Parsers
     parsers;
+    // Populate from Metadata
+    populateFromMetadata;
     // Schemas
     schemas;
+    // References
+    references;
     // Models
     models = {};
     // Collections
@@ -12905,12 +12926,14 @@ class ODataApi {
         this.cache = config.cache;
         this.errorHandler = config.errorHandler;
         this.parsers = new Map(Object.entries(config.parsers ?? EDM_PARSERS));
+        this.populateFromMetadata = config.populateFromMetadata ?? false;
         this.schemas = (config.schemas ?? []).map((schema) => new ODataSchema(schema, this));
+        this.references = (config.references ?? []).map((reference) => new ODataReference(reference, this));
         this.models = (config.models ?? {});
         this.collections = (config.collections ?? {});
     }
-    configure(settings = {}) {
-        this.requester = settings.requester;
+    initialize(requester) {
+        this.requester = requester;
         this.schemas.forEach((schema) => {
             schema.configure({
                 options: this.options.parserOptions,
@@ -12926,6 +12949,11 @@ class ODataApi {
                 }
             }
         });
+        return this.populateFromMetadata
+            ? firstValueFrom(this.metadata()
+                .fetch()
+                .pipe(map((metadata) => this.populate(metadata))))
+            : Promise.resolve(true);
     }
     populate(metadata) {
         const config = metadata.toConfig();
@@ -12937,6 +12965,7 @@ class ODataApi {
                 options: this.options.parserOptions,
             });
         });
+        return true;
     }
     fromJson(json) {
         const segments = ODataPathSegments.fromJson(json.segments);
@@ -13035,7 +13064,7 @@ class ODataApi {
     }
     //request(req: ODataRequest<any>): Observable<any> {
     request(method, resource, options) {
-        let req = ODataRequest.factory(this, method, resource, {
+        const req = ODataRequest.factory(this, method, resource, {
             body: options.body,
             etag: options.etag,
             context: options.context,
@@ -13051,16 +13080,12 @@ class ODataApi {
             parserOptions: options.parserOptions,
             withCredentials: options.withCredentials,
         });
-        let res$ = this.requester !== undefined ? this.requester(req) : NEVER;
-        res$ = res$.pipe(map((res) => res.type === HttpEventType.Response ? ODataResponse.fromHttpResponse(req, res) : res));
+        let res$ = this.handleRequest(req);
         if (this.errorHandler !== undefined)
             res$ = res$.pipe(catchError(this.errorHandler));
         if (options.observe === 'events') {
             return res$;
         }
-        if (this.cache !== undefined) {
-            res$ = this.handleRequest(req, res$);
-        }
         switch (options.observe || 'body') {
             case 'body':
                 switch (options.responseType) {
@@ -13087,43 +13112,48 @@ class ODataApi {
     /**
      * 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$;
+    handleRequest(req) {
+        return this.cache !== undefined && req.isFetch()
+            ? this.handleCacheFetch(req)
+            : this.cache !== undefined && req.isMutate()
+                ? this.handleCacheMutate(req)
+                : this.handleRequester(req);
+    }
+    handleRequester(req) {
+        return (this.requester !== undefined ? this.requester(req) : NEVER).pipe(map((res) => res.type === HttpEventType.Response ? ODataResponse.fromHttpResponse(req, res) : res));
     }
-    handleFetch(req, res$) {
+    handleCacheFetch(req) {
         const policy = req.fetchPolicy;
         const cached = this.cache.getResponse(req);
         if (policy === 'no-cache') {
-            return res$;
+            return this.handleRequester(req);
         }
         if (policy === 'cache-only') {
-            if (cached) {
+            if (cached !== undefined) {
                 return of(cached);
             }
             else {
                 return throwError(() => new Error('No Cached'));
             }
         }
-        if (policy === 'cache-first' || policy === 'cache-and-network' || policy === 'network-only') {
+        let res$ = cached !== undefined && policy !== 'network-only'
+            ? policy === 'cache-and-network'
+                ? this.handleRequester(req).pipe(startWith(cached))
+                : of(cached)
+            : this.handleRequester(req);
+        if (cached === undefined &&
+            (policy === 'cache-first' || policy === 'cache-and-network' || policy === 'network-only')) {
             res$ = res$.pipe(tap((res) => {
-                if (res.options.cacheability !== 'no-store')
+                if (res.options.cacheability !== 'no-store') {
                     this.cache.putResponse(req, res);
+                }
             }));
         }
-        return cached !== undefined && policy !== 'network-only'
-            ? policy === 'cache-and-network'
-                ? res$.pipe(startWith(cached))
-                : of(cached)
-            : res$;
+        return res$;
     }
-    handleMutate(req, res$) {
+    handleCacheMutate(req) {
         const requests = req.isBatch()
             ? req.resource.requests().filter((r) => r.isMutate())
             : [req];
@@ -13131,7 +13161,7 @@ class ODataApi {
             const scope = this.cache.scope(r);
             this.cache.forget({ scope });
         }
-        return res$;
+        return this.handleRequester(req);
     }
     //# region Find by Type
     // Memoize
@@ -13167,6 +13197,7 @@ class ODataApi {
         }
         const enumTypes = this.schemas.reduce((acc, schema) => [...acc, ...schema.enums], []);
         let enumType = enumTypes.find((e) => e.type() === value);
+        enumType = enumType ?? enumTypes.find((e) => e.type({ alias: true }) === value);
         enumType = enumType ?? enumTypes.find((e) => e.name === value);
         this.memo.enumTypes.set(value, enumType);
         return enumType;
@@ -13179,6 +13210,8 @@ class ODataApi {
         }
         const structuredTypes = this.schemas.reduce((acc, schema) => [...acc, ...schema.entities], []);
         let structuredType = structuredTypes.find((e) => e.type() === value);
+        structuredType =
+            structuredType ?? structuredTypes.find((e) => e.type({ alias: true }) === value);
         structuredType = structuredType ?? structuredTypes.find((e) => e.name === value);
         this.memo.structuredTypes.set(value, structuredType);
         return structuredType;
@@ -13203,6 +13236,19 @@ class ODataApi {
                     (callableBindingStructuredType &&
                         bindingStructuredType.isSubtypeOf(callableBindingStructuredType))));
         });
+        callable =
+            callable ??
+                callables.find((c) => {
+                    const isCallableType = c.type({ alias: true }) == value;
+                    const callableBindingType = c.binding()?.type;
+                    const callableBindingStructuredType = callableBindingType !== undefined
+                        ? this.findStructuredType(callableBindingType)
+                        : undefined;
+                    return (isCallableType &&
+                        (!bindingStructuredType ||
+                            (callableBindingStructuredType &&
+                                bindingStructuredType.isSubtypeOf(callableBindingStructuredType))));
+                });
         callable =
             callable ??
                 callables.find((c) => {
@@ -13227,6 +13273,7 @@ class ODataApi {
         }
         const entitySets = this.schemas.reduce((acc, schema) => [...acc, ...schema.entitySets], []);
         let entitySet = entitySets.find((e) => e.type() === value);
+        entitySet = entitySet ?? entitySets.find((e) => e.type({ alias: true }) === value);
         entitySet = entitySet ?? entitySets.find((e) => e.name === value);
         this.memo.entitySets.set(value, entitySet);
         return entitySet;
@@ -13239,6 +13286,7 @@ class ODataApi {
         }
         const singletons = this.schemas.reduce((acc, schema) => [...acc, ...schema.singletons], []);
         let singleton = singletons.find((e) => e.type() === value);
+        singleton = singleton ?? singletons.find((e) => e.type({ alias: true }) === value);
         singleton = singleton ?? singletons.find((e) => e.name === value);
         this.memo.singletons.set(value, singleton);
         return singleton;
@@ -13388,8 +13436,8 @@ class ODataSettings {
         if (this.apis.every((c) => !c.default))
             this.apis[0].default = true;
     }
-    configure(settings) {
-        this.apis.forEach((api) => api.configure(settings));
+    initialize(requester) {
+        return Promise.all(this.apis.map((api) => api.initialize(requester)));
     }
     defaultApi() {
         return this.apis.find((c) => c.default);
@@ -13474,38 +13522,53 @@ class ODataSettings {
     }
 }
 
-class ODataConfigLoader {
+class ODataLoader {
 }
-class ODataConfigSyncLoader {
+class ODataSyncLoader {
     passedConfigs;
-    constructor(passedConfigs) {
+    requester;
+    constructor(passedConfigs, requester) {
         this.passedConfigs = passedConfigs;
+        this.requester = requester;
     }
-    loadConfigs() {
-        return Array.isArray(this.passedConfigs) ? of(this.passedConfigs) : of([this.passedConfigs]);
+    load() {
+        const configs = Array.isArray(this.passedConfigs) ? this.passedConfigs : [this.passedConfigs];
+        return Promise.resolve({ configs, requester: this.requester });
     }
 }
-class ODataConfigAsyncLoader {
+class ODataAsyncLoader {
     configs$;
-    constructor(configs$) {
+    requester;
+    constructor(configs$, requester) {
         this.configs$ = configs$;
+        this.requester = requester;
     }
-    loadConfigs() {
-        return Array.isArray(this.configs$)
-            ? forkJoin(this.configs$)
-            : this.configs$.pipe(map$1((value) => Array.isArray(value) ? value : [value]));
+    load() {
+        return firstValueFrom(Array.isArray(this.configs$)
+            ? forkJoin(this.configs$).pipe(map$1((configs) => ({ configs, requester: this.requester })))
+            : this.configs$.pipe(map$1((value) => ({
+                configs: Array.isArray(value)
+                    ? value
+                    : [value],
+                requester: this.requester,
+            }))));
     }
 }
 class ODataMetadataLoader {
     sources$;
     baseConfigs;
-    constructor(sources$, baseConfigs) {
+    requester;
+    constructor(sources$, baseConfigs, requester) {
         this.sources$ = sources$;
         this.baseConfigs = baseConfigs;
+        this.requester = requester;
     }
-    loadConfigs() {
+    load() {
         const configs = Array.isArray(this.baseConfigs) ? this.baseConfigs : [this.baseConfigs];
-        return this.sources$.pipe(map$1((source) => (Array.isArray(source) ? source : [source]).map((m, i) => new ODataMetadataParser(m).metadata().toConfig(configs[i] ?? {}))));
+        return firstValueFrom(this.sources$.pipe(map$1((source) => ({
+            configs: (Array.isArray(source) ? source : [source]).map((m, i) => new ODataMetadataParser(m).metadata().toConfig(configs[i] ?? {})),
+            requester: this.requester,
+        }))));
     }
 }
 
@@ -13523,27 +13586,19 @@ function addBody(options, body) {
     };
 }
 class ODataClient {
-    http;
     loader;
     settings;
-    constructor(http, loader) {
-        this.http = http;
+    constructor(loader) {
         this.loader = loader;
-        this.loader.loadConfigs().subscribe((configs) => {
+    }
+    initialize() {
+        return this.loader
+            .load()
+            .then(({ configs, requester }) => {
             this.settings = new ODataSettings(configs);
-            this.settings.configure({
-                requester: (req) => this.http.request(req.method, `${req.url}`, {
-                    body: req.body,
-                    context: req.context,
-                    headers: req.headers,
-                    observe: req.observe,
-                    params: req.params,
-                    reportProgress: req.reportProgress,
-                    responseType: req.responseType,
-                    withCredentials: req.withCredentials,
-                }),
-            });
-        });
+            return this.settings.initialize(requester);
+        })
+            .then((results) => results.every((v) => v));
     }
     //#region Resolve Building Blocks
     /**
@@ -13708,12 +13763,13 @@ class ODataClient {
     put(resource, body, options = {}) {
         return this.request('PUT', resource, addBody(options, body));
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataClient });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataClient, deps: [{ token: ODataLoader }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataClient, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataClient, decorators: [{
-            type: Injectable
-        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: ODataConfigLoader }] });
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: () => [{ type: ODataLoader }] });
 
 class ODataBaseService {
     client;
@@ -13996,57 +14052,90 @@ class ODataServiceFactory {
         return new Service(this.client, singletonName, apiNameOrEntityType);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataServiceFactory });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataServiceFactory, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataServiceFactory, decorators: [{
-            type: Injectable
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: ODataClient }] });
 
 const ODATA_CONFIG = new InjectionToken('odata.config');
-function createSyncLoader(passedConfig) {
-    return new ODataConfigSyncLoader(passedConfig.config);
+function defaultHttpSyncLoader(config, http) {
+    return new ODataSyncLoader(config, (req) => http.request(req.method, `${req.url}`, {
+        body: req.body,
+        context: req.context,
+        headers: req.headers,
+        observe: req.observe,
+        params: req.params,
+        reportProgress: req.reportProgress,
+        responseType: req.responseType,
+        withCredentials: req.withCredentials,
+    }));
 }
 // Standalone version
 function provideODataClient(passedConfig) {
-    return makeEnvironmentProviders([
-        { provide: ODATA_CONFIG, useValue: passedConfig },
-        passedConfig?.loader ?? {
-            provide: ODataConfigLoader,
-            useFactory: createSyncLoader,
-            deps: [ODATA_CONFIG],
-        },
+    let providers = [
+        // Make the ODATA_CONFIG available through injection
+        { provide: ODATA_CONFIG, useValue: passedConfig.config ?? [] },
+        // Register the startup task
+        provideAppInitializer(() => inject(ODataClient).initialize()),
         ODataClient,
         ODataServiceFactory,
-    ]);
+    ];
+    if (passedConfig?.loader === undefined) {
+        providers = [
+            ...providers,
+            provideHttpClient(),
+            {
+                provide: ODataLoader,
+                useFactory: defaultHttpSyncLoader,
+                deps: [ODATA_CONFIG, HttpClient],
+            },
+        ];
+    }
+    else {
+        providers = [...providers, passedConfig.loader];
+    }
+    return makeEnvironmentProviders(providers);
 }
 // Module version
 class ODataModule {
     static forRoot(passedConfig) {
+        let providers = [
+            // Make the ODATA_CONFIG available through injection
+            { provide: ODATA_CONFIG, useValue: passedConfig.config ?? [] },
+            // Register the startup task
+            provideAppInitializer(() => inject(ODataClient).initialize()),
+            ODataClient,
+            ODataServiceFactory,
+        ];
+        if (passedConfig?.loader === undefined) {
+            providers = [
+                ...providers,
+                provideHttpClient(),
+                {
+                    provide: ODataLoader,
+                    useFactory: defaultHttpSyncLoader,
+                    deps: [ODATA_CONFIG, HttpClient],
+                },
+            ];
+        }
+        else {
+            providers = [...providers, passedConfig.loader];
+        }
         return {
             ngModule: ODataModule,
-            providers: [
-                // Make the ODATA_CONFIG available through injection
-                { provide: ODATA_CONFIG, useValue: passedConfig },
-                // Create the loader: Either the one getting passed or a sync one
-                passedConfig?.loader ?? {
-                    provide: ODataConfigLoader,
-                    useFactory: createSyncLoader,
-                    deps: [ODATA_CONFIG],
-                },
-                ODataClient,
-                ODataServiceFactory,
-            ],
+            providers,
         };
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
     static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, imports: [CommonModule] });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule] });
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, imports: [CommonModule] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [CommonModule],
-                    providers: [ODataClient, ODataServiceFactory],
                 }]
         }] });
 
@@ -14061,7 +14150,7 @@ class ODataBaseCache {
      * @returns Boolean indicating if the entry is expired
      */
     isExpired(entry) {
-        return entry.date < (Date.now() - entry.maxAge);
+        return entry.date < Date.now() - entry.maxAge;
     }
     /**
      * Using the resource on the request build an array of string to identify the scope of the request
@@ -14215,15 +14304,17 @@ class ODataInStorageCache extends ODataBaseCache {
     }
     get(name, { scope } = {}) {
         const key = this.buildKey([...(scope || []), name]);
-        const entry = JSON.parse(this.storage.getItem(key) ?? "{}");
+        const entry = JSON.parse(this.storage.getItem(key) ?? '{}');
         return entry !== undefined && !this.isExpired(entry) ? entry.payload : undefined;
     }
     forget({ name, scope = [], tags = [], }) {
         if (name)
             scope.push(name);
         const key = scope.length > 0 ? this.buildKey(scope) : undefined;
-        Object.keys(this.storage).filter(k => k.startsWith(this.prefix)).forEach(k => {
-            const entry = JSON.parse(this.storage.getItem(k) ?? "{}");
+        Object.keys(this.storage)
+            .filter((k) => k.startsWith(this.prefix))
+            .forEach((k) => {
+            const entry = JSON.parse(this.storage.getItem(k) ?? '{}');
             if (this.isExpired(entry) || // Expired
                 (key !== undefined && k.startsWith(key)) || // Key
                 (tags.length > 0 && tags.some((t) => entry.tags.indexOf(t) !== -1)) // Tags
@@ -14236,7 +14327,9 @@ class ODataInStorageCache extends ODataBaseCache {
      * Flush the cache and clean the storage
      */
     flush() {
-        Object.keys(this.storage).filter(k => k.startsWith(this.prefix)).forEach(k => {
+        Object.keys(this.storage)
+            .filter((k) => k.startsWith(this.prefix))
+            .forEach((k) => {
             this.storage.removeItem(k);
         });
     }
@@ -14265,7 +14358,7 @@ class ODataInStorageCache extends ODataBaseCache {
         return data !== undefined ? ODataResponse.fromJson(req, data) : undefined;
     }
     size() {
-        return Object.keys(this.storage).filter(k => k.startsWith(this.prefix)).length;
+        return Object.keys(this.storage).filter((k) => k.startsWith(this.prefix)).length;
     }
 }
 
@@ -14409,5 +14502,5 @@ class ODataIndexedDBCache extends ODataBaseCache {
  * Generated bundle index. Do not edit.
  */
 
-export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, Casting, CastingOperators, CollectionFunctions, ComputeExpression, ConditionalFunctions, DateAndTimeFunctions, Dates, Durations, EDM_PARSERS, EdmType, Enums, ExpandExpression, ExpandField, Expression, FieldFactory, FilterExpression, Function, GeoFunctions, GroupBy, GroupByTransformations, Grouping, GroupingOperators, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, JsonSchemaType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseCache, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataFunctions, ODataInMemoryCache, ODataInStorageCache, ODataIndexedDBCache, ODataMediaResource, ODataMetadata, ODataMetadataLoader, ODataMetadataParser, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventEmitter, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataOperators, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingleton, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataTransformations, ODataValueResource, Objects, Operator, OrderByExpression, OrderByField, PathSegment, QueryCustomTypes, QueryOption, RenderableFactory, SearchExpression, SearchTerm, SegmentHandler, SelectExpression, StandardAggregateMethods, StringAndCollectionFunctions, StringFunctions, Strings, Transformations, Type, TypeFunctions, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, encode, functions, isQueryCustomType, isRawType, normalizeValue, operators, pathAndParamsFromQueryOptions, pathAndParamsFromSegments, provideODataClient, raw, render, resolve, transformations };
+export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, Casting, CastingOperators, CollectionFunctions, ComputeExpression, ConditionalFunctions, DateAndTimeFunctions, Dates, Durations, EDM_PARSERS, EdmType, Enums, ExpandExpression, ExpandField, Expression, FieldFactory, FilterExpression, Function, GeoFunctions, GroupBy, GroupByTransformations, Grouping, GroupingOperators, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, JsonSchemaType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataAsyncLoader, ODataBaseCache, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataFunctions, ODataInMemoryCache, ODataInStorageCache, ODataIndexedDBCache, ODataLoader, 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, ODataSyncLoader, 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, defaultHttpSyncLoader, duration, encode, functions, isQueryCustomType, isRawType, normalizeValue, operators, pathAndParamsFromQueryOptions, pathAndParamsFromSegments, provideODataClient, raw, render, resolve, transformations };
 //# sourceMappingURL=angular-odata.mjs.map