@adinsure-ops/ops-cli 5.4.1 → 5.4.2-rc1

package/lib/command.base.d.ts

@@ -3,6 +3,7 @@ import SecurityContext from './security/context.js';
 export default abstract class CommandBase<T extends typeof Command> extends Command {
     protected readonly security: SecurityContext;
     private readonly childProcess;
+    private readonly _yarnVersionRegex;
     constructor(argv: string[], config: Config);
     getGitRoot(startDir?: string): Promise<string>;
     getYarnVersion(): Promise<string>;

package/lib/command.base.js

@@ -11,6 +11,7 @@ export default class CommandBase extends Command {
     constructor(argv, config) {
         super(argv, config);
         this.childProcess = new ChildProcessCommand();
+        this._yarnVersionRegex = /^\d+\.\d+\.\d+/;
         this.security = new SecurityContext(this.config.configDir);
     }
     getGitRoot(startDir) {
@@ -32,20 +33,14 @@ export default class CommandBase extends Command {
     }
     getYarnVersion() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.log(`Getting workspace yarn version`);
             const output = yield this.childProcess.runCommand(['yarn', '--version']);
-            if (output.error) {
-                ux.action.stop(`${chalk.red(output.error)}`);
+            const version = output.data.trim().split('\n')[0];
+            if (!this._yarnVersionRegex.test(version)) {
+                ux.action.stop(`${chalk.red('yarn version resolution failure')}`);
+                throw new Error(`Resolved yarn version "${version}" is not in correct format expected "${this._yarnVersionRegex.source}". Command output:\nstdout: "${output.data}",\nstderr: "${output.error}"`);
             }
-            else {
-                const version = output.data.split('\n')[0];
-                if (version) {
-                    return version;
-                }
-                else {
-                    ux.action.stop(`${chalk.red('failed getting yarn version')}`);
-                }
-            }
-            throw new Error(`Could not resolve yarn version.`);
+            return version;
         });
     }
     yarnIsBerryVersion(version) {

package/lib/commands/download/studio.js

@@ -65,9 +65,14 @@ class DownloadStudio extends CommandBase {
     installExtension(extensionPath) {
         return __awaiter(this, void 0, void 0, function* () {
             const cp = new ChildProcessCommand();
-            const commandResult = yield cp.runCommand([this.vscodeExecutable, '--install-extension', extensionPath, '--force']);
-            if (commandResult.error) {
-                this.error(`${chalk.redBright('Installing into VSCode failed!')}\n${commandResult.error}`);
+            // Success is decided by the exit code only (runCommand throws on non-zero exit).
+            // VS Code may write warnings (e.g. Node deprecation warnings) to stderr on a successful install.
+            try {
+                yield cp.runCommand([this.vscodeExecutable, '--install-extension', extensionPath, '--force']);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            catch (error) {
+                this.error(`${chalk.redBright('Installing into VSCode failed!')}\n${error.message}`);
             }
         });
     }
@@ -133,26 +138,26 @@ class DownloadStudio extends CommandBase {
                 else {
                     file = yield this.downloadFileFromGitLabRu(flags.version);
                 }
-                const writeStream = fs.createWriteStream(filePath);
-                writeStream.write(file.data, 'binary');
-                writeStream.on('finish', () => __awaiter(this, void 0, void 0, function* () {
-                    ux.action.stop(`${chalk.green('OK')}`);
-                    if (flags.install) {
-                        ux.action.start(`Installing into VSCode`, undefined, { stdout: true });
-                        yield this.installExtension(filePath);
-                        ux.action.stop(`${chalk.green('Done')}`);
-                        if (!flags.keep) {
-                            ux.action.start(`Removing VSIX file`, undefined, { stdout: true });
-                            fs.removeSync(filePath);
-                        }
+                yield fs.writeFile(filePath, file.data);
+                ux.action.stop(`${chalk.green('OK')}`);
+                if (flags.install) {
+                    ux.action.start(`Installing into VSCode`, undefined, { stdout: true });
+                    yield this.installExtension(filePath);
+                    ux.action.stop(`${chalk.green('Done')}`);
+                    if (!flags.keep) {
+                        ux.action.start(`Removing VSIX file`, undefined, { stdout: true });
+                        fs.removeSync(filePath);
                         ux.action.stop(`${chalk.green('Done')}`);
-                        this.log(`${chalk.yellow('Use \'CRTL + SHIFT + P\' and select reload windows to apply this studio version.')}`);
                     }
-                }));
-                writeStream.end();
+                    this.log(`${chalk.yellow('Use \'CRTL + SHIFT + P\' and select reload windows to apply this studio version.')}`);
+                }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
             catch (error) {
+                // Errors raised via this.error() are already formatted for oclif
+                if (error.oclif) {
+                    throw error;
+                }
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exist.', { exit: 1 });

package/oclif.manifest.json

@@ -1859,5 +1859,5 @@
       ]
     }
   },
-  "version": "5.4.1"
+  "version": "5.4.2-rc1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@adinsure-ops/ops-cli",
     "description": "Operations CLI for working with AdInsure",
-    "version": "5.4.1",
+    "version": "5.4.2-rc1",
     "author": "Adacta Digital Service Department",
     "bin": {
         "ops": "./bin/run.js"