@odata2ts/odata2ts 0.29.1 → 0.31.0

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

@@ -1 +1 @@
-{"version":3,"file":"DataTypeModel.js","sourceRoot":"","sources":["../../src/data-model/DataTypeModel.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,0BAAU,CAAA;IACV,0BAAU,CAAA;AACZ,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\n\r\nexport enum ODataVersion {\r\n  V2 = \"2.0\",\r\n  V4 = \"4.0\",\r\n}\r\n\r\nexport const enum DataTypes {\r\n  PrimitiveType = \"PrimitiveType\",\r\n  EnumType = \"EnumType\",\r\n  ComplexType = \"ComplexType\",\r\n  ModelType = \"ModelType\",\r\n}\r\n\r\nexport const enum OperationTypes {\r\n  Function = \"Function\",\r\n  Action = \"Action\",\r\n}\r\n\r\nexport interface PropertyModel {\r\n  odataName: string;\r\n  name: string;\r\n  odataType: string;\r\n  type: string;\r\n  typeModule?: string;\r\n  qObject?: string;\r\n  qPath: string;\r\n  qParam?: string;\r\n  required: boolean;\r\n  isCollection: boolean;\r\n  dataType: DataTypes;\r\n  converters?: Array<ValueConverterImport>;\r\n  managed?: boolean;\r\n}\r\n\r\nexport interface ModelType extends ComplexType {\r\n  idModelName: string;\r\n  qIdFunctionName: string;\r\n  generateId: boolean;\r\n  keyNames: Array<string>;\r\n  keys: Array<PropertyModel>;\r\n  getKeyUnion(): string;\r\n}\r\n\r\nexport interface ComplexType {\r\n  odataName: string;\r\n  name: string;\r\n  editableName: string;\r\n  qName: string;\r\n  props: Array<PropertyModel>;\r\n  baseProps: Array<PropertyModel>;\r\n  baseClasses: Array<string>;\r\n}\r\n\r\nexport interface EnumType {\r\n  odataName: string;\r\n  name: string;\r\n  members: Array<string>;\r\n}\r\n\r\nexport interface OperationType {\r\n  odataName: string;\r\n  name: string;\r\n  paramsModelName: string;\r\n  qName: string;\r\n  type: OperationTypes;\r\n  parameters: Array<PropertyModel>;\r\n  returnType?: ReturnTypeModel;\r\n  usePost?: boolean;\r\n}\r\n\r\nexport interface ReturnTypeModel extends PropertyModel {}\r\n\r\nexport type EntityContainerModel = {\r\n  entitySets: { [name: string]: EntitySetType };\r\n  singletons: { [name: string]: SingletonType };\r\n  functions: { [name: string]: FunctionImportType };\r\n  actions: { [name: string]: ActionImportType };\r\n};\r\n\r\nexport interface SingletonType {\r\n  odataName: string;\r\n  name: string;\r\n  entityType: ModelType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface EntitySetType {\r\n  odataName: string;\r\n  name: string;\r\n  entityType: ModelType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface NavPropBindingType {\r\n  path: string;\r\n  target: string;\r\n}\r\n\r\nexport interface ActionImportType {\r\n  odataName: string;\r\n  name: string;\r\n  operation: OperationType;\r\n}\r\n\r\nexport interface FunctionImportType extends ActionImportType {\r\n  entitySet: string;\r\n}\r\n"]}
+{"version":3,"file":"DataTypeModel.js","sourceRoot":"","sources":["../../src/data-model/DataTypeModel.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,0BAAU,CAAA;IACV,0BAAU,CAAA;AACZ,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\n\nexport enum ODataVersion {\n  V2 = \"2.0\",\n  V4 = \"4.0\",\n}\n\nexport const enum DataTypes {\n  PrimitiveType = \"PrimitiveType\",\n  EnumType = \"EnumType\",\n  ComplexType = \"ComplexType\",\n  ModelType = \"ModelType\",\n}\n\nexport const enum OperationTypes {\n  Function = \"Function\",\n  Action = \"Action\",\n}\n\nexport interface PropertyModel {\n  odataName: string;\n  name: string;\n  odataType: string;\n  fqType: string;\n  type: string;\n  typeModule?: string;\n  qObject?: string;\n  qPath: string;\n  qParam?: string;\n  required: boolean;\n  isCollection: boolean;\n  dataType: DataTypes;\n  converters?: Array<ValueConverterImport>;\n  managed?: boolean;\n}\n\nexport interface ModelType extends ComplexType {\n  idModelName: string;\n  qIdFunctionName: string;\n  generateId: boolean;\n  keyNames: Array<string>;\n  keys: Array<PropertyModel>;\n  getKeyUnion(): string;\n}\n\nexport interface ComplexType {\n  dataType: DataTypes;\n  fqName: string;\n  odataName: string;\n  name: string;\n  editableName: string;\n  qName: string;\n  props: Array<PropertyModel>;\n  baseProps: Array<PropertyModel>;\n  baseClasses: Array<string>;\n}\n\nexport interface EnumType {\n  dataType: DataTypes;\n  fqName: string;\n  odataName: string;\n  name: string;\n  members: Array<string>;\n}\n\nexport interface OperationType {\n  fqName: string;\n  odataName: string;\n  name: string;\n  paramsModelName: string;\n  qName: string;\n  type: OperationTypes;\n  parameters: Array<PropertyModel>;\n  returnType?: ReturnTypeModel;\n  usePost?: boolean;\n}\n\nexport interface ReturnTypeModel extends PropertyModel {}\n\nexport type EntityContainerModel = {\n  entitySets: { [name: string]: EntitySetType };\n  singletons: { [name: string]: SingletonType };\n  functions: { [name: string]: FunctionImportType };\n  actions: { [name: string]: ActionImportType };\n};\n\nexport interface SingletonType {\n  fqName: string;\n  odataName: string;\n  name: string;\n  entityType: ModelType;\n  navPropBinding?: Array<NavPropBindingType>;\n}\n\nexport interface EntitySetType {\n  fqName: string;\n  odataName: string;\n  name: string;\n  entityType: ModelType;\n  navPropBinding?: Array<NavPropBindingType>;\n}\n\nexport interface NavPropBindingType {\n  path: string;\n  target: string;\n}\n\nexport interface ActionImportType {\n  fqName: string;\n  odataName: string;\n  name: string;\n  operation: string;\n}\n\nexport interface FunctionImportType extends ActionImportType {\n  entitySet: string;\n}\n"]}

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

@@ -1,13 +1,13 @@
 import { RunOptions } from "../OptionModel";
-import { PropertyModel } from "./DataTypeModel";
+import { NamespaceWithAlias } from "./DataModel";
 export interface NamingHelperSettings extends Pick<RunOptions, "allowRenaming" | "naming"> {
 }
 export declare class NamingHelper {
     private readonly allowModelPropRenaming;
     private readonly mainServiceName;
-    private readonly servicePrefixes;
+    private readonly namespacePrefixes;
     private readonly options;
-    constructor(options: NamingHelperSettings, mainServiceName: string, serviceNames?: Array<string>);
+    constructor(options: NamingHelperSettings, mainServiceName: string, namespaces?: Array<NamespaceWithAlias>);
     /**
      * The prefix used to reference model or enum types in this schema.
      *
@@ -40,12 +40,12 @@ export declare class NamingHelper {
     getEnumName(name: string): string;
     getEditableModelName(name: string): string;
     getIdModelName(name: string): string;
-    getOperationParamsModelName(operationName: string, boundEntity?: PropertyModel | undefined): string;
+    getOperationParamsModelName(operationName: string, boundEntity?: string): string;
     getQName(name: string): string;
     getQPropName(name: string): string;
     getQIdFunctionName(name: string): string;
-    getQFunctionName(operationName: string, boundEntity?: PropertyModel | undefined): string;
-    getQActionName(operationName: string, boundEntity?: PropertyModel | undefined): string;
+    getQFunctionName(operationName: string, boundEntity?: string): string;
+    getQActionName(operationName: string, boundEntity?: string): string;
     getMainServiceName(): string;
     getServiceName: (name: string) => string;
     getCollectionServiceName: (name: string) => string;

package/lib/data-model/NamingHelper.js

@@ -24,7 +24,7 @@ const noopNamingFunction = (value, options) => {
     return ((options === null || options === void 0 ? void 0 : options.prefix) || "") + value + ((options === null || options === void 0 ? void 0 : options.suffix) || "");
 };
 class NamingHelper {
-    constructor(options, mainServiceName, serviceNames) {
+    constructor(options, mainServiceName, namespaces) {
         var _a;
         this.getServiceName = (name) => {
             const opts = this.options.services;
@@ -48,13 +48,20 @@ class NamingHelper {
         if (!(mainServiceName === null || mainServiceName === void 0 ? void 0 : mainServiceName.trim())) {
             throw new Error("NamingHelper: MainServiceName must be supplied!");
         }
-        if (!(serviceNames === null || serviceNames === void 0 ? void 0 : serviceNames.length)) {
-            serviceNames = [mainServiceName];
+        if (!(namespaces === null || namespaces === void 0 ? void 0 : namespaces.length)) {
+            namespaces = [[mainServiceName]];
         }
         this.allowModelPropRenaming = (_a = options.allowRenaming) !== null && _a !== void 0 ? _a : false;
         this.options = options.naming;
         this.mainServiceName = mainServiceName;
-        this.servicePrefixes = serviceNames
+        this.namespacePrefixes = namespaces
+            .reduce((accu, [ns, alias]) => {
+            accu.push(ns);
+            if (alias) {
+                accu.push(alias);
+            }
+            return accu;
+        }, [])
             .map((sn) => sn + ".")
             .sort((a, b) => (a.length === b.length ? 0 : a.length > b.length ? -1 : 1));
     }
@@ -64,7 +71,7 @@ class NamingHelper {
      * @returns service prefix
      */
     includesServicePrefix(name) {
-        for (let prefix of this.servicePrefixes) {
+        for (let prefix of this.namespacePrefixes) {
             if (name.startsWith(prefix)) {
                 return true;
             }
@@ -95,7 +102,7 @@ class NamingHelper {
         return this.getName(name, this.namingFunction(opts === null || opts === void 0 ? void 0 : opts.namingStrategy), opts);
     }
     stripServicePrefix(token) {
-        const found = this.servicePrefixes.find((prefix) => token.startsWith(prefix));
+        const found = this.namespacePrefixes.find((prefix) => token.startsWith(prefix));
         return found ? token.replace(found, "") : token;
     }
     namingFunction(strategy) {
@@ -210,7 +217,7 @@ class NamingHelper {
         return ((_d = opts === null || opts === void 0 ? void 0 : opts.main) === null || _d === void 0 ? void 0 : _d.applyServiceNaming) ? this.getName(result, strategy, opts) : result;
     }
     getPrefixedName(name, boundEntity) {
-        return (boundEntity === null || boundEntity === void 0 ? void 0 : boundEntity.type) ? boundEntity.type + "_" + name : name;
+        return boundEntity ? boundEntity + "_" + name : name;
     }
     getFunctionName(operationName) {
         var _a;

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

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

@@ -1,21 +1,30 @@
 import { DigestionOptions } from "../FactoryFunctionModel";
-import { EntityGenerationOptions, PropertyGenerationOptions } from "../OptionModel";
+import { EntityGenerationOptions, OperationGenerationOptions, PropertyGenerationOptions } from "../OptionModel";
+import { NamespaceWithAlias } from "./DataModel";
 export interface ConfiguredProp extends Omit<PropertyGenerationOptions, "name"> {
 }
 export interface ConfiguredEntity extends Omit<EntityGenerationOptions, "name"> {
 }
+export interface ConfiguredOperation extends Omit<OperationGenerationOptions, "name"> {
+}
 export declare class ServiceConfigHelper {
     private propMapping;
     private entityMapping;
+    private operationMapping;
     private propRegExps;
     private entityRegExps;
+    private operationRegExps;
     constructor(options: DigestionOptions);
     private evaluateProps;
     private getPropByName;
     private getPropByRegExp;
-    findConfigPropByName: (name: string) => ConfiguredProp | undefined;
+    findPropConfigByName: (name: string) => ConfiguredProp | undefined;
     private evaluateEntities;
     private getEntityByName;
     private getEntityByRegExp;
-    findConfigEntityByName: (name: string) => ConfiguredEntity | undefined;
+    findEntityConfigByName: (namespace: NamespaceWithAlias, name: string) => ConfiguredEntity | undefined;
+    private evaluateOperations;
+    private getOperationByName;
+    private getOperationByRegExp;
+    findOperationConfigByName: (namespace: NamespaceWithAlias, name: string) => ConfiguredOperation | undefined;
 }

package/lib/data-model/ServiceConfigHelper.js

@@ -2,26 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceConfigHelper = void 0;
 const tslib_1 = require("tslib");
+const DataModel_1 = require("./DataModel");
 const EXCEPTION_NO_NAME = "No value for required attribute [name] specified!";
 const EXCEPTION_WRONG_NAME_TYPE = "Wrong type for attribute [name]! You have to supply either a plain string or a RegExp.";
 class ServiceConfigHelper {
     constructor(options) {
         this.propMapping = new Map();
         this.entityMapping = new Map();
+        this.operationMapping = new Map();
         this.propRegExps = [];
         this.entityRegExps = [];
-        this.findConfigPropByName = (name) => {
+        this.operationRegExps = [];
+        this.findPropConfigByName = (name) => {
             const stringProp = this.getPropByName(name);
             const reProp = this.getPropByRegExp(name);
             return stringProp && reProp ? Object.assign(Object.assign({}, reProp), stringProp) : stringProp || reProp;
         };
-        this.findConfigEntityByName = (name) => {
-            const stringEnt = this.getEntityByName(name);
-            const reEnt = this.getEntityByRegExp(name);
+        this.findEntityConfigByName = (namespace, name) => {
+            const stringEnt = this.getEntityByName(namespace, name);
+            const reEnt = this.getEntityByRegExp(namespace, name);
+            return stringEnt && reEnt ? Object.assign(Object.assign({}, reEnt), stringEnt) : stringEnt || reEnt;
+        };
+        this.findOperationConfigByName = (namespace, name) => {
+            const stringEnt = this.getOperationByName(namespace, name);
+            const reEnt = this.getOperationByRegExp(namespace, name);
             return stringEnt && reEnt ? Object.assign(Object.assign({}, reEnt), stringEnt) : stringEnt || reEnt;
         };
         this.evaluateProps(options);
         this.evaluateEntities(options);
+        this.evaluateOperations(options);
     }
     evaluateProps(options) {
         options.propertiesByName.forEach((prop) => {
@@ -88,20 +97,73 @@ class ServiceConfigHelper {
             }
         });
     }
-    getEntityByName(nameToMap) {
-        const stringProp = this.entityMapping.get(nameToMap);
-        if (!stringProp) {
+    // get entity config by name matching: simple name or fully qualified name (alias also supported)
+    getEntityByName(namespace, nameToMap) {
+        const [ns, alias] = namespace;
+        const config = this.entityMapping.get((0, DataModel_1.withNamespace)(ns, nameToMap)) ||
+            (alias ? this.entityMapping.get((0, DataModel_1.withNamespace)(alias, nameToMap)) : undefined) ||
+            this.entityMapping.get(nameToMap);
+        if (!config) {
             return;
         }
-        const { name } = stringProp, attrs = tslib_1.__rest(stringProp, ["name"]);
+        const { name } = config, attrs = tslib_1.__rest(config, ["name"]);
         return Object.assign({}, attrs);
     }
-    getEntityByRegExp(nameToMap) {
+    getEntityByRegExp([mainNs, alias], nameToMap) {
+        const fqName = `${mainNs}.${nameToMap}`;
         const resultList = this.entityRegExps
-            .filter(([regExp]) => regExp.test(nameToMap))
+            .filter(([regExp]) => regExp.test(fqName))
             .map((_a) => {
             var [regExp, _b] = _a, { name, mappedName } = _b, attrs = tslib_1.__rest(_b, ["name", "mappedName"]);
-            return (Object.assign({ mappedName: mappedName ? nameToMap.replace(regExp, mappedName) : undefined }, attrs));
+            return (Object.assign({ mappedName: mappedName ? fqName.replace(regExp, mappedName) : undefined }, attrs));
+        });
+        return !resultList.length
+            ? undefined
+            : resultList.reduce((result, prop) => {
+                return Object.assign(Object.assign({}, result), prop);
+            }, {});
+    }
+    evaluateOperations(options) {
+        options.operationsByName.forEach((op) => {
+            if (!op.name) {
+                throw new Error(EXCEPTION_NO_NAME);
+            }
+            switch (typeof op.name) {
+                case "string":
+                    // TODO: check for existing operation name and throw?
+                    this.operationMapping.set(op.name, op);
+                    break;
+                case "object":
+                    const { source, ignoreCase } = op.name;
+                    if (!source) {
+                        throw new Error(EXCEPTION_WRONG_NAME_TYPE);
+                    }
+                    this.operationRegExps.push([new RegExp(`^${source}$`, ignoreCase ? "i" : ""), op]);
+                    break;
+                default:
+                    throw new Error(EXCEPTION_WRONG_NAME_TYPE);
+            }
+        });
+    }
+    // get entity config by name matching: simple name or fully qualified name (alias also supported)
+    getOperationByName(namespace, nameToMap) {
+        const [ns, alias] = namespace;
+        const config = this.operationMapping.get((0, DataModel_1.withNamespace)(ns, nameToMap)) ||
+            (alias ? this.operationMapping.get((0, DataModel_1.withNamespace)(alias, nameToMap)) : undefined) ||
+            this.operationMapping.get(nameToMap);
+        if (!config) {
+            return;
+        }
+        const { name } = config, attrs = tslib_1.__rest(config, ["name"]);
+        return Object.assign({}, attrs);
+    }
+    getOperationByRegExp([mainNs, alias], nameToMap) {
+        const fqName = `${mainNs}.${nameToMap}`;
+        const resultList = this.operationRegExps
+            .filter(([regExp]) => regExp.test(fqName))
+            .map((_a) => {
+            var [regExp, _b] = _a, { name, mappedName } = _b, attrs = tslib_1.__rest(_b, ["name", "mappedName"]);
+            return (Object.assign({ mappedName: mappedName ? fqName.replace(regExp, mappedName) : undefined }, attrs));
         });
         return !resultList.length
             ? undefined

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

@@ -1 +1 @@
-{"version":3,"file":"ServiceConfigHelper.js","sourceRoot":"","sources":["../../src/data-model/ServiceConfigHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import { DigestionOptions } from \"../FactoryFunctionModel\";\r\nimport { EntityGenerationOptions, PropertyGenerationOptions } from \"../OptionModel\";\r\n\r\nexport interface ConfiguredProp extends Omit<PropertyGenerationOptions, \"name\"> {}\r\nexport interface ConfiguredEntity extends Omit<EntityGenerationOptions, \"name\"> {}\r\n\r\nconst EXCEPTION_NO_NAME = \"No value for required attribute [name] specified!\";\r\nconst EXCEPTION_WRONG_NAME_TYPE =\r\n  \"Wrong type for attribute [name]! You have to supply either a plain string or a RegExp.\";\r\n\r\nexport class ServiceConfigHelper {\r\n  private propMapping = new Map<string, PropertyGenerationOptions>();\r\n  private entityMapping = new Map<string, EntityGenerationOptions>();\r\n  private propRegExps: Array<[RegExp, PropertyGenerationOptions]> = [];\r\n  private entityRegExps: Array<[RegExp, EntityGenerationOptions]> = [];\r\n\r\n  constructor(options: DigestionOptions) {\r\n    this.evaluateProps(options);\r\n    this.evaluateEntities(options);\r\n  }\r\n\r\n  private evaluateProps(options: DigestionOptions) {\r\n    options.propertiesByName.forEach((prop) => {\r\n      if (!prop.name) {\r\n        throw new Error(EXCEPTION_NO_NAME);\r\n      }\r\n      switch (typeof prop.name) {\r\n        case \"string\":\r\n          // TODO: check for existing prop.name and throw?\r\n          this.propMapping.set(prop.name, prop);\r\n          break;\r\n        case \"object\":\r\n          const { source, ignoreCase } = prop.name as RegExp;\r\n          if (!source) {\r\n            throw new Error(EXCEPTION_WRONG_NAME_TYPE);\r\n          }\r\n          this.propRegExps.push([new RegExp(`^${source}$`, ignoreCase ? \"i\" : \"\"), prop]);\r\n          break;\r\n        default:\r\n          throw new Error(EXCEPTION_WRONG_NAME_TYPE);\r\n      }\r\n    });\r\n  }\r\n\r\n  private getPropByName(nameToMap: string): ConfiguredProp | undefined {\r\n    const stringProp = this.propMapping.get(nameToMap);\r\n    if (!stringProp) {\r\n      return;\r\n    }\r\n    const { name, ...attrs } = stringProp;\r\n    return { ...attrs };\r\n  }\r\n\r\n  private getPropByRegExp(nameToMap: string): ConfiguredProp | undefined {\r\n    const resultList = this.propRegExps\r\n      .filter(([regExp]) => regExp.test(nameToMap))\r\n      .map(([regExp, { name, mappedName, ...attrs }]) => ({\r\n        mappedName: mappedName ? nameToMap.replace(regExp, mappedName) : undefined,\r\n        ...attrs,\r\n      }));\r\n\r\n    return !resultList.length\r\n      ? undefined\r\n      : resultList.reduce<ConfiguredProp>((result, prop) => {\r\n          return { ...result, ...prop };\r\n        }, {});\r\n  }\r\n\r\n  public findConfigPropByName = (name: string): ConfiguredProp | undefined => {\r\n    const stringProp = this.getPropByName(name);\r\n    const reProp = this.getPropByRegExp(name);\r\n\r\n    return stringProp && reProp ? { ...reProp, ...stringProp } : stringProp || reProp;\r\n  };\r\n\r\n  private evaluateEntities(options: DigestionOptions) {\r\n    options.entitiesByName.forEach((ent) => {\r\n      if (!ent.name) {\r\n        throw new Error(EXCEPTION_NO_NAME);\r\n      }\r\n      switch (typeof ent.name) {\r\n        case \"string\":\r\n          // TODO: check for existing prop.name and throw?\r\n          this.entityMapping.set(ent.name, ent);\r\n          break;\r\n        case \"object\":\r\n          const { source, ignoreCase } = ent.name as RegExp;\r\n          if (!source) {\r\n            throw new Error(EXCEPTION_WRONG_NAME_TYPE);\r\n          }\r\n          this.entityRegExps.push([new RegExp(`^${source}$`, ignoreCase ? \"i\" : \"\"), ent]);\r\n          break;\r\n        default:\r\n          throw new Error(EXCEPTION_WRONG_NAME_TYPE);\r\n      }\r\n    });\r\n  }\r\n\r\n  private getEntityByName(nameToMap: string): ConfiguredEntity | undefined {\r\n    const stringProp = this.entityMapping.get(nameToMap);\r\n    if (!stringProp) {\r\n      return;\r\n    }\r\n    const { name, ...attrs } = stringProp;\r\n    return { ...attrs };\r\n  }\r\n\r\n  private getEntityByRegExp(nameToMap: string): ConfiguredEntity | undefined {\r\n    const resultList = this.entityRegExps\r\n      .filter(([regExp]) => regExp.test(nameToMap))\r\n      .map(([regExp, { name, mappedName, ...attrs }]) => ({\r\n        mappedName: mappedName ? nameToMap.replace(regExp, mappedName) : undefined,\r\n        ...attrs,\r\n      }));\r\n\r\n    return !resultList.length\r\n      ? undefined\r\n      : resultList.reduce<ConfiguredEntity>((result, prop) => {\r\n          return { ...result, ...prop };\r\n        }, {});\r\n  }\r\n\r\n  public findConfigEntityByName = (name: string): ConfiguredEntity | undefined => {\r\n    const stringEnt = this.getEntityByName(name);\r\n    const reEnt = this.getEntityByRegExp(name);\r\n\r\n    return stringEnt && reEnt ? { ...reEnt, ...stringEnt } : stringEnt || reEnt;\r\n  };\r\n}\r\n"]}
+{"version":3,"file":"ServiceConfigHelper.js","sourceRoot":"","sources":["../../src/data-model/ServiceConfigHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import { DigestionOptions } from \"../FactoryFunctionModel\";\nimport { EntityGenerationOptions, OperationGenerationOptions, PropertyGenerationOptions } from \"../OptionModel\";\nimport { NamespaceWithAlias, withNamespace } from \"./DataModel\";\n\nexport interface ConfiguredProp extends Omit<PropertyGenerationOptions, \"name\"> {}\nexport interface ConfiguredEntity extends Omit<EntityGenerationOptions, \"name\"> {}\nexport interface ConfiguredOperation extends Omit<OperationGenerationOptions, \"name\"> {}\n\nconst EXCEPTION_NO_NAME = \"No value for required attribute [name] specified!\";\nconst EXCEPTION_WRONG_NAME_TYPE =\n  \"Wrong type for attribute [name]! You have to supply either a plain string or a RegExp.\";\n\nexport class ServiceConfigHelper {\n  private propMapping = new Map<string, PropertyGenerationOptions>();\n  private entityMapping = new Map<string, EntityGenerationOptions>();\n  private operationMapping = new Map<string, OperationGenerationOptions>();\n  private propRegExps: Array<[RegExp, PropertyGenerationOptions]> = [];\n  private entityRegExps: Array<[RegExp, EntityGenerationOptions]> = [];\n  private operationRegExps: Array<[RegExp, OperationGenerationOptions]> = [];\n\n  constructor(options: DigestionOptions) {\n    this.evaluateProps(options);\n    this.evaluateEntities(options);\n    this.evaluateOperations(options);\n  }\n\n  private evaluateProps(options: DigestionOptions) {\n    options.propertiesByName.forEach((prop) => {\n      if (!prop.name) {\n        throw new Error(EXCEPTION_NO_NAME);\n      }\n      switch (typeof prop.name) {\n        case \"string\":\n          // TODO: check for existing prop.name and throw?\n          this.propMapping.set(prop.name, prop);\n          break;\n        case \"object\":\n          const { source, ignoreCase } = prop.name as RegExp;\n          if (!source) {\n            throw new Error(EXCEPTION_WRONG_NAME_TYPE);\n          }\n          this.propRegExps.push([new RegExp(`^${source}$`, ignoreCase ? \"i\" : \"\"), prop]);\n          break;\n        default:\n          throw new Error(EXCEPTION_WRONG_NAME_TYPE);\n      }\n    });\n  }\n\n  private getPropByName(nameToMap: string): ConfiguredProp | undefined {\n    const stringProp = this.propMapping.get(nameToMap);\n    if (!stringProp) {\n      return;\n    }\n    const { name, ...attrs } = stringProp;\n    return { ...attrs };\n  }\n\n  private getPropByRegExp(nameToMap: string): ConfiguredProp | undefined {\n    const resultList = this.propRegExps\n      .filter(([regExp]) => regExp.test(nameToMap))\n      .map(([regExp, { name, mappedName, ...attrs }]) => ({\n        mappedName: mappedName ? nameToMap.replace(regExp, mappedName) : undefined,\n        ...attrs,\n      }));\n\n    return !resultList.length\n      ? undefined\n      : resultList.reduce<ConfiguredProp>((result, prop) => {\n          return { ...result, ...prop };\n        }, {});\n  }\n\n  public findPropConfigByName = (name: string): ConfiguredProp | undefined => {\n    const stringProp = this.getPropByName(name);\n    const reProp = this.getPropByRegExp(name);\n\n    return stringProp && reProp ? { ...reProp, ...stringProp } : stringProp || reProp;\n  };\n\n  private evaluateEntities(options: DigestionOptions) {\n    options.entitiesByName.forEach((ent) => {\n      if (!ent.name) {\n        throw new Error(EXCEPTION_NO_NAME);\n      }\n      switch (typeof ent.name) {\n        case \"string\":\n          // TODO: check for existing prop.name and throw?\n          this.entityMapping.set(ent.name, ent);\n          break;\n        case \"object\":\n          const { source, ignoreCase } = ent.name as RegExp;\n          if (!source) {\n            throw new Error(EXCEPTION_WRONG_NAME_TYPE);\n          }\n          this.entityRegExps.push([new RegExp(`^${source}$`, ignoreCase ? \"i\" : \"\"), ent]);\n          break;\n        default:\n          throw new Error(EXCEPTION_WRONG_NAME_TYPE);\n      }\n    });\n  }\n\n  // get entity config by name matching: simple name or fully qualified name (alias also supported)\n  private getEntityByName(namespace: NamespaceWithAlias, nameToMap: string): ConfiguredEntity | undefined {\n    const [ns, alias] = namespace;\n\n    const config =\n      this.entityMapping.get(withNamespace(ns, nameToMap)) ||\n      (alias ? this.entityMapping.get(withNamespace(alias, nameToMap)) : undefined) ||\n      this.entityMapping.get(nameToMap);\n    if (!config) {\n      return;\n    }\n    const { name, ...attrs } = config;\n    return { ...attrs };\n  }\n\n  private getEntityByRegExp([mainNs, alias]: NamespaceWithAlias, nameToMap: string): ConfiguredEntity | undefined {\n    const fqName = `${mainNs}.${nameToMap}`;\n    const resultList = this.entityRegExps\n      .filter(([regExp]) => regExp.test(fqName))\n      .map(([regExp, { name, mappedName, ...attrs }]) => ({\n        mappedName: mappedName ? fqName.replace(regExp, mappedName) : undefined,\n        ...attrs,\n      }));\n\n    return !resultList.length\n      ? undefined\n      : resultList.reduce<ConfiguredEntity>((result, prop) => {\n          return { ...result, ...prop };\n        }, {});\n  }\n\n  public findEntityConfigByName = (namespace: NamespaceWithAlias, name: string): ConfiguredEntity | undefined => {\n    const stringEnt = this.getEntityByName(namespace, name);\n    const reEnt = this.getEntityByRegExp(namespace, name);\n\n    return stringEnt && reEnt ? { ...reEnt, ...stringEnt } : stringEnt || reEnt;\n  };\n\n  private evaluateOperations(options: DigestionOptions) {\n    options.operationsByName.forEach((op) => {\n      if (!op.name) {\n        throw new Error(EXCEPTION_NO_NAME);\n      }\n      switch (typeof op.name) {\n        case \"string\":\n          // TODO: check for existing operation name and throw?\n          this.operationMapping.set(op.name, op);\n          break;\n        case \"object\":\n          const { source, ignoreCase } = op.name as RegExp;\n          if (!source) {\n            throw new Error(EXCEPTION_WRONG_NAME_TYPE);\n          }\n          this.operationRegExps.push([new RegExp(`^${source}$`, ignoreCase ? \"i\" : \"\"), op]);\n          break;\n        default:\n          throw new Error(EXCEPTION_WRONG_NAME_TYPE);\n      }\n    });\n  }\n\n  // get entity config by name matching: simple name or fully qualified name (alias also supported)\n  private getOperationByName(namespace: NamespaceWithAlias, nameToMap: string): ConfiguredOperation | undefined {\n    const [ns, alias] = namespace;\n\n    const config =\n      this.operationMapping.get(withNamespace(ns, nameToMap)) ||\n      (alias ? this.operationMapping.get(withNamespace(alias, nameToMap)) : undefined) ||\n      this.operationMapping.get(nameToMap);\n    if (!config) {\n      return;\n    }\n    const { name, ...attrs } = config;\n    return { ...attrs };\n  }\n\n  private getOperationByRegExp(\n    [mainNs, alias]: NamespaceWithAlias,\n    nameToMap: string\n  ): ConfiguredOperation | undefined {\n    const fqName = `${mainNs}.${nameToMap}`;\n    const resultList = this.operationRegExps\n      .filter(([regExp]) => regExp.test(fqName))\n      .map(([regExp, { name, mappedName, ...attrs }]) => ({\n        mappedName: mappedName ? fqName.replace(regExp, mappedName) : undefined,\n        ...attrs,\n      }));\n\n    return !resultList.length\n      ? undefined\n      : resultList.reduce<ConfiguredEntity>((result, prop) => {\n          return { ...result, ...prop };\n        }, {});\n  }\n\n  public findOperationConfigByName = (namespace: NamespaceWithAlias, name: string): ConfiguredOperation | undefined => {\n    const stringEnt = this.getOperationByName(namespace, name);\n    const reEnt = this.getOperationByRegExp(namespace, name);\n\n    return stringEnt && reEnt ? { ...reEnt, ...stringEnt } : stringEnt || reEnt;\n  };\n}\n"]}

package/lib/defaultConfig.js

@@ -95,6 +95,7 @@ const defaultConfig = {
     },
     propertiesByName: [],
     entitiesByName: [],
+    operationsByName: [],
 };
 const { models, queryObjects, services } = defaultConfig.naming;
 const minimalNamingConfig = {

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\nexport type DefaultConfiguration = Omit<RunOptions, \"sourceUrl\" | \"source\" | \"output\" | \"serviceName\">;\r\n/**\r\n * The default configuration.\r\n */\r\nconst defaultConfig: DefaultConfiguration = {\r\n  sourceUrlConfig: {},\r\n  refreshFile: false,\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  skipComments: false,\r\n  enablePrimitivePropertyServices: false,\r\n  disableAutoManagedKey: false,\r\n  allowRenaming: false,\r\n  v2ModelsWithExtraResultsWrapping: false,\r\n  v4BigNumberAsString: 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(): DefaultConfiguration {\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(): DefaultConfiguration {\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\";\n\nimport { NameSettings, NamingStrategies } from \"./NamingModel\";\nimport { EmitModes, Modes, RunOptions } from \"./OptionModel\";\n\nexport type DefaultConfiguration = Omit<RunOptions, \"sourceUrl\" | \"source\" | \"output\" | \"serviceName\">;\n/**\n * The default configuration.\n */\nconst defaultConfig: DefaultConfiguration = {\n  sourceUrlConfig: {},\n  refreshFile: false,\n  mode: Modes.all,\n  emitMode: EmitModes.js_dts,\n  debug: false,\n  prettier: false,\n  tsconfig: \"tsconfig.json\",\n  converters: [],\n  skipEditableModels: false,\n  skipIdModels: false,\n  skipOperations: false,\n  skipComments: false,\n  enablePrimitivePropertyServices: false,\n  disableAutoManagedKey: false,\n  allowRenaming: false,\n  v2ModelsWithExtraResultsWrapping: false,\n  v4BigNumberAsString: false,\n  naming: {\n    models: {\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\n      editableModels: {\n        prefix: \"Editable\",\n        suffix: \"\",\n        applyModelNaming: true,\n      },\n      idModels: {\n        prefix: \"\",\n        suffix: \"Id\",\n        applyModelNaming: true,\n      },\n      operationParamModels: {\n        prefix: \"\",\n        suffix: \"Params\",\n        applyModelNaming: true,\n      },\n      fileName: {\n        namingStrategy: NamingStrategies.PASCAL_CASE,\n        prefix: \"\",\n        suffix: \"Model\",\n      },\n    },\n    queryObjects: {\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\n      prefix: \"Q\",\n      suffix: \"\",\n      idFunctions: {\n        prefix: \"\",\n        suffix: \"Id\",\n      },\n      fileName: {\n        namingStrategy: NamingStrategies.PASCAL_CASE,\n        prefix: \"Q\",\n        suffix: \"\",\n      },\n    },\n    services: {\n      prefix: \"\",\n      suffix: \"Service\",\n      namingStrategy: NamingStrategies.PASCAL_CASE,\n      main: {\n        applyServiceNaming: true,\n      },\n      collection: {\n        prefix: \"\",\n        suffix: \"Collection\",\n        applyServiceNaming: true,\n      },\n      operations: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n      },\n      relatedServiceGetter: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n        prefix: \"\",\n        suffix: \"\",\n      },\n      privateProps: {\n        namingStrategy: NamingStrategies.CAMEL_CASE,\n        prefix: \"_\",\n        suffix: \"\",\n      },\n    },\n  },\n  propertiesByName: [],\n  entitiesByName: [],\n  operationsByName: [],\n};\n\nconst { models, queryObjects, services } = defaultConfig.naming;\nconst minimalNamingConfig: NameSettings = {\n  models: {\n    fileName: {\n      prefix: models.fileName.prefix,\n      suffix: models.fileName.suffix,\n    },\n    idModels: {\n      applyModelNaming: true,\n      prefix: models.idModels.prefix,\n      suffix: models.idModels.suffix,\n    },\n    editableModels: {\n      applyModelNaming: true,\n      prefix: models.editableModels.prefix,\n      suffix: models.editableModels.suffix,\n    },\n    operationParamModels: {\n      applyModelNaming: true,\n      prefix: models.operationParamModels.prefix,\n      suffix: models.operationParamModels.suffix,\n    },\n  },\n  queryObjects: {\n    prefix: queryObjects.prefix,\n    suffix: queryObjects.suffix,\n    fileName: {\n      prefix: queryObjects.fileName.prefix,\n      suffix: queryObjects.fileName.suffix,\n    },\n    idFunctions: {\n      prefix: queryObjects.idFunctions.prefix,\n      suffix: queryObjects.idFunctions.suffix,\n    },\n  },\n  services: {\n    prefix: services.prefix,\n    suffix: services.suffix,\n    main: {\n      applyServiceNaming: true,\n    },\n    collection: {\n      applyServiceNaming: true,\n      prefix: services.collection.prefix,\n      suffix: services.collection.suffix,\n    },\n    privateProps: {\n      prefix: services.privateProps.prefix,\n      suffix: services.privateProps.suffix,\n    },\n    relatedServiceGetter: {\n      prefix: services.relatedServiceGetter.prefix,\n      suffix: services.relatedServiceGetter.suffix,\n    },\n  },\n};\n\n/**\n * Creates a defensive copy of the default config.\n */\nexport function getDefaultConfig(): DefaultConfiguration {\n  return deepmerge(defaultConfig, {});\n}\n\n/**\n * Creates a defensive copy of the minimal config: minimal in respect to naming.\n */\nexport function getMinimalConfig(): DefaultConfiguration {\n  const { naming, ...passThrough } = defaultConfig;\n  return deepmerge(passThrough, { naming: minimalNamingConfig });\n}\n"]}

package/lib/generator/ImportContainer.d.ts

@@ -11,6 +11,5 @@ export declare class ImportContainer {
     addGeneratedModel(...names: Array<string>): void;
     addGeneratedQObject(...names: Array<string>): void;
     addCustomType(moduleName: string, typeName: string): void;
-    addGeneratedService(key: string, ...names: Array<string>): void;
     getImportDeclarations(fromSubPath?: boolean): Array<ImportDeclarationStructure>;
 }

package/lib/generator/ImportContainer.js

@@ -19,7 +19,6 @@ class ImportContainer {
             service: new Set(),
             genModel: new Set(),
             genQObjects: new Set(),
-            genServices: {},
             customTypes: new Map(),
         };
         this.mapping.genModel.moduleName = fileNames.model;
@@ -51,16 +50,8 @@ class ImportContainer {
         }
         importList.add(typeName);
     }
-    addGeneratedService(key, ...names) {
-        let serv = this.container.genServices[key];
-        if (!serv) {
-            serv = new Set();
-            this.container.genServices[key] = serv;
-        }
-        names.forEach((n) => serv.add(n));
-    }
     getImportDeclarations(fromSubPath = false) {
-        const _a = this.container, { genServices, customTypes } = _a, standardImports = tslib_1.__rest(_a, ["genServices", "customTypes"]);
+        const _a = this.container, { customTypes } = _a, standardImports = tslib_1.__rest(_a, ["customTypes"]);
         return [
             ...[...customTypes.keys()]
                 .filter((key) => { var _a; return !!((_a = customTypes.get(key)) === null || _a === void 0 ? void 0 : _a.size); })
@@ -71,7 +62,7 @@ class ImportContainer {
                 };
             }),
             ...Object.entries(standardImports)
-                .filter(([key, values]) => !!values.size)
+                .filter(([_, values]) => !!values.size)
                 .map(([key, values]) => {
                 const mapping = this.mapping[key];
                 return {
@@ -79,12 +70,6 @@ class ImportContainer {
                     moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? ".." : "."}/` : ""}${mapping.moduleName}`,
                 };
             }),
-            ...Object.entries(genServices).map(([key, values]) => {
-                return {
-                    namedImports: [...values],
-                    moduleSpecifier: (fromSubPath ? "./" : "./service/") + key,
-                };
-            }),
         ];
     }
 }

package/lib/generator/ImportContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImportContainer.js","sourceRoot":"","sources":["../../src/generator/ImportContainer.ts"],"names":[],"mappings":";;;;AAeA,MAAa,eAAe;IAuB1B,YAAY,SAAuB;QAtB3B,YAAO,GAEX;YACF,IAAI,EAAE,EAAE,UAAU,EAAE,sBAAsB,EAAE,UAAU,EAAE,KAAK,EAAE;YAC/D,QAAQ,EAAE,EAAE,UAAU,EAAE,+BAA+B,EAAE,UAAU,EAAE,KAAK,EAAE;YAC5E,SAAS,EAAE,EAAE,UAAU,EAAE,2BAA2B,EAAE,UAAU,EAAE,KAAK,EAAE;YACzE,OAAO,EAAE,EAAE,UAAU,EAAE,yBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE;YACrE,QAAQ,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YAC9C,WAAW,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;SAClD,CAAC;QAEM,cAAS,GAAwB;YACvC,IAAI,EAAE,IAAI,GAAG,EAAE;YACf,QAAQ,EAAE,IAAI,GAAG,EAAE;YACnB,SAAS,EAAE,IAAI,GAAG,EAAE;YACpB,OAAO,EAAE,IAAI,GAAG,EAAE;YAClB,QAAQ,EAAE,IAAI,GAAG,EAAE;YACnB,WAAW,EAAE,IAAI,GAAG,EAAE;YACtB,WAAW,EAAE,EAAE;YACf,WAAW,EAAE,IAAI,GAAG,EAAE;SACvB,CAAC;QAGA,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;QACnD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC;IAC1D,CAAC;IAEM,WAAW,CAAC,GAAG,KAAoB;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IAEM,cAAc,CAAC,GAAG,KAAoB;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAEM,gBAAgB,CAAC,GAAG,KAAoB;QAC7C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAEM,cAAc,CAAC,GAAG,KAAoB;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,iBAAiB,CAAC,GAAG,KAAoB;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAEM,mBAAmB,CAAC,GAAG,KAAoB;QAChD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAEM,aAAa,CAAC,UAAkB,EAAE,QAAgB;QACvD,IAAI,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;YACvB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;SACxD;QACD,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAEM,mBAAmB,CAAC,GAAW,EAAE,GAAG,KAAoB;QAC7D,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACjB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;SACxC;QACD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC;IAEM,qBAAqB,CAAC,cAAuB,KAAK;QACvD,MAAM,KAAmD,IAAI,CAAC,SAAS,EAAjE,EAAE,WAAW,EAAE,WAAW,OAAuC,EAAlC,eAAe,sBAA9C,8BAAgD,CAAiB,CAAC;QAExE,OAAO;YACL,GAAG,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;iBACvB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,0CAAE,IAAI,CAAA,CAAA,EAAA,CAAC;iBAC7C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACX,OAAO;oBACL,YAAY,EAAE,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;oBACxC,eAAe,EAAE,GAAG;iBACS,CAAC;YAClC,CAAC,CAAC;YACJ,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC;iBAC/B,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;iBACxC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE;gBACrB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAClC,OAAO;oBACL,YAAY,EAAE,CAAC,GAAG,MAAM,CAAC;oBACzB,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE;iBACtE,CAAC;YAClC,CAAC,CAAC;YACJ,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE;gBACnD,OAAO;oBACL,YAAY,EAAE,CAAC,GAAG,MAAM,CAAC;oBACzB,eAAe,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,GAAG;iBAC7B,CAAC;YAClC,CAAC,CAAC;SACH,CAAC;IACJ,CAAC;CACF;AAnGD,0CAmGC","sourcesContent":["import { ImportDeclarationStructure } from \"ts-morph\";\r\n\r\nimport { ProjectFiles } from \"../data-model/DataModel\";\r\n\r\ntype ImportContainerType = {\r\n  core: Set<string>;\r\n  qobjects: Set<string>;\r\n  clientApi: Set<string>;\r\n  service: Set<string>;\r\n  genModel: Set<string>;\r\n  genQObjects: Set<string>;\r\n  genServices: { [key: string]: Set<string> };\r\n  customTypes: Map<string, Set<string>>;\r\n};\r\n\r\nexport class ImportContainer {\r\n  private mapping: {\r\n    [K in keyof ImportContainerType as string]: { moduleName: string; isRelative: boolean; addName?: boolean };\r\n  } = {\r\n    core: { moduleName: \"@odata2ts/odata-core\", isRelative: false },\r\n    qobjects: { moduleName: \"@odata2ts/odata-query-objects\", isRelative: false },\r\n    clientApi: { moduleName: \"@odata2ts/http-client-api\", isRelative: false },\r\n    service: { moduleName: \"@odata2ts/odata-service\", isRelative: false },\r\n    genModel: { moduleName: \"\", isRelative: true },\r\n    genQObjects: { moduleName: \"\", isRelative: true },\r\n  };\r\n\r\n  private container: ImportContainerType = {\r\n    core: new Set(),\r\n    qobjects: new Set(),\r\n    clientApi: new Set(),\r\n    service: new Set(),\r\n    genModel: new Set(),\r\n    genQObjects: new Set(),\r\n    genServices: {},\r\n    customTypes: new Map(),\r\n  };\r\n\r\n  constructor(fileNames: ProjectFiles) {\r\n    this.mapping.genModel.moduleName = fileNames.model;\r\n    this.mapping.genQObjects.moduleName = fileNames.qObject;\r\n  }\r\n\r\n  public addFromCore(...names: Array<string>) {\r\n    names.forEach((n) => this.container.core.add(n));\r\n  }\r\n\r\n  public addFromQObject(...names: Array<string>) {\r\n    names.forEach((n) => this.container.qobjects.add(n));\r\n  }\r\n\r\n  public addFromClientApi(...names: Array<string>) {\r\n    names.forEach((n) => this.container.clientApi.add(n));\r\n  }\r\n\r\n  public addFromService(...names: Array<string>) {\r\n    names.forEach((n) => this.container.service.add(n));\r\n  }\r\n\r\n  public addGeneratedModel(...names: Array<string>) {\r\n    names.forEach((n) => this.container.genModel.add(n));\r\n  }\r\n\r\n  public addGeneratedQObject(...names: Array<string>) {\r\n    names.forEach((n) => this.container.genQObjects.add(n));\r\n  }\r\n\r\n  public addCustomType(moduleName: string, typeName: string) {\r\n    let importList = this.container.customTypes.get(moduleName);\r\n    if (!importList) {\r\n      importList = new Set();\r\n      this.container.customTypes.set(moduleName, importList);\r\n    }\r\n    importList.add(typeName);\r\n  }\r\n\r\n  public addGeneratedService(key: string, ...names: Array<string>) {\r\n    let serv = this.container.genServices[key];\r\n    if (!serv) {\r\n      serv = new Set();\r\n      this.container.genServices[key] = serv;\r\n    }\r\n    names.forEach((n) => serv.add(n));\r\n  }\r\n\r\n  public getImportDeclarations(fromSubPath: boolean = false): Array<ImportDeclarationStructure> {\r\n    const { genServices, customTypes, ...standardImports } = this.container;\r\n\r\n    return [\r\n      ...[...customTypes.keys()]\r\n        .filter((key) => !!customTypes.get(key)?.size)\r\n        .map((key) => {\r\n          return {\r\n            namedImports: [...customTypes.get(key)!],\r\n            moduleSpecifier: key,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...Object.entries(standardImports)\r\n        .filter(([key, values]) => !!values.size)\r\n        .map(([key, values]) => {\r\n          const mapping = this.mapping[key];\r\n          return {\r\n            namedImports: [...values],\r\n            moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? \"..\" : \".\"}/` : \"\"}${mapping.moduleName}`,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...Object.entries(genServices).map(([key, values]) => {\r\n        return {\r\n          namedImports: [...values],\r\n          moduleSpecifier: (fromSubPath ? \"./\" : \"./service/\") + key,\r\n        } as ImportDeclarationStructure;\r\n      }),\r\n    ];\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ImportContainer.js","sourceRoot":"","sources":["../../src/generator/ImportContainer.ts"],"names":[],"mappings":"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","sourcesContent":["import { ImportDeclarationStructure } from \"ts-morph\";\r\n\r\nimport { ProjectFiles } from \"../data-model/DataModel\";\r\n\r\ntype ImportContainerType = {\r\n  core: Set<string>;\r\n  qobjects: Set<string>;\r\n  clientApi: Set<string>;\r\n  service: Set<string>;\r\n  genModel: Set<string>;\r\n  genQObjects: Set<string>;\r\n  customTypes: Map<string, Set<string>>;\r\n};\r\n\r\nexport class ImportContainer {\r\n  private mapping: {\r\n    [K in keyof ImportContainerType as string]: { moduleName: string; isRelative: boolean; addName?: boolean };\r\n  } = {\r\n    core: { moduleName: \"@odata2ts/odata-core\", isRelative: false },\r\n    qobjects: { moduleName: \"@odata2ts/odata-query-objects\", isRelative: false },\r\n    clientApi: { moduleName: \"@odata2ts/http-client-api\", isRelative: false },\r\n    service: { moduleName: \"@odata2ts/odata-service\", isRelative: false },\r\n    genModel: { moduleName: \"\", isRelative: true },\r\n    genQObjects: { moduleName: \"\", isRelative: true },\r\n  };\r\n\r\n  private container: ImportContainerType = {\r\n    core: new Set(),\r\n    qobjects: new Set(),\r\n    clientApi: new Set(),\r\n    service: new Set(),\r\n    genModel: new Set(),\r\n    genQObjects: new Set(),\r\n    customTypes: new Map(),\r\n  };\r\n\r\n  constructor(fileNames: ProjectFiles) {\r\n    this.mapping.genModel.moduleName = fileNames.model;\r\n    this.mapping.genQObjects.moduleName = fileNames.qObject;\r\n  }\r\n\r\n  public addFromCore(...names: Array<string>) {\r\n    names.forEach((n) => this.container.core.add(n));\r\n  }\r\n\r\n  public addFromQObject(...names: Array<string>) {\r\n    names.forEach((n) => this.container.qobjects.add(n));\r\n  }\r\n\r\n  public addFromClientApi(...names: Array<string>) {\r\n    names.forEach((n) => this.container.clientApi.add(n));\r\n  }\r\n\r\n  public addFromService(...names: Array<string>) {\r\n    names.forEach((n) => this.container.service.add(n));\r\n  }\r\n\r\n  public addGeneratedModel(...names: Array<string>) {\r\n    names.forEach((n) => this.container.genModel.add(n));\r\n  }\r\n\r\n  public addGeneratedQObject(...names: Array<string>) {\r\n    names.forEach((n) => this.container.genQObjects.add(n));\r\n  }\r\n\r\n  public addCustomType(moduleName: string, typeName: string) {\r\n    let importList = this.container.customTypes.get(moduleName);\r\n    if (!importList) {\r\n      importList = new Set();\r\n      this.container.customTypes.set(moduleName, importList);\r\n    }\r\n    importList.add(typeName);\r\n  }\r\n\r\n  public getImportDeclarations(fromSubPath: boolean = false): Array<ImportDeclarationStructure> {\r\n    const { customTypes, ...standardImports } = this.container;\r\n\r\n    return [\r\n      ...[...customTypes.keys()]\r\n        .filter((key) => !!customTypes.get(key)?.size)\r\n        .map((key) => {\r\n          return {\r\n            namedImports: [...customTypes.get(key)!],\r\n            moduleSpecifier: key,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...Object.entries(standardImports)\r\n        .filter(([_, values]) => !!values.size)\r\n        .map(([key, values]) => {\r\n          const mapping = this.mapping[key];\r\n          return {\r\n            namedImports: [...values],\r\n            moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? \"..\" : \".\"}/` : \"\"}${mapping.moduleName}`,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n    ];\r\n  }\r\n}\r\n"]}

package/lib/generator/ModelGenerator.js

@@ -35,7 +35,7 @@ class ModelGenerator {
         });
     }
     generateModels() {
-        this.dataModel.getModels().forEach((model) => {
+        this.dataModel.getEntityTypes().forEach((model) => {
             this.generateModel(model);
             if (!this.options.skipIdModels) {
                 this.generateIdModel(model);
@@ -44,7 +44,7 @@ class ModelGenerator {
                 this.generateEditableModel(model);
             }
             if (!this.options.skipOperations) {
-                this.generateBoundOperationParams(model.name);
+                this.generateBoundOperationParams(model.fqName);
             }
         });
         this.dataModel.getComplexTypes().forEach((model) => {
@@ -69,7 +69,7 @@ class ModelGenerator {
                     docs: this.options.skipComments ? undefined : [this.generatePropDoc(p, model)],
                 };
             }),
-            extends: model.baseClasses,
+            extends: model.baseClasses.map((bc) => this.namingHelper.getModelName(bc)),
         });
     }
     generatePropDoc(prop, model) {
@@ -171,9 +171,9 @@ class ModelGenerator {
     }
     getEditablePropType(prop) {
         const type = prop.dataType === "ModelType" /* DataTypes.ModelType */
-            ? this.dataModel.getModel(prop.type).editableName
+            ? this.dataModel.getEntityType(prop.fqType).editableName
             : prop.dataType === "ComplexType" /* DataTypes.ComplexType */
-                ? this.dataModel.getComplexType(prop.type).editableName
+                ? this.dataModel.getComplexType(prop.fqType).editableName
                 : prop.type;
         // Collections
         if (prop.isCollection) {
@@ -188,7 +188,10 @@ class ModelGenerator {
         });
     }
     generateBoundOperationParams(entityName) {
-        this.dataModel.getOperationTypeByEntityOrCollectionBinding(entityName).forEach((operation) => {
+        [
+            ...this.dataModel.getEntityTypeOperations(entityName),
+            ...this.dataModel.getEntitySetOperations(entityName),
+        ].forEach((operation) => {
             this.generateOperationParams(operation);
         });
     }