@odata2ts/odata2ts 0.33.0 → 0.33.2

package/lib/project/ProjectManager.js

@@ -2,156 +2,200 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectManager = exports.createProjectManager = void 0;
 const tslib_1 = require("tslib");
-const promises_1 = require("fs/promises");
 const path = tslib_1.__importStar(require("path"));
 const fs_extra_1 = require("fs-extra");
 const ts_morph_1 = require("ts-morph");
-const tsconfig_loader_1 = tslib_1.__importDefault(require("tsconfig-loader"));
-const typescript_1 = tslib_1.__importDefault(require("typescript"));
-const OptionModel_1 = require("../OptionModel");
+const processors_1 = require("xml2js/lib/processors");
+const FileHandler_1 = require("./FileHandler");
 const formatter_1 = require("./formatter");
-function createProjectManager(projectFiles, outputDir, emitMode, usePrettier, tsConfigPath = "tsconfig.json") {
+const TsMorphHelper_1 = require("./TsMorphHelper");
+function createProjectManager(outputDir, emitMode, namingHelper, dataModel, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const generateDeclarations = OptionModel_1.EmitModes.js_dts === emitMode || OptionModel_1.EmitModes.dts === emitMode;
-        const conf = (0, tsconfig_loader_1.default)({ filename: tsConfigPath });
-        const formatter = yield (0, formatter_1.createFormatter)(outputDir, usePrettier);
-        const _a = (conf === null || conf === void 0 ? void 0 : conf.tsConfig.compilerOptions) || {}, { 
-        // ignored props
-        noEmit, // we always want to emit
-        importsNotUsedAsValues, // type is missing
-        jsx, plugins, 
-        // mapped props
-        moduleResolution, lib, module, newLine, target, rootDir, rootDirs } = _a, passThrough = tslib_1.__rest(_a, ["noEmit", "importsNotUsedAsValues", "jsx", "plugins", "moduleResolution", "lib", "module", "newLine", "target", "rootDir", "rootDirs"]);
-        const compilerOpts = Object.assign(Object.assign({}, passThrough), { outDir: outputDir, declaration: generateDeclarations, moduleResolution: getModuleResolutionKind(moduleResolution), module: getModuleKind(module), target: getTarget(target), lib: lib, newLine: (newLine === null || newLine === void 0 ? void 0 : newLine.toLowerCase()) === "crlf"
-                ? ts_morph_1.NewLineKind.CarriageReturnLineFeed
-                : (newLine === null || newLine === void 0 ? void 0 : newLine.toLowerCase()) === "lf"
-                    ? ts_morph_1.NewLineKind.LineFeed
-                    : undefined });
-        return new ProjectManager(projectFiles, outputDir, emitMode, formatter, compilerOpts);
+        const { usePrettier = false, tsConfigPath = "tsconfig.json" } = options;
+        const formatter = usePrettier ? yield (0, formatter_1.createFormatter)(outputDir, usePrettier) : undefined;
+        const compilerOpts = yield (0, TsMorphHelper_1.loadTsMorphCompilerOptions)(tsConfigPath, emitMode, outputDir);
+        const pm = new ProjectManager(outputDir, emitMode, namingHelper, dataModel, formatter, compilerOpts, Object.assign({ usePrettier,
+            tsConfigPath }, options));
+        yield pm.init();
+        return pm;
     });
 }
 exports.createProjectManager = createProjectManager;
-function getModuleResolutionKind(moduleResolution) {
-    const modRes = typeof moduleResolution === "string"
-        ? moduleResolution.toLowerCase() === "node"
-            ? "nodejs"
-            : moduleResolution.toLowerCase()
-        : undefined;
-    const matchedKey = Object.keys(typescript_1.default.ModuleResolutionKind).find((mk) => mk.toLowerCase() === modRes);
-    return matchedKey ? typescript_1.default.ModuleResolutionKind[matchedKey] : undefined;
-}
-function getModuleKind(module) {
-    const mod = typeof module === "string" ? module.toLowerCase() : undefined;
-    const matchedKey = Object.keys(typescript_1.default.ModuleKind).find((mk) => mk.toLowerCase() === mod);
-    return matchedKey ? typescript_1.default.ModuleKind[matchedKey] : undefined;
-}
-function getTarget(target) {
-    const t = typeof target === "string" ? target.toLowerCase() : undefined;
-    const matchedKey = Object.keys(typescript_1.default.ScriptTarget).find((st) => st.toLowerCase() === t);
-    return matchedKey ? typescript_1.default.ScriptTarget[matchedKey] : undefined;
-}
 class ProjectManager {
-    constructor(projectFiles, outputDir, emitMode, formatter, compilerOptions) {
-        this.projectFiles = projectFiles;
+    constructor(outputDir, emitMode, namingHelper, dataModel, formatter, compilerOptions, options) {
         this.outputDir = outputDir;
         this.emitMode = emitMode;
+        this.namingHelper = namingHelper;
+        this.dataModel = dataModel;
         this.formatter = formatter;
-        this.files = {};
-        this.formatAndWriteFile = (file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const fileName = file.getFilePath();
-            const content = file.getFullText();
-            try {
-                const formatted = yield this.formatter.format(content);
-                try {
-                    return (0, promises_1.writeFile)(fileName, formatted);
-                }
-                catch (writeError) {
-                    console.error(`Failed to write file [/${fileName}]`, writeError);
-                    process.exit(3);
-                }
-            }
-            catch (formattingError) {
-                console.error("Formatting failed", formattingError);
-                yield (0, promises_1.writeFile)("error.log", (formattingError === null || formattingError === void 0 ? void 0 : formattingError.toString()) || "no error message!");
-                process.exit(99);
-            }
-        });
+        this.options = options;
         // Create ts-morph project
         this.project = new ts_morph_1.Project({
-            manipulationSettings: this.formatter.getSettings(),
+            // manipulationSettings: this.formatter.getSettings(),
             skipAddingFilesFromTsConfig: true,
             compilerOptions,
         });
+        if (options.noOutput) {
+            this.cachedFiles = new Map();
+        }
     }
-    createFile(name) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const fileName = path.join(this.outputDir, `${name}.ts`);
-            yield (0, fs_extra_1.remove)(fileName);
-            return this.project.createSourceFile(fileName);
-        });
+    getDataModel() {
+        return this.dataModel;
     }
-    createModelFile() {
+    /**
+     * Only filled when noOutput=true
+     */
+    getCachedFiles() {
+        return this.cachedFiles;
+    }
+    writeFile(fileHandler) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.files.model = yield this.createFile(this.projectFiles.model);
-            return this.getModelFile();
+            if (this.options.noOutput) {
+                fileHandler.getFile().addImportDeclarations(fileHandler.getImports().getImportDeclarations());
+                this.cachedFiles.set(fileHandler.getFullFilePath(), fileHandler.getFile());
+                return;
+            }
+            return fileHandler.write(this.emitMode);
         });
     }
-    getModelFile() {
-        return this.files.model;
+    createFile(name, reservedNames, additionalPath = "") {
+        const fileName = path.join(this.outputDir, additionalPath, `${name}.ts`);
+        return new FileHandler_1.FileHandler(additionalPath, name, this.project.createSourceFile(fileName), this.dataModel, this.namingHelper.getFileNames(), !!this.options.bundledFileGeneration, this.formatter, reservedNames);
     }
-    createQObjectFile() {
+    init() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.files.qobject = yield this.createFile(this.projectFiles.qObject);
-            return this.getQObjectFile();
+            if (!this.options.bundledFileGeneration) {
+                // ensure folder for each model: we do this at this point for performance reasons
+                yield Promise.all(this.dataModel.getModelTypes().map((mt) => (0, fs_extra_1.ensureDir)(path.join(this.outputDir, mt.folderPath))));
+            }
+            const typePart = this.emitMode.toUpperCase().replace("_", " & ");
+            console.log(`Prepared to emit ${typePart} files.`);
         });
     }
-    getQObjectFile() {
-        return this.files.qobject;
+    initModels() {
+        if (this.options.bundledFileGeneration) {
+            // collect reserved names, that is names of classes we're going to create => imports must take them into account
+            const reservedWords = this.dataModel.getModelTypes().reduce((collector, model) => {
+                var _a;
+                const asEntityType = model;
+                collector.push(model.modelName);
+                if (asEntityType.editableName) {
+                    collector.push(asEntityType.editableName);
+                }
+                if ((_a = asEntityType.id) === null || _a === void 0 ? void 0 : _a.modelName) {
+                    collector.push(asEntityType.id.modelName);
+                }
+                this.dataModel.getAllEntityOperations(model.fqName).forEach((op) => {
+                    if (op.parameters.length) {
+                        collector.push(op.paramsModelName);
+                    }
+                });
+                return collector;
+            }, []);
+            this.dataModel.getUnboundOperationTypes().forEach((op) => {
+                if (op.parameters.length) {
+                    reservedWords.push(op.paramsModelName);
+                }
+            });
+            this.mainModelFile = this.createFile(this.namingHelper.getFileNames().model, reservedWords);
+        }
     }
-    createMainServiceFile() {
+    finalizeModels() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.files.mainService = yield this.createFile(this.projectFiles.service);
-            return this.getMainServiceFile();
+            if (this.mainModelFile) {
+                yield this.writeFile(this.mainModelFile);
+            }
         });
     }
-    getMainServiceFile() {
-        return this.files.mainService;
+    initQObjects() {
+        if (this.options.bundledFileGeneration) {
+            // collect reserved names, that is names of classes we're going to create => imports must take them into account
+            const reservedWords = this.dataModel.getModelTypes().reduce((collector, model) => {
+                var _a;
+                const asEntityType = model;
+                if (asEntityType.qName) {
+                    collector.push(asEntityType.qName, (0, processors_1.firstCharLowerCase)(asEntityType.qName));
+                }
+                if ((_a = asEntityType.id) === null || _a === void 0 ? void 0 : _a.qName) {
+                    collector.push(asEntityType.id.qName);
+                }
+                this.dataModel.getAllEntityOperations(model.fqName).forEach((op) => {
+                    collector.push(op.qName);
+                });
+                return collector;
+            }, []);
+            this.dataModel.getUnboundOperationTypes().forEach((op) => {
+                reservedWords.push(op.qName);
+            });
+            this.mainQFile = this.createFile(this.namingHelper.getFileNames().qObject, reservedWords);
+        }
     }
-    writeFiles() {
+    finalizeQObjects() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            switch (this.emitMode) {
-                case OptionModel_1.EmitModes.js:
-                case OptionModel_1.EmitModes.js_dts:
-                    yield this.emitJsFiles();
-                    break;
-                case OptionModel_1.EmitModes.dts:
-                    yield this.emitJsFiles(true);
-                    break;
-                case OptionModel_1.EmitModes.ts:
-                    yield this.emitTsFiles();
-                    break;
-                default:
-                    throw new Error(`Emit mode "${this.emitMode}" is invalid!`);
+            if (this.mainQFile) {
+                yield this.writeFile(this.mainQFile);
             }
         });
     }
-    emitJsFiles(declarationOnly) {
+    initServices() {
+        const mainServiceName = this.namingHelper.getMainServiceName();
+        const reservedNames = [mainServiceName];
+        if (this.options.bundledFileGeneration) {
+            [...this.dataModel.getEntityTypes(), ...this.dataModel.getComplexTypes()].reduce((collector, model) => {
+                collector.push(model.serviceName, model.serviceCollectionName);
+                return collector;
+            }, reservedNames);
+        }
+        this.mainServiceFile = this.createFile(mainServiceName, reservedNames);
+    }
+    finalizeServices() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            console.log(declarationOnly
-                ? "Emitting declaration files"
-                : `Emitting JS files (${this.emitMode === OptionModel_1.EmitModes.js_dts ? "including" : "without"} declaration files)`);
-            yield this.project.emit({ emitOnlyDtsFiles: !!declarationOnly });
-            /* for (const diagnostic of this.project.getPreEmitDiagnostics()) {
-              console.log(diagnostic.getMessageText());
-            } */
+            if (this.mainServiceFile) {
+                yield this.writeFile(this.mainServiceFile);
+            }
         });
     }
-    emitTsFiles() {
+    getMainServiceFile() {
+        return this.mainServiceFile;
+    }
+    createOrGetMainModelFile(reservedNames) {
+        if (!this.mainModelFile) {
+            this.mainModelFile = this.createFile(this.namingHelper.getFileNames().model, reservedNames);
+        }
+        return this.mainModelFile;
+    }
+    createOrGetMainQObjectFile(reservedNames) {
+        if (!this.mainQFile) {
+            this.mainQFile = this.createFile(this.namingHelper.getFileNames().qObject, reservedNames);
+        }
+        return this.mainQFile;
+    }
+    createOrGetModelFile(folderPath, name, reservedNames) {
+        if (this.mainModelFile) {
+            return this.mainModelFile;
+        }
+        return this.createFile(name, reservedNames, folderPath);
+    }
+    createOrGetQObjectFile(folderPath, name, reservedNames) {
+        if (this.mainQFile) {
+            return this.mainQFile;
+        }
+        return this.createFile(name, reservedNames, folderPath);
+    }
+    createOrGetServiceFile(folderPath, name, reservedNames) {
+        if (this.options.bundledFileGeneration) {
+            return this.mainServiceFile;
+        }
+        return this.createFile(name, reservedNames, folderPath);
+    }
+    finalizeFile(file) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const files = [this.getModelFile(), this.getQObjectFile(), this.getMainServiceFile()].filter((file) => !!file);
-            const text = files.length === 1 ? "Emitting 1 TS file" : `Emitting ${files.length} TS files`;
-            console.log(`${text}: ${files.map((f) => path.basename(f.getFilePath())).join(", ")}`);
-            return Promise.all(files.map(this.formatAndWriteFile));
+            // write individual files in unbundled mode & if this is not one of the main files on root level
+            if (!this.options.bundledFileGeneration &&
+                file.path !== "" &&
+                !Object.values(this.namingHelper.getFileNames()).includes(file.fileName)) {
+                yield this.writeFile(file);
+            }
         });
     }
 }

package/lib/project/ProjectManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectManager.js","sourceRoot":"","sources":["../../src/project/ProjectManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeFile } from \"fs/promises\";\r\nimport * as path from \"path\";\r\n\r\nimport { remove } from \"fs-extra\";\r\nimport {\r\n  CompilerOptions,\r\n  ModuleKind,\r\n  ModuleResolutionKind,\r\n  NewLineKind,\r\n  Project,\r\n  ScriptTarget,\r\n  SourceFile,\r\n} from \"ts-morph\";\r\nimport load from \"tsconfig-loader\";\r\nimport ts from \"typescript\";\r\n\r\nimport { ProjectFiles } from \"../data-model/DataModel\";\r\nimport { EmitModes } from \"../OptionModel\";\r\nimport { createFormatter } from \"./formatter\";\r\nimport { FileFormatter } from \"./formatter/FileFormatter\";\r\n\r\nexport async function createProjectManager(\r\n  projectFiles: ProjectFiles,\r\n  outputDir: string,\r\n  emitMode: EmitModes,\r\n  usePrettier: boolean,\r\n  tsConfigPath: string = \"tsconfig.json\"\r\n): Promise<ProjectManager> {\r\n  const generateDeclarations = EmitModes.js_dts === emitMode || EmitModes.dts === emitMode;\r\n  const conf = load({ filename: tsConfigPath });\r\n  const formatter = await createFormatter(outputDir, usePrettier);\r\n\r\n  const {\r\n    // ignored props\r\n    noEmit, // we always want to emit\r\n    importsNotUsedAsValues, // type is missing\r\n    jsx,\r\n    plugins,\r\n    // mapped props\r\n    moduleResolution,\r\n    lib,\r\n    module,\r\n    newLine,\r\n    target,\r\n    rootDir,\r\n    rootDirs,\r\n    ...passThrough\r\n  } = conf?.tsConfig.compilerOptions || {};\r\n\r\n  const compilerOpts: CompilerOptions = {\r\n    ...passThrough,\r\n    outDir: outputDir,\r\n    declaration: generateDeclarations,\r\n    moduleResolution: getModuleResolutionKind(moduleResolution),\r\n    module: getModuleKind(module),\r\n    target: getTarget(target),\r\n    lib: lib as string[],\r\n    newLine:\r\n      newLine?.toLowerCase() === \"crlf\"\r\n        ? NewLineKind.CarriageReturnLineFeed\r\n        : newLine?.toLowerCase() === \"lf\"\r\n        ? NewLineKind.LineFeed\r\n        : undefined,\r\n  };\r\n\r\n  return new ProjectManager(projectFiles, outputDir, emitMode, formatter, compilerOpts);\r\n}\r\n\r\nfunction getModuleResolutionKind(\r\n  moduleResolution: string | undefined | Record<string, any>\r\n): ModuleResolutionKind | undefined {\r\n  const modRes =\r\n    typeof moduleResolution === \"string\"\r\n      ? moduleResolution.toLowerCase() === \"node\"\r\n        ? \"nodejs\"\r\n        : moduleResolution.toLowerCase()\r\n      : undefined;\r\n  const matchedKey = Object.keys(ts.ModuleResolutionKind).find(\r\n    (mk): mk is keyof typeof ModuleResolutionKind => mk.toLowerCase() === modRes\r\n  );\r\n  return matchedKey ? (ts.ModuleResolutionKind[matchedKey] as ModuleResolutionKind) : undefined;\r\n}\r\n\r\nfunction getModuleKind(module: string | undefined | Record<string, any>): ModuleKind | undefined {\r\n  const mod = typeof module === \"string\" ? module.toLowerCase() : undefined;\r\n  const matchedKey = Object.keys(ts.ModuleKind).find((mk): mk is keyof typeof ModuleKind => mk.toLowerCase() === mod);\r\n  return matchedKey ? (ts.ModuleKind[matchedKey] as ModuleKind) : undefined;\r\n}\r\n\r\nfunction getTarget(target: string | undefined | Record<string, any>): ScriptTarget | undefined {\r\n  const t = typeof target === \"string\" ? target.toLowerCase() : undefined;\r\n  const matchedKey = Object.keys(ts.ScriptTarget).find((st): st is keyof typeof ScriptTarget => st.toLowerCase() === t);\r\n  return matchedKey ? (ts.ScriptTarget[matchedKey] as ScriptTarget) : undefined;\r\n}\r\n\r\nexport class ProjectManager {\r\n  private project!: Project;\r\n\r\n  private files: { [name: string]: SourceFile } = {};\r\n\r\n  constructor(\r\n    private projectFiles: ProjectFiles,\r\n    private outputDir: string,\r\n    private emitMode: EmitModes,\r\n    private formatter: FileFormatter,\r\n    compilerOptions: CompilerOptions | undefined\r\n  ) {\r\n    // Create ts-morph project\r\n    this.project = new Project({\r\n      manipulationSettings: this.formatter.getSettings(),\r\n      skipAddingFilesFromTsConfig: true,\r\n      compilerOptions,\r\n    });\r\n  }\r\n\r\n  private async createFile(name: string) {\r\n    const fileName = path.join(this.outputDir, `${name}.ts`);\r\n    await remove(fileName);\r\n    return this.project.createSourceFile(fileName);\r\n  }\r\n\r\n  public async createModelFile() {\r\n    this.files.model = await this.createFile(this.projectFiles.model);\r\n    return this.getModelFile();\r\n  }\r\n\r\n  public getModelFile() {\r\n    return this.files.model;\r\n  }\r\n\r\n  public async createQObjectFile() {\r\n    this.files.qobject = await this.createFile(this.projectFiles.qObject);\r\n    return this.getQObjectFile();\r\n  }\r\n\r\n  public getQObjectFile() {\r\n    return this.files.qobject;\r\n  }\r\n\r\n  public async createMainServiceFile() {\r\n    this.files.mainService = await this.createFile(this.projectFiles.service);\r\n    return this.getMainServiceFile();\r\n  }\r\n\r\n  public getMainServiceFile() {\r\n    return this.files.mainService;\r\n  }\r\n\r\n  public async writeFiles() {\r\n    switch (this.emitMode) {\r\n      case EmitModes.js:\r\n      case EmitModes.js_dts:\r\n        await this.emitJsFiles();\r\n        break;\r\n      case EmitModes.dts:\r\n        await this.emitJsFiles(true);\r\n        break;\r\n      case EmitModes.ts:\r\n        await this.emitTsFiles();\r\n        break;\r\n      default:\r\n        throw new Error(`Emit mode \"${this.emitMode}\" is invalid!`);\r\n    }\r\n  }\r\n\r\n  private async emitJsFiles(declarationOnly?: boolean) {\r\n    console.log(\r\n      declarationOnly\r\n        ? \"Emitting declaration files\"\r\n        : `Emitting JS files (${this.emitMode === EmitModes.js_dts ? \"including\" : \"without\"} declaration files)`\r\n    );\r\n\r\n    await this.project.emit({ emitOnlyDtsFiles: !!declarationOnly });\r\n\r\n    /* for (const diagnostic of this.project.getPreEmitDiagnostics()) {\r\n      console.log(diagnostic.getMessageText());\r\n    } */\r\n  }\r\n\r\n  private async emitTsFiles() {\r\n    const files = [this.getModelFile(), this.getQObjectFile(), this.getMainServiceFile()].filter((file) => !!file);\r\n    const text = files.length === 1 ? \"Emitting 1 TS file\" : `Emitting ${files.length} TS files`;\r\n    console.log(`${text}: ${files.map((f) => path.basename(f.getFilePath())).join(\", \")}`);\r\n    return Promise.all(files.map(this.formatAndWriteFile));\r\n  }\r\n\r\n  private formatAndWriteFile = async (file: SourceFile) => {\r\n    const fileName = file.getFilePath();\r\n    const content = file.getFullText();\r\n\r\n    try {\r\n      const formatted = await this.formatter.format(content);\r\n\r\n      try {\r\n        return writeFile(fileName, formatted);\r\n      } catch (writeError) {\r\n        console.error(`Failed to write file [/${fileName}]`, writeError);\r\n        process.exit(3);\r\n      }\r\n    } catch (formattingError) {\r\n      console.error(\"Formatting failed\", formattingError);\r\n      await writeFile(\"error.log\", formattingError?.toString() || \"no error message!\");\r\n      process.exit(99);\r\n    }\r\n  };\r\n}\r\n"]}
+{"version":3,"file":"ProjectManager.js","sourceRoot":"","sources":["../../src/project/ProjectManager.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from \"path\";\n\nimport { ensureDir } from \"fs-extra\";\nimport { CompilerOptions, Project, SourceFile } from \"ts-morph\";\nimport { firstCharLowerCase } from \"xml2js/lib/processors\";\n\nimport { DataModel } from \"../data-model/DataModel\";\nimport { EntityType } from \"../data-model/DataTypeModel\";\nimport { NamingHelper } from \"../data-model/NamingHelper\";\nimport { EmitModes } from \"../OptionModel\";\nimport { FileHandler } from \"./FileHandler\";\nimport { createFormatter } from \"./formatter\";\nimport { FileFormatter } from \"./formatter/FileFormatter\";\nimport { loadTsMorphCompilerOptions } from \"./TsMorphHelper\";\n\nexport interface ProjectManagerOptions {\n  usePrettier?: boolean;\n  tsConfigPath?: string;\n  bundledFileGeneration?: boolean;\n  /**\n   * for testing purposes, turn this on and retrieve all generated files via getCachedFiles\n   */\n  noOutput?: boolean;\n}\n\nexport async function createProjectManager(\n  outputDir: string,\n  emitMode: EmitModes,\n  namingHelper: NamingHelper,\n  dataModel: DataModel,\n  options: ProjectManagerOptions\n): Promise<ProjectManager> {\n  const { usePrettier = false, tsConfigPath = \"tsconfig.json\" } = options;\n  const formatter = usePrettier ? await createFormatter(outputDir, usePrettier) : undefined;\n\n  const compilerOpts: CompilerOptions = await loadTsMorphCompilerOptions(tsConfigPath, emitMode, outputDir);\n\n  const pm = new ProjectManager(outputDir, emitMode, namingHelper, dataModel, formatter, compilerOpts, {\n    usePrettier,\n    tsConfigPath,\n    ...options,\n  });\n\n  await pm.init();\n\n  return pm;\n}\n\nexport class ProjectManager {\n  private project!: Project;\n\n  private mainServiceFile: FileHandler | undefined;\n  private mainModelFile: FileHandler | undefined;\n  private mainQFile: FileHandler | undefined;\n\n  private readonly cachedFiles: Map<string, SourceFile> | undefined;\n\n  constructor(\n    protected outputDir: string,\n    protected emitMode: EmitModes,\n    protected namingHelper: NamingHelper,\n    protected dataModel: DataModel,\n    protected formatter: FileFormatter | undefined,\n    compilerOptions: CompilerOptions | undefined,\n    protected options: ProjectManagerOptions\n  ) {\n    // Create ts-morph project\n    this.project = new Project({\n      // manipulationSettings: this.formatter.getSettings(),\n      skipAddingFilesFromTsConfig: true,\n      compilerOptions,\n    });\n\n    if (options.noOutput) {\n      this.cachedFiles = new Map();\n    }\n  }\n\n  public getDataModel() {\n    return this.dataModel;\n  }\n\n  /**\n   * Only filled when noOutput=true\n   */\n  public getCachedFiles() {\n    return this.cachedFiles!;\n  }\n\n  private async writeFile(fileHandler: FileHandler) {\n    if (this.options.noOutput) {\n      fileHandler.getFile().addImportDeclarations(fileHandler.getImports().getImportDeclarations());\n      this.cachedFiles!.set(fileHandler.getFullFilePath(), fileHandler.getFile());\n      return;\n    }\n\n    return fileHandler.write(this.emitMode);\n  }\n\n  private createFile(\n    name: string,\n    reservedNames?: Array<string> | undefined,\n    additionalPath: string = \"\"\n  ): FileHandler {\n    const fileName = path.join(this.outputDir, additionalPath, `${name}.ts`);\n\n    return new FileHandler(\n      additionalPath,\n      name,\n      this.project.createSourceFile(fileName),\n      this.dataModel,\n      this.namingHelper.getFileNames(),\n      !!this.options.bundledFileGeneration,\n      this.formatter,\n      reservedNames\n    );\n  }\n\n  public async init() {\n    if (!this.options.bundledFileGeneration) {\n      // ensure folder for each model: we do this at this point for performance reasons\n      await Promise.all(\n        this.dataModel.getModelTypes().map((mt) => ensureDir(path.join(this.outputDir, mt.folderPath)))\n      );\n    }\n\n    const typePart = this.emitMode.toUpperCase().replace(\"_\", \" & \");\n    console.log(`Prepared to emit ${typePart} files.`);\n  }\n\n  public initModels() {\n    if (this.options.bundledFileGeneration) {\n      // collect reserved names, that is names of classes we're going to create => imports must take them into account\n      const reservedWords = this.dataModel.getModelTypes().reduce<Array<string>>((collector, model) => {\n        const asEntityType = model as EntityType;\n        collector.push(model.modelName);\n        if (asEntityType.editableName) {\n          collector.push(asEntityType.editableName);\n        }\n        if (asEntityType.id?.modelName) {\n          collector.push(asEntityType.id.modelName);\n        }\n        this.dataModel.getAllEntityOperations(model.fqName).forEach((op) => {\n          if (op.parameters.length) {\n            collector.push(op.paramsModelName);\n          }\n        });\n\n        return collector;\n      }, []);\n      this.dataModel.getUnboundOperationTypes().forEach((op) => {\n        if (op.parameters.length) {\n          reservedWords.push(op.paramsModelName);\n        }\n      });\n\n      this.mainModelFile = this.createFile(this.namingHelper.getFileNames().model, reservedWords);\n    }\n  }\n\n  public async finalizeModels() {\n    if (this.mainModelFile) {\n      await this.writeFile(this.mainModelFile);\n    }\n  }\n\n  public initQObjects() {\n    if (this.options.bundledFileGeneration) {\n      // collect reserved names, that is names of classes we're going to create => imports must take them into account\n      const reservedWords = this.dataModel.getModelTypes().reduce<Array<string>>((collector, model) => {\n        const asEntityType = model as EntityType;\n        if (asEntityType.qName) {\n          collector.push(asEntityType.qName, firstCharLowerCase(asEntityType.qName));\n        }\n        if (asEntityType.id?.qName) {\n          collector.push(asEntityType.id.qName);\n        }\n        this.dataModel.getAllEntityOperations(model.fqName).forEach((op) => {\n          collector.push(op.qName);\n        });\n\n        return collector;\n      }, []);\n      this.dataModel.getUnboundOperationTypes().forEach((op) => {\n        reservedWords.push(op.qName);\n      });\n\n      this.mainQFile = this.createFile(this.namingHelper.getFileNames().qObject, reservedWords);\n    }\n  }\n\n  public async finalizeQObjects() {\n    if (this.mainQFile) {\n      await this.writeFile(this.mainQFile);\n    }\n  }\n\n  public initServices() {\n    const mainServiceName = this.namingHelper.getMainServiceName();\n    const reservedNames = [mainServiceName];\n\n    if (this.options.bundledFileGeneration) {\n      [...this.dataModel.getEntityTypes(), ...this.dataModel.getComplexTypes()].reduce((collector, model) => {\n        collector.push(model.serviceName, model.serviceCollectionName);\n        return collector;\n      }, reservedNames);\n    }\n\n    this.mainServiceFile = this.createFile(mainServiceName, reservedNames);\n  }\n\n  public async finalizeServices() {\n    if (this.mainServiceFile) {\n      await this.writeFile(this.mainServiceFile);\n    }\n  }\n\n  public getMainServiceFile() {\n    return this.mainServiceFile!;\n  }\n\n  public createOrGetMainModelFile(reservedNames?: Array<string>) {\n    if (!this.mainModelFile) {\n      this.mainModelFile = this.createFile(this.namingHelper.getFileNames().model, reservedNames);\n    }\n    return this.mainModelFile;\n  }\n\n  public createOrGetMainQObjectFile(reservedNames?: Array<string>) {\n    if (!this.mainQFile) {\n      this.mainQFile = this.createFile(this.namingHelper.getFileNames().qObject, reservedNames);\n    }\n    return this.mainQFile;\n  }\n\n  public createOrGetModelFile(folderPath: string, name: string, reservedNames?: Array<string> | undefined) {\n    if (this.mainModelFile) {\n      return this.mainModelFile;\n    }\n\n    return this.createFile(name, reservedNames, folderPath);\n  }\n  public createOrGetQObjectFile(folderPath: string, name: string, reservedNames?: Array<string> | undefined) {\n    if (this.mainQFile) {\n      return this.mainQFile;\n    }\n\n    return this.createFile(name, reservedNames, folderPath);\n  }\n  public createOrGetServiceFile(folderPath: string, name: string, reservedNames?: Array<string> | undefined) {\n    if (this.options.bundledFileGeneration) {\n      return this.mainServiceFile!;\n    }\n\n    return this.createFile(name, reservedNames, folderPath);\n  }\n\n  public async finalizeFile(file: FileHandler) {\n    // write individual files in unbundled mode & if this is not one of the main files on root level\n    if (\n      !this.options.bundledFileGeneration &&\n      file.path !== \"\" &&\n      !Object.values(this.namingHelper.getFileNames()).includes(file.fileName)\n    ) {\n      await this.writeFile(file);\n    }\n  }\n}\n"]}

package/lib/project/TsMorphHelper.d.ts

@@ -0,0 +1,11 @@
+import { CompilerOptions } from "ts-morph";
+import { EmitModes } from "../OptionModel";
+/**
+ * Loads the TS configuration from the specified path.
+ * Then maps the appropriate options to ts-morph compiler options.
+ *
+ * @param tsConfigPath path to tsconfig.json
+ * @param emitMode the used emit mode
+ * @param outputDir the used output dir
+ */
+export declare function loadTsMorphCompilerOptions(tsConfigPath: string, emitMode: EmitModes, outputDir: string): Promise<CompilerOptions>;

package/lib/project/TsMorphHelper.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadTsMorphCompilerOptions = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@ts-morph/common");
+const tsconfig_loader_1 = tslib_1.__importDefault(require("tsconfig-loader"));
+const typescript_1 = tslib_1.__importDefault(require("typescript"));
+const OptionModel_1 = require("../OptionModel");
+/**
+ * Loads the TS configuration from the specified path.
+ * Then maps the appropriate options to ts-morph compiler options.
+ *
+ * @param tsConfigPath path to tsconfig.json
+ * @param emitMode the used emit mode
+ * @param outputDir the used output dir
+ */
+function loadTsMorphCompilerOptions(tsConfigPath, emitMode, outputDir) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const generateDeclarations = OptionModel_1.EmitModes.js_dts === emitMode || OptionModel_1.EmitModes.dts === emitMode;
+        // load config file
+        // NOTE: not async...
+        const conf = (0, tsconfig_loader_1.default)({ filename: tsConfigPath });
+        const _a = (conf === null || conf === void 0 ? void 0 : conf.tsConfig.compilerOptions) || {}, { 
+        // ignored props
+        noEmit, // we always want to emit
+        importsNotUsedAsValues, // type is missing
+        jsx, plugins, 
+        // mapped props
+        moduleResolution, lib, module, newLine, target, rootDir, rootDirs } = _a, passThrough = tslib_1.__rest(_a, ["noEmit", "importsNotUsedAsValues", "jsx", "plugins", "moduleResolution", "lib", "module", "newLine", "target", "rootDir", "rootDirs"]);
+        const compilerOpts = Object.assign(Object.assign({}, passThrough), { outDir: outputDir, declaration: generateDeclarations, moduleResolution: getModuleResolutionKind(moduleResolution), module: getModuleKind(module), target: getTarget(target) });
+        if (lib) {
+            compilerOpts.lib = lib;
+        }
+        if (newLine) {
+            compilerOpts.newLine = (newLine === null || newLine === void 0 ? void 0 : newLine.toLowerCase()) === "lf" ? common_1.NewLineKind.LineFeed : common_1.NewLineKind.CarriageReturnLineFeed;
+        }
+        return compilerOpts;
+    });
+}
+exports.loadTsMorphCompilerOptions = loadTsMorphCompilerOptions;
+/**
+ * Maps to lower case.
+ * Also translates "node" to "nodejs".
+ *
+ * @param moduleResolution
+ */
+function getModuleResolutionKind(moduleResolution) {
+    const modRes = typeof moduleResolution === "string"
+        ? moduleResolution.toLowerCase() === "node"
+            ? "nodejs"
+            : moduleResolution.toLowerCase()
+        : undefined;
+    const matchedKey = Object.keys(typescript_1.default.ModuleResolutionKind).find((mk) => mk.toLowerCase() === modRes);
+    return matchedKey ? typescript_1.default.ModuleResolutionKind[matchedKey] : undefined;
+}
+function getModuleKind(module) {
+    const mod = typeof module === "string" ? module.toLowerCase() : undefined;
+    const matchedKey = Object.keys(typescript_1.default.ModuleKind).find((mk) => mk.toLowerCase() === mod);
+    return matchedKey ? typescript_1.default.ModuleKind[matchedKey] : undefined;
+}
+function getTarget(target) {
+    const t = typeof target === "string" ? target.toLowerCase() : undefined;
+    const matchedKey = Object.keys(typescript_1.default.ScriptTarget).find((st) => st.toLowerCase() === t);
+    return matchedKey ? typescript_1.default.ScriptTarget[matchedKey] : undefined;
+}
+//# sourceMappingURL=TsMorphHelper.js.map

package/lib/project/TsMorphHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TsMorphHelper.js","sourceRoot":"","sources":["../../src/project/TsMorphHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import { NewLineKind } from \"@ts-morph/common\";\nimport { CompilerOptions, ModuleKind, ModuleResolutionKind, ScriptTarget } from \"ts-morph\";\nimport load from \"tsconfig-loader\";\nimport ts from \"typescript\";\n\nimport { EmitModes } from \"../OptionModel\";\n\n/**\n * Loads the TS configuration from the specified path.\n * Then maps the appropriate options to ts-morph compiler options.\n *\n * @param tsConfigPath path to tsconfig.json\n * @param emitMode the used emit mode\n * @param outputDir the used output dir\n */\nexport async function loadTsMorphCompilerOptions(tsConfigPath: string, emitMode: EmitModes, outputDir: string) {\n  const generateDeclarations = EmitModes.js_dts === emitMode || EmitModes.dts === emitMode;\n\n  // load config file\n  // NOTE: not async...\n  const conf = load({ filename: tsConfigPath });\n\n  const {\n    // ignored props\n    noEmit, // we always want to emit\n    importsNotUsedAsValues, // type is missing\n    jsx,\n    plugins,\n    // mapped props\n    moduleResolution,\n    lib,\n    module,\n    newLine,\n    target,\n    rootDir,\n    rootDirs,\n    ...passThrough\n  } = conf?.tsConfig.compilerOptions || {};\n\n  const compilerOpts: CompilerOptions = {\n    ...passThrough,\n    outDir: outputDir,\n    declaration: generateDeclarations,\n    moduleResolution: getModuleResolutionKind(moduleResolution),\n    module: getModuleKind(module),\n    target: getTarget(target),\n  };\n  if (lib) {\n    compilerOpts.lib = lib as string[];\n  }\n  if (newLine) {\n    compilerOpts.newLine = newLine?.toLowerCase() === \"lf\" ? NewLineKind.LineFeed : NewLineKind.CarriageReturnLineFeed;\n  }\n\n  return compilerOpts;\n}\n\n/**\n * Maps to lower case.\n * Also translates \"node\" to \"nodejs\".\n *\n * @param moduleResolution\n */\nfunction getModuleResolutionKind(\n  moduleResolution: string | undefined | Record<string, any>\n): ModuleResolutionKind | undefined {\n  const modRes =\n    typeof moduleResolution === \"string\"\n      ? moduleResolution.toLowerCase() === \"node\"\n        ? \"nodejs\"\n        : moduleResolution.toLowerCase()\n      : undefined;\n  const matchedKey = Object.keys(ts.ModuleResolutionKind).find(\n    (mk): mk is keyof typeof ModuleResolutionKind => mk.toLowerCase() === modRes\n  );\n  return matchedKey ? (ts.ModuleResolutionKind[matchedKey] as ModuleResolutionKind) : undefined;\n}\n\nfunction getModuleKind(module: string | undefined | Record<string, any>): ModuleKind | undefined {\n  const mod = typeof module === \"string\" ? module.toLowerCase() : undefined;\n  const matchedKey = Object.keys(ts.ModuleKind).find((mk): mk is keyof typeof ModuleKind => mk.toLowerCase() === mod);\n  return matchedKey ? (ts.ModuleKind[matchedKey] as ModuleKind) : undefined;\n}\n\nfunction getTarget(target: string | undefined | Record<string, any>): ScriptTarget | undefined {\n  const t = typeof target === \"string\" ? target.toLowerCase() : undefined;\n  const matchedKey = Object.keys(ts.ScriptTarget).find((st): st is keyof typeof ScriptTarget => st.toLowerCase() === t);\n  return matchedKey ? (ts.ScriptTarget[matchedKey] as ScriptTarget) : undefined;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odata2ts/odata2ts",
-  "version": "0.33.0",
+  "version": "0.33.2",
   "publishConfig": {
     "access": "public"
   },
@@ -14,12 +14,14 @@
   "scripts": {
     "build": "yarn clean && yarn compile",
     "check-circular-deps": "madge ./src --extensions ts --circular",
+    "check-circular-generated": "madge ./build --extensions ts --circular",
     "clean": "rimraf lib build",
     "clean-v2": "rimraf build/v2",
     "clean-v4": "rimraf build/v4",
     "clear-cache": "jest --clearCache",
     "compile": "tsc",
     "compile-fixtures": "tsc -p ./tsconfig.fixture.json",
+    "compile-generated": "tsc -p ./tsconfig.generated.json",
     "dev": "yarn generate trippin odata",
     "generate": "ts-node --cwd-mode src/run-cli.ts ",
     "int-test": "yarn clean && jest ./int-test",
@@ -45,14 +47,14 @@
     "v4"
   ],
   "peerDependencies": {
-    "@odata2ts/odata-query-objects": "^0.20.0",
-    "@odata2ts/odata-service": "^0.17.1"
+    "@odata2ts/odata-query-objects": "^0.20.2",
+    "@odata2ts/odata-service": "^0.18.0"
   },
   "dependencies": {
     "@odata2ts/converter-api": "^0.1.2",
     "@odata2ts/converter-runtime": "^0.2.2",
     "@odata2ts/http-client-api": "^0.5.1",
-    "@odata2ts/odata-core": "^0.4.0",
+    "@odata2ts/odata-core": "^0.5.0",
     "@prettier/plugin-xml": "^2.2.0",
     "axios": "^1.4.0",
     "camel-case": "^4.1.2",
@@ -73,9 +75,9 @@
   },
   "devDependencies": {
     "@odata2ts/converter-v2-to-v4": "^0.1.4",
-    "@odata2ts/odata-query-objects": "^0.20.0",
-    "@odata2ts/odata-service": "^0.17.1",
-    "@odata2ts/test-converters": "^0.3.0",
+    "@odata2ts/odata-query-objects": "^0.20.2",
+    "@odata2ts/odata-service": "^0.18.0",
+    "@odata2ts/test-converters": "^0.3.1",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.5.2",
     "@types/node": "^20.3.0",
@@ -88,6 +90,6 @@
     "typescript": "^5.1.3"
   },
   "types": "./lib/index.d.ts",
-  "gitHead": "76da31570a037c222fa40bc587694f371ef70c32",
+  "gitHead": "1e5119807992887ba96f8918b13bc51f55cbbe1c",
   "readme": "README.md"
 }