@odata2ts/odata2ts 0.40.1 → 0.40.2

package/lib/generator/ImportContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImportContainer.js","sourceRoot":"","sources":["../../src/generator/ImportContainer.ts"],"names":[],"mappings":"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","sourcesContent":["import path from \"path\";\nimport { ODataVersions } from \"@odata2ts/odata-core\";\nimport { ImportDeclarationStructure, OptionalKind } from \"ts-morph\";\nimport { DataModel } from \"../data-model/DataModel.js\";\nimport { ComplexType } from \"../data-model/DataTypeModel.js\";\nimport {\n  ClientApiImports,\n  CoreImports,\n  LIB_MODULES,\n  QueryObjectImports,\n  ServiceImports,\n  VERSIONED_CORE_IMPORTS,\n  VERSIONED_SERVICE_IMPORTS,\n} from \"./import/ImportObjects.js\";\nimport { ImportedNameValidator } from \"./ImportedNameValidator.js\";\n\ntype ImportContainerType = Record<\n  keyof typeof LIB_MODULES,\n  { regular: Map<string, string>; typeOnly: Map<string, string> }\n>;\n\n/**\n * Handles all the import statements for a given file.\n *\n * Features a renaming mechanism, so that when the import name conflicts with an existing import a new\n * name is generated and returned.\n *\n * Map<string,string>\n */\nexport class ImportContainer {\n  private readonly importedNameValidator: ImportedNameValidator;\n  // mapping of a custom defined type to a primitive type\n  private customTypes = {\n    regular: new Map<string, Map<string, string>>(),\n    typeOnly: new Map<string, Map<string, string>>(),\n  };\n  // imports to generated artefacts\n  private internalImports = {\n    regular: new Map<string, Map<string, string>>(),\n    typeOnly: new Map<string, Map<string, string>>(),\n  };\n\n  private libs: ImportContainerType = {\n    core: { regular: new Map(), typeOnly: new Map() },\n    qObject: { regular: new Map(), typeOnly: new Map() },\n    clientApi: { regular: new Map(), typeOnly: new Map() },\n    service: { regular: new Map(), typeOnly: new Map() },\n  };\n\n  constructor(\n    protected path: string,\n    protected fileName: string,\n    protected dataModel: DataModel,\n    protected mainFileNames: { model: string; qObject: string; service: string },\n    protected readonly bundledFileGeneration: boolean,\n    protected reservedNames: Array<string> | undefined,\n  ) {\n    this.importedNameValidator = new ImportedNameValidator(reservedNames);\n  }\n\n  public addCoreLib(odataVersion: ODataVersions, coreLib: CoreImports) {\n    const isVersioned = VERSIONED_CORE_IMPORTS.includes(coreLib);\n    const name = CoreImports[coreLib] + (isVersioned ? ODataVersions[odataVersion] : \"\");\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.core, name);\n\n    // TODO: currently only types are imported, however enums could potentially be imported too\n    this.libs.core.typeOnly.set(name, importName);\n\n    return importName;\n  }\n\n  private addFromQObject(name: string, typeOnlyImport = false) {\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.qObject, name);\n\n    const imports = this.libs.qObject;\n    if (typeOnlyImport) {\n      if (!imports.regular.has(name)) {\n        imports.typeOnly.set(name, importName);\n      }\n    } else {\n      if (imports.typeOnly.has(name)) {\n        imports.typeOnly.delete(name);\n      }\n      imports.regular.set(name, importName);\n    }\n\n    return importName;\n  }\n\n  public addQObject(qObject: QueryObjectImports | string) {\n    return this.addFromQObject(qObject);\n  }\n\n  public addQObjectType(qObject: string) {\n    return this.addFromQObject(qObject, true);\n  }\n\n  public addClientApi(clientApi: ClientApiImports) {\n    const name = ClientApiImports[clientApi];\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.clientApi, name);\n\n    // complete client api consists only of types\n    this.libs.clientApi.typeOnly.set(name, importName);\n    return importName;\n  }\n\n  public addServiceObject(odataVersion: ODataVersions, serviceObject: ServiceImports) {\n    const isVersioned = VERSIONED_SERVICE_IMPORTS.includes(serviceObject);\n    const name = ServiceImports[serviceObject] + (isVersioned ? ODataVersions[odataVersion] : \"\");\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.service, name);\n\n    // only regular imports for the service package\n    this.libs.service.regular.set(name, importName);\n    return importName;\n  }\n\n  // TODO: make sure that regular imports win over additional typeOnly imports\n  public addCustomType(moduleName: string, typeName: string, isTypeOnly: boolean = false) {\n    const importName = this.importedNameValidator.validateName(moduleName, typeName);\n    const imports = isTypeOnly ? this.customTypes.typeOnly : this.customTypes.regular;\n    let importList = imports.get(moduleName);\n    if (!importList) {\n      importList = new Map();\n      imports.set(moduleName, importList);\n    }\n\n    importList.set(typeName, importName);\n    return importName;\n  }\n\n  private pathAndFile(filePath: string, fileName: string) {\n    return filePath ? `${filePath}/${fileName}` : fileName;\n  }\n\n  private isDifferentFile(filePath: string, fileName: string) {\n    return this.pathAndFile(this.path, this.fileName) !== this.pathAndFile(filePath, fileName);\n  }\n\n  private addGeneratedImport(folderPath: string, fileName: string, name: string, isTypeOnly = false): string {\n    // imports are only relevant for different files\n    if (!this.isDifferentFile(folderPath, fileName)) {\n      return name;\n    }\n\n    const moduleName = this.pathAndFile(folderPath, fileName);\n    const importName = this.importedNameValidator.validateName(moduleName, name);\n    const imports = isTypeOnly ? this.internalImports.typeOnly : this.internalImports.regular;\n\n    if (isTypeOnly && this.internalImports.regular.get(moduleName)?.has(name)) {\n      return importName;\n    }\n    if (!isTypeOnly && this.internalImports.typeOnly.get(moduleName)?.has(name)) {\n      this.internalImports.typeOnly.get(moduleName)?.delete(name);\n    }\n\n    const importList = imports.get(moduleName) || new Map<string, string>();\n    importList.set(name, importName);\n    imports.set(moduleName, importList);\n\n    return importName;\n  }\n\n  public addGeneratedModel(fqName: string, name: string, isTypeOnly = true): string {\n    if (this.bundledFileGeneration) {\n      return this.addGeneratedImport(\"\", this.mainFileNames.model, name, isTypeOnly);\n    } else {\n      const model = this.dataModel.getModel(fqName) as ComplexType | undefined;\n      if (!model && fqName !== \"\") {\n        throw new Error(`Cannot find model by its fully qualified name: ${fqName}!`);\n      }\n\n      const folderPath = model ? model.folderPath : \"\";\n      const modelName = model ? model.modelName : this.mainFileNames.model;\n      return this.addGeneratedImport(folderPath, modelName, name, isTypeOnly);\n    }\n  }\n\n  public addGeneratedQObject(fqName: string, name: string, isTypeOnly = false) {\n    if (this.bundledFileGeneration) {\n      return this.addGeneratedImport(\"\", this.mainFileNames.qObject, name, isTypeOnly);\n    } else {\n      const model = this.dataModel.getModel(fqName) as ComplexType | undefined;\n      if (!model && fqName !== \"\") {\n        throw new Error(`Cannot find q-object by its fully qualified name: ${fqName}!`);\n      }\n\n      const folderPath = model ? model.folderPath : \"\";\n      const qName = model ? model.qName : this.mainFileNames!.qObject;\n      return this.addGeneratedImport(folderPath, qName, name, isTypeOnly);\n    }\n  }\n\n  public addGeneratedService(fqName: string, name: string) {\n    if (this.bundledFileGeneration) {\n      return this.addGeneratedImport(\"\", this.mainFileNames.service, name);\n    } else {\n      const model = this.dataModel.getModel(fqName) as ComplexType;\n      return this.addGeneratedImport(model.folderPath, model.serviceName, name);\n    }\n  }\n\n  private createImportDecl(\n    module: string,\n    toImport: Map<string, string>,\n    isTypeOnly = false,\n  ): OptionalKind<ImportDeclarationStructure> {\n    return {\n      namedImports: this.getNamedImports(toImport),\n      moduleSpecifier: module,\n      isTypeOnly,\n    };\n  }\n\n  public getImportDeclarations(): Array<OptionalKind<ImportDeclarationStructure>> {\n    return [\n      ...Object.entries(this.libs).reduce<Array<OptionalKind<ImportDeclarationStructure>>>(\n        (result, [moduleName, toImport]) => {\n          const module = LIB_MODULES[moduleName as keyof typeof LIB_MODULES];\n          if (toImport.typeOnly.size) {\n            result.push(this.createImportDecl(module, toImport.typeOnly, true));\n          }\n          if (toImport.regular.size) {\n            result.push(this.createImportDecl(module, toImport.regular));\n          }\n          return result;\n        },\n        [],\n      ),\n      ...[...this.customTypes.typeOnly]\n        .filter(([moduleName, toImport]) => toImport.size > 0)\n        .map(([moduleName, toImport]) => {\n          return this.createImportDecl(moduleName, toImport, true);\n        }),\n      ...[...this.customTypes.regular]\n        .filter(([moduleName, toImport]) => toImport.size > 0)\n        .map(([moduleName, toImport]) => {\n          return this.createImportDecl(moduleName, toImport);\n        }),\n      ...[...this.internalImports.typeOnly]\n        .filter(([_, toImport]) => toImport.size > 0)\n        .map(([key, toImport]) => {\n          const module = this.getModuleSpecifier(key);\n          return this.createImportDecl(module, toImport, true);\n        }),\n      ...[...this.internalImports.regular]\n        .filter(([_, toImport]) => toImport.size > 0)\n        .map(([key, toImport]) => {\n          const module = this.getModuleSpecifier(key);\n          return this.createImportDecl(module, toImport);\n        }),\n    ];\n  }\n\n  private getNamedImports(toImport: Map<string, string>): Array<{ name: string; alias: string | undefined }> {\n    return [...toImport.entries()].map(([name, alias]) => ({\n      name,\n      alias: alias !== name ? alias : undefined,\n    }));\n  }\n\n  private getModuleSpecifier(filePath: string): string {\n    const relativePath = path.relative(this.path, filePath).replaceAll(path.sep, \"/\");\n    return !relativePath.startsWith(\".\") ? \"./\" + relativePath : relativePath;\n  }\n}\n"]}
+{"version":3,"file":"ImportContainer.js","sourceRoot":"","sources":["../../src/generator/ImportContainer.ts"],"names":[],"mappings":"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","sourcesContent":["import path from \"path\";\r\nimport { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { ImportDeclarationStructure, OptionalKind } from \"ts-morph\";\r\nimport { DataModel } from \"../data-model/DataModel.js\";\r\nimport { ComplexType } from \"../data-model/DataTypeModel.js\";\r\nimport {\r\n  ClientApiImports,\r\n  CoreImports,\r\n  LIB_MODULES,\r\n  QueryObjectImports,\r\n  ServiceImports,\r\n  VERSIONED_CORE_IMPORTS,\r\n  VERSIONED_SERVICE_IMPORTS,\r\n} from \"./import/ImportObjects.js\";\r\nimport { ImportedNameValidator } from \"./ImportedNameValidator.js\";\r\n\r\ntype ImportContainerType = Record<\r\n  keyof typeof LIB_MODULES,\r\n  { regular: Map<string, string>; typeOnly: Map<string, string> }\r\n>;\r\n\r\n/**\r\n * Handles all the import statements for a given file.\r\n *\r\n * Features a renaming mechanism, so that when the import name conflicts with an existing import a new\r\n * name is generated and returned.\r\n *\r\n * Map<string,string>\r\n */\r\nexport class ImportContainer {\r\n  private readonly importedNameValidator: ImportedNameValidator;\r\n  // mapping of a custom defined type to a primitive type\r\n  private customTypes = {\r\n    regular: new Map<string, Map<string, string>>(),\r\n    typeOnly: new Map<string, Map<string, string>>(),\r\n  };\r\n  // imports to generated artefacts\r\n  private internalImports = {\r\n    regular: new Map<string, Map<string, string>>(),\r\n    typeOnly: new Map<string, Map<string, string>>(),\r\n  };\r\n\r\n  private libs: ImportContainerType = {\r\n    core: { regular: new Map(), typeOnly: new Map() },\r\n    qObject: { regular: new Map(), typeOnly: new Map() },\r\n    clientApi: { regular: new Map(), typeOnly: new Map() },\r\n    service: { regular: new Map(), typeOnly: new Map() },\r\n  };\r\n\r\n  constructor(\r\n    protected path: string,\r\n    protected fileName: string,\r\n    protected dataModel: DataModel,\r\n    protected mainFileNames: { model: string; qObject: string; service: string },\r\n    protected readonly bundledFileGeneration: boolean,\r\n    protected reservedNames: Array<string> | undefined,\r\n  ) {\r\n    this.importedNameValidator = new ImportedNameValidator(reservedNames);\r\n  }\r\n\r\n  public addCoreLib(odataVersion: ODataVersions, coreLib: CoreImports) {\r\n    const isVersioned = VERSIONED_CORE_IMPORTS.includes(coreLib);\r\n    const name = CoreImports[coreLib] + (isVersioned ? ODataVersions[odataVersion] : \"\");\r\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.core, name);\r\n\r\n    // TODO: currently only types are imported, however enums could potentially be imported too\r\n    this.libs.core.typeOnly.set(name, importName);\r\n\r\n    return importName;\r\n  }\r\n\r\n  public addFromMainQObject(name: string, isTypeOnly = false) {\r\n    return this.addGeneratedImport(\"\", this.mainFileNames.qObject, name, isTypeOnly);\r\n  }\r\n\r\n  private addFromQObject(name: string, typeOnlyImport = false) {\r\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.qObject, name);\r\n\r\n    const imports = this.libs.qObject;\r\n    if (typeOnlyImport) {\r\n      if (!imports.regular.has(name)) {\r\n        imports.typeOnly.set(name, importName);\r\n      }\r\n    } else {\r\n      if (imports.typeOnly.has(name)) {\r\n        imports.typeOnly.delete(name);\r\n      }\r\n      imports.regular.set(name, importName);\r\n    }\r\n\r\n    return importName;\r\n  }\r\n\r\n  public addQObject(qObject: QueryObjectImports | string) {\r\n    return this.addFromQObject(qObject);\r\n  }\r\n\r\n  public addQObjectType(qObject: string) {\r\n    return this.addFromQObject(qObject, true);\r\n  }\r\n\r\n  public addClientApi(clientApi: ClientApiImports) {\r\n    const name = ClientApiImports[clientApi];\r\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.clientApi, name);\r\n\r\n    // complete client api consists only of types\r\n    this.libs.clientApi.typeOnly.set(name, importName);\r\n    return importName;\r\n  }\r\n\r\n  public addServiceObject(odataVersion: ODataVersions, serviceObject: ServiceImports) {\r\n    const isVersioned = VERSIONED_SERVICE_IMPORTS.includes(serviceObject);\r\n    const name = ServiceImports[serviceObject] + (isVersioned ? ODataVersions[odataVersion] : \"\");\r\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.service, name);\r\n\r\n    // only regular imports for the service package\r\n    this.libs.service.regular.set(name, importName);\r\n    return importName;\r\n  }\r\n\r\n  // TODO: make sure that regular imports win over additional typeOnly imports\r\n  public addCustomType(moduleName: string, typeName: string, isTypeOnly: boolean = false) {\r\n    const importName = this.importedNameValidator.validateName(moduleName, typeName);\r\n    const imports = isTypeOnly ? this.customTypes.typeOnly : this.customTypes.regular;\r\n    let importList = imports.get(moduleName);\r\n    if (!importList) {\r\n      importList = new Map();\r\n      imports.set(moduleName, importList);\r\n    }\r\n\r\n    importList.set(typeName, importName);\r\n    return importName;\r\n  }\r\n\r\n  private pathAndFile(filePath: string, fileName: string) {\r\n    return filePath ? `${filePath}/${fileName}` : fileName;\r\n  }\r\n\r\n  private isDifferentFile(filePath: string, fileName: string) {\r\n    return this.pathAndFile(this.path, this.fileName) !== this.pathAndFile(filePath, fileName);\r\n  }\r\n\r\n  private addGeneratedImport(folderPath: string, fileName: string, name: string, isTypeOnly = false): string {\r\n    // imports are only relevant for different files\r\n    if (!this.isDifferentFile(folderPath, fileName)) {\r\n      return name;\r\n    }\r\n\r\n    const moduleName = this.pathAndFile(folderPath, fileName);\r\n    const importName = this.importedNameValidator.validateName(moduleName, name);\r\n    const imports = isTypeOnly ? this.internalImports.typeOnly : this.internalImports.regular;\r\n\r\n    if (isTypeOnly && this.internalImports.regular.get(moduleName)?.has(name)) {\r\n      return importName;\r\n    }\r\n    if (!isTypeOnly && this.internalImports.typeOnly.get(moduleName)?.has(name)) {\r\n      this.internalImports.typeOnly.get(moduleName)?.delete(name);\r\n    }\r\n\r\n    const importList = imports.get(moduleName) || new Map<string, string>();\r\n    importList.set(name, importName);\r\n    imports.set(moduleName, importList);\r\n\r\n    return importName;\r\n  }\r\n\r\n  public addGeneratedModel(fqName: string, name: string, isTypeOnly = true): string {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.model, name, isTypeOnly);\r\n    } else {\r\n      const model = this.dataModel.getModel(fqName) as ComplexType | undefined;\r\n      if (!model && fqName !== \"\") {\r\n        throw new Error(`Cannot find model by its fully qualified name: ${fqName}!`);\r\n      }\r\n\r\n      const folderPath = model ? model.folderPath : \"\";\r\n      const modelName = model ? model.modelName : this.mainFileNames.model;\r\n      return this.addGeneratedImport(folderPath, modelName, name, isTypeOnly);\r\n    }\r\n  }\r\n\r\n  public addGeneratedQBaseObject(model: ComplexType, isTypeOnly = false) {\r\n    if (!model.qBaseName) {\r\n      throw new Error(`Model ${model.fqName} has no base type!`);\r\n    }\r\n    return this.bundledFileGeneration\r\n      ? this.addGeneratedImport(\"\", this.mainFileNames.qObject, model.qBaseName, isTypeOnly)\r\n      : this.addGeneratedImport(model.folderPath, model.qBaseName, model.qBaseName, isTypeOnly);\r\n  }\r\n\r\n  public addGeneratedQObject(fqName: string, name: string, isTypeOnly = false) {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.qObject, name, isTypeOnly);\r\n    } else {\r\n      const model = this.dataModel.getModel(fqName) as ComplexType | undefined;\r\n      if (!model && fqName !== \"\") {\r\n        throw new Error(`Cannot find q-object by its fully qualified name: ${fqName}!`);\r\n      }\r\n\r\n      const folderPath = model ? model.folderPath : \"\";\r\n      const qName = model ? model.qName : this.mainFileNames!.qObject;\r\n      return this.addGeneratedImport(folderPath, qName, name, isTypeOnly);\r\n    }\r\n  }\r\n\r\n  public addGeneratedService(fqName: string, name: string) {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.service, name);\r\n    } else {\r\n      const model = this.dataModel.getModel(fqName) as ComplexType;\r\n      return this.addGeneratedImport(model.folderPath, model.serviceName, name);\r\n    }\r\n  }\r\n\r\n  private createImportDecl(\r\n    module: string,\r\n    toImport: Map<string, string>,\r\n    isTypeOnly = false,\r\n  ): OptionalKind<ImportDeclarationStructure> {\r\n    return {\r\n      namedImports: this.getNamedImports(toImport),\r\n      moduleSpecifier: module,\r\n      isTypeOnly,\r\n    };\r\n  }\r\n\r\n  public getImportDeclarations(): Array<OptionalKind<ImportDeclarationStructure>> {\r\n    return [\r\n      ...Object.entries(this.libs).reduce<Array<OptionalKind<ImportDeclarationStructure>>>(\r\n        (result, [moduleName, toImport]) => {\r\n          const module = LIB_MODULES[moduleName as keyof typeof LIB_MODULES];\r\n          if (toImport.typeOnly.size) {\r\n            result.push(this.createImportDecl(module, toImport.typeOnly, true));\r\n          }\r\n          if (toImport.regular.size) {\r\n            result.push(this.createImportDecl(module, toImport.regular));\r\n          }\r\n          return result;\r\n        },\r\n        [],\r\n      ),\r\n      ...[...this.customTypes.typeOnly]\r\n        .filter(([moduleName, toImport]) => toImport.size > 0)\r\n        .map(([moduleName, toImport]) => {\r\n          return this.createImportDecl(moduleName, toImport, true);\r\n        }),\r\n      ...[...this.customTypes.regular]\r\n        .filter(([moduleName, toImport]) => toImport.size > 0)\r\n        .map(([moduleName, toImport]) => {\r\n          return this.createImportDecl(moduleName, toImport);\r\n        }),\r\n      ...[...this.internalImports.typeOnly]\r\n        .filter(([_, toImport]) => toImport.size > 0)\r\n        .map(([key, toImport]) => {\r\n          const module = this.getModuleSpecifier(key);\r\n          return this.createImportDecl(module, toImport, true);\r\n        }),\r\n      ...[...this.internalImports.regular]\r\n        .filter(([_, toImport]) => toImport.size > 0)\r\n        .map(([key, toImport]) => {\r\n          const module = this.getModuleSpecifier(key);\r\n          return this.createImportDecl(module, toImport);\r\n        }),\r\n    ];\r\n  }\r\n\r\n  private getNamedImports(toImport: Map<string, string>): Array<{ name: string; alias: string | undefined }> {\r\n    return [...toImport.entries()].map(([name, alias]) => ({\r\n      name,\r\n      alias: alias !== name ? alias : undefined,\r\n    }));\r\n  }\r\n\r\n  private getModuleSpecifier(filePath: string): string {\r\n    const relativePath = path.relative(this.path, filePath).replaceAll(path.sep, \"/\");\r\n    return !relativePath.startsWith(\".\") ? \"./\" + relativePath : relativePath;\r\n  }\r\n}\r\n"]}

package/lib/generator/QueryObjectGenerator.js

@@ -7,6 +7,7 @@ export const generateQueryObjects = (project, dataModel, version, options, namin
     const generator = new QueryObjectGenerator(project, dataModel, version, options, namingHelper);
     return generator.generate();
 };
+const OPTIONS_STATEMENT = "OPTS";
 class QueryObjectGenerator {
     constructor(project, dataModel, version, options, namingHelper) {
         this.project = project;
@@ -18,6 +19,7 @@ class QueryObjectGenerator {
     generate() {
         return __awaiter(this, void 0, void 0, function* () {
             this.project.initQObjects();
+            this.generateOptions();
             // process EntityType & ComplexType
             const promises = [...this.generateEntityTypes(), ...this.generateComplexTypes()];
             if (!this.options.skipOperations) {
@@ -28,6 +30,24 @@ class QueryObjectGenerator {
             return this.project.finalizeQObjects();
         });
     }
+    generateOptions() {
+        const file = this.project.createOrGetMainQObjectFile();
+        // for now assume only enableNativeInOperator requires options to be processed
+        if (!this.options.enableNativeInOperator) {
+            return;
+        }
+        // for now hardcode enableNativeInOperator
+        file.getFile().addVariableStatement({
+            declarationKind: VariableDeclarationKind.Const,
+            isExported: !this.options.bundledFileGeneration,
+            declarations: [
+                {
+                    name: OPTIONS_STATEMENT,
+                    initializer: `{ nativeIn: true }`,
+                },
+            ],
+        });
+    }
     generateEntityTypes() {
         return this.dataModel.getEntityTypes().map((model) => {
             const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [
@@ -63,31 +83,40 @@ class QueryObjectGenerator {
             return this.project.finalizeFile(file);
         });
     }
-    generateModel(file, model) {
-        const imports = file.getImports();
-        const properties = this.generateQueryObjectProps(file.getImports(), model.props);
-        let extendsClause;
+    getExtendsClauseForQObjects(model, imports) {
         if (model.baseClasses.length) {
             const baseClass = model.baseClasses[0];
             const baseModel = this.dataModel.getModel(baseClass);
             if (!baseModel) {
                 throw new Error(`Entity or complex type "${baseClass}" from baseClass attribute not found!`);
             }
-            extendsClause = imports.addGeneratedQObject(baseClass, baseModel.qBaseName);
+            return imports.addGeneratedQBaseObject(baseModel);
         }
-        else {
-            extendsClause = imports.addQObject(QueryObjectImports.QueryObject);
-        }
-        if (model.qBaseName) {
-            // base class which used for extension
+        return imports.addQObject(QueryObjectImports.QueryObject);
+    }
+    generateModel(file, model) {
+        const imports = file.getImports();
+        if (!model.qBaseName) {
             file.getFile().addClass({
+                name: model.qName,
+                isExported: true,
+                extends: this.getExtendsClauseForQObjects(model, imports),
+                properties: this.generateQueryObjectProps(file.getImports(), model.props),
+            });
+        }
+        else {
+            // base class used for extension needs an own file
+            const baseFile = this.project.createOrGetQObjectFile(model.folderPath, model.qBaseName, [model.qBaseName]);
+            baseFile.getFile().addClass({
                 name: model.qBaseName,
                 isExported: true,
-                extends: extendsClause,
-                properties,
+                extends: this.getExtendsClauseForQObjects(model, baseFile.getImports()),
+                properties: this.generateQueryObjectProps(baseFile.getImports(), model.props),
             });
+            this.project.finalizeFile(baseFile);
             const [props, getAccessors, methods, statements] = Array.from(model.subtypes).reduce((collector, subtype) => {
                 const subClass = this.dataModel.getModel(subtype);
+                const subClassName = imports.addGeneratedQObject(subClass.fqName, subClass.qName);
                 const methodName = `__as${subClass.qName}`;
                 const enumerablePropDef = imports.addQObject(QueryObjectImports.ENUMERABLE_PROP_DEFINITION);
                 collector[0].push(`"${subClass.fqName}": "${subClass.qName}"`);
@@ -104,14 +133,14 @@ class QueryObjectGenerator {
                 collector[2].push({
                     name: methodName,
                     scope: Scope.Private,
-                    statements: `return new ${subClass.qName}(this.withPrefix("${subClass.fqName}"))`,
+                    statements: `return new ${subClassName}(this.withPrefix("${subClass.fqName}"))`,
                 });
                 return collector;
             }, [[], [], [], []]);
             file.getFile().addClass({
                 name: model.qName,
                 isExported: true,
-                extends: model.qBaseName,
+                extends: imports.addGeneratedQBaseObject(model),
                 properties: [
                     {
                         name: "__subtypeMapping",
@@ -125,14 +154,6 @@ class QueryObjectGenerator {
             });
             file.getFile().addStatements(`Object.defineProperties(${model.qName}.prototype, { ${statements.join(",")} });`);
         }
-        else {
-            file.getFile().addClass({
-                name: model.qName,
-                isExported: true,
-                extends: extendsClause,
-                properties: properties,
-            });
-        }
         file.getFile().addVariableStatement({
             declarationKind: VariableDeclarationKind.Const,
             isExported: true,
@@ -145,43 +166,42 @@ class QueryObjectGenerator {
         });
     }
     generateQueryObjectProps(importContainer, props) {
+        const isEnumType = (prop) => prop.dataType === "EnumType" /* DataTypes.EnumType */;
+        const isModelType = (prop) => prop.dataType === "ModelType" /* DataTypes.ModelType */ || prop.dataType === "ComplexType" /* DataTypes.ComplexType */;
+        const addOptions = this.options.enableNativeInOperator; // limited to hardcoded enableNativeIn for now
+        if (addOptions && props.some((prop) => !prop.isCollection && !isModelType(prop) && !isEnumType(prop))) {
+            importContainer.addFromMainQObject(OPTIONS_STATEMENT);
+        }
         return props.map((prop) => {
             const { odataName } = prop;
             const name = this.namingHelper.getQPropName(prop.name);
-            const isModelType = prop.dataType === "ModelType" /* DataTypes.ModelType */ || prop.dataType === "ComplexType" /* DataTypes.ComplexType */;
-            const isEnumType = prop.dataType === "EnumType" /* DataTypes.EnumType */;
-            const isNumericEnum = this.options.enumType === "numeric";
             let qPathInit;
             // factor in collections
             if (prop.isCollection) {
-                const qPath = importContainer.addQObject(isModelType
-                    ? QueryObjectImports.QEntityCollectionPath
-                    : isEnumType
-                        ? isNumericEnum
-                            ? QueryObjectImports.QNumericEnumCollectionPath
-                            : QueryObjectImports.QEnumCollectionPath
-                        : QueryObjectImports.QCollectionPath);
-                const qObject = isModelType
+                const qPath = importContainer.addQObject(prop.qPath);
+                const qObject = isModelType(prop)
                     ? importContainer.addGeneratedQObject(prop.fqType, prop.qObject)
-                    : isEnumType
+                    : isEnumType(prop)
                         ? importContainer.addGeneratedModel(prop.fqType, prop.type, false)
                         : importContainer.addQObject(prop.qObject);
-                qPathInit = `new ${qPath}(this.withPrefix("${odataName}"), ${isEnumType ? qObject : `() => ${qObject}`})`;
+                qPathInit = `new ${qPath}(this.withPrefix("${odataName}"), ${isEnumType(prop) ? qObject : `() => ${qObject}`})`;
             }
             else {
                 // add import for data type
                 const qPath = importContainer.addQObject(prop.qPath);
-                if (isModelType) {
+                if (isModelType(prop)) {
                     const qObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject);
                     qPathInit = `new ${qPath}(this.withPrefix("${odataName}"), () => ${qObject})`;
                 }
-                else if (isEnumType) {
+                else if (isEnumType(prop)) {
                     const qObject = importContainer.addGeneratedModel(prop.fqType, prop.type, false);
                     qPathInit = `new ${qPath}(this.withPrefix("${odataName}"), ${qObject})`;
                 }
                 else {
                     let converterStmt = this.generateConverterStmt(importContainer, prop.converters);
-                    qPathInit = `new ${qPath}(this.withPrefix("${odataName}")${converterStmt ? `, ${converterStmt}` : ""})`;
+                    const addConverter = !!converterStmt;
+                    converterStmt = converterStmt || "undefined";
+                    qPathInit = `new ${qPath}(this.withPrefix("${odataName}")${addOptions ? `, ${converterStmt}, ${OPTIONS_STATEMENT}` : addConverter ? `, ${converterStmt}` : ""})`;
                 }
             }
             return {

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 {\n  GetAccessorDeclarationStructure,\n  MethodDeclarationStructure,\n  OptionalKind,\n  PropertyDeclarationStructure,\n  Scope,\n  VariableDeclarationKind,\n} from \"ts-morph\";\nimport { firstCharLowerCase } from \"xml2js/lib/processors.js\";\nimport { DataModel } from \"../data-model/DataModel.js\";\nimport {\n  ComplexType,\n  DataTypes,\n  EntityType,\n  OperationType,\n  OperationTypes,\n  PropertyModel,\n} from \"../data-model/DataTypeModel.js\";\nimport { NamingHelper } from \"../data-model/NamingHelper.js\";\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel.js\";\nimport { FileHandler } from \"../project/FileHandler.js\";\nimport { ProjectManager } from \"../project/ProjectManager.js\";\nimport { QueryObjectImports } from \"./import/ImportObjects.js\";\nimport { ImportContainer } from \"./ImportContainer.js\";\n\nexport const generateQueryObjects: EntityBasedGeneratorFunction = (\n  project,\n  dataModel,\n  version,\n  options,\n  namingHelper,\n) => {\n  const generator = new QueryObjectGenerator(project, dataModel, version, options, namingHelper);\n  return generator.generate();\n};\n\nclass QueryObjectGenerator {\n  constructor(\n    private project: ProjectManager,\n    private dataModel: DataModel,\n    private version: ODataVersions,\n    private options: GeneratorFunctionOptions,\n    private namingHelper: NamingHelper,\n  ) {}\n\n  public async generate(): Promise<void> {\n    this.project.initQObjects();\n\n    // process EntityType & ComplexType\n    const promises: Array<Promise<void>> = [...this.generateEntityTypes(), ...this.generateComplexTypes()];\n    if (!this.options.skipOperations) {\n      // process unbound operations\n      promises.push(this.generateUnboundOperations());\n    }\n\n    await Promise.all(promises);\n\n    return this.project.finalizeQObjects();\n  }\n\n  private generateEntityTypes() {\n    return this.dataModel.getEntityTypes().map((model) => {\n      const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [\n        model.qName,\n        firstCharLowerCase(model.qName),\n        model.id.qName,\n      ]);\n\n      // q object\n      this.generateModel(file, model);\n\n      // qId function\n      if (!this.options.skipIdModels && model.generateId) {\n        this.generateIdFunction(file, model);\n      }\n\n      // bound q operations\n      if (!this.options.skipOperations) {\n        [\n          ...this.dataModel.getEntityTypeOperations(model.fqName),\n          ...this.dataModel.getEntitySetOperations(model.fqName),\n        ].forEach((operation) => {\n          this.generateOperation(file, operation, model.fqName);\n        });\n      }\n\n      return this.project.finalizeFile(file);\n    });\n  }\n\n  private generateComplexTypes() {\n    return this.dataModel.getComplexTypes().map((model) => {\n      const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [\n        model.qName,\n        firstCharLowerCase(model.qName),\n      ]);\n\n      this.generateModel(file, model);\n\n      return this.project.finalizeFile(file);\n    });\n  }\n\n  private generateModel(file: FileHandler, model: ComplexType) {\n    const imports = file.getImports();\n    const properties = this.generateQueryObjectProps(file.getImports(), model.props);\n\n    let extendsClause: string;\n    if (model.baseClasses.length) {\n      const baseClass = model.baseClasses[0];\n      const baseModel = this.dataModel.getModel(baseClass) as ComplexType;\n      if (!baseModel) {\n        throw new Error(`Entity or complex type \"${baseClass}\" from baseClass attribute not found!`);\n      }\n      extendsClause = imports.addGeneratedQObject(baseClass, baseModel.qBaseName!);\n    } else {\n      extendsClause = imports.addQObject(QueryObjectImports.QueryObject);\n    }\n\n    if (model.qBaseName) {\n      // base class which used for extension\n      file.getFile().addClass({\n        name: model.qBaseName,\n        isExported: true,\n        extends: extendsClause,\n        properties,\n      });\n\n      const [props, getAccessors, methods, statements] = Array.from(model.subtypes).reduce<\n        [\n          Array<string>,\n          OptionalKind<GetAccessorDeclarationStructure>[],\n          OptionalKind<MethodDeclarationStructure>[],\n          Array<string>,\n        ]\n      >(\n        (collector, subtype) => {\n          const subClass = this.dataModel.getModel(subtype) as ComplexType;\n          const methodName = `__as${subClass.qName}`;\n          const enumerablePropDef = imports.addQObject(QueryObjectImports.ENUMERABLE_PROP_DEFINITION);\n\n          collector[0].push(`\"${subClass.fqName}\": \"${subClass.qName}\"`);\n\n          subClass.props.forEach((prop) => {\n            const propName = this.namingHelper.getQPropName(prop.name);\n            const fqPropName = `${subClass.qName}_${propName}`;\n            collector[1].push({\n              name: fqPropName,\n              scope: Scope.Public,\n              statements: `return this.${methodName}().${propName};`,\n            });\n            collector[3].push(`${fqPropName}: ${enumerablePropDef}`);\n          });\n\n          collector[2].push({\n            name: methodName,\n            scope: Scope.Private,\n            statements: `return new ${subClass.qName}(this.withPrefix(\"${subClass.fqName}\"))`,\n          });\n\n          return collector;\n        },\n        [[], [], [], []],\n      );\n\n      file.getFile().addClass({\n        name: model.qName,\n        isExported: true,\n        extends: model.qBaseName,\n        properties: [\n          {\n            name: \"__subtypeMapping\",\n            scope: Scope.Protected,\n            isReadonly: true,\n            initializer: `{ ${props.join(\",\")} }`,\n          },\n        ],\n        getAccessors,\n        methods,\n      });\n\n      file.getFile().addStatements(`Object.defineProperties(${model.qName}.prototype, { ${statements.join(\",\")} });`);\n    } else {\n      file.getFile().addClass({\n        name: model.qName,\n        isExported: true,\n        extends: extendsClause,\n        properties: properties,\n      });\n    }\n\n    file.getFile().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  private generateQueryObjectProps(\n    importContainer: ImportContainer,\n    props: Array<PropertyModel>,\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      const isEnumType = prop.dataType === DataTypes.EnumType;\n      const isNumericEnum = this.options.enumType === \"numeric\";\n\n      let qPathInit: string;\n\n      // factor in collections\n      if (prop.isCollection) {\n        const qPath = importContainer.addQObject(\n          isModelType\n            ? QueryObjectImports.QEntityCollectionPath\n            : isEnumType\n              ? isNumericEnum\n                ? QueryObjectImports.QNumericEnumCollectionPath\n                : QueryObjectImports.QEnumCollectionPath\n              : QueryObjectImports.QCollectionPath,\n        );\n        const qObject = isModelType\n          ? importContainer.addGeneratedQObject(prop.fqType, prop.qObject!)\n          : isEnumType\n            ? importContainer.addGeneratedModel(prop.fqType, prop.type, false)\n            : importContainer.addQObject(prop.qObject!);\n\n        qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), ${isEnumType ? qObject : `() => ${qObject}`})`;\n      } else {\n        // add import for data type\n        const qPath = importContainer.addQObject(prop.qPath);\n        if (isModelType) {\n          const qObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject!);\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\n        } else if (isEnumType) {\n          const qObject = importContainer.addGeneratedModel(prop.fqType, prop.type, false);\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), ${qObject})`;\n        } else {\n          let converterStmt = this.generateConverterStmt(importContainer, prop.converters);\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\")${converterStmt ? `, ${converterStmt}` : \"\"})`;\n        }\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(importContainer: ImportContainer, converters: Array<ValueConverterImport> | undefined) {\n    if (!converters?.length) {\n      return undefined;\n    }\n    const converterIds = converters.map((converter) => {\n      return importContainer.addCustomType(converter.package, converter.converterId);\n    });\n\n    if (converterIds.length === 1) {\n      return converterIds[0];\n    } else {\n      const createChain = importContainer.addCustomType(\"@odata2ts/converter-runtime\", \"createChain\");\n\n      const [first, second, ...moreConverters] = converterIds;\n      return moreConverters.reduce((stmt, convId) => `${stmt}.chain(${convId})`, `${createChain}(${first}, ${second})`);\n    }\n  }\n\n  private generateIdFunction(file: FileHandler, model: EntityType) {\n    const importContainer = file.getImports();\n    const qFunc = importContainer.addQObject(QueryObjectImports.QId);\n    const idModelName = importContainer.addGeneratedModel(model.fqName, model.id.modelName);\n\n    file.getFile().addClass({\n      name: model.id.qName,\n      isExported: true,\n      extends: `${qFunc}<${idModelName}>`,\n      properties: [\n        {\n          name: \"params\",\n          scope: Scope.Private,\n          isReadonly: true,\n          initializer: this.getParamInitString(importContainer, model.keys),\n        },\n      ],\n      methods: [\n        {\n          name: \"getParams\",\n          statements: [\"return this.params\"],\n        },\n      ],\n    });\n  }\n\n  private getParamInitString(\n    importContainer: ImportContainer,\n    props: Array<PropertyModel>,\n    overloads?: Array<Array<PropertyModel>>,\n  ) {\n    const allParams = [props, ...(overloads ?? [])].map((paramSet) => {\n      const pString = paramSet\n        .map((prop) => {\n          let complexQParam = \"\";\n          if (prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType) {\n            const importedQObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject!);\n            complexQParam = `, new ${importedQObject}()`;\n          }\n\n          const qParam = importContainer.addQObject(prop.qParam!);\n          const isMappedNameNecessary = prop.odataName !== prop.name;\n          const mappedName = isMappedNameNecessary\n            ? `\"${prop.name}\"`\n            : prop.converters?.length\n              ? \"undefined\"\n              : undefined;\n          const converterStmt = this.generateConverterStmt(importContainer, prop.converters);\n          const mappedNameParam = mappedName ? `, ${mappedName}` : \"\";\n          const converterParam = converterStmt ? `, ${converterStmt}` : \"\";\n          return `new ${qParam}(\"${prop.odataName}\"${complexQParam}${mappedNameParam}${converterParam})`;\n        })\n        .join(\",\");\n      return `[${pString}]`;\n    });\n\n    return allParams.length === 1 ? allParams[0] : `[${allParams.join(\",\")}]`;\n  }\n\n  private async generateUnboundOperations() {\n    const unboundOps = this.dataModel.getUnboundOperationTypes();\n    const reservedNames = unboundOps.map((op) => op.qName);\n    const file = this.project.createOrGetMainQObjectFile(reservedNames);\n\n    unboundOps.forEach((operation) => {\n      this.generateOperation(file, operation, \"\");\n    });\n  }\n\n  private generateOperation(file: FileHandler, operation: OperationType, baseFqName: string) {\n    const imports = file.getImports();\n    const isV2 = this.version === ODataVersions.V2;\n    const returnType = operation.returnType;\n    const hasParams = operation.parameters.length > 0 || operation.overrides?.length;\n    const isParamsOptional = !![operation.parameters, ...(operation.overrides ?? [])].find((pSet) => pSet.length === 0);\n\n    // imports\n    const qOp = operation.type === OperationTypes.Action ? QueryObjectImports.QAction : QueryObjectImports.QFunction;\n    const qOperation = imports.addQObject(qOp);\n    const paramModelName = hasParams ? imports.addGeneratedModel(baseFqName, operation.paramsModelName) : undefined;\n\n    let returnTypeOpStmt: string = \"\";\n    if (returnType) {\n      if (returnType.dataType === DataTypes.ComplexType || returnType.dataType === DataTypes.ModelType) {\n        if (returnType.qObject) {\n          const opRt = imports.addQObject(QueryObjectImports.OperationReturnType);\n          const rts = imports.addQObject(QueryObjectImports.ReturnTypes);\n          const rType = returnType.isCollection\n            ? \"COLLECTION\"\n            : returnType.dataType === DataTypes.ComplexType\n              ? \"COMPLEX\"\n              : \"ENTITY\";\n          const qComplexParam = imports.addQObject(QueryObjectImports.QComplexParam);\n          const returnQName = imports.addGeneratedQObject(returnType.fqType, returnType.qObject);\n\n          returnTypeOpStmt = `new ${opRt}(${rts}.${rType}, new ${qComplexParam}(\"NONE\", new ${returnQName}))`;\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        const rtClass = imports.addQObject(QueryObjectImports.OperationReturnType);\n        const rtTypes = imports.addQObject(QueryObjectImports.ReturnTypes);\n        const rType = returnType.isCollection ? \"COLLECTION\" : \"VALUE\";\n        const qParam = imports.addQObject(returnType.qParam);\n\n        const rtKind = `${rtTypes}.${rType}`;\n\n        const converterParam = returnType.converters\n          ? \", \" + this.generateConverterStmt(imports, returnType.converters)\n          : \"\";\n        returnTypeOpStmt = `new ${rtClass}(${rtKind}, new ${qParam}(\"NONE\", undefined${converterParam}))`;\n      }\n    }\n\n    file.getFile().addClass({\n      name: operation.qName,\n      isExported: true,\n      extends: qOperation + (hasParams ? `<${paramModelName}>` : \"\"),\n      properties: [\n        {\n          name: \"params\",\n          scope: Scope.Private,\n          isReadonly: true,\n          type: hasParams ? undefined : \"[]\",\n          initializer: this.getParamInitString(imports, operation.parameters, operation.overrides),\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                parameters: [\n                  {\n                    name: \"notEncoded\",\n                    initializer: \"false\",\n                  },\n                ],\n                statements: [\"return super.buildUrl(undefined, notEncoded)\"],\n              } as OptionalKind<MethodDeclarationStructure>,\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\";\nimport { ODataVersions } from \"@odata2ts/odata-core\";\nimport {\n  GetAccessorDeclarationStructure,\n  MethodDeclarationStructure,\n  OptionalKind,\n  PropertyDeclarationStructure,\n  Scope,\n  VariableDeclarationKind,\n} from \"ts-morph\";\nimport { firstCharLowerCase } from \"xml2js/lib/processors.js\";\nimport { DataModel } from \"../data-model/DataModel.js\";\nimport {\n  ComplexType,\n  DataTypes,\n  EntityType,\n  OperationType,\n  OperationTypes,\n  PropertyModel,\n} from \"../data-model/DataTypeModel.js\";\nimport { NamingHelper } from \"../data-model/NamingHelper.js\";\nimport { EntityBasedGeneratorFunction, GeneratorFunctionOptions } from \"../FactoryFunctionModel.js\";\nimport { FileHandler } from \"../project/FileHandler.js\";\nimport { ProjectManager } from \"../project/ProjectManager.js\";\nimport { QueryObjectImports } from \"./import/ImportObjects.js\";\nimport { ImportContainer } from \"./ImportContainer.js\";\n\nexport const generateQueryObjects: EntityBasedGeneratorFunction = (\n  project,\n  dataModel,\n  version,\n  options,\n  namingHelper,\n) => {\n  const generator = new QueryObjectGenerator(project, dataModel, version, options, namingHelper);\n  return generator.generate();\n};\n\nconst OPTIONS_STATEMENT = \"OPTS\";\n\nclass QueryObjectGenerator {\n  constructor(\n    private project: ProjectManager,\n    private dataModel: DataModel,\n    private version: ODataVersions,\n    private options: GeneratorFunctionOptions,\n    private namingHelper: NamingHelper,\n  ) {}\n\n  public async generate(): Promise<void> {\n    this.project.initQObjects();\n\n    this.generateOptions();\n\n    // process EntityType & ComplexType\n    const promises: Array<Promise<void>> = [...this.generateEntityTypes(), ...this.generateComplexTypes()];\n    if (!this.options.skipOperations) {\n      // process unbound operations\n      promises.push(this.generateUnboundOperations());\n    }\n\n    await Promise.all(promises);\n\n    return this.project.finalizeQObjects();\n  }\n\n  private generateOptions() {\n    const file = this.project.createOrGetMainQObjectFile();\n\n    // for now assume only enableNativeInOperator requires options to be processed\n    if (!this.options.enableNativeInOperator) {\n      return;\n    }\n\n    // for now hardcode enableNativeInOperator\n    file.getFile().addVariableStatement({\n      declarationKind: VariableDeclarationKind.Const,\n      isExported: !this.options.bundledFileGeneration,\n      declarations: [\n        {\n          name: OPTIONS_STATEMENT,\n          initializer: `{ nativeIn: true }`,\n        },\n      ],\n    });\n  }\n\n  private generateEntityTypes() {\n    return this.dataModel.getEntityTypes().map((model) => {\n      const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [\n        model.qName,\n        firstCharLowerCase(model.qName),\n        model.id.qName,\n      ]);\n\n      // q object\n      this.generateModel(file, model);\n\n      // qId function\n      if (!this.options.skipIdModels && model.generateId) {\n        this.generateIdFunction(file, model);\n      }\n\n      // bound q operations\n      if (!this.options.skipOperations) {\n        [\n          ...this.dataModel.getEntityTypeOperations(model.fqName),\n          ...this.dataModel.getEntitySetOperations(model.fqName),\n        ].forEach((operation) => {\n          this.generateOperation(file, operation, model.fqName);\n        });\n      }\n\n      return this.project.finalizeFile(file);\n    });\n  }\n\n  private generateComplexTypes() {\n    return this.dataModel.getComplexTypes().map((model) => {\n      const file = this.project.createOrGetQObjectFile(model.folderPath, model.qName, [\n        model.qName,\n        firstCharLowerCase(model.qName),\n      ]);\n\n      this.generateModel(file, model);\n\n      return this.project.finalizeFile(file);\n    });\n  }\n\n  private getExtendsClauseForQObjects(model: ComplexType, imports: ImportContainer) {\n    if (model.baseClasses.length) {\n      const baseClass = model.baseClasses[0];\n      const baseModel = this.dataModel.getModel(baseClass) as ComplexType;\n      if (!baseModel) {\n        throw new Error(`Entity or complex type \"${baseClass}\" from baseClass attribute not found!`);\n      }\n      return imports.addGeneratedQBaseObject(baseModel);\n    }\n\n    return imports.addQObject(QueryObjectImports.QueryObject);\n  }\n\n  private generateModel(file: FileHandler, model: ComplexType) {\n    const imports = file.getImports();\n\n    if (!model.qBaseName) {\n      file.getFile().addClass({\n        name: model.qName,\n        isExported: true,\n        extends: this.getExtendsClauseForQObjects(model, imports),\n        properties: this.generateQueryObjectProps(file.getImports(), model.props),\n      });\n    } else {\n      // base class used for extension needs an own file\n      const baseFile = this.project.createOrGetQObjectFile(model.folderPath, model.qBaseName, [model.qBaseName]);\n      baseFile.getFile().addClass({\n        name: model.qBaseName,\n        isExported: true,\n        extends: this.getExtendsClauseForQObjects(model, baseFile.getImports()),\n        properties: this.generateQueryObjectProps(baseFile.getImports(), model.props),\n      });\n      this.project.finalizeFile(baseFile);\n\n      const [props, getAccessors, methods, statements] = Array.from(model.subtypes).reduce<\n        [\n          Array<string>,\n          OptionalKind<GetAccessorDeclarationStructure>[],\n          OptionalKind<MethodDeclarationStructure>[],\n          Array<string>,\n        ]\n      >(\n        (collector, subtype) => {\n          const subClass = this.dataModel.getModel(subtype) as ComplexType;\n          const subClassName = imports.addGeneratedQObject(subClass.fqName, subClass.qName);\n          const methodName = `__as${subClass.qName}`;\n          const enumerablePropDef = imports.addQObject(QueryObjectImports.ENUMERABLE_PROP_DEFINITION);\n\n          collector[0].push(`\"${subClass.fqName}\": \"${subClass.qName}\"`);\n\n          subClass.props.forEach((prop) => {\n            const propName = this.namingHelper.getQPropName(prop.name);\n            const fqPropName = `${subClass.qName}_${propName}`;\n            collector[1].push({\n              name: fqPropName,\n              scope: Scope.Public,\n              statements: `return this.${methodName}().${propName};`,\n            });\n            collector[3].push(`${fqPropName}: ${enumerablePropDef}`);\n          });\n\n          collector[2].push({\n            name: methodName,\n            scope: Scope.Private,\n            statements: `return new ${subClassName}(this.withPrefix(\"${subClass.fqName}\"))`,\n          });\n\n          return collector;\n        },\n        [[], [], [], []],\n      );\n\n      file.getFile().addClass({\n        name: model.qName,\n        isExported: true,\n        extends: imports.addGeneratedQBaseObject(model),\n        properties: [\n          {\n            name: \"__subtypeMapping\",\n            scope: Scope.Protected,\n            isReadonly: true,\n            initializer: `{ ${props.join(\",\")} }`,\n          },\n        ],\n        getAccessors,\n        methods,\n      });\n\n      file.getFile().addStatements(`Object.defineProperties(${model.qName}.prototype, { ${statements.join(\",\")} });`);\n    }\n\n    file.getFile().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  private generateQueryObjectProps(\n    importContainer: ImportContainer,\n    props: Array<PropertyModel>,\n  ): Array<OptionalKind<PropertyDeclarationStructure>> {\n    const isEnumType = (prop: PropertyModel) => prop.dataType === DataTypes.EnumType;\n    const isModelType = (prop: PropertyModel) =>\n      prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType;\n    const addOptions = this.options.enableNativeInOperator; // limited to hardcoded enableNativeIn for now\n\n    if (addOptions && props.some((prop) => !prop.isCollection && !isModelType(prop) && !isEnumType(prop))) {\n      importContainer.addFromMainQObject(OPTIONS_STATEMENT);\n    }\n\n    return props.map((prop) => {\n      const { odataName } = prop;\n      const name = this.namingHelper.getQPropName(prop.name);\n\n      let qPathInit: string;\n\n      // factor in collections\n      if (prop.isCollection) {\n        const qPath = importContainer.addQObject(prop.qPath);\n        const qObject = isModelType(prop)\n          ? importContainer.addGeneratedQObject(prop.fqType, prop.qObject!)\n          : isEnumType(prop)\n            ? importContainer.addGeneratedModel(prop.fqType, prop.type, false)\n            : importContainer.addQObject(prop.qObject!);\n\n        qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), ${isEnumType(prop) ? qObject : `() => ${qObject}`})`;\n      } else {\n        // add import for data type\n        const qPath = importContainer.addQObject(prop.qPath);\n        if (isModelType(prop)) {\n          const qObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject!);\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), () => ${qObject})`;\n        } else if (isEnumType(prop)) {\n          const qObject = importContainer.addGeneratedModel(prop.fqType, prop.type, false);\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\"), ${qObject})`;\n        } else {\n          let converterStmt = this.generateConverterStmt(importContainer, prop.converters);\n          const addConverter = !!converterStmt;\n          converterStmt = converterStmt || \"undefined\";\n\n          qPathInit = `new ${qPath}(this.withPrefix(\"${odataName}\")${\n            addOptions ? `, ${converterStmt}, ${OPTIONS_STATEMENT}` : addConverter ? `, ${converterStmt}` : \"\"\n          })`;\n        }\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(importContainer: ImportContainer, converters: Array<ValueConverterImport> | undefined) {\n    if (!converters?.length) {\n      return undefined;\n    }\n    const converterIds = converters.map((converter) => {\n      return importContainer.addCustomType(converter.package, converter.converterId);\n    });\n\n    if (converterIds.length === 1) {\n      return converterIds[0];\n    } else {\n      const createChain = importContainer.addCustomType(\"@odata2ts/converter-runtime\", \"createChain\");\n\n      const [first, second, ...moreConverters] = converterIds;\n      return moreConverters.reduce((stmt, convId) => `${stmt}.chain(${convId})`, `${createChain}(${first}, ${second})`);\n    }\n  }\n\n  private generateIdFunction(file: FileHandler, model: EntityType) {\n    const importContainer = file.getImports();\n    const qFunc = importContainer.addQObject(QueryObjectImports.QId);\n    const idModelName = importContainer.addGeneratedModel(model.fqName, model.id.modelName);\n\n    file.getFile().addClass({\n      name: model.id.qName,\n      isExported: true,\n      extends: `${qFunc}<${idModelName}>`,\n      properties: [\n        {\n          name: \"params\",\n          scope: Scope.Private,\n          isReadonly: true,\n          initializer: this.getParamInitString(importContainer, model.keys),\n        },\n      ],\n      methods: [\n        {\n          name: \"getParams\",\n          statements: [\"return this.params\"],\n        },\n      ],\n    });\n  }\n\n  private getParamInitString(\n    importContainer: ImportContainer,\n    props: Array<PropertyModel>,\n    overloads?: Array<Array<PropertyModel>>,\n  ) {\n    const allParams = [props, ...(overloads ?? [])].map((paramSet) => {\n      const pString = paramSet\n        .map((prop) => {\n          let complexQParam = \"\";\n          if (prop.dataType === DataTypes.ModelType || prop.dataType === DataTypes.ComplexType) {\n            const importedQObject = importContainer.addGeneratedQObject(prop.fqType, prop.qObject!);\n            complexQParam = `, new ${importedQObject}()`;\n          }\n\n          const qParam = importContainer.addQObject(prop.qParam!);\n          const isMappedNameNecessary = prop.odataName !== prop.name;\n          const mappedName = isMappedNameNecessary\n            ? `\"${prop.name}\"`\n            : prop.converters?.length\n              ? \"undefined\"\n              : undefined;\n          const converterStmt = this.generateConverterStmt(importContainer, prop.converters);\n          const mappedNameParam = mappedName ? `, ${mappedName}` : \"\";\n          const converterParam = converterStmt ? `, ${converterStmt}` : \"\";\n          return `new ${qParam}(\"${prop.odataName}\"${complexQParam}${mappedNameParam}${converterParam})`;\n        })\n        .join(\",\");\n      return `[${pString}]`;\n    });\n\n    return allParams.length === 1 ? allParams[0] : `[${allParams.join(\",\")}]`;\n  }\n\n  private async generateUnboundOperations() {\n    const unboundOps = this.dataModel.getUnboundOperationTypes();\n    const reservedNames = unboundOps.map((op) => op.qName);\n    const file = this.project.createOrGetMainQObjectFile(reservedNames);\n\n    unboundOps.forEach((operation) => {\n      this.generateOperation(file, operation, \"\");\n    });\n  }\n\n  private generateOperation(file: FileHandler, operation: OperationType, baseFqName: string) {\n    const imports = file.getImports();\n    const isV2 = this.version === ODataVersions.V2;\n    const returnType = operation.returnType;\n    const hasParams = operation.parameters.length > 0 || operation.overrides?.length;\n    const isParamsOptional = !![operation.parameters, ...(operation.overrides ?? [])].find((pSet) => pSet.length === 0);\n\n    // imports\n    const qOp = operation.type === OperationTypes.Action ? QueryObjectImports.QAction : QueryObjectImports.QFunction;\n    const qOperation = imports.addQObject(qOp);\n    const paramModelName = hasParams ? imports.addGeneratedModel(baseFqName, operation.paramsModelName) : undefined;\n\n    let returnTypeOpStmt: string = \"\";\n    if (returnType) {\n      if (returnType.dataType === DataTypes.ComplexType || returnType.dataType === DataTypes.ModelType) {\n        if (returnType.qObject) {\n          const opRt = imports.addQObject(QueryObjectImports.OperationReturnType);\n          const rts = imports.addQObject(QueryObjectImports.ReturnTypes);\n          const rType = returnType.isCollection\n            ? \"COLLECTION\"\n            : returnType.dataType === DataTypes.ComplexType\n              ? \"COMPLEX\"\n              : \"ENTITY\";\n          const qComplexParam = imports.addQObject(QueryObjectImports.QComplexParam);\n          const returnQName = imports.addGeneratedQObject(returnType.fqType, returnType.qObject);\n\n          returnTypeOpStmt = `new ${opRt}(${rts}.${rType}, new ${qComplexParam}(\"NONE\", new ${returnQName}))`;\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        const rtClass = imports.addQObject(QueryObjectImports.OperationReturnType);\n        const rtTypes = imports.addQObject(QueryObjectImports.ReturnTypes);\n        const rType = returnType.isCollection ? \"COLLECTION\" : \"VALUE\";\n        const qParam = imports.addQObject(returnType.qParam);\n\n        const rtKind = `${rtTypes}.${rType}`;\n\n        const converterParam = returnType.converters\n          ? \", \" + this.generateConverterStmt(imports, returnType.converters)\n          : \"\";\n        returnTypeOpStmt = `new ${rtClass}(${rtKind}, new ${qParam}(\"NONE\", undefined${converterParam}))`;\n      }\n    }\n\n    file.getFile().addClass({\n      name: operation.qName,\n      isExported: true,\n      extends: qOperation + (hasParams ? `<${paramModelName}>` : \"\"),\n      properties: [\n        {\n          name: \"params\",\n          scope: Scope.Private,\n          isReadonly: true,\n          type: hasParams ? undefined : \"[]\",\n          initializer: this.getParamInitString(imports, operation.parameters, operation.overrides),\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                parameters: [\n                  {\n                    name: \"notEncoded\",\n                    initializer: \"false\",\n                  },\n                ],\n                statements: [\"return super.buildUrl(undefined, notEncoded)\"],\n              } as OptionalKind<MethodDeclarationStructure>,\n            ]\n          : []),\n      ],\n    });\n  }\n}\n"]}

package/lib/generator/ServiceGenerator.js

@@ -278,7 +278,7 @@ class ServiceGenerator {
             const propEnum = this.dataModel.getModel(prop.fqType);
             const propTypeModel = imports.addGeneratedModel(propEnum.fqName, propEnum.modelName, false);
             type = `${imports.addQObjectType(QueryObjectImports.EnumCollection)}<typeof ${propTypeModel}>`;
-            qType = `${imports.addQObjectType(isNumericEnum ? QueryObjectImports.QNumericEnumCollection : QueryObjectImports.QEnumCollection)}<typeof ${propTypeModel}>`;
+            qType = `${imports.addQObjectType(prop.qObject)}<typeof ${propTypeModel}>`;
         }
         else {
             // TODO refactor string concat