@adinsure-ops/ops-cli 5.3.2 → 5.4.0-rc5

package/lib/command.base.d.ts

@@ -2,8 +2,11 @@ import { Command, Config } from '@oclif/core';
 import SecurityContext from './security/context.js';
 export default abstract class CommandBase<T extends typeof Command> extends Command {
     protected readonly security: SecurityContext;
+    private readonly childProcess;
     constructor(argv: string[], config: Config);
     getGitRoot(startDir?: string): Promise<string>;
+    getYarnVersion(): Promise<string>;
+    yarnIsBerryVersion(version: string): boolean;
     getVersion(versionFile?: string, ...filesToCheck: string[]): Promise<string>;
     /**
      * Resolve path to Changelog folder from current execution directory

package/lib/command.base.js

@@ -1,14 +1,16 @@
 import { __awaiter } from "tslib";
-import { Command } from '@oclif/core';
+import { Command, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
 import SecurityContext from './security/context.js';
+import ChildProcessCommand from './lib/command.js';
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 export default class CommandBase extends Command {
     constructor(argv, config) {
         super(argv, config);
+        this.childProcess = new ChildProcessCommand();
         this.security = new SecurityContext(this.config.configDir);
     }
     getGitRoot(startDir) {
@@ -28,6 +30,27 @@ export default class CommandBase extends Command {
             }
         });
     }
+    getYarnVersion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const output = yield this.childProcess.runCommand(['yarn', '--version']);
+            if (output.error) {
+                ux.action.stop(`${chalk.red(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.`);
+        });
+    }
+    yarnIsBerryVersion(version) {
+        return version.startsWith('v4');
+    }
     getVersion() {
         return __awaiter(this, arguments, void 0, function* (versionFile = 'VERSION', ...filesToCheck) {
             filesToCheck.unshift(versionFile);

package/lib/commands/doctor.d.ts

@@ -10,6 +10,7 @@ export default class Doctor extends CommandBase<typeof Doctor> {
     private nvm;
     private yarn;
     private node;
+    private corepack;
     private missingPackages;
     /**
      * Check if Git is installed
@@ -43,7 +44,13 @@ export default class Doctor extends CommandBase<typeof Doctor> {
      */
     yarnCheck(fix: boolean): Promise<void>;
     /**
-     * Check which yarn is installed
+     * Check corepack is installed
+     * @param {boolean} fix Try to install yarn if found missing
+     * @returns {void}
+     */
+    corepackCheck(fix: boolean): Promise<void>;
+    /**
+     * Install yarn via corepack.
      * @returns {void}
      */
     yarnInstall(): Promise<void>;

package/lib/commands/doctor.js

@@ -11,6 +11,7 @@ class Doctor extends CommandBase {
         this.nvm = false;
         this.yarn = false;
         this.node = false;
+        this.corepack = false;
         this.missingPackages = 0;
     }
     /**
@@ -137,6 +138,7 @@ class Doctor extends CommandBase {
                         ux.action.stop(`${chalk.green(version)}`);
                         this.node = true;
                         // only check yarn if node is installed
+                        yield this.corepackCheck(fix);
                         yield this.yarnCheck(fix);
                     }
                     else {
@@ -217,14 +219,52 @@ class Doctor extends CommandBase {
         });
     }
     /**
-     * Check which yarn is installed
+     * Check corepack is installed
+     * @param {boolean} fix Try to install yarn if found missing
+     * @returns {void}
+     */
+    corepackCheck(fix) {
+        return __awaiter(this, void 0, void 0, function* () {
+            ux.action.start('Checking corepack', undefined, { stdout: true });
+            try {
+                const output = yield this.cp.runCommand(['corepack', '--version']);
+                if (output.error) {
+                    ux.action.stop(`${chalk.red(output.error)}`);
+                }
+                else {
+                    const version = output.data.split('\n')[0];
+                    if (version) {
+                        this.corepack = true;
+                        ux.action.stop(`${chalk.green(version)}`);
+                    }
+                    else {
+                        ux.action.stop(`${chalk.red('corepack is missing')}`);
+                    }
+                }
+            }
+            catch (_a) {
+                this.missingPackages++;
+                ux.action.stop(`${chalk.red('corepack is missing')}`);
+                if (fix) {
+                    yield this.yarnInstall();
+                }
+            }
+        });
+    }
+    /**
+     * Install yarn via corepack.
      * @returns {void}
      */
     yarnInstall() {
         return __awaiter(this, void 0, void 0, function* () {
             ux.action.start('Install yarn', undefined, { stdout: true });
             try {
-                const output = yield this.cp.runCommand(['npm', '-g', 'install', 'yarn']);
+                const output = yield this.cp.runCommand([
+                    'npm',
+                    '-g',
+                    'install',
+                    'corepack',
+                ]);
                 if (output.error) {
                     ux.action.stop(`${chalk.red(output.error)}`);
                 }

package/lib/commands/download/studio.d.ts

@@ -15,6 +15,7 @@ export default class DownloadStudio extends CommandBase<typeof DownloadStudio> {
     };
     private readonly url_azure;
     private readonly url_gitlabru;
+    private get vscodeExecutable();
     /**
      * Get unique AdInsure Studio vsix zip by specified version
      * @param {string} version The version of AdInsure Studio vsix

package/lib/commands/download/studio.js

@@ -14,6 +14,19 @@ class DownloadStudio extends CommandBase {
         this.url_azure = 'https://ops.adinsure.com/api/storage/extensions/';
         this.url_gitlabru = 'https://gitlabru.adacta-fintech.ru/api/v4/projects/2/packages/generic';
     }
+    get vscodeExecutable() {
+        if (process.platform === 'win32') {
+            const pathEnv = process.env.PATH || process.env.Path;
+            if (pathEnv) {
+                for (const dir of pathEnv.split(path.delimiter)) {
+                    if (fs.existsSync(path.join(dir, 'code.cmd'))) {
+                        return 'code.cmd';
+                    }
+                }
+            }
+        }
+        return 'code';
+    }
     /**
      * Get unique AdInsure Studio vsix zip by specified version
      * @param {string} version The version of AdInsure Studio vsix
@@ -52,7 +65,7 @@ class DownloadStudio extends CommandBase {
     installExtension(extensionPath) {
         return __awaiter(this, void 0, void 0, function* () {
             const cp = new ChildProcessCommand();
-            const commandResult = yield cp.runCommand(['code.cmd', '--install-extension', extensionPath, '--force']);
+            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}`);
             }
@@ -65,7 +78,7 @@ class DownloadStudio extends CommandBase {
                 return false;
             }
             const cp = new ChildProcessCommand();
-            const result = yield cp.runCommand(['code.cmd', '--list-extensions', '--show-versions']);
+            const result = yield cp.runCommand([this.vscodeExecutable, '--list-extensions', '--show-versions']);
             return (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.includes(studioVersion);
         });
     }

package/lib/commands/npm/dependency-update.js

@@ -85,8 +85,17 @@ class NpmDependencyUpdate extends CommandBase {
             const packages = yield npmContext.packageList(this);
             try {
                 yield this.updateDependencies(newVersion, packages, flags.force, flags.filter);
-                ux.action.start(`running 'yarn install'`, undefined, { stdout: true });
-                yield command.runCommand(['yarn', 'install']);
+                ux.action.start(`running 'yarn install'`, undefined, {
+                    stdout: true,
+                });
+                const yarnVersion = yield this.getYarnVersion();
+                if (this.yarnIsBerryVersion(yarnVersion)) {
+                    yield command.runCommand(['yarn', 'install', '--mode=update-lockfile']);
+                    yield command.runCommand(['yarn', 'install', '--immutable']);
+                }
+                else {
+                    yield command.runCommand(['yarn', 'install']);
+                }
                 ux.action.stop(`${chalk.green('done')}`);
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }

package/oclif.manifest.json

@@ -1859,5 +1859,5 @@
       ]
     }
   },
-  "version": "5.3.2"
+  "version": "5.4.0-rc5"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@adinsure-ops/ops-cli",
     "description": "Operations CLI for working with AdInsure",
-    "version": "5.3.2",
+    "version": "5.4.0-rc5",
     "author": "Adacta Digital Service Department",
     "bin": {
         "ops": "./bin/run.js"
@@ -70,10 +70,10 @@
         "typescript-eslint": "^7.9.0"
     },
     "peerDependencies": {
-        "@types/node": "^20.5.7"
+        "@types/node": "^24.0.0"
     },
     "engines": {
-        "node": ">=18"
+        "node": ">=20"
     },
     "files": [
         "/bin",
@@ -100,6 +100,14 @@
             "@oclif/plugin-not-found",
             "@oclif/plugin-warn-if-update-available"
         ],
+        "update": {
+            "node": {
+                "targets": [
+                    "linux-x64",
+                    "linux-arm64"
+                ]
+            }
+        },
         "topics": {
             "download": {
                 "description": "download AdInsure platform bundle zip from Azure storage. Use download:[client, identity-server, scheduler, server, signalr, studio] for individual components"