@odata2ts/odata2ts 0.35.0 → 0.36.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.36.1](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.36.0...@odata2ts/odata2ts@0.36.1) (2024-07-31)
+
+### Bug Fixes
+
+* **generator:** more type-only imports depending on usage ([#292](https://github.com/odata2ts/odata2ts/issues/292)) ([c0b06f9](https://github.com/odata2ts/odata2ts/commit/c0b06f9bf86cb9060612a36f122ee0f41dccdcdb))
+
+# [0.36.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.35.0...@odata2ts/odata2ts@0.36.0) (2024-07-31)
+
+### Features
+
+* **generator:** add ts-nocheck to each generated file by default ([#284](https://github.com/odata2ts/odata2ts/issues/284)) ([655a3ab](https://github.com/odata2ts/odata2ts/commit/655a3ab801c79e34841f35b1a72cf7d02064f3b8))
+* **generator:** generate services based on API reference chain ([#275](https://github.com/odata2ts/odata2ts/issues/275)) ([8fd415b](https://github.com/odata2ts/odata2ts/commit/8fd415bd0a49144e14da08cd5e32d44e947c7f23))
+* **generator:** support function overloads for different parameter sets ([#282](https://github.com/odata2ts/odata2ts/issues/282)) ([0b53271](https://github.com/odata2ts/odata2ts/commit/0b532710499d975155c21984a62707ecf4789439))
+* **generator:** support type-only imports ([#290](https://github.com/odata2ts/odata2ts/issues/290)) ([dea381e](https://github.com/odata2ts/odata2ts/commit/dea381e7c31f84e03acbaafc15ede58aa9041c13))
+* model files always get type checked (no [@ts-nocheck](https://github.com/ts-nocheck)) ([#288](https://github.com/odata2ts/odata2ts/issues/288)) ([43ca58b](https://github.com/odata2ts/odata2ts/commit/43ca58bf72bb8e783b80798eaa73d5fd19676627))
+
+### BREAKING CHANGES
+
+* **generator:** generated code won't be type checked anymore. Use `debug: true` to get type checking back.
+
 # [0.35.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.34.0...@odata2ts/odata2ts@0.35.0) (2024-05-16)
 
 ### Bug Fixes

package/lib/app.js

@@ -65,6 +65,7 @@ function runApp(metadataJson, options) {
             usePrettier: options.prettier,
             tsConfigPath: options.tsconfig,
             bundledFileGeneration: options.bundledFileGeneration,
+            allowTypeChecking: options.debug,
         });
         // const promises: Array<Promise<void>> = [
         // 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\nimport { pascalCase } from \"pascal-case\";\r\n\r\nimport { NamespaceWithAlias } from \"./data-model/DataModel\";\r\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\r\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\r\nimport { ODataEdmxModelBase } 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\nfunction getServiceName(options: RunOptions, schemas: Array<SchemaV3 | SchemaV4>) {\r\n  if (options.serviceName) {\r\n    return options.serviceName;\r\n  }\r\n\r\n  // auto-detection of first namespace with defined EntityTypes\r\n  // NOTE: we make use of PascalCase here to enforce valid class names\r\n  const detectedSchema = schemas.find((schema) => schema.$.Namespace && schema.EntityType?.length) || schemas[0];\r\n  const serviceName = detectedSchema.$.Namespace;\r\n  return pascalCase(serviceName);\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 serviceName = getServiceName(options, schemas);\r\n\r\n  const namespaces = schemas.map<NamespaceWithAlias>((schema) => [schema.$.Namespace, schema.$.Alias]);\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\r\n  // Validation of entity names: the same name might be used across different namespaces\r\n  const validationErrors = dataModel.getNameValidation();\r\n  if (validationErrors.size) {\r\n    console.log(\"---\");\r\n    validationErrors.forEach((errors, name) => {\r\n      console.log(\r\n        `Duplicate name: ${name} - Fully Qualified Names: ${errors\r\n          .map((error) => error.fqName + (error.renamedTo ? ` (renamed to: ${error.renamedTo})` : \"\"))\r\n          .join(\", \")}`\r\n      );\r\n    });\r\n\r\n    if (options.disableAutomaticNameClashResolution) {\r\n      throw new Error(\"Name validation failed: Multiple entities have the same name across different namespaces!\");\r\n    }\r\n  }\r\n\r\n  // handling the overall generation project\r\n  const project = await createProjectManager(options.output, options.emitMode, namingHelper, dataModel, {\r\n    usePrettier: options.prettier,\r\n    tsConfigPath: options.tsconfig,\r\n    bundledFileGeneration: options.bundledFileGeneration,\r\n  });\r\n\r\n  // const promises: Array<Promise<void>> = [\r\n  // Generate Model Interfaces\r\n  // generateModels(project, dataModel, version, options, namingHelper),\r\n  // ];\r\n  await generateModels(project, dataModel, version, options, namingHelper);\r\n  console.log(\"Successfully generated models!\");\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    // promises.push(generateQueryObjects(project, dataModel, version, options, namingHelper));\r\n    await generateQueryObjects(project, dataModel, version, options, namingHelper);\r\n    console.log(\"Successfully generated q-objects!\");\r\n  }\r\n\r\n  // Generate Individual OData-Service\r\n  if (isServiceGen(options.mode)) {\r\n    // promises.push(generateServices(project, dataModel, version, namingHelper, options));\r\n    await generateServices(project, dataModel, version, namingHelper, options);\r\n    console.log(\"Successfully generated services!\");\r\n  }\r\n\r\n  // await Promise.all(promises);\r\n  console.log(\"Successfully finished!\");\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\nimport { pascalCase } from \"pascal-case\";\r\n\r\nimport { NamespaceWithAlias } from \"./data-model/DataModel\";\r\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\r\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\r\nimport { ODataEdmxModelBase } 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\nfunction getServiceName(options: RunOptions, schemas: Array<SchemaV3 | SchemaV4>) {\r\n  if (options.serviceName) {\r\n    return options.serviceName;\r\n  }\r\n\r\n  // auto-detection of first namespace with defined EntityTypes\r\n  // NOTE: we make use of PascalCase here to enforce valid class names\r\n  const detectedSchema = schemas.find((schema) => schema.$.Namespace && schema.EntityType?.length) || schemas[0];\r\n  const serviceName = detectedSchema.$.Namespace;\r\n  return pascalCase(serviceName);\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 serviceName = getServiceName(options, schemas);\r\n\r\n  const namespaces = schemas.map<NamespaceWithAlias>((schema) => [schema.$.Namespace, schema.$.Alias]);\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\r\n  // Validation of entity names: the same name might be used across different namespaces\r\n  const validationErrors = dataModel.getNameValidation();\r\n  if (validationErrors.size) {\r\n    console.log(\"---\");\r\n    validationErrors.forEach((errors, name) => {\r\n      console.log(\r\n        `Duplicate name: ${name} - Fully Qualified Names: ${errors\r\n          .map((error) => error.fqName + (error.renamedTo ? ` (renamed to: ${error.renamedTo})` : \"\"))\r\n          .join(\", \")}`\r\n      );\r\n    });\r\n\r\n    if (options.disableAutomaticNameClashResolution) {\r\n      throw new Error(\"Name validation failed: Multiple entities have the same name across different namespaces!\");\r\n    }\r\n  }\r\n\r\n  // handling the overall generation project\r\n  const project = await createProjectManager(options.output, options.emitMode, namingHelper, dataModel, {\r\n    usePrettier: options.prettier,\r\n    tsConfigPath: options.tsconfig,\r\n    bundledFileGeneration: options.bundledFileGeneration,\r\n    allowTypeChecking: options.debug,\r\n  });\r\n\r\n  // const promises: Array<Promise<void>> = [\r\n  // Generate Model Interfaces\r\n  // generateModels(project, dataModel, version, options, namingHelper),\r\n  // ];\r\n  await generateModels(project, dataModel, version, options, namingHelper);\r\n  console.log(\"Successfully generated models!\");\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    // promises.push(generateQueryObjects(project, dataModel, version, options, namingHelper));\r\n    await generateQueryObjects(project, dataModel, version, options, namingHelper);\r\n    console.log(\"Successfully generated q-objects!\");\r\n  }\r\n\r\n  // Generate Individual OData-Service\r\n  if (isServiceGen(options.mode)) {\r\n    // promises.push(generateServices(project, dataModel, version, namingHelper, options));\r\n    await generateServices(project, dataModel, version, namingHelper, options);\r\n    console.log(\"Successfully generated services!\");\r\n  }\r\n\r\n  // await Promise.all(promises);\r\n  console.log(\"Successfully finished!\");\r\n}\r\n"]}

package/lib/data-model/DataModel.js

@@ -138,6 +138,14 @@ class DataModel {
         return [...this.models.values()].filter((m) => m.dataType === "EnumType" /* DataTypes.EnumType */);
     }
     addUnboundOperationType(namespace, operationType) {
+        // supporting function overrides
+        const isFunction = operationType.type === "Function" /* OperationTypes.Function */;
+        const existingFn = isFunction ? this.unboundOperationTypes.get(operationType.fqName) : undefined;
+        if (existingFn) {
+            const params = operationType.parameters;
+            existingFn.overrides ? existingFn.overrides.push(params) : (existingFn.overrides = [params]);
+            return;
+        }
         this.unboundOperationTypes.set(operationType.fqName, operationType);
         this.addAlias(namespace, operationType.odataName);
     }
@@ -150,9 +158,18 @@ class DataModel {
     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);
+        const boundOps = store.get(fqEntityType);
+        if (boundOps) {
+            // supporting function overrides
+            const isFunction = operationType.type === "Function" /* OperationTypes.Function */;
+            const existingFn = isFunction ? boundOps.find((bo) => bo.fqName === operationType.fqName) : undefined;
+            if (existingFn) {
+                const params = operationType.parameters;
+                existingFn.overrides ? existingFn.overrides.push(params) : (existingFn.overrides = [params]);
+            }
+            else {
+                boundOps.push(operationType);
+            }
         }
         else {
             store.set(fqEntityType, [operationType]);

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  DataTypes,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EntityType,\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\nimport { ValidationError } from \"./validation/NameValidator\";\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  private nameValidation: Map<string, ValidationError[]> | undefined;\r\n\r\n  private models = new Map<string, EntityType | 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  /**\r\n   * Stores own type definitions which map to primitive types.\r\n   * @private\r\n   */\r\n  private typeDefinitions = new Map<string, string>();\r\n  private readonly namespace2Alias: { [ns: 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 getModelTypes(): Array<ModelType> {\r\n    return [...this.models.values()];\r\n  }\r\n\r\n  public addEntityType(namespace: string, name: string, model: Omit<EntityType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n\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 EntityType;\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 EntityType => 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\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\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 getAllEntityOperations(fqEntityName: string): Array<OperationType> {\r\n    return [...this.getEntityTypeOperations(fqEntityName), ...this.getEntitySetOperations(fqEntityName)];\r\n  }\r\n\r\n  public addAction(fqName: string, action: ActionImportType) {\r\n    this.container.actions[fqName] = action;\r\n  }\r\n\r\n  public addFunction(fqName: string, func: FunctionImportType) {\r\n    this.container.functions[fqName] = func;\r\n  }\r\n\r\n  public addSingleton(fqName: string, singleton: SingletonType) {\r\n    this.container.singletons[fqName] = singleton;\r\n  }\r\n\r\n  public addEntitySet(fqName: string, entitySet: EntitySetType) {\r\n    this.container.entitySets[fqName] = 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  public setNameValidation(map: Map<string, ValidationError[]>) {\r\n    this.nameValidation = map;\r\n  }\r\n\r\n  public getNameValidation() {\r\n    return this.nameValidation!;\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  DataTypes,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EntityType,\r\n  EnumType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  ODataVersion,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n  SingletonType,\r\n} from \"./DataTypeModel\";\r\nimport { ValidationError } from \"./validation/NameValidator\";\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  private nameValidation: Map<string, ValidationError[]> | undefined;\r\n\r\n  private models = new Map<string, EntityType | 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  /**\r\n   * Stores own type definitions which map to primitive types.\r\n   * @private\r\n   */\r\n  private typeDefinitions = new Map<string, string>();\r\n  private readonly namespace2Alias: { [ns: 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 getModelTypes(): Array<ModelType> {\r\n    return [...this.models.values()];\r\n  }\r\n\r\n  public addEntityType(namespace: string, name: string, model: Omit<EntityType, \"dataType\">) {\r\n    const fqName = withNamespace(namespace, name);\r\n\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 EntityType;\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 EntityType => 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\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\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    // supporting function overrides\r\n    const isFunction = operationType.type === OperationTypes.Function;\r\n    const existingFn = isFunction ? this.unboundOperationTypes.get(operationType.fqName) : undefined;\r\n    if (existingFn) {\r\n      const params = operationType.parameters;\r\n      existingFn.overrides ? existingFn.overrides.push(params) : (existingFn.overrides = [params]);\r\n      return;\r\n    }\r\n\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    const store = bindingProp.isCollection ? this.entityCollectionBoundOperationTypes : this.entityBoundOperationTypes;\r\n    const boundOps = store.get(fqEntityType);\r\n\r\n    if (boundOps) {\r\n      // supporting function overrides\r\n      const isFunction = operationType.type === OperationTypes.Function;\r\n      const existingFn = isFunction ? boundOps.find((bo) => bo.fqName === operationType.fqName) : undefined;\r\n      if (existingFn) {\r\n        const params = operationType.parameters;\r\n        existingFn.overrides ? existingFn.overrides.push(params) : (existingFn.overrides = [params]);\r\n      } else {\r\n        boundOps.push(operationType);\r\n      }\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 getAllEntityOperations(fqEntityName: string): Array<OperationType> {\r\n    return [...this.getEntityTypeOperations(fqEntityName), ...this.getEntitySetOperations(fqEntityName)];\r\n  }\r\n\r\n  public addAction(fqName: string, action: ActionImportType) {\r\n    this.container.actions[fqName] = action;\r\n  }\r\n\r\n  public addFunction(fqName: string, func: FunctionImportType) {\r\n    this.container.functions[fqName] = func;\r\n  }\r\n\r\n  public addSingleton(fqName: string, singleton: SingletonType) {\r\n    this.container.singletons[fqName] = singleton;\r\n  }\r\n\r\n  public addEntitySet(fqName: string, entitySet: EntitySetType) {\r\n    this.container.entitySets[fqName] = 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  public setNameValidation(map: Map<string, ValidationError[]>) {\r\n    this.nameValidation = map;\r\n  }\r\n\r\n  public getNameValidation() {\r\n    return this.nameValidation!;\r\n  }\r\n}\r\n"]}

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

@@ -24,7 +24,20 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     protected readonly dataModel: DataModel;
     protected readonly serviceConfigHelper: ServiceConfigHelper;
     protected readonly nameValidator: NameValidator;
+    /**
+     * Reverse mapping from fqName to data type: EntityType, ComplexType, EnumType, or Primitive Type.
+     */
     private model2Type;
+    /**
+     * Stores models (ComplexType or EntityType) by fqName that have been referenced in the API
+     * as entry point or via navProp.
+     * For these models one or two services are generated.
+     *
+     * In this way unnecessary service generation is prevented. For example, complex types that
+     * are only referenced as response of an operation do not need a generated service.
+     * @private
+     */
+    private serviceModels;
     protected constructor(version: ODataVersion, schemas: Array<S>, options: DigestionOptions, namingHelper: NamingHelper, converters?: MappedConverterChains);
     private collectModelTypes;
     private addModel2Type;
@@ -45,6 +58,8 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     private addEnum;
     private addComplexType;
     private addEntityType;
+    private analyzeModelUsage;
+    private analyze;
     private postProcessModel;
     private postProcessKeys;
     private collectBaseClassPropsAndKeys;

package/lib/data-model/DataModelDigestion.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Digester = void 0;
 const tslib_1 = require("tslib");
+const OptionModel_1 = require("../OptionModel");
 const DataModel_1 = require("./DataModel");
 const ServiceConfigHelper_1 = require("./ServiceConfigHelper");
 const NameClashValidator_1 = require("./validation/NameClashValidator");
@@ -18,7 +19,20 @@ class Digester {
         this.schemas = schemas;
         this.options = options;
         this.namingHelper = namingHelper;
+        /**
+         * Reverse mapping from fqName to data type: EntityType, ComplexType, EnumType, or Primitive Type.
+         */
         this.model2Type = new Map();
+        /**
+         * Stores models (ComplexType or EntityType) by fqName that have been referenced in the API
+         * as entry point or via navProp.
+         * For these models one or two services are generated.
+         *
+         * In this way unnecessary service generation is prevented. For example, complex types that
+         * are only referenced as response of an operation do not need a generated service.
+         * @private
+         */
+        this.serviceModels = new Set();
         this.mapProp = (p, entityPropConfig) => {
             var _a, _b;
             if (!p.$.Type) {
@@ -27,30 +41,30 @@ class Digester {
             const configProp = this.serviceConfigHelper.findPropConfigByName(p.$.Name);
             const modelName = 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");
+            let odataDataType = p.$.Type.replace(/^Collection\(([^\)]+)\)/, "$1");
             // support for primitive type mapping
-            if (this.namingHelper.includesServicePrefix(dataType)) {
-                const dt = this.dataModel.getPrimitiveType(dataType);
+            if (this.namingHelper.includesServicePrefix(odataDataType)) {
+                const dt = this.dataModel.getPrimitiveType(odataDataType);
                 if (dt !== undefined) {
-                    dataType = dt;
+                    odataDataType = dt;
                 }
             }
             let result;
             // domain object known from service:
             // EntityType, ComplexType, EnumType
-            if (this.namingHelper.includesServicePrefix(dataType)) {
-                const resultDt = this.model2Type.get(dataType);
-                const [dataTypeName, dataTypePrefix] = this.namingHelper.getNameAndServicePrefix(dataType);
+            if (this.namingHelper.includesServicePrefix(odataDataType)) {
+                const modelType = this.model2Type.get(odataDataType);
+                const [dataTypeName, dataTypePrefix] = this.namingHelper.getNameAndServicePrefix(odataDataType);
                 const dataTypeNamespace = [dataTypePrefix];
-                if (!resultDt) {
-                    throw new Error(`Couldn't determine model data type for property "${p.$.Name}"! Given data type: "${dataType}".`);
+                if (!modelType) {
+                    throw new Error(`Couldn't determine model type (EntityType, ComplexType, etc) for property "${p.$.Name}"! Given data type: "${odataDataType}".`);
                 }
                 // special handling for enums
-                if (resultDt === "EnumType" /* DataTypes.EnumType */) {
+                if (modelType === "EnumType" /* DataTypes.EnumType */) {
                     const enumConfig = this.serviceConfigHelper.findEnumTypeConfig(dataTypeNamespace, dataTypeName);
                     result = {
-                        dataType: resultDt,
-                        type: this.namingHelper.getEnumName((_a = enumConfig === null || enumConfig === void 0 ? void 0 : enumConfig.mappedName) !== null && _a !== void 0 ? _a : dataType),
+                        dataType: modelType,
+                        type: this.namingHelper.getEnumName((_a = enumConfig === null || enumConfig === void 0 ? void 0 : enumConfig.mappedName) !== null && _a !== void 0 ? _a : odataDataType),
                         qPath: "QEnumPath",
                         qObject: isCollection ? "QEnumCollection" : undefined,
                         qParam: "QEnumParam",
@@ -58,23 +72,23 @@ class Digester {
                 }
                 // handling of complex & entity types
                 else {
-                    const entityConfig = resultDt === "ComplexType" /* DataTypes.ComplexType */
+                    const entityConfig = modelType === "ComplexType" /* DataTypes.ComplexType */
                         ? this.serviceConfigHelper.findComplexTypeConfig(dataTypeNamespace, dataTypeName)
                         : this.serviceConfigHelper.findEntityTypeConfig(dataTypeNamespace, dataTypeName);
-                    const resultDataType = (_b = entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.mappedName) !== null && _b !== void 0 ? _b : dataType;
+                    const typeName = (_b = entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.mappedName) !== null && _b !== void 0 ? _b : odataDataType;
                     result = {
-                        dataType: resultDt,
-                        type: this.namingHelper.getModelName(resultDataType),
+                        dataType: modelType,
+                        type: this.namingHelper.getModelName(typeName),
                         qPath: "QEntityPath",
-                        qObject: this.namingHelper.getQName(resultDataType),
+                        qObject: this.namingHelper.getQName(typeName),
                         qParam: "QComplexParam",
                     };
                 }
             }
             // OData built-in data types
-            else if (dataType.startsWith(Digester.EDM_PREFIX)) {
-                const { outputType, qPath, qParam, qCollection } = this.mapODataType(dataType);
-                const { to, toModule: typeModule, converters } = this.dataModel.getConverter(dataType) || {};
+            else if (odataDataType.startsWith(Digester.EDM_PREFIX)) {
+                const { outputType, qPath, qParam, qCollection } = this.mapODataType(odataDataType);
+                const { to, toModule: typeModule, converters } = this.dataModel.getConverter(odataDataType) || {};
                 const type = !to ? outputType : to.startsWith(Digester.EDM_PREFIX) ? this.mapODataType(to).outputType : to;
                 result = {
                     dataType: "PrimitiveType" /* DataTypes.PrimitiveType */,
@@ -87,9 +101,9 @@ class Digester {
                 };
             }
             else {
-                throw new Error(`Unknown type [${dataType}]: Not 'Collection(...)', not OData type 'Edm.*', not starting with one of the namespaces!`);
+                throw new Error(`Unknown type [${odataDataType}]: Not 'Collection(...)', not OData type 'Edm.*', not starting with one of the namespaces!`);
             }
-            return Object.assign({ odataName: p.$.Name, name: modelName, odataType: p.$.Type, fqType: dataType, required: ifFalse(p.$.Nullable), 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: modelName, odataType: p.$.Type, fqType: odataDataType, required: ifFalse(p.$.Nullable), 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);
         };
         const namespaces = schemas.map((s) => [s.$.Namespace, s.$.Alias]);
         this.dataModel = new DataModel_1.DataModel(namespaces, version, converters);
@@ -129,6 +143,7 @@ class Digester {
     }
     digestEntityTypesAndOperations() {
         this.schemas.forEach((schema) => {
+            var _a;
             const ns = [schema.$.Namespace, schema.$.Alias];
             // type definitions: alias for primitive types
             this.addTypeDefinition(schema.$.Namespace, schema.TypeDefinition);
@@ -140,6 +155,7 @@ class Digester {
             this.addEntityType(ns, schema.EntityType);
             // V4 only: function & action types
             this.digestOperations(schema);
+            this.analyzeModelUsage(((_a = schema.EntityContainer) === null || _a === void 0 ? void 0 : _a.length) ? schema.EntityContainer[0] : undefined);
         });
         this.postProcessModel();
         this.postProcessKeys();
@@ -179,6 +195,7 @@ class Digester {
             baseProps: [],
             abstract: ifTrue(model.$.Abstract),
             open: ifTrue(model.$.OpenType),
+            genMode: OptionModel_1.Modes.service,
         };
     }
     addTypeDefinition(ns, types) {
@@ -252,6 +269,34 @@ class Digester {
                 }, generateId: !!keyNames.length, keyNames: keyNames, keys: [], getKeyUnion: () => keyNames.join(" | ") }));
         }
     }
+    analyzeModelUsage(ec) {
+        var _a, _b;
+        if ((_a = ec === null || ec === void 0 ? void 0 : ec.EntitySet) === null || _a === void 0 ? void 0 : _a.length) {
+            ec.EntitySet.forEach((et) => this.analyze(et.$.EntityType));
+        }
+        const ec4 = ec;
+        if ((_b = ec4 === null || ec4 === void 0 ? void 0 : ec4.Singleton) === null || _b === void 0 ? void 0 : _b.length) {
+            ec4.Singleton.forEach((singleton) => this.analyze(singleton.$.Type));
+        }
+    }
+    analyze(fqModelName) {
+        var _a;
+        if (this.serviceModels.has(fqModelName)) {
+            return;
+        }
+        this.serviceModels.add(fqModelName);
+        const model = (_a = this.dataModel.getEntityType(fqModelName)) !== null && _a !== void 0 ? _a : this.dataModel.getComplexType(fqModelName);
+        if (model) {
+            if (model.baseClasses.length) {
+                this.analyze(model.baseClasses[0]);
+            }
+            model === null || model === void 0 ? void 0 : model.props.forEach((p) => {
+                if (p.dataType === "ComplexType" /* DataTypes.ComplexType */ || p.dataType === "ModelType" /* DataTypes.ModelType */) {
+                    this.analyze(p.fqType);
+                }
+            });
+        }
+    }
     postProcessModel() {
         // complex types
         const complexTypes = this.dataModel.getComplexTypes();
@@ -262,6 +307,9 @@ class Digester {
             if (open) {
                 ct.open = true;
             }
+            if (!this.serviceModels.has(ct.fqName)) {
+                ct.genMode = OptionModel_1.Modes.qobjects;
+            }
         });
         // entity types
         const entityTypes = this.dataModel.getEntityTypes();
@@ -280,6 +328,9 @@ class Digester {
             if (open) {
                 et.open = open;
             }
+            if (!this.serviceModels.has(et.fqName)) {
+                et.genMode = OptionModel_1.Modes.qobjects;
+            }
             et.keyNames.unshift(...baseKeys.filter((bk) => !et.keyNames.includes(bk)));
         });
     }

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 { ComplexTypeGenerationOptions, EntityTypeGenerationOptions, PropertyGenerationOptions } from \"../OptionModel\";\r\nimport { DataModel, NamespaceWithAlias, withNamespace } from \"./DataModel\";\r\nimport {\r\n  ComplexType as ComplexModelType,\r\n  DataTypes,\r\n  EntityType as EntityModelType,\r\n  ODataVersion,\r\n  PropertyModel,\r\n} from \"./DataTypeModel\";\r\nimport { ComplexType, EntityType, EnumType, 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, WithoutName } from \"./ServiceConfigHelper\";\r\nimport { NameClashValidator } from \"./validation/NameClashValidator\";\r\nimport { NameValidator } from \"./validation/NameValidator\";\r\nimport { NoopValidator } from \"./validation/NoopValidator\";\r\n\r\ntype CollectorTuple = [\r\n  Array<PropertyModel>,\r\n  Array<string>,\r\n  { fqIdName: string; idName: string; qIdName: string; open: boolean }\r\n];\r\n\r\nfunction ifTrue(value: string | undefined): boolean {\r\n  return value === \"true\";\r\n}\r\n\r\nfunction ifFalse(value: string | undefined): boolean {\r\n  return value === \"false\";\r\n}\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\r\n  protected readonly dataModel: DataModel;\r\n  protected readonly serviceConfigHelper: ServiceConfigHelper;\r\n  protected readonly nameValidator: NameValidator;\r\n\r\n  private model2Type = 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    const namespaces = schemas.map<NamespaceWithAlias>((s) => [s.$.Namespace, s.$.Alias]);\r\n    this.dataModel = new DataModel(namespaces, version, converters);\r\n    this.serviceConfigHelper = new ServiceConfigHelper(options);\r\n    this.nameValidator = this.options.bundledFileGeneration ? new NameClashValidator(options) : new NoopValidator();\r\n\r\n    this.collectModelTypes(schemas);\r\n  }\r\n\r\n  private collectModelTypes(schemas: Array<S>) {\r\n    schemas.forEach((schema) => {\r\n      const { Namespace: ns, Alias: alias } = schema.$;\r\n\r\n      schema.EnumType?.forEach((et) => {\r\n        this.addModel2Type(ns, alias, et.$.Name, DataTypes.EnumType);\r\n      });\r\n      schema.ComplexType?.forEach((ct) => {\r\n        this.addModel2Type(ns, alias, ct.$.Name, DataTypes.ComplexType);\r\n      });\r\n      schema.EntityType?.forEach((et) => {\r\n        this.addModel2Type(ns, alias, et.$.Name, DataTypes.ModelType);\r\n      });\r\n    });\r\n  }\r\n\r\n  private addModel2Type(ns: string, alias: string | undefined, name: string, dt: DataTypes) {\r\n    this.model2Type.set(withNamespace(ns, name), dt);\r\n    if (alias) {\r\n      this.model2Type.set(withNamespace(alias, name), dt);\r\n    }\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    this.dataModel.setNameValidation(this.nameValidator.validate());\r\n    return this.dataModel;\r\n  }\r\n\r\n  private digestEntityTypesAndOperations() {\r\n    this.schemas.forEach((schema) => {\r\n      const ns: NamespaceWithAlias = [schema.$.Namespace, schema.$.Alias];\r\n\r\n      // type definitions: alias for primitive types\r\n      this.addTypeDefinition(schema.$.Namespace, schema.TypeDefinition);\r\n\r\n      // enums\r\n      this.addEnum(ns, schema.EnumType);\r\n\r\n      // complex types\r\n      this.addComplexType(ns, schema.ComplexType);\r\n\r\n      // entity types\r\n      this.addEntityType(ns, schema.EntityType);\r\n\r\n      // V4 only: function & action types\r\n      this.digestOperations(schema);\r\n    });\r\n\r\n    this.postProcessModel();\r\n    this.postProcessKeys();\r\n  }\r\n\r\n  private getBaseModel(\r\n    entityConfig: WithoutName<EntityTypeGenerationOptions | ComplexTypeGenerationOptions> | undefined,\r\n    model: ComplexType,\r\n    namespace: string,\r\n    name: string,\r\n    fqName: string\r\n  ) {\r\n    const odataName = model.$.Name;\r\n\r\n    // map properties respecting the config\r\n    const props = [...(model.Property ?? []), ...this.getNavigationProps(model)].map((p) => {\r\n      const epConfig = entityConfig?.properties?.find((ep) => ep.name === p.$.Name);\r\n      return this.mapProp(p, epConfig);\r\n    });\r\n\r\n    // support for base types, i.e. extends clause of interfaces\r\n    const baseClasses = [];\r\n    let finalBaseClass: string | undefined = undefined;\r\n    if (model.$.BaseType) {\r\n      baseClasses.push(model.$.BaseType);\r\n      const [baseName, basePrefix] = this.namingHelper.getNameAndServicePrefix(model.$.BaseType);\r\n      const baseConfig =\r\n        this.serviceConfigHelper.findEntityTypeConfig([basePrefix!], baseName) ||\r\n        this.serviceConfigHelper.findComplexTypeConfig([basePrefix!], baseName);\r\n      finalBaseClass = baseConfig?.mappedName ?? baseName;\r\n    }\r\n\r\n    return {\r\n      fqName,\r\n      odataName,\r\n      name,\r\n      modelName: this.namingHelper.getModelName(name),\r\n      qName: this.namingHelper.getQName(name),\r\n      editableName: this.namingHelper.getEditableModelName(name),\r\n      serviceName: this.namingHelper.getServiceName(name),\r\n      serviceCollectionName: this.namingHelper.getCollectionServiceName(name),\r\n      folderPath: this.namingHelper.getFolderPath(namespace, name),\r\n      baseClasses,\r\n      finalBaseClass,\r\n      props,\r\n      baseProps: [], // postprocess required\r\n      abstract: ifTrue(model.$.Abstract),\r\n      open: ifTrue(model.$.OpenType),\r\n    };\r\n  }\r\n\r\n  private addTypeDefinition(ns: string, 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(ns, t.$.Name, t.$.UnderlyingType);\r\n    }\r\n  }\r\n\r\n  private addEnum(namespace: NamespaceWithAlias, models: Array<EnumType> | undefined) {\r\n    if (!models || !models.length) {\r\n      return;\r\n    }\r\n\r\n    for (const et of models) {\r\n      const odataName = et.$.Name;\r\n      const fqName = withNamespace(namespace[0], odataName);\r\n      const config = this.serviceConfigHelper.findEnumTypeConfig(namespace, odataName);\r\n      const enumName = this.nameValidator.addEnumType(fqName, config?.mappedName || odataName);\r\n      const filePath = this.namingHelper.getFolderPath(namespace[0], enumName);\r\n      this.dataModel.addEnum(namespace[0], odataName, {\r\n        fqName,\r\n        odataName,\r\n        name: enumName,\r\n        modelName: this.namingHelper.getEnumName(enumName),\r\n        folderPath: filePath,\r\n        members: et.Member?.length ? et.Member.map((m) => m.$.Name) : [],\r\n      });\r\n    }\r\n  }\r\n\r\n  private addComplexType(namespace: NamespaceWithAlias, 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 config = this.serviceConfigHelper.findComplexTypeConfig(namespace, model.$.Name);\r\n      const fqName = withNamespace(namespace[0], model.$.Name);\r\n      const name = this.nameValidator.addComplexType(fqName, config?.mappedName || model.$.Name);\r\n      const baseModel = this.getBaseModel(config, model, namespace[0], name, fqName);\r\n      this.dataModel.addComplexType(namespace[0], baseModel.odataName, baseModel);\r\n    }\r\n  }\r\n\r\n  private addEntityType(namespace: NamespaceWithAlias, 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 entityConfig = this.serviceConfigHelper.findEntityTypeConfig(namespace, model.$.Name);\r\n      const fqName = withNamespace(namespace[0], model.$.Name);\r\n      const name = this.nameValidator.addEntityType(fqName, entityConfig?.mappedName || model.$.Name);\r\n      const baseModel = this.getBaseModel(entityConfig, model, namespace[0], name, fqName);\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.addEntityType(namespace[0], baseModel.odataName, {\r\n        ...baseModel,\r\n        id: {\r\n          fqName: baseModel.fqName,\r\n          modelName: this.namingHelper.getIdModelName(name),\r\n          qName: this.namingHelper.getQIdFunctionName(name),\r\n        },\r\n        generateId: !!keyNames.length,\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((ct) => {\r\n      const [baseProps, _, baseAttributes] = this.collectBaseClassPropsAndKeys(ct, []);\r\n      const { open } = baseAttributes;\r\n      ct.baseProps = baseProps.map((bp) => ({ ...bp }));\r\n      if (open) {\r\n        ct.open = true;\r\n      }\r\n    });\r\n    // entity types\r\n    const entityTypes = this.dataModel.getEntityTypes();\r\n    entityTypes.forEach((et) => {\r\n      const [baseProps, baseKeys, baseAttributes] = this.collectBaseClassPropsAndKeys(et, []);\r\n      const { fqIdName, idName, qIdName, open } = baseAttributes;\r\n      et.baseProps = baseProps.map((bp) => ({ ...bp }));\r\n\r\n      if (!et.keyNames.length && idName) {\r\n        et.id = {\r\n          fqName: fqIdName,\r\n          modelName: idName,\r\n          qName: qIdName,\r\n        };\r\n        et.generateId = false;\r\n      }\r\n      if (open) {\r\n        et.open = open;\r\n      }\r\n      et.keyNames.unshift(...baseKeys.filter((bk) => !et.keyNames.includes(bk)));\r\n    });\r\n  }\r\n\r\n  private postProcessKeys() {\r\n    const entityTypes = this.dataModel.getEntityTypes();\r\n    entityTypes.forEach((et) => {\r\n      const isSingleKey = et.keyNames.length === 1;\r\n      const props = [...et.baseProps, ...et.props];\r\n      et.keys = et.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\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\r\n        return prop;\r\n      });\r\n    });\r\n  }\r\n\r\n  private collectBaseClassPropsAndKeys(model: ComplexModelType, visitedModels: string[]): CollectorTuple {\r\n    if (visitedModels.includes(model.fqName)) {\r\n      throw new Error(`Cyclic inheritance detected for model ${model.fqName}!`);\r\n    }\r\n    visitedModels.push(model.fqName);\r\n    return model.baseClasses.reduce(\r\n      ([props, keys, attributes], bc) => {\r\n        const baseModel = this.dataModel.getEntityType(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 { fqIdName, idName, qIdName, open } = attributes;\r\n\r\n        // recursive\r\n        if (baseModel.baseClasses.length) {\r\n          const [parentProps, parentKeys, parentAttributes] = this.collectBaseClassPropsAndKeys(\r\n            baseModel,\r\n            visitedModels\r\n          );\r\n          props.unshift(...parentProps);\r\n          keys.unshift(...parentKeys);\r\n          if (parentAttributes?.idName) {\r\n            fqIdName = parentAttributes.fqIdName;\r\n            idName = parentAttributes.idName;\r\n            qIdName = parentAttributes.qIdName;\r\n          }\r\n          if (parentAttributes?.open) {\r\n            open = true;\r\n          }\r\n        }\r\n\r\n        props.push(...baseModel.props);\r\n        const entityModel = baseModel as EntityModelType;\r\n        if (entityModel.keyNames?.length) {\r\n          keys.push(...entityModel.keyNames.filter((kn) => !keys.includes(kn)));\r\n          fqIdName = entityModel.id.fqName;\r\n          idName = entityModel.id.modelName;\r\n          qIdName = entityModel.id.qName;\r\n        }\r\n        if (baseModel.open) {\r\n          open = true;\r\n        }\r\n        return [props, keys, { fqIdName, idName, qIdName, open }];\r\n      },\r\n      [[], [], { fqIdName: \"\", idName: \"\", qIdName: \"\", open: false }] as CollectorTuple\r\n    );\r\n  }\r\n\r\n  protected mapProp = (p: Property, entityPropConfig?: PropertyGenerationOptions | undefined): 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.findPropConfigByName(p.$.Name);\r\n    const modelName = this.namingHelper.getModelPropName(\r\n      entityPropConfig?.mappedName || configProp?.mappedName || p.$.Name\r\n    );\r\n    const isCollection = !!p.$.Type.match(/^Collection\\(/);\r\n    let dataType = p.$.Type.replace(/^Collection\\(([^\\)]+)\\)/, \"$1\");\r\n\r\n    // support for primitive type mapping\r\n    if (this.namingHelper.includesServicePrefix(dataType)) {\r\n      const dt = this.dataModel.getPrimitiveType(dataType);\r\n      if (dt !== undefined) {\r\n        dataType = dt;\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\r\n    if (this.namingHelper.includesServicePrefix(dataType)) {\r\n      const resultDt = this.model2Type.get(dataType)!;\r\n      const [dataTypeName, dataTypePrefix] = this.namingHelper.getNameAndServicePrefix(dataType);\r\n      const dataTypeNamespace: NamespaceWithAlias = [dataTypePrefix!];\r\n      if (!resultDt) {\r\n        throw new Error(\r\n          `Couldn't determine model data type for property \"${p.$.Name}\"! Given data type: \"${dataType}\".`\r\n        );\r\n      }\r\n\r\n      // special handling for enums\r\n      if (resultDt === DataTypes.EnumType) {\r\n        const enumConfig = this.serviceConfigHelper.findEnumTypeConfig(dataTypeNamespace, dataTypeName);\r\n        result = {\r\n          dataType: resultDt,\r\n          type: this.namingHelper.getEnumName(enumConfig?.mappedName ?? 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        const entityConfig =\r\n          resultDt === DataTypes.ComplexType\r\n            ? this.serviceConfigHelper.findComplexTypeConfig(dataTypeNamespace, dataTypeName)\r\n            : this.serviceConfigHelper.findEntityTypeConfig(dataTypeNamespace, dataTypeName);\r\n        const resultDataType = entityConfig?.mappedName ?? dataType;\r\n        result = {\r\n          dataType: resultDt,\r\n          type: this.namingHelper.getModelName(resultDataType),\r\n          qPath: \"QEntityPath\",\r\n          qObject: this.namingHelper.getQName(resultDataType),\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!`\r\n      );\r\n    }\r\n\r\n    return {\r\n      odataName: p.$.Name,\r\n      name: modelName,\r\n      odataType: p.$.Type,\r\n      fqType: dataType,\r\n      required: ifFalse(p.$.Nullable),\r\n      isCollection: isCollection,\r\n      managed: typeof entityPropConfig?.managed !== \"undefined\" ? entityPropConfig.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 {\r\n  ComplexTypeGenerationOptions,\r\n  EntityTypeGenerationOptions,\r\n  Modes,\r\n  PropertyGenerationOptions,\r\n} from \"../OptionModel\";\r\nimport { DataModel, NamespaceWithAlias, withNamespace } from \"./DataModel\";\r\nimport {\r\n  ComplexType as ComplexModelType,\r\n  DataTypes,\r\n  EntityType as EntityModelType,\r\n  ODataVersion,\r\n  PropertyModel,\r\n} from \"./DataTypeModel\";\r\nimport { ComplexType, EntityType, EnumType, Property, Schema, TypeDefinition } from \"./edmx/ODataEdmxModelBase\";\r\nimport { EntityContainerV3, SchemaV3 } from \"./edmx/ODataEdmxModelV3\";\r\nimport { EntityContainerV4, SchemaV4 } from \"./edmx/ODataEdmxModelV4\";\r\nimport { NamingHelper } from \"./NamingHelper\";\r\nimport { ServiceConfigHelper, WithoutName } from \"./ServiceConfigHelper\";\r\nimport { NameClashValidator } from \"./validation/NameClashValidator\";\r\nimport { NameValidator } from \"./validation/NameValidator\";\r\nimport { NoopValidator } from \"./validation/NoopValidator\";\r\n\r\ntype CollectorTuple = [\r\n  Array<PropertyModel>,\r\n  Array<string>,\r\n  { fqIdName: string; idName: string; qIdName: string; open: boolean }\r\n];\r\n\r\nfunction ifTrue(value: string | undefined): boolean {\r\n  return value === \"true\";\r\n}\r\n\r\nfunction ifFalse(value: string | undefined): boolean {\r\n  return value === \"false\";\r\n}\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\r\n  protected readonly dataModel: DataModel;\r\n  protected readonly serviceConfigHelper: ServiceConfigHelper;\r\n  protected readonly nameValidator: NameValidator;\r\n\r\n  /**\r\n   * Reverse mapping from fqName to data type: EntityType, ComplexType, EnumType, or Primitive Type.\r\n   */\r\n  private model2Type = new Map<string, DataTypes>();\r\n  /**\r\n   * Stores models (ComplexType or EntityType) by fqName that have been referenced in the API\r\n   * as entry point or via navProp.\r\n   * For these models one or two services are generated.\r\n   *\r\n   * In this way unnecessary service generation is prevented. For example, complex types that\r\n   * are only referenced as response of an operation do not need a generated service.\r\n   * @private\r\n   */\r\n  private serviceModels = new Set<string>();\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    const namespaces = schemas.map<NamespaceWithAlias>((s) => [s.$.Namespace, s.$.Alias]);\r\n    this.dataModel = new DataModel(namespaces, version, converters);\r\n    this.serviceConfigHelper = new ServiceConfigHelper(options);\r\n    this.nameValidator = this.options.bundledFileGeneration ? new NameClashValidator(options) : new NoopValidator();\r\n\r\n    this.collectModelTypes(schemas);\r\n  }\r\n\r\n  private collectModelTypes(schemas: Array<S>) {\r\n    schemas.forEach((schema) => {\r\n      const { Namespace: ns, Alias: alias } = schema.$;\r\n\r\n      schema.EnumType?.forEach((et) => {\r\n        this.addModel2Type(ns, alias, et.$.Name, DataTypes.EnumType);\r\n      });\r\n      schema.ComplexType?.forEach((ct) => {\r\n        this.addModel2Type(ns, alias, ct.$.Name, DataTypes.ComplexType);\r\n      });\r\n      schema.EntityType?.forEach((et) => {\r\n        this.addModel2Type(ns, alias, et.$.Name, DataTypes.ModelType);\r\n      });\r\n    });\r\n  }\r\n\r\n  private addModel2Type(ns: string, alias: string | undefined, name: string, dt: DataTypes) {\r\n    this.model2Type.set(withNamespace(ns, name), dt);\r\n    if (alias) {\r\n      this.model2Type.set(withNamespace(alias, name), dt);\r\n    }\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    this.dataModel.setNameValidation(this.nameValidator.validate());\r\n    return this.dataModel;\r\n  }\r\n\r\n  private digestEntityTypesAndOperations() {\r\n    this.schemas.forEach((schema) => {\r\n      const ns: NamespaceWithAlias = [schema.$.Namespace, schema.$.Alias];\r\n\r\n      // type definitions: alias for primitive types\r\n      this.addTypeDefinition(schema.$.Namespace, schema.TypeDefinition);\r\n\r\n      // enums\r\n      this.addEnum(ns, schema.EnumType);\r\n\r\n      // complex types\r\n      this.addComplexType(ns, schema.ComplexType);\r\n\r\n      // entity types\r\n      this.addEntityType(ns, schema.EntityType);\r\n\r\n      // V4 only: function & action types\r\n      this.digestOperations(schema);\r\n\r\n      this.analyzeModelUsage(schema.EntityContainer?.length ? schema.EntityContainer[0] : undefined);\r\n    });\r\n\r\n    this.postProcessModel();\r\n    this.postProcessKeys();\r\n  }\r\n\r\n  private getBaseModel(\r\n    entityConfig: WithoutName<EntityTypeGenerationOptions | ComplexTypeGenerationOptions> | undefined,\r\n    model: ComplexType,\r\n    namespace: string,\r\n    name: string,\r\n    fqName: string\r\n  ) {\r\n    const odataName = model.$.Name;\r\n\r\n    // map properties respecting the config\r\n    const props = [...(model.Property ?? []), ...this.getNavigationProps(model)].map((p) => {\r\n      const epConfig = entityConfig?.properties?.find((ep) => ep.name === p.$.Name);\r\n      return this.mapProp(p, epConfig);\r\n    });\r\n\r\n    // support for base types, i.e. extends clause of interfaces\r\n    const baseClasses = [];\r\n    let finalBaseClass: string | undefined = undefined;\r\n    if (model.$.BaseType) {\r\n      baseClasses.push(model.$.BaseType);\r\n      const [baseName, basePrefix] = this.namingHelper.getNameAndServicePrefix(model.$.BaseType);\r\n      const baseConfig =\r\n        this.serviceConfigHelper.findEntityTypeConfig([basePrefix!], baseName) ||\r\n        this.serviceConfigHelper.findComplexTypeConfig([basePrefix!], baseName);\r\n      finalBaseClass = baseConfig?.mappedName ?? baseName;\r\n    }\r\n\r\n    return {\r\n      fqName,\r\n      odataName,\r\n      name,\r\n      modelName: this.namingHelper.getModelName(name),\r\n      qName: this.namingHelper.getQName(name),\r\n      editableName: this.namingHelper.getEditableModelName(name),\r\n      serviceName: this.namingHelper.getServiceName(name),\r\n      serviceCollectionName: this.namingHelper.getCollectionServiceName(name),\r\n      folderPath: this.namingHelper.getFolderPath(namespace, name),\r\n      baseClasses,\r\n      finalBaseClass,\r\n      props,\r\n      baseProps: [], // postprocess required\r\n      abstract: ifTrue(model.$.Abstract),\r\n      open: ifTrue(model.$.OpenType),\r\n      genMode: Modes.service,\r\n    } satisfies Partial<ComplexModelType>;\r\n  }\r\n\r\n  private addTypeDefinition(ns: string, 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(ns, t.$.Name, t.$.UnderlyingType);\r\n    }\r\n  }\r\n\r\n  private addEnum(namespace: NamespaceWithAlias, models: Array<EnumType> | undefined) {\r\n    if (!models || !models.length) {\r\n      return;\r\n    }\r\n\r\n    for (const et of models) {\r\n      const odataName = et.$.Name;\r\n      const fqName = withNamespace(namespace[0], odataName);\r\n      const config = this.serviceConfigHelper.findEnumTypeConfig(namespace, odataName);\r\n      const enumName = this.nameValidator.addEnumType(fqName, config?.mappedName || odataName);\r\n      const filePath = this.namingHelper.getFolderPath(namespace[0], enumName);\r\n      this.dataModel.addEnum(namespace[0], odataName, {\r\n        fqName,\r\n        odataName,\r\n        name: enumName,\r\n        modelName: this.namingHelper.getEnumName(enumName),\r\n        folderPath: filePath,\r\n        members: et.Member?.length ? et.Member.map((m) => m.$.Name) : [],\r\n      });\r\n    }\r\n  }\r\n\r\n  private addComplexType(namespace: NamespaceWithAlias, 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 config = this.serviceConfigHelper.findComplexTypeConfig(namespace, model.$.Name);\r\n      const fqName = withNamespace(namespace[0], model.$.Name);\r\n      const name = this.nameValidator.addComplexType(fqName, config?.mappedName || model.$.Name);\r\n      const baseModel = this.getBaseModel(config, model, namespace[0], name, fqName);\r\n      this.dataModel.addComplexType(namespace[0], baseModel.odataName, baseModel);\r\n    }\r\n  }\r\n\r\n  private addEntityType(namespace: NamespaceWithAlias, 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 entityConfig = this.serviceConfigHelper.findEntityTypeConfig(namespace, model.$.Name);\r\n      const fqName = withNamespace(namespace[0], model.$.Name);\r\n      const name = this.nameValidator.addEntityType(fqName, entityConfig?.mappedName || model.$.Name);\r\n      const baseModel = this.getBaseModel(entityConfig, model, namespace[0], name, fqName);\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.addEntityType(namespace[0], baseModel.odataName, {\r\n        ...baseModel,\r\n        id: {\r\n          fqName: baseModel.fqName,\r\n          modelName: this.namingHelper.getIdModelName(name),\r\n          qName: this.namingHelper.getQIdFunctionName(name),\r\n        },\r\n        generateId: !!keyNames.length,\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 analyzeModelUsage(ec: EntityContainerV3 | EntityContainerV4 | undefined) {\r\n    if (ec?.EntitySet?.length) {\r\n      ec.EntitySet.forEach((et) => this.analyze(et.$.EntityType));\r\n    }\r\n    const ec4 = ec as EntityContainerV4;\r\n    if (ec4?.Singleton?.length) {\r\n      ec4.Singleton.forEach((singleton) => this.analyze(singleton.$.Type));\r\n    }\r\n  }\r\n\r\n  private analyze(fqModelName: string) {\r\n    if (this.serviceModels.has(fqModelName)) {\r\n      return;\r\n    }\r\n\r\n    this.serviceModels.add(fqModelName);\r\n    const model = this.dataModel.getEntityType(fqModelName) ?? this.dataModel.getComplexType(fqModelName);\r\n\r\n    if (model) {\r\n      if (model.baseClasses.length) {\r\n        this.analyze(model.baseClasses[0]);\r\n      }\r\n      model?.props.forEach((p) => {\r\n        if (p.dataType === DataTypes.ComplexType || p.dataType === DataTypes.ModelType) {\r\n          this.analyze(p.fqType);\r\n        }\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((ct) => {\r\n      const [baseProps, _, baseAttributes] = this.collectBaseClassPropsAndKeys(ct, []);\r\n      const { open } = baseAttributes;\r\n      ct.baseProps = baseProps.map((bp) => ({ ...bp }));\r\n      if (open) {\r\n        ct.open = true;\r\n      }\r\n      if (!this.serviceModels.has(ct.fqName)) {\r\n        ct.genMode = Modes.qobjects;\r\n      }\r\n    });\r\n    // entity types\r\n    const entityTypes = this.dataModel.getEntityTypes();\r\n    entityTypes.forEach((et) => {\r\n      const [baseProps, baseKeys, baseAttributes] = this.collectBaseClassPropsAndKeys(et, []);\r\n      const { fqIdName, idName, qIdName, open } = baseAttributes;\r\n      et.baseProps = baseProps.map((bp) => ({ ...bp }));\r\n\r\n      if (!et.keyNames.length && idName) {\r\n        et.id = {\r\n          fqName: fqIdName,\r\n          modelName: idName,\r\n          qName: qIdName,\r\n        };\r\n        et.generateId = false;\r\n      }\r\n      if (open) {\r\n        et.open = open;\r\n      }\r\n      if (!this.serviceModels.has(et.fqName)) {\r\n        et.genMode = Modes.qobjects;\r\n      }\r\n      et.keyNames.unshift(...baseKeys.filter((bk) => !et.keyNames.includes(bk)));\r\n    });\r\n  }\r\n\r\n  private postProcessKeys() {\r\n    const entityTypes = this.dataModel.getEntityTypes();\r\n    entityTypes.forEach((et) => {\r\n      const isSingleKey = et.keyNames.length === 1;\r\n      const props = [...et.baseProps, ...et.props];\r\n      et.keys = et.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\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\r\n        return prop;\r\n      });\r\n    });\r\n  }\r\n\r\n  private collectBaseClassPropsAndKeys(model: ComplexModelType, visitedModels: string[]): CollectorTuple {\r\n    if (visitedModels.includes(model.fqName)) {\r\n      throw new Error(`Cyclic inheritance detected for model ${model.fqName}!`);\r\n    }\r\n    visitedModels.push(model.fqName);\r\n    return model.baseClasses.reduce(\r\n      ([props, keys, attributes], bc) => {\r\n        const baseModel = this.dataModel.getEntityType(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 { fqIdName, idName, qIdName, open } = attributes;\r\n\r\n        // recursive\r\n        if (baseModel.baseClasses.length) {\r\n          const [parentProps, parentKeys, parentAttributes] = this.collectBaseClassPropsAndKeys(\r\n            baseModel,\r\n            visitedModels\r\n          );\r\n          props.unshift(...parentProps);\r\n          keys.unshift(...parentKeys);\r\n          if (parentAttributes?.idName) {\r\n            fqIdName = parentAttributes.fqIdName;\r\n            idName = parentAttributes.idName;\r\n            qIdName = parentAttributes.qIdName;\r\n          }\r\n          if (parentAttributes?.open) {\r\n            open = true;\r\n          }\r\n        }\r\n\r\n        props.push(...baseModel.props);\r\n        const entityModel = baseModel as EntityModelType;\r\n        if (entityModel.keyNames?.length) {\r\n          keys.push(...entityModel.keyNames.filter((kn) => !keys.includes(kn)));\r\n          fqIdName = entityModel.id.fqName;\r\n          idName = entityModel.id.modelName;\r\n          qIdName = entityModel.id.qName;\r\n        }\r\n        if (baseModel.open) {\r\n          open = true;\r\n        }\r\n        return [props, keys, { fqIdName, idName, qIdName, open }];\r\n      },\r\n      [[], [], { fqIdName: \"\", idName: \"\", qIdName: \"\", open: false }] as CollectorTuple\r\n    );\r\n  }\r\n\r\n  protected mapProp = (p: Property, entityPropConfig?: PropertyGenerationOptions | undefined): 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.findPropConfigByName(p.$.Name);\r\n    const modelName = this.namingHelper.getModelPropName(\r\n      entityPropConfig?.mappedName || configProp?.mappedName || p.$.Name\r\n    );\r\n    const isCollection = !!p.$.Type.match(/^Collection\\(/);\r\n    let odataDataType = p.$.Type.replace(/^Collection\\(([^\\)]+)\\)/, \"$1\");\r\n\r\n    // support for primitive type mapping\r\n    if (this.namingHelper.includesServicePrefix(odataDataType)) {\r\n      const dt = this.dataModel.getPrimitiveType(odataDataType);\r\n      if (dt !== undefined) {\r\n        odataDataType = dt;\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\r\n    if (this.namingHelper.includesServicePrefix(odataDataType)) {\r\n      const modelType = this.model2Type.get(odataDataType)!;\r\n      const [dataTypeName, dataTypePrefix] = this.namingHelper.getNameAndServicePrefix(odataDataType);\r\n      const dataTypeNamespace: NamespaceWithAlias = [dataTypePrefix!];\r\n      if (!modelType) {\r\n        throw new Error(\r\n          `Couldn't determine model type (EntityType, ComplexType, etc) for property \"${p.$.Name}\"! Given data type: \"${odataDataType}\".`\r\n        );\r\n      }\r\n\r\n      // special handling for enums\r\n      if (modelType === DataTypes.EnumType) {\r\n        const enumConfig = this.serviceConfigHelper.findEnumTypeConfig(dataTypeNamespace, dataTypeName);\r\n        result = {\r\n          dataType: modelType,\r\n          type: this.namingHelper.getEnumName(enumConfig?.mappedName ?? odataDataType),\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        const entityConfig =\r\n          modelType === DataTypes.ComplexType\r\n            ? this.serviceConfigHelper.findComplexTypeConfig(dataTypeNamespace, dataTypeName)\r\n            : this.serviceConfigHelper.findEntityTypeConfig(dataTypeNamespace, dataTypeName);\r\n        const typeName = entityConfig?.mappedName ?? odataDataType;\r\n\r\n        result = {\r\n          dataType: modelType,\r\n          type: this.namingHelper.getModelName(typeName),\r\n          qPath: \"QEntityPath\",\r\n          qObject: this.namingHelper.getQName(typeName),\r\n          qParam: \"QComplexParam\",\r\n        };\r\n      }\r\n    }\r\n    // OData built-in data types\r\n    else if (odataDataType.startsWith(Digester.EDM_PREFIX)) {\r\n      const { outputType, qPath, qParam, qCollection } = this.mapODataType(odataDataType);\r\n      const { to, toModule: typeModule, converters } = this.dataModel.getConverter(odataDataType) || {};\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 [${odataDataType}]: Not 'Collection(...)', not OData type 'Edm.*', not starting with one of the namespaces!`\r\n      );\r\n    }\r\n\r\n    return {\r\n      odataName: p.$.Name,\r\n      name: modelName,\r\n      odataType: p.$.Type,\r\n      fqType: odataDataType,\r\n      required: ifFalse(p.$.Nullable),\r\n      isCollection: isCollection,\r\n      managed: typeof entityPropConfig?.managed !== \"undefined\" ? entityPropConfig.managed : configProp?.managed,\r\n      ...result,\r\n    };\r\n  };\r\n}\r\n"]}