@odata2ts/odata2ts 0.18.0

package/lib/generator/QueryObjectGenerator.js

@@ -0,0 +1,234 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateQueryObjects = void 0;
+const odata_core_1 = require("@odata2ts/odata-core");
+const ts_morph_1 = require("ts-morph");
+const processors_1 = require("xml2js/lib/processors");
+const ImportContainer_1 = require("./ImportContainer");
+const generateQueryObjects = (dataModel, sourceFile, version, options, namingHelper) => {
+    const generator = new QueryObjectGenerator(dataModel, sourceFile, version, options, namingHelper);
+    return generator.generate();
+};
+exports.generateQueryObjects = generateQueryObjects;
+class QueryObjectGenerator {
+    constructor(dataModel, sourceFile, version, options, namingHelper) {
+        this.dataModel = dataModel;
+        this.sourceFile = sourceFile;
+        this.version = version;
+        this.options = options;
+        this.namingHelper = namingHelper;
+    }
+    generate() {
+        const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
+        this.generateModels(importContainer);
+        if (!this.options.skipOperations) {
+            this.generateUnboundOperations(importContainer);
+        }
+        this.sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));
+    }
+    generateModels(importContainer) {
+        this.dataModel.getModels().forEach((model) => {
+            this.generateModel(model, importContainer);
+            if (!this.options.skipIdModels) {
+                this.generateIdFunction(model, importContainer);
+            }
+            if (!this.options.skipOperations) {
+                this.generateBoundOperations(model.name, importContainer);
+            }
+        });
+        this.dataModel.getComplexTypes().forEach((model) => {
+            this.generateModel(model, importContainer);
+        });
+        if (this.dataModel.getModels().length || this.dataModel.getComplexTypes().length) {
+            importContainer.addFromQObject("QueryObject");
+        }
+    }
+    generateModel(model, importContainer) {
+        let extendsClause = "QueryObject";
+        if (model.baseClasses.length) {
+            const baseClass = model.baseClasses[0];
+            const baseModel = this.dataModel.getModel(baseClass) || this.dataModel.getComplexType(baseClass);
+            extendsClause = baseModel.qName;
+        }
+        this.sourceFile.addClass({
+            name: model.qName,
+            isExported: true,
+            extends: extendsClause,
+            properties: this.generateQueryObjectProps(model.props, importContainer),
+        });
+        this.sourceFile.addVariableStatement({
+            declarationKind: ts_morph_1.VariableDeclarationKind.Const,
+            isExported: true,
+            declarations: [
+                {
+                    name: (0, processors_1.firstCharLowerCase)(model.qName),
+                    initializer: `new ${model.qName}()`,
+                },
+            ],
+        });
+    }
+    generateQueryObjectProps(props, importContainer) {
+        return props.map((prop) => {
+            const { odataName } = prop;
+            const name = this.namingHelper.getQPropName(prop.name);
+            const isModelType = prop.dataType === "ModelType" /* ModelType */ || prop.dataType === "ComplexType" /* ComplexType */;
+            let qPathInit;
+            // factor in collections
+            if (prop.isCollection) {
+                const cType = `Q${isModelType ? "Entity" : ""}CollectionPath`;
+                const qObject = prop.qObject;
+                if (!qObject) {
+                    throw new Error("QObject for collection is missing!");
+                }
+                qPathInit = `new ${cType}(this.withPrefix("${odataName}"), () => ${qObject})`;
+                importContainer.addFromQObject(cType);
+                if (!isModelType) {
+                    importContainer.addFromQObject(qObject);
+                }
+            }
+            else {
+                if (isModelType) {
+                    qPathInit = `new ${prop.qPath}(this.withPrefix("${odataName}"), () => ${prop.qObject})`;
+                }
+                else {
+                    let converterStmt = this.generateConverterStmt(prop.converters, importContainer);
+                    qPathInit = `new ${prop.qPath}(this.withPrefix("${odataName}")${converterStmt ? `, ${converterStmt}` : ""})`;
+                }
+                // add import for data type
+                importContainer.addFromQObject(prop.qPath);
+            }
+            return {
+                name,
+                scope: ts_morph_1.Scope.Public,
+                isReadonly: true,
+                initializer: qPathInit,
+            };
+        });
+    }
+    generateConverterStmt(converters, importContainer) {
+        if (!(converters === null || converters === void 0 ? void 0 : converters.length)) {
+            return;
+        }
+        converters.forEach((converter) => {
+            importContainer.addCustomType(converter.package, converter.converterId);
+        });
+        if (converters.length === 1) {
+            return converters[0].converterId;
+        }
+        else {
+            importContainer.addCustomType("@odata2ts/converter-runtime", "createChain");
+            const [first, second, ...moreConverters] = converters;
+            return moreConverters.reduce((stmt, conv) => `${stmt}.chain(${conv.converterId})`, `createChain(${first.converterId}, ${second.converterId})`);
+        }
+    }
+    generateIdFunction(model, importContainer) {
+        if (!model.generateId) {
+            return;
+        }
+        const qFunc = "QId";
+        importContainer.addFromQObject(qFunc);
+        importContainer.addGeneratedModel(model.idModelName);
+        this.sourceFile.addClass({
+            name: model.qIdFunctionName,
+            isExported: true,
+            extends: `${qFunc}<${model.idModelName}>`,
+            properties: [
+                {
+                    name: "params",
+                    scope: ts_morph_1.Scope.Private,
+                    isReadonly: true,
+                    initializer: this.getParamInitString(model.keys, importContainer),
+                },
+            ],
+            methods: [
+                {
+                    name: "getParams",
+                    statements: ["return this.params"],
+                },
+            ],
+        });
+    }
+    getParamInitString(props, importContainer) {
+        return `[${props
+            .map((prop) => {
+            var _a;
+            if (prop.qParam) {
+                importContainer.addFromQObject(prop.qParam);
+            }
+            const isMappedNameNecessary = prop.odataName !== prop.name;
+            const mappedName = isMappedNameNecessary ? `"${prop.name}"` : ((_a = prop.converters) === null || _a === void 0 ? void 0 : _a.length) ? "undefined" : undefined;
+            const converterStmt = this.generateConverterStmt(prop.converters, importContainer);
+            return `new ${prop.qParam}("${prop.odataName}"${mappedName ? `, ${mappedName}` : ""}${converterStmt ? `, ${converterStmt}` : ""})`;
+        })
+            .join(",")}]`;
+    }
+    generateUnboundOperations(importContainer) {
+        this.dataModel.getUnboundOperationTypes().forEach((operation) => {
+            this.generateOperation(operation, importContainer);
+        });
+    }
+    generateBoundOperations(bindingName, importContainer) {
+        this.dataModel.getOperationTypeByBinding(bindingName).forEach((operation) => {
+            this.generateOperation(operation, importContainer);
+        });
+    }
+    generateOperation(operation, importContainer) {
+        const isV2 = this.version === odata_core_1.ODataVersions.V2;
+        const qOperation = operation.type === "Action" /* Action */ ? "QAction" : "QFunction";
+        const returnType = operation.returnType;
+        let returnTypeOpStmt = "";
+        const hasParams = operation.parameters.length > 0;
+        importContainer.addFromQObject(qOperation);
+        if (hasParams) {
+            importContainer.addGeneratedModel(operation.paramsModelName);
+        }
+        if (returnType) {
+            if (returnType.dataType === "ComplexType" /* ComplexType */ || returnType.dataType === "ModelType" /* ModelType */) {
+                if (returnType.qObject) {
+                    importContainer.addFromQObject("OperationReturnType", "ReturnTypes", "QComplexParam");
+                    returnTypeOpStmt = `new OperationReturnType(ReturnTypes.COMPLEX${returnType.isCollection ? "_COLLECTION" : ""}, new QComplexParam("NONE", new ${returnType.qObject}))`;
+                }
+            }
+            else if (returnType.converters && returnType.qParam) {
+                importContainer.addFromQObject("OperationReturnType", "ReturnTypes", returnType.qParam);
+                returnTypeOpStmt = `new OperationReturnType(ReturnTypes.VALUE${returnType.isCollection ? "_COLLECTION" : ""}, new ${returnType.qParam}("NONE", undefined, ${this.generateConverterStmt(returnType.converters, importContainer)}))`;
+            }
+        }
+        this.sourceFile.addClass({
+            name: operation.qName,
+            isExported: true,
+            extends: qOperation + (hasParams ? `<${operation.paramsModelName}>` : ""),
+            properties: [
+                {
+                    name: "params",
+                    scope: ts_morph_1.Scope.Private,
+                    isReadonly: true,
+                    initializer: this.getParamInitString(operation.parameters, importContainer),
+                },
+            ],
+            ctors: [
+                {
+                    statements: [
+                        `super("${operation.odataName}"${returnTypeOpStmt ? ", " + returnTypeOpStmt : isV2 ? ", undefined" : ""}${isV2 ? ", { v2Mode: true }" : ""})`,
+                    ],
+                },
+            ],
+            methods: [
+                {
+                    name: "getParams",
+                    statements: ["return this.params"],
+                },
+                // functions without params: add an overriding buildUrl() to not force users to have to pass undefined as param
+                ...(operation.type === "Function" /* Function */ && !hasParams
+                    ? [
+                        {
+                            name: "buildUrl",
+                            statements: ["return super.buildUrl(undefined)"],
+                        },
+                    ]
+                    : []),
+            ],
+        });
+    }
+}
+//# sourceMappingURL=QueryObjectGenerator.js.map

package/lib/generator/QueryObjectGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryObjectGenerator.js","sourceRoot":"","sources":["../../src/generator/QueryObjectGenerator.ts"],"names":[],"mappings":"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"}

package/lib/generator/ServiceGenerator.d.ts

@@ -0,0 +1,5 @@
+import { ODataVersions } from "@odata2ts/odata-core";
+import { DataModel } from "../data-model/DataModel";
+import { NamingHelper } from "../data-model/NamingHelper";
+import { ProjectManager } from "../project/ProjectManager";
+export declare function generateServices(dataModel: DataModel, project: ProjectManager, version: ODataVersions, namingHelper: NamingHelper): Promise<void>;

package/lib/generator/ServiceGenerator.js

@@ -0,0 +1,412 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateServices = void 0;
+const tslib_1 = require("tslib");
+const odata_core_1 = require("@odata2ts/odata-core");
+const ts_morph_1 = require("ts-morph");
+const upper_case_first_1 = require("upper-case-first");
+const processors_1 = require("xml2js/lib/processors");
+const ImportContainer_1 = require("./ImportContainer");
+const ROOT_SERVICE = "ODataService";
+const RESPONSE_TYPES = {
+    collection: "ODataCollectionResponse",
+    model: "ODataModelResponse",
+    value: "ODataValueResponse",
+};
+function generateServices(dataModel, project, version, namingHelper) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const generator = new ServiceGenerator(dataModel, project, version, namingHelper);
+        return generator.generate();
+    });
+}
+exports.generateServices = generateServices;
+class ServiceGenerator {
+    constructor(dataModel, project, version, namingHelper) {
+        this.dataModel = dataModel;
+        this.project = project;
+        this.version = version;
+        this.namingHelper = namingHelper;
+        this.generateQOperationProps = (operation) => {
+            return {
+                scope: ts_morph_1.Scope.Private,
+                name: this.namingHelper.getPrivatePropName(operation.qName),
+                type: operation.qName,
+                hasQuestionToken: true,
+            };
+        };
+    }
+    generate() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const sourceFile = yield this.project.createMainServiceFile();
+            const serviceName = this.namingHelper.getMainServiceName();
+            const container = this.dataModel.getEntityContainer();
+            const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];
+            yield this.generateModelServices();
+            const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
+            importContainer.addFromClientApi("ODataClient");
+            importContainer.addFromService(ROOT_SERVICE);
+            sourceFile.addClass({
+                isExported: true,
+                name: serviceName,
+                typeParameters: ["ClientType extends ODataClient"],
+                extends: `${ROOT_SERVICE}<ClientType>`,
+                properties: [
+                    {
+                        scope: ts_morph_1.Scope.Private,
+                        name: this.namingHelper.getPrivatePropName("name"),
+                        type: "string",
+                        initializer: `"${this.namingHelper.getODataServiceName()}"`,
+                    },
+                    ...this.generateEntityServiceResolverProp(container.entitySets, importContainer),
+                    ...this.generateServiceGettersByAssignment(container.entitySets),
+                    ...this.generateServiceTypeProps(container.singletons, this.namingHelper.getServiceName, importContainer),
+                    ...Object.values(unboundOperations).map(({ operation }) => this.generateQOperationProps(operation)),
+                ],
+                methods: [
+                    ...this.generateServiceTypeGetters(container.singletons, this.namingHelper.getServiceName),
+                    ...this.generateUnboundOperations(unboundOperations, importContainer),
+                ],
+            });
+            sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));
+        });
+    }
+    generateEntityServiceResolverProp(services, importContainer) {
+        return Object.values(services).map(({ name, entityType }) => {
+            const resolverName = this.namingHelper.getServiceResolverName(entityType.name);
+            importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), resolverName);
+            return {
+                name: this.namingHelper.getPublicPropNameForService(name),
+                scope: ts_morph_1.Scope.Public,
+                initializer: `${resolverName}(this.client, this.getPath(), "${name}")`,
+            };
+        });
+    }
+    generateServiceGettersByAssignment(services) {
+        return Object.values(services).map(({ name, odataName, entityType }) => {
+            const propName = this.namingHelper.getPublicPropNameForService(name);
+            return {
+                scope: ts_morph_1.Scope.Public,
+                name: this.namingHelper.getRelatedServiceGetter(name),
+                initializer: `this.${propName}.get.bind(this.${propName})`,
+            };
+        });
+    }
+    generateServiceTypeProps(services, typeRetriever, importContainer) {
+        return Object.values(services).map(({ name, entityType }) => {
+            const type = typeRetriever(entityType.name);
+            importContainer.addGeneratedService(this.namingHelper.getServiceName(entityType.name), type);
+            return {
+                scope: ts_morph_1.Scope.Private,
+                name: this.namingHelper.getPrivatePropName(name),
+                type: `${type}<ClientType>`,
+                hasQuestionToken: true,
+            };
+        });
+    }
+    generateServiceTypeGetters(services, typeRetriever) {
+        return Object.values(services).map(({ name, odataName, entityType }) => {
+            const propName = "this." + this.namingHelper.getPrivatePropName(name);
+            const serviceType = typeRetriever(entityType.name);
+            return {
+                scope: ts_morph_1.Scope.Public,
+                name: this.namingHelper.getRelatedServiceGetter(name),
+                statements: [
+                    `if(!${propName}) {`,
+                    // prettier-ignore
+                    `  ${propName} = new ${serviceType}(this.client, this.getPath(), "${odataName}")`,
+                    "}",
+                    `return ${propName}`,
+                ],
+            };
+        });
+    }
+    getVersionSuffix() {
+        return this.version === odata_core_1.ODataVersions.V2 ? "V2" : "V4";
+    }
+    generateModelService(model, serviceName, serviceFile, importContainer) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const entityServiceType = "EntityTypeService" + this.getVersionSuffix();
+            const collectionServiceType = "CollectionService" + this.getVersionSuffix();
+            const editableModelName = model.editableName;
+            const operations = this.dataModel.getOperationTypeByBinding(model.name);
+            const props = [...model.baseProps, ...model.props];
+            const modelProps = props.filter((prop) => prop.dataType === "ModelType" /* ModelType */ || prop.dataType === "ComplexType" /* ComplexType */);
+            const primColProps = props.filter((prop) => prop.isCollection && prop.dataType !== "ModelType" /* ModelType */ && prop.dataType !== "ComplexType" /* ComplexType */);
+            importContainer.addFromService(entityServiceType);
+            importContainer.addFromClientApi("ODataClient");
+            importContainer.addGeneratedModel(model.name, editableModelName);
+            importContainer.addGeneratedQObject(model.qName, (0, processors_1.firstCharLowerCase)(model.qName));
+            // generate EntityTypeService
+            serviceFile.addClass({
+                isExported: true,
+                name: serviceName,
+                typeParameters: ["ClientType extends ODataClient"],
+                extends: entityServiceType + `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}>`,
+                ctors: [
+                    {
+                        parameters: [
+                            { name: "client", type: "ClientType" },
+                            { name: "basePath", type: "string" },
+                            { name: "name", type: "string" },
+                        ],
+                        statements: [`super(client, basePath, name, ${(0, processors_1.firstCharLowerCase)(model.qName)});`],
+                    },
+                ],
+                properties: [
+                    ...this.generateModelProps(modelProps, collectionServiceType, serviceName, importContainer),
+                    ...this.generatePrimitiveCollectionProps(primColProps, collectionServiceType, importContainer),
+                    ...operations.map(this.generateQOperationProps),
+                ],
+                methods: [
+                    ...this.generateModelPropGetters(modelProps, collectionServiceType),
+                    ...this.generatePrimitiveCollectionGetters(primColProps, collectionServiceType),
+                    ...this.generateBoundOperations(operations, importContainer),
+                ],
+            });
+        });
+    }
+    generateModelProps(modelProps, collectionServiceType, serviceName, importContainer) {
+        return modelProps.map((prop) => {
+            const complexType = this.dataModel.getComplexType(prop.type);
+            const key = this.namingHelper.getServiceName(prop.type);
+            let propModelType = prop.isCollection ? this.namingHelper.getCollectionServiceName(prop.type) : key;
+            if (prop.isCollection && complexType) {
+                const editableName = complexType.editableName;
+                importContainer.addFromService(collectionServiceType);
+                importContainer.addGeneratedModel(complexType.name, editableName);
+                importContainer.addGeneratedQObject(complexType.qName, (0, processors_1.firstCharLowerCase)(complexType.qName));
+                propModelType = `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${editableName}>`;
+            }
+            else {
+                // don't include imports for this type
+                if (serviceName !== key) {
+                    importContainer.addGeneratedService(key, propModelType);
+                }
+                propModelType = `${propModelType}<ClientType>`;
+            }
+            return {
+                scope: ts_morph_1.Scope.Private,
+                name: this.namingHelper.getPrivatePropName(prop.name),
+                type: propModelType,
+                hasQuestionToken: true,
+            };
+        });
+    }
+    generatePrimitiveCollectionProps(primColProps, collectionServiceType, importContainer) {
+        return primColProps.map((prop) => {
+            const isEnum = prop.dataType === "EnumType" /* EnumType */;
+            const type = isEnum ? `EnumCollection<${prop.type}>` : `${(0, upper_case_first_1.upperCaseFirst)(prop.type)}Collection`;
+            const qType = isEnum ? "QEnumCollection" : `Q${type}`;
+            const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;
+            if (!prop.qObject) {
+                throw new Error("Illegal State: [qObject] must be provided for Collection types!");
+            }
+            importContainer.addFromService(collectionServiceType);
+            importContainer.addFromQObject(prop.qObject, (0, processors_1.firstCharLowerCase)(prop.qObject));
+            if (isEnum) {
+                importContainer.addGeneratedModel(prop.type);
+                importContainer.addFromQObject("EnumCollection");
+            }
+            else {
+                importContainer.addFromQObject(type);
+            }
+            return {
+                scope: ts_morph_1.Scope.Private,
+                name: this.namingHelper.getPrivatePropName(prop.name),
+                type: `${collectionType}`,
+                hasQuestionToken: true,
+            };
+        });
+    }
+    generateModelPropGetters(modelProps, collectionServiceType) {
+        return modelProps.map((prop) => {
+            const complexType = this.dataModel.getComplexType(prop.type);
+            const isComplexCollection = prop.isCollection && complexType;
+            const type = isComplexCollection
+                ? collectionServiceType
+                : prop.isCollection
+                    ? this.namingHelper.getCollectionServiceName(prop.type)
+                    : this.namingHelper.getServiceName(prop.type);
+            const typeWithGenerics = isComplexCollection
+                ? `${collectionServiceType}<ClientType, ${complexType.name}, ${complexType.qName}, ${complexType.editableName}>`
+                : `${type}<ClientType>`;
+            const privateSrvProp = "this." + this.namingHelper.getPrivatePropName(prop.name);
+            return {
+                scope: ts_morph_1.Scope.Public,
+                name: this.namingHelper.getRelatedServiceGetter(prop.name),
+                returnType: typeWithGenerics,
+                statements: [
+                    `if(!${privateSrvProp}) {`,
+                    // prettier-ignore
+                    `  ${privateSrvProp} = new ${type}(this.client, this.getPath(), "${prop.odataName}"${isComplexCollection ? `, ${(0, processors_1.firstCharLowerCase)(complexType.qName)}` : ""})`,
+                    "}",
+                    `return ${privateSrvProp}`,
+                ],
+            };
+        });
+    }
+    generatePrimitiveCollectionGetters(primColProps, collectionServiceType) {
+        return primColProps.map((prop) => {
+            const propName = "this." + this.namingHelper.getPrivatePropName(prop.name);
+            return {
+                scope: ts_morph_1.Scope.Public,
+                name: this.namingHelper.getRelatedServiceGetter(prop.name),
+                statements: [
+                    `if(!${propName}) {`,
+                    // prettier-ignore
+                    `  ${propName} = new ${collectionServiceType}(this.client, this.getPath(), "${prop.odataName}", ${(0, processors_1.firstCharLowerCase)(prop.qObject)})`,
+                    "}",
+                    `return ${propName}`,
+                ],
+            };
+        });
+    }
+    generateEntityCollectionService(model, serviceName, serviceFile, importContainer) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const entitySetServiceType = "EntitySetService" + this.getVersionSuffix();
+            const editableModelName = model.editableName;
+            const qObjectName = (0, processors_1.firstCharLowerCase)(model.qName);
+            importContainer.addFromService(entitySetServiceType);
+            importContainer.addGeneratedModel(model.idModelName);
+            importContainer.addGeneratedQObject(model.qIdFunctionName);
+            const collectionOperations = this.dataModel.getOperationTypeByBinding(`Collection(${model.name})`);
+            serviceFile.addClass({
+                isExported: true,
+                name: this.namingHelper.getCollectionServiceName(model.name),
+                typeParameters: ["ClientType extends ODataClient"],
+                extends: entitySetServiceType +
+                    `<ClientType, ${model.name}, ${editableModelName}, ${model.qName}, ${model.idModelName}, ${serviceName}<ClientType>>`,
+                ctors: [
+                    {
+                        parameters: [
+                            { name: "client", type: "ClientType" },
+                            { name: "basePath", type: "string" },
+                            { name: "name", type: "string" },
+                        ],
+                        statements: [
+                            `super(client, basePath, name, ${qObjectName}, ${serviceName}, new ${model.qIdFunctionName}(name));`,
+                        ],
+                    },
+                ],
+                properties: [...collectionOperations.map(this.generateQOperationProps)],
+                methods: [...this.generateBoundOperations(collectionOperations, importContainer)],
+            });
+        });
+    }
+    generateEntityServiceResolver(model, serviceName, serviceFile, importContainer) {
+        const idFunctionName = this.namingHelper.getQIdFunctionName(model.odataName);
+        const collectionName = this.namingHelper.getCollectionServiceName(model.name);
+        importContainer.addFromClientApi("ODataClient");
+        importContainer.addFromService("EntityServiceResolver");
+        importContainer.addGeneratedQObject(idFunctionName);
+        serviceFile.addFunction({
+            name: this.namingHelper.getServiceResolverName(model.name),
+            isExported: true,
+            parameters: [
+                {
+                    name: "client",
+                    type: "ODataClient",
+                },
+                {
+                    name: "basePath",
+                    type: "string",
+                },
+                {
+                    name: "entityName",
+                    type: "string",
+                },
+            ],
+            statements: [
+                `return new EntityServiceResolver(client, basePath, entityName, ${idFunctionName}, ${serviceName}, ${collectionName});`,
+            ],
+        });
+    }
+    generateModelServices() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // build service file for each entity, consisting of EntityTypeService & EntityCollectionService
+            for (const model of this.dataModel.getModels()) {
+                const serviceName = this.namingHelper.getServiceName(model.name);
+                const serviceFile = yield this.project.createServiceFile(serviceName);
+                const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
+                // entity type service
+                yield this.generateModelService(model, serviceName, serviceFile, importContainer);
+                // entity collection service
+                yield this.generateEntityCollectionService(model, serviceName, serviceFile, importContainer);
+                // the resolver function
+                yield this.generateEntityServiceResolver(model, serviceName, serviceFile, importContainer);
+                serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));
+            }
+            // build service file for complex types
+            for (const model of this.dataModel.getComplexTypes()) {
+                const serviceName = this.namingHelper.getServiceName(model.name);
+                const serviceFile = yield this.project.createServiceFile(serviceName);
+                const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
+                // entity type service
+                yield this.generateModelService(model, serviceName, serviceFile, importContainer);
+                serviceFile.addImportDeclarations(importContainer.getImportDeclarations(true));
+            }
+        });
+    }
+    generateBoundOperations(operations, importContainer) {
+        return operations.reduce((collector, operation) => {
+            collector.push(this.generateMethod(operation.name, operation, importContainer));
+            return collector;
+        }, []);
+    }
+    generateUnboundOperations(operations, importContainer) {
+        return Object.values(operations).reduce((collector, { name, operation }) => {
+            collector.push(this.generateMethod(name, operation, importContainer));
+            return collector;
+        }, []);
+    }
+    generateMethod(name, operation, importContainer) {
+        var _a, _b;
+        const isFunc = operation.type === "Function" /* Function */;
+        const odataType = ((_a = operation.returnType) === null || _a === void 0 ? void 0 : _a.isCollection)
+            ? RESPONSE_TYPES.collection + this.getVersionSuffix()
+            : ((_b = operation.returnType) === null || _b === void 0 ? void 0 : _b.dataType) === "PrimitiveType" /* PrimitiveType */
+                ? RESPONSE_TYPES.value + this.getVersionSuffix()
+                : RESPONSE_TYPES.model + this.getVersionSuffix();
+        const returnType = operation.returnType;
+        const requestConfigParam = { name: "requestConfig", hasQuestionToken: true, type: "ODataClientConfig<ClientType>" };
+        const hasParams = operation.parameters.length > 0;
+        // importing dependencies
+        importContainer.addFromClientApi("ODataClientConfig", "ODataResponse");
+        importContainer.addFromCore(odataType);
+        if (returnType === null || returnType === void 0 ? void 0 : returnType.type) {
+            if (["EnumType" /* EnumType */, "ModelType" /* ModelType */, "ComplexType" /* ComplexType */].includes(returnType.dataType)) {
+                importContainer.addGeneratedModel(returnType.type);
+            }
+        }
+        importContainer.addGeneratedQObject(operation.qName);
+        if (hasParams) {
+            importContainer.addGeneratedModel(operation.paramsModelName);
+        }
+        const qOpProp = "this." + this.namingHelper.getPrivatePropName(operation.qName);
+        return {
+            scope: ts_morph_1.Scope.Public,
+            isAsync: true,
+            name,
+            parameters: hasParams
+                ? [{ name: "params", type: operation.paramsModelName }, requestConfigParam]
+                : [requestConfigParam],
+            returnType: `ODataResponse<${odataType}<${(returnType === null || returnType === void 0 ? void 0 : returnType.type) || "void"}>>`,
+            statements: [
+                `if(!${qOpProp}) {`,
+                `  ${qOpProp} = new ${operation.qName}()`,
+                "}",
+                `const url = this.addFullPath(${qOpProp}.buildUrl(${isFunc && hasParams ? "params" : ""}));`,
+                `${returnType ? "const response = await " : "return"} this.client.${!isFunc
+                    ? // actions: since V4
+                        `post(url, ${hasParams ? `${qOpProp}.convertUserParams(params)` : "{}"}, ${requestConfigParam.name})`
+                    : operation.usePost
+                        ? // V2 POST => BUT values are still query params, they are not part of the request body
+                            `post(url, undefined, ${requestConfigParam.name})`
+                        : // functions: since V2
+                            `get(url, ${requestConfigParam.name})`};`,
+                returnType ? `return ${qOpProp}.convertResponse(response);` : "",
+            ],
+        };
+    }
+}
+//# sourceMappingURL=ServiceGenerator.js.map