angular-odata 0.147.0 → 0.148.0

package/fesm2022/angular-odata.mjs

@@ -527,7 +527,11 @@ const binary = (value) => ({
     type: QueryCustomTypes.Binary,
     value,
 });
-const isQueryCustomType = (value) => value !== null && value !== undefined && 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, } = {}) {
@@ -2987,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,
@@ -5634,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,
@@ -5648,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));
@@ -6170,6 +6176,7 @@ class ODataResource {
             resource.query((q) => q.restore(this.queryOptions.toQueryArguments()));
         }
         return ModelType.factory(entity, {
+            parent: null,
             resource: resource,
             annots,
             reset,
@@ -6189,6 +6196,7 @@ class ODataResource {
             resource.query((q) => q.restore(this.queryOptions.toQueryArguments()));
         }
         return CollectionType.factory(entities, {
+            parent: null,
             resource: resource,
             annots,
             reset,
@@ -6253,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;
@@ -8431,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() {
@@ -8448,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;
@@ -8464,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,
             })),
@@ -10371,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(),
         });
@@ -11218,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(),
         });
@@ -11756,7 +11769,7 @@ class ODataModelField {
     annotatedValue(term) {
         return this.parser.annotatedValue(term);
     }
-    configure({ concurrency, options, }) {
+    configure({ concurrency, options }) {
         this.parserOptions = options;
         if (concurrency)
             this.concurrency = concurrency;
@@ -12203,8 +12216,10 @@ class ODataModelOptions {
             // Break if no resource
             if (resource === null)
                 break;
-            // Resolve Key 
-            if ((prevField === null || prevField.collection) && ODataModelOptions.isModel(model) && model._meta.isEntityType()) {
+            // Resolve Key
+            if ((prevField === null || prevField.collection) &&
+                ODataModelOptions.isModel(model) &&
+                model._meta.isEntityType()) {
                 const key = model.key({ field_mapping: true });
                 if (key !== undefined) {
                     resource =
@@ -12828,8 +12843,7 @@ class ODataInclude {
         this.alias = config.alias;
         this.reference = reference;
     }
-    configure({ options }) {
-    }
+    configure({ options }) { }
 }
 class ODataIncludeAnnotation {
     termNamespace;
@@ -12842,8 +12856,7 @@ class ODataIncludeAnnotation {
         this.targetNamespace = config.targetNamespace;
         this.reference = reference;
     }
-    configure({ options }) {
-    }
+    configure({ options }) { }
 }
 class ODataReference extends ODataAnnotatable {
     api;
@@ -12885,7 +12898,7 @@ class ODataApi {
     errorHandler;
     // Base Parsers
     parsers;
-    // Populate from Metadata 
+    // Populate from Metadata
     populateFromMetadata;
     // Schemas
     schemas;
@@ -12936,9 +12949,11 @@ class ODataApi {
                 }
             }
         });
-        return (this.populateFromMetadata) ?
-            firstValueFrom(this.metadata().fetch().pipe(map(metadata => this.populate(metadata)))) :
-            Promise.resolve(true);
+        return this.populateFromMetadata
+            ? firstValueFrom(this.metadata()
+                .fetch()
+                .pipe(map((metadata) => this.populate(metadata))))
+            : Promise.resolve(true);
     }
     populate(metadata) {
         const config = metadata.toConfig();
@@ -13100,9 +13115,11 @@ class ODataApi {
      * @returns
      */
     handleRequest(req) {
-        return (this.cache !== undefined && req.isFetch()) ? this.handleCacheFetch(req) :
-            (this.cache !== undefined && req.isMutate()) ? this.handleCacheMutate(req) :
-                this.handleRequester(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));
@@ -13126,7 +13143,8 @@ class ODataApi {
                 ? this.handleRequester(req).pipe(startWith(cached))
                 : of(cached)
             : this.handleRequester(req);
-        if (cached === undefined && (policy === 'cache-first' || policy === 'cache-and-network' || policy === 'network-only')) {
+        if (cached === undefined &&
+            (policy === 'cache-first' || policy === 'cache-and-network' || policy === 'network-only')) {
             res$ = res$.pipe(tap((res) => {
                 if (res.options.cacheability !== 'no-store') {
                     this.cache.putResponse(req, res);
@@ -13192,7 +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.type({ alias: true }) === value);
         structuredType = structuredType ?? structuredTypes.find((e) => e.name === value);
         this.memo.structuredTypes.set(value, structuredType);
         return structuredType;
@@ -13526,10 +13545,12 @@ class ODataAsyncLoader {
     }
     load() {
         return firstValueFrom(Array.isArray(this.configs$)
-            ? forkJoin(this.configs$).pipe(map$1(configs => ({ configs, requester: this.requester })))
+            ? 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
+                configs: Array.isArray(value)
+                    ? value
+                    : [value],
+                requester: this.requester,
             }))));
     }
 }
@@ -13546,7 +13567,7 @@ class ODataMetadataLoader {
         const configs = Array.isArray(this.baseConfigs) ? this.baseConfigs : [this.baseConfigs];
         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
+            requester: this.requester,
         }))));
     }
 }
@@ -13571,12 +13592,13 @@ class ODataClient {
         this.loader = loader;
     }
     initialize() {
-        return this.loader.load()
+        return this.loader
+            .load()
             .then(({ configs, requester }) => {
             this.settings = new ODataSettings(configs);
             return this.settings.initialize(requester);
         })
-            .then(results => results.every(v => v));
+            .then((results) => results.every((v) => v));
     }
     //#region Resolve Building Blocks
     /**
@@ -14061,13 +14083,15 @@ function provideODataClient(passedConfig) {
         ODataServiceFactory,
     ];
     if (passedConfig?.loader === undefined) {
-        providers = [...providers,
+        providers = [
+            ...providers,
             provideHttpClient(),
             {
                 provide: ODataLoader,
                 useFactory: defaultHttpSyncLoader,
                 deps: [ODATA_CONFIG, HttpClient],
-            }];
+            },
+        ];
     }
     else {
         providers = [...providers, passedConfig.loader];
@@ -14086,20 +14110,22 @@ class ODataModule {
             ODataServiceFactory,
         ];
         if (passedConfig?.loader === undefined) {
-            providers = [...providers,
+            providers = [
+                ...providers,
                 provideHttpClient(),
                 {
                     provide: ODataLoader,
                     useFactory: defaultHttpSyncLoader,
                     deps: [ODATA_CONFIG, HttpClient],
-                }];
+                },
+            ];
         }
         else {
             providers = [...providers, passedConfig.loader];
         }
         return {
             ngModule: ODataModule,
-            providers
+            providers,
         };
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.5", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
@@ -14124,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
@@ -14278,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
@@ -14299,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);
         });
     }
@@ -14328,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;
     }
 }