@tramvai/cli 5.9.2 → 5.14.9

package/lib/models/port-manager.js

@@ -16,30 +16,28 @@ class PortManager {
         this.commandParams = commandParams;
         this.logger = logger;
     }
-    handleConfigValues() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.commandParams.port !== undefined && this.commandParams.port !== 0) {
-                // @ts-expect-error There is a string actually
-                this.port = parseInt(this.commandParams.port, 10);
-            }
-            if (this.commandParams.staticPort !== undefined && this.commandParams.staticPort !== 0) {
-                // @ts-expect-error There is a string actually
-                this.staticPort = parseInt(this.commandParams.staticPort, 10);
-            }
-            switch (this.configEntry.type) {
-                case 'child-app':
-                    yield this.forChildApp();
-                    break;
-                case 'module':
-                    yield this.forModule();
-                    break;
-                case 'application':
-                    yield this.forApplication();
-                    break;
-                default:
-                    break;
-            }
-        });
+    async handleConfigValues() {
+        if (this.commandParams.port !== undefined && this.commandParams.port !== 0) {
+            // @ts-expect-error There is a string actually
+            this.port = parseInt(this.commandParams.port, 10);
+        }
+        if (this.commandParams.staticPort !== undefined && this.commandParams.staticPort !== 0) {
+            // @ts-expect-error There is a string actually
+            this.staticPort = parseInt(this.commandParams.staticPort, 10);
+        }
+        switch (this.configEntry.type) {
+            case 'child-app':
+                await this.forChildApp();
+                break;
+            case 'module':
+                await this.forModule();
+                break;
+            case 'application':
+                await this.forApplication();
+                break;
+            default:
+                break;
+        }
     }
     /**
      * Try to detect port considering the fact, that if user requests
@@ -48,150 +46,124 @@ class PortManager {
      * Also, handle zero port (it means any random port) as the edge case,
      * because we must pass a final number to the config manager.
      */
-    computeAvailablePorts() {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
-                yield this.createCacheFile();
-                const release = yield this.lockCacheFile();
-                try {
-                    yield this.handleConfigValues();
-                    yield this.appendCacheFile([this.port, this.staticPort].join(','));
-                }
-                catch (error) {
-                    this.logger.event({
-                        type: 'warning',
-                        event: 'PORT_MANAGER:GET_AVAILABLE_PORTS',
-                        message: `Can't get free ports for ${this.configEntry.type}:`,
-                        payload: (_a = error.message) !== null && _a !== void 0 ? _a : '',
-                    });
-                }
-                finally {
-                    yield release();
-                }
-                return;
+    async computeAvailablePorts() {
+        if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+            await this.createCacheFile();
+            const release = await this.lockCacheFile();
+            try {
+                await this.handleConfigValues();
+                await this.appendCacheFile([this.port, this.staticPort].join(','));
             }
-            yield this.handleConfigValues();
-        });
+            catch (error) {
+                this.logger.event({
+                    type: 'warning',
+                    event: 'PORT_MANAGER:GET_AVAILABLE_PORTS',
+                    message: `Can't get free ports for ${this.configEntry.type}:`,
+                    payload: error.message ?? '',
+                });
+            }
+            finally {
+                await release();
+            }
+            return;
+        }
+        await this.handleConfigValues();
     }
     /**
      * Cleanup a cache file by removing ports were written previously.
      */
-    cleanup() {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
-                const release = yield this.lockCacheFile();
-                try {
-                    const cache = yield this.readCacheFile();
-                    yield this.writeCacheFile(cache
-                        .filter(Boolean)
-                        .filter((port) => port !== this.port.toString() && port !== this.staticPort.toString())
-                        .join(','));
-                }
-                catch (error) {
-                    this.logger.event({
-                        type: 'warning',
-                        event: 'PORT_MANAGER:CLEANUP',
-                        message: "Can't perform a cleanup of previously used ports:",
-                        payload: (_a = error.message) !== null && _a !== void 0 ? _a : '',
-                    });
-                }
-                finally {
-                    yield release();
-                }
-                return;
+    async cleanup() {
+        if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+            const release = await this.lockCacheFile();
+            try {
+                const cache = await this.readCacheFile();
+                await this.writeCacheFile(cache
+                    .filter(Boolean)
+                    .filter((port) => port !== this.port.toString() && port !== this.staticPort.toString())
+                    .join(','));
             }
-            (0, noop_1.default)();
-        });
+            catch (error) {
+                this.logger.event({
+                    type: 'warning',
+                    event: 'PORT_MANAGER:CLEANUP',
+                    message: "Can't perform a cleanup of previously used ports:",
+                    payload: error.message ?? '',
+                });
+            }
+            finally {
+                await release();
+            }
+            return;
+        }
+        (0, noop_1.default)();
     }
-    forApplication() {
-        var _a, _b;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_PORT));
-            this.staticPort =
-                (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield this.resolveFreePort(PortManager.DEFAULT_STATIC_PORT));
-        });
+    async forApplication() {
+        this.port = this.port ?? (await this.resolveFreePort(PortManager.DEFAULT_PORT));
+        this.staticPort =
+            this.staticPort ?? (await this.resolveFreePort(PortManager.DEFAULT_STATIC_PORT));
     }
-    forModule() {
-        var _a, _b;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
-            this.staticPort =
-                (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
-        });
+    async forModule() {
+        this.port = this.port ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
+        this.staticPort =
+            this.staticPort ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
     }
-    forChildApp() {
-        var _a, _b;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
-            this.staticPort =
-                (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
-        });
+    async forChildApp() {
+        this.port = this.port ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
+        this.staticPort =
+            this.staticPort ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
     }
     lockCacheFile() {
         return (0, proper_lockfile_1.lock)(PortManager.cachePath, { retries: 10 });
     }
-    createCacheFile() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                yield (0, fs_extra_1.access)(PortManager.cachePath);
-            }
-            catch (error) {
-                yield (0, fs_extra_1.outputFile)(PortManager.cachePath, '');
-            }
-        });
+    async createCacheFile() {
+        try {
+            await (0, fs_extra_1.access)(PortManager.cachePath);
+        }
+        catch (error) {
+            await (0, fs_extra_1.outputFile)(PortManager.cachePath, '');
+        }
     }
-    readCacheFile() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                const content = yield (0, fs_extra_1.readFile)(PortManager.cachePath, { encoding: 'utf-8' });
-                return content.split(',');
-            }
-            catch (error) {
-                return [];
-            }
-        });
+    async readCacheFile() {
+        try {
+            const content = await (0, fs_extra_1.readFile)(PortManager.cachePath, { encoding: 'utf-8' });
+            return content.split(',');
+        }
+        catch (error) {
+            return [];
+        }
     }
-    writeCacheFile(content) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield (0, fs_extra_1.outputFile)(PortManager.cachePath, content);
-        });
+    async writeCacheFile(content) {
+        await (0, fs_extra_1.outputFile)(PortManager.cachePath, content);
     }
-    appendCacheFile(content) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield (0, fs_extra_1.appendFile)(PortManager.cachePath, `,${content}`);
-        });
+    async appendCacheFile(content) {
+        await (0, fs_extra_1.appendFile)(PortManager.cachePath, `,${content}`);
     }
-    resolveFreePort(initial) {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
-                    const cache = yield this.readCacheFile();
-                    let port = yield (0, detect_port_1.default)(initial);
-                    let attempts = 1;
-                    while (cache.includes(port.toString())) {
-                        if (attempts >= 3) {
-                            throw new Error(`Max attempts exceeded (${attempts})`);
-                        }
-                        port = yield (0, detect_port_1.default)(0);
-                        attempts++;
+    async resolveFreePort(initial) {
+        try {
+            if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+                const cache = await this.readCacheFile();
+                let port = await (0, detect_port_1.default)(initial);
+                let attempts = 1;
+                while (cache.includes(port.toString())) {
+                    if (attempts >= 3) {
+                        throw new Error(`Max attempts exceeded (${attempts})`);
                     }
-                    return port;
+                    port = await (0, detect_port_1.default)(0);
+                    attempts++;
                 }
-                return (0, detect_port_1.default)(initial);
-            }
-            catch (error) {
-                this.logger.event({
-                    type: 'info',
-                    event: 'PORT_MANAGER:RESOLVE_FREE_PORT',
-                    message: "Can't resolve a free port, fallback to an initial one:",
-                    payload: (_a = error.message) !== null && _a !== void 0 ? _a : '',
-                });
-                return initial;
+                return port;
             }
-        });
+            return (0, detect_port_1.default)(initial);
+        }
+        catch (error) {
+            this.logger.event({
+                type: 'info',
+                event: 'PORT_MANAGER:RESOLVE_FREE_PORT',
+                message: "Can't resolve a free port, fallback to an initial one:",
+                payload: error.message ?? '',
+            });
+            return initial;
+        }
     }
 }
 exports.PortManager = PortManager;

package/lib/models/port-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"port-manager.js","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"port-manager.js","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":";;;;AAAA,uCAAoE;AACpE,+BAA4B;AAC5B,4EAA0C;AAC1C,sEAAqC;AACrC,qDAAuC;AACvC,gFAAgD;AAahD,MAAa,WAAW;IAiBtB,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAA6B;QAHtE,SAAI,GAAkB,IAAI,CAAC;QAC3B,eAAU,GAAkB,IAAI,CAAC;QAGtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE;YAC1E,8CAA8C;YAC9C,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;SACnD;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,KAAK,CAAC,EAAE;YACtF,8CAA8C;YAC9C,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;SAC/D;QAED,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;YAC7B,KAAK,WAAW;gBACd,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBACzB,MAAM;YAER,KAAK,QAAQ;gBACX,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;gBACvB,MAAM;YAER,KAAK,aAAa;gBAChB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;gBAC5B,MAAM;YAER;gBACE,MAAM;SACT;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,qBAAqB;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,MAAM,EAAE;YACxD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE3C,IAAI;gBACF,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAEhC,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aACpE;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;oBAChB,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,kCAAkC;oBACzC,OAAO,EAAE,4BAA4B,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG;oBAC7D,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,EAAE;iBAC7B,CAAC,CAAC;aACJ;oBAAS;gBACR,MAAM,OAAO,EAAE,CAAC;aACjB;YAED,OAAO;SACR;QAED,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAClC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,OAAO;QAClB,IAAI,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,MAAM,EAAE;YACxD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE3C,IAAI;gBACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAEzC,MAAM,IAAI,CAAC,cAAc,CACvB,KAAK;qBACF,MAAM,CAAC,OAAO,CAAC;qBACf,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;qBACtF,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;aACH;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;oBAChB,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,sBAAsB;oBAC7B,OAAO,EAAE,mDAAmD;oBAC5D,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,EAAE;iBAC7B,CAAC,CAAC;aACJ;oBAAS;gBACR,MAAM,OAAO,EAAE,CAAC;aACjB;YAED,OAAO;SACR;QAED,IAAA,cAAI,GAAE,CAAC;IACT,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,UAAU;YACb,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACrF,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC;QAC9F,IAAI,CAAC,UAAU;YACb,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC5F,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC;QAC9F,IAAI,CAAC,UAAU;YACb,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC5F,CAAC;IAEO,aAAa;QACnB,OAAO,IAAA,sBAAI,EAAC,WAAW,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI;YACF,MAAM,IAAA,iBAAM,EAAC,WAAW,CAAC,SAAS,CAAC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;SAC7C;IACH,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,WAAW,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YAE7E,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC3B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAe;QAC1C,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,OAAe;QAC3C,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,SAAS,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,OAAe;QAC3C,IAAI;YACF,IAAI,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,MAAM,EAAE;gBACxD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBACzC,IAAI,IAAI,GAAG,MAAM,IAAA,qBAAU,EAAC,OAAO,CAAC,CAAC;gBACrC,IAAI,QAAQ,GAAG,CAAC,CAAC;gBAEjB,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE;oBACtC,IAAI,QAAQ,IAAI,CAAC,EAAE;wBACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,GAAG,CAAC,CAAC;qBACxD;oBAED,IAAI,GAAG,MAAM,IAAA,qBAAU,EAAC,CAAC,CAAC,CAAC;oBAE3B,QAAQ,EAAE,CAAC;iBACZ;gBAED,OAAO,IAAI,CAAC;aACb;YAED,OAAO,IAAA,qBAAU,EAAC,OAAO,CAAC,CAAC;SAC5B;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAChB,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,gCAAgC;gBACvC,OAAO,EAAE,wDAAwD;gBACjE,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,EAAE;aAC7B,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC;SAChB;IACH,CAAC;;AArMH,kCAsMC;AArMiB,wBAAY,GAAG,IAAI,AAAP,CAAQ;AACpB,+BAAmB,GAAG,IAAI,AAAP,CAAQ;AAC3C,8CAA8C;AAC9B,sCAA0B,GAAG,IAAI,AAAP,CAAQ;AAC1B,qBAAS,GAAG,IAAA,WAAI,EACtC,IAAA,wBAAY,EAAC,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAC/D,YAAY,CACb,AAHgC,CAG/B"}

package/lib/models/task.js

@@ -8,35 +8,33 @@ class Task {
         this.options = { stdio: 'inherit' };
         this.context = context;
     }
-    run(parameters = {}) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.context.logger.event({
-                type: 'debug',
-                event: `RUN:TASK:${this.name}`,
-                message: JSON.stringify(parameters),
-            });
-            const args = [...this.arguments, ...(parameters.arguments || [])];
-            const options = Object.assign(Object.assign({}, this.options), parameters.options);
-            const trackAfter = this.context.analytics.trackAfter({
-                name: this.name,
-                category: 'task',
-                parameters: args,
-                label: this.analyticTaskUsageLabel(args),
-            });
-            return trackAfter(this.execute(this.command, args, options))
-                .then((result) => ({
-                status: 'ok',
-                code: result.exitCode,
-                stdout: result.stdout,
-                stderr: result.stderr,
-            }))
-                .catch((error) => ({
-                status: 'fail',
-                code: error.code,
-                stdout: error.stdout,
-                stderr: error.stderr,
-            }));
+    async run(parameters = {}) {
+        this.context.logger.event({
+            type: 'debug',
+            event: `RUN:TASK:${this.name}`,
+            message: JSON.stringify(parameters),
         });
+        const args = [...this.arguments, ...(parameters.arguments || [])];
+        const options = { ...this.options, ...parameters.options };
+        const trackAfter = this.context.analytics.trackAfter({
+            name: this.name,
+            category: 'task',
+            parameters: args,
+            label: this.analyticTaskUsageLabel(args),
+        });
+        return trackAfter(this.execute(this.command, args, options))
+            .then((result) => ({
+            status: 'ok',
+            code: result.exitCode,
+            stdout: result.stdout,
+            stderr: result.stderr,
+        }))
+            .catch((error) => ({
+            status: 'fail',
+            code: error.code,
+            stdout: error.stdout,
+            stderr: error.stderr,
+        }));
     }
     /**
      *

package/lib/models/task.js.map

@@ -1 +1 @@
-{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/models/task.ts"],"names":[],"mappings":";;;;AACA,0DAA0B;AAc1B,MAAsB,IAAI;IAKxB,YAAY,OAAO;QAJV,YAAO,GAA0B,EAAE,KAAK,EAAE,SAAkB,EAAE,CAAC;QAKtE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAUK,GAAG,CACP,aAAsE,EAAE;;YAExE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;gBACxB,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,YAAY,IAAI,CAAC,IAAI,EAAE;gBAC9B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;aACpC,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,UAAU,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC;YAClE,MAAM,OAAO,mCAAQ,IAAI,CAAC,OAAO,GAAK,UAAU,CAAC,OAAO,CAAE,CAAC;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;gBACnD,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,MAAM;gBAChB,UAAU,EAAE,IAAI;gBAChB,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC;aACzC,CAAC,CAAC;YAEH,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;iBACzD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACjB,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,MAAM,CAAC,QAAQ;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;iBACF,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACjB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB,CAAC,CAAC,CAAC;QACR,CAAC;KAAA;IAED;;;;;OAKG;IACO,OAAO,CAAC,OAAe,EAAE,IAAe,EAAE,OAA6B;QAC/E,OAAO,IAAA,eAAK,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAEO,sBAAsB,CAAC,IAAc;QAC3C,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;CACF;AA9DD,oBA8DC"}
+{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/models/task.ts"],"names":[],"mappings":";;;;AACA,0DAA0B;AAc1B,MAAsB,IAAI;IAKxB,YAAY,OAAO;QAJV,YAAO,GAA0B,EAAE,KAAK,EAAE,SAAkB,EAAE,CAAC;QAKtE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAUD,KAAK,CAAC,GAAG,CACP,aAAsE,EAAE;QAExE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,YAAY,IAAI,CAAC,IAAI,EAAE;YAC9B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;SACpC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,UAAU,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;YACnD,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,MAAM;YAChB,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC;SACzC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;aACzD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC;aACF,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACjB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC,CAAC,CAAC;IACR,CAAC;IAED;;;;;OAKG;IACO,OAAO,CAAC,OAAe,EAAE,IAAe,EAAE,OAA6B;QAC/E,OAAO,IAAA,eAAK,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAEO,sBAAsB,CAAC,IAAc;QAC3C,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;CACF;AA9DD,oBA8DC"}

package/lib/schema/autogeneratedSchema.json

@@ -1188,23 +1188,23 @@
                                                 "dotAll": {
                                                     "type": "boolean"
                                                 },
-                                                "__@match@7331": {
+                                                "__@match@7335": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@replace@7333": {
+                                                "__@replace@7337": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@search@7336": {
+                                                "__@search@7340": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@split@7338": {
+                                                "__@split@7342": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@matchAll@7340": {
+                                                "__@matchAll@7344": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 }
@@ -1901,23 +1901,23 @@
                                                 "dotAll": {
                                                     "type": "boolean"
                                                 },
-                                                "__@match@7331": {
+                                                "__@match@7335": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@replace@7333": {
+                                                "__@replace@7337": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@search@7336": {
+                                                "__@search@7340": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@split@7338": {
+                                                "__@split@7342": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@matchAll@7340": {
+                                                "__@matchAll@7344": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 }
@@ -2614,23 +2614,23 @@
                                                 "dotAll": {
                                                     "type": "boolean"
                                                 },
-                                                "__@match@7331": {
+                                                "__@match@7335": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@replace@7333": {
+                                                "__@replace@7337": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@search@7336": {
+                                                "__@search@7340": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@split@7338": {
+                                                "__@split@7342": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@matchAll@7340": {
+                                                "__@matchAll@7344": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 }

package/lib/ui/commander.js

@@ -49,7 +49,7 @@ function getParameters(args, commandObject) {
 }
 function normalizeArgs(args) {
     const commandObject = args.find((test) => typeof test === 'object' && !Array.isArray(test));
-    return Object.assign(Object.assign({}, getOptions(commandObject)), getParameters(args, commandObject));
+    return { ...getOptions(commandObject), ...getParameters(args, commandObject) };
 }
 function commander(commands, resolve) {
     commander_1.default

package/lib/ui/commander.js.map

@@ -1 +1 @@
-{"version":3,"file":"commander.js","sourceRoot":"","sources":["../../src/ui/commander.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commander.js","sourceRoot":"","sources":["../../src/ui/commander.ts"],"names":[],"mappings":"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"}

package/lib/utils/close.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.close = void 0;
-const tslib_1 = require("tslib");
-const close = (server) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const close = async (server) => {
     return new Promise((resolve, reject) => {
         server.close((err) => {
             if (err) {
@@ -12,6 +11,6 @@ const close = (server) => tslib_1.__awaiter(void 0, void 0, void 0, function* ()
             resolve();
         });
     });
-});
+};
 exports.close = close;
 //# sourceMappingURL=close.js.map

package/lib/utils/close.js.map

@@ -1 +1 @@
-{"version":3,"file":"close.js","sourceRoot":"","sources":["../../src/utils/close.ts"],"names":[],"mappings":";;;;AAAO,MAAM,KAAK,GAAG,CAAO,MAAsD,EAAE,EAAE;IACpF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;aACR;YAED,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAXW,QAAA,KAAK,SAWhB"}
+{"version":3,"file":"close.js","sourceRoot":"","sources":["../../src/utils/close.ts"],"names":[],"mappings":";;;AAAO,MAAM,KAAK,GAAG,KAAK,EAAE,MAAsD,EAAE,EAAE;IACpF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;aACR;YAED,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAXW,QAAA,KAAK,SAWhB"}

package/lib/utils/commands/dependencies/checkVersions.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkVersions = void 0;
-const tslib_1 = require("tslib");
 const tools_check_versions_1 = require("@tramvai/tools-check-versions");
-const checkVersions = (context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const checkVersions = async (context) => {
     try {
-        yield (0, tools_check_versions_1.run)();
+        await (0, tools_check_versions_1.run)();
     }
     catch (e) {
         throw new Error('Versions check failed');
     }
-});
+};
 exports.checkVersions = checkVersions;
 //# sourceMappingURL=checkVersions.js.map

package/lib/utils/commands/dependencies/checkVersions.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkVersions.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/checkVersions.ts"],"names":[],"mappings":";;;;AAAA,wEAAoD;AAG7C,MAAM,aAAa,GAAG,CAAO,OAAgB,EAAE,EAAE;IACtD,IAAI;QACF,MAAM,IAAA,0BAAG,GAAE,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;KAC1C;AACH,CAAC,CAAA,CAAC;AANW,QAAA,aAAa,iBAMxB"}
+{"version":3,"file":"checkVersions.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/checkVersions.ts"],"names":[],"mappings":";;;AAAA,wEAAoD;AAG7C,MAAM,aAAa,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;IACtD,IAAI;QACF,MAAM,IAAA,0BAAG,GAAE,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;KAC1C;AACH,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}

package/lib/utils/commands/dependencies/findTramvaiVersion.js

@@ -5,16 +5,15 @@ const tslib_1 = require("tslib");
 const semver_1 = require("semver");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const getVersionFromDep = (dep) => {
-    var _a, _b;
     if (dep) {
-        return ((_a = (0, semver_1.parse)(dep)) === null || _a === void 0 ? void 0 : _a.version) || ((_b = (0, semver_1.minVersion)(dep)) === null || _b === void 0 ? void 0 : _b.version);
+        return (0, semver_1.parse)(dep)?.version || (0, semver_1.minVersion)(dep)?.version;
     }
 };
-const findTramvaiVersion = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const findTramvaiVersion = async () => {
     const file = fs_1.default.readFileSync('package.json');
     const content = JSON.parse(file.toString());
     const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
     return currentVersion;
-});
+};
 exports.findTramvaiVersion = findTramvaiVersion;
 //# sourceMappingURL=findTramvaiVersion.js.map

package/lib/utils/commands/dependencies/findTramvaiVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"findTramvaiVersion.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/findTramvaiVersion.ts"],"names":[],"mappings":";;;;AAAA,mCAA2C;AAC3C,oDAAoB;AAEpB,MAAM,iBAAiB,GAAG,CAAC,GAAY,EAAE,EAAE;;IACzC,IAAI,GAAG,EAAE;QACP,OAAO,CAAA,MAAA,IAAA,cAAK,EAAC,GAAG,CAAC,0CAAE,OAAO,MAAI,MAAA,IAAA,mBAAU,EAAC,GAAG,CAAC,0CAAE,OAAO,CAAA,CAAC;KACxD;AACH,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,GAAS,EAAE;IAC3C,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;IAEhF,OAAO,cAAc,CAAC;AACxB,CAAC,CAAA,CAAC;AANW,QAAA,kBAAkB,sBAM7B"}
+{"version":3,"file":"findTramvaiVersion.js","sourceRoot":"","sources":["../../../../src/utils/commands/dependencies/findTramvaiVersion.ts"],"names":[],"mappings":";;;;AAAA,mCAA2C;AAC3C,oDAAoB;AAEpB,MAAM,iBAAiB,GAAG,CAAC,GAAY,EAAE,EAAE;IACzC,IAAI,GAAG,EAAE;QACP,OAAO,IAAA,cAAK,EAAC,GAAG,CAAC,EAAE,OAAO,IAAI,IAAA,mBAAU,EAAC,GAAG,CAAC,EAAE,OAAO,CAAC;KACxD;AACH,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;IAC3C,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;IAEhF,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AANW,QAAA,kBAAkB,sBAM7B"}

package/lib/utils/commands/dependencies/getLatestPackageVersion.js

@@ -4,15 +4,15 @@ exports.getLatestPackageVersion = void 0;
 const tslib_1 = require("tslib");
 const ora_1 = tslib_1.__importDefault(require("ora"));
 const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
-const getLatestPackageVersion = (packageName, version = 'latest') => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const getLatestPackageVersion = async (packageName, version = 'latest') => {
     const spinner = (0, ora_1.default)(`Resolving the highest version satifying to ${version}`).start();
     try {
-        const result = yield (0, latest_version_1.default)(packageName, { version });
+        const result = await (0, latest_version_1.default)(packageName, { version });
         return result;
     }
     finally {
         spinner.stop();
     }
-});
+};
 exports.getLatestPackageVersion = getLatestPackageVersion;
 //# sourceMappingURL=getLatestPackageVersion.js.map