@odata2ts/odata2ts 0.33.0 → 0.33.2

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

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NameClashValidator = void 0;
+const TypeModel_1 = require("../../TypeModel");
+class NameClashValidator {
+    constructor(options = {}) {
+        this.options = options;
+        this.entityContainer = new Map();
+        this.store = new Map();
+        this.errors = new Map();
+    }
+    addToError(name, hit, validationObject) {
+        var _a;
+        const existingErrors = this.errors.get(name);
+        if (existingErrors) {
+            if (!this.options.disableAutomaticNameClashResolution) {
+                validationObject.renamedTo = `${name}${existingErrors.length + 1}`;
+            }
+            existingErrors.push(validationObject);
+        }
+        else {
+            if (!this.options.disableAutomaticNameClashResolution) {
+                validationObject.renamedTo = `${name}2`;
+            }
+            this.errors.set(name, [hit, validationObject]);
+        }
+        return (_a = validationObject.renamedTo) !== null && _a !== void 0 ? _a : name;
+    }
+    addToTypes(fqName, name, type) {
+        const validationObject = { type, fqName };
+        const hit = this.store.get(name);
+        if (hit) {
+            return this.addToError(name, hit, validationObject);
+        }
+        else {
+            this.store.set(name, validationObject);
+            return name;
+        }
+    }
+    addToEntityContainer(fqName, name, type) {
+        const validationObject = { type, fqName };
+        const hit = this.entityContainer.get(name);
+        if (hit) {
+            return this.addToError(name, hit, validationObject);
+        }
+        else {
+            this.entityContainer.set(name, validationObject);
+            return name;
+        }
+    }
+    addEntityType(fqName, name) {
+        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.EntityType);
+    }
+    addComplexType(fqName, name) {
+        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.ComplexType);
+    }
+    addEnumType(fqName, name) {
+        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.EnumType);
+    }
+    addUnboundOperationType(fqName, name) {
+        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.OperationType);
+    }
+    addBoundOperationType(bindingName, fqName, name) {
+        const nameWithBinding = `${bindingName}_${name}`;
+        const validationObject = { type: TypeModel_1.TypeModel.OperationType, fqName };
+        const hit = this.store.get(nameWithBinding);
+        if (hit) {
+            return this.addToError(name, hit, validationObject);
+        }
+        else {
+            this.store.set(nameWithBinding, validationObject);
+            return name;
+        }
+    }
+    addOperationImportType(fqName, name) {
+        return this.addToEntityContainer(fqName, name, TypeModel_1.TypeModel.OperationImportType);
+    }
+    addEntitySet(fqName, name) {
+        return this.addToEntityContainer(fqName, name, TypeModel_1.TypeModel.EntitySet);
+    }
+    addSingleton(fqName, name) {
+        return this.addToEntityContainer(fqName, name, TypeModel_1.TypeModel.Singleton);
+    }
+    validate() {
+        return this.errors;
+    }
+}
+exports.NameClashValidator = NameClashValidator;
+//# sourceMappingURL=NameClashValidator.js.map

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

@@ -0,0 +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"]}

package/lib/data-model/validation/NameValidator.d.ts

@@ -1,21 +1,5 @@
-import { ConfigFileOptions } from "../../OptionModel";
 import { TypeModel } from "../../TypeModel";
-export interface ValidationError {
-    fqName: string;
-    type: TypeModel;
-    renamedTo?: string;
-}
-export interface NameValidatorOptions extends Pick<ConfigFileOptions, "disableAutomaticNameClashResolution"> {
-}
-export declare class NameValidator {
-    private options;
-    private entityContainer;
-    private store;
-    private errors;
-    constructor(options?: NameValidatorOptions);
-    private addToError;
-    private addToTypes;
-    private addToEntityContainer;
+export interface NameValidator {
     addEntityType(fqName: string, name: string): string;
     addComplexType(fqName: string, name: string): string;
     addEnumType(fqName: string, name: string): string;
@@ -26,3 +10,8 @@ export declare class NameValidator {
     addSingleton(fqName: string, name: string): string;
     validate(): Map<string, ValidationError[]>;
 }
+export interface ValidationError {
+    fqName: string;
+    type: TypeModel;
+    renamedTo?: string;
+}

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

@@ -1,80 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NameValidator = void 0;
-const TypeModel_1 = require("../../TypeModel");
-class NameValidator {
-    constructor(options = {}) {
-        this.options = options;
-        this.entityContainer = new Map();
-        this.store = new Map();
-        this.errors = new Map();
-    }
-    addToError(name, hit, validationObject) {
-        var _a;
-        const existingErrors = this.errors.get(name);
-        if (existingErrors) {
-            if (!this.options.disableAutomaticNameClashResolution) {
-                validationObject.renamedTo = `${name}${existingErrors.length + 1}`;
-            }
-            existingErrors.push(validationObject);
-        }
-        else {
-            if (!this.options.disableAutomaticNameClashResolution) {
-                validationObject.renamedTo = `${name}2`;
-            }
-            this.errors.set(name, [hit, validationObject]);
-        }
-        return (_a = validationObject.renamedTo) !== null && _a !== void 0 ? _a : name;
-    }
-    addToTypes(fqName, name, type) {
-        const validationObject = { type, fqName };
-        const hit = this.store.get(name);
-        if (hit) {
-            return this.addToError(name, hit, validationObject);
-        }
-        else {
-            this.store.set(name, validationObject);
-            return name;
-        }
-    }
-    addToEntityContainer(fqName, name, type) {
-        const validationObject = { type, fqName };
-        const hit = this.entityContainer.get(name);
-        if (hit) {
-            return this.addToError(name, hit, validationObject);
-        }
-        else {
-            this.entityContainer.set(name, validationObject);
-            return name;
-        }
-    }
-    addEntityType(fqName, name) {
-        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.EntityType);
-    }
-    addComplexType(fqName, name) {
-        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.ComplexType);
-    }
-    addEnumType(fqName, name) {
-        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.EnumType);
-    }
-    addUnboundOperationType(fqName, name) {
-        return this.addToTypes(fqName, name, TypeModel_1.TypeModel.OperationType);
-    }
-    addBoundOperationType(bindingName, fqName, name) {
-        return this.addToTypes(`${bindingName}_${fqName}`, name, TypeModel_1.TypeModel.OperationType);
-    }
-    addOperationImportType(fqName, name) {
-        return this.addToEntityContainer(fqName, name, TypeModel_1.TypeModel.OperationImportType);
-    }
-    addEntitySet(fqName, name) {
-        return this.addToEntityContainer(fqName, name, TypeModel_1.TypeModel.EntitySet);
-    }
-    addSingleton(fqName, name) {
-        return this.addToEntityContainer(fqName, name, TypeModel_1.TypeModel.Singleton);
-    }
-    validate() {
-        return this.errors;
-    }
-}
-exports.NameValidator = NameValidator;
 //# sourceMappingURL=NameValidator.js.map

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

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

package/lib/data-model/validation/NoopValidator.d.ts

@@ -0,0 +1,12 @@
+import { NameValidator, ValidationError } from "./NameValidator";
+export declare class NoopValidator implements NameValidator {
+    addBoundOperationType(bindingName: string, fqName: string, name: string): string;
+    addComplexType(fqName: string, name: string): string;
+    addEntitySet(fqName: string, name: string): string;
+    addEntityType(fqName: string, name: string): string;
+    addEnumType(fqName: string, name: string): string;
+    addOperationImportType(fqName: string, name: string): string;
+    addSingleton(fqName: string, name: string): string;
+    addUnboundOperationType(fqName: string, name: string): string;
+    validate(): Map<string, ValidationError[]>;
+}

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoopValidator = void 0;
+class NoopValidator {
+    addBoundOperationType(bindingName, fqName, name) {
+        return name;
+    }
+    addComplexType(fqName, name) {
+        return name;
+    }
+    addEntitySet(fqName, name) {
+        return name;
+    }
+    addEntityType(fqName, name) {
+        return name;
+    }
+    addEnumType(fqName, name) {
+        return name;
+    }
+    addOperationImportType(fqName, name) {
+        return name;
+    }
+    addSingleton(fqName, name) {
+        return name;
+    }
+    addUnboundOperationType(fqName, name) {
+        return name;
+    }
+    validate() {
+        return new Map();
+    }
+}
+exports.NoopValidator = NoopValidator;
+//# sourceMappingURL=NoopValidator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"NoopValidator.js","sourceRoot":"","sources":["../../../src/data-model/validation/NoopValidator.ts"],"names":[],"mappings":";;;AAGA,MAAa,aAAa;IACxB,qBAAqB,CAAC,WAAmB,EAAE,MAAc,EAAE,IAAY;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,CAAC,MAAc,EAAE,IAAY;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,MAAc,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,IAAY;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,MAAc,EAAE,IAAY;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sBAAsB,CAAC,MAAc,EAAE,IAAY;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,MAAc,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uBAAuB,CAAC,MAAc,EAAE,IAAY;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;CACF;AApCD,sCAoCC","sourcesContent":["import { TypeModel } from \"../../TypeModel\";\nimport { NameValidator, ValidationError } from \"./NameValidator\";\n\nexport class NoopValidator implements NameValidator {\n  addBoundOperationType(bindingName: string, fqName: string, name: string): string {\n    return name;\n  }\n\n  addComplexType(fqName: string, name: string): string {\n    return name;\n  }\n\n  addEntitySet(fqName: string, name: string): string {\n    return name;\n  }\n\n  addEntityType(fqName: string, name: string): string {\n    return name;\n  }\n\n  addEnumType(fqName: string, name: string): string {\n    return name;\n  }\n\n  addOperationImportType(fqName: string, name: string): string {\n    return name;\n  }\n\n  addSingleton(fqName: string, name: string): string {\n    return name;\n  }\n\n  addUnboundOperationType(fqName: string, name: string): string {\n    return name;\n  }\n\n  validate(): Map<string, ValidationError[]> {\n    return new Map();\n  }\n}\n"]}

package/lib/defaultConfig.js

@@ -27,6 +27,7 @@ const defaultConfig = {
     v2ModelsWithExtraResultsWrapping: false,
     v4BigNumberAsString: false,
     disableAutomaticNameClashResolution: false,
+    bundledFileGeneration: true,
     naming: {
         models: {
             namingStrategy: NamingModel_1.NamingStrategies.PASCAL_CASE,

package/lib/defaultConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../src/defaultConfig.ts"],"names":[],"mappings":";;;;AAAA,kEAAkC;AAElC,+CAA+D;AAC/D,+CAA6D;AAG7D;;GAEG;AACH,MAAM,aAAa,GAAyB;IAC1C,eAAe,EAAE,EAAE;IACnB,WAAW,EAAE,KAAK;IAClB,IAAI,EAAE,mBAAK,CAAC,GAAG;IACf,QAAQ,EAAE,uBAAS,CAAC,MAAM;IAC1B,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,eAAe;IACzB,UAAU,EAAE,EAAE;IACd,kBAAkB,EAAE,KAAK;IACzB,YAAY,EAAE,KAAK;IACnB,cAAc,EAAE,KAAK;IACrB,YAAY,EAAE,KAAK;IACnB,+BAA+B,EAAE,KAAK;IACtC,qBAAqB,EAAE,KAAK;IAC5B,aAAa,EAAE,KAAK;IACpB,gCAAgC,EAAE,KAAK;IACvC,mBAAmB,EAAE,KAAK;IAC1B,mCAAmC,EAAE,KAAK;IAC1C,MAAM,EAAE;QACN,MAAM,EAAE;YACN,cAAc,EAAE,8BAAgB,CAAC,WAAW;YAC5C,kBAAkB,EAAE,8BAAgB,CAAC,UAAU;YAC/C,cAAc,EAAE;gBACd,MAAM,EAAE,UAAU;gBAClB,MAAM,EAAE,EAAE;gBACV,gBAAgB,EAAE,IAAI;aACvB;YACD,QAAQ,EAAE;gBACR,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,IAAI;gBACZ,gBAAgB,EAAE,IAAI;aACvB;YACD,oBAAoB,EAAE;gBACpB,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,QAAQ;gBAChB,gBAAgB,EAAE,IAAI;aACvB;YACD,QAAQ,EAAE;gBACR,cAAc,EAAE,8BAAgB,CAAC,WAAW;gBAC5C,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,OAAO;aAChB;SACF;QACD,YAAY,EAAE;YACZ,cAAc,EAAE,8BAAgB,CAAC,WAAW;YAC5C,kBAAkB,EAAE,8BAAgB,CAAC,UAAU;YAC/C,MAAM,EAAE,GAAG;YACX,MAAM,EAAE,EAAE;YACV,WAAW,EAAE;gBACX,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,IAAI;aACb;YACD,QAAQ,EAAE;gBACR,cAAc,EAAE,8BAAgB,CAAC,WAAW;gBAC5C,MAAM,EAAE,GAAG;gBACX,MAAM,EAAE,EAAE;aACX;SACF;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,SAAS;YACjB,cAAc,EAAE,8BAAgB,CAAC,WAAW;YAC5C,IAAI,EAAE;gBACJ,kBAAkB,EAAE,IAAI;aACzB;YACD,UAAU,EAAE;gBACV,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,YAAY;gBACpB,kBAAkB,EAAE,IAAI;aACzB;YACD,UAAU,EAAE;gBACV,cAAc,EAAE,8BAAgB,CAAC,UAAU;aAC5C;YACD,oBAAoB,EAAE;gBACpB,cAAc,EAAE,8BAAgB,CAAC,UAAU;gBAC3C,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,EAAE;aACX;YACD,YAAY,EAAE;gBACZ,cAAc,EAAE,8BAAgB,CAAC,UAAU;gBAC3C,MAAM,EAAE,GAAG;gBACX,MAAM,EAAE,EAAE;aACX;SACF;KACF;IACD,gBAAgB,EAAE,EAAE;IACpB,aAAa,EAAE,EAAE;CAClB,CAAC;AAEF,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC;AAChE,MAAM,mBAAmB,GAAiB;IACxC,MAAM,EAAE;QACN,QAAQ,EAAE;YACR,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;YAC9B,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;SAC/B;QACD,QAAQ,EAAE;YACR,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;YAC9B,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;SAC/B;QACD,cAAc,EAAE;YACd,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM;YACpC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM;SACrC;QACD,oBAAoB,EAAE;YACpB,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,MAAM;YAC1C,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,MAAM;SAC3C;KACF;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,QAAQ,EAAE;YACR,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM;YACpC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM;SACrC;QACD,WAAW,EAAE;YACX,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM;YACvC,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,MAAM;SACxC;KACF;IACD,QAAQ,EAAE;QACR,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,IAAI,EAAE;YACJ,kBAAkB,EAAE,IAAI;SACzB;QACD,UAAU,EAAE;YACV,kBAAkB,EAAE,IAAI;YACxB,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM;YAClC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM;SACnC;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,MAAM;YACpC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,MAAM;SACrC;QACD,oBAAoB,EAAE;YACpB,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,MAAM;YAC5C,MAAM,EAAE,QAAQ,CAAC,oBAAoB,CAAC,MAAM;SAC7C;KACF;CACF,CAAC;AAEF;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,OAAO,IAAA,mBAAS,EAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AAFD,4CAEC;AAED;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,MAAM,EAAE,MAAM,KAAqB,aAAa,EAA7B,WAAW,kBAAK,aAAa,EAA1C,UAA0B,CAAgB,CAAC;IACjD,OAAO,IAAA,mBAAS,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAC;AACjE,CAAC;AAHD,4CAGC","sourcesContent":["import deepmerge from \"deepmerge\";\r\n\r\nimport { NameSettings, NamingStrategies } from \"./NamingModel\";\r\nimport { EmitModes, Modes, RunOptions } from \"./OptionModel\";\r\n\r\nexport type DefaultConfiguration = Omit<RunOptions, \"sourceUrl\" | \"source\" | \"output\" | \"serviceName\">;\r\n/**\r\n * The default configuration.\r\n */\r\nconst defaultConfig: DefaultConfiguration = {\r\n  sourceUrlConfig: {},\r\n  refreshFile: false,\r\n  mode: Modes.all,\r\n  emitMode: EmitModes.js_dts,\r\n  debug: false,\r\n  prettier: false,\r\n  tsconfig: \"tsconfig.json\",\r\n  converters: [],\r\n  skipEditableModels: false,\r\n  skipIdModels: false,\r\n  skipOperations: false,\r\n  skipComments: false,\r\n  enablePrimitivePropertyServices: false,\r\n  disableAutoManagedKey: false,\r\n  allowRenaming: false,\r\n  v2ModelsWithExtraResultsWrapping: false,\r\n  v4BigNumberAsString: false,\r\n  disableAutomaticNameClashResolution: false,\r\n  naming: {\r\n    models: {\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\r\n      editableModels: {\r\n        prefix: \"Editable\",\r\n        suffix: \"\",\r\n        applyModelNaming: true,\r\n      },\r\n      idModels: {\r\n        prefix: \"\",\r\n        suffix: \"Id\",\r\n        applyModelNaming: true,\r\n      },\r\n      operationParamModels: {\r\n        prefix: \"\",\r\n        suffix: \"Params\",\r\n        applyModelNaming: true,\r\n      },\r\n      fileName: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n        prefix: \"\",\r\n        suffix: \"Model\",\r\n      },\r\n    },\r\n    queryObjects: {\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\r\n      prefix: \"Q\",\r\n      suffix: \"\",\r\n      idFunctions: {\r\n        prefix: \"\",\r\n        suffix: \"Id\",\r\n      },\r\n      fileName: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n        prefix: \"Q\",\r\n        suffix: \"\",\r\n      },\r\n    },\r\n    services: {\r\n      prefix: \"\",\r\n      suffix: \"Service\",\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      main: {\r\n        applyServiceNaming: true,\r\n      },\r\n      collection: {\r\n        prefix: \"\",\r\n        suffix: \"Collection\",\r\n        applyServiceNaming: true,\r\n      },\r\n      operations: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n      },\r\n      relatedServiceGetter: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"\",\r\n        suffix: \"\",\r\n      },\r\n      privateProps: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"_\",\r\n        suffix: \"\",\r\n      },\r\n    },\r\n  },\r\n  propertiesByName: [],\r\n  byTypeAndName: [],\r\n};\r\n\r\nconst { models, queryObjects, services } = defaultConfig.naming;\r\nconst minimalNamingConfig: NameSettings = {\r\n  models: {\r\n    fileName: {\r\n      prefix: models.fileName.prefix,\r\n      suffix: models.fileName.suffix,\r\n    },\r\n    idModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.idModels.prefix,\r\n      suffix: models.idModels.suffix,\r\n    },\r\n    editableModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.editableModels.prefix,\r\n      suffix: models.editableModels.suffix,\r\n    },\r\n    operationParamModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.operationParamModels.prefix,\r\n      suffix: models.operationParamModels.suffix,\r\n    },\r\n  },\r\n  queryObjects: {\r\n    prefix: queryObjects.prefix,\r\n    suffix: queryObjects.suffix,\r\n    fileName: {\r\n      prefix: queryObjects.fileName.prefix,\r\n      suffix: queryObjects.fileName.suffix,\r\n    },\r\n    idFunctions: {\r\n      prefix: queryObjects.idFunctions.prefix,\r\n      suffix: queryObjects.idFunctions.suffix,\r\n    },\r\n  },\r\n  services: {\r\n    prefix: services.prefix,\r\n    suffix: services.suffix,\r\n    main: {\r\n      applyServiceNaming: true,\r\n    },\r\n    collection: {\r\n      applyServiceNaming: true,\r\n      prefix: services.collection.prefix,\r\n      suffix: services.collection.suffix,\r\n    },\r\n    privateProps: {\r\n      prefix: services.privateProps.prefix,\r\n      suffix: services.privateProps.suffix,\r\n    },\r\n    relatedServiceGetter: {\r\n      prefix: services.relatedServiceGetter.prefix,\r\n      suffix: services.relatedServiceGetter.suffix,\r\n    },\r\n  },\r\n};\r\n\r\n/**\r\n * Creates a defensive copy of the default config.\r\n */\r\nexport function getDefaultConfig(): DefaultConfiguration {\r\n  return deepmerge(defaultConfig, {});\r\n}\r\n\r\n/**\r\n * Creates a defensive copy of the minimal config: minimal in respect to naming.\r\n */\r\nexport function getMinimalConfig(): DefaultConfiguration {\r\n  const { naming, ...passThrough } = defaultConfig;\r\n  return deepmerge(passThrough, { naming: minimalNamingConfig });\r\n}\r\n"]}
+{"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../src/defaultConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import deepmerge from \"deepmerge\";\r\n\r\nimport { NameSettings, NamingStrategies } from \"./NamingModel\";\r\nimport { EmitModes, Modes, RunOptions } from \"./OptionModel\";\r\n\r\nexport type DefaultConfiguration = Omit<RunOptions, \"sourceUrl\" | \"source\" | \"output\" | \"serviceName\">;\r\n/**\r\n * The default configuration.\r\n */\r\nconst defaultConfig: DefaultConfiguration = {\r\n  sourceUrlConfig: {},\r\n  refreshFile: false,\r\n  mode: Modes.all,\r\n  emitMode: EmitModes.js_dts,\r\n  debug: false,\r\n  prettier: false,\r\n  tsconfig: \"tsconfig.json\",\r\n  converters: [],\r\n  skipEditableModels: false,\r\n  skipIdModels: false,\r\n  skipOperations: false,\r\n  skipComments: false,\r\n  enablePrimitivePropertyServices: false,\r\n  disableAutoManagedKey: false,\r\n  allowRenaming: false,\r\n  v2ModelsWithExtraResultsWrapping: false,\r\n  v4BigNumberAsString: false,\r\n  disableAutomaticNameClashResolution: false,\r\n  bundledFileGeneration: true,\r\n  naming: {\r\n    models: {\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\r\n      editableModels: {\r\n        prefix: \"Editable\",\r\n        suffix: \"\",\r\n        applyModelNaming: true,\r\n      },\r\n      idModels: {\r\n        prefix: \"\",\r\n        suffix: \"Id\",\r\n        applyModelNaming: true,\r\n      },\r\n      operationParamModels: {\r\n        prefix: \"\",\r\n        suffix: \"Params\",\r\n        applyModelNaming: true,\r\n      },\r\n      fileName: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n        prefix: \"\",\r\n        suffix: \"Model\",\r\n      },\r\n    },\r\n    queryObjects: {\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      propNamingStrategy: NamingStrategies.CAMEL_CASE,\r\n      prefix: \"Q\",\r\n      suffix: \"\",\r\n      idFunctions: {\r\n        prefix: \"\",\r\n        suffix: \"Id\",\r\n      },\r\n      fileName: {\r\n        namingStrategy: NamingStrategies.PASCAL_CASE,\r\n        prefix: \"Q\",\r\n        suffix: \"\",\r\n      },\r\n    },\r\n    services: {\r\n      prefix: \"\",\r\n      suffix: \"Service\",\r\n      namingStrategy: NamingStrategies.PASCAL_CASE,\r\n      main: {\r\n        applyServiceNaming: true,\r\n      },\r\n      collection: {\r\n        prefix: \"\",\r\n        suffix: \"Collection\",\r\n        applyServiceNaming: true,\r\n      },\r\n      operations: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n      },\r\n      relatedServiceGetter: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"\",\r\n        suffix: \"\",\r\n      },\r\n      privateProps: {\r\n        namingStrategy: NamingStrategies.CAMEL_CASE,\r\n        prefix: \"_\",\r\n        suffix: \"\",\r\n      },\r\n    },\r\n  },\r\n  propertiesByName: [],\r\n  byTypeAndName: [],\r\n};\r\n\r\nconst { models, queryObjects, services } = defaultConfig.naming;\r\nconst minimalNamingConfig: NameSettings = {\r\n  models: {\r\n    fileName: {\r\n      prefix: models.fileName.prefix,\r\n      suffix: models.fileName.suffix,\r\n    },\r\n    idModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.idModels.prefix,\r\n      suffix: models.idModels.suffix,\r\n    },\r\n    editableModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.editableModels.prefix,\r\n      suffix: models.editableModels.suffix,\r\n    },\r\n    operationParamModels: {\r\n      applyModelNaming: true,\r\n      prefix: models.operationParamModels.prefix,\r\n      suffix: models.operationParamModels.suffix,\r\n    },\r\n  },\r\n  queryObjects: {\r\n    prefix: queryObjects.prefix,\r\n    suffix: queryObjects.suffix,\r\n    fileName: {\r\n      prefix: queryObjects.fileName.prefix,\r\n      suffix: queryObjects.fileName.suffix,\r\n    },\r\n    idFunctions: {\r\n      prefix: queryObjects.idFunctions.prefix,\r\n      suffix: queryObjects.idFunctions.suffix,\r\n    },\r\n  },\r\n  services: {\r\n    prefix: services.prefix,\r\n    suffix: services.suffix,\r\n    main: {\r\n      applyServiceNaming: true,\r\n    },\r\n    collection: {\r\n      applyServiceNaming: true,\r\n      prefix: services.collection.prefix,\r\n      suffix: services.collection.suffix,\r\n    },\r\n    privateProps: {\r\n      prefix: services.privateProps.prefix,\r\n      suffix: services.privateProps.suffix,\r\n    },\r\n    relatedServiceGetter: {\r\n      prefix: services.relatedServiceGetter.prefix,\r\n      suffix: services.relatedServiceGetter.suffix,\r\n    },\r\n  },\r\n};\r\n\r\n/**\r\n * Creates a defensive copy of the default config.\r\n */\r\nexport function getDefaultConfig(): DefaultConfiguration {\r\n  return deepmerge(defaultConfig, {});\r\n}\r\n\r\n/**\r\n * Creates a defensive copy of the minimal config: minimal in respect to naming.\r\n */\r\nexport function getMinimalConfig(): DefaultConfiguration {\r\n  const { naming, ...passThrough } = defaultConfig;\r\n  return deepmerge(passThrough, { naming: minimalNamingConfig });\r\n}\r\n"]}

package/lib/generator/ImportContainer.d.ts

@@ -1,15 +1,48 @@
+import { ODataVersions } from "@odata2ts/odata-core";
 import { ImportDeclarationStructure } from "ts-morph";
-import { ProjectFiles } from "../data-model/DataModel";
+import { DataModel } from "../data-model/DataModel";
+import { ClientApiImports, CoreImports, QueryObjectImports, ServiceImports } from "./import/ImportObjects";
+/**
+ * Handles all the import statements for a given file.
+ *
+ * Features a renaming mechanism, so that when the import name conflicts with an existing import a new
+ * name is generated and returned.
+ *
+ * Map<string,string>
+ */
 export declare class ImportContainer {
-    private mapping;
-    private container;
-    constructor(fileNames: ProjectFiles);
-    addFromCore(...names: Array<string>): void;
-    addFromQObject(...names: Array<string>): void;
-    addFromClientApi(...names: Array<string>): void;
-    addFromService(...names: Array<string>): void;
-    addGeneratedModel(...names: Array<string>): void;
-    addGeneratedQObject(...names: Array<string>): void;
-    addCustomType(moduleName: string, typeName: string): void;
+    protected path: string;
+    protected fileName: string;
+    protected dataModel: DataModel;
+    protected mainFileNames: {
+        model: string;
+        qObject: string;
+        service: string;
+    };
+    protected readonly bundledFileGeneration: boolean;
+    protected reservedNames: Array<string> | undefined;
+    private readonly importedNameValidator;
+    private customTypes;
+    private internalImports;
+    private libs;
+    constructor(path: string, fileName: string, dataModel: DataModel, mainFileNames: {
+        model: string;
+        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;
+    private pathAndFile;
+    private isDifferentFile;
+    private addGeneratedImport;
+    addGeneratedModel(fqName: string, name: string): string;
+    addGeneratedQObject(fqName: string, name: string): string;
+    addGeneratedService(fqName: string, name: string): string;
     getImportDeclarations(fromSubPath?: boolean): Array<ImportDeclarationStructure>;
+    private getNamedImports;
+    private getModuleSpecifier;
 }

package/lib/generator/ImportContainer.js

@@ -2,76 +2,179 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportContainer = void 0;
 const tslib_1 = require("tslib");
+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");
+/**
+ * Handles all the import statements for a given file.
+ *
+ * Features a renaming mechanism, so that when the import name conflicts with an existing import a new
+ * name is generated and returned.
+ *
+ * Map<string,string>
+ */
 class ImportContainer {
-    constructor(fileNames) {
-        this.mapping = {
-            core: { moduleName: "@odata2ts/odata-core", isRelative: false },
-            qobjects: { moduleName: "@odata2ts/odata-query-objects", isRelative: false },
-            clientApi: { moduleName: "@odata2ts/http-client-api", isRelative: false },
-            service: { moduleName: "@odata2ts/odata-service", isRelative: false },
-            genModel: { moduleName: "", isRelative: true },
-            genQObjects: { moduleName: "", isRelative: true },
+    constructor(path, fileName, dataModel, mainFileNames, bundledFileGeneration, reservedNames) {
+        this.path = path;
+        this.fileName = fileName;
+        this.dataModel = dataModel;
+        this.mainFileNames = mainFileNames;
+        this.bundledFileGeneration = bundledFileGeneration;
+        this.reservedNames = reservedNames;
+        // mapping of a custom defined type to a primitive type
+        this.customTypes = new Map();
+        // imports to generated artefacts
+        this.internalImports = new Map();
+        this.libs = {
+            core: new Map(),
+            qObject: new Map(),
+            clientApi: new Map(),
+            service: new Map(),
         };
-        this.container = {
-            core: new Set(),
-            qobjects: new Set(),
-            clientApi: new Set(),
-            service: new Set(),
-            genModel: new Set(),
-            genQObjects: new Set(),
-            customTypes: new Map(),
-        };
-        this.mapping.genModel.moduleName = fileNames.model;
-        this.mapping.genQObjects.moduleName = fileNames.qObject;
+        this.importedNameValidator = new ImportedNameValidator_1.ImportedNameValidator(reservedNames);
     }
-    addFromCore(...names) {
-        names.forEach((n) => this.container.core.add(n));
+    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) {
-        names.forEach((n) => this.container.qobjects.add(n));
-    }
-    addFromClientApi(...names) {
-        names.forEach((n) => this.container.clientApi.add(n));
+        return names.map((n) => {
+            const importName = this.importedNameValidator.validateName(ImportObjects_1.LIB_MODULES.qObject, n);
+            this.libs.qObject.set(n, importName);
+            return importName;
+        });
     }
-    addFromService(...names) {
-        names.forEach((n) => this.container.service.add(n));
+    addQObject(...qObjects) {
+        return this.addFromQObject(...qObjects.map((qObject) => ImportObjects_1.QueryObjectImports[qObject]));
     }
-    addGeneratedModel(...names) {
-        names.forEach((n) => this.container.genModel.add(n));
+    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;
+        });
     }
-    addGeneratedQObject(...names) {
-        names.forEach((n) => this.container.genQObjects.add(n));
+    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.container.customTypes.get(moduleName);
+        let importList = this.customTypes.get(moduleName);
         if (!importList) {
-            importList = new Set();
-            this.container.customTypes.set(moduleName, importList);
+            importList = new Map();
+            this.customTypes.set(moduleName, importList);
+        }
+        const importName = this.importedNameValidator.validateName(moduleName, typeName);
+        importList.set(typeName, importName);
+        return importName;
+    }
+    pathAndFile(filePath, fileName) {
+        return filePath ? `${filePath}/${fileName}` : fileName;
+    }
+    isDifferentFile(filePath, fileName) {
+        return this.pathAndFile(this.path, this.fileName) !== this.pathAndFile(filePath, fileName);
+    }
+    addGeneratedImport(folderPath, fileName, name) {
+        // 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);
+        return importName;
+    }
+    addGeneratedModel(fqName, name) {
+        if (this.bundledFileGeneration) {
+            return this.addGeneratedImport("", this.mainFileNames.model, name);
+        }
+        else {
+            const model = this.dataModel.getModel(fqName);
+            if (!model && fqName !== "") {
+                throw new Error(`Cannot find model by its fully qualified name: ${fqName}!`);
+            }
+            const folderPath = model ? model.folderPath : "";
+            const modelName = model ? model.modelName : this.mainFileNames.model;
+            return this.addGeneratedImport(folderPath, modelName, name);
+        }
+    }
+    addGeneratedQObject(fqName, name) {
+        if (this.bundledFileGeneration) {
+            return this.addGeneratedImport("", this.mainFileNames.qObject, name);
+        }
+        else {
+            const model = this.dataModel.getModel(fqName);
+            if (!model && fqName !== "") {
+                throw new Error(`Cannot find q-object by its fully qualified name: ${fqName}!`);
+            }
+            const folderPath = model ? model.folderPath : "";
+            const qName = model ? model.qName : this.mainFileNames.qObject;
+            return this.addGeneratedImport(folderPath, qName, name);
+        }
+    }
+    addGeneratedService(fqName, name) {
+        if (this.bundledFileGeneration) {
+            return this.addGeneratedImport("", this.mainFileNames.service, name);
+        }
+        else {
+            const model = this.dataModel.getModel(fqName);
+            return this.addGeneratedImport(model.folderPath, model.serviceName, name);
         }
-        importList.add(typeName);
     }
     getImportDeclarations(fromSubPath = false) {
-        const _a = this.container, { customTypes } = _a, standardImports = tslib_1.__rest(_a, ["customTypes"]);
         return [
-            ...[...customTypes.keys()]
-                .filter((key) => { var _a; return !!((_a = customTypes.get(key)) === null || _a === void 0 ? void 0 : _a.size); })
-                .map((key) => {
+            ...Object.entries(this.libs)
+                .filter(([_, values]) => !!values.size)
+                .map(([moduleName, toImport]) => {
                 return {
-                    namedImports: [...customTypes.get(key)],
-                    moduleSpecifier: key,
+                    namedImports: this.getNamedImports(toImport),
+                    moduleSpecifier: ImportObjects_1.LIB_MODULES[moduleName],
                 };
             }),
-            ...Object.entries(standardImports)
-                .filter(([_, values]) => !!values.size)
-                .map(([key, values]) => {
-                const mapping = this.mapping[key];
+            ...[...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: [...values],
-                    moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? ".." : "."}/` : ""}${mapping.moduleName}`,
+                    namedImports: this.getNamedImports(toImport),
+                    moduleSpecifier: moduleName,
+                };
+            }),
+            ...[...this.internalImports.entries()]
+                .filter(([_, toImport]) => toImport.size > 0)
+                .map(([key, toImport]) => {
+                return {
+                    namedImports: this.getNamedImports(toImport),
+                    moduleSpecifier: this.getModuleSpecifier(key),
                 };
             }),
         ];
     }
+    getNamedImports(toImport) {
+        return [...toImport.entries()].map(([name, alias]) => ({
+            name,
+            alias: alias !== name ? alias : undefined,
+        }));
+    }
+    getModuleSpecifier(filePath) {
+        const relativePath = path_1.default.relative(this.path, filePath).replaceAll(path_1.default.sep, "/");
+        return !relativePath.startsWith(".") ? "./" + relativePath : relativePath;
+    }
 }
 exports.ImportContainer = ImportContainer;
 //# sourceMappingURL=ImportContainer.js.map