@adinsure-ops/ops-cli 5.1.2 → 5.2.0

package/lib/commands/sql.d.ts

@@ -20,7 +20,7 @@ export default class Sql extends CommandBase<typeof Sql> {
         'column-type': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     private readonly _moduleTypes;
-    private readonly _dbmsType;
+    private _dbmsTypes;
     /**
      * Get unique Script ID zip by specified version
      * @param {string} version The version of Identity Server
@@ -37,6 +37,7 @@ export default class Sql extends CommandBase<typeof Sql> {
     handleLayer(scriptDbmsFolder: string, scriptLayer: string, scriptType: string, dbmsFormat: string): Promise<string>;
     sqlExtendScriptGeneration(tableSchema: string | undefined, tableName: string | undefined, columnName: string | undefined, columnType: string | undefined): Promise<string>;
     oradcExtendScriptGeneration(tableSchema: string | undefined, tableName: string | undefined, columnName: string | undefined, columnType: string | undefined): Promise<string>;
+    postgresExtendScriptGeneration(tableSchema: string | undefined, tableName: string | undefined, columnName: string | undefined, columnType: string | undefined): Promise<string>;
     checkExtendParameters(): Promise<string[]>;
     run(): Promise<void>;
 }

package/lib/commands/sql.js

@@ -21,7 +21,23 @@ class Sql extends CommandBase {
             reins: 'Reinsurance',
             shared: 'Shared',
         };
-        this._dbmsType = ['sql', 'oradc'];
+        this._dbmsTypes = [
+            {
+                name: 'sql',
+                scriptLocation: undefined,
+                extendGenerator: this.sqlExtendScriptGeneration
+            },
+            {
+                name: 'oradc',
+                scriptLocation: undefined,
+                extendGenerator: this.oradcExtendScriptGeneration
+            },
+            {
+                name: 'postgres',
+                scriptLocation: undefined,
+                extendGenerator: this.postgresExtendScriptGeneration
+            }
+        ];
     }
     /**
      * Get unique Script ID zip by specified version
@@ -122,12 +138,19 @@ BEGIN
 end;`;
         });
     }
+    postgresExtendScriptGeneration(tableSchema, tableName, columnName, columnType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return `ALTER TABLE IF EXISTS ${tableSchema}.${tableName}
+ADD COLUMN IF NOT EXISTS ${columnName} ${columnType};
+`;
+        });
+    }
     checkExtendParameters() {
         return __awaiter(this, void 0, void 0, function* () {
             const { flags } = yield this.parse(Sql);
             const arrayOfParameters = [];
             if (flags['table-schema'] === undefined) {
-                arrayOfParameters.push('table-scehma');
+                arrayOfParameters.push('table-schema');
             }
             if (flags['table-name'] === undefined) {
                 arrayOfParameters.push('table-name');
@@ -218,13 +241,12 @@ end;`;
             if (!(yield fs.pathExists(scriptsRootFolder))) {
                 this.error(`Could not resolve database scripts folder: ${scriptsRootFolder}`);
             }
-            const scriptFolderLocations = [];
-            for (const dbmsFormat of this._dbmsType) {
-                const scriptDbmsFolder = path.resolve(scriptsRootFolder, dbmsFormat);
+            for (const dbmsFormat of this._dbmsTypes) {
+                const scriptDbmsFolder = path.resolve(scriptsRootFolder, dbmsFormat.name);
                 if (yield fs.pathExists(scriptDbmsFolder)) {
                     let scriptFolder = path.resolve(scriptDbmsFolder, scriptType);
                     if (scriptLayer !== undefined) {
-                        scriptFolder = yield this.handleLayer(scriptDbmsFolder, scriptLayer, scriptType, dbmsFormat);
+                        scriptFolder = yield this.handleLayer(scriptDbmsFolder, scriptLayer, scriptType, dbmsFormat.name);
                     }
                     if (scriptModule !== undefined) {
                         scriptFolder = path.resolve(scriptFolder, this._moduleTypes[scriptModule]);
@@ -233,7 +255,7 @@ end;`;
                         this.warn(`Could not resolve existing database scripts folder. Creating folder: ${scriptFolder}`);
                         yield fs.mkdir(scriptFolder);
                     }
-                    scriptFolderLocations.push(scriptFolder);
+                    dbmsFormat.scriptLocation = scriptFolder;
                 }
             }
             // Validation of parameters succeed. Requesting new SQL script ID and creating file.
@@ -247,27 +269,12 @@ end;`;
                 scriptId = (yield this.getScriptId(version.version)).data;
                 this.log(`Got: '${chalk.green(scriptId)}'`);
             }
-            // Check if the operation is Extend
-            if (scriptType === 'Extend') {
-                // The first file will always be in \sql\ folder for mssql
-                // and the second one will always be in \oradc\ for oracle db
-                let sqlOrOradc = 0;
-                for (const scriptFolder of scriptFolderLocations) {
-                    const scriptsFilePath = path.resolve(scriptFolder, `${scriptId}.sql`);
-                    // The values in flags such as table-schema, which are passed into the sql generation function can never be undefined as they
-                    // are checked prior to executing this code, so the functions are defined in a way where they can intake an undefined parameter
-                    // only due to typescript.
-                    yield (sqlOrOradc ? fs.writeFile(scriptsFilePath, yield this.oradcExtendScriptGeneration(flags['table-schema'], flags['table-name'], flags['column-name'], flags['column-type'])) : fs.writeFile(scriptsFilePath, yield this.sqlExtendScriptGeneration(flags['table-schema'], flags['table-name'], flags['column-name'], flags['column-type'])));
-                    this.log(`${chalk.yellow(scriptsFilePath)}`);
-                    sqlOrOradc++;
-                }
-            }
-            else {
-                for (const scriptFolder of scriptFolderLocations) {
-                    const scriptsFilePath = path.resolve(scriptFolder, `${scriptId}.sql`);
-                    yield fs.writeFile(scriptsFilePath, '');
-                    this.log(`${chalk.yellow(scriptsFilePath)}`);
-                }
+            const usedDbmsTypes = this._dbmsTypes.filter(it => it.scriptLocation !== undefined);
+            for (const usedDbmsType of usedDbmsTypes) {
+                const scriptsFilePath = path.resolve(usedDbmsType.scriptLocation, `${scriptId}.sql`);
+                const content = scriptType === 'Extend' ? yield usedDbmsType.extendGenerator(flags['table-schema'], flags['table-name'], flags['column-name'], flags['column-type']) : '';
+                yield fs.writeFile(scriptsFilePath, content);
+                this.log(`${chalk.yellow(scriptsFilePath)}`);
             }
         });
     }

package/lib/commands/version.js

@@ -23,7 +23,7 @@ class Version extends CommandBase {
             const currentPrereleaseDate = moment().format('YYYYMM');
             const bumpedPackageName = [];
             // Find all package.json files that are not in node modules
-            const searchPattern = ['**/package.json', '!**/node_modules'];
+            const searchPattern = ['**/package.json', '.**/package.json', '!**/node_modules'];
             if (excludeDirs) {
                 for (const exclude of excludeDirs) {
                     searchPattern.push(`!${exclude}`);
@@ -94,7 +94,7 @@ class Version extends CommandBase {
     updateDependencies(version, updatedPackages) {
         return __awaiter(this, void 0, void 0, function* () {
             // Find all package.json files that are not in node modules
-            const paths = yield globby(['**/package.json', '!**/node_modules']);
+            const paths = yield globby(['**/package.json', '.**/package.json', '!**/node_modules']);
             for (const path of paths) {
                 for (const packageName of updatedPackages) {
                     const re = new RegExp('"' + packageName + '": "\\d+\\.\\d+\\..*"', 'g');

package/lib/lib/npm.js

@@ -37,10 +37,10 @@ export default class NpmContext {
         return __awaiter(this, arguments, void 0, function* (context, packages = ['**/*'], excludes = ['']) {
             try {
                 const workspaces = yield this.getWorkspaces();
-                let searchPattern = ['package.json', '**/package.json', '!**/node_modules'];
+                let searchPattern = ['package.json', '**/package.json', '.**/package.json', '!**/node_modules'];
                 const pkgs = [];
                 if (workspaces.length > 0) {
-                    searchPattern = [...workspaces, 'package.json', '!**/node_modules'];
+                    searchPattern = [...workspaces, 'package.json', '.*/package.json', '!**/node_modules'];
                 }
                 const pkgPaths = yield globby(searchPattern);
                 for (const pkgPath of pkgPaths) {

package/oclif.manifest.json

@@ -1589,5 +1589,5 @@
       ]
     }
   },
-  "version": "5.1.2"
+  "version": "5.2.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@adinsure-ops/ops-cli",
     "description": "Operations CLI for working with AdInsure",
-    "version": "5.1.2",
+    "version": "5.2.0",
     "author": "Adacta Digital Service Department",
     "bin": {
         "ops": "./bin/run.js"
@@ -123,4 +123,4 @@
         "eslint": "eslint --quiet --config .eslint.config.js --fix"
     },
     "types": "lib/index.d.ts"
-}
+}

package/CHANGELOGS.md

@@ -1,198 +0,0 @@
-# Changelogs
-
-## 5.1.2: 2024-07-04
-
-- LJADIRD-43932: updated all core (oclif) and non-core dependencies
-- LJADIRDSUP-15178: added acquiring token by refreshToken functionality into security context
-- LJADIRD-47453: updated create-nightly-tag regex to match correct versions and create new tag
-
-## 5.1.1: 2024-05-13
-
-- LJADIRD-46524: added more verbose output to the security context when aquiring token
-
-## 5.1.0: 2024-03-29
-
-- LJADIRDSUP-13830: added verbose error output when downloading studio and installing the plugin into the VSCode
-- LJADIRD-45744: removed Node.js v16 support, only supporting Node.js >=18
-
-## 5.0.11: 2024-03-26
-
-- LJADIRD-45711: updated regex for matching tags in the gitlab:next-nightly-tag command
-
-## 5.0.10: 2024-03-20
-
-- LJADIRDSUP-13469: added gurads for checking if the npmrc file being read is a directory
-
-## 5.0.9: 2024-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
-
-## 5.0.7: 2023-12-18
-
-- Sql command can now accept aruguments in lowercase as well as with a capital first letter
-- Bugfix: sql path will now stop capitalizing the extend, migration, data and schema directory
-
-## 5.0.6: 2023-12-14
-
-- Node 16 support added
-
-## 5.0.5: 2023-11-20
-
-- Fixed the ops-cli releasing cycle as a few minor releases were not uploaded to npm.js
-
-## 5.0.4: 2023-09-27
-
-- Fixed version command's post request, where the headers were actually stored in the body
-
-## 5.0.3: 2023-09-25
-
-- Updated node engine support to also include 20.x and deprecated the use of 14.x
-
-## 5.0.2: 2023-09-14
-
-- Fixed download commands and their output flag
-- Fixed translate command to have correct url in the get request
-
-## 5.0.1: 2023-09-12
-
-- Updated ops-cli to the stable version 5.x
-- Prepare-content command is back! But with a differenct syntax than before, so check the README
-- Faster performance and updated dependencies
-
-## 5.0.0: 2023-09-08
-
-- Added --description flag to the log command. It accepts the description of the changelog which will be used
-- Added --force flag to the log command. It creates folder structure if missing
-- Added --keep flag to the download:studio command
-- Bugfixes
-- Security patching: the project was migrated to a new oclif framework from the old one
-- Performace tuning
-- [DEPRECATED] Deprecation and removal of the prepare-content command
-- [REMOVED] `--servicePrincipal` login is no longer available or required. 'AZURE_CLIENT_ID' and 'AZURE_CLIENT_SECRET' environment variables are required with every command in order to use service principal.
-
-## 4.8.3: 2023-08-22
-
-- Bugfixes; sql command was fixed so that even when Extend was not used it required its parameters
-- Security patches in library dependencies
-
-## 4.8.2: 2023-07-28
-
-- Sql command can now generate a template for mssql and oracle, for extending an sql table with a column
-
-## 4.8.1: 2023-06-01
-
-- Added --force option to login command, to forcefully replace the old auth token
-- Added --retry option to publush command, to retry publishing a package multiple times in case of 4xx or 5xx http errors
-
-## 4.8.0: 2023-05-01
-
-- VERSION files now don't need to be trimmed (they can have leading or trailing whitespace characters) in order for commands to read it properly
-- Added two new commands (usage in README file):
-  - download:jmeter-examples
-  - download:keycloak-scim
-
-## 4.7.0: 2023-03-22
-
-- Fixed bug in `download:studio` when flag `-i` was always required in case we used `-o` flag
-- Download of signalr is now also supported
-- Improved description for download topic, it now displays information on downloading individual components
-- Update command is no longer supported. Instead the update available warning provides information on available update options
-
-## 4.6.0: 2023-02-15
-
-- Doctor no longer checks for `vsts-npm-auth` package
-- When installing studio you can pass parameter `s` to skip installation in case the selected version is already installed
-
-## 4.5.2: 2023-01-12
-
-- Limit description length for sql scripts
-
-## 4.5.1: 2022-12-13
-
-- Fixed release version for windows and linux packages
-
-## 4.5.0: 2022-10-05
-
-- Add `--major` flag for sql script generation
-- Add `SQL_SCRIPT_VERSION` to force script generation
-
-## 4.4.0: 2022-10-03
-
-- Added parameters for offline sql script creation
-- Ability to recover from prerelease tag when creating db scripts
-
-## 4.3.0: 2022-07-27
-
-- Added command `npm:dependency-update` to update dependencies on packages in workspace defined by filter
-- Added command `nuget:dependency-update` to update dependencies on packages in workspace defined by filter
-- Improve error handling in translation fetching
-- Improve warning output when npm publish fails
-
-## 4.2.0: 2022-07-15
-
-- Added command `gitlab:get-tag-pipeline` to track pipeline status and wait for pipeline to finish
-- Added `--outputVersionOnly` to `gitlab:next-nightly-tag` to output only version
-
-## 4.1.0: 2022-06-15
-
-- `vsix` file is removed after installation when `-i` flag is used
-
-## 4.0.0: 2021-05-31
-
-- New auth options
-- [DEPRECATED] `--servicePrincipal` login is no longer available or required. 'AZURE_CLIENT_ID' and 'AZURE_CLIENT_SECRET' environment variables are required with every command in order to use service principal.
-
-## 3.9.0: 2021-05-30
-
-- Additional options for translations output filename
-
-## 3.8.1: 2021-05-17
-
-- Fix GitLab next nightly tag when tags with `test` and `qa` annotation exists
-
-## 3.8.0: 2021-05-05
-
-- Added GitLab next nightly tag
-
-## 3.7.0: 2021-04-28
-
-- Added download commands for AdInsure Server, Client, IdentityServer and Scheduler
-
-## 3.6.1: 2021-12-02
-
-- Improve workspace search pattern for npm publish
-
-## 3.6.0: 2021-11-30
-
-- Add ability to transform files with prepare-content
-
-## 3.5.0: 2021-11-24
-
-- Renaming prepare-content command
-
-## 3.4.0: 2021-10-24
-
-- Added Jira command for listing labels and setting them
-- Added Jira command for listing issue
-
-## 3.3.1: 2021-10-16
-
-- Exclude should be optional for npm:publish
-
-## 3.3.0: 2021-10-14
-
-- Introduced npm check command
-- Introcuced npm publish command
-- Introduced doctor command
-- Introduced download:platform and download:studio command
-
-## 3.2.4: 2021-10-09
-
-- Ignore VERSION file when using 'new' command
-- Unexpected token in JSON files should not stop execution
-- Introduce `--exclude-dir` parameter for `version` command