npm - @odata2ts/odata2ts - Versions diffs - 0.39.2 → 0.40.2 - Mend

@odata2ts/odata2ts 0.39.2 → 0.40.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/CHANGELOG.md +57 -0
package/lib/FactoryFunctionModel.d.ts +2 -2
package/lib/FactoryFunctionModel.js.map +1 -1
package/lib/OptionModel.d.ts +11 -3
package/lib/OptionModel.js.map +1 -1
package/lib/data-model/DataModelDigestion.js +23 -8
package/lib/data-model/DataModelDigestion.js.map +1 -1
package/lib/data-model/QueryObjectTypes.d.ts +13 -0
package/lib/data-model/QueryObjectTypes.js +15 -0
package/lib/data-model/QueryObjectTypes.js.map +1 -0
package/lib/defaultConfig.js +2 -1
package/lib/defaultConfig.js.map +1 -1
package/lib/generator/ImportContainer.d.ts +3 -0
package/lib/generator/ImportContainer.js +11 -0
package/lib/generator/ImportContainer.js.map +1 -1
package/lib/generator/ModelGenerator.js +18 -9
package/lib/generator/ModelGenerator.js.map +1 -1
package/lib/generator/QueryObjectGenerator.js +58 -38
package/lib/generator/QueryObjectGenerator.js.map +1 -1
package/lib/generator/ServiceGenerator.d.ts +1 -1
package/lib/generator/ServiceGenerator.js +2 -2
package/lib/generator/ServiceGenerator.js.map +1 -1
package/lib/generator/import/ImportObjects.d.ts +0 -6
package/lib/generator/import/ImportObjects.js +0 -6
package/lib/generator/import/ImportObjects.js.map +1 -1
package/lib/project/ProjectManager.js +2 -2
package/lib/project/ProjectManager.js.map +1 -1
package/package.json +6 -6

package/lib/generator/ServiceGenerator.js CHANGED Viewed

@@ -271,14 +271,14 @@ class ServiceGenerator {
         }
         const collectionServiceType = imports.addServiceObject(this.version, ServiceImports.CollectionService);
         const isEnum = prop.dataType === "EnumType" /* DataTypes.EnumType */;
-        const isNumericEnum = this.options.numericEnums;
+        const isNumericEnum = this.options.enumType === "numeric";
         let qType;
         let type;
         if (isEnum) {
             const propEnum = this.dataModel.getModel(prop.fqType);
             const propTypeModel = imports.addGeneratedModel(propEnum.fqName, propEnum.modelName, false);
             type = `${imports.addQObjectType(QueryObjectImports.EnumCollection)}<typeof ${propTypeModel}>`;
-            qType = `${imports.addQObjectType(isNumericEnum ? QueryObjectImports.QNumericEnumCollection : QueryObjectImports.QEnumCollection)}<typeof ${propTypeModel}>`;
+            qType = `${imports.addQObjectType(prop.qObject)}<typeof ${propTypeModel}>`;
         }
         else {
             // TODO refactor string concat

package/lib/generator/ServiceGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ServiceGenerator.js","sourceRoot":"","sources":["../../src/generator/ServiceGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\nimport deepmerge from \"deepmerge\";\nimport {\n ClassDeclarationStructure,\n MethodDeclarationStructure,\n OptionalKind,\n PropertyDeclarationStructure,\n Scope,\n} from \"ts-morph\";\nimport { upperCaseFirst } from \"upper-case-first\";\nimport { firstCharLowerCase } from \"xml2js/lib/processors.js\";\nimport { DataModel } from \"../data-model/DataModel.js\";\nimport {\n ActionImportType,\n ComplexType,\n DataTypes,\n EntityContainerModel,\n EntityType,\n FunctionImportType,\n OperationType,\n OperationTypes,\n PropertyModel,\n ReturnTypeModel,\n SingletonType,\n} from \"../data-model/DataTypeModel.js\";\nimport { NamingHelper } from \"../data-model/NamingHelper.js\";\nimport { ConfigFileOptions, Modes } from \"../OptionModel.js\";\nimport { FileHandler } from \"../project/FileHandler.js\";\nimport { ProjectManager } from \"../project/ProjectManager.js\";\nimport { ClientApiImports, CoreImports, QueryObjectImports, ServiceImports } from \"./import/ImportObjects.js\";\nimport { ImportContainer } from \"./ImportContainer.js\";\n\nexport interface PropsAndOps extends Required<Pick<ClassDeclarationStructure, \"properties\" \| \"methods\">> {}\n\nexport interface ServiceGeneratorOptions\n extends Pick<ConfigFileOptions, \"enablePrimitivePropertyServices\" \| \"v4BigNumberAsString\" \| \"numericEnums\"> {}\n\nexport async function generateServices(\n project: ProjectManager,\n dataModel: DataModel,\n version: ODataVersions,\n namingHelper: NamingHelper,\n options?: ServiceGeneratorOptions,\n) {\n const generator = new ServiceGenerator(project, dataModel, version, namingHelper, options);\n return generator.generate();\n}\n\nclass ServiceGenerator {\n constructor(\n private project: ProjectManager,\n private dataModel: DataModel,\n private version: ODataVersions,\n private namingHelper: NamingHelper,\n private options: ServiceGeneratorOptions = {},\n ) {}\n\n private isV4BigNumber() {\n return this.options.v4BigNumberAsString && this.version === ODataVersions.V4;\n }\n\n public async generate(): Promise<void> {\n const mainServiceName = this.namingHelper.getMainServiceName();\n this.project.initServices();\n\n await Promise.all([\n this.generateMainService(mainServiceName),\n ...this.generateEntityTypeServices(),\n ...this.generateComplexTypeServices(),\n ]);\n\n return this.project.finalizeServices();\n }\n\n private async generateMainService(mainServiceName: string) {\n const mainServiceFile = this.project.getMainServiceFile();\n const importContainer = mainServiceFile.getImports();\n const container = this.dataModel.getEntityContainer();\n const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];\n\n const httpClient = importContainer.addClientApi(ClientApiImports.ODataHttpClient);\n const rootService = importContainer.addServiceObject(this.version, ServiceImports.ODataService);\n\n const { properties, methods }: PropsAndOps = deepmerge(\n this.generateMainServiceProperties(container, importContainer),\n this.generateMainServiceOperations(unboundOperations, importContainer),\n );\n\n mainServiceFile.getFile().addClass({\n isExported: true,\n name: mainServiceName,\n typeParameters: [`in out ClientType extends ${httpClient}`],\n extends: `${rootService}<ClientType>`,\n ctors: this.isV4BigNumber()\n ? [\n {\n parameters: [\n { name: \"client\", type: \"ClientType\" },\n { name: \"basePath\", type: \"string\" },\n {\n name: \"options\",\n type: importContainer.addServiceObject(this.version, ServiceImports.ODataServiceOptions),\n hasQuestionToken: true,\n },\n ],\n statements: [`super(client, basePath, options);`, \"this.__base.options.bigNumbersAsString = true;\"],\n },\n ]\n : [],\n properties,\n methods,\n });\n }\n\n private generateMainServiceProperties(\n container: EntityContainerModel,\n importContainer: ImportContainer,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n Object.values(container.entitySets).forEach(({ name, odataName, entityType }) => {\n result.methods.push(this.generateRelatedServiceGetter(name, odataName, entityType, importContainer));\n });\n\n Object.values(container.singletons).forEach((singleton) => {\n result.properties.push(this.generateSingletonProp(importContainer, singleton));\n result.methods.push(this.generateSingletonGetter(singleton));\n });\n\n return result;\n }\n\n private generateMainServiceOperations(\n ops: Array<FunctionImportType \| ActionImportType>,\n importContainer: ImportContainer,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n ops.forEach(({ operation, name }) => {\n const op = this.dataModel.getUnboundOperationType(operation);\n if (!op) {\n throw new Error(`Operation \"${operation}\" not found!`);\n }\n\n result.properties.push(this.generateQOperationProp(op));\n result.methods.push(this.generateMethod(name, op, importContainer, \"\"));\n });\n\n return result;\n }\n\n private generateRelatedServiceGetter(\n propName: string,\n odataPropName: string,\n entityType: EntityType,\n imports: ImportContainer,\n ): OptionalKind<MethodDeclarationStructure> {\n const idName = imports.addGeneratedModel(entityType.id.fqName, entityType.id.modelName);\n const idFunctionName = imports.addGeneratedQObject(entityType.id.fqName, entityType.id.qName);\n const serviceName = imports.addGeneratedService(entityType.fqName, entityType.serviceName);\n const collectionName = imports.addGeneratedService(entityType.fqName, entityType.serviceCollectionName);\n\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(propName),\n parameters: [\n {\n name: \"id\",\n type: `${idName} \| undefined`,\n hasQuestionToken: true,\n },\n ],\n overloads: [\n {\n parameters: [],\n returnType: `${collectionName}<ClientType>`,\n },\n {\n parameters: [\n {\n name: \"id\",\n type: idName,\n },\n ],\n returnType: `${serviceName}<ClientType>`,\n },\n ],\n statements: [\n `const fieldName = \"${odataPropName}\";`,\n `const { client, path, options, isUrlNotEncoded } = this.__base;`,\n 'return typeof id === \"undefined\" \|\| id === null',\n `? new ${collectionName}(client, path, fieldName, options)`,\n `: new ${serviceName}(client, path, new ${idFunctionName}(fieldName).buildUrl(id, isUrlNotEncoded()), options);`,\n ],\n };\n }\n\n private generateSingletonProp(\n importContainer: ImportContainer,\n singleton: SingletonType,\n ): OptionalKind<PropertyDeclarationStructure> {\n const { name, entityType } = singleton;\n const type = entityType.serviceName;\n\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(name),\n type: `${type}<ClientType>`,\n hasQuestionToken: true,\n };\n }\n\n private generateQOperationProp = (operation: OperationType) => {\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(operation.qName),\n type: operation.qName,\n hasQuestionToken: true,\n };\n };\n\n private generateSingletonGetter(singleton: SingletonType): OptionalKind<MethodDeclarationStructure> {\n const { name, odataName, entityType } = singleton;\n const propName = \"this.\" + this.namingHelper.getPrivatePropName(name);\n const serviceType = entityType.serviceName;\n\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(name),\n statements: [\n `if(!${propName}) {`,\n ` const { client, path, options } = this.__base;`,\n // prettier-ignore\n ` ${propName} = new ${serviceType}(client, path, \"${odataName}\", options)`,\n \"}\",\n `return ${propName}`,\n ],\n };\n }\n\n private generateEntityTypeService(file: FileHandler, model: ComplexType, isComplexType = false) {\n const importContainer = file.getImports();\n\n const operations = this.dataModel.getEntityTypeOperations(model.fqName);\n const props = [...model.baseProps, ...model.props];\n\n const entityServiceType = importContainer.addServiceObject(\n this.version,\n this.version === ODataVersions.V2 && isComplexType\n ? ServiceImports.ComplexTypeService\n : ServiceImports.EntityTypeService,\n );\n const httpClient = importContainer.addClientApi(ClientApiImports.ODataHttpClient);\n\n // note: predictable first imports => no need to take renaming into account\n const modelName = importContainer.addGeneratedModel(model.fqName, model.modelName);\n const editableModelName = importContainer.addGeneratedModel(model.fqName, model.editableName);\n const qName = importContainer.addGeneratedQObject(model.fqName, model.qName, true);\n const qObjectName = importContainer.addGeneratedQObject(model.fqName, firstCharLowerCase(model.qName));\n const serviceOptions = importContainer.addServiceObject(\n this.version,\n this.version === ODataVersions.V4\n ? ServiceImports.ODataServiceOptionsInternal\n : ServiceImports.ODataServiceOptions,\n );\n\n const { properties, methods }: PropsAndOps = deepmerge(\n deepmerge(\n this.generateServiceProperties(importContainer, model.serviceName, props),\n this.generateServiceOperations(importContainer, model, operations),\n ),\n this.generateCastOperations(importContainer, model, false),\n );\n\n // generate EntityTypeService\n file.getFile().addClass({\n isExported: true,\n name: model.serviceName,\n typeParameters: [`in out ClientType extends ${httpClient}`],\n extends: entityServiceType + `<ClientType, ${modelName}, ${editableModelName}, ${qName}>`,\n ctors: [\n {\n parameters: [\n { name: \"client\", type: \"ClientType\" },\n { name: \"basePath\", type: \"string\" },\n { name: \"name\", type: \"string\" },\n { name: \"options\", type: serviceOptions, hasQuestionToken: true },\n ],\n statements: [`super(client, basePath, name, ${qObjectName}, options);`],\n },\n ],\n properties,\n methods,\n });\n }\n\n private generateServiceProperties(\n importContainer: ImportContainer,\n serviceName: string,\n props: Array<PropertyModel>,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n props.forEach((prop) => {\n // collection of ComplexTypes, ComplexTypes, or EntityTypes\n if ((prop.dataType === DataTypes.ModelType && !prop.isCollection) \|\| prop.dataType === DataTypes.ComplexType) {\n result.properties.push(this.generateModelProp(importContainer, prop));\n result.methods.push(this.generateModelPropGetter(importContainer, prop));\n } else if (prop.isCollection) {\n // collection of EntityTypes\n if (prop.dataType === DataTypes.ModelType) {\n const entityType = this.dataModel.getEntityType(prop.fqType);\n if (!entityType) {\n throw new Error(`Entity type \"${prop.fqType}\" specified by property not found!`);\n }\n\n result.methods.push(\n this.generateRelatedServiceGetter(prop.name, prop.odataName, entityType, importContainer),\n );\n }\n // collection of primitive or enum types\n else {\n result.properties.push(this.generatePrimitiveCollectionProp(importContainer, prop));\n result.methods.push(this.generatePrimitiveCollectionGetter(importContainer, prop));\n }\n }\n // generation of services for each primitive property: turned off by default\n else if (this.options.enablePrimitivePropertyServices && prop.dataType === DataTypes.PrimitiveType) {\n result.properties.push(this.generatePrimitiveTypeProp(importContainer, prop));\n result.methods.push(this.generatePrimitiveTypeGetter(importContainer, prop));\n }\n });\n\n return result;\n }\n\n private generateServiceOperations(\n importContainer: ImportContainer,\n model: ComplexType,\n operations: Array<OperationType>,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n operations.forEach((operation) => {\n result.properties.push(this.generateQOperationProp(operation));\n result.methods.push(this.generateMethod(operation.name, operation, importContainer, model.fqName));\n });\n\n return result;\n }\n\n private generateModelProp(imports: ImportContainer, prop: PropertyModel): PropertyDeclarationStructure {\n const propModel = this.dataModel.getModel(prop.fqType) as ComplexType;\n let propModelType: string;\n\n if (prop.isCollection) {\n const modelName = imports.addGeneratedModel(propModel.fqName, propModel.modelName);\n const editableModelName = imports.addGeneratedModel(propModel.fqName, propModel.editableName);\n const qModelName = imports.addGeneratedQObject(propModel.fqName, propModel.qName, true);\n const collectionServiceType = imports.addServiceObject(this.version, ServiceImports.CollectionService);\n\n propModelType = `${collectionServiceType}<ClientType, ${modelName}, ${qModelName}, ${editableModelName}>`;\n } else {\n const serviceName = imports.addGeneratedService(propModel.fqName, propModel.serviceName);\n propModelType = `${serviceName}<ClientType>`;\n }\n\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(prop.name),\n type: propModelType,\n hasQuestionToken: true,\n } as PropertyDeclarationStructure;\n }\n\n private generatePrimitiveCollectionProp(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<PropertyDeclarationStructure> {\n if (!prop.qObject) {\n throw new Error(\"Illegal State: [qObject] must be provided for Collection types!\");\n }\n\n const collectionServiceType = imports.addServiceObject(this.version, ServiceImports.CollectionService);\n const isEnum = prop.dataType === DataTypes.EnumType;\n const isNumericEnum = this.options.numericEnums;\n let qType: string;\n let type: string;\n\n if (isEnum) {\n const propEnum = this.dataModel.getModel(prop.fqType)!;\n const propTypeModel = imports.addGeneratedModel(propEnum.fqName, propEnum.modelName, false);\n type = `${imports.addQObjectType(QueryObjectImports.EnumCollection)}<typeof ${propTypeModel}>`;\n qType = `${imports.addQObjectType(\n isNumericEnum ? QueryObjectImports.QNumericEnumCollection : QueryObjectImports.QEnumCollection,\n )}<typeof ${propTypeModel}>`;\n } else {\n // TODO refactor string concat\n type = imports.addQObjectType(`${upperCaseFirst(prop.type)}Collection`);\n qType = imports.addQObjectType(prop.qObject);\n }\n const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;\n\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(prop.name),\n type: `${collectionType}`,\n hasQuestionToken: true,\n };\n }\n\n private generatePrimitiveTypeProp(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<PropertyDeclarationStructure> {\n const serviceType = imports.addServiceObject(this.version, ServiceImports.PrimitiveTypeService);\n const type = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type, true) : prop.type;\n\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(prop.name),\n type: `${serviceType}<ClientType, ${type}>`,\n hasQuestionToken: true,\n };\n }\n\n private generateModelPropGetter(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<MethodDeclarationStructure> {\n const model = this.dataModel.getModel(prop.fqType) as ComplexType;\n const isComplexCollection = prop.isCollection && model.dataType === DataTypes.ComplexType;\n\n const type = isComplexCollection\n ? imports.addServiceObject(this.version, ServiceImports.CollectionService)\n : prop.isCollection\n ? model.serviceCollectionName\n : model.serviceName;\n const typeWithGenerics = isComplexCollection\n ? `${type}<ClientType, ${imports.addGeneratedModel(model.fqName, model.modelName)}, ${imports.addGeneratedQObject(\n model.fqName,\n model.qName,\n true,\n )}, ${imports.addGeneratedModel(model.fqName, model.editableName)}>`\n : `${type}<ClientType>`;\n\n const privateSrvProp = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\n\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(prop.name),\n returnType: typeWithGenerics,\n statements: [\n `if(!${privateSrvProp}) {`,\n ` const { client, path, options } = this.__base;`,\n // prettier-ignore\n ` ${privateSrvProp} = new ${type}(client, path, \"${prop.odataName}\"${isComplexCollection ? `, ${imports.addGeneratedQObject(model.fqName, firstCharLowerCase(model.qName))}`: \"\"}, options)`,\n \"}\",\n `return ${privateSrvProp}`,\n ],\n };\n }\n\n private generatePrimitiveCollectionGetter(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<MethodDeclarationStructure> {\n const collectionServiceType = imports.addServiceObject(this.version, ServiceImports.CollectionService);\n const qCollectionName = imports.addQObject(prop.qObject!);\n const enumName =\n prop.dataType === DataTypes.EnumType ? imports.addGeneratedModel(prop.fqType, prop.type) : undefined;\n\n const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(prop.name),\n statements: [\n `if(!${propName}) {`,\n ` const { client, path, options } = this.__base;`,\n // prettier-ignore\n ` ${propName} = new ${collectionServiceType}(client, path, \"${prop.odataName}\", new ${qCollectionName}(${enumName ?? \"\"}), options)`,\n \"}\",\n `return ${propName}`,\n ],\n };\n }\n\n private generatePrimitiveTypeGetter(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<MethodDeclarationStructure> {\n const serviceType = imports.addServiceObject(this.version, ServiceImports.PrimitiveTypeService);\n const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\n // for V2: mapped name must be specified\n const v2MappedName =\n this.version === ODataVersions.V4 ? \"\" : prop.name !== prop.odataName ? `, \"${prop.name}\"` : \", undefined\";\n\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(prop.name),\n statements: [\n `if(!${propName}) {`,\n ` const { client, path, qModel, options } = this.__base;`,\n ` ${propName} = new ${serviceType}(client, path, \"${prop.odataName}\", qModel.${prop.name}.converter${v2MappedName}, options)`,\n \"}\",\n `return ${propName}`,\n ],\n };\n }\n\n private generateEntityCollectionService(file: FileHandler, model: EntityType) {\n const importContainer = file.getImports();\n const editableModelName = model.editableName;\n const qObjectName = firstCharLowerCase(model.qName);\n\n const entitySetServiceType = importContainer.addServiceObject(this.version, ServiceImports.EntitySetService);\n const paramsModelName = importContainer.addGeneratedModel(model.id.fqName, model.id.modelName);\n const qIdFunctionName = importContainer.addGeneratedQObject(model.id.fqName, model.id.qName);\n const serviceOptions = importContainer.addServiceObject(\n this.version,\n this.version === ODataVersions.V4\n ? ServiceImports.ODataServiceOptionsInternal\n : ServiceImports.ODataServiceOptions,\n );\n\n const collectionOperations = this.dataModel.getEntitySetOperations(model.fqName);\n\n const { properties, methods } = deepmerge(\n this.generateServiceOperations(importContainer, model, collectionOperations),\n this.generateCastOperations(importContainer, model, true),\n );\n\n file.getFile().addClass({\n isExported: true,\n name: model.serviceCollectionName,\n typeParameters: [\"in out ClientType extends ODataHttpClient\"],\n extends:\n entitySetServiceType +\n `<ClientType, ${model.modelName}, ${editableModelName}, ${model.qName}, ${paramsModelName}>`,\n ctors: [\n {\n parameters: [\n { name: \"client\", type: \"ClientType\" },\n { name: \"basePath\", type: \"string\" },\n { name: \"name\", type: \"string\" },\n { name: \"options\", type: serviceOptions, hasQuestionToken: true },\n ],\n statements: [`super(client, basePath, name, ${qObjectName}, new ${qIdFunctionName}(name), options);`],\n },\n ],\n properties,\n methods,\n });\n }\n\n private generateEntityTypeServices(): Array<Promise<void>> {\n // build service file for each entity, consisting of EntityTypeService & EntityCollectionService\n return this.dataModel\n .getEntityTypes()\n .filter((model) => model.genMode === Modes.service \|\| model.genMode === Modes.all)\n .map((model) => {\n const file = this.project.createOrGetServiceFile(model.folderPath, model.serviceName, [\n model.serviceName,\n model.serviceCollectionName,\n ]);\n\n // entity type service\n this.generateEntityTypeService(file, model);\n // entity collection service if this entity specified keys at all\n if (model.keyNames.length) {\n this.generateEntityCollectionService(file, model);\n }\n\n return this.project.finalizeFile(file);\n });\n }\n\n private generateComplexTypeServices(): Array<Promise<void>> {\n // build service file for complex types\n return this.dataModel\n .getComplexTypes()\n .filter((model) => model.genMode === Modes.service \|\| model.genMode === Modes.all)\n .map((model) => {\n const file = this.project.createOrGetServiceFile(model.folderPath, model.serviceName, [model.serviceName]);\n\n // entity type service\n this.generateEntityTypeService(file, model, true);\n\n return this.project.finalizeFile(file);\n });\n }\n\n private generateMethod(\n name: string,\n operation: OperationType,\n importContainer: ImportContainer,\n baseFqName: string,\n ): OptionalKind<MethodDeclarationStructure> {\n const isFunc = operation.type === OperationTypes.Function;\n const returnType = operation.returnType;\n const hasParams = operation.parameters.length > 0 \|\| operation.overrides?.length;\n const isParamsOptional = !![operation.parameters, ...(operation.overrides ?? [])].find((pSet) => pSet.length === 0);\n\n // importing dependencies\n const httpClientConfigModel = importContainer.addClientApi(ClientApiImports.ODataHttpClientConfig);\n const odataResponse = importContainer.addClientApi(ClientApiImports.HttpResponseModel);\n const responseStructure = this.importReturnType(importContainer, returnType);\n const qOperationName = importContainer.addGeneratedQObject(baseFqName, operation.qName);\n const rtType =\n returnType?.type && returnType.dataType !== DataTypes.PrimitiveType\n ? importContainer.addGeneratedModel(returnType.fqType, returnType.type)\n : returnType?.type;\n const paramsModelName = hasParams\n ? importContainer.addGeneratedModel(baseFqName, operation.paramsModelName)\n : undefined;\n\n const requestConfigParam = {\n name: \"requestConfig\",\n hasQuestionToken: true,\n type: `${httpClientConfigModel}<ClientType>`,\n };\n const qOpProp = \"this.\" + this.namingHelper.getPrivatePropName(operation.qName);\n\n return {\n scope: Scope.Public,\n isAsync: true,\n name,\n parameters: hasParams\n ? [{ name: \"params\", type: paramsModelName, hasQuestionToken: isParamsOptional }, requestConfigParam]\n : [requestConfigParam],\n returnType: `Promise<${odataResponse}<${responseStructure}<${rtType \|\| \"void\"}>>>`,\n statements: [\n `if(!${qOpProp}) {`,\n ` ${qOpProp} = new ${qOperationName}()`,\n \"}\",\n\n `const { addFullPath, client, getDefaultHeaders, isUrlNotEncoded } = this.__base;`,\n `const url = addFullPath(${qOpProp}.buildUrl(${isFunc && hasParams ? \"params, \" : \"\"}${isFunc ? \"isUrlNotEncoded()\" : \"\"}));`,\n `${returnType ? \"const response = await \" : \"return\"} client.${\n !isFunc\n ? // actions: since V4\n `post(url, ${hasParams ? `${qOpProp}.convertUserParams(params)` : \"{}\"}, ${\n requestConfigParam.name\n }, getDefaultHeaders())`\n : operation.usePost\n ? // V2 POST => BUT values are still query params, they are not part of the request body\n `post(url, undefined, ${requestConfigParam.name}, getDefaultHeaders())`\n : // functions: since V2\n `get(url, ${requestConfigParam.name}, getDefaultHeaders())`\n };`,\n returnType ? `return ${qOpProp}.convertResponse(response);` : \"\",\n ],\n };\n }\n\n private importReturnType(imports: ImportContainer, returnType: ReturnTypeModel \| undefined): string {\n const typeToImport: CoreImports = returnType?.isCollection\n ? CoreImports.ODataCollectionResponse\n : returnType?.dataType === DataTypes.PrimitiveType\n ? CoreImports.ODataValueResponse\n : this.version === ODataVersions.V4\n ? CoreImports.ODataModelResponseV4\n : CoreImports.ODataEntityModelResponseV2;\n\n return imports.addCoreLib(this.version, typeToImport);\n }\n\n private generateCastOperations(\n importContainer: ImportContainer,\n model: ComplexType,\n isCollection: boolean,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n if (this.version === ODataVersions.V4) {\n model.subtypes.forEach((subtype) => {\n const subClass = this.dataModel.getModel(subtype) as ComplexType;\n const serviceName = isCollection ? subClass.serviceCollectionName : subClass.serviceName;\n const serviceType = importContainer.addGeneratedService(subClass.fqName, serviceName);\n result.methods.push({\n name: `as${upperCaseFirst(serviceName)}`,\n scope: Scope.Public,\n statements: [\n \"const { client, path, options } = this.__base;\",\n `return new ${serviceType}(client, path, \"${subClass.fqName}\", { ...options, subtype: true });`,\n ],\n });\n });\n }\n\n return result;\n }\n}\n"]}
1	+ {"version":3,"file":"ServiceGenerator.js","sourceRoot":"","sources":["../../src/generator/ServiceGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\nimport deepmerge from \"deepmerge\";\nimport {\n ClassDeclarationStructure,\n MethodDeclarationStructure,\n OptionalKind,\n PropertyDeclarationStructure,\n Scope,\n} from \"ts-morph\";\nimport { upperCaseFirst } from \"upper-case-first\";\nimport { firstCharLowerCase } from \"xml2js/lib/processors.js\";\nimport { DataModel } from \"../data-model/DataModel.js\";\nimport {\n ActionImportType,\n ComplexType,\n DataTypes,\n EntityContainerModel,\n EntityType,\n FunctionImportType,\n OperationType,\n OperationTypes,\n PropertyModel,\n ReturnTypeModel,\n SingletonType,\n} from \"../data-model/DataTypeModel.js\";\nimport { NamingHelper } from \"../data-model/NamingHelper.js\";\nimport { ConfigFileOptions, Modes } from \"../OptionModel.js\";\nimport { FileHandler } from \"../project/FileHandler.js\";\nimport { ProjectManager } from \"../project/ProjectManager.js\";\nimport { ClientApiImports, CoreImports, QueryObjectImports, ServiceImports } from \"./import/ImportObjects.js\";\nimport { ImportContainer } from \"./ImportContainer.js\";\n\nexport interface PropsAndOps extends Required<Pick<ClassDeclarationStructure, \"properties\" \| \"methods\">> {}\n\nexport interface ServiceGeneratorOptions\n extends Pick<ConfigFileOptions, \"enablePrimitivePropertyServices\" \| \"v4BigNumberAsString\" \| \"enumType\"> {}\n\nexport async function generateServices(\n project: ProjectManager,\n dataModel: DataModel,\n version: ODataVersions,\n namingHelper: NamingHelper,\n options?: ServiceGeneratorOptions,\n) {\n const generator = new ServiceGenerator(project, dataModel, version, namingHelper, options);\n return generator.generate();\n}\n\nclass ServiceGenerator {\n constructor(\n private project: ProjectManager,\n private dataModel: DataModel,\n private version: ODataVersions,\n private namingHelper: NamingHelper,\n private options: ServiceGeneratorOptions = {},\n ) {}\n\n private isV4BigNumber() {\n return this.options.v4BigNumberAsString && this.version === ODataVersions.V4;\n }\n\n public async generate(): Promise<void> {\n const mainServiceName = this.namingHelper.getMainServiceName();\n this.project.initServices();\n\n await Promise.all([\n this.generateMainService(mainServiceName),\n ...this.generateEntityTypeServices(),\n ...this.generateComplexTypeServices(),\n ]);\n\n return this.project.finalizeServices();\n }\n\n private async generateMainService(mainServiceName: string) {\n const mainServiceFile = this.project.getMainServiceFile();\n const importContainer = mainServiceFile.getImports();\n const container = this.dataModel.getEntityContainer();\n const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];\n\n const httpClient = importContainer.addClientApi(ClientApiImports.ODataHttpClient);\n const rootService = importContainer.addServiceObject(this.version, ServiceImports.ODataService);\n\n const { properties, methods }: PropsAndOps = deepmerge(\n this.generateMainServiceProperties(container, importContainer),\n this.generateMainServiceOperations(unboundOperations, importContainer),\n );\n\n mainServiceFile.getFile().addClass({\n isExported: true,\n name: mainServiceName,\n typeParameters: [`in out ClientType extends ${httpClient}`],\n extends: `${rootService}<ClientType>`,\n ctors: this.isV4BigNumber()\n ? [\n {\n parameters: [\n { name: \"client\", type: \"ClientType\" },\n { name: \"basePath\", type: \"string\" },\n {\n name: \"options\",\n type: importContainer.addServiceObject(this.version, ServiceImports.ODataServiceOptions),\n hasQuestionToken: true,\n },\n ],\n statements: [`super(client, basePath, options);`, \"this.__base.options.bigNumbersAsString = true;\"],\n },\n ]\n : [],\n properties,\n methods,\n });\n }\n\n private generateMainServiceProperties(\n container: EntityContainerModel,\n importContainer: ImportContainer,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n Object.values(container.entitySets).forEach(({ name, odataName, entityType }) => {\n result.methods.push(this.generateRelatedServiceGetter(name, odataName, entityType, importContainer));\n });\n\n Object.values(container.singletons).forEach((singleton) => {\n result.properties.push(this.generateSingletonProp(importContainer, singleton));\n result.methods.push(this.generateSingletonGetter(singleton));\n });\n\n return result;\n }\n\n private generateMainServiceOperations(\n ops: Array<FunctionImportType \| ActionImportType>,\n importContainer: ImportContainer,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n ops.forEach(({ operation, name }) => {\n const op = this.dataModel.getUnboundOperationType(operation);\n if (!op) {\n throw new Error(`Operation \"${operation}\" not found!`);\n }\n\n result.properties.push(this.generateQOperationProp(op));\n result.methods.push(this.generateMethod(name, op, importContainer, \"\"));\n });\n\n return result;\n }\n\n private generateRelatedServiceGetter(\n propName: string,\n odataPropName: string,\n entityType: EntityType,\n imports: ImportContainer,\n ): OptionalKind<MethodDeclarationStructure> {\n const idName = imports.addGeneratedModel(entityType.id.fqName, entityType.id.modelName);\n const idFunctionName = imports.addGeneratedQObject(entityType.id.fqName, entityType.id.qName);\n const serviceName = imports.addGeneratedService(entityType.fqName, entityType.serviceName);\n const collectionName = imports.addGeneratedService(entityType.fqName, entityType.serviceCollectionName);\n\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(propName),\n parameters: [\n {\n name: \"id\",\n type: `${idName} \| undefined`,\n hasQuestionToken: true,\n },\n ],\n overloads: [\n {\n parameters: [],\n returnType: `${collectionName}<ClientType>`,\n },\n {\n parameters: [\n {\n name: \"id\",\n type: idName,\n },\n ],\n returnType: `${serviceName}<ClientType>`,\n },\n ],\n statements: [\n `const fieldName = \"${odataPropName}\";`,\n `const { client, path, options, isUrlNotEncoded } = this.__base;`,\n 'return typeof id === \"undefined\" \|\| id === null',\n `? new ${collectionName}(client, path, fieldName, options)`,\n `: new ${serviceName}(client, path, new ${idFunctionName}(fieldName).buildUrl(id, isUrlNotEncoded()), options);`,\n ],\n };\n }\n\n private generateSingletonProp(\n importContainer: ImportContainer,\n singleton: SingletonType,\n ): OptionalKind<PropertyDeclarationStructure> {\n const { name, entityType } = singleton;\n const type = entityType.serviceName;\n\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(name),\n type: `${type}<ClientType>`,\n hasQuestionToken: true,\n };\n }\n\n private generateQOperationProp = (operation: OperationType) => {\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(operation.qName),\n type: operation.qName,\n hasQuestionToken: true,\n };\n };\n\n private generateSingletonGetter(singleton: SingletonType): OptionalKind<MethodDeclarationStructure> {\n const { name, odataName, entityType } = singleton;\n const propName = \"this.\" + this.namingHelper.getPrivatePropName(name);\n const serviceType = entityType.serviceName;\n\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(name),\n statements: [\n `if(!${propName}) {`,\n ` const { client, path, options } = this.__base;`,\n // prettier-ignore\n ` ${propName} = new ${serviceType}(client, path, \"${odataName}\", options)`,\n \"}\",\n `return ${propName}`,\n ],\n };\n }\n\n private generateEntityTypeService(file: FileHandler, model: ComplexType, isComplexType = false) {\n const importContainer = file.getImports();\n\n const operations = this.dataModel.getEntityTypeOperations(model.fqName);\n const props = [...model.baseProps, ...model.props];\n\n const entityServiceType = importContainer.addServiceObject(\n this.version,\n this.version === ODataVersions.V2 && isComplexType\n ? ServiceImports.ComplexTypeService\n : ServiceImports.EntityTypeService,\n );\n const httpClient = importContainer.addClientApi(ClientApiImports.ODataHttpClient);\n\n // note: predictable first imports => no need to take renaming into account\n const modelName = importContainer.addGeneratedModel(model.fqName, model.modelName);\n const editableModelName = importContainer.addGeneratedModel(model.fqName, model.editableName);\n const qName = importContainer.addGeneratedQObject(model.fqName, model.qName, true);\n const qObjectName = importContainer.addGeneratedQObject(model.fqName, firstCharLowerCase(model.qName));\n const serviceOptions = importContainer.addServiceObject(\n this.version,\n this.version === ODataVersions.V4\n ? ServiceImports.ODataServiceOptionsInternal\n : ServiceImports.ODataServiceOptions,\n );\n\n const { properties, methods }: PropsAndOps = deepmerge(\n deepmerge(\n this.generateServiceProperties(importContainer, model.serviceName, props),\n this.generateServiceOperations(importContainer, model, operations),\n ),\n this.generateCastOperations(importContainer, model, false),\n );\n\n // generate EntityTypeService\n file.getFile().addClass({\n isExported: true,\n name: model.serviceName,\n typeParameters: [`in out ClientType extends ${httpClient}`],\n extends: entityServiceType + `<ClientType, ${modelName}, ${editableModelName}, ${qName}>`,\n ctors: [\n {\n parameters: [\n { name: \"client\", type: \"ClientType\" },\n { name: \"basePath\", type: \"string\" },\n { name: \"name\", type: \"string\" },\n { name: \"options\", type: serviceOptions, hasQuestionToken: true },\n ],\n statements: [`super(client, basePath, name, ${qObjectName}, options);`],\n },\n ],\n properties,\n methods,\n });\n }\n\n private generateServiceProperties(\n importContainer: ImportContainer,\n serviceName: string,\n props: Array<PropertyModel>,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n props.forEach((prop) => {\n // collection of ComplexTypes, ComplexTypes, or EntityTypes\n if ((prop.dataType === DataTypes.ModelType && !prop.isCollection) \|\| prop.dataType === DataTypes.ComplexType) {\n result.properties.push(this.generateModelProp(importContainer, prop));\n result.methods.push(this.generateModelPropGetter(importContainer, prop));\n } else if (prop.isCollection) {\n // collection of EntityTypes\n if (prop.dataType === DataTypes.ModelType) {\n const entityType = this.dataModel.getEntityType(prop.fqType);\n if (!entityType) {\n throw new Error(`Entity type \"${prop.fqType}\" specified by property not found!`);\n }\n\n result.methods.push(\n this.generateRelatedServiceGetter(prop.name, prop.odataName, entityType, importContainer),\n );\n }\n // collection of primitive or enum types\n else {\n result.properties.push(this.generatePrimitiveCollectionProp(importContainer, prop));\n result.methods.push(this.generatePrimitiveCollectionGetter(importContainer, prop));\n }\n }\n // generation of services for each primitive property: turned off by default\n else if (this.options.enablePrimitivePropertyServices && prop.dataType === DataTypes.PrimitiveType) {\n result.properties.push(this.generatePrimitiveTypeProp(importContainer, prop));\n result.methods.push(this.generatePrimitiveTypeGetter(importContainer, prop));\n }\n });\n\n return result;\n }\n\n private generateServiceOperations(\n importContainer: ImportContainer,\n model: ComplexType,\n operations: Array<OperationType>,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n operations.forEach((operation) => {\n result.properties.push(this.generateQOperationProp(operation));\n result.methods.push(this.generateMethod(operation.name, operation, importContainer, model.fqName));\n });\n\n return result;\n }\n\n private generateModelProp(imports: ImportContainer, prop: PropertyModel): PropertyDeclarationStructure {\n const propModel = this.dataModel.getModel(prop.fqType) as ComplexType;\n let propModelType: string;\n\n if (prop.isCollection) {\n const modelName = imports.addGeneratedModel(propModel.fqName, propModel.modelName);\n const editableModelName = imports.addGeneratedModel(propModel.fqName, propModel.editableName);\n const qModelName = imports.addGeneratedQObject(propModel.fqName, propModel.qName, true);\n const collectionServiceType = imports.addServiceObject(this.version, ServiceImports.CollectionService);\n\n propModelType = `${collectionServiceType}<ClientType, ${modelName}, ${qModelName}, ${editableModelName}>`;\n } else {\n const serviceName = imports.addGeneratedService(propModel.fqName, propModel.serviceName);\n propModelType = `${serviceName}<ClientType>`;\n }\n\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(prop.name),\n type: propModelType,\n hasQuestionToken: true,\n } as PropertyDeclarationStructure;\n }\n\n private generatePrimitiveCollectionProp(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<PropertyDeclarationStructure> {\n if (!prop.qObject) {\n throw new Error(\"Illegal State: [qObject] must be provided for Collection types!\");\n }\n\n const collectionServiceType = imports.addServiceObject(this.version, ServiceImports.CollectionService);\n const isEnum = prop.dataType === DataTypes.EnumType;\n const isNumericEnum = this.options.enumType === \"numeric\";\n let qType: string;\n let type: string;\n\n if (isEnum) {\n const propEnum = this.dataModel.getModel(prop.fqType)!;\n const propTypeModel = imports.addGeneratedModel(propEnum.fqName, propEnum.modelName, false);\n type = `${imports.addQObjectType(QueryObjectImports.EnumCollection)}<typeof ${propTypeModel}>`;\n qType = `${imports.addQObjectType(prop.qObject)}<typeof ${propTypeModel}>`;\n } else {\n // TODO refactor string concat\n type = imports.addQObjectType(`${upperCaseFirst(prop.type)}Collection`);\n qType = imports.addQObjectType(prop.qObject);\n }\n const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;\n\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(prop.name),\n type: `${collectionType}`,\n hasQuestionToken: true,\n };\n }\n\n private generatePrimitiveTypeProp(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<PropertyDeclarationStructure> {\n const serviceType = imports.addServiceObject(this.version, ServiceImports.PrimitiveTypeService);\n const type = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type, true) : prop.type;\n\n return {\n scope: Scope.Private,\n name: this.namingHelper.getPrivatePropName(prop.name),\n type: `${serviceType}<ClientType, ${type}>`,\n hasQuestionToken: true,\n };\n }\n\n private generateModelPropGetter(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<MethodDeclarationStructure> {\n const model = this.dataModel.getModel(prop.fqType) as ComplexType;\n const isComplexCollection = prop.isCollection && model.dataType === DataTypes.ComplexType;\n\n const type = isComplexCollection\n ? imports.addServiceObject(this.version, ServiceImports.CollectionService)\n : prop.isCollection\n ? model.serviceCollectionName\n : model.serviceName;\n const typeWithGenerics = isComplexCollection\n ? `${type}<ClientType, ${imports.addGeneratedModel(model.fqName, model.modelName)}, ${imports.addGeneratedQObject(\n model.fqName,\n model.qName,\n true,\n )}, ${imports.addGeneratedModel(model.fqName, model.editableName)}>`\n : `${type}<ClientType>`;\n\n const privateSrvProp = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\n\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(prop.name),\n returnType: typeWithGenerics,\n statements: [\n `if(!${privateSrvProp}) {`,\n ` const { client, path, options } = this.__base;`,\n // prettier-ignore\n ` ${privateSrvProp} = new ${type}(client, path, \"${prop.odataName}\"${isComplexCollection ? `, ${imports.addGeneratedQObject(model.fqName, firstCharLowerCase(model.qName))}`: \"\"}, options)`,\n \"}\",\n `return ${privateSrvProp}`,\n ],\n };\n }\n\n private generatePrimitiveCollectionGetter(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<MethodDeclarationStructure> {\n const collectionServiceType = imports.addServiceObject(this.version, ServiceImports.CollectionService);\n const qCollectionName = imports.addQObject(prop.qObject!);\n const enumName =\n prop.dataType === DataTypes.EnumType ? imports.addGeneratedModel(prop.fqType, prop.type) : undefined;\n\n const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(prop.name),\n statements: [\n `if(!${propName}) {`,\n ` const { client, path, options } = this.__base;`,\n // prettier-ignore\n ` ${propName} = new ${collectionServiceType}(client, path, \"${prop.odataName}\", new ${qCollectionName}(${enumName ?? \"\"}), options)`,\n \"}\",\n `return ${propName}`,\n ],\n };\n }\n\n private generatePrimitiveTypeGetter(\n imports: ImportContainer,\n prop: PropertyModel,\n ): OptionalKind<MethodDeclarationStructure> {\n const serviceType = imports.addServiceObject(this.version, ServiceImports.PrimitiveTypeService);\n const propName = \"this.\" + this.namingHelper.getPrivatePropName(prop.name);\n // for V2: mapped name must be specified\n const v2MappedName =\n this.version === ODataVersions.V4 ? \"\" : prop.name !== prop.odataName ? `, \"${prop.name}\"` : \", undefined\";\n\n return {\n scope: Scope.Public,\n name: this.namingHelper.getRelatedServiceGetter(prop.name),\n statements: [\n `if(!${propName}) {`,\n ` const { client, path, qModel, options } = this.__base;`,\n ` ${propName} = new ${serviceType}(client, path, \"${prop.odataName}\", qModel.${prop.name}.converter${v2MappedName}, options)`,\n \"}\",\n `return ${propName}`,\n ],\n };\n }\n\n private generateEntityCollectionService(file: FileHandler, model: EntityType) {\n const importContainer = file.getImports();\n const editableModelName = model.editableName;\n const qObjectName = firstCharLowerCase(model.qName);\n\n const entitySetServiceType = importContainer.addServiceObject(this.version, ServiceImports.EntitySetService);\n const paramsModelName = importContainer.addGeneratedModel(model.id.fqName, model.id.modelName);\n const qIdFunctionName = importContainer.addGeneratedQObject(model.id.fqName, model.id.qName);\n const serviceOptions = importContainer.addServiceObject(\n this.version,\n this.version === ODataVersions.V4\n ? ServiceImports.ODataServiceOptionsInternal\n : ServiceImports.ODataServiceOptions,\n );\n\n const collectionOperations = this.dataModel.getEntitySetOperations(model.fqName);\n\n const { properties, methods } = deepmerge(\n this.generateServiceOperations(importContainer, model, collectionOperations),\n this.generateCastOperations(importContainer, model, true),\n );\n\n file.getFile().addClass({\n isExported: true,\n name: model.serviceCollectionName,\n typeParameters: [\"in out ClientType extends ODataHttpClient\"],\n extends:\n entitySetServiceType +\n `<ClientType, ${model.modelName}, ${editableModelName}, ${model.qName}, ${paramsModelName}>`,\n ctors: [\n {\n parameters: [\n { name: \"client\", type: \"ClientType\" },\n { name: \"basePath\", type: \"string\" },\n { name: \"name\", type: \"string\" },\n { name: \"options\", type: serviceOptions, hasQuestionToken: true },\n ],\n statements: [`super(client, basePath, name, ${qObjectName}, new ${qIdFunctionName}(name), options);`],\n },\n ],\n properties,\n methods,\n });\n }\n\n private generateEntityTypeServices(): Array<Promise<void>> {\n // build service file for each entity, consisting of EntityTypeService & EntityCollectionService\n return this.dataModel\n .getEntityTypes()\n .filter((model) => model.genMode === Modes.service \|\| model.genMode === Modes.all)\n .map((model) => {\n const file = this.project.createOrGetServiceFile(model.folderPath, model.serviceName, [\n model.serviceName,\n model.serviceCollectionName,\n ]);\n\n // entity type service\n this.generateEntityTypeService(file, model);\n // entity collection service if this entity specified keys at all\n if (model.keyNames.length) {\n this.generateEntityCollectionService(file, model);\n }\n\n return this.project.finalizeFile(file);\n });\n }\n\n private generateComplexTypeServices(): Array<Promise<void>> {\n // build service file for complex types\n return this.dataModel\n .getComplexTypes()\n .filter((model) => model.genMode === Modes.service \|\| model.genMode === Modes.all)\n .map((model) => {\n const file = this.project.createOrGetServiceFile(model.folderPath, model.serviceName, [model.serviceName]);\n\n // entity type service\n this.generateEntityTypeService(file, model, true);\n\n return this.project.finalizeFile(file);\n });\n }\n\n private generateMethod(\n name: string,\n operation: OperationType,\n importContainer: ImportContainer,\n baseFqName: string,\n ): OptionalKind<MethodDeclarationStructure> {\n const isFunc = operation.type === OperationTypes.Function;\n const returnType = operation.returnType;\n const hasParams = operation.parameters.length > 0 \|\| operation.overrides?.length;\n const isParamsOptional = !![operation.parameters, ...(operation.overrides ?? [])].find((pSet) => pSet.length === 0);\n\n // importing dependencies\n const httpClientConfigModel = importContainer.addClientApi(ClientApiImports.ODataHttpClientConfig);\n const odataResponse = importContainer.addClientApi(ClientApiImports.HttpResponseModel);\n const responseStructure = this.importReturnType(importContainer, returnType);\n const qOperationName = importContainer.addGeneratedQObject(baseFqName, operation.qName);\n const rtType =\n returnType?.type && returnType.dataType !== DataTypes.PrimitiveType\n ? importContainer.addGeneratedModel(returnType.fqType, returnType.type)\n : returnType?.type;\n const paramsModelName = hasParams\n ? importContainer.addGeneratedModel(baseFqName, operation.paramsModelName)\n : undefined;\n\n const requestConfigParam = {\n name: \"requestConfig\",\n hasQuestionToken: true,\n type: `${httpClientConfigModel}<ClientType>`,\n };\n const qOpProp = \"this.\" + this.namingHelper.getPrivatePropName(operation.qName);\n\n return {\n scope: Scope.Public,\n isAsync: true,\n name,\n parameters: hasParams\n ? [{ name: \"params\", type: paramsModelName, hasQuestionToken: isParamsOptional }, requestConfigParam]\n : [requestConfigParam],\n returnType: `Promise<${odataResponse}<${responseStructure}<${rtType \|\| \"void\"}>>>`,\n statements: [\n `if(!${qOpProp}) {`,\n ` ${qOpProp} = new ${qOperationName}()`,\n \"}\",\n\n `const { addFullPath, client, getDefaultHeaders, isUrlNotEncoded } = this.__base;`,\n `const url = addFullPath(${qOpProp}.buildUrl(${isFunc && hasParams ? \"params, \" : \"\"}${isFunc ? \"isUrlNotEncoded()\" : \"\"}));`,\n `${returnType ? \"const response = await \" : \"return\"} client.${\n !isFunc\n ? // actions: since V4\n `post(url, ${hasParams ? `${qOpProp}.convertUserParams(params)` : \"{}\"}, ${\n requestConfigParam.name\n }, getDefaultHeaders())`\n : operation.usePost\n ? // V2 POST => BUT values are still query params, they are not part of the request body\n `post(url, undefined, ${requestConfigParam.name}, getDefaultHeaders())`\n : // functions: since V2\n `get(url, ${requestConfigParam.name}, getDefaultHeaders())`\n };`,\n returnType ? `return ${qOpProp}.convertResponse(response);` : \"\",\n ],\n };\n }\n\n private importReturnType(imports: ImportContainer, returnType: ReturnTypeModel \| undefined): string {\n const typeToImport: CoreImports = returnType?.isCollection\n ? CoreImports.ODataCollectionResponse\n : returnType?.dataType === DataTypes.PrimitiveType\n ? CoreImports.ODataValueResponse\n : this.version === ODataVersions.V4\n ? CoreImports.ODataModelResponseV4\n : CoreImports.ODataEntityModelResponseV2;\n\n return imports.addCoreLib(this.version, typeToImport);\n }\n\n private generateCastOperations(\n importContainer: ImportContainer,\n model: ComplexType,\n isCollection: boolean,\n ): PropsAndOps {\n const result: PropsAndOps = { properties: [], methods: [] };\n\n if (this.version === ODataVersions.V4) {\n model.subtypes.forEach((subtype) => {\n const subClass = this.dataModel.getModel(subtype) as ComplexType;\n const serviceName = isCollection ? subClass.serviceCollectionName : subClass.serviceName;\n const serviceType = importContainer.addGeneratedService(subClass.fqName, serviceName);\n result.methods.push({\n name: `as${upperCaseFirst(serviceName)}`,\n scope: Scope.Public,\n statements: [\n \"const { client, path, options } = this.__base;\",\n `return new ${serviceType}(client, path, \"${subClass.fqName}\", { ...options, subtype: true });`,\n ],\n });\n });\n }\n\n return result;\n }\n}\n"]}

package/lib/generator/import/ImportObjects.d.ts CHANGED Viewed

@@ -35,12 +35,6 @@ export declare enum QueryObjectImports {
     QFunction = "QFunction",
     QAction = "QAction",
     EnumCollection = "EnumCollection",
-    QEnumCollection = "QEnumCollection",
-    QNumericEnumCollection = "QNumericEnumCollection",
-    QEnumCollectionPath = "QEnumCollectionPath",
-    QNumericEnumCollectionPath = "QNumericEnumCollectionPath",
-    QCollectionPath = "QCollectionPath",
-    QEntityCollectionPath = "QEntityCollectionPath",
     OperationReturnType = "OperationReturnType",
     ReturnTypes = "ReturnTypes",
     QComplexParam = "QComplexParam"

package/lib/generator/import/ImportObjects.js CHANGED Viewed

@@ -37,12 +37,6 @@ export var QueryObjectImports;
     QueryObjectImports["QFunction"] = "QFunction";
     QueryObjectImports["QAction"] = "QAction";
     QueryObjectImports["EnumCollection"] = "EnumCollection";
-    QueryObjectImports["QEnumCollection"] = "QEnumCollection";
-    QueryObjectImports["QNumericEnumCollection"] = "QNumericEnumCollection";
-    QueryObjectImports["QEnumCollectionPath"] = "QEnumCollectionPath";
-    QueryObjectImports["QNumericEnumCollectionPath"] = "QNumericEnumCollectionPath";
-    QueryObjectImports["QCollectionPath"] = "QCollectionPath";
-    QueryObjectImports["QEntityCollectionPath"] = "QEntityCollectionPath";
     QueryObjectImports["OperationReturnType"] = "OperationReturnType";
     QueryObjectImports["ReturnTypes"] = "ReturnTypes";
     QueryObjectImports["QComplexParam"] = "QComplexParam";

package/lib/generator/import/ImportObjects.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ImportObjects.js","sourceRoot":"","sources":["../../../src/generator/import/ImportObjects.ts"],"names":[],"mappings":"~~AAEA~~;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,sBAAsB;IAC5B,OAAO,EAAE,+BAA+B;IACxC,SAAS,EAAE,2BAA2B;IACtC,OAAO,EAAE,yBAAyB;CACnC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAN,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,mEAAe,CAAA;IACf,mFAAuB,CAAA;IACvB,6EAAoB,CAAA;IACpB,yEAAkB,CAAA;IAClB,yFAA0B,CAAA;IAC1B,2FAA2B,CAAA;AAC7B,CAAC,EAPW,WAAW,KAAX,WAAW,QAOtB;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,WAAW,CAAC,uBAAuB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;AAE5G;;GAEG;AACH,MAAM,CAAN,IAAY,~~kBAgBX~~;~~AAhBD~~,WAAY,kBAAkB;IAC5B,iDAA2B,CAAA;IAC3B,+EAAyD,CAAA;IACzD,iCAAW,CAAA;IACX,6CAAuB,CAAA;IACvB,yCAAmB,CAAA;IACnB,uDAAiC,CAAA;IACjC,~~yDAAmC,CAAA;IACnC,uEAAiD,CAAA;IACjD,~~iEAA2C,CAAA;IAC3C~~,+EAAyD~~,~~CAAA;IACzD,yDAAmC,CAAA;IACnC,qEAA+C,CAAA;IAC/C,iEAA2C,CAAA;IAC3C,~~iDAA2B,CAAA;IAC3B,qDAA+B,CAAA;AACjC,CAAC,~~EAhBW~~,kBAAkB,KAAlB,kBAAkB,~~QAgB7B~~;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,6EAAe,CAAA;IACf,yFAAqB,CAAA;IACrB,iFAAiB,CAAA;AACnB,CAAC,EAJW,gBAAgB,KAAhB,gBAAgB,QAI3B;AAED;;;GAGG;AACH,MAAM,CAAN,IAAY,cASX;AATD,WAAY,cAAc;IACxB,mEAAY,CAAA;IACZ,iFAAmB,CAAA;IACnB,iGAA2B,CAAA;IAC3B,6EAAiB,CAAA;IACjB,mFAAoB,CAAA;IACpB,6EAAiB,CAAA;IACjB,2EAAgB,CAAA;IAChB,+EAAkB,CAAA;AACpB,CAAC,EATW,cAAc,KAAd,cAAc,QASzB;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,cAAc,CAAC,iBAAiB;IAChC,cAAc,CAAC,oBAAoB;IACnC,cAAc,CAAC,iBAAiB;IAChC,cAAc,CAAC,gBAAgB;IAC/B,cAAc,CAAC,kBAAkB;CAClC,CAAC","sourcesContent":["~~import { ODataComplexModelResponseV2, ODataEntityModelResponseV2 } from \"@odata2ts/odata-core\";\n\n~~/*\n All module names of the main dependencies.\n /\nexport const LIB_MODULES = {\n core: \"@odata2ts/odata-core\",\n qObject: \"@odata2ts/odata-query-objects\",\n clientApi: \"@odata2ts/http-client-api\",\n service: \"@odata2ts/odata-service\",\n};\n\n/\n All imported entity names from the core API.\n * Includes versioned file names, i.e. according to OData version.\n /\nexport enum CoreImports {\n DeferredContent,\n ODataCollectionResponse, // versioned\n ODataModelResponseV4,\n ODataValueResponse, // versioned\n ODataEntityModelResponseV2,\n ODataComplexModelResponseV2,\n}\n\n/\n For all core imports that are versioned two files exist, one for V2, one for V4.\n * ODataCollectionResponse = ODataCollectionResponseV2 + ODataCollectionResponseV4\n \n /\nexport const VERSIONED_CORE_IMPORTS = [CoreImports.ODataCollectionResponse, CoreImports.ODataValueResponse];\n\n/*\n Most relevant, but not all imports from query objects library\n /\nexport enum QueryObjectImports {\n QueryObject = \"QueryObject\",\n ENUMERABLE_PROP_DEFINITION = \"ENUMERABLE_PROP_DEFINITION\",\n QId = \"QId\",\n QFunction = \"QFunction\",\n QAction = \"QAction\",\n EnumCollection = \"EnumCollection\",\n QEnumCollection = \"QEnumCollection\",\n QNumericEnumCollection = \"QNumericEnumCollection\",\n QEnumCollectionPath = \"QEnumCollectionPath\",\n QNumericEnumCollectionPath = \"QNumericEnumCollectionPath\",\n QCollectionPath = \"QCollectionPath\",\n QEntityCollectionPath = \"QEntityCollectionPath\",\n OperationReturnType = \"OperationReturnType\",\n ReturnTypes = \"ReturnTypes\",\n QComplexParam = \"QComplexParam\",\n}\n\n/\n All imports from HTTP client API.\n /\nexport enum ClientApiImports {\n ODataHttpClient,\n ODataHttpClientConfig,\n HttpResponseModel,\n}\n\n/\n All imports from service library.\n * Includes versioned file names, i.e. according to OData version.\n /\nexport enum ServiceImports {\n ODataService,\n ODataServiceOptions,\n ODataServiceOptionsInternal,\n EntityTypeService,\n PrimitiveTypeService,\n CollectionService,\n EntitySetService,\n ComplexTypeService,\n}\n\n/\n For all versioned imports two files exist, one for V2, one for V4.\n * EntityTypeService = EntityTypeServiceV2 + EntityTypeServiceV4\n */\nexport const VERSIONED_SERVICE_IMPORTS = [\n ServiceImports.EntityTypeService,\n ServiceImports.PrimitiveTypeService,\n ServiceImports.CollectionService,\n ServiceImports.EntitySetService,\n ServiceImports.ComplexTypeService,\n];\n"]}
1	+ {"version":3,"file":"ImportObjects.js","sourceRoot":"","sources":["../../../src/generator/import/ImportObjects.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,sBAAsB;IAC5B,OAAO,EAAE,+BAA+B;IACxC,SAAS,EAAE,2BAA2B;IACtC,OAAO,EAAE,yBAAyB;CACnC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAN,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,mEAAe,CAAA;IACf,mFAAuB,CAAA;IACvB,6EAAoB,CAAA;IACpB,yEAAkB,CAAA;IAClB,yFAA0B,CAAA;IAC1B,2FAA2B,CAAA;AAC7B,CAAC,EAPW,WAAW,KAAX,WAAW,QAOtB;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,WAAW,CAAC,uBAAuB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;AAE5G;;GAEG;AACH,MAAM,CAAN,IAAY,kBAUX;AAVD,WAAY,kBAAkB;IAC5B,iDAA2B,CAAA;IAC3B,+EAAyD,CAAA;IACzD,iCAAW,CAAA;IACX,6CAAuB,CAAA;IACvB,yCAAmB,CAAA;IACnB,uDAAiC,CAAA;IACjC,iEAA2C,CAAA;IAC3C,iDAA2B,CAAA;IAC3B,qDAA+B,CAAA;AACjC,CAAC,EAVW,kBAAkB,KAAlB,kBAAkB,QAU7B;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,6EAAe,CAAA;IACf,yFAAqB,CAAA;IACrB,iFAAiB,CAAA;AACnB,CAAC,EAJW,gBAAgB,KAAhB,gBAAgB,QAI3B;AAED;;;GAGG;AACH,MAAM,CAAN,IAAY,cASX;AATD,WAAY,cAAc;IACxB,mEAAY,CAAA;IACZ,iFAAmB,CAAA;IACnB,iGAA2B,CAAA;IAC3B,6EAAiB,CAAA;IACjB,mFAAoB,CAAA;IACpB,6EAAiB,CAAA;IACjB,2EAAgB,CAAA;IAChB,+EAAkB,CAAA;AACpB,CAAC,EATW,cAAc,KAAd,cAAc,QASzB;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,cAAc,CAAC,iBAAiB;IAChC,cAAc,CAAC,oBAAoB;IACnC,cAAc,CAAC,iBAAiB;IAChC,cAAc,CAAC,gBAAgB;IAC/B,cAAc,CAAC,kBAAkB;CAClC,CAAC","sourcesContent":["/*\n All module names of the main dependencies.\n /\nexport const LIB_MODULES = {\n core: \"@odata2ts/odata-core\",\n qObject: \"@odata2ts/odata-query-objects\",\n clientApi: \"@odata2ts/http-client-api\",\n service: \"@odata2ts/odata-service\",\n};\n\n/\n All imported entity names from the core API.\n * Includes versioned file names, i.e. according to OData version.\n /\nexport enum CoreImports {\n DeferredContent,\n ODataCollectionResponse, // versioned\n ODataModelResponseV4,\n ODataValueResponse, // versioned\n ODataEntityModelResponseV2,\n ODataComplexModelResponseV2,\n}\n\n/\n For all core imports that are versioned two files exist, one for V2, one for V4.\n * ODataCollectionResponse = ODataCollectionResponseV2 + ODataCollectionResponseV4\n \n /\nexport const VERSIONED_CORE_IMPORTS = [CoreImports.ODataCollectionResponse, CoreImports.ODataValueResponse];\n\n/*\n Most relevant, but not all imports from query objects library\n /\nexport enum QueryObjectImports {\n QueryObject = \"QueryObject\",\n ENUMERABLE_PROP_DEFINITION = \"ENUMERABLE_PROP_DEFINITION\",\n QId = \"QId\",\n QFunction = \"QFunction\",\n QAction = \"QAction\",\n EnumCollection = \"EnumCollection\",\n OperationReturnType = \"OperationReturnType\",\n ReturnTypes = \"ReturnTypes\",\n QComplexParam = \"QComplexParam\",\n}\n\n/\n All imports from HTTP client API.\n /\nexport enum ClientApiImports {\n ODataHttpClient,\n ODataHttpClientConfig,\n HttpResponseModel,\n}\n\n/\n All imports from service library.\n * Includes versioned file names, i.e. according to OData version.\n /\nexport enum ServiceImports {\n ODataService,\n ODataServiceOptions,\n ODataServiceOptionsInternal,\n EntityTypeService,\n PrimitiveTypeService,\n CollectionService,\n EntitySetService,\n ComplexTypeService,\n}\n\n/\n For all versioned imports two files exist, one for V2, one for V4.\n * EntityTypeService = EntityTypeServiceV2 + EntityTypeServiceV4\n */\nexport const VERSIONED_SERVICE_IMPORTS = [\n ServiceImports.EntityTypeService,\n ServiceImports.PrimitiveTypeService,\n ServiceImports.CollectionService,\n ServiceImports.EntitySetService,\n ServiceImports.ComplexTypeService,\n];\n"]}

package/lib/project/ProjectManager.js CHANGED Viewed

@@ -168,14 +168,14 @@ export class ProjectManager {
         return this.mainQFile;
     }
     createOrGetModelFile(folderPath, name, reservedNames) {
-        if (this.mainModelFile) {
+        if (this.options.bundledFileGeneration) {
             return this.mainModelFile;
         }
         // model files always allow for type checking
         return this.createFile(name, reservedNames, folderPath, true);
     }
     createOrGetQObjectFile(folderPath, name, reservedNames) {
-        if (this.mainQFile) {
+        if (this.options.bundledFileGeneration) {
             return this.mainQFile;
         }
         return this.createFile(name, reservedNames, folderPath);

package/lib/project/ProjectManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ProjectManager.js","sourceRoot":"","sources":["../../src/project/ProjectManager.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from \"path\";\nimport { mkdirp } from \"mkdirp\";\nimport { CompilerOptions, Project, SourceFile } from \"ts-morph\";\nimport { firstCharLowerCase } from \"xml2js/lib/processors.js\";\nimport { DataModel } from \"../data-model/DataModel.js\";\nimport { EntityType } from \"../data-model/DataTypeModel.js\";\nimport { NamingHelper } from \"../data-model/NamingHelper.js\";\nimport { ImportContainer } from \"../generator/ImportContainer.js\";\nimport { EmitModes } from \"../OptionModel.js\";\nimport { FileHandler } from \"./FileHandler.js\";\nimport { FileFormatter } from \"./formatter/FileFormatter.js\";\nimport { createFormatter } from \"./formatter/index.js\";\nimport { loadTsMorphCompilerOptions } from \"./TsMorphHelper.js\";\n\nexport interface ProjectManagerOptions {\n usePrettier?: boolean;\n tsConfigPath?: string;\n bundledFileGeneration?: boolean;\n /*\n for testing purposes, turn this on and retrieve all generated files via getCachedFiles\n /\n noOutput?: boolean;\n allowTypeChecking?: boolean;\n}\n\nexport async function createProjectManager(\n outputDir: string,\n emitMode: EmitModes,\n namingHelper: NamingHelper,\n dataModel: DataModel,\n options: ProjectManagerOptions,\n): Promise<ProjectManager> {\n const { usePrettier = false, tsConfigPath = \"tsconfig.json\" } = options;\n const formatter = usePrettier ? await createFormatter(outputDir, usePrettier) : undefined;\n\n const compilerOpts: CompilerOptions = await loadTsMorphCompilerOptions(tsConfigPath, emitMode, outputDir);\n\n const pm = new ProjectManager(outputDir, emitMode, namingHelper, dataModel, formatter, compilerOpts, {\n usePrettier,\n tsConfigPath,\n ...options,\n });\n\n await pm.init();\n\n return pm;\n}\n\nexport class ProjectManager {\n private project!: Project;\n\n private mainServiceFile: FileHandler \| undefined;\n private mainModelFile: FileHandler \| undefined;\n private mainQFile: FileHandler \| undefined;\n\n private readonly cachedFiles: Map<string, SourceFile> \| undefined;\n\n constructor(\n protected outputDir: string,\n protected emitMode: EmitModes,\n protected namingHelper: NamingHelper,\n protected dataModel: DataModel,\n protected formatter: FileFormatter \| undefined,\n compilerOptions: CompilerOptions \| undefined,\n protected options: ProjectManagerOptions,\n ) {\n // Create ts-morph project\n this.project = new Project({\n // manipulationSettings: this.formatter.getSettings(),\n skipAddingFilesFromTsConfig: true,\n compilerOptions,\n });\n\n if (options.noOutput) {\n this.cachedFiles = new Map();\n }\n }\n\n public getDataModel() {\n return this.dataModel;\n }\n\n /\n Only filled when noOutput=true\n */\n public getCachedFiles() {\n return this.cachedFiles!;\n }\n\n private async writeFile(fileHandler: FileHandler) {\n if (this.options.noOutput) {\n await fileHandler.write(this.emitMode, true);\n this.cachedFiles!.set(fileHandler.getFullFilePath(), fileHandler.getFile());\n\n return;\n }\n\n return fileHandler.write(this.emitMode);\n }\n\n private createFile(\n name: string,\n reservedNames?: Array<string> \| undefined,\n additionalPath: string = \"\",\n forceTypeChecking = false,\n ): FileHandler {\n const fileName = path.join(this.outputDir, additionalPath, `${name}.ts`);\n const imports = new ImportContainer(\n additionalPath,\n name,\n this.dataModel,\n this.namingHelper.getFileNames(),\n !!this.options.bundledFileGeneration,\n reservedNames,\n );\n\n return new FileHandler(\n additionalPath,\n name,\n this.project.createSourceFile(fileName),\n imports,\n this.formatter,\n forceTypeChecking \|\| !!this.options.allowTypeChecking,\n );\n }\n\n public async init() {\n if (!this.options.bundledFileGeneration) {\n // ensure folder for each model: we do this at this point for performance reasons\n await Promise.all(this.dataModel.getModelTypes().map((mt) => mkdirp(path.join(this.outputDir, mt.folderPath))));\n }\n }\n\n public initModels() {\n if (this.options.bundledFileGeneration) {\n // collect reserved names, that is names of classes we're going to create => imports must take them into account\n const reservedWords = this.dataModel.getModelTypes().reduce<Array<string>>((collector, model) => {\n const asEntityType = model as EntityType;\n collector.push(model.modelName);\n if (asEntityType.editableName) {\n collector.push(asEntityType.editableName);\n }\n if (asEntityType.id?.modelName) {\n collector.push(asEntityType.id.modelName);\n }\n this.dataModel.getAllEntityOperations(model.fqName).forEach((op) => {\n if (op.parameters.length) {\n collector.push(op.paramsModelName);\n }\n });\n\n return collector;\n }, []);\n this.dataModel.getUnboundOperationTypes().forEach((op) => {\n if (op.parameters.length) {\n reservedWords.push(op.paramsModelName);\n }\n });\n\n this.mainModelFile = this.createFile(this.namingHelper.getFileNames().model, reservedWords);\n }\n }\n\n public async finalizeModels() {\n if (\n this.mainModelFile &&\n (this.options.bundledFileGeneration \|\| this.mainModelFile.getFile().getFullText().length)\n ) {\n await this.writeFile(this.mainModelFile);\n }\n }\n\n public initQObjects() {\n if (this.options.bundledFileGeneration) {\n // collect reserved names, that is names of classes we're going to create => imports must take them into account\n const reservedWords = this.dataModel.getModelTypes().reduce<Array<string>>((collector, model) => {\n const asEntityType = model as EntityType;\n if (asEntityType.qName) {\n collector.push(asEntityType.qName, firstCharLowerCase(asEntityType.qName));\n }\n if (asEntityType.id?.qName) {\n collector.push(asEntityType.id.qName);\n }\n this.dataModel.getAllEntityOperations(model.fqName).forEach((op) => {\n collector.push(op.qName);\n });\n\n return collector;\n }, []);\n this.dataModel.getUnboundOperationTypes().forEach((op) => {\n reservedWords.push(op.qName);\n });\n\n this.mainQFile = this.createFile(this.namingHelper.getFileNames().qObject, reservedWords);\n }\n }\n\n public async finalizeQObjects() {\n if (this.mainQFile && (this.options.bundledFileGeneration \|\| this.mainQFile.getFile().getFullText().length)) {\n await this.writeFile(this.mainQFile);\n }\n }\n\n public initServices() {\n const mainServiceName = this.namingHelper.getMainServiceName();\n const reservedNames = [mainServiceName];\n\n if (this.options.bundledFileGeneration) {\n [...this.dataModel.getEntityTypes(), ...this.dataModel.getComplexTypes()].reduce((collector, model) => {\n collector.push(model.serviceName, model.serviceCollectionName);\n return collector;\n }, reservedNames);\n }\n\n this.mainServiceFile = this.createFile(mainServiceName, reservedNames);\n }\n\n public async finalizeServices() {\n if (this.mainServiceFile) {\n await this.writeFile(this.mainServiceFile);\n }\n }\n\n public getMainServiceFile() {\n return this.mainServiceFile!;\n }\n\n public createOrGetMainModelFile(reservedNames?: Array<string>) {\n if (!this.mainModelFile) {\n this.mainModelFile = this.createFile(this.namingHelper.getFileNames().model, reservedNames, \"\", true);\n }\n return this.mainModelFile;\n }\n\n public createOrGetMainQObjectFile(reservedNames?: Array<string>) {\n if (!this.mainQFile) {\n this.mainQFile = this.createFile(this.namingHelper.getFileNames().qObject, reservedNames);\n }\n return this.mainQFile;\n }\n\n public createOrGetModelFile(folderPath: string, name: string, reservedNames?: Array<string> \| undefined) {\n if (this.mainModelFile) {\n return this.mainModelFile;\n }\n\n // model files always allow for type checking\n return this.createFile(name, reservedNames, folderPath, true);\n }\n public createOrGetQObjectFile(folderPath: string, name: string, reservedNames?: Array<string> \| undefined) {\n if (this.mainQFile) {\n return this.mainQFile;\n }\n\n return this.createFile(name, reservedNames, folderPath);\n }\n public createOrGetServiceFile(folderPath: string, name: string, reservedNames?: Array<string> \| undefined) {\n if (this.options.bundledFileGeneration) {\n return this.mainServiceFile!;\n }\n\n return this.createFile(name, reservedNames, folderPath);\n }\n\n public async finalizeFile(file: FileHandler) {\n // write individual files in unbundled mode & if this is not one of the main files on root level\n if (\n !this.options.bundledFileGeneration &&\n file.path !== \"\" &&\n !Object.values(this.namingHelper.getFileNames()).includes(file.fileName)\n ) {\n await this.writeFile(file);\n }\n }\n}\n"]}
1	+ {"version":3,"file":"ProjectManager.js","sourceRoot":"","sources":["../../src/project/ProjectManager.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from \"path\";\nimport { mkdirp } from \"mkdirp\";\nimport { CompilerOptions, Project, SourceFile } from \"ts-morph\";\nimport { firstCharLowerCase } from \"xml2js/lib/processors.js\";\nimport { DataModel } from \"../data-model/DataModel.js\";\nimport { EntityType } from \"../data-model/DataTypeModel.js\";\nimport { NamingHelper } from \"../data-model/NamingHelper.js\";\nimport { ImportContainer } from \"../generator/ImportContainer.js\";\nimport { EmitModes } from \"../OptionModel.js\";\nimport { FileHandler } from \"./FileHandler.js\";\nimport { FileFormatter } from \"./formatter/FileFormatter.js\";\nimport { createFormatter } from \"./formatter/index.js\";\nimport { loadTsMorphCompilerOptions } from \"./TsMorphHelper.js\";\n\nexport interface ProjectManagerOptions {\n usePrettier?: boolean;\n tsConfigPath?: string;\n bundledFileGeneration?: boolean;\n /*\n for testing purposes, turn this on and retrieve all generated files via getCachedFiles\n /\n noOutput?: boolean;\n allowTypeChecking?: boolean;\n}\n\nexport async function createProjectManager(\n outputDir: string,\n emitMode: EmitModes,\n namingHelper: NamingHelper,\n dataModel: DataModel,\n options: ProjectManagerOptions,\n): Promise<ProjectManager> {\n const { usePrettier = false, tsConfigPath = \"tsconfig.json\" } = options;\n const formatter = usePrettier ? await createFormatter(outputDir, usePrettier) : undefined;\n\n const compilerOpts: CompilerOptions = await loadTsMorphCompilerOptions(tsConfigPath, emitMode, outputDir);\n\n const pm = new ProjectManager(outputDir, emitMode, namingHelper, dataModel, formatter, compilerOpts, {\n usePrettier,\n tsConfigPath,\n ...options,\n });\n\n await pm.init();\n\n return pm;\n}\n\nexport class ProjectManager {\n private project!: Project;\n\n private mainServiceFile: FileHandler \| undefined;\n private mainModelFile: FileHandler \| undefined;\n private mainQFile: FileHandler \| undefined;\n\n private readonly cachedFiles: Map<string, SourceFile> \| undefined;\n\n constructor(\n protected outputDir: string,\n protected emitMode: EmitModes,\n protected namingHelper: NamingHelper,\n protected dataModel: DataModel,\n protected formatter: FileFormatter \| undefined,\n compilerOptions: CompilerOptions \| undefined,\n protected options: ProjectManagerOptions,\n ) {\n // Create ts-morph project\n this.project = new Project({\n // manipulationSettings: this.formatter.getSettings(),\n skipAddingFilesFromTsConfig: true,\n compilerOptions,\n });\n\n if (options.noOutput) {\n this.cachedFiles = new Map();\n }\n }\n\n public getDataModel() {\n return this.dataModel;\n }\n\n /\n Only filled when noOutput=true\n */\n public getCachedFiles() {\n return this.cachedFiles!;\n }\n\n private async writeFile(fileHandler: FileHandler) {\n if (this.options.noOutput) {\n await fileHandler.write(this.emitMode, true);\n this.cachedFiles!.set(fileHandler.getFullFilePath(), fileHandler.getFile());\n\n return;\n }\n\n return fileHandler.write(this.emitMode);\n }\n\n private createFile(\n name: string,\n reservedNames?: Array<string> \| undefined,\n additionalPath: string = \"\",\n forceTypeChecking = false,\n ): FileHandler {\n const fileName = path.join(this.outputDir, additionalPath, `${name}.ts`);\n const imports = new ImportContainer(\n additionalPath,\n name,\n this.dataModel,\n this.namingHelper.getFileNames(),\n !!this.options.bundledFileGeneration,\n reservedNames,\n );\n\n return new FileHandler(\n additionalPath,\n name,\n this.project.createSourceFile(fileName),\n imports,\n this.formatter,\n forceTypeChecking \|\| !!this.options.allowTypeChecking,\n );\n }\n\n public async init() {\n if (!this.options.bundledFileGeneration) {\n // ensure folder for each model: we do this at this point for performance reasons\n await Promise.all(this.dataModel.getModelTypes().map((mt) => mkdirp(path.join(this.outputDir, mt.folderPath))));\n }\n }\n\n public initModels() {\n if (this.options.bundledFileGeneration) {\n // collect reserved names, that is names of classes we're going to create => imports must take them into account\n const reservedWords = this.dataModel.getModelTypes().reduce<Array<string>>((collector, model) => {\n const asEntityType = model as EntityType;\n collector.push(model.modelName);\n if (asEntityType.editableName) {\n collector.push(asEntityType.editableName);\n }\n if (asEntityType.id?.modelName) {\n collector.push(asEntityType.id.modelName);\n }\n this.dataModel.getAllEntityOperations(model.fqName).forEach((op) => {\n if (op.parameters.length) {\n collector.push(op.paramsModelName);\n }\n });\n\n return collector;\n }, []);\n this.dataModel.getUnboundOperationTypes().forEach((op) => {\n if (op.parameters.length) {\n reservedWords.push(op.paramsModelName);\n }\n });\n\n this.mainModelFile = this.createFile(this.namingHelper.getFileNames().model, reservedWords);\n }\n }\n\n public async finalizeModels() {\n if (\n this.mainModelFile &&\n (this.options.bundledFileGeneration \|\| this.mainModelFile.getFile().getFullText().length)\n ) {\n await this.writeFile(this.mainModelFile);\n }\n }\n\n public initQObjects() {\n if (this.options.bundledFileGeneration) {\n // collect reserved names, that is names of classes we're going to create => imports must take them into account\n const reservedWords = this.dataModel.getModelTypes().reduce<Array<string>>((collector, model) => {\n const asEntityType = model as EntityType;\n if (asEntityType.qName) {\n collector.push(asEntityType.qName, firstCharLowerCase(asEntityType.qName));\n }\n if (asEntityType.id?.qName) {\n collector.push(asEntityType.id.qName);\n }\n this.dataModel.getAllEntityOperations(model.fqName).forEach((op) => {\n collector.push(op.qName);\n });\n\n return collector;\n }, []);\n this.dataModel.getUnboundOperationTypes().forEach((op) => {\n reservedWords.push(op.qName);\n });\n\n this.mainQFile = this.createFile(this.namingHelper.getFileNames().qObject, reservedWords);\n }\n }\n\n public async finalizeQObjects() {\n if (this.mainQFile && (this.options.bundledFileGeneration \|\| this.mainQFile.getFile().getFullText().length)) {\n await this.writeFile(this.mainQFile);\n }\n }\n\n public initServices() {\n const mainServiceName = this.namingHelper.getMainServiceName();\n const reservedNames = [mainServiceName];\n\n if (this.options.bundledFileGeneration) {\n [...this.dataModel.getEntityTypes(), ...this.dataModel.getComplexTypes()].reduce((collector, model) => {\n collector.push(model.serviceName, model.serviceCollectionName);\n return collector;\n }, reservedNames);\n }\n\n this.mainServiceFile = this.createFile(mainServiceName, reservedNames);\n }\n\n public async finalizeServices() {\n if (this.mainServiceFile) {\n await this.writeFile(this.mainServiceFile);\n }\n }\n\n public getMainServiceFile() {\n return this.mainServiceFile!;\n }\n\n public createOrGetMainModelFile(reservedNames?: Array<string>) {\n if (!this.mainModelFile) {\n this.mainModelFile = this.createFile(this.namingHelper.getFileNames().model, reservedNames, \"\", true);\n }\n return this.mainModelFile;\n }\n\n public createOrGetMainQObjectFile(reservedNames?: Array<string>) {\n if (!this.mainQFile) {\n this.mainQFile = this.createFile(this.namingHelper.getFileNames().qObject, reservedNames);\n }\n return this.mainQFile;\n }\n\n public createOrGetModelFile(folderPath: string, name: string, reservedNames?: Array<string> \| undefined) {\n if (this.options.bundledFileGeneration) {\n return this.mainModelFile!;\n }\n\n // model files always allow for type checking\n return this.createFile(name, reservedNames, folderPath, true);\n }\n public createOrGetQObjectFile(folderPath: string, name: string, reservedNames?: Array<string> \| undefined) {\n if (this.options.bundledFileGeneration) {\n return this.mainQFile!;\n }\n\n return this.createFile(name, reservedNames, folderPath);\n }\n public createOrGetServiceFile(folderPath: string, name: string, reservedNames?: Array<string> \| undefined) {\n if (this.options.bundledFileGeneration) {\n return this.mainServiceFile!;\n }\n\n return this.createFile(name, reservedNames, folderPath);\n }\n\n public async finalizeFile(file: FileHandler) {\n // write individual files in unbundled mode & if this is not one of the main files on root level\n if (\n !this.options.bundledFileGeneration &&\n file.path !== \"\" &&\n !Object.values(this.namingHelper.getFileNames()).includes(file.fileName)\n ) {\n await this.writeFile(file);\n }\n }\n}\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@odata2ts/odata2ts",
-  "version": "0.39.2",
+  "version": "0.40.2",
   "description": "Flexible generator to produce various TypeScript artefacts (from simple model interfaces to complete odata clients) from OData metadata files",
   "keywords": [
     "odata2ts",
@@ -47,7 +47,7 @@
   "dependencies": {
     "@odata2ts/converter-api": "^0.2.5",
     "@odata2ts/converter-runtime": "^0.5.5",
-    "@odata2ts/http-client-api": "^0.6.2",
+    "@odata2ts/http-client-api": "^0.6.5",
     "@odata2ts/odata-core": "^0.6.1",
     "@prettier/plugin-xml": "^3.4.1",
     "@types/xml2js": "^0.4.11",
@@ -68,14 +68,14 @@
   },
   "devDependencies": {
     "@odata2ts/converter-v2-to-v4": "^0.5.1",
-    "@odata2ts/odata-query-objects": "^0.27.1",
-    "@odata2ts/odata-service": "^0.22.2",
+    "@odata2ts/odata-query-objects": "^0.28.2",
+    "@odata2ts/odata-service": "^0.23.2",
     "@odata2ts/test-converters": "^0.5.0",
     "@types/node": "^22.4.0"
   },
   "peerDependencies": {
-    "@odata2ts/odata-query-objects": "^0.27.1",
-    "@odata2ts/odata-service": "^0.22.2",
+    "@odata2ts/odata-query-objects": "^0.28.2",
+    "@odata2ts/odata-service": "^0.23.2",
     "typescript": ">= 4.7"
   },
   "publishConfig": {