@adinsure-ops/ops-cli 5.0.8 → 5.0.10-rc1

package/CHANGELOGS.md

@@ -1,5 +1,10 @@
 # Changelogs
 
+## 5.0.9: 2023-01-03
+
+- ops-cli sql command is now case insensitive
+- LJADIRDSUP-12244: axios already returns json and doesn't need to be parsed again
+
 ## 5.0.8: 2023-12-22
 
 - gitlab:get-nightly-tag command request is fixed since the parameters in the HTTP header were misconfigured

package/lib/command.base.js

@@ -1,9 +1,9 @@
 import { __awaiter } from "tslib";
 import { Command } from '@oclif/core';
+import axios from 'axios';
+import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
-import chalk from 'chalk';
-import axios from 'axios';
 import SecurityContext from './security/context.js';
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 export default class CommandBase extends Command {

package/lib/commands/download/client.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 class DownloadClient extends CommandBase {
     constructor() {
@@ -53,11 +53,9 @@ class DownloadClient extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

package/lib/commands/download/identity-server.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 class DownloadIdentityServer extends CommandBase {
     constructor() {
@@ -53,11 +53,9 @@ class DownloadIdentityServer extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

package/lib/commands/download/jmeter.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 class DownloadJmeter extends CommandBase {
     constructor() {
@@ -48,11 +48,9 @@ class DownloadJmeter extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

package/lib/commands/download/keycloak-scim.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 class DownloadKeycloak extends CommandBase {
     constructor() {
@@ -48,11 +48,9 @@ class DownloadKeycloak extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

package/lib/commands/download/platform.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 class DownloadPlatform extends CommandBase {
     constructor() {
@@ -53,11 +53,9 @@ class DownloadPlatform extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

package/lib/commands/download/scheduler.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 class DownloadScheduler extends CommandBase {
     constructor() {
@@ -53,11 +53,9 @@ class DownloadScheduler extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

package/lib/commands/download/server.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 class DownloadServer extends CommandBase {
     constructor() {
@@ -53,11 +53,9 @@ class DownloadServer extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

package/lib/commands/download/signalr.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 class DownloadSignalrServer extends CommandBase {
     constructor() {
@@ -53,11 +53,9 @@ class DownloadSignalrServer extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

package/lib/commands/download/studio.js

@@ -3,8 +3,8 @@ import { Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';
 import os from 'os';
+import path from 'path';
 import CommandBase from '../../command.base.js';
 import ChildProcessCommand from '../../lib/command.js';
 class DownloadStudio extends CommandBase {
@@ -103,11 +103,9 @@ class DownloadStudio extends CommandBase {
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exists.', { exit: 1 });
-                        break;
                     }
                     case 400: {
                         this.error('Try refreshing your login credentials with "ops login".', { exit: 1 });
-                        break;
                     }
                     default: {
                         this.error(error.message);

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

@@ -43,7 +43,7 @@ class NpmCheckPublish extends CommandBase {
                 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);
+                const allPackages = (yield npmContext.getAllNpmPackages(flags.pat)).data;
                 ux.action.stop(`${chalk.green('done')}`);
                 yield this.checkPackagesExists(packages, allPackages, flags.version);
                 ux.action.stop('success');

package/lib/commands/npm/publish.js

@@ -151,7 +151,7 @@ class NpmPublish extends CommandBase {
                 ux.action.stop(`${chalk.green('done')}`);
                 ux.action.start('Getting list of published packages', undefined, { stdout: true });
                 // eslint-disable-next-line unicorn/no-await-expression-member
-                const allPackages = JSON.parse((yield npmContext.getAllNpmPackages(flags.pat)).data);
+                const allPackages = (yield npmContext.getAllNpmPackages(flags.pat)).data;
                 ux.action.stop(`${chalk.green('done')}`);
                 yield this.publishPackages(packages, allPackages, flags.version, flags.retry);
                 ux.action.stop('success');

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

@@ -3,8 +3,8 @@ import { Args, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import semver from 'semver';
-import NugetContext from '../../lib/nuget.js';
 import CommandBase from '../../command.base.js';
+import NugetContext from '../../lib/nuget.js';
 class NuGetDependencyUpdate extends CommandBase {
     /**
      * Update dependencies in csproj files for @adinsure packages

package/lib/commands/prepare-content.js

@@ -170,9 +170,7 @@ class PrepareContent extends CommandBase {
                 throw new Error(error.message);
             }
             const lines = fileContent.split(/\r?\n/).filter(line => line.length > 0);
-            const lineParse = lines.map(line => {
-                return this.parseDotfileLine(line.trim(), sourceDirectory);
-            });
+            const lineParse = lines.map(line => this.parseDotfileLine(line.trim(), sourceDirectory));
             const parsedLines = Promise.all(lineParse).then(lines => lines.filter(line => line.prefix !== '#'));
             return parsedLines;
         });
@@ -230,9 +228,7 @@ class PrepareContent extends CommandBase {
     }
     prepareTransformations(linesData, baseSourceDir, baseDestinationDir) {
         return __awaiter(this, void 0, void 0, function* () {
-            const transformations = linesData.map(line => {
-                return this.getTransformation(line, baseSourceDir, baseDestinationDir);
-            });
+            const transformations = linesData.map(line => this.getTransformation(line, baseSourceDir, baseDestinationDir));
             return Promise.all(transformations);
         });
     }

package/lib/commands/sql.js

@@ -8,6 +8,7 @@ import _ from 'lodash-es';
 import path from 'path';
 import semver from 'semver';
 import CommandBase from '../command.base.js';
+import { capitalizeFirstLetter } from '../lib/helper.js';
 class Sql extends CommandBase {
     constructor() {
         super(...arguments);
@@ -55,12 +56,9 @@ class Sql extends CommandBase {
                 ('0' + (date.getUTCSeconds())).slice(-2);
             const versionSplit = version.split('.');
             let scriptId = prefix +
-                '_' +
-                ('00' + versionSplit[0]).slice(-3) +
-                '.' +
-                ('00' + versionSplit[1]).slice(-3) +
-                '.' +
-                ('00' + versionSplit[2]).slice(-3) +
+                '_' + ('00' + versionSplit[0]).slice(-3) +
+                '.' + ('00' + versionSplit[1]).slice(-3) +
+                '.' + ('00' + versionSplit[2]).slice(-3) +
                 '_' + timestamp;
             if (description) {
                 scriptId = scriptId + '_' + _.snakeCase(description).slice(0, 100);
@@ -185,7 +183,6 @@ end;`;
             }
             // Validation of input parameters
             let scriptType = args.type;
-            console.log(scriptType);
             if (!scriptType) {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const responses = yield inquirer.prompt([{
@@ -196,8 +193,7 @@ end;`;
                     }]);
                 scriptType = responses.type;
             }
-            if (scriptType === 'Migration')
-                scriptType = scriptType.toLowerCase();
+            scriptType = scriptType === 'Migration' ? scriptType.toLowerCase() : capitalizeFirstLetter(scriptType);
             let scriptModule = args.module;
             if (!scriptModule && scriptType === 'data') {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/lib/commands/translate.js

@@ -32,7 +32,7 @@ class Translate extends CommandBase {
                     'Content-Type': this.getFormat(format),
                 },
                 responseType: 'arraybuffer',
-                params: Object.assign({ languages: languages }, (modules && { modules: modules })),
+                params: Object.assign({ languages }, (modules && { modules })),
             };
             try {
                 return (yield axios.get(`https://dictionary.adinsure.com/api/Translations`, requestOptions));

package/lib/commands/version.js

@@ -1,13 +1,13 @@
 import { __awaiter } from "tslib";
-import { Flags, Args, ux } from '@oclif/core';
+import { Args, Flags, ux } from '@oclif/core';
 import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import { globby } from 'globby';
 import moment from 'moment';
 import path from 'path';
-import semver from 'semver';
 import replaceInFile from 'replace-in-file';
+import semver from 'semver';
 import CommandBase from '../command.base.js';
 class Version extends CommandBase {
     /**
@@ -76,15 +76,12 @@ class Version extends CommandBase {
     validateOptions(args, flags) {
         if (args.type !== 'new' && flags.version) {
             this.error(`${chalk.red('Version flag can only be used with new type')}`, { exit: 2 });
-            return false;
         }
         if (args.type === 'new' && !flags.version) {
             this.error(`${chalk.red('Version flag is required with new type')}`, { exit: 2 });
-            return false;
         }
         if (args.type === 'new' && flags.increment) {
             this.error(`${chalk.red('Increment flag not supported with new type')}`, { exit: 2 });
-            return false;
         }
         return true;
     }
@@ -133,7 +130,6 @@ class Version extends CommandBase {
                     switch (error.response.status) {
                         case 401: {
                             this.error(`${chalk.red('You don\'t have permissions. If this was intentional command, please contact Operations for permissions, do git reset and rerun command.')}`);
-                            break;
                         }
                         default: {
                             this.error(`${chalk.red(error)}`);

package/lib/security/context.js

@@ -87,7 +87,7 @@ export default class SecurityContext {
                         scopes: [this.resource + '/.default', 'offline_access'],
                     }).then(response => {
                         if (response) {
-                            const accessToken = response.accessToken;
+                            const { accessToken } = response;
                             resolve(accessToken);
                         }
                         else {
@@ -116,7 +116,7 @@ export default class SecurityContext {
                             scopes: [this.resource + '/.default'],
                         }).then(response => {
                             if (response) {
-                                const accessToken = response.accessToken;
+                                const { accessToken } = response;
                                 resolve(accessToken);
                             }
                             else {
@@ -131,7 +131,7 @@ export default class SecurityContext {
                             scopes: [this.resource + '/.default', 'offline_access'],
                         }).then(response => {
                             if (response) {
-                                const accessToken = response.accessToken;
+                                const { accessToken } = response;
                                 resolve(accessToken);
                             }
                             else {
@@ -185,7 +185,7 @@ export default class SecurityContext {
     acquireTokenDeviceFlow() {
         return new Promise((resolve, reject) => {
             this._pca.acquireTokenByDeviceCode({
-                deviceCodeCallback: response => {
+                deviceCodeCallback(response) {
                     if (response.message) {
                         // tslint:disable-next-line: no-console
                         console.log(response.message);

package/lib/types/changelog.types.d.ts

@@ -1,6 +1,6 @@
 export interface ChangelogEntry {
-    type: string;
-    issue: string;
     component: string;
     content: string;
+    issue: string;
+    type: string;
 }

package/lib/types/npm.types.d.ts

@@ -4,31 +4,31 @@ export type AzurePackageArray = {
 };
 export type AzurePackage = {
     id: string;
-    normalizedName: string;
     name: string;
+    normalizedName: string;
     protocolType: string;
     url: string;
     versions: AzurePackageVersion[];
 };
 export type AzurePackageVersion = {
     id: string;
-    normalizedVersion: string;
-    version: string;
     isLatest: boolean;
     isListed: boolean;
+    normalizedVersion: string;
+    publishDate: string;
     storageId: string;
+    version: string;
     views: AzurePackageView[];
-    publishDate: string;
 };
 export type AzurePackageView = {
     id: string;
     name: string;
-    url: string;
     type: boolean;
+    url: string;
 };
 export type NpmPackage = {
+    jsonPath: string;
     name: string;
-    version: string;
     path: string;
-    jsonPath: string;
+    version: string;
 };

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.0.8",
+  "version": "5.0.10-rc1",
   "commands": {
     "doctor": {
       "id": "doctor",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@adinsure-ops/ops-cli",
     "description": "Operations CLI for working with AdInsure",
-    "version": "5.0.8",
+    "version": "5.0.10-rc1",
     "author": "Adacta Digital Service Department",
     "bin": {
         "ops": "./bin/run.js"
@@ -32,7 +32,6 @@
         "semver": "^7.5.4",
         "tough-cookie": "^4.1.3",
         "tslib": "^2.6.2",
-        "typescript": "^5.2.2",
         "yaml": "^2.3.1"
     },
     "devDependencies": {
@@ -68,7 +67,8 @@
         "sinon": "^15.1.0",
         "timekeeper": "^2.2.0",
         "ts-mockito": "^2.6.1",
-        "ts-node": "^10.9.1"
+        "ts-node": "^10.9.1",
+        "typescript": "^5.2.2"
     },
     "peerDependencies": {
         "@types/node": "^20.5.7"
@@ -121,7 +121,7 @@
         "test-with-coverage": "nyc --require ts-node/register --extension .ts mocha --reporter=doc --timeout 20000 --forbid-only \"test/**/*.test.ts\"",
         "test-single": "nyc --require ts-node/register --extension .ts mocha --timeout 20000 --forbid-only",
         "test-single-with-coverage": "nyc --require ts-node/register --extension .ts mocha --reporter=doc --timeout 20000 --forbid-only",
-        "eslint": "eslint ./src ./test --ext .ts --config .eslintrc"
+        "eslint": "eslint --quiet ./src ./test --ext .ts --config .eslintrc"
     },
     "types": "lib/index.d.ts"
 }