@odata2ts/odata2ts 0.33.1 → 0.34.0

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\";\nimport { JSDocStructure, OptionalKind, SourceFile, StructureKind } from \"ts-morph\";\n\nimport { DataModel } from \"../data-model/DataModel\";\nimport { ComplexType, DataTypes, ModelType, OperationType, PropertyModel } from \"../data-model/DataTypeModel\";\nimport { NamingHelper } from \"../data-model/NamingHelper\";\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel\";\nimport { ImportContainer } from \"./ImportContainer\";\n\nexport const generateModels: EntityBasedGeneratorFunction = (dataModel, sourceFile, version, options, namingHelper) => {\n  const generator = new ModelGenerator(dataModel, sourceFile, version, options, namingHelper);\n  return generator.generate();\n};\n\nconst DEFERRED_CONTENT = \"DeferredContent\";\n\nclass ModelGenerator {\n  private importContainer!: ImportContainer;\n\n  constructor(\n    private dataModel: DataModel,\n    private sourceFile: SourceFile,\n    private version: ODataVersions,\n    private options: GeneratorFunctionOptions,\n    private namingHelper: NamingHelper\n  ) {}\n\n  public generate(): void {\n    this.importContainer = new ImportContainer(this.namingHelper.getFileNames());\n\n    this.generateEnums();\n    this.generateModels();\n    if (!this.options.skipOperations) {\n      this.generateUnboundOperationParams();\n    }\n  }\n\n  private generateEnums() {\n    this.dataModel.getEnums().forEach((et) => {\n      this.sourceFile.addEnum({\n        name: et.name,\n        isExported: true,\n        members: et.members.map((mem) => ({ name: mem, initializer: `\"${mem}\"` })),\n      });\n    });\n  }\n\n  private generateModels() {\n    this.dataModel.getEntityTypes().forEach((model) => {\n      this.generateModel(model);\n      if (!this.options.skipIdModels && model.generateId) {\n        this.generateIdModel(model);\n      }\n      if (!this.options.skipEditableModels && !model.abstract) {\n        this.generateEditableModel(model);\n      }\n      if (!this.options.skipOperations) {\n        this.generateBoundOperationParams(model.fqName);\n      }\n    });\n    this.dataModel.getComplexTypes().forEach((model) => {\n      this.generateModel(model);\n      if (!this.options.skipEditableModels && !model.abstract) {\n        this.generateEditableModel(model);\n      }\n    });\n\n    this.sourceFile.addImportDeclarations(this.importContainer.getImportDeclarations());\n  }\n\n  private generateModel(model: ComplexType | ModelType) {\n    this.sourceFile.addInterface({\n      name: model.name,\n      isExported: true,\n      properties: model.props.map((p) => {\n        const isEntity = p.dataType == DataTypes.ModelType;\n        return {\n          name: p.name,\n          type: this.getPropType(p),\n          // props for entities or entity collections are not added in V4 if not explicitly expanded\n          hasQuestionToken: this.dataModel.isV4() && isEntity,\n          docs: this.options.skipComments ? undefined : [this.generatePropDoc(p, model)],\n        };\n      }),\n      extends: model.finalBaseClass ? [this.namingHelper.getModelName(model.finalBaseClass)] : undefined,\n    });\n  }\n\n  private generatePropDoc(prop: PropertyModel, model: ComplexType | ModelType): OptionalKind<JSDocStructure> {\n    const isKeyProp = (model as ModelType).keyNames?.includes(prop.odataName);\n    const baseAttribs: Array<string> = [];\n    if (isKeyProp) {\n      baseAttribs.push(\"**Key Property**: This is a key property used to identify the entity.\");\n    }\n    if (prop.managed) {\n      baseAttribs.push(\"**Managed**: This property is managed on the server side and cannot be edited.\");\n    }\n    if (prop.converters?.length) {\n      baseAttribs.push(`**Applied Converters**: ${prop.converters.map((c) => c.converterId).join(\",\")}.`);\n    }\n\n    const attributeTable: Array<[string, string]> = [\n      [\"Name\", prop.odataName],\n      [\"Type\", prop.odataType],\n    ];\n    if (prop.required) {\n      attributeTable.push([\"Nullable\", \"false\"]);\n    }\n\n    const description =\n      (baseAttribs ? baseAttribs.join(\"<br/>\") + \"\\n\\n\" : \"\") +\n      \"OData Attributes:\\n\" +\n      \"|Attribute Name | Attribute Value |\\n| --- | ---|\\n\" +\n      attributeTable.map((row) => `| ${row[0]} | \\`${row[1]}\\` |`).join(\"\\n\");\n\n    return { kind: StructureKind.JSDoc, description };\n  }\n\n  private getPropType(prop: PropertyModel): string {\n    const isEntity = prop.dataType == DataTypes.ModelType;\n\n    // V2 entity special: deferred content\n    let suffix = \"\";\n    if (isEntity && this.dataModel.isV2()) {\n      this.importContainer.addFromCore(DEFERRED_CONTENT);\n      suffix = ` | ${DEFERRED_CONTENT}`;\n    }\n    // custom types which require type imports => possible via converters\n    else if (prop.typeModule) {\n      this.importContainer.addCustomType(prop.typeModule, prop.type);\n    }\n\n    // Collections\n    if (prop.isCollection) {\n      const type = `Array<${prop.type}>`;\n      if (this.dataModel.isV2() && this.options.v2ModelsWithExtraResultsWrapping) {\n        return `{ results: ${type} }` + suffix;\n      } else {\n        return type + suffix;\n      }\n    }\n\n    // primitive, enum & complex types\n    return prop.type + (prop.required ? \"\" : \" | null\") + suffix;\n  }\n\n  private generateIdModel(model: ModelType) {\n    const singleType = model.keys.length === 1 ? `${model.keys[0].type} | ` : \"\";\n    const keyTypes = model.keys.map((keyProp) => `${keyProp.name}: ${this.getPropType(keyProp)}`).join(\",\");\n    const type = `${singleType}{${keyTypes}}`;\n\n    this.sourceFile.addTypeAlias({\n      name: model.idModelName,\n      isExported: true,\n      type,\n    });\n  }\n\n  private generateEditableModel(model: ComplexType) {\n    const entityTypes = [DataTypes.ModelType, DataTypes.ComplexType];\n    const allProps = [...model.baseProps, ...model.props].filter((p) => !p.managed);\n\n    const requiredProps = allProps\n      .filter((p) => p.required && !entityTypes.includes(p.dataType))\n      .map((p) => `\"${p.name}\"`)\n      .join(\" | \");\n    const optionalProps = allProps\n      .filter((p) => !p.required && !entityTypes.includes(p.dataType))\n      .map((p) => `\"${p.name}\"`)\n      .join(\" | \");\n    const complexProps = allProps.filter((p) => p.dataType === DataTypes.ComplexType);\n\n    const extendsClause = [\n      requiredProps ? `Pick<${model.name}, ${requiredProps}>` : null,\n      optionalProps ? `Partial<Pick<${model.name}, ${optionalProps}>>` : null,\n    ].filter((e): e is string => !!e);\n\n    this.sourceFile.addInterface({\n      name: model.editableName,\n      isExported: true,\n      extends: extendsClause,\n      properties: !complexProps\n        ? undefined\n        : complexProps.map((p) => {\n            return {\n              name: p.name,\n              type: this.getEditablePropType(p),\n              // optional props don't need to be specified in editable model\n              // also, entities would require deep insert func => we make it optional for now\n              hasQuestionToken: !p.required || p.dataType === DataTypes.ModelType,\n            };\n          }),\n    });\n  }\n\n  private getEditablePropType(prop: PropertyModel): string {\n    const type =\n      prop.dataType === DataTypes.ModelType\n        ? this.dataModel.getEntityType(prop.fqType)!.editableName\n        : prop.dataType === DataTypes.ComplexType\n        ? this.dataModel.getComplexType(prop.fqType)!.editableName\n        : prop.type;\n\n    // Collections\n    if (prop.isCollection) {\n      return `Array<${type}>`;\n    }\n\n    // primitive, enum & complex types\n    return type + (prop.required ? \"\" : \" | null\");\n  }\n\n  private generateUnboundOperationParams() {\n    this.dataModel.getUnboundOperationTypes().forEach((operation) => {\n      this.generateOperationParams(operation);\n    });\n  }\n\n  private generateBoundOperationParams(entityName: string) {\n    [\n      ...this.dataModel.getEntityTypeOperations(entityName),\n      ...this.dataModel.getEntitySetOperations(entityName),\n    ].forEach((operation) => {\n      this.generateOperationParams(operation);\n    });\n  }\n\n  private generateOperationParams(operation: OperationType) {\n    if (!operation.parameters.length) {\n      return;\n    }\n    this.sourceFile.addInterface({\n      name: operation.paramsModelName,\n      isExported: true,\n      properties: operation.parameters.map((p) => {\n        return {\n          name: p.name,\n          type: this.getPropType(p),\n          hasQuestionToken: !p.required,\n        };\n      }),\n    });\n  }\n}\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,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,2BAAW,CAAC,eAAe,CAAC,CAAC;YACnF,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,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SAC5F;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,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE;YAChC,OAAO;SACR;QACD,IAAI,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC;YAC1B,IAAI,EAAE,SAAS,CAAC,eAAe;YAC/B,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC,OAAO;oBACL,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;oBAC5C,gBAAgB,EAAE,CAAC,CAAC,CAAC,QAAQ;iBAC9B,CAAC;YACJ,CAAC,CAAC;SACH,CAAC,CAAC;IACL,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) : 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"]}

package/lib/generator/QueryObjectGenerator.js

@@ -1,79 +1,105 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateQueryObjects = void 0;
+const tslib_1 = require("tslib");
 const odata_core_1 = require("@odata2ts/odata-core");
 const ts_morph_1 = require("ts-morph");
 const processors_1 = require("xml2js/lib/processors");
-const ImportContainer_1 = require("./ImportContainer");
-const generateQueryObjects = (dataModel, sourceFile, version, options, namingHelper) => {
-    const generator = new QueryObjectGenerator(dataModel, sourceFile, version, options, namingHelper);
+const ImportObjects_1 = require("./import/ImportObjects");
+const generateQueryObjects = (project, dataModel, version, options, namingHelper) => {
+    const generator = new QueryObjectGenerator(project, dataModel, version, options, namingHelper);
     return generator.generate();
 };
 exports.generateQueryObjects = generateQueryObjects;
 class QueryObjectGenerator {
-    constructor(dataModel, sourceFile, version, options, namingHelper) {
+    constructor(project, dataModel, version, options, namingHelper) {
+        this.project = project;
         this.dataModel = dataModel;
-        this.sourceFile = sourceFile;
         this.version = version;
         this.options = options;
         this.namingHelper = namingHelper;
     }
     generate() {
-        const importContainer = new ImportContainer_1.ImportContainer(this.namingHelper.getFileNames());
-        this.generateModels(importContainer);
-        if (!this.options.skipOperations) {
-            this.generateUnboundOperations(importContainer);
-        }
-        this.sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this.project.initQObjects();
+            // process EntityType & ComplexType
+            const promises = [...this.generateEntityTypes(), ...this.generateComplexTypes()];
+            if (!this.options.skipOperations) {
+                // process unbound operations
+                promises.push(this.generateUnboundOperations());
+            }
+            yield Promise.all(promises);
+            return this.project.finalizeQObjects();
+        });
     }
-    generateModels(importContainer) {
-        this.dataModel.getEntityTypes().forEach((model) => {
-            this.generateModel(model, importContainer);
+    generateEntityTypes() {
+        return this.dataModel.getEntityTypes().map((model) => {
+            const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [
+                model.qName,
+                (0, processors_1.firstCharLowerCase)(model.qName),
+                model.id.qName,
+            ]);
+            // q object
+            this.generateModel(file, model);
+            // qId function
             if (!this.options.skipIdModels && model.generateId) {
-                this.generateIdFunction(model, importContainer);
+                this.generateIdFunction(file, model);
             }
+            // bound q operations
             if (!this.options.skipOperations) {
-                this.generateBoundOperations(model.fqName, importContainer);
+                [
+                    ...this.dataModel.getEntityTypeOperations(model.fqName),
+                    ...this.dataModel.getEntitySetOperations(model.fqName),
+                ].forEach((operation) => {
+                    this.generateOperation(file, operation, model.fqName);
+                });
             }
+            return this.project.finalizeFile(file);
         });
-        this.dataModel.getComplexTypes().forEach((model) => {
-            this.generateModel(model, importContainer);
+    }
+    generateComplexTypes() {
+        return this.dataModel.getComplexTypes().map((model) => {
+            const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [
+                model.qName,
+                (0, processors_1.firstCharLowerCase)(model.qName),
+            ]);
+            this.generateModel(file, model);
+            return this.project.finalizeFile(file);
         });
-        if (this.dataModel.getEntityTypes().length || this.dataModel.getComplexTypes().length) {
-            importContainer.addFromQObject("QueryObject");
-        }
     }
-    generateModel(model, importContainer) {
-        let extendsClause = "QueryObject";
+    generateModel(file, model) {
+        const imports = file.getImports();
+        let extendsClause;
         if (model.baseClasses.length) {
             const baseClass = model.baseClasses[0];
-            const baseModel = this.dataModel.getEntityType(baseClass) || this.dataModel.getComplexType(baseClass);
+            const baseModel = this.dataModel.getModel(baseClass);
             if (!baseModel) {
                 throw new Error(`Entity or complex type "${baseClass}" from baseClass attribute not found!`);
             }
-            extendsClause = baseModel.qName;
+            extendsClause = imports.addGeneratedQObject(baseClass, baseModel.qName);
         }
-        this.sourceFile.addClass({
+        else {
+            [extendsClause] = imports.addQObject(ImportObjects_1.QueryObjectImports.QueryObject);
+        }
+        file.getFile().addClass({
             name: model.qName,
             isExported: true,
             extends: extendsClause,
-            isAbstract: model.abstract,
-            properties: this.generateQueryObjectProps(model.props, importContainer),
+            // isAbstract: model.abstract,
+            properties: this.generateQueryObjectProps(file.getImports(), model.props),
+        });
+        file.getFile().addVariableStatement({
+            declarationKind: ts_morph_1.VariableDeclarationKind.Const,
+            isExported: true,
+            declarations: [
+                {
+                    name: (0, processors_1.firstCharLowerCase)(model.qName),
+                    initializer: `new ${model.qName}()`,
+                },
+            ],
         });
-        if (!model.abstract) {
-            this.sourceFile.addVariableStatement({
-                declarationKind: ts_morph_1.VariableDeclarationKind.Const,
-                isExported: true,
-                declarations: [
-                    {
-                        name: (0, processors_1.firstCharLowerCase)(model.qName),
-                        initializer: `new ${model.qName}()`,
-                    },
-                ],
-            });
-        }
     }
-    generateQueryObjectProps(props, importContainer) {
+    generateQueryObjectProps(importContainer, props) {
         return props.map((prop) => {
             const { odataName } = prop;
             const name = this.namingHelper.getQPropName(prop.name);
@@ -81,27 +107,24 @@ class QueryObjectGenerator {
             let qPathInit;
             // factor in collections
             if (prop.isCollection) {
-                const cType = `Q${isModelType ? "Entity" : ""}CollectionPath`;
-                const qObject = prop.qObject;
-                if (!qObject) {
-                    throw new Error("QObject for collection is missing!");
-                }
-                qPathInit = `new ${cType}(this.withPrefix("${odataName}"), () => ${qObject})`;
-                importContainer.addFromQObject(cType);
-                if (!isModelType) {
-                    importContainer.addFromQObject(qObject);
-                }
+                const cType = isModelType ? ImportObjects_1.QueryObjectImports.QEntityCollectionPath : ImportObjects_1.QueryObjectImports.QCollectionPath;
+                const collectionType = importContainer.addQObject(cType);
+                const qObject = isModelType
+                    ? importContainer.addGeneratedQObject(prop.fqType, prop.qObject)
+                    : importContainer.addFromQObject(prop.qObject)[0];
+                qPathInit = `new ${collectionType}(this.withPrefix("${odataName}"), () => ${qObject})`;
             }
             else {
+                // add import for data type
+                const qPath = importContainer.addFromQObject(prop.qPath);
                 if (isModelType) {
-                    qPathInit = `new ${prop.qPath}(this.withPrefix("${odataName}"), () => ${prop.qObject})`;
+                    const qObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject);
+                    qPathInit = `new ${qPath}(this.withPrefix("${odataName}"), () => ${qObject})`;
                 }
                 else {
-                    let converterStmt = this.generateConverterStmt(prop.converters, importContainer);
-                    qPathInit = `new ${prop.qPath}(this.withPrefix("${odataName}")${converterStmt ? `, ${converterStmt}` : ""})`;
+                    let converterStmt = this.generateConverterStmt(importContainer, prop.converters);
+                    qPathInit = `new ${qPath}(this.withPrefix("${odataName}")${converterStmt ? `, ${converterStmt}` : ""})`;
                 }
-                // add import for data type
-                importContainer.addFromQObject(prop.qPath);
             }
             return {
                 name,
@@ -111,36 +134,36 @@ class QueryObjectGenerator {
             };
         });
     }
-    generateConverterStmt(converters, importContainer) {
+    generateConverterStmt(importContainer, converters) {
         if (!(converters === null || converters === void 0 ? void 0 : converters.length)) {
-            return;
+            return undefined;
         }
-        converters.forEach((converter) => {
-            importContainer.addCustomType(converter.package, converter.converterId);
+        const converterIds = converters.map((converter) => {
+            return importContainer.addCustomType(converter.package, converter.converterId);
         });
-        if (converters.length === 1) {
-            return converters[0].converterId;
+        if (converterIds.length === 1) {
+            return converterIds[0];
         }
         else {
-            importContainer.addCustomType("@odata2ts/converter-runtime", "createChain");
-            const [first, second, ...moreConverters] = converters;
-            return moreConverters.reduce((stmt, conv) => `${stmt}.chain(${conv.converterId})`, `createChain(${first.converterId}, ${second.converterId})`);
+            const createChain = importContainer.addCustomType("@odata2ts/converter-runtime", "createChain");
+            const [first, second, ...moreConverters] = converterIds;
+            return moreConverters.reduce((stmt, convId) => `${stmt}.chain(${convId})`, `${createChain}(${first}, ${second})`);
         }
     }
-    generateIdFunction(model, importContainer) {
-        const qFunc = "QId";
-        importContainer.addFromQObject(qFunc);
-        importContainer.addGeneratedModel(model.idModelName);
-        this.sourceFile.addClass({
-            name: model.qIdFunctionName,
+    generateIdFunction(file, model) {
+        const importContainer = file.getImports();
+        const qFunc = importContainer.addQObject(ImportObjects_1.QueryObjectImports.QId);
+        const idModelName = importContainer.addGeneratedModel(model.fqName, model.id.modelName);
+        file.getFile().addClass({
+            name: model.id.qName,
             isExported: true,
-            extends: `${qFunc}<${model.idModelName}>`,
+            extends: `${qFunc}<${idModelName}>`,
             properties: [
                 {
                     name: "params",
                     scope: ts_morph_1.Scope.Private,
                     isReadonly: true,
-                    initializer: this.getParamInitString(model.keys, importContainer),
+                    initializer: this.getParamInitString(importContainer, model.keys),
                 },
             ],
             methods: [
@@ -151,76 +174,80 @@ class QueryObjectGenerator {
             ],
         });
     }
-    getParamInitString(props, importContainer) {
+    getParamInitString(importContainer, props) {
         return `[${props
             .map((prop) => {
             var _a;
-            const isComplexParam = prop.dataType === "ModelType" /* DataTypes.ModelType */ || prop.dataType === "ComplexType" /* DataTypes.ComplexType */;
-            if (prop.qParam) {
-                importContainer.addFromQObject(prop.qParam);
+            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(prop.converters, importContainer);
+            const converterStmt = this.generateConverterStmt(importContainer, prop.converters);
             const mappedNameParam = mappedName ? `, ${mappedName}` : "";
-            const complexQParam = isComplexParam ? `, new ${prop.qObject}()` : "";
             const converterParam = converterStmt ? `, ${converterStmt}` : "";
-            return `new ${prop.qParam}("${prop.odataName}"${complexQParam}${mappedNameParam}${converterParam})`;
+            return `new ${qParam}("${prop.odataName}"${complexQParam}${mappedNameParam}${converterParam})`;
         })
             .join(",")}]`;
     }
-    generateUnboundOperations(importContainer) {
-        this.dataModel.getUnboundOperationTypes().forEach((operation) => {
-            this.generateOperation(operation, importContainer);
-        });
-    }
-    generateBoundOperations(fqEntityName, importContainer) {
-        [
-            ...this.dataModel.getEntityTypeOperations(fqEntityName),
-            ...this.dataModel.getEntitySetOperations(fqEntityName),
-        ].forEach((operation) => {
-            this.generateOperation(operation, importContainer);
+    generateUnboundOperations() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const unboundOps = this.dataModel.getUnboundOperationTypes();
+            const reservedNames = unboundOps.map((op) => op.qName);
+            const file = this.project.createOrGetMainQObjectFile(reservedNames);
+            unboundOps.forEach((operation) => {
+                this.generateOperation(file, operation, "");
+            });
         });
     }
-    generateOperation(operation, importContainer) {
+    generateOperation(file, operation, baseFqName) {
         var _a;
+        const imports = file.getImports();
         const isV2 = this.version === odata_core_1.ODataVersions.V2;
-        const qOperation = operation.type === "Action" /* OperationTypes.Action */ ? "QAction" : "QFunction";
         const returnType = operation.returnType;
-        let returnTypeOpStmt = "";
         const hasParams = operation.parameters.length > 0;
-        importContainer.addFromQObject(qOperation);
-        if (hasParams) {
-            importContainer.addGeneratedModel(operation.paramsModelName);
-        }
+        // 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;
+        let returnTypeOpStmt = "";
         if (returnType) {
+            const collectionSuffix = returnType.isCollection ? "_COLLECTION" : "";
             if (returnType.dataType === "ComplexType" /* DataTypes.ComplexType */ || returnType.dataType === "ModelType" /* DataTypes.ModelType */) {
                 if (returnType.qObject) {
-                    importContainer.addFromQObject("OperationReturnType", "ReturnTypes", "QComplexParam");
-                    returnTypeOpStmt = `new OperationReturnType(ReturnTypes.COMPLEX${returnType.isCollection ? "_COLLECTION" : ""}, new QComplexParam("NONE", new ${returnType.qObject}))`;
+                    const [opRt, rts, qComplexParam] = imports.addQObject(ImportObjects_1.QueryObjectImports.OperationReturnType, ImportObjects_1.QueryObjectImports.ReturnTypes, 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) {
-                importContainer.addFromQObject("OperationReturnType", "ReturnTypes", returnType.qParam);
-                const rtKind = "ReturnTypes.VALUE" + (returnType.isCollection ? "_COLLECTION" : "");
+                const [rtClass, rtTypes] = imports.addQObject(ImportObjects_1.QueryObjectImports.OperationReturnType, ImportObjects_1.QueryObjectImports.ReturnTypes);
+                const [qParam] = imports.addFromQObject(returnType.qParam);
+                // TODO: some constants with string concat
+                const rtKind = `${rtTypes}.VALUE${collectionSuffix}`;
                 const converterParam = returnType.converters
-                    ? ", " + this.generateConverterStmt(returnType.converters, importContainer)
+                    ? ", " + this.generateConverterStmt(imports, returnType.converters)
                     : "";
-                returnTypeOpStmt = `new OperationReturnType(${rtKind}, new ${returnType.qParam}("NONE", undefined${converterParam}))`;
+                returnTypeOpStmt = `new ${rtClass}(${rtKind}, new ${qParam}("NONE", undefined${converterParam}))`;
             }
         }
-        this.sourceFile.addClass({
+        file.getFile().addClass({
             name: operation.qName,
             isExported: true,
-            extends: qOperation + (hasParams ? `<${operation.paramsModelName}>` : ""),
+            extends: qOperation + (hasParams ? `<${paramModelName}>` : ""),
             properties: [
                 {
                     name: "params",
                     scope: ts_morph_1.Scope.Private,
                     isReadonly: true,
                     type: ((_a = operation.parameters) === null || _a === void 0 ? void 0 : _a.length) ? undefined : "[]",
-                    initializer: this.getParamInitString(operation.parameters, importContainer),
+                    initializer: this.getParamInitString(imports, operation.parameters),
                 },
             ],
             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\";\nimport { ODataVersions } from \"@odata2ts/odata-core\";\nimport { OptionalKind, PropertyDeclarationStructure, Scope, SourceFile, VariableDeclarationKind } from \"ts-morph\";\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\n\nimport { DataModel } from \"../data-model/DataModel\";\nimport {\n  ComplexType,\n  DataTypes,\n  ModelType,\n  OperationType,\n  OperationTypes,\n  PropertyModel,\n} from \"../data-model/DataTypeModel\";\nimport { NamingHelper } from \"../data-model/NamingHelper\";\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel\";\nimport { ImportContainer } from \"./ImportContainer\";\n\nexport const generateQueryObjects: EntityBasedGeneratorFunction = (\n  dataModel,\n  sourceFile,\n  version,\n  options,\n  namingHelper\n) => {\n  const generator = new QueryObjectGenerator(dataModel, sourceFile, version, options, namingHelper);\n  return generator.generate();\n};\n\nclass QueryObjectGenerator {\n  constructor(\n    private dataModel: DataModel,\n    private sourceFile: SourceFile,\n    private version: ODataVersions,\n    private options: GeneratorFunctionOptions,\n    private namingHelper: NamingHelper\n  ) {}\n\n  public generate(): void {\n    const importContainer = new ImportContainer(this.namingHelper.getFileNames());\n\n    this.generateModels(importContainer);\n    if (!this.options.skipOperations) {\n      this.generateUnboundOperations(importContainer);\n    }\n\n    this.sourceFile.addImportDeclarations(importContainer.getImportDeclarations(false));\n  }\n\n  private generateModels(importContainer: ImportContainer) {\n    this.dataModel.getEntityTypes().forEach((model) => {\n      this.generateModel(model, importContainer);\n      if (!this.options.skipIdModels && model.generateId) {\n        this.generateIdFunction(model, importContainer);\n      }\n      if (!this.options.skipOperations) {\n        this.generateBoundOperations(model.fqName, importContainer);\n      }\n    });\n    this.dataModel.getComplexTypes().forEach((model) => {\n      this.generateModel(model, importContainer);\n    });\n\n    if (this.dataModel.getEntityTypes().length || this.dataModel.getComplexTypes().length) {\n      importContainer.addFromQObject(\"QueryObject\");\n    }\n  }\n\n  private generateModel(model: ComplexType, importContainer: ImportContainer) {\n    let extendsClause = \"QueryObject\";\n    if (model.baseClasses.length) {\n      const baseClass = model.baseClasses[0];\n      const baseModel = this.dataModel.getEntityType(baseClass) || this.dataModel.getComplexType(baseClass);\n      if (!baseModel) {\n        throw new Error(`Entity or complex type \"${baseClass}\" from baseClass attribute not found!`);\n      }\n\n      extendsClause = baseModel.qName;\n    }\n\n    this.sourceFile.addClass({\n      name: model.qName,\n      isExported: true,\n      extends: extendsClause,\n      isAbstract: model.abstract,\n      properties: this.generateQueryObjectProps(model.props, importContainer),\n    });\n\n    if (!model.abstract) {\n      this.sourceFile.addVariableStatement({\n        declarationKind: VariableDeclarationKind.Const,\n        isExported: true,\n        declarations: [\n          {\n            name: firstCharLowerCase(model.qName),\n            initializer: `new ${model.qName}()`,\n          },\n        ],\n      });\n    }\n  }\n\n  private generateQueryObjectProps(\n    props: Array<PropertyModel>,\n    importContainer: ImportContainer\n  ): Array<OptionalKind<PropertyDeclarationStructure>> {\n    return props.map((prop) => {\n      const { odataName } = prop;\n      const name = this.namingHelper.getQPropName(prop.name);\n      const isModelType = prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\n      let qPathInit: string;\n\n      // factor in collections\n      if (prop.isCollection) {\n        const cType = `Q${isModelType ? \"Entity\" : \"\"}CollectionPath`;\n        const qObject = prop.qObject;\n\n        if (!qObject) {\n          throw new Error(\"QObject for collection is missing!\");\n        }\n\n        qPathInit = `new ${cType}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\n\n        importContainer.addFromQObject(cType);\n        if (!isModelType) {\n          importContainer.addFromQObject(qObject);\n        }\n      } else {\n        if (isModelType) {\n          qPathInit = `new ${prop.qPath}(this.withPrefix(\"${odataName}\"), () => ${prop.qObject!})`;\n        } else {\n          let converterStmt = this.generateConverterStmt(prop.converters, importContainer);\n          qPathInit = `new ${prop.qPath}(this.withPrefix(\"${odataName}\")${converterStmt ? `, ${converterStmt}` : \"\"})`;\n        }\n        // add import for data type\n        importContainer.addFromQObject(prop.qPath);\n      }\n\n      return {\n        name,\n        scope: Scope.Public,\n        isReadonly: true,\n        initializer: qPathInit,\n      } as OptionalKind<PropertyDeclarationStructure>;\n    });\n  }\n\n  private generateConverterStmt(converters: Array<ValueConverterImport> | undefined, importContainer: ImportContainer) {\n    if (!converters?.length) {\n      return;\n    }\n    converters.forEach((converter) => {\n      importContainer.addCustomType(converter.package, converter.converterId);\n    });\n\n    if (converters.length === 1) {\n      return converters[0].converterId;\n    } else {\n      importContainer.addCustomType(\"@odata2ts/converter-runtime\", \"createChain\");\n\n      const [first, second, ...moreConverters] = converters;\n      return moreConverters.reduce(\n        (stmt, conv) => `${stmt}.chain(${conv.converterId})`,\n        `createChain(${first.converterId}, ${second.converterId})`\n      );\n    }\n  }\n\n  private generateIdFunction(model: ModelType, importContainer: ImportContainer) {\n    const qFunc = \"QId\";\n    importContainer.addFromQObject(qFunc);\n    importContainer.addGeneratedModel(model.idModelName);\n\n    this.sourceFile.addClass({\n      name: model.qIdFunctionName,\n      isExported: true,\n      extends: `${qFunc}<${model.idModelName}>`,\n      properties: [\n        {\n          name: \"params\",\n          scope: Scope.Private,\n          isReadonly: true,\n          initializer: this.getParamInitString(model.keys, importContainer),\n        },\n      ],\n      methods: [\n        {\n          name: \"getParams\",\n          statements: [\"return this.params\"],\n        },\n      ],\n    });\n  }\n\n  private getParamInitString(props: Array<PropertyModel>, importContainer: ImportContainer) {\n    return `[${props\n      .map((prop) => {\n        const isComplexParam = prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\n        if (prop.qParam) {\n          importContainer.addFromQObject(prop.qParam);\n        }\n        const isMappedNameNecessary = prop.odataName !== prop.name;\n        const mappedName = isMappedNameNecessary ? `\"${prop.name}\"` : prop.converters?.length ? \"undefined\" : undefined;\n        const converterStmt = this.generateConverterStmt(prop.converters, importContainer);\n        const mappedNameParam = mappedName ? `, ${mappedName}` : \"\";\n        const complexQParam = isComplexParam ? `, new ${prop.qObject}()` : \"\";\n        const converterParam = converterStmt ? `, ${converterStmt}` : \"\";\n        return `new ${prop.qParam}(\"${prop.odataName}\"${complexQParam}${mappedNameParam}${converterParam})`;\n      })\n      .join(\",\")}]`;\n  }\n\n  private generateUnboundOperations(importContainer: ImportContainer) {\n    this.dataModel.getUnboundOperationTypes().forEach((operation) => {\n      this.generateOperation(operation, importContainer);\n    });\n  }\n\n  private generateBoundOperations(fqEntityName: string, importContainer: ImportContainer) {\n    [\n      ...this.dataModel.getEntityTypeOperations(fqEntityName),\n      ...this.dataModel.getEntitySetOperations(fqEntityName),\n    ].forEach((operation) => {\n      this.generateOperation(operation, importContainer);\n    });\n  }\n\n  private generateOperation(operation: OperationType, importContainer: ImportContainer) {\n    const isV2 = this.version === ODataVersions.V2;\n    const qOperation = operation.type === OperationTypes.Action ? \"QAction\" : \"QFunction\";\n    const returnType = operation.returnType;\n    let returnTypeOpStmt: string = \"\";\n    const hasParams = operation.parameters.length > 0;\n    importContainer.addFromQObject(qOperation);\n    if (hasParams) {\n      importContainer.addGeneratedModel(operation.paramsModelName);\n    }\n    if (returnType) {\n      if (returnType.dataType === DataTypes.ComplexType || returnType.dataType === DataTypes.ModelType) {\n        if (returnType.qObject) {\n          importContainer.addFromQObject(\"OperationReturnType\", \"ReturnTypes\", \"QComplexParam\");\n          returnTypeOpStmt = `new OperationReturnType(ReturnTypes.COMPLEX${\n            returnType.isCollection ? \"_COLLECTION\" : \"\"\n          }, new QComplexParam(\"NONE\", new ${returnType.qObject}))`;\n        }\n      }\n      // currently, it only makes sense to add the OperationReturnType if a converter is present\n      else if (returnType.converters && returnType.qParam) {\n        importContainer.addFromQObject(\"OperationReturnType\", \"ReturnTypes\", returnType.qParam);\n        const rtKind = \"ReturnTypes.VALUE\" + (returnType.isCollection ? \"_COLLECTION\" : \"\");\n        const converterParam = returnType.converters\n          ? \", \" + this.generateConverterStmt(returnType.converters, importContainer)\n          : \"\";\n        returnTypeOpStmt = `new OperationReturnType(${rtKind}, new ${returnType.qParam}(\"NONE\", undefined${converterParam}))`;\n      }\n    }\n\n    this.sourceFile.addClass({\n      name: operation.qName,\n      isExported: true,\n      extends: qOperation + (hasParams ? `<${operation.paramsModelName}>` : \"\"),\n      properties: [\n        {\n          name: \"params\",\n          scope: Scope.Private,\n          isReadonly: true,\n          type: operation.parameters?.length ? undefined : \"[]\",\n          initializer: this.getParamInitString(operation.parameters, importContainer),\n        },\n      ],\n      ctors: [\n        {\n          statements: [\n            `super(\"${operation.odataName}\"${returnTypeOpStmt ? \", \" + returnTypeOpStmt : isV2 ? \", undefined\" : \"\"}${\n              isV2 ? \", { v2Mode: true }\" : \"\"\n            })`,\n          ],\n        },\n      ],\n      methods: [\n        {\n          name: \"getParams\",\n          statements: [\"return this.params\"],\n        },\n        // functions without params: add an overriding buildUrl() to not force users to have to pass undefined as param\n        ...(operation.type === OperationTypes.Function && !hasParams\n          ? [\n              {\n                name: \"buildUrl\",\n                statements: [\"return super.buildUrl(undefined)\"],\n              },\n            ]\n          : []),\n      ],\n    });\n  }\n}\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 { 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"]}

package/lib/generator/ServiceGenerator.d.ts

@@ -8,4 +8,4 @@ export interface PropsAndOps extends Required<Pick<ClassDeclarationStructure, "p
 }
 export interface ServiceGeneratorOptions extends Pick<ConfigFileOptions, "enablePrimitivePropertyServices" | "v4BigNumberAsString"> {
 }
-export declare function generateServices(dataModel: DataModel, project: ProjectManager, version: ODataVersions, namingHelper: NamingHelper, options?: ServiceGeneratorOptions): Promise<void>;
+export declare function generateServices(project: ProjectManager, dataModel: DataModel, version: ODataVersions, namingHelper: NamingHelper, options?: ServiceGeneratorOptions): Promise<void>;