angular-odata 0.100.0 → 0.100.1

package/lib/helper.d.ts

@@ -17,81 +17,52 @@ export interface ODataVersionHelper {
     ODATA_ANNOTATION_PREFIX: string;
     ODATA_FUNCTION_PREFIX: string;
     ODATA_ID: string;
+    ODATA_TYPE: string;
     ODATA_COUNT: string;
     ODATA_ETAG: string;
     ODATA_CONTEXT: string;
     ODATA_MEDIA_ETAG: string;
     entity(value: {
-        [name: string]: any;
+        [key: string]: any;
     }): any;
     entities(value: {
-        [name: string]: any;
+        [key: string]: any;
     }): any;
     property(value: {
-        [name: string]: any;
+        [key: string]: any;
     }): any;
     annotations(value: {
-        [name: string]: any;
-    }): {
-        [name: string]: any;
-    };
+        [key: string]: any;
+    }): Map<string, any>;
     attributes(value: {
-        [name: string]: any;
+        [key: string]: any;
     }, metadata: ODataMetadataType): any;
-    id(value: {
-        [name: string]: any;
-    }, id?: string): string | undefined;
-    etag(value: {
-        [name: string]: any;
-    }, etag?: string): string | undefined;
-    type(value: {
-        [name: string]: any;
-    }, type?: string): string | undefined;
-    count(value: {
-        [name: string]: any;
-    }): number | undefined;
-    context(value: {
-        [name: string]: any;
+    context(annots: Map<string, any> | {
+        [key: string]: any;
     }): ODataContext;
-    functions(value: {
-        [name: string]: any;
-    }): {
-        [name: string]: any;
-    };
-    properties(value: {
-        [name: string]: any;
-    }): {
-        [name: string]: any;
-    };
-    mediaEtag(value: {
-        [name: string]: any;
-    }): string | undefined;
-    metadataEtag(value: {
-        [name: string]: any;
-    }): string | undefined;
-    nextLink(value: {
-        [name: string]: any;
-    }): string | undefined;
-    readLink(value: {
-        [name: string]: any;
-    }): string | undefined;
-    mediaReadLink(value: {
-        [name: string]: any;
-    }): string | undefined;
-    editLink(value: {
-        [name: string]: any;
-    }): string | undefined;
-    mediaEditLink(value: {
-        [name: string]: any;
+    id(annots: Map<string, any> | {
+        [key: string]: any;
     }): string | undefined;
-    mediaContentType(value: {
-        [name: string]: any;
+    etag(annots: Map<string, any> | {
+        [key: string]: any;
     }): string | undefined;
-    deltaLink(value: {
-        [name: string]: any;
+    type(annots: Map<string, any> | {
+        [key: string]: any;
     }): string | undefined;
+    count(annots: Map<string, any>): number | undefined;
+    functions(annots: Map<string, any>): Map<string, any>;
+    properties(annots: Map<string, any>): Map<string, Map<string, any>>;
+    mediaEtag(annots: Map<string, any>): string | undefined;
+    metadataEtag(annots: Map<string, any>): string | undefined;
+    nextLink(annots: Map<string, any>): string | undefined;
+    readLink(annots: Map<string, any>): string | undefined;
+    mediaReadLink(annots: Map<string, any>): string | undefined;
+    editLink(annots: Map<string, any>): string | undefined;
+    mediaEditLink(annots: Map<string, any>): string | undefined;
+    mediaContentType(annots: Map<string, any>): string | undefined;
+    deltaLink(annots: Map<string, any>): string | undefined;
     countParam(): {
-        [name: string]: string;
+        [key: string]: string;
     };
 }
 export declare const ODataHelper: {

package/lib/models/model.d.ts

@@ -15,15 +15,9 @@ export declare class ODataModel<T> {
         ODataModel<any> | ODataCollection<any, ODataModel<any>>,
         ODataModelField<any> | null
     ] | null;
-    _attributes: {
-        [name: string]: any;
-    };
-    _changes: {
-        [name: string]: any;
-    };
-    _relations: {
-        [name: string]: ODataModelRelation<any>;
-    };
+    _attributes: Map<string, any>;
+    _changes: Map<string, any>;
+    _relations: Map<string, ODataModelRelation<any>>;
     _resource: ODataResource<T> | null;
     _annotations: ODataEntityAnnotations;
     _reset: boolean;

package/lib/resources/query/builder.d.ts

@@ -91,7 +91,7 @@ export default function <T>({ select, search, skiptoken, format, top, skip, filt
 export declare function buildPathAndQuery<T>({ select, search, skiptoken, format, top, skip, filter, transform, orderBy, key, count, expand, action, func, aliases, escape, }?: Partial<QueryOptions<T>>): [string, {
     [name: string]: any;
 }];
-export declare function normalizeValue(value: Value, { aliases, escape }: {
+export declare function normalizeValue(value: Value, { aliases, escape, }?: {
     aliases?: QueryCustomType[];
     escape?: boolean;
 }): any;

package/lib/resources/query/handlers.d.ts

@@ -7,9 +7,7 @@ import type { ODataQueryArguments, ODataQueryOptions } from './options';
 export declare class ODataQueryOptionHandler<T> {
     private o;
     private n;
-    constructor(o: {
-        [name: string]: any;
-    }, n: QueryOptionNames);
+    constructor(o: Map<QueryOptionNames, any>, n: QueryOptionNames);
     get name(): QueryOptionNames;
     toJSON(): any;
     empty(): boolean;
@@ -39,6 +37,12 @@ export declare class ODataQueryOptionsHandler<T> {
      * @returns The alias
      */
     alias(value: any, name?: string): import("./builder").QueryCustomType;
+    /**
+     * Normalize the given value to a valid odata value
+     * @param value The value to normalize
+     * @returns The normalized value
+     */
+    normalize(value: any): any;
     select(opts: (builder: {
         s: T;
         e: () => SelectExpression<T>;

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

@@ -18,10 +18,8 @@ export declare type ODataQueryArguments<T> = {
     [QueryOptionNames.format]?: string;
 };
 export declare class ODataQueryOptions<T> {
-    values: {
-        [name: string]: any;
-    };
-    constructor(options?: {
+    values: Map<QueryOptionNames, any>;
+    constructor(values?: Map<QueryOptionNames, any> | {
         [name: string]: any;
     });
     pathAndParams(escape?: boolean): [string, {
@@ -31,10 +29,10 @@ export declare class ODataQueryOptions<T> {
     toJSON(): {};
     toQueryArguments(): ODataQueryArguments<T>;
     clone<O>(): ODataQueryOptions<O>;
-    expression(name: QueryOptionNames, exp?: Expression<T>): any;
-    option<O>(name: QueryOptionNames, opts?: O): ODataQueryOptionHandler<O>;
-    has(name: QueryOptionNames): boolean;
-    remove(...names: QueryOptionNames[]): void;
-    keep(...names: QueryOptionNames[]): void;
+    expression(key: QueryOptionNames, exp?: Expression<T>): any;
+    option<O>(key: QueryOptionNames, opts?: O): ODataQueryOptionHandler<O>;
+    has(key: QueryOptionNames): boolean;
+    remove(...keys: QueryOptionNames[]): void;
+    keep(...keys: QueryOptionNames[]): void;
     clear(): void;
 }

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

@@ -2,35 +2,31 @@ import { ODataContext, ODataVersionHelper } from '../../helper';
 import { ODataMetadataType } from '../../types';
 export declare abstract class ODataAnnotations {
     helper: ODataVersionHelper;
-    protected annotations: {
-        [annot: string]: any;
-    };
+    protected annotations: Map<string, any>;
     protected context?: ODataContext | undefined;
-    constructor(helper: ODataVersionHelper, annotations?: {
-        [annot: string]: any;
-    }, context?: ODataContext | undefined);
+    constructor(helper: ODataVersionHelper, annotations?: Map<string, any>, context?: ODataContext | undefined);
     attributes<T>(data: {
-        [name: string]: any;
+        [key: string]: any;
     }, metadata: ODataMetadataType): T;
     get entitySet(): string | undefined;
     get type(): string | undefined;
     abstract clone(): ODataAnnotations;
     abstract data(data: {
-        [name: string]: any;
+        [key: string]: any;
     }): {
-        [name: string]: any;
+        [key: string]: any;
     };
 }
 export declare class ODataPropertyAnnotations extends ODataAnnotations {
     clone(): ODataPropertyAnnotations;
     data(data: {
-        [name: string]: any;
+        [key: string]: any;
     }): any;
 }
 export declare class ODataEntityAnnotations extends ODataAnnotations {
     clone(): ODataEntityAnnotations;
     data(data: {
-        [name: string]: any;
+        [key: string]: any;
     }): any;
     get id(): string | undefined;
     get etag(): string | undefined;
@@ -42,20 +38,18 @@ export declare class ODataEntityAnnotations extends ODataAnnotations {
     get mediaEditLink(): string | undefined;
     get mediaContentType(): string | undefined;
     private _properties?;
-    get properties(): {
-        [name: string]: any;
-    };
-    property(name: string): any;
+    get properties(): Map<string, Map<string, any>>;
+    property(name: string): Map<string, any> | undefined;
     private _functions?;
     get functions(): {
-        [name: string]: any;
+        [key: string]: any;
     };
     function(name: string): any;
 }
 export declare class ODataEntitiesAnnotations extends ODataAnnotations {
     clone(): ODataEntitiesAnnotations;
     data(data: {
-        [name: string]: any;
+        [key: string]: any;
     }): any;
     get readLink(): string | undefined;
     get count(): number | undefined;
@@ -66,7 +60,7 @@ export declare class ODataEntitiesAnnotations extends ODataAnnotations {
     get skiptoken(): string | undefined;
     private _functions?;
     get functions(): {
-        [name: string]: any;
+        [key: string]: any;
     };
     function(name: string): any;
 }

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

@@ -46,9 +46,7 @@ export declare class ODataResponse<T> extends HttpResponse<T> {
     private _context?;
     get context(): ODataContext;
     private _annotations?;
-    get annotations(): {
-        [name: string]: any;
-    };
+    get annotations(): Map<string, any>;
     /**
      * Handle the response body as an entity
      * @returns

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-odata",
-  "version": "0.100.0",
+  "version": "0.100.1",
   "license": "MIT",
   "description": "Client side OData typescript library for Angular",
   "repository": {
@@ -25,8 +25,8 @@
   "homepage": "https://github.com/diegomvh/angular-odata",
   "private": false,
   "peerDependencies": {
-    "@angular/common": "^13.1.0",
-    "@angular/core": "^13.1.0"
+    "@angular/common": "^13.3.0",
+    "@angular/core": "^13.3.0"
   },
   "dependencies": {
     "tslib": "^2.3.0"