@odata2ts/odata2ts 0.23.1 → 0.24.0

package/lib/app.js

@@ -1,64 +1,64 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runApp = void 0;
-const tslib_1 = require("tslib");
-const odata_core_1 = require("@odata2ts/odata-core");
-const DataModelDigestionV2_1 = require("./data-model/DataModelDigestionV2");
-const DataModelDigestionV4_1 = require("./data-model/DataModelDigestionV4");
-const NamingHelper_1 = require("./data-model/NamingHelper");
-const generator_1 = require("./generator");
-const OptionModel_1 = require("./OptionModel");
-const ProjectManager_1 = require("./project/ProjectManager");
-function isQObjectGen(mode) {
-    return [OptionModel_1.Modes.qobjects, OptionModel_1.Modes.service, OptionModel_1.Modes.all].includes(mode);
-}
-function isServiceGen(mode) {
-    return [OptionModel_1.Modes.service, OptionModel_1.Modes.all].includes(mode);
-}
-/**
- *
- * @param metadataJson metadata of a given OData service already parsed as JSON
- * @param options further options
- */
-function runApp(metadataJson, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // determine edmx edmxVersion attribute
-        const edmxVersion = metadataJson["edmx:Edmx"].$.Version;
-        const version = edmxVersion === "1.0" ? odata_core_1.ODataVersions.V2 : odata_core_1.ODataVersions.V4;
-        const dataService = metadataJson["edmx:Edmx"]["edmx:DataServices"][0];
-        // handling multiple schemas => merge them
-        const schemaRaw = dataService.Schema.reduce((collector, schema) => (Object.assign(Object.assign({}, schema), collector)), {});
-        const detectedServiceName = dataService.Schema.length === 1
-            ? dataService.Schema[0].$.Namespace
-            : (_a = dataService.Schema.find((schema) => !schema.EntityContainer)) === null || _a === void 0 ? void 0 : _a.$.Namespace;
-        // encapsulate the whole naming logic
-        const namingHelper = new NamingHelper_1.NamingHelper(options, detectedServiceName, options.serviceName);
-        // parse model information from edmx into something we can really work with
-        // => that stuff is called dataModel!
-        const dataModel = version === odata_core_1.ODataVersions.V2
-            ? yield (0, DataModelDigestionV2_1.digest)(schemaRaw, options, namingHelper)
-            : yield (0, DataModelDigestionV4_1.digest)(schemaRaw, options, namingHelper);
-        // handling the overall generation project
-        const project = yield (0, ProjectManager_1.createProjectManager)(namingHelper.getFileNames(), options.output, options.emitMode, options.prettier, options.tsconfig);
-        // Generate Model Interfaces
-        // supported edmx types: EntityType, ComplexType, EnumType
-        const modelsFile = yield project.createModelFile();
-        (0, generator_1.generateModels)(dataModel, modelsFile, version, options, namingHelper);
-        // Generate Query Objects
-        // supported edmx types: EntityType, ComplexType
-        // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object
-        if (isQObjectGen(options.mode)) {
-            const qFile = yield project.createQObjectFile();
-            (0, generator_1.generateQueryObjects)(dataModel, qFile, version, options, namingHelper);
-        }
-        // Generate Individual OData-Service
-        if (isServiceGen(options.mode)) {
-            yield project.cleanServiceDir();
-            yield (0, generator_1.generateServices)(dataModel, project, version, namingHelper);
-        }
-        yield project.writeFiles();
-    });
-}
-exports.runApp = runApp;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runApp = void 0;
+const tslib_1 = require("tslib");
+const odata_core_1 = require("@odata2ts/odata-core");
+const DataModelDigestionV2_1 = require("./data-model/DataModelDigestionV2");
+const DataModelDigestionV4_1 = require("./data-model/DataModelDigestionV4");
+const NamingHelper_1 = require("./data-model/NamingHelper");
+const generator_1 = require("./generator");
+const OptionModel_1 = require("./OptionModel");
+const ProjectManager_1 = require("./project/ProjectManager");
+function isQObjectGen(mode) {
+    return [OptionModel_1.Modes.qobjects, OptionModel_1.Modes.service, OptionModel_1.Modes.all].includes(mode);
+}
+function isServiceGen(mode) {
+    return [OptionModel_1.Modes.service, OptionModel_1.Modes.all].includes(mode);
+}
+/**
+ *
+ * @param metadataJson metadata of a given OData service already parsed as JSON
+ * @param options further options
+ */
+function runApp(metadataJson, options) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // determine edmx edmxVersion attribute
+        const edmxVersion = metadataJson["edmx:Edmx"].$.Version;
+        const version = edmxVersion === "1.0" ? odata_core_1.ODataVersions.V2 : odata_core_1.ODataVersions.V4;
+        const dataService = metadataJson["edmx:Edmx"]["edmx:DataServices"][0];
+        // handling multiple schemas => merge them
+        const schemaRaw = dataService.Schema.reduce((collector, schema) => (Object.assign(Object.assign({}, schema), collector)), {});
+        const detectedServiceName = dataService.Schema.length === 1
+            ? dataService.Schema[0].$.Namespace
+            : (_a = dataService.Schema.find((schema) => !schema.EntityContainer)) === null || _a === void 0 ? void 0 : _a.$.Namespace;
+        // encapsulate the whole naming logic
+        const namingHelper = new NamingHelper_1.NamingHelper(options, detectedServiceName, options.serviceName);
+        // parse model information from edmx into something we can really work with
+        // => that stuff is called dataModel!
+        const dataModel = version === odata_core_1.ODataVersions.V2
+            ? yield (0, DataModelDigestionV2_1.digest)(schemaRaw, options, namingHelper)
+            : yield (0, DataModelDigestionV4_1.digest)(schemaRaw, options, namingHelper);
+        // handling the overall generation project
+        const project = yield (0, ProjectManager_1.createProjectManager)(namingHelper.getFileNames(), options.output, options.emitMode, options.prettier, options.tsconfig);
+        // Generate Model Interfaces
+        // supported edmx types: EntityType, ComplexType, EnumType
+        const modelsFile = yield project.createModelFile();
+        (0, generator_1.generateModels)(dataModel, modelsFile, version, options, namingHelper);
+        // Generate Query Objects
+        // supported edmx types: EntityType, ComplexType
+        // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object
+        if (isQObjectGen(options.mode)) {
+            const qFile = yield project.createQObjectFile();
+            (0, generator_1.generateQueryObjects)(dataModel, qFile, version, options, namingHelper);
+        }
+        // Generate Individual OData-Service
+        if (isServiceGen(options.mode)) {
+            yield project.cleanServiceDir();
+            yield (0, generator_1.generateServices)(dataModel, project, version, namingHelper);
+        }
+        yield project.writeFiles();
+    });
+}
+exports.runApp = runApp;
 //# sourceMappingURL=app.js.map

package/lib/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\n\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\nimport { ODataEdmxModelBase, Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\nimport { SchemaV3 } from \"./data-model/edmx/ODataEdmxModelV3\";\nimport { SchemaV4 } from \"./data-model/edmx/ODataEdmxModelV4\";\nimport { NamingHelper } from \"./data-model/NamingHelper\";\nimport { generateModels, generateQueryObjects, generateServices } from \"./generator\";\nimport { Modes, RunOptions } from \"./OptionModel\";\nimport { createProjectManager } from \"./project/ProjectManager\";\n\nfunction isQObjectGen(mode: Modes) {\n  return [Modes.qobjects, Modes.service, Modes.all].includes(mode);\n}\n\nfunction isServiceGen(mode: Modes) {\n  return [Modes.service, Modes.all].includes(mode);\n}\n\n/**\n *\n * @param metadataJson metadata of a given OData service already parsed as JSON\n * @param options further options\n */\nexport async function runApp(metadataJson: ODataEdmxModelBase<any>, options: RunOptions): Promise<void> {\n  // determine edmx edmxVersion attribute\n  const edmxVersion = metadataJson[\"edmx:Edmx\"].$.Version;\n  const version = edmxVersion === \"1.0\" ? ODataVersions.V2 : ODataVersions.V4;\n\n  const dataService = metadataJson[\"edmx:Edmx\"][\"edmx:DataServices\"][0];\n\n  // handling multiple schemas => merge them\n  const schemaRaw = dataService.Schema.reduce(\n    (collector, schema) => ({\n      ...schema,\n      ...collector,\n    }),\n    {} as Schema<any, any>\n  );\n  const detectedServiceName =\n    dataService.Schema.length === 1\n      ? dataService.Schema[0].$.Namespace\n      : dataService.Schema.find((schema) => !schema.EntityContainer)?.$.Namespace;\n\n  // encapsulate the whole naming logic\n  const namingHelper = new NamingHelper(options, detectedServiceName, options.serviceName);\n  // parse model information from edmx into something we can really work with\n  // => that stuff is called dataModel!\n  const dataModel =\n    version === ODataVersions.V2\n      ? await digestV2(schemaRaw as SchemaV3, options, namingHelper)\n      : await digestV4(schemaRaw as SchemaV4, options, namingHelper);\n  // handling the overall generation project\n  const project = await createProjectManager(\n    namingHelper.getFileNames(),\n    options.output,\n    options.emitMode,\n    options.prettier,\n    options.tsconfig\n  );\n\n  // Generate Model Interfaces\n  // supported edmx types: EntityType, ComplexType, EnumType\n  const modelsFile = await project.createModelFile();\n  generateModels(dataModel, modelsFile, version, options, namingHelper);\n\n  // Generate Query Objects\n  // supported edmx types: EntityType, ComplexType\n  // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object\n  if (isQObjectGen(options.mode)) {\n    const qFile = await project.createQObjectFile();\n    generateQueryObjects(dataModel, qFile, version, options, namingHelper);\n  }\n\n  // Generate Individual OData-Service\n  if (isServiceGen(options.mode)) {\n    await project.cleanServiceDir();\n    await generateServices(dataModel, project, version, namingHelper);\n  }\n\n  await project.writeFiles();\n}\n"]}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;AAAA,qDAAqD;AAErD,4EAAuE;AACvE,4EAAuE;AAIvE,4DAAyD;AACzD,2CAAqF;AACrF,+CAAkD;AAClD,6DAAgE;AAEhE,SAAS,YAAY,CAAC,IAAW;IAC/B,OAAO,CAAC,mBAAK,CAAC,QAAQ,EAAE,mBAAK,CAAC,OAAO,EAAE,mBAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,YAAY,CAAC,IAAW;IAC/B,OAAO,CAAC,mBAAK,CAAC,OAAO,EAAE,mBAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,SAAsB,MAAM,CAAC,YAAqC,EAAE,OAAmB;;;QACrF,uCAAuC;QACvC,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACxD,MAAM,OAAO,GAAG,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,0BAAa,CAAC,EAAE,CAAC,CAAC,CAAC,0BAAa,CAAC,EAAE,CAAC;QAE5E,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtE,0CAA0C;QAC1C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CACzC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,iCAClB,MAAM,GACN,SAAS,EACZ,EACF,EAAsB,CACvB,CAAC;QACF,MAAM,mBAAmB,GACvB,WAAW,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAC7B,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;YACnC,CAAC,CAAC,MAAA,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,0CAAE,CAAC,CAAC,SAAS,CAAC;QAEhF,qCAAqC;QACrC,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACzF,2EAA2E;QAC3E,qCAAqC;QACrC,MAAM,SAAS,GACb,OAAO,KAAK,0BAAa,CAAC,EAAE;YAC1B,CAAC,CAAC,MAAM,IAAA,6BAAQ,EAAC,SAAqB,EAAE,OAAO,EAAE,YAAY,CAAC;YAC9D,CAAC,CAAC,MAAM,IAAA,6BAAQ,EAAC,SAAqB,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QACnE,0CAA0C;QAC1C,MAAM,OAAO,GAAG,MAAM,IAAA,qCAAoB,EACxC,YAAY,CAAC,YAAY,EAAE,EAC3B,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,QAAQ,CACjB,CAAC;QAEF,4BAA4B;QAC5B,0DAA0D;QAC1D,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;QACnD,IAAA,0BAAc,EAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QAEtE,yBAAyB;QACzB,gDAAgD;QAChD,mJAAmJ;QACnJ,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC9B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAChD,IAAA,gCAAoB,EAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;SACxE;QAED,oCAAoC;QACpC,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC9B,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;YAChC,MAAM,IAAA,4BAAgB,EAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;SACnE;QAED,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;;CAC5B;AAzDD,wBAyDC","sourcesContent":["import { ODataVersions } from \"@odata2ts/odata-core\";\r\n\r\nimport { digest as digestV2 } from \"./data-model/DataModelDigestionV2\";\r\nimport { digest as digestV4 } from \"./data-model/DataModelDigestionV4\";\r\nimport { ODataEdmxModelBase, Schema } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { SchemaV3 } from \"./data-model/edmx/ODataEdmxModelV3\";\r\nimport { SchemaV4 } from \"./data-model/edmx/ODataEdmxModelV4\";\r\nimport { NamingHelper } from \"./data-model/NamingHelper\";\r\nimport { generateModels, generateQueryObjects, generateServices } from \"./generator\";\r\nimport { Modes, RunOptions } from \"./OptionModel\";\r\nimport { createProjectManager } from \"./project/ProjectManager\";\r\n\r\nfunction isQObjectGen(mode: Modes) {\r\n  return [Modes.qobjects, Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\nfunction isServiceGen(mode: Modes) {\r\n  return [Modes.service, Modes.all].includes(mode);\r\n}\r\n\r\n/**\r\n *\r\n * @param metadataJson metadata of a given OData service already parsed as JSON\r\n * @param options further options\r\n */\r\nexport async function runApp(metadataJson: ODataEdmxModelBase<any>, options: RunOptions): Promise<void> {\r\n  // determine edmx edmxVersion attribute\r\n  const edmxVersion = metadataJson[\"edmx:Edmx\"].$.Version;\r\n  const version = edmxVersion === \"1.0\" ? ODataVersions.V2 : ODataVersions.V4;\r\n\r\n  const dataService = metadataJson[\"edmx:Edmx\"][\"edmx:DataServices\"][0];\r\n\r\n  // handling multiple schemas => merge them\r\n  const schemaRaw = dataService.Schema.reduce(\r\n    (collector, schema) => ({\r\n      ...schema,\r\n      ...collector,\r\n    }),\r\n    {} as Schema<any, any>\r\n  );\r\n  const detectedServiceName =\r\n    dataService.Schema.length === 1\r\n      ? dataService.Schema[0].$.Namespace\r\n      : dataService.Schema.find((schema) => !schema.EntityContainer)?.$.Namespace;\r\n\r\n  // encapsulate the whole naming logic\r\n  const namingHelper = new NamingHelper(options, detectedServiceName, options.serviceName);\r\n  // parse model information from edmx into something we can really work with\r\n  // => that stuff is called dataModel!\r\n  const dataModel =\r\n    version === ODataVersions.V2\r\n      ? await digestV2(schemaRaw as SchemaV3, options, namingHelper)\r\n      : await digestV4(schemaRaw as SchemaV4, options, namingHelper);\r\n  // handling the overall generation project\r\n  const project = await createProjectManager(\r\n    namingHelper.getFileNames(),\r\n    options.output,\r\n    options.emitMode,\r\n    options.prettier,\r\n    options.tsconfig\r\n  );\r\n\r\n  // Generate Model Interfaces\r\n  // supported edmx types: EntityType, ComplexType, EnumType\r\n  const modelsFile = await project.createModelFile();\r\n  generateModels(dataModel, modelsFile, version, options, namingHelper);\r\n\r\n  // Generate Query Objects\r\n  // supported edmx types: EntityType, ComplexType\r\n  // supported edmx prop types: primitive types, enum types, primitive collection (incl enum types), entity collection, entity object, complex object\r\n  if (isQObjectGen(options.mode)) {\r\n    const qFile = await project.createQObjectFile();\r\n    generateQueryObjects(dataModel, qFile, version, options, namingHelper);\r\n  }\r\n\r\n  // Generate Individual OData-Service\r\n  if (isServiceGen(options.mode)) {\r\n    await project.cleanServiceDir();\r\n    await generateServices(dataModel, project, version, namingHelper);\r\n  }\r\n\r\n  await project.writeFiles();\r\n}\r\n"]}

package/lib/cli.d.ts

@@ -1,3 +1,3 @@
-export declare class Cli {
-    run(): Promise<void>;
-}
+export declare class Cli {
+    run(): Promise<void>;
+}

package/lib/cli.js

@@ -1,154 +1,154 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Cli = void 0;
-const tslib_1 = require("tslib");
-const commander_1 = tslib_1.__importStar(require("commander"));
-const cosmiconfig_1 = require("cosmiconfig");
-const cosmiconfig_typescript_loader_1 = require("cosmiconfig-typescript-loader");
-const fs_extra_1 = require("fs-extra");
-const xml2js_1 = require("xml2js");
-const app_1 = require("./app");
-const evaluateConfig_1 = require("./evaluateConfig");
-const OptionModel_1 = require("./OptionModel");
-const logFilePath_1 = require("./project/logger/logFilePath");
-function parseMode(value, dummyPrevious) {
-    switch (value) {
-        case "models":
-            return OptionModel_1.Modes.models;
-        case "qobjects":
-            return OptionModel_1.Modes.qobjects;
-        case "service":
-            return OptionModel_1.Modes.service;
-        case "all":
-            return OptionModel_1.Modes.all;
-        default:
-            throw new Error(`Not a valid Mode: ${value}`);
-    }
-}
-function parseEmitMode(value, dummyPrevious) {
-    switch (value) {
-        case "dts":
-            return OptionModel_1.EmitModes.dts;
-        case "js":
-            return OptionModel_1.EmitModes.js;
-        case "ts":
-            return OptionModel_1.EmitModes.ts;
-        case "js_dts":
-            return OptionModel_1.EmitModes.js_dts;
-        default:
-            throw new Error(`Not a valid EmitMode: ${value}`);
-    }
-}
-function processCliArgs() {
-    var _a;
-    const cli = new commander_1.default.Command()
-        .version("0.3.0")
-        .description("CLI to generate Typescript Interfaces for models of a given OData service.")
-        .argument("[services...]", "Run the generation process only for certain services specified in config file", [])
-        .option("-s, --source <metadata.xml>", "Metadata file describing the OData service")
-        .option("-o, --output <path>", "Output location for generated files")
-        .addOption(new commander_1.Option("-m, --mode <mode>", "What kind of stuff gets generated")
-        .choices(Object.values(OptionModel_1.Modes).filter((t) => isNaN(Number(t))))
-        .argParser(parseMode))
-        .addOption(new commander_1.Option("-e, --emit-mode <mode>", "Output TS source files, compiled JS files with/wihthout generated d.ts files")
-        .choices(Object.values(OptionModel_1.EmitModes))
-        .argParser(parseEmitMode))
-        .option("-p, --prettier", "Format result with prettier (only applies if emitMode=ts)")
-        .option("-t, --tsconfig <path>", "Specify alternative to 'tsconfig.json' to use specific compilerOptions (applies if emitMode is not ts)")
-        .option("-d, --debug", "Verbose debug infos")
-        .option("-name, --service-name <serviceName>", "Give the service your own name")
-        .option("-n, --disable-auto-managed-key", "Give the service your own name")
-        .option("-r, --allow-renaming ", "Give the service your own name")
-        .parse(process.argv);
-    const args = ((_a = cli.args) === null || _a === void 0 ? void 0 : _a.length) ? { services: cli.args } : {};
-    return Object.assign(Object.assign({}, cli.opts()), args);
-}
-function processConfigFile() {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const moduleName = "odata2ts";
-        const explorer = (0, cosmiconfig_1.cosmiconfig)(moduleName, {
-            searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.cjs`],
-            loaders: {
-                ".ts": (0, cosmiconfig_typescript_loader_1.TypeScriptLoader)(),
-            },
-        });
-        const discoveredConfig = yield explorer.search();
-        if (discoveredConfig === null || discoveredConfig === void 0 ? void 0 : discoveredConfig.config) {
-            console.log("Loaded config file: ", (0, logFilePath_1.logFilePath)(discoveredConfig.filepath));
-        }
-        else {
-            console.log("No config file found.");
-        }
-        return discoveredConfig === null || discoveredConfig === void 0 ? void 0 : discoveredConfig.config;
-    });
-}
-class Cli {
-    run() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let runs;
-            try {
-                const cliOpts = processCliArgs();
-                if (cliOpts.debug) {
-                    console.log("CLI opts:", cliOpts);
-                }
-                const fileOpts = yield processConfigFile();
-                runs = (0, evaluateConfig_1.evaluateConfigOptions)(cliOpts, fileOpts);
-            }
-            catch (error) {
-                console.error("Bad arguments!", error === null || error === void 0 ? void 0 : error.message);
-                process.exit(1);
-            }
-            for (let run of runs) {
-                yield startServiceGenerationRun(run);
-            }
-        });
-    }
-}
-exports.Cli = Cli;
-function startServiceGenerationRun(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { source, output, debug, mode, emitMode, prettier, serviceName } = options;
-        console.log("---------------------------");
-        console.log("Starting generation process");
-        if (debug) {
-            console.log("Resolved config:", {
-                source,
-                output,
-                debug,
-                mode: OptionModel_1.Modes[mode],
-                emitMode,
-                prettier,
-                serviceName,
-            });
-        }
-        console.log("Reading file:", source);
-        const exists = yield (0, fs_extra_1.pathExists)(source);
-        if (!exists) {
-            console.error(`Input source [${source}] doesn't exist!`);
-            process.exit(2);
-        }
-        // read metadata file and convert to JSON
-        const metadataXml = yield (0, fs_extra_1.readFile)(source);
-        const metadataJson = (yield (0, xml2js_1.parseStringPromise)(metadataXml));
-        // TODO find out if "1.0" and "4.0" are really correct
-        // TODO exit here if no version not suitable version was detected
-        // console.log(`OData version detected: ${metadataJson["edmx:Edmx"].$.Version}`);
-        // ensure that output directory exists
-        try {
-            yield (0, fs_extra_1.emptyDir)(output);
-        }
-        catch (error) {
-            console.error(`Output path [${output}] couldn't be created!`, error);
-            process.exit(3);
-        }
-        // run the app
-        try {
-            yield (0, app_1.runApp)(metadataJson, options);
-        }
-        catch (err) {
-            console.error("Error while running the program", err);
-            process.exit(99);
-        }
-    });
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Cli = void 0;
+const tslib_1 = require("tslib");
+const commander_1 = tslib_1.__importStar(require("commander"));
+const cosmiconfig_1 = require("cosmiconfig");
+const cosmiconfig_typescript_loader_1 = require("cosmiconfig-typescript-loader");
+const fs_extra_1 = require("fs-extra");
+const xml2js_1 = require("xml2js");
+const app_1 = require("./app");
+const evaluateConfig_1 = require("./evaluateConfig");
+const OptionModel_1 = require("./OptionModel");
+const logFilePath_1 = require("./project/logger/logFilePath");
+function parseMode(value, dummyPrevious) {
+    switch (value) {
+        case "models":
+            return OptionModel_1.Modes.models;
+        case "qobjects":
+            return OptionModel_1.Modes.qobjects;
+        case "service":
+            return OptionModel_1.Modes.service;
+        case "all":
+            return OptionModel_1.Modes.all;
+        default:
+            throw new Error(`Not a valid Mode: ${value}`);
+    }
+}
+function parseEmitMode(value, dummyPrevious) {
+    switch (value) {
+        case "dts":
+            return OptionModel_1.EmitModes.dts;
+        case "js":
+            return OptionModel_1.EmitModes.js;
+        case "ts":
+            return OptionModel_1.EmitModes.ts;
+        case "js_dts":
+            return OptionModel_1.EmitModes.js_dts;
+        default:
+            throw new Error(`Not a valid EmitMode: ${value}`);
+    }
+}
+function processCliArgs() {
+    var _a;
+    const cli = new commander_1.default.Command()
+        .version("0.3.0")
+        .description("CLI to generate Typescript Interfaces for models of a given OData service.")
+        .argument("[services...]", "Run the generation process only for certain services specified in config file", [])
+        .option("-s, --source <metadata.xml>", "Metadata file describing the OData service")
+        .option("-o, --output <path>", "Output location for generated files")
+        .addOption(new commander_1.Option("-m, --mode <mode>", "What kind of stuff gets generated")
+        .choices(Object.values(OptionModel_1.Modes).filter((t) => isNaN(Number(t))))
+        .argParser(parseMode))
+        .addOption(new commander_1.Option("-e, --emit-mode <mode>", "Output TS source files, compiled JS files with/wihthout generated d.ts files")
+        .choices(Object.values(OptionModel_1.EmitModes))
+        .argParser(parseEmitMode))
+        .option("-p, --prettier", "Format result with prettier (only applies if emitMode=ts)")
+        .option("-t, --tsconfig <path>", "Specify alternative to 'tsconfig.json' to use specific compilerOptions (applies if emitMode is not ts)")
+        .option("-d, --debug", "Verbose debug infos")
+        .option("-name, --service-name <serviceName>", "Give the service your own name")
+        .option("-n, --disable-auto-managed-key", "Give the service your own name")
+        .option("-r, --allow-renaming ", "Give the service your own name")
+        .parse(process.argv);
+    const args = ((_a = cli.args) === null || _a === void 0 ? void 0 : _a.length) ? { services: cli.args } : {};
+    return Object.assign(Object.assign({}, cli.opts()), args);
+}
+function processConfigFile() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const moduleName = "odata2ts";
+        const explorer = (0, cosmiconfig_1.cosmiconfig)(moduleName, {
+            searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.cjs`],
+            loaders: {
+                ".ts": (0, cosmiconfig_typescript_loader_1.TypeScriptLoader)(),
+            },
+        });
+        const discoveredConfig = yield explorer.search();
+        if (discoveredConfig === null || discoveredConfig === void 0 ? void 0 : discoveredConfig.config) {
+            console.log("Loaded config file: ", (0, logFilePath_1.logFilePath)(discoveredConfig.filepath));
+        }
+        else {
+            console.log("No config file found.");
+        }
+        return discoveredConfig === null || discoveredConfig === void 0 ? void 0 : discoveredConfig.config;
+    });
+}
+class Cli {
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let runs;
+            try {
+                const cliOpts = processCliArgs();
+                if (cliOpts.debug) {
+                    console.log("CLI opts:", cliOpts);
+                }
+                const fileOpts = yield processConfigFile();
+                runs = (0, evaluateConfig_1.evaluateConfigOptions)(cliOpts, fileOpts);
+            }
+            catch (error) {
+                console.error("Bad arguments!", error === null || error === void 0 ? void 0 : error.message);
+                process.exit(1);
+            }
+            for (let run of runs) {
+                yield startServiceGenerationRun(run);
+            }
+        });
+    }
+}
+exports.Cli = Cli;
+function startServiceGenerationRun(options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { source, output, debug, mode, emitMode, prettier, serviceName } = options;
+        console.log("---------------------------");
+        console.log("Starting generation process");
+        if (debug) {
+            console.log("Resolved config:", {
+                source,
+                output,
+                debug,
+                mode: OptionModel_1.Modes[mode],
+                emitMode,
+                prettier,
+                serviceName,
+            });
+        }
+        console.log("Reading file:", source);
+        const exists = yield (0, fs_extra_1.pathExists)(source);
+        if (!exists) {
+            console.error(`Input source [${source}] doesn't exist!`);
+            process.exit(2);
+        }
+        // read metadata file and convert to JSON
+        const metadataXml = yield (0, fs_extra_1.readFile)(source);
+        const metadataJson = (yield (0, xml2js_1.parseStringPromise)(metadataXml));
+        // TODO find out if "1.0" and "4.0" are really correct
+        // TODO exit here if no version not suitable version was detected
+        // console.log(`OData version detected: ${metadataJson["edmx:Edmx"].$.Version}`);
+        // ensure that output directory exists
+        try {
+            yield (0, fs_extra_1.emptyDir)(output);
+        }
+        catch (error) {
+            console.error(`Output path [${output}] couldn't be created!`, error);
+            process.exit(3);
+        }
+        // run the app
+        try {
+            yield (0, app_1.runApp)(metadataJson, options);
+        }
+        catch (err) {
+            console.error("Error while running the program", err);
+            process.exit(99);
+        }
+    });
+}
 //# sourceMappingURL=cli.js.map

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

@@ -1,85 +1,85 @@
-import { MappedConverterChains } from "@odata2ts/converter-runtime";
-import { ODataTypesV2, ODataTypesV4 } from "@odata2ts/odata-core";
-import { ActionImportType, ComplexType, EntityContainerModel, EntitySetType, EnumType, FunctionImportType, ModelType, ODataVersion, OperationType, SingletonType } from "./DataTypeModel";
-export interface ProjectFiles {
-    model: string;
-    qObject: string;
-    service: string;
-}
-export declare class DataModel {
-    private version;
-    private readonly converters;
-    private modelTypes;
-    private complexTypes;
-    private enumTypes;
-    private operationTypes;
-    private container;
-    constructor(version: ODataVersion, converters?: MappedConverterChains);
-    /**
-     * OData version: 2.0 or 4.0.
-     * @returns
-     */
-    getODataVersion(): ODataVersion;
-    isV2(): boolean;
-    isV4(): boolean;
-    addModel(name: string, model: ModelType): void;
-    /**
-     * Get a specific model by its name.
-     *
-     * @param modelName the final model name that is generated
-     * @returns the model type
-     */
-    getModel(modelName: string): ModelType;
-    /**
-     * Retrieve all known EntityType models from the EDMX model.
-     *
-     * @returns list of model types
-     */
-    getModels(): ModelType[];
-    /**
-     * Set all model entity types
-     *
-     * @param models new model types
-     */
-    setModels(models: {
-        [name: string]: ModelType;
-    }): void;
-    addComplexType(name: string, model: ComplexType): void;
-    /**
-     * Get a specific model by its name.
-     *
-     * @param name the final model name that is generated
-     * @returns the model type
-     */
-    getComplexType(name: string): ComplexType;
-    /**
-     * Retrieve all known ComplexType models from the EDMX model.
-     *
-     * @returns list of model types
-     */
-    getComplexTypes(): ComplexType[];
-    /**
-     * Set all complex types
-     *
-     * @param models new complex types
-     */
-    setComplexTypes(complexTypes: {
-        [name: string]: ComplexType;
-    }): void;
-    addEnum(name: string, type: EnumType): void;
-    /**
-     * Get list of all known enums, i.e. EnumType nodes from the EDMX model.
-     * @returns list of enum types
-     */
-    getEnums(): EnumType[];
-    addOperationType(binding: string, operationType: OperationType): void;
-    getUnboundOperationTypes(): Array<OperationType>;
-    getOperationTypeByBinding(binding: string): Array<OperationType>;
-    getOperationTypeByEntityOrCollectionBinding(binding: string): Array<OperationType>;
-    addAction(name: string, action: ActionImportType): void;
-    addFunction(name: string, func: FunctionImportType): void;
-    addSingleton(name: string, singleton: SingletonType): void;
-    addEntitySet(name: string, entitySet: EntitySetType): void;
-    getEntityContainer(): EntityContainerModel;
-    getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string): import("@odata2ts/converter-runtime").ValueConverterChain | undefined;
-}
+import { MappedConverterChains } from "@odata2ts/converter-runtime";
+import { ODataTypesV2, ODataTypesV4 } from "@odata2ts/odata-core";
+import { ActionImportType, ComplexType, EntityContainerModel, EntitySetType, EnumType, FunctionImportType, ModelType, ODataVersion, OperationType, SingletonType } from "./DataTypeModel";
+export interface ProjectFiles {
+    model: string;
+    qObject: string;
+    service: string;
+}
+export declare class DataModel {
+    private version;
+    private readonly converters;
+    private modelTypes;
+    private complexTypes;
+    private enumTypes;
+    private operationTypes;
+    private container;
+    constructor(version: ODataVersion, converters?: MappedConverterChains);
+    /**
+     * OData version: 2.0 or 4.0.
+     * @returns
+     */
+    getODataVersion(): ODataVersion;
+    isV2(): boolean;
+    isV4(): boolean;
+    addModel(name: string, model: ModelType): void;
+    /**
+     * Get a specific model by its name.
+     *
+     * @param modelName the final model name that is generated
+     * @returns the model type
+     */
+    getModel(modelName: string): ModelType;
+    /**
+     * Retrieve all known EntityType models from the EDMX model.
+     *
+     * @returns list of model types
+     */
+    getModels(): ModelType[];
+    /**
+     * Set all model entity types
+     *
+     * @param models new model types
+     */
+    setModels(models: {
+        [name: string]: ModelType;
+    }): void;
+    addComplexType(name: string, model: ComplexType): void;
+    /**
+     * Get a specific model by its name.
+     *
+     * @param name the final model name that is generated
+     * @returns the model type
+     */
+    getComplexType(name: string): ComplexType;
+    /**
+     * Retrieve all known ComplexType models from the EDMX model.
+     *
+     * @returns list of model types
+     */
+    getComplexTypes(): ComplexType[];
+    /**
+     * Set all complex types
+     *
+     * @param models new complex types
+     */
+    setComplexTypes(complexTypes: {
+        [name: string]: ComplexType;
+    }): void;
+    addEnum(name: string, type: EnumType): void;
+    /**
+     * Get list of all known enums, i.e. EnumType nodes from the EDMX model.
+     * @returns list of enum types
+     */
+    getEnums(): EnumType[];
+    addOperationType(binding: string, operationType: OperationType): void;
+    getUnboundOperationTypes(): Array<OperationType>;
+    getOperationTypeByBinding(binding: string): Array<OperationType>;
+    getOperationTypeByEntityOrCollectionBinding(binding: string): Array<OperationType>;
+    addAction(name: string, action: ActionImportType): void;
+    addFunction(name: string, func: FunctionImportType): void;
+    addSingleton(name: string, singleton: SingletonType): void;
+    addEntitySet(name: string, entitySet: EntitySetType): void;
+    getEntityContainer(): EntityContainerModel;
+    getConverter(dataType: ODataTypesV2 | ODataTypesV4 | string): import("@odata2ts/converter-runtime").ValueConverterChain | undefined;
+}