angular-odata 0.105.0 → 0.115.0

package/lib/resources/types/navigation-property.d.ts

@@ -6,7 +6,7 @@ import { QueryOptionNames } from '../../types';
 import { ODataPathSegments } from '../path';
 import { ODataQueryOptions } from '../query';
 import { ODataResource } from '../resource';
-import { ODataEntities, ODataEntity } from '../responses';
+import { ODataEntities, ODataEntitiesAnnotations, ODataEntity } from '../responses';
 import { ODataCountResource } from './count';
 import { ODataMediaResource } from './media';
 import { ODataEntitiesOptions, ODataEntityOptions, ODataOptions } from './options';
@@ -36,17 +36,10 @@ export declare class ODataNavigationPropertyResource<T> extends ODataResource<T>
     count(): ODataCountResource<T>;
     cast<C>(type: string): ODataNavigationPropertyResource<C>;
     protected post(attrs: Partial<T>, options?: ODataOptions): Observable<ODataEntity<T>>;
-    protected put(attrs: Partial<T>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
-    protected patch(attrs: Partial<T>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
-    protected delete(options?: ODataOptions & {
-        etag?: string;
-    }): Observable<any>;
+    protected put(attrs: Partial<T>, options?: ODataOptions): Observable<ODataEntity<T>>;
+    protected patch(attrs: Partial<T>, options?: ODataOptions): Observable<ODataEntity<T>>;
+    protected delete(options?: ODataOptions): Observable<any>;
     protected get(options?: ODataEntityOptions & ODataEntitiesOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<any>;
     /**
@@ -60,42 +53,31 @@ export declare class ODataNavigationPropertyResource<T> extends ODataResource<T>
      * Update an existing entity
      * @param attrs The entity attributes
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns The updated entity with the annotations
      */
-    update(attrs: Partial<T>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
+    update(attrs: Partial<T>, options?: ODataOptions): Observable<ODataEntity<T>>;
     /**
      * Modify an existing entity
      * @param attrs The entity attributes
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns The modified entity with the annotations
      */
-    modify(attrs: Partial<T>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
+    modify(attrs: Partial<T>, options?: ODataOptions): Observable<ODataEntity<T>>;
     /**
      * Delete an existing entity
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns An observable of the destroy
      */
-    destroy(options?: ODataOptions & {
-        etag?: string;
-    }): Observable<any>;
+    destroy(options?: ODataOptions): Observable<any>;
     /**
      * Fetch entity / entities
      * @param options Options for the request
      * @return An observable of the entity or entities with annotations
      */
     fetch(options?: ODataEntityOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<ODataEntity<T>>;
     fetch(options?: ODataEntitiesOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<ODataEntities<T>>;
     /**
@@ -104,7 +86,6 @@ export declare class ODataNavigationPropertyResource<T> extends ODataResource<T>
      * @returns The entity
      */
     fetchEntity(options?: ODataOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<T | null>;
     /**
@@ -113,7 +94,6 @@ export declare class ODataNavigationPropertyResource<T> extends ODataResource<T>
      * @returns The model
      */
     fetchModel<M extends ODataModel<T>>(options?: ODataOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<M | null>;
     /**
@@ -139,6 +119,24 @@ export declare class ODataNavigationPropertyResource<T> extends ODataResource<T>
      * @returns All entities
      */
     fetchAll(options?: ODataOptions & {
+        withCount?: boolean;
+        bodyQueryOptions?: QueryOptionNames[];
+    }): Observable<{
+        entities: T[];
+        annots: ODataEntitiesAnnotations<T>;
+    }>;
+    fetchMany(top: number, options?: ODataOptions & {
+        withCount?: boolean;
+        bodyQueryOptions?: QueryOptionNames[];
+    }): Observable<{
+        entities: T[];
+        annots: ODataEntitiesAnnotations<T>;
+    }>;
+    fetchOne(options?: ODataOptions & {
+        withCount?: boolean;
         bodyQueryOptions?: QueryOptionNames[];
-    }): Observable<T[]>;
+    }): Observable<{
+        entity: T | null;
+        annots: ODataEntitiesAnnotations<T>;
+    }>;
 }

package/lib/resources/types/options.d.ts

@@ -1,12 +1,14 @@
-import { HttpHeaders, HttpParams } from '@angular/common/http';
+import { HttpContext, HttpHeaders, HttpParams } from '@angular/common/http';
 import { FetchPolicy } from '../../types';
 import { ODataQueryArguments } from '../query';
 export declare type ODataOptions = {
+    etag?: string;
+    context?: HttpContext;
     headers?: HttpHeaders | {
         [header: string]: string | string[];
     };
     params?: HttpParams | {
-        [param: string]: string | string[];
+        [param: string]: string | number | boolean | ReadonlyArray<string | number | boolean>;
     };
     reportProgress?: boolean;
     withCredentials?: boolean;

package/lib/resources/types/property.d.ts

@@ -2,10 +2,11 @@ import { Observable } from 'rxjs';
 import { ODataApi } from '../../api';
 import { ODataCollection, ODataModel } from '../../models';
 import { ODataStructuredType } from '../../schema';
+import { QueryOptionNames } from '../../types';
 import { ODataPathSegments } from '../path';
 import { ODataQueryOptions } from '../query';
 import { ODataResource } from '../resource';
-import { ODataEntities, ODataEntity, ODataProperty } from '../responses';
+import { ODataEntities, ODataEntitiesAnnotations, ODataEntity, ODataProperty } from '../responses';
 import { ODataEntitiesOptions, ODataEntityOptions, ODataOptions, ODataPropertyOptions } from './options';
 import { ODataValueResource } from './value';
 export declare class ODataPropertyResource<T> extends ODataResource<T> {
@@ -22,15 +23,13 @@ export declare class ODataPropertyResource<T> extends ODataResource<T> {
     keys(values: any[]): ODataPropertyResource<T>;
     value(): ODataValueResource<T>;
     property<P>(path: string): ODataPropertyResource<P>;
-    protected get(options: ODataEntityOptions & ODataEntitiesOptions & ODataPropertyOptions): Observable<any>;
+    protected get(options?: ODataEntityOptions & ODataEntitiesOptions & ODataPropertyOptions): Observable<any>;
     /**
      * Fetch the property
      * @param options Options for the request
      * @return The entity / entities / property value
      */
-    fetch(options?: ODataEntityOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
+    fetch(options?: ODataEntityOptions): Observable<ODataEntity<T>>;
     fetch(options?: ODataEntitiesOptions): Observable<ODataEntities<T>>;
     fetch(options?: ODataPropertyOptions): Observable<ODataProperty<T>>;
     /**
@@ -38,25 +37,19 @@ export declare class ODataPropertyResource<T> extends ODataResource<T> {
      * @param options Options for the request
      * @returns The property value
      */
-    fetchProperty(options?: ODataOptions & {
-        etag?: string;
-    }): Observable<T | null>;
+    fetchProperty(options?: ODataOptions): Observable<T | null>;
     /**
      * Fetch the entity
      * @param options Options for the request
      * @returns The entity
      */
-    fetchEntity(options?: ODataOptions & {
-        etag?: string;
-    }): Observable<T | null>;
+    fetchEntity(options?: ODataOptions): Observable<T | null>;
     /**
      * Fetch the entity and return as model
      * @param options Options for the request
      * @returns The model
      */
-    fetchModel<M extends ODataModel<T>>(options?: ODataOptions & {
-        etag?: string;
-    }): Observable<M | null>;
+    fetchModel<M extends ODataModel<T>>(options?: ODataOptions): Observable<M | null>;
     /**
      * Fetch the entities
      * @param options Options for the request
@@ -73,10 +66,30 @@ export declare class ODataPropertyResource<T> extends ODataResource<T> {
     fetchCollection<M extends ODataModel<T>, C extends ODataCollection<T, M>>(options?: ODataOptions & {
         withCount?: boolean;
     }): Observable<C | null>;
+    fetchOne(options?: ODataOptions & {
+        withCount?: boolean;
+        bodyQueryOptions?: QueryOptionNames[];
+    }): Observable<{
+        entity: T | null;
+        annots: ODataEntitiesAnnotations<T>;
+    }>;
+    fetchMany(top: number, options?: ODataOptions & {
+        withCount?: boolean;
+        bodyQueryOptions?: QueryOptionNames[];
+    }): Observable<{
+        entities: T[];
+        annots: ODataEntitiesAnnotations<T>;
+    }>;
     /**
      * Fetch all entities
      * @param options Options for the request
      * @returns All entities
      */
-    fetchAll(options?: ODataOptions): Observable<T[]>;
+    fetchAll(options?: ODataOptions & {
+        withCount?: boolean;
+        bodyQueryOptions?: QueryOptionNames[];
+    }): Observable<{
+        entities: T[];
+        annots: ODataEntitiesAnnotations<T>;
+    }>;
 }

package/lib/resources/types/reference.d.ts

@@ -14,9 +14,7 @@ export declare class ODataReferenceResource<T> extends ODataResource<T> {
     }): ODataReferenceResource<P>;
     clone(): ODataReferenceResource<T>;
     protected post(target: ODataEntityResource<any>, options?: ODataOptions): Observable<any>;
-    protected put(target: ODataEntityResource<any>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<any>;
+    protected put(target: ODataEntityResource<any>, options?: ODataOptions): Observable<any>;
     protected delete({ etag, target, ...options }?: {
         etag?: string;
         target?: ODataEntityResource<any>;
@@ -41,28 +39,22 @@ export declare class ODataReferenceResource<T> extends ODataResource<T> {
      * @param options Options for the request
      * @returns Observable of the response
      */
-    set(target: ODataEntityResource<any>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<any>;
+    set(target: ODataEntityResource<any>, options?: ODataOptions): Observable<any>;
     /**
      * Unset the reference to the given target.
      * @param options Options for the request.
      * @returns Observable of the response
      */
-    unset(options?: ODataOptions & {
-        etag?: string;
-    }): Observable<any>;
+    unset(options?: ODataOptions): Observable<any>;
     /**
      * Fetch entity / entities
      * @param options Options for the request
      * @return An observable of the entity or entities with annotations
      */
     fetch(options?: ODataEntityOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<ODataEntity<T>>;
     fetch(options?: ODataEntitiesOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<ODataEntities<T>>;
     /**
@@ -71,7 +63,6 @@ export declare class ODataReferenceResource<T> extends ODataResource<T> {
      * @returns The entity
      */
     fetchEntity(options?: ODataOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<T | null>;
     /**

package/lib/resources/types/singleton.d.ts

@@ -24,20 +24,13 @@ export declare class ODataSingletonResource<T> extends ODataResource<T> {
     property<P>(path: string): ODataPropertyResource<P>;
     action<P, R>(path: string): ODataActionResource<P, R>;
     function<P, R>(path: string): ODataFunctionResource<P, R>;
-    protected post(attrs: Partial<T>, options?: ODataOptions): Observable<ODataEntity<T>>;
-    protected put(attrs: Partial<T>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
-    protected patch(attrs: Partial<T>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
-    protected delete(options?: ODataOptions & {
-        etag?: string;
-    }): Observable<any>;
+    protected post(attrs: Partial<T>, options?: ODataOptions): Observable<any>;
+    protected put(attrs: Partial<T>, options?: ODataOptions): Observable<any>;
+    protected patch(attrs: Partial<T>, options?: ODataOptions): Observable<any>;
+    protected delete(options?: ODataOptions): Observable<any>;
     protected get(options?: ODataOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
-    }): Observable<ODataEntity<T>>;
+    }): Observable<any>;
     /**
      * Creates a new entity.
      * @param attrs The entity attributes to create.
@@ -51,54 +44,42 @@ export declare class ODataSingletonResource<T> extends ODataResource<T> {
      * @param options The options for the request.
      * @returns The updated entity with the annotations.
      */
-    update(attrs: Partial<T>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
+    update(attrs: Partial<T>, options?: ODataOptions): Observable<ODataEntity<T>>;
     /**
      * Modifies an existing entity.
      * @param attrs The entity attributes to modify.
      * @param options The options for the request.
      * @returns The modified entity with the annotations.
      */
-    modify(attrs: Partial<T>, options?: ODataOptions & {
-        etag?: string;
-    }): Observable<ODataEntity<T>>;
+    modify(attrs: Partial<T>, options?: ODataOptions): Observable<ODataEntity<T>>;
     /**
      * Delete an existing entity.
      * @param options The options for the request.
      * @returns Observable of the deleted entity.
      */
-    destroy(options?: ODataOptions & {
-        etag?: string;
-    }): Observable<any>;
+    destroy(options?: ODataOptions): Observable<any>;
     /**
      * Fetch an existing entity.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity with the annotations.
      */
     fetch(options?: ODataOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<ODataEntity<T>>;
     /**
      * Fetch an existing entity.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity.
      */
     fetchEntity(options?: ODataOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<T | null>;
     /**
      * Fetch an existing entity and return a model.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity.
      */
     fetchModel<M extends ODataModel<T>>(options?: ODataOptions & {
-        etag?: string;
         bodyQueryOptions?: QueryOptionNames[];
     }): Observable<M | null>;
 }

package/lib/services/entity-set.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
 import { ODataCollection } from '../models/collection';
 import { ODataModel } from '../models/model';
-import { EntityKey, ODataEntities, ODataEntity, ODataEntityResource, ODataEntitySetResource, ODataOptions } from '../resources';
+import { EntityKey, ODataEntity, ODataEntityResource, ODataEntitySetResource, ODataOptions } from '../resources';
 import { ODataEntityService } from './entity';
 export declare class ODataEntitySetService<T> extends ODataEntityService<T> {
     /**
@@ -27,24 +27,38 @@ export declare class ODataEntitySetService<T> extends ODataEntityService<T> {
      * Get all entities from the entity set.
      * @param options The options for the request.
      */
-    fetchAll(options?: ODataOptions): Observable<T[]>;
+    fetchAll(options?: ODataOptions): Observable<{
+        entities: T[]; /**
+         * Delete an entity in the entity set.
+         * @param key The entity key.
+         * @param etag The etag for the entity.
+         * @param options The options for the request.
+         */
+        annots: import("../resources").ODataEntitiesAnnotations<T>;
+    }>;
     /**
      * Get entities from the entity set.
      * @param withCount Get the count of the entities.
      * @param options The options for the request.
      */
-    fetchMany(options?: ODataOptions & {
+    fetchMany(top: number, options?: ODataOptions & {
         withCount?: boolean;
-    }): Observable<ODataEntities<T>>;
+    }): Observable<{
+        entities: T[];
+        annots: import("../resources").ODataEntitiesAnnotations<T>;
+    }>;
     /**
      * Get an entity from the entity set.
      * @param key The entity key.
      * @param etag The etag for the entity.
      * @param options The options for the request.
      */
-    fetchOne(key: EntityKey<T>, options?: ODataOptions & {
+    fetchOne(options?: ODataOptions & {
         etag?: string;
-    }): Observable<ODataEntity<T>>;
+    }): Observable<{
+        entity: T | null;
+        annots: import("../resources").ODataEntitiesAnnotations<T>;
+    }>;
     /**
      * Create an entity in the entity set.
      * @param attrs The attributes for the entity.

package/lib/utils/http.d.ts

@@ -4,7 +4,7 @@ export declare const Http: {
         [header: string]: string | string[];
     })[]): HttpHeaders;
     mergeHttpParams(...values: (HttpParams | {
-        [param: string]: string | string[];
+        [param: string]: string | number | boolean | readonly (string | number | boolean)[];
     })[]): HttpParams;
     splitHttpParams(params: HttpParams, keys: string[]): [HttpParams, HttpParams];
     withoutHttpParams(params: HttpParams, keys: string[]): HttpParams;

package/lib/utils/objects.d.ts

@@ -1,9 +1,23 @@
 export declare const Objects: {
-    set(obj: Object, path: string, value: any): void;
-    get(obj: Object, path: string, def?: any): any;
-    unset(obj: Object, path: string): void;
-    has(obj: Object, path: string): boolean;
-    merge(target: Object, source: Object): Object;
+    set(obj: {
+        [attr: string]: any;
+    }, path: string, value: any): void;
+    get(obj: {
+        [attr: string]: any;
+    }, path: string, def?: any): any;
+    unset(obj: {
+        [attr: string]: any;
+    }, path: string): void;
+    has(obj: {
+        [attr: string]: any;
+    }, path: string): boolean;
+    merge(target: {
+        [attr: string]: any;
+    }, source: {
+        [attr: string]: any;
+    }): {
+        [attr: string]: any;
+    };
     equal(object1: {
         [attr: string]: any;
     }, object2: {

package/package.json

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