@odata2ts/odata2ts 0.23.0 → 0.24.0

package/lib/evaluateConfig.js

@@ -1,83 +1,83 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateConfigOptions = void 0;
-const tslib_1 = require("tslib");
-const deepmerge_1 = tslib_1.__importDefault(require("deepmerge"));
-const defaultConfig_1 = require("./defaultConfig");
-const OptionModel_1 = require("./OptionModel");
-/**
- * Provides default values and evaluates the various config file and CLI options.
- * This function always returns a list of RunOptions,
- * whereby each item represents one generation run / one service.
- *
- * Configurations are merged in the following order (last one wins):
- * - default values
- * - config file: base settings
- * - config file: service specific settings
- * - CLI options
- *
- * If the CLI options specify source and output, then the service config is completely ignored and only the
- * base settings are applied from the config file.
- *
- * If the CLI options do not specify source and output, but do specify services, then these services must
- * exist in the config file and each service must supply values for source and output as a minimum.
- *
- * If the CLI options neither entail source nor services, then at least one service must be configured in the
- * config file. All configured services are returned.
- *
- * @param cliOpts CLI passed options
- * @param configOpts config file options
- */
-function evaluateConfigOptions(cliOpts, configOpts) {
-    var _a;
-    const defaultConfig = ((_a = configOpts === null || configOpts === void 0 ? void 0 : configOpts.naming) === null || _a === void 0 ? void 0 : _a.minimalDefaults) ? (0, defaultConfig_1.getMinimalConfig)() : (0, defaultConfig_1.getDefaultConfig)();
-    // No config file
-    if (!configOpts) {
-        if (!cliOpts.source || !cliOpts.output) {
-            throw new Error("Without any configuration file options --source and --output must be specified!");
-        }
-        return [(0, deepmerge_1.default)(defaultConfig, cliOpts)];
-    }
-    const { services: cliServices, source, output } = cliOpts, cliBaseOpts = tslib_1.__rest(cliOpts, ["services", "source", "output"]);
-    const { services: confServices } = configOpts, confBaseOpts = tslib_1.__rest(configOpts, ["services"]);
-    // No configurations of services in config file
-    // or CLI opts specify source and output => ignore service config
-    if ((source && output) || !confServices) {
-        if (!source || !output) {
-            throw new Error("No services were configured in config file, so options --source and --output must be specified!");
-        }
-        const merged = deepmerge_1.default.all([defaultConfig, confBaseOpts, cliOpts]);
-        return [safeGuardOptions(merged)];
-    }
-    // Either services are specified or we use all configured services
-    const servicesToUse = (cliServices === null || cliServices === void 0 ? void 0 : cliServices.length) ? cliServices : Object.keys(confServices);
-    return servicesToUse.map((s) => {
-        var _a, _b;
-        const service = confServices[s];
-        if (!service) {
-            throw new Error(`Specified service "${s}" doesn't exist in configuration!`);
-        }
-        const serviceDefault = ((_a = service.naming) === null || _a === void 0 ? void 0 : _a.minimalDefaults) && !((_b = configOpts === null || configOpts === void 0 ? void 0 : configOpts.naming) === null || _b === void 0 ? void 0 : _b.minimalDefaults) ? (0, defaultConfig_1.getMinimalConfig)() : defaultConfig;
-        const merged = deepmerge_1.default.all([serviceDefault, confBaseOpts, service, cliBaseOpts]);
-        return safeGuardOptions(merged);
-    });
-}
-exports.evaluateConfigOptions = evaluateConfigOptions;
-/**
- * Make sure that some options are only active if in correct mode.
- * @param options
- */
-function safeGuardOptions(options) {
-    // skip options are not valid for service generation
-    if (options.mode === OptionModel_1.Modes.service || options.mode === OptionModel_1.Modes.all) {
-        options.skipEditableModels = false;
-        options.skipIdModels = false;
-        options.skipOperations = false;
-    }
-    // special option which is only valid for model generation
-    if (options.mode !== OptionModel_1.Modes.models) {
-        options.v2ModelsWithExtraResultsWrapping = false;
-    }
-    return options;
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.evaluateConfigOptions = void 0;
+const tslib_1 = require("tslib");
+const deepmerge_1 = tslib_1.__importDefault(require("deepmerge"));
+const defaultConfig_1 = require("./defaultConfig");
+const OptionModel_1 = require("./OptionModel");
+/**
+ * Provides default values and evaluates the various config file and CLI options.
+ * This function always returns a list of RunOptions,
+ * whereby each item represents one generation run / one service.
+ *
+ * Configurations are merged in the following order (last one wins):
+ * - default values
+ * - config file: base settings
+ * - config file: service specific settings
+ * - CLI options
+ *
+ * If the CLI options specify source and output, then the service config is completely ignored and only the
+ * base settings are applied from the config file.
+ *
+ * If the CLI options do not specify source and output, but do specify services, then these services must
+ * exist in the config file and each service must supply values for source and output as a minimum.
+ *
+ * If the CLI options neither entail source nor services, then at least one service must be configured in the
+ * config file. All configured services are returned.
+ *
+ * @param cliOpts CLI passed options
+ * @param configOpts config file options
+ */
+function evaluateConfigOptions(cliOpts, configOpts) {
+    var _a;
+    const defaultConfig = ((_a = configOpts === null || configOpts === void 0 ? void 0 : configOpts.naming) === null || _a === void 0 ? void 0 : _a.minimalDefaults) ? (0, defaultConfig_1.getMinimalConfig)() : (0, defaultConfig_1.getDefaultConfig)();
+    // No config file
+    if (!configOpts) {
+        if (!cliOpts.source || !cliOpts.output) {
+            throw new Error("Without any configuration file options --source and --output must be specified!");
+        }
+        return [(0, deepmerge_1.default)(defaultConfig, cliOpts)];
+    }
+    const { services: cliServices, source, output } = cliOpts, cliBaseOpts = tslib_1.__rest(cliOpts, ["services", "source", "output"]);
+    const { services: confServices } = configOpts, confBaseOpts = tslib_1.__rest(configOpts, ["services"]);
+    // No configurations of services in config file
+    // or CLI opts specify source and output => ignore service config
+    if ((source && output) || !confServices) {
+        if (!source || !output) {
+            throw new Error("No services were configured in config file, so options --source and --output must be specified!");
+        }
+        const merged = deepmerge_1.default.all([defaultConfig, confBaseOpts, cliOpts]);
+        return [safeGuardOptions(merged)];
+    }
+    // Either services are specified or we use all configured services
+    const servicesToUse = (cliServices === null || cliServices === void 0 ? void 0 : cliServices.length) ? cliServices : Object.keys(confServices);
+    return servicesToUse.map((s) => {
+        var _a, _b;
+        const service = confServices[s];
+        if (!service) {
+            throw new Error(`Specified service "${s}" doesn't exist in configuration!`);
+        }
+        const serviceDefault = ((_a = service.naming) === null || _a === void 0 ? void 0 : _a.minimalDefaults) && !((_b = configOpts === null || configOpts === void 0 ? void 0 : configOpts.naming) === null || _b === void 0 ? void 0 : _b.minimalDefaults) ? (0, defaultConfig_1.getMinimalConfig)() : defaultConfig;
+        const merged = deepmerge_1.default.all([serviceDefault, confBaseOpts, service, cliBaseOpts]);
+        return safeGuardOptions(merged);
+    });
+}
+exports.evaluateConfigOptions = evaluateConfigOptions;
+/**
+ * Make sure that some options are only active if in correct mode.
+ * @param options
+ */
+function safeGuardOptions(options) {
+    // skip options are not valid for service generation
+    if (options.mode === OptionModel_1.Modes.service || options.mode === OptionModel_1.Modes.all) {
+        options.skipEditableModels = false;
+        options.skipIdModels = false;
+        options.skipOperations = false;
+    }
+    // special option which is only valid for model generation
+    if (options.mode !== OptionModel_1.Modes.models) {
+        options.v2ModelsWithExtraResultsWrapping = false;
+    }
+    return options;
+}
 //# sourceMappingURL=evaluateConfig.js.map

package/lib/generator/ImportContainer.d.ts

@@ -1,16 +1,16 @@
-import { ImportDeclarationStructure } from "ts-morph";
-import { ProjectFiles } from "../data-model/DataModel";
-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;
-    addGeneratedService(key: string, ...names: Array<string>): void;
-    getImportDeclarations(fromSubPath?: boolean): Array<ImportDeclarationStructure>;
-}
+import { ImportDeclarationStructure } from "ts-morph";
+import { ProjectFiles } from "../data-model/DataModel";
+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;
+    addGeneratedService(key: string, ...names: Array<string>): void;
+    getImportDeclarations(fromSubPath?: boolean): Array<ImportDeclarationStructure>;
+}

package/lib/generator/ImportContainer.js

@@ -1,92 +1,92 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportContainer = void 0;
-const tslib_1 = require("tslib");
-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 },
-        };
-        this.container = {
-            core: new Set(),
-            qobjects: new Set(),
-            clientApi: new Set(),
-            service: new Set(),
-            genModel: new Set(),
-            genQObjects: new Set(),
-            genServices: {},
-            customTypes: new Map(),
-        };
-        this.mapping.genModel.moduleName = fileNames.model;
-        this.mapping.genQObjects.moduleName = fileNames.qObject;
-    }
-    addFromCore(...names) {
-        names.forEach((n) => this.container.core.add(n));
-    }
-    addFromQObject(...names) {
-        names.forEach((n) => this.container.qobjects.add(n));
-    }
-    addFromClientApi(...names) {
-        names.forEach((n) => this.container.clientApi.add(n));
-    }
-    addFromService(...names) {
-        names.forEach((n) => this.container.service.add(n));
-    }
-    addGeneratedModel(...names) {
-        names.forEach((n) => this.container.genModel.add(n));
-    }
-    addGeneratedQObject(...names) {
-        names.forEach((n) => this.container.genQObjects.add(n));
-    }
-    addCustomType(moduleName, typeName) {
-        let importList = this.container.customTypes.get(moduleName);
-        if (!importList) {
-            importList = new Set();
-            this.container.customTypes.set(moduleName, importList);
-        }
-        importList.add(typeName);
-    }
-    addGeneratedService(key, ...names) {
-        let serv = this.container.genServices[key];
-        if (!serv) {
-            serv = new Set();
-            this.container.genServices[key] = serv;
-        }
-        names.forEach((n) => serv.add(n));
-    }
-    getImportDeclarations(fromSubPath = false) {
-        const _a = this.container, { genServices, customTypes } = _a, standardImports = tslib_1.__rest(_a, ["genServices", "customTypes"]);
-        return [
-            ...[...customTypes.keys()]
-                .filter((key) => { var _a; return !!((_a = customTypes.get(key)) === null || _a === void 0 ? void 0 : _a.size); })
-                .map((key) => {
-                return {
-                    namedImports: [...customTypes.get(key)],
-                    moduleSpecifier: key,
-                };
-            }),
-            ...Object.entries(standardImports)
-                .filter(([key, values]) => !!values.size)
-                .map(([key, values]) => {
-                const mapping = this.mapping[key];
-                return {
-                    namedImports: [...values],
-                    moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? ".." : "."}/` : ""}${mapping.moduleName}`,
-                };
-            }),
-            ...Object.entries(genServices).map(([key, values]) => {
-                return {
-                    namedImports: [...values],
-                    moduleSpecifier: (fromSubPath ? "./" : "./service/") + key,
-                };
-            }),
-        ];
-    }
-}
-exports.ImportContainer = ImportContainer;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportContainer = void 0;
+const tslib_1 = require("tslib");
+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 },
+        };
+        this.container = {
+            core: new Set(),
+            qobjects: new Set(),
+            clientApi: new Set(),
+            service: new Set(),
+            genModel: new Set(),
+            genQObjects: new Set(),
+            genServices: {},
+            customTypes: new Map(),
+        };
+        this.mapping.genModel.moduleName = fileNames.model;
+        this.mapping.genQObjects.moduleName = fileNames.qObject;
+    }
+    addFromCore(...names) {
+        names.forEach((n) => this.container.core.add(n));
+    }
+    addFromQObject(...names) {
+        names.forEach((n) => this.container.qobjects.add(n));
+    }
+    addFromClientApi(...names) {
+        names.forEach((n) => this.container.clientApi.add(n));
+    }
+    addFromService(...names) {
+        names.forEach((n) => this.container.service.add(n));
+    }
+    addGeneratedModel(...names) {
+        names.forEach((n) => this.container.genModel.add(n));
+    }
+    addGeneratedQObject(...names) {
+        names.forEach((n) => this.container.genQObjects.add(n));
+    }
+    addCustomType(moduleName, typeName) {
+        let importList = this.container.customTypes.get(moduleName);
+        if (!importList) {
+            importList = new Set();
+            this.container.customTypes.set(moduleName, importList);
+        }
+        importList.add(typeName);
+    }
+    addGeneratedService(key, ...names) {
+        let serv = this.container.genServices[key];
+        if (!serv) {
+            serv = new Set();
+            this.container.genServices[key] = serv;
+        }
+        names.forEach((n) => serv.add(n));
+    }
+    getImportDeclarations(fromSubPath = false) {
+        const _a = this.container, { genServices, customTypes } = _a, standardImports = tslib_1.__rest(_a, ["genServices", "customTypes"]);
+        return [
+            ...[...customTypes.keys()]
+                .filter((key) => { var _a; return !!((_a = customTypes.get(key)) === null || _a === void 0 ? void 0 : _a.size); })
+                .map((key) => {
+                return {
+                    namedImports: [...customTypes.get(key)],
+                    moduleSpecifier: key,
+                };
+            }),
+            ...Object.entries(standardImports)
+                .filter(([key, values]) => !!values.size)
+                .map(([key, values]) => {
+                const mapping = this.mapping[key];
+                return {
+                    namedImports: [...values],
+                    moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? ".." : "."}/` : ""}${mapping.moduleName}`,
+                };
+            }),
+            ...Object.entries(genServices).map(([key, values]) => {
+                return {
+                    namedImports: [...values],
+                    moduleSpecifier: (fromSubPath ? "./" : "./service/") + key,
+                };
+            }),
+        ];
+    }
+}
+exports.ImportContainer = ImportContainer;
 //# sourceMappingURL=ImportContainer.js.map

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 { ImportDeclarationStructure } from \"ts-morph\";\n\nimport { ProjectFiles } from \"../data-model/DataModel\";\n\ntype ImportContainerType = {\n  core: Set<string>;\n  qobjects: Set<string>;\n  clientApi: Set<string>;\n  service: Set<string>;\n  genModel: Set<string>;\n  genQObjects: Set<string>;\n  genServices: { [key: string]: Set<string> };\n  customTypes: Map<string, Set<string>>;\n};\n\nexport class ImportContainer {\n  private mapping: {\n    [K in keyof ImportContainerType as string]: { moduleName: string; isRelative: boolean; addName?: boolean };\n  } = {\n    core: { moduleName: \"@odata2ts/odata-core\", isRelative: false },\n    qobjects: { moduleName: \"@odata2ts/odata-query-objects\", isRelative: false },\n    clientApi: { moduleName: \"@odata2ts/http-client-api\", isRelative: false },\n    service: { moduleName: \"@odata2ts/odata-service\", isRelative: false },\n    genModel: { moduleName: \"\", isRelative: true },\n    genQObjects: { moduleName: \"\", isRelative: true },\n  };\n\n  private container: ImportContainerType = {\n    core: new Set(),\n    qobjects: new Set(),\n    clientApi: new Set(),\n    service: new Set(),\n    genModel: new Set(),\n    genQObjects: new Set(),\n    genServices: {},\n    customTypes: new Map(),\n  };\n\n  constructor(fileNames: ProjectFiles) {\n    this.mapping.genModel.moduleName = fileNames.model;\n    this.mapping.genQObjects.moduleName = fileNames.qObject;\n  }\n\n  public addFromCore(...names: Array<string>) {\n    names.forEach((n) => this.container.core.add(n));\n  }\n\n  public addFromQObject(...names: Array<string>) {\n    names.forEach((n) => this.container.qobjects.add(n));\n  }\n\n  public addFromClientApi(...names: Array<string>) {\n    names.forEach((n) => this.container.clientApi.add(n));\n  }\n\n  public addFromService(...names: Array<string>) {\n    names.forEach((n) => this.container.service.add(n));\n  }\n\n  public addGeneratedModel(...names: Array<string>) {\n    names.forEach((n) => this.container.genModel.add(n));\n  }\n\n  public addGeneratedQObject(...names: Array<string>) {\n    names.forEach((n) => this.container.genQObjects.add(n));\n  }\n\n  public addCustomType(moduleName: string, typeName: string) {\n    let importList = this.container.customTypes.get(moduleName);\n    if (!importList) {\n      importList = new Set();\n      this.container.customTypes.set(moduleName, importList);\n    }\n    importList.add(typeName);\n  }\n\n  public addGeneratedService(key: string, ...names: Array<string>) {\n    let serv = this.container.genServices[key];\n    if (!serv) {\n      serv = new Set();\n      this.container.genServices[key] = serv;\n    }\n    names.forEach((n) => serv.add(n));\n  }\n\n  public getImportDeclarations(fromSubPath: boolean = false): Array<ImportDeclarationStructure> {\n    const { genServices, customTypes, ...standardImports } = this.container;\n\n    return [\n      ...[...customTypes.keys()]\n        .filter((key) => !!customTypes.get(key)?.size)\n        .map((key) => {\n          return {\n            namedImports: [...customTypes.get(key)!],\n            moduleSpecifier: key,\n          } as ImportDeclarationStructure;\n        }),\n      ...Object.entries(standardImports)\n        .filter(([key, values]) => !!values.size)\n        .map(([key, values]) => {\n          const mapping = this.mapping[key];\n          return {\n            namedImports: [...values],\n            moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? \"..\" : \".\"}/` : \"\"}${mapping.moduleName}`,\n          } as ImportDeclarationStructure;\n        }),\n      ...Object.entries(genServices).map(([key, values]) => {\n        return {\n          namedImports: [...values],\n          moduleSpecifier: (fromSubPath ? \"./\" : \"./service/\") + key,\n        } as ImportDeclarationStructure;\n      }),\n    ];\n  }\n}\n"]}
+{"version":3,"file":"ImportContainer.js","sourceRoot":"","sources":["../../src/generator/ImportContainer.ts"],"names":[],"mappings":"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","sourcesContent":["import { ImportDeclarationStructure } from \"ts-morph\";\r\n\r\nimport { ProjectFiles } from \"../data-model/DataModel\";\r\n\r\ntype ImportContainerType = {\r\n  core: Set<string>;\r\n  qobjects: Set<string>;\r\n  clientApi: Set<string>;\r\n  service: Set<string>;\r\n  genModel: Set<string>;\r\n  genQObjects: Set<string>;\r\n  genServices: { [key: string]: Set<string> };\r\n  customTypes: Map<string, Set<string>>;\r\n};\r\n\r\nexport class ImportContainer {\r\n  private mapping: {\r\n    [K in keyof ImportContainerType as string]: { moduleName: string; isRelative: boolean; addName?: boolean };\r\n  } = {\r\n    core: { moduleName: \"@odata2ts/odata-core\", isRelative: false },\r\n    qobjects: { moduleName: \"@odata2ts/odata-query-objects\", isRelative: false },\r\n    clientApi: { moduleName: \"@odata2ts/http-client-api\", isRelative: false },\r\n    service: { moduleName: \"@odata2ts/odata-service\", isRelative: false },\r\n    genModel: { moduleName: \"\", isRelative: true },\r\n    genQObjects: { moduleName: \"\", isRelative: true },\r\n  };\r\n\r\n  private container: ImportContainerType = {\r\n    core: new Set(),\r\n    qobjects: new Set(),\r\n    clientApi: new Set(),\r\n    service: new Set(),\r\n    genModel: new Set(),\r\n    genQObjects: new Set(),\r\n    genServices: {},\r\n    customTypes: new Map(),\r\n  };\r\n\r\n  constructor(fileNames: ProjectFiles) {\r\n    this.mapping.genModel.moduleName = fileNames.model;\r\n    this.mapping.genQObjects.moduleName = fileNames.qObject;\r\n  }\r\n\r\n  public addFromCore(...names: Array<string>) {\r\n    names.forEach((n) => this.container.core.add(n));\r\n  }\r\n\r\n  public addFromQObject(...names: Array<string>) {\r\n    names.forEach((n) => this.container.qobjects.add(n));\r\n  }\r\n\r\n  public addFromClientApi(...names: Array<string>) {\r\n    names.forEach((n) => this.container.clientApi.add(n));\r\n  }\r\n\r\n  public addFromService(...names: Array<string>) {\r\n    names.forEach((n) => this.container.service.add(n));\r\n  }\r\n\r\n  public addGeneratedModel(...names: Array<string>) {\r\n    names.forEach((n) => this.container.genModel.add(n));\r\n  }\r\n\r\n  public addGeneratedQObject(...names: Array<string>) {\r\n    names.forEach((n) => this.container.genQObjects.add(n));\r\n  }\r\n\r\n  public addCustomType(moduleName: string, typeName: string) {\r\n    let importList = this.container.customTypes.get(moduleName);\r\n    if (!importList) {\r\n      importList = new Set();\r\n      this.container.customTypes.set(moduleName, importList);\r\n    }\r\n    importList.add(typeName);\r\n  }\r\n\r\n  public addGeneratedService(key: string, ...names: Array<string>) {\r\n    let serv = this.container.genServices[key];\r\n    if (!serv) {\r\n      serv = new Set();\r\n      this.container.genServices[key] = serv;\r\n    }\r\n    names.forEach((n) => serv.add(n));\r\n  }\r\n\r\n  public getImportDeclarations(fromSubPath: boolean = false): Array<ImportDeclarationStructure> {\r\n    const { genServices, customTypes, ...standardImports } = this.container;\r\n\r\n    return [\r\n      ...[...customTypes.keys()]\r\n        .filter((key) => !!customTypes.get(key)?.size)\r\n        .map((key) => {\r\n          return {\r\n            namedImports: [...customTypes.get(key)!],\r\n            moduleSpecifier: key,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...Object.entries(standardImports)\r\n        .filter(([key, values]) => !!values.size)\r\n        .map(([key, values]) => {\r\n          const mapping = this.mapping[key];\r\n          return {\r\n            namedImports: [...values],\r\n            moduleSpecifier: `${mapping.isRelative ? `${fromSubPath ? \"..\" : \".\"}/` : \"\"}${mapping.moduleName}`,\r\n          } as ImportDeclarationStructure;\r\n        }),\r\n      ...Object.entries(genServices).map(([key, values]) => {\r\n        return {\r\n          namedImports: [...values],\r\n          moduleSpecifier: (fromSubPath ? \"./\" : \"./service/\") + key,\r\n        } as ImportDeclarationStructure;\r\n      }),\r\n    ];\r\n  }\r\n}\r\n"]}

package/lib/generator/ModelGenerator.d.ts

@@ -1,2 +1,2 @@
-import { EntityBasedGeneratorFunction } from "../FactoryFunctionModel";
-export declare const generateModels: EntityBasedGeneratorFunction;
+import { EntityBasedGeneratorFunction } from "../FactoryFunctionModel";
+export declare const generateModels: EntityBasedGeneratorFunction;