@odata2ts/odata2ts 0.23.1 → 0.25.0

package/lib/data-model/DataModel.d.ts

@@ -1,85 +1,88 @@
-import { MappedConverterChains } from "@odata2ts/converter-runtime";
-import { ODataTypesV2, ODataTypesV4 } from "@odata2ts/odata-core";
-import { ActionImportType, ComplexType, EntityContainerModel, EntitySetType, EnumType, FunctionImportType, ModelType, ODataVersion, OperationType, SingletonType } from "./DataTypeModel";
-export interface ProjectFiles {
-    model: string;
-    qObject: string;
-    service: string;
-}
-export declare class DataModel {
-    private version;
-    private readonly converters;
-    private modelTypes;
-    private complexTypes;
-    private enumTypes;
-    private operationTypes;
-    private container;
-    constructor(version: ODataVersion, converters?: MappedConverterChains);
-    /**
-     * OData version: 2.0 or 4.0.
-     * @returns
-     */
-    getODataVersion(): ODataVersion;
-    isV2(): boolean;
-    isV4(): boolean;
-    addModel(name: string, model: ModelType): void;
-    /**
-     * Get a specific model by its name.
-     *
-     * @param modelName the final model name that is generated
-     * @returns the model type
-     */
-    getModel(modelName: string): ModelType;
-    /**
-     * Retrieve all known EntityType models from the EDMX model.
-     *
-     * @returns list of model types
-     */
-    getModels(): ModelType[];
-    /**
-     * Set all model entity types
-     *
-     * @param models new model types
-     */
-    setModels(models: {
-        [name: string]: ModelType;
-    }): void;
-    addComplexType(name: string, model: ComplexType): void;
-    /**
-     * Get a specific model by its name.
-     *
-     * @param name the final model name that is generated
-     * @returns the model type
-     */
-    getComplexType(name: string): ComplexType;
-    /**
-     * Retrieve all known ComplexType models from the EDMX model.
-     *
-     * @returns list of model types
-     */
-    getComplexTypes(): ComplexType[];
-    /**
-     * Set all complex types
-     *
-     * @param models new complex types
-     */
-    setComplexTypes(complexTypes: {
-        [name: string]: ComplexType;
-    }): void;
-    addEnum(name: string, type: EnumType): void;
-    /**
-     * Get list of all known enums, i.e. EnumType nodes from the EDMX model.
-     * @returns list of enum types
-     */
-    getEnums(): EnumType[];
-    addOperationType(binding: string, operationType: OperationType): void;
-    getUnboundOperationTypes(): Array<OperationType>;
-    getOperationTypeByBinding(binding: string): Array<OperationType>;
-    getOperationTypeByEntityOrCollectionBinding(binding: string): Array<OperationType>;
-    addAction(name: string, action: ActionImportType): void;
-    addFunction(name: string, func: FunctionImportType): void;
-    addSingleton(name: string, singleton: SingletonType): void;
-    addEntitySet(name: string, entitySet: EntitySetType): void;
-    getEntityContainer(): EntityContainerModel;
-    getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string): import("@odata2ts/converter-runtime").ValueConverterChain | undefined;
-}
+import { MappedConverterChains } from "@odata2ts/converter-runtime";
+import { ODataTypesV2, ODataTypesV4 } from "@odata2ts/odata-core";
+import { ActionImportType, ComplexType, EntityContainerModel, EntitySetType, EnumType, FunctionImportType, ModelType, ODataVersion, OperationType, SingletonType } from "./DataTypeModel";
+export interface ProjectFiles {
+    model: string;
+    qObject: string;
+    service: string;
+}
+export declare class DataModel {
+    private version;
+    private readonly converters;
+    private modelTypes;
+    private complexTypes;
+    private enumTypes;
+    private operationTypes;
+    private typeDefinitions;
+    private container;
+    constructor(version: ODataVersion, converters?: MappedConverterChains);
+    /**
+     * OData version: 2.0 or 4.0.
+     * @returns
+     */
+    getODataVersion(): ODataVersion;
+    isV2(): boolean;
+    isV4(): boolean;
+    addTypeDefinition(name: string, type: string): void;
+    getPrimitiveType(name: string): string | undefined;
+    addModel(name: string, model: ModelType): void;
+    /**
+     * Get a specific model by its name.
+     *
+     * @param modelName the final model name that is generated
+     * @returns the model type
+     */
+    getModel(modelName: string): ModelType;
+    /**
+     * Retrieve all known EntityType models from the EDMX model.
+     *
+     * @returns list of model types
+     */
+    getModels(): ModelType[];
+    /**
+     * Set all model entity types
+     *
+     * @param models new model types
+     */
+    setModels(models: {
+        [name: string]: ModelType;
+    }): void;
+    addComplexType(name: string, model: ComplexType): void;
+    /**
+     * Get a specific model by its name.
+     *
+     * @param name the final model name that is generated
+     * @returns the model type
+     */
+    getComplexType(name: string): ComplexType;
+    /**
+     * Retrieve all known ComplexType models from the EDMX model.
+     *
+     * @returns list of model types
+     */
+    getComplexTypes(): ComplexType[];
+    /**
+     * Set all complex types
+     *
+     * @param models new complex types
+     */
+    setComplexTypes(complexTypes: {
+        [name: string]: ComplexType;
+    }): void;
+    addEnum(name: string, type: EnumType): void;
+    /**
+     * Get list of all known enums, i.e. EnumType nodes from the EDMX model.
+     * @returns list of enum types
+     */
+    getEnums(): EnumType[];
+    addOperationType(binding: string, operationType: OperationType): void;
+    getUnboundOperationTypes(): Array<OperationType>;
+    getOperationTypeByBinding(binding: string): Array<OperationType>;
+    getOperationTypeByEntityOrCollectionBinding(binding: string): Array<OperationType>;
+    addAction(name: string, action: ActionImportType): void;
+    addFunction(name: string, func: FunctionImportType): void;
+    addSingleton(name: string, singleton: SingletonType): void;
+    addEntitySet(name: string, entitySet: EntitySetType): void;
+    getEntityContainer(): EntityContainerModel;
+    getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string): import("@odata2ts/converter-runtime").ValueConverterChain | undefined;
+}

package/lib/data-model/DataModel.js

@@ -1,135 +1,142 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataModel = void 0;
-const DataTypeModel_1 = require("./DataTypeModel");
-const ROOT_OPERATION_BINDING = "/";
-class DataModel {
-    constructor(version, converters = new Map()) {
-        this.version = version;
-        this.modelTypes = {};
-        this.complexTypes = {};
-        this.enumTypes = {};
-        // combines functions & actions
-        this.operationTypes = {};
-        this.container = { entitySets: {}, singletons: {}, functions: {}, actions: {} };
-        this.converters = converters;
-    }
-    /**
-     * OData version: 2.0 or 4.0.
-     * @returns
-     */
-    getODataVersion() {
-        return this.version;
-    }
-    isV2() {
-        return this.version === DataTypeModel_1.ODataVersion.V2;
-    }
-    isV4() {
-        return this.version === DataTypeModel_1.ODataVersion.V4;
-    }
-    addModel(name, model) {
-        this.modelTypes[name] = model;
-    }
-    /**
-     * Get a specific model by its name.
-     *
-     * @param modelName the final model name that is generated
-     * @returns the model type
-     */
-    getModel(modelName) {
-        return this.modelTypes[modelName];
-    }
-    /**
-     * Retrieve all known EntityType models from the EDMX model.
-     *
-     * @returns list of model types
-     */
-    getModels() {
-        return Object.values(this.modelTypes);
-    }
-    /**
-     * Set all model entity types
-     *
-     * @param models new model types
-     */
-    setModels(models) {
-        this.modelTypes = models;
-    }
-    addComplexType(name, model) {
-        this.complexTypes[name] = model;
-    }
-    /**
-     * Get a specific model by its name.
-     *
-     * @param name the final model name that is generated
-     * @returns the model type
-     */
-    getComplexType(name) {
-        return this.complexTypes[name];
-    }
-    /**
-     * Retrieve all known ComplexType models from the EDMX model.
-     *
-     * @returns list of model types
-     */
-    getComplexTypes() {
-        return Object.values(this.complexTypes);
-    }
-    /**
-     * Set all complex types
-     *
-     * @param models new complex types
-     */
-    setComplexTypes(complexTypes) {
-        this.complexTypes = complexTypes;
-    }
-    addEnum(name, type) {
-        this.enumTypes[name] = type;
-    }
-    /**
-     * Get list of all known enums, i.e. EnumType nodes from the EDMX model.
-     * @returns list of enum types
-     */
-    getEnums() {
-        return Object.values(this.enumTypes);
-    }
-    addOperationType(binding, operationType) {
-        if (!this.operationTypes[binding]) {
-            this.operationTypes[binding] = [];
-        }
-        this.operationTypes[binding].push(operationType);
-    }
-    getUnboundOperationTypes() {
-        const operations = this.operationTypes[ROOT_OPERATION_BINDING];
-        return !operations ? [] : [...operations];
-    }
-    getOperationTypeByBinding(binding) {
-        const operations = this.operationTypes[binding];
-        return !operations ? [] : [...operations];
-    }
-    getOperationTypeByEntityOrCollectionBinding(binding) {
-        const entityOps = this.operationTypes[binding] || [];
-        const collOps = this.operationTypes[`Collection(${binding})`] || [];
-        return [...collOps, ...entityOps];
-    }
-    addAction(name, action) {
-        this.container.actions[name] = action;
-    }
-    addFunction(name, func) {
-        this.container.functions[name] = func;
-    }
-    addSingleton(name, singleton) {
-        this.container.singletons[name] = singleton;
-    }
-    addEntitySet(name, entitySet) {
-        this.container.entitySets[name] = entitySet;
-    }
-    getEntityContainer() {
-        return this.container;
-    }
-    getConverter(dataType) {
-        return this.converters.get(dataType);
-    }
-}
-exports.DataModel = DataModel;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataModel = void 0;
+const DataTypeModel_1 = require("./DataTypeModel");
+const ROOT_OPERATION_BINDING = "/";
+class DataModel {
+    constructor(version, converters = new Map()) {
+        this.version = version;
+        this.modelTypes = {};
+        this.complexTypes = {};
+        this.enumTypes = {};
+        // combines functions & actions
+        this.operationTypes = {};
+        this.typeDefinitions = {};
+        this.container = { entitySets: {}, singletons: {}, functions: {}, actions: {} };
+        this.converters = converters;
+    }
+    /**
+     * OData version: 2.0 or 4.0.
+     * @returns
+     */
+    getODataVersion() {
+        return this.version;
+    }
+    isV2() {
+        return this.version === DataTypeModel_1.ODataVersion.V2;
+    }
+    isV4() {
+        return this.version === DataTypeModel_1.ODataVersion.V4;
+    }
+    addTypeDefinition(name, type) {
+        this.typeDefinitions[name] = type;
+    }
+    getPrimitiveType(name) {
+        return this.typeDefinitions[name];
+    }
+    addModel(name, model) {
+        this.modelTypes[name] = model;
+    }
+    /**
+     * Get a specific model by its name.
+     *
+     * @param modelName the final model name that is generated
+     * @returns the model type
+     */
+    getModel(modelName) {
+        return this.modelTypes[modelName];
+    }
+    /**
+     * Retrieve all known EntityType models from the EDMX model.
+     *
+     * @returns list of model types
+     */
+    getModels() {
+        return Object.values(this.modelTypes);
+    }
+    /**
+     * Set all model entity types
+     *
+     * @param models new model types
+     */
+    setModels(models) {
+        this.modelTypes = models;
+    }
+    addComplexType(name, model) {
+        this.complexTypes[name] = model;
+    }
+    /**
+     * Get a specific model by its name.
+     *
+     * @param name the final model name that is generated
+     * @returns the model type
+     */
+    getComplexType(name) {
+        return this.complexTypes[name];
+    }
+    /**
+     * Retrieve all known ComplexType models from the EDMX model.
+     *
+     * @returns list of model types
+     */
+    getComplexTypes() {
+        return Object.values(this.complexTypes);
+    }
+    /**
+     * Set all complex types
+     *
+     * @param models new complex types
+     */
+    setComplexTypes(complexTypes) {
+        this.complexTypes = complexTypes;
+    }
+    addEnum(name, type) {
+        this.enumTypes[name] = type;
+    }
+    /**
+     * Get list of all known enums, i.e. EnumType nodes from the EDMX model.
+     * @returns list of enum types
+     */
+    getEnums() {
+        return Object.values(this.enumTypes);
+    }
+    addOperationType(binding, operationType) {
+        if (!this.operationTypes[binding]) {
+            this.operationTypes[binding] = [];
+        }
+        this.operationTypes[binding].push(operationType);
+    }
+    getUnboundOperationTypes() {
+        const operations = this.operationTypes[ROOT_OPERATION_BINDING];
+        return !operations ? [] : [...operations];
+    }
+    getOperationTypeByBinding(binding) {
+        const operations = this.operationTypes[binding];
+        return !operations ? [] : [...operations];
+    }
+    getOperationTypeByEntityOrCollectionBinding(binding) {
+        const entityOps = this.operationTypes[binding] || [];
+        const collOps = this.operationTypes[`Collection(${binding})`] || [];
+        return [...collOps, ...entityOps];
+    }
+    addAction(name, action) {
+        this.container.actions[name] = action;
+    }
+    addFunction(name, func) {
+        this.container.functions[name] = func;
+    }
+    addSingleton(name, singleton) {
+        this.container.singletons[name] = singleton;
+    }
+    addEntitySet(name, entitySet) {
+        this.container.entitySets[name] = entitySet;
+    }
+    getEntityContainer() {
+        return this.container;
+    }
+    getConverter(dataType) {
+        return this.converters.get(dataType);
+    }
+}
+exports.DataModel = DataModel;
 //# sourceMappingURL=DataModel.js.map

package/lib/data-model/DataModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataModel.js","sourceRoot":"","sources":["../../src/data-model/DataModel.ts"],"names":[],"mappings":";;;AAGA,mDAWyB;AAQzB,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAEnC,MAAa,SAAS;IAUpB,YAAoB,OAAqB,EAAE,aAAoC,IAAI,GAAG,EAAE;QAApE,YAAO,GAAP,OAAO,CAAc;QAPjC,eAAU,GAAkC,EAAE,CAAC;QAC/C,iBAAY,GAAoC,EAAE,CAAC;QACnD,cAAS,GAAiC,EAAE,CAAC;QACrD,+BAA+B;QACvB,mBAAc,GAAgD,EAAE,CAAC;QACjE,cAAS,GAAyB,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAGvG,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACI,eAAe;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,IAAI;QACT,OAAO,IAAI,CAAC,OAAO,KAAK,4BAAY,CAAC,EAAE,CAAC;IAC1C,CAAC;IAEM,IAAI;QACT,OAAO,IAAI,CAAC,OAAO,KAAK,4BAAY,CAAC,EAAE,CAAC;IAC1C,CAAC;IAEM,QAAQ,CAAC,IAAY,EAAE,KAAgB;QAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IAChC,CAAC;IAED;;;;;OAKG;IACI,QAAQ,CAAC,SAAiB;QAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACI,SAAS;QACd,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACI,SAAS,CAAC,MAAqC;QACpD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IAC3B,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,KAAkB;QACpD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IAClC,CAAC;IAED;;;;;OAKG;IACI,cAAc,CAAC,IAAY;QAChC,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACI,eAAe;QACpB,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACI,eAAe,CAAC,YAA6C;QAClE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,OAAO,CAAC,IAAY,EAAE,IAAc;QACzC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACI,QAAQ;QACb,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAEM,gBAAgB,CAAC,OAAe,EAAE,aAA4B;QACnE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YACjC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;SACnC;QAED,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACnD,CAAC;IAEM,wBAAwB;QAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;QAC/D,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;IAC5C,CAAC;IAEM,yBAAyB,CAAC,OAAe;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAChD,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;IAC5C,CAAC;IAEM,2CAA2C,CAAC,OAAe;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;QACpE,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,SAAS,CAAC,IAAY,EAAE,MAAwB;QACrD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IACxC,CAAC;IAEM,WAAW,CAAC,IAAY,EAAE,IAAwB;QACvD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACxC,CAAC;IAEM,YAAY,CAAC,IAAY,EAAE,SAAwB;QACxD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC9C,CAAC;IAEM,YAAY,CAAC,IAAY,EAAE,SAAwB;QACxD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC9C,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,YAAY,CAAC,QAA8C;QAChE,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;CACF;AAzJD,8BAyJC","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\r\nimport { ODataTypesV2, ODataTypesV4 } from \"@odata2ts/odata-core\";\r\n\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EnumType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  ODataVersion,\r\n  OperationType,\r\n  SingletonType,\r\n} from \"./DataTypeModel\";\r\n\r\nexport interface ProjectFiles {\r\n  model: string;\r\n  qObject: string;\r\n  service: string;\r\n}\r\n\r\nconst ROOT_OPERATION_BINDING = \"/\";\r\n\r\nexport class DataModel {\r\n  private readonly converters: MappedConverterChains;\r\n\r\n  private modelTypes: { [name: string]: ModelType } = {};\r\n  private complexTypes: { [name: string]: ComplexType } = {};\r\n  private enumTypes: { [name: string]: EnumType } = {};\r\n  // combines functions & actions\r\n  private operationTypes: { [binding: string]: Array<OperationType> } = {};\r\n  private container: EntityContainerModel = { entitySets: {}, singletons: {}, functions: {}, actions: {} };\r\n\r\n  constructor(private version: ODataVersion, converters: MappedConverterChains = new Map()) {\r\n    this.converters = converters;\r\n  }\r\n\r\n  /**\r\n   * OData version: 2.0 or 4.0.\r\n   * @returns\r\n   */\r\n  public getODataVersion() {\r\n    return this.version;\r\n  }\r\n\r\n  public isV2() {\r\n    return this.version === ODataVersion.V2;\r\n  }\r\n\r\n  public isV4() {\r\n    return this.version === ODataVersion.V4;\r\n  }\r\n\r\n  public addModel(name: string, model: ModelType) {\r\n    this.modelTypes[name] = model;\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its name.\r\n   *\r\n   * @param modelName the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getModel(modelName: string) {\r\n    return this.modelTypes[modelName];\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known EntityType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getModels() {\r\n    return Object.values(this.modelTypes);\r\n  }\r\n\r\n  /**\r\n   * Set all model entity types\r\n   *\r\n   * @param models new model types\r\n   */\r\n  public setModels(models: { [name: string]: ModelType }) {\r\n    this.modelTypes = models;\r\n  }\r\n\r\n  public addComplexType(name: string, model: ComplexType) {\r\n    this.complexTypes[name] = model;\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its name.\r\n   *\r\n   * @param name the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getComplexType(name: string) {\r\n    return this.complexTypes[name];\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known ComplexType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getComplexTypes() {\r\n    return Object.values(this.complexTypes);\r\n  }\r\n\r\n  /**\r\n   * Set all complex types\r\n   *\r\n   * @param models new complex types\r\n   */\r\n  public setComplexTypes(complexTypes: { [name: string]: ComplexType }) {\r\n    this.complexTypes = complexTypes;\r\n  }\r\n\r\n  public addEnum(name: string, type: EnumType) {\r\n    this.enumTypes[name] = type;\r\n  }\r\n\r\n  /**\r\n   * Get list of all known enums, i.e. EnumType nodes from the EDMX model.\r\n   * @returns list of enum types\r\n   */\r\n  public getEnums() {\r\n    return Object.values(this.enumTypes);\r\n  }\r\n\r\n  public addOperationType(binding: string, operationType: OperationType) {\r\n    if (!this.operationTypes[binding]) {\r\n      this.operationTypes[binding] = [];\r\n    }\r\n\r\n    this.operationTypes[binding].push(operationType);\r\n  }\r\n\r\n  public getUnboundOperationTypes(): Array<OperationType> {\r\n    const operations = this.operationTypes[ROOT_OPERATION_BINDING];\r\n    return !operations ? [] : [...operations];\r\n  }\r\n\r\n  public getOperationTypeByBinding(binding: string): Array<OperationType> {\r\n    const operations = this.operationTypes[binding];\r\n    return !operations ? [] : [...operations];\r\n  }\r\n\r\n  public getOperationTypeByEntityOrCollectionBinding(binding: string): Array<OperationType> {\r\n    const entityOps = this.operationTypes[binding] || [];\r\n    const collOps = this.operationTypes[`Collection(${binding})`] || [];\r\n    return [...collOps, ...entityOps];\r\n  }\r\n\r\n  public addAction(name: string, action: ActionImportType) {\r\n    this.container.actions[name] = action;\r\n  }\r\n\r\n  public addFunction(name: string, func: FunctionImportType) {\r\n    this.container.functions[name] = func;\r\n  }\r\n\r\n  public addSingleton(name: string, singleton: SingletonType) {\r\n    this.container.singletons[name] = singleton;\r\n  }\r\n\r\n  public addEntitySet(name: string, entitySet: EntitySetType) {\r\n    this.container.entitySets[name] = entitySet;\r\n  }\r\n\r\n  public getEntityContainer() {\r\n    return this.container;\r\n  }\r\n\r\n  public getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string) {\r\n    return this.converters.get(dataType);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"DataModel.js","sourceRoot":"","sources":["../../src/data-model/DataModel.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\r\nimport { ODataTypesV2, ODataTypesV4 } from \"@odata2ts/odata-core\";\r\n\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EnumType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  ODataVersion,\r\n  OperationType,\r\n  SingletonType,\r\n} from \"./DataTypeModel\";\r\n\r\nexport interface ProjectFiles {\r\n  model: string;\r\n  qObject: string;\r\n  service: string;\r\n}\r\n\r\nconst ROOT_OPERATION_BINDING = \"/\";\r\n\r\nexport class DataModel {\r\n  private readonly converters: MappedConverterChains;\r\n\r\n  private modelTypes: { [name: string]: ModelType } = {};\r\n  private complexTypes: { [name: string]: ComplexType } = {};\r\n  private enumTypes: { [name: string]: EnumType } = {};\r\n  // combines functions & actions\r\n  private operationTypes: { [binding: string]: Array<OperationType> } = {};\r\n  private typeDefinitions: { [name: string]: string } = {};\r\n  private container: EntityContainerModel = { entitySets: {}, singletons: {}, functions: {}, actions: {} };\r\n\r\n  constructor(private version: ODataVersion, converters: MappedConverterChains = new Map()) {\r\n    this.converters = converters;\r\n  }\r\n\r\n  /**\r\n   * OData version: 2.0 or 4.0.\r\n   * @returns\r\n   */\r\n  public getODataVersion() {\r\n    return this.version;\r\n  }\r\n\r\n  public isV2() {\r\n    return this.version === ODataVersion.V2;\r\n  }\r\n\r\n  public isV4() {\r\n    return this.version === ODataVersion.V4;\r\n  }\r\n\r\n  public addTypeDefinition(name: string, type: string) {\r\n    this.typeDefinitions[name] = type;\r\n  }\r\n\r\n  public getPrimitiveType(name: string): string | undefined {\r\n    return this.typeDefinitions[name];\r\n  }\r\n\r\n  public addModel(name: string, model: ModelType) {\r\n    this.modelTypes[name] = model;\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its name.\r\n   *\r\n   * @param modelName the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getModel(modelName: string) {\r\n    return this.modelTypes[modelName];\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known EntityType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getModels() {\r\n    return Object.values(this.modelTypes);\r\n  }\r\n\r\n  /**\r\n   * Set all model entity types\r\n   *\r\n   * @param models new model types\r\n   */\r\n  public setModels(models: { [name: string]: ModelType }) {\r\n    this.modelTypes = models;\r\n  }\r\n\r\n  public addComplexType(name: string, model: ComplexType) {\r\n    this.complexTypes[name] = model;\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its name.\r\n   *\r\n   * @param name the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getComplexType(name: string) {\r\n    return this.complexTypes[name];\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known ComplexType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getComplexTypes() {\r\n    return Object.values(this.complexTypes);\r\n  }\r\n\r\n  /**\r\n   * Set all complex types\r\n   *\r\n   * @param models new complex types\r\n   */\r\n  public setComplexTypes(complexTypes: { [name: string]: ComplexType }) {\r\n    this.complexTypes = complexTypes;\r\n  }\r\n\r\n  public addEnum(name: string, type: EnumType) {\r\n    this.enumTypes[name] = type;\r\n  }\r\n\r\n  /**\r\n   * Get list of all known enums, i.e. EnumType nodes from the EDMX model.\r\n   * @returns list of enum types\r\n   */\r\n  public getEnums() {\r\n    return Object.values(this.enumTypes);\r\n  }\r\n\r\n  public addOperationType(binding: string, operationType: OperationType) {\r\n    if (!this.operationTypes[binding]) {\r\n      this.operationTypes[binding] = [];\r\n    }\r\n\r\n    this.operationTypes[binding].push(operationType);\r\n  }\r\n\r\n  public getUnboundOperationTypes(): Array<OperationType> {\r\n    const operations = this.operationTypes[ROOT_OPERATION_BINDING];\r\n    return !operations ? [] : [...operations];\r\n  }\r\n\r\n  public getOperationTypeByBinding(binding: string): Array<OperationType> {\r\n    const operations = this.operationTypes[binding];\r\n    return !operations ? [] : [...operations];\r\n  }\r\n\r\n  public getOperationTypeByEntityOrCollectionBinding(binding: string): Array<OperationType> {\r\n    const entityOps = this.operationTypes[binding] || [];\r\n    const collOps = this.operationTypes[`Collection(${binding})`] || [];\r\n    return [...collOps, ...entityOps];\r\n  }\r\n\r\n  public addAction(name: string, action: ActionImportType) {\r\n    this.container.actions[name] = action;\r\n  }\r\n\r\n  public addFunction(name: string, func: FunctionImportType) {\r\n    this.container.functions[name] = func;\r\n  }\r\n\r\n  public addSingleton(name: string, singleton: SingletonType) {\r\n    this.container.singletons[name] = singleton;\r\n  }\r\n\r\n  public addEntitySet(name: string, entitySet: EntitySetType) {\r\n    this.container.entitySets[name] = entitySet;\r\n  }\r\n\r\n  public getEntityContainer() {\r\n    return this.container;\r\n  }\r\n\r\n  public getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string) {\r\n    return this.converters.get(dataType);\r\n  }\r\n}\r\n"]}

package/lib/data-model/DataModelDigestion.d.ts

@@ -1,44 +1,48 @@
-import { MappedConverterChains } from "@odata2ts/converter-runtime";
-import { DigestionOptions } from "../FactoryFunctionModel";
-import { DataModel } from "./DataModel";
-import { ODataVersion, PropertyModel } from "./DataTypeModel";
-import { ComplexType, EntityType, Property, Schema } from "./edmx/ODataEdmxModelBase";
-import { NamingHelper } from "./NamingHelper";
-import { ServiceConfigHelper } from "./ServiceConfigHelper";
-export interface TypeModel {
-    outputType: string;
-    qPath: string;
-    qCollection: string;
-    qParam: string | undefined;
-}
-export declare abstract class Digester<S extends Schema<ET, CT>, ET extends EntityType, CT extends ComplexType> {
-    protected version: ODataVersion;
-    protected schema: S;
-    protected options: DigestionOptions;
-    protected namingHelper: NamingHelper;
-    protected static EDM_PREFIX: string;
-    protected static ROOT_OPERATION: string;
-    protected readonly dataModel: DataModel;
-    protected readonly serviceConfigHelper: ServiceConfigHelper;
-    private model2Type;
-    protected constructor(version: ODataVersion, schema: S, options: DigestionOptions, namingHelper: NamingHelper, converters?: MappedConverterChains);
-    protected abstract getNavigationProps(entityType: ET | ComplexType): Array<Property>;
-    protected abstract digestEntityContainer(): void;
-    /**
-     * Get essential infos about a given odata type from the version specific service variants.
-     *
-     * @param type
-     * @return tuple of return type, query object, query collection object
-     */
-    protected abstract mapODataType(type: string): TypeModel;
-    digest(): Promise<DataModel>;
-    private collectModelTypes;
-    private digestSchema;
-    private getBaseModel;
-    private addComplexType;
-    private addEntityType;
-    private postProcessModel;
-    private sortModelsByInheritance;
-    private collectBaseClassPropsAndKeys;
-    protected mapProp: (p: Property) => PropertyModel;
-}
+import { MappedConverterChains } from "@odata2ts/converter-runtime";
+import { DigestionOptions } from "../FactoryFunctionModel";
+import { DataModel } from "./DataModel";
+import { ODataVersion, PropertyModel } from "./DataTypeModel";
+import { ComplexType, EntityType, Property, Schema } from "./edmx/ODataEdmxModelBase";
+import { SchemaV3 } from "./edmx/ODataEdmxModelV3";
+import { SchemaV4 } from "./edmx/ODataEdmxModelV4";
+import { NamingHelper } from "./NamingHelper";
+import { ServiceConfigHelper } from "./ServiceConfigHelper";
+export interface TypeModel {
+    outputType: string;
+    qPath: string;
+    qCollection: string;
+    qParam: string | undefined;
+}
+export declare abstract class Digester<S extends Schema<ET, CT>, ET extends EntityType, CT extends ComplexType> {
+    protected version: ODataVersion;
+    protected schemas: Array<S>;
+    protected options: DigestionOptions;
+    protected namingHelper: NamingHelper;
+    protected static EDM_PREFIX: string;
+    protected static ROOT_OPERATION: string;
+    protected readonly dataModel: DataModel;
+    protected readonly serviceConfigHelper: ServiceConfigHelper;
+    private model2Type;
+    protected constructor(version: ODataVersion, schemas: Array<S>, options: DigestionOptions, namingHelper: NamingHelper, converters?: MappedConverterChains);
+    protected abstract getNavigationProps(entityType: ET | ComplexType): Array<Property>;
+    protected abstract digestOperations(schema: SchemaV3 | SchemaV4): void;
+    protected abstract digestEntityContainer(schema: SchemaV3 | SchemaV4): void;
+    /**
+     * Get essential infos about a given odata type from the version specific service variants.
+     *
+     * @param type
+     * @return tuple of return type, query object, query collection object
+     */
+    protected abstract mapODataType(type: string): TypeModel;
+    digest(): Promise<DataModel>;
+    private collectModelTypes;
+    private digestEntityTypesAndOperations;
+    private getBaseModel;
+    private addTypeDefinition;
+    private addComplexType;
+    private addEntityType;
+    private postProcessModel;
+    private sortModelsByInheritance;
+    private collectBaseClassPropsAndKeys;
+    protected mapProp: (p: Property) => PropertyModel;
+}