@odata2ts/odata2ts 0.24.0 → 0.25.1

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.25.1](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.25.0...@odata2ts/odata2ts@0.25.1) (2023-07-10)
+
+### Bug Fixes
+
+* **odata2ts:** duplicate output paths ([#184](https://github.com/odata2ts/odata2ts/issues/184)) ([b55366d](https://github.com/odata2ts/odata2ts/commit/b55366dab8d331ace3c766b4279b5b0cc575aa03))
+
+# [0.25.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.24.0...@odata2ts/odata2ts@0.25.0) (2023-07-10)
+
+### Bug Fixes
+
+* **odata2ts:** use qualified name for bound operations ([#182](https://github.com/odata2ts/odata2ts/issues/182)) ([120c9b8](https://github.com/odata2ts/odata2ts/commit/120c9b807ac209a8eb82b389bc7c21d7df7fe876))
+
+### Features
+
+* **odata2ts:** support for multiple namespaces by merging ([#175](https://github.com/odata2ts/odata2ts/issues/175)) ([db8fd61](https://github.com/odata2ts/odata2ts/commit/db8fd6165c57ceb9e04488789a62f2a5467ecc68))
+
+* **odata2ts:** support schema alias ([#181](https://github.com/odata2ts/odata2ts/issues/181)) ([e0c04a8](https://github.com/odata2ts/odata2ts/commit/e0c04a83e32d99187652966bb9cc32f36ead3df2))
+
+* **odata2ts:** support TypeDefinition elements ([#183](https://github.com/odata2ts/odata2ts/issues/183)) ([d77d2cb](https://github.com/odata2ts/odata2ts/commit/d77d2cbf17383dab50d35bb7374e08a83d264db2))
+
 # [0.24.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.23.1...@odata2ts/odata2ts@0.24.0) (2023-06-14)
 
 ### Features

package/lib/FactoryFunctionModel.d.ts

@@ -8,6 +8,6 @@ export type DigestionOptions = Pick<RunOptions, "converters" | "disableAutoManag
 /**
  * Takes an EdmxSchema plus the run options and creates a DataModel.
  */
-export type DigesterFunction<S extends Schema<any, any>> = (schema: S, options: DigestionOptions, namingHelper: NamingHelper) => Promise<DataModel>;
+export type DigesterFunction<S extends Schema<any, any>> = (schema: Array<S>, options: DigestionOptions, namingHelper: NamingHelper) => Promise<DataModel>;
 export type GeneratorFunctionOptions = Pick<RunOptions, "skipEditableModels" | "skipIdModels" | "skipOperations" | "skipComments" | "v2ModelsWithExtraResultsWrapping">;
 export type EntityBasedGeneratorFunction = (dataModel: DataModel, sourceFile: SourceFile, version: ODataVersions, options: GeneratorFunctionOptions, namingHelper: NamingHelper) => void;

package/lib/FactoryFunctionModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"FactoryFunctionModel.js","sourceRoot":"","sources":["../src/FactoryFunctionModel.ts"],"names":[],"mappings":"","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { SourceFile } from \"ts-morph\";\r\n\r\nimport { DataModel } from \"./data-model/DataModel\";\r\nimport { Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper\";\r\nimport { RunOptions } from \"./OptionModel\";\r\n\r\nexport type DigestionOptions = Pick<\r\n  RunOptions,\r\n  | \"converters\"\r\n  | \"disableAutoManagedKey\"\r\n  | \"propertiesByName\"\r\n  | \"entitiesByName\"\r\n  | \"v2ModelsWithExtraResultsWrapping\"\r\n  | \"skipEditableModels\"\r\n  | \"skipComments\"\r\n>;\r\n\r\n/**\r\n * Takes an EdmxSchema plus the run options and creates a DataModel.\r\n */\r\nexport type DigesterFunction<S extends Schema<any, any>> = (\r\n  schema: S,\r\n  options: DigestionOptions,\r\n  namingHelper: NamingHelper\r\n) => Promise<DataModel>;\r\n\r\nexport type GeneratorFunctionOptions = Pick<\r\n  RunOptions,\r\n  \"skipEditableModels\" | \"skipIdModels\" | \"skipOperations\" | \"skipComments\" | \"v2ModelsWithExtraResultsWrapping\"\r\n>;\r\n\r\nexport type EntityBasedGeneratorFunction = (\r\n  dataModel: DataModel,\r\n  sourceFile: SourceFile,\r\n  version: ODataVersions,\r\n  options: GeneratorFunctionOptions,\r\n  namingHelper: NamingHelper\r\n) => void;\r\n"]}
+{"version":3,"file":"FactoryFunctionModel.js","sourceRoot":"","sources":["../src/FactoryFunctionModel.ts"],"names":[],"mappings":"","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { SourceFile } from \"ts-morph\";\r\n\r\nimport { DataModel } from \"./data-model/DataModel\";\r\nimport { Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper\";\r\nimport { RunOptions } from \"./OptionModel\";\r\n\r\nexport type DigestionOptions = Pick<\r\n  RunOptions,\r\n  | \"converters\"\r\n  | \"disableAutoManagedKey\"\r\n  | \"propertiesByName\"\r\n  | \"entitiesByName\"\r\n  | \"v2ModelsWithExtraResultsWrapping\"\r\n  | \"skipEditableModels\"\r\n  | \"skipComments\"\r\n>;\r\n\r\n/**\r\n * Takes an EdmxSchema plus the run options and creates a DataModel.\r\n */\r\nexport type DigesterFunction<S extends Schema<any, any>> = (\r\n  schema: Array<S>,\r\n  options: DigestionOptions,\r\n  namingHelper: NamingHelper\r\n) => Promise<DataModel>;\r\n\r\nexport type GeneratorFunctionOptions = Pick<\r\n  RunOptions,\r\n  \"skipEditableModels\" | \"skipIdModels\" | \"skipOperations\" | \"skipComments\" | \"v2ModelsWithExtraResultsWrapping\"\r\n>;\r\n\r\nexport type EntityBasedGeneratorFunction = (\r\n  dataModel: DataModel,\r\n  sourceFile: SourceFile,\r\n  version: ODataVersions,\r\n  options: GeneratorFunctionOptions,\r\n  namingHelper: NamingHelper\r\n) => void;\r\n"]}

package/lib/app.js

@@ -21,24 +21,28 @@ function isServiceGen(mode) {
  * @param options further options
  */
 function runApp(metadataJson, options) {
-    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         // determine edmx edmxVersion attribute
         const edmxVersion = metadataJson["edmx:Edmx"].$.Version;
         const version = edmxVersion === "1.0" ? odata_core_1.ODataVersions.V2 : odata_core_1.ODataVersions.V4;
         const dataService = metadataJson["edmx:Edmx"]["edmx:DataServices"][0];
-        // handling multiple schemas => merge them
-        const schemaRaw = dataService.Schema.reduce((collector, schema) => (Object.assign(Object.assign({}, schema), collector)), {});
-        const detectedServiceName = dataService.Schema.length === 1
-            ? dataService.Schema[0].$.Namespace
-            : (_a = dataService.Schema.find((schema) => !schema.EntityContainer)) === null || _a === void 0 ? void 0 : _a.$.Namespace;
+        const schemas = dataService.Schema;
+        const detectedSchema = schemas.find((schema) => { var _a; return schema.$.Namespace && ((_a = schema.EntityType) === null || _a === void 0 ? void 0 : _a.length); }) || schemas[0];
+        const serviceName = options.serviceName || detectedSchema.$.Namespace;
+        const namespaces = [];
+        schemas.forEach((schema) => {
+            namespaces.push(schema.$.Namespace);
+            if (schema.$.Alias) {
+                namespaces.push(schema.$.Alias);
+            }
+        });
         // encapsulate the whole naming logic
-        const namingHelper = new NamingHelper_1.NamingHelper(options, detectedServiceName, options.serviceName);
+        const namingHelper = new NamingHelper_1.NamingHelper(options, serviceName, namespaces);
         // parse model information from edmx into something we can really work with
         // => that stuff is called dataModel!
         const dataModel = version === odata_core_1.ODataVersions.V2
-            ? yield (0, DataModelDigestionV2_1.digest)(schemaRaw, options, namingHelper)
-            : yield (0, DataModelDigestionV4_1.digest)(schemaRaw, options, namingHelper);
+            ? yield (0, DataModelDigestionV2_1.digest)(dataService.Schema, options, namingHelper)
+            : yield (0, DataModelDigestionV4_1.digest)(dataService.Schema, options, namingHelper);
         // handling the overall generation project
         const project = yield (0, ProjectManager_1.createProjectManager)(namingHelper.getFileNames(), options.output, options.emitMode, options.prettier, options.tsconfig);
         // Generate Model Interfaces

package/lib/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\n\r\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\r\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\r\nimport { ODataEdmxModelBase, Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { SchemaV3 } from \"./data-model/edmx/ODataEdmxModelV3\";\r\nimport { SchemaV4 } from \"./data-model/edmx/ODataEdmxModelV4\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper\";\r\nimport { generateModels, generateQueryObjects, generateServices } from \"./generator\";\r\nimport { Modes, RunOptions } from \"./OptionModel\";\r\nimport { createProjectManager } from \"./project/ProjectManager\";\r\n\r\nfunction isQObjectGen(mode: Modes) {\r\n  return [Modes.qobjects, Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\nfunction isServiceGen(mode: Modes) {\r\n  return [Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\n/**\r\n *\r\n * @param metadataJson metadata of a given OData service already parsed as JSON\r\n * @param options further options\r\n */\r\nexport async function runApp(metadataJson: ODataEdmxModelBase<any>, options: RunOptions): Promise<void> {\r\n  // determine edmx edmxVersion attribute\r\n  const edmxVersion = metadataJson[\"edmx:Edmx\"].$.Version;\r\n  const version = edmxVersion === \"1.0\" ? ODataVersions.V2 : ODataVersions.V4;\r\n\r\n  const dataService = metadataJson[\"edmx:Edmx\"][\"edmx:DataServices\"][0];\r\n\r\n  // handling multiple schemas => merge them\r\n  const schemaRaw = dataService.Schema.reduce(\r\n    (collector, schema) => ({\r\n      ...schema,\r\n      ...collector,\r\n    }),\r\n    {} as Schema<any, any>\r\n  );\r\n  const detectedServiceName =\r\n    dataService.Schema.length === 1\r\n      ? dataService.Schema[0].$.Namespace\r\n      : dataService.Schema.find((schema) => !schema.EntityContainer)?.$.Namespace;\r\n\r\n  // encapsulate the whole naming logic\r\n  const namingHelper = new NamingHelper(options, detectedServiceName, options.serviceName);\r\n  // parse model information from edmx into something we can really work with\r\n  // => that stuff is called dataModel!\r\n  const dataModel =\r\n    version === ODataVersions.V2\r\n      ? await digestV2(schemaRaw as SchemaV3, options, namingHelper)\r\n      : await digestV4(schemaRaw as SchemaV4, options, namingHelper);\r\n  // handling the overall generation project\r\n  const project = await createProjectManager(\r\n    namingHelper.getFileNames(),\r\n    options.output,\r\n    options.emitMode,\r\n    options.prettier,\r\n    options.tsconfig\r\n  );\r\n\r\n  // Generate Model Interfaces\r\n  // supported edmx types: EntityType, ComplexType, EnumType\r\n  const modelsFile = await project.createModelFile();\r\n  generateModels(dataModel, modelsFile, version, options, namingHelper);\r\n\r\n  // Generate Query Objects\r\n  // supported edmx types: EntityType, ComplexType\r\n  // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object\r\n  if (isQObjectGen(options.mode)) {\r\n    const qFile = await project.createQObjectFile();\r\n    generateQueryObjects(dataModel, qFile, version, options, namingHelper);\r\n  }\r\n\r\n  // Generate Individual OData-Service\r\n  if (isServiceGen(options.mode)) {\r\n    await project.cleanServiceDir();\r\n    await generateServices(dataModel, project, version, namingHelper);\r\n  }\r\n\r\n  await project.writeFiles();\r\n}\r\n"]}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\n\r\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\r\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\r\nimport { ODataEdmxModelBase, Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { SchemaV3 } from \"./data-model/edmx/ODataEdmxModelV3\";\r\nimport { SchemaV4 } from \"./data-model/edmx/ODataEdmxModelV4\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper\";\r\nimport { generateModels, generateQueryObjects, generateServices } from \"./generator\";\r\nimport { Modes, RunOptions } from \"./OptionModel\";\r\nimport { createProjectManager } from \"./project/ProjectManager\";\r\n\r\nfunction isQObjectGen(mode: Modes) {\r\n  return [Modes.qobjects, Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\nfunction isServiceGen(mode: Modes) {\r\n  return [Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\n/**\r\n *\r\n * @param metadataJson metadata of a given OData service already parsed as JSON\r\n * @param options further options\r\n */\r\nexport async function runApp(metadataJson: ODataEdmxModelBase<any>, options: RunOptions): Promise<void> {\r\n  // determine edmx edmxVersion attribute\r\n  const edmxVersion = metadataJson[\"edmx:Edmx\"].$.Version;\r\n  const version = edmxVersion === \"1.0\" ? ODataVersions.V2 : ODataVersions.V4;\r\n\r\n  const dataService = metadataJson[\"edmx:Edmx\"][\"edmx:DataServices\"][0];\r\n  const schemas = dataService.Schema as Array<SchemaV3 | SchemaV4>;\r\n\r\n  const detectedSchema = schemas.find((schema) => schema.$.Namespace && schema.EntityType?.length) || schemas[0];\r\n  const serviceName = options.serviceName || detectedSchema.$.Namespace;\r\n\r\n  const namespaces: Array<string> = [];\r\n  schemas.forEach((schema) => {\r\n    namespaces.push(schema.$.Namespace);\r\n    if (schema.$.Alias) {\r\n      namespaces.push(schema.$.Alias);\r\n    }\r\n  });\r\n\r\n  // encapsulate the whole naming logic\r\n  const namingHelper = new NamingHelper(options, serviceName, namespaces);\r\n  // parse model information from edmx into something we can really work with\r\n  // => that stuff is called dataModel!\r\n  const dataModel =\r\n    version === ODataVersions.V2\r\n      ? await digestV2(dataService.Schema as Array<SchemaV3>, options, namingHelper)\r\n      : await digestV4(dataService.Schema as Array<SchemaV4>, options, namingHelper);\r\n  // handling the overall generation project\r\n  const project = await createProjectManager(\r\n    namingHelper.getFileNames(),\r\n    options.output,\r\n    options.emitMode,\r\n    options.prettier,\r\n    options.tsconfig\r\n  );\r\n\r\n  // Generate Model Interfaces\r\n  // supported edmx types: EntityType, ComplexType, EnumType\r\n  const modelsFile = await project.createModelFile();\r\n  generateModels(dataModel, modelsFile, version, options, namingHelper);\r\n\r\n  // Generate Query Objects\r\n  // supported edmx types: EntityType, ComplexType\r\n  // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object\r\n  if (isQObjectGen(options.mode)) {\r\n    const qFile = await project.createQObjectFile();\r\n    generateQueryObjects(dataModel, qFile, version, options, namingHelper);\r\n  }\r\n\r\n  // Generate Individual OData-Service\r\n  if (isServiceGen(options.mode)) {\r\n    await project.cleanServiceDir();\r\n    await generateServices(dataModel, project, version, namingHelper);\r\n  }\r\n\r\n  await project.writeFiles();\r\n}\r\n"]}

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

@@ -13,6 +13,7 @@ export declare class DataModel {
     private complexTypes;
     private enumTypes;
     private operationTypes;
+    private typeDefinitions;
     private container;
     constructor(version: ODataVersion, converters?: MappedConverterChains);
     /**
@@ -22,6 +23,8 @@ export declare class DataModel {
     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.

package/lib/data-model/DataModel.js

@@ -11,6 +11,7 @@ class DataModel {
         this.enumTypes = {};
         // combines functions & actions
         this.operationTypes = {};
+        this.typeDefinitions = {};
         this.container = { entitySets: {}, singletons: {}, functions: {}, actions: {} };
         this.converters = converters;
     }
@@ -27,6 +28,12 @@ class DataModel {
     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;
     }

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 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

@@ -3,6 +3,8 @@ 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 {
@@ -13,7 +15,7 @@ export interface TypeModel {
 }
 export declare abstract class Digester<S extends Schema<ET, CT>, ET extends EntityType, CT extends ComplexType> {
     protected version: ODataVersion;
-    protected schema: S;
+    protected schemas: Array<S>;
     protected options: DigestionOptions;
     protected namingHelper: NamingHelper;
     protected static EDM_PREFIX: string;
@@ -21,9 +23,10 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     protected readonly dataModel: DataModel;
     protected readonly serviceConfigHelper: ServiceConfigHelper;
     private model2Type;
-    protected constructor(version: ODataVersion, schema: S, options: DigestionOptions, namingHelper: NamingHelper, converters?: MappedConverterChains);
+    protected constructor(version: ODataVersion, schemas: Array<S>, options: DigestionOptions, namingHelper: NamingHelper, converters?: MappedConverterChains);
     protected abstract getNavigationProps(entityType: ET | ComplexType): Array<Property>;
-    protected abstract digestEntityContainer(): void;
+    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.
      *
@@ -33,8 +36,9 @@ 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 digestSchema;
+    private digestEntityTypesAndOperations;
     private getBaseModel;
+    private addTypeDefinition;
     private addComplexType;
     private addEntityType;
     private postProcessModel;

package/lib/data-model/DataModelDigestion.js

@@ -5,9 +5,9 @@ const tslib_1 = require("tslib");
 const DataModel_1 = require("./DataModel");
 const ServiceConfigHelper_1 = require("./ServiceConfigHelper");
 class Digester {
-    constructor(version, schema, options, namingHelper, converters) {
+    constructor(version, schemas, options, namingHelper, converters) {
         this.version = version;
-        this.schema = schema;
+        this.schemas = schemas;
         this.options = options;
         this.namingHelper = namingHelper;
         this.model2Type = new Map();
@@ -15,14 +15,20 @@ class Digester {
             if (!p.$.Type) {
                 throw new Error(`No type information given for property [${p.$.Name}]!`);
             }
-            const isCollection = !!p.$.Type.match(/^Collection\(/);
-            const dataType = p.$.Type.replace(/^Collection\(([^\)]+)\)/, "$1");
             const configProp = this.serviceConfigHelper.findConfigPropByName(p.$.Name);
             const name = this.namingHelper.getModelPropName((configProp === null || configProp === void 0 ? void 0 : configProp.mappedName) || p.$.Name);
+            const isCollection = !!p.$.Type.match(/^Collection\(/);
+            let dataType = p.$.Type.replace(/^Collection\(([^\)]+)\)/, "$1");
+            if (this.namingHelper.includesServicePrefix(dataType)) {
+                const dtName = this.namingHelper.stripServicePrefix(dataType);
+                if (this.dataModel.getPrimitiveType(dtName) !== undefined) {
+                    dataType = this.dataModel.getPrimitiveType(dtName);
+                }
+            }
             let result;
             // domain object known from service:
-            // EntityType, ComplexType or EnumType
-            if (dataType.startsWith(this.namingHelper.getServicePrefix())) {
+            // EntityType, ComplexType, EnumType or TypeDefinition
+            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}'`);
@@ -64,52 +70,60 @@ class Digester {
                 };
             }
             else {
-                throw new Error(`Unknown type [${dataType}]: Not 'Collection(...)', not '${this.namingHelper.getServicePrefix()}*', not OData type 'Edm.*'`);
+                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: configProp === null || configProp === void 0 ? void 0 : configProp.managed }, result);
         };
         this.dataModel = new DataModel_1.DataModel(version, converters);
         this.serviceConfigHelper = new ServiceConfigHelper_1.ServiceConfigHelper(options);
-        this.collectModelTypes(this.schema);
+        this.collectModelTypes(schemas);
     }
     digest() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.digestSchema(this.schema);
+            this.digestEntityTypesAndOperations();
+            // delegate to version specific entity container digestion
+            this.schemas.forEach((schema) => this.digestEntityContainer(schema));
             return this.dataModel;
         });
     }
-    collectModelTypes(schema) {
-        var _a, _b, _c;
-        const servicePrefix = this.namingHelper.getServicePrefix();
-        (_a = schema.EnumType) === null || _a === void 0 ? void 0 : _a.forEach((et) => {
-            this.model2Type.set(servicePrefix + 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 */);
-        });
-        (_c = schema.EntityType) === null || _c === void 0 ? void 0 : _c.forEach((et) => {
-            this.model2Type.set(servicePrefix + et.$.Name, "ModelType" /* DataTypes.ModelType */);
+    collectModelTypes(schemas) {
+        schemas.forEach((schema) => {
+            var _a, _b, _c;
+            const servicePrefix = schema.$.Namespace + ".";
+            (_a = schema.EnumType) === null || _a === void 0 ? void 0 : _a.forEach((et) => {
+                this.model2Type.set(servicePrefix + 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 */);
+            });
+            (_c = schema.EntityType) === null || _c === void 0 ? void 0 : _c.forEach((et) => {
+                this.model2Type.set(servicePrefix + et.$.Name, "ModelType" /* DataTypes.ModelType */);
+            });
         });
     }
-    digestSchema(schema) {
-        // 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),
-                    members: et.Member.map((m) => m.$.Name),
-                });
+    digestEntityTypesAndOperations() {
+        this.schemas.forEach((schema) => {
+            // type definitions: alias for primitive types
+            this.addTypeDefinition(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),
+                        members: et.Member.map((m) => m.$.Name),
+                    });
+                }
             }
-        }
-        // entity types
-        this.addEntityType(schema.EntityType);
-        // complex types
-        this.addComplexType(schema.ComplexType);
+            // entity types
+            this.addEntityType(schema.EntityType);
+            // complex types
+            this.addComplexType(schema.ComplexType);
+            // V4 only: function & action types
+            this.digestOperations(schema);
+        });
         this.postProcessModel();
-        // delegate to concrete entity container digestion
-        this.digestEntityContainer();
     }
     getBaseModel(model) {
         var _a;
@@ -136,6 +150,14 @@ class Digester {
             baseProps: [], // postprocess required
         };
     }
+    addTypeDefinition(types) {
+        if (!types || !types.length) {
+            return;
+        }
+        for (const t of types) {
+            this.dataModel.addTypeDefinition(t.$.Name, t.$.UnderlyingType);
+        }
+    }
     addComplexType(models) {
         if (!models || !models.length) {
             return;
@@ -247,6 +269,9 @@ class Digester {
         return model.baseClasses.reduce(([props, keys, idName, qIdName], bc) => {
             var _a;
             const baseModel = this.dataModel.getModel(bc) || this.dataModel.getComplexType(bc);
+            if (!baseModel) {
+                throw new Error(`BaseModel "${bc}" doesn't exist!`);
+            }
             let idNameResult = idName;
             let qIdNameResult = qIdName;
             // recursive

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

@@ -1 +1 @@
-{"version":3,"file":"DataModelDigestion.js","sourceRoot":"","sources":["../../src/data-model/DataModelDigestion.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\r\n\r\nimport { DigestionOptions } from \"../FactoryFunctionModel\";\r\nimport { DataModel } from \"./DataModel\";\r\nimport { ComplexType as ComplexModelType, DataTypes, ModelType, ODataVersion, PropertyModel } from \"./DataTypeModel\";\r\nimport { ComplexType, EntityType, Property, Schema } from \"./edmx/ODataEdmxModelBase\";\r\nimport { NamingHelper } from \"./NamingHelper\";\r\nimport { ServiceConfigHelper } from \"./ServiceConfigHelper\";\r\n\r\nexport interface TypeModel {\r\n  outputType: string;\r\n  qPath: string;\r\n  qCollection: string;\r\n  qParam: string | undefined;\r\n}\r\n\r\nexport abstract class Digester<S extends Schema<ET, CT>, ET extends EntityType, CT extends ComplexType> {\r\n  protected static EDM_PREFIX = \"Edm.\";\r\n  protected static ROOT_OPERATION = \"/\";\r\n\r\n  protected readonly dataModel: DataModel;\r\n  protected readonly serviceConfigHelper: ServiceConfigHelper;\r\n\r\n  private model2Type: Map<string, DataTypes> = new Map<string, DataTypes>();\r\n\r\n  protected constructor(\r\n    protected version: ODataVersion,\r\n    protected schema: S,\r\n    protected options: DigestionOptions,\r\n    protected namingHelper: NamingHelper,\r\n    converters?: MappedConverterChains\r\n  ) {\r\n    this.dataModel = new DataModel(version, converters);\r\n    this.serviceConfigHelper = new ServiceConfigHelper(options);\r\n    this.collectModelTypes(this.schema);\r\n  }\r\n\r\n  protected abstract getNavigationProps(entityType: ET | ComplexType): Array<Property>;\r\n\r\n  protected abstract digestEntityContainer(): void;\r\n\r\n  /**\r\n   * Get essential infos about a given odata type from the version specific service variants.\r\n   *\r\n   * @param type\r\n   * @return tuple of return type, query object, query collection object\r\n   */\r\n  protected abstract mapODataType(type: string): TypeModel;\r\n\r\n  public async digest(): Promise<DataModel> {\r\n    this.digestSchema(this.schema);\r\n    return this.dataModel;\r\n  }\r\n\r\n  private collectModelTypes(schema: Schema<ET, CT>) {\r\n    const servicePrefix = this.namingHelper.getServicePrefix();\r\n    schema.EnumType?.forEach((et) => {\r\n      this.model2Type.set(servicePrefix + et.$.Name, DataTypes.EnumType);\r\n    });\r\n    schema.ComplexType?.forEach((ct) => {\r\n      this.model2Type.set(servicePrefix + ct.$.Name, DataTypes.ComplexType);\r\n    });\r\n    schema.EntityType?.forEach((et) => {\r\n      this.model2Type.set(servicePrefix + et.$.Name, DataTypes.ModelType);\r\n    });\r\n  }\r\n\r\n  private digestSchema(schema: Schema<ET, CT>) {\r\n    // enums\r\n    if (schema.EnumType) {\r\n      for (const et of schema.EnumType) {\r\n        const name = et.$.Name;\r\n        this.dataModel.addEnum(name, {\r\n          odataName: name,\r\n          name: this.namingHelper.getEnumName(name),\r\n          members: et.Member.map((m) => m.$.Name),\r\n        });\r\n      }\r\n    }\r\n\r\n    // entity types\r\n    this.addEntityType(schema.EntityType);\r\n    // complex types\r\n    this.addComplexType(schema.ComplexType);\r\n\r\n    this.postProcessModel();\r\n\r\n    // delegate to concrete entity container digestion\r\n    this.digestEntityContainer();\r\n  }\r\n\r\n  private getBaseModel(model: ComplexType) {\r\n    const entityConfig = this.serviceConfigHelper.findConfigEntityByName(model.$.Name);\r\n    const entityName = entityConfig?.mappedName || model.$.Name;\r\n\r\n    const name = this.namingHelper.getModelName(entityName);\r\n    const qName = this.namingHelper.getQName(entityName);\r\n    const editableName = this.namingHelper.getEditableModelName(entityName);\r\n    const odataName = model.$.Name;\r\n    const bType = model.$.BaseType;\r\n    const props = [...(model.Property ?? []), ...this.getNavigationProps(model)];\r\n\r\n    // support for base types, i.e. extends clause of interfaces\r\n    const baseClasses = [];\r\n    if (bType) {\r\n      baseClasses.push(this.namingHelper.getModelName(bType));\r\n    }\r\n\r\n    return {\r\n      name,\r\n      qName,\r\n      odataName,\r\n      editableName,\r\n      baseClasses,\r\n      props: props.map(this.mapProp),\r\n      baseProps: [], // postprocess required\r\n    };\r\n  }\r\n\r\n  private addComplexType(models: Array<ComplexType> | undefined) {\r\n    if (!models || !models.length) {\r\n      return;\r\n    }\r\n\r\n    for (const model of models) {\r\n      const baseModel = this.getBaseModel(model);\r\n      this.dataModel.addComplexType(baseModel.name, baseModel);\r\n    }\r\n  }\r\n\r\n  private addEntityType(models: Array<ET> | undefined) {\r\n    if (!models || !models.length) {\r\n      return;\r\n    }\r\n\r\n    for (const model of models) {\r\n      const baseModel = this.getBaseModel(model);\r\n      const entityConfig = this.serviceConfigHelper.findConfigEntityByName(model.$.Name);\r\n      const entityName = entityConfig?.mappedName || model.$.Name;\r\n\r\n      // key support: we add keys from this entity,\r\n      // but not keys stemming from base classes (postprocess required)\r\n      const keyNames: Array<string> = [];\r\n      if (entityConfig?.keys?.length) {\r\n        keyNames.push(...entityConfig.keys);\r\n      } else {\r\n        const entity = model as EntityType;\r\n        if (entity.Key && entity.Key.length && entity.Key[0].PropertyRef.length) {\r\n          const propNames = entity.Key[0].PropertyRef.map((key) => key.$.Name);\r\n          keyNames.push(...propNames);\r\n        }\r\n      }\r\n\r\n      this.dataModel.addModel(baseModel.name, {\r\n        ...baseModel,\r\n        idModelName: this.namingHelper.getIdModelName(entityName),\r\n        qIdFunctionName: this.namingHelper.getQIdFunctionName(entityName),\r\n        generateId: true,\r\n        keyNames: keyNames, // postprocess required to include key specs from base classes\r\n        keys: [], // postprocess required to include props from base classes\r\n        getKeyUnion: () => keyNames.join(\" | \"),\r\n      });\r\n    }\r\n  }\r\n\r\n  private postProcessModel() {\r\n    // complex types\r\n    const complexTypes = this.dataModel.getComplexTypes();\r\n    complexTypes.forEach((model) => {\r\n      const [baseProps] = this.collectBaseClassPropsAndKeys(model, []);\r\n      model.baseProps = baseProps;\r\n    });\r\n    const modelTypes = this.dataModel.getModels();\r\n    // entity types\r\n    modelTypes.forEach((model) => {\r\n      const [baseProps, baseKeys, idName, qIdName] = this.collectBaseClassPropsAndKeys(model, []);\r\n      model.baseProps = baseProps;\r\n\r\n      if (!model.keyNames.length && idName) {\r\n        model.idModelName = idName;\r\n        model.qIdFunctionName = qIdName;\r\n        model.generateId = false;\r\n      }\r\n      model.keyNames.unshift(...baseKeys);\r\n\r\n      // sanity check: entity types require key specification\r\n      if (!model.keyNames.length) {\r\n        throw new Error(`Key property is missing from Entity \"${model.name}\" (${model.odataName})!`);\r\n      }\r\n\r\n      const isSingleKey = model.keyNames.length === 1;\r\n      const props = [...model.baseProps, ...model.props];\r\n      model.keys = model.keyNames.map((keyName) => {\r\n        const prop = props.find((p) => p.odataName === keyName);\r\n        if (!prop) {\r\n          throw new Error(`Key with name [${keyName}] not found in props!`);\r\n        }\r\n        // automatically set key prop to managed, if this is the only key of the given entity\r\n        if (prop.managed === undefined) {\r\n          prop.managed = !this.options.disableAutoManagedKey && isSingleKey;\r\n        }\r\n        return prop;\r\n      });\r\n    });\r\n\r\n    const sortedModelTypes = this.sortModelsByInheritance<ModelType>(modelTypes);\r\n    this.dataModel.setModels(sortedModelTypes);\r\n\r\n    const sortedComplexTypes = this.sortModelsByInheritance<ComplexModelType>(complexTypes);\r\n    this.dataModel.setComplexTypes(sortedComplexTypes);\r\n  }\r\n\r\n  private sortModelsByInheritance<Type extends ComplexModelType>(models: Type[]): { [name: string]: 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 sortedModels: { [name: string]: Type } = {};\r\n    const visitedModels = new Set<Type>();\r\n    const inProgressModels = new Set<Type>();\r\n\r\n    function visit(model: Type) {\r\n      if (inProgressModels.has(model)) {\r\n        throw new Error(\"Cyclic dependencies detected!\");\r\n      }\r\n\r\n      if (!visitedModels.has(model)) {\r\n        inProgressModels.add(model);\r\n\r\n        for (const baseClassName of model.baseClasses) {\r\n          const baseClass = models.find((e) => e.name === baseClassName);\r\n          if (baseClass) {\r\n            visit(baseClass);\r\n          }\r\n        }\r\n        visitedModels.add(model);\r\n        inProgressModels.delete(model);\r\n        sortedModels[model.name] = model;\r\n      }\r\n    }\r\n\r\n    for (const model of models) {\r\n      visit(model);\r\n    }\r\n    return sortedModels;\r\n  }\r\n\r\n  private collectBaseClassPropsAndKeys(\r\n    model: ComplexModelType,\r\n    visitedModels: string[]\r\n  ): [Array<PropertyModel>, Array<string>, string, string] {\r\n    if (visitedModels.includes(model.name)) {\r\n      throw new Error(`Cyclic inheritance detected for model ${model.name}!`);\r\n    }\r\n    visitedModels.push(model.name);\r\n    return model.baseClasses.reduce(\r\n      ([props, keys, idName, qIdName], bc) => {\r\n        const baseModel = this.dataModel.getModel(bc) || this.dataModel.getComplexType(bc);\r\n        let idNameResult = idName;\r\n        let qIdNameResult = qIdName;\r\n\r\n        // recursive\r\n        if (baseModel.baseClasses.length) {\r\n          const [parentProps, parentKeys, parentIdName, parentQIdName] = this.collectBaseClassPropsAndKeys(\r\n            baseModel,\r\n            visitedModels\r\n          );\r\n          props.unshift(...parentProps);\r\n          keys.unshift(...parentKeys);\r\n          if (parentIdName) {\r\n            idNameResult = parentIdName;\r\n            qIdNameResult = parentQIdName;\r\n          }\r\n        }\r\n\r\n        props.push(...baseModel.props);\r\n        if (baseModel.keyNames?.length) {\r\n          keys.push(...baseModel.keyNames.filter((kn) => !keys.includes(kn)));\r\n          idNameResult = baseModel.idModelName;\r\n          qIdNameResult = baseModel.qIdFunctionName;\r\n        }\r\n        return [props, keys, idNameResult, qIdNameResult];\r\n      },\r\n      [[], [], \"\", \"\"] as [Array<PropertyModel>, Array<string>, string, string]\r\n    );\r\n  }\r\n\r\n  protected mapProp = (p: Property): PropertyModel => {\r\n    if (!p.$.Type) {\r\n      throw new Error(`No type information given for property [${p.$.Name}]!`);\r\n    }\r\n\r\n    const isCollection = !!p.$.Type.match(/^Collection\\(/);\r\n    const dataType = p.$.Type.replace(/^Collection\\(([^\\)]+)\\)/, \"$1\");\r\n    const configProp = this.serviceConfigHelper.findConfigPropByName(p.$.Name);\r\n    const name = this.namingHelper.getModelPropName(configProp?.mappedName || p.$.Name);\r\n\r\n    let result: Pick<PropertyModel, \"dataType\" | \"type\" | \"typeModule\" | \"qPath\" | \"qParam\" | \"qObject\" | \"converters\">;\r\n\r\n    // domain object known from service:\r\n    // EntityType, ComplexType or EnumType\r\n    if (dataType.startsWith(this.namingHelper.getServicePrefix())) {\r\n      const resultDt = this.model2Type.get(dataType);\r\n      if (!resultDt) {\r\n        throw new Error(`Couldn't determine model type for data type with name '${dataType}'`);\r\n      }\r\n\r\n      // special handling for enums\r\n      if (resultDt === DataTypes.EnumType) {\r\n        result = {\r\n          dataType: resultDt,\r\n          type: this.namingHelper.getEnumName(dataType),\r\n          qPath: \"QEnumPath\",\r\n          qObject: isCollection ? \"QEnumCollection\" : undefined,\r\n          qParam: \"QEnumParam\",\r\n        };\r\n      }\r\n      // handling of complex & entity types\r\n      else {\r\n        result = {\r\n          dataType: resultDt,\r\n          type: this.namingHelper.getModelName(dataType),\r\n          qPath: \"QEntityPath\",\r\n          qObject: this.namingHelper.getQName(dataType),\r\n          qParam: \"QComplexParam\",\r\n        };\r\n      }\r\n    }\r\n    // OData built-in data types\r\n    else if (dataType.startsWith(Digester.EDM_PREFIX)) {\r\n      const { outputType, qPath, qParam, qCollection } = this.mapODataType(dataType);\r\n      const { to, toModule: typeModule, converters } = this.dataModel.getConverter(dataType) || {};\r\n\r\n      const type = !to ? outputType : to.startsWith(Digester.EDM_PREFIX) ? this.mapODataType(to).outputType : to;\r\n\r\n      result = {\r\n        dataType: DataTypes.PrimitiveType,\r\n        type,\r\n        typeModule,\r\n        qPath,\r\n        qParam,\r\n        qObject: isCollection ? qCollection : undefined,\r\n        converters,\r\n      };\r\n    } else {\r\n      throw new Error(\r\n        `Unknown type [${dataType}]: Not 'Collection(...)', not '${this.namingHelper.getServicePrefix()}*', not OData type 'Edm.*'`\r\n      );\r\n    }\r\n\r\n    return {\r\n      odataName: p.$.Name,\r\n      name,\r\n      odataType: p.$.Type,\r\n      required: p.$.Nullable === \"false\",\r\n      isCollection: isCollection,\r\n      managed: configProp?.managed,\r\n      ...result,\r\n    };\r\n  };\r\n}\r\n"]}
+{"version":3,"file":"DataModelDigestion.js","sourceRoot":"","sources":["../../src/data-model/DataModelDigestion.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\r\n\r\nimport { DigestionOptions } from \"../FactoryFunctionModel\";\r\nimport { DataModel } from \"./DataModel\";\r\nimport { ComplexType as ComplexModelType, DataTypes, ModelType, ODataVersion, PropertyModel } from \"./DataTypeModel\";\r\nimport { ComplexType, EntityType, Property, Schema, TypeDefinition } from \"./edmx/ODataEdmxModelBase\";\r\nimport { SchemaV3 } from \"./edmx/ODataEdmxModelV3\";\r\nimport { SchemaV4 } from \"./edmx/ODataEdmxModelV4\";\r\nimport { NamingHelper } from \"./NamingHelper\";\r\nimport { ServiceConfigHelper } from \"./ServiceConfigHelper\";\r\n\r\nexport interface TypeModel {\r\n  outputType: string;\r\n  qPath: string;\r\n  qCollection: string;\r\n  qParam: string | undefined;\r\n}\r\n\r\nexport abstract class Digester<S extends Schema<ET, CT>, ET extends EntityType, CT extends ComplexType> {\r\n  protected static EDM_PREFIX = \"Edm.\";\r\n  protected static ROOT_OPERATION = \"/\";\r\n\r\n  protected readonly dataModel: DataModel;\r\n  protected readonly serviceConfigHelper: ServiceConfigHelper;\r\n\r\n  private model2Type: Map<string, DataTypes> = new Map<string, DataTypes>();\r\n\r\n  protected constructor(\r\n    protected version: ODataVersion,\r\n    protected schemas: Array<S>,\r\n    protected options: DigestionOptions,\r\n    protected namingHelper: NamingHelper,\r\n    converters?: MappedConverterChains\r\n  ) {\r\n    this.dataModel = new DataModel(version, converters);\r\n    this.serviceConfigHelper = new ServiceConfigHelper(options);\r\n\r\n    this.collectModelTypes(schemas);\r\n  }\r\n\r\n  protected abstract getNavigationProps(entityType: ET | ComplexType): Array<Property>;\r\n\r\n  protected abstract digestOperations(schema: SchemaV3 | SchemaV4): void;\r\n\r\n  protected abstract digestEntityContainer(schema: SchemaV3 | SchemaV4): void;\r\n\r\n  /**\r\n   * Get essential infos about a given odata type from the version specific service variants.\r\n   *\r\n   * @param type\r\n   * @return tuple of return type, query object, query collection object\r\n   */\r\n  protected abstract mapODataType(type: string): TypeModel;\r\n\r\n  public async digest(): Promise<DataModel> {\r\n    this.digestEntityTypesAndOperations();\r\n\r\n    // delegate to version specific entity container digestion\r\n    this.schemas.forEach((schema) => this.digestEntityContainer(schema));\r\n\r\n    return this.dataModel;\r\n  }\r\n\r\n  private collectModelTypes(schemas: Array<S>) {\r\n    schemas.forEach((schema) => {\r\n      const servicePrefix = schema.$.Namespace + \".\";\r\n\r\n      schema.EnumType?.forEach((et) => {\r\n        this.model2Type.set(servicePrefix + et.$.Name, DataTypes.EnumType);\r\n      });\r\n      schema.ComplexType?.forEach((ct) => {\r\n        this.model2Type.set(servicePrefix + ct.$.Name, DataTypes.ComplexType);\r\n      });\r\n      schema.EntityType?.forEach((et) => {\r\n        this.model2Type.set(servicePrefix + et.$.Name, DataTypes.ModelType);\r\n      });\r\n    });\r\n  }\r\n\r\n  private digestEntityTypesAndOperations() {\r\n    this.schemas.forEach((schema) => {\r\n      // type definitions: alias for primitive types\r\n      this.addTypeDefinition(schema.TypeDefinition);\r\n\r\n      // enums\r\n      if (schema.EnumType) {\r\n        for (const et of schema.EnumType) {\r\n          const name = et.$.Name;\r\n          this.dataModel.addEnum(name, {\r\n            odataName: name,\r\n            name: this.namingHelper.getEnumName(name),\r\n            members: et.Member.map((m) => m.$.Name),\r\n          });\r\n        }\r\n      }\r\n\r\n      // entity types\r\n      this.addEntityType(schema.EntityType);\r\n      // complex types\r\n      this.addComplexType(schema.ComplexType);\r\n\r\n      // V4 only: function & action types\r\n      this.digestOperations(schema);\r\n    });\r\n\r\n    this.postProcessModel();\r\n  }\r\n\r\n  private getBaseModel(model: ComplexType) {\r\n    const entityConfig = this.serviceConfigHelper.findConfigEntityByName(model.$.Name);\r\n    const entityName = entityConfig?.mappedName || model.$.Name;\r\n\r\n    const name = this.namingHelper.getModelName(entityName);\r\n    const qName = this.namingHelper.getQName(entityName);\r\n    const editableName = this.namingHelper.getEditableModelName(entityName);\r\n    const odataName = model.$.Name;\r\n    const bType = model.$.BaseType;\r\n    const props = [...(model.Property ?? []), ...this.getNavigationProps(model)];\r\n\r\n    // support for base types, i.e. extends clause of interfaces\r\n    const baseClasses = [];\r\n    if (bType) {\r\n      baseClasses.push(this.namingHelper.getModelName(bType));\r\n    }\r\n\r\n    return {\r\n      name,\r\n      qName,\r\n      odataName,\r\n      editableName,\r\n      baseClasses,\r\n      props: props.map(this.mapProp),\r\n      baseProps: [], // postprocess required\r\n    };\r\n  }\r\n\r\n  private addTypeDefinition(types: Array<TypeDefinition> | undefined) {\r\n    if (!types || !types.length) {\r\n      return;\r\n    }\r\n\r\n    for (const t of types) {\r\n      this.dataModel.addTypeDefinition(t.$.Name, t.$.UnderlyingType);\r\n    }\r\n  }\r\n\r\n  private addComplexType(models: Array<ComplexType> | undefined) {\r\n    if (!models || !models.length) {\r\n      return;\r\n    }\r\n\r\n    for (const model of models) {\r\n      const baseModel = this.getBaseModel(model);\r\n      this.dataModel.addComplexType(baseModel.name, baseModel);\r\n    }\r\n  }\r\n\r\n  private addEntityType(models: Array<ET> | undefined) {\r\n    if (!models || !models.length) {\r\n      return;\r\n    }\r\n\r\n    for (const model of models) {\r\n      const baseModel = this.getBaseModel(model);\r\n      const entityConfig = this.serviceConfigHelper.findConfigEntityByName(model.$.Name);\r\n      const entityName = entityConfig?.mappedName || model.$.Name;\r\n\r\n      // key support: we add keys from this entity,\r\n      // but not keys stemming from base classes (postprocess required)\r\n      const keyNames: Array<string> = [];\r\n      if (entityConfig?.keys?.length) {\r\n        keyNames.push(...entityConfig.keys);\r\n      } else {\r\n        const entity = model as EntityType;\r\n        if (entity.Key && entity.Key.length && entity.Key[0].PropertyRef.length) {\r\n          const propNames = entity.Key[0].PropertyRef.map((key) => key.$.Name);\r\n          keyNames.push(...propNames);\r\n        }\r\n      }\r\n\r\n      this.dataModel.addModel(baseModel.name, {\r\n        ...baseModel,\r\n        idModelName: this.namingHelper.getIdModelName(entityName),\r\n        qIdFunctionName: this.namingHelper.getQIdFunctionName(entityName),\r\n        generateId: true,\r\n        keyNames: keyNames, // postprocess required to include key specs from base classes\r\n        keys: [], // postprocess required to include props from base classes\r\n        getKeyUnion: () => keyNames.join(\" | \"),\r\n      });\r\n    }\r\n  }\r\n\r\n  private postProcessModel() {\r\n    // complex types\r\n    const complexTypes = this.dataModel.getComplexTypes();\r\n    complexTypes.forEach((model) => {\r\n      const [baseProps] = this.collectBaseClassPropsAndKeys(model, []);\r\n      model.baseProps = baseProps;\r\n    });\r\n    const modelTypes = this.dataModel.getModels();\r\n    // entity types\r\n    modelTypes.forEach((model) => {\r\n      const [baseProps, baseKeys, idName, qIdName] = this.collectBaseClassPropsAndKeys(model, []);\r\n      model.baseProps = baseProps;\r\n\r\n      if (!model.keyNames.length && idName) {\r\n        model.idModelName = idName;\r\n        model.qIdFunctionName = qIdName;\r\n        model.generateId = false;\r\n      }\r\n      model.keyNames.unshift(...baseKeys);\r\n\r\n      // sanity check: entity types require key specification\r\n      if (!model.keyNames.length) {\r\n        throw new Error(`Key property is missing from Entity \"${model.name}\" (${model.odataName})!`);\r\n      }\r\n\r\n      const isSingleKey = model.keyNames.length === 1;\r\n      const props = [...model.baseProps, ...model.props];\r\n      model.keys = model.keyNames.map((keyName) => {\r\n        const prop = props.find((p) => p.odataName === keyName);\r\n        if (!prop) {\r\n          throw new Error(`Key with name [${keyName}] not found in props!`);\r\n        }\r\n        // automatically set key prop to managed, if this is the only key of the given entity\r\n        if (prop.managed === undefined) {\r\n          prop.managed = !this.options.disableAutoManagedKey && isSingleKey;\r\n        }\r\n        return prop;\r\n      });\r\n    });\r\n\r\n    const sortedModelTypes = this.sortModelsByInheritance<ModelType>(modelTypes);\r\n    this.dataModel.setModels(sortedModelTypes);\r\n\r\n    const sortedComplexTypes = this.sortModelsByInheritance<ComplexModelType>(complexTypes);\r\n    this.dataModel.setComplexTypes(sortedComplexTypes);\r\n  }\r\n\r\n  private sortModelsByInheritance<Type extends ComplexModelType>(models: Type[]): { [name: string]: 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 sortedModels: { [name: string]: Type } = {};\r\n    const visitedModels = new Set<Type>();\r\n    const inProgressModels = new Set<Type>();\r\n\r\n    function visit(model: Type) {\r\n      if (inProgressModels.has(model)) {\r\n        throw new Error(\"Cyclic dependencies detected!\");\r\n      }\r\n\r\n      if (!visitedModels.has(model)) {\r\n        inProgressModels.add(model);\r\n\r\n        for (const baseClassName of model.baseClasses) {\r\n          const baseClass = models.find((e) => e.name === baseClassName);\r\n          if (baseClass) {\r\n            visit(baseClass);\r\n          }\r\n        }\r\n        visitedModels.add(model);\r\n        inProgressModels.delete(model);\r\n        sortedModels[model.name] = model;\r\n      }\r\n    }\r\n\r\n    for (const model of models) {\r\n      visit(model);\r\n    }\r\n    return sortedModels;\r\n  }\r\n\r\n  private collectBaseClassPropsAndKeys(\r\n    model: ComplexModelType,\r\n    visitedModels: string[]\r\n  ): [Array<PropertyModel>, Array<string>, string, string] {\r\n    if (visitedModels.includes(model.name)) {\r\n      throw new Error(`Cyclic inheritance detected for model ${model.name}!`);\r\n    }\r\n    visitedModels.push(model.name);\r\n    return model.baseClasses.reduce(\r\n      ([props, keys, idName, qIdName], bc) => {\r\n        const baseModel = this.dataModel.getModel(bc) || this.dataModel.getComplexType(bc);\r\n        if (!baseModel) {\r\n          throw new Error(`BaseModel \"${bc}\" doesn't exist!`);\r\n        }\r\n\r\n        let idNameResult = idName;\r\n        let qIdNameResult = qIdName;\r\n\r\n        // recursive\r\n        if (baseModel.baseClasses.length) {\r\n          const [parentProps, parentKeys, parentIdName, parentQIdName] = this.collectBaseClassPropsAndKeys(\r\n            baseModel,\r\n            visitedModels\r\n          );\r\n          props.unshift(...parentProps);\r\n          keys.unshift(...parentKeys);\r\n          if (parentIdName) {\r\n            idNameResult = parentIdName;\r\n            qIdNameResult = parentQIdName;\r\n          }\r\n        }\r\n\r\n        props.push(...baseModel.props);\r\n        if (baseModel.keyNames?.length) {\r\n          keys.push(...baseModel.keyNames.filter((kn) => !keys.includes(kn)));\r\n          idNameResult = baseModel.idModelName;\r\n          qIdNameResult = baseModel.qIdFunctionName;\r\n        }\r\n        return [props, keys, idNameResult, qIdNameResult];\r\n      },\r\n      [[], [], \"\", \"\"] as [Array<PropertyModel>, Array<string>, string, string]\r\n    );\r\n  }\r\n\r\n  protected mapProp = (p: Property): PropertyModel => {\r\n    if (!p.$.Type) {\r\n      throw new Error(`No type information given for property [${p.$.Name}]!`);\r\n    }\r\n\r\n    const configProp = this.serviceConfigHelper.findConfigPropByName(p.$.Name);\r\n    const name = this.namingHelper.getModelPropName(configProp?.mappedName || p.$.Name);\r\n    const isCollection = !!p.$.Type.match(/^Collection\\(/);\r\n    let dataType = p.$.Type.replace(/^Collection\\(([^\\)]+)\\)/, \"$1\");\r\n    if (this.namingHelper.includesServicePrefix(dataType)) {\r\n      const dtName = this.namingHelper.stripServicePrefix(dataType);\r\n      if (this.dataModel.getPrimitiveType(dtName) !== undefined) {\r\n        dataType = this.dataModel.getPrimitiveType(dtName)!;\r\n      }\r\n    }\r\n\r\n    let result: Pick<PropertyModel, \"dataType\" | \"type\" | \"typeModule\" | \"qPath\" | \"qParam\" | \"qObject\" | \"converters\">;\r\n\r\n    // domain object known from service:\r\n    // EntityType, ComplexType, EnumType or TypeDefinition\r\n    if (this.namingHelper.includesServicePrefix(dataType)) {\r\n      const resultDt = this.model2Type.get(dataType);\r\n      if (!resultDt) {\r\n        throw new Error(`Couldn't determine model type for data type with name '${dataType}'`);\r\n      }\r\n\r\n      // special handling for enums\r\n      if (resultDt === DataTypes.EnumType) {\r\n        result = {\r\n          dataType: resultDt,\r\n          type: this.namingHelper.getEnumName(dataType),\r\n          qPath: \"QEnumPath\",\r\n          qObject: isCollection ? \"QEnumCollection\" : undefined,\r\n          qParam: \"QEnumParam\",\r\n        };\r\n      }\r\n      // handling of complex & entity types\r\n      else {\r\n        result = {\r\n          dataType: resultDt,\r\n          type: this.namingHelper.getModelName(dataType),\r\n          qPath: \"QEntityPath\",\r\n          qObject: this.namingHelper.getQName(dataType),\r\n          qParam: \"QComplexParam\",\r\n        };\r\n      }\r\n    }\r\n    // OData built-in data types\r\n    else if (dataType.startsWith(Digester.EDM_PREFIX)) {\r\n      const { outputType, qPath, qParam, qCollection } = this.mapODataType(dataType);\r\n      const { to, toModule: typeModule, converters } = this.dataModel.getConverter(dataType) || {};\r\n\r\n      const type = !to ? outputType : to.startsWith(Digester.EDM_PREFIX) ? this.mapODataType(to).outputType : to;\r\n\r\n      result = {\r\n        dataType: DataTypes.PrimitiveType,\r\n        type,\r\n        typeModule,\r\n        qPath,\r\n        qParam,\r\n        qObject: isCollection ? qCollection : undefined,\r\n        converters,\r\n      };\r\n    } else {\r\n      throw new Error(\r\n        `Unknown type [${dataType}]: Not 'Collection(...)', not OData type 'Edm.*', not starting with one of the namespaces!W`\r\n      );\r\n    }\r\n\r\n    return {\r\n      odataName: p.$.Name,\r\n      name,\r\n      odataType: p.$.Type,\r\n      required: p.$.Nullable === \"false\",\r\n      isCollection: isCollection,\r\n      managed: configProp?.managed,\r\n      ...result,\r\n    };\r\n  };\r\n}\r\n"]}

package/lib/data-model/DataModelDigestionV2.js

@@ -13,28 +13,36 @@ const DataTypeModel_1 = require("./DataTypeModel");
  * @param options
  * @param namingHelper
  */
-const digest = (schema, options, namingHelper) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const digest = (schemas, options, namingHelper) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const converters = yield (0, converter_runtime_1.loadConverters)(odata_core_1.ODataVersions.V2, options.converters);
-    const digester = new DigesterV3(schema, options, namingHelper, converters);
+    const digester = new DigesterV3(schemas, options, namingHelper, converters);
     return digester.digest();
 });
 exports.digest = digest;
 class DigesterV3 extends DataModelDigestion_1.Digester {
-    constructor(schema, options, namingHelper, converters) {
-        super(DataTypeModel_1.ODataVersion.V2, schema, options, namingHelper, converters);
+    constructor(schemas, options, namingHelper, converters) {
+        super(DataTypeModel_1.ODataVersion.V2, schemas, options, namingHelper, converters);
+    }
+    findAssociationEnd(np) {
+        var _a;
+        for (let schema of this.schemas) {
+            if (schema.Association) {
+                const relationship = this.namingHelper.stripServicePrefix(np.$.Relationship);
+                const association = (_a = schema.Association) === null || _a === void 0 ? void 0 : _a.find((a) => a.$.Name === relationship);
+                const result = association === null || association === void 0 ? void 0 : association.End.find((e) => e.$.Role === np.$.ToRole);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        throw new Error(`Association end couldn't be determined for NavigationProperty [${np.$.Name}]`);
     }
     getNavigationProps(entityType) {
         // return (entityType as EntityTypeV3).NavigationProperty || [];
         const et = entityType;
         if (et.NavigationProperty) {
             return et.NavigationProperty.map((np) => {
-                var _a;
-                const relationship = this.namingHelper.stripServicePrefix(np.$.Relationship);
-                const association = (_a = this.schema.Association) === null || _a === void 0 ? void 0 : _a.find((a) => a.$.Name === relationship);
-                const end = association === null || association === void 0 ? void 0 : association.End.find((e) => e.$.Role === np.$.ToRole);
-                if (!end) {
-                    throw new Error(`Association end couldn't be determined for NavigationProperty [${np.$.Name}]`);
-                }
+                const end = this.findAssociationEnd(np);
                 const isRequired = end.$.Multiplicity !== "*" && !end.$.Multiplicity.startsWith("0..");
                 const isCollection = end.$.Multiplicity !== "1" && !end.$.Multiplicity.endsWith("..1");
                 return {
@@ -48,10 +56,12 @@ class DigesterV3 extends DataModelDigestion_1.Digester {
         }
         return [];
     }
-    digestEntityContainer() {
+    // in V2 all we have & need is the FunctionImport: Function & Action elements are only known in V4.
+    digestOperations(schema) { }
+    digestEntityContainer(schema) {
         var _a, _b;
-        if (this.schema.EntityContainer && this.schema.EntityContainer.length) {
-            const container = this.schema.EntityContainer[0];
+        if (schema.EntityContainer && schema.EntityContainer.length) {
+            const container = schema.EntityContainer[0];
             (_a = container.FunctionImport) === null || _a === void 0 ? void 0 : _a.forEach((funcImport) => {
                 var _a, _b, _c, _d;
                 const name = this.namingHelper.getFunctionName(funcImport.$.Name);