@odata2ts/odata2ts 0.29.1 → 0.31.0

package/lib/data-model/DataModel.js

@@ -1,19 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataModel = void 0;
+exports.DataModel = exports.withNamespace = void 0;
 const DataTypeModel_1 = require("./DataTypeModel");
-const ROOT_OPERATION_BINDING = "/";
+function withNamespace(ns, name) {
+    // this supports the edge case of an empty string as namespace which isn't really valid according to spec (see CSDL)
+    return ns ? `${ns}.${name}` : name;
+}
+exports.withNamespace = withNamespace;
 class DataModel {
-    constructor(version, converters = new Map()) {
+    constructor(namespaces, version, converters = new Map()) {
         this.version = version;
-        this.modelTypes = {};
-        this.complexTypes = {};
-        this.enumTypes = {};
-        // combines functions & actions
-        this.operationTypes = {};
-        this.typeDefinitions = {};
+        this.models = new Map();
+        /**
+         * Stores unbound operations by their fully qualified name.
+         * @private
+         */
+        this.unboundOperationTypes = new Map();
+        /**
+         * Stores operations bound to an entity type by the fully qualified name of the binding entity, e.g.
+         * "Trippin.Person".
+         * @private
+         */
+        this.entityBoundOperationTypes = new Map();
+        /**
+         * Stores operations bound to an entity collection by the fully qualified name of the binding entity, e.g.
+         * "Trippin.Person".
+         * @private
+         */
+        this.entityCollectionBoundOperationTypes = new Map();
+        this.typeDefinitions = new Map();
+        this.aliases = {};
         this.container = { entitySets: {}, singletons: {}, functions: {}, actions: {} };
         this.converters = converters;
+        this.namespace2Alias = namespaces.reduce((col, [ns, alias]) => {
+            if (alias) {
+                col[ns] = alias;
+            }
+            return col;
+        }, {});
     }
     /**
      * OData version: 2.0 or 4.0.
@@ -28,51 +52,62 @@ class DataModel {
     isV4() {
         return this.version === DataTypeModel_1.ODataVersion.V4;
     }
-    addTypeDefinition(name, type) {
-        this.typeDefinitions[name] = type;
+    retrieveType(fqName, haystack) {
+        return haystack.get(fqName) || (this.aliases[fqName] ? haystack.get(this.aliases[fqName]) : undefined);
+    }
+    addAlias(namespace, name) {
+        const alias = this.namespace2Alias[namespace];
+        if (alias) {
+            this.aliases[withNamespace(alias, name)] = withNamespace(namespace, name);
+        }
+    }
+    addTypeDefinition(namespace, name, type) {
+        const fqName = withNamespace(namespace, name);
+        this.typeDefinitions.set(fqName, type);
+        this.addAlias(namespace, name);
+    }
+    getPrimitiveType(fqName) {
+        return this.retrieveType(fqName, this.typeDefinitions);
     }
-    getPrimitiveType(name) {
-        return this.typeDefinitions[name];
+    getModel(fqName) {
+        return this.retrieveType(fqName, this.models);
     }
-    addModel(name, model) {
-        this.modelTypes[name] = model;
+    addEntityType(namespace, name, model) {
+        const fqName = withNamespace(namespace, name);
+        this.models.set(fqName, Object.assign(Object.assign({}, model), { dataType: "ModelType" /* DataTypes.ModelType */ }));
+        this.addAlias(namespace, name);
     }
     /**
-     * Get a specific model by its name.
+     * Get a specific model by its fully qualified name.
      *
-     * @param modelName the final model name that is generated
+     * @param fqName the fully qualified name of the entity
      * @returns the model type
      */
-    getModel(modelName) {
-        return this.modelTypes[modelName];
+    getEntityType(fqName) {
+        return this.retrieveType(fqName, this.models);
     }
     /**
      * Retrieve all known EntityType models from the EDMX model.
      *
      * @returns list of model types
      */
-    getModels() {
-        return Object.values(this.modelTypes);
+    getEntityTypes() {
+        const ets = [...this.models.values()].filter((m) => m.dataType === "ModelType" /* DataTypes.ModelType */);
+        return this.sortModelsByInheritance(ets);
     }
-    /**
-     * Set all model entity types
-     *
-     * @param models new model types
-     */
-    setModels(models) {
-        this.modelTypes = models;
-    }
-    addComplexType(name, model) {
-        this.complexTypes[name] = model;
+    addComplexType(namespace, name, model) {
+        const fqName = withNamespace(namespace, name);
+        this.models.set(fqName, Object.assign(Object.assign({}, model), { dataType: "ComplexType" /* DataTypes.ComplexType */ }));
+        this.addAlias(namespace, name);
     }
     /**
-     * Get a specific model by its name.
+     * Get a specific model by its fully qualified name.
      *
-     * @param name the final model name that is generated
+     * @param fqName the final model name that is generated
      * @returns the model type
      */
-    getComplexType(name) {
-        return this.complexTypes[name];
+    getComplexType(fqName) {
+        return this.retrieveType(fqName, this.models);
     }
     /**
      * Retrieve all known ComplexType models from the EDMX model.
@@ -80,44 +115,49 @@ class DataModel {
      * @returns list of model types
      */
     getComplexTypes() {
-        return Object.values(this.complexTypes);
+        const types = [...this.models.values()].filter((m) => m.dataType === "ComplexType" /* DataTypes.ComplexType */);
+        return this.sortModelsByInheritance(types);
     }
-    /**
-     * Set all complex types
-     *
-     * @param models new complex types
-     */
-    setComplexTypes(complexTypes) {
-        this.complexTypes = complexTypes;
-    }
-    addEnum(name, type) {
-        this.enumTypes[name] = type;
+    addEnum(namespace, name, type) {
+        const fqName = withNamespace(namespace, name);
+        this.models.set(fqName, Object.assign(Object.assign({}, type), { dataType: "EnumType" /* DataTypes.EnumType */ }));
+        this.addAlias(namespace, name);
     }
     /**
      * 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);
+        return [...this.models.values()].filter((m) => m.dataType === "EnumType" /* DataTypes.EnumType */);
     }
-    addOperationType(binding, operationType) {
-        if (!this.operationTypes[binding]) {
-            this.operationTypes[binding] = [];
-        }
-        this.operationTypes[binding].push(operationType);
+    addUnboundOperationType(namespace, operationType) {
+        this.unboundOperationTypes.set(operationType.fqName, operationType);
+        this.addAlias(namespace, operationType.odataName);
     }
     getUnboundOperationTypes() {
-        const operations = this.operationTypes[ROOT_OPERATION_BINDING];
-        return !operations ? [] : [...operations];
+        return [...this.unboundOperationTypes.values()];
+    }
+    getUnboundOperationType(fqOpName) {
+        return this.retrieveType(fqOpName, this.unboundOperationTypes);
+    }
+    addBoundOperationType(namespace, bindingProp, operationType) {
+        const fqEntityType = bindingProp.fqType;
+        const store = bindingProp.isCollection ? this.entityCollectionBoundOperationTypes : this.entityBoundOperationTypes;
+        const list = store.get(fqEntityType);
+        if (list) {
+            list.push(operationType);
+        }
+        else {
+            store.set(fqEntityType, [operationType]);
+        }
     }
-    getOperationTypeByBinding(binding) {
-        const operations = this.operationTypes[binding];
-        return !operations ? [] : [...operations];
+    getEntityTypeOperations(fqEntityName) {
+        const operations = this.retrieveType(fqEntityName, this.entityBoundOperationTypes);
+        return operations || [];
     }
-    getOperationTypeByEntityOrCollectionBinding(binding) {
-        const entityOps = this.operationTypes[binding] || [];
-        const collOps = this.operationTypes[`Collection(${binding})`] || [];
-        return [...collOps, ...entityOps];
+    getEntitySetOperations(fqEntityName) {
+        const operations = this.retrieveType(fqEntityName, this.entityCollectionBoundOperationTypes);
+        return operations || [];
     }
     addAction(name, action) {
         this.container.actions[name] = action;
@@ -137,6 +177,35 @@ class DataModel {
     getConverter(dataType) {
         return this.converters.get(dataType);
     }
+    sortModelsByInheritance(models) {
+        // recursively visit all models and sort them by inheritance such that base classes
+        // are always before derived classes
+        const sorted = [];
+        const visitedModels = new Set();
+        const inProgressModels = new Set();
+        function visit(model) {
+            const fqName = model.fqName;
+            if (inProgressModels.has(fqName)) {
+                throw new Error(`Cyclic inheritance detected for model "${fqName}"!`);
+            }
+            if (!visitedModels.has(fqName)) {
+                inProgressModels.add(fqName);
+                for (const baseClassName of model.baseClasses) {
+                    const baseClass = models.find((e) => e.fqName === baseClassName);
+                    if (baseClass) {
+                        visit(baseClass);
+                    }
+                }
+                visitedModels.add(fqName);
+                inProgressModels.delete(fqName);
+                sorted.push(model);
+            }
+        }
+        for (const model of models) {
+            visit(model);
+        }
+        return sorted;
+    }
 }
 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":"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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"]}
+{"version":3,"file":"DataModel.js","sourceRoot":"","sources":["../../src/data-model/DataModel.ts"],"names":[],"mappings":";;;AAGA,mDAayB;AAazB,SAAgB,aAAa,CAAC,EAAU,EAAE,IAAY;IACpD,oHAAoH;IACpH,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACrC,CAAC;AAHD,sCAGC;AAED,MAAa,SAAS;IA0BpB,YACE,UAAqC,EAC7B,OAAqB,EAC7B,aAAoC,IAAI,GAAG,EAAE;QADrC,YAAO,GAAP,OAAO,CAAc;QAzBvB,WAAM,GAAG,IAAI,GAAG,EAA8C,CAAC;QACvE;;;WAGG;QACK,0BAAqB,GAAG,IAAI,GAAG,EAAyB,CAAC;QACjE;;;;WAIG;QACK,8BAAyB,GAAG,IAAI,GAAG,EAAgC,CAAC;QAC5E;;;;WAIG;QACK,wCAAmC,GAAG,IAAI,GAAG,EAAgC,CAAC;QAE9E,oBAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,YAAO,GAA2B,EAAE,CAAC;QACrC,cAAS,GAAyB,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAOvG,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,MAAM,CAAyB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;YACpF,IAAI,KAAK,EAAE;gBACT,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;aACjB;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,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;IAEO,YAAY,CAAI,MAAc,EAAE,QAAwB;QAC9D,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACzG,CAAC;IAEO,QAAQ,CAAC,SAAiB,EAAE,IAAY;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;SAC3E;IACH,CAAC;IAEM,iBAAiB,CAAC,SAAiB,EAAE,IAAY,EAAE,IAAY;QACpE,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAEM,gBAAgB,CAAC,MAAc;QACpC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzD,CAAC;IAEM,QAAQ,CAAC,MAAc;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAEM,aAAa,CAAC,SAAiB,EAAE,IAAY,EAAE,KAAkC;QACtF,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,kCAAO,KAAK,KAAE,QAAQ,2CAAwB,CAAC;QACrE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAc,CAAC;IAC7D,CAAC;IAED;;;;OAIG;IACI,cAAc;QACnB,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAkB,EAAE,CAAC,CAAC,CAAC,QAAQ,0CAAwB,CAAC,CAAC;QACxG,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAEM,cAAc,CAAC,SAAiB,EAAE,IAAY,EAAE,KAAoC;QACzF,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,kCAAO,KAAK,KAAE,QAAQ,+CAA0B,CAAC;QACvE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACI,cAAc,CAAC,MAAc;QAClC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAgB,CAAC;IAC/D,CAAC;IAED;;;;OAIG;IACI,eAAe;QACpB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAoB,EAAE,CAAC,CAAC,CAAC,QAAQ,8CAA0B,CAAC,CAAC;QAC9G,OAAO,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,OAAO,CAAC,SAAiB,EAAE,IAAY,EAAE,IAAgC;QAC9E,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,kCAAO,IAAI,KAAE,QAAQ,yCAAuB,CAAC;QACnE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACI,QAAQ;QACb,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAiB,EAAE,CAAC,CAAC,CAAC,QAAQ,wCAAuB,CAAC,CAAC;IACnG,CAAC;IAEM,uBAAuB,CAAC,SAAiB,EAAE,aAA4B;QAC5E,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAEM,wBAAwB;QAC7B,OAAO,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;IAEM,uBAAuB,CAAC,QAAgB;QAC7C,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACjE,CAAC;IAEM,qBAAqB,CAAC,SAAiB,EAAE,WAA0B,EAAE,aAA4B;QACtG,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC;QAExC,MAAM,KAAK,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC;QACnH,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACrC,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAC1B;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;SAC1C;IACH,CAAC;IAEM,uBAAuB,CAAC,YAAoB;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACnF,OAAO,UAAU,IAAI,EAAE,CAAC;IAC1B,CAAC;IAEM,sBAAsB,CAAC,YAAoB;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,mCAAmC,CAAC,CAAC;QAC7F,OAAO,UAAU,IAAI,EAAE,CAAC;IAC1B,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;IAEO,uBAAuB,CAA6C,MAAmB;QAC7F,mFAAmF;QACnF,oCAAoC;QACpC,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QACxC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;QAE3C,SAAS,KAAK,CAAC,KAAW;YACxB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;YAC5B,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAChC,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,IAAI,CAAC,CAAC;aACvE;YAED,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC9B,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAE7B,KAAK,MAAM,aAAa,IAAI,KAAK,CAAC,WAAW,EAAE;oBAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC;oBACjE,IAAI,SAAS,EAAE;wBACb,KAAK,CAAC,SAAS,CAAC,CAAC;qBAClB;iBACF;gBACD,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC1B,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACpB;QACH,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,KAAK,CAAC,KAAK,CAAC,CAAC;SACd;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA/OD,8BA+OC","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  DataTypes,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EnumType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  ODataVersion,\r\n  OperationType,\r\n  PropertyModel,\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\n/**\r\n * Each namespace is represented as tuple: 1. the namespace 2. the alias, if any.\r\n */\r\nexport type NamespaceWithAlias = [string, string?];\r\n\r\nexport function withNamespace(ns: string, name: string) {\r\n  // this supports the edge case of an empty string as namespace which isn't really valid according to spec (see CSDL)\r\n  return ns ? `${ns}.${name}` : name;\r\n}\r\n\r\nexport class DataModel {\r\n  private readonly converters: MappedConverterChains;\r\n\r\n  private models = new Map<string, ModelType | ComplexType | EnumType>();\r\n  /**\r\n   * Stores unbound operations by their fully qualified name.\r\n   * @private\r\n   */\r\n  private unboundOperationTypes = new Map<string, OperationType>();\r\n  /**\r\n   * Stores operations bound to an entity type by the fully qualified name of the binding entity, e.g.\r\n   * \"Trippin.Person\".\r\n   * @private\r\n   */\r\n  private entityBoundOperationTypes = new Map<string, Array<OperationType>>();\r\n  /**\r\n   * Stores operations bound to an entity collection by the fully qualified name of the binding entity, e.g.\r\n   * \"Trippin.Person\".\r\n   * @private\r\n   */\r\n  private entityCollectionBoundOperationTypes = new Map<string, Array<OperationType>>();\r\n  private readonly namespace2Alias: { [ns: string]: string };\r\n  private typeDefinitions = new Map<string, string>();\r\n  private aliases: Record<string, string> = {};\r\n  private container: EntityContainerModel = { entitySets: {}, singletons: {}, functions: {}, actions: {} };\r\n\r\n  constructor(\r\n    namespaces: Array<NamespaceWithAlias>,\r\n    private version: ODataVersion,\r\n    converters: MappedConverterChains = new Map()\r\n  ) {\r\n    this.converters = converters;\r\n    this.namespace2Alias = namespaces.reduce<Record<string, string>>((col, [ns, alias]) => {\r\n      if (alias) {\r\n        col[ns] = alias;\r\n      }\r\n      return col;\r\n    }, {});\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  private retrieveType<T>(fqName: string, haystack: Map<string, T>): T | undefined {\r\n    return haystack.get(fqName) || (this.aliases[fqName] ? haystack.get(this.aliases[fqName]) : undefined);\r\n  }\r\n\r\n  private addAlias(namespace: string, name: string) {\r\n    const alias = this.namespace2Alias[namespace];\r\n    if (alias) {\r\n      this.aliases[withNamespace(alias, name)] = withNamespace(namespace, name);\r\n    }\r\n  }\r\n\r\n  public addTypeDefinition(namespace: string, name: string, type: string) {\r\n    const fqName = withNamespace(namespace, name);\r\n    this.typeDefinitions.set(fqName, type);\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  public getPrimitiveType(fqName: string): string | undefined {\r\n    return this.retrieveType(fqName, this.typeDefinitions);\r\n  }\r\n\r\n  public getModel(fqName: string) {\r\n    return this.retrieveType(fqName, this.models);\r\n  }\r\n\r\n  public addEntityType(namespace: string, name: string, model: Omit<ModelType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n    this.models.set(fqName, { ...model, dataType: DataTypes.ModelType });\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its fully qualified name.\r\n   *\r\n   * @param fqName the fully qualified name of the entity\r\n   * @returns the model type\r\n   */\r\n  public getEntityType(fqName: string) {\r\n    return this.retrieveType(fqName, this.models) as ModelType;\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 getEntityTypes() {\r\n    const ets = [...this.models.values()].filter((m): m is ModelType => m.dataType === DataTypes.ModelType);\r\n    return this.sortModelsByInheritance(ets);\r\n  }\r\n\r\n  public addComplexType(namespace: string, name: string, model: Omit<ComplexType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n    this.models.set(fqName, { ...model, dataType: DataTypes.ComplexType });\r\n    this.addAlias(namespace, name);\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its fully qualified name.\r\n   *\r\n   * @param fqName the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getComplexType(fqName: string) {\r\n    return this.retrieveType(fqName, this.models) as ComplexType;\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    const types = [...this.models.values()].filter((m): m is ComplexType => m.dataType === DataTypes.ComplexType);\r\n    return this.sortModelsByInheritance(types);\r\n  }\r\n\r\n  public addEnum(namespace: string, name: string, type: Omit<EnumType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n    this.models.set(fqName, { ...type, dataType: DataTypes.EnumType });\r\n    this.addAlias(namespace, name);\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 [...this.models.values()].filter((m): m is EnumType => m.dataType === DataTypes.EnumType);\r\n  }\r\n\r\n  public addUnboundOperationType(namespace: string, operationType: OperationType) {\r\n    this.unboundOperationTypes.set(operationType.fqName, operationType);\r\n    this.addAlias(namespace, operationType.odataName);\r\n  }\r\n\r\n  public getUnboundOperationTypes(): Array<OperationType> {\r\n    return [...this.unboundOperationTypes.values()];\r\n  }\r\n\r\n  public getUnboundOperationType(fqOpName: string): OperationType | undefined {\r\n    return this.retrieveType(fqOpName, this.unboundOperationTypes);\r\n  }\r\n\r\n  public addBoundOperationType(namespace: string, bindingProp: PropertyModel, operationType: OperationType) {\r\n    const fqEntityType = bindingProp.fqType;\r\n\r\n    const store = bindingProp.isCollection ? this.entityCollectionBoundOperationTypes : this.entityBoundOperationTypes;\r\n    const list = store.get(fqEntityType);\r\n    if (list) {\r\n      list.push(operationType);\r\n    } else {\r\n      store.set(fqEntityType, [operationType]);\r\n    }\r\n  }\r\n\r\n  public getEntityTypeOperations(fqEntityName: string): Array<OperationType> {\r\n    const operations = this.retrieveType(fqEntityName, this.entityBoundOperationTypes);\r\n    return operations || [];\r\n  }\r\n\r\n  public getEntitySetOperations(fqEntityName: string): Array<OperationType> {\r\n    const operations = this.retrieveType(fqEntityName, this.entityCollectionBoundOperationTypes);\r\n    return operations || [];\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  private sortModelsByInheritance<Type extends Omit<ComplexType, \"dataType\">>(models: Array<Type>): Array<Type> {\r\n    // recursively visit all models and sort them by inheritance such that base classes\r\n    // are always before derived classes\r\n    const sorted: Array<Type> = [];\r\n    const visitedModels = new Set<string>();\r\n    const inProgressModels = new Set<string>();\r\n\r\n    function visit(model: Type) {\r\n      const fqName = model.fqName;\r\n      if (inProgressModels.has(fqName)) {\r\n        throw new Error(`Cyclic inheritance detected for model \"${fqName}\"!`);\r\n      }\r\n\r\n      if (!visitedModels.has(fqName)) {\r\n        inProgressModels.add(fqName);\r\n\r\n        for (const baseClassName of model.baseClasses) {\r\n          const baseClass = models.find((e) => e.fqName === baseClassName);\r\n          if (baseClass) {\r\n            visit(baseClass);\r\n          }\r\n        }\r\n        visitedModels.add(fqName);\r\n        inProgressModels.delete(fqName);\r\n        sorted.push(model);\r\n      }\r\n    }\r\n\r\n    for (const model of models) {\r\n      visit(model);\r\n    }\r\n    return sorted;\r\n  }\r\n}\r\n"]}

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

@@ -20,11 +20,12 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     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);
+    private collectModelTypes;
+    private addModel2Type;
     protected abstract getNavigationProps(entityType: ET | ComplexType): Array<Property>;
     protected abstract digestOperations(schema: SchemaV3 | SchemaV4): void;
     protected abstract digestEntityContainer(schema: SchemaV3 | SchemaV4): void;
@@ -36,14 +37,12 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
      */
     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, entityPropConfig?: PropertyGenerationOptions | undefined) => PropertyModel;
 }

package/lib/data-model/DataModelDigestion.js

@@ -15,14 +15,15 @@ class Digester {
             if (!p.$.Type) {
                 throw new Error(`No type information given for property [${p.$.Name}]!`);
             }
-            const configProp = this.serviceConfigHelper.findConfigPropByName(p.$.Name);
+            const configProp = this.serviceConfigHelper.findPropConfigByName(p.$.Name);
             const name = this.namingHelper.getModelPropName((entityPropConfig === null || entityPropConfig === void 0 ? void 0 : entityPropConfig.mappedName) || (configProp === null || configProp === void 0 ? void 0 : configProp.mappedName) || p.$.Name);
             const isCollection = !!p.$.Type.match(/^Collection\(/);
             let dataType = p.$.Type.replace(/^Collection\(([^\)]+)\)/, "$1");
+            // support for primitive type mapping
             if (this.namingHelper.includesServicePrefix(dataType)) {
-                const dtName = this.namingHelper.stripServicePrefix(dataType);
-                if (this.dataModel.getPrimitiveType(dtName) !== undefined) {
-                    dataType = this.dataModel.getPrimitiveType(dtName);
+                const dt = this.dataModel.getPrimitiveType(dataType);
+                if (dt !== undefined) {
+                    dataType = dt;
                 }
             }
             let result;
@@ -31,7 +32,7 @@ class Digester {
             if (this.namingHelper.includesServicePrefix(dataType)) {
                 const resultDt = this.model2Type.get(dataType);
                 if (!resultDt) {
-                    throw new Error(`Couldn't determine model type for data type with name '${dataType}'`);
+                    throw new Error(`Couldn't determine model data type for property "${p.$.Name}"! Given data type: "${dataType}".`);
                 }
                 // special handling for enums
                 if (resultDt === "EnumType" /* DataTypes.EnumType */) {
@@ -72,113 +73,122 @@ class Digester {
             else {
                 throw new Error(`Unknown type [${dataType}]: Not 'Collection(...)', not OData type 'Edm.*', not starting with one of the namespaces!W`);
             }
-            return Object.assign({ odataName: p.$.Name, name, odataType: p.$.Type, required: p.$.Nullable === "false", isCollection: isCollection, managed: typeof (entityPropConfig === null || entityPropConfig === void 0 ? void 0 : entityPropConfig.managed) !== "undefined" ? entityPropConfig.managed : configProp === null || configProp === void 0 ? void 0 : configProp.managed }, result);
+            return Object.assign({ odataName: p.$.Name, name, odataType: p.$.Type, fqType: dataType, required: p.$.Nullable === "false", isCollection: isCollection, managed: typeof (entityPropConfig === null || entityPropConfig === void 0 ? void 0 : entityPropConfig.managed) !== "undefined" ? entityPropConfig.managed : configProp === null || configProp === void 0 ? void 0 : configProp.managed }, result);
         };
-        this.dataModel = new DataModel_1.DataModel(version, converters);
+        const namespaces = schemas.map((s) => [s.$.Namespace, s.$.Alias]);
+        this.dataModel = new DataModel_1.DataModel(namespaces, version, converters);
         this.serviceConfigHelper = new ServiceConfigHelper_1.ServiceConfigHelper(options);
         this.collectModelTypes(schemas);
     }
-    digest() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.digestEntityTypesAndOperations();
-            // delegate to version specific entity container digestion
-            this.schemas.forEach((schema) => this.digestEntityContainer(schema));
-            return this.dataModel;
-        });
-    }
     collectModelTypes(schemas) {
         schemas.forEach((schema) => {
             var _a, _b, _c;
-            const servicePrefix = schema.$.Namespace + ".";
+            const { Namespace: ns, Alias: alias } = schema.$;
             (_a = schema.EnumType) === null || _a === void 0 ? void 0 : _a.forEach((et) => {
-                this.model2Type.set(servicePrefix + et.$.Name, "EnumType" /* DataTypes.EnumType */);
+                this.addModel2Type(ns, alias, et.$.Name, "EnumType" /* DataTypes.EnumType */);
             });
             (_b = schema.ComplexType) === null || _b === void 0 ? void 0 : _b.forEach((ct) => {
-                this.model2Type.set(servicePrefix + ct.$.Name, "ComplexType" /* DataTypes.ComplexType */);
+                this.addModel2Type(ns, alias, ct.$.Name, "ComplexType" /* DataTypes.ComplexType */);
             });
             (_c = schema.EntityType) === null || _c === void 0 ? void 0 : _c.forEach((et) => {
-                this.model2Type.set(servicePrefix + et.$.Name, "ModelType" /* DataTypes.ModelType */);
+                this.addModel2Type(ns, alias, et.$.Name, "ModelType" /* DataTypes.ModelType */);
             });
         });
     }
+    addModel2Type(ns, alias, name, dt) {
+        this.model2Type.set((0, DataModel_1.withNamespace)(ns, name), dt);
+        if (alias) {
+            this.model2Type.set((0, DataModel_1.withNamespace)(alias, name), dt);
+        }
+    }
+    digest() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this.digestEntityTypesAndOperations();
+            // delegate to version specific entity container digestion
+            this.schemas.forEach((schema) => this.digestEntityContainer(schema));
+            return this.dataModel;
+        });
+    }
     digestEntityTypesAndOperations() {
         this.schemas.forEach((schema) => {
+            const ns = [schema.$.Namespace, schema.$.Alias];
             // type definitions: alias for primitive types
-            this.addTypeDefinition(schema.TypeDefinition);
+            this.addTypeDefinition(schema.$.Namespace, schema.TypeDefinition);
             // enums
             if (schema.EnumType) {
                 for (const et of schema.EnumType) {
-                    const name = et.$.Name;
-                    this.dataModel.addEnum(name, {
-                        odataName: name,
-                        name: this.namingHelper.getEnumName(name),
+                    const odataName = et.$.Name;
+                    const fqName = (0, DataModel_1.withNamespace)(ns[0], odataName);
+                    this.dataModel.addEnum(ns[0], odataName, {
+                        fqName,
+                        odataName,
+                        name: this.namingHelper.getEnumName(odataName),
                         members: et.Member.map((m) => m.$.Name),
                     });
                 }
             }
-            // entity types
-            this.addEntityType(schema.EntityType);
             // complex types
-            this.addComplexType(schema.ComplexType);
+            this.addComplexType(ns, schema.ComplexType);
+            // entity types
+            this.addEntityType(ns, schema.EntityType);
             // V4 only: function & action types
             this.digestOperations(schema);
         });
         this.postProcessModel();
     }
-    getBaseModel(model) {
+    getBaseModel(namespace, model) {
         var _a;
-        const entityConfig = this.serviceConfigHelper.findConfigEntityByName(model.$.Name);
-        const entityName = (entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.mappedName) || model.$.Name;
-        const name = this.namingHelper.getModelName(entityName);
-        const qName = this.namingHelper.getQName(entityName);
-        const editableName = this.namingHelper.getEditableModelName(entityName);
         const odataName = model.$.Name;
-        const bType = model.$.BaseType;
-        const props = [...((_a = model.Property) !== null && _a !== void 0 ? _a : []), ...this.getNavigationProps(model)];
+        const fqName = (0, DataModel_1.withNamespace)(namespace[0], odataName);
+        const entityConfig = this.serviceConfigHelper.findEntityConfigByName(namespace, odataName);
+        const entityName = (entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.mappedName) || model.$.Name;
+        // map properties respecting the config
+        const props = [...((_a = model.Property) !== null && _a !== void 0 ? _a : []), ...this.getNavigationProps(model)].map((p) => {
+            var _a;
+            const epConfig = (_a = entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.properties) === null || _a === void 0 ? void 0 : _a.find((ep) => ep.name === p.$.Name);
+            return this.mapProp(p, epConfig);
+        });
         // support for base types, i.e. extends clause of interfaces
         const baseClasses = [];
-        if (bType) {
-            baseClasses.push(this.namingHelper.getModelName(bType));
+        if (model.$.BaseType) {
+            baseClasses.push(model.$.BaseType);
         }
         return {
-            name,
-            qName,
+            fqName,
             odataName,
-            editableName,
+            name: this.namingHelper.getModelName(entityName),
+            qName: this.namingHelper.getQName(entityName),
+            editableName: this.namingHelper.getEditableModelName(entityName),
             baseClasses,
-            props: props.map((p) => {
-                var _a;
-                const epConfig = (_a = entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.properties) === null || _a === void 0 ? void 0 : _a.find((ep) => ep.name === p.$.Name);
-                return this.mapProp(p, epConfig);
-            }),
+            props,
             baseProps: [], // postprocess required
         };
     }
-    addTypeDefinition(types) {
+    addTypeDefinition(ns, types) {
         if (!types || !types.length) {
             return;
         }
         for (const t of types) {
-            this.dataModel.addTypeDefinition(t.$.Name, t.$.UnderlyingType);
+            this.dataModel.addTypeDefinition(ns, t.$.Name, t.$.UnderlyingType);
         }
     }
-    addComplexType(models) {
+    addComplexType(namespace, models) {
         if (!models || !models.length) {
             return;
         }
         for (const model of models) {
-            const baseModel = this.getBaseModel(model);
-            this.dataModel.addComplexType(baseModel.name, baseModel);
+            const baseModel = this.getBaseModel(namespace, model);
+            this.dataModel.addComplexType(namespace[0], baseModel.odataName, baseModel);
         }
     }
-    addEntityType(models) {
+    addEntityType(namespace, models) {
         var _a;
         if (!models || !models.length) {
             return;
         }
         for (const model of models) {
-            const baseModel = this.getBaseModel(model);
-            const entityConfig = this.serviceConfigHelper.findConfigEntityByName(model.$.Name);
+            const baseModel = this.getBaseModel(namespace, model);
+            const entityConfig = this.serviceConfigHelper.findEntityConfigByName(namespace, model.$.Name);
             const entityName = (entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.mappedName) || model.$.Name;
             // key support: we add keys from this entity,
             // but not keys stemming from base classes (postprocess required)
@@ -193,7 +203,7 @@ class Digester {
                     keyNames.push(...propNames);
                 }
             }
-            this.dataModel.addModel(baseModel.name, Object.assign(Object.assign({}, baseModel), { idModelName: this.namingHelper.getIdModelName(entityName), qIdFunctionName: this.namingHelper.getQIdFunctionName(entityName), generateId: true, keyNames: keyNames, keys: [], getKeyUnion: () => keyNames.join(" | ") }));
+            this.dataModel.addEntityType(namespace[0], baseModel.odataName, Object.assign(Object.assign({}, baseModel), { idModelName: this.namingHelper.getIdModelName(entityName), qIdFunctionName: this.namingHelper.getQIdFunctionName(entityName), generateId: true, keyNames: keyNames, keys: [], getKeyUnion: () => keyNames.join(" | ") }));
         }
     }
     postProcessModel() {
@@ -203,8 +213,8 @@ class Digester {
             const [baseProps] = this.collectBaseClassPropsAndKeys(model, []);
             model.baseProps = baseProps;
         });
-        const modelTypes = this.dataModel.getModels();
         // entity types
+        const modelTypes = this.dataModel.getEntityTypes();
         modelTypes.forEach((model) => {
             const [baseProps, baseKeys, idName, qIdName] = this.collectBaseClassPropsAndKeys(model, []);
             model.baseProps = baseProps;
@@ -232,47 +242,15 @@ class Digester {
                 return prop;
             });
         });
-        const sortedModelTypes = this.sortModelsByInheritance(modelTypes);
-        this.dataModel.setModels(sortedModelTypes);
-        const sortedComplexTypes = this.sortModelsByInheritance(complexTypes);
-        this.dataModel.setComplexTypes(sortedComplexTypes);
-    }
-    sortModelsByInheritance(models) {
-        // recursively visit all models and sort them by inheritance such that base classes
-        // are always before derived classes
-        const sortedModels = {};
-        const visitedModels = new Set();
-        const inProgressModels = new Set();
-        function visit(model) {
-            if (inProgressModels.has(model)) {
-                throw new Error("Cyclic dependencies detected!");
-            }
-            if (!visitedModels.has(model)) {
-                inProgressModels.add(model);
-                for (const baseClassName of model.baseClasses) {
-                    const baseClass = models.find((e) => e.name === baseClassName);
-                    if (baseClass) {
-                        visit(baseClass);
-                    }
-                }
-                visitedModels.add(model);
-                inProgressModels.delete(model);
-                sortedModels[model.name] = model;
-            }
-        }
-        for (const model of models) {
-            visit(model);
-        }
-        return sortedModels;
     }
     collectBaseClassPropsAndKeys(model, visitedModels) {
-        if (visitedModels.includes(model.name)) {
-            throw new Error(`Cyclic inheritance detected for model ${model.name}!`);
+        if (visitedModels.includes(model.fqName)) {
+            throw new Error(`Cyclic inheritance detected for model ${model.fqName}!`);
         }
-        visitedModels.push(model.name);
+        visitedModels.push(model.fqName);
         return model.baseClasses.reduce(([props, keys, idName, qIdName], bc) => {
             var _a;
-            const baseModel = this.dataModel.getModel(bc) || this.dataModel.getComplexType(bc);
+            const baseModel = this.dataModel.getEntityType(bc) || this.dataModel.getComplexType(bc);
             if (!baseModel) {
                 throw new Error(`BaseModel "${bc}" doesn't exist!`);
             }
@@ -289,10 +267,11 @@ class Digester {
                 }
             }
             props.push(...baseModel.props);
-            if ((_a = baseModel.keyNames) === null || _a === void 0 ? void 0 : _a.length) {
-                keys.push(...baseModel.keyNames.filter((kn) => !keys.includes(kn)));
-                idNameResult = baseModel.idModelName;
-                qIdNameResult = baseModel.qIdFunctionName;
+            const entityModel = baseModel;
+            if ((_a = entityModel.keyNames) === null || _a === void 0 ? void 0 : _a.length) {
+                keys.push(...entityModel.keyNames.filter((kn) => !keys.includes(kn)));
+                idNameResult = entityModel.idModelName;
+                qIdNameResult = entityModel.qIdFunctionName;
             }
             return [props, keys, idNameResult, qIdNameResult];
         }, [[], [], "", ""]);
@@ -300,5 +279,4 @@ class Digester {
 }
 exports.Digester = Digester;
 Digester.EDM_PREFIX = "Edm.";
-Digester.ROOT_OPERATION = "/";
 //# sourceMappingURL=DataModelDigestion.js.map