@odata2ts/odata2ts 0.21.0 → 0.22.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.21.0...@odata2ts/odata2ts@0.22.0) (2023-04-27)
+
+### Code Refactoring
+
+* **odata2ts:** dispense with resolver & directly implement related services as getter ([9b49501](https://github.com/odata2ts/odata2ts/commit/9b49501e279b6c5869cbc5ac2fd246577780b81f))
+
+### BREAKING CHANGES
+
+* **odata2ts:** Changed defaults for properties representing related services: no prefix anymore, just the name of the property as function (previously, prefix `navTo`).
+Removed `get` method of EntitySetServices: use property directly instead.
+Removed the following naming options regarding generated services: `serviceResolverFunction`, `publicProps`
+
 # [0.21.0](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.20.3...@odata2ts/odata2ts@0.21.0) (2023-04-20)
 
 ### Features

package/lib/NamingModel.d.ts

@@ -160,16 +160,9 @@ export interface ServiceNamingOptions extends NamingStrategyOption, RequiredNami
         applyServiceNaming?: boolean;
     };
     /**
-     * Naming for factory function for EntityServiceResolvers.
+     * Naming for getter method of another service.
      *
-     * By default, prefix = create, suffix = ServiceResolver
-     * @example createTestEntityServiceResolver
-     */
-    serviceResolverFunction: NamingStrategyOption & RequiredNamingOptions;
-    /**
-     * Naming for getter method. Another related service is returned.
-     *
-     * By default, prefix = "navTo" and namingStrategy = camelCase
+     * By default, namingStrategy = camelCase
      */
     relatedServiceGetter: NamingStrategyOption & RequiredNamingOptions;
     /**
@@ -182,10 +175,8 @@ export interface ServiceNamingOptions extends NamingStrategyOption, RequiredNami
     operations?: NamingStrategyOption & OperationNamingOptions;
     /**
      * Naming options for private properties of service classes.
+     *
+     * By default, prefix = _
      */
     privateProps: NamingStrategyOption & RequiredNamingOptions;
-    /**
-     * Naming options for public properties of service classes.
-     */
-    publicProps?: NamingStrategyOption;
 }

package/lib/NamingModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"NamingModel.js","sourceRoot":"","sources":["../src/NamingModel.ts"],"names":[],"mappings":";;;AAKA,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,6BAAS,CAAA;IACT,8CAA0B,CAAA;IAC1B,4CAAwB,CAAA;IACxB,kDAA8B,CAAA;IAC9B,4CAAwB,CAAA;AAC1B,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,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 factory function for EntityServiceResolvers.\r\n   *\r\n   * By default, prefix = create, suffix = ServiceResolver\r\n   * @example createTestEntityServiceResolver\r\n   */\r\n  serviceResolverFunction: NamingStrategyOption & RequiredNamingOptions;\r\n\r\n  /**\r\n   * Naming for getter method. Another related service is returned.\r\n   *\r\n   * By default, prefix = \"navTo\" and 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  privateProps: NamingStrategyOption & RequiredNamingOptions;\r\n\r\n  /**\r\n   * Naming options for public properties of service classes.\r\n   */\r\n  publicProps?: NamingStrategyOption;\r\n}\r\n"]}
+{"version":3,"file":"NamingModel.js","sourceRoot":"","sources":["../src/NamingModel.ts"],"names":[],"mappings":";;;AAKA,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,6BAAS,CAAA;IACT,8CAA0B,CAAA;IAC1B,4CAAwB,CAAA;IACxB,kDAA8B,CAAA;IAC9B,4CAAwB,CAAA;AAC1B,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,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"]}

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

@@ -48,10 +48,8 @@ export declare class NamingHelper {
     getMainServiceName(): string;
     getServiceName: (name: string) => string;
     getCollectionServiceName: (name: string) => string;
-    getServiceResolverName: (name: string) => string;
     getFunctionName(name: string): string;
     getActionName(name: string): string;
     getRelatedServiceGetter(name: string): string;
-    getPublicPropNameForService(name: string): string;
     getPrivatePropName: (name: string) => string;
 }

package/lib/data-model/NamingHelper.js

@@ -37,11 +37,6 @@ class NamingHelper {
             const result = this.getName(name, strategy, opts === null || opts === void 0 ? void 0 : opts.collection);
             return ((_a = opts === null || opts === void 0 ? void 0 : opts.collection) === null || _a === void 0 ? void 0 : _a.applyServiceNaming) ? this.getName(result, strategy, opts) : result;
         };
-        this.getServiceResolverName = (name) => {
-            var _a;
-            const opts = (_a = this.options.services) === null || _a === void 0 ? void 0 : _a.serviceResolverFunction;
-            return this.getName(name, this.namingFunction(opts === null || opts === void 0 ? void 0 : opts.namingStrategy), opts);
-        };
         this.getPrivatePropName = (name) => {
             var _a;
             const opts = (_a = this.options.services) === null || _a === void 0 ? void 0 : _a.privateProps;
@@ -215,11 +210,6 @@ class NamingHelper {
         const opts = (_a = this.options.services) === null || _a === void 0 ? void 0 : _a.relatedServiceGetter;
         return this.getName(name, this.namingFunction(opts === null || opts === void 0 ? void 0 : opts.namingStrategy), opts);
     }
-    getPublicPropNameForService(name) {
-        var _a;
-        const opts = (_a = this.options.services) === null || _a === void 0 ? void 0 : _a.publicProps;
-        return this.getName(name, this.namingFunction(opts === null || opts === void 0 ? void 0 : opts.namingStrategy));
-    }
 }
 exports.NamingHelper = NamingHelper;
 //# sourceMappingURL=NamingHelper.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"NamingHelper.js","sourceRoot":"","sources":["../../src/data-model/NamingHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import { camelCase } from \"camel-case\";\r\nimport { constantCase } from \"constant-case\";\r\nimport { pascalCase } from \"pascal-case\";\r\nimport { snakeCase } from \"snake-case\";\r\n\r\nimport { FileNamingStrategyOption, NameSettings, NamingStrategies, StandardNamingOptions } from \"../NamingModel\";\r\nimport { RunOptions } from \"../OptionModel\";\r\n\r\nfunction getNamingStrategyImpl(strategy: NamingStrategies | undefined) {\r\n  switch (strategy) {\r\n    case NamingStrategies.CAMEL_CASE:\r\n      return camelCase;\r\n    case NamingStrategies.PASCAL_CASE:\r\n      return pascalCase;\r\n    case NamingStrategies.CONSTANT_CASE:\r\n      return constantCase;\r\n    case NamingStrategies.SNAKE_CASE:\r\n      return snakeCase;\r\n    default:\r\n      return undefined;\r\n  }\r\n}\r\n\r\nconst noopNamingFunction = (value: string, options?: StandardNamingOptions) => {\r\n  return (options?.prefix || \"\") + value + (options?.suffix || \"\");\r\n};\r\n\r\nexport interface NamingHelperSettings extends Pick<RunOptions, \"allowRenaming\" | \"naming\"> {}\r\n\r\nexport class NamingHelper {\r\n  private readonly allowModelPropRenaming: boolean;\r\n  private readonly serviceName: string;\r\n  private readonly servicePrefix: string;\r\n  private readonly options: NameSettings;\r\n\r\n  constructor(options: NamingHelperSettings, serviceName: string, overridingServiceName?: string) {\r\n    if (!options) {\r\n      throw new Error(\"NamingHelper: Options must be supplied!\");\r\n    }\r\n    if (!serviceName?.trim()) {\r\n      throw new Error(\"NamingHelper: ServicePrefix must be supplied!\");\r\n    }\r\n\r\n    this.allowModelPropRenaming = options.allowRenaming ?? false;\r\n    this.options = options.naming || {};\r\n    this.servicePrefix = serviceName + \".\";\r\n    this.serviceName = overridingServiceName || serviceName;\r\n  }\r\n\r\n  /**\r\n   * The prefix used to reference model or enum types in this schema.\r\n   *\r\n   * @returns service prefix\r\n   */\r\n  public getServicePrefix() {\r\n    return this.servicePrefix;\r\n  }\r\n\r\n  /**\r\n   * The OData service name as it was found and is used in metadata file.\r\n   *\r\n   * @returns\r\n   */\r\n  public getODataServiceName() {\r\n    return this.serviceName;\r\n  }\r\n\r\n  public getFileNames() {\r\n    return {\r\n      model: this.getFileName(this.options.models?.fileName),\r\n      qObject: this.getFileName(this.options.queryObjects?.fileName),\r\n      service: this.getMainServiceName(),\r\n    };\r\n  }\r\n\r\n  private getFileName(opts?: FileNamingStrategyOption & StandardNamingOptions) {\r\n    return this.getName(this.serviceName, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public getFileNameService(name: string) {\r\n    const opts = this.options.services;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public stripServicePrefix(token: string) {\r\n    return token.replace(this.servicePrefix, \"\");\r\n  }\r\n\r\n  private namingFunction(strategy: NamingStrategies | undefined) {\r\n    const strategyFn = getNamingStrategyImpl(strategy);\r\n    if (!strategyFn || !this.allowModelPropRenaming) {\r\n      return noopNamingFunction;\r\n    }\r\n\r\n    return (value: string, options?: StandardNamingOptions) => {\r\n      const prefix = options?.prefix;\r\n      const suffix = options?.suffix;\r\n      const isPrefixSpecialChar = prefix?.startsWith(\"_\");\r\n      const isSuffixSpecialChar = suffix?.endsWith(\"_\");\r\n\r\n      let result = strategyFn((prefix ? prefix + \"_\" : \"\") + value + (suffix ? \"_\" + suffix : \"\"));\r\n      if (isPrefixSpecialChar) {\r\n        result = \"_\" + result;\r\n      }\r\n      if (isSuffixSpecialChar) {\r\n        result = result + \"_\";\r\n      }\r\n      return result;\r\n    };\r\n  }\r\n\r\n  private getName(\r\n    name: string,\r\n    strategy: (value: string, options?: StandardNamingOptions) => string,\r\n    options?: StandardNamingOptions\r\n  ) {\r\n    return strategy(this.stripServicePrefix(name), options);\r\n  }\r\n\r\n  private getModelNamingStrategy() {\r\n    return this.namingFunction(this.options.models?.namingStrategy);\r\n  }\r\n\r\n  private getModelPropNamingStrategy() {\r\n    return this.namingFunction(this.options.models?.propNamingStrategy);\r\n  }\r\n\r\n  private getQObjectNamingStrategy() {\r\n    return this.namingFunction(this.options.queryObjects?.namingStrategy);\r\n  }\r\n\r\n  private getQObjectPropNamingStrategy() {\r\n    return this.namingFunction(this.options.queryObjects?.propNamingStrategy);\r\n  }\r\n\r\n  private getOperationNamingStrategy() {\r\n    return this.namingFunction(this.options.services?.operations?.namingStrategy);\r\n  }\r\n\r\n  public getModelName(name: string): string {\r\n    return this.getName(name, this.getModelNamingStrategy(), this.options.models);\r\n  }\r\n\r\n  public getModelPropName(name: string): string {\r\n    return this.getName(name, this.getModelPropNamingStrategy());\r\n  }\r\n\r\n  public getEnumName(name: string) {\r\n    return this.getName(name, this.getModelNamingStrategy(), this.options.models);\r\n  }\r\n\r\n  public getEditableModelName(name: string) {\r\n    let options = this.options.models?.editableModels;\r\n    const result = this.getName(name, this.getModelNamingStrategy(), options);\r\n    return options?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n  }\r\n\r\n  public getIdModelName(name: string) {\r\n    let options = this.options.models?.idModels;\r\n    const result = this.getName(name, this.getModelNamingStrategy(), options);\r\n    return options?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n  }\r\n\r\n  public getOperationParamsModelName(name: string) {\r\n    const settings = this.options.models?.operationParamModels;\r\n    const result = this.getName(name, this.getModelNamingStrategy(), settings);\r\n    return settings?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n  }\r\n\r\n  public getQName(name: string) {\r\n    return this.getName(name, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getQPropName(name: string): string {\r\n    return this.getName(name, this.getQObjectPropNamingStrategy());\r\n  }\r\n\r\n  public getQIdFunctionName(name: string) {\r\n    const opts = this.options.queryObjects?.idFunctions;\r\n    const result = this.getName(name, this.getQObjectNamingStrategy(), opts);\r\n    return this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getQFunctionName(name: string) {\r\n    const opts = this.options.queryObjects?.operations;\r\n    const result = this.getName(name, this.getQObjectNamingStrategy(), opts?.function || opts);\r\n    return this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getQActionName(name: string) {\r\n    const opts = this.options.queryObjects?.operations;\r\n    const result = this.getName(name, this.getQObjectNamingStrategy(), opts?.action || opts);\r\n    return this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getMainServiceName() {\r\n    const name = this.getODataServiceName();\r\n    const opts = this.options.services;\r\n    const strategy = this.namingFunction(\r\n      opts?.main?.namingStrategy ?? (opts?.main?.applyServiceNaming ? opts.namingStrategy : undefined)\r\n    );\r\n    const result = this.getName(name, strategy, opts?.main);\r\n    return opts?.main?.applyServiceNaming ? this.getName(result, strategy, opts) : result;\r\n  }\r\n\r\n  public getServiceName = (name: string) => {\r\n    const opts = this.options.services;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  };\r\n\r\n  public getCollectionServiceName = (name: string) => {\r\n    const opts = this.options.services;\r\n    const strategy = this.namingFunction(opts?.namingStrategy);\r\n    const result = this.getName(name, strategy, opts?.collection);\r\n    return opts?.collection?.applyServiceNaming ? this.getName(result, strategy, opts) : result;\r\n  };\r\n\r\n  public getServiceResolverName = (name: string) => {\r\n    const opts = this.options.services?.serviceResolverFunction;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  };\r\n\r\n  public getFunctionName(name: string) {\r\n    const opts = this.options.services?.operations;\r\n    return this.getName(name, this.getOperationNamingStrategy(), opts?.function || opts);\r\n  }\r\n\r\n  public getActionName(name: string) {\r\n    const opts = this.options.services?.operations;\r\n    return this.getName(name, this.getOperationNamingStrategy(), opts?.action || opts);\r\n  }\r\n\r\n  public getRelatedServiceGetter(name: string) {\r\n    const opts = this.options.services?.relatedServiceGetter;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public getPublicPropNameForService(name: string) {\r\n    const opts = this.options.services?.publicProps;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy));\r\n  }\r\n\r\n  public getPrivatePropName = (name: string) => {\r\n    const opts = this.options.services?.privateProps;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  };\r\n}\r\n"]}
+{"version":3,"file":"NamingHelper.js","sourceRoot":"","sources":["../../src/data-model/NamingHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import { camelCase } from \"camel-case\";\r\nimport { constantCase } from \"constant-case\";\r\nimport { pascalCase } from \"pascal-case\";\r\nimport { snakeCase } from \"snake-case\";\r\n\r\nimport { FileNamingStrategyOption, NameSettings, NamingStrategies, StandardNamingOptions } from \"../NamingModel\";\r\nimport { RunOptions } from \"../OptionModel\";\r\n\r\nfunction getNamingStrategyImpl(strategy: NamingStrategies | undefined) {\r\n  switch (strategy) {\r\n    case NamingStrategies.CAMEL_CASE:\r\n      return camelCase;\r\n    case NamingStrategies.PASCAL_CASE:\r\n      return pascalCase;\r\n    case NamingStrategies.CONSTANT_CASE:\r\n      return constantCase;\r\n    case NamingStrategies.SNAKE_CASE:\r\n      return snakeCase;\r\n    default:\r\n      return undefined;\r\n  }\r\n}\r\n\r\nconst noopNamingFunction = (value: string, options?: StandardNamingOptions) => {\r\n  return (options?.prefix || \"\") + value + (options?.suffix || \"\");\r\n};\r\n\r\nexport interface NamingHelperSettings extends Pick<RunOptions, \"allowRenaming\" | \"naming\"> {}\r\n\r\nexport class NamingHelper {\r\n  private readonly allowModelPropRenaming: boolean;\r\n  private readonly serviceName: string;\r\n  private readonly servicePrefix: string;\r\n  private readonly options: NameSettings;\r\n\r\n  constructor(options: NamingHelperSettings, serviceName: string, overridingServiceName?: string) {\r\n    if (!options) {\r\n      throw new Error(\"NamingHelper: Options must be supplied!\");\r\n    }\r\n    if (!serviceName?.trim()) {\r\n      throw new Error(\"NamingHelper: ServicePrefix must be supplied!\");\r\n    }\r\n\r\n    this.allowModelPropRenaming = options.allowRenaming ?? false;\r\n    this.options = options.naming || {};\r\n    this.servicePrefix = serviceName + \".\";\r\n    this.serviceName = overridingServiceName || serviceName;\r\n  }\r\n\r\n  /**\r\n   * The prefix used to reference model or enum types in this schema.\r\n   *\r\n   * @returns service prefix\r\n   */\r\n  public getServicePrefix() {\r\n    return this.servicePrefix;\r\n  }\r\n\r\n  /**\r\n   * The OData service name as it was found and is used in metadata file.\r\n   *\r\n   * @returns\r\n   */\r\n  public getODataServiceName() {\r\n    return this.serviceName;\r\n  }\r\n\r\n  public getFileNames() {\r\n    return {\r\n      model: this.getFileName(this.options.models?.fileName),\r\n      qObject: this.getFileName(this.options.queryObjects?.fileName),\r\n      service: this.getMainServiceName(),\r\n    };\r\n  }\r\n\r\n  private getFileName(opts?: FileNamingStrategyOption & StandardNamingOptions) {\r\n    return this.getName(this.serviceName, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public getFileNameService(name: string) {\r\n    const opts = this.options.services;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public stripServicePrefix(token: string) {\r\n    return token.replace(this.servicePrefix, \"\");\r\n  }\r\n\r\n  private namingFunction(strategy: NamingStrategies | undefined) {\r\n    const strategyFn = getNamingStrategyImpl(strategy);\r\n    if (!strategyFn || !this.allowModelPropRenaming) {\r\n      return noopNamingFunction;\r\n    }\r\n\r\n    return (value: string, options?: StandardNamingOptions) => {\r\n      const prefix = options?.prefix;\r\n      const suffix = options?.suffix;\r\n      const isPrefixSpecialChar = prefix?.startsWith(\"_\");\r\n      const isSuffixSpecialChar = suffix?.endsWith(\"_\");\r\n\r\n      let result = strategyFn((prefix ? prefix + \"_\" : \"\") + value + (suffix ? \"_\" + suffix : \"\"));\r\n      if (isPrefixSpecialChar) {\r\n        result = \"_\" + result;\r\n      }\r\n      if (isSuffixSpecialChar) {\r\n        result = result + \"_\";\r\n      }\r\n      return result;\r\n    };\r\n  }\r\n\r\n  private getName(\r\n    name: string,\r\n    strategy: (value: string, options?: StandardNamingOptions) => string,\r\n    options?: StandardNamingOptions\r\n  ) {\r\n    return strategy(this.stripServicePrefix(name), options);\r\n  }\r\n\r\n  private getModelNamingStrategy() {\r\n    return this.namingFunction(this.options.models?.namingStrategy);\r\n  }\r\n\r\n  private getModelPropNamingStrategy() {\r\n    return this.namingFunction(this.options.models?.propNamingStrategy);\r\n  }\r\n\r\n  private getQObjectNamingStrategy() {\r\n    return this.namingFunction(this.options.queryObjects?.namingStrategy);\r\n  }\r\n\r\n  private getQObjectPropNamingStrategy() {\r\n    return this.namingFunction(this.options.queryObjects?.propNamingStrategy);\r\n  }\r\n\r\n  private getOperationNamingStrategy() {\r\n    return this.namingFunction(this.options.services?.operations?.namingStrategy);\r\n  }\r\n\r\n  public getModelName(name: string): string {\r\n    return this.getName(name, this.getModelNamingStrategy(), this.options.models);\r\n  }\r\n\r\n  public getModelPropName(name: string): string {\r\n    return this.getName(name, this.getModelPropNamingStrategy());\r\n  }\r\n\r\n  public getEnumName(name: string) {\r\n    return this.getName(name, this.getModelNamingStrategy(), this.options.models);\r\n  }\r\n\r\n  public getEditableModelName(name: string) {\r\n    let options = this.options.models?.editableModels;\r\n    const result = this.getName(name, this.getModelNamingStrategy(), options);\r\n    return options?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n  }\r\n\r\n  public getIdModelName(name: string) {\r\n    let options = this.options.models?.idModels;\r\n    const result = this.getName(name, this.getModelNamingStrategy(), options);\r\n    return options?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n  }\r\n\r\n  public getOperationParamsModelName(name: string) {\r\n    const settings = this.options.models?.operationParamModels;\r\n    const result = this.getName(name, this.getModelNamingStrategy(), settings);\r\n    return settings?.applyModelNaming\r\n      ? this.getName(result, this.getModelNamingStrategy(), this.options.models)\r\n      : result;\r\n  }\r\n\r\n  public getQName(name: string) {\r\n    return this.getName(name, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getQPropName(name: string): string {\r\n    return this.getName(name, this.getQObjectPropNamingStrategy());\r\n  }\r\n\r\n  public getQIdFunctionName(name: string) {\r\n    const opts = this.options.queryObjects?.idFunctions;\r\n    const result = this.getName(name, this.getQObjectNamingStrategy(), opts);\r\n    return this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getQFunctionName(name: string) {\r\n    const opts = this.options.queryObjects?.operations;\r\n    const result = this.getName(name, this.getQObjectNamingStrategy(), opts?.function || opts);\r\n    return this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getQActionName(name: string) {\r\n    const opts = this.options.queryObjects?.operations;\r\n    const result = this.getName(name, this.getQObjectNamingStrategy(), opts?.action || opts);\r\n    return this.getName(result, this.getQObjectNamingStrategy(), this.options.queryObjects);\r\n  }\r\n\r\n  public getMainServiceName() {\r\n    const name = this.getODataServiceName();\r\n    const opts = this.options.services;\r\n    const strategy = this.namingFunction(\r\n      opts?.main?.namingStrategy ?? (opts?.main?.applyServiceNaming ? opts.namingStrategy : undefined)\r\n    );\r\n    const result = this.getName(name, strategy, opts?.main);\r\n    return opts?.main?.applyServiceNaming ? this.getName(result, strategy, opts) : result;\r\n  }\r\n\r\n  public getServiceName = (name: string) => {\r\n    const opts = this.options.services;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  };\r\n\r\n  public getCollectionServiceName = (name: string) => {\r\n    const opts = this.options.services;\r\n    const strategy = this.namingFunction(opts?.namingStrategy);\r\n    const result = this.getName(name, strategy, opts?.collection);\r\n    return opts?.collection?.applyServiceNaming ? this.getName(result, strategy, opts) : result;\r\n  };\r\n\r\n  public getFunctionName(name: string) {\r\n    const opts = this.options.services?.operations;\r\n    return this.getName(name, this.getOperationNamingStrategy(), opts?.function || opts);\r\n  }\r\n\r\n  public getActionName(name: string) {\r\n    const opts = this.options.services?.operations;\r\n    return this.getName(name, this.getOperationNamingStrategy(), opts?.action || opts);\r\n  }\r\n\r\n  public getRelatedServiceGetter(name: string) {\r\n    const opts = this.options.services?.relatedServiceGetter;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  }\r\n\r\n  public getPrivatePropName = (name: string) => {\r\n    const opts = this.options.services?.privateProps;\r\n    return this.getName(name, this.namingFunction(opts?.namingStrategy), opts);\r\n  };\r\n}\r\n"]}

package/lib/defaultConfig.js

@@ -73,17 +73,12 @@ const defaultConfig = {
                 suffix: "Collection",
                 applyServiceNaming: true,
             },
-            serviceResolverFunction: {
-                namingStrategy: NamingModel_1.NamingStrategies.CAMEL_CASE,
-                prefix: "create",
-                suffix: "serviceResolver",
-            },
             operations: {
                 namingStrategy: NamingModel_1.NamingStrategies.CAMEL_CASE,
             },
             relatedServiceGetter: {
                 namingStrategy: NamingModel_1.NamingStrategies.CAMEL_CASE,
-                prefix: "navTo",
+                prefix: "",
                 suffix: "",
             },
             privateProps: {
@@ -91,9 +86,6 @@ const defaultConfig = {
                 prefix: "_",
                 suffix: "",
             },
-            publicProps: {
-                namingStrategy: NamingModel_1.NamingStrategies.PASCAL_CASE,
-            },
         },
     },
     propertiesByName: [],
@@ -153,10 +145,6 @@ const minimalNamingConfig = {
             prefix: services.relatedServiceGetter.prefix,
             suffix: services.relatedServiceGetter.suffix,
         },
-        serviceResolverFunction: {
-            prefix: services.serviceResolverFunction.prefix,
-            suffix: services.serviceResolverFunction.suffix,
-        },
     },
 };
 /**

package/lib/defaultConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../src/defaultConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import deepmerge from \"deepmerge\";\r\n\r\nimport { NameSettings, NamingStrategies } from \"./NamingModel\";\r\nimport { EmitModes, Modes, RunOptions } from \"./OptionModel\";\r\n\r\n/**\r\n * The default configuration.\r\n */\r\nconst defaultConfig: Omit<RunOptions, \"source\" | \"output\"> = {\r\n  mode: Modes.all,\r\n  emitMode: EmitModes.js_dts,\r\n  debug: false,\r\n  prettier: false,\r\n  tsconfig: \"tsconfig.json\",\r\n  converters: [],\r\n  skipEditableModels: false,\r\n  skipIdModels: false,\r\n  skipOperations: false,\r\n  disableAutoManagedKey: false,\r\n  allowRenaming: false,\r\n  v2ModelsWithExtraResultsWrapping: false,\r\n  naming: {\r\n    models: {\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\r\n      editableModels: {\r\n        prefix: \"Editable\",\r\n        suffix: \"\",\r\n        applyModelNaming: true,\r\n      },\r\n      idModels: {\r\n        prefix: \"\",\r\n        suffix: \"Id\",\r\n        applyModelNaming: true,\r\n      },\r\n      operationParamModels: {\r\n        prefix: \"\",\r\n        suffix: \"Params\",\r\n        applyModelNaming: true,\r\n      },\r\n      fileName: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n        prefix: \"\",\r\n        suffix: \"Model\",\r\n      },\r\n    },\r\n    queryObjects: {\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\r\n      prefix: \"Q\",\r\n      suffix: \"\",\r\n      idFunctions: {\r\n        prefix: \"\",\r\n        suffix: \"Id\",\r\n      },\r\n      fileName: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n        prefix: \"Q\",\r\n        suffix: \"\",\r\n      },\r\n    },\r\n    services: {\r\n      prefix: \"\",\r\n      suffix: \"Service\",\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      main: {\r\n        applyServiceNaming: true,\r\n      },\r\n      collection: {\r\n        prefix: \"\",\r\n        suffix: \"Collection\",\r\n        applyServiceNaming: true,\r\n      },\r\n      serviceResolverFunction: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"create\",\r\n        suffix: \"serviceResolver\",\r\n      },\r\n      operations: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n      },\r\n      relatedServiceGetter: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"navTo\",\r\n        suffix: \"\",\r\n      },\r\n      privateProps: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"_\",\r\n        suffix: \"\",\r\n      },\r\n      publicProps: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      },\r\n    },\r\n  },\r\n  propertiesByName: [],\r\n  entitiesByName: [],\r\n};\r\n\r\nconst { models, queryObjects, services } = defaultConfig.naming;\r\nconst minimalNamingConfig: NameSettings = {\r\n  models: {\r\n    fileName: {\r\n      prefix: models.fileName.prefix,\r\n      suffix: models.fileName.suffix,\r\n    },\r\n    idModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.idModels.prefix,\r\n      suffix: models.idModels.suffix,\r\n    },\r\n    editableModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.editableModels.prefix,\r\n      suffix: models.editableModels.suffix,\r\n    },\r\n    operationParamModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.operationParamModels.prefix,\r\n      suffix: models.operationParamModels.suffix,\r\n    },\r\n  },\r\n  queryObjects: {\r\n    prefix: queryObjects.prefix,\r\n    suffix: queryObjects.suffix,\r\n    fileName: {\r\n      prefix: queryObjects.fileName.prefix,\r\n      suffix: queryObjects.fileName.suffix,\r\n    },\r\n    idFunctions: {\r\n      prefix: queryObjects.idFunctions.prefix,\r\n      suffix: queryObjects.idFunctions.suffix,\r\n    },\r\n  },\r\n  services: {\r\n    prefix: services.prefix,\r\n    suffix: services.suffix,\r\n    main: {\r\n      applyServiceNaming: true,\r\n    },\r\n    collection: {\r\n      applyServiceNaming: true,\r\n      prefix: services.collection.prefix,\r\n      suffix: services.collection.suffix,\r\n    },\r\n    privateProps: {\r\n      prefix: services.privateProps.prefix,\r\n      suffix: services.privateProps.suffix,\r\n    },\r\n    relatedServiceGetter: {\r\n      prefix: services.relatedServiceGetter.prefix,\r\n      suffix: services.relatedServiceGetter.suffix,\r\n    },\r\n    serviceResolverFunction: {\r\n      prefix: services.serviceResolverFunction.prefix,\r\n      suffix: services.serviceResolverFunction.suffix,\r\n    },\r\n  },\r\n};\r\n\r\n/**\r\n * Creates a defensive copy of the default config.\r\n */\r\nexport function getDefaultConfig(): Omit<RunOptions, \"source\" | \"output\"> {\r\n  return deepmerge(defaultConfig, {});\r\n}\r\n\r\n/**\r\n * Creates a defensive copy of the minimal config: minimal in respect to naming.\r\n */\r\nexport function getMinimalConfig(): Omit<RunOptions, \"source\" | \"output\"> {\r\n  const { naming, ...passThrough } = defaultConfig;\r\n  return deepmerge(passThrough, { naming: minimalNamingConfig });\r\n}\r\n"]}
+{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../src/defaultConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import deepmerge from \"deepmerge\";\r\n\r\nimport { NameSettings, NamingStrategies } from \"./NamingModel\";\r\nimport { EmitModes, Modes, RunOptions } from \"./OptionModel\";\r\n\r\n/**\r\n * The default configuration.\r\n */\r\nconst defaultConfig: Omit<RunOptions, \"source\" | \"output\"> = {\r\n  mode: Modes.all,\r\n  emitMode: EmitModes.js_dts,\r\n  debug: false,\r\n  prettier: false,\r\n  tsconfig: \"tsconfig.json\",\r\n  converters: [],\r\n  skipEditableModels: false,\r\n  skipIdModels: false,\r\n  skipOperations: false,\r\n  disableAutoManagedKey: false,\r\n  allowRenaming: false,\r\n  v2ModelsWithExtraResultsWrapping: false,\r\n  naming: {\r\n    models: {\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\r\n      editableModels: {\r\n        prefix: \"Editable\",\r\n        suffix: \"\",\r\n        applyModelNaming: true,\r\n      },\r\n      idModels: {\r\n        prefix: \"\",\r\n        suffix: \"Id\",\r\n        applyModelNaming: true,\r\n      },\r\n      operationParamModels: {\r\n        prefix: \"\",\r\n        suffix: \"Params\",\r\n        applyModelNaming: true,\r\n      },\r\n      fileName: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n        prefix: \"\",\r\n        suffix: \"Model\",\r\n      },\r\n    },\r\n    queryObjects: {\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\r\n      prefix: \"Q\",\r\n      suffix: \"\",\r\n      idFunctions: {\r\n        prefix: \"\",\r\n        suffix: \"Id\",\r\n      },\r\n      fileName: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n        prefix: \"Q\",\r\n        suffix: \"\",\r\n      },\r\n    },\r\n    services: {\r\n      prefix: \"\",\r\n      suffix: \"Service\",\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      main: {\r\n        applyServiceNaming: true,\r\n      },\r\n      collection: {\r\n        prefix: \"\",\r\n        suffix: \"Collection\",\r\n        applyServiceNaming: true,\r\n      },\r\n      operations: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n      },\r\n      relatedServiceGetter: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"\",\r\n        suffix: \"\",\r\n      },\r\n      privateProps: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"_\",\r\n        suffix: \"\",\r\n      },\r\n    },\r\n  },\r\n  propertiesByName: [],\r\n  entitiesByName: [],\r\n};\r\n\r\nconst { models, queryObjects, services } = defaultConfig.naming;\r\nconst minimalNamingConfig: NameSettings = {\r\n  models: {\r\n    fileName: {\r\n      prefix: models.fileName.prefix,\r\n      suffix: models.fileName.suffix,\r\n    },\r\n    idModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.idModels.prefix,\r\n      suffix: models.idModels.suffix,\r\n    },\r\n    editableModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.editableModels.prefix,\r\n      suffix: models.editableModels.suffix,\r\n    },\r\n    operationParamModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.operationParamModels.prefix,\r\n      suffix: models.operationParamModels.suffix,\r\n    },\r\n  },\r\n  queryObjects: {\r\n    prefix: queryObjects.prefix,\r\n    suffix: queryObjects.suffix,\r\n    fileName: {\r\n      prefix: queryObjects.fileName.prefix,\r\n      suffix: queryObjects.fileName.suffix,\r\n    },\r\n    idFunctions: {\r\n      prefix: queryObjects.idFunctions.prefix,\r\n      suffix: queryObjects.idFunctions.suffix,\r\n    },\r\n  },\r\n  services: {\r\n    prefix: services.prefix,\r\n    suffix: services.suffix,\r\n    main: {\r\n      applyServiceNaming: true,\r\n    },\r\n    collection: {\r\n      applyServiceNaming: true,\r\n      prefix: services.collection.prefix,\r\n      suffix: services.collection.suffix,\r\n    },\r\n    privateProps: {\r\n      prefix: services.privateProps.prefix,\r\n      suffix: services.privateProps.suffix,\r\n    },\r\n    relatedServiceGetter: {\r\n      prefix: services.relatedServiceGetter.prefix,\r\n      suffix: services.relatedServiceGetter.suffix,\r\n    },\r\n  },\r\n};\r\n\r\n/**\r\n * Creates a defensive copy of the default config.\r\n */\r\nexport function getDefaultConfig(): Omit<RunOptions, \"source\" | \"output\"> {\r\n  return deepmerge(defaultConfig, {});\r\n}\r\n\r\n/**\r\n * Creates a defensive copy of the minimal config: minimal in respect to naming.\r\n */\r\nexport function getMinimalConfig(): Omit<RunOptions, \"source\" | \"output\"> {\r\n  const { naming, ...passThrough } = defaultConfig;\r\n  return deepmerge(passThrough, { naming: minimalNamingConfig });\r\n}\r\n"]}

package/lib/generator/ServiceGenerator.d.ts

@@ -1,5 +1,8 @@
 import { ODataVersions } from "@odata2ts/odata-core";
+import { ClassDeclarationStructure } from "ts-morph";
 import { DataModel } from "../data-model/DataModel";
 import { NamingHelper } from "../data-model/NamingHelper";
 import { ProjectManager } from "../project/ProjectManager";
+export interface PropsAndOps extends Required<Pick<ClassDeclarationStructure, "properties" | "methods">> {
+}
 export declare function generateServices(dataModel: DataModel, project: ProjectManager, version: ODataVersions, namingHelper: NamingHelper): Promise<void>;

package/lib/generator/ServiceGenerator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateServices = void 0;
 const tslib_1 = require("tslib");
 const odata_core_1 = require("@odata2ts/odata-core");
+const deepmerge_1 = tslib_1.__importDefault(require("deepmerge"));
 const ts_morph_1 = require("ts-morph");
 const upper_case_first_1 = require("upper-case-first");
 const processors_1 = require("xml2js/lib/processors");
@@ -26,7 +27,7 @@ class ServiceGenerator {
         this.project = project;
         this.version = version;
         this.namingHelper = namingHelper;
-        this.generateQOperationProps = (operation) => {
+        this.generateQOperationProp = (operation) => {
             return {
                 scope: ts_morph_1.Scope.Private,
                 name: this.namingHelper.getPrivatePropName(operation.qName),
@@ -45,97 +46,131 @@ class ServiceGenerator {
             const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
             importContainer.addFromClientApi("ODataClient");
             importContainer.addFromService(ROOT_SERVICE);
+            const { properties, methods } = (0, deepmerge_1.default)(this.generateMainServiceProperties(container, importContainer), this.generateMainServiceOperations(unboundOperations, importContainer));
             sourceFile.addClass({
                 isExported: true,
                 name: serviceName,
                 typeParameters: ["ClientType extends ODataClient"],
                 extends: `${ROOT_SERVICE}<ClientType>`,
-                properties: [
-                    {
-                        scope: ts_morph_1.Scope.Private,
-                        name: this.namingHelper.getPrivatePropName("name"),
-                        type: "string",
-                        initializer: `"${this.namingHelper.getODataServiceName()}"`,
-                    },
-                    ...this.generateEntityServiceResolverProp(container.entitySets, importContainer),
-                    ...this.generateServiceGettersByAssignment(container.entitySets),
-                    ...this.generateServiceTypeProps(container.singletons, this.namingHelper.getServiceName, importContainer),
-                    ...Object.values(unboundOperations).map(({ operation }) => this.generateQOperationProps(operation)),
-                ],
-                methods: [
-                    ...this.generateServiceTypeGetters(container.singletons, this.namingHelper.getServiceName),
-                    ...this.generateUnboundOperations(unboundOperations, importContainer),
-                ],
+                properties /*: [
+                  {
+                    scope: Scope.Private,
+                    name: this.namingHelper.getPrivatePropName("name"),
+                    type: "string",
+                    initializer: `"${this.namingHelper.getODataServiceName()}"`,
+                  },
+                ]*/,
+                methods,
             });
             sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));
         });
     }
-    generateEntityServiceResolverProp(services, importContainer) {
-        return Object.values(services).map(({ name, entityType }) => {
-            const resolverName = this.namingHelper.getServiceResolverName(entityType.name);
-            importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), resolverName);
-            return {
-                name: this.namingHelper.getPublicPropNameForService(name),
-                scope: ts_morph_1.Scope.Public,
-                initializer: `${resolverName}(this.client, this.getPath(), "${name}")`,
-            };
+    generateMainServiceProperties(container, importContainer) {
+        const result = { properties: [], methods: [] };
+        Object.values(container.entitySets).forEach(({ name, entityType }) => {
+            result.methods.push(this.generateRelatedServiceGetter(name, entityType, importContainer));
         });
-    }
-    generateServiceGettersByAssignment(services) {
-        return Object.values(services).map(({ name, odataName, entityType }) => {
-            const propName = this.namingHelper.getPublicPropNameForService(name);
-            return {
-                scope: ts_morph_1.Scope.Public,
-                name: this.namingHelper.getRelatedServiceGetter(name),
-                initializer: `this.${propName}.get.bind(this.${propName})`,
-            };
+        Object.values(container.singletons).forEach((singleton) => {
+            result.properties.push(this.generateSingletonProp(singleton, importContainer));
+            result.methods.push(this.generateSingletonGetter(singleton));
         });
+        return result;
     }
-    generateServiceTypeProps(services, typeRetriever, importContainer) {
-        return Object.values(services).map(({ name, entityType }) => {
-            const type = typeRetriever(entityType.name);
-            importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), type);
-            return {
-                scope: ts_morph_1.Scope.Private,
-                name: this.namingHelper.getPrivatePropName(name),
-                type: `${type}<ClientType>`,
-                hasQuestionToken: true,
-            };
+    generateMainServiceOperations(ops, importContainer) {
+        const result = { properties: [], methods: [] };
+        ops.forEach(({ operation, name }) => {
+            result.properties.push(this.generateQOperationProp(operation));
+            result.methods.push(this.generateMethod(name, operation, importContainer));
         });
+        return result;
     }
-    generateServiceTypeGetters(services, typeRetriever) {
-        return Object.values(services).map(({ name, odataName, entityType }) => {
-            const propName = "this." + this.namingHelper.getPrivatePropName(name);
-            const serviceType = typeRetriever(entityType.name);
-            return {
-                scope: ts_morph_1.Scope.Public,
-                name: this.namingHelper.getRelatedServiceGetter(name),
-                statements: [
-                    `if(!${propName}) {`,
-                    // prettier-ignore
-                    `  ${propName} = new ${serviceType}(this.client, this.getPath(), "${odataName}")`,
-                    "}",
-                    `return ${propName}`,
-                ],
-            };
-        });
+    generateRelatedServiceGetter(propName, entityType, importContainer, currentServiceName) {
+        const idName = entityType.idModelName;
+        const idFunctionName = entityType.qIdFunctionName;
+        const serviceName = this.namingHelper.getServiceName(entityType.name);
+        const collectionName = this.namingHelper.getCollectionServiceName(entityType.name);
+        importContainer.addFromClientApi("ODataClient");
+        importContainer.addGeneratedModel(idName);
+        importContainer.addGeneratedQObject(idFunctionName);
+        // make sure to not falsely import self-referential stuff
+        if (!currentServiceName || currentServiceName !== serviceName) {
+            importContainer.addGeneratedService(serviceName, collectionName, serviceName);
+        }
+        return {
+            scope: ts_morph_1.Scope.Public,
+            name: this.namingHelper.getRelatedServiceGetter(propName),
+            parameters: [
+                {
+                    name: "id",
+                    type: `${idName} | undefined`,
+                    hasQuestionToken: true,
+                },
+            ],
+            overloads: [
+                {
+                    parameters: [],
+                    returnType: `${collectionName}<ClientType>`,
+                },
+                {
+                    parameters: [
+                        {
+                            name: "id",
+                            type: idName,
+                        },
+                    ],
+                    returnType: `${serviceName}<ClientType>`,
+                },
+            ],
+            statements: [
+                `const fieldName = "${propName}";`,
+                'return typeof id === "undefined" || id === null',
+                `? new ${collectionName}(this.client, this.getPath(), fieldName)`,
+                `: new ${serviceName}(this.client, this.getPath(), new ${idFunctionName}(fieldName).buildUrl(id));`,
+            ],
+        };
+    }
+    generateSingletonProp(singleton, importContainer) {
+        const { name, entityType } = singleton;
+        const type = this.namingHelper.getServiceName(entityType.name);
+        importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), type);
+        return {
+            scope: ts_morph_1.Scope.Private,
+            name: this.namingHelper.getPrivatePropName(name),
+            type: `${type}<ClientType>`,
+            hasQuestionToken: true,
+        };
+    }
+    generateSingletonGetter(singleton) {
+        const { name, odataName, entityType } = singleton;
+        const propName = "this." + this.namingHelper.getPrivatePropName(name);
+        const serviceType = this.namingHelper.getServiceName(entityType.name);
+        return {
+            scope: ts_morph_1.Scope.Public,
+            name: this.namingHelper.getRelatedServiceGetter(name),
+            statements: [
+                `if(!${propName}) {`,
+                // prettier-ignore
+                `  ${propName} = new ${serviceType}(this.client, this.getPath(), "${odataName}")`,
+                "}",
+                `return ${propName}`,
+            ],
+        };
     }
     getVersionSuffix() {
         return this.version === odata_core_1.ODataVersions.V2 ? "V2" : "V4";
     }
-    generateModelService(model, serviceName, serviceFile, importContainer) {
+    generateEntityTypeService(model, serviceName, serviceFile, importContainer) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const entityServiceType = "EntityTypeService" + this.getVersionSuffix();
-            const collectionServiceType = "CollectionService" + this.getVersionSuffix();
             const editableModelName = model.editableName;
+            const qObjectName = (0, processors_1.firstCharLowerCase)(model.qName);
             const operations = this.dataModel.getOperationTypeByBinding(model.name);
             const props = [...model.baseProps, ...model.props];
-            const modelProps = props.filter((prop) => prop.dataType === "ModelType" /* DataTypes.ModelType */ || prop.dataType === "ComplexType" /* DataTypes.ComplexType */);
-            const primColProps = props.filter((prop) => prop.isCollection && prop.dataType !== "ModelType" /* DataTypes.ModelType */ && prop.dataType !== "ComplexType" /* DataTypes.ComplexType */);
             importContainer.addFromService(entityServiceType);
             importContainer.addFromClientApi("ODataClient");
             importContainer.addGeneratedModel(model.name, editableModelName);
-            importContainer.addGeneratedQObject(model.qName, (0, processors_1.firstCharLowerCase)(model.qName));
+            importContainer.addGeneratedQObject(model.qName, qObjectName);
+            const { properties, methods } = (0, deepmerge_1.default)(this.generateServiceProperties(serviceName, props, importContainer), this.generateServiceOperations(operations, importContainer));
             // generate EntityTypeService
             serviceFile.addClass({
                 isExported: true,
@@ -149,119 +184,134 @@ class ServiceGenerator {
                             { name: "basePath", type: "string" },
                             { name: "name", type: "string" },
                         ],
-                        statements: [`super(client, basePath, name, ${(0, processors_1.firstCharLowerCase)(model.qName)});`],
+                        statements: [`super(client, basePath, name, ${qObjectName});`],
                     },
                 ],
-                properties: [
-                    ...this.generateModelProps(modelProps, collectionServiceType, serviceName, importContainer),
-                    ...this.generatePrimitiveCollectionProps(primColProps, collectionServiceType, importContainer),
-                    ...operations.map(this.generateQOperationProps),
-                ],
-                methods: [
-                    ...this.generateModelPropGetters(modelProps, collectionServiceType),
-                    ...this.generatePrimitiveCollectionGetters(primColProps, collectionServiceType),
-                    ...this.generateBoundOperations(operations, importContainer),
-                ],
+                properties,
+                methods,
             });
         });
     }
-    generateModelProps(modelProps, collectionServiceType, serviceName, importContainer) {
-        return modelProps.map((prop) => {
-            const complexType = this.dataModel.getComplexType(prop.type);
-            const key = this.namingHelper.getServiceName(prop.type);
-            let propModelType = prop.isCollection ? this.namingHelper.getCollectionServiceName(prop.type) : key;
-            if (prop.isCollection && complexType) {
-                const editableName = complexType.editableName;
-                importContainer.addFromService(collectionServiceType);
-                importContainer.addGeneratedModel(complexType.name, editableName);
-                importContainer.addGeneratedQObject(complexType.qName, (0, processors_1.firstCharLowerCase)(complexType.qName));
-                propModelType = `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${editableName}>`;
+    generateServiceProperties(serviceName, props, importContainer) {
+        const collectionServiceType = "CollectionService" + this.getVersionSuffix();
+        const result = { properties: [], methods: [] };
+        props.forEach((prop) => {
+            if ((prop.dataType === "ModelType" /* DataTypes.ModelType */ && !prop.isCollection) || prop.dataType === "ComplexType" /* DataTypes.ComplexType */) {
+                result.properties.push(this.generateModelProp(prop, collectionServiceType, serviceName, importContainer));
+                result.methods.push(this.generateModelPropGetter(prop, collectionServiceType));
             }
-            else {
-                // don't include imports for this type
-                if (serviceName !== key) {
-                    importContainer.addGeneratedService(key, propModelType);
+            else if (prop.isCollection) {
+                // collection of entity types
+                if (prop.dataType === "ModelType" /* DataTypes.ModelType */) {
+                    const entityType = this.dataModel.getModel(prop.type);
+                    result.methods.push(this.generateRelatedServiceGetter(prop.name, entityType, importContainer, serviceName));
+                }
+                // collection of primitive or complex types
+                else {
+                    result.properties.push(this.generatePrimitiveCollectionProp(prop, collectionServiceType, importContainer));
+                    result.methods.push(this.generatePrimitiveCollectionGetter(prop, collectionServiceType));
                 }
-                propModelType = `${propModelType}<ClientType>`;
             }
-            return {
-                scope: ts_morph_1.Scope.Private,
-                name: this.namingHelper.getPrivatePropName(prop.name),
-                type: propModelType,
-                hasQuestionToken: true,
-            };
         });
+        return result;
     }
-    generatePrimitiveCollectionProps(primColProps, collectionServiceType, importContainer) {
-        return primColProps.map((prop) => {
-            const isEnum = prop.dataType === "EnumType" /* DataTypes.EnumType */;
-            const type = isEnum ? `EnumCollection<${prop.type}>` : `${(0, upper_case_first_1.upperCaseFirst)(prop.type)}Collection`;
-            const qType = isEnum ? "QEnumCollection" : `Q${type}`;
-            const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;
-            if (!prop.qObject) {
-                throw new Error("Illegal State: [qObject] must be provided for Collection types!");
-            }
+    generateServiceOperations(operations, importContainer) {
+        const result = { properties: [], methods: [] };
+        operations.forEach((operation) => {
+            result.properties.push(this.generateQOperationProp(operation));
+            result.methods.push(this.generateMethod(operation.name, operation, importContainer));
+        });
+        return result;
+    }
+    generateModelProp(prop, collectionServiceType, serviceName, importContainer) {
+        const complexType = this.dataModel.getComplexType(prop.type);
+        const key = this.namingHelper.getServiceName(prop.type);
+        let propModelType = prop.isCollection ? this.namingHelper.getCollectionServiceName(prop.type) : key;
+        if (prop.isCollection && complexType) {
+            const editableName = complexType.editableName;
             importContainer.addFromService(collectionServiceType);
-            importContainer.addFromQObject(prop.qObject, (0, processors_1.firstCharLowerCase)(prop.qObject));
-            if (isEnum) {
-                importContainer.addGeneratedModel(prop.type);
-                importContainer.addFromQObject("EnumCollection");
-            }
-            else {
-                importContainer.addFromQObject(type);
+            importContainer.addGeneratedModel(complexType.name, editableName);
+            importContainer.addGeneratedQObject(complexType.qName, (0, processors_1.firstCharLowerCase)(complexType.qName));
+            propModelType = `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${editableName}>`;
+        }
+        else {
+            // don't include imports for this type
+            if (serviceName !== key) {
+                importContainer.addGeneratedService(key, propModelType);
             }
-            return {
-                scope: ts_morph_1.Scope.Private,
-                name: this.namingHelper.getPrivatePropName(prop.name),
-                type: `${collectionType}`,
-                hasQuestionToken: true,
-            };
-        });
+            propModelType = `${propModelType}<ClientType>`;
+        }
+        return {
+            scope: ts_morph_1.Scope.Private,
+            name: this.namingHelper.getPrivatePropName(prop.name),
+            type: propModelType,
+            hasQuestionToken: true,
+        };
     }
-    generateModelPropGetters(modelProps, collectionServiceType) {
-        return modelProps.map((prop) => {
-            const complexType = this.dataModel.getComplexType(prop.type);
-            const isComplexCollection = prop.isCollection && complexType;
-            const type = isComplexCollection
-                ? collectionServiceType
-                : prop.isCollection
-                    ? this.namingHelper.getCollectionServiceName(prop.type)
-                    : this.namingHelper.getServiceName(prop.type);
-            const typeWithGenerics = isComplexCollection
-                ? `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${complexType.editableName}>`
-                : `${type}<ClientType>`;
-            const privateSrvProp = "this." + this.namingHelper.getPrivatePropName(prop.name);
-            return {
-                scope: ts_morph_1.Scope.Public,
-                name: this.namingHelper.getRelatedServiceGetter(prop.name),
-                returnType: typeWithGenerics,
-                statements: [
-                    `if(!${privateSrvProp}) {`,
-                    // prettier-ignore
-                    `  ${privateSrvProp} = new ${type}(this.client, this.getPath(), "${prop.odataName}"${isComplexCollection ? `, ${(0, processors_1.firstCharLowerCase)(complexType.qName)}` : ""})`,
-                    "}",
-                    `return ${privateSrvProp}`,
-                ],
-            };
-        });
+    generatePrimitiveCollectionProp(prop, collectionServiceType, importContainer) {
+        const isEnum = prop.dataType === "EnumType" /* DataTypes.EnumType */;
+        const type = isEnum ? `EnumCollection<${prop.type}>` : `${(0, upper_case_first_1.upperCaseFirst)(prop.type)}Collection`;
+        const qType = isEnum ? "QEnumCollection" : `Q${type}`;
+        const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;
+        if (!prop.qObject) {
+            throw new Error("Illegal State: [qObject] must be provided for Collection types!");
+        }
+        importContainer.addFromService(collectionServiceType);
+        importContainer.addFromQObject(prop.qObject, (0, processors_1.firstCharLowerCase)(prop.qObject));
+        if (isEnum) {
+            importContainer.addGeneratedModel(prop.type);
+            importContainer.addFromQObject("EnumCollection");
+        }
+        else {
+            importContainer.addFromQObject(type);
+        }
+        return {
+            scope: ts_morph_1.Scope.Private,
+            name: this.namingHelper.getPrivatePropName(prop.name),
+            type: `${collectionType}`,
+            hasQuestionToken: true,
+        };
     }
-    generatePrimitiveCollectionGetters(primColProps, collectionServiceType) {
-        return primColProps.map((prop) => {
-            const propName = "this." + this.namingHelper.getPrivatePropName(prop.name);
-            return {
-                scope: ts_morph_1.Scope.Public,
-                name: this.namingHelper.getRelatedServiceGetter(prop.name),
-                statements: [
-                    `if(!${propName}) {`,
-                    // prettier-ignore
-                    `  ${propName} = new ${collectionServiceType}(this.client, this.getPath(), "${prop.odataName}", ${(0, processors_1.firstCharLowerCase)(prop.qObject)})`,
-                    "}",
-                    `return ${propName}`,
-                ],
-            };
-        });
+    generateModelPropGetter(prop, collectionServiceType) {
+        const complexType = this.dataModel.getComplexType(prop.type);
+        const isComplexCollection = prop.isCollection && complexType;
+        const type = isComplexCollection
+            ? collectionServiceType
+            : prop.isCollection
+                ? this.namingHelper.getCollectionServiceName(prop.type)
+                : this.namingHelper.getServiceName(prop.type);
+        const typeWithGenerics = isComplexCollection
+            ? `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${complexType.editableName}>`
+            : `${type}<ClientType>`;
+        const privateSrvProp = "this." + this.namingHelper.getPrivatePropName(prop.name);
+        return {
+            scope: ts_morph_1.Scope.Public,
+            name: this.namingHelper.getRelatedServiceGetter(prop.name),
+            returnType: typeWithGenerics,
+            statements: [
+                `if(!${privateSrvProp}) {`,
+                // prettier-ignore
+                `  ${privateSrvProp} = new ${type}(this.client, this.getPath(), "${prop.odataName}"${isComplexCollection ? `, ${(0, processors_1.firstCharLowerCase)(complexType.qName)}` : ""})`,
+                "}",
+                `return ${privateSrvProp}`,
+            ],
+        };
+    }
+    generatePrimitiveCollectionGetter(prop, collectionServiceType) {
+        const propName = "this." + this.namingHelper.getPrivatePropName(prop.name);
+        return {
+            scope: ts_morph_1.Scope.Public,
+            name: this.namingHelper.getRelatedServiceGetter(prop.name),
+            statements: [
+                `if(!${propName}) {`,
+                // prettier-ignore
+                `  ${propName} = new ${collectionServiceType}(this.client, this.getPath(), "${prop.odataName}", ${(0, processors_1.firstCharLowerCase)(prop.qObject)})`,
+                "}",
+                `return ${propName}`,
+            ],
+        };
     }
-    generateEntityCollectionService(model, serviceName, serviceFile, importContainer) {
+    generateEntityCollectionService(model, serviceFile, importContainer) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const entitySetServiceType = "EntitySetService" + this.getVersionSuffix();
             const editableModelName = model.editableName;
@@ -270,12 +320,13 @@ class ServiceGenerator {
             importContainer.addGeneratedModel(model.idModelName);
             importContainer.addGeneratedQObject(model.qIdFunctionName);
             const collectionOperations = this.dataModel.getOperationTypeByBinding(`Collection(${model.name})`);
+            const { properties, methods } = this.generateServiceOperations(collectionOperations, importContainer);
             serviceFile.addClass({
                 isExported: true,
                 name: this.namingHelper.getCollectionServiceName(model.name),
                 typeParameters: ["ClientType extends ODataClient"],
                 extends: entitySetServiceType +
-                    `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}, ${model.idModelName}, ${serviceName}<ClientType>>`,
+                    `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}, ${model.idModelName}>`,
                 ctors: [
                     {
                         parameters: [
@@ -283,44 +334,14 @@ class ServiceGenerator {
                             { name: "basePath", type: "string" },
                             { name: "name", type: "string" },
                         ],
-                        statements: [
-                            `super(client, basePath, name, ${qObjectName}, ${serviceName}, new ${model.qIdFunctionName}(name));`,
-                        ],
+                        statements: [`super(client, basePath, name, ${qObjectName}, new ${model.qIdFunctionName}(name));`],
                     },
                 ],
-                properties: [...collectionOperations.map(this.generateQOperationProps)],
-                methods: [...this.generateBoundOperations(collectionOperations, importContainer)],
+                properties,
+                methods,
             });
         });
     }
-    generateEntityServiceResolver(model, serviceName, serviceFile, importContainer) {
-        const idFunctionName = model.qIdFunctionName;
-        const collectionName = this.namingHelper.getCollectionServiceName(model.name);
-        importContainer.addFromClientApi("ODataClient");
-        importContainer.addFromService("EntityServiceResolver");
-        importContainer.addGeneratedQObject(idFunctionName);
-        serviceFile.addFunction({
-            name: this.namingHelper.getServiceResolverName(model.name),
-            isExported: true,
-            parameters: [
-                {
-                    name: "client",
-                    type: "ODataClient",
-                },
-                {
-                    name: "basePath",
-                    type: "string",
-                },
-                {
-                    name: "entityName",
-                    type: "string",
-                },
-            ],
-            statements: [
-                `return new EntityServiceResolver(client, basePath, entityName, ${idFunctionName}, ${serviceName}, ${collectionName});`,
-            ],
-        });
-    }
     generateModelServices() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // build service file for each entity, consisting of EntityTypeService & EntityCollectionService
@@ -329,11 +350,9 @@ class ServiceGenerator {
                 const serviceFile = yield this.project.createServiceFile(serviceName);
                 const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
                 // entity type service
-                yield this.generateModelService(model, serviceName, serviceFile, importContainer);
+                yield this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);
                 // entity collection service
-                yield this.generateEntityCollectionService(model, serviceName, serviceFile, importContainer);
-                // the resolver function
-                yield this.generateEntityServiceResolver(model, serviceName, serviceFile, importContainer);
+                yield this.generateEntityCollectionService(model, serviceFile, importContainer);
                 serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));
             }
             // build service file for complex types
@@ -342,23 +361,11 @@ class ServiceGenerator {
                 const serviceFile = yield this.project.createServiceFile(serviceName);
                 const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
                 // entity type service
-                yield this.generateModelService(model, serviceName, serviceFile, importContainer);
+                yield this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);
                 serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));
             }
         });
     }
-    generateBoundOperations(operations, importContainer) {
-        return operations.reduce((collector, operation) => {
-            collector.push(this.generateMethod(operation.name, operation, importContainer));
-            return collector;
-        }, []);
-    }
-    generateUnboundOperations(operations, importContainer) {
-        return Object.values(operations).reduce((collector, { name, operation }) => {
-            collector.push(this.generateMethod(name, operation, importContainer));
-            return collector;
-        }, []);
-    }
     generateMethod(name, operation, importContainer) {
         var _a, _b;
         const isFunc = operation.type === "Function" /* OperationTypes.Function */;

package/lib/generator/ServiceGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceGenerator.js","sourceRoot":"","sources":["../../src/generator/ServiceGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { MethodDeclarationStructure, OptionalKind, PropertyDeclarationStructure, Scope, SourceFile } from \"ts-morph\";\r\nimport { upperCaseFirst } from \"upper-case-first\";\r\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  DataTypes,\r\n  EntitySetType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n  SingletonType,\r\n} from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { ProjectManager } from \"../project/ProjectManager\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nconst ROOT_SERVICE = \"ODataService\";\r\n\r\nconst RESPONSE_TYPES = {\r\n  collection: \"ODataCollectionResponse\",\r\n  model: \"ODataModelResponse\",\r\n  value: \"ODataValueResponse\",\r\n};\r\n\r\nexport async function generateServices(\r\n  dataModel: DataModel,\r\n  project: ProjectManager,\r\n  version: ODataVersions,\r\n  namingHelper: NamingHelper\r\n) {\r\n  const generator = new ServiceGenerator(dataModel, project, version, namingHelper);\r\n  return generator.generate();\r\n}\r\n\r\nclass ServiceGenerator {\r\n  constructor(\r\n    private dataModel: DataModel,\r\n    private project: ProjectManager,\r\n    private version: ODataVersions,\r\n    private namingHelper: NamingHelper\r\n  ) {}\r\n\r\n  public async generate(): Promise<void> {\r\n    const sourceFile = await this.project.createMainServiceFile();\r\n    const serviceName = this.namingHelper.getMainServiceName();\r\n    const container = this.dataModel.getEntityContainer();\r\n    const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];\r\n\r\n    await this.generateModelServices();\r\n\r\n    const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n    importContainer.addFromClientApi(\"ODataClient\");\r\n    importContainer.addFromService(ROOT_SERVICE);\r\n\r\n    sourceFile.addClass({\r\n      isExported: true,\r\n      name: serviceName,\r\n      typeParameters: [\"ClientType extends ODataClient\"],\r\n      extends: `${ROOT_SERVICE}<ClientType>`,\r\n      properties: [\r\n        {\r\n          scope: Scope.Private,\r\n          name: this.namingHelper.getPrivatePropName(\"name\"),\r\n          type: \"string\",\r\n          initializer: `\"${this.namingHelper.getODataServiceName()}\"`,\r\n        },\r\n        ...this.generateEntityServiceResolverProp(container.entitySets, importContainer),\r\n        ...this.generateServiceGettersByAssignment(container.entitySets),\r\n        ...this.generateServiceTypeProps(container.singletons, this.namingHelper.getServiceName, importContainer),\r\n        ...Object.values(unboundOperations).map(({ operation }) => this.generateQOperationProps(operation)),\r\n      ],\r\n      methods: [\r\n        ...this.generateServiceTypeGetters(container.singletons, this.namingHelper.getServiceName),\r\n        ...this.generateUnboundOperations(unboundOperations, importContainer),\r\n      ],\r\n    });\r\n\r\n    sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));\r\n  }\r\n\r\n  private generateEntityServiceResolverProp(\r\n    services: Record<string, EntitySetType>,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure>[] {\r\n    return Object.values(services).map(({ name, entityType }) => {\r\n      const resolverName = this.namingHelper.getServiceResolverName(entityType.name);\r\n\r\n      importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), resolverName);\r\n\r\n      return {\r\n        name: this.namingHelper.getPublicPropNameForService(name),\r\n        scope: Scope.Public,\r\n        initializer: `${resolverName}(this.client, this.getPath(), \"${name}\")`,\r\n      };\r\n    });\r\n  }\r\n\r\n  private generateServiceGettersByAssignment(\r\n    services: Record<string, EntitySetType>\r\n  ): OptionalKind<PropertyDeclarationStructure>[] {\r\n    return Object.values(services).map(({ name, odataName, entityType }) => {\r\n      const propName = this.namingHelper.getPublicPropNameForService(name);\r\n      return {\r\n        scope: Scope.Public,\r\n        name: this.namingHelper.getRelatedServiceGetter(name),\r\n        initializer: `this.${propName}.get.bind(this.${propName})`,\r\n      };\r\n    });\r\n  }\r\n\r\n  private generateServiceTypeProps(\r\n    services: Record<string, SingletonType | EntitySetType>,\r\n    typeRetriever: (name: string) => string,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure>[] {\r\n    return Object.values(services).map(({ name, entityType }) => {\r\n      const type = typeRetriever(entityType.name);\r\n\r\n      importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), type);\r\n\r\n      return {\r\n        scope: Scope.Private,\r\n        name: this.namingHelper.getPrivatePropName(name),\r\n        type: `${type}<ClientType>`,\r\n        hasQuestionToken: true,\r\n      };\r\n    });\r\n  }\r\n\r\n  private generateQOperationProps = (operation: OperationType) => {\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(operation.qName),\r\n      type: operation.qName,\r\n      hasQuestionToken: true,\r\n    };\r\n  };\r\n\r\n  private generateServiceTypeGetters(\r\n    services: Record<string, SingletonType | EntitySetType>,\r\n    typeRetriever: (name: string) => string\r\n  ): OptionalKind<MethodDeclarationStructure>[] {\r\n    return Object.values(services).map(({ name, odataName, entityType }) => {\r\n      const propName = \"this.\" + this.namingHelper.getPrivatePropName(name);\r\n      const serviceType = typeRetriever(entityType.name);\r\n      return {\r\n        scope: Scope.Public,\r\n        name: this.namingHelper.getRelatedServiceGetter(name),\r\n        statements: [\r\n          `if(!${propName}) {`,\r\n          // prettier-ignore\r\n          `  ${propName} = new ${serviceType}(this.client, this.getPath(), \"${odataName}\")`,\r\n          \"}\",\r\n          `return ${propName}`,\r\n        ],\r\n      };\r\n    });\r\n  }\r\n\r\n  private getVersionSuffix() {\r\n    return this.version === ODataVersions.V2 ? \"V2\" : \"V4\";\r\n  }\r\n\r\n  private async generateModelService(\r\n    model: ComplexType,\r\n    serviceName: string,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const entityServiceType = \"EntityTypeService\" + this.getVersionSuffix();\r\n    const collectionServiceType = \"CollectionService\" + this.getVersionSuffix();\r\n\r\n    const editableModelName = model.editableName;\r\n    const operations = this.dataModel.getOperationTypeByBinding(model.name);\r\n    const props = [...model.baseProps, ...model.props];\r\n    const modelProps = props.filter(\r\n      (prop) => prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType\r\n    );\r\n    const primColProps = props.filter(\r\n      (prop) => prop.isCollection && prop.dataType !== DataTypes.ModelType && prop.dataType !== DataTypes.ComplexType\r\n    );\r\n\r\n    importContainer.addFromService(entityServiceType);\r\n    importContainer.addFromClientApi(\"ODataClient\");\r\n    importContainer.addGeneratedModel(model.name, editableModelName);\r\n    importContainer.addGeneratedQObject(model.qName, firstCharLowerCase(model.qName));\r\n\r\n    // generate EntityTypeService\r\n    serviceFile.addClass({\r\n      isExported: true,\r\n      name: serviceName,\r\n      typeParameters: [\"ClientType extends ODataClient\"],\r\n      extends: entityServiceType + `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}>`,\r\n      ctors: [\r\n        {\r\n          parameters: [\r\n            { name: \"client\", type: \"ClientType\" },\r\n            { name: \"basePath\", type: \"string\" },\r\n            { name: \"name\", type: \"string\" },\r\n          ],\r\n          statements: [`super(client, basePath, name, ${firstCharLowerCase(model.qName)});`],\r\n        },\r\n      ],\r\n      properties: [\r\n        ...this.generateModelProps(modelProps, collectionServiceType, serviceName, importContainer),\r\n        ...this.generatePrimitiveCollectionProps(primColProps, collectionServiceType, importContainer),\r\n        ...operations.map(this.generateQOperationProps),\r\n      ],\r\n      methods: [\r\n        ...this.generateModelPropGetters(modelProps, collectionServiceType),\r\n        ...this.generatePrimitiveCollectionGetters(primColProps, collectionServiceType),\r\n        ...this.generateBoundOperations(operations, importContainer),\r\n      ],\r\n    });\r\n  }\r\n\r\n  private generateModelProps(\r\n    modelProps: Array<PropertyModel>,\r\n    collectionServiceType: string,\r\n    serviceName: string,\r\n    importContainer: ImportContainer\r\n  ): Array<PropertyDeclarationStructure> {\r\n    return modelProps.map((prop) => {\r\n      const complexType = this.dataModel.getComplexType(prop.type);\r\n      const key = this.namingHelper.getServiceName(prop.type);\r\n      let propModelType = prop.isCollection ? this.namingHelper.getCollectionServiceName(prop.type) : key;\r\n\r\n      if (prop.isCollection && complexType) {\r\n        const editableName = complexType.editableName;\r\n        importContainer.addFromService(collectionServiceType);\r\n        importContainer.addGeneratedModel(complexType.name, editableName);\r\n        importContainer.addGeneratedQObject(complexType.qName, firstCharLowerCase(complexType.qName));\r\n        propModelType = `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${editableName}>`;\r\n      } else {\r\n        // don't include imports for this type\r\n        if (serviceName !== key) {\r\n          importContainer.addGeneratedService(key, propModelType);\r\n        }\r\n\r\n        propModelType = `${propModelType}<ClientType>`;\r\n      }\r\n\r\n      return {\r\n        scope: Scope.Private,\r\n        name: this.namingHelper.getPrivatePropName(prop.name),\r\n        type: propModelType,\r\n        hasQuestionToken: true,\r\n      } as PropertyDeclarationStructure;\r\n    });\r\n  }\r\n\r\n  private generatePrimitiveCollectionProps(\r\n    primColProps: Array<PropertyModel>,\r\n    collectionServiceType: string,\r\n    importContainer: ImportContainer\r\n  ): Array<PropertyDeclarationStructure> {\r\n    return primColProps.map((prop) => {\r\n      const isEnum = prop.dataType === DataTypes.EnumType;\r\n      const type = isEnum ? `EnumCollection<${prop.type}>` : `${upperCaseFirst(prop.type)}Collection`;\r\n      const qType = isEnum ? \"QEnumCollection\" : `Q${type}`;\r\n      const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;\r\n\r\n      if (!prop.qObject) {\r\n        throw new Error(\"Illegal State: [qObject] must be provided for Collection types!\");\r\n      }\r\n\r\n      importContainer.addFromService(collectionServiceType);\r\n      importContainer.addFromQObject(prop.qObject, firstCharLowerCase(prop.qObject));\r\n      if (isEnum) {\r\n        importContainer.addGeneratedModel(prop.type);\r\n        importContainer.addFromQObject(\"EnumCollection\");\r\n      } else {\r\n        importContainer.addFromQObject(type);\r\n      }\r\n\r\n      return {\r\n        scope: Scope.Private,\r\n        name: this.namingHelper.getPrivatePropName(prop.name),\r\n        type: `${collectionType}`,\r\n        hasQuestionToken: true,\r\n      } as PropertyDeclarationStructure;\r\n    });\r\n  }\r\n\r\n  private generateModelPropGetters(\r\n    modelProps: Array<PropertyModel>,\r\n    collectionServiceType: string\r\n  ): Array<MethodDeclarationStructure> {\r\n    return modelProps.map((prop) => {\r\n      const complexType = this.dataModel.getComplexType(prop.type);\r\n      const isComplexCollection = prop.isCollection && complexType;\r\n      const type = isComplexCollection\r\n        ? collectionServiceType\r\n        : prop.isCollection\r\n        ? this.namingHelper.getCollectionServiceName(prop.type)\r\n        : this.namingHelper.getServiceName(prop.type);\r\n      const typeWithGenerics = isComplexCollection\r\n        ? `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${complexType.editableName}>`\r\n        : `${type}<ClientType>`;\r\n\r\n      const privateSrvProp = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n\r\n      return {\r\n        scope: Scope.Public,\r\n        name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n        returnType: typeWithGenerics,\r\n        statements: [\r\n          `if(!${privateSrvProp}) {`,\r\n          // prettier-ignore\r\n          `  ${privateSrvProp} = new ${type}(this.client, this.getPath(), \"${prop.odataName}\"${isComplexCollection ? `, ${firstCharLowerCase(complexType.qName)}`: \"\"})`,\r\n          \"}\",\r\n          `return ${privateSrvProp}`,\r\n        ],\r\n      } as MethodDeclarationStructure;\r\n    });\r\n  }\r\n\r\n  private generatePrimitiveCollectionGetters(\r\n    primColProps: Array<PropertyModel>,\r\n    collectionServiceType: string\r\n  ): Array<MethodDeclarationStructure> {\r\n    return primColProps.map((prop) => {\r\n      const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n      return {\r\n        scope: Scope.Public,\r\n        name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n        statements: [\r\n          `if(!${propName}) {`,\r\n          // prettier-ignore\r\n          `  ${propName} = new ${collectionServiceType}(this.client, this.getPath(), \"${prop.odataName}\", ${firstCharLowerCase(prop.qObject!)})`,\r\n          \"}\",\r\n          `return ${propName}`,\r\n        ],\r\n      } as MethodDeclarationStructure;\r\n    });\r\n  }\r\n\r\n  private async generateEntityCollectionService(\r\n    model: ModelType,\r\n    serviceName: string,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const entitySetServiceType = \"EntitySetService\" + this.getVersionSuffix();\r\n    const editableModelName = model.editableName;\r\n    const qObjectName = firstCharLowerCase(model.qName);\r\n\r\n    importContainer.addFromService(entitySetServiceType);\r\n    importContainer.addGeneratedModel(model.idModelName);\r\n    importContainer.addGeneratedQObject(model.qIdFunctionName);\r\n\r\n    const collectionOperations = this.dataModel.getOperationTypeByBinding(`Collection(${model.name})`);\r\n\r\n    serviceFile.addClass({\r\n      isExported: true,\r\n      name: this.namingHelper.getCollectionServiceName(model.name),\r\n      typeParameters: [\"ClientType extends ODataClient\"],\r\n      extends:\r\n        entitySetServiceType +\r\n        `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}, ${model.idModelName}, ${serviceName}<ClientType>>`,\r\n      ctors: [\r\n        {\r\n          parameters: [\r\n            { name: \"client\", type: \"ClientType\" },\r\n            { name: \"basePath\", type: \"string\" },\r\n            { name: \"name\", type: \"string\" },\r\n          ],\r\n          statements: [\r\n            `super(client, basePath, name, ${qObjectName}, ${serviceName}, new ${model.qIdFunctionName}(name));`,\r\n          ],\r\n        },\r\n      ],\r\n      properties: [...collectionOperations.map(this.generateQOperationProps)],\r\n      methods: [...this.generateBoundOperations(collectionOperations, importContainer)],\r\n    });\r\n  }\r\n\r\n  private generateEntityServiceResolver(\r\n    model: ModelType,\r\n    serviceName: string,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const idFunctionName = model.qIdFunctionName;\r\n    const collectionName = this.namingHelper.getCollectionServiceName(model.name);\r\n\r\n    importContainer.addFromClientApi(\"ODataClient\");\r\n    importContainer.addFromService(\"EntityServiceResolver\");\r\n    importContainer.addGeneratedQObject(idFunctionName);\r\n\r\n    serviceFile.addFunction({\r\n      name: this.namingHelper.getServiceResolverName(model.name),\r\n      isExported: true,\r\n      parameters: [\r\n        {\r\n          name: \"client\",\r\n          type: \"ODataClient\",\r\n        },\r\n        {\r\n          name: \"basePath\",\r\n          type: \"string\",\r\n        },\r\n        {\r\n          name: \"entityName\",\r\n          type: \"string\",\r\n        },\r\n      ],\r\n      statements: [\r\n        `return new EntityServiceResolver(client, basePath, entityName, ${idFunctionName}, ${serviceName}, ${collectionName});`,\r\n      ],\r\n    });\r\n  }\r\n\r\n  private async generateModelServices() {\r\n    // build service file for each entity, consisting of EntityTypeService & EntityCollectionService\r\n    for (const model of this.dataModel.getModels()) {\r\n      const serviceName = this.namingHelper.getServiceName(model.name);\r\n      const serviceFile = await this.project.createServiceFile(serviceName);\r\n      const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n\r\n      // entity type service\r\n      await this.generateModelService(model, serviceName, serviceFile, importContainer);\r\n\r\n      // entity collection service\r\n      await this.generateEntityCollectionService(model, serviceName, serviceFile, importContainer);\r\n\r\n      // the resolver function\r\n      await this.generateEntityServiceResolver(model, serviceName, serviceFile, importContainer);\r\n\r\n      serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));\r\n    }\r\n\r\n    // build service file for complex types\r\n    for (const model of this.dataModel.getComplexTypes()) {\r\n      const serviceName = this.namingHelper.getServiceName(model.name);\r\n      const serviceFile = await this.project.createServiceFile(serviceName);\r\n      const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n\r\n      // entity type service\r\n      await this.generateModelService(model, serviceName, serviceFile, importContainer);\r\n      serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));\r\n    }\r\n  }\r\n\r\n  private generateBoundOperations(operations: Array<OperationType>, importContainer: ImportContainer) {\r\n    return operations.reduce<Array<OptionalKind<MethodDeclarationStructure>>>((collector, operation) => {\r\n      collector.push(this.generateMethod(operation.name, operation, importContainer));\r\n\r\n      return collector;\r\n    }, []);\r\n  }\r\n\r\n  private generateUnboundOperations(\r\n    operations: Array<FunctionImportType | ActionImportType>,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    return Object.values(operations).reduce<Array<OptionalKind<MethodDeclarationStructure>>>(\r\n      (collector, { name, operation }) => {\r\n        collector.push(this.generateMethod(name, operation, importContainer));\r\n\r\n        return collector;\r\n      },\r\n      []\r\n    );\r\n  }\r\n\r\n  private generateMethod(\r\n    name: string,\r\n    operation: OperationType,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const isFunc = operation.type === OperationTypes.Function;\r\n    const odataType = operation.returnType?.isCollection\r\n      ? RESPONSE_TYPES.collection + this.getVersionSuffix()\r\n      : operation.returnType?.dataType === DataTypes.PrimitiveType\r\n      ? RESPONSE_TYPES.value + this.getVersionSuffix()\r\n      : RESPONSE_TYPES.model + this.getVersionSuffix();\r\n    const returnType = operation.returnType;\r\n    const requestConfigParam = { name: \"requestConfig\", hasQuestionToken: true, type: \"ODataClientConfig<ClientType>\" };\r\n    const hasParams = operation.parameters.length > 0;\r\n\r\n    // importing dependencies\r\n    importContainer.addFromClientApi(\"ODataClientConfig\", \"ODataResponse\");\r\n    importContainer.addFromCore(odataType);\r\n    if (returnType?.type) {\r\n      if ([DataTypes.EnumType, DataTypes.ModelType, DataTypes.ComplexType].includes(returnType.dataType)) {\r\n        importContainer.addGeneratedModel(returnType.type);\r\n      }\r\n    }\r\n    importContainer.addGeneratedQObject(operation.qName);\r\n    if (hasParams) {\r\n      importContainer.addGeneratedModel(operation.paramsModelName);\r\n    }\r\n\r\n    const qOpProp = \"this.\" + this.namingHelper.getPrivatePropName(operation.qName);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      isAsync: true,\r\n      name,\r\n      parameters: hasParams\r\n        ? [{ name: \"params\", type: operation.paramsModelName }, requestConfigParam]\r\n        : [requestConfigParam],\r\n      returnType: `ODataResponse<${odataType}<${returnType?.type || \"void\"}>>`,\r\n      statements: [\r\n        `if(!${qOpProp}) {`,\r\n        `  ${qOpProp} = new ${operation.qName}()`,\r\n        \"}\",\r\n\r\n        `const url = this.addFullPath(${qOpProp}.buildUrl(${isFunc && hasParams ? \"params\" : \"\"}));`,\r\n        `${returnType ? \"const response = await \" : \"return\"} this.client.${\r\n          !isFunc\r\n            ? // actions: since V4\r\n              `post(url, ${hasParams ? `${qOpProp}.convertUserParams(params)` : \"{}\"}, ${requestConfigParam.name})`\r\n            : operation.usePost\r\n            ? // V2 POST => BUT values are still query params, they are not part of the request body\r\n              `post(url, undefined, ${requestConfigParam.name})`\r\n            : // functions: since V2\r\n              `get(url, ${requestConfigParam.name})`\r\n        };`,\r\n        returnType ? `return ${qOpProp}.convertResponse(response);` : \"\",\r\n      ],\r\n    };\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ServiceGenerator.js","sourceRoot":"","sources":["../../src/generator/ServiceGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport deepmerge from \"deepmerge\";\r\nimport {\r\n  ClassDeclarationStructure,\r\n  MethodDeclarationStructure,\r\n  OptionalKind,\r\n  PropertyDeclarationStructure,\r\n  Scope,\r\n  SourceFile,\r\n} from \"ts-morph\";\r\nimport { upperCaseFirst } from \"upper-case-first\";\r\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  DataTypes,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n  SingletonType,\r\n} from \"../data-model/DataTypeModel\";\r\nimport { EntityType } from \"../data-model/edmx/ODataEdmxModelBase\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { ProjectManager } from \"../project/ProjectManager\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nconst ROOT_SERVICE = \"ODataService\";\r\n\r\nconst RESPONSE_TYPES = {\r\n  collection: \"ODataCollectionResponse\",\r\n  model: \"ODataModelResponse\",\r\n  value: \"ODataValueResponse\",\r\n};\r\n\r\nexport interface PropsAndOps extends Required<Pick<ClassDeclarationStructure, \"properties\" | \"methods\">> {}\r\n\r\nexport async function generateServices(\r\n  dataModel: DataModel,\r\n  project: ProjectManager,\r\n  version: ODataVersions,\r\n  namingHelper: NamingHelper\r\n) {\r\n  const generator = new ServiceGenerator(dataModel, project, version, namingHelper);\r\n  return generator.generate();\r\n}\r\n\r\nclass ServiceGenerator {\r\n  constructor(\r\n    private dataModel: DataModel,\r\n    private project: ProjectManager,\r\n    private version: ODataVersions,\r\n    private namingHelper: NamingHelper\r\n  ) {}\r\n\r\n  public async generate(): Promise<void> {\r\n    const sourceFile = await this.project.createMainServiceFile();\r\n    const serviceName = this.namingHelper.getMainServiceName();\r\n    const container = this.dataModel.getEntityContainer();\r\n    const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];\r\n\r\n    await this.generateModelServices();\r\n\r\n    const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n    importContainer.addFromClientApi(\"ODataClient\");\r\n    importContainer.addFromService(ROOT_SERVICE);\r\n\r\n    const { properties, methods }: PropsAndOps = deepmerge(\r\n      this.generateMainServiceProperties(container, importContainer),\r\n      this.generateMainServiceOperations(unboundOperations, importContainer)\r\n    );\r\n\r\n    sourceFile.addClass({\r\n      isExported: true,\r\n      name: serviceName,\r\n      typeParameters: [\"ClientType extends ODataClient\"],\r\n      extends: `${ROOT_SERVICE}<ClientType>`,\r\n      properties /*: [\r\n        {\r\n          scope: Scope.Private,\r\n          name: this.namingHelper.getPrivatePropName(\"name\"),\r\n          type: \"string\",\r\n          initializer: `\"${this.namingHelper.getODataServiceName()}\"`,\r\n        },\r\n      ]*/,\r\n      methods,\r\n    });\r\n\r\n    sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));\r\n  }\r\n\r\n  private generateMainServiceProperties(\r\n    container: EntityContainerModel,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    Object.values(container.entitySets).forEach(({ name, entityType }) => {\r\n      result.methods.push(this.generateRelatedServiceGetter(name, entityType, importContainer));\r\n    });\r\n\r\n    Object.values(container.singletons).forEach((singleton) => {\r\n      result.properties.push(this.generateSingletonProp(singleton, importContainer));\r\n      result.methods.push(this.generateSingletonGetter(singleton));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateMainServiceOperations(\r\n    ops: Array<FunctionImportType | ActionImportType>,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    ops.forEach(({ operation, name }) => {\r\n      result.properties.push(this.generateQOperationProp(operation));\r\n      result.methods.push(this.generateMethod(name, operation, importContainer));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateRelatedServiceGetter(\r\n    propName: string,\r\n    entityType: ModelType,\r\n    importContainer: ImportContainer,\r\n    currentServiceName?: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const idName = entityType.idModelName;\r\n    const idFunctionName = entityType.qIdFunctionName;\r\n    const serviceName = this.namingHelper.getServiceName(entityType.name);\r\n    const collectionName = this.namingHelper.getCollectionServiceName(entityType.name);\r\n\r\n    importContainer.addFromClientApi(\"ODataClient\");\r\n    importContainer.addGeneratedModel(idName);\r\n    importContainer.addGeneratedQObject(idFunctionName);\r\n    // make sure to not falsely import self-referential stuff\r\n    if (!currentServiceName || currentServiceName !== serviceName) {\r\n      importContainer.addGeneratedService(serviceName, collectionName, serviceName);\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(propName),\r\n      parameters: [\r\n        {\r\n          name: \"id\",\r\n          type: `${idName} | undefined`,\r\n          hasQuestionToken: true,\r\n        },\r\n      ],\r\n      overloads: [\r\n        {\r\n          parameters: [],\r\n          returnType: `${collectionName}<ClientType>`,\r\n        },\r\n        {\r\n          parameters: [\r\n            {\r\n              name: \"id\",\r\n              type: idName,\r\n            },\r\n          ],\r\n          returnType: `${serviceName}<ClientType>`,\r\n        },\r\n      ],\r\n      statements: [\r\n        `const fieldName = \"${propName}\";`,\r\n        'return typeof id === \"undefined\" || id === null',\r\n        `? new ${collectionName}(this.client, this.getPath(), fieldName)`,\r\n        `: new ${serviceName}(this.client, this.getPath(), new ${idFunctionName}(fieldName).buildUrl(id));`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private generateSingletonProp(\r\n    singleton: SingletonType,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure> {\r\n    const { name, entityType } = singleton;\r\n    const type = this.namingHelper.getServiceName(entityType.name);\r\n\r\n    importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), type);\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(name),\r\n      type: `${type}<ClientType>`,\r\n      hasQuestionToken: true,\r\n    };\r\n  }\r\n\r\n  private generateQOperationProp = (operation: OperationType) => {\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(operation.qName),\r\n      type: operation.qName,\r\n      hasQuestionToken: true,\r\n    };\r\n  };\r\n\r\n  private generateSingletonGetter(singleton: SingletonType): OptionalKind<MethodDeclarationStructure> {\r\n    const { name, odataName, entityType } = singleton;\r\n    const propName = \"this.\" + this.namingHelper.getPrivatePropName(name);\r\n    const serviceType = this.namingHelper.getServiceName(entityType.name);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(name),\r\n      statements: [\r\n        `if(!${propName}) {`,\r\n        // prettier-ignore\r\n        `  ${propName} = new ${serviceType}(this.client, this.getPath(), \"${odataName}\")`,\r\n        \"}\",\r\n        `return ${propName}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private getVersionSuffix() {\r\n    return this.version === ODataVersions.V2 ? \"V2\" : \"V4\";\r\n  }\r\n\r\n  private async generateEntityTypeService(\r\n    model: ComplexType,\r\n    serviceName: string,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const entityServiceType = \"EntityTypeService\" + this.getVersionSuffix();\r\n\r\n    const editableModelName = model.editableName;\r\n    const qObjectName = firstCharLowerCase(model.qName);\r\n    const operations = this.dataModel.getOperationTypeByBinding(model.name);\r\n    const props = [...model.baseProps, ...model.props];\r\n\r\n    importContainer.addFromService(entityServiceType);\r\n    importContainer.addFromClientApi(\"ODataClient\");\r\n    importContainer.addGeneratedModel(model.name, editableModelName);\r\n    importContainer.addGeneratedQObject(model.qName, qObjectName);\r\n\r\n    const { properties, methods }: PropsAndOps = deepmerge(\r\n      this.generateServiceProperties(serviceName, props, importContainer),\r\n      this.generateServiceOperations(operations, importContainer)\r\n    );\r\n\r\n    // generate EntityTypeService\r\n    serviceFile.addClass({\r\n      isExported: true,\r\n      name: serviceName,\r\n      typeParameters: [\"ClientType extends ODataClient\"],\r\n      extends: entityServiceType + `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}>`,\r\n      ctors: [\r\n        {\r\n          parameters: [\r\n            { name: \"client\", type: \"ClientType\" },\r\n            { name: \"basePath\", type: \"string\" },\r\n            { name: \"name\", type: \"string\" },\r\n          ],\r\n          statements: [`super(client, basePath, name, ${qObjectName});`],\r\n        },\r\n      ],\r\n      properties,\r\n      methods,\r\n    });\r\n  }\r\n\r\n  private generateServiceProperties(\r\n    serviceName: string,\r\n    props: Array<PropertyModel>,\r\n    importContainer: ImportContainer\r\n  ): PropsAndOps {\r\n    const collectionServiceType = \"CollectionService\" + this.getVersionSuffix();\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    props.forEach((prop) => {\r\n      if ((prop.dataType === DataTypes.ModelType && !prop.isCollection) || prop.dataType === DataTypes.ComplexType) {\r\n        result.properties.push(this.generateModelProp(prop, collectionServiceType, serviceName, importContainer));\r\n        result.methods.push(this.generateModelPropGetter(prop, collectionServiceType));\r\n      } else if (prop.isCollection) {\r\n        // collection of entity types\r\n        if (prop.dataType === DataTypes.ModelType) {\r\n          const entityType = this.dataModel.getModel(prop.type);\r\n          result.methods.push(this.generateRelatedServiceGetter(prop.name, entityType, importContainer, serviceName));\r\n        }\r\n        // collection of primitive or complex types\r\n        else {\r\n          result.properties.push(this.generatePrimitiveCollectionProp(prop, collectionServiceType, importContainer));\r\n          result.methods.push(this.generatePrimitiveCollectionGetter(prop, collectionServiceType));\r\n        }\r\n      }\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateServiceOperations(operations: Array<OperationType>, importContainer: ImportContainer): PropsAndOps {\r\n    const result: PropsAndOps = { properties: [], methods: [] };\r\n\r\n    operations.forEach((operation) => {\r\n      result.properties.push(this.generateQOperationProp(operation));\r\n      result.methods.push(this.generateMethod(operation.name, operation, importContainer));\r\n    });\r\n\r\n    return result;\r\n  }\r\n\r\n  private generateModelProp(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string,\r\n    serviceName: string,\r\n    importContainer: ImportContainer\r\n  ): PropertyDeclarationStructure {\r\n    const complexType = this.dataModel.getComplexType(prop.type);\r\n    const key = this.namingHelper.getServiceName(prop.type);\r\n    let propModelType = prop.isCollection ? this.namingHelper.getCollectionServiceName(prop.type) : key;\r\n\r\n    if (prop.isCollection && complexType) {\r\n      const editableName = complexType.editableName;\r\n      importContainer.addFromService(collectionServiceType);\r\n      importContainer.addGeneratedModel(complexType.name, editableName);\r\n      importContainer.addGeneratedQObject(complexType.qName, firstCharLowerCase(complexType.qName));\r\n      propModelType = `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${editableName}>`;\r\n    } else {\r\n      // don't include imports for this type\r\n      if (serviceName !== key) {\r\n        importContainer.addGeneratedService(key, propModelType);\r\n      }\r\n\r\n      propModelType = `${propModelType}<ClientType>`;\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(prop.name),\r\n      type: propModelType,\r\n      hasQuestionToken: true,\r\n    } as PropertyDeclarationStructure;\r\n  }\r\n\r\n  private generatePrimitiveCollectionProp(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<PropertyDeclarationStructure> {\r\n    const isEnum = prop.dataType === DataTypes.EnumType;\r\n    const type = isEnum ? `EnumCollection<${prop.type}>` : `${upperCaseFirst(prop.type)}Collection`;\r\n    const qType = isEnum ? \"QEnumCollection\" : `Q${type}`;\r\n    const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;\r\n\r\n    if (!prop.qObject) {\r\n      throw new Error(\"Illegal State: [qObject] must be provided for Collection types!\");\r\n    }\r\n\r\n    importContainer.addFromService(collectionServiceType);\r\n    importContainer.addFromQObject(prop.qObject, firstCharLowerCase(prop.qObject));\r\n    if (isEnum) {\r\n      importContainer.addGeneratedModel(prop.type);\r\n      importContainer.addFromQObject(\"EnumCollection\");\r\n    } else {\r\n      importContainer.addFromQObject(type);\r\n    }\r\n\r\n    return {\r\n      scope: Scope.Private,\r\n      name: this.namingHelper.getPrivatePropName(prop.name),\r\n      type: `${collectionType}`,\r\n      hasQuestionToken: true,\r\n    };\r\n  }\r\n\r\n  private generateModelPropGetter(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const complexType = this.dataModel.getComplexType(prop.type);\r\n    const isComplexCollection = prop.isCollection && complexType;\r\n    const type = isComplexCollection\r\n      ? collectionServiceType\r\n      : prop.isCollection\r\n      ? this.namingHelper.getCollectionServiceName(prop.type)\r\n      : this.namingHelper.getServiceName(prop.type);\r\n    const typeWithGenerics = isComplexCollection\r\n      ? `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${complexType.editableName}>`\r\n      : `${type}<ClientType>`;\r\n\r\n    const privateSrvProp = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n      returnType: typeWithGenerics,\r\n      statements: [\r\n        `if(!${privateSrvProp}) {`,\r\n        // prettier-ignore\r\n        `  ${privateSrvProp} = new ${type}(this.client, this.getPath(), \"${prop.odataName}\"${isComplexCollection ? `, ${firstCharLowerCase(complexType.qName)}`: \"\"})`,\r\n        \"}\",\r\n        `return ${privateSrvProp}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private generatePrimitiveCollectionGetter(\r\n    prop: PropertyModel,\r\n    collectionServiceType: string\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\r\n    return {\r\n      scope: Scope.Public,\r\n      name: this.namingHelper.getRelatedServiceGetter(prop.name),\r\n      statements: [\r\n        `if(!${propName}) {`,\r\n        // prettier-ignore\r\n        `  ${propName} = new ${collectionServiceType}(this.client, this.getPath(), \"${prop.odataName}\", ${firstCharLowerCase(prop.qObject!)})`,\r\n        \"}\",\r\n        `return ${propName}`,\r\n      ],\r\n    };\r\n  }\r\n\r\n  private async generateEntityCollectionService(\r\n    model: ModelType,\r\n    serviceFile: SourceFile,\r\n    importContainer: ImportContainer\r\n  ) {\r\n    const entitySetServiceType = \"EntitySetService\" + this.getVersionSuffix();\r\n    const editableModelName = model.editableName;\r\n    const qObjectName = firstCharLowerCase(model.qName);\r\n\r\n    importContainer.addFromService(entitySetServiceType);\r\n    importContainer.addGeneratedModel(model.idModelName);\r\n    importContainer.addGeneratedQObject(model.qIdFunctionName);\r\n\r\n    const collectionOperations = this.dataModel.getOperationTypeByBinding(`Collection(${model.name})`);\r\n\r\n    const { properties, methods } = this.generateServiceOperations(collectionOperations, importContainer);\r\n\r\n    serviceFile.addClass({\r\n      isExported: true,\r\n      name: this.namingHelper.getCollectionServiceName(model.name),\r\n      typeParameters: [\"ClientType extends ODataClient\"],\r\n      extends:\r\n        entitySetServiceType +\r\n        `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}, ${model.idModelName}>`,\r\n      ctors: [\r\n        {\r\n          parameters: [\r\n            { name: \"client\", type: \"ClientType\" },\r\n            { name: \"basePath\", type: \"string\" },\r\n            { name: \"name\", type: \"string\" },\r\n          ],\r\n          statements: [`super(client, basePath, name, ${qObjectName}, new ${model.qIdFunctionName}(name));`],\r\n        },\r\n      ],\r\n      properties,\r\n      methods,\r\n    });\r\n  }\r\n\r\n  private async generateModelServices() {\r\n    // build service file for each entity, consisting of EntityTypeService & EntityCollectionService\r\n    for (const model of this.dataModel.getModels()) {\r\n      const serviceName = this.namingHelper.getServiceName(model.name);\r\n      const serviceFile = await this.project.createServiceFile(serviceName);\r\n      const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n\r\n      // entity type service\r\n      await this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);\r\n\r\n      // entity collection service\r\n      await this.generateEntityCollectionService(model, serviceFile, importContainer);\r\n\r\n      serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));\r\n    }\r\n\r\n    // build service file for complex types\r\n    for (const model of this.dataModel.getComplexTypes()) {\r\n      const serviceName = this.namingHelper.getServiceName(model.name);\r\n      const serviceFile = await this.project.createServiceFile(serviceName);\r\n      const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n\r\n      // entity type service\r\n      await this.generateEntityTypeService(model, serviceName, serviceFile, importContainer);\r\n      serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));\r\n    }\r\n  }\r\n\r\n  private generateMethod(\r\n    name: string,\r\n    operation: OperationType,\r\n    importContainer: ImportContainer\r\n  ): OptionalKind<MethodDeclarationStructure> {\r\n    const isFunc = operation.type === OperationTypes.Function;\r\n    const odataType = operation.returnType?.isCollection\r\n      ? RESPONSE_TYPES.collection + this.getVersionSuffix()\r\n      : operation.returnType?.dataType === DataTypes.PrimitiveType\r\n      ? RESPONSE_TYPES.value + this.getVersionSuffix()\r\n      : RESPONSE_TYPES.model + this.getVersionSuffix();\r\n    const returnType = operation.returnType;\r\n    const requestConfigParam = { name: \"requestConfig\", hasQuestionToken: true, type: \"ODataClientConfig<ClientType>\" };\r\n    const hasParams = operation.parameters.length > 0;\r\n\r\n    // importing dependencies\r\n    importContainer.addFromClientApi(\"ODataClientConfig\", \"ODataResponse\");\r\n    importContainer.addFromCore(odataType);\r\n    if (returnType?.type) {\r\n      if ([DataTypes.EnumType, DataTypes.ModelType, DataTypes.ComplexType].includes(returnType.dataType)) {\r\n        importContainer.addGeneratedModel(returnType.type);\r\n      }\r\n    }\r\n    importContainer.addGeneratedQObject(operation.qName);\r\n    if (hasParams) {\r\n      importContainer.addGeneratedModel(operation.paramsModelName);\r\n    }\r\n\r\n    const qOpProp = \"this.\" + this.namingHelper.getPrivatePropName(operation.qName);\r\n\r\n    return {\r\n      scope: Scope.Public,\r\n      isAsync: true,\r\n      name,\r\n      parameters: hasParams\r\n        ? [{ name: \"params\", type: operation.paramsModelName }, requestConfigParam]\r\n        : [requestConfigParam],\r\n      returnType: `ODataResponse<${odataType}<${returnType?.type || \"void\"}>>`,\r\n      statements: [\r\n        `if(!${qOpProp}) {`,\r\n        `  ${qOpProp} = new ${operation.qName}()`,\r\n        \"}\",\r\n\r\n        `const url = this.addFullPath(${qOpProp}.buildUrl(${isFunc && hasParams ? \"params\" : \"\"}));`,\r\n        `${returnType ? \"const response = await \" : \"return\"} this.client.${\r\n          !isFunc\r\n            ? // actions: since V4\r\n              `post(url, ${hasParams ? `${qOpProp}.convertUserParams(params)` : \"{}\"}, ${requestConfigParam.name})`\r\n            : operation.usePost\r\n            ? // V2 POST => BUT values are still query params, they are not part of the request body\r\n              `post(url, undefined, ${requestConfigParam.name})`\r\n            : // functions: since V2\r\n              `get(url, ${requestConfigParam.name})`\r\n        };`,\r\n        returnType ? `return ${qOpProp}.convertResponse(response);` : \"\",\r\n      ],\r\n    };\r\n  }\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odata2ts/odata2ts",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "publishConfig": {
     "access": "public"
   },
@@ -47,7 +47,7 @@
   "peerDependencies": {
     "@odata2ts/odata-client-api": "^0.6.3",
     "@odata2ts/odata-query-objects": "^0.17.3",
-    "@odata2ts/odata-service": "^0.13.9"
+    "@odata2ts/odata-service": "^0.14.0"
   },
   "dependencies": {
     "@odata2ts/converter-api": "^0.1.2",
@@ -73,7 +73,7 @@
     "@odata2ts/converter-v2-to-v4": "^0.1.4",
     "@odata2ts/odata-client-api": "^0.6.3",
     "@odata2ts/odata-query-objects": "^0.17.3",
-    "@odata2ts/odata-service": "^0.13.9",
+    "@odata2ts/odata-service": "^0.14.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.23",
@@ -87,6 +87,6 @@
     "typescript": "^4.9.4"
   },
   "types": "./lib/index.d.ts",
-  "gitHead": "f58b15c1d3239f3a16f56aec2811fa4071b0789e",
+  "gitHead": "420744615c73f04791c365869ad0258cd4a9d237",
   "readme": "README.md"
 }