@odata2ts/odata2ts 0.23.0 → 0.24.0

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

@@ -1,29 +1,29 @@
-import { BaseFormatter } from "./BaseFormatter";
-/**
- * Prettier formatter.
- *
- * NOTE: Should be created like this => const formatter = await new NoopFormatter("./test.ts").init();
- *
- * @export
- * @class NoopFormatter
- * @extends {Formatter}
- */
-export declare class NoopFormatter extends BaseFormatter {
-    /**
-     * Initializes the formatter.
-     *
-     * @abstract
-     * @returns {Promise<Formatter>} Initialized formatter
-     * @memberof Formatter
-     */
-    init(): Promise<BaseFormatter>;
-    /**
-     * Formats a given source code.
-     *
-     * @abstract
-     * @param {string} source Source code to format
-     * @returns {string} Formatted source code
-     * @memberof Formatter
-     */
-    format(source: string): Promise<string>;
-}
+import { BaseFormatter } from "./BaseFormatter";
+/**
+ * Prettier formatter.
+ *
+ * NOTE: Should be created like this => const formatter = await new NoopFormatter("./test.ts").init();
+ *
+ * @export
+ * @class NoopFormatter
+ * @extends {Formatter}
+ */
+export declare class NoopFormatter extends BaseFormatter {
+    /**
+     * Initializes the formatter.
+     *
+     * @abstract
+     * @returns {Promise<Formatter>} Initialized formatter
+     * @memberof Formatter
+     */
+    init(): Promise<BaseFormatter>;
+    /**
+     * Formats a given source code.
+     *
+     * @abstract
+     * @param {string} source Source code to format
+     * @returns {string} Formatted source code
+     * @memberof Formatter
+     */
+    format(source: string): Promise<string>;
+}

package/lib/project/formatter/NoopFormatter.js

@@ -1,43 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NoopFormatter = void 0;
-const tslib_1 = require("tslib");
-const BaseFormatter_1 = require("./BaseFormatter");
-/**
- * Prettier formatter.
- *
- * NOTE: Should be created like this => const formatter = await new NoopFormatter("./test.ts").init();
- *
- * @export
- * @class NoopFormatter
- * @extends {Formatter}
- */
-class NoopFormatter extends BaseFormatter_1.BaseFormatter {
-    /**
-     * Initializes the formatter.
-     *
-     * @abstract
-     * @returns {Promise<Formatter>} Initialized formatter
-     * @memberof Formatter
-     */
-    init() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this;
-        });
-    }
-    /**
-     * Formats a given source code.
-     *
-     * @abstract
-     * @param {string} source Source code to format
-     * @returns {string} Formatted source code
-     * @memberof Formatter
-     */
-    format(source) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return source;
-        });
-    }
-}
-exports.NoopFormatter = NoopFormatter;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoopFormatter = void 0;
+const tslib_1 = require("tslib");
+const BaseFormatter_1 = require("./BaseFormatter");
+/**
+ * Prettier formatter.
+ *
+ * NOTE: Should be created like this => const formatter = await new NoopFormatter("./test.ts").init();
+ *
+ * @export
+ * @class NoopFormatter
+ * @extends {Formatter}
+ */
+class NoopFormatter extends BaseFormatter_1.BaseFormatter {
+    /**
+     * Initializes the formatter.
+     *
+     * @abstract
+     * @returns {Promise<Formatter>} Initialized formatter
+     * @memberof Formatter
+     */
+    init() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this;
+        });
+    }
+    /**
+     * Formats a given source code.
+     *
+     * @abstract
+     * @param {string} source Source code to format
+     * @returns {string} Formatted source code
+     * @memberof Formatter
+     */
+    format(source) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return source;
+        });
+    }
+}
+exports.NoopFormatter = NoopFormatter;
 //# sourceMappingURL=NoopFormatter.js.map

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

@@ -1,46 +1,46 @@
-import { BaseFormatter } from "./BaseFormatter";
-export declare class PrettierFormatter extends BaseFormatter {
-    /**
-     * Prettier options found in the project.
-     *
-     * @private
-     * @type {prettier.Options}
-     * @memberof PrettierFormatter
-     */
-    private options;
-    /**
-     * Initializes the formatter.
-     *
-     * @returns {Promise<PrettierFormatter>} Initialized formatter
-     * @memberof PrettierFormatter
-     */
-    init(): Promise<PrettierFormatter>;
-    /**
-     * Formats a given source code.
-     *
-     * @abstract
-     * @param {string} source Source code to format
-     * @returns {string} Formatted source code
-     * @memberof Formatter
-     */
-    format(source: string): Promise<string>;
-    /**
-     * Converts prettier indentation config to ts-morph settings.
-     *
-     * @private
-     * @param {boolean | undefined} useTabs Flag, whether to use tabs or not
-     * @param {number | undefined} tabWidth Width of a simulated tab, each number represents a space
-     * @returns {IndentationText} Converted indentation text
-     * @memberof PrettierFormatter
-     */
-    private convertIndentation;
-    /**
-     * Converts prettier newline config to ts-morph settings.
-     *
-     * @private
-     * @param {string | undefined} eol prettier end-of-line config
-     * @returns {NewLineKind | undefined} Converted new line kind
-     * @memberof PrettierFormatter
-     */
-    private convertNewline;
-}
+import { BaseFormatter } from "./BaseFormatter";
+export declare class PrettierFormatter extends BaseFormatter {
+    /**
+     * Prettier options found in the project.
+     *
+     * @private
+     * @type {prettier.Options}
+     * @memberof PrettierFormatter
+     */
+    private options;
+    /**
+     * Initializes the formatter.
+     *
+     * @returns {Promise<PrettierFormatter>} Initialized formatter
+     * @memberof PrettierFormatter
+     */
+    init(): Promise<PrettierFormatter>;
+    /**
+     * Formats a given source code.
+     *
+     * @abstract
+     * @param {string} source Source code to format
+     * @returns {string} Formatted source code
+     * @memberof Formatter
+     */
+    format(source: string): Promise<string>;
+    /**
+     * Converts prettier indentation config to ts-morph settings.
+     *
+     * @private
+     * @param {boolean | undefined} useTabs Flag, whether to use tabs or not
+     * @param {number | undefined} tabWidth Width of a simulated tab, each number represents a space
+     * @returns {IndentationText} Converted indentation text
+     * @memberof PrettierFormatter
+     */
+    private convertIndentation;
+    /**
+     * Converts prettier newline config to ts-morph settings.
+     *
+     * @private
+     * @param {string | undefined} eol prettier end-of-line config
+     * @returns {NewLineKind | undefined} Converted new line kind
+     * @memberof PrettierFormatter
+     */
+    private convertNewline;
+}

package/lib/project/formatter/PrettierFormatter.js

@@ -1,93 +1,93 @@
-"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 {
-    /**
-     * Initializes the formatter.
-     *
-     * @returns {Promise<PrettierFormatter>} Initialized formatter
-     * @memberof PrettierFormatter
-     */
-    init() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const options = yield prettier_1.default.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,
-                    useTrailingCommas: this.options.trailingComma === "none" ? false : true,
-                };
-            }
-            else
-                this.settings = {};
-            return this;
-        });
-    }
-    /**
-     * Formats a given source code.
-     *
-     * @abstract
-     * @param {string} source Source code to format
-     * @returns {string} Formatted source code
-     * @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));
-        });
-    }
-    /**
-     * Converts prettier indentation config to ts-morph settings.
-     *
-     * @private
-     * @param {boolean | undefined} useTabs Flag, whether to use tabs or not
-     * @param {number | undefined} tabWidth Width of a simulated tab, each number represents a space
-     * @returns {IndentationText} Converted indentation text
-     * @memberof PrettierFormatter
-     */
-    convertIndentation(useTabs, tabWidth) {
-        if (useTabs)
-            return ts_morph_1.IndentationText.Tab;
-        switch (tabWidth) {
-            case 2:
-                return ts_morph_1.IndentationText.TwoSpaces;
-            case 4:
-                return ts_morph_1.IndentationText.FourSpaces;
-            case 8:
-                return ts_morph_1.IndentationText.EightSpaces;
-            default:
-                return ts_morph_1.IndentationText.TwoSpaces;
-        }
-    }
-    /**
-     * Converts prettier newline config to ts-morph settings.
-     *
-     * @private
-     * @param {string | undefined} eol prettier end-of-line config
-     * @returns {NewLineKind | undefined} Converted new line kind
-     * @memberof PrettierFormatter
-     */
-    convertNewline(eol) {
-        switch (eol) {
-            case "lf":
-                return ts_morph_1.NewLineKind.LineFeed;
-            case "crlf":
-                return ts_morph_1.NewLineKind.CarriageReturnLineFeed;
-            case "cr":
-                return ts_morph_1.NewLineKind.CarriageReturnLineFeed;
-            case "auto":
-                return ts_morph_1.NewLineKind.LineFeed;
-            default:
-                return ts_morph_1.NewLineKind.LineFeed;
-        }
-    }
-}
-exports.PrettierFormatter = PrettierFormatter;
+"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 {
+    /**
+     * Initializes the formatter.
+     *
+     * @returns {Promise<PrettierFormatter>} Initialized formatter
+     * @memberof PrettierFormatter
+     */
+    init() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const options = yield prettier_1.default.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,
+                    useTrailingCommas: this.options.trailingComma === "none" ? false : true,
+                };
+            }
+            else
+                this.settings = {};
+            return this;
+        });
+    }
+    /**
+     * Formats a given source code.
+     *
+     * @abstract
+     * @param {string} source Source code to format
+     * @returns {string} Formatted source code
+     * @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));
+        });
+    }
+    /**
+     * Converts prettier indentation config to ts-morph settings.
+     *
+     * @private
+     * @param {boolean | undefined} useTabs Flag, whether to use tabs or not
+     * @param {number | undefined} tabWidth Width of a simulated tab, each number represents a space
+     * @returns {IndentationText} Converted indentation text
+     * @memberof PrettierFormatter
+     */
+    convertIndentation(useTabs, tabWidth) {
+        if (useTabs)
+            return ts_morph_1.IndentationText.Tab;
+        switch (tabWidth) {
+            case 2:
+                return ts_morph_1.IndentationText.TwoSpaces;
+            case 4:
+                return ts_morph_1.IndentationText.FourSpaces;
+            case 8:
+                return ts_morph_1.IndentationText.EightSpaces;
+            default:
+                return ts_morph_1.IndentationText.TwoSpaces;
+        }
+    }
+    /**
+     * Converts prettier newline config to ts-morph settings.
+     *
+     * @private
+     * @param {string | undefined} eol prettier end-of-line config
+     * @returns {NewLineKind | undefined} Converted new line kind
+     * @memberof PrettierFormatter
+     */
+    convertNewline(eol) {
+        switch (eol) {
+            case "lf":
+                return ts_morph_1.NewLineKind.LineFeed;
+            case "crlf":
+                return ts_morph_1.NewLineKind.CarriageReturnLineFeed;
+            case "cr":
+                return ts_morph_1.NewLineKind.CarriageReturnLineFeed;
+            case "auto":
+                return ts_morph_1.NewLineKind.LineFeed;
+            default:
+                return ts_morph_1.NewLineKind.LineFeed;
+        }
+    }
+}
+exports.PrettierFormatter = PrettierFormatter;
 //# sourceMappingURL=PrettierFormatter.js.map

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

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

package/lib/project/formatter/index.js

@@ -1,15 +1,15 @@
-"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);
-        yield formatter.init();
-        return formatter;
-    });
-}
-exports.createFormatter = createFormatter;
+"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);
+        yield formatter.init();
+        return formatter;
+    });
+}
+exports.createFormatter = createFormatter;
 //# sourceMappingURL=index.js.map

package/lib/project/logger/logFilePath.d.ts

@@ -1 +1 @@
-export declare function logFilePath(filePath: string): string;
+export declare function logFilePath(filePath: string): string;

package/lib/project/logger/logFilePath.js

@@ -1,13 +1,13 @@
-"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) {
-    // we only show file paths relative to work dir of running process
-    const relativePath = path_1.default.relative(process.cwd(), filePath);
-    // beautify slashes for windows
-    return relativePath.split(path_1.default.sep).join("/");
-}
-exports.logFilePath = logFilePath;
+"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) {
+    // we only show file paths relative to work dir of running process
+    const relativePath = path_1.default.relative(process.cwd(), filePath);
+    // beautify slashes for windows
+    return relativePath.split(path_1.default.sep).join("/");
+}
+exports.logFilePath = logFilePath;
 //# sourceMappingURL=logFilePath.js.map

package/lib/run-cli.d.ts

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
-export {};
+#!/usr/bin/env node
+export {};

package/lib/run-cli.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odata2ts/odata2ts",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "publishConfig": {
     "access": "public"
   },
@@ -45,48 +45,47 @@
     "cli"
   ],
   "peerDependencies": {
-    "@odata2ts/http-client-api": "^0.1.0",
-    "@odata2ts/odata-query-objects": "^0.18.0",
-    "@odata2ts/odata-service": "^0.15.0"
+    "@odata2ts/odata-query-objects": "^0.18.2",
+    "@odata2ts/odata-service": "^0.15.2"
   },
   "dependencies": {
     "@odata2ts/converter-api": "^0.1.2",
     "@odata2ts/converter-runtime": "^0.1.5",
-    "@odata2ts/odata-core": "^0.3.7",
+    "@odata2ts/odata-core": "^0.3.8",
     "camel-case": "^4.1.2",
-    "commander": "^9.1.0",
+    "commander": "^10.0.1",
     "constant-case": "^3.0.4",
-    "cosmiconfig": "^7.0.1",
-    "cosmiconfig-typescript-loader": "^4.0.0",
-    "deepmerge": "^4.2.2",
-    "fs-extra": "^10.0.1",
+    "cosmiconfig": "^8.2.0",
+    "cosmiconfig-typescript-loader": "^4.3.0",
+    "deepmerge": "^4.3.1",
+    "fs-extra": "^11.1.1",
     "pascal-case": "^3.1.2",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.8",
     "snake-case": "^3.0.4",
-    "ts-morph": "^14.0.0",
-    "ts-node": "^10.7.0",
+    "ts-morph": "^18.0.0",
+    "ts-node": "^10.9.1",
     "tsconfig-loader": "^1.1.0",
     "upper-case-first": "^2.0.2",
-    "xml2js": "^0.5.0"
+    "xml2js": "^0.6.0"
   },
   "devDependencies": {
     "@odata2ts/converter-v2-to-v4": "^0.1.4",
     "@odata2ts/http-client-api": "^0.1.0",
-    "@odata2ts/odata-query-objects": "^0.18.0",
-    "@odata2ts/odata-service": "^0.15.0",
-    "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^27.4.1",
-    "@types/node": "^17.0.23",
-    "@types/prettier": "^2.4.4",
-    "@types/xml2js": "^0.4.9",
-    "axios": "^0.26.1",
-    "jest": "^27.5.1",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.4",
-    "type-fest": "2.19.0",
-    "typescript": "^4.9.4"
+    "@odata2ts/odata-query-objects": "^0.18.2",
+    "@odata2ts/odata-service": "^0.15.2",
+    "@odata2ts/test-converters": "^0.2.6",
+    "@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"
   },
   "types": "./lib/index.d.ts",
-  "gitHead": "a3d6457b87ce8c9ec42772c8a5fd02b4246a2e37",
+  "gitHead": "03016b8c3e7ec6fade37afcce777e6547edb384f",
   "readme": "README.md"
 }