angular-odata 0.128.0 → 0.131.0

package/lib/services/singleton.d.ts

@@ -8,7 +8,7 @@ import { ODataEntityService } from './entity';
  */
 export declare class ODataSingletonService<T> extends ODataEntityService<T> {
     static Model?: typeof ODataModel;
-    model(entity?: Partial<T>): ODataModel<T>;
+    model(entity?: Partial<T>): ODataModel<T> & import("angular-odata").ModelInterface<T>;
     /**
      * Get the entity resource for this service.
      * @param key The entity key.

package/lib/settings.d.ts

@@ -3,10 +3,10 @@ import { ODataApi } from './api';
 import { ODataCollection, ODataModel } from './models';
 import { ODataRequest } from './resources';
 import { ODataCallable, ODataEntitySet, ODataEnumType, ODataStructuredType } from './schema';
-import { ApiConfig, EdmType, Parser } from './types';
+import { ODataApiConfig, EdmType, Parser } from './types';
 export declare class ODataSettings {
     apis: ODataApi[];
-    constructor(configs: ApiConfig[]);
+    constructor(configs: ODataApiConfig[]);
     configure(settings: {
         requester?: (request: ODataRequest<any>) => Observable<any>;
     }): void;

package/lib/types.d.ts

@@ -77,7 +77,43 @@ export declare enum JsonType {
     boolean = "boolean",
     null = "null"
 }
-export interface ApiOptions {
+export interface ParserOptions {
+    version?: ODataVersion;
+    exponentialDecimals?: boolean;
+    metadata?: ODataMetadataType;
+    ieee754Compatible?: boolean;
+    streaming?: boolean;
+    stringAsEnum?: boolean;
+    deleteRefBy?: 'path' | 'id';
+    nonParenthesisForEmptyParameterFunction?: boolean;
+}
+export interface ResponseOptions extends ParserOptions {
+    cacheability?: CacheCacheability;
+    maxAge?: number;
+}
+export interface StructuredTypeFieldOptions extends ParserOptions {
+    field: ODataStructuredTypeFieldConfig;
+}
+export interface Parser<T> {
+    deserialize(value: any, options?: ParserOptions | StructuredTypeFieldOptions): T;
+    serialize(value: any, options?: ParserOptions | StructuredTypeFieldOptions): any;
+    encode(value: any, options?: ParserOptions | StructuredTypeFieldOptions): any;
+}
+export interface FieldParser<T> extends Parser<T> {
+    nullable?: boolean;
+    default?: any;
+    maxLength?: number;
+    precision?: number;
+    scale?: number | 'variable';
+}
+export declare const NONE_PARSER: Parser<any>;
+export interface ODataCache {
+    put<T>(key: string, payload: T, ...opts: any[]): void;
+    get<T>(key: string, ...opts: any[]): T | undefined;
+    handleRequest(req: any, res$: Observable<any>): Observable<any>;
+    flush(): void;
+}
+export interface ODataApiConfigOptions {
     version?: ODataVersion;
     params?: {
         [param: string]: string | string[];
@@ -111,55 +147,23 @@ export interface ApiOptions {
     jsonBatchFormat?: boolean;
     relativeUrls?: boolean;
 }
-export interface ParserOptions {
-    version?: ODataVersion;
-    exponentialDecimals?: boolean;
-    metadata?: ODataMetadataType;
-    ieee754Compatible?: boolean;
-    streaming?: boolean;
-    stringAsEnum?: boolean;
-    deleteRefBy?: 'path' | 'id';
-    nonParenthesisForEmptyParameterFunction?: boolean;
-}
-export interface ResponseOptions extends ParserOptions {
-    cacheability?: CacheCacheability;
-    maxAge?: number;
-}
-export interface StructuredTypeFieldOptions extends ParserOptions {
-    field: StructuredTypeFieldConfig;
-}
-export interface Parser<T> {
-    deserialize(value: any, options?: ParserOptions | StructuredTypeFieldOptions): T;
-    serialize(value: any, options?: ParserOptions | StructuredTypeFieldOptions): any;
-    encode(value: any, options?: ParserOptions | StructuredTypeFieldOptions): any;
-}
-export interface FieldParser<T> extends Parser<T> {
-    nullable?: boolean;
-    default?: any;
-    maxLength?: number;
-    precision?: number;
-    scale?: number | 'variable';
-}
-export declare const NONE_PARSER: Parser<any>;
-export interface Cache {
-    put<T>(key: string, payload: T, ...opts: any[]): void;
-    get<T>(key: string, ...opts: any[]): T | undefined;
-}
-export type ApiConfig = {
+export type ODataApiConfig = {
     serviceRootUrl: string;
+    metadataUrl?: string;
     name?: string;
     version?: ODataVersion;
     default?: boolean;
     creation?: Date;
-    cache?: Cache;
+    cache?: ODataCache;
     errorHandler?: (error: any, caught: Observable<any>) => Observable<never>;
-    options?: ApiOptions;
+    options?: ODataApiConfigOptions;
     parsers?: {
         [type: string]: Parser<any>;
     };
-    schemas?: SchemaConfig[];
+    schemas?: ODataSchemaConfig[];
+    references?: ODataReferenceConfig[];
 };
-export type AnnotationConfig = {
+export type ODataAnnotationConfig = {
     term: string;
     string?: string;
     bool?: boolean;
@@ -167,39 +171,48 @@ export type AnnotationConfig = {
     permissions?: string[];
     properties?: string[];
 };
-export type SchemaConfig = {
+export type ODataReferenceConfig = {
+    uri: string;
+    includes?: string;
+    annotations?: ODataAnnotationConfig[];
+    enums?: ODataEnumTypeConfig[];
+    entities?: ODataStructuredTypeConfig[];
+    callables?: ODataCallableConfig[];
+    containers?: ODataEntityContainerConfig[];
+};
+export type ODataSchemaConfig = {
     namespace: string;
     alias?: string;
-    annotations?: AnnotationConfig[];
-    enums?: EnumTypeConfig<any>[];
-    entities?: StructuredTypeConfig<any>[];
-    callables?: CallableConfig[];
-    containers?: EntityContainerConfig[];
+    annotations?: ODataAnnotationConfig[];
+    enums?: ODataEnumTypeConfig[];
+    entities?: ODataStructuredTypeConfig[];
+    callables?: ODataCallableConfig[];
+    containers?: ODataEntityContainerConfig[];
 };
-export type EntityContainerConfig = {
+export type ODataEntityContainerConfig = {
     name: string;
-    annotations?: AnnotationConfig[];
-    entitySets?: EntitySetConfig[];
-    singletons?: SingletonConfig[];
+    annotations?: ODataAnnotationConfig[];
+    entitySets?: ODataEntitySetConfig[];
+    singletons?: ODataSingletonConfig[];
 };
-export type EnumTypeFieldConfig<E> = {
-    value: E;
-    annotations?: AnnotationConfig[];
+export type ODataEnumTypeFieldConfig = {
+    value: number;
+    annotations?: ODataAnnotationConfig[];
 };
-export type EnumTypeConfig<E> = {
+export type ODataEnumTypeConfig = {
     name: string;
     flags?: boolean;
-    annotations?: AnnotationConfig[];
+    annotations?: ODataAnnotationConfig[];
     members: {
-        [name: string]: E;
+        [name: string]: number;
     } | {
         [value: number]: string;
     };
     fields: {
-        [member: string]: EnumTypeFieldConfig<E>;
+        [member: string]: ODataEnumTypeFieldConfig;
     };
 };
-export type StructuredTypeFieldConfig = {
+export type ODataStructuredTypeFieldConfig = {
     type: string;
     default?: any;
     maxLength?: number;
@@ -208,7 +221,7 @@ export type StructuredTypeFieldConfig = {
     nullable?: boolean;
     navigation?: boolean;
     precision?: number;
-    annotations?: AnnotationConfig[];
+    annotations?: ODataAnnotationConfig[];
     scale?: number | 'variable';
     referentials?: {
         property: string;
@@ -217,7 +230,7 @@ export type StructuredTypeFieldConfig = {
     referential?: string;
     referenced?: string;
 };
-export type StructuredTypeConfig<T> = {
+export type ODataStructuredTypeConfig = {
     name: string;
     base?: string;
     open?: boolean;
@@ -227,46 +240,46 @@ export type StructuredTypeConfig<T> = {
     collection?: {
         new (...params: any[]): any;
     };
-    annotations?: AnnotationConfig[];
+    annotations?: ODataAnnotationConfig[];
     keys?: {
         name: string;
         alias?: string;
     }[];
     fields?: {
-        [P in keyof T]?: StructuredTypeFieldConfig;
+        [name: string]: ODataStructuredTypeFieldConfig;
     };
 };
-export type ParameterConfig = {
+export type ODataParameterConfig = {
     type: string;
     nullable?: boolean;
     collection?: boolean;
 };
-export type CallableConfig = {
+export type ODataCallableConfig = {
     name: string;
     entitySetPath?: string;
     bound?: boolean;
     composable?: boolean;
     parameters?: {
-        [name: string]: ParameterConfig;
+        [name: string]: ODataParameterConfig;
     };
     return?: {
         type: string;
         collection?: boolean;
     };
 };
-export type EntitySetConfig = {
+export type ODataEntitySetConfig = {
     name: string;
     entityType: string;
     service: {
         new (...params: any[]): any;
     };
-    annotations?: AnnotationConfig[];
+    annotations?: ODataAnnotationConfig[];
 };
-export type SingletonConfig = {
+export type ODataSingletonConfig = {
     name: string;
     type: string;
     service: {
         new (...params: any[]): any;
     };
-    annotations?: AnnotationConfig[];
+    annotations?: ODataAnnotationConfig[];
 };

package/lib/utils/enums.d.ts

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

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 | number | boolean | readonly (string | number | boolean)[];
+        [param: string]: string | number | boolean | ReadonlyArray<string | number | boolean>;
     })[]): HttpParams;
     splitHttpParams(params: HttpParams, keys: string[]): [HttpParams, HttpParams];
     withoutHttpParams(params: HttpParams, keys: string[]): HttpParams;

package/lib/utils/objects.d.ts

@@ -31,7 +31,7 @@ export declare const Objects: {
         [attr: string]: any;
     };
     resolveKey(key: any, { single }?: {
-        single?: boolean | undefined;
+        single?: boolean;
     }): any;
     clone(target: any, map?: WeakMap<object, any>): any;
 };

package/lib/utils/odata.d.ts

@@ -1,4 +1,4 @@
-import { CallableConfig } from '../types';
+import { ODataCallableConfig } from '../types';
 export declare const OData: {
-    mergeCallableParameters(callables: CallableConfig[]): CallableConfig[];
+    mergeCallableParameters(callables: ODataCallableConfig[]): ODataCallableConfig[];
 };

package/lib/utils/strings.d.ts

@@ -1,7 +1,7 @@
 export declare const Strings: {
     uniqueId({ prefix, suffix, }?: {
-        prefix?: string | undefined;
-        suffix?: string | undefined;
+        prefix?: string;
+        suffix?: string;
     }): string;
     titleCase(text: string): string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-odata",
-  "version": "0.128.0",
+  "version": "0.131.0",
   "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": ">=14.0.0",
-    "@angular/core": ">=14.0.0"
+    "@angular/common": ">=16.0.0",
+    "@angular/core": ">=16.0.0"
   },
   "schematics": "./schematics/collection.json",
   "ng-add": {
@@ -44,8 +44,6 @@
     },
     ".": {
       "types": "./index.d.ts",
-      "esm2022": "./esm2022/angular-odata.mjs",
-      "esm": "./esm2022/angular-odata.mjs",
       "default": "./fesm2022/angular-odata.mjs"
     }
   }

package/schematics/apigen/angular/api-config.js

@@ -12,7 +12,13 @@ class ApiConfig extends base_1.Base {
         return (0, schematics_1.url)('./files/api-config');
     }
     variables() {
-        return Object.assign({}, this.options);
+        return {
+            serviceRootUrl: this.options.serviceRootUrl,
+            metadataUrl: this.options.metadata,
+            apiConfigName: this.options.name,
+            version: this.options.version,
+            creation: this.options.creation,
+        };
     }
     name() {
         return core_1.strings.classify(this.options.name) + 'Config';

package/schematics/apigen/angular/api-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-config.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/api-config.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAC9B,2DAAyD;AAGzD,MAAa,SAAU,SAAQ,WAAI;IACjC,YAAY,OAAqB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,oBAAoB,CAAC,CAAC;IACnC,CAAC;IACe,SAAS;QACvB,yBAAY,IAAI,CAAC,OAAO,EAAG;IAC7B,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IACxD,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IACe,WAAW;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAzBD,8BAyBC"}
+{"version":3,"file":"api-config.js","sourceRoot":"","sources":["../../../../../projects/angular-odata/schematics/apigen/angular/api-config.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,iCAA8B;AAC9B,2DAAyD;AAGzD,MAAa,SAAU,SAAQ,WAAI;IACjC,YAAY,OAAqB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IACe,QAAQ;QACtB,OAAO,IAAA,gBAAG,EAAC,oBAAoB,CAAC,CAAC;IACnC,CAAC;IACe,SAAS;QACvB,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;YAC3C,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAClC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC7B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;SAChC,CAAC;IACJ,CAAC;IACe,IAAI;QAClB,OAAO,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;IACxD,CAAC;IACe,QAAQ;QACtB,OAAO,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC1D,CAAC;IACe,SAAS;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACe,QAAQ;QACtB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IACe,WAAW;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA/BD,8BA+BC"}

package/schematics/apigen/angular/base.d.ts

@@ -2,13 +2,20 @@ import { Import } from './import';
 import { Source } from '@angular-devkit/schematics';
 import { Schema as ApiGenSchema } from '../schema';
 import { CsdlCallable, CsdlParameter } from '../metadata/csdl/csdl-function-action';
+import { ODataMetadata } from '../metadata';
 export declare class Callable {
     protected callable: CsdlCallable;
+    callables: CsdlCallable[];
     constructor(callable: CsdlCallable);
+    addOverload(callable: CsdlCallable): void;
     name(): string;
-    isBound(): boolean | undefined;
+    isBound(): boolean;
     bindingParameter(): CsdlParameter | undefined;
-    parameters(): CsdlParameter[];
+    parameters(): {
+        binding: CsdlParameter | undefined;
+        required: CsdlParameter[];
+        optional: CsdlParameter[];
+    };
     returnType(): import("../metadata/csdl/csdl-function-action").CsdlReturnType | undefined;
     fullName(): string;
     resourceFunction(): string;
@@ -49,3 +56,16 @@ export declare class Index extends Base {
     fullName(): string;
     importTypes(): string[];
 }
+export declare class Metadata extends Base {
+    private meta;
+    constructor(options: ApiGenSchema, meta: ODataMetadata);
+    template(): Source;
+    variables(): {
+        [name: string]: any;
+    };
+    name(): string;
+    fileName(): string;
+    directory(): string;
+    fullName(): string;
+    importTypes(): string[];
+}

package/schematics/apigen/angular/base.js

@@ -1,46 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Index = exports.Base = exports.Callable = void 0;
+exports.Metadata = exports.Index = exports.Base = exports.Callable = void 0;
 const core_1 = require("@angular-devkit/core");
 const random_1 = require("../../random");
 const import_1 = require("./import");
 const schematics_1 = require("@angular-devkit/schematics");
 const csdl_function_action_1 = require("../metadata/csdl/csdl-function-action");
 const utils_1 = require("../utils");
-const makeRelativePath = (from, to) => {
-    if (from === '') {
-        return to;
-    }
-    if (to.startsWith(from)) {
-        return to.substring(from.length + 1);
-    }
-    let shared = from;
-    let i = 0;
-    while (shared.length > 0 && !to.startsWith(shared)) {
-        shared = shared.substring(0, shared.lastIndexOf('/'));
-        i++;
-    }
-    return (Array.from({ length: i }).fill('..').join('/') +
-        '/' +
-        to.substring(shared.length));
-};
 class Callable {
     constructor(callable) {
         this.callable = callable;
+        this.callables = [];
+        this.callables.push(callable);
+    }
+    addOverload(callable) {
+        this.callables.push(callable);
     }
     name() {
         return this.callable.Name;
     }
     isBound() {
-        return this.callable.IsBound;
+        var _a;
+        return (_a = this.callable.IsBound) !== null && _a !== void 0 ? _a : false;
     }
     bindingParameter() {
         var _a;
         return (_a = this.callable.Parameter) === null || _a === void 0 ? void 0 : _a.find((p) => p.Name === csdl_function_action_1.BINDING_PARAMETER_NAME);
     }
     parameters() {
-        var _a, _b;
-        return ((_b = (_a = this.callable.Parameter) === null || _a === void 0 ? void 0 : _a.filter((p) => p.Name !== csdl_function_action_1.BINDING_PARAMETER_NAME)) !== null && _b !== void 0 ? _b : []);
+        const parameters = this.callables.reduce((acc, c) => {
+            var _a;
+            for (let param of (_a = c.Parameter) !== null && _a !== void 0 ? _a : []) {
+                if (acc.some((p) => p.Name === param.Name))
+                    continue;
+                acc.push(param);
+            }
+            return acc;
+        }, []);
+        const names = parameters.map((p) => p.Name);
+        const binding = parameters.find((p) => p.Name === csdl_function_action_1.BINDING_PARAMETER_NAME);
+        const inAllCallables = names.filter((n) => n !== csdl_function_action_1.BINDING_PARAMETER_NAME &&
+            this.callables.every((c) => { var _a; return ((_a = c.Parameter) !== null && _a !== void 0 ? _a : []).some((p) => p.Name === n); }));
+        const required = parameters.filter((p) => p.Name !== csdl_function_action_1.BINDING_PARAMETER_NAME && inAllCallables.includes(p.Name));
+        const optional = parameters.filter((p) => p.Name !== csdl_function_action_1.BINDING_PARAMETER_NAME && !inAllCallables.includes(p.Name));
+        return {
+            binding,
+            required,
+            optional,
+        };
     }
     returnType() {
         return this.callable.ReturnType;
@@ -51,30 +58,33 @@ class Callable {
     resourceFunction() {
         const isFunction = this.callable instanceof csdl_function_action_1.CsdlFunction;
         const methodName = core_1.strings.camelize(this.callable.Name);
-        const bindingParameter = this.bindingParameter();
-        const bindingType = bindingParameter !== undefined
-            ? (0, utils_1.toTypescriptType)(bindingParameter.Type)
-            : '';
+        const { binding, required, optional } = this.parameters();
+        const parameters = [...required, ...optional];
+        const bindingType = binding !== undefined ? (0, utils_1.toTypescriptType)(binding.Type) : '';
         const returnType = this.returnType();
         const retType = returnType === undefined ? 'null' : (0, utils_1.toTypescriptType)(returnType.Type);
-        const bindingMethod = !(bindingParameter === null || bindingParameter === void 0 ? void 0 : bindingParameter.Collection) ? 'entity' : 'entities';
+        const bindingMethod = !(binding === null || binding === void 0 ? void 0 : binding.Collection) ? 'entity' : 'entities';
         const baseMethod = isFunction ? 'function' : 'action';
-        const keyParameter = !(bindingParameter === null || bindingParameter === void 0 ? void 0 : bindingParameter.Collection)
+        const keyParameter = !(binding === null || binding === void 0 ? void 0 : binding.Collection)
             ? `key: EntityKey<${bindingType}>`
             : '';
-        const key = !(bindingParameter === null || bindingParameter === void 0 ? void 0 : bindingParameter.Collection) ? `key` : '';
-        const parameters = this.parameters();
+        const key = !(binding === null || binding === void 0 ? void 0 : binding.Collection) ? `key` : '';
         const parametersType = parameters.length === 0
             ? 'null'
-            : `{${parameters.map((p) => `${p.Name}: ${(0, utils_1.toTypescriptType)(p.Type)}`).join(', ')}}`;
+            : `{${parameters
+                .map((p) => {
+                const op = optional.includes(p);
+                return `${p.Name}${op ? '?' : ''}: ${(0, utils_1.toTypescriptType)(p.Type)}`;
+            })
+                .join(', ')}}`;
         return `public ${methodName}(${keyParameter}) {
     return this.${bindingMethod}(${key}).${baseMethod}<${parametersType}, ${retType}>('${this.fullName()}');
   }`;
     }
     callableFunction() {
         const isFunction = this.callable instanceof csdl_function_action_1.CsdlFunction;
-        const bindingParameter = this.bindingParameter();
-        const parameters = this.parameters();
+        const { binding, required, optional } = this.parameters();
+        const parameters = [...required, ...optional];
         const returnType = this.returnType();
         const methodResourceName = core_1.strings.camelize(this.callable.Name);
         const methodName = core_1.strings.classify(this.callable.Name);
@@ -86,22 +96,24 @@ class Callable {
                     ? 'property'
                     : 'entity';
         const retType = returnType === undefined ? 'null' : (0, utils_1.toTypescriptType)(returnType.Type);
-        const bindingType = bindingParameter !== undefined
-            ? (0, utils_1.toTypescriptType)(bindingParameter.Type)
-            : '';
+        const bindingType = binding !== undefined ? (0, utils_1.toTypescriptType)(binding.Type) : '';
         const baseMethod = isFunction ? 'callFunction' : 'callAction';
         const parametersCall = parameters.length === 0
             ? 'null'
             : `{${parameters.map((p) => p.Name).join(', ')}}`;
         // Method arguments
-        let args = !(bindingParameter === null || bindingParameter === void 0 ? void 0 : bindingParameter.Collection)
-            ? [`key: EntityKey<${bindingType}>`]
-            : [];
+        let args = !(binding === null || binding === void 0 ? void 0 : binding.Collection) ? [`key: EntityKey<${bindingType}>`] : [];
         args = [
             ...args,
-            ...(parameters.length === 0
+            ...(required.length === 0
                 ? []
-                : parameters.map((p) => `${p.Name}: ${(0, utils_1.toTypescriptType)(p.Type)}`)),
+                : required.map((p) => `${p.Name}: ${(0, utils_1.toTypescriptType)(p.Type)}`)),
+        ];
+        args = [
+            ...args,
+            ...(optional.length === 0
+                ? []
+                : optional.map((p) => `${p.Name}?: ${(0, utils_1.toTypescriptType)(p.Type)}`)),
         ];
         const optionsType = returnType !== undefined && returnType.Type.startsWith('Edm.')
             ? isFunction
@@ -112,7 +124,7 @@ class Callable {
                 : `ODataActionOptions<${retType}>`;
         args.push(`options?: ${optionsType}`);
         // Key parameter
-        const key = !(bindingParameter === null || bindingParameter === void 0 ? void 0 : bindingParameter.Collection) ? `key` : '';
+        const key = !(binding === null || binding === void 0 ? void 0 : binding.Collection) ? `key` : '';
         // Render
         return `public call${methodName}(${args.join(', ')}) {
     return this.${baseMethod}(${parametersCall}, this.${methodResourceName}(${key}), '${responseType}', options);
@@ -135,7 +147,7 @@ class Base {
         const groups = this.dependencies
             .filter((a) => a[1].path() != this.path())
             .reduce((acc, i) => {
-            const path = makeRelativePath(this.directory(), i[1].path());
+            const path = (0, utils_1.makeRelativePath)(this.directory(), i[1].path());
             if (acc[path] === undefined) {
                 acc[path] = [];
             }
@@ -197,4 +209,32 @@ class Index extends Base {
     }
 }
 exports.Index = Index;
+class Metadata extends Base {
+    constructor(options, meta) {
+        super(options);
+        this.meta = meta;
+    }
+    template() {
+        return (0, schematics_1.url)('./files/metadata');
+    }
+    variables() {
+        return { content: JSON.stringify(this.meta.toJson(), null, 2) };
+    }
+    name() {
+        return '';
+    }
+    fileName() {
+        return 'metadata';
+    }
+    directory() {
+        return '';
+    }
+    fullName() {
+        return this.name();
+    }
+    importTypes() {
+        return [];
+    }
+}
+exports.Metadata = Metadata;
 //# sourceMappingURL=base.js.map