@odata2ts/odata2ts 0.36.3 → 0.37.0

package/lib/project/formatter/NoopFormatter.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NoopFormatter = void 0;
-const tslib_1 = require("tslib");
-const BaseFormatter_1 = require("./BaseFormatter");
+import { __awaiter } from "tslib";
+import { BaseFormatter } from "./BaseFormatter.js";
 /**
  * Prettier formatter.
  *
@@ -12,7 +9,7 @@ const BaseFormatter_1 = require("./BaseFormatter");
  * @class NoopFormatter
  * @extends {Formatter}
  */
-class NoopFormatter extends BaseFormatter_1.BaseFormatter {
+export class NoopFormatter extends BaseFormatter {
     /**
      * Initializes the formatter.
      *
@@ -21,7 +18,7 @@ class NoopFormatter extends BaseFormatter_1.BaseFormatter {
      * @memberof Formatter
      */
     init() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             return this;
         });
     }
@@ -34,10 +31,9 @@ class NoopFormatter extends BaseFormatter_1.BaseFormatter {
      * @memberof Formatter
      */
     format(source) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             return source;
         });
     }
 }
-exports.NoopFormatter = NoopFormatter;
 //# sourceMappingURL=NoopFormatter.js.map

package/lib/project/formatter/NoopFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"NoopFormatter.js","sourceRoot":"","sources":["../../../src/project/formatter/NoopFormatter.ts"],"names":[],"mappings":";;;;AAAA,mDAAgD;AAEhD;;;;;;;;GAQG;AACH,MAAa,aAAc,SAAQ,6BAAa;IAC9C;;;;;;OAMG;IACU,IAAI;;YACf,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;;;OAOG;IACU,MAAM,CAAC,MAAc;;YAChC,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;CACF;AAvBD,sCAuBC","sourcesContent":["import { BaseFormatter } from \"./BaseFormatter\";\r\n\r\n/**\r\n * Prettier formatter.\r\n *\r\n * NOTE: Should be created like this => const formatter = await new NoopFormatter(\"./test.ts\").init();\r\n *\r\n * @export\r\n * @class NoopFormatter\r\n * @extends {Formatter}\r\n */\r\nexport class NoopFormatter extends BaseFormatter {\r\n  /**\r\n   * Initializes the formatter.\r\n   *\r\n   * @abstract\r\n   * @returns {Promise<Formatter>} Initialized formatter\r\n   * @memberof Formatter\r\n   */\r\n  public async init(): Promise<BaseFormatter> {\r\n    return this;\r\n  }\r\n\r\n  /**\r\n   * Formats a given source code.\r\n   *\r\n   * @abstract\r\n   * @param {string} source Source code to format\r\n   * @returns {string} Formatted source code\r\n   * @memberof Formatter\r\n   */\r\n  public async format(source: string): Promise<string> {\r\n    return source;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"NoopFormatter.js","sourceRoot":"","sources":["../../../src/project/formatter/NoopFormatter.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;;GAQG;AACH,MAAM,OAAO,aAAc,SAAQ,aAAa;IAC9C;;;;;;OAMG;IACU,IAAI;;YACf,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;;;OAOG;IACU,MAAM,CAAC,MAAc;;YAChC,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;CACF","sourcesContent":["import { BaseFormatter } from \"./BaseFormatter.js\";\r\n\r\n/**\r\n * Prettier formatter.\r\n *\r\n * NOTE: Should be created like this => const formatter = await new NoopFormatter(\"./test.ts\").init();\r\n *\r\n * @export\r\n * @class NoopFormatter\r\n * @extends {Formatter}\r\n */\r\nexport class NoopFormatter extends BaseFormatter {\r\n  /**\r\n   * Initializes the formatter.\r\n   *\r\n   * @abstract\r\n   * @returns {Promise<Formatter>} Initialized formatter\r\n   * @memberof Formatter\r\n   */\r\n  public async init(): Promise<BaseFormatter> {\r\n    return this;\r\n  }\r\n\r\n  /**\r\n   * Formats a given source code.\r\n   *\r\n   * @abstract\r\n   * @param {string} source Source code to format\r\n   * @returns {string} Formatted source code\r\n   * @memberof Formatter\r\n   */\r\n  public async format(source: string): Promise<string> {\r\n    return source;\r\n  }\r\n}\r\n"]}

package/lib/project/formatter/PrettierFormatter.d.ts

@@ -1,4 +1,4 @@
-import { BaseFormatter } from "./BaseFormatter";
+import { BaseFormatter } from "./BaseFormatter.js";
 export declare class PrettierFormatter extends BaseFormatter {
     /**
      * Prettier options found in the project.

package/lib/project/formatter/PrettierFormatter.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrettierFormatter = void 0;
-const tslib_1 = require("tslib");
-const prettier_1 = tslib_1.__importDefault(require("prettier"));
-const ts_morph_1 = require("ts-morph");
-const BaseFormatter_1 = require("./BaseFormatter");
-class PrettierFormatter extends BaseFormatter_1.BaseFormatter {
+import { __awaiter } from "tslib";
+import prettier from "prettier";
+import { IndentationText, NewLineKind, QuoteKind } from "ts-morph";
+import { BaseFormatter } from "./BaseFormatter.js";
+export class PrettierFormatter extends BaseFormatter {
     /**
      * Initializes the formatter.
      *
@@ -13,22 +10,21 @@ class PrettierFormatter extends BaseFormatter_1.BaseFormatter {
      * @memberof PrettierFormatter
      */
     init() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const options = yield prettier_1.default.resolveConfig(this.output);
+        return __awaiter(this, void 0, void 0, function* () {
+            const options = yield prettier.resolveConfig(this.output);
             if (options) {
                 this.options = options;
                 this.settings = {
                     indentationText: this.convertIndentation(this.options.useTabs, this.options.tabWidth),
                     insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: this.options.bracketSpacing !== undefined ? this.options.bracketSpacing : true,
                     newLineKind: this.convertNewline(this.options.endOfLine),
-                    quoteKind: this.options.singleQuote ? ts_morph_1.QuoteKind.Single : ts_morph_1.QuoteKind.Double,
+                    quoteKind: this.options.singleQuote ? QuoteKind.Single : QuoteKind.Double,
                     useTrailingCommas: this.options.trailingComma === "none" ? false : true,
                 };
             }
             else {
                 this.settings = {};
             }
-            ;
             return this;
         });
     }
@@ -41,8 +37,8 @@ class PrettierFormatter extends BaseFormatter_1.BaseFormatter {
      * @memberof Formatter
      */
     format(source) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return prettier_1.default.format(source, Object.assign({ parser: "typescript" }, this.options));
+        return __awaiter(this, void 0, void 0, function* () {
+            return prettier.format(source, Object.assign({ parser: "typescript" }, this.options));
         });
     }
     /**
@@ -56,16 +52,16 @@ class PrettierFormatter extends BaseFormatter_1.BaseFormatter {
      */
     convertIndentation(useTabs, tabWidth) {
         if (useTabs)
-            return ts_morph_1.IndentationText.Tab;
+            return IndentationText.Tab;
         switch (tabWidth) {
             case 2:
-                return ts_morph_1.IndentationText.TwoSpaces;
+                return IndentationText.TwoSpaces;
             case 4:
-                return ts_morph_1.IndentationText.FourSpaces;
+                return IndentationText.FourSpaces;
             case 8:
-                return ts_morph_1.IndentationText.EightSpaces;
+                return IndentationText.EightSpaces;
             default:
-                return ts_morph_1.IndentationText.TwoSpaces;
+                return IndentationText.TwoSpaces;
         }
     }
     /**
@@ -79,17 +75,16 @@ class PrettierFormatter extends BaseFormatter_1.BaseFormatter {
     convertNewline(eol) {
         switch (eol) {
             case "lf":
-                return ts_morph_1.NewLineKind.LineFeed;
+                return NewLineKind.LineFeed;
             case "crlf":
-                return ts_morph_1.NewLineKind.CarriageReturnLineFeed;
+                return NewLineKind.CarriageReturnLineFeed;
             case "cr":
-                return ts_morph_1.NewLineKind.CarriageReturnLineFeed;
+                return NewLineKind.CarriageReturnLineFeed;
             case "auto":
-                return ts_morph_1.NewLineKind.LineFeed;
+                return NewLineKind.LineFeed;
             default:
-                return ts_morph_1.NewLineKind.LineFeed;
+                return NewLineKind.LineFeed;
         }
     }
 }
-exports.PrettierFormatter = PrettierFormatter;
 //# sourceMappingURL=PrettierFormatter.js.map

package/lib/project/formatter/PrettierFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PrettierFormatter.js","sourceRoot":"","sources":["../../../src/project/formatter/PrettierFormatter.ts"],"names":[],"mappings":";;;;AAAA,gEAAgC;AAChC,uCAAmE;AAEnE,mDAAgD;AAEhD,MAAa,iBAAkB,SAAQ,6BAAa;IAUlD;;;;;OAKG;IACU,IAAI;;YACf,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE1D,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvB,IAAI,CAAC,QAAQ,GAAG;oBACd,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;oBACrF,qDAAqD,EACnD,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;oBAChF,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;oBACxD,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAS,CAAC,MAAM;oBACzE,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;iBACxE,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;aACpB;YAAA,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;;;OAOG;IACU,MAAM,CAAC,MAAc;;YAChC,OAAO,kBAAQ,CAAC,MAAM,CAAC,MAAM,kBAC3B,MAAM,EAAE,YAAY,IACjB,IAAI,CAAC,OAAO,EACf,CAAC;QACL,CAAC;KAAA;IAED;;;;;;;;OAQG;IACK,kBAAkB,CAAC,OAA4B,EAAE,QAA4B;QACnF,IAAI,OAAO;YAAE,OAAO,0BAAe,CAAC,GAAG,CAAC;QAExC,QAAQ,QAAQ,EAAE;YAChB,KAAK,CAAC;gBACJ,OAAO,0BAAe,CAAC,SAAS,CAAC;YACnC,KAAK,CAAC;gBACJ,OAAO,0BAAe,CAAC,UAAU,CAAC;YACpC,KAAK,CAAC;gBACJ,OAAO,0BAAe,CAAC,WAAW,CAAC;YACrC;gBACE,OAAO,0BAAe,CAAC,SAAS,CAAC;SACpC;IACH,CAAC;IAED;;;;;;;OAOG;IACK,cAAc,CAAC,GAAuB;QAC5C,QAAQ,GAAG,EAAE;YACX,KAAK,IAAI;gBACP,OAAO,sBAAW,CAAC,QAAQ,CAAC;YAC9B,KAAK,MAAM;gBACT,OAAO,sBAAW,CAAC,sBAAsB,CAAC;YAC5C,KAAK,IAAI;gBACP,OAAO,sBAAW,CAAC,sBAAsB,CAAC;YAC5C,KAAK,MAAM;gBACT,OAAO,sBAAW,CAAC,QAAQ,CAAC;YAC9B;gBACE,OAAO,sBAAW,CAAC,QAAQ,CAAC;SAC/B;IACH,CAAC;CACF;AAjGD,8CAiGC","sourcesContent":["import prettier from \"prettier\";\r\nimport { IndentationText, NewLineKind, QuoteKind } from \"ts-morph\";\r\n\r\nimport { BaseFormatter } from \"./BaseFormatter\";\r\n\r\nexport class PrettierFormatter extends BaseFormatter {\r\n  /**\r\n   * Prettier options found in the project.\r\n   *\r\n   * @private\r\n   * @type {prettier.Options}\r\n   * @memberof PrettierFormatter\r\n   */\r\n  private options!: prettier.Options;\r\n\r\n  /**\r\n   * Initializes the formatter.\r\n   *\r\n   * @returns {Promise<PrettierFormatter>} Initialized formatter\r\n   * @memberof PrettierFormatter\r\n   */\r\n  public async init(): Promise<PrettierFormatter> {\r\n    const options = await prettier.resolveConfig(this.output);\r\n\r\n    if (options) {\r\n      this.options = options;\r\n      this.settings = {\r\n        indentationText: this.convertIndentation(this.options.useTabs, this.options.tabWidth),\r\n        insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces:\r\n          this.options.bracketSpacing !== undefined ? this.options.bracketSpacing : true,\r\n        newLineKind: this.convertNewline(this.options.endOfLine),\r\n        quoteKind: this.options.singleQuote ? QuoteKind.Single : QuoteKind.Double,\r\n        useTrailingCommas: this.options.trailingComma === \"none\" ? false : true,\r\n      };\r\n    } else {\r\n      this.settings = {};\r\n    };\r\n\r\n    return this;\r\n  }\r\n\r\n  /**\r\n   * Formats a given source code.\r\n   *\r\n   * @abstract\r\n   * @param {string} source Source code to format\r\n   * @returns {string} Formatted source code\r\n   * @memberof Formatter\r\n   */\r\n  public async format(source: string): Promise<string> {\r\n    return prettier.format(source, {\r\n      parser: \"typescript\",\r\n      ...this.options,\r\n    });\r\n  }\r\n\r\n  /**\r\n   * Converts prettier indentation config to ts-morph settings.\r\n   *\r\n   * @private\r\n   * @param {boolean | undefined} useTabs Flag, whether to use tabs or not\r\n   * @param {number | undefined} tabWidth Width of a simulated tab, each number represents a space\r\n   * @returns {IndentationText} Converted indentation text\r\n   * @memberof PrettierFormatter\r\n   */\r\n  private convertIndentation(useTabs: boolean | undefined, tabWidth: number | undefined): IndentationText {\r\n    if (useTabs) return IndentationText.Tab;\r\n\r\n    switch (tabWidth) {\r\n      case 2:\r\n        return IndentationText.TwoSpaces;\r\n      case 4:\r\n        return IndentationText.FourSpaces;\r\n      case 8:\r\n        return IndentationText.EightSpaces;\r\n      default:\r\n        return IndentationText.TwoSpaces;\r\n    }\r\n  }\r\n\r\n  /**\r\n   * Converts prettier newline config to ts-morph settings.\r\n   *\r\n   * @private\r\n   * @param {string | undefined} eol prettier end-of-line config\r\n   * @returns {NewLineKind | undefined} Converted new line kind\r\n   * @memberof PrettierFormatter\r\n   */\r\n  private convertNewline(eol: string | undefined): NewLineKind | undefined {\r\n    switch (eol) {\r\n      case \"lf\":\r\n        return NewLineKind.LineFeed;\r\n      case \"crlf\":\r\n        return NewLineKind.CarriageReturnLineFeed;\r\n      case \"cr\":\r\n        return NewLineKind.CarriageReturnLineFeed;\r\n      case \"auto\":\r\n        return NewLineKind.LineFeed;\r\n      default:\r\n        return NewLineKind.LineFeed;\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"PrettierFormatter.js","sourceRoot":"","sources":["../../../src/project/formatter/PrettierFormatter.ts"],"names":[],"mappings":";AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAUlD;;;;;OAKG;IACU,IAAI;;YACf,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE1D,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvB,IAAI,CAAC,QAAQ,GAAG;oBACd,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;oBACrF,qDAAqD,EACnD,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;oBAChF,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;oBACxD,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM;oBACzE,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;iBACxE,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;aACpB;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;;;OAOG;IACU,MAAM,CAAC,MAAc;;YAChC,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,kBAC3B,MAAM,EAAE,YAAY,IACjB,IAAI,CAAC,OAAO,EACf,CAAC;QACL,CAAC;KAAA;IAED;;;;;;;;OAQG;IACK,kBAAkB,CAAC,OAA4B,EAAE,QAA4B;QACnF,IAAI,OAAO;YAAE,OAAO,eAAe,CAAC,GAAG,CAAC;QAExC,QAAQ,QAAQ,EAAE;YAChB,KAAK,CAAC;gBACJ,OAAO,eAAe,CAAC,SAAS,CAAC;YACnC,KAAK,CAAC;gBACJ,OAAO,eAAe,CAAC,UAAU,CAAC;YACpC,KAAK,CAAC;gBACJ,OAAO,eAAe,CAAC,WAAW,CAAC;YACrC;gBACE,OAAO,eAAe,CAAC,SAAS,CAAC;SACpC;IACH,CAAC;IAED;;;;;;;OAOG;IACK,cAAc,CAAC,GAAuB;QAC5C,QAAQ,GAAG,EAAE;YACX,KAAK,IAAI;gBACP,OAAO,WAAW,CAAC,QAAQ,CAAC;YAC9B,KAAK,MAAM;gBACT,OAAO,WAAW,CAAC,sBAAsB,CAAC;YAC5C,KAAK,IAAI;gBACP,OAAO,WAAW,CAAC,sBAAsB,CAAC;YAC5C,KAAK,MAAM;gBACT,OAAO,WAAW,CAAC,QAAQ,CAAC;YAC9B;gBACE,OAAO,WAAW,CAAC,QAAQ,CAAC;SAC/B;IACH,CAAC;CACF","sourcesContent":["import prettier from \"prettier\";\r\nimport { IndentationText, NewLineKind, QuoteKind } from \"ts-morph\";\r\n\r\nimport { BaseFormatter } from \"./BaseFormatter.js\";\r\n\r\nexport class PrettierFormatter extends BaseFormatter {\r\n  /**\r\n   * Prettier options found in the project.\r\n   *\r\n   * @private\r\n   * @type {prettier.Options}\r\n   * @memberof PrettierFormatter\r\n   */\r\n  private options!: prettier.Options;\r\n\r\n  /**\r\n   * Initializes the formatter.\r\n   *\r\n   * @returns {Promise<PrettierFormatter>} Initialized formatter\r\n   * @memberof PrettierFormatter\r\n   */\r\n  public async init(): Promise<PrettierFormatter> {\r\n    const options = await prettier.resolveConfig(this.output);\r\n\r\n    if (options) {\r\n      this.options = options;\r\n      this.settings = {\r\n        indentationText: this.convertIndentation(this.options.useTabs, this.options.tabWidth),\r\n        insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces:\r\n          this.options.bracketSpacing !== undefined ? this.options.bracketSpacing : true,\r\n        newLineKind: this.convertNewline(this.options.endOfLine),\r\n        quoteKind: this.options.singleQuote ? QuoteKind.Single : QuoteKind.Double,\r\n        useTrailingCommas: this.options.trailingComma === \"none\" ? false : true,\r\n      };\r\n    } else {\r\n      this.settings = {};\r\n    }\r\n\r\n    return this;\r\n  }\r\n\r\n  /**\r\n   * Formats a given source code.\r\n   *\r\n   * @abstract\r\n   * @param {string} source Source code to format\r\n   * @returns {string} Formatted source code\r\n   * @memberof Formatter\r\n   */\r\n  public async format(source: string): Promise<string> {\r\n    return prettier.format(source, {\r\n      parser: \"typescript\",\r\n      ...this.options,\r\n    });\r\n  }\r\n\r\n  /**\r\n   * Converts prettier indentation config to ts-morph settings.\r\n   *\r\n   * @private\r\n   * @param {boolean | undefined} useTabs Flag, whether to use tabs or not\r\n   * @param {number | undefined} tabWidth Width of a simulated tab, each number represents a space\r\n   * @returns {IndentationText} Converted indentation text\r\n   * @memberof PrettierFormatter\r\n   */\r\n  private convertIndentation(useTabs: boolean | undefined, tabWidth: number | undefined): IndentationText {\r\n    if (useTabs) return IndentationText.Tab;\r\n\r\n    switch (tabWidth) {\r\n      case 2:\r\n        return IndentationText.TwoSpaces;\r\n      case 4:\r\n        return IndentationText.FourSpaces;\r\n      case 8:\r\n        return IndentationText.EightSpaces;\r\n      default:\r\n        return IndentationText.TwoSpaces;\r\n    }\r\n  }\r\n\r\n  /**\r\n   * Converts prettier newline config to ts-morph settings.\r\n   *\r\n   * @private\r\n   * @param {string | undefined} eol prettier end-of-line config\r\n   * @returns {NewLineKind | undefined} Converted new line kind\r\n   * @memberof PrettierFormatter\r\n   */\r\n  private convertNewline(eol: string | undefined): NewLineKind | undefined {\r\n    switch (eol) {\r\n      case \"lf\":\r\n        return NewLineKind.LineFeed;\r\n      case \"crlf\":\r\n        return NewLineKind.CarriageReturnLineFeed;\r\n      case \"cr\":\r\n        return NewLineKind.CarriageReturnLineFeed;\r\n      case \"auto\":\r\n        return NewLineKind.LineFeed;\r\n      default:\r\n        return NewLineKind.LineFeed;\r\n    }\r\n  }\r\n}\r\n"]}

package/lib/project/formatter/index.d.ts

@@ -1,2 +1,2 @@
-import type { FileFormatter } from "./FileFormatter";
+import type { FileFormatter } from "./FileFormatter.js";
 export declare function createFormatter(outputDir: string, usePrettier: boolean): Promise<FileFormatter>;

package/lib/project/formatter/index.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFormatter = void 0;
-const tslib_1 = require("tslib");
-const PrettierFormatter_1 = require("./PrettierFormatter");
-const NoopFormatter_1 = require("./NoopFormatter");
-function createFormatter(outputDir, usePrettier) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const formatter = usePrettier ? new PrettierFormatter_1.PrettierFormatter(outputDir) : new NoopFormatter_1.NoopFormatter(outputDir);
+import { __awaiter } from "tslib";
+import { NoopFormatter } from "./NoopFormatter.js";
+import { PrettierFormatter } from "./PrettierFormatter.js";
+export function createFormatter(outputDir, usePrettier) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const formatter = usePrettier ? new PrettierFormatter(outputDir) : new NoopFormatter(outputDir);
         yield formatter.init();
         return formatter;
     });
 }
-exports.createFormatter = createFormatter;
 //# sourceMappingURL=index.js.map

package/lib/project/formatter/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/project/formatter/index.ts"],"names":[],"mappings":";;;;AACA,2DAAwD;AACxD,mDAAgD;AAEhD,SAAsB,eAAe,CAAC,SAAiB,EAAE,WAAoB;;QAC3E,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,qCAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,6BAAa,CAAC,SAAS,CAAC,CAAC;QAChG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;QAEvB,OAAO,SAAS,CAAC;IACnB,CAAC;CAAA;AALD,0CAKC","sourcesContent":["import type { FileFormatter } from \"./FileFormatter\";\r\nimport { PrettierFormatter } from \"./PrettierFormatter\";\r\nimport { NoopFormatter } from \"./NoopFormatter\";\r\n\r\nexport async function createFormatter(outputDir: string, usePrettier: boolean): Promise<FileFormatter> {\r\n  const formatter = usePrettier ? new PrettierFormatter(outputDir) : new NoopFormatter(outputDir);\r\n  await formatter.init();\r\n\r\n  return formatter;\r\n}\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/project/formatter/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,UAAgB,eAAe,CAAC,SAAiB,EAAE,WAAoB;;QAC3E,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;QAChG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;QAEvB,OAAO,SAAS,CAAC;IACnB,CAAC;CAAA","sourcesContent":["import type { FileFormatter } from \"./FileFormatter.js\";\r\nimport { NoopFormatter } from \"./NoopFormatter.js\";\r\nimport { PrettierFormatter } from \"./PrettierFormatter.js\";\r\n\r\nexport async function createFormatter(outputDir: string, usePrettier: boolean): Promise<FileFormatter> {\r\n  const formatter = usePrettier ? new PrettierFormatter(outputDir) : new NoopFormatter(outputDir);\r\n  await formatter.init();\r\n\r\n  return formatter;\r\n}\r\n"]}

package/lib/project/logger/logFilePath.js

@@ -1,13 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logFilePath = void 0;
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-function logFilePath(filePath) {
+import path from "path";
+export function logFilePath(filePath) {
     // we only show file paths relative to work dir of running process
-    const relativePath = path_1.default.relative(process.cwd(), filePath);
+    const relativePath = path.relative(process.cwd(), filePath);
     // beautify slashes for windows
-    return relativePath.split(path_1.default.sep).join("/");
+    return relativePath.split(path.sep).join("/");
 }
-exports.logFilePath = logFilePath;
 //# sourceMappingURL=logFilePath.js.map

package/lib/project/logger/logFilePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"logFilePath.js","sourceRoot":"","sources":["../../../src/project/logger/logFilePath.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,SAAgB,WAAW,CAAC,QAAgB;IAC1C,kEAAkE;IAClE,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC5D,+BAA+B;IAC/B,OAAO,YAAY,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChD,CAAC;AALD,kCAKC","sourcesContent":["import path from \"path\";\r\n\r\nexport function logFilePath(filePath: string) {\r\n  // we only show file paths relative to work dir of running process\r\n  const relativePath = path.relative(process.cwd(), filePath);\r\n  // beautify slashes for windows\r\n  return relativePath.split(path.sep).join(\"/\");\r\n}\r\n"]}
+{"version":3,"file":"logFilePath.js","sourceRoot":"","sources":["../../../src/project/logger/logFilePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAU,WAAW,CAAC,QAAgB;IAC1C,kEAAkE;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC5D,+BAA+B;IAC/B,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChD,CAAC","sourcesContent":["import path from \"path\";\r\n\r\nexport function logFilePath(filePath: string) {\r\n  // we only show file paths relative to work dir of running process\r\n  const relativePath = path.relative(process.cwd(), filePath);\r\n  // beautify slashes for windows\r\n  return relativePath.split(path.sep).join(\"/\");\r\n}\r\n"]}

package/lib/run-cli.js

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("./cli");
+import { run } from "./cli/cli.js";
 // noinspection JSIgnoredPromiseFromCall
-new cli_1.Cli().run();
+run();
 //# sourceMappingURL=run-cli.js.map

package/lib/run-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-cli.js","sourceRoot":"","sources":["../src/run-cli.ts"],"names":[],"mappings":";;;AAEA,+BAA4B;AAE5B,wCAAwC;AACxC,IAAI,SAAG,EAAE,CAAC,GAAG,EAAE,CAAC","sourcesContent":["#!/usr/bin/env node\r\n\r\nimport { Cli } from \"./cli\";\r\n\r\n// noinspection JSIgnoredPromiseFromCall\r\nnew Cli().run();\r\n"]}
+{"version":3,"file":"run-cli.js","sourceRoot":"","sources":["../src/run-cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,wCAAwC;AACxC,GAAG,EAAE,CAAC","sourcesContent":["#!/usr/bin/env node\r\nimport { run } from \"./cli/cli.js\";\r\n\r\n// noinspection JSIgnoredPromiseFromCall\r\nrun();\r\n"]}

package/package.json

@@ -1,39 +1,7 @@
 {
   "name": "@odata2ts/odata2ts",
-  "version": "0.36.3",
-  "publishConfig": {
-    "access": "public"
-  },
+  "version": "0.37.0",
   "description": "Flexible generator to produce various TypeScript artefacts (from simple model interfaces to complete odata clients) from OData metadata files",
-  "license": "MIT",
-  "repository": "git@github.com:odata2ts/odata2ts.git",
-  "author": "texttechne",
-  "homepage": "https://odata2ts.github.io/",
-  "main": "lib/index.js",
-  "bin": "lib/run-cli.js",
-  "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",
-    "prepublish": "yarn build",
-    "test": "yarn compile-fixtures && jest ./test"
-  },
-  "files": [
-    "*.md",
-    "bin",
-    "lib",
-    "LICENSE"
-  ],
   "keywords": [
     "odata2ts",
     "generator",
@@ -46,50 +14,72 @@
     "v2",
     "v4"
   ],
-  "peerDependencies": {
-    "@odata2ts/odata-query-objects": "^0.23.1",
-    "@odata2ts/odata-service": "^0.19.3"
+  "homepage": "https://odata2ts.github.io/",
+  "repository": "git@github.com:odata2ts/odata2ts.git",
+  "license": "MIT",
+  "author": "texttechne",
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "./lib/index.d.ts",
+  "bin": "lib/run-cli.js",
+  "files": [
+    "*.md",
+    "bin",
+    "lib",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "yarn clean && tsc",
+    "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",
+    "compile": "tsc -p tsconfig.compile.json",
+    "dev": "yarn generate trippin odata",
+    "generate": "ts-node --esm --cwd-mode src/run-cli.ts",
+    "int-test": "yarn clean && vitest run --dir int-test",
+    "prepublish": "yarn build",
+    "test": "vitest run --dir test",
+    "testing": "vitest --dir test"
   },
   "dependencies": {
-    "@odata2ts/converter-api": "^0.1.2",
-    "@odata2ts/converter-runtime": "^0.2.2",
-    "@odata2ts/http-client-api": "^0.5.1",
-    "@odata2ts/odata-core": "^0.5.0",
-    "@prettier/plugin-xml": "^2.2.0",
+    "@odata2ts/converter-api": "^0.2.2",
+    "@odata2ts/converter-runtime": "^0.5.0",
+    "@odata2ts/http-client-api": "^0.6.2",
+    "@odata2ts/odata-core": "^0.6.0",
+    "@prettier/plugin-xml": "^3.4.1",
+    "@types/xml2js": "^0.4.11",
     "axios": "^1.4.0",
-    "camel-case": "^4.1.2",
+    "change-case": "^5.4.4",
     "commander": "^10.0.1",
-    "constant-case": "^3.0.4",
     "cosmiconfig": "^8.2.0",
     "cosmiconfig-typescript-loader": "^5.0.0",
     "deepmerge": "^4.3.1",
-    "fs-extra": "^11.1.1",
-    "pascal-case": "^3.1.2",
-    "prettier": "^2.8.8",
-    "snake-case": "^3.0.4",
+    "mkdirp": "^3.0.1",
+    "prettier": "^3.3.3",
     "ts-morph": "^18.0.0",
     "ts-node": "^10.9.1",
     "tsconfig-loader": "^1.1.0",
+    "type-fest": "2.12.2",
     "upper-case-first": "^2.0.2",
     "xml2js": "^0.6.0"
   },
   "devDependencies": {
-    "@odata2ts/converter-v2-to-v4": "^0.1.4",
-    "@odata2ts/odata-query-objects": "^0.23.1",
-    "@odata2ts/odata-service": "^0.19.3",
-    "@odata2ts/test-converters": "^0.3.1",
-    "@types/fs-extra": "^11.0.1",
-    "@types/jest": "^29.5.2",
-    "@types/node": "^20.3.0",
-    "@types/prettier": "^2.7.3",
-    "@types/xml2js": "^0.4.11",
-    "jest": "^29.5.0",
-    "rimraf": "^5.0.1",
-    "ts-jest": "^29.1.0",
-    "type-fest": "2.12.2",
-    "typescript": "^5.1.3"
+    "@odata2ts/converter-v2-to-v4": "^0.5.1",
+    "@odata2ts/odata-query-objects": "^0.24.0",
+    "@odata2ts/odata-service": "^0.20.0",
+    "@odata2ts/test-converters": "^0.4.0",
+    "@types/node": "^22.4.0",
+    "typescript": "5.1.3"
   },
-  "types": "./lib/index.d.ts",
-  "gitHead": "8a0ef94131c114b44edcddc0bc0af4fc5ab800fd",
+  "peerDependencies": {
+    "@odata2ts/odata-query-objects": "^0.24.0",
+    "@odata2ts/odata-service": "^0.20.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "4d68f9e9394abc81028c901be51fedfe55cb786c",
   "readme": "README.md"
 }

package/lib/cli.d.ts

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

package/lib/cli.js

@@ -1,176 +0,0 @@
-"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 download_1 = require("./download/");
-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 <url or metadata.xml>", "Path to metadata file")
-        .option("-o, --output <path>", "Output location for generated files")
-        .option("-u, --source-url <sourceUrl>", "URL to the root of the OData service")
-        .option("-f, --refresh-file", "Download metadata again and overwrite existing file (only applies if sourceUrl is specified)")
-        .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", "Don't mark single key props as managed by the server side (not editable)")
-        .option("-r, --allow-renaming", "Allow that property and entity names may be changed by configured casing")
-        .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, sourceUrl, refreshFile, sourceUrlConfig, debug, mode, emitMode, prettier, serviceName } = options;
-        console.log("---------------------------");
-        console.log(`Starting generation process. Service name ${serviceName ? `"${serviceName}"` : "will be detected automatically!"}`);
-        if (debug) {
-            console.log("Resolved config:", {
-                source,
-                output,
-                sourceUrl,
-                refreshFile,
-                debug,
-                mode: OptionModel_1.Modes[mode],
-                emitMode,
-                prettier,
-                serviceName,
-            });
-        }
-        // evaluate source
-        const exists = yield (0, fs_extra_1.pathExists)(source);
-        console.log(`${exists ? "Found" : "Didn't find"} metadata file at: `, source);
-        let metadataXml;
-        // download metadata and store on disk
-        if (sourceUrl && (!exists || refreshFile)) {
-            try {
-                metadataXml = yield (0, download_1.downloadMetadata)(sourceUrl, sourceUrlConfig, debug);
-            }
-            catch (e) {
-                console.error(`Failed to load metadata! Message: ${e === null || e === void 0 ? void 0 : e.message}`);
-                process.exit(10);
-            }
-            metadataXml = yield (0, download_1.storeMetadata)(source, metadataXml, prettier);
-        }
-        // otherwise file must exist
-        else if (!exists) {
-            console.error(`Input source [${source}] doesn't exist!`);
-            process.exit(2);
-        }
-        // read the metadata from file
-        else {
-            console.log("Reading metadata from file:", source);
-            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/cli.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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","sourcesContent":["import commander, { Option } from \"commander\";\r\nimport { cosmiconfig } from \"cosmiconfig\";\r\nimport { TypeScriptLoader } from \"cosmiconfig-typescript-loader\";\r\nimport { emptyDir, pathExists, readFile } from \"fs-extra\";\r\nimport { parseStringPromise } from \"xml2js\";\r\n\r\nimport { runApp } from \"./app\";\r\nimport { ODataEdmxModelBase } from \"./data-model/edmx/ODataEdmxModelBase\";\r\nimport { downloadMetadata, storeMetadata } from \"./download/\";\r\nimport { evaluateConfigOptions } from \"./evaluateConfig\";\r\nimport { CliOptions, ConfigFileOptions, EmitModes, Modes, RunOptions, UrlSourceConfiguration } from \"./OptionModel\";\r\nimport { logFilePath } from \"./project/logger/logFilePath\";\r\n\r\nfunction parseMode(value: string, dummyPrevious: Modes | undefined) {\r\n  switch (value) {\r\n    case \"models\":\r\n      return Modes.models;\r\n    case \"qobjects\":\r\n      return Modes.qobjects;\r\n    case \"service\":\r\n      return Modes.service;\r\n    case \"all\":\r\n      return Modes.all;\r\n    default:\r\n      throw new Error(`Not a valid Mode: ${value}`);\r\n  }\r\n}\r\n\r\nfunction parseEmitMode(value: string, dummyPrevious: EmitModes) {\r\n  switch (value) {\r\n    case \"dts\":\r\n      return EmitModes.dts;\r\n    case \"js\":\r\n      return EmitModes.js;\r\n    case \"ts\":\r\n      return EmitModes.ts;\r\n    case \"js_dts\":\r\n      return EmitModes.js_dts;\r\n    default:\r\n      throw new Error(`Not a valid EmitMode: ${value}`);\r\n  }\r\n}\r\n\r\nfunction processCliArgs() {\r\n  const cli = new commander.Command()\r\n    .version(\"0.3.0\")\r\n    .description(\"CLI to generate Typescript Interfaces for models of a given OData service.\")\r\n    .argument(\"[services...]\", \"Run the generation process only for certain services specified in config file\", [])\r\n    .option(\"-s, --source <url or metadata.xml>\", \"Path to metadata file\")\r\n    .option(\"-o, --output <path>\", \"Output location for generated files\")\r\n    .option(\"-u, --source-url <sourceUrl>\", \"URL to the root of the OData service\")\r\n    .option(\r\n      \"-f, --refresh-file\",\r\n      \"Download metadata again and overwrite existing file (only applies if sourceUrl is specified)\"\r\n    )\r\n    .addOption(\r\n      new Option(\"-m, --mode <mode>\", \"What kind of stuff gets generated\")\r\n        .choices(Object.values(Modes).filter((t): t is string => isNaN(Number(t))))\r\n        .argParser<Modes>(parseMode)\r\n    )\r\n    .addOption(\r\n      new Option(\r\n        \"-e, --emit-mode <mode>\",\r\n        \"Output TS source files, compiled JS files with/wihthout generated d.ts files\"\r\n      )\r\n        .choices(Object.values(EmitModes))\r\n        .argParser<EmitModes>(parseEmitMode)\r\n    )\r\n    .option(\"-p, --prettier\", \"Format result with prettier (only applies if emitMode=ts)\")\r\n    .option(\r\n      \"-t, --tsconfig <path>\",\r\n      \"Specify alternative to 'tsconfig.json' to use specific compilerOptions (applies if emitMode is not ts)\"\r\n    )\r\n    .option(\"-d, --debug\", \"Verbose debug infos\")\r\n    .option(\"-name, --service-name <serviceName>\", \"Give the service your own name\")\r\n    .option(\r\n      \"-n, --disable-auto-managed-key\",\r\n      \"Don't mark single key props as managed by the server side (not editable)\"\r\n    )\r\n    .option(\"-r, --allow-renaming\", \"Allow that property and entity names may be changed by configured casing\")\r\n    .parse(process.argv);\r\n\r\n  const args = cli.args?.length ? { services: cli.args } : {};\r\n  return {\r\n    ...cli.opts(),\r\n    ...args,\r\n  } as CliOptions;\r\n}\r\n\r\nasync function processConfigFile() {\r\n  const moduleName = \"odata2ts\";\r\n  const explorer = cosmiconfig(moduleName, {\r\n    searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.ts`, `${moduleName}.config.cjs`],\r\n    loaders: {\r\n      \".ts\": TypeScriptLoader(),\r\n    },\r\n  });\r\n  const discoveredConfig = await explorer.search();\r\n\r\n  if (discoveredConfig?.config) {\r\n    console.log(\"Loaded config file: \", logFilePath(discoveredConfig.filepath));\r\n  } else {\r\n    console.log(\"No config file found.\");\r\n  }\r\n\r\n  return discoveredConfig?.config as ConfigFileOptions;\r\n}\r\n\r\nexport class Cli {\r\n  async run(): Promise<void> {\r\n    let runs;\r\n    try {\r\n      const cliOpts = processCliArgs();\r\n      if (cliOpts.debug) {\r\n        console.log(\"CLI opts:\", cliOpts);\r\n      }\r\n      const fileOpts = await processConfigFile();\r\n\r\n      runs = evaluateConfigOptions(cliOpts, fileOpts);\r\n    } catch (error: any) {\r\n      console.error(\"Bad arguments!\", error?.message);\r\n      process.exit(1);\r\n    }\r\n\r\n    for (let run of runs) {\r\n      await startServiceGenerationRun(run);\r\n    }\r\n  }\r\n}\r\n\r\nasync function startServiceGenerationRun(options: RunOptions) {\r\n  const { source, output, sourceUrl, refreshFile, sourceUrlConfig, debug, mode, emitMode, prettier, serviceName } =\r\n    options;\r\n  console.log(\"---------------------------\");\r\n  console.log(\r\n    `Starting generation process. Service name ${serviceName ? `\"${serviceName}\"` : \"will be detected automatically!\"}`\r\n  );\r\n\r\n  if (debug) {\r\n    console.log(\"Resolved config:\", {\r\n      source,\r\n      output,\r\n      sourceUrl,\r\n      refreshFile,\r\n      debug,\r\n      mode: Modes[mode],\r\n      emitMode,\r\n      prettier,\r\n      serviceName,\r\n    });\r\n  }\r\n\r\n  // evaluate source\r\n  const exists = await pathExists(source);\r\n  console.log(`${exists ? \"Found\" : \"Didn't find\"} metadata file at: `, source);\r\n\r\n  let metadataXml;\r\n  // download metadata and store on disk\r\n  if (sourceUrl && (!exists || refreshFile)) {\r\n    try {\r\n      metadataXml = await downloadMetadata(sourceUrl, sourceUrlConfig, debug);\r\n    } catch (e) {\r\n      console.error(`Failed to load metadata! Message: ${(e as Error)?.message}`);\r\n      process.exit(10);\r\n    }\r\n    metadataXml = await storeMetadata(source, metadataXml, prettier);\r\n  }\r\n  // otherwise file must exist\r\n  else if (!exists) {\r\n    console.error(`Input source [${source}] doesn't exist!`);\r\n    process.exit(2);\r\n  }\r\n  // read the metadata from file\r\n  else {\r\n    console.log(\"Reading metadata from file:\", source);\r\n    metadataXml = await readFile(source);\r\n  }\r\n\r\n  const metadataJson = (await parseStringPromise(metadataXml)) as ODataEdmxModelBase<any>;\r\n  // TODO find out if \"1.0\" and \"4.0\" are really correct\r\n  // TODO exit here if no version not suitable version was detected\r\n  // console.log(`OData version detected: ${metadataJson[\"edmx:Edmx\"].$.Version}`);\r\n\r\n  // ensure that output directory exists\r\n  try {\r\n    await emptyDir(output);\r\n  } catch (error) {\r\n    console.error(`Output path [${output}] couldn't be created!`, error);\r\n    process.exit(3);\r\n  }\r\n\r\n  // run the app\r\n  try {\r\n    await runApp(metadataJson, options);\r\n  } catch (err: any) {\r\n    console.error(\"Error while running the program\", err);\r\n    process.exit(99);\r\n  }\r\n}\r\n"]}