@waron97/prbot 2.3.0 → 2.5.0

package/README.md

@@ -42,6 +42,7 @@ source ~/.bashrc
 | `DEVOPS_PROJECT`       | Azure DevOps project                                     |
 | `DEVOPS_REPO`          | Azure DevOps repository name                             |
 | `AUTOPR_TARGET_BRANCH` | Target branch for auto-created PRs (default: `15.0-dev`) |
+| `IMPORTEXPORT_URL`     | ImportExport API base URL                                 |
 
 ## Commands
 
@@ -115,10 +116,70 @@ Options:
 | `-b, --branch <name>`  | Branch name (default: `autopr_<first-task-id>` or `autopr_<first-jira>`) |
 | `-n, --name <text>`    | PR title (default: Trident task name)                                    |
 
+### `prbot commit`
+
+Interactive commit builder. Prompts for operation type (`[IMP]`, `[FIX]`, etc.), and a message. The destinatin module will be automatically detected. If nothing is staged, shows unstaged files and lets you select which to stage first. Previews the final commit message before confirming.
+
+```bash
+prbot commit
+```
+
+### `prbot export workflow <module>`
+
+Alias for `prbot pr <module>`. Fetches workflow XML and commits.
+
+```bash
+prbot export workflow config_wf_contestazione
+```
+
+Options:
+
+| Flag                 | Description                                                               |
+| -------------------- | ------------------------------------------------------------------------- |
+| `-b, --bump <level>` | Also bump manifest version after commit. Level: `major`, `minor`, `patch` |
+
+### `prbot export pb`
+
+Exports a Process Builder process from the ImportExport API and writes the ZIP to `ADDONS_PATH/.cloudbuild/pb/B2WA/processes/`. Updates the file in place if it already exists, otherwise writes to the `all/` subdirectory. Prompts to select the process via fuzzy search.
+
+```bash
+prbot export pb
+prbot export pb --no-commit
+```
+
+Options:
+
+| Flag          | Description              |
+| ------------- | ------------------------ |
+| `--no-commit` | Skip the git commit step |
+
+### `prbot export imperex`
+
+Exports a single Imperex record from Odoo via RIP and writes the resulting YAML into `ADDONS_PATH/sorgenia_imperex_metadata/migrations/0.0.0/imperex/<model>/`. Prompts first for the model (from local folder names), then for the record (fetched from API). Both prompts support fuzzy search.
+
+```bash
+prbot export imperex
+prbot export imperex --no-commit
+```
+
+Options:
+
+| Flag          | Description              |
+| ------------- | ------------------------ |
+| `--no-commit` | Skip the git commit step |
+
 ### `prbot init`
 
 Interactive setup: writes `~/.config/prbot/config` and installs shell completion.
 
+### `prbot update`
+
+Reinstalls the latest published version from npm.
+
+```bash
+prbot update
+```
+
 ## Tab completion
 
 After `prbot init` and sourcing `~/.bashrc`, `<module>` arguments autocomplete from directories in `ADDONS_PATH/config/`.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@waron97/prbot",
-    "version": "2.3.0",
+    "version": "2.5.0",
     "description": "",
     "main": "index.js",
     "scripts": {

package/src/commands/autopr.js

@@ -4,6 +4,7 @@ import search from '@inquirer/search';
 import inquirer from 'inquirer';
 import fetch from 'node-fetch';
 import { resolveAddonsPath } from '../lib/addons.js';
+import { fuzzyMatch } from '../lib/fuzzy.js';
 import { execGit } from '../lib/git.js';
 import {
     appendPrToLine,
@@ -176,7 +177,7 @@ async function selectSection(sections, candidates) {
         message: 'Select changelog section:',
         source: async (input) => {
             if (!input) return allChoices;
-            return allChoices.filter((c) => c.value.toLowerCase().includes(input.toLowerCase()));
+            return allChoices.filter((c) => fuzzyMatch(c.value, input));
         },
     });
     return sections.find((s) => s.heading === selected);

package/src/commands/changelog.js

@@ -3,6 +3,7 @@ import fs from 'fs/promises';
 import search from '@inquirer/search';
 import inquirer from 'inquirer';
 import { resolveAddonsPath } from '../lib/addons.js';
+import { fuzzyMatch } from '../lib/fuzzy.js';
 
 function buildRefString(tridents, jiras, prNumber) {
     const refs = [];
@@ -159,11 +160,7 @@ async function changelog(prNumber, options) {
                 return sectionChoices;
             }
 
-            const filtered = sectionChoices.filter((choice) =>
-                choice.name.toLowerCase().includes(input.toLowerCase())
-            );
-
-            return filtered;
+            return sectionChoices.filter((choice) => fuzzyMatch(choice.name, input));
         },
     });
 

package/src/commands/commit.js

@@ -13,133 +13,182 @@ const commitOperations = [
     },
     { name: `📖 DOC ${chalk.gray('- Documentation changes')}`, value: '[DOC]' },
     { name: `🩹 FIX ${chalk.gray('- Bugfix or hotfix')}`, value: '[FIX]' },
-    { name: `🛠️ IMP ${chalk.gray('- Improvement of existing code')}`, value: '[IMP]' },
+    { name: `🛠️  IMP ${chalk.gray('- Improvement of existing code')}`, value: '[IMP]' },
     { name: `💬 I18N ${chalk.gray('- Translation changes')}`, value: '[I18N]' },
     { name: `📦 MIG ${chalk.gray('- Module migration')}`, value: '[MIG]' },
     { name: `🔄 REF ${chalk.gray('- Code refactoring')}`, value: '[REF]' },
     { name: `🎉 REL ${chalk.gray('- Release commit')}`, value: '[REL]' },
-    { name: `🗑️ REM ${chalk.gray('- Removing unnecessary files')}`, value: '[REM]' },
-    { name: `✏️ REN ${chalk.gray('- Renaming files/variables/models/etc.')}`, value: '[REN]' },
+    { name: `🗑️  REM ${chalk.gray('- Removing unnecessary files')}`, value: '[REM]' },
+    { name: `✏️  REN ${chalk.gray('- Renaming files/variables/models/etc.')}`, value: '[REN]' },
     { name: `🔙 REV ${chalk.gray('- Revert of an existing commit')}`, value: '[REV]' },
     { name: `🧳 SUB ${chalk.gray('- Submodule adding/updating')}`, value: '[SUB]' },
-    { name: `#️⃣ VER ${chalk.gray('- Versioning')}`, value: '[VER]' },
+    { name: `#️⃣  VER ${chalk.gray('- Versioning')}`, value: '[VER]' },
 ];
 
-const commitTypes = [
-    { name: '🔧 Workflow', value: 'workflow' },
-    { name: '📋 Module', value: 'module' },
-    { name: '👤 Wizard', value: 'wizard' },
-    { name: '⚙️  Symphony Process', value: 'symphony' },
-];
+function getModuleFromFile(file) {
+    const parts = file.split('/');
 
-async function commit() {
-    const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+    if (parts[0] === 'config') {
+        return parts[1];
+    }
 
-    const unstagedChanges = await execGit(['diff', '--name-only'], ADDONS_PATH);
-    const stagedChanges = await execGit(['diff', '--cached', '--name-only'], ADDONS_PATH);
+    if (parts[0] === '.cloudbuild') {
+        const allIndex = parts.indexOf('all');
 
-    let stageFilesAnswers = [];
+        if (allIndex !== -1) {
+            return parts.slice(0, allIndex + 1).join('/');
+        }
+    }
+
+    return parts[0];
+}
 
-    if (!stagedChanges.trim()) {
+function validateSameModule(files) {
+    const modules = files.map(getModuleFromFile);
+    const currentModule = `[${modules[0]}]`;
+
+    const allSameModule = modules.every((module) => `[${module}]` === currentModule);
+
+    if (!allSameModule) {
+        console.log(chalk.red('Selected files are not of the same module'));
+        return null;
+    }
+
+    return currentModule;
+}
+
+async function getFilesToCommit(stagedChanges, unstagedChanges) {
+    if (stagedChanges.trim()) {
+        console.log(chalk.green('Staged changes:'));
+        console.log(stagedChanges);
+
+        return {
+            filesToCheck: stagedChanges.trim().split('\n'),
+            filesToStage: [],
+        };
+    }
+
+    const unstagedFiles = unstagedChanges.trim().split('\n');
+
+    while (true) {
         console.log(chalk.yellow('No staged changes found.'));
         console.log(chalk.yellow('Unstaged changes:'));
         console.log(unstagedChanges);
 
-        stageFilesAnswers = await inquirer.prompt([
+        const answers = await inquirer.prompt([
             {
                 message: 'Select unstaged files to stage for commit:',
                 type: 'checkbox',
                 name: 'filesToStage',
-                choices: unstagedChanges
-                    .trim()
-                    .split('\n')
-                    .map((file) => file),
+                choices: unstagedFiles,
             },
         ]);
-    } else {
-        console.log(chalk.green('Staged changes:'));
-        console.log(stagedChanges);
+
+        const currentModule = validateSameModule(answers.filesToStage);
+
+        if (currentModule) {
+            return {
+                filesToCheck: answers.filesToStage,
+                filesToStage: answers.filesToStage,
+                currentModule,
+            };
+        }
     }
+}
 
-    const answers = await inquirer.prompt([
-        {
-            type: 'search-list',
-            message: 'Select an operation:',
-            name: 'commitOperation',
-            choices: commitOperations,
-        },
-        {
-            type: 'search-list',
-            message: 'Select what has been changed:',
-            name: 'commitType',
-            choices: commitTypes,
-            when(answers) {
-                return answers.commitOperation !== '[DOC]';
-            },
-        },
-        {
-            type: 'input',
-            message(answers) {
-                return `Please enter the name of the ${answers.commitType}:`;
+async function commit() {
+    const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+
+    while (true) {
+        const unstagedChanges = await execGit(['diff', '--name-only'], ADDONS_PATH);
+        const stagedChanges = await execGit(['diff', '--cached', '--name-only'], ADDONS_PATH);
+
+        if (!unstagedChanges.trim() && !stagedChanges.trim()) {
+            console.log(chalk.red('No changes found to commit.'));
+            return;
+        }
+
+        const {
+            filesToCheck,
+            filesToStage,
+            currentModule: selectedModule,
+        } = await getFilesToCommit(stagedChanges, unstagedChanges);
+
+        if (filesToCheck.length === 0) {
+            console.log(chalk.red('No files selected.'));
+            return;
+        }
+
+        let currentModule = selectedModule || validateSameModule(filesToCheck);
+
+        if (!currentModule) {
+            return;
+        }
+
+        const answers = await inquirer.prompt([
+            {
+                type: 'search-list',
+                message: 'Select an operation:',
+                name: 'commitOperation',
+                choices: commitOperations,
             },
-            name: 'commitModule',
-            default: 'config_wf_',
-            when(answers) {
-                return answers.commitType === 'workflow' || answers.commitType === 'module';
+            {
+                type: 'input',
+                message: 'Please enter your message:',
+                name: 'commitMessage',
+                filter: (input) => input.trim(),
+                when(answers) {
+                    return answers.commitOperation !== '[DOC]';
+                },
             },
-            filter(input) {
-                let value = input.trim();
+        ]);
 
-                if (!value.startsWith('[')) {
-                    value = `[${value}`;
-                }
+        if (answers.commitOperation === '[DOC]') {
+            currentModule = '[CHANGELOG]';
+            answers.commitMessage = 'Changelog';
+        }
 
-                if (!value.endsWith(']')) {
-                    value = `${value}]`;
-                }
+        const commitMessage = `${answers.commitOperation}${currentModule} ${answers.commitMessage}`;
 
-                return value;
-            },
-        },
-        {
-            type: 'input',
-            message: 'Please enter your message:',
-            name: 'commitMessage',
-            filter: (input) => input.trim(),
-            when(answers) {
-                return answers.commitOperation !== '[DOC]';
+        const finalPrompt = await inquirer.prompt([
+            {
+                type: 'confirm',
+                message: `${chalk.red(commitMessage)}\nDo you want to proceed with this commit message?`,
+                name: 'confirmCommit',
             },
-        },
-    ]);
+        ]);
 
-    if (answers.commitOperation === '[DOC]') {
-        answers.commitModule = '[CHANGELOG]';
-        answers.commitMessage = 'Changelog';
-    }
+        if (!finalPrompt.confirmCommit) {
+            return;
+        }
 
-    if (answers.commitType === 'wizard') {
-        answers.commitModule = '[.cloudbuild/pb/B2WA/processes/all]';
-    }
+        if (filesToStage.length > 0) {
+            await execGit(['add', ...filesToStage], ADDONS_PATH);
+        }
 
-    if (answers.commitType === 'symphony') {
-        answers.commitModule = '[.cloudbuild/symphony/B2WA/processes/all]';
-    }
+        await execGit(['commit', '-m', commitMessage], ADDONS_PATH);
+        console.log(chalk.green('Commit created successfully!'));
 
-    const commitMessage = `${answers.commitOperation}${answers.commitModule} ${answers.commitMessage}`;
+        const remainingUnstaged = await execGit(['diff', '--name-only'], ADDONS_PATH);
+        const remainingStaged = await execGit(['diff', '--cached', '--name-only'], ADDONS_PATH);
 
-    const finalPrompt = await inquirer.prompt([
-        {
-            type: 'confirm',
-            message: `${chalk.red(commitMessage)}\nDo you want to proceed with this commit message?`,
-            name: 'confirmCommit',
-        },
-    ]);
+        if (!remainingUnstaged.trim() && !remainingStaged.trim()) {
+            console.log(chalk.green('No more changes to commit.'));
+            break;
+        }
 
-    if (finalPrompt.confirmCommit) {
-        if (stageFilesAnswers.filesToStage && stageFilesAnswers.filesToStage.length > 0) {
-            await execGit(['add', ...stageFilesAnswers.filesToStage], ADDONS_PATH);
+        const { continueCommit } = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'continueCommit',
+                message: 'Do you want to create another commit?',
+                default: true,
+            },
+        ]);
+
+        if (!continueCommit) {
+            break;
         }
-        await execGit(['commit', '-m', commitMessage], ADDONS_PATH);
     }
 }
 

package/src/commands/export.js

@@ -1,7 +1,8 @@
 import { exportPb } from './exportPb.js';
+import { exportImperex } from './exportImperex.js';
 
 function exportRip() {
     console.log('Not implemented yet.');
 }
 
-export { exportPb, exportRip };
+export { exportPb, exportRip, exportImperex };

package/src/commands/exportImperex.js

@@ -0,0 +1,97 @@
+import fs from 'fs/promises';
+import path from 'path';
+import fetch from 'node-fetch';
+import search from '@inquirer/search';
+import { getToken } from '../lib/auth.js';
+import { execGit } from '../lib/git.js';
+import { resolveAddonsPath } from '../lib/addons.js';
+import { fuzzyMatch } from '../lib/fuzzy.js';
+
+const IMPEREX_REL = 'sorgenia_imperex_metadata/migrations/0.0.0/imperex';
+
+async function getModels(addonsPath) {
+    const dir = path.join(addonsPath, IMPEREX_REL);
+    const entries = await fs.readdir(dir, { withFileTypes: true });
+    return entries.filter((e) => e.isDirectory()).map((e) => e.name);
+}
+
+async function listRecords(model, token) {
+    const url = `${process.env.RIP_URL}/helpdesk.ticket/prbot_list_records`;
+    const response = await fetch(url, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+        body: JSON.stringify({ model }),
+    });
+    if (!response.ok) throw new Error(await response.text());
+    return await response.json();
+}
+
+async function exportRecord(model, id, token) {
+    const url = `${process.env.RIP_URL}/helpdesk.ticket/prbot_imperex_export`;
+    const response = await fetch(url, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+        body: JSON.stringify({
+            export_to: 'yaml',
+            make_zip: true,
+            manifest: {},
+            recs: { [model]: [id] },
+        }),
+    });
+    if (!response.ok) throw new Error(await response.text());
+    return await response.json();
+}
+
+async function exportImperex(opts) {
+    const token = await getToken();
+    const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+
+    const models = await getModels(ADDONS_PATH);
+    const modelChoices = models.map((m) => ({ name: m, value: m }));
+    const model = await search({
+        message: 'Select Imperex model:',
+        source: async (input) => {
+            if (!input) return modelChoices;
+            return modelChoices.filter((c) => fuzzyMatch(c.name, input));
+        },
+    });
+
+    console.log(`Fetching records for ${model}...`);
+    const records = await listRecords(model, token);
+    const recChoices = records.map((r) => ({ name: String(r.name ?? r.id), value: r.id }));
+    const recordId = await search({
+        message: 'Select record to export:',
+        source: async (input) => {
+            if (!input) return recChoices;
+            return recChoices.filter((c) => fuzzyMatch(c.name, input));
+        },
+    });
+
+    console.log(`Exporting record ${recordId}...`);
+    const { attachments } = await exportRecord(model, recordId, token);
+
+    const modelDir = path.join(ADDONS_PATH, IMPEREX_REL, model);
+    await fs.mkdir(modelDir, { recursive: true });
+
+    const saved = [];
+    for (const att of attachments) {
+        if (att.name === '__manifest__.yaml') continue;
+        const destPath = path.join(modelDir, path.basename(att.name));
+        await fs.writeFile(destPath, att.content, 'utf-8');
+        console.log(`Written: ${destPath}`);
+        saved.push(destPath);
+    }
+
+    if (opts.commit !== false) {
+        for (const p of saved) {
+            await execGit(['add', p], ADDONS_PATH);
+        }
+        await execGit(
+            ['commit', '-m', `[IMP][sorgenia_imperex_metadata] update ${model} record`],
+            ADDONS_PATH,
+        );
+        console.log('Committed.');
+    }
+}
+
+export { exportImperex };

package/src/commands/exportPb.js

@@ -5,6 +5,7 @@ import search from '@inquirer/search';
 import { getToken } from '../lib/auth.js';
 import { execGit } from '../lib/git.js';
 import { resolveAddonsPath } from '../lib/addons.js';
+import { fuzzyMatch } from '../lib/fuzzy.js';
 
 async function getProcessList(token) {
     const url = `${process.env.IMPORTEXPORT_URL}/object/process_builder?addLanguageParam=true`;
@@ -112,8 +113,7 @@ async function exportPb(opts) {
         message: 'Select PB process to export:',
         source: async (input) => {
             if (!input) return choices;
-            const q = input.toLowerCase();
-            return choices.filter((c) => c.name.toLowerCase().includes(q));
+            return choices.filter((c) => fuzzyMatch(c.name, input));
         },
     });
 

package/src/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { readdirSync, readFileSync } from 'fs';
+import { execFile } from 'child_process';
 import path from 'path';
 import { program } from 'commander';
 import { configDotenv } from 'dotenv';
@@ -7,7 +8,7 @@ import omelette from 'omelette';
 import { autopr } from './commands/autopr.js';
 import { changelog } from './commands/changelog.js';
 import { commit } from './commands/commit.js';
-import { exportPb, exportRip } from './commands/export.js';
+import { exportPb, exportRip, exportImperex } from './commands/export.js';
 import { init } from './commands/init.js';
 import { main as prMain } from './commands/pr.js';
 import { verbot } from './commands/ver.js';
@@ -137,4 +138,25 @@ exportCmd
         });
     });
 
+exportCmd
+    .command('imperex')
+    .option('--no-commit')
+    .action((opts) => {
+        exportImperex(opts).catch((err) => {
+            throw err;
+        });
+    });
+
+program.command('update').action(() => {
+    console.log('Updating prbot...');
+    execFile('npm', ['i', '-g', '@waron97/prbot'], (error, stdout, stderr) => {
+        if (error) {
+            console.error(stderr || error.message);
+            process.exit(1);
+        }
+        console.log(stdout);
+        console.log('Done.');
+    });
+});
+
 program.parse();

package/src/lib/fuzzy.js

@@ -0,0 +1,13 @@
+function fuzzyMatch(str, query) {
+    const s = str.toLowerCase();
+    const q = query.toLowerCase();
+    let si = 0;
+    for (const ch of q) {
+        si = s.indexOf(ch, si);
+        if (si === -1) return false;
+        si++;
+    }
+    return true;
+}
+
+export { fuzzyMatch };