@odata2ts/odata2ts 0.35.0 → 0.36.1

package/lib/data-model/DataTypeModel.d.ts

@@ -1,4 +1,5 @@
 import { ValueConverterImport } from "@odata2ts/converter-runtime";
+import { Modes } from "../OptionModel";
 export declare enum ODataVersion {
     V2 = "2.0",
     V4 = "4.0"
@@ -58,6 +59,7 @@ export interface ComplexType {
     finalBaseClass: string | undefined;
     abstract: boolean;
     open: boolean;
+    genMode: Modes;
 }
 export interface EnumType {
     dataType: DataTypes;
@@ -78,6 +80,7 @@ export interface OperationType {
     parameters: Array<PropertyModel>;
     returnType?: ReturnTypeModel;
     usePost?: boolean;
+    overrides?: Array<Array<PropertyModel>>;
 }
 export interface ReturnTypeModel extends PropertyModel {
 }

package/lib/data-model/DataTypeModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataTypeModel.js","sourceRoot":"","sources":["../../src/data-model/DataTypeModel.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,0BAAU,CAAA;IACV,0BAAU,CAAA;AACZ,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\n\r\nexport enum ODataVersion {\r\n  V2 = \"2.0\",\r\n  V4 = \"4.0\",\r\n}\r\n\r\nexport const enum DataTypes {\r\n  PrimitiveType = \"PrimitiveType\",\r\n  EnumType = \"EnumType\",\r\n  ComplexType = \"ComplexType\",\r\n  ModelType = \"ModelType\",\r\n}\r\n\r\nexport const enum OperationTypes {\r\n  Function = \"Function\",\r\n  Action = \"Action\",\r\n}\r\n\r\nexport interface PropertyModel {\r\n  odataName: string;\r\n  name: string;\r\n  odataType: string;\r\n  fqType: string;\r\n  type: string;\r\n  typeModule?: string;\r\n  qObject?: string;\r\n  qPath: string;\r\n  qParam?: string;\r\n  required: boolean;\r\n  isCollection: boolean;\r\n  dataType: DataTypes;\r\n  converters?: Array<ValueConverterImport>;\r\n  managed?: boolean;\r\n}\r\n\r\nexport type ModelType = EntityType | ComplexType | EnumType;\r\n\r\nexport interface EntityType extends ComplexType {\r\n  id: {\r\n    // fully qualified name of entity to which this id belongs (might have been inherited)\r\n    fqName: string;\r\n    // that's the name of the param model for the id function\r\n    modelName: string;\r\n    // that's the name of the id function which is a q-object\r\n    qName: string;\r\n  };\r\n  generateId: boolean;\r\n  keyNames: Array<string>;\r\n  keys: Array<PropertyModel>;\r\n  getKeyUnion(): string;\r\n}\r\n\r\nexport interface ComplexType {\r\n  dataType: DataTypes;\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  modelName: string;\r\n  editableName: string;\r\n  qName: string;\r\n  serviceName: string;\r\n  serviceCollectionName: string;\r\n  folderPath: string;\r\n  props: Array<PropertyModel>;\r\n  baseProps: Array<PropertyModel>;\r\n  baseClasses: Array<string>;\r\n  finalBaseClass: string | undefined;\r\n  abstract: boolean;\r\n  open: boolean;\r\n}\r\n\r\nexport interface EnumType {\r\n  dataType: DataTypes;\r\n  odataName: string;\r\n  fqName: string;\r\n  name: string;\r\n  modelName: string;\r\n  folderPath: string;\r\n  members: Array<string>;\r\n}\r\n\r\nexport interface OperationType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  qName: string;\r\n  paramsModelName: string;\r\n  type: OperationTypes;\r\n  parameters: Array<PropertyModel>;\r\n  returnType?: ReturnTypeModel;\r\n  usePost?: boolean;\r\n}\r\n\r\nexport interface ReturnTypeModel extends PropertyModel {}\r\n\r\nexport type EntityContainerModel = {\r\n  entitySets: { [name: string]: EntitySetType };\r\n  singletons: { [name: string]: SingletonType };\r\n  functions: { [name: string]: FunctionImportType };\r\n  actions: { [name: string]: ActionImportType };\r\n};\r\n\r\nexport interface SingletonType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: EntityType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface EntitySetType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: EntityType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface NavPropBindingType {\r\n  path: string;\r\n  target: string;\r\n}\r\n\r\nexport interface ActionImportType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  operation: string;\r\n}\r\n\r\nexport interface FunctionImportType extends ActionImportType {\r\n  entitySet: string;\r\n}\r\n"]}
+{"version":3,"file":"DataTypeModel.js","sourceRoot":"","sources":["../../src/data-model/DataTypeModel.ts"],"names":[],"mappings":";;;AAIA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,0BAAU,CAAA;IACV,0BAAU,CAAA;AACZ,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { ValueConverterImport } from \"@odata2ts/converter-runtime\";\r\n\r\nimport { Modes } from \"../OptionModel\";\r\n\r\nexport enum ODataVersion {\r\n  V2 = \"2.0\",\r\n  V4 = \"4.0\",\r\n}\r\n\r\nexport const enum DataTypes {\r\n  PrimitiveType = \"PrimitiveType\",\r\n  EnumType = \"EnumType\",\r\n  ComplexType = \"ComplexType\",\r\n  ModelType = \"ModelType\",\r\n}\r\n\r\nexport const enum OperationTypes {\r\n  Function = \"Function\",\r\n  Action = \"Action\",\r\n}\r\n\r\nexport interface PropertyModel {\r\n  odataName: string;\r\n  name: string;\r\n  odataType: string;\r\n  fqType: string;\r\n  type: string;\r\n  typeModule?: string;\r\n  qObject?: string;\r\n  qPath: string;\r\n  qParam?: string;\r\n  required: boolean;\r\n  isCollection: boolean;\r\n  dataType: DataTypes;\r\n  converters?: Array<ValueConverterImport>;\r\n  managed?: boolean;\r\n}\r\n\r\nexport type ModelType = EntityType | ComplexType | EnumType;\r\n\r\nexport interface EntityType extends ComplexType {\r\n  id: {\r\n    // fully qualified name of entity to which this id belongs (might have been inherited)\r\n    fqName: string;\r\n    // that's the name of the param model for the id function\r\n    modelName: string;\r\n    // that's the name of the id function which is a q-object\r\n    qName: string;\r\n  };\r\n  generateId: boolean;\r\n  keyNames: Array<string>;\r\n  keys: Array<PropertyModel>;\r\n  getKeyUnion(): string;\r\n}\r\n\r\nexport interface ComplexType {\r\n  dataType: DataTypes;\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  modelName: string;\r\n  editableName: string;\r\n  qName: string;\r\n  serviceName: string;\r\n  serviceCollectionName: string;\r\n  folderPath: string;\r\n  props: Array<PropertyModel>;\r\n  baseProps: Array<PropertyModel>;\r\n  baseClasses: Array<string>;\r\n  finalBaseClass: string | undefined;\r\n  abstract: boolean;\r\n  open: boolean;\r\n  genMode: Modes;\r\n}\r\n\r\nexport interface EnumType {\r\n  dataType: DataTypes;\r\n  odataName: string;\r\n  fqName: string;\r\n  name: string;\r\n  modelName: string;\r\n  folderPath: string;\r\n  members: Array<string>;\r\n}\r\n\r\nexport interface OperationType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  qName: string;\r\n  paramsModelName: string;\r\n  type: OperationTypes;\r\n  parameters: Array<PropertyModel>;\r\n  returnType?: ReturnTypeModel;\r\n  usePost?: boolean;\r\n  overrides?: Array<Array<PropertyModel>>;\r\n}\r\n\r\nexport interface ReturnTypeModel extends PropertyModel {}\r\n\r\nexport type EntityContainerModel = {\r\n  entitySets: { [name: string]: EntitySetType };\r\n  singletons: { [name: string]: SingletonType };\r\n  functions: { [name: string]: FunctionImportType };\r\n  actions: { [name: string]: ActionImportType };\r\n};\r\n\r\nexport interface SingletonType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: EntityType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface EntitySetType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  entityType: EntityType;\r\n  navPropBinding?: Array<NavPropBindingType>;\r\n}\r\n\r\nexport interface NavPropBindingType {\r\n  path: string;\r\n  target: string;\r\n}\r\n\r\nexport interface ActionImportType {\r\n  fqName: string;\r\n  odataName: string;\r\n  name: string;\r\n  operation: string;\r\n}\r\n\r\nexport interface FunctionImportType extends ActionImportType {\r\n  entitySet: string;\r\n}\r\n"]}

package/lib/data-model/validation/NameClashValidator.js

@@ -58,13 +58,23 @@ class NameClashValidator {
         return this.addToTypes(fqName, name, TypeModel_1.TypeModel.EnumType);
     }
     addUnboundOperationType(fqName, name) {
-        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.OperationType);
+        const validationObject = { type: TypeModel_1.TypeModel.OperationType, fqName };
+        const hit = this.store.get(name);
+        // to support function overloads: allow multiple operation definitions with same fully qualified name
+        if (hit && hit.fqName !== fqName) {
+            return this.addToError(name, hit, validationObject);
+        }
+        else {
+            this.store.set(name, validationObject);
+            return name;
+        }
     }
     addBoundOperationType(bindingName, fqName, name) {
         const nameWithBinding = `${bindingName}_${name}`;
         const validationObject = { type: TypeModel_1.TypeModel.OperationType, fqName };
         const hit = this.store.get(nameWithBinding);
-        if (hit) {
+        // to support function overloads: allow multiple operation definitions with same fully qualified name
+        if (hit && hit.fqName !== fqName) {
             return this.addToError(name, hit, validationObject);
         }
         else {

package/lib/data-model/validation/NameClashValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"NameClashValidator.js","sourceRoot":"","sources":["../../../src/data-model/validation/NameClashValidator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ConfigFileOptions } from \"../../OptionModel\";\r\nimport { TypeModel } from \"../../TypeModel\";\r\nimport { NameValidator, ValidationError } from \"./NameValidator\";\r\n\r\nexport interface NameValidatorOptions\r\n  extends Pick<ConfigFileOptions, \"disableAutomaticNameClashResolution\" | \"bundledFileGeneration\"> {}\r\n\r\nexport class NameClashValidator implements NameValidator {\r\n  private entityContainer = new Map<string, ValidationError>();\r\n  private store = new Map<string, ValidationError>();\r\n  private errors = new Map<string, ValidationError[]>();\r\n\r\n  constructor(private options: NameValidatorOptions = {}) {}\r\n\r\n  private addToError(name: string, hit: ValidationError, validationObject: ValidationError) {\r\n    const existingErrors = this.errors.get(name);\r\n    if (existingErrors) {\r\n      if (!this.options.disableAutomaticNameClashResolution) {\r\n        validationObject.renamedTo = `${name}${existingErrors.length + 1}`;\r\n      }\r\n      existingErrors.push(validationObject);\r\n    } else {\r\n      if (!this.options.disableAutomaticNameClashResolution) {\r\n        validationObject.renamedTo = `${name}2`;\r\n      }\r\n      this.errors.set(name, [hit, validationObject]);\r\n    }\r\n    return validationObject.renamedTo ?? name;\r\n  }\r\n\r\n  private addToTypes(fqName: string, name: string, type: TypeModel): string {\r\n    const validationObject: ValidationError = { type, fqName };\r\n    const hit = this.store.get(name);\r\n    if (hit) {\r\n      return this.addToError(name, hit, validationObject);\r\n    } else {\r\n      this.store.set(name, validationObject);\r\n      return name;\r\n    }\r\n  }\r\n\r\n  private addToEntityContainer(fqName: string, name: string, type: TypeModel): string {\r\n    const validationObject: ValidationError = { type, fqName };\r\n    const hit = this.entityContainer.get(name);\r\n    if (hit) {\r\n      return this.addToError(name, hit, validationObject);\r\n    } else {\r\n      this.entityContainer.set(name, validationObject);\r\n      return name;\r\n    }\r\n  }\r\n\r\n  addEntityType(fqName: string, name: string) {\r\n    return this.addToTypes(fqName, name, TypeModel.EntityType);\r\n  }\r\n\r\n  addComplexType(fqName: string, name: string) {\r\n    return this.addToTypes(fqName, name, TypeModel.ComplexType);\r\n  }\r\n\r\n  addEnumType(fqName: string, name: string) {\r\n    return this.addToTypes(fqName, name, TypeModel.EnumType);\r\n  }\r\n\r\n  addUnboundOperationType(fqName: string, name: string) {\r\n    return this.addToTypes(fqName, name, TypeModel.OperationType);\r\n  }\r\n\r\n  addBoundOperationType(bindingName: string, fqName: string, name: string) {\r\n    const nameWithBinding = `${bindingName}_${name}`;\r\n    const validationObject: ValidationError = { type: TypeModel.OperationType, fqName };\r\n    const hit = this.store.get(nameWithBinding);\r\n    if (hit) {\r\n      return this.addToError(name, hit, validationObject);\r\n    } else {\r\n      this.store.set(nameWithBinding, validationObject);\r\n      return name;\r\n    }\r\n  }\r\n\r\n  addOperationImportType(fqName: string, name: string) {\r\n    return this.addToEntityContainer(fqName, name, TypeModel.OperationImportType);\r\n  }\r\n\r\n  addEntitySet(fqName: string, name: string) {\r\n    return this.addToEntityContainer(fqName, name, TypeModel.EntitySet);\r\n  }\r\n\r\n  addSingleton(fqName: string, name: string) {\r\n    return this.addToEntityContainer(fqName, name, TypeModel.Singleton);\r\n  }\r\n\r\n  validate() {\r\n    return this.errors;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"NameClashValidator.js","sourceRoot":"","sources":["../../../src/data-model/validation/NameClashValidator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ConfigFileOptions } from \"../../OptionModel\";\r\nimport { TypeModel } from \"../../TypeModel\";\r\nimport { NameValidator, ValidationError } from \"./NameValidator\";\r\n\r\nexport interface NameValidatorOptions\r\n  extends Pick<ConfigFileOptions, \"disableAutomaticNameClashResolution\" | \"bundledFileGeneration\"> {}\r\n\r\nexport class NameClashValidator implements NameValidator {\r\n  private entityContainer = new Map<string, ValidationError>();\r\n  private store = new Map<string, ValidationError>();\r\n  private errors = new Map<string, ValidationError[]>();\r\n\r\n  constructor(private options: NameValidatorOptions = {}) {}\r\n\r\n  private addToError(name: string, hit: ValidationError, validationObject: ValidationError) {\r\n    const existingErrors = this.errors.get(name);\r\n    if (existingErrors) {\r\n      if (!this.options.disableAutomaticNameClashResolution) {\r\n        validationObject.renamedTo = `${name}${existingErrors.length + 1}`;\r\n      }\r\n      existingErrors.push(validationObject);\r\n    } else {\r\n      if (!this.options.disableAutomaticNameClashResolution) {\r\n        validationObject.renamedTo = `${name}2`;\r\n      }\r\n      this.errors.set(name, [hit, validationObject]);\r\n    }\r\n    return validationObject.renamedTo ?? name;\r\n  }\r\n\r\n  private addToTypes(fqName: string, name: string, type: TypeModel): string {\r\n    const validationObject: ValidationError = { type, fqName };\r\n    const hit = this.store.get(name);\r\n    if (hit) {\r\n      return this.addToError(name, hit, validationObject);\r\n    } else {\r\n      this.store.set(name, validationObject);\r\n      return name;\r\n    }\r\n  }\r\n\r\n  private addToEntityContainer(fqName: string, name: string, type: TypeModel): string {\r\n    const validationObject: ValidationError = { type, fqName };\r\n    const hit = this.entityContainer.get(name);\r\n    if (hit) {\r\n      return this.addToError(name, hit, validationObject);\r\n    } else {\r\n      this.entityContainer.set(name, validationObject);\r\n      return name;\r\n    }\r\n  }\r\n\r\n  addEntityType(fqName: string, name: string) {\r\n    return this.addToTypes(fqName, name, TypeModel.EntityType);\r\n  }\r\n\r\n  addComplexType(fqName: string, name: string) {\r\n    return this.addToTypes(fqName, name, TypeModel.ComplexType);\r\n  }\r\n\r\n  addEnumType(fqName: string, name: string) {\r\n    return this.addToTypes(fqName, name, TypeModel.EnumType);\r\n  }\r\n\r\n  addUnboundOperationType(fqName: string, name: string) {\r\n    const validationObject: ValidationError = { type: TypeModel.OperationType, fqName };\r\n\r\n    const hit = this.store.get(name);\r\n    // to support function overloads: allow multiple operation definitions with same fully qualified name\r\n    if (hit && hit.fqName !== fqName) {\r\n      return this.addToError(name, hit, validationObject);\r\n    } else {\r\n      this.store.set(name, validationObject);\r\n      return name;\r\n    }\r\n  }\r\n\r\n  addBoundOperationType(bindingName: string, fqName: string, name: string) {\r\n    const nameWithBinding = `${bindingName}_${name}`;\r\n    const validationObject: ValidationError = { type: TypeModel.OperationType, fqName };\r\n    const hit = this.store.get(nameWithBinding);\r\n    // to support function overloads: allow multiple operation definitions with same fully qualified name\r\n    if (hit && hit.fqName !== fqName) {\r\n      return this.addToError(name, hit, validationObject);\r\n    } else {\r\n      this.store.set(nameWithBinding, validationObject);\r\n      return name;\r\n    }\r\n  }\r\n\r\n  addOperationImportType(fqName: string, name: string) {\r\n    return this.addToEntityContainer(fqName, name, TypeModel.OperationImportType);\r\n  }\r\n\r\n  addEntitySet(fqName: string, name: string) {\r\n    return this.addToEntityContainer(fqName, name, TypeModel.EntitySet);\r\n  }\r\n\r\n  addSingleton(fqName: string, name: string) {\r\n    return this.addToEntityContainer(fqName, name, TypeModel.Singleton);\r\n  }\r\n\r\n  validate() {\r\n    return this.errors;\r\n  }\r\n}\r\n"]}

package/lib/generator/ImportContainer.d.ts

@@ -1,5 +1,5 @@
 import { ODataVersions } from "@odata2ts/odata-core";
-import { ImportDeclarationStructure } from "ts-morph";
+import { ImportDeclarationStructure, OptionalKind } from "ts-morph";
 import { DataModel } from "../data-model/DataModel";
 import { ClientApiImports, CoreImports, QueryObjectImports, ServiceImports } from "./import/ImportObjects";
 /**
@@ -30,19 +30,21 @@ export declare class ImportContainer {
         qObject: string;
         service: string;
     }, bundledFileGeneration: boolean, reservedNames: Array<string> | undefined);
-    addCoreLib(odataVersion: ODataVersions, ...coreLibs: Array<CoreImports>): string[];
-    addFromQObject(...names: Array<string>): string[];
-    addQObject(...qObjects: Array<QueryObjectImports>): string[];
-    addClientApi(...clientApis: Array<ClientApiImports>): string[];
-    addServiceObject(odataVersion: ODataVersions, ...serviceObjects: Array<ServiceImports>): string[];
-    addCustomType(moduleName: string, typeName: string): string;
+    addCoreLib(odataVersion: ODataVersions, coreLib: CoreImports): string;
+    private addFromQObject;
+    addQObject(qObject: QueryObjectImports | string): string;
+    addQObjectType(qObject: string): string;
+    addClientApi(clientApi: ClientApiImports): string;
+    addServiceObject(odataVersion: ODataVersions, serviceObject: ServiceImports): string;
+    addCustomType(moduleName: string, typeName: string, isTypeOnly?: boolean): string;
     private pathAndFile;
     private isDifferentFile;
     private addGeneratedImport;
     addGeneratedModel(fqName: string, name: string): string;
-    addGeneratedQObject(fqName: string, name: string): string;
+    addGeneratedQObject(fqName: string, name: string, isTypeOnly?: boolean): string;
     addGeneratedService(fqName: string, name: string): string;
-    getImportDeclarations(fromSubPath?: boolean): Array<ImportDeclarationStructure>;
+    private createImportDecl;
+    getImportDeclarations(): Array<OptionalKind<ImportDeclarationStructure>>;
     private getNamedImports;
     private getModuleSpecifier;
 }

package/lib/generator/ImportContainer.js

@@ -6,6 +6,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const odata_core_1 = require("@odata2ts/odata-core");
 const ImportObjects_1 = require("./import/ImportObjects");
 const ImportedNameValidator_1 = require("./ImportedNameValidator");
+function generateImportId() { }
 /**
  * Handles all the import statements for a given file.
  *
@@ -23,61 +24,66 @@ class ImportContainer {
         this.bundledFileGeneration = bundledFileGeneration;
         this.reservedNames = reservedNames;
         // mapping of a custom defined type to a primitive type
-        this.customTypes = new Map();
+        this.customTypes = {
+            regular: new Map(),
+            typeOnly: new Map(),
+        };
         // imports to generated artefacts
-        this.internalImports = new Map();
+        this.internalImports = {
+            regular: new Map(),
+            typeOnly: new Map(),
+        };
         this.libs = {
-            core: new Map(),
-            qObject: new Map(),
-            clientApi: new Map(),
-            service: new Map(),
+            core: { regular: new Map(), typeOnly: new Map() },
+            qObject: { regular: new Map(), typeOnly: new Map() },
+            clientApi: { regular: new Map(), typeOnly: new Map() },
+            service: { regular: new Map(), typeOnly: new Map() },
         };
         this.importedNameValidator = new ImportedNameValidator_1.ImportedNameValidator(reservedNames);
     }
-    addCoreLib(odataVersion, ...coreLibs) {
-        return coreLibs.map((coreLib) => {
-            const name = ImportObjects_1.CoreImports[coreLib] + (ImportObjects_1.VERSIONED_CORE_IMPORTS.includes(coreLib) ? odata_core_1.ODataVersions[odataVersion] : "");
-            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.core, name);
-            this.libs.core.set(name, importName);
-            return importName;
-        });
-    }
-    addFromQObject(...names) {
-        return names.map((n) => {
-            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.qObject, n);
-            this.libs.qObject.set(n, importName);
-            return importName;
-        });
-    }
-    addQObject(...qObjects) {
-        return this.addFromQObject(...qObjects.map((qObject) => ImportObjects_1.QueryObjectImports[qObject]));
-    }
-    addClientApi(...clientApis) {
-        return clientApis.map((clientApi) => {
-            const name = ImportObjects_1.ClientApiImports[clientApi];
-            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.clientApi, name);
-            this.libs.clientApi.set(name, importName);
-            return importName;
-        });
-    }
-    addServiceObject(odataVersion, ...serviceObjects) {
-        return serviceObjects
-            .map((so) => {
-            return ImportObjects_1.ServiceImports[so] + (ImportObjects_1.VERSIONED_SERVICE_IMPORTS.includes(so) ? odata_core_1.ODataVersions[odataVersion] : "");
-        })
-            .map((so) => {
-            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.service, so);
-            this.libs.service.set(so, importName);
-            return importName;
-        });
-    }
-    addCustomType(moduleName, typeName) {
-        let importList = this.customTypes.get(moduleName);
+    addCoreLib(odataVersion, coreLib) {
+        const isVersioned = ImportObjects_1.VERSIONED_CORE_IMPORTS.includes(coreLib);
+        const name = ImportObjects_1.CoreImports[coreLib] + (isVersioned ? odata_core_1.ODataVersions[odataVersion] : "");
+        const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.core, name);
+        // TODO: currently only types are imported, however enums could potentially be imported too
+        this.libs.core.typeOnly.set(name, importName);
+        return importName;
+    }
+    addFromQObject(name, typeOnlyImport = false) {
+        const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.qObject, name);
+        const imports = typeOnlyImport ? this.libs.qObject.typeOnly : this.libs.qObject.regular;
+        imports.set(name, importName);
+        return importName;
+    }
+    addQObject(qObject) {
+        return this.addFromQObject(qObject);
+    }
+    addQObjectType(qObject) {
+        return this.addFromQObject(qObject, true);
+    }
+    addClientApi(clientApi) {
+        const name = ImportObjects_1.ClientApiImports[clientApi];
+        const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.clientApi, name);
+        // complete client api consists only of types
+        this.libs.clientApi.typeOnly.set(name, importName);
+        return importName;
+    }
+    addServiceObject(odataVersion, serviceObject) {
+        const isVersioned = ImportObjects_1.VERSIONED_SERVICE_IMPORTS.includes(serviceObject);
+        const name = ImportObjects_1.ServiceImports[serviceObject] + (isVersioned ? odata_core_1.ODataVersions[odataVersion] : "");
+        const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.service, name);
+        // only regular imports for the service package
+        this.libs.service.regular.set(name, importName);
+        return importName;
+    }
+    addCustomType(moduleName, typeName, isTypeOnly = false) {
+        const importName = this.importedNameValidator.validateName(moduleName, typeName);
+        const imports = isTypeOnly ? this.customTypes.typeOnly : this.customTypes.regular;
+        let importList = imports.get(moduleName);
         if (!importList) {
             importList = new Map();
-            this.customTypes.set(moduleName, importList);
+            imports.set(moduleName, importList);
         }
-        const importName = this.importedNameValidator.validateName(moduleName, typeName);
         importList.set(typeName, importName);
         return importName;
     }
@@ -87,21 +93,22 @@ class ImportContainer {
     isDifferentFile(filePath, fileName) {
         return this.pathAndFile(this.path, this.fileName) !== this.pathAndFile(filePath, fileName);
     }
-    addGeneratedImport(folderPath, fileName, name) {
+    addGeneratedImport(folderPath, fileName, name, isTypeOnly = false) {
         // imports are only relevant for different files
         if (!this.isDifferentFile(folderPath, fileName)) {
             return name;
         }
         const moduleName = this.pathAndFile(folderPath, fileName);
         const importName = this.importedNameValidator.validateName(moduleName, name);
-        const imports = this.internalImports.get(moduleName) || new Map();
-        imports.set(name, importName);
-        this.internalImports.set(moduleName, imports);
+        const imports = isTypeOnly ? this.internalImports.typeOnly : this.internalImports.regular;
+        const importList = imports.get(moduleName) || new Map();
+        importList.set(name, importName);
+        imports.set(moduleName, importList);
         return importName;
     }
     addGeneratedModel(fqName, name) {
         if (this.bundledFileGeneration) {
-            return this.addGeneratedImport("", this.mainFileNames.model, name);
+            return this.addGeneratedImport("", this.mainFileNames.model, name, true);
         }
         else {
             const model = this.dataModel.getModel(fqName);
@@ -110,10 +117,10 @@ class ImportContainer {
             }
             const folderPath = model ? model.folderPath : "";
             const modelName = model ? model.modelName : this.mainFileNames.model;
-            return this.addGeneratedImport(folderPath, modelName, name);
+            return this.addGeneratedImport(folderPath, modelName, name, true);
         }
     }
-    addGeneratedQObject(fqName, name) {
+    addGeneratedQObject(fqName, name, isTypeOnly = false) {
         if (this.bundledFileGeneration) {
             return this.addGeneratedImport("", this.mainFileNames.qObject, name);
         }
@@ -124,7 +131,7 @@ class ImportContainer {
             }
             const folderPath = model ? model.folderPath : "";
             const qName = model ? model.qName : this.mainFileNames.qObject;
-            return this.addGeneratedImport(folderPath, qName, name);
+            return this.addGeneratedImport(folderPath, qName, name, isTypeOnly);
         }
     }
     addGeneratedService(fqName, name) {
@@ -136,32 +143,46 @@ class ImportContainer {
             return this.addGeneratedImport(model.folderPath, model.serviceName, name);
         }
     }
-    getImportDeclarations(fromSubPath = false) {
+    createImportDecl(module, toImport, isTypeOnly = false) {
+        return {
+            namedImports: this.getNamedImports(toImport),
+            moduleSpecifier: module,
+            isTypeOnly,
+        };
+    }
+    getImportDeclarations() {
         return [
-            ...Object.entries(this.libs)
-                .filter(([_, values]) => !!values.size)
+            ...Object.entries(this.libs).reduce((result, [moduleName, toImport]) => {
+                const module = ImportObjects_1.LIB_MODULES[moduleName];
+                if (toImport.typeOnly.size) {
+                    result.push(this.createImportDecl(module, toImport.typeOnly, true));
+                }
+                if (toImport.regular.size) {
+                    result.push(this.createImportDecl(module, toImport.regular));
+                }
+                return result;
+            }, []),
+            ...[...this.customTypes.typeOnly]
+                .filter(([moduleName, toImport]) => toImport.size > 0)
+                .map(([moduleName, toImport]) => {
+                return this.createImportDecl(moduleName, toImport, true);
+            }),
+            ...[...this.customTypes.regular]
+                .filter(([moduleName, toImport]) => toImport.size > 0)
                 .map(([moduleName, toImport]) => {
-                return {
-                    namedImports: this.getNamedImports(toImport),
-                    moduleSpecifier: ImportObjects_1.LIB_MODULES[moduleName],
-                };
+                return this.createImportDecl(moduleName, toImport);
             }),
-            ...[...this.customTypes.keys()]
-                .filter((moduleName) => { var _a; return !!((_a = this.customTypes.get(moduleName)) === null || _a === void 0 ? void 0 : _a.size); })
-                .map((moduleName) => {
-                const toImport = this.customTypes.get(moduleName);
-                return {
-                    namedImports: this.getNamedImports(toImport),
-                    moduleSpecifier: moduleName,
-                };
+            ...[...this.internalImports.typeOnly]
+                .filter(([_, toImport]) => toImport.size > 0)
+                .map(([key, toImport]) => {
+                const module = this.getModuleSpecifier(key);
+                return this.createImportDecl(module, toImport, true);
             }),
-            ...[...this.internalImports.entries()]
+            ...[...this.internalImports.regular]
                 .filter(([_, toImport]) => toImport.size > 0)
                 .map(([key, toImport]) => {
-                return {
-                    namedImports: this.getNamedImports(toImport),
-                    moduleSpecifier: this.getModuleSpecifier(key),
-                };
+                const module = this.getModuleSpecifier(key);
+                return this.createImportDecl(module, toImport);
             }),
         ];
     }

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\";\r\n\r\nimport { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { ImportDeclarationStructure } from \"ts-morph\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport { ComplexType, OperationType } from \"../data-model/DataTypeModel\";\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\";\r\nimport { ImportedNameValidator } from \"./ImportedNameValidator\";\r\n\r\ntype ImportContainerType = Record<keyof typeof LIB_MODULES, Map<string, string>>;\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 = new Map<string, Map<string, string>>();\r\n  // imports to generated artefacts\r\n  private internalImports = new Map<string, Map<string, string>>();\r\n\r\n  private libs: ImportContainerType = {\r\n    core: new Map(),\r\n    qObject: new Map(),\r\n    clientApi: new Map(),\r\n    service: 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, ...coreLibs: Array<CoreImports>) {\r\n    return coreLibs.map((coreLib) => {\r\n      const name = CoreImports[coreLib] + (VERSIONED_CORE_IMPORTS.includes(coreLib) ? ODataVersions[odataVersion] : \"\");\r\n      const importName = this.importedNameValidator.validateName(LIB_MODULES.core, name);\r\n      this.libs.core.set(name, importName);\r\n      return importName;\r\n    });\r\n  }\r\n\r\n  public addFromQObject(...names: Array<string>) {\r\n    return names.map((n) => {\r\n      const importName = this.importedNameValidator.validateName(LIB_MODULES.qObject, n);\r\n      this.libs.qObject.set(n, importName);\r\n      return importName;\r\n    });\r\n  }\r\n\r\n  public addQObject(...qObjects: Array<QueryObjectImports>) {\r\n    return this.addFromQObject(...qObjects.map((qObject) => QueryObjectImports[qObject]));\r\n  }\r\n\r\n  public addClientApi(...clientApis: Array<ClientApiImports>) {\r\n    return clientApis.map((clientApi) => {\r\n      const name = ClientApiImports[clientApi];\r\n      const importName = this.importedNameValidator.validateName(LIB_MODULES.clientApi, name);\r\n      this.libs.clientApi.set(name, importName);\r\n      return importName;\r\n    });\r\n  }\r\n\r\n  public addServiceObject(odataVersion: ODataVersions, ...serviceObjects: Array<ServiceImports>) {\r\n    return serviceObjects\r\n      .map((so) => {\r\n        return ServiceImports[so] + (VERSIONED_SERVICE_IMPORTS.includes(so) ? ODataVersions[odataVersion] : \"\");\r\n      })\r\n      .map((so) => {\r\n        const importName = this.importedNameValidator.validateName(LIB_MODULES.service, so);\r\n        this.libs.service.set(so, importName);\r\n        return importName;\r\n      });\r\n  }\r\n\r\n  public addCustomType(moduleName: string, typeName: string) {\r\n    let importList = this.customTypes.get(moduleName);\r\n    if (!importList) {\r\n      importList = new Map();\r\n      this.customTypes.set(moduleName, importList);\r\n    }\r\n\r\n    const importName = this.importedNameValidator.validateName(moduleName, typeName);\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): 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\r\n    const imports = this.internalImports.get(moduleName) || new Map<string, string>();\r\n    imports.set(name, importName);\r\n    this.internalImports.set(moduleName, imports);\r\n\r\n    return importName;\r\n  }\r\n\r\n  public addGeneratedModel(fqName: string, name: string): string {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.model, name);\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);\r\n    }\r\n  }\r\n\r\n  public addGeneratedQObject(fqName: string, name: string) {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.qObject, name);\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);\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  public getImportDeclarations(fromSubPath: boolean = false): Array<ImportDeclarationStructure> {\r\n    return [\r\n      ...Object.entries(this.libs)\r\n        .filter(([_, values]) => !!values.size)\r\n        .map(([moduleName, toImport]) => {\r\n          return {\r\n            namedImports: this.getNamedImports(toImport),\r\n            moduleSpecifier: LIB_MODULES[moduleName as keyof typeof LIB_MODULES],\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...[...this.customTypes.keys()]\r\n        .filter((moduleName) => !!this.customTypes.get(moduleName)?.size)\r\n        .map((moduleName) => {\r\n          const toImport = this.customTypes.get(moduleName)!;\r\n          return {\r\n            namedImports: this.getNamedImports(toImport),\r\n            moduleSpecifier: moduleName,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...[...this.internalImports.entries()]\r\n        .filter(([_, toImport]) => toImport.size > 0)\r\n        .map(([key, toImport]) => {\r\n          return {\r\n            namedImports: this.getNamedImports(toImport),\r\n            moduleSpecifier: this.getModuleSpecifier(key),\r\n          } as ImportDeclarationStructure;\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"]}
+{"version":3,"file":"ImportContainer.js","sourceRoot":"","sources":["../../src/generator/ImportContainer.ts"],"names":[],"mappings":"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","sourcesContent":["import path from \"path\";\r\n\r\nimport { ODataVersions } from \"@odata2ts/odata-core\";\r\nimport { ImportDeclarationStructure, OptionalKind } from \"ts-morph\";\r\n\r\nimport { DataModel } from \"../data-model/DataModel\";\r\nimport { ComplexType, OperationType } from \"../data-model/DataTypeModel\";\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\";\r\nimport { ImportedNameValidator } from \"./ImportedNameValidator\";\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\nfunction generateImportId() {}\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  private addFromQObject(name: string, typeOnlyImport = false) {\r\n    const importName = this.importedNameValidator.validateName(LIB_MODULES.qObject, name);\r\n\r\n    const imports = typeOnlyImport ? this.libs.qObject.typeOnly : this.libs.qObject.regular;\r\n    imports.set(name, importName);\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  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    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): string {\r\n    if (this.bundledFileGeneration) {\r\n      return this.addGeneratedImport(\"\", this.mainFileNames.model, name, true);\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, true);\r\n    }\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);\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/ModelGenerator.js

@@ -140,13 +140,13 @@ class ModelGenerator {
         // V2 entity special: deferred content
         let suffix = "";
         if (this.dataModel.isV2() && prop.dataType == "ModelType" /* DataTypes.ModelType */) {
-            const [defContent] = imports.addCoreLib(this.version, ImportObjects_1.CoreImports.DeferredContent);
+            const defContent = imports.addCoreLib(this.version, ImportObjects_1.CoreImports.DeferredContent);
             suffix = ` | ${defContent}`;
         }
         let typeName;
         if (prop.dataType === "PrimitiveType" /* DataTypes.PrimitiveType */) {
             // custom types which require type imports => possible via converters
-            typeName = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type) : prop.type;
+            typeName = prop.typeModule ? imports.addCustomType(prop.typeModule, prop.type, true) : prop.type;
         }
         else {
             typeName = imports.addGeneratedModel(prop.fqType, prop.type);
@@ -234,20 +234,45 @@ class ModelGenerator {
         });
     }
     generateOperationParams(file, operation) {
-        if (!operation.parameters.length) {
-            return;
+        var _a;
+        const paramSets = [operation.parameters, ...((_a = operation.overrides) !== null && _a !== void 0 ? _a : [])].filter((pSet) => !!pSet.length);
+        // standard: one interface for parameters
+        if (paramSets.length === 1) {
+            file.getFile().addInterface({
+                name: operation.paramsModelName,
+                isExported: true,
+                properties: paramSets[0].map((p) => {
+                    return {
+                        name: p.name,
+                        type: this.getPropType(file.getImports(), p),
+                        hasQuestionToken: !p.required,
+                    };
+                }),
+            });
+        }
+        // function overload: one type with intersections of different param models
+        else if (paramSets.length > 1) {
+            file.getFile().addTypeAlias({
+                name: operation.paramsModelName,
+                isExported: true,
+                type: (writer) => {
+                    paramSets.forEach((pSet, index) => {
+                        writer.block(() => {
+                            pSet.forEach((param, index) => {
+                                const paramType = this.getPropType(file.getImports(), param);
+                                writer.write(`${param.name}${param.required ? "" : "?"}: ${paramType}`);
+                                if (index < pSet.length - 1) {
+                                    writer.write(",");
+                                }
+                            });
+                        });
+                        if (index < paramSets.length - 1) {
+                            writer.write(" | ");
+                        }
+                    });
+                },
+            });
         }
-        file.getFile().addInterface({
-            name: operation.paramsModelName,
-            isExported: true,
-            properties: operation.parameters.map((p) => {
-                return {
-                    name: p.name,
-                    type: this.getPropType(file.getImports(), p),
-                    hasQuestionToken: !p.required,
-                };
-            }),
-        });
     }
 }
 //# sourceMappingURL=ModelGenerator.js.map