@adinsure-ops/ops-cli 4.8.3 → 5.0.0-rc4

package/lib/commands/login.d.ts

@@ -1,17 +1,16 @@
-import { flags } from '@oclif/command';
-import CommandBase from '../command.base';
-export default class Login extends CommandBase {
+import CommandBase from '../command.base.js';
+export default class Login extends CommandBase<typeof Login> {
     static description: string;
     static usage: string;
     static examples: string[];
     static flags: {
-        servicePrincipal: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        deviceFlow: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        clientId: flags.IOptionFlag<string | undefined>;
-        secret: flags.IOptionFlag<string | undefined>;
-        npm: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        skipCI: flags.IOptionFlag<string | undefined>;
-        force: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        servicePrincipal: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        deviceFlow: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        clientId: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        secret: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        npm: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        skipCI: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static responsePageContent: string;
     private readonly npmRegistries;

package/lib/commands/login.js

@@ -1,15 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
-const chalk_1 = require("chalk");
-const fs = require("fs");
-const http = require("http");
-const open = require("open");
-const path = require("path");
-const url = require("url");
-const command_base_1 = require("../command.base");
-const npmrc_1 = require("../lib/npmrc");
-class Login extends command_base_1.default {
+import { __awaiter } from "tslib";
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+import fs from 'fs';
+import http from 'http';
+import open from 'open';
+import path from 'path';
+import url from 'url';
+import CommandBase from '../command.base.js';
+import NpmRc from '../lib/npmrc.js';
+class Login extends CommandBase {
     constructor() {
         super(...arguments);
         this.npmRegistries = [
@@ -22,97 +21,101 @@ class Login extends command_base_1.default {
      *
      * @returns [[Promise<string>]]
      */
-    async setNPM() {
-        return new Promise(async (resolve, reject) => {
-            try {
-                let npmRc = new npmrc_1.default();
-                let token;
-                token = await this.security.getNPMToken();
-                this.npmRegistries.forEach(registry => {
-                    const registryUrl = url.parse(registry);
-                    // tslint:disable-next-line: no-floating-promises
-                    npmRc.set(`//${registryUrl.hostname}${registryUrl.pathname}:_authToken`, token);
-                });
-                // tslint:disable-next-line: no-floating-promises
-                npmRc.save();
-                this.log(`${chalk_1.default.green('NPM token generated!')}`);
-                resolve();
-            }
-            catch (err) {
-                reject(err);
-            }
+    setNPM() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const npmRc = new NpmRc();
+                    const token = yield this.security.getNPMToken();
+                    for (const registry of this.npmRegistries) {
+                        const registryUrl = new url.URL(registry);
+                        npmRc.set(`//${registryUrl.hostname}${registryUrl.pathname}:_authToken`, token);
+                    }
+                    npmRc.save();
+                    this.log(`${chalk.green('NPM token generated!')}`);
+                    resolve();
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                }
+                catch (error) {
+                    reject(error);
+                }
+            }));
         });
     }
-    async run() {
-        const { flags } = this.parse(Login);
-        if (flags.force) {
-            fs.unlink(path.resolve(this.security.getTokenPath()), err => {
-                if (err) {
-                }
-                this.log(`${chalk_1.default.yellow('Note: We have launched a browser for you to login.')}`);
-            });
-        }
-        if (flags.skipCI && process.env[flags.skipCI]) {
-            if (flags.force)
-                this.error(new Error('Cannot skip login as the force login flag has been set'));
-            this.log(`${chalk_1.default.yellow('Note: skipping login because variables was set for CI')}`);
-            return;
-        }
-        if (flags.npm) {
-            try {
-                await this.setNPM();
-                return;
-            }
-            catch (_a) {
-                this.log(`${chalk_1.default.yellow('Note: Login is needed to get NPM token!')}`);
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { flags } = yield this.parse(Login);
+            if (flags.force) {
+                fs.unlink(path.resolve(this.security.getTokenPath()), () => {
+                    this.log(`${chalk.yellow('Note: We have launched a browser for you to login.')}`);
+                });
             }
-        }
-        if (flags.deviceFlow) {
-            try {
-                await this.security.acquireTokenDeviceFlow();
-                this.log(`${chalk_1.default.green('Login Successful!')}`);
+            if (flags.skipCI && process.env[flags.skipCI]) {
+                if (flags.force)
+                    this.error(new Error('Cannot skip login as the force login flag has been set'));
+                this.log(`${chalk.yellow('Note: skipping login because variables was set for CI')}`);
+                return;
             }
-            catch (err) {
-                this.error(err);
+            if (flags.npm) {
+                try {
+                    yield this.setNPM();
+                    return;
+                }
+                catch (_a) {
+                    this.log(`${chalk.yellow('Note: Login is needed to get NPM token!')}`);
+                }
             }
-        }
-        else if (flags.servicePrincipal || flags.clientId || flags.secret) {
-            this.warn(`${chalk_1.default.red('[DEPRECATED] --servicePrincipal parameter is deprecated. To use with service principal, please set environment variables AZURE_CLIENT_ID and AZURE_CLIENT_SECRET! Login is not required!')}`);
-        }
-        else {
-            this.log(`${chalk_1.default.yellow('Note: We have launched a browser for you to login.')}`);
-            let loginUrl = await this.security.getLoginUrl();
-            await open(loginUrl);
-            let server = http.createServer(async (req, res) => {
-                // First let the user know everything was OK
-                res.writeHead(200, { 'Content-Type': 'text/html' });
-                res.write(Login.responsePageContent);
-                res.end();
-                this.log(`${chalk_1.default.yellow('You have logged in successfully. Acquiring your access token...')}`);
-                // Then let's acquire an authentication token from AAD
+            if (flags.deviceFlow) {
                 try {
-                    let query = url.parse(req.url, true).query;
-                    let name = await this.security.acquireToken(query);
-                    this.log(`Hello ${name}!`);
+                    yield this.security.acquireTokenDeviceFlow();
+                    this.log(`${chalk.green('Login Successful!')}`);
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 }
-                catch (err) {
-                    this.error(err, { exit: false });
+                catch (error) {
+                    this.error(error);
                 }
-                if (flags.npm) {
+            }
+            else if (flags.servicePrincipal || flags.clientId || flags.secret) {
+                this.warn(`${chalk.red('[DEPRECATED] --servicePrincipal parameter is deprecated. To use with service principal, please set environment variables AZURE_CLIENT_ID and AZURE_CLIENT_SECRET! Login is not required!')}`);
+            }
+            else {
+                this.log(`${chalk.yellow('Note: We have launched a browser for you to login.')}`);
+                const loginUrl = yield this.security.getLoginUrl();
+                yield open(loginUrl);
+                const server = http.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
+                    // First let the user know everything was OK
+                    res.writeHead(200, { 'Content-Type': 'text/html' });
+                    res.write(Login.responsePageContent);
+                    res.end();
+                    this.log(`${chalk.yellow('You have logged in successfully. Acquiring your access token...')}`);
+                    // Then let's acquire an authentication token from AAD
                     try {
-                        await this.setNPM();
+                        const queryURL = new url.URL(req.url, 'http://localhost:3044').searchParams;
+                        const name = yield this.security.acquireToken(
+                        // eslint-disable-next-line unicorn/prefer-spread
+                        Object.fromEntries(Array.from(queryURL.entries())));
+                        this.log(`Hello ${name}!`);
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     }
-                    catch (err) {
-                        this.error(err, { exit: false });
+                    catch (error) {
+                        this.error(error, { exit: false });
                     }
-                }
-                server.close();
-            });
-            server.listen(3044);
-        }
+                    if (flags.npm) {
+                        try {
+                            yield this.setNPM();
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        }
+                        catch (error) {
+                            this.error(error, { exit: false });
+                        }
+                    }
+                    server.close();
+                }));
+                server.listen(3044);
+            }
+        });
     }
 }
-exports.default = Login;
 Login.description = 'log in to use ops services';
 Login.usage = 'login';
 Login.examples = [
@@ -122,32 +125,32 @@ Login.examples = [
     `$ ops login --deviceFlow`,
 ];
 Login.flags = {
-    servicePrincipal: command_1.flags.boolean({
+    servicePrincipal: Flags.boolean({
         description: 'authenticate using service principal credentials',
         default: false,
     }),
-    deviceFlow: command_1.flags.boolean({
+    deviceFlow: Flags.boolean({
         description: 'authenticate using device flow',
         default: false,
     }),
-    clientId: command_1.flags.string({
+    clientId: Flags.string({
         char: 'c',
         env: 'AZURE_CLIENT_ID',
         description: '[DEPRECATED] (application) client id',
     }),
-    secret: command_1.flags.string({
+    secret: Flags.string({
         char: 's',
         env: 'AZURE_CLIENT_SECRET',
         description: '[DEPRECATED] client secret',
     }),
-    npm: command_1.flags.boolean({
+    npm: Flags.boolean({
         description: 'register also for npm',
         default: false,
     }),
-    skipCI: command_1.flags.string({
+    skipCI: Flags.string({
         description: 'Skip login if environment variables is set',
     }),
-    force: command_1.flags.boolean({
+    force: Flags.boolean({
         description: 'Force a change of login token',
         default: false,
     }),
@@ -167,3 +170,4 @@ Login.responsePageContent = `
         </script>
     </body>
 </html>`;
+export default Login;

package/lib/commands/npm/check-publish.d.ts

@@ -1,15 +1,14 @@
-import { flags } from '@oclif/command';
-import CommandBase from '../../command.base';
-import { AzurePackageArray, NpmPackage } from '../../types/npm.types';
-export default class NpmCheckPublish extends CommandBase {
+import CommandBase from '../../command.base.js';
+import { AzurePackageArray, NpmPackage } from '../../types/npm.types.js';
+export default class NpmCheckPublish extends CommandBase<typeof NpmCheckPublish> {
     static description: string;
     static usage: string;
     static examples: string[];
     static flags: {
-        package: flags.IOptionFlag<string[]>;
-        exclude: flags.IOptionFlag<string[]>;
-        version: flags.IOptionFlag<string>;
-        pat: flags.IOptionFlag<string | undefined>;
+        package: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        exclude: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        version: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        pat: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     checkPackagesExists(packages: NpmPackage[], allPackages: AzurePackageArray, version: string): Promise<void>;
     run(): Promise<void>;

package/lib/commands/npm/check-publish.js

@@ -1,77 +1,82 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
-const chalk_1 = require("chalk");
-const cli_ux_1 = require("cli-ux");
-const command_base_1 = require("../../command.base");
-const npm_1 = require("../../lib/npm");
-class NpmCheckPublish extends command_base_1.default {
-    async checkPackagesExists(packages, allPackages, version) {
-        let errorCount = 0;
-        for (const pkg of packages) {
-            cli_ux_1.default.action.start(`${pkg.name}@${version}`, undefined, { stdout: true });
-            let matchedPackage = allPackages.value.find(azurePackage => azurePackage.name === pkg.name);
-            if (!matchedPackage) {
-                cli_ux_1.default.action.stop(`${chalk_1.default.red('package missing')}`);
-                errorCount++;
-                continue;
+import { __awaiter } from "tslib";
+import { Flags, ux } from '@oclif/core';
+import chalk from 'chalk';
+import CommandBase from '../../command.base.js';
+import NpmContext from '../../lib/npm.js';
+class NpmCheckPublish extends CommandBase {
+    checkPackagesExists(packages, allPackages, version) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let errorCount = 0;
+            for (const pkg of packages) {
+                ux.action.start(`${pkg.name}@${version}`, undefined, { stdout: true });
+                const matchedPackage = allPackages.value.find(azurePackage => azurePackage.name === pkg.name);
+                if (!matchedPackage) {
+                    ux.action.stop(`${chalk.red('package missing')}`);
+                    errorCount++;
+                    continue;
+                }
+                const matchVersion = matchedPackage.versions.find(azurePackageVersion => azurePackageVersion.version === version);
+                if (!matchVersion) {
+                    ux.action.stop(`${chalk.red('version missing')}`);
+                    errorCount++;
+                    continue;
+                }
+                ux.action.stop(`${chalk.green('exists')}`);
             }
-            let matchVersion = matchedPackage.versions.find(azurePackageVersion => azurePackageVersion.version === version);
-            if (!matchVersion) {
-                cli_ux_1.default.action.stop(`${chalk_1.default.red('version missing')}`);
-                errorCount++;
-                continue;
+            if (errorCount > 0) {
+                throw new Error(`${errorCount} packages or versions missing!`);
             }
-            cli_ux_1.default.action.stop(`${chalk_1.default.green('exists')}`);
-        }
-        if (errorCount > 0) {
-            throw new Error(`${errorCount} packages or versions missing!`);
-        }
+        });
     }
-    async run() {
-        try {
-            const { flags } = this.parse(NpmCheckPublish);
-            let npmContext = new npm_1.default();
-            cli_ux_1.default.action.start('Parsing packages to check', undefined, { stdout: true });
-            const packages = await npmContext.packageList(flags.package, flags.exclude, this);
-            cli_ux_1.default.action.stop(`${chalk_1.default.green('done')}`);
-            cli_ux_1.default.action.start('Getting list of available packages', undefined, { stdout: true });
-            const allPackages = JSON.parse(await npmContext.getAllNpmPackages(flags.pat));
-            cli_ux_1.default.action.stop(`${chalk_1.default.green('done')}`);
-            await this.checkPackagesExists(packages, allPackages, flags.version);
-            cli_ux_1.default.action.stop('success');
-        }
-        catch (err) {
-            cli_ux_1.default.action.stop('error');
-            this.error(`${err.message}`);
-        }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // eslint-disable-next-line unicorn/no-await-expression-member
+                const { flags } = (yield this.parse(NpmCheckPublish)).flags;
+                const npmContext = new NpmContext();
+                ux.action.start('Parsing packages to check', undefined, { stdout: true });
+                const packages = yield npmContext.packageList(this, flags.package, flags.exclude);
+                ux.action.stop(`${chalk.green('done')}`);
+                ux.action.start('Getting list of available packages', undefined, { stdout: true });
+                // eslint-disable-next-line unicorn/no-await-expression-member
+                const allPackages = JSON.parse((yield npmContext.getAllNpmPackages(flags.pat)).data);
+                ux.action.stop(`${chalk.green('done')}`);
+                yield this.checkPackagesExists(packages, allPackages, flags.version);
+                ux.action.stop('success');
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            catch (error) {
+                ux.action.stop('error');
+                this.error(`${error.message}`);
+            }
+        });
     }
 }
-exports.default = NpmCheckPublish;
 NpmCheckPublish.description = 'check if npm packages were published';
 NpmCheckPublish.usage = 'npm:check-publish [options]';
 NpmCheckPublish.examples = [
     '$ ops npm:check-publish -v 6.0.1',
     '$ ops npm:check-publish -p @adinsure/* -v 6.0.0',
-    '$ ops npm:check-publish -p @adinsure/* -x @adisure/demo -v 6.0.0'
+    '$ ops npm:check-publish -p @adinsure/* -x @adisure/demo -v 6.0.0',
 ];
 NpmCheckPublish.flags = {
-    package: command_1.flags.string({
+    package: Flags.string({
         char: 'p',
         description: 'package name filter you want to check',
-        multiple: true
+        multiple: true,
     }),
-    exclude: command_1.flags.string({
+    exclude: Flags.string({
         char: 'x',
         description: 'exclude packages from filter',
-        multiple: true
+        multiple: true,
     }),
-    version: command_1.flags.string({
+    version: Flags.string({
         char: 'v',
         description: 'version we want to check if published',
-        required: true
+        required: true,
     }),
-    pat: command_1.flags.string({
-        description: 'PAT token or AZURE_DEVOPS_EXT_PAT environment variable'
+    pat: Flags.string({
+        description: 'PAT token or AZURE_DEVOPS_EXT_PAT environment variable',
     }),
 };
+export default NpmCheckPublish;

package/lib/commands/npm/dependency-update.d.ts

@@ -1,23 +1,25 @@
-import { flags } from '@oclif/command';
-import CommandBase from '../../command.base';
-import { NpmPackage } from '../../types/npm.types';
-export default class NpmDependencyUpdate extends CommandBase {
+import CommandBase from '../../command.base.js';
+import { NpmPackage } from '../../types/npm.types.js';
+export default class NpmDependencyUpdate extends CommandBase<typeof NpmDependencyUpdate> {
     static description: string;
     static usage: string;
     static examples: string[];
     static args: {
-        name: string;
-        required: boolean;
-        description: string;
-    }[];
+        version: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+    };
     static flags: {
-        filter: flags.IOptionFlag<string[]>;
-        exclude: flags.IOptionFlag<string[]>;
-        force: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        filter: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        exclude: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     /**
      * Update dependencies in package.json files for @adinsure packages
+     * @param {string} newVersion New version to update to
+     * @param {NpmPackage[]} packages Packages to update
+     * @param {boolean} [force=false] Force the update
+     * @param {string[]} filter Regular expressions filter for packages
+     * @returns {Prmoise<void>} Void Promise
      */
-    updateDependencies(newVersion: string, filter: string[] | undefined, packages: NpmPackage[], force?: boolean): Promise<void>;
+    updateDependencies(newVersion: string, packages: NpmPackage[], force?: boolean, filter?: string[]): Promise<void>;
     run(): Promise<undefined>;
 }