@odata2ts/odata2ts 0.35.0 → 0.36.1

package/lib/generator/ModelGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelGenerator.js","sourceRoot":"","sources":["../../src/generator/ModelGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { JSDocStructure, OptionalKind, StructureKind } from \"ts-morph\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport { ComplexType, DataTypes, EntityType, OperationType, PropertyModel } from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel\";\r\nimport { FileHandler } from \"../project/FileHandler\";\r\nimport { ProjectManager } from \"../project/ProjectManager\";\r\nimport { CoreImports } from \"./import/ImportObjects\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nexport const generateModels: EntityBasedGeneratorFunction = (\r\n  project: ProjectManager,\r\n  dataModel,\r\n  version,\r\n  options,\r\n  namingHelper\r\n) => {\r\n  const generator = new ModelGenerator(project, dataModel, version, options, namingHelper);\r\n  return generator.generate();\r\n};\r\n\r\nclass ModelGenerator {\r\n  constructor(\r\n    private project: ProjectManager,\r\n    private dataModel: DataModel,\r\n    private version: ODataVersions,\r\n    private options: GeneratorFunctionOptions,\r\n    private namingHelper: NamingHelper\r\n  ) {}\r\n\r\n  public async generate(): Promise<void> {\r\n    this.project.initModels();\r\n\r\n    const promises: Array<Promise<void>> = [\r\n      ...this.generateEnums(),\r\n      ...this.generateEntityTypeModels(),\r\n      ...this.generateComplexTypeModels(),\r\n    ];\r\n\r\n    if (!this.options.skipOperations) {\r\n      promises.push(this.generateUnboundOperationParams());\r\n    }\r\n\r\n    await Promise.all(promises);\r\n\r\n    return this.project.finalizeModels();\r\n  }\r\n\r\n  private generateEnums() {\r\n    return this.dataModel.getEnums().map((et) => {\r\n      const file = this.project.createOrGetModelFile(et.folderPath, et.modelName);\r\n\r\n      file.getFile().addEnum({\r\n        name: et.modelName,\r\n        isExported: true,\r\n        members: et.members.map((mem) => ({ name: mem, initializer: `\"${mem}\"` })),\r\n      });\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateEntityTypeModels() {\r\n    return this.dataModel.getEntityTypes().map((model) => {\r\n      const file = this.project.createOrGetModelFile(model.folderPath, model.modelName, [\r\n        model.modelName,\r\n        model.id.modelName,\r\n        model.editableName,\r\n      ]);\r\n\r\n      // query model\r\n      this.generateModel(file, model);\r\n\r\n      // key model\r\n      if (!this.options.skipIdModels && model.generateId) {\r\n        this.generateIdModel(file, model);\r\n      }\r\n\r\n      // editable model\r\n      if (!this.options.skipEditableModels) {\r\n        this.generateEditableModel(file, model);\r\n      }\r\n\r\n      // param models for bound operations\r\n      if (!this.options.skipOperations) {\r\n        [\r\n          ...this.dataModel.getEntityTypeOperations(model.fqName),\r\n          ...this.dataModel.getEntitySetOperations(model.fqName),\r\n        ].forEach((operation) => {\r\n          this.generateOperationParams(file, operation);\r\n        });\r\n      }\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateComplexTypeModels() {\r\n    return this.dataModel.getComplexTypes().map((model) => {\r\n      const file = this.project.createOrGetModelFile(model.folderPath, model.modelName, [\r\n        model.modelName,\r\n        model.editableName,\r\n      ]);\r\n\r\n      // query model\r\n      this.generateModel(file, model);\r\n\r\n      // editable model\r\n      if (!this.options.skipEditableModels) {\r\n        this.generateEditableModel(file, model);\r\n      }\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateModel(file: FileHandler, model: ComplexType | EntityType) {\r\n    const imports = file.getImports();\r\n    let extendsClause = undefined;\r\n    if (model.finalBaseClass) {\r\n      const modelName = imports.addGeneratedModel(\r\n        model.baseClasses[0],\r\n        this.namingHelper.getModelName(model.finalBaseClass)\r\n      );\r\n      extendsClause = [modelName];\r\n    }\r\n\r\n    file.getFile().addInterface({\r\n      name: model.modelName,\r\n      isExported: true,\r\n      properties: model.props.map((p) => {\r\n        const isEntity = p.dataType == DataTypes.ModelType;\r\n        return {\r\n          name: p.name,\r\n          type: this.getPropType(file.getImports(), p),\r\n          // props for entities or entity collections are not added in V4 if not explicitly expanded\r\n          hasQuestionToken: this.dataModel.isV4() && isEntity,\r\n          docs: this.options.skipComments ? undefined : [this.generatePropDoc(p, model)],\r\n        };\r\n      }),\r\n      extends: extendsClause,\r\n    });\r\n  }\r\n\r\n  private generatePropDoc(prop: PropertyModel, model: ComplexType | EntityType): OptionalKind<JSDocStructure> {\r\n    const isKeyProp = (model as EntityType).keyNames?.includes(prop.odataName);\r\n    const baseAttribs: Array<string> = [];\r\n    if (isKeyProp) {\r\n      baseAttribs.push(\"**Key Property**: This is a key property used to identify the entity.\");\r\n    }\r\n    if (prop.managed) {\r\n      baseAttribs.push(\"**Managed**: This property is managed on the server side and cannot be edited.\");\r\n    }\r\n    if (prop.converters?.length) {\r\n      baseAttribs.push(`**Applied Converters**: ${prop.converters.map((c) => c.converterId).join(\",\")}.`);\r\n    }\r\n\r\n    const attributeTable: Array<[string, string]> = [\r\n      [\"Name\", prop.odataName],\r\n      [\"Type\", prop.odataType],\r\n    ];\r\n    if (prop.required) {\r\n      attributeTable.push([\"Nullable\", \"false\"]);\r\n    }\r\n\r\n    const description =\r\n      (baseAttribs ? baseAttribs.join(\"<br/>\") + \"\\n\\n\" : \"\") +\r\n      \"OData Attributes:\\n\" +\r\n      \"|Attribute Name | Attribute Value |\\n| --- | ---|\\n\" +\r\n      attributeTable.map((row) => `| ${row[0]} | \\`${row[1]}\\` |`).join(\"\\n\");\r\n\r\n    return { kind: StructureKind.JSDoc, description };\r\n  }\r\n\r\n  private getPropType(imports: ImportContainer, prop: PropertyModel): string {\r\n    // V2 entity special: deferred content\r\n    let suffix = \"\";\r\n    if (this.dataModel.isV2() && prop.dataType == DataTypes.ModelType) {\r\n      const [defContent] = imports.addCoreLib(this.version, CoreImports.DeferredContent);\r\n      suffix = ` | ${defContent}`;\r\n    }\r\n\r\n    let typeName: string;\r\n    if (prop.dataType === DataTypes.PrimitiveType) {\r\n      // custom types which require type imports => possible via converters\r\n      typeName = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type) : prop.type;\r\n    } else {\r\n      typeName = imports.addGeneratedModel(prop.fqType, prop.type);\r\n    }\r\n\r\n    // Collections\r\n    if (prop.isCollection) {\r\n      const type = `Array<${typeName}>`;\r\n      if (this.dataModel.isV2() && this.options.v2ModelsWithExtraResultsWrapping) {\r\n        return `{ results: ${type} }` + suffix;\r\n      } else {\r\n        return type + suffix;\r\n      }\r\n    }\r\n\r\n    // primitive, enum & complex types\r\n    return typeName + (prop.required ? \"\" : \" | null\") + suffix;\r\n  }\r\n\r\n  private generateIdModel(file: FileHandler, model: EntityType) {\r\n    const singleType = model.keys.length === 1 ? `${model.keys[0].type} | ` : \"\";\r\n    const keyTypes = model.keys\r\n      .map((keyProp) => `${keyProp.name}: ${this.getPropType(file.getImports(), keyProp)}`)\r\n      .join(\",\");\r\n    const type = `${singleType}{${keyTypes}}`;\r\n\r\n    file.getFile().addTypeAlias({\r\n      name: model.id.modelName,\r\n      isExported: true,\r\n      type,\r\n    });\r\n  }\r\n\r\n  private generateEditableModel(file: FileHandler, model: ComplexType) {\r\n    const entityTypes = [DataTypes.ModelType, DataTypes.ComplexType];\r\n    const allProps = [...model.baseProps, ...model.props].filter((p) => !p.managed);\r\n\r\n    const requiredProps = allProps\r\n      .filter((p) => p.required && !entityTypes.includes(p.dataType))\r\n      .map((p) => `\"${p.name}\"`)\r\n      .join(\" | \");\r\n    const optionalProps = allProps\r\n      .filter((p) => !p.required && !entityTypes.includes(p.dataType))\r\n      .map((p) => `\"${p.name}\"`)\r\n      .join(\" | \");\r\n    const complexProps = allProps.filter((p) => p.dataType === DataTypes.ComplexType);\r\n\r\n    const extendsClause = [\r\n      requiredProps ? `Pick<${model.modelName}, ${requiredProps}>` : null,\r\n      optionalProps ? `Partial<Pick<${model.modelName}, ${optionalProps}>>` : null,\r\n    ].filter((e): e is string => !!e);\r\n\r\n    file.getFile().addInterface({\r\n      name: model.editableName,\r\n      isExported: true,\r\n      extends: extendsClause,\r\n      properties: !complexProps\r\n        ? undefined\r\n        : complexProps.map((p) => {\r\n            return {\r\n              name: p.name,\r\n              type: this.getEditablePropType(file.getImports(), p),\r\n              // optional props don't need to be specified in editable model\r\n              // also, entities would require deep insert func => we make it optional for now\r\n              hasQuestionToken: !p.required || p.dataType === DataTypes.ModelType,\r\n            };\r\n          }),\r\n    });\r\n  }\r\n\r\n  private getEditablePropType(imports: ImportContainer, prop: PropertyModel): string {\r\n    const isModelType = [DataTypes.ModelType, DataTypes.ComplexType].includes(prop.dataType);\r\n\r\n    let editableType = prop.type;\r\n    if (isModelType) {\r\n      const editName = this.dataModel.getComplexType(prop.fqType)!.editableName;\r\n      editableType = imports.addGeneratedModel(prop.fqType, editName);\r\n    }\r\n\r\n    // Collections\r\n    if (prop.isCollection) {\r\n      return `Array<${editableType}>`;\r\n    }\r\n\r\n    // primitive, enum & complex types\r\n    return editableType + (prop.required ? \"\" : \" | null\");\r\n  }\r\n\r\n  private async generateUnboundOperationParams() {\r\n    const unboundOps = this.dataModel.getUnboundOperationTypes();\r\n    const reservedNames = unboundOps.map((op) => op.paramsModelName);\r\n    const file = this.project.createOrGetMainModelFile(reservedNames);\r\n\r\n    unboundOps.forEach((operation) => {\r\n      this.generateOperationParams(file, operation);\r\n    });\r\n  }\r\n\r\n  private generateOperationParams(file: FileHandler, operation: OperationType) {\r\n    if (!operation.parameters.length) {\r\n      return;\r\n    }\r\n    file.getFile().addInterface({\r\n      name: operation.paramsModelName,\r\n      isExported: true,\r\n      properties: operation.parameters.map((p) => {\r\n        return {\r\n          name: p.name,\r\n          type: this.getPropType(file.getImports(), p),\r\n          hasQuestionToken: !p.required,\r\n        };\r\n      }),\r\n    });\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ModelGenerator.js","sourceRoot":"","sources":["../../src/generator/ModelGenerator.ts"],"names":[],"mappings":";;;;AACA,uCAAuE;AAQvE,0DAAqD;AAG9C,MAAM,cAAc,GAAiC,CAC1D,OAAuB,EACvB,SAAS,EACT,OAAO,EACP,OAAO,EACP,YAAY,EACZ,EAAE;IACF,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IACzF,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;AAC9B,CAAC,CAAC;AATW,QAAA,cAAc,kBASzB;AAEF,MAAM,cAAc;IAClB,YACU,OAAuB,EACvB,SAAoB,EACpB,OAAsB,EACtB,OAAiC,EACjC,YAA0B;QAJ1B,YAAO,GAAP,OAAO,CAAgB;QACvB,cAAS,GAAT,SAAS,CAAW;QACpB,YAAO,GAAP,OAAO,CAAe;QACtB,YAAO,GAAP,OAAO,CAA0B;QACjC,iBAAY,GAAZ,YAAY,CAAc;IACjC,CAAC;IAES,QAAQ;;YACnB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAE1B,MAAM,QAAQ,GAAyB;gBACrC,GAAG,IAAI,CAAC,aAAa,EAAE;gBACvB,GAAG,IAAI,CAAC,wBAAwB,EAAE;gBAClC,GAAG,IAAI,CAAC,yBAAyB,EAAE;aACpC,CAAC;YAEF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE,CAAC,CAAC;aACtD;YAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE5B,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QACvC,CAAC;KAAA;IAEO,aAAa;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;YAE5E,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC;gBACrB,IAAI,EAAE,EAAE,CAAC,SAAS;gBAClB,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC;aAC3E,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,wBAAwB;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACnD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE;gBAChF,KAAK,CAAC,SAAS;gBACf,KAAK,CAAC,EAAE,CAAC,SAAS;gBAClB,KAAK,CAAC,YAAY;aACnB,CAAC,CAAC;YAEH,cAAc;YACd,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEhC,YAAY;YACZ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC,UAAU,EAAE;gBAClD,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aACnC;YAED,iBAAiB;YACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;gBACpC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aACzC;YAED,oCAAoC;YACpC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAChC;oBACE,GAAG,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,KAAK,CAAC,MAAM,CAAC;oBACvD,GAAG,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC;iBACvD,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;oBACtB,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAChD,CAAC,CAAC,CAAC;aACJ;YAED,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,yBAAyB;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACpD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE;gBAChF,KAAK,CAAC,SAAS;gBACf,KAAK,CAAC,YAAY;aACnB,CAAC,CAAC;YAEH,cAAc;YACd,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEhC,iBAAiB;YACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;gBACpC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aACzC;YAED,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,IAAiB,EAAE,KAA+B;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,IAAI,aAAa,GAAG,SAAS,CAAC;QAC9B,IAAI,KAAK,CAAC,cAAc,EAAE;YACxB,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,CACzC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EACpB,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,cAAc,CAAC,CACrD,CAAC;YACF,aAAa,GAAG,CAAC,SAAS,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC;YAC1B,IAAI,EAAE,KAAK,CAAC,SAAS;YACrB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAChC,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,yCAAuB,CAAC;gBACnD,OAAO;oBACL,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;oBAC5C,0FAA0F;oBAC1F,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,QAAQ;oBACnD,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;iBAC/E,CAAC;YACJ,CAAC,CAAC;YACF,OAAO,EAAE,aAAa;SACvB,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,IAAmB,EAAE,KAA+B;;QAC1E,MAAM,SAAS,GAAG,MAAC,KAAoB,CAAC,QAAQ,0CAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAkB,EAAE,CAAC;QACtC,IAAI,SAAS,EAAE;YACb,WAAW,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;SAC3F;QACD,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,WAAW,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;SACpG;QACD,IAAI,MAAA,IAAI,CAAC,UAAU,0CAAE,MAAM,EAAE;YAC3B,WAAW,CAAC,IAAI,CAAC,2BAA2B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACrG;QAED,MAAM,cAAc,GAA4B;YAC9C,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC;YACxB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC;SACzB,CAAC;QACF,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;SAC5C;QAED,MAAM,WAAW,GACf,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACvD,qBAAqB;YACrB,qDAAqD;YACrD,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE1E,OAAO,EAAE,IAAI,EAAE,wBAAa,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IACpD,CAAC;IAEO,WAAW,CAAC,OAAwB,EAAE,IAAmB;QAC/D,sCAAsC;QACtC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,QAAQ,yCAAuB,EAAE;YACjE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,2BAAW,CAAC,eAAe,CAAC,CAAC;YACjF,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;SAC7B;QAED,IAAI,QAAgB,CAAC;QACrB,IAAI,IAAI,CAAC,QAAQ,kDAA4B,EAAE;YAC7C,qEAAqE;YACrE,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SAClG;aAAM;YACL,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SAC9D;QAED,cAAc;QACd,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,MAAM,IAAI,GAAG,SAAS,QAAQ,GAAG,CAAC;YAClC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,gCAAgC,EAAE;gBAC1E,OAAO,cAAc,IAAI,IAAI,GAAG,MAAM,CAAC;aACxC;iBAAM;gBACL,OAAO,IAAI,GAAG,MAAM,CAAC;aACtB;SACF;QAED,kCAAkC;QAClC,OAAO,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;IAC9D,CAAC;IAEO,eAAe,CAAC,IAAiB,EAAE,KAAiB;QAC1D,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI;aACxB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC;aACpF,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,MAAM,IAAI,GAAG,GAAG,UAAU,IAAI,QAAQ,GAAG,CAAC;QAE1C,IAAI,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC;YAC1B,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS;YACxB,UAAU,EAAE,IAAI;YAChB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAEO,qBAAqB,CAAC,IAAiB,EAAE,KAAkB;QACjE,MAAM,WAAW,GAAG,kFAA4C,CAAC;QACjE,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEhF,MAAM,aAAa,GAAG,QAAQ;aAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;aAC9D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC;aACzB,IAAI,CAAC,KAAK,CAAC,CAAC;QACf,MAAM,aAAa,GAAG,QAAQ;aAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;aAC/D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC;aACzB,IAAI,CAAC,KAAK,CAAC,CAAC;QACf,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,8CAA0B,CAAC,CAAC;QAElF,MAAM,aAAa,GAAG;YACpB,aAAa,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,SAAS,KAAK,aAAa,GAAG,CAAC,CAAC,CAAC,IAAI;YACnE,aAAa,CAAC,CAAC,CAAC,gBAAgB,KAAK,CAAC,SAAS,KAAK,aAAa,IAAI,CAAC,CAAC,CAAC,IAAI;SAC7E,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElC,IAAI,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC;YAC1B,IAAI,EAAE,KAAK,CAAC,YAAY;YACxB,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,aAAa;YACtB,UAAU,EAAE,CAAC,YAAY;gBACvB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACrB,OAAO;wBACL,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;wBACpD,8DAA8D;wBAC9D,+EAA+E;wBAC/E,gBAAgB,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,0CAAwB;qBACpE,CAAC;gBACJ,CAAC,CAAC;SACP,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB,CAAC,OAAwB,EAAE,IAAmB;QACvE,MAAM,WAAW,GAAG,kFAA4C,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzF,IAAI,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;QAC7B,IAAI,WAAW,EAAE;YACf,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC,YAAY,CAAC;YAC1E,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;SACjE;QAED,cAAc;QACd,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,SAAS,YAAY,GAAG,CAAC;SACjC;QAED,kCAAkC;QAClC,OAAO,YAAY,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;IAEa,8BAA8B;;YAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE,CAAC;YAC7D,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;YACjE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;YAElE,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC/B,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAEO,uBAAuB,CAAC,IAAiB,EAAE,SAAwB;;QACzE,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzG,yCAAyC;QACzC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,IAAI,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC;gBAC1B,IAAI,EAAE,SAAS,CAAC,eAAe;gBAC/B,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACjC,OAAO;wBACL,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;wBAC5C,gBAAgB,EAAE,CAAC,CAAC,CAAC,QAAQ;qBAC9B,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,CAAC;SACJ;QACD,2EAA2E;aACtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,IAAI,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC;gBAC1B,IAAI,EAAE,SAAS,CAAC,eAAe;gBAC/B,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;oBACf,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;wBAChC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;4BAChB,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gCAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC;gCAC7D,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC,CAAC;gCACxE,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oCAC3B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iCACnB;4BACH,CAAC,CAAC,CAAC;wBACL,CAAC,CAAC,CAAC;wBACH,IAAI,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;4BAChC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;yBACrB;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC;aACF,CAAC,CAAC;SACJ;IACH,CAAC;CACF","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { JSDocStructure, OptionalKind, StructureKind } from \"ts-morph\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport { ComplexType, DataTypes, EntityType, OperationType, PropertyModel } from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel\";\r\nimport { FileHandler } from \"../project/FileHandler\";\r\nimport { ProjectManager } from \"../project/ProjectManager\";\r\nimport { CoreImports } from \"./import/ImportObjects\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nexport const generateModels: EntityBasedGeneratorFunction = (\r\n  project: ProjectManager,\r\n  dataModel,\r\n  version,\r\n  options,\r\n  namingHelper\r\n) => {\r\n  const generator = new ModelGenerator(project, dataModel, version, options, namingHelper);\r\n  return generator.generate();\r\n};\r\n\r\nclass ModelGenerator {\r\n  constructor(\r\n    private project: ProjectManager,\r\n    private dataModel: DataModel,\r\n    private version: ODataVersions,\r\n    private options: GeneratorFunctionOptions,\r\n    private namingHelper: NamingHelper\r\n  ) {}\r\n\r\n  public async generate(): Promise<void> {\r\n    this.project.initModels();\r\n\r\n    const promises: Array<Promise<void>> = [\r\n      ...this.generateEnums(),\r\n      ...this.generateEntityTypeModels(),\r\n      ...this.generateComplexTypeModels(),\r\n    ];\r\n\r\n    if (!this.options.skipOperations) {\r\n      promises.push(this.generateUnboundOperationParams());\r\n    }\r\n\r\n    await Promise.all(promises);\r\n\r\n    return this.project.finalizeModels();\r\n  }\r\n\r\n  private generateEnums() {\r\n    return this.dataModel.getEnums().map((et) => {\r\n      const file = this.project.createOrGetModelFile(et.folderPath, et.modelName);\r\n\r\n      file.getFile().addEnum({\r\n        name: et.modelName,\r\n        isExported: true,\r\n        members: et.members.map((mem) => ({ name: mem, initializer: `\"${mem}\"` })),\r\n      });\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateEntityTypeModels() {\r\n    return this.dataModel.getEntityTypes().map((model) => {\r\n      const file = this.project.createOrGetModelFile(model.folderPath, model.modelName, [\r\n        model.modelName,\r\n        model.id.modelName,\r\n        model.editableName,\r\n      ]);\r\n\r\n      // query model\r\n      this.generateModel(file, model);\r\n\r\n      // key model\r\n      if (!this.options.skipIdModels && model.generateId) {\r\n        this.generateIdModel(file, model);\r\n      }\r\n\r\n      // editable model\r\n      if (!this.options.skipEditableModels) {\r\n        this.generateEditableModel(file, model);\r\n      }\r\n\r\n      // param models for bound operations\r\n      if (!this.options.skipOperations) {\r\n        [\r\n          ...this.dataModel.getEntityTypeOperations(model.fqName),\r\n          ...this.dataModel.getEntitySetOperations(model.fqName),\r\n        ].forEach((operation) => {\r\n          this.generateOperationParams(file, operation);\r\n        });\r\n      }\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateComplexTypeModels() {\r\n    return this.dataModel.getComplexTypes().map((model) => {\r\n      const file = this.project.createOrGetModelFile(model.folderPath, model.modelName, [\r\n        model.modelName,\r\n        model.editableName,\r\n      ]);\r\n\r\n      // query model\r\n      this.generateModel(file, model);\r\n\r\n      // editable model\r\n      if (!this.options.skipEditableModels) {\r\n        this.generateEditableModel(file, model);\r\n      }\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateModel(file: FileHandler, model: ComplexType | EntityType) {\r\n    const imports = file.getImports();\r\n    let extendsClause = undefined;\r\n    if (model.finalBaseClass) {\r\n      const modelName = imports.addGeneratedModel(\r\n        model.baseClasses[0],\r\n        this.namingHelper.getModelName(model.finalBaseClass)\r\n      );\r\n      extendsClause = [modelName];\r\n    }\r\n\r\n    file.getFile().addInterface({\r\n      name: model.modelName,\r\n      isExported: true,\r\n      properties: model.props.map((p) => {\r\n        const isEntity = p.dataType == DataTypes.ModelType;\r\n        return {\r\n          name: p.name,\r\n          type: this.getPropType(file.getImports(), p),\r\n          // props for entities or entity collections are not added in V4 if not explicitly expanded\r\n          hasQuestionToken: this.dataModel.isV4() && isEntity,\r\n          docs: this.options.skipComments ? undefined : [this.generatePropDoc(p, model)],\r\n        };\r\n      }),\r\n      extends: extendsClause,\r\n    });\r\n  }\r\n\r\n  private generatePropDoc(prop: PropertyModel, model: ComplexType | EntityType): OptionalKind<JSDocStructure> {\r\n    const isKeyProp = (model as EntityType).keyNames?.includes(prop.odataName);\r\n    const baseAttribs: Array<string> = [];\r\n    if (isKeyProp) {\r\n      baseAttribs.push(\"**Key Property**: This is a key property used to identify the entity.\");\r\n    }\r\n    if (prop.managed) {\r\n      baseAttribs.push(\"**Managed**: This property is managed on the server side and cannot be edited.\");\r\n    }\r\n    if (prop.converters?.length) {\r\n      baseAttribs.push(`**Applied Converters**: ${prop.converters.map((c) => c.converterId).join(\",\")}.`);\r\n    }\r\n\r\n    const attributeTable: Array<[string, string]> = [\r\n      [\"Name\", prop.odataName],\r\n      [\"Type\", prop.odataType],\r\n    ];\r\n    if (prop.required) {\r\n      attributeTable.push([\"Nullable\", \"false\"]);\r\n    }\r\n\r\n    const description =\r\n      (baseAttribs ? baseAttribs.join(\"<br/>\") + \"\\n\\n\" : \"\") +\r\n      \"OData Attributes:\\n\" +\r\n      \"|Attribute Name | Attribute Value |\\n| --- | ---|\\n\" +\r\n      attributeTable.map((row) => `| ${row[0]} | \\`${row[1]}\\` |`).join(\"\\n\");\r\n\r\n    return { kind: StructureKind.JSDoc, description };\r\n  }\r\n\r\n  private getPropType(imports: ImportContainer, prop: PropertyModel): string {\r\n    // V2 entity special: deferred content\r\n    let suffix = \"\";\r\n    if (this.dataModel.isV2() && prop.dataType == DataTypes.ModelType) {\r\n      const defContent = imports.addCoreLib(this.version, CoreImports.DeferredContent);\r\n      suffix = ` | ${defContent}`;\r\n    }\r\n\r\n    let typeName: string;\r\n    if (prop.dataType === DataTypes.PrimitiveType) {\r\n      // custom types which require type imports => possible via converters\r\n      typeName = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type, true) : prop.type;\r\n    } else {\r\n      typeName = imports.addGeneratedModel(prop.fqType, prop.type);\r\n    }\r\n\r\n    // Collections\r\n    if (prop.isCollection) {\r\n      const type = `Array<${typeName}>`;\r\n      if (this.dataModel.isV2() && this.options.v2ModelsWithExtraResultsWrapping) {\r\n        return `{ results: ${type} }` + suffix;\r\n      } else {\r\n        return type + suffix;\r\n      }\r\n    }\r\n\r\n    // primitive, enum & complex types\r\n    return typeName + (prop.required ? \"\" : \" | null\") + suffix;\r\n  }\r\n\r\n  private generateIdModel(file: FileHandler, model: EntityType) {\r\n    const singleType = model.keys.length === 1 ? `${model.keys[0].type} | ` : \"\";\r\n    const keyTypes = model.keys\r\n      .map((keyProp) => `${keyProp.name}: ${this.getPropType(file.getImports(), keyProp)}`)\r\n      .join(\",\");\r\n    const type = `${singleType}{${keyTypes}}`;\r\n\r\n    file.getFile().addTypeAlias({\r\n      name: model.id.modelName,\r\n      isExported: true,\r\n      type,\r\n    });\r\n  }\r\n\r\n  private generateEditableModel(file: FileHandler, model: ComplexType) {\r\n    const entityTypes = [DataTypes.ModelType, DataTypes.ComplexType];\r\n    const allProps = [...model.baseProps, ...model.props].filter((p) => !p.managed);\r\n\r\n    const requiredProps = allProps\r\n      .filter((p) => p.required && !entityTypes.includes(p.dataType))\r\n      .map((p) => `\"${p.name}\"`)\r\n      .join(\" | \");\r\n    const optionalProps = allProps\r\n      .filter((p) => !p.required && !entityTypes.includes(p.dataType))\r\n      .map((p) => `\"${p.name}\"`)\r\n      .join(\" | \");\r\n    const complexProps = allProps.filter((p) => p.dataType === DataTypes.ComplexType);\r\n\r\n    const extendsClause = [\r\n      requiredProps ? `Pick<${model.modelName}, ${requiredProps}>` : null,\r\n      optionalProps ? `Partial<Pick<${model.modelName}, ${optionalProps}>>` : null,\r\n    ].filter((e): e is string => !!e);\r\n\r\n    file.getFile().addInterface({\r\n      name: model.editableName,\r\n      isExported: true,\r\n      extends: extendsClause,\r\n      properties: !complexProps\r\n        ? undefined\r\n        : complexProps.map((p) => {\r\n            return {\r\n              name: p.name,\r\n              type: this.getEditablePropType(file.getImports(), p),\r\n              // optional props don't need to be specified in editable model\r\n              // also, entities would require deep insert func => we make it optional for now\r\n              hasQuestionToken: !p.required || p.dataType === DataTypes.ModelType,\r\n            };\r\n          }),\r\n    });\r\n  }\r\n\r\n  private getEditablePropType(imports: ImportContainer, prop: PropertyModel): string {\r\n    const isModelType = [DataTypes.ModelType, DataTypes.ComplexType].includes(prop.dataType);\r\n\r\n    let editableType = prop.type;\r\n    if (isModelType) {\r\n      const editName = this.dataModel.getComplexType(prop.fqType)!.editableName;\r\n      editableType = imports.addGeneratedModel(prop.fqType, editName);\r\n    }\r\n\r\n    // Collections\r\n    if (prop.isCollection) {\r\n      return `Array<${editableType}>`;\r\n    }\r\n\r\n    // primitive, enum & complex types\r\n    return editableType + (prop.required ? \"\" : \" | null\");\r\n  }\r\n\r\n  private async generateUnboundOperationParams() {\r\n    const unboundOps = this.dataModel.getUnboundOperationTypes();\r\n    const reservedNames = unboundOps.map((op) => op.paramsModelName);\r\n    const file = this.project.createOrGetMainModelFile(reservedNames);\r\n\r\n    unboundOps.forEach((operation) => {\r\n      this.generateOperationParams(file, operation);\r\n    });\r\n  }\r\n\r\n  private generateOperationParams(file: FileHandler, operation: OperationType) {\r\n    const paramSets = [operation.parameters, ...(operation.overrides ?? [])].filter((pSet) => !!pSet.length);\r\n\r\n    // standard: one interface for parameters\r\n    if (paramSets.length === 1) {\r\n      file.getFile().addInterface({\r\n        name: operation.paramsModelName,\r\n        isExported: true,\r\n        properties: paramSets[0].map((p) => {\r\n          return {\r\n            name: p.name,\r\n            type: this.getPropType(file.getImports(), p),\r\n            hasQuestionToken: !p.required,\r\n          };\r\n        }),\r\n      });\r\n    }\r\n    // function overload: one type with intersections of different param models\r\n    else if (paramSets.length > 1) {\r\n      file.getFile().addTypeAlias({\r\n        name: operation.paramsModelName,\r\n        isExported: true,\r\n        type: (writer) => {\r\n          paramSets.forEach((pSet, index) => {\r\n            writer.block(() => {\r\n              pSet.forEach((param, index) => {\r\n                const paramType = this.getPropType(file.getImports(), param);\r\n                writer.write(`${param.name}${param.required ? \"\" : \"?\"}: ${paramType}`);\r\n                if (index < pSet.length - 1) {\r\n                  writer.write(\",\");\r\n                }\r\n              });\r\n            });\r\n            if (index < paramSets.length - 1) {\r\n              writer.write(\" | \");\r\n            }\r\n          });\r\n        },\r\n      });\r\n    }\r\n  }\r\n}\r\n"]}

package/lib/generator/QueryObjectGenerator.js

@@ -79,7 +79,7 @@ class QueryObjectGenerator {
             extendsClause = imports.addGeneratedQObject(baseClass, baseModel.qName);
         }
         else {
-            [extendsClause] = imports.addQObject(ImportObjects_1.QueryObjectImports.QueryObject);
+            extendsClause = imports.addQObject(ImportObjects_1.QueryObjectImports.QueryObject);
         }
         file.getFile().addClass({
             name: model.qName,
@@ -107,16 +107,15 @@ class QueryObjectGenerator {
             let qPathInit;
             // factor in collections
             if (prop.isCollection) {
-                const cType = isModelType ? ImportObjects_1.QueryObjectImports.QEntityCollectionPath : ImportObjects_1.QueryObjectImports.QCollectionPath;
-                const collectionType = importContainer.addQObject(cType);
+                const qPath = importContainer.addQObject(isModelType ? ImportObjects_1.QueryObjectImports.QEntityCollectionPath : ImportObjects_1.QueryObjectImports.QCollectionPath);
                 const qObject = isModelType
                     ? importContainer.addGeneratedQObject(prop.fqType, prop.qObject)
-                    : importContainer.addFromQObject(prop.qObject)[0];
-                qPathInit = `new ${collectionType}(this.withPrefix("${odataName}"), () => ${qObject})`;
+                    : importContainer.addQObject(prop.qObject);
+                qPathInit = `new ${qPath}(this.withPrefix("${odataName}"), () => ${qObject})`;
             }
             else {
                 // add import for data type
-                const qPath = importContainer.addFromQObject(prop.qPath);
+                const qPath = importContainer.addQObject(prop.qPath);
                 if (isModelType) {
                     const qObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject);
                     qPathInit = `new ${qPath}(this.withPrefix("${odataName}"), () => ${qObject})`;
@@ -174,24 +173,32 @@ class QueryObjectGenerator {
             ],
         });
     }
-    getParamInitString(importContainer, props) {
-        return `[${props
-            .map((prop) => {
-            var _a;
-            let complexQParam = "";
-            if (prop.dataType === "ModelType" /* DataTypes.ModelType */ || prop.dataType === "ComplexType" /* DataTypes.ComplexType */) {
-                const importedQObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject);
-                complexQParam = `, new ${importedQObject}()`;
-            }
-            const 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(importContainer, prop.converters);
-            const mappedNameParam = mappedName ? `, ${mappedName}` : "";
-            const converterParam = converterStmt ? `, ${converterStmt}` : "";
-            return `new ${qParam}("${prop.odataName}"${complexQParam}${mappedNameParam}${converterParam})`;
-        })
-            .join(",")}]`;
+    getParamInitString(importContainer, props, overloads) {
+        const allParams = [props, ...(overloads !== null && overloads !== void 0 ? overloads : [])].map((paramSet) => {
+            const pString = paramSet
+                .map((prop) => {
+                var _a;
+                let complexQParam = "";
+                if (prop.dataType === "ModelType" /* DataTypes.ModelType */ || prop.dataType === "ComplexType" /* DataTypes.ComplexType */) {
+                    const importedQObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject);
+                    complexQParam = `, new ${importedQObject}()`;
+                }
+                const qParam = importContainer.addQObject(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(importContainer, prop.converters);
+                const mappedNameParam = mappedName ? `, ${mappedName}` : "";
+                const converterParam = converterStmt ? `, ${converterStmt}` : "";
+                return `new ${qParam}("${prop.odataName}"${complexQParam}${mappedNameParam}${converterParam})`;
+            })
+                .join(",");
+            return `[${pString}]`;
+        });
+        return allParams.length === 1 ? allParams[0] : `[${allParams.join(",")}]`;
     }
     generateUnboundOperations() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -204,31 +211,33 @@ class QueryObjectGenerator {
         });
     }
     generateOperation(file, operation, baseFqName) {
-        var _a;
+        var _a, _b;
         const imports = file.getImports();
         const isV2 = this.version === odata_core_1.ODataVersions.V2;
         const returnType = operation.returnType;
-        const hasParams = operation.parameters.length > 0;
+        const hasParams = operation.parameters.length > 0 || ((_a = operation.overrides) === null || _a === void 0 ? void 0 : _a.length);
+        const isParamsOptional = !![operation.parameters, ...((_b = operation.overrides) !== null && _b !== void 0 ? _b : [])].find((pSet) => pSet.length === 0);
         // imports
         const qOp = operation.type === "Action" /* OperationTypes.Action */ ? ImportObjects_1.QueryObjectImports.QAction : ImportObjects_1.QueryObjectImports.QFunction;
         const qOperation = imports.addQObject(qOp);
-        const paramModelName = operation.parameters.length
-            ? imports.addGeneratedModel(baseFqName, operation.paramsModelName)
-            : undefined;
+        const paramModelName = hasParams ? imports.addGeneratedModel(baseFqName, operation.paramsModelName) : undefined;
         let returnTypeOpStmt = "";
         if (returnType) {
             const collectionSuffix = returnType.isCollection ? "_COLLECTION" : "";
             if (returnType.dataType === "ComplexType" /* DataTypes.ComplexType */ || returnType.dataType === "ModelType" /* DataTypes.ModelType */) {
                 if (returnType.qObject) {
-                    const [opRt, rts, qComplexParam] = imports.addQObject(ImportObjects_1.QueryObjectImports.OperationReturnType, ImportObjects_1.QueryObjectImports.ReturnTypes, ImportObjects_1.QueryObjectImports.QComplexParam);
+                    const opRt = imports.addQObject(ImportObjects_1.QueryObjectImports.OperationReturnType);
+                    const rts = imports.addQObject(ImportObjects_1.QueryObjectImports.ReturnTypes);
+                    const qComplexParam = imports.addQObject(ImportObjects_1.QueryObjectImports.QComplexParam);
                     const returnQName = imports.addGeneratedQObject(returnType.fqType, returnType.qObject);
                     returnTypeOpStmt = `new ${opRt}(${rts}.COMPLEX${collectionSuffix}, new ${qComplexParam}("NONE", new ${returnQName}))`;
                 }
             }
             // currently, it only makes sense to add the OperationReturnType if a converter is present
             else if (returnType.converters && returnType.qParam) {
-                const [rtClass, rtTypes] = imports.addQObject(ImportObjects_1.QueryObjectImports.OperationReturnType, ImportObjects_1.QueryObjectImports.ReturnTypes);
-                const [qParam] = imports.addFromQObject(returnType.qParam);
+                const rtClass = imports.addQObject(ImportObjects_1.QueryObjectImports.OperationReturnType);
+                const rtTypes = imports.addQObject(ImportObjects_1.QueryObjectImports.ReturnTypes);
+                const qParam = imports.addQObject(returnType.qParam);
                 // TODO: some constants with string concat
                 const rtKind = `${rtTypes}.VALUE${collectionSuffix}`;
                 const converterParam = returnType.converters
@@ -246,8 +255,8 @@ class QueryObjectGenerator {
                     name: "params",
                     scope: ts_morph_1.Scope.Private,
                     isReadonly: true,
-                    type: ((_a = operation.parameters) === null || _a === void 0 ? void 0 : _a.length) ? undefined : "[]",
-                    initializer: this.getParamInitString(imports, operation.parameters),
+                    type: hasParams ? undefined : "[]",
+                    initializer: this.getParamInitString(imports, operation.parameters, operation.overrides),
                 },
             ],
             ctors: [

package/lib/generator/QueryObjectGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryObjectGenerator.js","sourceRoot":"","sources":["../../src/generator/QueryObjectGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\nimport { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { OptionalKind, PropertyDeclarationStructure, Scope, VariableDeclarationKind } from \"ts-morph\";\r\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport {\r\n  ComplexType,\r\n  DataTypes,\r\n  EntityType,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n} from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel\";\r\nimport { FileHandler } from \"../project/FileHandler\";\r\nimport { ProjectManager } from \"../project/ProjectManager\";\r\nimport { QueryObjectImports } from \"./import/ImportObjects\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nexport const generateQueryObjects: EntityBasedGeneratorFunction = (\r\n  project,\r\n  dataModel,\r\n  version,\r\n  options,\r\n  namingHelper\r\n) => {\r\n  const generator = new QueryObjectGenerator(project, dataModel, version, options, namingHelper);\r\n  return generator.generate();\r\n};\r\n\r\nclass QueryObjectGenerator {\r\n  constructor(\r\n    private project: ProjectManager,\r\n    private dataModel: DataModel,\r\n    private version: ODataVersions,\r\n    private options: GeneratorFunctionOptions,\r\n    private namingHelper: NamingHelper\r\n  ) {}\r\n\r\n  public async generate(): Promise<void> {\r\n    this.project.initQObjects();\r\n\r\n    // process EntityType & ComplexType\r\n    const promises: Array<Promise<void>> = [...this.generateEntityTypes(), ...this.generateComplexTypes()];\r\n    if (!this.options.skipOperations) {\r\n      // process unbound operations\r\n      promises.push(this.generateUnboundOperations());\r\n    }\r\n\r\n    await Promise.all(promises);\r\n\r\n    return this.project.finalizeQObjects();\r\n  }\r\n\r\n  private generateEntityTypes() {\r\n    return this.dataModel.getEntityTypes().map((model) => {\r\n      const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [\r\n        model.qName,\r\n        firstCharLowerCase(model.qName),\r\n        model.id.qName,\r\n      ]);\r\n\r\n      // q object\r\n      this.generateModel(file, model);\r\n\r\n      // qId function\r\n      if (!this.options.skipIdModels && model.generateId) {\r\n        this.generateIdFunction(file, model);\r\n      }\r\n\r\n      // bound q operations\r\n      if (!this.options.skipOperations) {\r\n        [\r\n          ...this.dataModel.getEntityTypeOperations(model.fqName),\r\n          ...this.dataModel.getEntitySetOperations(model.fqName),\r\n        ].forEach((operation) => {\r\n          this.generateOperation(file, operation, model.fqName);\r\n        });\r\n      }\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateComplexTypes() {\r\n    return this.dataModel.getComplexTypes().map((model) => {\r\n      const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [\r\n        model.qName,\r\n        firstCharLowerCase(model.qName),\r\n      ]);\r\n\r\n      this.generateModel(file, model);\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateModel(file: FileHandler, model: ComplexType) {\r\n    const imports = file.getImports();\r\n\r\n    let extendsClause: string;\r\n    if (model.baseClasses.length) {\r\n      const baseClass = model.baseClasses[0];\r\n      const baseModel = this.dataModel.getModel(baseClass) as ComplexType;\r\n      if (!baseModel) {\r\n        throw new Error(`Entity or complex type \"${baseClass}\" from baseClass attribute not found!`);\r\n      }\r\n      extendsClause = imports.addGeneratedQObject(baseClass, baseModel.qName);\r\n    } else {\r\n      [extendsClause] = imports.addQObject(QueryObjectImports.QueryObject);\r\n    }\r\n\r\n    file.getFile().addClass({\r\n      name: model.qName,\r\n      isExported: true,\r\n      extends: extendsClause,\r\n      // isAbstract: model.abstract,\r\n      properties: this.generateQueryObjectProps(file.getImports(), model.props),\r\n    });\r\n\r\n    file.getFile().addVariableStatement({\r\n      declarationKind: VariableDeclarationKind.Const,\r\n      isExported: true,\r\n      declarations: [\r\n        {\r\n          name: firstCharLowerCase(model.qName),\r\n          initializer: `new ${model.qName}()`,\r\n        },\r\n      ],\r\n    });\r\n  }\r\n\r\n  private generateQueryObjectProps(\r\n    importContainer: ImportContainer,\r\n    props: Array<PropertyModel>\r\n  ): Array<OptionalKind<PropertyDeclarationStructure>> {\r\n    return props.map((prop) => {\r\n      const { odataName } = prop;\r\n      const name = this.namingHelper.getQPropName(prop.name);\r\n      const isModelType = prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\r\n      let qPathInit: string;\r\n\r\n      // factor in collections\r\n      if (prop.isCollection) {\r\n        const cType = isModelType ? QueryObjectImports.QEntityCollectionPath : QueryObjectImports.QCollectionPath;\r\n        const collectionType = importContainer.addQObject(cType);\r\n        const qObject = isModelType\r\n          ? importContainer.addGeneratedQObject(prop.fqType, prop.qObject!)\r\n          : importContainer.addFromQObject(prop.qObject!)[0];\r\n\r\n        qPathInit = `new ${collectionType}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\r\n      } else {\r\n        // add import for data type\r\n        const qPath = importContainer.addFromQObject(prop.qPath);\r\n        if (isModelType) {\r\n          const qObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject!);\r\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\r\n        } else {\r\n          let converterStmt = this.generateConverterStmt(importContainer, prop.converters);\r\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\")${converterStmt ? `, ${converterStmt}` : \"\"})`;\r\n        }\r\n      }\r\n\r\n      return {\r\n        name,\r\n        scope: Scope.Public,\r\n        isReadonly: true,\r\n        initializer: qPathInit,\r\n      } as OptionalKind<PropertyDeclarationStructure>;\r\n    });\r\n  }\r\n\r\n  private generateConverterStmt(importContainer: ImportContainer, converters: Array<ValueConverterImport> | undefined) {\r\n    if (!converters?.length) {\r\n      return undefined;\r\n    }\r\n    const converterIds = converters.map((converter) => {\r\n      return importContainer.addCustomType(converter.package, converter.converterId);\r\n    });\r\n\r\n    if (converterIds.length === 1) {\r\n      return converterIds[0];\r\n    } else {\r\n      const createChain = importContainer.addCustomType(\"@odata2ts/converter-runtime\", \"createChain\");\r\n\r\n      const [first, second, ...moreConverters] = converterIds;\r\n      return moreConverters.reduce((stmt, convId) => `${stmt}.chain(${convId})`, `${createChain}(${first}, ${second})`);\r\n    }\r\n  }\r\n\r\n  private generateIdFunction(file: FileHandler, model: EntityType) {\r\n    const importContainer = file.getImports();\r\n    const qFunc = importContainer.addQObject(QueryObjectImports.QId);\r\n    const idModelName = importContainer.addGeneratedModel(model.fqName, model.id.modelName);\r\n\r\n    file.getFile().addClass({\r\n      name: model.id.qName,\r\n      isExported: true,\r\n      extends: `${qFunc}<${idModelName}>`,\r\n      properties: [\r\n        {\r\n          name: \"params\",\r\n          scope: Scope.Private,\r\n          isReadonly: true,\r\n          initializer: this.getParamInitString(importContainer, model.keys),\r\n        },\r\n      ],\r\n      methods: [\r\n        {\r\n          name: \"getParams\",\r\n          statements: [\"return this.params\"],\r\n        },\r\n      ],\r\n    });\r\n  }\r\n\r\n  private getParamInitString(importContainer: ImportContainer, props: Array<PropertyModel>) {\r\n    return `[${props\r\n      .map((prop) => {\r\n        let complexQParam = \"\";\r\n        if (prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType) {\r\n          const importedQObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject!);\r\n          complexQParam = `, new ${importedQObject}()`;\r\n        }\r\n\r\n        const qParam = importContainer.addFromQObject(prop.qParam!);\r\n        const isMappedNameNecessary = prop.odataName !== prop.name;\r\n        const mappedName = isMappedNameNecessary ? `\"${prop.name}\"` : prop.converters?.length ? \"undefined\" : undefined;\r\n        const converterStmt = this.generateConverterStmt(importContainer, prop.converters);\r\n        const mappedNameParam = mappedName ? `, ${mappedName}` : \"\";\r\n        const converterParam = converterStmt ? `, ${converterStmt}` : \"\";\r\n        return `new ${qParam}(\"${prop.odataName}\"${complexQParam}${mappedNameParam}${converterParam})`;\r\n      })\r\n      .join(\",\")}]`;\r\n  }\r\n\r\n  private async generateUnboundOperations() {\r\n    const unboundOps = this.dataModel.getUnboundOperationTypes();\r\n    const reservedNames = unboundOps.map((op) => op.qName);\r\n    const file = this.project.createOrGetMainQObjectFile(reservedNames);\r\n\r\n    unboundOps.forEach((operation) => {\r\n      this.generateOperation(file, operation, \"\");\r\n    });\r\n  }\r\n\r\n  private generateOperation(file: FileHandler, operation: OperationType, baseFqName: string) {\r\n    const imports = file.getImports();\r\n    const isV2 = this.version === ODataVersions.V2;\r\n    const returnType = operation.returnType;\r\n    const hasParams = operation.parameters.length > 0;\r\n\r\n    // imports\r\n    const qOp = operation.type === OperationTypes.Action ? QueryObjectImports.QAction : QueryObjectImports.QFunction;\r\n    const qOperation = imports.addQObject(qOp);\r\n    const paramModelName = operation.parameters.length\r\n      ? imports.addGeneratedModel(baseFqName, operation.paramsModelName)\r\n      : undefined;\r\n\r\n    let returnTypeOpStmt: string = \"\";\r\n    if (returnType) {\r\n      const collectionSuffix = returnType.isCollection ? \"_COLLECTION\" : \"\";\r\n      if (returnType.dataType === DataTypes.ComplexType || returnType.dataType === DataTypes.ModelType) {\r\n        if (returnType.qObject) {\r\n          const [opRt, rts, qComplexParam] = imports.addQObject(\r\n            QueryObjectImports.OperationReturnType,\r\n            QueryObjectImports.ReturnTypes,\r\n            QueryObjectImports.QComplexParam\r\n          );\r\n          const returnQName = imports.addGeneratedQObject(returnType.fqType, returnType.qObject);\r\n\r\n          returnTypeOpStmt = `new ${opRt}(${rts}.COMPLEX${collectionSuffix}, new ${qComplexParam}(\"NONE\", new ${returnQName}))`;\r\n        }\r\n      }\r\n      // currently, it only makes sense to add the OperationReturnType if a converter is present\r\n      else if (returnType.converters && returnType.qParam) {\r\n        const [rtClass, rtTypes] = imports.addQObject(\r\n          QueryObjectImports.OperationReturnType,\r\n          QueryObjectImports.ReturnTypes\r\n        );\r\n        const [qParam] = imports.addFromQObject(returnType.qParam);\r\n\r\n        // TODO: some constants with string concat\r\n        const rtKind = `${rtTypes}.VALUE${collectionSuffix}`;\r\n\r\n        const converterParam = returnType.converters\r\n          ? \", \" + this.generateConverterStmt(imports, returnType.converters)\r\n          : \"\";\r\n        returnTypeOpStmt = `new ${rtClass}(${rtKind}, new ${qParam}(\"NONE\", undefined${converterParam}))`;\r\n      }\r\n    }\r\n\r\n    file.getFile().addClass({\r\n      name: operation.qName,\r\n      isExported: true,\r\n      extends: qOperation + (hasParams ? `<${paramModelName}>` : \"\"),\r\n      properties: [\r\n        {\r\n          name: \"params\",\r\n          scope: Scope.Private,\r\n          isReadonly: true,\r\n          type: operation.parameters?.length ? undefined : \"[]\",\r\n          initializer: this.getParamInitString(imports, operation.parameters),\r\n        },\r\n      ],\r\n      ctors: [\r\n        {\r\n          statements: [\r\n            `super(\"${operation.odataName}\"${returnTypeOpStmt ? \", \" + returnTypeOpStmt : isV2 ? \", undefined\" : \"\"}${\r\n              isV2 ? \", { v2Mode: true }\" : \"\"\r\n            })`,\r\n          ],\r\n        },\r\n      ],\r\n      methods: [\r\n        {\r\n          name: \"getParams\",\r\n          statements: [\"return this.params\"],\r\n        },\r\n        // functions without params: add an overriding buildUrl() to not force users to have to pass undefined as param\r\n        ...(operation.type === OperationTypes.Function && !hasParams\r\n          ? [\r\n              {\r\n                name: \"buildUrl\",\r\n                statements: [\"return super.buildUrl(undefined)\"],\r\n              },\r\n            ]\r\n          : []),\r\n      ],\r\n    });\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"QueryObjectGenerator.js","sourceRoot":"","sources":["../../src/generator/QueryObjectGenerator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\nimport { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { OptionalKind, PropertyDeclarationStructure, Scope, VariableDeclarationKind } from \"ts-morph\";\r\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport {\r\n  ComplexType,\r\n  DataTypes,\r\n  EntityType,\r\n  OperationType,\r\n  OperationTypes,\r\n  PropertyModel,\r\n} from \"../data-model/DataTypeModel\";\r\nimport { NamingHelper } from \"../data-model/NamingHelper\";\r\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel\";\r\nimport { Modes } from \"../OptionModel\";\r\nimport { FileHandler } from \"../project/FileHandler\";\r\nimport { ProjectManager } from \"../project/ProjectManager\";\r\nimport { QueryObjectImports } from \"./import/ImportObjects\";\r\nimport { ImportContainer } from \"./ImportContainer\";\r\n\r\nexport const generateQueryObjects: EntityBasedGeneratorFunction = (\r\n  project,\r\n  dataModel,\r\n  version,\r\n  options,\r\n  namingHelper\r\n) => {\r\n  const generator = new QueryObjectGenerator(project, dataModel, version, options, namingHelper);\r\n  return generator.generate();\r\n};\r\n\r\nclass QueryObjectGenerator {\r\n  constructor(\r\n    private project: ProjectManager,\r\n    private dataModel: DataModel,\r\n    private version: ODataVersions,\r\n    private options: GeneratorFunctionOptions,\r\n    private namingHelper: NamingHelper\r\n  ) {}\r\n\r\n  public async generate(): Promise<void> {\r\n    this.project.initQObjects();\r\n\r\n    // process EntityType & ComplexType\r\n    const promises: Array<Promise<void>> = [...this.generateEntityTypes(), ...this.generateComplexTypes()];\r\n    if (!this.options.skipOperations) {\r\n      // process unbound operations\r\n      promises.push(this.generateUnboundOperations());\r\n    }\r\n\r\n    await Promise.all(promises);\r\n\r\n    return this.project.finalizeQObjects();\r\n  }\r\n\r\n  private generateEntityTypes() {\r\n    return this.dataModel.getEntityTypes().map((model) => {\r\n      const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [\r\n        model.qName,\r\n        firstCharLowerCase(model.qName),\r\n        model.id.qName,\r\n      ]);\r\n\r\n      // q object\r\n      this.generateModel(file, model);\r\n\r\n      // qId function\r\n      if (!this.options.skipIdModels && model.generateId) {\r\n        this.generateIdFunction(file, model);\r\n      }\r\n\r\n      // bound q operations\r\n      if (!this.options.skipOperations) {\r\n        [\r\n          ...this.dataModel.getEntityTypeOperations(model.fqName),\r\n          ...this.dataModel.getEntitySetOperations(model.fqName),\r\n        ].forEach((operation) => {\r\n          this.generateOperation(file, operation, model.fqName);\r\n        });\r\n      }\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateComplexTypes() {\r\n    return this.dataModel.getComplexTypes().map((model) => {\r\n      const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [\r\n        model.qName,\r\n        firstCharLowerCase(model.qName),\r\n      ]);\r\n\r\n      this.generateModel(file, model);\r\n\r\n      return this.project.finalizeFile(file);\r\n    });\r\n  }\r\n\r\n  private generateModel(file: FileHandler, model: ComplexType) {\r\n    const imports = file.getImports();\r\n\r\n    let extendsClause: string;\r\n    if (model.baseClasses.length) {\r\n      const baseClass = model.baseClasses[0];\r\n      const baseModel = this.dataModel.getModel(baseClass) as ComplexType;\r\n      if (!baseModel) {\r\n        throw new Error(`Entity or complex type \"${baseClass}\" from baseClass attribute not found!`);\r\n      }\r\n      extendsClause = imports.addGeneratedQObject(baseClass, baseModel.qName);\r\n    } else {\r\n      extendsClause = imports.addQObject(QueryObjectImports.QueryObject);\r\n    }\r\n\r\n    file.getFile().addClass({\r\n      name: model.qName,\r\n      isExported: true,\r\n      extends: extendsClause,\r\n      // isAbstract: model.abstract,\r\n      properties: this.generateQueryObjectProps(file.getImports(), model.props),\r\n    });\r\n\r\n    file.getFile().addVariableStatement({\r\n      declarationKind: VariableDeclarationKind.Const,\r\n      isExported: true,\r\n      declarations: [\r\n        {\r\n          name: firstCharLowerCase(model.qName),\r\n          initializer: `new ${model.qName}()`,\r\n        },\r\n      ],\r\n    });\r\n  }\r\n\r\n  private generateQueryObjectProps(\r\n    importContainer: ImportContainer,\r\n    props: Array<PropertyModel>\r\n  ): Array<OptionalKind<PropertyDeclarationStructure>> {\r\n    return props.map((prop) => {\r\n      const { odataName } = prop;\r\n      const name = this.namingHelper.getQPropName(prop.name);\r\n      const isModelType = prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\r\n      let qPathInit: string;\r\n\r\n      // factor in collections\r\n      if (prop.isCollection) {\r\n        const qPath = importContainer.addQObject(\r\n          isModelType ? QueryObjectImports.QEntityCollectionPath : QueryObjectImports.QCollectionPath\r\n        );\r\n        const qObject = isModelType\r\n          ? importContainer.addGeneratedQObject(prop.fqType, prop.qObject!)\r\n          : importContainer.addQObject(prop.qObject!);\r\n\r\n        qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\r\n      } else {\r\n        // add import for data type\r\n        const qPath = importContainer.addQObject(prop.qPath);\r\n        if (isModelType) {\r\n          const qObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject!);\r\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\r\n        } else {\r\n          let converterStmt = this.generateConverterStmt(importContainer, prop.converters);\r\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\")${converterStmt ? `, ${converterStmt}` : \"\"})`;\r\n        }\r\n      }\r\n\r\n      return {\r\n        name,\r\n        scope: Scope.Public,\r\n        isReadonly: true,\r\n        initializer: qPathInit,\r\n      } as OptionalKind<PropertyDeclarationStructure>;\r\n    });\r\n  }\r\n\r\n  private generateConverterStmt(importContainer: ImportContainer, converters: Array<ValueConverterImport> | undefined) {\r\n    if (!converters?.length) {\r\n      return undefined;\r\n    }\r\n    const converterIds = converters.map((converter) => {\r\n      return importContainer.addCustomType(converter.package, converter.converterId);\r\n    });\r\n\r\n    if (converterIds.length === 1) {\r\n      return converterIds[0];\r\n    } else {\r\n      const createChain = importContainer.addCustomType(\"@odata2ts/converter-runtime\", \"createChain\");\r\n\r\n      const [first, second, ...moreConverters] = converterIds;\r\n      return moreConverters.reduce((stmt, convId) => `${stmt}.chain(${convId})`, `${createChain}(${first}, ${second})`);\r\n    }\r\n  }\r\n\r\n  private generateIdFunction(file: FileHandler, model: EntityType) {\r\n    const importContainer = file.getImports();\r\n    const qFunc = importContainer.addQObject(QueryObjectImports.QId);\r\n    const idModelName = importContainer.addGeneratedModel(model.fqName, model.id.modelName);\r\n\r\n    file.getFile().addClass({\r\n      name: model.id.qName,\r\n      isExported: true,\r\n      extends: `${qFunc}<${idModelName}>`,\r\n      properties: [\r\n        {\r\n          name: \"params\",\r\n          scope: Scope.Private,\r\n          isReadonly: true,\r\n          initializer: this.getParamInitString(importContainer, model.keys),\r\n        },\r\n      ],\r\n      methods: [\r\n        {\r\n          name: \"getParams\",\r\n          statements: [\"return this.params\"],\r\n        },\r\n      ],\r\n    });\r\n  }\r\n\r\n  private getParamInitString(\r\n    importContainer: ImportContainer,\r\n    props: Array<PropertyModel>,\r\n    overloads?: Array<Array<PropertyModel>>\r\n  ) {\r\n    const allParams = [props, ...(overloads ?? [])].map((paramSet) => {\r\n      const pString = paramSet\r\n        .map((prop) => {\r\n          let complexQParam = \"\";\r\n          if (prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType) {\r\n            const importedQObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject!);\r\n            complexQParam = `, new ${importedQObject}()`;\r\n          }\r\n\r\n          const qParam = importContainer.addQObject(prop.qParam!);\r\n          const isMappedNameNecessary = prop.odataName !== prop.name;\r\n          const mappedName = isMappedNameNecessary\r\n            ? `\"${prop.name}\"`\r\n            : prop.converters?.length\r\n            ? \"undefined\"\r\n            : undefined;\r\n          const converterStmt = this.generateConverterStmt(importContainer, prop.converters);\r\n          const mappedNameParam = mappedName ? `, ${mappedName}` : \"\";\r\n          const converterParam = converterStmt ? `, ${converterStmt}` : \"\";\r\n          return `new ${qParam}(\"${prop.odataName}\"${complexQParam}${mappedNameParam}${converterParam})`;\r\n        })\r\n        .join(\",\");\r\n      return `[${pString}]`;\r\n    });\r\n\r\n    return allParams.length === 1 ? allParams[0] : `[${allParams.join(\",\")}]`;\r\n  }\r\n\r\n  private async generateUnboundOperations() {\r\n    const unboundOps = this.dataModel.getUnboundOperationTypes();\r\n    const reservedNames = unboundOps.map((op) => op.qName);\r\n    const file = this.project.createOrGetMainQObjectFile(reservedNames);\r\n\r\n    unboundOps.forEach((operation) => {\r\n      this.generateOperation(file, operation, \"\");\r\n    });\r\n  }\r\n\r\n  private generateOperation(file: FileHandler, operation: OperationType, baseFqName: string) {\r\n    const imports = file.getImports();\r\n    const isV2 = this.version === ODataVersions.V2;\r\n    const returnType = operation.returnType;\r\n    const hasParams = operation.parameters.length > 0 || operation.overrides?.length;\r\n    const isParamsOptional = !![operation.parameters, ...(operation.overrides ?? [])].find((pSet) => pSet.length === 0);\r\n\r\n    // imports\r\n    const qOp = operation.type === OperationTypes.Action ? QueryObjectImports.QAction : QueryObjectImports.QFunction;\r\n    const qOperation = imports.addQObject(qOp);\r\n    const paramModelName = hasParams ? imports.addGeneratedModel(baseFqName, operation.paramsModelName) : undefined;\r\n\r\n    let returnTypeOpStmt: string = \"\";\r\n    if (returnType) {\r\n      const collectionSuffix = returnType.isCollection ? \"_COLLECTION\" : \"\";\r\n      if (returnType.dataType === DataTypes.ComplexType || returnType.dataType === DataTypes.ModelType) {\r\n        if (returnType.qObject) {\r\n          const opRt = imports.addQObject(QueryObjectImports.OperationReturnType);\r\n          const rts = imports.addQObject(QueryObjectImports.ReturnTypes);\r\n          const qComplexParam = imports.addQObject(QueryObjectImports.QComplexParam);\r\n          const returnQName = imports.addGeneratedQObject(returnType.fqType, returnType.qObject);\r\n\r\n          returnTypeOpStmt = `new ${opRt}(${rts}.COMPLEX${collectionSuffix}, new ${qComplexParam}(\"NONE\", new ${returnQName}))`;\r\n        }\r\n      }\r\n      // currently, it only makes sense to add the OperationReturnType if a converter is present\r\n      else if (returnType.converters && returnType.qParam) {\r\n        const rtClass = imports.addQObject(QueryObjectImports.OperationReturnType);\r\n        const rtTypes = imports.addQObject(QueryObjectImports.ReturnTypes);\r\n        const qParam = imports.addQObject(returnType.qParam);\r\n\r\n        // TODO: some constants with string concat\r\n        const rtKind = `${rtTypes}.VALUE${collectionSuffix}`;\r\n\r\n        const converterParam = returnType.converters\r\n          ? \", \" + this.generateConverterStmt(imports, returnType.converters)\r\n          : \"\";\r\n        returnTypeOpStmt = `new ${rtClass}(${rtKind}, new ${qParam}(\"NONE\", undefined${converterParam}))`;\r\n      }\r\n    }\r\n\r\n    file.getFile().addClass({\r\n      name: operation.qName,\r\n      isExported: true,\r\n      extends: qOperation + (hasParams ? `<${paramModelName}>` : \"\"),\r\n      properties: [\r\n        {\r\n          name: \"params\",\r\n          scope: Scope.Private,\r\n          isReadonly: true,\r\n          type: hasParams ? undefined : \"[]\",\r\n          initializer: this.getParamInitString(imports, operation.parameters, operation.overrides),\r\n        },\r\n      ],\r\n      ctors: [\r\n        {\r\n          statements: [\r\n            `super(\"${operation.odataName}\"${returnTypeOpStmt ? \", \" + returnTypeOpStmt : isV2 ? \", undefined\" : \"\"}${\r\n              isV2 ? \", { v2Mode: true }\" : \"\"\r\n            })`,\r\n          ],\r\n        },\r\n      ],\r\n      methods: [\r\n        {\r\n          name: \"getParams\",\r\n          statements: [\"return this.params\"],\r\n        },\r\n        // functions without params: add an overriding buildUrl() to not force users to have to pass undefined as param\r\n        ...(operation.type === OperationTypes.Function && !hasParams\r\n          ? [\r\n              {\r\n                name: \"buildUrl\",\r\n                statements: [\"return super.buildUrl(undefined)\"],\r\n              },\r\n            ]\r\n          : []),\r\n      ],\r\n    });\r\n  }\r\n}\r\n"]}

package/lib/generator/ServiceGenerator.js

@@ -7,6 +7,7 @@ const deepmerge_1 = tslib_1.__importDefault(require("deepmerge"));
 const ts_morph_1 = require("ts-morph");
 const upper_case_first_1 = require("upper-case-first");
 const processors_1 = require("xml2js/lib/processors");
+const OptionModel_1 = require("../OptionModel");
 const ImportObjects_1 = require("./import/ImportObjects");
 function generateServices(project, dataModel, version, namingHelper, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -52,8 +53,8 @@ class ServiceGenerator {
             const importContainer = mainServiceFile.getImports();
             const container = this.dataModel.getEntityContainer();
             const unboundOperations = [...Object.values(container.functions), ...Object.values(container.actions)];
-            const [httpClient] = importContainer.addClientApi(ImportObjects_1.ClientApiImports.ODataHttpClient);
-            const [rootService] = importContainer.addServiceObject(this.version, ImportObjects_1.ServiceImports.ODataService);
+            const httpClient = importContainer.addClientApi(ImportObjects_1.ClientApiImports.ODataHttpClient);
+            const rootService = importContainer.addServiceObject(this.version, ImportObjects_1.ServiceImports.ODataService);
             const { properties, methods } = (0, deepmerge_1.default)(this.generateMainServiceProperties(container, importContainer), this.generateMainServiceOperations(unboundOperations, importContainer));
             mainServiceFile.getFile().addClass({
                 isExported: true,
@@ -169,12 +170,12 @@ class ServiceGenerator {
         const importContainer = file.getImports();
         const operations = this.dataModel.getEntityTypeOperations(model.fqName);
         const props = [...model.baseProps, ...model.props];
-        const [entityServiceType] = importContainer.addServiceObject(this.version, ImportObjects_1.ServiceImports.EntityTypeService);
-        const [httpClient] = importContainer.addClientApi(ImportObjects_1.ClientApiImports.ODataHttpClient);
+        const entityServiceType = importContainer.addServiceObject(this.version, ImportObjects_1.ServiceImports.EntityTypeService);
+        const httpClient = importContainer.addClientApi(ImportObjects_1.ClientApiImports.ODataHttpClient);
         // note: predictable first imports => no need to take renaming into account
         const modelName = importContainer.addGeneratedModel(model.fqName, model.modelName);
         const editableModelName = importContainer.addGeneratedModel(model.fqName, model.editableName);
-        const qName = importContainer.addGeneratedQObject(model.fqName, model.qName);
+        const qName = importContainer.addGeneratedQObject(model.fqName, model.qName, true);
         const qObjectName = importContainer.addGeneratedQObject(model.fqName, (0, processors_1.firstCharLowerCase)(model.qName));
         const { properties, methods } = (0, deepmerge_1.default)(this.generateServiceProperties(importContainer, model.serviceName, props), this.generateServiceOperations(importContainer, model, operations));
         // generate EntityTypeService
@@ -242,8 +243,8 @@ class ServiceGenerator {
         if (prop.isCollection) {
             const modelName = imports.addGeneratedModel(propModel.fqName, propModel.modelName);
             const editableModelName = imports.addGeneratedModel(propModel.fqName, propModel.editableName);
-            const qModelName = imports.addGeneratedQObject(propModel.fqName, propModel.qName);
-            const [collectionServiceType] = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.CollectionService);
+            const qModelName = imports.addGeneratedQObject(propModel.fqName, propModel.qName, true);
+            const collectionServiceType = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.CollectionService);
             propModelType = `${collectionServiceType}<ClientType, ${modelName}, ${qModelName}, ${editableModelName}>`;
         }
         else {
@@ -261,19 +262,20 @@ class ServiceGenerator {
         if (!prop.qObject) {
             throw new Error("Illegal State: [qObject] must be provided for Collection types!");
         }
-        const [collectionServiceType] = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.CollectionService);
+        const collectionServiceType = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.CollectionService);
         const isEnum = prop.dataType === "EnumType" /* DataTypes.EnumType */;
         let qType;
         let type;
         if (!isEnum) {
-            // TODO move string concat (StringCollection, GuidCollection...) to better place
-            [type, qType] = imports.addFromQObject(`${(0, upper_case_first_1.upperCaseFirst)(prop.type)}Collection`, prop.qObject);
+            // TODO refactor string concat
+            type = imports.addQObjectType(`${(0, upper_case_first_1.upperCaseFirst)(prop.type)}Collection`);
+            qType = imports.addQObjectType(prop.qObject);
         }
         else {
             const propEnum = this.dataModel.getModel(prop.fqType);
             const propTypeModel = imports.addGeneratedModel(propEnum.fqName, propEnum.modelName);
-            [type, qType] = imports.addQObject(ImportObjects_1.QueryObjectImports.EnumCollection, ImportObjects_1.QueryObjectImports.QEnumCollection);
-            type = `${type}<${propTypeModel}>`;
+            type = `${imports.addQObjectType(ImportObjects_1.QueryObjectImports.EnumCollection)}<${propTypeModel}>`;
+            qType = imports.addQObjectType(ImportObjects_1.QueryObjectImports.QEnumCollection);
         }
         const collectionType = `${collectionServiceType}<ClientType, ${type}, ${qType}>`;
         return {
@@ -284,8 +286,8 @@ class ServiceGenerator {
         };
     }
     generatePrimitiveTypeProp(imports, prop) {
-        const [serviceType] = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.PrimitiveTypeService);
-        const type = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type) : prop.type;
+        const serviceType = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.PrimitiveTypeService);
+        const type = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type, true) : prop.type;
         return {
             scope: ts_morph_1.Scope.Private,
             name: this.namingHelper.getPrivatePropName(prop.name),
@@ -297,12 +299,12 @@ class ServiceGenerator {
         const model = this.dataModel.getModel(prop.fqType);
         const isComplexCollection = prop.isCollection && model.dataType === "ComplexType" /* DataTypes.ComplexType */;
         const type = isComplexCollection
-            ? imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.CollectionService)[0]
+            ? imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.CollectionService)
             : prop.isCollection
                 ? model.serviceCollectionName
                 : model.serviceName;
         const typeWithGenerics = isComplexCollection
-            ? `${type}<ClientType, ${imports.addGeneratedModel(model.fqName, model.modelName)}, ${imports.addGeneratedQObject(model.fqName, model.qName)}, ${imports.addGeneratedModel(model.fqName, model.editableName)}>`
+            ? `${type}<ClientType, ${imports.addGeneratedModel(model.fqName, model.modelName)}, ${imports.addGeneratedQObject(model.fqName, model.qName, true)}, ${imports.addGeneratedModel(model.fqName, model.editableName)}>`
             : `${type}<ClientType>`;
         const privateSrvProp = "this." + this.namingHelper.getPrivatePropName(prop.name);
         return {
@@ -313,16 +315,16 @@ class ServiceGenerator {
                 `if(!${privateSrvProp}) {`,
                 `  const { client, path } = this.__base;`,
                 // prettier-ignore
-                `  ${privateSrvProp} = new ${type}(client, path, "${prop.odataName}"${isComplexCollection ? `, ${imports.addGeneratedQObject(model.fqName, (0, processors_1.firstCharLowerCase)(model.qName))}` : ""})`,
+                `  ${privateSrvProp} = new ${type}(client, path, "${prop.odataName}"${isComplexCollection ? `, ${imports.addGeneratedQObject(model.fqName, (0, processors_1.firstCharLowerCase)(model.qName), true)}` : ""})`,
                 "}",
                 `return ${privateSrvProp}`,
             ],
         };
     }
     generatePrimitiveCollectionGetter(imports, prop) {
-        const [collectionServiceType] = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.CollectionService);
+        const collectionServiceType = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.CollectionService);
         const instanceName = (0, processors_1.firstCharLowerCase)(prop.qObject);
-        const [qInstanceName] = imports.addFromQObject(instanceName);
+        const qInstanceName = imports.addQObject(instanceName);
         const propName = "this." + this.namingHelper.getPrivatePropName(prop.name);
         return {
             scope: ts_morph_1.Scope.Public,
@@ -338,7 +340,7 @@ class ServiceGenerator {
         };
     }
     generatePrimitiveTypeGetter(imports, prop) {
-        const [serviceType] = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.PrimitiveTypeService);
+        const serviceType = imports.addServiceObject(this.version, ImportObjects_1.ServiceImports.PrimitiveTypeService);
         const propName = "this." + this.namingHelper.getPrivatePropName(prop.name);
         // for V2: mapped name must be specified
         const useMappedName = this.version === odata_core_1.ODataVersions.V2 && prop.name !== prop.odataName;
@@ -361,7 +363,7 @@ class ServiceGenerator {
         const importContainer = file.getImports();
         const editableModelName = model.editableName;
         const qObjectName = (0, processors_1.firstCharLowerCase)(model.qName);
-        const [entitySetServiceType] = importContainer.addServiceObject(this.version, ImportObjects_1.ServiceImports.EntitySetService);
+        const entitySetServiceType = importContainer.addServiceObject(this.version, ImportObjects_1.ServiceImports.EntitySetService);
         const paramsModelName = importContainer.addGeneratedModel(model.id.fqName, model.id.modelName);
         const qIdFunctionName = importContainer.addGeneratedQObject(model.id.fqName, model.id.qName);
         const collectionOperations = this.dataModel.getEntitySetOperations(model.fqName);
@@ -390,7 +392,10 @@ class ServiceGenerator {
     }
     generateEntityTypeServices() {
         // build service file for each entity, consisting of EntityTypeService & EntityCollectionService
-        return this.dataModel.getEntityTypes().map((model) => {
+        return this.dataModel
+            .getEntityTypes()
+            .filter((model) => model.genMode === OptionModel_1.Modes.service || model.genMode === OptionModel_1.Modes.all)
+            .map((model) => {
             const file = this.project.createOrGetServiceFile(model.folderPath, model.serviceName, [
                 model.serviceName,
                 model.serviceCollectionName,
@@ -406,7 +411,10 @@ class ServiceGenerator {
     }
     generateComplexTypeServices() {
         // build service file for complex types
-        return this.dataModel.getComplexTypes().map((model) => {
+        return this.dataModel
+            .getComplexTypes()
+            .filter((model) => model.genMode === OptionModel_1.Modes.service || model.genMode === OptionModel_1.Modes.all)
+            .map((model) => {
             const file = this.project.createOrGetServiceFile(model.folderPath, model.serviceName, [model.serviceName]);
             // entity type service
             this.generateEntityTypeService(file, model);
@@ -414,11 +422,14 @@ class ServiceGenerator {
         });
     }
     generateMethod(name, operation, importContainer, baseFqName) {
+        var _a, _b;
         const isFunc = operation.type === "Function" /* OperationTypes.Function */;
         const returnType = operation.returnType;
-        const hasParams = operation.parameters.length > 0;
+        const hasParams = operation.parameters.length > 0 || ((_a = operation.overrides) === null || _a === void 0 ? void 0 : _a.length);
+        const isParamsOptional = !![operation.parameters, ...((_b = operation.overrides) !== null && _b !== void 0 ? _b : [])].find((pSet) => pSet.length === 0);
         // importing dependencies
-        const [httpClientConfigModel, odataResponse] = importContainer.addClientApi(ImportObjects_1.ClientApiImports.ODataHttpClientConfig, ImportObjects_1.ClientApiImports.HttpResponseModel);
+        const httpClientConfigModel = importContainer.addClientApi(ImportObjects_1.ClientApiImports.ODataHttpClientConfig);
+        const odataResponse = importContainer.addClientApi(ImportObjects_1.ClientApiImports.HttpResponseModel);
         const responseStructure = this.importReturnType(importContainer, returnType);
         const qOperationName = importContainer.addGeneratedQObject(baseFqName, operation.qName);
         const rtType = (returnType === null || returnType === void 0 ? void 0 : returnType.type) && returnType.dataType !== "PrimitiveType" /* DataTypes.PrimitiveType */
@@ -437,7 +448,9 @@ class ServiceGenerator {
             scope: ts_morph_1.Scope.Public,
             isAsync: true,
             name,
-            parameters: hasParams ? [{ name: "params", type: paramsModelName }, requestConfigParam] : [requestConfigParam],
+            parameters: hasParams
+                ? [{ name: "params", type: paramsModelName, hasQuestionToken: isParamsOptional }, requestConfigParam]
+                : [requestConfigParam],
             returnType: `Promise<${odataResponse}<${responseStructure}<${rtType || "void"}>>>`,
             statements: [
                 `if(!${qOpProp}) {`,
@@ -463,7 +476,7 @@ class ServiceGenerator {
             : (returnType === null || returnType === void 0 ? void 0 : returnType.dataType) === "PrimitiveType" /* DataTypes.PrimitiveType */
                 ? ImportObjects_1.CoreImports.ODataValueResponse
                 : ImportObjects_1.CoreImports.ODataModelResponse;
-        return imports.addCoreLib(this.version, typeToImport)[0];
+        return imports.addCoreLib(this.version, typeToImport);
     }
 }
 //# sourceMappingURL=ServiceGenerator.js.map