@odata2ts/odata2ts 0.20.1 → 0.20.3

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.20.3](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.20.2...@odata2ts/odata2ts@0.20.3) (2023-04-18)
+
+### Bug Fixes
+
+* **odata2ts:** add empty array as type for empty params ([#154](https://github.com/odata2ts/odata2ts/issues/154)) ([fbdd000](https://github.com/odata2ts/odata2ts/commit/fbdd0005d46d7d402d8039bec3ea4aecdb593b88))
+* prevent idModel and qIdFunction from baseclass to be overwritten in digester which breaks multiple inheritance ([#150](https://github.com/odata2ts/odata2ts/issues/150)) ([e17038e](https://github.com/odata2ts/odata2ts/commit/e17038ee0e924101f9dd6ed97e10da5847cb8857))
+* Reorder models and qobjects by inheritance (base types first) ([#151](https://github.com/odata2ts/odata2ts/issues/151)) ([7d456fe](https://github.com/odata2ts/odata2ts/commit/7d456fe3fd28b246721a170cd878d04c3dbc2d80))
+
+## [0.20.2](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.20.1...@odata2ts/odata2ts@0.20.2) (2023-04-13)
+
+**Note:** Version bump only for package @odata2ts/odata2ts
+
 ## [0.20.1](https://github.com/odata2ts/odata2ts/compare/@odata2ts/odata2ts@0.20.0...@odata2ts/odata2ts@0.20.1) (2023-04-08)
 
 **Note:** Version bump only for package @odata2ts/odata2ts

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

@@ -31,11 +31,19 @@ export declare class DataModel {
      */
     getModel(modelName: string): ModelType;
     /**
-     * Retrieve all known models, i.e. EntityType and ComplexType nodes from the EDMX model.
+     * Retrieve all known EntityType models from the EDMX model.
      *
      * @returns list of model types
      */
     getModels(): ModelType[];
+    /**
+     * Set all model entity types
+     *
+     * @param models new model types
+     */
+    setModels(models: {
+        [name: string]: ModelType;
+    }): void;
     addComplexType(name: string, model: ComplexType): void;
     /**
      * Get a specific model by its name.
@@ -45,11 +53,19 @@ export declare class DataModel {
      */
     getComplexType(name: string): ComplexType;
     /**
-     * Retrieve all known models, i.e. EntityType and ComplexType nodes from the EDMX model.
+     * Retrieve all known ComplexType models from the EDMX model.
      *
      * @returns list of model types
      */
     getComplexTypes(): ComplexType[];
+    /**
+     * Set all complex types
+     *
+     * @param models new complex types
+     */
+    setComplexTypes(complexTypes: {
+        [name: string]: ComplexType;
+    }): void;
     addEnum(name: string, type: EnumType): void;
     /**
      * Get list of all known enums, i.e. EnumType nodes from the EDMX model.

package/lib/data-model/DataModel.js

@@ -40,13 +40,21 @@ class DataModel {
         return this.modelTypes[modelName];
     }
     /**
-     * Retrieve all known models, i.e. EntityType and ComplexType nodes from the EDMX model.
+     * Retrieve all known EntityType models from the EDMX model.
      *
      * @returns list of model types
      */
     getModels() {
         return Object.values(this.modelTypes);
     }
+    /**
+     * Set all model entity types
+     *
+     * @param models new model types
+     */
+    setModels(models) {
+        this.modelTypes = models;
+    }
     addComplexType(name, model) {
         this.complexTypes[name] = model;
     }
@@ -60,13 +68,21 @@ class DataModel {
         return this.complexTypes[name];
     }
     /**
-     * Retrieve all known models, i.e. EntityType and ComplexType nodes from the EDMX model.
+     * Retrieve all known ComplexType models from the EDMX model.
      *
      * @returns list of model types
      */
     getComplexTypes() {
         return Object.values(this.complexTypes);
     }
+    /**
+     * Set all complex types
+     *
+     * @param models new complex types
+     */
+    setComplexTypes(complexTypes) {
+        this.complexTypes = complexTypes;
+    }
     addEnum(name, type) {
         this.enumTypes[name] = type;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"DataModel.js","sourceRoot":"","sources":["../../src/data-model/DataModel.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\r\nimport { ODataTypesV2, ODataTypesV4 } from \"@odata2ts/odata-core\";\r\n\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EnumType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  ODataVersion,\r\n  OperationType,\r\n  SingletonType,\r\n} from \"./DataTypeModel\";\r\n\r\nexport interface ProjectFiles {\r\n  model: string;\r\n  qObject: string;\r\n  service: string;\r\n}\r\n\r\nconst ROOT_OPERATION_BINDING = \"/\";\r\n\r\nexport class DataModel {\r\n  private readonly converters: MappedConverterChains;\r\n\r\n  private modelTypes: { [name: string]: ModelType } = {};\r\n  private complexTypes: { [name: string]: ComplexType } = {};\r\n  private enumTypes: { [name: string]: EnumType } = {};\r\n  // combines functions & actions\r\n  private operationTypes: { [binding: string]: Array<OperationType> } = {};\r\n  private container: EntityContainerModel = { entitySets: {}, singletons: {}, functions: {}, actions: {} };\r\n\r\n  constructor(private version: ODataVersion, converters: MappedConverterChains = new Map()) {\r\n    this.converters = converters;\r\n  }\r\n\r\n  /**\r\n   * OData version: 2.0 or 4.0.\r\n   * @returns\r\n   */\r\n  public getODataVersion() {\r\n    return this.version;\r\n  }\r\n\r\n  public isV2() {\r\n    return this.version === ODataVersion.V2;\r\n  }\r\n\r\n  public isV4() {\r\n    return this.version === ODataVersion.V4;\r\n  }\r\n\r\n  public addModel(name: string, model: ModelType) {\r\n    this.modelTypes[name] = model;\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its name.\r\n   *\r\n   * @param modelName the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getModel(modelName: string) {\r\n    return this.modelTypes[modelName];\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known models, i.e. EntityType and ComplexType nodes from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getModels() {\r\n    return Object.values(this.modelTypes);\r\n  }\r\n\r\n  public addComplexType(name: string, model: ComplexType) {\r\n    this.complexTypes[name] = model;\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its name.\r\n   *\r\n   * @param name the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getComplexType(name: string) {\r\n    return this.complexTypes[name];\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known models, i.e. EntityType and ComplexType nodes from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getComplexTypes() {\r\n    return Object.values(this.complexTypes);\r\n  }\r\n\r\n  public addEnum(name: string, type: EnumType) {\r\n    this.enumTypes[name] = type;\r\n  }\r\n\r\n  /**\r\n   * Get list of all known enums, i.e. EnumType nodes from the EDMX model.\r\n   * @returns list of enum types\r\n   */\r\n  public getEnums() {\r\n    return Object.values(this.enumTypes);\r\n  }\r\n\r\n  public addOperationType(binding: string, operationType: OperationType) {\r\n    if (!this.operationTypes[binding]) {\r\n      this.operationTypes[binding] = [];\r\n    }\r\n\r\n    this.operationTypes[binding].push(operationType);\r\n  }\r\n\r\n  public getUnboundOperationTypes(): Array<OperationType> {\r\n    const operations = this.operationTypes[ROOT_OPERATION_BINDING];\r\n    return !operations ? [] : [...operations];\r\n  }\r\n\r\n  public getOperationTypeByBinding(binding: string): Array<OperationType> {\r\n    const operations = this.operationTypes[binding];\r\n    return !operations ? [] : [...operations];\r\n  }\r\n\r\n  public getOperationTypeByEntityOrCollectionBinding(binding: string): Array<OperationType> {\r\n    const entityOps = this.operationTypes[binding] || [];\r\n    const collOps = this.operationTypes[`Collection(${binding})`] || [];\r\n    return [...collOps, ...entityOps];\r\n  }\r\n\r\n  public addAction(name: string, action: ActionImportType) {\r\n    this.container.actions[name] = action;\r\n  }\r\n\r\n  public addFunction(name: string, func: FunctionImportType) {\r\n    this.container.functions[name] = func;\r\n  }\r\n\r\n  public addSingleton(name: string, singleton: SingletonType) {\r\n    this.container.singletons[name] = singleton;\r\n  }\r\n\r\n  public addEntitySet(name: string, entitySet: EntitySetType) {\r\n    this.container.entitySets[name] = entitySet;\r\n  }\r\n\r\n  public getEntityContainer() {\r\n    return this.container;\r\n  }\r\n\r\n  public getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string) {\r\n    return this.converters.get(dataType);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"DataModel.js","sourceRoot":"","sources":["../../src/data-model/DataModel.ts"],"names":[],"mappings":"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","sourcesContent":["import { MappedConverterChains } from \"@odata2ts/converter-runtime\";\r\nimport { ODataTypesV2, ODataTypesV4 } from \"@odata2ts/odata-core\";\r\n\r\nimport {\r\n  ActionImportType,\r\n  ComplexType,\r\n  EntityContainerModel,\r\n  EntitySetType,\r\n  EnumType,\r\n  FunctionImportType,\r\n  ModelType,\r\n  ODataVersion,\r\n  OperationType,\r\n  SingletonType,\r\n} from \"./DataTypeModel\";\r\n\r\nexport interface ProjectFiles {\r\n  model: string;\r\n  qObject: string;\r\n  service: string;\r\n}\r\n\r\nconst ROOT_OPERATION_BINDING = \"/\";\r\n\r\nexport class DataModel {\r\n  private readonly converters: MappedConverterChains;\r\n\r\n  private modelTypes: { [name: string]: ModelType } = {};\r\n  private complexTypes: { [name: string]: ComplexType } = {};\r\n  private enumTypes: { [name: string]: EnumType } = {};\r\n  // combines functions & actions\r\n  private operationTypes: { [binding: string]: Array<OperationType> } = {};\r\n  private container: EntityContainerModel = { entitySets: {}, singletons: {}, functions: {}, actions: {} };\r\n\r\n  constructor(private version: ODataVersion, converters: MappedConverterChains = new Map()) {\r\n    this.converters = converters;\r\n  }\r\n\r\n  /**\r\n   * OData version: 2.0 or 4.0.\r\n   * @returns\r\n   */\r\n  public getODataVersion() {\r\n    return this.version;\r\n  }\r\n\r\n  public isV2() {\r\n    return this.version === ODataVersion.V2;\r\n  }\r\n\r\n  public isV4() {\r\n    return this.version === ODataVersion.V4;\r\n  }\r\n\r\n  public addModel(name: string, model: ModelType) {\r\n    this.modelTypes[name] = model;\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its name.\r\n   *\r\n   * @param modelName the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getModel(modelName: string) {\r\n    return this.modelTypes[modelName];\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known EntityType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getModels() {\r\n    return Object.values(this.modelTypes);\r\n  }\r\n\r\n  /**\r\n   * Set all model entity types\r\n   *\r\n   * @param models new model types\r\n   */\r\n  public setModels(models: { [name: string]: ModelType }) {\r\n    this.modelTypes = models;\r\n  }\r\n\r\n  public addComplexType(name: string, model: ComplexType) {\r\n    this.complexTypes[name] = model;\r\n  }\r\n\r\n  /**\r\n   * Get a specific model by its name.\r\n   *\r\n   * @param name the final model name that is generated\r\n   * @returns the model type\r\n   */\r\n  public getComplexType(name: string) {\r\n    return this.complexTypes[name];\r\n  }\r\n\r\n  /**\r\n   * Retrieve all known ComplexType models from the EDMX model.\r\n   *\r\n   * @returns list of model types\r\n   */\r\n  public getComplexTypes() {\r\n    return Object.values(this.complexTypes);\r\n  }\r\n\r\n  /**\r\n   * Set all complex types\r\n   *\r\n   * @param models new complex types\r\n   */\r\n  public setComplexTypes(complexTypes: { [name: string]: ComplexType }) {\r\n    this.complexTypes = complexTypes;\r\n  }\r\n\r\n  public addEnum(name: string, type: EnumType) {\r\n    this.enumTypes[name] = type;\r\n  }\r\n\r\n  /**\r\n   * Get list of all known enums, i.e. EnumType nodes from the EDMX model.\r\n   * @returns list of enum types\r\n   */\r\n  public getEnums() {\r\n    return Object.values(this.enumTypes);\r\n  }\r\n\r\n  public addOperationType(binding: string, operationType: OperationType) {\r\n    if (!this.operationTypes[binding]) {\r\n      this.operationTypes[binding] = [];\r\n    }\r\n\r\n    this.operationTypes[binding].push(operationType);\r\n  }\r\n\r\n  public getUnboundOperationTypes(): Array<OperationType> {\r\n    const operations = this.operationTypes[ROOT_OPERATION_BINDING];\r\n    return !operations ? [] : [...operations];\r\n  }\r\n\r\n  public getOperationTypeByBinding(binding: string): Array<OperationType> {\r\n    const operations = this.operationTypes[binding];\r\n    return !operations ? [] : [...operations];\r\n  }\r\n\r\n  public getOperationTypeByEntityOrCollectionBinding(binding: string): Array<OperationType> {\r\n    const entityOps = this.operationTypes[binding] || [];\r\n    const collOps = this.operationTypes[`Collection(${binding})`] || [];\r\n    return [...collOps, ...entityOps];\r\n  }\r\n\r\n  public addAction(name: string, action: ActionImportType) {\r\n    this.container.actions[name] = action;\r\n  }\r\n\r\n  public addFunction(name: string, func: FunctionImportType) {\r\n    this.container.functions[name] = func;\r\n  }\r\n\r\n  public addSingleton(name: string, singleton: SingletonType) {\r\n    this.container.singletons[name] = singleton;\r\n  }\r\n\r\n  public addEntitySet(name: string, entitySet: EntitySetType) {\r\n    this.container.entitySets[name] = entitySet;\r\n  }\r\n\r\n  public getEntityContainer() {\r\n    return this.container;\r\n  }\r\n\r\n  public getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string) {\r\n    return this.converters.get(dataType);\r\n  }\r\n}\r\n"]}

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

@@ -38,6 +38,7 @@ export declare abstract class Digester<S extends Schema<ET, CT>, ET extends Enti
     private addComplexType;
     private addEntityType;
     private postProcessModel;
+    private sortModelsByInheritance;
     private collectBaseClassPropsAndKeys;
     protected mapProp: (p: Property) => PropertyModel;
 }

package/lib/data-model/DataModelDigestion.js

@@ -172,13 +172,15 @@ class Digester {
     }
     postProcessModel() {
         // complex types
-        this.dataModel.getComplexTypes().forEach((model) => {
-            const [baseProps] = this.collectBaseClassPropsAndKeys(model);
+        const complexTypes = this.dataModel.getComplexTypes();
+        complexTypes.forEach((model) => {
+            const [baseProps] = this.collectBaseClassPropsAndKeys(model, []);
             model.baseProps = baseProps;
         });
+        const modelTypes = this.dataModel.getModels();
         // entity types
-        this.dataModel.getModels().forEach((model) => {
-            const [baseProps, baseKeys, idName, qIdName] = this.collectBaseClassPropsAndKeys(model);
+        modelTypes.forEach((model) => {
+            const [baseProps, baseKeys, idName, qIdName] = this.collectBaseClassPropsAndKeys(model, []);
             model.baseProps = baseProps;
             if (!model.keyNames.length && idName) {
                 model.idModelName = idName;
@@ -204,15 +206,52 @@ class Digester {
                 return prop;
             });
         });
+        const sortedModelTypes = this.sortModelsByInheritance(modelTypes);
+        this.dataModel.setModels(sortedModelTypes);
+        const sortedComplexTypes = this.sortModelsByInheritance(complexTypes);
+        this.dataModel.setComplexTypes(sortedComplexTypes);
     }
-    collectBaseClassPropsAndKeys(model) {
+    sortModelsByInheritance(models) {
+        // recursively visit all models and sort them by inheritance such that base classes
+        // are always before derived classes
+        const sortedModels = {};
+        const visitedModels = new Set();
+        const inProgressModels = new Set();
+        function visit(model) {
+            if (inProgressModels.has(model)) {
+                throw new Error("Cyclic dependencies detected!");
+            }
+            if (!visitedModels.has(model)) {
+                inProgressModels.add(model);
+                for (const baseClassName of model.baseClasses) {
+                    const baseClass = models.find((e) => e.name === baseClassName);
+                    if (baseClass) {
+                        visit(baseClass);
+                    }
+                }
+                visitedModels.add(model);
+                inProgressModels.delete(model);
+                sortedModels[model.name] = model;
+            }
+        }
+        for (const model of models) {
+            visit(model);
+        }
+        return sortedModels;
+    }
+    collectBaseClassPropsAndKeys(model, visitedModels) {
+        if (visitedModels.includes(model.name)) {
+            throw new Error(`Cyclic inheritance detected for model ${model.name}!`);
+        }
+        visitedModels.push(model.name);
         return model.baseClasses.reduce(([props, keys, idName, qIdName], bc) => {
+            var _a;
             const baseModel = this.dataModel.getModel(bc) || this.dataModel.getComplexType(bc);
             let idNameResult = idName;
             let qIdNameResult = qIdName;
             // recursive
             if (baseModel.baseClasses.length) {
-                const [parentProps, parentKeys, parentIdName, parentQIdName] = this.collectBaseClassPropsAndKeys(baseModel);
+                const [parentProps, parentKeys, parentIdName, parentQIdName] = this.collectBaseClassPropsAndKeys(baseModel, visitedModels);
                 props.unshift(...parentProps);
                 keys.unshift(...parentKeys);
                 if (parentIdName) {
@@ -221,7 +260,7 @@ class Digester {
                 }
             }
             props.push(...baseModel.props);
-            if (baseModel.keyNames) {
+            if ((_a = baseModel.keyNames) === null || _a === void 0 ? void 0 : _a.length) {
                 keys.push(...baseModel.keyNames.filter((kn) => !keys.includes(kn)));
                 idNameResult = baseModel.idModelName;
                 qIdNameResult = baseModel.qIdFunctionName;

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

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

package/lib/generator/QueryObjectGenerator.js

@@ -177,6 +177,7 @@ class QueryObjectGenerator {
         });
     }
     generateOperation(operation, importContainer) {
+        var _a;
         const isV2 = this.version === odata_core_1.ODataVersions.V2;
         const qOperation = operation.type === "Action" /* OperationTypes.Action */ ? "QAction" : "QFunction";
         const returnType = operation.returnType;
@@ -207,6 +208,7 @@ class QueryObjectGenerator {
                     name: "params",
                     scope: ts_morph_1.Scope.Private,
                     isReadonly: true,
+                    type: ((_a = operation.parameters) === null || _a === void 0 ? void 0 : _a.length) ? undefined : "[]",
                     initializer: this.getParamInitString(operation.parameters, importContainer),
                 },
             ],

package/lib/generator/QueryObjectGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryObjectGenerator.js","sourceRoot":"","sources":["../../src/generator/QueryObjectGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\nimport { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { OptionalKind, PropertyDeclarationStructure, Scope, SourceFile, VariableDeclarationKind } from \"ts-morph\";\r\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport {\r\n  ComplexType,\r\n  DataTypes,\r\n  ModelType,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n} from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nexport const generateQueryObjects: EntityBasedGeneratorFunction = (\r\n  dataModel,\r\n  sourceFile,\r\n  version,\r\n  options,\r\n  namingHelper\r\n) => {\r\n  const generator = new QueryObjectGenerator(dataModel, sourceFile, version, options, namingHelper);\r\n  return generator.generate();\r\n};\r\n\r\nclass QueryObjectGenerator {\r\n  constructor(\r\n    private dataModel: DataModel,\r\n    private sourceFile: SourceFile,\r\n    private version: ODataVersions,\r\n    private options: GeneratorFunctionOptions,\r\n    private namingHelper: NamingHelper\r\n  ) {}\r\n\r\n  public generate(): void {\r\n    const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n\r\n    this.generateModels(importContainer);\r\n    if (!this.options.skipOperations) {\r\n      this.generateUnboundOperations(importContainer);\r\n    }\r\n\r\n    this.sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));\r\n  }\r\n\r\n  private generateModels(importContainer: ImportContainer) {\r\n    this.dataModel.getModels().forEach((model) => {\r\n      this.generateModel(model, importContainer);\r\n      if (!this.options.skipIdModels) {\r\n        this.generateIdFunction(model, importContainer);\r\n      }\r\n      if (!this.options.skipOperations) {\r\n        this.generateBoundOperations(model.name, importContainer);\r\n      }\r\n    });\r\n    this.dataModel.getComplexTypes().forEach((model) => {\r\n      this.generateModel(model, importContainer);\r\n    });\r\n\r\n    if (this.dataModel.getModels().length || this.dataModel.getComplexTypes().length) {\r\n      importContainer.addFromQObject(\"QueryObject\");\r\n    }\r\n  }\r\n\r\n  private generateModel(model: ComplexType, importContainer: ImportContainer) {\r\n    let extendsClause = \"QueryObject\";\r\n    if (model.baseClasses.length) {\r\n      const baseClass = model.baseClasses[0];\r\n      const baseModel = this.dataModel.getModel(baseClass) || this.dataModel.getComplexType(baseClass);\r\n      extendsClause = baseModel.qName;\r\n    }\r\n\r\n    this.sourceFile.addClass({\r\n      name: model.qName,\r\n      isExported: true,\r\n      extends: extendsClause,\r\n      properties: this.generateQueryObjectProps(model.props, importContainer),\r\n    });\r\n\r\n    this.sourceFile.addVariableStatement({\r\n      declarationKind: VariableDeclarationKind.Const,\r\n      isExported: true,\r\n      declarations: [\r\n        {\r\n          name: firstCharLowerCase(model.qName),\r\n          initializer: `new ${model.qName}()`,\r\n        },\r\n      ],\r\n    });\r\n  }\r\n\r\n  private generateQueryObjectProps(\r\n    props: Array<PropertyModel>,\r\n    importContainer: ImportContainer\r\n  ): Array<OptionalKind<PropertyDeclarationStructure>> {\r\n    return props.map((prop) => {\r\n      const { odataName } = prop;\r\n      const name = this.namingHelper.getQPropName(prop.name);\r\n      const isModelType = prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\r\n      let qPathInit: string;\r\n\r\n      // factor in collections\r\n      if (prop.isCollection) {\r\n        const cType = `Q${isModelType ? \"Entity\" : \"\"}CollectionPath`;\r\n        const qObject = prop.qObject;\r\n\r\n        if (!qObject) {\r\n          throw new Error(\"QObject for collection is missing!\");\r\n        }\r\n\r\n        qPathInit = `new ${cType}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\r\n\r\n        importContainer.addFromQObject(cType);\r\n        if (!isModelType) {\r\n          importContainer.addFromQObject(qObject);\r\n        }\r\n      } else {\r\n        if (isModelType) {\r\n          qPathInit = `new ${prop.qPath}(this.withPrefix(\"${odataName}\"), () => ${prop.qObject!})`;\r\n        } else {\r\n          let converterStmt = this.generateConverterStmt(prop.converters, importContainer);\r\n          qPathInit = `new ${prop.qPath}(this.withPrefix(\"${odataName}\")${converterStmt ? `, ${converterStmt}` : \"\"})`;\r\n        }\r\n        // add import for data type\r\n        importContainer.addFromQObject(prop.qPath);\r\n      }\r\n\r\n      return {\r\n        name,\r\n        scope: Scope.Public,\r\n        isReadonly: true,\r\n        initializer: qPathInit,\r\n      } as OptionalKind<PropertyDeclarationStructure>;\r\n    });\r\n  }\r\n\r\n  private generateConverterStmt(converters: Array<ValueConverterImport> | undefined, importContainer: ImportContainer) {\r\n    if (!converters?.length) {\r\n      return;\r\n    }\r\n    converters.forEach((converter) => {\r\n      importContainer.addCustomType(converter.package, converter.converterId);\r\n    });\r\n\r\n    if (converters.length === 1) {\r\n      return converters[0].converterId;\r\n    } else {\r\n      importContainer.addCustomType(\"@odata2ts/converter-runtime\", \"createChain\");\r\n\r\n      const [first, second, ...moreConverters] = converters;\r\n      return moreConverters.reduce(\r\n        (stmt, conv) => `${stmt}.chain(${conv.converterId})`,\r\n        `createChain(${first.converterId}, ${second.converterId})`\r\n      );\r\n    }\r\n  }\r\n\r\n  private generateIdFunction(model: ModelType, importContainer: ImportContainer) {\r\n    if (!model.generateId) {\r\n      return;\r\n    }\r\n\r\n    const qFunc = \"QId\";\r\n    importContainer.addFromQObject(qFunc);\r\n    importContainer.addGeneratedModel(model.idModelName);\r\n\r\n    this.sourceFile.addClass({\r\n      name: model.qIdFunctionName,\r\n      isExported: true,\r\n      extends: `${qFunc}<${model.idModelName}>`,\r\n      properties: [\r\n        {\r\n          name: \"params\",\r\n          scope: Scope.Private,\r\n          isReadonly: true,\r\n          initializer: this.getParamInitString(model.keys, importContainer),\r\n        },\r\n      ],\r\n      methods: [\r\n        {\r\n          name: \"getParams\",\r\n          statements: [\"return this.params\"],\r\n        },\r\n      ],\r\n    });\r\n  }\r\n\r\n  private getParamInitString(props: Array<PropertyModel>, importContainer: ImportContainer) {\r\n    return `[${props\r\n      .map((prop) => {\r\n        const isComplexParam = prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\r\n        if (prop.qParam) {\r\n          importContainer.addFromQObject(prop.qParam);\r\n        }\r\n        const isMappedNameNecessary = prop.odataName !== prop.name;\r\n        const mappedName = isMappedNameNecessary ? `\"${prop.name}\"` : prop.converters?.length ? \"undefined\" : undefined;\r\n        const converterStmt = this.generateConverterStmt(prop.converters, importContainer);\r\n        const mappedNameParam = mappedName ? `, ${mappedName}` : \"\";\r\n        const complexQParam = isComplexParam ? `, new ${prop.qObject}()` : \"\";\r\n        const converterParam = converterStmt ? `, ${converterStmt}` : \"\";\r\n        return `new ${prop.qParam}(\"${prop.odataName}\"${complexQParam}${mappedNameParam}${converterParam})`;\r\n      })\r\n      .join(\",\")}]`;\r\n  }\r\n\r\n  private generateUnboundOperations(importContainer: ImportContainer) {\r\n    this.dataModel.getUnboundOperationTypes().forEach((operation) => {\r\n      this.generateOperation(operation, importContainer);\r\n    });\r\n  }\r\n\r\n  private generateBoundOperations(bindingName: string, importContainer: ImportContainer) {\r\n    this.dataModel.getOperationTypeByEntityOrCollectionBinding(bindingName).forEach((operation) => {\r\n      this.generateOperation(operation, importContainer);\r\n    });\r\n  }\r\n\r\n  private generateOperation(operation: OperationType, importContainer: ImportContainer) {\r\n    const isV2 = this.version === ODataVersions.V2;\r\n    const qOperation = operation.type === OperationTypes.Action ? \"QAction\" : \"QFunction\";\r\n    const returnType = operation.returnType;\r\n    let returnTypeOpStmt: string = \"\";\r\n    const hasParams = operation.parameters.length > 0;\r\n    importContainer.addFromQObject(qOperation);\r\n    if (hasParams) {\r\n      importContainer.addGeneratedModel(operation.paramsModelName);\r\n    }\r\n    if (returnType) {\r\n      if (returnType.dataType === DataTypes.ComplexType || returnType.dataType === DataTypes.ModelType) {\r\n        if (returnType.qObject) {\r\n          importContainer.addFromQObject(\"OperationReturnType\", \"ReturnTypes\", \"QComplexParam\");\r\n          returnTypeOpStmt = `new OperationReturnType(ReturnTypes.COMPLEX${\r\n            returnType.isCollection ? \"_COLLECTION\" : \"\"\r\n          }, new QComplexParam(\"NONE\", new ${returnType.qObject}))`;\r\n        }\r\n      } else if (returnType.converters && returnType.qParam) {\r\n        importContainer.addFromQObject(\"OperationReturnType\", \"ReturnTypes\", returnType.qParam);\r\n        returnTypeOpStmt = `new OperationReturnType(ReturnTypes.VALUE${\r\n          returnType.isCollection ? \"_COLLECTION\" : \"\"\r\n        }, new ${returnType.qParam}(\"NONE\", undefined, ${this.generateConverterStmt(\r\n          returnType.converters,\r\n          importContainer\r\n        )}))`;\r\n      }\r\n    }\r\n\r\n    this.sourceFile.addClass({\r\n      name: operation.qName,\r\n      isExported: true,\r\n      extends: qOperation + (hasParams ? `<${operation.paramsModelName}>` : \"\"),\r\n      properties: [\r\n        {\r\n          name: \"params\",\r\n          scope: Scope.Private,\r\n          isReadonly: true,\r\n          initializer: this.getParamInitString(operation.parameters, importContainer),\r\n        },\r\n      ],\r\n      ctors: [\r\n        {\r\n          statements: [\r\n            `super(\"${operation.odataName}\"${returnTypeOpStmt ? \", \" + returnTypeOpStmt : isV2 ? \", undefined\" : \"\"}${\r\n              isV2 ? \", { v2Mode: true }\" : \"\"\r\n            })`,\r\n          ],\r\n        },\r\n      ],\r\n      methods: [\r\n        {\r\n          name: \"getParams\",\r\n          statements: [\"return this.params\"],\r\n        },\r\n        // functions without params: add an overriding buildUrl() to not force users to have to pass undefined as param\r\n        ...(operation.type === OperationTypes.Function && !hasParams\r\n          ? [\r\n              {\r\n                name: \"buildUrl\",\r\n                statements: [\"return super.buildUrl(undefined)\"],\r\n              },\r\n            ]\r\n          : []),\r\n      ],\r\n    });\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"QueryObjectGenerator.js","sourceRoot":"","sources":["../../src/generator/QueryObjectGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\nimport { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { OptionalKind, PropertyDeclarationStructure, Scope, SourceFile, VariableDeclarationKind } from \"ts-morph\";\r\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport {\r\n  ComplexType,\r\n  DataTypes,\r\n  ModelType,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n} from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nexport const generateQueryObjects: EntityBasedGeneratorFunction = (\r\n  dataModel,\r\n  sourceFile,\r\n  version,\r\n  options,\r\n  namingHelper\r\n) => {\r\n  const generator = new QueryObjectGenerator(dataModel, sourceFile, version, options, namingHelper);\r\n  return generator.generate();\r\n};\r\n\r\nclass QueryObjectGenerator {\r\n  constructor(\r\n    private dataModel: DataModel,\r\n    private sourceFile: SourceFile,\r\n    private version: ODataVersions,\r\n    private options: GeneratorFunctionOptions,\r\n    private namingHelper: NamingHelper\r\n  ) {}\r\n\r\n  public generate(): void {\r\n    const importContainer = new ImportContainer(this.namingHelper.getFileNames());\r\n\r\n    this.generateModels(importContainer);\r\n    if (!this.options.skipOperations) {\r\n      this.generateUnboundOperations(importContainer);\r\n    }\r\n\r\n    this.sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));\r\n  }\r\n\r\n  private generateModels(importContainer: ImportContainer) {\r\n    this.dataModel.getModels().forEach((model) => {\r\n      this.generateModel(model, importContainer);\r\n      if (!this.options.skipIdModels) {\r\n        this.generateIdFunction(model, importContainer);\r\n      }\r\n      if (!this.options.skipOperations) {\r\n        this.generateBoundOperations(model.name, importContainer);\r\n      }\r\n    });\r\n    this.dataModel.getComplexTypes().forEach((model) => {\r\n      this.generateModel(model, importContainer);\r\n    });\r\n\r\n    if (this.dataModel.getModels().length || this.dataModel.getComplexTypes().length) {\r\n      importContainer.addFromQObject(\"QueryObject\");\r\n    }\r\n  }\r\n\r\n  private generateModel(model: ComplexType, importContainer: ImportContainer) {\r\n    let extendsClause = \"QueryObject\";\r\n    if (model.baseClasses.length) {\r\n      const baseClass = model.baseClasses[0];\r\n      const baseModel = this.dataModel.getModel(baseClass) || this.dataModel.getComplexType(baseClass);\r\n      extendsClause = baseModel.qName;\r\n    }\r\n\r\n    this.sourceFile.addClass({\r\n      name: model.qName,\r\n      isExported: true,\r\n      extends: extendsClause,\r\n      properties: this.generateQueryObjectProps(model.props, importContainer),\r\n    });\r\n\r\n    this.sourceFile.addVariableStatement({\r\n      declarationKind: VariableDeclarationKind.Const,\r\n      isExported: true,\r\n      declarations: [\r\n        {\r\n          name: firstCharLowerCase(model.qName),\r\n          initializer: `new ${model.qName}()`,\r\n        },\r\n      ],\r\n    });\r\n  }\r\n\r\n  private generateQueryObjectProps(\r\n    props: Array<PropertyModel>,\r\n    importContainer: ImportContainer\r\n  ): Array<OptionalKind<PropertyDeclarationStructure>> {\r\n    return props.map((prop) => {\r\n      const { odataName } = prop;\r\n      const name = this.namingHelper.getQPropName(prop.name);\r\n      const isModelType = prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\r\n      let qPathInit: string;\r\n\r\n      // factor in collections\r\n      if (prop.isCollection) {\r\n        const cType = `Q${isModelType ? \"Entity\" : \"\"}CollectionPath`;\r\n        const qObject = prop.qObject;\r\n\r\n        if (!qObject) {\r\n          throw new Error(\"QObject for collection is missing!\");\r\n        }\r\n\r\n        qPathInit = `new ${cType}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\r\n\r\n        importContainer.addFromQObject(cType);\r\n        if (!isModelType) {\r\n          importContainer.addFromQObject(qObject);\r\n        }\r\n      } else {\r\n        if (isModelType) {\r\n          qPathInit = `new ${prop.qPath}(this.withPrefix(\"${odataName}\"), () => ${prop.qObject!})`;\r\n        } else {\r\n          let converterStmt = this.generateConverterStmt(prop.converters, importContainer);\r\n          qPathInit = `new ${prop.qPath}(this.withPrefix(\"${odataName}\")${converterStmt ? `, ${converterStmt}` : \"\"})`;\r\n        }\r\n        // add import for data type\r\n        importContainer.addFromQObject(prop.qPath);\r\n      }\r\n\r\n      return {\r\n        name,\r\n        scope: Scope.Public,\r\n        isReadonly: true,\r\n        initializer: qPathInit,\r\n      } as OptionalKind<PropertyDeclarationStructure>;\r\n    });\r\n  }\r\n\r\n  private generateConverterStmt(converters: Array<ValueConverterImport> | undefined, importContainer: ImportContainer) {\r\n    if (!converters?.length) {\r\n      return;\r\n    }\r\n    converters.forEach((converter) => {\r\n      importContainer.addCustomType(converter.package, converter.converterId);\r\n    });\r\n\r\n    if (converters.length === 1) {\r\n      return converters[0].converterId;\r\n    } else {\r\n      importContainer.addCustomType(\"@odata2ts/converter-runtime\", \"createChain\");\r\n\r\n      const [first, second, ...moreConverters] = converters;\r\n      return moreConverters.reduce(\r\n        (stmt, conv) => `${stmt}.chain(${conv.converterId})`,\r\n        `createChain(${first.converterId}, ${second.converterId})`\r\n      );\r\n    }\r\n  }\r\n\r\n  private generateIdFunction(model: ModelType, importContainer: ImportContainer) {\r\n    if (!model.generateId) {\r\n      return;\r\n    }\r\n\r\n    const qFunc = \"QId\";\r\n    importContainer.addFromQObject(qFunc);\r\n    importContainer.addGeneratedModel(model.idModelName);\r\n\r\n    this.sourceFile.addClass({\r\n      name: model.qIdFunctionName,\r\n      isExported: true,\r\n      extends: `${qFunc}<${model.idModelName}>`,\r\n      properties: [\r\n        {\r\n          name: \"params\",\r\n          scope: Scope.Private,\r\n          isReadonly: true,\r\n          initializer: this.getParamInitString(model.keys, importContainer),\r\n        },\r\n      ],\r\n      methods: [\r\n        {\r\n          name: \"getParams\",\r\n          statements: [\"return this.params\"],\r\n        },\r\n      ],\r\n    });\r\n  }\r\n\r\n  private getParamInitString(props: Array<PropertyModel>, importContainer: ImportContainer) {\r\n    return `[${props\r\n      .map((prop) => {\r\n        const isComplexParam = prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\r\n        if (prop.qParam) {\r\n          importContainer.addFromQObject(prop.qParam);\r\n        }\r\n        const isMappedNameNecessary = prop.odataName !== prop.name;\r\n        const mappedName = isMappedNameNecessary ? `\"${prop.name}\"` : prop.converters?.length ? \"undefined\" : undefined;\r\n        const converterStmt = this.generateConverterStmt(prop.converters, importContainer);\r\n        const mappedNameParam = mappedName ? `, ${mappedName}` : \"\";\r\n        const complexQParam = isComplexParam ? `, new ${prop.qObject}()` : \"\";\r\n        const converterParam = converterStmt ? `, ${converterStmt}` : \"\";\r\n        return `new ${prop.qParam}(\"${prop.odataName}\"${complexQParam}${mappedNameParam}${converterParam})`;\r\n      })\r\n      .join(\",\")}]`;\r\n  }\r\n\r\n  private generateUnboundOperations(importContainer: ImportContainer) {\r\n    this.dataModel.getUnboundOperationTypes().forEach((operation) => {\r\n      this.generateOperation(operation, importContainer);\r\n    });\r\n  }\r\n\r\n  private generateBoundOperations(bindingName: string, importContainer: ImportContainer) {\r\n    this.dataModel.getOperationTypeByEntityOrCollectionBinding(bindingName).forEach((operation) => {\r\n      this.generateOperation(operation, importContainer);\r\n    });\r\n  }\r\n\r\n  private generateOperation(operation: OperationType, importContainer: ImportContainer) {\r\n    const isV2 = this.version === ODataVersions.V2;\r\n    const qOperation = operation.type === OperationTypes.Action ? \"QAction\" : \"QFunction\";\r\n    const returnType = operation.returnType;\r\n    let returnTypeOpStmt: string = \"\";\r\n    const hasParams = operation.parameters.length > 0;\r\n    importContainer.addFromQObject(qOperation);\r\n    if (hasParams) {\r\n      importContainer.addGeneratedModel(operation.paramsModelName);\r\n    }\r\n    if (returnType) {\r\n      if (returnType.dataType === DataTypes.ComplexType || returnType.dataType === DataTypes.ModelType) {\r\n        if (returnType.qObject) {\r\n          importContainer.addFromQObject(\"OperationReturnType\", \"ReturnTypes\", \"QComplexParam\");\r\n          returnTypeOpStmt = `new OperationReturnType(ReturnTypes.COMPLEX${\r\n            returnType.isCollection ? \"_COLLECTION\" : \"\"\r\n          }, new QComplexParam(\"NONE\", new ${returnType.qObject}))`;\r\n        }\r\n      } else if (returnType.converters && returnType.qParam) {\r\n        importContainer.addFromQObject(\"OperationReturnType\", \"ReturnTypes\", returnType.qParam);\r\n        returnTypeOpStmt = `new OperationReturnType(ReturnTypes.VALUE${\r\n          returnType.isCollection ? \"_COLLECTION\" : \"\"\r\n        }, new ${returnType.qParam}(\"NONE\", undefined, ${this.generateConverterStmt(\r\n          returnType.converters,\r\n          importContainer\r\n        )}))`;\r\n      }\r\n    }\r\n\r\n    this.sourceFile.addClass({\r\n      name: operation.qName,\r\n      isExported: true,\r\n      extends: qOperation + (hasParams ? `<${operation.paramsModelName}>` : \"\"),\r\n      properties: [\r\n        {\r\n          name: \"params\",\r\n          scope: Scope.Private,\r\n          isReadonly: true,\r\n          type: operation.parameters?.length ? undefined : \"[]\",\r\n          initializer: this.getParamInitString(operation.parameters, importContainer),\r\n        },\r\n      ],\r\n      ctors: [\r\n        {\r\n          statements: [\r\n            `super(\"${operation.odataName}\"${returnTypeOpStmt ? \", \" + returnTypeOpStmt : isV2 ? \", undefined\" : \"\"}${\r\n              isV2 ? \", { v2Mode: true }\" : \"\"\r\n            })`,\r\n          ],\r\n        },\r\n      ],\r\n      methods: [\r\n        {\r\n          name: \"getParams\",\r\n          statements: [\"return this.params\"],\r\n        },\r\n        // functions without params: add an overriding buildUrl() to not force users to have to pass undefined as param\r\n        ...(operation.type === OperationTypes.Function && !hasParams\r\n          ? [\r\n              {\r\n                name: \"buildUrl\",\r\n                statements: [\"return super.buildUrl(undefined)\"],\r\n              },\r\n            ]\r\n          : []),\r\n      ],\r\n    });\r\n  }\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odata2ts/odata2ts",
-  "version": "0.20.1",
+  "version": "0.20.3",
   "publishConfig": {
     "access": "public"
   },
@@ -32,27 +32,26 @@
     "LICENSE"
   ],
   "keywords": [
-    "odata2ts",
-    "odata",
-    "odata v2",
-    "odata v4",
     "odata client",
-    "cli",
     "generator",
-    "odata client generator",
-    "typescript",
     "ts",
-    "javascript",
-    "js"
+    "model",
+    "interface",
+    "odata",
+    "typescript",
+    "odata2ts",
+    "v2",
+    "v4",
+    "cli"
   ],
   "peerDependencies": {
     "@odata2ts/odata-client-api": "^0.6.3",
-    "@odata2ts/odata-query-objects": "^0.17.1",
-    "@odata2ts/odata-service": "^0.13.7"
+    "@odata2ts/odata-query-objects": "^0.17.3",
+    "@odata2ts/odata-service": "^0.13.9"
   },
   "dependencies": {
-    "@odata2ts/converter-api": "^0.1.1",
-    "@odata2ts/converter-runtime": "^0.1.2",
+    "@odata2ts/converter-api": "^0.1.2",
+    "@odata2ts/converter-runtime": "^0.1.5",
     "@odata2ts/odata-core": "^0.3.7",
     "camel-case": "^4.1.2",
     "commander": "^9.1.0",
@@ -68,13 +67,13 @@
     "ts-node": "^10.7.0",
     "tsconfig-loader": "^1.1.0",
     "upper-case-first": "^2.0.2",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.5.0"
   },
   "devDependencies": {
-    "@odata2ts/converter-v2-to-v4": "^0.1.2",
+    "@odata2ts/converter-v2-to-v4": "^0.1.4",
     "@odata2ts/odata-client-api": "^0.6.3",
-    "@odata2ts/odata-query-objects": "^0.17.1",
-    "@odata2ts/odata-service": "^0.13.7",
+    "@odata2ts/odata-query-objects": "^0.17.3",
+    "@odata2ts/odata-service": "^0.13.9",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.23",
@@ -88,6 +87,6 @@
     "typescript": "^4.9.4"
   },
   "types": "./lib/index.d.ts",
-  "gitHead": "e822bca2fc167a490cd7467167868c624fe7b9a1",
+  "gitHead": "b75ce4575da23cb486a5026dd3256c33e82bb485",
   "readme": "README.md"
 }