angular-odata 0.124.0 → 0.125.0

package/lib/constants.d.ts

@@ -59,6 +59,7 @@ export declare const NEWLINE = "\r\n";
 export declare const NEWLINE_REGEXP: RegExp;
 export declare const CACHE_KEY_SEPARATOR = ":";
 export declare const CID_FIELD_NAME = "_cid";
+export declare const EVENT_SPLITTER: RegExp;
 export declare const COMPUTED: RegExp;
 export declare const OPTIMISTIC_CONCURRENCY: RegExp;
 export declare const DESCRIPTION: RegExp;

package/lib/helper.d.ts

@@ -26,31 +26,31 @@ export interface ODataVersionHelper {
     ODATA_DEFERRED: string;
     ODATA_ANNOTATION: string;
     entity(value: {
-        [key: string]: any;
+        [name: string]: any;
     }): any;
     entities(value: {
-        [key: string]: any;
+        [name: string]: any;
     }): any;
     property(value: {
-        [key: string]: any;
+        [name: string]: any;
     }): any;
     annotations(value: {
-        [key: string]: any;
+        [name: string]: any;
     }): Map<string, any>;
     attributes(value: {
-        [key: string]: any;
+        [name: string]: any;
     }, metadata: ODataMetadataType): any;
     context(annots: Map<string, any> | {
-        [key: string]: any;
+        [name: string]: any;
     }): ODataContext;
     id(annots: Map<string, any> | {
-        [key: string]: any;
+        [name: string]: any;
     }): string | undefined;
     etag(annots: Map<string, any> | {
-        [key: string]: any;
+        [name: string]: any;
     }): string | undefined;
     type(annots: Map<string, any> | {
-        [key: string]: any;
+        [name: string]: any;
     }): string | undefined;
     count(annots: Map<string, any>): number | undefined;
     functions(annots: Map<string, any>): Map<string, any>;
@@ -65,7 +65,7 @@ export interface ODataVersionHelper {
     mediaContentType(annots: Map<string, any>): string | undefined;
     deltaLink(annots: Map<string, any>): string | undefined;
     countParam(): {
-        [key: string]: string;
+        [name: string]: string;
     };
 }
 export declare const ODataHelper: {

package/lib/models/collection.d.ts

@@ -1,9 +1,8 @@
-import { EventEmitter } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ODataActionOptions, ODataEntitiesAnnotations, ODataEntitySetResource, ODataFunctionOptions, ODataNavigationPropertyResource, ODataOptions, ODataPropertyResource, ODataQueryOptionsHandler, ODataResource } from '../resources';
 import { ODataStructuredType } from '../schema/structured-type';
 import { ODataModel } from './model';
-import { ModelFieldOptions, ODataModelEntry, ODataModelEvent, ODataModelField } from './options';
+import { ModelFieldOptions, ODataModelEntry, ODataModelEventEmitter, ODataModelField } from './options';
 export declare class ODataCollection<T, M extends ODataModel<T>> implements Iterable<M> {
     static model: typeof ODataModel | null;
     _parent: [
@@ -23,7 +22,7 @@ export declare class ODataCollection<T, M extends ODataModel<T>> implements Iter
     _model: typeof ODataModel;
     models(): M[];
     get length(): number;
-    events$: EventEmitter<ODataModelEvent<T>>;
+    events$: ODataModelEventEmitter<T>;
     constructor(entities?: Partial<T>[] | {
         [name: string]: any;
     }[], { parent, resource, annots, model, reset, }?: {
@@ -134,8 +133,8 @@ export declare class ODataCollection<T, M extends ODataModel<T>> implements Iter
         silent?: boolean;
     }): void;
     query(ctx: (q: ODataQueryOptionsHandler<T>, s?: ODataStructuredType<T>) => void): this;
-    callFunction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataFunctionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
-    callAction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataActionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
+    callFunction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', options?: ODataFunctionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
+    callAction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', options?: ODataActionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
     private _unlink;
     private _link;
     private _findEntry;

package/lib/models/model.d.ts

@@ -1,9 +1,8 @@
-import { EventEmitter } from '@angular/core';
 import { Observable } from 'rxjs';
 import { EntityKey, ODataActionOptions, ODataEntityAnnotations, ODataEntityResource, ODataFunctionOptions, ODataNavigationPropertyResource, ODataOptions, ODataPropertyResource, ODataQueryArgumentsOptions, ODataQueryOptionsHandler, ODataResource, ODataSingletonResource } from '../resources';
 import { ODataStructuredType } from '../schema';
 import { ODataCollection } from './collection';
-import { ModelOptions, ODataModelEvent, ODataModelField, ODataModelOptions, ODataModelAttribute } from './options';
+import { ModelOptions, ODataModelField, ODataModelOptions, ODataModelAttribute, ODataModelEventEmitter } from './options';
 import { ParserOptions } from '../types';
 export declare class ODataModel<T> {
     static options: ModelOptions;
@@ -30,7 +29,7 @@ export declare class ODataModel<T> {
     _reparent: boolean;
     _silent: boolean;
     _meta: ODataModelOptions<any>;
-    events$: EventEmitter<ODataModelEvent<T>>;
+    events$: ODataModelEventEmitter<T>;
     constructor(data?: Partial<T> | {
         [name: string]: any;
     }, { parent, resource, annots, reset, }?: {
@@ -74,7 +73,7 @@ export declare class ODataModel<T> {
         [name: string]: any;
     } | null | undefined;
     _errors?: {
-        [key: string]: any;
+        [name: string]: any;
     };
     validate({ method, navigation, }?: {
         method?: 'create' | 'update' | 'modify';
@@ -158,13 +157,14 @@ export declare class ODataModel<T> {
      * @returns The result of the context
      */
     asEntity<R>(ctx: (model: this) => R): R;
-    callFunction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none' | 'blob' | 'arraybuffer', { ...options }?: {} & ODataFunctionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null | Blob | ArrayBuffer>;
+    callFunction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none' | 'blob' | 'arraybuffer', options?: ODataFunctionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null | Blob | ArrayBuffer>;
     callAction<P, R>(name: string, params: P | null, responseType?: 'property' | 'model' | 'collection' | 'none' | 'blob' | 'arraybuffer', { ...options }?: {} & ODataActionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null | Blob | ArrayBuffer>;
     cast<S>(type: string): ODataModel<S>;
-    fetchNavigationProperty<S>(name: keyof T | string, responseType: 'model' | 'collection', { ...options }?: {} & ODataQueryArgumentsOptions<S>): Observable<ODataModel<S> | ODataCollection<S, ODataModel<S>> | null>;
-    getValue<P>(name: keyof T | string, options?: ODataOptions): Observable<P | ODataModel<P> | ODataCollection<P, ODataModel<P>> | null>;
+    fetchNavigationProperty<S>(name: keyof T | string, responseType: 'model' | 'collection', options?: ODataQueryArgumentsOptions<S>): Observable<ODataModel<S> | ODataCollection<S, ODataModel<S>> | null>;
+    fetchAttribute<P>(name: keyof T | string, options?: ODataQueryArgumentsOptions<P>): Observable<P | ODataModel<P> | ODataCollection<P, ODataModel<P>> | null>;
+    getAttribute<P>(name: keyof T | string): P | ODataModel<P> | ODataCollection<P, ODataModel<P>> | null | undefined;
+    setAttribute<N>(name: keyof T | string, model: ODataModel<N> | ODataCollection<N, ODataModel<N>> | null, options?: ODataOptions): Observable<this>;
     setReference<N>(name: keyof T | string, model: ODataModel<N> | ODataCollection<N, ODataModel<N>> | null, options?: ODataOptions): Observable<this>;
-    getReference<P>(name: keyof T | string): ODataModel<P> | ODataCollection<P, ODataModel<P>> | null;
     get [Symbol.toStringTag](): string;
     equals(other: ODataModel<T>): boolean;
     collection(): ODataCollection<T, ODataModel<T>> | undefined;

package/lib/models/options.d.ts

@@ -18,33 +18,54 @@ export declare enum ODataModelEventType {
     Attach = "attach"
 }
 export declare class ODataModelEvent<T> {
-    name: ODataModelEventType;
+    name: ODataModelEventType | string;
     value?: any;
     previous?: any;
     options?: any;
-    constructor(name: ODataModelEventType, { model, collection, previous, value, attr, options, }?: {
+    constructor(name: ODataModelEventType | string, { model, collection, previous, value, attr, options, bubbly, chain, }?: {
         model?: ODataModel<T>;
         collection?: ODataCollection<T, ODataModel<T>>;
         attr?: ODataModelAttribute<any> | number;
         previous?: any;
         value?: any;
         options?: any;
+        bubbly?: boolean;
+        chain?: [
+            ODataModel<any> | ODataCollection<any, ODataModel<any>>,
+            ODataModelAttribute<any> | number | null
+        ][];
     });
-    bubbling: boolean;
-    stopPropagation(): void;
     chain: [
         ODataModel<any> | ODataCollection<any, ODataModel<any>>,
         ODataModelAttribute<any> | number | null
     ][];
     push(model: ODataModel<any> | ODataCollection<any, ODataModel<any>>, attr: ODataModelAttribute<any> | number): ODataModelEvent<T>;
+    bubbly: boolean;
+    stopPropagation(): void;
     visited(model: ODataModel<any> | ODataCollection<any, ODataModel<any>>): boolean;
+    canContinueWith(self: ODataModel<T> | ODataCollection<T, ODataModel<T>>): boolean;
     get path(): string;
     model?: ODataModel<T>;
     get currentModel(): ODataModel<any> | undefined;
     collection?: ODataCollection<T, ODataModel<T>>;
     get currentCollection(): ODataCollection<any, ODataModel<any>> | undefined;
 }
-export declare const BUBBLING: ODataModelEventType[];
+export declare class ODataModelEventEmitter<T> extends EventEmitter<ODataModelEvent<T>> {
+    model?: ODataModel<T>;
+    collection?: ODataCollection<T, ODataModel<T>>;
+    constructor({ model, collection, }?: {
+        model?: ODataModel<T>;
+        collection?: ODataCollection<T, ODataModel<T>>;
+    });
+    trigger(type: ODataModelEventType | string, { collection, previous, value, attr, options, bubbly, }?: {
+        collection?: ODataCollection<T, ODataModel<T>>;
+        attr?: ODataModelAttribute<any> | number;
+        previous?: any;
+        value?: any;
+        options?: any;
+        bubbly?: boolean;
+    }): void;
+}
 export declare const INCLUDE_SHALLOW: {
     include_concurrency: boolean;
     include_computed: boolean;
@@ -154,7 +175,7 @@ export declare class ODataModelAttribute<T> {
     private value?;
     private change?;
     private subscription?;
-    events$: EventEmitter<ODataModelEvent<T>>;
+    events$: ODataModelEventEmitter<T>;
     constructor(_model: ODataModel<any>, _field: ODataModelField<T>);
     get navigation(): boolean;
     get computed(): boolean | undefined;
@@ -190,6 +211,7 @@ export declare class ODataModelOptions<T> {
     entitySet?: ODataEntitySet;
     parent?: ODataModelOptions<any>;
     children: ODataModelOptions<any>[];
+    events$: ODataModelEventEmitter<T>;
     constructor({ options, schema, }: {
         options: ModelOptions;
         schema: ODataStructuredType<T>;

package/lib/resources/responses/annotations.d.ts

@@ -6,33 +6,33 @@ export declare abstract class ODataAnnotations<T> {
     protected context?: ODataContext | undefined;
     constructor(helper: ODataVersionHelper, annotations?: Map<string, any>, context?: ODataContext | undefined);
     attributes(data: {
-        [key: string]: any;
+        [name: string]: any;
     }, metadata: ODataMetadataType): Partial<T>;
     update(data: {
-        [key: string]: any;
+        [name: string]: any;
     }): void;
     get entitySet(): string | undefined;
     get type(): string | undefined;
     abstract union(other: ODataAnnotations<any>): ODataAnnotations<any>;
     abstract clone(): ODataAnnotations<any>;
     abstract data(data: {
-        [key: string]: any;
+        [name: string]: any;
     }): {
-        [key: string]: any;
+        [name: string]: any;
     };
 }
 export declare class ODataPropertyAnnotations<T> extends ODataAnnotations<T> {
     union(other: ODataPropertyAnnotations<any>): ODataPropertyAnnotations<any>;
     clone(): ODataPropertyAnnotations<any>;
     data(data: {
-        [key: string]: any;
+        [name: string]: any;
     }): any;
 }
 export declare class ODataEntityAnnotations<T> extends ODataAnnotations<T> {
     union(other: ODataEntityAnnotations<any>): ODataEntityAnnotations<any>;
     clone(): ODataEntityAnnotations<any>;
     data(data: {
-        [key: string]: any;
+        [name: string]: any;
     }): any;
     get id(): string | undefined;
     get etag(): string | undefined;
@@ -49,7 +49,7 @@ export declare class ODataEntityAnnotations<T> extends ODataAnnotations<T> {
     property<F>(name: keyof T, type: 'single'): ODataEntityAnnotations<F>;
     private _functions?;
     get functions(): {
-        [key: string]: any;
+        [name: string]: any;
     };
     function(name: string): any;
 }
@@ -57,7 +57,7 @@ export declare class ODataEntitiesAnnotations<T> extends ODataAnnotations<T> {
     union(other: ODataEntitiesAnnotations<any>): ODataEntitiesAnnotations<any>;
     clone(): ODataEntitiesAnnotations<any>;
     data(data: {
-        [key: string]: any;
+        [name: string]: any;
     }): any;
     get readLink(): string | undefined;
     get count(): number | undefined;
@@ -68,7 +68,7 @@ export declare class ODataEntitiesAnnotations<T> extends ODataAnnotations<T> {
     get skiptoken(): string | undefined;
     private _functions?;
     get functions(): {
-        [key: string]: any;
+        [name: string]: any;
     };
     function(name: string): any;
 }

package/lib/utils/enums.d.ts

@@ -1,23 +1,23 @@
 export declare const Enums: {
     names<E extends {
-        [key: string]: any;
+        [name: string]: any;
     }>(enums: E): string[];
     values<E_1 extends {
-        [key: string]: any;
+        [name: string]: any;
     }>(enums: E_1): number[];
     toValue<E_2 extends {
-        [key: string]: any;
+        [name: string]: any;
     }>(enums: E_2, value: any): number | undefined;
     toValues<E_3 extends {
-        [key: string]: any;
+        [name: string]: any;
     }>(enums: E_3, value: any): number[];
     toName<E_4 extends {
-        [key: string]: any;
+        [name: string]: any;
     }>(enums: E_4, value: any): string | undefined;
     toNames<E_5 extends {
-        [key: string]: any;
+        [name: string]: any;
     }>(enums: E_5, value: any): string[];
     toFlags<E_6 extends {
-        [key: string]: any;
+        [name: string]: any;
     }>(enums: E_6, value: any): string[];
 };

package/package.json

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