@odata2ts/odata2ts 0.38.1 → 0.39.0

package/CHANGELOG.md

@@ -3,11 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.39.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.38.1...@odata2ts/odata2ts@0.39.0) (2024-10-28)
+
+### Features
+
+* **generator:** add cast operations to base type services ([#327](https://github.com/odata2ts/odata2ts/issues/327)) ([df52284](https://github.com/odata2ts/odata2ts/commit/df522846e275c160266c02d5c5b49c8be995b3fb))
+* **generator:** conversion of subtype by control info ([#331](https://github.com/odata2ts/odata2ts/issues/331)) ([a8a8a50](https://github.com/odata2ts/odata2ts/commit/a8a8a50c5a619cfe7e32bf6fa399e2f5b1f55ffa))
+* **generator:** qobjects with casted subtype props ([#328](https://github.com/odata2ts/odata2ts/issues/328)) ([88eb9bd](https://github.com/odata2ts/odata2ts/commit/88eb9bdedf02fa4d74ebfc638f89aca583f1852d))
+* **service:** subtype services ([#332](https://github.com/odata2ts/odata2ts/issues/332)) ([6918735](https://github.com/odata2ts/odata2ts/commit/691873557d21418561f017189fe896d544ffcba5))
+* **service:** support no url encoding ([#326](https://github.com/odata2ts/odata2ts/issues/326)) ([304bc62](https://github.com/odata2ts/odata2ts/commit/304bc627199766f7a930bffe28e39bb24eea39b1))
+
+### BREAKING CHANGES
+
+* **service:** dedicated options parameter for all services
+
 ## [0.38.1](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.38.0...@odata2ts/odata2ts@0.38.1) (2024-09-19)
 
 ### Bug Fixes
 
 * **generator:** api usage analysis must respect alias ([#317](https://github.com/odata2ts/odata2ts/issues/317)) ([5877161](https://github.com/odata2ts/odata2ts/commit/5877161317d09c5ded9b44ce4a7ecd0f65e65235))
+
 * **generator:** set peer dependency of TS to >= 4.7 ([949d874](https://github.com/odata2ts/odata2ts/commit/949d8749828dda06a2072d4153556c53d0adb3cf))
 
 # [0.38.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.37.0...@odata2ts/odata2ts@0.38.0) (2024-09-11)
@@ -15,12 +30,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 ### Bug Fixes
 
 * auto name clash resolution for v4 actions ([#315](https://github.com/odata2ts/odata2ts/issues/315)) ([3366843](https://github.com/odata2ts/odata2ts/commit/3366843dc227f9c8edd5b4660d63c564cc82f121))
+
 * **generator:** add rimraf as dependency ([9f08ccd](https://github.com/odata2ts/odata2ts/commit/9f08ccd5fc68b1de381ea1cb711c6e667ca5be98))
+
 * **generator:** use typeof when using enums as types ([baf784f](https://github.com/odata2ts/odata2ts/commit/baf784f76f119c2394ba4f1c3cd93359dc31171e))
 
 ### Features
 
 * compile src & test folders as sanity check ([12607f0](https://github.com/odata2ts/odata2ts/commit/12607f04a4ec1142d750318cab5964f3d9a513c4))
+
 * **generator:** allow for numeric enums ([#308](https://github.com/odata2ts/odata2ts/issues/308)) ([a5c36e6](https://github.com/odata2ts/odata2ts/commit/a5c36e6433bb5d793d5f970b12d6ebb8a4c5270d))
 
 # [0.37.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.36.3...@odata2ts/odata2ts@0.37.0) (2024-08-25)
@@ -36,6 +54,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 ### BREAKING CHANGES
 
 * as there is no generated index file all file paths must be fixed.
+
 * ESM tends to break stuff
 
 ## [0.36.3](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.36.2...@odata2ts/odata2ts@0.36.3) (2024-08-12)
@@ -61,9 +80,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 ### 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

package/lib/NamingModel.d.ts

@@ -91,6 +91,9 @@ export interface QueryObjectNamingOptions extends NamingStrategyOption, Required
     propNamingStrategy?: NamingStrategies;
     idFunctions: RequiredNamingOptions;
     operations?: OperationNamingOptions;
+    baseType: RequiredNamingOptions & {
+        applyQNaming?: boolean;
+    };
 }
 export interface OperationNamingOptions extends StandardNamingOptions {
     /**

package/lib/NamingModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"NamingModel.js","sourceRoot":"","sources":["../src/NamingModel.ts"],"names":[],"mappings":"AAKA,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,6BAAS,CAAA;IACT,8CAA0B,CAAA;IAC1B,4CAAwB,CAAA;IACxB,kDAA8B,CAAA;IAC9B,4CAAwB,CAAA;AAC1B,CAAC,EANW,gBAAgB,KAAhB,gBAAgB,QAM3B","sourcesContent":["/**\r\n * The available naming strategies.\r\n */\r\nimport { PartialDeep } from \"type-fest\";\r\n\r\nexport enum NamingStrategies {\r\n  NONE = \"\",\r\n  PASCAL_CASE = \"pascalCase\",\r\n  CAMEL_CASE = \"camelCase\",\r\n  CONSTANT_CASE = \"constantCase\",\r\n  SNAKE_CASE = \"snakeCase\",\r\n}\r\n\r\n/**\r\n * Based on an existing configuration (for example default settings) the user only specifies what needs\r\n * to be changed. Hence, all options are completely optional.\r\n */\r\nexport interface OverridableNamingOptions extends PartialDeep<NameSettings> {}\r\n\r\n/**\r\n * The required and optional name settings for the generator.\r\n */\r\nexport interface NameSettings {\r\n  /**\r\n   * Because multiple artefacts are generated out of the same entity, some name settings are required in order\r\n   * to differentiate those artefacts. Out-of-the-box odata2ts provides you with sensible default settings,\r\n   * so that you only need to override those settings you want to change.\r\n   *\r\n   * However, sometimes it makes more sense to start from scratch, so that the defaults don't interfere with\r\n   * your own configuration. In this scenario this switch should be enabled to only have default values for\r\n   * the required name settings.\r\n   */\r\n  minimalDefaults?: boolean;\r\n\r\n  /**\r\n   * Generation options for models, i.e. interfaces representing entity or complex types.\r\n   */\r\n  models: ModelNamingOptions;\r\n\r\n  /**\r\n   * Generation options for Query Objects.\r\n   *\r\n   * By default, prefix = \"Q\"\r\n   */\r\n  queryObjects: QueryObjectNamingOptions;\r\n\r\n  services: ServiceNamingOptions;\r\n}\r\n\r\nexport interface ModelNamingOptions extends NamingStrategyOption, StandardNamingOptions {\r\n  /**\r\n   * All generated models are bundled into one file.\r\n   * This option specifies the formatting of the file name.\r\n   */\r\n  fileName: FileNamingStrategyOption & RequiredNamingOptions;\r\n\r\n  /**\r\n   * Choose a specific strategy to format property names of models: pascal-case, camel-case, etc.\r\n   * By default, camel-case.\r\n   */\r\n  propNamingStrategy?: NamingStrategies;\r\n\r\n  /**\r\n   * For each model an editable version is generated which represents the model definition for\r\n   * create, update and patch actions.\r\n   *\r\n   * You can override the naming options here.\r\n   * By default, prefix = \"Editable\"\r\n   */\r\n  editableModels: EntityDerivedNamingOptions;\r\n\r\n  /**\r\n   * ID models are generated from entity id parameters.\r\n   *\r\n   * You can configure the naming options here.\r\n   * By default, suffix = \"Id\"\r\n   */\r\n  idModels: EntityDerivedNamingOptions;\r\n\r\n  /**\r\n   * Operation parameter models are generated from function or action signatures.\r\n   *\r\n   * You can configure the naming options here.\r\n   * By default, suffix = \"Params\"\r\n   */\r\n  operationParamModels: EntityDerivedNamingOptions;\r\n}\r\n\r\nexport interface EntityDerivedNamingOptions extends RequiredNamingOptions {\r\n  applyModelNaming?: boolean;\r\n}\r\n\r\nexport interface QueryObjectNamingOptions extends NamingStrategyOption, RequiredNamingOptions {\r\n  /**\r\n   * All generated models are bundled into one file.\r\n   * This option specifies the formatting of the file name.\r\n   */\r\n  fileName: FileNamingStrategyOption & RequiredNamingOptions;\r\n\r\n  /**\r\n   * Choose a specific strategy to format property names of query objects: pascal-case, camel-case, etc.\r\n   * By default, camel-case.\r\n   */\r\n  propNamingStrategy?: NamingStrategies;\r\n\r\n  idFunctions: RequiredNamingOptions;\r\n\r\n  operations?: OperationNamingOptions;\r\n}\r\n\r\nexport interface OperationNamingOptions extends StandardNamingOptions {\r\n  /**\r\n   * Naming options for actions only.\r\n   * When this configuration is provided, the parent configuration regarding suffix and prefix is ignored.\r\n   */\r\n  action?: StandardNamingOptions;\r\n  /**\r\n   * Naming options for functions only.\r\n   * When this configuration is provided, the parent configuration regarding suffix and prefix is ignored.\r\n   */\r\n  function?: StandardNamingOptions;\r\n}\r\n\r\nexport interface NamingStrategyOption {\r\n  /**\r\n   * Choose a specific strategy to format names: pascal-case, camel-case, etc.\r\n   * Defaults to pascal-case.\r\n   */\r\n  namingStrategy?: NamingStrategies;\r\n}\r\n\r\nexport interface FileNamingStrategyOption {\r\n  /**\r\n   * Choose a specific strategy to format names: pascal-case, camel-case, etc.\r\n   * Defaults to pascal-case.\r\n   */\r\n  namingStrategy?: NamingStrategies;\r\n}\r\n\r\nexport interface StandardNamingOptions {\r\n  /**\r\n   * Prefix all names, e.g. \"I\" => \"ITest\"\r\n   */\r\n  prefix?: string;\r\n  /**\r\n   * Suffix all names, e.g. \"model\" => \"TestModel\"\r\n   */\r\n  suffix?: string;\r\n}\r\n\r\nexport interface RequiredNamingOptions extends Required<StandardNamingOptions> {}\r\n\r\n/**\r\n * Naming options for generated service classes.\r\n * These options affect the main service as well as all services generated for each entity, complex and collection type.\r\n *\r\n * There exists one specialty about services: The file names are not configurable.\r\n * File names are determined by the name of their corresponding classes, so that service file name\r\n * and service class name always correspond.\r\n *\r\n * By default, suffix = Service and namingStrategy = PascalCase\r\n */\r\nexport interface ServiceNamingOptions extends NamingStrategyOption, RequiredNamingOptions {\r\n  /**\r\n   * Controls the naming options for the main odata service.\r\n   * By default, the base service naming options are applied.\r\n   * But since this is the main entry point for users, it can be configured individually here.\r\n   *\r\n   * By default, applyServiceNaming = true\r\n   */\r\n  main?: NamingStrategyOption & StandardNamingOptions & { applyServiceNaming?: boolean };\r\n\r\n  /**\r\n   * Name of the service responsible for entity collections.\r\n   *\r\n   * By default, suffix = Collection and applyServiceNaming = true\r\n   */\r\n  collection: RequiredNamingOptions & { applyServiceNaming?: boolean };\r\n\r\n  /**\r\n   * Naming for getter method of another service.\r\n   *\r\n   * By default, namingStrategy = camelCase\r\n   */\r\n  relatedServiceGetter: NamingStrategyOption & RequiredNamingOptions;\r\n\r\n  /**\r\n   * Operations are functions and actions of the OData service and are represented as methods\r\n   * of the generated service class. This setting controls the naming of the corresponding\r\n   * function.\r\n   *\r\n   * By default, namingStrategy = camelCase\r\n   */\r\n  operations?: NamingStrategyOption & OperationNamingOptions;\r\n\r\n  /**\r\n   * Naming options for private properties of service classes.\r\n   *\r\n   * By default, prefix = _\r\n   */\r\n  privateProps: NamingStrategyOption & RequiredNamingOptions;\r\n}\r\n"]}
+{"version":3,"file":"NamingModel.js","sourceRoot":"","sources":["../src/NamingModel.ts"],"names":[],"mappings":"AAKA,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,6BAAS,CAAA;IACT,8CAA0B,CAAA;IAC1B,4CAAwB,CAAA;IACxB,kDAA8B,CAAA;IAC9B,4CAAwB,CAAA;AAC1B,CAAC,EANW,gBAAgB,KAAhB,gBAAgB,QAM3B","sourcesContent":["/**\r\n * The available naming strategies.\r\n */\r\nimport { PartialDeep } from \"type-fest\";\r\n\r\nexport enum NamingStrategies {\r\n  NONE = \"\",\r\n  PASCAL_CASE = \"pascalCase\",\r\n  CAMEL_CASE = \"camelCase\",\r\n  CONSTANT_CASE = \"constantCase\",\r\n  SNAKE_CASE = \"snakeCase\",\r\n}\r\n\r\n/**\r\n * Based on an existing configuration (for example default settings) the user only specifies what needs\r\n * to be changed. Hence, all options are completely optional.\r\n */\r\nexport interface OverridableNamingOptions extends PartialDeep<NameSettings> {}\r\n\r\n/**\r\n * The required and optional name settings for the generator.\r\n */\r\nexport interface NameSettings {\r\n  /**\r\n   * Because multiple artefacts are generated out of the same entity, some name settings are required in order\r\n   * to differentiate those artefacts. Out-of-the-box odata2ts provides you with sensible default settings,\r\n   * so that you only need to override those settings you want to change.\r\n   *\r\n   * However, sometimes it makes more sense to start from scratch, so that the defaults don't interfere with\r\n   * your own configuration. In this scenario this switch should be enabled to only have default values for\r\n   * the required name settings.\r\n   */\r\n  minimalDefaults?: boolean;\r\n\r\n  /**\r\n   * Generation options for models, i.e. interfaces representing entity or complex types.\r\n   */\r\n  models: ModelNamingOptions;\r\n\r\n  /**\r\n   * Generation options for Query Objects.\r\n   *\r\n   * By default, prefix = \"Q\"\r\n   */\r\n  queryObjects: QueryObjectNamingOptions;\r\n\r\n  services: ServiceNamingOptions;\r\n}\r\n\r\nexport interface ModelNamingOptions extends NamingStrategyOption, StandardNamingOptions {\r\n  /**\r\n   * All generated models are bundled into one file.\r\n   * This option specifies the formatting of the file name.\r\n   */\r\n  fileName: FileNamingStrategyOption & RequiredNamingOptions;\r\n\r\n  /**\r\n   * Choose a specific strategy to format property names of models: pascal-case, camel-case, etc.\r\n   * By default, camel-case.\r\n   */\r\n  propNamingStrategy?: NamingStrategies;\r\n\r\n  /**\r\n   * For each model an editable version is generated which represents the model definition for\r\n   * create, update and patch actions.\r\n   *\r\n   * You can override the naming options here.\r\n   * By default, prefix = \"Editable\"\r\n   */\r\n  editableModels: EntityDerivedNamingOptions;\r\n\r\n  /**\r\n   * ID models are generated from entity id parameters.\r\n   *\r\n   * You can configure the naming options here.\r\n   * By default, suffix = \"Id\"\r\n   */\r\n  idModels: EntityDerivedNamingOptions;\r\n\r\n  /**\r\n   * Operation parameter models are generated from function or action signatures.\r\n   *\r\n   * You can configure the naming options here.\r\n   * By default, suffix = \"Params\"\r\n   */\r\n  operationParamModels: EntityDerivedNamingOptions;\r\n}\r\n\r\nexport interface EntityDerivedNamingOptions extends RequiredNamingOptions {\r\n  applyModelNaming?: boolean;\r\n}\r\n\r\nexport interface QueryObjectNamingOptions extends NamingStrategyOption, RequiredNamingOptions {\r\n  /**\r\n   * All generated models are bundled into one file.\r\n   * This option specifies the formatting of the file name.\r\n   */\r\n  fileName: FileNamingStrategyOption & RequiredNamingOptions;\r\n\r\n  /**\r\n   * Choose a specific strategy to format property names of query objects: pascal-case, camel-case, etc.\r\n   * By default, camel-case.\r\n   */\r\n  propNamingStrategy?: NamingStrategies;\r\n\r\n  idFunctions: RequiredNamingOptions;\r\n\r\n  operations?: OperationNamingOptions;\r\n\r\n  baseType: RequiredNamingOptions & { applyQNaming?: boolean };\r\n}\r\n\r\nexport interface OperationNamingOptions extends StandardNamingOptions {\r\n  /**\r\n   * Naming options for actions only.\r\n   * When this configuration is provided, the parent configuration regarding suffix and prefix is ignored.\r\n   */\r\n  action?: StandardNamingOptions;\r\n  /**\r\n   * Naming options for functions only.\r\n   * When this configuration is provided, the parent configuration regarding suffix and prefix is ignored.\r\n   */\r\n  function?: StandardNamingOptions;\r\n}\r\n\r\nexport interface NamingStrategyOption {\r\n  /**\r\n   * Choose a specific strategy to format names: pascal-case, camel-case, etc.\r\n   * Defaults to pascal-case.\r\n   */\r\n  namingStrategy?: NamingStrategies;\r\n}\r\n\r\nexport interface FileNamingStrategyOption {\r\n  /**\r\n   * Choose a specific strategy to format names: pascal-case, camel-case, etc.\r\n   * Defaults to pascal-case.\r\n   */\r\n  namingStrategy?: NamingStrategies;\r\n}\r\n\r\nexport interface StandardNamingOptions {\r\n  /**\r\n   * Prefix all names, e.g. \"I\" => \"ITest\"\r\n   */\r\n  prefix?: string;\r\n  /**\r\n   * Suffix all names, e.g. \"model\" => \"TestModel\"\r\n   */\r\n  suffix?: string;\r\n}\r\n\r\nexport interface RequiredNamingOptions extends Required<StandardNamingOptions> {}\r\n\r\n/**\r\n * Naming options for generated service classes.\r\n * These options affect the main service as well as all services generated for each entity, complex and collection type.\r\n *\r\n * There exists one specialty about services: The file names are not configurable.\r\n * File names are determined by the name of their corresponding classes, so that service file name\r\n * and service class name always correspond.\r\n *\r\n * By default, suffix = Service and namingStrategy = PascalCase\r\n */\r\nexport interface ServiceNamingOptions extends NamingStrategyOption, RequiredNamingOptions {\r\n  /**\r\n   * Controls the naming options for the main odata service.\r\n   * By default, the base service naming options are applied.\r\n   * But since this is the main entry point for users, it can be configured individually here.\r\n   *\r\n   * By default, applyServiceNaming = true\r\n   */\r\n  main?: NamingStrategyOption & StandardNamingOptions & { applyServiceNaming?: boolean };\r\n\r\n  /**\r\n   * Name of the service responsible for entity collections.\r\n   *\r\n   * By default, suffix = Collection and applyServiceNaming = true\r\n   */\r\n  collection: RequiredNamingOptions & { applyServiceNaming?: boolean };\r\n\r\n  /**\r\n   * Naming for getter method of another service.\r\n   *\r\n   * By default, namingStrategy = camelCase\r\n   */\r\n  relatedServiceGetter: NamingStrategyOption & RequiredNamingOptions;\r\n\r\n  /**\r\n   * Operations are functions and actions of the OData service and are represented as methods\r\n   * of the generated service class. This setting controls the naming of the corresponding\r\n   * function.\r\n   *\r\n   * By default, namingStrategy = camelCase\r\n   */\r\n  operations?: NamingStrategyOption & OperationNamingOptions;\r\n\r\n  /**\r\n   * Naming options for private properties of service classes.\r\n   *\r\n   * By default, prefix = _\r\n   */\r\n  privateProps: NamingStrategyOption & RequiredNamingOptions;\r\n}\r\n"]}

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

@@ -28,16 +28,6 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
      * 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;
@@ -58,9 +48,21 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     private addEnum;
     private addComplexType;
     private addEntityType;
+    /**
+     * Check that models (ComplexType or EntityType) have been referenced in the API
+     * as entry point or via navProp or by virtue of being a base type or subtype of those.
+     * 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.
+     *
+     * @param ec
+     * @private
+     */
     private analyzeModelUsage;
     /**
-     * Check
+     * Check usage of model types within API.
+     *
      * @param fqModelName
      * @private
      */
@@ -69,4 +71,5 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     private postProcessKeys;
     private collectBaseClassPropsAndKeys;
     protected mapProp: (p: Property, entityPropConfig?: PropertyGenerationOptions | undefined) => PropertyModel;
+    private addSubtypes;
 }

package/lib/data-model/DataModelDigestion.js

@@ -20,16 +20,6 @@ export class Digester {
          * 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) {
@@ -144,7 +134,6 @@ export 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);
@@ -156,11 +145,13 @@ export class Digester {
             this.addEntityType(ns, schema.EntityType);
             // V4 only: function & action types
             this.digestOperations(schema);
-            // mark each EntityType & ComplexType which is referencable from API
-            this.analyzeModelUsage(((_a = schema.EntityContainer) === null || _a === void 0 ? void 0 : _a.length) ? schema.EntityContainer[0] : undefined);
         });
         this.postProcessModel();
         this.postProcessKeys();
+        this.schemas.forEach((schema) => {
+            var _a;
+            this.analyzeModelUsage(((_a = schema.EntityContainer) === null || _a === void 0 ? void 0 : _a.length) ? schema.EntityContainer[0] : undefined);
+        });
     }
     getBaseModel(entityConfig, model, namespace, name, fqName) {
         var _a, _b;
@@ -197,7 +188,8 @@ export class Digester {
             baseProps: [],
             abstract: ifTrue(model.$.Abstract),
             open: ifTrue(model.$.OpenType),
-            genMode: Modes.service,
+            genMode: Modes.qobjects,
+            subtypes: new Set(),
         };
     }
     addTypeDefinition(ns, types) {
@@ -268,9 +260,20 @@ export class Digester {
                     fqName: baseModel.fqName,
                     modelName: this.namingHelper.getIdModelName(name),
                     qName: this.namingHelper.getQIdFunctionName(name),
-                }, generateId: !!keyNames.length, keyNames: keyNames, keys: [], getKeyUnion: () => keyNames.join(" | ") }));
+                }, generateId: !!keyNames.length, keyNames: keyNames, keys: [], getKeyUnion: () => keyNames.join(" | "), subtypes: new Set() }));
         }
     }
+    /**
+     * Check that models (ComplexType or EntityType) have been referenced in the API
+     * as entry point or via navProp or by virtue of being a base type or subtype of those.
+     * 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.
+     *
+     * @param ec
+     * @private
+     */
     analyzeModelUsage(ec) {
         var _a, _b;
         if ((_a = ec === null || ec === void 0 ? void 0 : ec.EntitySet) === null || _a === void 0 ? void 0 : _a.length) {
@@ -282,7 +285,8 @@ export class Digester {
         }
     }
     /**
-     * Check
+     * Check usage of model types within API.
+     *
      * @param fqModelName
      * @private
      */
@@ -290,14 +294,19 @@ export class Digester {
         var _a;
         // to also resolve aliases the data model needs to be used
         const model = (_a = this.dataModel.getEntityType(fqModelName)) !== null && _a !== void 0 ? _a : this.dataModel.getComplexType(fqModelName);
-        if (!(model === null || model === void 0 ? void 0 : model.fqName) || this.serviceModels.has(model.fqName)) {
+        if (!(model === null || model === void 0 ? void 0 : model.fqName) || model.genMode === Modes.service) {
             return;
         }
-        this.serviceModels.add(model.fqName);
+        model.genMode = Modes.service;
         if (model) {
+            // respect base classes
             if (model.baseClasses.length) {
                 this.analyze(model.baseClasses[0]);
             }
+            // include subtypes since each base class can be cast to its subtypes
+            model.subtypes.forEach((subtype) => {
+                this.analyze(subtype);
+            });
             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);
@@ -309,19 +318,22 @@ export class Digester {
         // complex types
         const complexTypes = this.dataModel.getComplexTypes();
         complexTypes.forEach((ct) => {
+            // build up set of subtypes for each complex type
+            this.addSubtypes(ct);
+            // get props & keys from base types
             const [baseProps, _, baseAttributes] = this.collectBaseClassPropsAndKeys(ct, []);
             const { open } = baseAttributes;
             ct.baseProps = baseProps.map((bp) => (Object.assign({}, bp)));
             if (open) {
                 ct.open = true;
             }
-            if (!this.serviceModels.has(ct.fqName)) {
-                ct.genMode = Modes.qobjects;
-            }
         });
         // entity types
         const entityTypes = this.dataModel.getEntityTypes();
         entityTypes.forEach((et) => {
+            // build up set of subtypes for each entity type
+            this.addSubtypes(et);
+            // get props & keys from base types
             const [baseProps, baseKeys, baseAttributes] = this.collectBaseClassPropsAndKeys(et, []);
             const { fqIdName, idName, qIdName, open } = baseAttributes;
             et.baseProps = baseProps.map((bp) => (Object.assign({}, bp)));
@@ -336,9 +348,6 @@ export class Digester {
             if (open) {
                 et.open = open;
             }
-            if (!this.serviceModels.has(et.fqName)) {
-                et.genMode = Modes.qobjects;
-            }
             et.keyNames.unshift(...baseKeys.filter((bk) => !et.keyNames.includes(bk)));
         });
     }
@@ -400,6 +409,23 @@ export class Digester {
             return [props, keys, { fqIdName, idName, qIdName, open }];
         }, [[], [], { fqIdName: "", idName: "", qIdName: "", open: false }]);
     }
+    addSubtypes(model, grandChildren = new Set()) {
+        if (!model.baseClasses.length) {
+            return;
+        }
+        model.baseClasses.forEach((baseClass) => {
+            const baseType = this.dataModel.getModel(baseClass);
+            // add subtypes & base name for q-objects
+            baseType.subtypes.add(model.fqName);
+            if (!baseType.qBaseName) {
+                baseType.qBaseName = this.namingHelper.getQBaseName(baseType.name);
+            }
+            grandChildren.forEach((gc) => baseType.subtypes.add(gc));
+            // recursive
+            grandChildren.add(model.fqName);
+            this.addSubtypes(baseType, grandChildren);
+        });
+    }
 }
 Digester.EDM_PREFIX = "Edm.";
 //# sourceMappingURL=DataModelDigestion.js.map

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\nimport type { DigestionOptions } from \"../FactoryFunctionModel.js\";\r\nimport {\r\n  ComplexTypeGenerationOptions,\r\n  EntityTypeGenerationOptions,\r\n  Modes,\r\n  PropertyGenerationOptions,\r\n} from \"../OptionModel.js\";\r\nimport { DataModel, NamespaceWithAlias, withNamespace } from \"./DataModel.js\";\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.js\";\r\nimport { ComplexType, EntityType, EnumType, Property, Schema, TypeDefinition } from \"./edmx/ODataEdmxModelBase.js\";\r\nimport { EntityContainerV3, SchemaV3 } from \"./edmx/ODataEdmxModelV3.js\";\r\nimport { EntityContainerV4, SchemaV4 } from \"./edmx/ODataEdmxModelV4.js\";\r\nimport { NamingHelper } from \"./NamingHelper.js\";\r\nimport { ServiceConfigHelper, WithoutName } from \"./ServiceConfigHelper.js\";\r\nimport { NameClashValidator } from \"./validation/NameClashValidator.js\";\r\nimport { NameValidator } from \"./validation/NameValidator.js\";\r\nimport { NoopValidator } from \"./validation/NoopValidator.js\";\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 = 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      // mark each EntityType & ComplexType which is referencable from API\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) => ({ name: m.$.Name, value: m.$.Value })) : [],\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  /**\r\n   * Check\r\n   * @param fqModelName\r\n   * @private\r\n   */\r\n  private analyze(fqModelName: string) {\r\n    // to also resolve aliases the data model needs to be used\r\n    const model = this.dataModel.getEntityType(fqModelName) ?? this.dataModel.getComplexType(fqModelName);\r\n    if (!model?.fqName || this.serviceModels.has(model.fqName)) {\r\n      return;\r\n    }\r\n\r\n    this.serviceModels.add(model.fqName);\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: this.options.numericEnums ? \"QNumericEnumPath\" : \"QEnumPath\",\r\n          qObject: isCollection\r\n            ? this.options.numericEnums\r\n              ? \"QNumericEnumCollection\"\r\n              : \"QEnumCollection\"\r\n            : undefined,\r\n          qParam: this.options.numericEnums ? \"QNumericEnumParam\" : \"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"]}
+{"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\nimport type { DigestionOptions } from \"../FactoryFunctionModel.js\";\r\nimport {\r\n  ComplexTypeGenerationOptions,\r\n  EntityTypeGenerationOptions,\r\n  Modes,\r\n  PropertyGenerationOptions,\r\n} from \"../OptionModel.js\";\r\nimport { DataModel, NamespaceWithAlias, withNamespace } from \"./DataModel.js\";\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.js\";\r\nimport { ComplexType, EntityType, EnumType, Property, Schema, TypeDefinition } from \"./edmx/ODataEdmxModelBase.js\";\r\nimport { EntityContainerV3, SchemaV3 } from \"./edmx/ODataEdmxModelV3.js\";\r\nimport { EntityContainerV4, SchemaV4 } from \"./edmx/ODataEdmxModelV4.js\";\r\nimport { NamingHelper } from \"./NamingHelper.js\";\r\nimport { ServiceConfigHelper, WithoutName } from \"./ServiceConfigHelper.js\";\r\nimport { NameClashValidator } from \"./validation/NameClashValidator.js\";\r\nimport { NameValidator } from \"./validation/NameValidator.js\";\r\nimport { NoopValidator } from \"./validation/NoopValidator.js\";\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  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 = 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    this.schemas.forEach((schema) => {\r\n      this.analyzeModelUsage(schema.EntityContainer?.length ? schema.EntityContainer[0] : undefined);\r\n    });\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.qobjects,\r\n      subtypes: new Set(),\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) => ({ name: m.$.Name, value: m.$.Value })) : [],\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        subtypes: new Set(),\r\n      });\r\n    }\r\n  }\r\n\r\n  /**\r\n   * Check that models (ComplexType or EntityType) have been referenced in the API\r\n   * as entry point or via navProp or by virtue of being a base type or subtype of those.\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   *\r\n   * @param ec\r\n   * @private\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  /**\r\n   * Check usage of model types within API.\r\n   *\r\n   * @param fqModelName\r\n   * @private\r\n   */\r\n  private analyze(fqModelName: string) {\r\n    // to also resolve aliases the data model needs to be used\r\n    const model = this.dataModel.getEntityType(fqModelName) ?? this.dataModel.getComplexType(fqModelName);\r\n    if (!model?.fqName || model.genMode === Modes.service) {\r\n      return;\r\n    }\r\n\r\n    model.genMode = Modes.service;\r\n\r\n    if (model) {\r\n      // respect base classes\r\n      if (model.baseClasses.length) {\r\n        this.analyze(model.baseClasses[0]);\r\n      }\r\n      // include subtypes since each base class can be cast to its subtypes\r\n      model.subtypes.forEach((subtype) => {\r\n        this.analyze(subtype);\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      // build up set of subtypes for each complex type\r\n      this.addSubtypes(ct);\r\n\r\n      // get props & keys from base types\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      // build up set of subtypes for each entity type\r\n      this.addSubtypes(et);\r\n\r\n      // get props & keys from base types\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 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: this.options.numericEnums ? \"QNumericEnumPath\" : \"QEnumPath\",\r\n          qObject: isCollection\r\n            ? this.options.numericEnums\r\n              ? \"QNumericEnumCollection\"\r\n              : \"QEnumCollection\"\r\n            : undefined,\r\n          qParam: this.options.numericEnums ? \"QNumericEnumParam\" : \"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  private addSubtypes(model: ComplexModelType, grandChildren = new Set<string>()) {\r\n    if (!model.baseClasses.length) {\r\n      return;\r\n    }\r\n\r\n    model.baseClasses.forEach((baseClass) => {\r\n      const baseType = this.dataModel.getModel(baseClass) as ComplexModelType;\r\n\r\n      // add subtypes & base name for q-objects\r\n      baseType.subtypes.add(model.fqName);\r\n      if (!baseType.qBaseName) {\r\n        baseType.qBaseName = this.namingHelper.getQBaseName(baseType.name);\r\n      }\r\n      grandChildren.forEach((gc) => baseType.subtypes.add(gc));\r\n\r\n      // recursive\r\n      grandChildren.add(model.fqName);\r\n      this.addSubtypes(baseType, grandChildren);\r\n    });\r\n  }\r\n}\r\n"]}

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

@@ -50,6 +50,7 @@ export interface ComplexType {
     modelName: string;
     editableName: string;
     qName: string;
+    qBaseName?: string;
     serviceName: string;
     serviceCollectionName: string;
     folderPath: string;
@@ -60,6 +61,7 @@ export interface ComplexType {
     abstract: boolean;
     open: boolean;
     genMode: Modes;
+    subtypes: Set<string>;
 }
 export interface EnumType {
     dataType: DataTypes;

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

@@ -1 +1 @@
-{"version":3,"file":"DataTypeModel.js","sourceRoot":"","sources":["../../src/data-model/DataTypeModel.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,0BAAU,CAAA;IACV,0BAAU,CAAA;AACZ,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\nimport { Modes } from \"../OptionModel.js\";\r\n\r\nexport enum ODataVersion {\r\n  V2 = \"2.0\",\r\n  V4 = \"4.0\",\r\n}\r\n\r\nexport const enum DataTypes {\r\n  PrimitiveType = \"PrimitiveType\",\r\n  EnumType = \"EnumType\",\r\n  ComplexType = \"ComplexType\",\r\n  ModelType = \"ModelType\",\r\n}\r\n\r\nexport const enum OperationTypes {\r\n  Function = \"Function\",\r\n  Action = \"Action\",\r\n}\r\n\r\nexport interface PropertyModel {\r\n  odataName: string;\r\n  name: string;\r\n  odataType: string;\r\n  fqType: string;\r\n  type: string;\r\n  typeModule?: string;\r\n  qObject?: string;\r\n  qPath: string;\r\n  qParam?: string;\r\n  required: boolean;\r\n  isCollection: boolean;\r\n  dataType: DataTypes;\r\n  converters?: Array<ValueConverterImport>;\r\n  managed?: boolean;\r\n}\r\n\r\nexport type ModelType = EntityType | ComplexType | EnumType;\r\n\r\nexport interface EntityType extends ComplexType {\r\n  id: {\r\n    // fully qualified name of entity to which this id belongs (might have been inherited)\r\n    fqName: string;\r\n    // that's the name of the param model for the id function\r\n    modelName: string;\r\n    // that's the name of the id function which is a q-object\r\n    qName: string;\r\n  };\r\n  generateId: boolean;\r\n  keyNames: Array<string>;\r\n  keys: Array<PropertyModel>;\r\n  getKeyUnion(): string;\r\n}\r\n\r\nexport interface ComplexType {\r\n  dataType: DataTypes;\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  modelName: string;\r\n  editableName: string;\r\n  qName: string;\r\n  serviceName: string;\r\n  serviceCollectionName: string;\r\n  folderPath: string;\r\n  props: Array<PropertyModel>;\r\n  baseProps: Array<PropertyModel>;\r\n  baseClasses: Array<string>;\r\n  finalBaseClass: string | undefined;\r\n  abstract: boolean;\r\n  open: boolean;\r\n  genMode: Modes;\r\n}\r\n\r\nexport interface EnumType {\r\n  dataType: DataTypes;\r\n  odataName: string;\r\n  fqName: string;\r\n  name: string;\r\n  modelName: string;\r\n  folderPath: string;\r\n  members: Array<{ name: string; value: number }>;\r\n}\r\n\r\nexport interface OperationType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  qName: string;\r\n  paramsModelName: string;\r\n  type: OperationTypes;\r\n  parameters: Array<PropertyModel>;\r\n  returnType?: ReturnTypeModel;\r\n  usePost?: boolean;\r\n  overrides?: Array<Array<PropertyModel>>;\r\n}\r\n\r\nexport interface ReturnTypeModel extends PropertyModel {}\r\n\r\nexport type EntityContainerModel = {\r\n  entitySets: { [name: string]: EntitySetType };\r\n  singletons: { [name: string]: SingletonType };\r\n  functions: { [name: string]: FunctionImportType };\r\n  actions: { [name: string]: ActionImportType };\r\n};\r\n\r\nexport interface SingletonType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: EntityType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface EntitySetType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: EntityType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface NavPropBindingType {\r\n  path: string;\r\n  target: string;\r\n}\r\n\r\nexport interface ActionImportType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  operation: string;\r\n}\r\n\r\nexport interface FunctionImportType extends ActionImportType {\r\n  entitySet: string;\r\n}\r\n"]}
+{"version":3,"file":"DataTypeModel.js","sourceRoot":"","sources":["../../src/data-model/DataTypeModel.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,0BAAU,CAAA;IACV,0BAAU,CAAA;AACZ,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\nimport { Modes } from \"../OptionModel.js\";\r\n\r\nexport enum ODataVersion {\r\n  V2 = \"2.0\",\r\n  V4 = \"4.0\",\r\n}\r\n\r\nexport const enum DataTypes {\r\n  PrimitiveType = \"PrimitiveType\",\r\n  EnumType = \"EnumType\",\r\n  ComplexType = \"ComplexType\",\r\n  ModelType = \"ModelType\",\r\n}\r\n\r\nexport const enum OperationTypes {\r\n  Function = \"Function\",\r\n  Action = \"Action\",\r\n}\r\n\r\nexport interface PropertyModel {\r\n  odataName: string;\r\n  name: string;\r\n  odataType: string;\r\n  fqType: string;\r\n  type: string;\r\n  typeModule?: string;\r\n  qObject?: string;\r\n  qPath: string;\r\n  qParam?: string;\r\n  required: boolean;\r\n  isCollection: boolean;\r\n  dataType: DataTypes;\r\n  converters?: Array<ValueConverterImport>;\r\n  managed?: boolean;\r\n}\r\n\r\nexport type ModelType = EntityType | ComplexType | EnumType;\r\n\r\nexport interface EntityType extends ComplexType {\r\n  id: {\r\n    // fully qualified name of entity to which this id belongs (might have been inherited)\r\n    fqName: string;\r\n    // that's the name of the param model for the id function\r\n    modelName: string;\r\n    // that's the name of the id function which is a q-object\r\n    qName: string;\r\n  };\r\n  generateId: boolean;\r\n  keyNames: Array<string>;\r\n  keys: Array<PropertyModel>;\r\n  getKeyUnion(): string;\r\n}\r\n\r\nexport interface ComplexType {\r\n  dataType: DataTypes;\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  modelName: string;\r\n  editableName: string;\r\n  qName: string;\r\n  qBaseName?: string;\r\n  serviceName: string;\r\n  serviceCollectionName: string;\r\n  folderPath: string;\r\n  props: Array<PropertyModel>;\r\n  baseProps: Array<PropertyModel>;\r\n  baseClasses: Array<string>;\r\n  finalBaseClass: string | undefined;\r\n  abstract: boolean;\r\n  open: boolean;\r\n  genMode: Modes;\r\n  subtypes: Set<string>;\r\n}\r\n\r\nexport interface EnumType {\r\n  dataType: DataTypes;\r\n  odataName: string;\r\n  fqName: string;\r\n  name: string;\r\n  modelName: string;\r\n  folderPath: string;\r\n  members: Array<{ name: string; value: number }>;\r\n}\r\n\r\nexport interface OperationType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  qName: string;\r\n  paramsModelName: string;\r\n  type: OperationTypes;\r\n  parameters: Array<PropertyModel>;\r\n  returnType?: ReturnTypeModel;\r\n  usePost?: boolean;\r\n  overrides?: Array<Array<PropertyModel>>;\r\n}\r\n\r\nexport interface ReturnTypeModel extends PropertyModel {}\r\n\r\nexport type EntityContainerModel = {\r\n  entitySets: { [name: string]: EntitySetType };\r\n  singletons: { [name: string]: SingletonType };\r\n  functions: { [name: string]: FunctionImportType };\r\n  actions: { [name: string]: ActionImportType };\r\n};\r\n\r\nexport interface SingletonType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: EntityType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface EntitySetType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: EntityType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface NavPropBindingType {\r\n  path: string;\r\n  target: string;\r\n}\r\n\r\nexport interface ActionImportType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  operation: string;\r\n}\r\n\r\nexport interface FunctionImportType extends ActionImportType {\r\n  entitySet: string;\r\n}\r\n"]}

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

@@ -43,6 +43,7 @@ export declare class NamingHelper {
     getIdModelName(name: string): string;
     getOperationParamsModelName(operationName: string, boundEntity?: string): string;
     getQName(name: string): string;
+    getQBaseName(name: string): string;
     getQPropName(name: string): string;
     getQIdFunctionName(name: string): string;
     getQFunctionName(operationName: string, boundEntity?: string): string;

package/lib/data-model/NamingHelper.js

@@ -184,6 +184,12 @@ export class NamingHelper {
     getQName(name) {
         return this.getName(name, this.getQObjectNamingStrategy(), this.options.queryObjects);
     }
+    getQBaseName(name) {
+        const opts = this.options.queryObjects;
+        const strategy = this.getQObjectNamingStrategy();
+        const result = this.getName(name, strategy, opts.baseType);
+        return opts.baseType.applyQNaming ? this.getName(result, strategy, opts) : result;
+    }
     getQPropName(name) {
         return this.getName(name, this.getQObjectPropNamingStrategy());
     }