@adinsure-ops/ops-cli 5.3.1 → 5.3.2

package/README.md

@@ -21,7 +21,7 @@ To quick start development:
 - Run `yarn install`
 - For easier debugging, run `yarn link`
 
-You can run and debug commands directly from terminal by running `ops [command]` (if you `yarn link`-ed the package) or execute `.\bin\run [command]` (if you didn't). For debugging, you can follow oclif's documentation on how to turn on debug mode for a single command **[here](https://oclif.io/docs/debugging/)**.
+You can run and debug commands directly from terminal by running `ops [command]` (if you `yarn link`-ed the package) or execute `.\bin\run [command]` (if you didn't link, e.g. `.\bin\run.cmd sql schema` for non-Windows environments and `.\bin\dev.cmd sql schema` for Windows environments). For debugging, you can follow oclif's documentation on how to turn on debug mode for a single command **[here](https://oclif.io/docs/debugging/)**.
 
 ## Upgrade guilde
 

package/lib/commands/download/studio.js

@@ -52,7 +52,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', '--install-extension', extensionPath, '--force']);
+            const commandResult = yield cp.runCommand(['code.cmd', '--install-extension', extensionPath, '--force']);
             if (commandResult.error) {
                 this.error(`${chalk.redBright('Installing into VSCode failed!')}\n${commandResult.error}`);
             }
@@ -65,7 +65,7 @@ class DownloadStudio extends CommandBase {
                 return false;
             }
             const cp = new ChildProcessCommand();
-            const result = yield cp.runCommand(['code', '--list-extensions', '--show-versions']);
+            const result = yield cp.runCommand(['code.cmd', '--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/gitlab/get-tag-pipeline.d.ts

@@ -1,5 +1,6 @@
 import CommandBase from '../../command.base.js';
 import GitLab from '../../lib/gitlab.js';
+import OpsConfig from '../../lib/config.js';
 export default class GitlabGetTagPipeline extends CommandBase<typeof GitlabGetTagPipeline> {
     static description: string;
     static usage: string;
@@ -16,5 +17,7 @@ export default class GitlabGetTagPipeline extends CommandBase<typeof GitlabGetTa
         delay: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     waitPipelineStatus(gitlab: GitLab, tag: string, timeout: number, delay: number): Promise<string>;
+    hostConfigValidation(config: OpsConfig): Promise<void>;
+    projectConfigValidation(config: OpsConfig): Promise<void>;
     run(): Promise<void>;
 }

package/lib/commands/gitlab/get-tag-pipeline.js

@@ -3,6 +3,7 @@ import { Args, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import CommandBase from '../../command.base.js';
 import GitLab from '../../lib/gitlab.js';
+import OpsConfig from '../../lib/config.js';
 class GitlabGetTagPipeline extends CommandBase {
     waitPipelineStatus(gitlab, tag, timeout, delay) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -82,12 +83,36 @@ class GitlabGetTagPipeline extends CommandBase {
             }));
         });
     }
+    hostConfigValidation(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const host = config.get("gitlab_host");
+            if (host !== undefined) {
+                GitlabGetTagPipeline.flags.host.default = host;
+                return;
+            }
+            GitlabGetTagPipeline.flags.host.default =
+                "https://git.adacta-fintech.com";
+        });
+    }
+    projectConfigValidation(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const project = config.get("gitlab_project_id");
+            if (project !== undefined) {
+                GitlabGetTagPipeline.flags.project.default = project;
+                return;
+            }
+            GitlabGetTagPipeline.flags.project.default = "413";
+        });
+    }
     run() {
         const _super = Object.create(null, {
             run: { get: () => super.run }
         });
         return __awaiter(this, void 0, void 0, function* () {
             _super.run.call(this);
+            const config = new OpsConfig(this.security.getConfigPath());
+            this.hostConfigValidation(config);
+            this.projectConfigValidation(config);
             const { args, flags } = yield this.parse(GitlabGetTagPipeline);
             const gitlab = new GitLab(flags.host, flags.project, flags.pat);
             if (!flags.wait) {
@@ -123,13 +148,11 @@ GitlabGetTagPipeline.flags = {
         description: 'Token from user that has permissions to list and create tags',
     }),
     host: Flags.string({
-        required: true,
         default: 'https://git.adacta-fintech.com',
         env: 'CI_SERVER_URL',
         description: 'Server hostname',
     }),
     project: Flags.string({
-        required: true,
         default: '413',
         env: 'CI_PROJECT_ID',
         description: 'Project ID',

package/lib/commands/gitlab/next-nightly-tag.d.ts

@@ -1,4 +1,5 @@
 import CommandBase from '../../command.base.js';
+import OpsConfig from '../../lib/config.js';
 export default class GitlabNextNightlyTag extends CommandBase<typeof GitlabNextNightlyTag> {
     static description: string;
     static usage: string;
@@ -14,5 +15,7 @@ export default class GitlabNextNightlyTag extends CommandBase<typeof GitlabNextN
         outputVersionOnly: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         dryRun: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
+    hostConfigValidation(config: OpsConfig): Promise<void>;
+    projectConfigValidation(config: OpsConfig): Promise<void>;
     run(): Promise<undefined>;
 }

package/lib/commands/gitlab/next-nightly-tag.js

@@ -4,13 +4,38 @@ import chalk from 'chalk';
 import semver from 'semver';
 import CommandBase from '../../command.base.js';
 import GitLab from '../../lib/gitlab.js';
+import OpsConfig from '../../lib/config.js';
 class GitlabNextNightlyTag extends CommandBase {
+    hostConfigValidation(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const host = config.get("gitlab_host");
+            if (host !== undefined) {
+                GitlabNextNightlyTag.flags.host.default = host;
+                return;
+            }
+            GitlabNextNightlyTag.flags.host.default =
+                "https://git.adacta-fintech.com";
+        });
+    }
+    projectConfigValidation(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const project = config.get("gitlab_project_id");
+            if (project !== undefined) {
+                GitlabNextNightlyTag.flags.project.default = project;
+                return;
+            }
+            GitlabNextNightlyTag.flags.project.default = "413";
+        });
+    }
     run() {
         const _super = Object.create(null, {
             run: { get: () => super.run }
         });
         return __awaiter(this, void 0, void 0, function* () {
             _super.run.call(this);
+            const config = new OpsConfig(this.security.getConfigPath());
+            this.hostConfigValidation(config);
+            this.projectConfigValidation(config);
             const { args, flags } = yield this.parse(GitlabNextNightlyTag);
             const gitlab = new GitLab(flags.host, flags.project, flags.pat);
             const re = /^release\/(\w+-)?((\d+)(\.\d+)?)$/;
@@ -103,13 +128,11 @@ GitlabNextNightlyTag.flags = {
         description: 'Token from user that has permissions to list and create tags',
     }),
     host: Flags.string({
-        required: true,
         default: 'https://git.adacta-fintech.com',
         env: 'CI_SERVER_URL',
         description: 'Server hostname',
     }),
     project: Flags.string({
-        required: true,
         default: '413',
         env: 'CI_PROJECT_ID',
         description: 'Project ID',

package/lib/commands/log/generate.d.ts

@@ -15,7 +15,14 @@ export default class Generate extends CommandBase<typeof Generate> {
     };
     private readonly _entryTypes;
     private readonly _mdFileTypeRegex;
+    private readonly _changelogTitle;
     readChangelogs(dir: string): Promise<ChangelogEntry[]>;
-    generateLog(entries: ChangelogEntry[], components: string[]): Promise<string>;
+    generateLog(entries: ChangelogEntry[], components: string[], headingLevel?: number): Promise<string>;
+    generateChangelog(version: string, entries: ChangelogEntry[], components: string[], currentContents?: string, date?: string): Promise<string>;
+    private formatEntry;
+    private indentMarkdownLines;
+    private stripChangelogTitle;
+    private normalizeLineEndings;
+    private startsWithBlockContent;
     run(): Promise<void>;
 }

package/lib/commands/log/generate.js

@@ -18,6 +18,7 @@ class Generate extends CommandBase {
             { types: ['Fixed', 'fixed'], text: 'Fixed' },
         ];
         this._mdFileTypeRegex = /\.md$/i;
+        this._changelogTitle = '# Changelog';
     }
     readChangelogs(dir) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -38,43 +39,84 @@ class Generate extends CommandBase {
             return result;
         });
     }
-    generateLog(entries, components) {
-        return __awaiter(this, void 0, void 0, function* () {
+    generateLog(entries_1, components_1) {
+        return __awaiter(this, arguments, void 0, function* (entries, components, headingLevel = 3) {
+            var _a;
             let content = '';
             // First group by component, then re-sort the components to get the desired output ordering
             const componentGroups = _.groupBy(entries, 'component');
             for (const group of components) {
+                const groupEntries = (_a = componentGroups[group]) !== null && _a !== void 0 ? _a : [];
                 if (group !== '') {
-                    content += `## ${_.capitalize(group)}\r\n\r\n`;
+                    content += `${'#'.repeat(headingLevel)} ${_.capitalize(group)}\r\n\r\n`;
                 }
-                if (componentGroups[group] === undefined || componentGroups[group].length === 0) {
+                if (groupEntries.length === 0) {
                     content += `No changes were introduced in this version.\r\n\r\n`;
                     continue;
                 }
+                const typeHeadingLevel = group === '' ? headingLevel : headingLevel + 1;
                 for (const type of this._entryTypes) {
-                    const batch = _.remove(componentGroups[group], e => _.indexOf(type.types, e.type) > -1);
+                    const batch = groupEntries.filter(e => _.indexOf(type.types, e.type) > -1);
                     if (batch.length === 0) {
                         continue;
                     }
-                    content += `### ${type.text} (${batch.length} changes)\r\n\r\n`;
+                    content += `${'#'.repeat(typeHeadingLevel)} ${type.text} (${batch.length} changes)\r\n\r\n`;
                     for (const log of batch) {
-                        if (log.content.startsWith('-') || log.content.startsWith('* ')) {
-                            content += `- [${log.issue}](https://jira.adacta-fintech.com/browse/${log.issue}):\r\n`;
-                            content += '    ' + log.content.replaceAll('\n', '\n    ');
-                        }
-                        else {
-                            content += `- [${log.issue}](https://jira.adacta-fintech.com/browse/${log.issue}): `;
-                            content += log.content.replaceAll('\n', '\n    ') + '\r\n';
-                        }
-                        content += '\r\n';
+                        content += `${this.formatEntry(log)}\r\n\r\n`;
                     }
-                    content += '\r\n';
                 }
             }
             // We only want 1 new line at the end of this changelog
-            return content.trimEnd() + '\r\n\r\n';
+            return content.trimEnd() + '\r\n';
+        });
+    }
+    generateChangelog(version_1, entries_1, components_1) {
+        return __awaiter(this, arguments, void 0, function* (version, entries, components, currentContents = '', date = moment().format('YYYY-MM-DD')) {
+            const currentChangelog = this.stripChangelogTitle(currentContents);
+            const generatedChangelog = `${this._changelogTitle}\r\n\r\n## ${version} (${date})\r\n\r\n${yield this.generateLog(entries, components)}`;
+            return currentChangelog ? `${generatedChangelog}\r\n${currentChangelog}\r\n` : generatedChangelog;
         });
     }
+    formatEntry(log) {
+        const normalizedContent = this.normalizeLineEndings(log.content).trim();
+        const lines = normalizedContent.length === 0 ? [] : normalizedContent.split('\n').map(line => line.trimEnd());
+        const issueLine = `- [${log.issue}](https://jira.adacta-fintech.com/browse/${log.issue}):`;
+        if (lines.length === 0) {
+            return issueLine;
+        }
+        if (this.startsWithBlockContent(lines[0])) {
+            return `${issueLine}\r\n${this.indentMarkdownLines(lines)}`;
+        }
+        const [firstLine, ...remainingLines] = lines;
+        if (remainingLines.length === 0) {
+            return `${issueLine} ${firstLine}`;
+        }
+        return `${issueLine} ${firstLine}\r\n${this.indentMarkdownLines(remainingLines)}`;
+    }
+    indentMarkdownLines(lines) {
+        return lines.map(line => line.length === 0 ? '' : `    ${line}`).join('\r\n');
+    }
+    stripChangelogTitle(currentContents) {
+        const trimmedContents = currentContents.trimEnd();
+        if (trimmedContents.length === 0) {
+            return '';
+        }
+        const lines = this.normalizeLineEndings(trimmedContents.trimStart()).split('\n');
+        if (lines[0].trim().toLowerCase() !== this._changelogTitle.toLowerCase()) {
+            return trimmedContents;
+        }
+        lines.shift();
+        while (lines.length > 0 && lines[0].trim().length === 0) {
+            lines.shift();
+        }
+        return lines.join('\r\n').trimEnd();
+    }
+    normalizeLineEndings(content) {
+        return content.replace(/\r\n?/g, '\n');
+    }
+    startsWithBlockContent(line) {
+        return /^([-*+]\s|\d+\.\s|```|~~~|\||#{1,6}\s)/.test(line.trimStart());
+    }
     run() {
         const _super = Object.create(null, {
             run: { get: () => super.run }
@@ -94,9 +136,8 @@ class Generate extends CommandBase {
                 ux.action.stop('done, no changelogs found.');
                 return;
             }
-            const content = `# ${version} (${moment().format('YYYY-MM-DD')})\r\n\r\n${yield this.generateLog(changelogs, components)}`;
             if (flags.preview) {
-                fs.writeFileSync(path.resolve(root, 'preview.md'), content, 'utf8');
+                fs.writeFileSync(path.resolve(root, 'preview.md'), yield this.generateChangelog(version, changelogs, components), 'utf8');
                 ux.action.stop('generated preview.md');
                 return;
             }
@@ -105,7 +146,7 @@ class Generate extends CommandBase {
             if (confirm) {
                 const changelogFile = path.resolve(root, flags.file);
                 const currentContents = fs.readFileSync(changelogFile, { encoding: 'utf8', flag: 'a+' });
-                fs.writeFileSync(changelogFile, content + currentContents, { encoding: 'utf8', flag: 'w' });
+                fs.writeFileSync(changelogFile, yield this.generateChangelog(version, changelogs, components, currentContents), { encoding: 'utf8', flag: 'w' });
                 // delete unreleased changelogs
                 for (const group of components) {
                     const componentChangelogFolder = path.join(changelogFolder, group);

package/lib/commands/sql.d.ts

@@ -18,6 +18,7 @@ export default class Sql extends CommandBase<typeof Sql> {
         'table-name': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'column-name': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'column-type': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        dwh: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     private readonly _moduleTypes;
     private _dbmsTypes;

package/lib/commands/sql.js

@@ -237,7 +237,8 @@ ADD COLUMN IF NOT EXISTS ${columnName} ${columnType};
             }
             const scriptLayer = flags.layer;
             this.log(`Generating on SQL script layer:'${scriptLayer}'`);
-            const scriptsRootFolder = path.resolve(yield this.getGitRoot(), 'database');
+            const databaseFolder = flags.dwh ? 'database-dwh' : 'database';
+            const scriptsRootFolder = path.resolve(yield this.getGitRoot(), databaseFolder);
             if (!(yield fs.pathExists(scriptsRootFolder))) {
                 this.error(`Could not resolve database scripts folder: ${scriptsRootFolder}`);
             }
@@ -282,8 +283,12 @@ ADD COLUMN IF NOT EXISTS ${columnName} ${columnType};
 Sql.description = 'creates a new database script';
 Sql.usage = 'sql <type> <module> [flags]';
 Sql.examples = [
-    `$ ops sql schema `,
+    `$ ops sql schema`,
+    `$ ops sql schema --dwh`,
+    `$ ops sql data acc`,
+    `$ ops sql data acc --dwh`,
     `$ ops sql data shared --layer basic`,
+    `$ ops sql data shared --dwh --layer basic`,
     `$ ops sql data shared --major`,
     `$ ops sql data shared --offline --description "this is script description"`,
 ];
@@ -335,5 +340,9 @@ Sql.flags = {
     'column-type': Flags.string({
         description: 'type of the new column to be added',
     }),
+    'dwh': Flags.boolean({
+        description: 'create database scripts for DWH',
+        default: false
+    }),
 };
 export default Sql;

package/oclif.manifest.json

@@ -210,8 +210,12 @@
       },
       "description": "creates a new database script",
       "examples": [
-        "$ ops sql schema ",
+        "$ ops sql schema",
+        "$ ops sql schema --dwh",
+        "$ ops sql data acc",
+        "$ ops sql data acc --dwh",
         "$ ops sql data shared --layer basic",
+        "$ ops sql data shared --dwh --layer basic",
         "$ ops sql data shared --major",
         "$ ops sql data shared --offline --description \"this is script description\""
       ],
@@ -284,6 +288,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "dwh": {
+          "description": "create database scripts for DWH",
+          "name": "dwh",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -1181,7 +1191,6 @@
           "description": "Server hostname",
           "env": "CI_SERVER_URL",
           "name": "host",
-          "required": true,
           "default": "https://git.adacta-fintech.com",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -1191,7 +1200,6 @@
           "description": "Project ID",
           "env": "CI_PROJECT_ID",
           "name": "project",
-          "required": true,
           "default": "413",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -1263,7 +1271,6 @@
           "description": "Server hostname",
           "env": "CI_SERVER_URL",
           "name": "host",
-          "required": true,
           "default": "https://git.adacta-fintech.com",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -1273,7 +1280,6 @@
           "description": "Project ID",
           "env": "CI_PROJECT_ID",
           "name": "project",
-          "required": true,
           "default": "413",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -1853,5 +1859,5 @@
       ]
     }
   },
-  "version": "5.3.1"
+  "version": "5.3.2"
 }

package/package.json

@@ -1,38 +1,38 @@
 {
     "name": "@adinsure-ops/ops-cli",
     "description": "Operations CLI for working with AdInsure",
-    "version": "5.3.1",
+    "version": "5.3.2",
     "author": "Adacta Digital Service Department",
     "bin": {
         "ops": "./bin/run.js"
     },
     "type": "module",
     "dependencies": {
-        "@azure/msal-node": "^2.8.1",
-        "@oclif/core": "^3.26.6",
-        "@oclif/plugin-help": "^6.0.22",
-        "@oclif/plugin-not-found": "^3.1.9",
-        "@oclif/plugin-warn-if-update-available": "^3.0.19",
-        "axios": "^1.6.8",
-        "chalk": "^5.3.0",
-        "fs-extra": "^11.2.0",
-        "globby": "^14.0.1",
-        "gray-matter": "^4.0.3",
-        "ini": "^4.1.2",
-        "inquirer": "^9.2.21",
+        "@azure/msal-node": "2.8.1",
+        "@oclif/core": "3.26.6",
+        "@oclif/plugin-help": "6.0.22",
+        "@oclif/plugin-not-found": "3.1.9",
+        "@oclif/plugin-warn-if-update-available": "3.0.19",
+        "axios": "1.14.0",
+        "chalk": "5.3.0",
+        "fs-extra": "11.2.0",
+        "globby": "14.0.1",
+        "gray-matter": "4.0.3",
+        "ini": "4.1.2",
+        "inquirer": "9.2.21",
         "jira-client": "8.2.2",
-        "jszip": "^3.10.1",
-        "lodash-es": "^4.17.21",
-        "minimatch": "^9.0.4",
-        "moment": "^2.30.1",
-        "oauth": "^0.10.0",
-        "open": "^10.1.0",
-        "replace-in-file": "^7.1.0",
-        "rimraf": "^5.0.7",
-        "semver": "^7.6.2",
-        "tough-cookie": "^4.1.4",
-        "tslib": "^2.6.2",
-        "yaml": "^2.4.2"
+        "jszip": "3.10.1",
+        "lodash-es": "4.17.21",
+        "minimatch": "9.0.4",
+        "moment": "2.30.1",
+        "oauth": "0.10.0",
+        "open": "10.1.0",
+        "replace-in-file": "7.1.0",
+        "rimraf": "5.0.7",
+        "semver": "7.6.2",
+        "tough-cookie": "4.1.4",
+        "tslib": "2.6.2",
+        "yaml": "2.4.2"
     },
     "devDependencies": {
         "@eslint/js": "^9.2.0",
@@ -122,5 +122,8 @@
         "test-single-with-coverage": "nyc --require ts-node/register --extension .ts mocha --reporter=doc --timeout 20000 --forbid-only",
         "eslint": "eslint --quiet --config .eslint.config.js --fix"
     },
-    "types": "lib/index.d.ts"
+    "types": "lib/index.d.ts",
+    "resolutions": {
+        "axios": "1.14.0"
+    }
 }